commit 33e1c78ae3681719b389d4ead425afa4433f445d · pyrox.dev/nixpkgs

+2 -2

doc/languages-frameworks/python.md

···

       566
        
           with import <nixpkgs> {};

     

       567
        
       

     

       568
        
           (python3.buildEnv.override {

     

       569
       -
             extraLibs = with python3Packages; [ numpy requests ];

     

       570
        
           }).env

     

       571
        
       

     

       572
        
       will drop you into a shell where Python will have the

     
···

       605
        
       

     

       606
        
           with import <nixpkgs> {};

     

       607
        
       

     

       608
       -
           (python33.withPackages (ps: [ps.numpy ps.requests])).env

     

       609
        
       

     

       610
        
       In contrast to `python.buildEnv`, `python.withPackages` does not support the more advanced options

     

       611
        
       such as `ignoreCollisions = true` or `postBuild`. If you need them, you have to use `python.buildEnv`.

···

       566
        
           with import <nixpkgs> {};

     

       567
        
       

     

       568
        
           (python3.buildEnv.override {

     

       569
       +
             extraLibs = with python3Packages; [ numpy requests2 ];

     

       570
        
           }).env

     

       571
        
       

     

       572
        
       will drop you into a shell where Python will have the

     
···

       605
        
       

     

       606
        
           with import <nixpkgs> {};

     

       607
        
       

     

       608
       +
           (python33.withPackages (ps: [ps.numpy ps.requests2])).env

     

       609
        
       

     

       610
        
       In contrast to `python.buildEnv`, `python.withPackages` does not support the more advanced options

     

       611
        
       such as `ignoreCollisions = true` or `postBuild`. If you need them, you have to use `python.buildEnv`.

+2 -1

lib/maintainers.nix

···

       240
        
         mathnerd314 = "Mathnerd314 <mathnerd314.gph+hs@gmail.com>";

     

       241
        
         matthiasbeyer = "Matthias Beyer <mail@beyermatthias.de>";

     

       242
        
         maurer = "Matthew Maurer <matthew.r.maurer+nix@gmail.com>";

     

       243
       -
         mbakke = "Marius Bakke <ymse@tuta.io>";

     

       244
        
         matthewbauer = "Matthew Bauer <mjbauer95@gmail.com>";

     

       245
        
         mbe = "Brandon Edens <brandonedens@gmail.com>";

     

       246
        
         mboes = "Mathieu Boespflug <mboes@tweag.net>";

     
···

       248
        
         meditans = "Carlo Nucera <meditans@gmail.com>";

     

       249
        
         meisternu = "Matt Miemiec <meister@krutt.org>";

     

       250
        
         michaelpj = "Michael Peyton Jones <michaelpj@gmail.com>";

     

       0
        
       
     

       251
        
         michelk = "Michel Kuhlmann <michel@kuhlmanns.info>";

     

       252
        
         mimadrid = "Miguel Madrid <mimadrid@ucm.es>";

     

       253
        
         mingchuan = "Ming Chuan <ming@culpring.com>";

···

       240
        
         mathnerd314 = "Mathnerd314 <mathnerd314.gph+hs@gmail.com>";

     

       241
        
         matthiasbeyer = "Matthias Beyer <mail@beyermatthias.de>";

     

       242
        
         maurer = "Matthew Maurer <matthew.r.maurer+nix@gmail.com>";

     

       243
       +
         mbakke = "Marius Bakke <mbakke@fastmail.com>";

     

       244
        
         matthewbauer = "Matthew Bauer <mjbauer95@gmail.com>";

     

       245
        
         mbe = "Brandon Edens <brandonedens@gmail.com>";

     

       246
        
         mboes = "Mathieu Boespflug <mboes@tweag.net>";

     
···

       248
        
         meditans = "Carlo Nucera <meditans@gmail.com>";

     

       249
        
         meisternu = "Matt Miemiec <meister@krutt.org>";

     

       250
        
         michaelpj = "Michael Peyton Jones <michaelpj@gmail.com>";

     

       251
       +
         michalrus = "Michal Rus <m@michalrus.com>";

     

       252
        
         michelk = "Michel Kuhlmann <michel@kuhlmanns.info>";

     

       253
        
         mimadrid = "Miguel Madrid <mimadrid@ucm.es>";

     

       254
        
         mingchuan = "Ming Chuan <ming@culpring.com>";

nixos/doc/manual/configuration/grsecurity.xml

···

       265
        
         <sect1 xml:id="sec-grsec-issues"><title>Issues and work-arounds</title>

     

       266
        
       

     

       267
        
         <itemizedlist>

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       268
        
           <listitem><para>Access to EFI runtime services is disabled by default:

     

       269
        
           this plugs a potential code injection attack vector; use

     

       270
        
           <option>security.grsecurity.disableEfiRuntimeServices</option> to override

···

       265
        
         <sect1 xml:id="sec-grsec-issues"><title>Issues and work-arounds</title>

     

       266
        
       

     

       267
        
         <itemizedlist>

     

       268
       +
           <listitem><para>User namespaces require <literal>CAP_SYS_ADMIN</literal>:

     

       269
       +
           consequently, unprivileged namespaces are unsupported. Applications that

     

       270
       +
           rely on namespaces for sandboxing must use a privileged helper. For chromium

     

       271
       +
           there is <option>security.chromiumSuidSandbox.enable</option>.</para></listitem>

     

       272
       +
       

     

       273
        
           <listitem><para>Access to EFI runtime services is disabled by default:

     

       274
        
           this plugs a potential code injection attack vector; use

     

       275
        
           <option>security.grsecurity.disableEfiRuntimeServices</option> to override

+4 -1

nixos/lib/make-disk-image.nix

···

       12
        
         # directly.

     

       13
        
         partitioned ? true

     

       14
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       15
        
       , # The root file system type.

     

       16
        
         fsType ? "ext4"

     

       17
        
       

     
···

       108
        
             # Generate the GRUB menu.

     

       109
        
             ln -s vda /dev/xvda

     

       110
        
             ln -s vda /dev/sda

     

       111
       -
             chroot /mnt ${config.system.build.toplevel}/bin/switch-to-configuration boot

     

       112
        
       

     

       113
        
             umount /mnt/proc /mnt/dev /mnt/sys

     

       114
        
             umount /mnt

···

       12
        
         # directly.

     

       13
        
         partitioned ? true

     

       14
        
       

     

       15
       +
         # Whether to invoke switch-to-configuration boot during image creation

     

       16
       +
       , installBootLoader ? true

     

       17
       +
       

     

       18
        
       , # The root file system type.

     

       19
        
         fsType ? "ext4"

     

       20
        
       

     
···

       111
        
             # Generate the GRUB menu.

     

       112
        
             ln -s vda /dev/xvda

     

       113
        
             ln -s vda /dev/sda

     

       114
       +
             ${optionalString installBootLoader "chroot /mnt ${config.system.build.toplevel}/bin/switch-to-configuration boot"}

     

       115
        
       

     

       116
        
             umount /mnt/proc /mnt/dev /mnt/sys

     

       117
        
             umount /mnt

nixos/modules/security/grsecurity.nix

···

       119
        
             "kernel.grsecurity.chroot_deny_chroot" = mkForce 0;

     

       120
        
             "kernel.grsecurity.chroot_deny_mount" = mkForce 0;

     

       121
        
             "kernel.grsecurity.chroot_deny_pivot" = mkForce 0;

     

       0
        
       
     

       122
        
           } // optionalAttrs containerSupportRequired {

     

       123
        
             # chroot(2) restrictions that conflict with NixOS lightweight containers

     

       124
        
             "kernel.grsecurity.chroot_deny_chmod" = mkForce 0;

     

       125
        
             "kernel.grsecurity.chroot_deny_mount" = mkForce 0;

     

       126
        
             "kernel.grsecurity.chroot_restrict_nice" = mkForce 0;

     

       0
        
       
     

       127
        
           };

     

       128
        
       

     

       129
        
           assertions = [

···

       119
        
             "kernel.grsecurity.chroot_deny_chroot" = mkForce 0;

     

       120
        
             "kernel.grsecurity.chroot_deny_mount" = mkForce 0;

     

       121
        
             "kernel.grsecurity.chroot_deny_pivot" = mkForce 0;

     

       122
       +
             "kernel.grsecurity.chroot_deny_chmod" = mkForce 0;

     

       123
        
           } // optionalAttrs containerSupportRequired {

     

       124
        
             # chroot(2) restrictions that conflict with NixOS lightweight containers

     

       125
        
             "kernel.grsecurity.chroot_deny_chmod" = mkForce 0;

     

       126
        
             "kernel.grsecurity.chroot_deny_mount" = mkForce 0;

     

       127
        
             "kernel.grsecurity.chroot_restrict_nice" = mkForce 0;

     

       128
       +
             "kernel.grsecurity.chroot_caps" = mkForce 0;

     

       129
        
           };

     

       130
        
       

     

       131
        
           assertions = [

+1 -1

nixos/modules/services/backup/crashplan.nix

···

       28
        
             description = "CrashPlan Backup Engine";

     

       29
        
       

     

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

     

       31
       -
             after    = [ "network.target" ];

     

       32
        
       

     

       33
        
             preStart = ''

     

       34
        
               ensureDir() {

···

       28
        
             description = "CrashPlan Backup Engine";

     

       29
        
       

     

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

     

       31
       +
             after    = [ "network.target" "local-fs.target" ];

     

       32
        
       

     

       33
        
             preStart = ''

     

       34
        
               ensureDir() {

+6 -3

nixos/modules/services/misc/autofs.nix

···

       75
        
           boot.kernelModules = [ "autofs4" ];

     

       76
        
       

     

       77
        
           systemd.services.autofs =

     

       78
       -
             { description = "Filesystem automounter";

     

       0
        
       
     

       0
        
       
     

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

     

       80
       -
               after = [ "network.target" ];

     

       81
        
       

     

       82
        
               preStart = ''

     

       83
        
                 # There should be only one autofs service managed by systemd, so this should be safe.

     
···

       85
        
               '';

     

       86
        
       

     

       87
        
               serviceConfig = {

     

       88
       -
                 ExecStart = "${pkgs.autofs5}/sbin/automount ${if cfg.debug then "-d" else ""} -f -t ${builtins.toString cfg.timeout} ${autoMaster} ${if cfg.debug then "-l7" else ""}";

     

       0
        
       
     

       0
        
       
     

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

     

       90
        
               };

     

       91
        
             };

···

       75
        
           boot.kernelModules = [ "autofs4" ];

     

       76
        
       

     

       77
        
           systemd.services.autofs =

     

       78
       +
             { description = "Automounts filesystems on demand";

     

       79
       +
               after = [ "network.target" "ypbind.service" "sssd.service" "network-online.target" ];

     

       80
       +
               wants = [ "network-online.target" ];

     

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

     

       0
        
       
     

       82
        
       

     

       83
        
               preStart = ''

     

       84
        
                 # There should be only one autofs service managed by systemd, so this should be safe.

     
···

       86
        
               '';

     

       87
        
       

     

       88
        
               serviceConfig = {

     

       89
       +
                 Type = "forking";

     

       90
       +
                 PIDFile = "/run/autofs.pid";

     

       91
       +
                 ExecStart = "${pkgs.autofs5}/bin/automount ${optionalString cfg.debug "-d"} -p /run/autofs.pid -t ${builtins.toString cfg.timeout} ${autoMaster}";

     

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

     

       93
        
               };

     

       94
        
             };

+12 -17

nixos/modules/services/networking/ejabberd.nix

···

       111
        
             description = "ejabberd server";

     

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

     

       113
        
             after = [ "network.target" ];

     

       114
       -
             path = [ pkgs.findutils pkgs.coreutils ] ++ lib.optional cfg.imagemagick pkgs.imagemagick;

     

       115
        
       

     

       116
        
             serviceConfig = {

     

       117
       -
               Type = "forking";

     

       118
        
               # FIXME: runit is used for `chpst` -- can we get rid of this?

     

       119
        
               ExecStop = ''${pkgs.runit}/bin/chpst -u "${cfg.user}:${cfg.group}" ${ectl} stop'';

     

       120
        
               ExecReload = ''${pkgs.runit}/bin/chpst -u "${cfg.user}:${cfg.group}" ${ectl} reload_config'';

     
···

       132
        
       

     

       133
        
               mkdir -p -m750 "${cfg.spoolDir}"

     

       134
        
               chown -R "${cfg.user}:${cfg.group}" "${cfg.spoolDir}"

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       135
        
             '';

     

       136
        
       

     

       137
       -
             script = ''

     

       138
       -
               [ -z "$(ls -A '${cfg.spoolDir}')" ] && firstRun=1

     

       139
       -
       

     

       140
       -
               ${ectl} start

     

       141
       -
       

     

       142
       -
               count=0

     

       143
        
               while ! ${ectl} status >/dev/null 2>&1; do

     

       144
       -
                 if [ $count -eq 30 ]; then

     

       145
       -
                   echo "ejabberd server hasn't started in 30 seconds, giving up"

     

       146
       -
                   exit 1

     

       147
       -
                 fi

     

       148
       -
       

     

       149
       -
                 count=$((count++))

     

       150
       -
                 sleep 1

     

       151
        
               done

     

       152
        
       

     

       153
       -
               if [ -n "$firstRun" ]; then

     

       0
        
       
     

       154
        
                 for src in ${dumps}; do

     

       155
        
                   find "$src" -type f | while read dump; do

     

       156
        
                     echo "Loading configuration dump at $dump"

     

       157
       -
                     ${ectl} load "$dump"

     

       158
        
                   done

     

       159
        
                 done

     

       160
        
               fi

···

       111
        
             description = "ejabberd server";

     

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

     

       113
        
             after = [ "network.target" ];

     

       114
       +
             path = [ pkgs.findutils pkgs.coreutils pkgs.runit ] ++ lib.optional cfg.imagemagick pkgs.imagemagick;

     

       115
        
       

     

       116
        
             serviceConfig = {

     

       117
       +
               ExecStart = ''${ectl} foreground'';

     

       118
        
               # FIXME: runit is used for `chpst` -- can we get rid of this?

     

       119
        
               ExecStop = ''${pkgs.runit}/bin/chpst -u "${cfg.user}:${cfg.group}" ${ectl} stop'';

     

       120
        
               ExecReload = ''${pkgs.runit}/bin/chpst -u "${cfg.user}:${cfg.group}" ${ectl} reload_config'';

     
···

       132
        
       

     

       133
        
               mkdir -p -m750 "${cfg.spoolDir}"

     

       134
        
               chown -R "${cfg.user}:${cfg.group}" "${cfg.spoolDir}"

     

       135
       +
       

     

       136
       +
               if [ -z "$(ls -A '${cfg.spoolDir}')" ]; then

     

       137
       +
                 touch "${cfg.spoolDir}/.firstRun"

     

       138
       +
               fi

     

       139
        
             '';

     

       140
        
       

     

       141
       +
             postStart = ''

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       142
        
               while ! ${ectl} status >/dev/null 2>&1; do

     

       143
       +
                 if ! kill -0 "$MAINPID"; then exit 1; fi

     

       144
       +
                 sleep 0.1

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       145
        
               done

     

       146
        
       

     

       147
       +
               if [ -e "${cfg.spoolDir}/.firstRun" ]; then

     

       148
       +
                 rm "${cfg.spoolDir}/.firstRun"

     

       149
        
                 for src in ${dumps}; do

     

       150
        
                   find "$src" -type f | while read dump; do

     

       151
        
                     echo "Loading configuration dump at $dump"

     

       152
       +
                     chpst -u "${cfg.user}:${cfg.group}" ${ectl} load "$dump"

     

       153
        
                   done

     

       154
        
                 done

     

       155
        
               fi

+3 -9

nixos/modules/services/networking/networkmanager.nix

···

       235
        
       

     

       236
        
           systemd.packages = cfg.packages;

     

       237
        
       

     

       238
       -
           # Create an initialisation service that both starts

     

       239
       -
           # NetworkManager when network.target is reached,

     

       240
       -
           # and sets up necessary directories for NM.

     

       241
       -
           systemd.services."networkmanager-init" = {

     

       242
       -
             description = "NetworkManager initialisation";

     

       243
        
             wantedBy = [ "network.target" ];

     

       244
       -
             wants = [ "network-manager.service" ];

     

       245
       -
             before = [ "network-manager.service" ];

     

       246
       -
             script = ''

     

       247
        
               mkdir -m 700 -p /etc/NetworkManager/system-connections

     

       248
        
               mkdir -m 755 -p ${stateDirs}

     

       249
        
             '';

     

       250
       -
             serviceConfig.Type = "oneshot";

     

       251
        
           };

     

       252
        
       

     

       253
        
           # Turn off NixOS' network management

···

       235
        
       

     

       236
        
           systemd.packages = cfg.packages;

     

       237
        
       

     

       238
       +
           systemd.services."network-manager" = {

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       239
        
             wantedBy = [ "network.target" ];

     

       240
       +
       

     

       241
       +
             preStart = ''

     

       0
        
       
     

       242
        
               mkdir -m 700 -p /etc/NetworkManager/system-connections

     

       243
        
               mkdir -m 755 -p ${stateDirs}

     

       244
        
             '';

     

       0
        
       
     

       245
        
           };

     

       246
        
       

     

       247
        
           # Turn off NixOS' network management

+1 -1

nixos/modules/services/web-servers/phpfpm/default.nix

···

       105
        
           };

     

       106
        
         };

     

       107
        
       

     

       108
       -
         config = mkIf (cfg.pools != {}) {

     

       109
        
       

     

       110
        
           systemd.services.phpfpm = {

     

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

···

       105
        
           };

     

       106
        
         };

     

       107
        
       

     

       108
       +
         config = mkIf (cfg.pools != {} || cfg.poolConfigs != {}) {

     

       109
        
       

     

       110
        
           systemd.services.phpfpm = {

     

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

+2 -2

nixos/tests/ecryptfs.nix

···

       30
        
           $machine->sleep(2);

     

       31
        
       

     

       32
        
           # Why do I need to do this??

     

       33
       -
           $machine->succeed("su alice -c ecryptfs-umount-private");

     

       34
        
           $machine->sleep(1);

     

       35
        
           $machine->fail("mount | grep ecryptfs"); # check that encrypted home is not mounted

     

       36
        
       

     
···

       53
        
           $machine->sleep(2);

     

       54
        
       

     

       55
        
           # Why do I need to do this??

     

       56
       -
           $machine->succeed("su alice -c ecryptfs-umount-private");

     

       57
        
           $machine->sleep(1);

     

       58
        
       

     

       59
        
           # Check that the filesystem is not accessible

···

       30
        
           $machine->sleep(2);

     

       31
        
       

     

       32
        
           # Why do I need to do this??

     

       33
       +
           $machine->succeed("su alice -c ecryptfs-umount-private || true");

     

       34
        
           $machine->sleep(1);

     

       35
        
           $machine->fail("mount | grep ecryptfs"); # check that encrypted home is not mounted

     

       36
        
       

     
···

       53
        
           $machine->sleep(2);

     

       54
        
       

     

       55
        
           # Why do I need to do this??

     

       56
       +
           $machine->succeed("su alice -c ecryptfs-umount-private || true");

     

       57
        
           $machine->sleep(1);

     

       58
        
       

     

       59
        
           # Check that the filesystem is not accessible

+12 -10

pkgs/applications/audio/guitarix/default.nix

···

       1
        
       { stdenv, fetchurl, gettext, intltool, pkgconfig, python

     

       2
       -
       , avahi, bluez, boost, eigen, fftw, glib, glibmm, gtk, gtkmm, libjack2

     

       0
        
       
     

       3
        
       , ladspaH, librdf, libsndfile, lilv, lv2, serd, sord, sratom

     

       4
       -
       , webkitgtk2, zita-convolver, zita-resampler

     

       5
        
       , optimizationSupport ? false # Enable support for native CPU extensions

     

       6
        
       }:

     

       7
        
       

     
···

       11
        
       

     

       12
        
       stdenv.mkDerivation rec {

     

       13
        
         name = "guitarix-${version}";

     

       14
       -
         version = "0.34.0";

     

       15
        
       

     

       16
        
         src = fetchurl {

     

       17
       -
           url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.bz2";

     

       18
       -
           sha256 = "0pamaq8iybsaglq6y1m1rlmz4wgbs2r6m24bj7x4fwg4grjvzjl8";

     

       19
        
         };

     

       20
        
       

     

       21
       -
         nativeBuildInputs = [ gettext intltool pkgconfig python ];

     

       22
        
       

     

       23
        
         buildInputs = [

     

       24
       -
           avahi bluez boost eigen fftw glib glibmm gtk gtkmm libjack2

     

       25
       -
           ladspaH librdf libsndfile lilv lv2 serd sord sratom

     

       26
       -
           webkitgtk2 zita-convolver zita-resampler

     

       0
        
       
     

       27
        
         ];

     

       28
        
       

     

       29
        
         configureFlags = [

     
···

       39
        
       

     

       40
        
         installPhase = ''python waf install'';

     

       41
        
       

     

       42
       -
         meta = with stdenv.lib; { 

     

       43
        
           description = "A virtual guitar amplifier for Linux running with JACK";

     

       44
        
           longDescription = ''

     

       45
        
               guitarix is a virtual guitar amplifier for Linux running with

···

       1
        
       { stdenv, fetchurl, gettext, intltool, pkgconfig, python

     

       2
       +
       , avahi, bluez, boost, eigen, fftw, glib, glib_networking

     

       3
       +
       , glibmm, gsettings_desktop_schemas, gtk, gtkmm, libjack2

     

       4
        
       , ladspaH, librdf, libsndfile, lilv, lv2, serd, sord, sratom

     

       5
       +
       , webkitgtk2, wrapGAppsHook, zita-convolver, zita-resampler

     

       6
        
       , optimizationSupport ? false # Enable support for native CPU extensions

     

       7
        
       }:

     

       8
        
       

     
···

       12
        
       

     

       13
        
       stdenv.mkDerivation rec {

     

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

     

       15
       +
         version = "0.35.1";

     

       16
        
       

     

       17
        
         src = fetchurl {

     

       18
       +
           url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.xz";

     

       19
       +
           sha256 = "066qva1zk63qw60s0vbi9g9jh22ljw67p91pk82kv11gw24h3vg6";

     

       20
        
         };

     

       21
        
       

     

       22
       +
         nativeBuildInputs = [ gettext intltool wrapGAppsHook pkgconfig python ];

     

       23
        
       

     

       24
        
         buildInputs = [

     

       25
       +
           avahi bluez boost eigen fftw glib glibmm glib_networking.out

     

       26
       +
           gsettings_desktop_schemas gtk gtkmm libjack2 ladspaH librdf

     

       27
       +
           libsndfile lilv lv2 serd sord sratom webkitgtk2 zita-convolver

     

       28
       +
           zita-resampler

     

       29
        
         ];

     

       30
        
       

     

       31
        
         configureFlags = [

     
···

       41
        
       

     

       42
        
         installPhase = ''python waf install'';

     

       43
        
       

     

       44
       +
         meta = with stdenv.lib; {

     

       45
        
           description = "A virtual guitar amplifier for Linux running with JACK";

     

       46
        
           longDescription = ''

     

       47
        
               guitarix is a virtual guitar amplifier for Linux running with

+10 -8

pkgs/applications/audio/morituri/default.nix

···

       1
       -
       { stdenv, fetchgit, python, pythonPackages, cdparanoia, cdrdao

     

       2
       -
       , pygobject, gst_python, gst_plugins_base, gst_plugins_good

     

       3
       -
       , setuptools, utillinux, makeWrapper, substituteAll, autoreconfHook }:

     

       4
        
       

     

       5
       -
       stdenv.mkDerivation rec {

     

       0
        
       
     

       0
        
       
     

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

     

       7
        
         version = "0.2.3.20151109";

     

       8
        
         namePrefix = "";

     
···

       14
        
           sha256 = "1sl5y5j3gdbynf2v0gf9dwd2hzawj8lm8ywadid7qm34yn8lx12k";

     

       15
        
         };

     

       16
        
       

     

       17
       -
         pythonPath = [

     

       18
       -
           pygobject gst_python pythonPackages.musicbrainzngs

     

       19
       -
           pythonPackages.pycdio pythonPackages.pyxdg setuptools

     

       20
       -
           pythonPackages.CDDB

     

       21
        
         ];

     

       22
        
       

     

       23
        
         nativeBuildInputs = [ autoreconfHook ];

···

       1
       +
       { stdenv, fetchgit, pythonPackages, cdparanoia, cdrdao

     

       2
       +
       , gst_python, gst_plugins_base, gst_plugins_good

     

       3
       +
       , utillinux, makeWrapper, substituteAll, autoreconfHook }:

     

       4
        
       

     

       5
       +
       let

     

       6
       +
         inherit (pythonPackages) python;

     

       7
       +
       in stdenv.mkDerivation rec {

     

       8
        
         name = "morituri-${version}";

     

       9
        
         version = "0.2.3.20151109";

     

       10
        
         namePrefix = "";

     
···

       16
        
           sha256 = "1sl5y5j3gdbynf2v0gf9dwd2hzawj8lm8ywadid7qm34yn8lx12k";

     

       17
        
         };

     

       18
        
       

     

       19
       +
         pythonPath = with pythonPackages; [

     

       20
       +
           pygobject gst_python musicbrainzngs

     

       21
       +
           pycdio pyxdg setuptools

     

       22
       +
           CDDB

     

       23
        
         ];

     

       24
        
       

     

       25
        
         nativeBuildInputs = [ autoreconfHook ];

+6 -6

pkgs/applications/audio/picard/default.nix

···

       1
       -
       { stdenv, buildPythonApplication, fetchurl, gettext

     

       2
        
       , pkgconfig, libofa, ffmpeg, chromaprint

     

       3
       -
       , pyqt4, mutagen, python-libdiscid

     

       4
        
       }:

     

       5
        
       

     

       6
       -
       let version = "1.3.2"; in

     

       7
       -
       buildPythonApplication {

     

       0
        
       
     

       8
        
         name = "picard-${version}";

     

       9
        
         namePrefix = "";

     

       10
        
       

     
···

       20
        
           gettext

     

       21
        
         ];

     

       22
        
       

     

       23
       -
         propagatedBuildInputs = [

     

       24
        
           pyqt4

     

       25
        
           mutagen

     

       26
       -
           python-libdiscid

     

       27
        
         ];

     

       28
        
       

     

       29
        
         installPhase = ''

···

       1
       +
       { stdenv, pythonPackages, fetchurl, gettext

     

       2
        
       , pkgconfig, libofa, ffmpeg, chromaprint

     

       0
        
       
     

       3
        
       }:

     

       4
        
       

     

       5
       +
       let

     

       6
       +
         version = "1.3.2";

     

       7
       +
       in pythonPackages.buildPythonApplication {

     

       8
        
         name = "picard-${version}";

     

       9
        
         namePrefix = "";

     

       10
        
       

     
···

       20
        
           gettext

     

       21
        
         ];

     

       22
        
       

     

       23
       +
         propagatedBuildInputs = with pythonPackages; [

     

       24
        
           pyqt4

     

       25
        
           mutagen

     

       26
       +
           discid

     

       27
        
         ];

     

       28
        
       

     

       29
        
         installPhase = ''

+2 -2

pkgs/applications/editors/nano/default.nix

···

       12
        
       

     

       13
        
       stdenv.mkDerivation rec {

     

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

     

       15
       -
         version = "2.6.2";

     

       16
        
         src = fetchurl {

     

       17
        
           url = "https://nano-editor.org/dist/v2.6/${name}.tar.gz";

     

       18
       -
           sha256 = "11c9iqiah4q7q3ndn7z9192a796vp4fffkg27s6q1dn8avp06dj5";

     

       19
        
         };

     

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

     

       21
        
         buildInputs = [ ncurses ];

···

       12
        
       

     

       13
        
       stdenv.mkDerivation rec {

     

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

     

       15
       +
         version = "2.6.3";

     

       16
        
         src = fetchurl {

     

       17
        
           url = "https://nano-editor.org/dist/v2.6/${name}.tar.gz";

     

       18
       +
           sha256 = "00ym3zws1vdds726drgr5wj14mjn18d96ghn6vjci0915zhm8h2g";

     

       19
        
         };

     

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

     

       21
        
         buildInputs = [ ncurses ];

+3 -3

pkgs/applications/graphics/screencloud/default.nix

···

       1
       -
       { stdenv, fetchurl, fetchFromGitHub, cmake, qt4, quazip, qt-mobility, qxt, python, pycrypto, glib }:

     

       2
        
       

     

       3
        
       with stdenv.lib;

     

       4
        
       stdenv.mkDerivation rec {

     
···

       17
        
           sha256 = "1s0dxa1sa37nvna5nfqdsp294810favj68qb7ghl78qna7zw0cim";

     

       18
        
         };

     

       19
        
       

     

       20
       -
         buildInputs = [ cmake qt4 quazip qt-mobility qxt python pycrypto ];

     

       21
        
       

     

       22
        
         patchPhase = ''

     

       23
        
           # Required to make the configure script work. Normally, screencloud's

     
···

       58
        
         postInstall = ''

     

       59
        
           patchShebangs $prefix/opt/screencloud/screencloud.sh

     

       60
        
           substituteInPlace "$prefix/opt/screencloud/screencloud.sh" --replace "/opt" "$prefix/opt"

     

       61
       -
           sed -i "2 i\export PYTHONPATH=$(toPythonPath ${pycrypto}):\$PYTHONPATH" "$prefix/opt/screencloud/screencloud.sh"

     

       62
        
           mkdir $prefix/bin

     

       63
        
           mkdir $prefix/lib

     

       64
        
           ln -s $prefix/opt/screencloud/screencloud.sh $prefix/bin/screencloud

···

       1
       +
       { stdenv, fetchurl, fetchFromGitHub, cmake, qt4, quazip, qt-mobility, qxt, pythonPackages, glib }:

     

       2
        
       

     

       3
        
       with stdenv.lib;

     

       4
        
       stdenv.mkDerivation rec {

     
···

       17
        
           sha256 = "1s0dxa1sa37nvna5nfqdsp294810favj68qb7ghl78qna7zw0cim";

     

       18
        
         };

     

       19
        
       

     

       20
       +
         buildInputs = [ cmake qt4 quazip qt-mobility qxt pythonPackages.python pythonPackages.pycrypto ];

     

       21
        
       

     

       22
        
         patchPhase = ''

     

       23
        
           # Required to make the configure script work. Normally, screencloud's

     
···

       58
        
         postInstall = ''

     

       59
        
           patchShebangs $prefix/opt/screencloud/screencloud.sh

     

       60
        
           substituteInPlace "$prefix/opt/screencloud/screencloud.sh" --replace "/opt" "$prefix/opt"

     

       61
       +
           sed -i "2 i\export PYTHONPATH=$(toPythonPath ${pythonPackages.pycrypto}):\$PYTHONPATH" "$prefix/opt/screencloud/screencloud.sh"

     

       62
        
           mkdir $prefix/bin

     

       63
        
           mkdir $prefix/lib

     

       64
        
           ln -s $prefix/opt/screencloud/screencloud.sh $prefix/bin/screencloud

+3 -2

pkgs/applications/graphics/yed/default.nix

···

       1
        
       { stdenv, fetchurl, requireFile, makeWrapper, unzip, jre }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
       -
         name = "yEd-3.15.0.2";

     

       0
        
       
     

       5
        
       

     

       6
        
         src = requireFile {

     

       7
        
           name = "${name}.zip";

     

       8
        
           url = "https://www.yworks.com/en/products/yfiles/yed/";

     

       9
       -
           sha256 = "c60e4868f267303ee8b6fc2587beb4cc846f32bd8a6a557b77e01f0d8039aa4d";

     

       10
        
         };

     

       11
        
       

     

       12
        
         nativeBuildInputs = [ unzip makeWrapper ];

···

       1
        
       { stdenv, fetchurl, requireFile, makeWrapper, unzip, jre }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

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

     

       5
       +
         version = "3.16.1";

     

       6
        
       

     

       7
        
         src = requireFile {

     

       8
        
           name = "${name}.zip";

     

       9
        
           url = "https://www.yworks.com/en/products/yfiles/yed/";

     

       10
       +
           sha256 = "0h7ykcpvsikjfap51hpcz6z814riiwyps585j2i1yv9dmsbqdi7j";

     

       11
        
         };

     

       12
        
       

     

       13
        
         nativeBuildInputs = [ unzip makeWrapper ];

+2 -1

pkgs/applications/misc/dmenu/default.nix

···

       13
        
         inherit patches;

     

       14
        
       

     

       15
        
         postPatch = ''

     

       16
       -
           sed -ri -e 's!\<(dmenu|stest)\>!'"$out/bin"'/&!g' dmenu_run

     

       0
        
       
     

       17
        
         '';

     

       18
        
       

     

       19
        
         preConfigure = ''

···

       13
        
         inherit patches;

     

       14
        
       

     

       15
        
         postPatch = ''

     

       16
       +
           sed -ri -e 's!\<(dmenu|dmenu_path|stest)\>!'"$out/bin"'/&!g' dmenu_run

     

       17
       +
           sed -ri -e 's!\<stest\>!'"$out/bin"'/&!g' dmenu_path

     

       18
        
         '';

     

       19
        
       

     

       20
        
         preConfigure = ''

+5 -4

pkgs/applications/misc/gramps/default.nix

···

       1
       -
       { stdenv, fetchurl, gtk3, pythonPackages, python, pycairo, pygobject3, intltool,

     

       2
        
         pango, gsettings_desktop_schemas }:

     

       3
        
       

     

       4
       -
       pythonPackages.buildPythonApplication rec {

     

       0
        
       
     

       0
        
       
     

       5
        
         version = "4.1.1";

     

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

     

       7
       -
         namePrefix = "";

     

       8
        
       

     

       9
        
         buildInputs = [ intltool gtk3 ];

     

       10
        
       

     
···

       16
        
           sha256 = "0jdps7yx2mlma1hdj64wssvnqd824xdvw0bmn2dnal5fn3h7h060";

     

       17
        
         };

     

       18
        
       

     

       19
       -
         pythonPath = [ pygobject3 pango pycairo pythonPackages.bsddb ];

     

       20
        
       

     

       21
        
         # Same installPhase as in buildPythonApplication but without --old-and-unmanageble

     

       22
        
         # install flag.

···

       1
       +
       { stdenv, fetchurl, gtk3, pythonPackages, intltool,

     

       2
        
         pango, gsettings_desktop_schemas }:

     

       3
        
       

     

       4
       +
       let

     

       5
       +
         inherit (pythonPackages) python buildPythonApplication;

     

       6
       +
       in buildPythonApplication rec {

     

       7
        
         version = "4.1.1";

     

       8
        
         name = "gramps-${version}";

     

       0
        
       
     

       9
        
       

     

       10
        
         buildInputs = [ intltool gtk3 ];

     

       11
        
       

     
···

       17
        
           sha256 = "0jdps7yx2mlma1hdj64wssvnqd824xdvw0bmn2dnal5fn3h7h060";

     

       18
        
         };

     

       19
        
       

     

       20
       +
         pythonPath = with pythonPackages; [ pygobject3 pycairo bsddb ] ++ [ pango ];

     

       21
        
       

     

       22
        
         # Same installPhase as in buildPythonApplication but without --old-and-unmanageble

     

       23
        
         # install flag.

+5 -2

pkgs/applications/misc/mysql-workbench/default.nix

···

       3
        
       , libctemplate, libglade

     

       4
        
       , libiodbc

     

       5
        
       , libgnome, libsigcxx, libuuid, libxml2, libzip, lua, mesa, mysql

     

       6
       -
       , pango, paramiko, pcre, pexpect, pkgconfig, pycrypto, python, sqlite, sudo

     

       0
        
       
     

       7
        
       }:

     

       8
        
       

     

       9
       -
       stdenv.mkDerivation rec {

     

       0
        
       
     

       0
        
       
     

       10
        
         pname = "mysql-workbench";

     

       11
        
         version = "5.2.47";

     

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

···

       3
        
       , libctemplate, libglade

     

       4
        
       , libiodbc

     

       5
        
       , libgnome, libsigcxx, libuuid, libxml2, libzip, lua, mesa, mysql

     

       6
       +
       , pango, pcre, pkgconfig, sqlite, sudo

     

       7
       +
       , pythonPackages

     

       8
        
       }:

     

       9
        
       

     

       10
       +
       let

     

       11
       +
         inherit (pythonPackages) pexpect pycrypto python paramiko;

     

       12
       +
       in stdenv.mkDerivation rec {

     

       13
        
         pname = "mysql-workbench";

     

       14
        
         version = "5.2.47";

     

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

-113

pkgs/applications/misc/octoprint/0001-Don-t-use-static-library.patch

···

       1
       -
       From 0be3198cccf753226758684955f49a32d8d920c0 Mon Sep 17 00:00:00 2001

     

       2
       -
       From: Nikolay Amiantov <ab@fmap.me>

     

       3
       -
       Date: Wed, 17 Feb 2016 14:37:31 +0300

     

       4
       -
       Subject: [PATCH] Don't use static library

     

       5
       -
       

     

       6
       -
       ---

     

       7
       -
        octoprint_m3dfio/__init__.py   | 67 +-----------------------------------------

     

       8
       -
        shared library source/Makefile |  6 ++--

     

       9
       -
        2 files changed, 5 insertions(+), 68 deletions(-)

     

       10
       -
       

     

       11
       -
       diff --git a/octoprint_m3dfio/__init__.py b/octoprint_m3dfio/__init__.py

     

       12
       -
       index a2ca533..43f178a 100644

     

       13
       -
       --- a/octoprint_m3dfio/__init__.py

     

       14
       -
       +++ b/octoprint_m3dfio/__init__.py

     

       15
       -
       @@ -793,72 +793,7 @@ class M3DFioPlugin(

     

       16
       -
        		# Set file locations

     

       17
       -
        		self.setFileLocations()

     

       18
       -
        		

     

       19
       -
       -		# Check if running on Linux

     

       20
       -
       -		if platform.uname()[0].startswith("Linux") :

     

       21
       -
       -		

     

       22
       -
       -			# Check if running on a Raspberry Pi 1

     

       23
       -
       -			if platform.uname()[4].startswith("armv6l") and self.getCpuHardware() == "BCM2708" :

     

       24
       -
       -			

     

       25
       -
       -				# Set shared library

     

       26
       -
       -				self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_arm1176jzf-s.so")

     

       27
       -
       -			

     

       28
       -
       -			# Otherwise check if running on a Raspberry Pi 2 or Raspberry Pi 3

     

       29
       -
       -			elif platform.uname()[4].startswith("armv7l") and self.getCpuHardware() == "BCM2709" :

     

       30
       -
       -			

     

       31
       -
       -				# Set shared library

     

       32
       -
       -				self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_arm_cortex-a7.so")

     

       33
       -
       -			

     

       34
       -
       -			# Otherwise check if running on an ARM7 device

     

       35
       -
       -			elif platform.uname()[4].startswith("armv7") :

     

       36
       -
       -			

     

       37
       -
       -				# Set shared library

     

       38
       -
       -				self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_arm7.so")

     

       39
       -
       -			

     

       40
       -
       -			# Otherwise check if using an i386 or x86-64 device

     

       41
       -
       -			elif platform.uname()[4].endswith("86") or platform.uname()[4].endswith("64") :

     

       42
       -
       -		

     

       43
       -
       -				# Check if Python is running as 32-bit

     

       44
       -
       -				if platform.architecture()[0].startswith("32") :

     

       45
       -
       -				

     

       46
       -
       -					# Set shared library

     

       47
       -
       -					self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_i386.so")

     

       48
       -
       -			

     

       49
       -
       -				# Otherwise check if Python is running as 64-bit

     

       50
       -
       -				elif platform.architecture()[0].startswith("64") :

     

       51
       -
       -				

     

       52
       -
       -					# Set shared library

     

       53
       -
       -					self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_x86-64.so")

     

       54
       -
       -		

     

       55
       -
       -		# Otherwise check if running on Windows and using an i386 or x86-64 device

     

       56
       -
       -		elif platform.uname()[0].startswith("Windows") and (platform.uname()[4].endswith("86") or platform.uname()[4].endswith("64")) :

     

       57
       -
       -		

     

       58
       -
       -			# Check if Python is running as 32-bit

     

       59
       -
       -			if platform.architecture()[0].startswith("32") :

     

       60
       -
       -			

     

       61
       -
       -				# Set shared library

     

       62
       -
       -				self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_i386.dll")

     

       63
       -
       -		

     

       64
       -
       -			# Otherwise check if Python is running as 64-bit

     

       65
       -
       -			elif platform.architecture()[0].startswith("64") :

     

       66
       -
       -			

     

       67
       -
       -				# Set shared library

     

       68
       -
       -				self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_x86-64.dll")

     

       69
       -
       -		

     

       70
       -
       -		# Otherwise check if running on OS X and using an i386 or x86-64 device

     

       71
       -
       -		elif platform.uname()[0].startswith("Darwin") and (platform.uname()[4].endswith("86") or platform.uname()[4].endswith("64")) :

     

       72
       -
       -		

     

       73
       -
       -			# Check if Python is running as 32-bit

     

       74
       -
       -			if platform.architecture()[0].startswith("32") :

     

       75
       -
       -			

     

       76
       -
       -				# Set shared library

     

       77
       -
       -				self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_i386.dylib")

     

       78
       -
       -		

     

       79
       -
       -			# Otherwise check if Python is running as 64-bit

     

       80
       -
       -			elif platform.architecture()[0].startswith("64") :

     

       81
       -
       -			

     

       82
       -
       -				# Set shared library

     

       83
       -
       -				self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_x86-64.dylib")

     

       84
       -
       -		

     

       85
       -
       +		self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/../../../libpreprocessor.so")

     

       86
       -
        		# Check if shared library was set

     

       87
       -
        		if self.sharedLibrary :

     

       88
       -
        		

     

       89
       -
       diff --git a/shared library source/Makefile b/shared library source/Makefile

     

       90
       -
       index 9d015a1..a24f134 100644

     

       91
       -
       --- a/shared library source/Makefile	

     

       92
       -
       +++ b/shared library source/Makefile	

     

       93
       -
       @@ -58,13 +58,15 @@ ifeq ($(TARGET_PLATFORM), OSX64)

     

       94
       -
        	CFLAGS = -fPIC -m64 -stdlib=libc++ -O3 -Wl,-install_name,$(PROG)$(VER)

     

       95
       -
        endif

     

       96
       -
        

     

       97
       -
       +PROG = lib$(LIBRARY_NAME).so

     

       98
       -
       +CC = g++

     

       99
       -
        SRCS = preprocessor.cpp gcode.cpp vector.cpp

     

       100
       -
       -CFLAGS += -Wall -std=c++11 -fvisibility=hidden -shared

     

       101
       -
       +CFLAGS = -O3 -fPIC -Wall -std=c++11 -fvisibility=hidden -shared

     

       102
       -
        

     

       103
       -
        all: $(PROG)

     

       104
       -
        

     

       105
       -
        $(PROG):   $(SRCS)

     

       106
       -
       -	$(CC) $(CFLAGS) -o ../octoprint_m3dfio/static/libraries/$(PROG) $(SRCS)

     

       107
       -
       +	$(CC) $(CFLAGS) -o $(PROG) $(SRCS)

     

       108
       -
        

     

       109
       -
        clean:

     

       110
       -
        	rm -f ../octoprint_m3dfio/static/libraries/$(PROG)

     

       111
       -
       -- 

     

       112
       -
       2.7.1

     

       113
       -

+19 -16

pkgs/applications/misc/octoprint/default.nix

···

       2
        
       

     

       3
        
       pythonPackages.buildPythonApplication rec {

     

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

     

       5
       -
         version = "1.2.10";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "foosel";

     

       9
        
           repo = "OctoPrint";

     

       10
        
           rev = version;

     

       11
       -
           sha256 = "1ips1083c4qrfnkssvp1lxrs92svlid29l225ifsymrinpbjawav";

     

       12
        
         };

     

       13
        
       

     

       14
        
         # We need old Tornado

     

       15
        
         propagatedBuildInputs = with pythonPackages; [

     

       16
       -
           awesome-slugify flask_assets watchdog rsa requests2 pkginfo pylru

     

       17
       -
           semantic-version flask_principal sarge tornado_4_0_1 werkzeug netaddr flaskbabel

     

       18
       -
           netifaces psutil pyserial flask_login pyyaml sockjs-tornado

     

       0
        
       
     

       19
        
         ];

     

       20
        
       

     

       0
        
       
     

       0
        
       
     

       21
        
         postPatch = ''

     

       22
       -
           # Jailbreak dependencies

     

       23
        
           sed -i \

     

       24
       -
             -e 's,rsa==,rsa>=,g' \

     

       25
       -
             -e 's,sockjs-tornado==,sockjs-tornado>=,g' \

     

       26
       -
             -e 's,Flask-Principal==,Flask-Principal>=,g' \

     

       27
       -
             -e 's,werkzeug==,werkzeug>=,g' \

     

       28
       -
             -e 's,netaddr==,netaddr>=,g' \

     

       29
       -
             -e 's,requests==,requests>=,g' \

     

       30
       -
             -e 's,netifaces==,netifaces>=,g' \

     

       31
       -
             -e 's,psutil==,psutil>=,g' \

     

       32
       -
             -e 's,PyYAML==,PyYAML>=,g' \

     

       0
        
       
     

       0
        
       
     

       33
        
             setup.py

     

       34
        
         '';

     

       35
        
       

     

       36
        
         meta = with stdenv.lib; {

     

       37
        
           homepage = "http://octoprint.org/";

     

       38
        
           description = "The snappy web interface for your 3D printer";

     

       39
       -
           platforms = platforms.all;

     

       40
        
           license = licenses.agpl3;

     

       41
        
           maintainers = with maintainers; [ abbradar ];

     

       42
        
         };

···

       2
        
       

     

       3
        
       pythonPackages.buildPythonApplication rec {

     

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

     

       5
       +
         version = "1.2.15";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "foosel";

     

       9
        
           repo = "OctoPrint";

     

       10
        
           rev = version;

     

       11
       +
           sha256 = "0qfragp7n8m7l5l30s5fz1x7xzini2sdh2y3m1ahs7ay8zp4xk56";

     

       12
        
         };

     

       13
        
       

     

       14
        
         # We need old Tornado

     

       15
        
         propagatedBuildInputs = with pythonPackages; [

     

       16
       +
           awesome-slugify flask_assets rsa requests2 pkginfo watchdog

     

       17
       +
           semantic-version flask_principal werkzeug flaskbabel tornado_4_0_1

     

       18
       +
           psutil pyserial flask_login netaddr markdown sockjs-tornado

     

       19
       +
           pylru pyyaml sarge feedparser netifaces

     

       20
        
         ];

     

       21
        
       

     

       22
       +
         # Jailbreak dependencies.

     

       23
       +
         # Currently broken for new: tornado, pyserial, flask_login

     

       24
        
         postPatch = ''

     

       0
        
       
     

       25
        
           sed -i \

     

       26
       +
             -e 's,werkzeug>=[^"]*,werkzeug,g' \

     

       27
       +
             -e 's,requests>=[^"]*,requests,g' \

     

       28
       +
             -e 's,pkginfo>=[^"]*,pkginfo,g' \

     

       29
       +
             -e 's,semantic_version>=[^"]*,semantic_version,g' \

     

       30
       +
             -e 's,psutil>=[^"]*,psutil,g' \

     

       31
       +
             -e 's,Flask-Babel>=[^"]*,Flask-Babel,g' \

     

       32
       +
             -e 's,Flask-Principal>=[^"]*,Flask-Principal,g' \

     

       33
       +
             -e 's,markdown>=[^"]*,markdown,g' \

     

       34
       +
             -e 's,Flask-Assets>=[^"]*,Flask-Assets,g' \

     

       35
       +
             -e 's,rsa>=[^"]*,rsa,g' \

     

       36
       +
             -e 's,PyYAML>=[^"]*,PyYAML,g' \

     

       37
        
             setup.py

     

       38
        
         '';

     

       39
        
       

     

       40
        
         meta = with stdenv.lib; {

     

       41
        
           homepage = "http://octoprint.org/";

     

       42
        
           description = "The snappy web interface for your 3D printer";

     

       0
        
       
     

       43
        
           license = licenses.agpl3;

     

       44
        
           maintainers = with maintainers; [ abbradar ];

     

       45
        
         };

+161

pkgs/applications/misc/octoprint/m33-fio-one-library.patch

···

       1
       +
       From 62b4fabd1d4ee7a584a565d48c7eaec6e80fe0bd Mon Sep 17 00:00:00 2001

     

       2
       +
       From: Nikolay Amiantov <ab@fmap.me>

     

       3
       +
       Date: Fri, 12 Aug 2016 23:41:22 +0300

     

       4
       +
       Subject: [PATCH] Build and use one version of preprocessor library

     

       5
       +
       

     

       6
       +
       ---

     

       7
       +
        octoprint_m33fio/__init__.py   | 66 +-----------------------------------------

     

       8
       +
        shared library source/Makefile | 59 +++----------------------------------

     

       9
       +
        2 files changed, 5 insertions(+), 120 deletions(-)

     

       10
       +
       

     

       11
       +
       diff --git a/octoprint_m33fio/__init__.py b/octoprint_m33fio/__init__.py

     

       12
       +
       index da539f5..b0a17ad 100755

     

       13
       +
       --- a/octoprint_m33fio/__init__.py

     

       14
       +
       +++ b/octoprint_m33fio/__init__.py

     

       15
       +
       @@ -979,71 +979,7 @@ class M33FioPlugin(

     

       16
       +
        		# Check if using shared library or checking if it is usable

     

       17
       +
        		if self._settings.get_boolean(["UseSharedLibrary"]) or isUsable :

     

       18
       +
        	

     

       19
       +
       -			# Check if running on Linux

     

       20
       +
       -			if platform.uname()[0].startswith("Linux") :

     

       21
       +
       -

     

       22
       +
       -				# Check if running on a Raspberry Pi 1

     

       23
       +
       -				if platform.uname()[4].startswith("armv6l") and self.getCpuHardware() == "BCM2708" :

     

       24
       +
       -	

     

       25
       +
       -					# Set shared library

     

       26
       +
       -					self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_arm1176jzf-s.so")

     

       27
       +
       -	

     

       28
       +
       -				# Otherwise check if running on a Raspberry Pi 2 or Raspberry Pi 3

     

       29
       +
       -				elif platform.uname()[4].startswith("armv7l") and self.getCpuHardware() == "BCM2709" :

     

       30
       +
       -	

     

       31
       +
       -					# Set shared library

     

       32
       +
       -					self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_arm_cortex-a7.so")

     

       33
       +
       -	

     

       34
       +
       -				# Otherwise check if running on an ARM7 device

     

       35
       +
       -				elif platform.uname()[4].startswith("armv7") :

     

       36
       +
       -	

     

       37
       +
       -					# Set shared library

     

       38
       +
       -					self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_arm7.so")

     

       39
       +
       -	

     

       40
       +
       -				# Otherwise check if using an i386 or x86-64 device

     

       41
       +
       -				elif platform.uname()[4].endswith("86") or platform.uname()[4].endswith("64") :

     

       42
       +
       -

     

       43
       +
       -					# Check if Python is running as 32-bit

     

       44
       +
       -					if platform.architecture()[0].startswith("32") :

     

       45
       +
       -		

     

       46
       +
       -						# Set shared library

     

       47
       +
       -						self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_i386.so")

     

       48
       +
       -	

     

       49
       +
       -					# Otherwise check if Python is running as 64-bit

     

       50
       +
       -					elif platform.architecture()[0].startswith("64") :

     

       51
       +
       -		

     

       52
       +
       -						# Set shared library

     

       53
       +
       -						self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_x86-64.so")

     

       54
       +
       -

     

       55
       +
       -			# Otherwise check if running on Windows and using an i386 or x86-64 device

     

       56
       +
       -			elif platform.uname()[0].startswith("Windows") and (platform.uname()[4].endswith("86") or platform.uname()[4].endswith("64")) :

     

       57
       +
       -

     

       58
       +
       -				# Check if Python is running as 32-bit

     

       59
       +
       -				if platform.architecture()[0].startswith("32") :

     

       60
       +
       -	

     

       61
       +
       -					# Set shared library

     

       62
       +
       -					self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_i386.dll")

     

       63
       +
       -

     

       64
       +
       -				# Otherwise check if Python is running as 64-bit

     

       65
       +
       -				elif platform.architecture()[0].startswith("64") :

     

       66
       +
       -	

     

       67
       +
       -					# Set shared library

     

       68
       +
       -					self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_x86-64.dll")

     

       69
       +
       -

     

       70
       +
       -			# Otherwise check if running on OS X and using an i386 or x86-64 device

     

       71
       +
       -			elif platform.uname()[0].startswith("Darwin") and (platform.uname()[4].endswith("86") or platform.uname()[4].endswith("64")) :

     

       72
       +
       -

     

       73
       +
       -				# Check if Python is running as 32-bit

     

       74
       +
       -				if platform.architecture()[0].startswith("32") :

     

       75
       +
       -	

     

       76
       +
       -					# Set shared library

     

       77
       +
       -					self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_i386.dylib")

     

       78
       +
       -

     

       79
       +
       -				# Otherwise check if Python is running as 64-bit

     

       80
       +
       -				elif platform.architecture()[0].startswith("64") :

     

       81
       +
       -	

     

       82
       +
       -					# Set shared library

     

       83
       +
       -					self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_x86-64.dylib")

     

       84
       +
       +			self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/libpreprocessor.so")

     

       85
       +
        

     

       86
       +
        			# Check if shared library was set

     

       87
       +
        			if self.sharedLibrary :

     

       88
       +
       diff --git a/shared library source/Makefile b/shared library source/Makefile

     

       89
       +
       index a43d657..0b254aa 100755

     

       90
       +
       --- a/shared library source/Makefile	

     

       91
       +
       +++ b/shared library source/Makefile	

     

       92
       +
       @@ -1,62 +1,11 @@

     

       93
       +
        # Target platform options: LINUX32, LINUX64, WINDOWS32, WINDOWS64, PI, PI2, ARM7, OSX32, OSX64

     

       94
       +
       -LIBRARY_NAME = preprocessor

     

       95
       +
       +LIBRARY_NAME = libpreprocessor

     

       96
       +
        TARGET_PLATFORM = LINUX64

     

       97
       +
        VER = .1

     

       98
       +
        

     

       99
       +
       -ifeq ($(TARGET_PLATFORM), LINUX32)

     

       100
       +
       -	PROG = $(LIBRARY_NAME)_i386.so

     

       101
       +
       -	CC = g++

     

       102
       +
       -	CFLAGS = -fPIC -m32 -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++

     

       103
       +
       -endif

     

       104
       +
       -

     

       105
       +
       -ifeq ($(TARGET_PLATFORM), LINUX64)

     

       106
       +
       -	PROG = $(LIBRARY_NAME)_x86-64.so

     

       107
       +
       -	CC = g++

     

       108
       +
       -	CFLAGS = -fPIC -m64 -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++

     

       109
       +
       -endif

     

       110
       +
       -

     

       111
       +
       -ifeq ($(TARGET_PLATFORM), WINDOWS32)

     

       112
       +
       -	PROG = $(LIBRARY_NAME)_i386.dll

     

       113
       +
       -	CC = i686-w64-mingw32-g++

     

       114
       +
       -	CFLAGS = -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++

     

       115
       +
       -endif

     

       116
       +
       -

     

       117
       +
       -ifeq ($(TARGET_PLATFORM), WINDOWS64)

     

       118
       +
       -	PROG = $(LIBRARY_NAME)_x86-64.dll

     

       119
       +
       -	CC = x86_64-w64-mingw32-g++

     

       120
       +
       -	CFLAGS = -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++

     

       121
       +
       -endif

     

       122
       +
       -

     

       123
       +
       -ifeq ($(TARGET_PLATFORM), PI)

     

       124
       +
       -	PROG = $(LIBRARY_NAME)_arm1176jzf-s.so

     

       125
       +
       -	CC = ~/tools/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf/bin/arm-linux-gnueabihf-g++

     

       126
       +
       -	CFLAGS = -fPIC -mcpu=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++

     

       127
       +
       -endif

     

       128
       +
       -

     

       129
       +
       -ifeq ($(TARGET_PLATFORM), PI2)

     

       130
       +
       -	PROG = $(LIBRARY_NAME)_arm_cortex-a7.so

     

       131
       +
       -	CC = ~/tools/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf/bin/arm-linux-gnueabihf-g++

     

       132
       +
       -	CFLAGS = -fPIC -mcpu=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++

     

       133
       +
       -endif

     

       134
       +
       -

     

       135
       +
       -ifeq ($(TARGET_PLATFORM), ARM7)

     

       136
       +
       -	PROG = $(LIBRARY_NAME)_arm7.so

     

       137
       +
       -	CC = ~/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/arm-linux-gnueabihf-g++

     

       138
       +
       -	CFLAGS = -fPIC -mcpu=generic-armv7-a -mfpu=vfp -mfloat-abi=hard -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++

     

       139
       +
       -endif

     

       140
       +
       -

     

       141
       +
       -ifeq ($(TARGET_PLATFORM), OSX32)

     

       142
       +
       -	PROG = $(LIBRARY_NAME)_i386.dylib

     

       143
       +
       -	CC = clang++

     

       144
       +
       -	CFLAGS = -fPIC -m32 -stdlib=libc++ -O3 -Wl,-install_name,$(PROG)$(VER)

     

       145
       +
       -

     

       146
       +
       -endif

     

       147
       +
       -

     

       148
       +
       -ifeq ($(TARGET_PLATFORM), OSX64)

     

       149
       +
       -	PROG = $(LIBRARY_NAME)_x86-64.dylib

     

       150
       +
       -	CC = clang++

     

       151
       +
       -	CFLAGS = -fPIC -m64 -stdlib=libc++ -O3 -Wl,-install_name,$(PROG)$(VER)

     

       152
       +
       -endif

     

       153
       +
       +PROG = $(LIBRARY_NAME).so

     

       154
       +
       +CC = g++

     

       155
       +
       +CFLAGS = -fPIC -O3 -Wl,-soname,$(PROG)$(VER)

     

       156
       +
        

     

       157
       +
        SRCS = preprocessor.cpp gcode.cpp vector.cpp

     

       158
       +
        CFLAGS += -Wall -std=c++11 -fvisibility=hidden -shared

     

       159
       +
       -- 

     

       160
       +
       2.9.2

     

       161
       +

+65 -60

pkgs/applications/misc/octoprint/plugins.nix

···

       4
        
         buildPlugin = args: pythonPackages.buildPythonApplication (args // {

     

       5
        
           buildInputs = (args.buildInputs or []) ++ [ octoprint ];

     

       6
        
         });

     

       7
       -
       in {

     

       8
        
       

     

       9
       -
         m3d-fio = buildPlugin rec {

     

       10
       -
           name = "M3D-Fio-${version}";

     

       11
       -
           version = "0.32";

     

       12
        
       

     

       13
       -
           src = fetchFromGitHub {

     

       14
       -
             owner = "donovan6000";

     

       15
       -
             repo = "M3D-Fio";

     

       16
       -
             rev = "V${version}";

     

       17
       -
             sha256 = "1s15nx6v56yjwd88b19fx0gk1l0abp76nz10yicspdn91fpr1sf4";

     

       18
       -
           };

     

       19
        
       

     

       20
       -
           patches = [

     

       21
       -
             ./0001-Don-t-use-static-library.patch

     

       22
       -
           ];

     

       23
        
       

     

       24
       -
           postInstall = ''

     

       25
       -
           (

     

       26
       -
             cd 'shared library source'

     

       27
       -
             make

     

       28
       -
             install -Dm755 libpreprocessor.so $out/lib/libpreprocessor.so

     

       29
       -
           )

     

       30
       -
           rm -rf $out/${pythonPackages.python.sitePackages}/octoprint_m3dfio/static/libraries

     

       31
       -
           '';

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       32
        
       

     

       33
       -
           meta = with stdenv.lib; {

     

       34
       -
             homepage = "https://github.com/donovan6000/M3D-Fio";

     

       35
       -
             description = "OctoPrint plugin for the Micro 3D printer";

     

       36
       -
             platforms = platforms.all;

     

       37
       -
             license = licenses.gpl3;

     

       38
       -
             maintainers = with maintainers; [ abbradar ];

     

       0
        
       
     

       39
        
           };

     

       40
       -
         };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       41
        
       

     

       42
       -
         titlestatus = buildPlugin rec {

     

       43
       -
           name = "OctoPrint-TitleStatus-${version}";

     

       44
       -
           version = "0.0.4";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       45
        
       

     

       46
       -
           src = fetchFromGitHub {

     

       47
       -
             owner = "MoonshineSG";

     

       48
       -
             repo = "OctoPrint-TitleStatus";

     

       49
       -
             rev = version;

     

       50
       -
             sha256 = "1l78xrabn5hcly2mgxwi17nwgnp2s6jxi9iy4wnw8k8icv74ag7k";

     

       0
        
       
     

       0
        
       
     

       51
        
           };

     

       52
        
       

     

       53
       -
           meta = with stdenv.lib; {

     

       54
       -
             homepage = https://github.com/MoonshineSG/OctoPrint-TitleStatus;

     

       55
       -
             description = "Show printers status in window title";

     

       56
       -
             platforms = platforms.all;

     

       57
       -
             license = licenses.agpl3;

     

       58
       -
             maintainers = with maintainers; [ abbradar ];

     

       59
       -
           };

     

       60
       -
         };

     

       61
        
       

     

       62
       -
         stlviewer = buildPlugin rec {

     

       63
       -
           name = "OctoPrint-STLViewer-${version}";

     

       64
       -
           version = "0.3.0";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       65
        
       

     

       66
       -
           src = fetchFromGitHub {

     

       67
       -
             owner = "jneilliii";

     

       68
       -
             repo = "OctoPrint-STLViewer";

     

       69
       -
             rev = "v${version}";

     

       70
       -
             sha256 = "1a6sa8pw9ay7x27pfwr3nzb22x3jaw0c9vwyz4mrj76zkiw6svfi";

     

       0
        
       
     

       0
        
       
     

       71
        
           };

     

       72
        
       

     

       73
       -
           meta = with stdenv.lib; {

     

       74
       -
             homepage = https://github.com/jneilliii/Octoprint-STLViewer;

     

       75
       -
             description = "A simple stl viewer tab for OctoPrint";

     

       76
       -
             platforms = platforms.all;

     

       77
       -
             license = licenses.agpl3;

     

       78
       -
             maintainers = with maintainers; [ abbradar ];

     

       79
       -
           };

     

       80
        
         };

     

       81
        
       

     

       82
       -
       }

···

       4
        
         buildPlugin = args: pythonPackages.buildPythonApplication (args // {

     

       5
        
           buildInputs = (args.buildInputs or []) ++ [ octoprint ];

     

       6
        
         });

     

       0
        
       
     

       7
        
       

     

       8
       +
         self = {

     

       0
        
       
     

       0
        
       
     

       9
        
       

     

       10
       +
           # Deprecated alias

     

       11
       +
           m3d-fio = self.m33-fio; # added 2016-08-13

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       12
        
       

     

       13
       +
           m33-fio = buildPlugin rec {

     

       14
       +
             name = "M33-Fio-${version}";

     

       15
       +
             version = "1.5";

     

       16
        
       

     

       17
       +
             src = fetchFromGitHub {

     

       18
       +
               owner = "donovan6000";

     

       19
       +
               repo = "M33-Fio";

     

       20
       +
               rev = "V${version}";

     

       21
       +
               sha256 = "0ss8ic9l5srb5wj2mj0qafam0z4d6zv0cixhxgghh03fp0lvwjyq";

     

       22
       +
             };

     

       23
       +
       

     

       24
       +
             patches = [

     

       25
       +
               ./m33-fio-one-library.patch

     

       26
       +
             ];

     

       27
       +
       

     

       28
       +
             postPatch = ''

     

       29
       +
               rm -rf octoprint_m33fio/static/libraries/*

     

       30
       +
               (

     

       31
       +
                 cd 'shared library source'

     

       32
       +
                 make

     

       33
       +
               )

     

       34
       +
             '';

     

       35
        
       

     

       36
       +
             meta = with stdenv.lib; {

     

       37
       +
               homepage = "https://github.com/donovan6000/M3D-Fio";

     

       38
       +
               description = "OctoPrint plugin for the Micro 3D printer";

     

       39
       +
               platforms = platforms.all;

     

       40
       +
               license = licenses.gpl3;

     

       41
       +
               maintainers = with maintainers; [ abbradar ];

     

       42
       +
             };

     

       43
        
           };

     

       44
       +
       

     

       45
       +
           titlestatus = buildPlugin rec {

     

       46
       +
             name = "OctoPrint-TitleStatus-${version}";

     

       47
       +
             version = "0.0.4";

     

       48
        
       

     

       49
       +
             src = fetchFromGitHub {

     

       50
       +
               owner = "MoonshineSG";

     

       51
       +
               repo = "OctoPrint-TitleStatus";

     

       52
       +
               rev = version;

     

       53
       +
               sha256 = "1l78xrabn5hcly2mgxwi17nwgnp2s6jxi9iy4wnw8k8icv74ag7k";

     

       54
       +
             };

     

       55
        
       

     

       56
       +
             meta = with stdenv.lib; {

     

       57
       +
               homepage = "https://github.com/MoonshineSG/OctoPrint-TitleStatus";

     

       58
       +
               description = "Show printers status in window title";

     

       59
       +
               platforms = platforms.all;

     

       60
       +
               license = licenses.agpl3;

     

       61
       +
               maintainers = with maintainers; [ abbradar ];

     

       62
       +
             };

     

       63
        
           };

     

       64
        
       

     

       65
       +
           stlviewer = buildPlugin rec {

     

       66
       +
             name = "OctoPrint-STLViewer-${version}";

     

       67
       +
             version = "0.3.0";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       68
        
       

     

       69
       +
             src = fetchFromGitHub {

     

       70
       +
               owner = "jneilliii";

     

       71
       +
               repo = "OctoPrint-STLViewer";

     

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

     

       73
       +
               sha256 = "1a6sa8pw9ay7x27pfwr3nzb22x3jaw0c9vwyz4mrj76zkiw6svfi";

     

       74
       +
             };

     

       75
        
       

     

       76
       +
             meta = with stdenv.lib; {

     

       77
       +
               homepage = "https://github.com/jneilliii/Octoprint-STLViewer";

     

       78
       +
               description = "A simple stl viewer tab for OctoPrint";

     

       79
       +
               platforms = platforms.all;

     

       80
       +
               license = licenses.agpl3;

     

       81
       +
               maintainers = with maintainers; [ abbradar ];

     

       82
       +
             };

     

       83
        
           };

     

       84
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       85
        
         };

     

       86
        
       

     

       87
       +
       in self

+8 -8

pkgs/applications/misc/rofi/default.nix

···

       1
       -
       { stdenv, fetchurl, autoreconfHook, pkgconfig, libX11, libxkbcommon, pango

     

       2
       -
       , cairo, glib, libxcb, xcbutil, xcbutilwm, libstartup_notification

     

       3
       -
       , i3Support ? false, i3

     

       4
        
       }:

     

       5
        
       

     

       6
        
       stdenv.mkDerivation rec {

     

       7
       -
         version = "1.1.0";

     

       8
        
         name = "rofi-${version}";

     

       9
        
       

     

       10
        
         src = fetchurl {

     

       11
        
           url = "https://github.com/DaveDavenport/rofi/releases/download/${version}/${name}.tar.xz";

     

       12
       -
           sha256 = "1l8vl0mh7i0b1ycifqpg6392f5i4qxlv003m126skfk6fnlfq8hn";

     

       13
        
         };

     

       14
        
       

     

       15
        
         preConfigure = ''

     
···

       18
        
           sed -i 's/~root/~nobody/g' test/helper-expand.c

     

       19
        
         '';

     

       20
        
       

     

       21
       -
         buildInputs = [ autoreconfHook pkgconfig libX11 libxkbcommon pango

     

       22
       -
           cairo libstartup_notification libxcb xcbutil xcbutilwm

     

       23
       -
         ] ++ stdenv.lib.optional i3Support i3;

     

       0
        
       
     

       24
        
       

     

       25
        
         meta = with stdenv.lib; {

     

       26
        
           description = "Window switcher, run dialog and dmenu replacement";

···

       1
       +
       { stdenv, fetchurl, autoreconfHook, pkgconfig, libxkbcommon, pango

     

       2
       +
       , cairo, glib, libxcb, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification

     

       0
        
       
     

       3
        
       }:

     

       4
        
       

     

       5
        
       stdenv.mkDerivation rec {

     

       6
       +
         version = "1.2.0";

     

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

     

       8
        
       

     

       9
        
         src = fetchurl {

     

       10
        
           url = "https://github.com/DaveDavenport/rofi/releases/download/${version}/${name}.tar.xz";

     

       11
       +
           sha256 = "0xxx0xpxhrhlhi2axq9867zqrhwqavc1qrr833k1xr0pvm5m0aqc";

     

       12
        
         };

     

       13
        
       

     

       14
        
         preConfigure = ''

     
···

       17
        
           sed -i 's/~root/~nobody/g' test/helper-expand.c

     

       18
        
         '';

     

       19
        
       

     

       20
       +
         buildInputs = [ autoreconfHook pkgconfig libxkbcommon pango cairo

     

       21
       +
           libstartup_notification libxcb xcbutil xcbutilwm xcbutilxrm

     

       22
       +
         ];

     

       23
       +
         doCheck = true;

     

       24
        
       

     

       25
        
         meta = with stdenv.lib; {

     

       26
        
           description = "Window switcher, run dialog and dmenu replacement";

+10 -9

pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix

···

       1
       -
       { stdenv, fetchgit }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation {

     

       4
       -
         name = "urxvt-tabbedex-2015-03-03";

     

       5
        
       

     

       6
       -
         src = fetchgit {

     

       7
       -
           url = "https://github.com/mina86/urxvt-tabbedex";

     

       8
       -
           rev = "b0a02018b1cbaaba2a0c8ea7af9368db0adf3363";

     

       9
       -
           sha256 = "f0025f2741d424736620147d9fc39faac68193cb9f74bde0fb6e02a6f1ae61c3";

     

       0
        
       
     

       10
        
         };

     

       11
        
       

     

       12
       -
         installPhase = ''

     

       13
       -
           install -D tabbedex $out/lib/urxvt/perl/tabbedex

     

       14
       -
         '';

     

       15
        
       

     

       16
        
         meta = with stdenv.lib; {

     

       17
        
           description = "Tabbed plugin for rxvt-unicode with many enhancements (mina86's fork)";

···

       1
       +
       { stdenv, fetchFromGitHub, perl }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation {

     

       4
       +
         name = "urxvt-tabbedex-2016-08-09";

     

       5
        
       

     

       6
       +
         src = fetchFromGitHub {

     

       7
       +
           owner = "mina86";

     

       8
       +
           repo = "urxvt-tabbedex";

     

       9
       +
           rev = "ac220eb3984e151ba14dce08f446bc7bc8ca29a2";

     

       10
       +
           sha256 = "1b5mff5137jb5ysklsmfp5ql3m4g1z3bdhk0nwhz2hgwz40ap6k8";

     

       11
        
         };

     

       12
        
       

     

       13
       +
         nativeBuildInputs = [ perl ];

     

       14
       +
       

     

       15
       +
         installFlags = [ "PREFIX=$(out)" ];

     

       16
        
       

     

       17
        
         meta = with stdenv.lib; {

     

       18
        
           description = "Tabbed plugin for rxvt-unicode with many enhancements (mina86's fork)";

pkgs/applications/networking/browsers/firefox-bin/default.nix

···

       17
        
       , gtk3

     

       18
        
       , libX11

     

       19
        
       , libXScrnSaver

     

       0
        
       
     

       20
        
       , libXcomposite

     

       21
        
       , libXdamage

     

       22
        
       , libXext

     
···

       90
        
             libX11

     

       91
        
             libXScrnSaver

     

       92
        
             libXcomposite

     

       0
        
       
     

       93
        
             libXdamage

     

       94
        
             libXext

     

       95
        
             libXfixes

···

       17
        
       , gtk3

     

       18
        
       , libX11

     

       19
        
       , libXScrnSaver

     

       20
       +
       , libxcb

     

       21
        
       , libXcomposite

     

       22
        
       , libXdamage

     

       23
        
       , libXext

     
···

       91
        
             libX11

     

       92
        
             libXScrnSaver

     

       93
        
             libXcomposite

     

       94
       +
             libxcb

     

       95
        
             libXdamage

     

       96
        
             libXext

     

       97
        
             libXfixes

+20 -13

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

···

       1
       -
       { stdenv, fetchurl, cmake, pkgconfig, intltool, vala, makeWrapper

     

       2
        
       , gtk3, webkitgtk, librsvg, libnotify, sqlite

     

       3
        
       , glib_networking, gsettings_desktop_schemas, libsoup, pcre, gnome3

     

       0
        
       
     

       0
        
       
     

       4
        
       }:

     

       5
        
       

     

       6
       -
       let

     

       7
       -
         version = "0.5.11";

     

       8
       -
       in

     

       9
        
       stdenv.mkDerivation rec {

     

       10
        
         name = "midori-${version}";

     

       0
        
       
     

       11
        
       

     

       12
        
         meta = with stdenv.lib; {

     

       13
        
           description = "Lightweight WebKitGTK+ web browser";

     

       14
        
           homepage = "http://midori-browser.org";

     

       15
       -
           license = licenses.lgpl21Plus;

     

       16
       -
           platforms = platforms.linux;

     

       17
        
           maintainers = with maintainers; [ raskin ramkromberg ];

     

       18
        
         };

     

       19
        
       

     
···

       26
        
           sha256 = "0gcwqkcyliqz10i33ww3wl02mmfnl7jzl2d493l4l53ipsb1l6cn";

     

       27
        
         };

     

       28
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       29
        
         buildInputs = [

     

       30
       -
           cmake pkgconfig intltool vala makeWrapper

     

       31
       -
           webkitgtk librsvg libnotify sqlite gsettings_desktop_schemas pcre gnome3.gcr

     

       0
        
       
     

       32
        
           (libsoup.override {gnomeSupport = true; valaSupport = true;})

     

       0
        
       
     

       0
        
       
     

       33
        
         ];

     

       34
        
       

     

       35
        
         cmakeFlags = [ 

     

       36
        
           "-DCMAKE_BUILD_TYPE=Release"

     

       37
       -
           "-DUSE_ZEITGEIST=OFF"

     

       38
       -
           "-DHALF_BRO_INCOM_WEBKIT2=OFF"

     

       39
        
           "-DUSE_GTK3=1"

     

       40
        
         ];

     

       41
        
       

     

       42
        
         NIX_LDFLAGS="-lX11";

     

       43
        
       

     

       44
        
         preFixup = ''

     

       45
       -
           wrapProgram $out/bin/midori \

     

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

     

       47
       -
             --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"

     

       48
        
         '';

     

       49
        
       }

···

       1
       +
       { stdenv, fetchurl, cmake, pkgconfig, intltool, vala, wrapGAppsHook

     

       2
        
       , gtk3, webkitgtk, librsvg, libnotify, sqlite

     

       3
        
       , glib_networking, gsettings_desktop_schemas, libsoup, pcre, gnome3

     

       4
       +
       , libxcb, libpthreadstubs, libXdmcp, libxkbcommon, epoxy, at_spi2_core

     

       5
       +
       , zeitgeistSupport ? false, zeitgeist ? null

     

       6
        
       }:

     

       7
        
       

     

       8
       +
       assert zeitgeistSupport -> zeitgeist != null;

     

       9
       +
       

     

       0
        
       
     

       10
        
       stdenv.mkDerivation rec {

     

       11
        
         name = "midori-${version}";

     

       12
       +
         version = "0.5.11";

     

       13
        
       

     

       14
        
         meta = with stdenv.lib; {

     

       15
        
           description = "Lightweight WebKitGTK+ web browser";

     

       16
        
           homepage = "http://midori-browser.org";

     

       17
       +
           license = with licenses; [ lgpl21Plus ];

     

       18
       +
           platforms = with platforms; linux;

     

       19
        
           maintainers = with maintainers; [ raskin ramkromberg ];

     

       20
        
         };

     

       21
        
       

     
···

       28
        
           sha256 = "0gcwqkcyliqz10i33ww3wl02mmfnl7jzl2d493l4l53ipsb1l6cn";

     

       29
        
         };

     

       30
        
       

     

       31
       +
         nativeBuildInputs = [

     

       32
       +
           pkgconfig wrapGAppsHook cmake intltool

     

       33
       +
         ];

     

       34
       +
       

     

       35
        
         buildInputs = [

     

       36
       +
           vala

     

       37
       +
           gtk3 webkitgtk librsvg libnotify sqlite gsettings_desktop_schemas pcre gnome3.gcr

     

       38
       +
           libxcb libpthreadstubs libXdmcp libxkbcommon epoxy at_spi2_core

     

       39
        
           (libsoup.override {gnomeSupport = true; valaSupport = true;})

     

       40
       +
         ] ++ stdenv.lib.optionals zeitgeistSupport [

     

       41
       +
           zeitgeist

     

       42
        
         ];

     

       43
        
       

     

       44
        
         cmakeFlags = [ 

     

       45
        
           "-DCMAKE_BUILD_TYPE=Release"

     

       46
       +
           "-DUSE_ZEITGEIST=${if zeitgeistSupport then "ON" else "OFF"}"

     

       47
       +
           "-DHALF_BRO_INCOM_WEBKIT2=ON"

     

       48
        
           "-DUSE_GTK3=1"

     

       49
        
         ];

     

       50
        
       

     

       51
        
         NIX_LDFLAGS="-lX11";

     

       52
        
       

     

       53
        
         preFixup = ''

     

       54
       +
           gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules")

     

       0
        
       
     

       0
        
       
     

       55
        
         '';

     

       56
        
       }

+32 -7

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

···

       1
       -
       { stdenv, fetchurl, python, buildPythonApplication, qtmultimedia, pyqt5

     

       2
       -
       , jinja2, pygments, pyyaml, pypeg2, gst-plugins-base, gst-plugins-good

     

       3
       -
       , gst-plugins-bad, gst-libav, wrapGAppsHook, glib_networking, makeQtWrapper }:

     

       0
        
       
     

       4
        
       

     

       5
        
       let version = "0.8.2"; in

     

       6
        
       

     
···

       16
        
         # Needs tox

     

       17
        
         doCheck = false;

     

       18
        
       

     

       19
       -
         buildInputs = [ wrapGAppsHook makeQtWrapper

     

       20
        
           qtmultimedia

     

       21
       -
           gst-plugins-base gst-plugins-good gst-plugins-bad gst-libav

     

       22
       -
           glib_networking ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       23
        
       

     

       24
        
         propagatedBuildInputs = [

     

       25
       -
           python pyyaml pyqt5 jinja2 pygments pypeg2

     

       26
        
         ];

     

       27
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       28
        
         postInstall = ''

     

       29
        
           mv $out/bin/qutebrowser $out/bin/.qutebrowser-noqtpath

     

       30
        
           makeQtWrapper $out/bin/.qutebrowser-noqtpath $out/bin/qutebrowser

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       31
        
         '';

     

       32
        
       

     

       33
        
         meta = {

···

       1
       +
       { stdenv, fetchurl, buildPythonApplication, makeQtWrapper, wrapGAppsHook

     

       2
       +
       , qtmultimedia, pyqt5, jinja2, pygments, pyyaml, pypeg2, glib_networking

     

       3
       +
       , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2, libxslt

     

       4
       +
       , gst-plugins-base, gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-libav }:

     

       5
        
       

     

       6
        
       let version = "0.8.2"; in

     

       7
        
       

     
···

       17
        
         # Needs tox

     

       18
        
         doCheck = false;

     

       19
        
       

     

       20
       +
         buildInputs = [

     

       21
        
           qtmultimedia

     

       22
       +
           gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav

     

       23
       +
           glib_networking

     

       24
       +
         ];

     

       25
       +
       

     

       26
       +
         nativeBuildInputs = [

     

       27
       +
           makeQtWrapper wrapGAppsHook asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt

     

       28
       +
         ];

     

       29
        
       

     

       30
        
         propagatedBuildInputs = [

     

       31
       +
           pyyaml pyqt5 jinja2 pygments pypeg2

     

       32
        
         ];

     

       33
        
       

     

       34
       +
         postPatch = ''

     

       35
       +
           sed -i "s,/usr/share/qutebrowser,$out/share/qutebrowser,g" qutebrowser/utils/standarddir.py

     

       36
       +
         '';

     

       37
       +
       

     

       38
       +
         postBuild = ''

     

       39
       +
           a2x -f manpage doc/qutebrowser.1.asciidoc

     

       40
       +
         '';

     

       41
       +
       

     

       42
        
         postInstall = ''

     

       43
        
           mv $out/bin/qutebrowser $out/bin/.qutebrowser-noqtpath

     

       44
        
           makeQtWrapper $out/bin/.qutebrowser-noqtpath $out/bin/qutebrowser

     

       45
       +
       

     

       46
       +
           install -Dm644 doc/qutebrowser.1 "$out/share/man/man1/qutebrowser.1"

     

       47
       +
           install -Dm644 qutebrowser.desktop \

     

       48
       +
               "$out/share/applications/qutebrowser.desktop"

     

       49
       +
           for i in 16 24 32 48 64 128 256 512; do

     

       50
       +
               install -Dm644 "icons/qutebrowser-''${i}x''${i}.png" \

     

       51
       +
                   "$out/share/icons/hicolor/''${i}x''${i}/apps/qutebrowser.png"

     

       52
       +
           done

     

       53
       +
           install -Dm644 icons/qutebrowser.svg \

     

       54
       +
               "$out/share/icons/hicolor/scalable/apps/qutebrowser.svg"

     

       55
       +
           install -Dm755 -t "$out/share/qutebrowser/userscripts/" misc/userscripts/*

     

       56
        
         '';

     

       57
        
       

     

       58
        
         meta = {

+3 -3

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

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

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

     

       5
       -
         version = "0.15.3";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
       -
           url = "https://downloads.mesosphere.io/marathon/v${version}/marathon-${version}.tgz";

     

       9
       -
           sha256 = "1br4k596sjp4cf5l2nyaqhlsfdr443n08fvdyf4kilhr803x2rjq";

     

       10
        
         };

     

       11
        
       

     

       12
        
         buildInputs = [ makeWrapper jdk mesos ];

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

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

     

       5
       +
         version = "1.1.1";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
       +
           url = "https://downloads.mesosphere.com/marathon/v${version}/marathon-${version}.tgz";

     

       9
       +
           sha256 = "35a80401383f6551c45c676beed30b3c1af6d3ad027f44735c208abe8eaca93d";

     

       10
        
         };

     

       11
        
       

     

       12
        
         buildInputs = [ makeWrapper jdk mesos ];

+2 -2

pkgs/applications/networking/instant-messengers/blink/default.nix

···

       1
       -
       { stdenv, fetchurl, pythonPackages, pyqt4, cython, libvncserver, zlib, twisted

     

       2
        
       , gnutls, libvpx, makeDesktopItem }:

     

       3
        
       

     

       4
        
       pythonPackages.buildPythonApplication rec {

     
···

       18
        
         propagatedBuildInputs = with pythonPackages;[ pyqt4 cjson sipsimple twisted

     

       19
        
           ];

     

       20
        
       

     

       21
       -
         buildInputs = [ cython zlib libvncserver libvpx ];

     

       22
        
       

     

       23
        
         desktopItem = makeDesktopItem {

     

       24
        
           name = "Blink";

···

       1
       +
       { stdenv, fetchurl, pythonPackages, libvncserver, zlib

     

       2
        
       , gnutls, libvpx, makeDesktopItem }:

     

       3
        
       

     

       4
        
       pythonPackages.buildPythonApplication rec {

     
···

       18
        
         propagatedBuildInputs = with pythonPackages;[ pyqt4 cjson sipsimple twisted

     

       19
        
           ];

     

       20
        
       

     

       21
       +
         buildInputs = [ pythonPackages.cython zlib libvncserver libvpx ];

     

       22
        
       

     

       23
        
         desktopItem = makeDesktopItem {

     

       24
        
           name = "Blink";

+3 -3

pkgs/applications/networking/instant-messengers/pybitmessage/default.nix

···

       1
       -
       { stdenv, fetchFromGitHub, python, pythonPackages, pyqt4, openssl }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

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

     
···

       12
        
           sha256 = "1f4h0yc1mfjnxzvxiv9hxgak59mgr3a5ykv50vlyiay82za20jax";

     

       13
        
         };

     

       14
        
       

     

       15
       -
         buildInputs = [ python pyqt4 openssl pythonPackages.wrapPython pythonPackages.sqlite3 ];

     

       16
        
       

     

       17
        
         preConfigure = ''

     

       18
        
           substituteInPlace Makefile \

     
···

       24
        
       

     

       25
        
         postInstall = ''

     

       26
        
           substituteInPlace $out/bin/pybitmessage \

     

       27
       -
             --replace "exec python2" "exec ${python}/bin/python" \

     

       28
        
             --replace "/opt/openssl-compat-bitcoin/lib/" "${openssl.out}/lib/"

     

       29
        
           wrapProgram $out/bin/pybitmessage \

     

       30
        
             --prefix PYTHONPATH : "$(toPythonPath $out):$PYTHONPATH"

···

       1
       +
       { stdenv, fetchFromGitHub, pythonPackages, openssl }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

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

     
···

       12
        
           sha256 = "1f4h0yc1mfjnxzvxiv9hxgak59mgr3a5ykv50vlyiay82za20jax";

     

       13
        
         };

     

       14
        
       

     

       15
       +
         buildInputs = with pythonPackages; [ python pyqt4 wrapPython sqlite3 ] ++ [ openssl ];

     

       16
        
       

     

       17
        
         preConfigure = ''

     

       18
        
           substituteInPlace Makefile \

     
···

       24
        
       

     

       25
        
         postInstall = ''

     

       26
        
           substituteInPlace $out/bin/pybitmessage \

     

       27
       +
             --replace "exec python2" "exec ${pythonPackages.python}/bin/python" \

     

       28
        
             --replace "/opt/openssl-compat-bitcoin/lib/" "${openssl.out}/lib/"

     

       29
        
           wrapProgram $out/bin/pybitmessage \

     

       30
        
             --prefix PYTHONPATH : "$(toPythonPath $out):$PYTHONPATH"

+8 -23

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

···

       16
        
       

     

       17
        
       in stdenv.mkDerivation rec {

     

       18
        
         name = "telegram-desktop-${version}";

     

       19
       -
         version = "0.9.56";

     

       20
        
         qtVersion = lib.replaceStrings ["."] ["_"] packagedQt;

     

       21
        
       

     

       22
        
         src = fetchFromGitHub {

     

       23
        
           owner = "telegramdesktop";

     

       24
        
           repo = "tdesktop";

     

       25
        
           rev = "v${version}";

     

       26
       -
           sha256 = "000ngg6arfb6mif0hvin099f83q3sn7mw4vfvrikskczblw3a5lc";

     

       27
        
         };

     

       28
        
       

     

       29
        
         tgaur = fetchgit {

     

       30
        
           url = "https://aur.archlinux.org/telegram-desktop.git";

     

       31
       -
           rev = "f8907d1ccaf8345c06232238342921213270e3d8";

     

       32
       -
           sha256 = "04jh0fsrh4iwg188d20z15qkxv05wa5lpd8h21yxx3jxqljpdkws";

     

       33
        
         };

     

       34
        
       

     

       35
        
         buildInputs = [

     
···

       50
        
           "CONFIG+=release"

     

       51
        
           "DEFINES+=TDESKTOP_DISABLE_AUTOUPDATE"

     

       52
        
           "DEFINES+=TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME"

     

       53
       -
           "INCLUDEPATH+=${gtk2.dev}/include/gtk-2.0"

     

       54
       -
           "INCLUDEPATH+=${glib.dev}/include/glib-2.0"

     

       55
       -
           "INCLUDEPATH+=${glib.out}/lib/glib-2.0/include"

     

       56
       -
           "INCLUDEPATH+=${cairo.dev}/include/cairo"

     

       57
       -
           "INCLUDEPATH+=${pango.dev}/include/pango-1.0"

     

       58
       -
           "INCLUDEPATH+=${gtk2.out}/lib/gtk-2.0/include"

     

       59
       -
           "INCLUDEPATH+=${gdk_pixbuf.dev}/include/gdk-pixbuf-2.0"

     

       60
       -
           "INCLUDEPATH+=${atk.dev}/include/atk-1.0"

     

       61
       -
           "INCLUDEPATH+=${libappindicator-gtk2}/include/libappindicator-0.1"

     

       62
       -
           "INCLUDEPATH+=${libunity}/include/unity"

     

       63
       -
           "INCLUDEPATH+=${dee}/include/dee-1.0"

     

       64
       -
           "INCLUDEPATH+=${libdbusmenu-glib}/include/libdbusmenu-glib-0.4"

     

       65
        
           "INCLUDEPATH+=${breakpad}/include/breakpad"

     

       66
        
           "QT_TDESKTOP_VERSION=${systemQt}"

     

       67
       -
           "LIBS+=-lcrypto"

     

       68
       -
           "LIBS+=-lssl"

     

       69
        
         ];

     

       70
        
       

     

       71
        
         qtSrcs = [ qtbase.src qtimageformats.src ];

     
···

       79
        
           sed -i 'Telegram/Telegram.pro' \

     

       80
        
             -e 's,CUSTOM_API_ID,,g' \

     

       81
        
             -e 's,/usr,/does-not-exist,g' \

     

       82
       -
             -e '/LIBS += .*libxkbcommon.a/d' \

     

       83
       -
             -e 's,LIBS += .*libz.a,LIBS += -lz,' \

     

       84
        
             -e 's,LIBS += .*libbreakpad_client.a,LIBS += ${breakpad}/lib/libbreakpad_client.a,' \

     

       85
       -
             -e 's, -flto,,g' \

     

       86
       -
             -e 's, -static-libstdc++,,g'

     

       87
        
       

     

       88
        
           export qmakeFlags="$qmakeFlags QT_TDESKTOP_PATH=$PWD/../qt"

     

       89
        
       

     
···

       105
        
             export configureFlags="-prefix "$PWD/../qt" -release -opensource -confirm-license -system-zlib \

     

       106
        
               -system-libpng -system-libjpeg -system-freetype -system-harfbuzz -system-pcre -system-xcb \

     

       107
        
               -system-xkbcommon-x11 -no-opengl -static -nomake examples -nomake tests \

     

       108
       -
               -openssl-linked -dbus-linked -system-sqlite -verbose \

     

       109
        
               ${lib.optionalString (!system-x86_64) "-no-sse2"} -no-sse3 -no-ssse3 \

     

       110
        
               -no-sse4.1 -no-sse4.2 -no-avx -no-avx2 -no-mips_dsp -no-mips_dspr2"

     

       111
        
             export dontAddPrefix=1

···

       16
        
       

     

       17
        
       in stdenv.mkDerivation rec {

     

       18
        
         name = "telegram-desktop-${version}";

     

       19
       +
         version = "0.10.1";

     

       20
        
         qtVersion = lib.replaceStrings ["."] ["_"] packagedQt;

     

       21
        
       

     

       22
        
         src = fetchFromGitHub {

     

       23
        
           owner = "telegramdesktop";

     

       24
        
           repo = "tdesktop";

     

       25
        
           rev = "v${version}";

     

       26
       +
           sha256 = "08isxwif6zllglkpd9i7ypxm2s4bibzqris48607bafr88ylksdk";

     

       27
        
         };

     

       28
        
       

     

       29
        
         tgaur = fetchgit {

     

       30
        
           url = "https://aur.archlinux.org/telegram-desktop.git";

     

       31
       +
           rev = "9ce7be9efed501f988bb099956fa63729f2c25ea";

     

       32
       +
           sha256 = "1wp6lqscpm2byizchm0bj48dg9bga02r9r69ns10zxk0gk0qvvdn";

     

       33
        
         };

     

       34
        
       

     

       35
        
         buildInputs = [

     
···

       50
        
           "CONFIG+=release"

     

       51
        
           "DEFINES+=TDESKTOP_DISABLE_AUTOUPDATE"

     

       52
        
           "DEFINES+=TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME"

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       53
        
           "INCLUDEPATH+=${breakpad}/include/breakpad"

     

       54
        
           "QT_TDESKTOP_VERSION=${systemQt}"

     

       0
        
       
     

       0
        
       
     

       55
        
         ];

     

       56
        
       

     

       57
        
         qtSrcs = [ qtbase.src qtimageformats.src ];

     
···

       65
        
           sed -i 'Telegram/Telegram.pro' \

     

       66
        
             -e 's,CUSTOM_API_ID,,g' \

     

       67
        
             -e 's,/usr,/does-not-exist,g' \

     

       68
       +
             -e 's, -flto,,g' \

     

       0
        
       
     

       69
        
             -e 's,LIBS += .*libbreakpad_client.a,LIBS += ${breakpad}/lib/libbreakpad_client.a,' \

     

       70
       +
             -e 's, -static-libstdc++,,g' \

     

       71
       +
             -e '/LIBS += .*libxkbcommon.a/d'

     

       72
        
       

     

       73
        
           export qmakeFlags="$qmakeFlags QT_TDESKTOP_PATH=$PWD/../qt"

     

       74
        
       

     
···

       90
        
             export configureFlags="-prefix "$PWD/../qt" -release -opensource -confirm-license -system-zlib \

     

       91
        
               -system-libpng -system-libjpeg -system-freetype -system-harfbuzz -system-pcre -system-xcb \

     

       92
        
               -system-xkbcommon-x11 -no-opengl -static -nomake examples -nomake tests \

     

       93
       +
               -openssl-linked -dbus-linked -system-sqlite -verbose -no-gtkstyle \

     

       94
        
               ${lib.optionalString (!system-x86_64) "-no-sse2"} -no-sse3 -no-ssse3 \

     

       95
        
               -no-sse4.1 -no-sse4.2 -no-avx -no-avx2 -no-mips_dsp -no-mips_dspr2"

     

       96
        
             export dontAddPrefix=1

+2 -2

pkgs/applications/networking/mailreaders/claws-mail/default.nix

···

       32
        
       

     

       33
        
       stdenv.mkDerivation rec {

     

       34
        
         name = "claws-mail-${version}";

     

       35
       -
         version = "3.13.2";

     

       36
        
       

     

       37
        
         meta = {

     

       38
        
           description = "The user-friendly, lightweight, and fast email client";

     
···

       44
        
       

     

       45
        
         src = fetchurl {

     

       46
        
           url = "http://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz";

     

       47
       -
           sha256 = "1l8ankx0qpq1ix1an8viphcf11ksh53jsrm1xjmq8cjbh5910wva";

     

       48
        
         };

     

       49
        
       

     

       50
        
         patches = [ ./mime.patch ];

···

       32
        
       

     

       33
        
       stdenv.mkDerivation rec {

     

       34
        
         name = "claws-mail-${version}";

     

       35
       +
         version = "3.14.0";

     

       36
        
       

     

       37
        
         meta = {

     

       38
        
           description = "The user-friendly, lightweight, and fast email client";

     
···

       44
        
       

     

       45
        
         src = fetchurl {

     

       46
        
           url = "http://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz";

     

       47
       +
           sha256 = "0nfchgga3ir91s8rky0a0vnz8cgj2f6h716wh3cmb466a01xfss6";

     

       48
        
         };

     

       49
        
       

     

       50
        
         patches = [ ./mime.patch ];

+2 -2

pkgs/applications/networking/syncthing/default.nix

···

       1
        
       { stdenv, fetchFromGitHub, go }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
       -
         version = "0.14.3";

     

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

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "syncthing";

     

       9
        
           repo = "syncthing";

     

       10
        
           rev = "v${version}";

     

       11
       -
           sha256 = "114i0911h3q6dn3j9x2qcm5lzpqclvrpf5vk87qpqp9qy62jp3az";

     

       12
        
         };

     

       13
        
       

     

       14
        
         buildInputs = [ go ];

···

       1
        
       { stdenv, fetchFromGitHub, go }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
       +
         version = "0.14.4";

     

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

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "syncthing";

     

       9
        
           repo = "syncthing";

     

       10
        
           rev = "v${version}";

     

       11
       +
           sha256 = "0i1pgwy7vn2hfcqa7dvrrc40hzrzn47alvnxm058f2hhxjis3fdw";

     

       12
        
         };

     

       13
        
       

     

       14
        
         buildInputs = [ go ];

+6 -6

pkgs/applications/office/impressive/default.nix

···

       1
       -
       { fetchurl, stdenv, python, makeWrapper, lib

     

       2
       -
       , xpdf, pillow, pyopengl, pygame

     

       3
       -
       , setuptools, mesa, freeglut }:

     

       4
        
       

     

       5
       -
       let version = "0.10.5";

     

       6
       -
       in

     

       7
       -
        stdenv.mkDerivation {

     

       0
        
       
     

       8
        
           # This project was formerly known as KeyJNote.

     

       9
        
           # See http://keyj.s2000.ws/?p=77 for details.

     

       10

···

       1
       +
       { fetchurl, stdenv, pythonPackages, makeWrapper, lib

     

       2
       +
       , xpdf, mesa, freeglut }:

     

       0
        
       
     

       3
        
       

     

       4
       +
       let

     

       5
       +
         inherit (pythonPackages) python pyopengl pygame setuptools pillow;

     

       6
       +
         version = "0.10.5";

     

       7
       +
       in stdenv.mkDerivation {

     

       8
        
           # This project was formerly known as KeyJNote.

     

       9
        
           # See http://keyj.s2000.ws/?p=77 for details.

     

       10

+1 -1

pkgs/applications/search/catfish/default.nix

···

       1
       -
       { stdenv, fetchurl, file, which, intltool, findutils, xdg_utils, pycairo,

     

       2
        
         gnome3, pythonPackages, wrapGAppsHook }:

     

       3
        
       

     

       4
        
       pythonPackages.buildPythonApplication rec {

···

       1
       +
       { stdenv, fetchurl, file, which, intltool, findutils, xdg_utils,

     

       2
        
         gnome3, pythonPackages, wrapGAppsHook }:

     

       3
        
       

     

       4
        
       pythonPackages.buildPythonApplication rec {

+9 -11

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

···

       1
       -
       { stdenv, fetchurl, itstool, buildPythonApplication, python27, intltool, wrapGAppsHook

     

       2
       -
       , libxml2, pygobject3, gobjectIntrospection, gtk3, gnome3, pycairo, cairo, file

     

       3
        
       }:

     

       4
        
       

     

       5
        
       

     

       6
        
       let

     

       7
        
         minor = "3.16";

     

       8
        
         version = "${minor}.2";

     

       9
       -
       in

     

       10
       -
       

     

       11
       -
       buildPythonApplication rec {

     

       12
        
         name = "meld-${version}";

     

       13
       -
         namePrefix = "";

     

       14
        
       

     

       15
        
         src = fetchurl {

     

       16
        
           url = "mirror://gnome/sources/meld/${minor}/meld-${version}.tar.xz";

     
···

       18
        
         };

     

       19
        
       

     

       20
        
         buildInputs = [

     

       21
       -
           python27 intltool wrapGAppsHook itstool libxml2

     

       22
        
           gnome3.gtksourceview gnome3.gsettings_desktop_schemas pycairo cairo

     

       23
        
           gnome3.defaultIconTheme gnome3.dconf file

     

       24
        
         ];

     

       25
        
         propagatedBuildInputs = [ gobjectIntrospection pygobject3 gtk3 ];

     

       26
        
       

     

       27
        
         installPhase = ''

     

       28
       -
           mkdir -p "$out/lib/${python27.libPrefix}/site-packages"

     

       29
        
       

     

       30
       -
           export PYTHONPATH="$out/lib/${python27.libPrefix}/site-packages:$PYTHONPATH"

     

       31
        
       

     

       32
       -
           ${python27}/bin/${python27.executable} setup.py install \

     

       33
       -
             --install-lib=$out/lib/${python27.libPrefix}/site-packages \

     

       34
        
             --prefix="$out"

     

       35
        
       

     

       36
        
           mkdir -p $out/share/gsettings-schemas/$name

···

       1
       +
       { stdenv, fetchurl, itstool, pythonPackages, intltool, wrapGAppsHook

     

       2
       +
       , libxml2, gobjectIntrospection, gtk3, gnome3, cairo, file

     

       3
        
       }:

     

       4
        
       

     

       5
        
       

     

       6
        
       let

     

       7
        
         minor = "3.16";

     

       8
        
         version = "${minor}.2";

     

       9
       +
         inherit (pythonPackages) python buildPythonApplication pycairo pygobject3;

     

       10
       +
       in buildPythonApplication rec {

     

       0
        
       
     

       11
        
         name = "meld-${version}";

     

       0
        
       
     

       12
        
       

     

       13
        
         src = fetchurl {

     

       14
        
           url = "mirror://gnome/sources/meld/${minor}/meld-${version}.tar.xz";

     
···

       16
        
         };

     

       17
        
       

     

       18
        
         buildInputs = [

     

       19
       +
           intltool wrapGAppsHook itstool libxml2

     

       20
        
           gnome3.gtksourceview gnome3.gsettings_desktop_schemas pycairo cairo

     

       21
        
           gnome3.defaultIconTheme gnome3.dconf file

     

       22
        
         ];

     

       23
        
         propagatedBuildInputs = [ gobjectIntrospection pygobject3 gtk3 ];

     

       24
        
       

     

       25
        
         installPhase = ''

     

       26
       +
           mkdir -p "$out/lib/${python.libPrefix}/site-packages"

     

       27
        
       

     

       28
       +
           export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH"

     

       29
        
       

     

       30
       +
           ${python}/bin/${python.executable} setup.py install \

     

       31
       +
             --install-lib=$out/lib/${python.libPrefix}/site-packages \

     

       32
        
             --prefix="$out"

     

       33
        
       

     

       34
        
           mkdir -p $out/share/gsettings-schemas/$name

+12 -10

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

···

       1
       -
       {stdenv, fetchurl, makeWrapper, python27, python27Packages, git,

     

       2
       -
        docbook_xml_dtd_412, docbook_xml_xslt, asciidoc, xmlto,

     

       3
       -
        cython ? null,

     

       4
       -
        bazaar ? null, cvs ? null, darcs ? null, fossil ? null,

     

       5
       -
        mercurial ? null, monotone ? null, rcs ? null, src ? null,

     

       6
       -
        subversion ? null, cvs_fast_export ? null }:

     

       7
        
       with stdenv; with lib;

     

       8
       -
       mkDerivation rec {

     

       0
        
       
     

       0
        
       
     

       9
        
         name = "reposurgeon-${meta.version}";

     

       10
        
         meta = {

     

       11
        
           description = "A tool for editing version-control repository history";

     
···

       33
        
           makeFlagsArray=(

     

       34
        
             XML_CATALOG_FILES="${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml ${docbook_xml_xslt}/xml/xsl/docbook/catalog.xml"

     

       35
        
             prefix="$out"

     

       36
       -
             pyinclude="-I${python27}/include/python2.7"

     

       37
       -
             pylib="-L${python27}/lib -lpython2.7"

     

       38
        
           )

     

       39
        
         '';

     

       40
        
       

     
···

       51
        
               [ out git bazaar cvs darcs fossil mercurial

     

       52
        
                 monotone rcs src subversion cvs_fast_export ]

     

       53
        
             );

     

       54
       -
             pythonpath = makeSearchPathOutput "lib" python27.sitePackages (

     

       55
        
               filter (x: x != null)

     

       56
        
               [ python27Packages.readline or null python27Packages.hglib or null ]

     

       57
        
             );

···

       1
       +
       { stdenv, fetchurl, makeWrapper, python27Packages, git

     

       2
       +
       , docbook_xml_dtd_412, docbook_xml_xslt, asciidoc, xmlto

     

       3
       +
       , bazaar ? null, cvs ? null, darcs ? null, fossil ? null

     

       4
       +
       , mercurial ? null, monotone ? null, rcs ? null, src ? null

     

       5
       +
       , subversion ? null, cvs_fast_export ? null }:

     

       6
       +
       

     

       7
        
       with stdenv; with lib;

     

       8
       +
       let

     

       9
       +
         inherit (python27Packages) python cython;

     

       10
       +
       in mkDerivation rec {

     

       11
        
         name = "reposurgeon-${meta.version}";

     

       12
        
         meta = {

     

       13
        
           description = "A tool for editing version-control repository history";

     
···

       35
        
           makeFlagsArray=(

     

       36
        
             XML_CATALOG_FILES="${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml ${docbook_xml_xslt}/xml/xsl/docbook/catalog.xml"

     

       37
        
             prefix="$out"

     

       38
       +
             pyinclude="-I${python}/include/python2.7"

     

       39
       +
             pylib="-L${python}/lib -lpython2.7"

     

       40
        
           )

     

       41
        
         '';

     

       42
        
       

     
···

       53
        
               [ out git bazaar cvs darcs fossil mercurial

     

       54
        
                 monotone rcs src subversion cvs_fast_export ]

     

       55
        
             );

     

       56
       +
             pythonpath = makeSearchPathOutput "lib" python.sitePackages (

     

       57
        
               filter (x: x != null)

     

       58
        
               [ python27Packages.readline or null python27Packages.hglib or null ]

     

       59
        
             );

+1 -1

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

···

       1
       -
       { stdenv, fetchurl, python, rcs, git, pylint }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         name = "src-1.11";

···

       1
       +
       { stdenv, fetchurl, python, rcs, git }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         name = "src-1.11";

+3 -2

pkgs/applications/video/byzanz/default.nix

···

       1
       -
       { stdenv, fetchgit, which, gnome3, glib, intltool, pkgconfig, libtool, cairo, gtk3, gst_all_1 }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         version = "0.2.3.alpha";

     
···

       18
        
       

     

       19
        
         NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";

     

       20
        
       

     

       21
       -
         buildInputs = [ which gnome3.gnome_common glib intltool pkgconfig libtool cairo gtk3 gst_all_1.gstreamer gst_all_1.gst-plugins-base ];

     

       0
        
       
     

       22
        
       

     

       23
        
         meta = with stdenv.lib; {

     

       24
        
           description = "Tool to record a running X desktop to an animation suitable for presentation in a web browser";

···

       1
       +
       { stdenv, fetchgit, wrapGAppsHook, which, gnome3, glib, intltool, pkgconfig, libtool, cairo, gtk3, gst_all_1, xorg }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         version = "0.2.3.alpha";

     
···

       18
        
       

     

       19
        
         NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";

     

       20
        
       

     

       21
       +
         buildInputs = [ which gnome3.gnome_common glib intltool pkgconfig libtool cairo gtk3 xorg.xwininfo ]

     

       22
       +
         ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-bad gst-plugins-good gst-plugins-ugly gst-libav wrapGAppsHook ]);

     

       23
        
       

     

       24
        
         meta = with stdenv.lib; {

     

       25
        
           description = "Tool to record a running X desktop to an animation suitable for presentation in a web browser";

+14 -13

pkgs/applications/video/miro/default.nix

···

       1
       -
       { stdenv, fetchurl, python, buildPythonApplication, pythonPackages, pkgconfig

     

       2
       -
       , pyrex096, ffmpeg, boost, glib, pygobject, gtk2, webkitgtk2, libsoup, pygtk

     

       3
       -
       , taglib, sqlite, pycurl, mutagen, pycairo, pythonDBus, pywebkitgtk

     

       4
        
       , libtorrentRasterbar, glib_networking, gsettings_desktop_schemas

     

       5
        
       , gst_python, gst_plugins_base, gst_plugins_good, gst_ffmpeg

     

       6
        
       , enableBonjour ? false, avahi ? null

     
···

       10
        
       

     

       11
        
       with stdenv.lib;

     

       12
        
       

     

       13
       -
       buildPythonApplication rec {

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

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

     

       15
       -
         namePrefix = "";

     

       16
       -
         version = "6.0";

     

       17
        
       

     

       18
        
         src = fetchurl {

     

       19
        
           url = "http://ftp.osuosl.org/pub/pculture.org/miro/src/${name}.tar.gz";

     
···

       56
        
       

     

       57
        
         preInstall = ''

     

       58
        
           # see https://bitbucket.org/pypa/setuptools/issue/130/install_data-doesnt-respect-prefix

     

       59
       -
           ${python}/bin/${python.executable} setup.py install_data --root=$out

     

       60
        
           sed -i '/data_files=data_files/d' setup.py

     

       61
        
         '';

     

       62
        
       

     
···

       68
        
             --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share"

     

       69
        
         '';

     

       70
        
       

     

       71
       -
         buildInputs = [

     

       72
       -
           pkgconfig pyrex096 ffmpeg boost glib pygobject gtk2 webkitgtk2 libsoup

     

       73
       -
           pygtk taglib gsettings_desktop_schemas sqlite

     

       74
        
         ];

     

       75
        
       

     

       76
       -
         propagatedBuildInputs = [

     

       77
       -
           pygobject pygtk pycurl python.modules.sqlite3 mutagen pycairo pythonDBus

     

       78
       -
           pywebkitgtk libtorrentRasterbar

     

       79
        
           gst_python gst_plugins_base gst_plugins_good gst_ffmpeg

     

       80
        
         ] ++ optional enableBonjour avahi;

     

       81

···

       1
       +
       { stdenv, fetchurl, pkgconfig

     

       2
       +
       , pythonPackages, pyrex096, ffmpeg, boost, glib, gtk2, webkitgtk2, libsoup

     

       3
       +
       , taglib, sqlite

     

       4
        
       , libtorrentRasterbar, glib_networking, gsettings_desktop_schemas

     

       5
        
       , gst_python, gst_plugins_base, gst_plugins_good, gst_ffmpeg

     

       6
        
       , enableBonjour ? false, avahi ? null

     
···

       10
        
       

     

       11
        
       with stdenv.lib;

     

       12
        
       

     

       13
       +
       let

     

       14
       +
         inherit (pythonPackages) python buildPythonApplication;

     

       15
       +
         version = "6.0";

     

       16
       +
       in buildPythonApplication rec {

     

       17
        
         name = "miro-${version}";

     

       0
        
       
     

       0
        
       
     

       18
        
       

     

       19
        
         src = fetchurl {

     

       20
        
           url = "http://ftp.osuosl.org/pub/pculture.org/miro/src/${name}.tar.gz";

     
···

       57
        
       

     

       58
        
         preInstall = ''

     

       59
        
           # see https://bitbucket.org/pypa/setuptools/issue/130/install_data-doesnt-respect-prefix

     

       60
       +
           ${python.interpreter} setup.py install_data --root=$out

     

       61
        
           sed -i '/data_files=data_files/d' setup.py

     

       62
        
         '';

     

       63
        
       

     
···

       69
        
             --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share"

     

       70
        
         '';

     

       71
        
       

     

       72
       +
         buildInputs = with pythonPackages; [ pygtk pygobject ] ++ [

     

       73
       +
           pkgconfig pyrex096 ffmpeg boost glib gtk2 webkitgtk2 libsoup

     

       74
       +
           taglib gsettings_desktop_schemas sqlite

     

       75
        
         ];

     

       76
        
       

     

       77
       +
         propagatedBuildInputs = with pythonPackages; [

     

       78
       +
           pygobject pygtk pycurl sqlite3 mutagen pycairo dbus

     

       79
       +
           pywebkitgtk] ++ [ libtorrentRasterbar

     

       80
        
           gst_python gst_plugins_base gst_plugins_good gst_ffmpeg

     

       81
        
         ] ++ optional enableBonjour avahi;

     

       82

+5 -2

pkgs/applications/video/qarte/default.nix

···

       1
       -
       { stdenv, fetchbzr, python, pyqt4, sip, rtmpdump, makeWrapper }:

     

       2
        
       

     

       3
       -
       stdenv.mkDerivation {

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       4
        
         name = "qarte-2.4.0";

     

       5
        
         src = fetchbzr {

     

       6
        
           url = http://bazaar.launchpad.net/~vincent-vandevyvre/qarte/trunk;

···

       1
       +
       { stdenv, fetchbzr, pythonPackages, rtmpdump, makeWrapper }:

     

       2
        
       

     

       3
       +
       let

     

       4
       +
         inherit (pythonPackages) python pyqt4;

     

       5
       +
         sip = pythonPackages.sip_4_16;

     

       6
       +
       in stdenv.mkDerivation {

     

       7
        
         name = "qarte-2.4.0";

     

       8
        
         src = fetchbzr {

     

       9
        
           url = http://bazaar.launchpad.net/~vincent-vandevyvre/qarte/trunk;

+1 -3

pkgs/applications/virtualization/tini/default.nix

···

       7
        
           url = "https://github.com/krallin/tini/archive/v0.8.3.tar.gz";

     

       8
        
           sha256 ="1w7rj4crrcyv25idmh4asbp2sxzwyihy5mbpw384bzxjzaxn9xpa";

     

       9
        
         };

     

       0
        
       
     

       10
        
         NIX_CFLAGS_COMPILE = [

     

       11
        
           "-DPR_SET_CHILD_SUBREAPER=36"

     

       12
        
           "-DPR_GET_CHILD_SUBREAPER=37"

     

       13
        
         ];

     

       14
        
         buildInputs = [ cmake ];

     

       15
       -
         postInstall = ''

     

       16
       -
           rm $out/bin/tini-static

     

       17
       -
         '';

     

       18
        
         meta = with stdenv.lib; {

     

       19
        
           description = "A tiny but valid init for containers";

     

       20
        
           homepage = https://github.com/krallin/tini;

···

       7
        
           url = "https://github.com/krallin/tini/archive/v0.8.3.tar.gz";

     

       8
        
           sha256 ="1w7rj4crrcyv25idmh4asbp2sxzwyihy5mbpw384bzxjzaxn9xpa";

     

       9
        
         };

     

       10
       +
         patchPhase = "sed -i /tini-static/d CMakeLists.txt";

     

       11
        
         NIX_CFLAGS_COMPILE = [

     

       12
        
           "-DPR_SET_CHILD_SUBREAPER=36"

     

       13
        
           "-DPR_GET_CHILD_SUBREAPER=37"

     

       14
        
         ];

     

       15
        
         buildInputs = [ cmake ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       16
        
         meta = with stdenv.lib; {

     

       17
        
           description = "A tiny but valid init for containers";

     

       18
        
           homepage = https://github.com/krallin/tini;

-2

pkgs/build-support/kernel/modules-closure.sh

···

       1
        
       source $stdenv/setup

     

       2
        
       

     

       3
       -
       set -o pipefail

     

       4
       -
       

     

       5
        
       version=$(cd $kernel/lib/modules && ls -d *)

     

       6
        
       

     

       7
        
       echo "kernel version is $version"

···

       1
        
       source $stdenv/setup

     

       2
        
       

     

       0
        
       
     

       0
        
       
     

       3
        
       version=$(cd $kernel/lib/modules && ls -d *)

     

       4
        
       

     

       5
        
       echo "kernel version is $version"

+2 -2

pkgs/data/fonts/emojione/default.nix

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

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

     

       5
       -
         version = "1.2";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "eosrei";

     

       9
        
           repo = "emojione-color-font";

     

       10
        
           rev = "v${version}";

     

       11
       -
           sha256 = "001c2bph4jcdg9arfmyxrscf1i09gvg44kqy28chjmhxzq99hpcg";

     

       12
        
         };

     

       13
        
       

     

       14
        
         preBuild = ''

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

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

     

       5
       +
         version = "1.3";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "eosrei";

     

       9
        
           repo = "emojione-color-font";

     

       10
        
           rev = "v${version}";

     

       11
       +
           sha256 = "0hgs661g1j91lkafhrfx5ix7ymarh5bzcx34r2id6jl7dc3j41l3";

     

       12
        
         };

     

       13
        
       

     

       14
        
         preBuild = ''

+2 -2

pkgs/data/misc/wireless-regdb/default.nix

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         name = "wireless-regdb-${version}";

     

       5
       -
         version = "2016-05-02";

     

       6
        
       

     

       7
        
         src = fetchgit {

     

       8
       -
           sha256 = "1qa741an242wi6gdikkr4ahanphfhwnjg8q2z3rsv8wdha91k895";

     

       9
        
           url = https://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git;

     

       10
        
           rev = "refs/tags/master-${version}";

     

       11
        
         };

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         name = "wireless-regdb-${version}";

     

       5
       +
         version = "2016-06-10";

     

       6
        
       

     

       7
        
         src = fetchgit {

     

       8
       +
           sha256 = "0im9likzpziircl96pql2jpyl8pfcqc5v0wgqy705j4ga5sx8pmn";

     

       9
        
           url = https://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git;

     

       10
        
           rev = "refs/tags/master-${version}";

     

       11
        
         };

-1

pkgs/desktops/gnome-3/3.20/core/gnome-control-center/default.nix

···

       30
        
             networkmanager modemmanager makeWrapper gnome3.gnome-bluetooth grilo ];

     

       31
        
       

     

       32
        
         preBuild = ''

     

       33
       -
           substituteInPlace tz.h --replace "/usr/share/zoneinfo/zone.tab" "${tzdata}/share/zoneinfo/zone.tab"

     

       34
        
           substituteInPlace panels/datetime/tz.h --replace "/usr/share/zoneinfo/zone.tab" "${tzdata}/share/zoneinfo/zone.tab"

     

       35
        
       

     

       36
        
           # hack to make test-endianess happy

···

       30
        
             networkmanager modemmanager makeWrapper gnome3.gnome-bluetooth grilo ];

     

       31
        
       

     

       32
        
         preBuild = ''

     

       0
        
       
     

       33
        
           substituteInPlace panels/datetime/tz.h --replace "/usr/share/zoneinfo/zone.tab" "${tzdata}/share/zoneinfo/zone.tab"

     

       34
        
       

     

       35
        
           # hack to make test-endianess happy

-4

pkgs/desktops/gnome-3/3.20/core/vte/default.nix

···

       19
        
       

     

       20
        
         enableParallelBuilding = true;

     

       21
        
       

     

       22
       -
         postInstall = ''

     

       23
       -
           substituteInPlace $out/lib/libvte2_90.la --replace "-lncurses" "-L${ncurses.out}/lib -lncurses"

     

       24
       -
         '';

     

       25
       -
       

     

       26
        
         meta = with stdenv.lib; {

     

       27
        
           homepage = http://www.gnome.org/;

     

       28
        
           description = "A library implementing a terminal emulator widget for GTK+";

···

       19
        
       

     

       20
        
         enableParallelBuilding = true;

     

       21
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       22
        
         meta = with stdenv.lib; {

     

       23
        
           homepage = http://www.gnome.org/;

     

       24
        
           description = "A library implementing a terminal emulator widget for GTK+";

+2 -2

pkgs/desktops/kde-4.14/applications/kate.nix

···

       1
       -
       { stdenv, kde, kdelibs, kactivities, qjson, pyqt4, python, pykde4}:

     

       2
        
       

     

       3
        
       kde {

     

       4
        
       

     

       5
       -
         buildInputs = [ kdelibs kactivities qjson pyqt4 python pykde4 ];

     

       6
        
       

     

       7
        
         meta = {

     

       8
        
           description = "Kate, the KDE Advanced Text Editor, as well as KWrite";

···

       1
       +
       { stdenv, kde, kdelibs, kactivities, qjson, pythonPackages, pykde4}:

     

       2
        
       

     

       3
        
       kde {

     

       4
        
       

     

       5
       +
         buildInputs = [ kdelibs kactivities qjson pythonPackages.pyqt4 pythonPackages.python pykde4 ];

     

       6
        
       

     

       7
        
         meta = {

     

       8
        
           description = "Kate, the KDE Advanced Text Editor, as well as KWrite";

+5 -4

pkgs/desktops/kde-4.14/kdebindings/pykde4.nix

···

       1
       -
       { kde, kdelibs, python, pyqt4, kdepimlibs, shared_desktop_ontologies,

     

       2
        
         polkit_qt4, boost, lndir, pkgconfig }:

     

       3
        
       

     

       4
       -
       let pydir = "lib/python${python.majorVersion}"; in

     

       5
       -
       

     

       6
       -
       kde {

     

       0
        
       
     

       7
        
       

     

       8
        
         patches = [ ./pykde4-gcc-5.patch ];

     

       9

···

       1
       +
       { kde, kdelibs, pythonPackages, kdepimlibs, shared_desktop_ontologies,

     

       2
        
         polkit_qt4, boost, lndir, pkgconfig }:

     

       3
        
       

     

       4
       +
       let

     

       5
       +
         inherit (pythonPackages) python pyqt4;

     

       6
       +
         pydir = "lib/python${python.majorVersion}";

     

       7
       +
       in kde {

     

       8
        
       

     

       9
        
         patches = [ ./pykde4-gcc-5.patch ];

     

       10

+2 -2

pkgs/desktops/kde-4.14/kdeutils/print-manager.nix

···

       1
        
       { kde, kdelibs

     

       2
       -
       , pythonPackages, cups, pyqt4, pykde4, pycups, system-config-printer }:

     

       3
        
       

     

       4
        
       let s_c_p = system-config-printer.override { withGUI = false; }; in

     

       5
        
       

     
···

       7
        
         buildInputs = [ kdelibs pythonPackages.python pythonPackages.wrapPython

     

       8
        
           ] ++ pythonPath;

     

       9
        
       

     

       10
       -
         pythonPath = [ cups pyqt4 pykde4 pycups s_c_p ];

     

       11
        
       

     

       12
        
         # system-config-printer supplies some D-Bus policy that we need.

     

       13
        
         propagatedUserEnvPkgs = [ s_c_p ];

···

       1
        
       { kde, kdelibs

     

       2
       +
       , pythonPackages, cups, pykde4, system-config-printer }:

     

       3
        
       

     

       4
        
       let s_c_p = system-config-printer.override { withGUI = false; }; in

     

       5
        
       

     
···

       7
        
         buildInputs = [ kdelibs pythonPackages.python pythonPackages.wrapPython

     

       8
        
           ] ++ pythonPath;

     

       9
        
       

     

       10
       +
         pythonPath = [ cups pythonPackages.pyqt4 pykde4 pythonPackages.pycups s_c_p ];

     

       11
        
       

     

       12
        
         # system-config-printer supplies some D-Bus policy that we need.

     

       13
        
         propagatedUserEnvPkgs = [ s_c_p ];

pkgs/desktops/kde-5/plasma/breeze-gtk.nix

···

       5
        
       plasmaPackage {

     

       6
        
         name = "breeze-gtk";

     

       7
        
         nativeBuildInputs = [ ecm ];

     

       0
        
       
     

       8
        
       }

···

       5
        
       plasmaPackage {

     

       6
        
         name = "breeze-gtk";

     

       7
        
         nativeBuildInputs = [ ecm ];

     

       8
       +
         cmakeFlags = [ "-DWITH_GTK3_VERSION=3.20" ];

     

       9
        
       }

pkgs/development/haskell-modules/configuration-common.nix

···

       30
        
           hardeningDisable = [ "format" ];

     

       31
        
         });

     

       32
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       33
        
         # Use the default version of mysql to build this package (which is actually mariadb).

     

       34
        
         mysql = super.mysql.override { mysql = pkgs.mysql.lib; };

     

       35

···

       30
        
           hardeningDisable = [ "format" ];

     

       31
        
         });

     

       32
        
       

     

       33
       +
         # This test keeps being aborted because it runs too quietly for too long

     

       34
       +
         Lazy-Pbkdf2 = if pkgs.stdenv.isi686 then dontCheck super.Lazy-Pbkdf2 else super.Lazy-Pbkdf2;

     

       35
       +
       

     

       36
        
         # Use the default version of mysql to build this package (which is actually mariadb).

     

       37
        
         mysql = super.mysql.override { mysql = pkgs.mysql.lib; };

     

       38

+4 -2

pkgs/development/interpreters/renpy/default.nix

···

       1
       -
       { stdenv, fetchurl, python, cython, pkgconfig, wrapPython

     

       2
       -
       , pygame, SDL, libpng, ffmpeg, freetype, glew, mesa, fribidi, zlib

     

       3
        
       }:

     

       0
        
       
     

       0
        
       
     

       4
        
       

     

       5
        
       stdenv.mkDerivation {

     

       6
        
         name = "renpy-6.17.6";

···

       1
       +
       { stdenv, fetchurl, pythonPackages, pkgconfig, SDL

     

       2
       +
       , libpng, ffmpeg, freetype, glew, mesa, fribidi, zlib

     

       3
        
       }:

     

       4
       +
       

     

       5
       +
       with pythonPackages;

     

       6
        
       

     

       7
        
       stdenv.mkDerivation {

     

       8
        
         name = "renpy-6.17.6";

+3 -4

pkgs/development/libraries/armadillo/default.nix

···

       1
       -
       { stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         version = "7.200.2";

     
···

       9
        
           sha256 = "1yvx75caks477jqwx5gspi6946jialddk00wdvg6dnh5wdi2xasm";

     

       10
        
         };

     

       11
        
       

     

       12
       -
         buildInputs = [ cmake openblasCompat superlu hdf5 ];

     

       13
        
       

     

       14
        
         cmakeFlags = [ "-DDETECT_HDF5=ON" ];

     

       15
        
       

     

       16
       -
         patches = [ ./use-unix-config-on-OS-X.patch

     

       17
       -
                     ./use-OpenBLAS-as-LAPACK.patch ];

     

       18
        
         

     

       19
        
         meta = with stdenv.lib; {

     

       20
        
           description = "C++ linear algebra library";

···

       1
       +
       { stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5-cpp }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         version = "7.200.2";

     
···

       9
        
           sha256 = "1yvx75caks477jqwx5gspi6946jialddk00wdvg6dnh5wdi2xasm";

     

       10
        
         };

     

       11
        
       

     

       12
       +
         buildInputs = [ cmake openblasCompat superlu hdf5-cpp ];

     

       13
        
       

     

       14
        
         cmakeFlags = [ "-DDETECT_HDF5=ON" ];

     

       15
        
       

     

       16
       +
         patches = [ ./use-unix-config-on-OS-X.patch ];

     

       0
        
       
     

       17
        
         

     

       18
        
         meta = with stdenv.lib; {

     

       19
        
           description = "C++ linear algebra library";

-14

pkgs/development/libraries/armadillo/use-OpenBLAS-as-LAPACK.patch

···

       1
       -
       diff --git a/cmake_aux/Modules/ARMA_FindLAPACK.cmake b/cmake_aux/Modules/ARMA_FindLAPACK.cmake

     

       2
       -
       index 5395afb..a203c93 100644

     

       3
       -
       --- a/cmake_aux/Modules/ARMA_FindLAPACK.cmake

     

       4
       -
       +++ b/cmake_aux/Modules/ARMA_FindLAPACK.cmake

     

       5
       -
       @@ -5,7 +5,7 @@

     

       6
       -
        # also defined, but not for general use are

     

       7
       -
        #  LAPACK_LIBRARY, where to find the LAPACK library.

     

       8
       -
        

     

       9
       -
       -SET(LAPACK_NAMES ${LAPACK_NAMES} lapack)

     

       10
       -
       +SET(LAPACK_NAMES ${LAPACK_NAMES} openblas)

     

       11
       -
        FIND_LIBRARY(LAPACK_LIBRARY

     

       12
       -
          NAMES ${LAPACK_NAMES}

     

       13
       -
          PATHS /usr/lib64/atlas /usr/lib/atlas /usr/lib64 /usr/lib /usr/local/lib64 /usr/local/lib

     

       14
       -

+3 -3

pkgs/development/libraries/cppzmq/default.nix

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

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

     

       5
       -
         version = "2016-01-20";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "zeromq";

     

       9
        
           repo = "cppzmq";

     

       10
       -
           rev = "68a7b09cfce01c4c279fba2cf91686fcfc566848";

     

       11
       -
           sha256 = "00dsqqlm8mxhm8kfdspxfln0wzwkyywscnf264afw02k6xf28ndm";

     

       12
        
         };

     

       13
        
       

     

       14
        
         installPhase = ''

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

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

     

       5
       +
         version = "2016-07-18";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "zeromq";

     

       9
        
           repo = "cppzmq";

     

       10
       +
           rev = "92d2af6def80a01b76d5e73f073c439ad00ab757";

     

       11
       +
           sha256 = "0lnwh314hh5ifad2sa2nz1g1ld1jc4vplm7clyvx304sjjvbvl27";

     

       12
        
         };

     

       13
        
       

     

       14
        
         installPhase = ''

+6 -6

pkgs/development/libraries/folly/default.nix

···

       1
       -
       { stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, boost, libevent, double_conversion, glog

     

       2
       -
       , google-gflags, python, libiberty, openssl }:

     

       3
        
       

     

       4
        
       stdenv.mkDerivation rec {

     

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

     

       6
       -
         version = "2016-04-29";

     

       7
        
       

     

       8
        
         src = fetchFromGitHub {

     

       9
        
           owner = "facebook";

     

       10
        
           repo = "folly";

     

       11
       -
           rev = "b31eb722e444ab0293a73fe9de3f94e657ca6de9";

     

       12
       -
           sha256 = "0s95y0wnz4xbrkzbiksnb0n0d0qrkcsbssznng57kwlq8jlfka24";

     

       13
        
         };

     

       14
        
       

     

       15
       -
         nativeBuildInputs = [ autoreconfHook python ];

     

       16
        
         buildInputs = [ libiberty boost libevent double_conversion glog google-gflags openssl ];

     

       17
        
       

     

       18
        
         postPatch = "cd folly";

···

       1
       +
       { stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig, boost, libevent

     

       2
       +
       , double_conversion, glog, google-gflags, python, libiberty, openssl }:

     

       3
        
       

     

       4
        
       stdenv.mkDerivation rec {

     

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

     

       6
       +
         version = "2016.08.08.00";

     

       7
        
       

     

       8
        
         src = fetchFromGitHub {

     

       9
        
           owner = "facebook";

     

       10
        
           repo = "folly";

     

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

     

       12
       +
           sha256 = "0f9xdi8w2mbn6gxjfvpzh8i22ca8p11a2ss6qkw31yhdgd3s9087";

     

       13
        
         };

     

       14
        
       

     

       15
       +
         nativeBuildInputs = [ autoreconfHook python pkgconfig ];

     

       16
        
         buildInputs = [ libiberty boost libevent double_conversion glog google-gflags openssl ];

     

       17
        
       

     

       18
        
         postPatch = "cd folly";

+2 -2

pkgs/development/libraries/icu/default.nix

···

       2
        
       

     

       3
        
       let

     

       4
        
         pname = "icu4c";

     

       5
       -
         version = "56.1";

     

       6
        
       in

     

       7
        
       stdenv.mkDerivation ({

     

       8
        
         name = pname + "-" + version;

     
···

       10
        
         src = fetchurl {

     

       11
        
           url = "http://download.icu-project.org/files/${pname}/${version}/${pname}-"

     

       12
        
             + (stdenv.lib.replaceChars ["."] ["_"] version) + "-src.tgz";

     

       13
       -
           sha256 = "05j86714qaj0lvhvyr2s1xncw6sk0h2dcghb3iiwykbkbh8fjr1s";

     

       14
        
         };

     

       15
        
       

     

       16
        
         outputs = [ "dev" "out" ];

···

       2
        
       

     

       3
        
       let

     

       4
        
         pname = "icu4c";

     

       5
       +
         version = "57.1";

     

       6
        
       in

     

       7
        
       stdenv.mkDerivation ({

     

       8
        
         name = pname + "-" + version;

     
···

       10
        
         src = fetchurl {

     

       11
        
           url = "http://download.icu-project.org/files/${pname}/${version}/${pname}-"

     

       12
        
             + (stdenv.lib.replaceChars ["."] ["_"] version) + "-src.tgz";

     

       13
       +
           sha256 = "10cmkqigxh9f73y7q3p991q6j8pph0mrydgj11w1x6wlcp5ng37z";

     

       14
        
         };

     

       15
        
       

     

       16
        
         outputs = [ "dev" "out" ];

pkgs/development/libraries/jemalloc/default.nix

···

       8
        
           sha256 = "1bmdr51wxiir595k2r6z9a7rcgm42kkgnr586xir7vdcndr3pwf8";

     

       9
        
         };

     

       10
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       11
        
         meta = with stdenv.lib; {

     

       12
        
           homepage = http://www.canonware.com/jemalloc/index.html;

     

       13
        
           description = "General purpose malloc(3) implementation";

···

       8
        
           sha256 = "1bmdr51wxiir595k2r6z9a7rcgm42kkgnr586xir7vdcndr3pwf8";

     

       9
        
         };

     

       10
        
       

     

       11
       +
         # By default, jemalloc puts a je_ prefix onto all its symbols on OSX, which

     

       12
       +
         # then stops downstream builds (mariadb in particular) from detecting it. This

     

       13
       +
         # option should remove the prefix and give us a working jemalloc.

     

       14
       +
         configureFlags = stdenv.lib.optional stdenv.isDarwin "--with-jemalloc-prefix=";

     

       15
       +
       

     

       16
        
         meta = with stdenv.lib; {

     

       17
        
           homepage = http://www.canonware.com/jemalloc/index.html;

     

       18
        
           description = "General purpose malloc(3) implementation";

-6

pkgs/development/libraries/libbsd/default.nix

···

       9
        
           sha256 = "02i5brb2007sxq3mn862mr7yxxm0g6nj172417hjyvjax7549xmj";

     

       10
        
         };

     

       11
        
       

     

       12
       -
         patchPhase = ''

     

       13
       -
           substituteInPlace Makefile \

     

       14
       -
             --replace "/usr" "$out" \

     

       15
       -
             --replace "{exec_prefix}" "{prefix}"

     

       16
       -
         '';

     

       17
       -
       

     

       18
        
         meta = {

     

       19
        
           description = "Common functions found on BSD systems";

     

       20
        
           homepage = http://libbsd.freedesktop.org/;

···

       9
        
           sha256 = "02i5brb2007sxq3mn862mr7yxxm0g6nj172417hjyvjax7549xmj";

     

       10
        
         };

     

       11
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       12
        
         meta = {

     

       13
        
           description = "Common functions found on BSD systems";

     

       14
        
           homepage = http://libbsd.freedesktop.org/;

+28

pkgs/development/libraries/libdynd/default.nix

···

       1
       +
       { stdenv, fetchFromGitHub, cmake }:

     

       2
       +
       

     

       3
       +
       let version = "0.7.2"; in

     

       4
       +
       stdenv.mkDerivation {

     

       5
       +
         name = "libdynd-${version}";

     

       6
       +
       

     

       7
       +
         src = fetchFromGitHub {

     

       8
       +
           owner = "libdynd";

     

       9
       +
           repo = "libdynd";

     

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

     

       11
       +
           sha256 = "0fkd5rawqni1cq51fmr76iw7ll4fmbahfwv4rglnsabbkylf73pr";

     

       12
       +
         };

     

       13
       +
       

     

       14
       +
         cmakeFlags = [

     

       15
       +
           "-DDYND_BUILD_BENCHMARKS=OFF"

     

       16
       +
         ];

     

       17
       +
       

     

       18
       +
         buildInputs = [ cmake ];

     

       19
       +
       

     

       20
       +
         outputs = [ "dev" "out" ];

     

       21
       +
         outputDoc = "dev";

     

       22
       +
       

     

       23
       +
         meta = with stdenv.lib; {

     

       24
       +
           description = "C++ dynamic ndarray library, with Python exposure.";

     

       25
       +
           homepage = http://libdynd.org;

     

       26
       +
           license = licenses.bsd2;

     

       27
       +
         };

     

       28
       +
       }

+2 -2

pkgs/development/libraries/libvdpau-va-gl/default.nix

···

       3
        
       

     

       4
        
       stdenv.mkDerivation rec {

     

       5
        
         name = "libvdpau-va-gl-${version}";

     

       6
       -
         version = "0.3.6";

     

       7
        
       

     

       8
        
         src = fetchFromGitHub {

     

       9
        
           owner = "i-rinat";

     

       10
        
           repo = "libvdpau-va-gl";

     

       11
        
           rev = "v${version}";

     

       12
       -
           sha256 = "06lcg6zfj6mn17svz7s0y6ijdah55l9rnp9r440lcbixivjbgyn5";

     

       13
        
         };

     

       14
        
       

     

       15
        
         nativeBuildInputs = [ cmake pkgconfig ];

···

       3
        
       

     

       4
        
       stdenv.mkDerivation rec {

     

       5
        
         name = "libvdpau-va-gl-${version}";

     

       6
       +
         version = "0.4.0";

     

       7
        
       

     

       8
        
         src = fetchFromGitHub {

     

       9
        
           owner = "i-rinat";

     

       10
        
           repo = "libvdpau-va-gl";

     

       11
        
           rev = "v${version}";

     

       12
       +
           sha256 = "1y511jxs0df1fqzjcvb6zln7nbmchv1g6z3lw0z9nsf64ziycj8k";

     

       13
        
         };

     

       14
        
       

     

       15
        
         nativeBuildInputs = [ cmake pkgconfig ];

+3 -5

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

···

       1
        
       { stdenv, fetchurl, unzip, openblas, gfortran }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
       -
         version = "3.12.4";

     

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

     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
        
           url = "http://www.coin-or.org/download/source/Ipopt/Ipopt-${version}.zip";

     

       9
       -
           sha256 = "0hxmpi3zx5zgv2ijscdvc40xf88hx5if0d9sgch155z70g15wx0l";

     

       10
        
         };

     

       11
        
       

     

       12
       -
         preConfigure = ''

     

       13
       -
            export CXXDEFS="-DHAVE_RAND -DHAVE_CSTRING -DHAVE_CSTDIO"

     

       14
       -
         '';

     

       15
        
       

     

       16
        
         configureFlags = [

     

       17
        
           "--with-blas-lib=-lopenblas"

···

       1
        
       { stdenv, fetchurl, unzip, openblas, gfortran }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
       +
         version = "3.12.6";

     

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

     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
        
           url = "http://www.coin-or.org/download/source/Ipopt/Ipopt-${version}.zip";

     

       9
       +
           sha256 = "0lx09h1757s5jppwnxwblcjk0biqjxy7yaf3z4vfqbl4rl93avs0";

     

       10
        
         };

     

       11
        
       

     

       12
       +
         CXXDEFS = [ "-DHAVE_RAND" "-DHAVE_CSTRING" "-DHAVE_CSTDIO" ];

     

       0
        
       
     

       0
        
       
     

       13
        
       

     

       14
        
         configureFlags = [

     

       15
        
           "--with-blas-lib=-lopenblas"

+3 -5

pkgs/development/libraries/xgboost/default.nix

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

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

     

       5
       -
         version = "2016-05-14";

     

       6
        
       

     

       7
        
         # needs submodules

     

       8
        
         src = fetchgit {

     

       9
        
           url = "https://github.com/dmlc/xgboost";

     

       10
       -
           rev = "9c26566eb09733423f821f139938ff4105c3775d";

     

       11
       -
           sha256 = "1d7lnbwxwakclqqfjwyk9w3wd2clkihdr6ljs5z08ydiaspri093";

     

       12
        
         };

     

       13
       -
       

     

       14
       -
         postPatch = "sed '1i#include <cmath>' -i src/tree/param.h";

     

       15
        
       

     

       16
        
         enableParallelBuilding = true;

     

       17

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

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

     

       5
       +
         version = "0.60";

     

       6
        
       

     

       7
        
         # needs submodules

     

       8
        
         src = fetchgit {

     

       9
        
           url = "https://github.com/dmlc/xgboost";

     

       10
       +
           rev = "refs/tags/v${version}";

     

       11
       +
           sha256 = "0536vfl59n9vlagl1cpdl06c9y19dscwhwdzvi27zk5nc5qb6rdq";

     

       12
        
         };

     

       0
        
       
     

       0
        
       
     

       13
        
       

     

       14
        
         enableParallelBuilding = true;

     

       15

+4 -1

pkgs/development/python-modules/pyqt/4.x.nix

···

       40
        
       

     

       41
        
         enableParallelBuilding = true;

     

       42
        
       

     

       43
       -
         passthru.pythonPath = [];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       44
        
       

     

       45
        
         meta = {

     

       46
        
           description = "Python bindings for Qt";

···

       40
        
       

     

       41
        
         enableParallelBuilding = true;

     

       42
        
       

     

       43
       +
         passthru = {

     

       44
       +
           pythonPath = [];

     

       45
       +
           qt = qt4;

     

       46
       +
         };

     

       47
        
       

     

       48
        
         meta = {

     

       49
        
           description = "Python bindings for Qt";

+42

pkgs/development/tools/java/visualvm/default.nix

···

       1
       +
       { stdenv, fetchzip, lib, makeWrapper, jdk, gtk }:

     

       2
       +
       

     

       3
       +
       stdenv.mkDerivation rec {

     

       4
       +
         name = "visualvm-1.3.8";

     

       5
       +
       

     

       6
       +
         src = fetchzip {

     

       7
       +
           url = "https://java.net/projects/visualvm/downloads/download/release138/visualvm_138.zip";

     

       8
       +
           sha256 = "09wsi85z1g7bwyfhb37vw0gy3wl0j1cy35aj59rg7067q262gy1y";

     

       9
       +
         };

     

       10
       +
       

     

       11
       +
         nativeBuildInputs = [ makeWrapper ];

     

       12
       +
       

     

       13
       +
         installPhase = ''

     

       14
       +
           rm bin/visualvm.exe

     

       15
       +
       

     

       16
       +
           substituteInPlace etc/visualvm.conf \

     

       17
       +
             --replace "#visualvm_jdkhome=" "visualvm_jdkhome=" \

     

       18
       +
             --replace "/path/to/jdk" "${jdk.home}" \

     

       19
       +
             --replace 'visualvm_default_options="' 'visualvm_default_options="--laf com.sun.java.swing.plaf.gtk.GTKLookAndFeel -J-Dawt.useSystemAAFontSettings=lcd -J-Dswing.aatext=true '

     

       20
       +
       

     

       21
       +
           cp -r . $out

     

       22
       +
       

     

       23
       +
           # To get the native LAF, JVM needs to see GTK’s .so-s.

     

       24
       +
           wrapProgram $out/bin/visualvm \

     

       25
       +
             --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gtk ]}"

     

       26
       +
         '';

     

       27
       +
       

     

       28
       +
         meta = with stdenv.lib; {

     

       29
       +
           description = "A visual interface for viewing information about Java applications";

     

       30
       +
           longDescription = ''

     

       31
       +
             VisualVM is a visual tool integrating several commandline JDK

     

       32
       +
             tools and lightweight profiling capabilities. Designed for both

     

       33
       +
             production and development time use, it further enhances the

     

       34
       +
             capability of monitoring and performance analysis for the Java

     

       35
       +
             SE platform.

     

       36
       +
           '';

     

       37
       +
           homepage = https://visualvm.java.net/;

     

       38
       +
           license = licenses.gpl2ClasspathPlus;

     

       39
       +
           platforms = platforms.all;

     

       40
       +
           maintainers = with maintainers; [ michalrus ];

     

       41
       +
         };

     

       42
       +
       }

+6 -16

pkgs/development/tools/pypi2nix/default.nix

···

       3
        
       

     

       4
        
       let

     

       5
        
         deps = import ./deps.nix { inherit fetchurl; };

     

       6
       -
         version = "1.3.0";

     

       7
        
         src = fetchurl {

     

       8
        
           url = "https://github.com/garbas/pypi2nix/archive/v${version}.tar.gz";

     

       9
       -
           sha256 = "0mk9v4s51jdrrcs78v3cm131pz3fdhjkd4cmmfn1kkcfcpqzw6j8";

     

       10
       -
           

     

       11
        
         };

     

       12
        
       in stdenv.mkDerivation rec {

     

       13
        
         name = "pypi2nix-${version}";

     

       14
        
         srcs = with deps; [

     

       15
        
           src

     

       16
       -
           pip

     

       17
        
           click

     

       18
       -
           setuptools

     

       19
       -
           zcbuildout

     

       20
       -
           zcrecipeegg

     

       21
        
           requests

     

       22
        
         ];  # six attrs effect ];

     

       23
        
         buildInputs = [ python zip makeWrapper ];

     
···

       26
        
         postUnpack = ''

     

       27
        
           mkdir -p $out/pkgs

     

       28
        
       

     

       29
       -
           mv pip-*/pip                        $out/pkgs/pip

     

       30
        
           mv click-*/click                    $out/pkgs/click

     

       31
       -
           mv setuptools-*/setuptools          $out/pkgs/setuptools

     

       32
       -
           mv zc.buildout-*/src/zc             $out/pkgs/zc

     

       33
       -
           mv zc.recipe.egg-*/src/zc/recipe    $out/pkgs/zc/recipe

     

       34
        
           # mv six-*/six.py                    $out/pkgs/

     

       35
        
           # mv attrs-*/src/attr                $out/pkgs/attrs

     

       36
        
           # mv effect-*/effect                 $out/pkgs/effect

     

       37
        
           mv requests-*/requests              $out/pkgs/

     

       38
        
       

     

       39
       -
           if [ -z "$IN_NIX_SHELL" ]; then

     

       40
        
             if [ -e git-export ]; then

     

       41
        
               mv git-export/src/pypi2nix      $out/pkgs/pypi2nix

     

       42
        
             else

     
···

       48
        
         commonPhase = ''

     

       49
        
           mkdir -p $out/bin

     

       50
        
       

     

       51
       -
           echo "#!${python}/bin/python3"       >  $out/bin/pypi2nix

     

       52
       -
           echo "import pypi2nix.cli"          >> $out/bin/pypi2nix

     

       53
       -
           echo "pypi2nix.cli.main()"          >> $out/bin/pypi2nix

     

       54
        
       

     

       55
        
           chmod +x $out/bin/pypi2nix

     

       56
        
       

     
···

       81
        
           homepage = https://github.com/garbas/pypi2nix;

     

       82
        
           description = "A tool that generates nix expressions for your python packages, so you don't have to.";

     

       83
        
           maintainers = with stdenv.lib.maintainers; [ garbas ];

     

       84
       -
           platforms = with stdenv.lib.platforms; unix;

     

       85
        
         };

     

       86
        
       }

···

       3
        
       

     

       4
        
       let

     

       5
        
         deps = import ./deps.nix { inherit fetchurl; };

     

       6
       +
         version = "1.4.0";

     

       7
        
         src = fetchurl {

     

       8
        
           url = "https://github.com/garbas/pypi2nix/archive/v${version}.tar.gz";

     

       9
       +
           sha256 = "0w5f10p4d4ppwg2plbbrmqwmi1ycgpaidyajza11c9svka014zrb";

     

       0
        
       
     

       10
        
         };

     

       11
        
       in stdenv.mkDerivation rec {

     

       12
        
         name = "pypi2nix-${version}";

     

       13
        
         srcs = with deps; [

     

       14
        
           src

     

       0
        
       
     

       15
        
           click

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       16
        
           requests

     

       17
        
         ];  # six attrs effect ];

     

       18
        
         buildInputs = [ python zip makeWrapper ];

     
···

       21
        
         postUnpack = ''

     

       22
        
           mkdir -p $out/pkgs

     

       23
        
       

     

       0
        
       
     

       24
        
           mv click-*/click                    $out/pkgs/click

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       25
        
           # mv six-*/six.py                    $out/pkgs/

     

       26
        
           # mv attrs-*/src/attr                $out/pkgs/attrs

     

       27
        
           # mv effect-*/effect                 $out/pkgs/effect

     

       28
        
           mv requests-*/requests              $out/pkgs/

     

       29
        
       

     

       30
       +
           if [ "$IN_NIX_SHELL" != "1" ]; then

     

       31
        
             if [ -e git-export ]; then

     

       32
        
               mv git-export/src/pypi2nix      $out/pkgs/pypi2nix

     

       33
        
             else

     
···

       39
        
         commonPhase = ''

     

       40
        
           mkdir -p $out/bin

     

       41
        
       

     

       42
       +
           echo "#!${python.interpreter}" >  $out/bin/pypi2nix

     

       43
       +
           echo "import pypi2nix.cli" >> $out/bin/pypi2nix

     

       44
       +
           echo "pypi2nix.cli.main()" >> $out/bin/pypi2nix

     

       45
        
       

     

       46
        
           chmod +x $out/bin/pypi2nix

     

       47
        
       

     
···

       72
        
           homepage = https://github.com/garbas/pypi2nix;

     

       73
        
           description = "A tool that generates nix expressions for your python packages, so you don't have to.";

     

       74
        
           maintainers = with stdenv.lib.maintainers; [ garbas ];

     

       0
        
       
     

       75
        
         };

     

       76
        
       }

pkgs/development/tools/pypi2nix/deps.nix

···

       17
        
         zcrecipeeggVersion = "2.0.3";

     

       18
        
         zcrecipeeggHash = "69a8ce276029390a36008150444aa0b4";

     

       19
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       20
        
         wheelVersion = "0.29.0";

     

       21
        
         wheelHash = "555a67e4507cedee23a0deb9651e452f";

     

       22
        
       

     
···

       69
        
         zcrecipeegg = fetchurl {

     

       70
        
           url = "https://pypi.python.org/packages/08/5e/ade683d229d77ed457017145672f1be4fd98be60f1a5344109a4e66a7d54/zc.recipe.egg-${zcrecipeeggVersion}.tar.gz";

     

       71
        
           md5 = zcrecipeeggHash;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       72
        
         };

     

       73
        
       

     

       74
        
         wheel = fetchurl {

···

       17
        
         zcrecipeeggVersion = "2.0.3";

     

       18
        
         zcrecipeeggHash = "69a8ce276029390a36008150444aa0b4";

     

       19
        
       

     

       20
       +
         buildoutrequirementsVersion = "0.2.2";

     

       21
       +
         buildoutrequirementsHash = "0b4e53d871b167eaac0846942221af00";

     

       22
       +
       

     

       23
        
         wheelVersion = "0.29.0";

     

       24
        
         wheelHash = "555a67e4507cedee23a0deb9651e452f";

     

       25
        
       

     
···

       72
        
         zcrecipeegg = fetchurl {

     

       73
        
           url = "https://pypi.python.org/packages/08/5e/ade683d229d77ed457017145672f1be4fd98be60f1a5344109a4e66a7d54/zc.recipe.egg-${zcrecipeeggVersion}.tar.gz";

     

       74
        
           md5 = zcrecipeeggHash;

     

       75
       +
         };

     

       76
       +
       

     

       77
       +
         buildoutrequirements = fetchurl {

     

       78
       +
           url = "https://github.com/garbas/buildout.requirements/archive/1e2977e2d254184399401746736d2b17c912b350.tar.gz";

     

       79
       +
           md5 = buildoutrequirementsHash;

     

       80
        
         };

     

       81
        
       

     

       82
        
         wheel = fetchurl {

+3 -3

pkgs/games/crawl/default.nix

···

       3
        
       , tileMode ? false

     

       4
        
       }:

     

       5
        
       

     

       6
       -
       let version = "0.18.0";

     

       7
       -
       in

     

       8
        
       stdenv.mkDerivation rec {

     

       9
        
         name = "crawl-${version}" + (if tileMode then "-tiles" else "");

     

       0
        
       
     

       0
        
       
     

       10
        
         src = fetchFromGitHub {

     

       11
        
           owner = "crawl-ref";

     

       12
        
           repo = "crawl-ref";

     

       13
        
           rev = version;

     

       14
       -
           sha256 = "0mgg9lzy7lp5bhp8340a6c6qyz7yiz80wb39gknls8hvv0f6i0si";

     

       15
        
         };

     

       16
        
       

     

       17
        
         patches = [ ./crawl_purify.patch ];

···

       3
        
       , tileMode ? false

     

       4
        
       }:

     

       5
        
       

     

       0
        
       
     

       0
        
       
     

       6
        
       stdenv.mkDerivation rec {

     

       7
        
         name = "crawl-${version}" + (if tileMode then "-tiles" else "");

     

       8
       +
         version = "0.18.1";

     

       9
       +
       

     

       10
        
         src = fetchFromGitHub {

     

       11
        
           owner = "crawl-ref";

     

       12
        
           repo = "crawl-ref";

     

       13
        
           rev = version;

     

       14
       +
           sha256 = "1cg5mxhx0lfhadls6n8avcpkjx08nqf1y085li97zqxl3gjaj64j";

     

       15
        
         };

     

       16
        
       

     

       17
        
         patches = [ ./crawl_purify.patch ];

+2 -2

pkgs/games/dwarf-fortress/default.nix

···

       5
        
         callPackage_i686 = pkgsi686Linux.newScope self;

     

       6
        
       

     

       7
        
         self = rec {

     

       8
       -
           dwarf-fortress-original = callPackage_i686 ./game.nix { };

     

       9
        
       

     

       10
        
           dfhack = callPackage_i686 ./dfhack {

     

       11
        
             inherit (pkgsi686Linux.perlPackages) XMLLibXML XMLLibXSLT;

     
···

       14
        
             };

     

       15
        
           };

     

       16
        
       

     

       17
       -
           dwarf-fortress-unfuck = callPackage_i686 ./unfuck.nix { };

     

       18
        
       

     

       19
        
           dwarf-fortress = callPackage ./wrapper {

     

       20
        
             themes = {

···

       5
        
         callPackage_i686 = pkgsi686Linux.newScope self;

     

       6
        
       

     

       7
        
         self = rec {

     

       8
       +
           dwarf-fortress-original = callPackage ./game.nix { };

     

       9
        
       

     

       10
        
           dfhack = callPackage_i686 ./dfhack {

     

       11
        
             inherit (pkgsi686Linux.perlPackages) XMLLibXML XMLLibXSLT;

     
···

       14
        
             };

     

       15
        
           };

     

       16
        
       

     

       17
       +
           dwarf-fortress-unfuck = callPackage ./unfuck.nix { };

     

       18
        
       

     

       19
        
           dwarf-fortress = callPackage ./wrapper {

     

       20
        
             themes = {

+7 -5

pkgs/games/dwarf-fortress/dfhack/default.nix

···

       5
        
       }:

     

       6
        
       

     

       7
        
       let

     

       8
       -
         dfVersion = "0.42.06";

     

       9
        
         version = "${dfVersion}-r1";

     

       0
        
       
     

       10
        
         rev = "refs/tags/${version}";

     

       11
        
         # revision of library/xml submodule

     

       12
        
         xmlRev = "98cc1e01886aaea161d651cf97229ad08e9782b0";

     
···

       14
        
         fakegit = writeScriptBin "git" ''

     

       15
        
           #! ${stdenv.shell}

     

       16
        
           if [ "$*" = "describe --tags --long" ]; then

     

       17
       -
             echo "${dfVersion}-unknown"

     

       18
        
           elif [ "$*" = "rev-parse HEAD" ]; then

     

       19
        
             if [ "$(dirname "$(pwd)")" = "xml" ]; then

     

       20
        
               echo "${xmlRev}"

     
···

       35
        
         src = fetchgit {

     

       36
        
           url = "https://github.com/DFHack/dfhack";

     

       37
        
           inherit rev;

     

       38
       -
           sha256 = "1p234m8r84cdr4bx622hcd13mshnjc5bw7hdxhv18waaxvdpv6jh";

     

       39
        
         };

     

       40
        
       

     

       41
        
         patches = [ ./use-system-libraries.patch ];

     

       42
       -
         postPatch = "sed '1i#include <math.h>' -i plugins/3dveins.cpp";

     

       43
        
       

     

       44
        
         nativeBuildInputs = [ cmake perl XMLLibXML XMLLibXSLT fakegit ];

     

       45
        
         # we can't use native Lua; upstream uses private headers

     

       46
        
         buildInputs = [ zlib jsoncpp protobuf tinyxml ];

     

       47
        
       

     

       0
        
       
     

       0
        
       
     

       48
        
         enableParallelBuilding = true;

     

       49
        
       

     

       50
       -
         passthru = { inherit dfVersion; };

     

       51
        
       

     

       52
        
         meta = with stdenv.lib; {

     

       53
        
           description = "Memory hacking library for Dwarf Fortress and a set of tools that use it";

···

       5
        
       }:

     

       6
        
       

     

       7
        
       let

     

       8
       +
         dfVersion = "0.43.03";

     

       9
        
         version = "${dfVersion}-r1";

     

       10
       +
       

     

       11
        
         rev = "refs/tags/${version}";

     

       12
        
         # revision of library/xml submodule

     

       13
        
         xmlRev = "98cc1e01886aaea161d651cf97229ad08e9782b0";

     
···

       15
        
         fakegit = writeScriptBin "git" ''

     

       16
        
           #! ${stdenv.shell}

     

       17
        
           if [ "$*" = "describe --tags --long" ]; then

     

       18
       +
             echo "${version}-unknown"

     

       19
        
           elif [ "$*" = "rev-parse HEAD" ]; then

     

       20
        
             if [ "$(dirname "$(pwd)")" = "xml" ]; then

     

       21
        
               echo "${xmlRev}"

     
···

       36
        
         src = fetchgit {

     

       37
        
           url = "https://github.com/DFHack/dfhack";

     

       38
        
           inherit rev;

     

       39
       +
           sha256 = "0m5kqpaz0ypji4c32w0hhbsicvgvnjh56pqvq7af6pqqnyg1nzcx";

     

       40
        
         };

     

       41
        
       

     

       42
        
         patches = [ ./use-system-libraries.patch ];

     

       0
        
       
     

       43
        
       

     

       44
        
         nativeBuildInputs = [ cmake perl XMLLibXML XMLLibXSLT fakegit ];

     

       45
        
         # we can't use native Lua; upstream uses private headers

     

       46
        
         buildInputs = [ zlib jsoncpp protobuf tinyxml ];

     

       47
        
       

     

       48
       +
         cmakeFlags = [ "-DEXTERNAL_TINYXML=ON" ];

     

       49
       +
       

     

       50
        
         enableParallelBuilding = true;

     

       51
        
       

     

       52
       +
         passthru = { inherit version dfVersion; };

     

       53
        
       

     

       54
        
         meta = with stdenv.lib; {

     

       55
        
           description = "Memory hacking library for Dwarf Fortress and a set of tools that use it";

+15 -27

pkgs/games/dwarf-fortress/dfhack/use-system-libraries.patch

···

       1
        
       diff --git a/CMakeLists.txt b/CMakeLists.txt

     

       2
       -
       index 46fd565..254c3c0 100644

     

       3
        
       --- a/CMakeLists.txt

     

       4
        
       +++ b/CMakeLists.txt

     

       5
        
       @@ -160,8 +160,6 @@ ELSEIF(MSVC)

     
···

       11
        
        ADD_DEFINITIONS(-DLUA_BUILD_AS_DLL)

     

       12
        
        

     

       13
        
        if(APPLE)

     

       14
       -
       @@ -182,11 +180,8 @@ else()

     

       15
        
            set(ZLIB_ROOT /usr/lib/i386-linux-gnu)

     

       16
        
        endif()

     

       17
        
        find_package(ZLIB REQUIRED)

     
···

       19
        
        include_directories(depends/lua/include)

     

       20
        
        include_directories(depends/md5)

     

       21
        
       -include_directories(depends/jsoncpp)

     

       22
       -
       -include_directories(depends/tinyxml)

     

       23
       -
        include_directories(depends/tthread)

     

       24
       -
        include_directories(${ZLIB_INCLUDE_DIRS})

     

       25
       -
        include_directories(depends/clsocket/src)

     

       26
        
       diff --git a/depends/CMakeLists.txt b/depends/CMakeLists.txt

     

       27
       -
       index bf0345b..2a1a852 100644

     

       28
        
       --- a/depends/CMakeLists.txt

     

       29
        
       +++ b/depends/CMakeLists.txt

     

       30
       -
       @@ -1,10 +1,7 @@

     

       31
        
        #list depends here.

     

       32
        
        add_subdirectory(lua)

     

       33
        
        add_subdirectory(md5)

     

       34
        
       -add_subdirectory(protobuf)

     

       35
       -
       -add_subdirectory(tinyxml)

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       36
        
        add_subdirectory(tthread)

     

       37
        
       -add_subdirectory(jsoncpp)

     

       38
        
        # build clsocket static and only as a dependency. Setting those options here overrides its own default settings.

     

       39
        
        OPTION(CLSOCKET_SHARED "Build clsocket lib as shared." OFF)

     

       40
        
        OPTION(CLSOCKET_DEP_ONLY "Build for use inside other CMake projects as dependency." ON)

     

       41
        
       diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt

     

       42
       -
       index 54300ec..128bfd1 100644

     

       43
        
       --- a/library/CMakeLists.txt

     

       44
        
       +++ b/library/CMakeLists.txt

     

       45
        
       @@ -223,10 +223,10 @@ LIST(APPEND PROJECT_SOURCES ${PROJECT_PROTO_SRCS})

     
···

       55
        
        )

     

       56
        
        

     

       57
        
        # Merge headers into sources

     

       58
       -
       @@ -269,12 +269,12 @@ IF(UNIX)

     

       59
       -
        ENDIF()

     

       60
       -
        

     

       61
       -
        IF(APPLE)

     

       62
       -
       -  SET(PROJECT_LIBS dl dfhack-md5 dfhack-tinyxml dfhack-tinythread)

     

       63
       -
       +  SET(PROJECT_LIBS dl dfhack-md5 tinyxml dfhack-tinythread)

     

       64
       -
        ELSEIF(UNIX)

     

       65
       -
       -  SET(PROJECT_LIBS rt dl dfhack-md5 dfhack-tinyxml dfhack-tinythread)

     

       66
       -
       +  SET(PROJECT_LIBS rt dl dfhack-md5 tinyxml dfhack-tinythread)

     

       67
       -
        ELSE(WIN32)

     

       68
       -
          #FIXME: do we really need psapi?

     

       69
       -
       -  SET(PROJECT_LIBS psapi dfhack-md5 dfhack-tinyxml dfhack-tinythread)

     

       70
       -
       +  SET(PROJECT_LIBS psapi dfhack-md5 tinyxml dfhack-tinythread)

     

       71
       -
        ENDIF()

     

       72
       -
        

     

       73
       -
        ADD_LIBRARY(dfhack-version STATIC DFHackVersion.cpp)

     

       74
        
       diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt

     

       75
       -
       index dd1c634..7bd8c17 100644

     

       76
        
       --- a/plugins/CMakeLists.txt

     

       77
        
       +++ b/plugins/CMakeLists.txt

     

       78
        
       @@ -47,11 +47,11 @@ STRING(REPLACE ".proto" ".pb.h" PROJECT_PROTO_HDRS "${PROJECT_PROTOS}")

···

       1
        
       diff --git a/CMakeLists.txt b/CMakeLists.txt

     

       2
       +
       index 956edfc..fb0e6bc 100644

     

       3
        
       --- a/CMakeLists.txt

     

       4
        
       +++ b/CMakeLists.txt

     

       5
        
       @@ -160,8 +160,6 @@ ELSEIF(MSVC)

     
···

       11
        
        ADD_DEFINITIONS(-DLUA_BUILD_AS_DLL)

     

       12
        
        

     

       13
        
        if(APPLE)

     

       14
       +
       @@ -182,10 +180,8 @@ else()

     

       15
        
            set(ZLIB_ROOT /usr/lib/i386-linux-gnu)

     

       16
        
        endif()

     

       17
        
        find_package(ZLIB REQUIRED)

     
···

       19
        
        include_directories(depends/lua/include)

     

       20
        
        include_directories(depends/md5)

     

       21
        
       -include_directories(depends/jsoncpp)

     

       22
       +
        

     

       23
       +
        # Support linking against external tinyxml

     

       24
       +
        # If we find an external tinyxml, set the DFHACK_TINYXML variable to "tinyxml"

     

       0
        
       
     

       25
        
       diff --git a/depends/CMakeLists.txt b/depends/CMakeLists.txt

     

       26
       +
       index d8442b1..b47dc2a 100644

     

       27
        
       --- a/depends/CMakeLists.txt

     

       28
        
       +++ b/depends/CMakeLists.txt

     

       29
       +
       @@ -1,7 +1,6 @@

     

       30
        
        #list depends here.

     

       31
        
        add_subdirectory(lua)

     

       32
        
        add_subdirectory(md5)

     

       33
        
       -add_subdirectory(protobuf)

     

       34
       +
        

     

       35
       +
        # Don't build tinyxml if it's being externally linked against.

     

       36
       +
        if(NOT TinyXML_FOUND)

     

       37
       +
       @@ -9,7 +8,6 @@ if(NOT TinyXML_FOUND)

     

       38
       +
        endif()

     

       39
       +
        

     

       40
        
        add_subdirectory(tthread)

     

       41
        
       -add_subdirectory(jsoncpp)

     

       42
        
        # build clsocket static and only as a dependency. Setting those options here overrides its own default settings.

     

       43
        
        OPTION(CLSOCKET_SHARED "Build clsocket lib as shared." OFF)

     

       44
        
        OPTION(CLSOCKET_DEP_ONLY "Build for use inside other CMake projects as dependency." ON)

     

       45
        
       diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt

     

       46
       +
       index d3e3480..5d4b572 100644

     

       47
        
       --- a/library/CMakeLists.txt

     

       48
        
       +++ b/library/CMakeLists.txt

     

       49
        
       @@ -223,10 +223,10 @@ LIST(APPEND PROJECT_SOURCES ${PROJECT_PROTO_SRCS})

     
···

       59
        
        )

     

       60
        
        

     

       61
        
        # Merge headers into sources

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       62
        
       diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt

     

       63
       +
       index c24b940..afeb888 100644

     

       64
        
       --- a/plugins/CMakeLists.txt

     

       65
        
       +++ b/plugins/CMakeLists.txt

     

       66
        
       @@ -47,11 +47,11 @@ STRING(REPLACE ".proto" ".pb.h" PROJECT_PROTO_HDRS "${PROJECT_PROTOS}")

+16 -8

pkgs/games/dwarf-fortress/game.nix

···

       3
        
       }:

     

       4
        
       

     

       5
        
       let

     

       6
       -
         baseVersion = "42";

     

       7
       -
         patchVersion = "06";

     

       8
        
         dfVersion = "0.${baseVersion}.${patchVersion}";

     

       9
        
         libpath = lib.makeLibraryPath [ stdenv.cc.cc stdenv.glibc dwarf-fortress-unfuck SDL ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       10
        
       

     

       11
        
       in

     

       12
        
       

     
···

       16
        
         name = "dwarf-fortress-original-${dfVersion}";

     

       17
        
       

     

       18
        
         src = fetchurl {

     

       19
       -
           url = "http://www.bay12games.com/dwarves/df_${baseVersion}_${patchVersion}_linux.tar.bz2";

     

       20
       -
           sha256 = "17y9zq9xn1g0a501w4vkinb0n2yjiczsi2g7r6zggr41pxrqxpq3";

     

       21
        
         };

     

       22
        
       

     

       23
        
         installPhase = ''

     
···

       39
        
       

     

       40
        
         passthru = { inherit baseVersion patchVersion dfVersion; };

     

       41
        
       

     

       42
       -
         meta = {

     

       43
        
           description = "A single-player fantasy game with a randomly generated adventure world";

     

       44
        
           homepage = http://www.bay12games.com/dwarves;

     

       45
       -
           license = lib.licenses.unfreeRedistributable;

     

       46
       -
           platforms = [ "i686-linux" ];

     

       47
       -
           maintainers = with lib.maintainers; [ a1russell robbinch roconnor the-kenny abbradar ];

     

       48
        
         };

     

       49
        
       }

···

       3
        
       }:

     

       4
        
       

     

       5
        
       let

     

       6
       +
         baseVersion = "43";

     

       7
       +
         patchVersion = "05";

     

       8
        
         dfVersion = "0.${baseVersion}.${patchVersion}";

     

       9
        
         libpath = lib.makeLibraryPath [ stdenv.cc.cc stdenv.glibc dwarf-fortress-unfuck SDL ];

     

       10
       +
         platform =

     

       11
       +
           if stdenv.system == "x86_64-linux" then "linux"

     

       12
       +
           else if stdenv.system == "i686-linux" then "linux32"

     

       13
       +
           else throw "Unsupported platform";

     

       14
       +
         sha256 =

     

       15
       +
           if stdenv.system == "x86_64-linux" then "1r0b96yrdf24m9476k5x7rmp3faxr0kfwwdf35agpvlb1qbi6v45"

     

       16
       +
           else if stdenv.system == "i686-linux" then "16l1lydpkbnl3zhz4i2snmjk7pps8vmw3zv0bjgr8dncbsrycd03"

     

       17
       +
           else throw "Unsupported platform";

     

       18
        
       

     

       19
        
       in

     

       20
        
       

     
···

       24
        
         name = "dwarf-fortress-original-${dfVersion}";

     

       25
        
       

     

       26
        
         src = fetchurl {

     

       27
       +
           url = "http://www.bay12games.com/dwarves/df_${baseVersion}_${patchVersion}_${platform}.tar.bz2";

     

       28
       +
           inherit sha256;

     

       29
        
         };

     

       30
        
       

     

       31
        
         installPhase = ''

     
···

       47
        
       

     

       48
        
         passthru = { inherit baseVersion patchVersion dfVersion; };

     

       49
        
       

     

       50
       +
         meta = with stdenv.lib; {

     

       51
        
           description = "A single-player fantasy game with a randomly generated adventure world";

     

       52
        
           homepage = http://www.bay12games.com/dwarves;

     

       53
       +
           license = licenses.unfreeRedistributable;

     

       54
       +
           platforms = platforms.linux;

     

       55
       +
           maintainers = with maintainers; [ a1russell robbinch roconnor the-kenny abbradar ];

     

       56
        
         };

     

       57
        
       }

+3 -3

pkgs/games/dwarf-fortress/themes/cla.nix

···

       5
        
       

     

       6
        
       stdenv.mkDerivation rec {

     

       7
        
         name = "cla-theme-${version}";

     

       8
       -
         version = "42.06-v22";

     

       9
        
       

     

       10
        
         src = fetchFromGitHub {

     

       11
        
           owner = "DFgraphics";

     

       12
        
           repo = "CLA";

     

       13
        
           rev = version;

     

       14
       -
           sha256 = "1rr52j1wns17axc27fab0wn0338axzwkqp7cpa690kb3bl1y0pf5";

     

       15
        
         };

     

       16
        
       

     

       17
        
         installPhase = ''

     
···

       19
        
           cp -r data raw $out

     

       20
        
         '';

     

       21
        
       

     

       22
       -
         passthru.dfVersion = "0.42.06";

     

       23
        
       

     

       24
        
         preferLocalBuild = true;

     

       25

···

       5
        
       

     

       6
        
       stdenv.mkDerivation rec {

     

       7
        
         name = "cla-theme-${version}";

     

       8
       +
         version = "43.04-v23";

     

       9
        
       

     

       10
        
         src = fetchFromGitHub {

     

       11
        
           owner = "DFgraphics";

     

       12
        
           repo = "CLA";

     

       13
        
           rev = version;

     

       14
       +
           sha256 = "0a88jkcli9iq0prg5w0xh1cyms0b7dnc9rdahn7wy7fyakyp7s27";

     

       15
        
         };

     

       16
        
       

     

       17
        
         installPhase = ''

     
···

       19
        
           cp -r data raw $out

     

       20
        
         '';

     

       21
        
       

     

       22
       +
         passthru.dfVersion = "0.43.05";

     

       23
        
       

     

       24
        
         preferLocalBuild = true;

     

       25

+3 -3

pkgs/games/dwarf-fortress/themes/phoebus.nix

···

       5
        
       

     

       6
        
       stdenv.mkDerivation rec {

     

       7
        
         name = "phoebus-theme-${version}";

     

       8
       -
         version = "42.06a";

     

       9
        
       

     

       10
        
         src = fetchFromGitHub {

     

       11
        
           owner = "DFgraphics";

     

       12
        
           repo = "Phoebus";

     

       13
        
           rev = version;

     

       14
       -
           sha256 = "1mkj882mf1lvjs2b7jxfazym9fl1y20slbfi1lgqzbp1872aaxi0";

     

       15
        
         };

     

       16
        
       

     

       17
        
         installPhase = ''

     
···

       19
        
           cp -r data raw $out

     

       20
        
         '';

     

       21
        
       

     

       22
       -
         passthru.dfVersion = "0.42.06";

     

       23
        
       

     

       24
        
         preferLocalBuild = true;

     

       25

···

       5
        
       

     

       6
        
       stdenv.mkDerivation rec {

     

       7
        
         name = "phoebus-theme-${version}";

     

       8
       +
         version = "43.03";

     

       9
        
       

     

       10
        
         src = fetchFromGitHub {

     

       11
        
           owner = "DFgraphics";

     

       12
        
           repo = "Phoebus";

     

       13
        
           rev = version;

     

       14
       +
           sha256 = "1mga5w3mks3bm6qch7azffr51g3q26za7hnas4qmxfs3m56bjav7";

     

       15
        
         };

     

       16
        
       

     

       17
        
         installPhase = ''

     
···

       19
        
           cp -r data raw $out

     

       20
        
         '';

     

       21
        
       

     

       22
       +
         passthru.dfVersion = "0.43.05";

     

       23
        
       

     

       24
        
         preferLocalBuild = true;

     

       25

+5 -7

pkgs/games/dwarf-fortress/unfuck.nix

···

       4
        
       }:

     

       5
        
       

     

       6
        
       stdenv.mkDerivation {

     

       7
       -
         name = "dwarf_fortress_unfuck-2016-04-22";

     

       8
        
       

     

       9
        
         src = fetchFromGitHub {

     

       10
        
           owner = "svenstaro";

     

       11
        
           repo = "dwarf_fortress_unfuck";

     

       12
       -
           rev = "dde40a2c619eac119b6db1bcd0c8d8612472f866";

     

       13
       -
           sha256 = "12bqh3k4wsk1c0bz2zly8h0ilbsdmsbwr9cdjc6i7liwg9906g7i";

     

       14
        
         };

     

       15
       -
       

     

       16
       -
         postPatch = "sed '1i#include <math.h>' -i g_src/ttf_manager.cpp";

     

       17
        
       

     

       18
        
         cmakeFlags = [

     

       19
        
           "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"

     
···

       32
        
       

     

       33
        
         enableParallelBuilding = true;

     

       34
        
       

     

       35
       -
         passthru.dfVersion = "0.42.06";

     

       36
        
       

     

       37
        
         meta = with stdenv.lib; {

     

       38
        
           description = "Unfucked multimedia layer for Dwarf Fortress";

     

       39
        
           homepage = https://github.com/svenstaro/dwarf_fortress_unfuck;

     

       40
        
           license = licenses.free;

     

       41
       -
           platforms = [ "i686-linux" ];

     

       42
        
           maintainers = with maintainers; [ abbradar ];

     

       43
        
         };

     

       44
        
       }

···

       4
        
       }:

     

       5
        
       

     

       6
        
       stdenv.mkDerivation {

     

       7
       +
         name = "dwarf_fortress_unfuck-2016-07-13";

     

       8
        
       

     

       9
        
         src = fetchFromGitHub {

     

       10
        
           owner = "svenstaro";

     

       11
        
           repo = "dwarf_fortress_unfuck";

     

       12
       +
           rev = "d6a4ee67e7b41bec1caa87548640643db35a6080";

     

       13
       +
           sha256 = "17p7jzmwd5z54wn6bxmic0i8y8mma3q359zcy3r9x2mp2wv1yd7p";

     

       14
        
         };

     

       0
        
       
     

       0
        
       
     

       15
        
       

     

       16
        
         cmakeFlags = [

     

       17
        
           "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"

     
···

       30
        
       

     

       31
        
         enableParallelBuilding = true;

     

       32
        
       

     

       33
       +
         passthru.dfVersion = "0.43.05";

     

       34
        
       

     

       35
        
         meta = with stdenv.lib; {

     

       36
        
           description = "Unfucked multimedia layer for Dwarf Fortress";

     

       37
        
           homepage = https://github.com/svenstaro/dwarf_fortress_unfuck;

     

       38
        
           license = licenses.free;

     

       39
       +
           platforms = platforms.linux;

     

       40
        
           maintainers = with maintainers; [ abbradar ];

     

       41
        
         };

     

       42
        
       }

+2 -2

pkgs/games/factorio/fetch.nix

···

       1
       -
       { stdenv, curl, cacert

     

       2
        
       # Begin download parameters

     

       3
        
       , username ? ""

     

       4
        
       , password ? ""

     
···

       18
        
       stdenv.mkDerivation {

     

       19
        
         name = "factorio.tar.gz";

     

       20
        
       

     

       21
       -
         buildInputs = [ curl ];

     

       22
        
       

     

       23
        
         inherit url loginUrl username password cacert;

     

       24

···

       1
       +
       { stdenv, curl, xidel, cacert

     

       2
        
       # Begin download parameters

     

       3
        
       , username ? ""

     

       4
        
       , password ? ""

     
···

       18
        
       stdenv.mkDerivation {

     

       19
        
         name = "factorio.tar.gz";

     

       20
        
       

     

       21
       +
         buildInputs = [ curl xidel ];

     

       22
        
       

     

       23
        
         inherit url loginUrl username password cacert;

     

       24

+16 -5

pkgs/games/factorio/fetch.sh

···

       9
        
        --max-redirs 20 \

     

       10
        
        --retry 3 \

     

       11
        
        --cacert $cacert/etc/ssl/certs/ca-bundle.crt \

     

       0
        
       
     

       0
        
       
     

       12
        
        $curlOpts \

     

       13
        
        $NIX_CURL_FLAGS"

     

       14
        
       

     

       15
        
       # We don't want the password to be on any program's argv, as it may be

     

       16
        
       # visible in /proc. Writing it to file with echo should be safe, since

     

       17
        
       # it's a shell builtin.

     

       18
       -
       echo "password=$password" > password

     

       19
        
       # Might as well hide the username as well.

     

       20
       -
       echo "username-or-email=$username" > username

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       21
        
       

     

       22
        
       # Log in. We don't especially care about the result, but let's check if login failed.

     

       23
       -
       $curl -c cookies -d @username -d @password $loginUrl -D headers > /dev/null

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       24
        
       

     

       25
       -
       if grep -q 'Location: /' headers; then

     

       26
        
           # Now download. We need --insecure for this, but the sha256 should cover us.

     

       27
       -
           $curl -b cookies --insecure --location $url > $out

     

       0
        
       
     

       28
        
       else

     

       0
        
       
     

       29
        
           echo 'Login failed'

     

       30
        
           echo 'Please set username and password with config.nix,'

     

       31
        
           echo 'or /etc/nix/nixpkgs-config.nix if on NixOS.'

···

       9
        
        --max-redirs 20 \

     

       10
        
        --retry 3 \

     

       11
        
        --cacert $cacert/etc/ssl/certs/ca-bundle.crt \

     

       12
       +
        -b cookies \

     

       13
       +
        -c cookies \

     

       14
        
        $curlOpts \

     

       15
        
        $NIX_CURL_FLAGS"

     

       16
        
       

     

       17
        
       # We don't want the password to be on any program's argv, as it may be

     

       18
        
       # visible in /proc. Writing it to file with echo should be safe, since

     

       19
        
       # it's a shell builtin.

     

       20
       +
       echo -n "$password" > password

     

       21
        
       # Might as well hide the username as well.

     

       22
       +
       echo -n "$username" > username

     

       23
       +
       

     

       24
       +
       # Get a CSRF token.

     

       25
       +
       csrf=$($curl $loginUrl | xidel - -e '//input[@id="csrf_token"]/@value')

     

       26
        
       

     

       27
        
       # Log in. We don't especially care about the result, but let's check if login failed.

     

       28
       +
       $curl --data-urlencode csrf_token="$csrf" \

     

       29
       +
             --data-urlencode username_or_email@username \

     

       30
       +
             --data-urlencode password@password \

     

       31
       +
             -d action=Login \

     

       32
       +
             $loginUrl -D headers > /dev/null

     

       33
        
       

     

       34
       +
       if grep -q 'Location: https://' headers; then

     

       35
        
           # Now download. We need --insecure for this, but the sha256 should cover us.

     

       36
       +
           $curl --insecure --location $url > $out

     

       37
       +
           set +x

     

       38
        
       else

     

       39
       +
           set +x

     

       40
        
           echo 'Login failed'

     

       41
        
           echo 'Please set username and password with config.nix,'

     

       42
        
           echo 'or /etc/nix/nixpkgs-config.nix if on NixOS.'

+1 -3

pkgs/games/mnemosyne/default.nix

···

       1
        
       { stdenv

     

       2
        
       , fetchurl

     

       3
       -
       , buildPythonApplication

     

       4
       -
       , pyqt4

     

       5
        
       , pythonPackages

     

       6
        
       }:

     

       7
        
       let

     

       8
        
         version = "2.3.2";

     

       9
       -
       in buildPythonApplication rec {

     

       10
        
         name = "mnemosyne-${version}";

     

       11
        
         src = fetchurl {

     

       12
        
           url    = "http://sourceforge.net/projects/mnemosyne-proj/files/mnemosyne/${name}/Mnemosyne-${version}.tar.gz";

···

       1
        
       { stdenv

     

       2
        
       , fetchurl

     

       0
        
       
     

       0
        
       
     

       3
        
       , pythonPackages

     

       4
        
       }:

     

       5
        
       let

     

       6
        
         version = "2.3.2";

     

       7
       +
       in pythonPackages.buildPythonApplication rec {

     

       8
        
         name = "mnemosyne-${version}";

     

       9
        
         src = fetchurl {

     

       10
        
           url    = "http://sourceforge.net/projects/mnemosyne-proj/files/mnemosyne/${name}/Mnemosyne-${version}.tar.gz";

+3 -3

pkgs/games/quake3/ioquake/default.nix

···

       4
        
       

     

       5
        
       stdenv.mkDerivation rec {

     

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

     

       7
       -
         version = "2016-04-05";

     

       8
        
       

     

       9
        
         src = fetchFromGitHub {

     

       10
        
           owner = "ioquake";

     

       11
        
           repo = "ioq3";

     

       12
       -
           rev = "1f6703821f11be9c711c6ee42371ab290dd12776";

     

       13
       -
           sha256 = "0jbn4lv85khfcmn1dc3mrx7zxldj3p4cggx85hdfpiwmnsjl4w67";

     

       14
        
         };

     

       15
        
       

     

       16
        
         nativeBuildInputs = [ which pkgconfig ];

···

       4
        
       

     

       5
        
       stdenv.mkDerivation rec {

     

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

     

       7
       +
         version = "2016-08-11";

     

       8
        
       

     

       9
        
         src = fetchFromGitHub {

     

       10
        
           owner = "ioquake";

     

       11
        
           repo = "ioq3";

     

       12
       +
           rev = "1cf0b21cda562bade9152958f1525e5ac281ab9c";

     

       13
       +
           sha256 = "104yrgi9dnfb493pm9wvk2kn80nazcr1nllb5vd7di66jnvcjks0";

     

       14
        
         };

     

       15
        
       

     

       16
        
         nativeBuildInputs = [ which pkgconfig ];

+18

pkgs/games/steam/runtime-generated.nix

···

       1255
        
             };

     

       1256
        
           }

     

       1257
        
           rec {

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       1258
        
             name = "libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64";

     

       1259
        
             md5 = "a1e5b4a8f8200feef82dab976f1b4e5d";

     

       1260
        
             url = "mirror://steamrt/pool/main/h/heimdal/libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb";

     
···

       2991
        
             source = fetchurl {

     

       2992
        
               inherit url md5;

     

       2993
        
               name = "libvpx1.deb";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       2994
        
             };

     

       2995
        
           }

     

       2996
        
           rec {

···

       1255
        
             };

     

       1256
        
           }

     

       1257
        
           rec {

     

       1258
       +
             name = "libvulkan1_1.0.3~git20160215-0.1+steamos5+srt1_amd64";

     

       1259
       +
             md5 = "4d9ac7966de8160a13817291206b51a4";

     

       1260
       +
             url = "mirror://steamrt/pool/main/v/vulkan-loader/libvulkan1_1.0.3~git20160215-0.1+steamos5+srt1_amd64.deb";

     

       1261
       +
             source = fetchurl {

     

       1262
       +
               inherit url md5;

     

       1263
       +
               name = "libvulkan1.deb";

     

       1264
       +
             };

     

       1265
       +
           }

     

       1266
       +
           rec {

     

       1267
        
             name = "libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64";

     

       1268
        
             md5 = "a1e5b4a8f8200feef82dab976f1b4e5d";

     

       1269
        
             url = "mirror://steamrt/pool/main/h/heimdal/libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb";

     
···

       3000
        
             source = fetchurl {

     

       3001
        
               inherit url md5;

     

       3002
        
               name = "libvpx1.deb";

     

       3003
       +
             };

     

       3004
       +
           }

     

       3005
       +
           rec {

     

       3006
       +
             name = "libvulkan1_1.0.3~git20160215-0.1+steamos5+srt1_i386";

     

       3007
       +
             md5 = "de2c787fcc443fb989b1862367a2e0c7";

     

       3008
       +
             url = "mirror://steamrt/pool/main/v/vulkan-loader/libvulkan1_1.0.3~git20160215-0.1+steamos5+srt1_i386.deb";

     

       3009
       +
             source = fetchurl {

     

       3010
       +
               inherit url md5;

     

       3011
       +
               name = "libvulkan1.deb";

     

       3012
        
             };

     

       3013
        
           }

     

       3014
        
           rec {

+1 -1

pkgs/games/steam/runtime.nix

···

       9
        
           inputFile = writeText "steam-runtime.json" (builtins.toJSON input);

     

       10
        
       

     

       11
        
       in stdenv.mkDerivation {

     

       12
       -
         name = "steam-runtime-2016-03-03";

     

       13
        
       

     

       14
        
         nativeBuildInputs = [ python2 dpkg binutils ];

     

       15

···

       9
        
           inputFile = writeText "steam-runtime.json" (builtins.toJSON input);

     

       10
        
       

     

       11
        
       in stdenv.mkDerivation {

     

       12
       +
         name = "steam-runtime-2016-08-13";

     

       13
        
       

     

       14
        
         nativeBuildInputs = [ python2 dpkg binutils ];

     

       15

+3 -3

pkgs/games/the-powder-toy/default.nix

···

       1
        
       { stdenv, fetchFromGitHub, scons, pkgconfig, SDL, lua, fftwFloat }:

     

       2
        
       

     

       3
       -
       let version = "91.3.328";

     

       4
       -
       in

     

       5
        
       stdenv.mkDerivation rec {

     

       6
        
         name = "the-powder-toy-${version}";

     

       0
        
       
     

       0
        
       
     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "simtr";

     

       9
        
           repo = "The-Powder-Toy";

     

       10
        
           rev = "v${version}";

     

       11
       -
           sha256 = "0krg4d2m8cnfabm5qq7wr1y53h21i49xjcggzg98xjd0972zvfrk";

     

       12
        
         };

     

       13
        
       

     

       14
        
         patches = [ ./fix-env.patch ];

···

       1
        
       { stdenv, fetchFromGitHub, scons, pkgconfig, SDL, lua, fftwFloat }:

     

       2
        
       

     

       0
        
       
     

       0
        
       
     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         name = "the-powder-toy-${version}";

     

       5
       +
         version = "91.5.330";

     

       6
       +
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "simtr";

     

       9
        
           repo = "The-Powder-Toy";

     

       10
        
           rev = "v${version}";

     

       11
       +
           sha256 = "19m7jyg3pnppymvr6lz454mjiw18hvldpdhi33596m9ji3nrq8x7";

     

       12
        
         };

     

       13
        
       

     

       14
        
         patches = [ ./fix-env.patch ];

+2 -2

pkgs/games/wesnoth/dev.nix

···

       5
        
       

     

       6
        
       stdenv.mkDerivation rec {

     

       7
        
         pname = "wesnoth";

     

       8
       -
         version = "1.13.4";

     

       9
        
       

     

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

     

       11
        
       

     

       12
        
         src = fetchurl {

     

       13
        
           url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2";

     

       14
       -
           sha256 = "1ys25ijwphld11002cad9iz5mc5rqazmjn8866l8gcdfrrhk943s";

     

       15
        
         };

     

       16
        
       

     

       17
        
         nativeBuildInputs = [ cmake pkgconfig ];

···

       5
        
       

     

       6
        
       stdenv.mkDerivation rec {

     

       7
        
         pname = "wesnoth";

     

       8
       +
         version = "1.13.5";

     

       9
        
       

     

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

     

       11
        
       

     

       12
        
         src = fetchurl {

     

       13
        
           url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2";

     

       14
       +
           sha256 = "15hvf06r7086plwmagh89plcxal2zql8k4mg0yf1zgwjvdz284dx";

     

       15
        
         };

     

       16
        
       

     

       17
        
         nativeBuildInputs = [ cmake pkgconfig ];

+1 -1

pkgs/misc/drivers/hplip/3.15.9.nix

···

       3
        
       , cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends, dbus, usbutils

     

       4
        
       , net_snmp, polkit

     

       5
        
       , bash, coreutils, utillinux

     

       6
       -
       , qtSupport ? true, qt4, pyqt4

     

       7
        
       , withPlugin ? false

     

       8
        
       }:

     

       9

···

       3
        
       , cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends, dbus, usbutils

     

       4
        
       , net_snmp, polkit

     

       5
        
       , bash, coreutils, utillinux

     

       6
       +
       , qtSupport ? true, qt4

     

       7
        
       , withPlugin ? false

     

       8
        
       }:

     

       9

+1 -1

pkgs/misc/drivers/hplip/default.nix

···

       3
        
       , cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends, dbus, usbutils

     

       4
        
       , net_snmp, openssl, polkit

     

       5
        
       , bash, coreutils, utillinux

     

       6
       -
       , qtSupport ? true, qt4, pyqt4

     

       7
        
       , withPlugin ? false

     

       8
        
       }:

     

       9

···

       3
        
       , cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends, dbus, usbutils

     

       4
        
       , net_snmp, openssl, polkit

     

       5
        
       , bash, coreutils, utillinux

     

       6
       +
       , qtSupport ? true, qt4

     

       7
        
       , withPlugin ? false

     

       8
        
       }:

     

       9

+5 -5

pkgs/misc/drivers/m3d-linux/default.nix pkgs/misc/drivers/m33-linux/default.nix

···

       1
        
       { stdenv, fetchFromGitHub }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation {

     

       4
       -
         name = "M3D-Linux-2016-01-20";

     

       5
        
       

     

       6
        
         src = fetchFromGitHub {

     

       7
        
           owner = "donovan6000";

     

       8
        
           repo = "M3D-Linux";

     

       9
       -
           rev = "d0bbb0379c52a88af55740a937edc92af162cdf6";

     

       10
       -
           sha256 = "0fwzb9mf04bw5wxabh3js7nir60kfq8iz7kcigw6c233aadwg03i";

     

       11
        
         };

     

       12
        
       

     

       13
        
         installPhase = ''

     

       14
       -
           install -Dm755 m3d-linux $out/bin/m3d-linux

     

       15
       -
           install -Dm755 90-m3d-local.rules $out/lib/udev/rules.d/90-m3d-local.rules

     

       16
        
         '';

     

       17
        
       

     

       18
        
         meta = with stdenv.lib; {

···

       1
        
       { stdenv, fetchFromGitHub }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation {

     

       4
       +
         name = "M33-Linux-2016-06-23";

     

       5
        
       

     

       6
        
         src = fetchFromGitHub {

     

       7
        
           owner = "donovan6000";

     

       8
        
           repo = "M3D-Linux";

     

       9
       +
           rev = "5c1b90c13d260771dac970b49fdc9f840fee5f4a";

     

       10
       +
           sha256 = "1bvbclkyfcv23vxb4s1zssvygklks1nhp4iwi4v90c1fvyz0356f";

     

       11
        
         };

     

       12
        
       

     

       13
        
         installPhase = ''

     

       14
       +
           install -Dm755 m33-linux $out/bin/m33-linux

     

       15
       +
           install -Dm755 90-micro-3d-local.rules $out/lib/udev/rules.d/90-micro-3d-local.rules

     

       16
        
         '';

     

       17
        
       

     

       18
        
         meta = with stdenv.lib; {

+3 -3

pkgs/misc/emulators/wine/sources.nix

···

       30
        
         };

     

       31
        
       

     

       32
        
         unstable = fetchurl rec {

     

       33
       -
           version = "1.9.14";

     

       34
        
           url = "mirror://sourceforge/wine/wine-${version}.tar.bz2";

     

       35
       -
           sha256 = "0b65j8lc2axyc7lpa5rjr7vbjz4y78gkd7hhmvhra78pmwf9dgkz";

     

       36
        
           inherit (stable) mono;

     

       37
        
           gecko32 = fetchurl rec {

     

       38
        
             version = "2.44";

     
···

       48
        
       

     

       49
        
         staging = fetchFromGitHub rec {

     

       50
        
           inherit (unstable) version;

     

       51
       -
           sha256 = "0582ylrvl7racpb0il3wmbivb2d7lh6n3mymh19yw94qzgifwqrw";

     

       52
        
           owner = "wine-compholio";

     

       53
        
           repo = "wine-staging";

     

       54
        
           rev = "v${version}";

···

       30
        
         };

     

       31
        
       

     

       32
        
         unstable = fetchurl rec {

     

       33
       +
           version = "1.9.16";

     

       34
        
           url = "mirror://sourceforge/wine/wine-${version}.tar.bz2";

     

       35
       +
           sha256 = "010gjib4nhrn9j9q12v5irda8df8xp17a6v6qqskkadd79kxc871";

     

       36
        
           inherit (stable) mono;

     

       37
        
           gecko32 = fetchurl rec {

     

       38
        
             version = "2.44";

     
···

       48
        
       

     

       49
        
         staging = fetchFromGitHub rec {

     

       50
        
           inherit (unstable) version;

     

       51
       +
           sha256 = "0rcy0i36jxv2akczd4sfrdmlsqxmj5v0wzvqb3xl8p2mldk9i8yl";

     

       52
        
           owner = "wine-compholio";

     

       53
        
           repo = "wine-staging";

     

       54
        
           rev = "v${version}";

+1 -1

pkgs/misc/frescobaldi/default.nix

···

       1
       -
       { stdenv, fetchurl, pythonPackages, lilypond, pyqt4, pygame }:

     

       2
        
       

     

       3
        
       pythonPackages.buildPythonApplication rec {

     

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

···

       1
       +
       { stdenv, fetchurl, pythonPackages, lilypond}:

     

       2
        
       

     

       3
        
       pythonPackages.buildPythonApplication rec {

     

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

+3 -3

pkgs/misc/long-shebang/default.nix

···

       1
        
       { stdenv, fetchurl }: let

     

       2
       -
         version = "1.0.0";

     

       3
        
       in stdenv.mkDerivation {

     

       4
        
         name = "long-shebang-${version}";

     

       5
        
       

     

       6
        
         src = fetchurl {

     

       7
       -
           url = "https://github.com/shlevy/long-shebang/releases/download/v1.0.0/long-shebang-1.0.0.tar.xz";

     

       8
       -
           sha256 = "15f5rmihj3r53rmalix1bn1agybbzrc3g2a9xzjyd4v3vfd2vckr";

     

       9
        
         };

     

       10
        
       

     

       11
        
         meta = {

···

       1
        
       { stdenv, fetchurl }: let

     

       2
       +
         version = "1.1.0";

     

       3
        
       in stdenv.mkDerivation {

     

       4
        
         name = "long-shebang-${version}";

     

       5
        
       

     

       6
        
         src = fetchurl {

     

       7
       +
           url = "https://github.com/shlevy/long-shebang/releases/download/v${version}/long-shebang-${version}.tar.xz";

     

       8
       +
           sha256 = "0rlyibf7pczjfsi91nl1n5vri2vqibmvyyy070jaw3wb0wjm565a";

     

       9
        
         };

     

       10
        
       

     

       11
        
         meta = {

+4 -4

pkgs/os-specific/linux/android-udev-rules/default.nix

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         name = "android-udev-rules-${version}";

     

       5
       -
         version = "2016-04-26";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "M0Rf30";

     

       9
        
           repo = "android-udev-rules";

     

       10
       -
           rev = "9af6e552016392db35191142b599a5199cf8a9fa";

     

       11
       -
           sha256 = "1lvh7md6qz91q8jy9phnfxlb19s104lvsk75a5r07d8bjc4w9pxb";

     

       12
        
         };

     

       13
        
       

     

       14
        
         installPhase = ''

     
···

       16
        
         '';

     

       17
        
       

     

       18
        
         meta = with stdenv.lib; {

     

       19
       -
           homepage = https://github.com/M0Rf30/android-udev-rules;

     

       20
        
           description = "Android udev rules list aimed to be the most comprehensive on the net";

     

       21
        
           platforms = platforms.linux;

     

       22
        
           license = licenses.gpl3;

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         name = "android-udev-rules-${version}";

     

       5
       +
         version = "20160805";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "M0Rf30";

     

       9
        
           repo = "android-udev-rules";

     

       10
       +
           rev = version;

     

       11
       +
           sha256 = "0sdf3insqs73cdzmwl3lqy7nj82f1lprxd3vm0jh3qpf0sd1k93c";

     

       12
        
         };

     

       13
        
       

     

       14
        
         installPhase = ''

     
···

       16
        
         '';

     

       17
        
       

     

       18
        
         meta = with stdenv.lib; {

     

       19
       +
           homepage = "https://github.com/M0Rf30/android-udev-rules";

     

       20
        
           description = "Android udev rules list aimed to be the most comprehensive on the net";

     

       21
        
           platforms = platforms.linux;

     

       22
        
           license = licenses.gpl3;

+16 -14

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

···

       1
       -
       { stdenv, fetchurl, flex, bison, linuxHeaders }:

     

       0
        
       
     

       2
        
       

     

       3
        
       let

     

       4
       -
         version = "5.1.1";

     

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

     

       6
        
       in stdenv.mkDerivation {

     

       7
        
         inherit name;

     

       8
        
       

     

       9
        
         src = fetchurl {

     

       10
        
           url = "mirror://kernel/linux/daemons/autofs/v5/${name}.tar.xz";

     

       11
       -
           sha256 = "1hr1f11wp538h7r298wpa5khfkhfs8va3p1kdixxhrgkkzpz13z0";

     

       12
        
         };

     

       13
        
       

     

       14
        
         preConfigure = ''

     

       15
       -
           configureFlags="--disable-move-mount --with-path=$PATH"

     

       16
       -
           export MOUNT=/var/run/current-system/sw/bin/mount

     

       17
       -
           export UMOUNT=/var/run/current-system/sw/bin/umount

     

       18
       -
           export MODPROBE=/var/run/current-system/sw/bin/modprobe

     

       19
       -
           # Grrr, rpcgen can't find cpp. (NIXPKGS-48)

     

       20
       -
           mkdir rpcgen

     

       21
       -
           echo "#! $shell" > rpcgen/rpcgen

     

       22
       -
           echo "exec $(type -tp rpcgen) -Y $(dirname $(type -tp cpp)) \"\$@\"" >> rpcgen/rpcgen

     

       23
       -
           chmod +x rpcgen/rpcgen

     

       24
       -
           export RPCGEN=$(pwd)/rpcgen/rpcgen

     

       25
        
         '';

     

       26
        
       

     

       27
        
         installPhase = ''

     
···

       29
        
           #make install SUBDIRS="samples" # impure!

     

       30
        
         '';

     

       31
        
       

     

       32
       -
         buildInputs = [ flex bison linuxHeaders ];

     

       0
        
       
     

       0
        
       
     

       33
        
       

     

       34
        
         meta = {

     

       35
        
           inherit version;

···

       1
       +
       { stdenv, lib, fetchurl, flex, bison, linuxHeaders, libtirpc, utillinux, nfs-utils, e2fsprogs

     

       2
       +
       , libxml2 }:

     

       3
        
       

     

       4
        
       let

     

       5
       +
         version = "5.1.2";

     

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

     

       7
        
       in stdenv.mkDerivation {

     

       8
        
         inherit name;

     

       9
        
       

     

       10
        
         src = fetchurl {

     

       11
        
           url = "mirror://kernel/linux/daemons/autofs/v5/${name}.tar.xz";

     

       12
       +
           sha256 = "031z64hmbzyllgvi72cw87755vnmafvsfwi0w21xksla10wxxdw8";

     

       13
        
         };

     

       14
        
       

     

       15
        
         preConfigure = ''

     

       16
       +
           configureFlags="--enable-force-shutdown --enable-ignore-busy --with-path=$PATH"

     

       17
       +
       

     

       18
       +
           export MOUNT=${lib.getBin utillinux}/bin/mount

     

       19
       +
           export MOUNT_NFS=${lib.getBin nfs-utils}/bin/mount.nfs

     

       20
       +
           export UMOUNT=${lib.getBin utillinux}/bin/umount

     

       21
       +
           export MODPROBE=${lib.getBin utillinux}/bin/modprobe

     

       22
       +
           export E2FSCK=${lib.getBin e2fsprogs}/bin/fsck.ext2

     

       23
       +
           export E3FSCK=${lib.getBin e2fsprogs}/bin/fsck.ext3

     

       24
       +
           export E4FSCK=${lib.getBin e2fsprogs}/bin/fsck.ext4

     

       0
        
       
     

       25
        
         '';

     

       26
        
       

     

       27
        
         installPhase = ''

     
···

       29
        
           #make install SUBDIRS="samples" # impure!

     

       30
        
         '';

     

       31
        
       

     

       32
       +
         buildInputs = [ linuxHeaders libtirpc libxml2 ];

     

       33
       +
       

     

       34
       +
         nativeBuildInputs = [ flex bison ];

     

       35
        
       

     

       36
        
         meta = {

     

       37
        
           inherit version;

+3 -3

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

···

       3
        
       

     

       4
        
       stdenv.mkDerivation rec {

     

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

     

       6
       -
         version = "2.10";

     

       7
        
       

     

       8
        
         src = fetchFromGitHub {

     

       9
        
           owner = "johang";

     

       10
        
           repo = "btfs";

     

       11
       -
           rev = "2eac5e70a1ed22fa0761b6357c54fd90eea02de6";

     

       12
       -
           sha256 = "146vgwn79dnbkkn35safga55lkwhvarkmilparmr26hjb56cs1dk";

     

       13
        
         };

     

       14
        
       

     

       15
        
         buildInputs = [

···

       3
        
       

     

       4
        
       stdenv.mkDerivation rec {

     

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

     

       6
       +
         version = "2.11";

     

       7
        
       

     

       8
        
         src = fetchFromGitHub {

     

       9
        
           owner = "johang";

     

       10
        
           repo = "btfs";

     

       11
       +
           rev = "fe585ca285690579db50b1624cec81ae76279ba2";

     

       12
       +
           sha256 = "1vqya2k8cx5x7jfapl9vmmb002brwbsz4j5xs4417kzv3j2bsms9";

     

       13
        
         };

     

       14
        
       

     

       15
        
         buildInputs = [

-19

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

···

       1
       -
       { stdenv, fetchurl, perl, buildLinux, ... } @ args:

     

       2
       -
       

     

       3
       -
       import ./generic.nix (args // rec {

     

       4
       -
         version = "4.5.7";

     

       5
       -
         extraMeta.branch = "4.5";

     

       6
       -
       

     

       7
       -
         src = fetchurl {

     

       8
       -
           url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";

     

       9
       -
           sha256 = "0azvh7lf9kak1xcs5f9smlvx4gkf45vyandizmxhx0zyjlhacw60";

     

       10
       -
         };

     

       11
       -
       

     

       12
       -
         kernelPatches = args.kernelPatches;

     

       13
       -
       

     

       14
       -
         features.iwlwifi = true;

     

       15
       -
         features.efiBootStub = true;

     

       16
       -
         features.needsCifsUtils = true;

     

       17
       -
         features.canDisableNetfilterConntrackHelpers = true;

     

       18
       -
         features.netfilterRPFilter = true;

     

       19
       -
       } // (args.argsOverride or {}))

+2 -2

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

···

       1
        
       { stdenv, fetchurl, perl, buildLinux, ... } @ args:

     

       2
        
       

     

       3
        
       import ./generic.nix (args // rec {

     

       4
       -
         version = "4.6.5";

     

       5
        
         extraMeta.branch = "4.6";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
        
           url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";

     

       9
       -
           sha256 = "1i8ksv8w6dn86q54gzk230gxrylqx3m55x789d29q5balg456bby";

     

       10
        
         };

     

       11
        
       

     

       12
        
         kernelPatches = args.kernelPatches;

···

       1
        
       { stdenv, fetchurl, perl, buildLinux, ... } @ args:

     

       2
        
       

     

       3
        
       import ./generic.nix (args // rec {

     

       4
       +
         version = "4.6.6";

     

       5
        
         extraMeta.branch = "4.6";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
        
           url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";

     

       9
       +
           sha256 = "1lx00j0z0rasmc87mcvqd1h6r4znb9c2q22jbs2mrissr5w05vgm";

     

       10
        
         };

     

       11
        
       

     

       12
        
         kernelPatches = args.kernelPatches;

+4 -3

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

···

       1
        
       { stdenv, fetchurl, perl, buildLinux, ... } @ args:

     

       2
        
       

     

       3
        
       import ./generic.nix (args // rec {

     

       4
       -
         version = "4.6.5";

     

       5
       -
         extraMeta.branch = "4.6";

     

       0
        
       
     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
        
           url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";

     

       9
       -
           sha256 = "1i8ksv8w6dn86q54gzk230gxrylqx3m55x789d29q5balg456bby";

     

       10
        
         };

     

       11
        
       

     

       12
        
         kernelPatches = args.kernelPatches;

···

       1
        
       { stdenv, fetchurl, perl, buildLinux, ... } @ args:

     

       2
        
       

     

       3
        
       import ./generic.nix (args // rec {

     

       4
       +
         version = "4.7";

     

       5
       +
         modDirVersion = "4.7.0";

     

       6
       +
         extraMeta.branch = "4.7";

     

       7
        
       

     

       8
        
         src = fetchurl {

     

       9
        
           url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";

     

       10
       +
           sha256 = "042z53ik3mqaqlfrn5b70kw882fwd42zanqld10s1vcs438w742i";

     

       11
        
         };

     

       12
        
       

     

       13
        
         kernelPatches = args.kernelPatches;

+3 -3

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

···

       93
        
         grsecurity_4_4 = throw "grsecurity stable is no longer supported";

     

       94
        
       

     

       95
        
         grsecurity_testing = grsecPatch

     

       96
       -
           { kver   = "4.6.5";

     

       97
       -
             grrev  = "201607312210";

     

       98
       -
             sha256 = "17dnp6w092kvqxqxbdgjpl4mrsn2wkb7z8q5d8ck7dfanpmqap0w";

     

       99
        
           };

     

       100
        
       

     

       101
        
         # This patch relaxes grsec constraints on the location of usermode helpers,

···

       93
        
         grsecurity_4_4 = throw "grsecurity stable is no longer supported";

     

       94
        
       

     

       95
        
         grsecurity_testing = grsecPatch

     

       96
       +
           { kver   = "4.7";

     

       97
       +
             grrev  = "201608131240";

     

       98
       +
             sha256 = "0bcng47xk5nf4xwcl1l6a2nfb54b8v5piwg42nf3d99hy4si8fvd";

     

       99
        
           };

     

       100
        
       

     

       101
        
         # This patch relaxes grsec constraints on the location of usermode helpers,

+1 -1

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

···

       16
        
       

     

       17
        
         meta = with stdenv.lib; {

     

       18
        
           description = "Support to authenticate against PostgreSQL for PAM-enabled appliations";

     

       19
       -
           homepage = https://github.com/pam-pgsql/pam-pgsql;

     

       20
        
           license = licenses.gpl2Plus;

     

       21
        
           platforms = platforms.linux;

     

       22
        
           maintainers = with maintainers; [ abbradar ];

···

       16
        
       

     

       17
        
         meta = with stdenv.lib; {

     

       18
        
           description = "Support to authenticate against PostgreSQL for PAM-enabled appliations";

     

       19
       +
           homepage = "https://github.com/pam-pgsql/pam-pgsql";

     

       20
        
           license = licenses.gpl2Plus;

     

       21
        
           platforms = platforms.linux;

     

       22
        
           maintainers = with maintainers; [ abbradar ];

+2 -6

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

···

       1
       -
       { fetchFromGitHub, stdenv, autoconf, automake, libtool, coreutils, gawk

     

       2
        
       , configFile ? "all"

     

       3
        
       

     

       4
        
       # Kernel dependencies

     
···

       28
        
       

     

       29
        
         patches = [ ./const.patch ./install_prefix.patch ];

     

       30
        
       

     

       31
       -
         buildInputs = [ autoconf automake libtool ];

     

       32
        
       

     

       33
        
         hardeningDisable = [ "pic" ];

     

       34
        
       

     

       35
        
         preConfigure = ''

     

       36
       -
           ./autogen.sh

     

       37
       -
       

     

       38
        
           substituteInPlace ./module/spl/spl-generic.c --replace /usr/bin/hostid hostid

     

       39
       -
           substituteInPlace ./module/spl/spl-module.c  --replace /bin/mknod mknod

     

       40
       -
       

     

       41
        
           substituteInPlace ./module/spl/spl-generic.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:${gawk}:/bin"

     

       42
        
           substituteInPlace ./module/splat/splat-vnode.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin"

     

       43
        
           substituteInPlace ./module/splat/splat-linux.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin"

···

       1
       +
       { fetchFromGitHub, stdenv, autoreconfHook, coreutils, gawk

     

       2
        
       , configFile ? "all"

     

       3
        
       

     

       4
        
       # Kernel dependencies

     
···

       28
        
       

     

       29
        
         patches = [ ./const.patch ./install_prefix.patch ];

     

       30
        
       

     

       31
       +
         nativeBuildInputs = [ autoreconfHook ];

     

       32
        
       

     

       33
        
         hardeningDisable = [ "pic" ];

     

       34
        
       

     

       35
        
         preConfigure = ''

     

       0
        
       
     

       0
        
       
     

       36
        
           substituteInPlace ./module/spl/spl-generic.c --replace /usr/bin/hostid hostid

     

       0
        
       
     

       0
        
       
     

       37
        
           substituteInPlace ./module/spl/spl-generic.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:${gawk}:/bin"

     

       38
        
           substituteInPlace ./module/splat/splat-vnode.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin"

     

       39
        
           substituteInPlace ./module/splat/splat-linux.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin"

+2 -2

pkgs/os-specific/linux/systemd/cryptsetup-generator.nix

···

       18
        
         # For some reason systemd-cryptsetup-generator is a wrapper-script

     

       19
        
         # with the current release of systemd. We want the real one.

     

       20
        
       

     

       21
       -
         # TODO: Revert 3efadce when the wrapper-script is gone

     

       22
        
         installPhase = ''

     

       23
        
           mkdir -p $out/lib/systemd/

     

       24
       -
           cp systemd-cryptsetup $out/lib/systemd/systemd-cryptsetup

     

       25
        
           cp .libs/*.so $out/lib/

     

       26
        
       

     

       27
        
           mkdir -p $out/lib/systemd/system-generators/

···

       18
        
         # For some reason systemd-cryptsetup-generator is a wrapper-script

     

       19
        
         # with the current release of systemd. We want the real one.

     

       20
        
       

     

       21
       +
         # TODO: Remove `.libs` prefix when the wrapper-script is gone

     

       22
        
         installPhase = ''

     

       23
        
           mkdir -p $out/lib/systemd/

     

       24
       +
           cp .libs/systemd-cryptsetup $out/lib/systemd/systemd-cryptsetup

     

       25
        
           cp .libs/*.so $out/lib/

     

       26
        
       

     

       27
        
           mkdir -p $out/lib/systemd/system-generators/

+11 -12

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

···

       1
       -
       { stdenv, fetchgit, libmnl, kernel ? null }:

     

       2
        
       

     

       3
        
       # module requires Linux >= 4.1 https://www.wireguard.io/install/#kernel-requirements

     

       4
        
       assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "4.1";

     
···

       6
        
       let

     

       7
        
         name = "wireguard-unstable-${version}";

     

       8
        
       

     

       9
       -
         version = "2016-07-22";

     

       10
        
       

     

       11
       -
         src = fetchgit {

     

       12
       -
           url    = "https://git.zx2c4.com/WireGuard";

     

       13
       -
           rev    = "8e8bf6f848c324603827c0e57f0856d5866ac32d";

     

       14
       -
           sha256 = "11qrf9fxm6mkwjnjq7dgbisdric5w22cyfkqc6zx9fla2dz99mxk";

     

       15
        
         };

     

       16
        
       

     

       17
        
         meta = with stdenv.lib; {

     

       18
       -
           homepage    = https://www.wireguard.io/;

     

       19
       -
           description = "Fast, modern, secure VPN tunnel";

     

       20
       -
           license     = licenses.gpl2;

     

       21
       -
           platforms   = platforms.linux;

     

       0
        
       
     

       0
        
       
     

       22
        
         };

     

       23
        
       

     

       24
        
         module = stdenv.mkDerivation {

     
···

       35
        
           INSTALL_MOD_PATH = "\${out}";

     

       36
        
       

     

       37
        
           buildPhase = "make module";

     

       38
       -
       

     

       39
        
         };

     

       40
        
       

     

       41
        
         tools = stdenv.mkDerivation {

     
···

       52
        
           ];

     

       53
        
       

     

       54
        
           buildPhase = "make tools";

     

       55
       -
       

     

       56
        
         };

     

       57
        
       

     

       58
        
       in if kernel == null

···

       1
       +
       { stdenv, fetchurl, libmnl, kernel ? null }:

     

       2
        
       

     

       3
        
       # module requires Linux >= 4.1 https://www.wireguard.io/install/#kernel-requirements

     

       4
        
       assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "4.1";

     
···

       6
        
       let

     

       7
        
         name = "wireguard-unstable-${version}";

     

       8
        
       

     

       9
       +
         version = "2016-08-08";

     

       10
        
       

     

       11
       +
         src = fetchurl {

     

       12
       +
           url    = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-experimental-0.0.20160808.tar.xz";

     

       13
       +
           sha256 = "0z9s9xi8dzkmjnki7ialf2haxb0mn2x5676sjwmjij1jfi9ypxhw";

     

       0
        
       
     

       14
        
         };

     

       15
        
       

     

       16
        
         meta = with stdenv.lib; {

     

       17
       +
           homepage     = https://www.wireguard.io/;

     

       18
       +
           downloadPage = https://git.zx2c4.com/WireGuard/refs/;

     

       19
       +
           description  = "Fast, modern, secure VPN tunnel";

     

       20
       +
           maintainers  = with maintainers; [ ericsagnes ];

     

       21
       +
           license      = licenses.gpl2;

     

       22
       +
           platforms    = platforms.linux;

     

       23
        
         };

     

       24
        
       

     

       25
        
         module = stdenv.mkDerivation {

     
···

       36
        
           INSTALL_MOD_PATH = "\${out}";

     

       37
        
       

     

       38
        
           buildPhase = "make module";

     

       0
        
       
     

       39
        
         };

     

       40
        
       

     

       41
        
         tools = stdenv.mkDerivation {

     
···

       52
        
           ];

     

       53
        
       

     

       54
        
           buildPhase = "make tools";

     

       0
        
       
     

       55
        
         };

     

       56
        
       

     

       57
        
       in if kernel == null

pkgs/servers/apache-kafka/default.nix

···

       11
        
                     scalaVersion = "2.11";

     

       12
        
                     sha256 = "0ykcjv5dz9i5bws9my2d60pww1g9v2p2nqr67h0i2xrjm7az8a6v";

     

       13
        
                   };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       14
        
         };

     

       15
        
       in

     

       16

···

       11
        
                     scalaVersion = "2.11";

     

       12
        
                     sha256 = "0ykcjv5dz9i5bws9my2d60pww1g9v2p2nqr67h0i2xrjm7az8a6v";

     

       13
        
                   };

     

       14
       +
           "0.10" = { kafkaVersion = "0.10.0.1";

     

       15
       +
                      scalaVersion = "2.11";

     

       16
       +
                      sha256 = "0bdhzbhmm87a47162hyazcjmfibqg9r3ryzfjag7r0nxxmd64wrd";

     

       17
       +
                    };

     

       18
        
         };

     

       19
        
       in

     

       20

+13 -7

pkgs/servers/caddy/default.nix

···

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

     

       2
        
       

     

       3
        
       buildGoPackage rec {

     

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

     

       5
       -
         version = "0.8.3";

     

       6
       -
         rev = "e2234497b79603388b58ba226abb157aa4aaf065";

     

       7
        
       

     

       8
        
         goPackagePath = "github.com/mholt/caddy";

     

       9
        
       

     

       10
       -
         src = fetchFromGitHub {

     

       0
        
       
     

       0
        
       
     

       11
        
           inherit rev;

     

       12
       -
           owner = "mholt";

     

       13
       -
           repo = "caddy";

     

       14
       -
           sha256 = "1snijkbz02yr7wij7bcmrj4257709sbklb3nhb5qmy95b9ssffm6";

     

       15
        
         };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       16
        
       

     

       17
        
         goDeps = ./deps.json;

     

       18
        
       }

···

       1
       +
       { stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:

     

       2
        
       

     

       3
        
       buildGoPackage rec {

     

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

     

       5
       +
         version = "v0.9.0";

     

       6
       +
         rev = "f28af637327a4f12ae745284c519cfdeca5502ef";

     

       7
        
       

     

       8
        
         goPackagePath = "github.com/mholt/caddy";

     

       9
        
       

     

       10
       +
         subPackages = [ "caddy" ];

     

       11
       +
       

     

       12
       +
         src = fetchgit {

     

       13
        
           inherit rev;

     

       14
       +
           url = "https://github.com/mholt/caddy.git";

     

       15
       +
           sha256 = "1s7z0xbcw516i37pyj1wgxd9diqrifdghf97vs31ilbqs6z0nyls";

     

       0
        
       
     

       16
        
         };

     

       17
       +
       

     

       18
       +
         buildFlagsArray = ''

     

       19
       +
           -ldflags=

     

       20
       +
             -X github.com/mholt/caddy/caddy/caddymain.gitTag=${version}

     

       21
       +
         '';

     

       22
        
       

     

       23
        
         goDeps = ./deps.json;

     

       24
        
       }

+180 -144

pkgs/servers/caddy/deps.json

···

       1
        
       [

     

       2
       -
           {

     

       3
       -
               "goPackagePath": "gopkg.in/yaml.v2",

     

       4
       -
               "fetch": {

     

       5
       -
                   "type": "git",

     

       6
       -
                   "url": "https://gopkg.in/yaml.v2",

     

       7
       -
                   "rev": "a83829b6f1293c91addabc89d0571c246397bbf4",

     

       8
       -
                   "sha256": "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"

     

       9
       -
               }

     

       10
       -
           },

     

       11
       -
           {

     

       12
       -
               "goPackagePath": "golang.org/x/crypto",

     

       13
       -
               "fetch": {

     

       14
       -
                   "type": "git",

     

       15
       -
                   "url": "https://go.googlesource.com/crypto",

     

       16
       -
                   "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6",

     

       17
       -
                   "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"

     

       18
       -
               }

     

       19
       -
           },

     

       20
       -
           {

     

       21
       -
               "goPackagePath": "golang.org/x/net",

     

       22
       -
               "fetch": {

     

       23
       -
                   "type": "git",

     

       24
       -
                   "url": "https://go.googlesource.com/net",

     

       25
       -
                   "rev": "62ac18b461605b4be188bbc7300e9aa2bc836cd4",

     

       26
       -
                   "sha256": "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"

     

       27
       -
               }

     

       28
       -
           },

     

       29
       -
           {

     

       30
       -
               "goPackagePath": "github.com/gorilla/websocket",

     

       31
       -
               "fetch": {

     

       32
       -
                   "type": "git",

     

       33
       -
                   "url": "https://github.com/gorilla/websocket",

     

       34
       -
                   "rev": "a622679ebd7a3b813862379232f645f8e690e43f",

     

       35
       -
                   "sha256": "1nc9jbcmgya1i6dmf6sbcqsnxi9hbjg6dz1z0k7zmc6xdwlq0y4q"

     

       36
       -
               }

     

       37
       -
           },

     

       38
       -
           {

     

       39
       -
               "goPackagePath": "github.com/miekg/dns",

     

       40
       -
               "fetch": {

     

       41
       -
                   "type": "git",

     

       42
       -
                   "url": "https://github.com/miekg/dns",

     

       43
       -
                   "rev": "7e024ce8ce18b21b475ac6baf8fa3c42536bf2fa",

     

       44
       -
                   "sha256": "0hlwb52lnnj3c6papjk9i5w5cjdw6r7c891v4xksnfvk1f9cy9kl"

     

       45
       -
               }

     

       46
       -
           },

     

       47
       -
           {

     

       48
       -
               "goPackagePath": "github.com/BurntSushi/toml",

     

       49
       -
               "fetch": {

     

       50
       -
                   "type": "git",

     

       51
       -
                   "url": "https://github.com/BurntSushi/toml",

     

       52
       -
                   "rev": "056c9bc7be7190eaa7715723883caffa5f8fa3e4",

     

       53
       -
                   "sha256": "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw"

     

       54
       -
               }

     

       55
       -
           },

     

       56
       -
           {

     

       57
       -
               "goPackagePath": "github.com/hashicorp/go-syslog",

     

       58
       -
               "fetch": {

     

       59
       -
                   "type": "git",

     

       60
       -
                   "url": "https://github.com/hashicorp/go-syslog",

     

       61
       -
                   "rev": "42a2b573b664dbf281bd48c3cc12c086b17a39ba",

     

       62
       -
                   "sha256": "1j53m2wjyczm9m55znfycdvm4c8vfniqgk93dvzwy8vpj5gm6sb3"

     

       63
       -
               }

     

       64
       -
           },

     

       65
       -
           {

     

       66
       -
               "goPackagePath": "github.com/flynn/go-shlex",

     

       67
       -
               "fetch": {

     

       68
       -
                   "type": "git",

     

       69
       -
                   "url": "https://github.com/flynn/go-shlex",

     

       70
       -
                   "rev": "3f9db97f856818214da2e1057f8ad84803971cff",

     

       71
       -
                   "sha256": "1j743lysygkpa2s2gii2xr32j7bxgc15zv4113b0q9jhn676ysia"

     

       72
       -
               }

     

       73
       -
           },

     

       74
       -
           {

     

       75
       -
               "goPackagePath": "github.com/xenolf/lego",

     

       76
       -
               "fetch": {

     

       77
       -
                   "type": "git",

     

       78
       -
                   "url": "https://github.com/xenolf/lego",

     

       79
       -
                   "rev": "ca19a90028e242e878585941c2a27c8f3b3efc25",

     

       80
       -
                   "sha256": "1zkcsbdzbmfzk3kqmcj9l13li8sz228xhrw2wj3ab4a0w6drbw3x"

     

       81
       -
               }

     

       82
       -
           },

     

       83
       -
           {

     

       84
       -
               "goPackagePath": "gopkg.in/natefinch/lumberjack.v2",

     

       85
       -
               "fetch": {

     

       86
       -
                   "type": "git",

     

       87
       -
                   "url": "https://gopkg.in/natefinch/lumberjack.v2",

     

       88
       -
                   "rev": "514cbda263a734ae8caac038dadf05f8f3f9f738",

     

       89
       -
                   "sha256": "1v92v8vkip36l2fs6l5dpp655151hrijjc781cif658r8nf7xr82"

     

       90
       -
               }

     

       91
       -
           },

     

       92
       -
           {

     

       93
       -
               "goPackagePath": "github.com/shurcooL/sanitized_anchor_name",

     

       94
       -
               "fetch": {

     

       95
       -
                   "type": "git",

     

       96
       -
                   "url": "https://github.com/shurcooL/sanitized_anchor_name",

     

       97
       -
                   "rev": "10ef21a441db47d8b13ebcc5fd2310f636973c77",

     

       98
       -
                   "sha256": "1cnbzcf47cn796rcjpph1s64qrabhkv5dn9sbynsy7m9zdwr5f01"

     

       99
       -
               }

     

       100
       -
           },

     

       101
       -
           {

     

       102
       -
               "goPackagePath": "gopkg.in/square/go-jose.v1",

     

       103
       -
               "fetch": {

     

       104
       -
                   "type": "git",

     

       105
       -
                   "url": "https://gopkg.in/square/go-jose.v1",

     

       106
       -
                   "rev": "40d457b439244b546f023d056628e5184136899b",

     

       107
       -
                   "sha256": "0asa1kl1qbx0cyayk44jhxxff0awpkwiw6va7yzrzjzhfc5kvg7p"

     

       108
       -
               }

     

       109
       -
           },

     

       110
       -
           {

     

       111
       -
               "goPackagePath": "github.com/mholt/archiver",

     

       112
       -
               "fetch": {

     

       113
       -
                   "type": "git",

     

       114
       -
                   "url": "https://github.com/mholt/archiver",

     

       115
       -
                   "rev": "85f054813ed511646b0ce5e047697e0651b8e1a4",

     

       116
       -
                   "sha256": "0b38mrfm3rwgdi7hrp4gjhf0y0f6bw73qjkfrkafxjrdpdg7nyly"

     

       117
       -
               }

     

       118
       -
           },

     

       119
       -
           {

     

       120
       -
               "goPackagePath": "github.com/dustin/go-humanize",

     

       121
       -
               "fetch": {

     

       122
       -
                   "type": "git",

     

       123
       -
                   "url": "https://github.com/dustin/go-humanize",

     

       124
       -
                   "rev": "8929fe90cee4b2cb9deb468b51fb34eba64d1bf0",

     

       125
       -
                   "sha256": "1g155kxjh6hd3ibx41nbpj6f7h5bh54zgl9dr53xzg2xlxljgjy0"

     

       126
       -
               }

     

       127
       -
           },

     

       128
       -
           {

     

       129
       -
               "goPackagePath": "github.com/jimstudt/http-authentication",

     

       130
       -
               "fetch": {

     

       131
       -
                   "type": "git",

     

       132
       -
                   "url": "https://github.com/jimstudt/http-authentication",

     

       133
       -
                   "rev": "3eca13d6893afd7ecabe15f4445f5d2872a1b012",

     

       134
       -
                   "sha256": "1drw3bhrxpjzwryqz9nq5s0yyjqyd42iym3bh1zjs5qsh401cq08"

     

       135
       -
               }

     

       136
       -
           },

     

       137
       -
           {

     

       138
       -
               "goPackagePath": "github.com/russross/blackfriday",

     

       139
       -
               "fetch": {

     

       140
       -
                   "type": "git",

     

       141
       -
                   "url": "https://github.com/russross/blackfriday",

     

       142
       -
                   "rev": "d18b67ae0afd61dae240896eae1785f00709aa31",

     

       143
       -
                   "sha256": "1l78hz8k1ixry5fjw29834jz1q5ysjcpf6kx2ggjj1s6xh0bfzvf"

     

       144
       -
               }

     

       145
        
           }

     

       146
       -
       ]

     

       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
        
       
     

       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
        
       
     

       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
        
       
     

       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
        
       
     

       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
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0

···

       1
        
       [

     

       2
       +
         {

     

       3
       +
           "goPackagePath": "github.com/BurntSushi/toml",

     

       4
       +
           "fetch": {

     

       5
       +
             "type": "git",

     

       6
       +
             "url": "https://github.com/BurntSushi/toml",

     

       7
       +
             "rev": "99064174e013895bbd9b025c31100bd1d9b590ca",

     

       8
       +
             "sha256": "058qrar8rvw3wb0ci1mf1axnqq2729cvv9zmdr4ms2nn9s97yiz9"

     

       9
       +
           }

     

       10
       +
         },

     

       11
       +
         {

     

       12
       +
           "goPackagePath": "github.com/dustin/go-humanize",

     

       13
       +
           "fetch": {

     

       14
       +
             "type": "git",

     

       15
       +
             "url": "https://github.com/dustin/go-humanize",

     

       16
       +
             "rev": "2fcb5204cdc65b4bec9fd0a87606bb0d0e3c54e8",

     

       17
       +
             "sha256": "1m2qgn5vh5m66ggmclgikvwc05np2r7sxgpvlj2jip5d61x29j5k"

     

       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
        
       
     

       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
        
       
     

       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
        
       
     

       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
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       18
        
           }

     

       19
       +
         },

     

       20
       +
         {

     

       21
       +
           "goPackagePath": "github.com/flynn/go-shlex",

     

       22
       +
           "fetch": {

     

       23
       +
             "type": "git",

     

       24
       +
             "url": "https://github.com/flynn/go-shlex",

     

       25
       +
             "rev": "3f9db97f856818214da2e1057f8ad84803971cff",

     

       26
       +
             "sha256": "1j743lysygkpa2s2gii2xr32j7bxgc15zv4113b0q9jhn676ysia"

     

       27
       +
           }

     

       28
       +
         },

     

       29
       +
         {

     

       30
       +
           "goPackagePath": "github.com/gorilla/websocket",

     

       31
       +
           "fetch": {

     

       32
       +
             "type": "git",

     

       33
       +
             "url": "https://github.com/gorilla/websocket",

     

       34
       +
             "rev": "a69d25be2fe2923a97c2af6849b2f52426f68fc0",

     

       35
       +
             "sha256": "1z09mff5yfdrw8vbylrgrick5m5hczjy8m2x6swdq8v062s45g3v"

     

       36
       +
           }

     

       37
       +
         },

     

       38
       +
         {

     

       39
       +
           "goPackagePath": "github.com/hashicorp/go-syslog",

     

       40
       +
           "fetch": {

     

       41
       +
             "type": "git",

     

       42
       +
             "url": "https://github.com/hashicorp/go-syslog",

     

       43
       +
             "rev": "42a2b573b664dbf281bd48c3cc12c086b17a39ba",

     

       44
       +
             "sha256": "1j53m2wjyczm9m55znfycdvm4c8vfniqgk93dvzwy8vpj5gm6sb3"

     

       45
       +
           }

     

       46
       +
         },

     

       47
       +
         {

     

       48
       +
           "goPackagePath": "github.com/jimstudt/http-authentication",

     

       49
       +
           "fetch": {

     

       50
       +
             "type": "git",

     

       51
       +
             "url": "https://github.com/jimstudt/http-authentication",

     

       52
       +
             "rev": "3eca13d6893afd7ecabe15f4445f5d2872a1b012",

     

       53
       +
             "sha256": "1drw3bhrxpjzwryqz9nq5s0yyjqyd42iym3bh1zjs5qsh401cq08"

     

       54
       +
           }

     

       55
       +
         },

     

       56
       +
         {

     

       57
       +
           "goPackagePath": "github.com/lucas-clemente/aes12",

     

       58
       +
           "fetch": {

     

       59
       +
             "type": "git",

     

       60
       +
             "url": "https://github.com/lucas-clemente/aes12",

     

       61
       +
             "rev": "5a3c52721c1e81aa8162601ac2342486525156d5",

     

       62
       +
             "sha256": "16z4h752na2d4sskjvbgi9bpwx874lpnzn6i13n33xjz599nps4y"

     

       63
       +
           }

     

       64
       +
         },

     

       65
       +
         {

     

       66
       +
           "goPackagePath": "github.com/lucas-clemente/fnv128a",

     

       67
       +
           "fetch": {

     

       68
       +
             "type": "git",

     

       69
       +
             "url": "https://github.com/lucas-clemente/fnv128a",

     

       70
       +
             "rev": "393af48d391698c6ae4219566bfbdfef67269997",

     

       71
       +
             "sha256": "1cvq0p0k86p668yz9rb3z98fz3f9phvbvqp6ilbasiy4y2x5w184"

     

       72
       +
           }

     

       73
       +
         },

     

       74
       +
         {

     

       75
       +
           "goPackagePath": "github.com/lucas-clemente/quic-go",

     

       76
       +
           "fetch": {

     

       77
       +
             "type": "git",

     

       78
       +
             "url": "https://github.com/lucas-clemente/quic-go",

     

       79
       +
             "rev": "61454ac85f1209c41ffcc000213a42f3e76346e5",

     

       80
       +
             "sha256": "0y7qmwlb93r0aq5m5qarc86550d75yx86pwv31wd2m0474yv7jk9"

     

       81
       +
           }

     

       82
       +
         },

     

       83
       +
         {

     

       84
       +
           "goPackagePath": "github.com/lucas-clemente/quic-go-certificates",

     

       85
       +
           "fetch": {

     

       86
       +
             "type": "git",

     

       87
       +
             "url": "https://github.com/lucas-clemente/quic-go-certificates",

     

       88
       +
             "rev": "9bb36d3159787cca26dcfa15e23049615e307ef8",

     

       89
       +
             "sha256": "146674p0rg0m4j8p33r5idn5j5k4a277fz1yzf87v5m8wf4694q5"

     

       90
       +
           }

     

       91
       +
         },

     

       92
       +
         {

     

       93
       +
           "goPackagePath": "github.com/mholt/caddy",

     

       94
       +
           "fetch": {

     

       95
       +
             "type": "git",

     

       96
       +
             "url": "https://github.com/mholt/caddy.git",

     

       97
       +
             "rev": "f28af637327a4f12ae745284c519cfdeca5502ef",

     

       98
       +
             "sha256": "1s7z0xbcw516i37pyj1wgxd9diqrifdghf97vs31ilbqs6z0nyls"

     

       99
       +
           }

     

       100
       +
         },

     

       101
       +
         {

     

       102
       +
           "goPackagePath": "github.com/miekg/dns",

     

       103
       +
           "fetch": {

     

       104
       +
             "type": "git",

     

       105
       +
             "url": "https://github.com/miekg/dns",

     

       106
       +
             "rev": "db96a2b759cdef4f11a34506a42eb8d1290c598e",

     

       107
       +
             "sha256": "0h5n4psd0p7q55jadgsgz2a1aj791yanrfj76avalh6aawvdpcm6"

     

       108
       +
           }

     

       109
       +
         },

     

       110
       +
         {

     

       111
       +
           "goPackagePath": "github.com/russross/blackfriday",

     

       112
       +
           "fetch": {

     

       113
       +
             "type": "git",

     

       114
       +
             "url": "https://github.com/russross/blackfriday",

     

       115
       +
             "rev": "93622da34e54fb6529bfb7c57e710f37a8d9cbd8",

     

       116
       +
             "sha256": "19y4cx4afm3fjj7w83g0wklbzqdjm7m1j5nq64l4yq8bi50y2iv2"

     

       117
       +
           }

     

       118
       +
         },

     

       119
       +
         {

     

       120
       +
           "goPackagePath": "github.com/shurcooL/sanitized_anchor_name",

     

       121
       +
           "fetch": {

     

       122
       +
             "type": "git",

     

       123
       +
             "url": "https://github.com/shurcooL/sanitized_anchor_name",

     

       124
       +
             "rev": "10ef21a441db47d8b13ebcc5fd2310f636973c77",

     

       125
       +
             "sha256": "1cnbzcf47cn796rcjpph1s64qrabhkv5dn9sbynsy7m9zdwr5f01"

     

       126
       +
           }

     

       127
       +
         },

     

       128
       +
         {

     

       129
       +
           "goPackagePath": "github.com/xenolf/lego",

     

       130
       +
           "fetch": {

     

       131
       +
             "type": "git",

     

       132
       +
             "url": "https://github.com/xenolf/lego",

     

       133
       +
             "rev": "4c33bee13d438d72ea22be3ff806f8093fb8d072",

     

       134
       +
             "sha256": "191wx4jmi2hs2m233da0c7j1l80alf2493wmnixfphwwdik7qdvw"

     

       135
       +
           }

     

       136
       +
         },

     

       137
       +
         {

     

       138
       +
           "goPackagePath": "golang.org/x/crypto",

     

       139
       +
           "fetch": {

     

       140
       +
             "type": "git",

     

       141
       +
             "url": "https://go.googlesource.com/crypto",

     

       142
       +
             "rev": "7a1054f3ac58191481dc500077c6b060f5d6c7e5",

     

       143
       +
             "sha256": "1n34nalvan3mydjzi48hxa30mz0i3zcb2rynw07s39m457ab1412"

     

       144
       +
           }

     

       145
       +
         },

     

       146
       +
         {

     

       147
       +
           "goPackagePath": "golang.org/x/net",

     

       148
       +
           "fetch": {

     

       149
       +
             "type": "git",

     

       150
       +
             "url": "https://go.googlesource.com/net",

     

       151
       +
             "rev": "57bfaa875b96fb91b4766077f34470528d4b03e9",

     

       152
       +
             "sha256": "17gfka5dv1n7v0z49clyl3h0xm5w2qcaldyyzlar6rh6l14g2dq5"

     

       153
       +
           }

     

       154
       +
         },

     

       155
       +
         {

     

       156
       +
           "goPackagePath": "gopkg.in/natefinch/lumberjack.v2",

     

       157
       +
           "fetch": {

     

       158
       +
             "type": "git",

     

       159
       +
             "url": "https://gopkg.in/natefinch/lumberjack.v2",

     

       160
       +
             "rev": "514cbda263a734ae8caac038dadf05f8f3f9f738",

     

       161
       +
             "sha256": "1v92v8vkip36l2fs6l5dpp655151hrijjc781cif658r8nf7xr82"

     

       162
       +
           }

     

       163
       +
         },

     

       164
       +
         {

     

       165
       +
           "goPackagePath": "gopkg.in/square/go-jose.v1",

     

       166
       +
           "fetch": {

     

       167
       +
             "type": "git",

     

       168
       +
             "url": "https://gopkg.in/square/go-jose.v1",

     

       169
       +
             "rev": "e3f973b66b91445ec816dd7411ad1b6495a5a2fc",

     

       170
       +
             "sha256": "18icclnws5bz4xmlyybkxl38nhvyr990h88rvp4lp9n4r1fk3lhb"

     

       171
       +
           }

     

       172
       +
         },

     

       173
       +
         {

     

       174
       +
           "goPackagePath": "gopkg.in/yaml.v2",

     

       175
       +
           "fetch": {

     

       176
       +
             "type": "git",

     

       177
       +
             "url": "https://gopkg.in/yaml.v2",

     

       178
       +
             "rev": "e4d366fc3c7938e2958e662b4258c7a89e1f0e3e",

     

       179
       +
             "sha256": "1himz6569rcgn27q6sdrwvdldx45q2spgjb5cfihgb80zww8di8x"

     

       180
       +
           }

     

       181
       +
         }

     

       182
       +
       ]

+2 -2

pkgs/servers/emby/default.nix

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

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

     

       5
       -
         version = "3.0.6030";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
        
           url = "https://github.com/MediaBrowser/Emby/archive/${version}.tar.gz";

     

       9
       -
           sha256 = "14fmgb8pwj11n57c1rm002ylwqapdqywbpsv7z6skairbaf6ny09";

     

       10
        
         };

     

       11
        
       

     

       12
        
         propagatedBuildInputs = with pkgs; [

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

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

     

       5
       +
         version = "3.0.6060";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
        
           url = "https://github.com/MediaBrowser/Emby/archive/${version}.tar.gz";

     

       9
       +
           sha256 = "1s895198x3kiqfznhp56vj67wld9fgh2wd7k8hw69mrasby0kmp3";

     

       10
        
         };

     

       11
        
       

     

       12
        
         propagatedBuildInputs = with pkgs; [

+1 -1

pkgs/servers/mail/dspam/default.nix

···

       99
        
         '';

     

       100
        
       

     

       101
        
         meta = with lib; {

     

       102
       -
           homepage = http://dspam.nuclearelephant.com/;

     

       103
        
           description = "Community Driven Antispam Filter";

     

       104
        
           license = licenses.agpl3;

     

       105
        
           platforms = platforms.linux;

···

       99
        
         '';

     

       100
        
       

     

       101
        
         meta = with lib; {

     

       102
       +
           homepage = "http://nuclearelephant.com/";

     

       103
        
           description = "Community Driven Antispam Filter";

     

       104
        
           license = licenses.agpl3;

     

       105
        
           platforms = platforms.linux;

+1 -1

pkgs/servers/rpcbind/default.nix

···

       26
        
           description = "ONC RPC portmapper";

     

       27
        
           license = licenses.bsd3;

     

       28
        
           platforms = platforms.unix;

     

       29
       -
           homepage = http://sourceforge.net/projects/rpcbind/;

     

       30
        
           maintainers = with maintainers; [ abbradar ];

     

       31
        
           longDescription = ''

     

       32
        
             Universal addresses to RPC program number mapper.

···

       26
        
           description = "ONC RPC portmapper";

     

       27
        
           license = licenses.bsd3;

     

       28
        
           platforms = platforms.unix;

     

       29
       +
           homepage = "http://sourceforge.net/projects/rpcbind/";

     

       30
        
           maintainers = with maintainers; [ abbradar ];

     

       31
        
           longDescription = ''

     

       32
        
             Universal addresses to RPC program number mapper.

+12 -3

pkgs/servers/sql/mariadb/default.nix

···

       32
        
         nativeBuildInputs = [ cmake pkgconfig ];

     

       33
        
       

     

       34
        
         buildInputs = [

     

       35
       -
           ncurses openssl zlib pcre

     

       36
       -
         ] ++ stdenv.lib.optionals stdenv.isLinux [ jemalloc libaio systemd ]

     

       37
        
           ++ stdenv.lib.optionals stdenv.isDarwin [ perl fixDarwinDylibNames cctools CoreServices ];

     

       38
        
       

     

       39
        
         cmakeFlags = [

     
···

       49
        
           "-DWITH_ZLIB=system"

     

       50
        
           "-DWITH_SSL=system"

     

       51
        
           "-DWITH_PCRE=system"

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       52
        
         ]

     

       53
        
           ++ optional stdenv.isDarwin "-DCURSES_LIBRARY=${ncurses.out}/lib/libncurses.dylib"

     

       54
       -
           ++ optional (!stdenv.isLinux) "-DWITH_JEMALLOC=no" # bad build at least on Darwin

     

       55
        
           ;

     

       56
        
       

     

       57
        
         preConfigure = ''

···

       32
        
         nativeBuildInputs = [ cmake pkgconfig ];

     

       33
        
       

     

       34
        
         buildInputs = [

     

       35
       +
           ncurses openssl zlib pcre jemalloc

     

       36
       +
         ] ++ stdenv.lib.optionals stdenv.isLinux [ libaio systemd ]

     

       37
        
           ++ stdenv.lib.optionals stdenv.isDarwin [ perl fixDarwinDylibNames cctools CoreServices ];

     

       38
        
       

     

       39
        
         cmakeFlags = [

     
···

       49
        
           "-DWITH_ZLIB=system"

     

       50
        
           "-DWITH_SSL=system"

     

       51
        
           "-DWITH_PCRE=system"

     

       52
       +
       

     

       53
       +
           # On Darwin without sandbox, CMake will find the system java and attempt to build with java support, but

     

       54
       +
           # then it will fail during the actual build. Let's just disable the flag explicitly until someone decides

     

       55
       +
           # to pass in java explicitly. This should have no effect on Linux.

     

       56
       +
           "-DCONNECT_WITH_JDBC=OFF"

     

       57
       +
       

     

       58
       +
           # Same as above. Somehow on Darwin CMake decides that we support GSS even though we aren't provding the

     

       59
       +
           # library through Nix, and then breaks later on. This should have no effect on Linux.

     

       60
       +
           "-DPLUGIN_AUTH_GSSAPI=NO"

     

       61
       +
           "-DPLUGIN_AUTH_GSSAPI_CLIENT=NO"

     

       62
        
         ]

     

       63
        
           ++ optional stdenv.isDarwin "-DCURSES_LIBRARY=${ncurses.out}/lib/libncurses.dylib"

     

       0
        
       
     

       64
        
           ;

     

       65
        
       

     

       66
        
         preConfigure = ''

+1 -1

pkgs/servers/uwsgi/default.nix

···

       81
        
         NIX_CFLAGS_LINK = [ "-lsystemd" ];

     

       82
        
       

     

       83
        
         meta = with stdenv.lib; {

     

       84
       -
           homepage = http://uwsgi-docs.readthedocs.org/en/latest/;

     

       85
        
           description = "A fast, self-healing and developer/sysadmin-friendly application container server coded in pure C";

     

       86
        
           license = licenses.gpl2;

     

       87
        
           maintainers = with maintainers; [ abbradar ];

···

       81
        
         NIX_CFLAGS_LINK = [ "-lsystemd" ];

     

       82
        
       

     

       83
        
         meta = with stdenv.lib; {

     

       84
       +
           homepage = "http://uwsgi-docs.readthedocs.org/en/latest/";

     

       85
        
           description = "A fast, self-healing and developer/sysadmin-friendly application container server coded in pure C";

     

       86
        
           license = licenses.gpl2;

     

       87
        
           maintainers = with maintainers; [ abbradar ];

+22

pkgs/servers/x11/xorg/xcb-util-xrm.nix

···

       1
       +
       { stdenv, fetchurl, pkgconfig, m4, libxcb, xcbutil, libX11 }:

     

       2
       +
       

     

       3
       +
       stdenv.mkDerivation rec {

     

       4
       +
         version = "1.0";

     

       5
       +
         name = "xcb-util-xrm-${version}";

     

       6
       +
       

     

       7
       +
         src = fetchurl {

     

       8
       +
           url = "https://github.com/Airblader/xcb-util-xrm/releases/download/v${version}/${name}.tar.bz2";

     

       9
       +
           sha256 = "1h5vxwpd37dqfw9yj1l4zd9c5dj30r3g0szgysr6kd7xrqgaq04l";

     

       10
       +
         };

     

       11
       +
       

     

       12
       +
         buildInputs = [ pkgconfig m4 libxcb xcbutil ]

     

       13
       +
           ++ stdenv.lib.optional doCheck [ libX11 ];

     

       14
       +
         doCheck = true;

     

       15
       +
       

     

       16
       +
         meta = with stdenv.lib; {

     

       17
       +
           description = "XCB utility functions for the X resource manager";

     

       18
       +
           homepage = https://github.com/Airblader/xcb-util-xrm;

     

       19
       +
           license = licenses.mit; # X11 variant

     

       20
       +
           platforms = with platforms; unix;

     

       21
       +
         };

     

       22
       +
       }

+4 -3

pkgs/servers/xmpp/ejabberd/default.nix

···

       23
        
         ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils utillinux procps ];

     

       24
        
       

     

       25
        
       in stdenv.mkDerivation rec {

     

       26
       -
         version = "16.04";

     

       27
        
         name = "ejabberd-${version}";

     

       28
        
       

     

       29
        
         src = fetchurl {

     

       30
        
           url = "http://www.process-one.net/downloads/ejabberd/${version}/${name}.tgz";

     

       31
       -
           sha256 = "1hrcswk03x5x6f6xy8sac4ihhi6jcmsfp6449k3570j39vklz5ix";

     

       32
        
         };

     

       33
        
       

     

       34
        
         nativeBuildInputs = [ fakegit ];

     
···

       74
        
       

     

       75
        
           outputHashMode = "recursive";

     

       76
        
           outputHashAlgo = "sha256";

     

       77
       -
           outputHash = "08s1j0xa65xkrqw810wzgssngs67sz722jsvj7p02v4ra8jcl31f";

     

       78
        
         };

     

       79
        
       

     

       80
        
         configureFlags =

     
···

       95
        
         preBuild = ''

     

       96
        
           cp -r $deps deps

     

       97
        
           chmod -R +w deps

     

       0
        
       
     

       98
        
         '';

     

       99
        
       

     

       100
        
         postInstall = ''

···

       23
        
         ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils utillinux procps ];

     

       24
        
       

     

       25
        
       in stdenv.mkDerivation rec {

     

       26
       +
         version = "16.08";

     

       27
        
         name = "ejabberd-${version}";

     

       28
        
       

     

       29
        
         src = fetchurl {

     

       30
        
           url = "http://www.process-one.net/downloads/ejabberd/${version}/${name}.tgz";

     

       31
       +
           sha256 = "0dqikg0xgph8xjvaxc9r6cyq7k7c8l5jiqr3kyhricziyak9hmdl";

     

       32
        
         };

     

       33
        
       

     

       34
        
         nativeBuildInputs = [ fakegit ];

     
···

       74
        
       

     

       75
        
           outputHashMode = "recursive";

     

       76
        
           outputHashAlgo = "sha256";

     

       77
       +
           outputHash = "040l336570lwxsvlli7kqaa18pz92jbf9105mx394ib62z72vvlp";

     

       78
        
         };

     

       79
        
       

     

       80
        
         configureFlags =

     
···

       95
        
         preBuild = ''

     

       96
        
           cp -r $deps deps

     

       97
        
           chmod -R +w deps

     

       98
       +
           patchShebangs deps

     

       99
        
         '';

     

       100
        
       

     

       101
        
         postInstall = ''

+2 -2

pkgs/tools/X11/primus/lib.nix

···

       5
        
       }:

     

       6
        
       

     

       7
        
       stdenv.mkDerivation {

     

       8
       -
         name = "primus-lib-20151204";

     

       9
        
       

     

       10
        
         src = fetchFromGitHub {

     

       11
        
           owner = "amonakov";

     
···

       28
        
       

     

       29
        
         meta = with stdenv.lib; {

     

       30
        
           description = "Low-overhead client-side GPU offloading";

     

       31
       -
           homepage = https://github.com/amonakov/primus;

     

       32
        
           platforms = platforms.linux;

     

       33
        
           license = licenses.bsd2;

     

       34
        
           maintainers = with maintainers; [ abbradar ];

···

       5
        
       }:

     

       6
        
       

     

       7
        
       stdenv.mkDerivation {

     

       8
       +
         name = "primus-lib-2015-04-28";

     

       9
        
       

     

       10
        
         src = fetchFromGitHub {

     

       11
        
           owner = "amonakov";

     
···

       28
        
       

     

       29
        
         meta = with stdenv.lib; {

     

       30
        
           description = "Low-overhead client-side GPU offloading";

     

       31
       +
           homepage = "https://github.com/amonakov/primus";

     

       32
        
           platforms = platforms.linux;

     

       33
        
           license = licenses.bsd2;

     

       34
        
           maintainers = with maintainers; [ abbradar ];

+1 -1

pkgs/tools/X11/virtualgl/lib.nix

···

       20
        
         enableParallelBuilding = true;

     

       21
        
       

     

       22
        
         meta = with stdenv.lib; {

     

       23
       -
           homepage = http://www.virtualgl.org/;

     

       24
        
           description = "X11 GL rendering in a remote computer with full 3D hw acceleration";

     

       25
        
           license = licenses.free; # many parts under different free licenses

     

       26
        
           platforms = platforms.linux;

···

       20
        
         enableParallelBuilding = true;

     

       21
        
       

     

       22
        
         meta = with stdenv.lib; {

     

       23
       +
           homepage = "http://www.virtualgl.org/";

     

       24
        
           description = "X11 GL rendering in a remote computer with full 3D hw acceleration";

     

       25
        
           license = licenses.free; # many parts under different free licenses

     

       26
        
           platforms = platforms.linux;

+5 -4

pkgs/tools/X11/xpra/default.nix

···

       1
       -
       { stdenv, fetchurl, buildPythonApplication, pythonPackages

     

       2
       -
       , python, cython, pkgconfig

     

       3
       -
       , xorg, gtk, glib, pango, cairo, gdk_pixbuf, atk, pycairo

     

       4
        
       , makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf, xkeyboard_config

     

       5
        
       , ffmpeg, x264, libvpx, libwebp

     

       6
        
       , libfakeXinerama }:

     

       7
        
       

     

       8
       -
       buildPythonApplication rec {

     

       0
        
       
     

       0
        
       
     

       9
        
         name = "xpra-0.17.4";

     

       10
        
         namePrefix = "";

     

       11
        
         src = fetchurl {

···

       1
       +
       { stdenv, fetchurl, pythonPackages, pkgconfig

     

       2
       +
       , xorg, gtk, glib, pango, cairo, gdk_pixbuf, atk

     

       0
        
       
     

       3
        
       , makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf, xkeyboard_config

     

       4
        
       , ffmpeg, x264, libvpx, libwebp

     

       5
        
       , libfakeXinerama }:

     

       6
        
       

     

       7
       +
       let

     

       8
       +
         inherit (pythonPackages) python cython buildPythonApplication;

     

       9
       +
       in buildPythonApplication rec {

     

       10
        
         name = "xpra-0.17.4";

     

       11
        
         namePrefix = "";

     

       12
        
         src = fetchurl {

+3 -4

pkgs/tools/backup/duplicity/default.nix

···

       1
       -
       { stdenv, fetchurl, python, librsync, ncftp, gnupg, boto, makeWrapper

     

       2
       -
       , lockfile, setuptools, paramiko, pycrypto, ecdsa

     

       3
        
       }:

     

       4
        
       

     

       5
        
       let

     

       6
        
         version = "0.7.07.1";

     

       7
       -
       in

     

       8
       -
       stdenv.mkDerivation {

     

       9
        
         name = "duplicity-${version}";

     

       10
        
       

     

       11
        
         src = fetchurl {

···

       1
       +
       { stdenv, fetchurl, pythonPackages, librsync, ncftp, gnupg, makeWrapper

     

       0
        
       
     

       2
        
       }:

     

       3
        
       

     

       4
        
       let

     

       5
        
         version = "0.7.07.1";

     

       6
       +
         inherit (pythonPackages) boto ecdsa lockfile paramiko pycrypto python setuptools;

     

       7
       +
       in stdenv.mkDerivation {

     

       8
        
         name = "duplicity-${version}";

     

       9
        
       

     

       10
        
         src = fetchurl {

+2 -4

pkgs/tools/backup/obnam/default.nix

···

       1
       -
       { stdenv, fetchurl, python, pythonPackages, pycrypto, attr }:

     

       2
        
       

     

       3
        
       pythonPackages.buildPythonApplication rec {

     

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

     

       5
        
         version = "1.19.1";

     

       6
        
       

     

       7
       -
         namePrefix = "";

     

       8
       -
       

     

       9
        
         src = fetchurl rec {

     

       10
        
           url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_${version}.orig.tar.xz";

     

       11
        
           sha256 = "096abbvz2c9vm8r7zm82yqrd7zj04pb1xzlv6z0dspkngd0cfdqc";

     

       12
        
         };

     

       13
        
       

     

       14
        
         buildInputs = [ pythonPackages.sphinx attr ];

     

       15
       -
         propagatedBuildInputs = [ pycrypto pythonPackages.paramiko pythonPackages.tracing pythonPackages.ttystatus pythonPackages.cliapp pythonPackages.larch pythonPackages.pyyaml pythonPackages.fuse ];

     

       16
        
       

     

       17
        
         doCheck = false;

     

       18

···

       1
       +
       { stdenv, fetchurl, pythonPackages, attr }:

     

       2
        
       

     

       3
        
       pythonPackages.buildPythonApplication rec {

     

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

     

       5
        
         version = "1.19.1";

     

       6
        
       

     

       0
        
       
     

       0
        
       
     

       7
        
         src = fetchurl rec {

     

       8
        
           url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_${version}.orig.tar.xz";

     

       9
        
           sha256 = "096abbvz2c9vm8r7zm82yqrd7zj04pb1xzlv6z0dspkngd0cfdqc";

     

       10
        
         };

     

       11
        
       

     

       12
        
         buildInputs = [ pythonPackages.sphinx attr ];

     

       13
       +
         propagatedBuildInputs = with pythonPackages; [ pycrypto paramiko tracing ttystatus cliapp larch pyyaml fuse ];

     

       14
        
       

     

       15
        
         doCheck = false;

     

       16

+1 -1

pkgs/tools/bluetooth/blueman/default.nix

···

       40
        
         '';

     

       41
        
       

     

       42
        
         meta = with lib; {

     

       43
       -
           homepage = https://github.com/blueman-project;

     

       44
        
           description = "GTK+-based Bluetooth Manager";

     

       45
        
           license = licenses.gpl3;

     

       46
        
           platforms = platforms.linux;

···

       40
        
         '';

     

       41
        
       

     

       42
        
         meta = with lib; {

     

       43
       +
           homepage = "https://github.com/blueman-project/blueman";

     

       44
        
           description = "GTK+-based Bluetooth Manager";

     

       45
        
           license = licenses.gpl3;

     

       46
        
           platforms = platforms.linux;

+1 -1

pkgs/tools/filesystems/bcache-tools/default.nix

···

       1
       -
       { stdenv, fetchurl, pkgconfig, utillinux, kmod }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         name = "bcache-tools-${version}";

···

       1
       +
       { stdenv, fetchurl, pkgconfig, utillinux }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         name = "bcache-tools-${version}";

+1 -1

pkgs/tools/graphics/imgurbash2/default.nix

···

       26
        
           license = licenses.mit;

     

       27
        
           platforms = platforms.linux;

     

       28
        
           maintainers = with maintainers; [ abbradar ];

     

       29
       -
           homepage = https://github.com/ram-on/imgurbash2;

     

       30
        
         };

     

       31
        
       }

···

       26
        
           license = licenses.mit;

     

       27
        
           platforms = platforms.linux;

     

       28
        
           maintainers = with maintainers; [ abbradar ];

     

       29
       +
           homepage = "https://github.com/ram-on/imgurbash2";

     

       30
        
         };

     

       31
        
       }

+7 -4

pkgs/tools/misc/debian-devscripts/default.nix

···

       1
        
       {stdenv, fetchurl, perl, CryptSSLeay, LWP, unzip, xz, dpkg, TimeDate, DBFile

     

       2
       -
       , FileDesktopEntry, libxslt, docbook_xsl, python3, setuptools, makeWrapper

     

       0
        
       
     

       3
        
       , perlPackages, curl, gnupg, diffutils

     

       4
        
       , sendmailPath ? "/var/setuid-wrappers/sendmail"

     

       5
        
       }:

     

       6
        
       

     

       7
       -
       stdenv.mkDerivation rec {

     

       0
        
       
     

       0
        
       
     

       8
        
         version = "2.16.6";

     

       9
        
         name = "debian-devscripts-${version}";

     

       10
        
       

     
···

       14
        
         };

     

       15
        
       

     

       16
        
         buildInputs = [ perl CryptSSLeay LWP unzip xz dpkg TimeDate DBFile 

     

       17
       -
           FileDesktopEntry libxslt python3 setuptools makeWrapper

     

       18
        
           perlPackages.ParseDebControl perlPackages.LWPProtocolHttps

     

       19
        
           curl gnupg diffutils ];

     

       20
        
       

     

       21
        
         preConfigure = ''

     

       22
        
           export PERL5LIB="$PERL5LIB''${PERL5LIB:+:}${dpkg}";

     

       23
       -
           tgtpy="$out/lib/${python3.libPrefix}/site-packages"

     

       24
        
           mkdir -p "$tgtpy"

     

       25
        
           export PYTHONPATH="$PYTHONPATH''${PYTHONPATH:+:}$tgtpy"

     

       26
        
           find po4a scripts -type f -exec sed -r \

···

       1
        
       {stdenv, fetchurl, perl, CryptSSLeay, LWP, unzip, xz, dpkg, TimeDate, DBFile

     

       2
       +
       , FileDesktopEntry, libxslt, docbook_xsl, makeWrapper

     

       3
       +
       , python3Packages

     

       4
        
       , perlPackages, curl, gnupg, diffutils

     

       5
        
       , sendmailPath ? "/var/setuid-wrappers/sendmail"

     

       6
        
       }:

     

       7
        
       

     

       8
       +
       let

     

       9
       +
         inherit (python3Packages) python setuptools;

     

       10
       +
       in stdenv.mkDerivation rec {

     

       11
        
         version = "2.16.6";

     

       12
        
         name = "debian-devscripts-${version}";

     

       13
        
       

     
···

       17
        
         };

     

       18
        
       

     

       19
        
         buildInputs = [ perl CryptSSLeay LWP unzip xz dpkg TimeDate DBFile 

     

       20
       +
           FileDesktopEntry libxslt python setuptools makeWrapper

     

       21
        
           perlPackages.ParseDebControl perlPackages.LWPProtocolHttps

     

       22
        
           curl gnupg diffutils ];

     

       23
        
       

     

       24
        
         preConfigure = ''

     

       25
        
           export PERL5LIB="$PERL5LIB''${PERL5LIB:+:}${dpkg}";

     

       26
       +
           tgtpy="$out/lib/${python.libPrefix}/site-packages"

     

       27
        
           mkdir -p "$tgtpy"

     

       28
        
           export PYTHONPATH="$PYTHONPATH''${PYTHONPATH:+:}$tgtpy"

     

       29
        
           find po4a scripts -type f -exec sed -r \

+3 -3

pkgs/tools/misc/grub4dos/default.nix

···

       6
        
         else abort "Unknown architecture";

     

       7
        
       in stdenv.mkDerivation rec {

     

       8
        
         name = "grub4dos-${version}";

     

       9
       -
         version = "0.4.6a-2016-04-26";

     

       10
        
       

     

       11
        
         src = fetchFromGitHub {

     

       12
        
           owner = "chenall";

     

       13
        
           repo = "grub4dos";

     

       14
       -
           rev = "61d8229375c679436d56376518456723b2025e1a";

     

       15
       -
           sha256 = "1r4jmvykk5cvpf1kysykvksa9vfy7p29q20x72inw2pbhipj0f10";

     

       16
        
         };

     

       17
        
       

     

       18
        
         nativeBuildInputs = [ nasm ];

···

       6
        
         else abort "Unknown architecture";

     

       7
        
       in stdenv.mkDerivation rec {

     

       8
        
         name = "grub4dos-${version}";

     

       9
       +
         version = "0.4.6a-2016-08-06";

     

       10
        
       

     

       11
        
         src = fetchFromGitHub {

     

       12
        
           owner = "chenall";

     

       13
        
           repo = "grub4dos";

     

       14
       +
           rev = "99d6ddbe7611f942d2708d77a620d6aa94a284d1";

     

       15
       +
           sha256 = "0gnllk0qkx6d0azf7v9cr0b23gp577avksz0f4dl3v3ldgi0dksq";

     

       16
        
         };

     

       17
        
       

     

       18
        
         nativeBuildInputs = [ nasm ];

+6 -4

pkgs/tools/misc/svtplay-dl/default.nix

···

       1
       -
       { stdenv, fetchFromGitHub, makeWrapper, python, perl, zip

     

       2
       -
       , rtmpdump, nose, mock, pycrypto, requests2, substituteAll }:

     

       3
        
       

     

       4
       -
       stdenv.mkDerivation rec {

     

       0
        
       
     

       0
        
       
     

       5
        
         name = "svtplay-dl-${version}";

     

       6
        
         version = "1.1";

     

       7
        
       

     
···

       24
        
             --replace 'PYTHONPATH=lib' 'PYTHONPATH=lib:$PYTHONPATH'

     

       25
        
         '';

     

       26
        
       

     

       27
       -
         makeFlags = "PREFIX=$(out) SYSCONFDIR=$(out)/etc PYTHON=${python}/bin/python";

     

       28
        
       

     

       29
        
         postInstall = ''

     

       30
        
           wrapProgram "$out/bin/svtplay-dl" \

···

       1
       +
       { stdenv, fetchFromGitHub, makeWrapper, pythonPackages, perl, zip

     

       2
       +
       , rtmpdump, substituteAll }:

     

       3
        
       

     

       4
       +
       let

     

       5
       +
         inherit (pythonPackages) python nose pycrypto requests2 mock;

     

       6
       +
       in stdenv.mkDerivation rec {

     

       7
        
         name = "svtplay-dl-${version}";

     

       8
        
         version = "1.1";

     

       9
        
       

     
···

       26
        
             --replace 'PYTHONPATH=lib' 'PYTHONPATH=lib:$PYTHONPATH'

     

       27
        
         '';

     

       28
        
       

     

       29
       +
         makeFlags = "PREFIX=$(out) SYSCONFDIR=$(out)/etc PYTHON=${python.interpreter}";

     

       30
        
       

     

       31
        
         postInstall = ''

     

       32
        
           wrapProgram "$out/bin/svtplay-dl" \

+6 -5

pkgs/tools/networking/logmein-hamachi/default.nix

···

       10
        
           else if stdenv.system == "i686-linux" then "x86"

     

       11
        
           else abort "Unsupported architecture";

     

       12
        
         sha256 =

     

       13
       -
           if stdenv.system == "x86_64-linux" then "1j9sba5prpihlmxr98ss3vls2qjfc6hypzlakr1k97z0a8433nif"

     

       14
       -
           else if stdenv.system == "i686-linux" then "100x6gib2np72wrvcn1yhdyn4fplf5x8xm4x0g77izyfdb3yjg8h"

     

       15
        
           else abort "Unsupported architecture";

     

       16
        
         libraries = stdenv.lib.makeLibraryPath [ stdenv.cc.cc ];

     

       17
        
       

     

       18
        
       in stdenv.mkDerivation rec {

     

       19
       -
         name = "logmein-hamachi-2.1.0.139";

     

       0
        
       
     

       20
        
       

     

       21
        
         src = fetchurl {

     

       22
       -
           url = "https://secure.logmein.com/labs/${name}-${arch}.tgz";

     

       23
        
           inherit sha256;

     

       24
        
         };

     

       25
        
       

     
···

       37
        
       

     

       38
        
         meta = with stdenv.lib; {

     

       39
        
           description = "A hosted VPN service that lets you securely extend LAN-like networks to distributed teams";

     

       40
       -
           homepage = https://secure.logmein.com/products/hamachi/;

     

       41
        
           license = licenses.unfreeRedistributable;

     

       42
        
           maintainers = with maintainers; [ abbradar ];

     

       43
        
           platforms = platforms.linux;

···

       10
        
           else if stdenv.system == "i686-linux" then "x86"

     

       11
        
           else abort "Unsupported architecture";

     

       12
        
         sha256 =

     

       13
       +
           if stdenv.system == "x86_64-linux" then "0l8y8z8fqvxrypx3dp83mm3qr9shgpcn5h7x2k2z13gp4aq0yw6g"

     

       14
       +
           else if stdenv.system == "i686-linux" then "00nl442k4pij9fm8inlk4qrcvbnz55fbwf3sm3dgbzvd5jcgsa0f"

     

       15
        
           else abort "Unsupported architecture";

     

       16
        
         libraries = stdenv.lib.makeLibraryPath [ stdenv.cc.cc ];

     

       17
        
       

     

       18
        
       in stdenv.mkDerivation rec {

     

       19
       +
         name = "logmein-hamachi-${version}";

     

       20
       +
         version = "2.1.0.165";

     

       21
        
       

     

       22
        
         src = fetchurl {

     

       23
       +
           url = "https://www.vpn.net/installers/${name}-${arch}.tgz";

     

       24
        
           inherit sha256;

     

       25
        
         };

     

       26
        
       

     
···

       38
        
       

     

       39
        
         meta = with stdenv.lib; {

     

       40
        
           description = "A hosted VPN service that lets you securely extend LAN-like networks to distributed teams";

     

       41
       +
           homepage = "https://secure.logmein.com/products/hamachi/";

     

       42
        
           license = licenses.unfreeRedistributable;

     

       43
        
           maintainers = with maintainers; [ abbradar ];

     

       44
        
           platforms = platforms.linux;

pkgs/tools/networking/network-manager/default.nix

···

       26
        
             --replace /bin/sh ${stdenv.shell} \

     

       27
        
             --replace /usr/sbin/ethtool ${ethtool}/sbin/ethtool \

     

       28
        
             --replace /bin/sed ${gnused}/bin/sed

     

       0
        
       
     

       0
        
       
     

       29
        
           # to enable link-local connections

     

       30
        
           configureFlags="$configureFlags --with-udev-dir=$out/lib/udev"

     

       31
        
         '';

···

       26
        
             --replace /bin/sh ${stdenv.shell} \

     

       27
        
             --replace /usr/sbin/ethtool ${ethtool}/sbin/ethtool \

     

       28
        
             --replace /bin/sed ${gnused}/bin/sed

     

       29
       +
           substituteInPlace data/NetworkManager.service.in \

     

       30
       +
             --replace /bin/kill ${coreutils}/bin/kill

     

       31
        
           # to enable link-local connections

     

       32
        
           configureFlags="$configureFlags --with-udev-dir=$out/lib/udev"

     

       33
        
         '';

+16 -11

pkgs/tools/networking/openvpn/update-resolv-conf.nix

···

       1
       -
       { stdenv, fetchgit, makeWrapper, openresolv, coreutils }:

     

       2
        
       

     

       3
       -
       stdenv.mkDerivation rec {

     

       4
       -
         name = "update-resolv-conf-20141003";

     

       5
        
       

     

       6
       -
         src = fetchgit {

     

       7
       -
           url = https://github.com/masterkorp/openvpn-update-resolv-conf/;

     

       8
       -
           rev = "dd968419373bce71b22bbd26de962e89eb470670";

     

       9
       -
           sha256 = "0j7mg66lqhgvhybgbn98y7i5skj1ify41hmb0yhkx2xrli8027b9";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       10
        
         };

     

       11
        
       

     

       12
        
         nativeBuildInputs = [ makeWrapper ];

     

       13
        
       

     

       14
        
         installPhase = ''

     

       15
        
           install -Dm555 update-resolv-conf.sh $out/libexec/openvpn/update-resolv-conf

     

       16
       -
           sed -i 's,^\(RESOLVCONF=\).*,\1resolvconf,' $out/libexec/openvpn/update-resolv-conf

     

       17
        
       

     

       18
       -
           wrapProgram $out/libexec/openvpn/update-resolv-conf \

     

       19
       -
               --prefix PATH : ${coreutils}/bin:${openresolv}/sbin

     

       0
        
       
     

       20
        
         '';

     

       21
        
       

     

       22
        
         meta = with stdenv.lib; {

     

       23
        
           description = "Script to update your /etc/resolv.conf with DNS settings that come from the received push dhcp-options";

     

       24
       -
           homepage = https://github.com/masterkorp/openvpn-update-resolv-conf/;

     

       25
        
           maintainers = with maintainers; [ abbradar ];

     

       26
        
           license = licenses.gpl2;

     

       27
        
           platforms = platforms.unix;

···

       1
       +
       { stdenv, lib, fetchFromGitHub, makeWrapper, openresolv, coreutils, which, systemd }:

     

       2
        
       

     

       3
       +
       let

     

       4
       +
         binPath = lib.makeBinPath [ coreutils openresolv which systemd ];

     

       5
        
       

     

       6
       +
       in stdenv.mkDerivation rec {

     

       7
       +
         name = "update-resolv-conf-2016-04-24";

     

       8
       +
       

     

       9
       +
         src = fetchFromGitHub {

     

       10
       +
           owner = "masterkorp";

     

       11
       +
           repo = "openvpn-update-resolv-conf";

     

       12
       +
           rev = "994574f36b9147cc78674a5f13874d503a625c98";

     

       13
       +
           sha256 = "1rvzlaj53k8s09phg4clsyzlmf44dmwwyvg0nbg966sxp3xsqlxc";

     

       14
        
         };

     

       15
        
       

     

       16
        
         nativeBuildInputs = [ makeWrapper ];

     

       17
        
       

     

       18
        
         installPhase = ''

     

       19
        
           install -Dm555 update-resolv-conf.sh $out/libexec/openvpn/update-resolv-conf

     

       20
       +
           install -Dm555 update-systemd-network.sh $out/libexec/openvpn/update-systemd-network

     

       21
        
       

     

       22
       +
           for i in $out/libexec/openvpn/*; do

     

       23
       +
             wrapProgram $i --prefix PATH : ${binPath}

     

       24
       +
           done

     

       25
        
         '';

     

       26
        
       

     

       27
        
         meta = with stdenv.lib; {

     

       28
        
           description = "Script to update your /etc/resolv.conf with DNS settings that come from the received push dhcp-options";

     

       29
       +
           homepage = "https://github.com/masterkorp/openvpn-update-resolv-conf/";

     

       30
        
           maintainers = with maintainers; [ abbradar ];

     

       31
        
           license = licenses.gpl2;

     

       32
        
           platforms = platforms.unix;

+16 -14

pkgs/tools/networking/wicd/default.nix

···

       1
       -
       {stdenv, fetchurl, python, pygobject, pycairo, pyGtkGlade, pythonDBus, 

     

       2
       -
        wpa_supplicant, dhcp, dhcpcd, wirelesstools, nettools, openresolv, iproute, iputils,

     

       3
       -
        pythonPackages, locale ? "C" }:

     

       0
        
       
     

       4
        
       

     

       5
       -
       stdenv.mkDerivation rec {

     

       0
        
       
     

       0
        
       
     

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

     

       7
        
         version = "1.7.2.4";

     

       8
        
         

     
···

       11
        
           sha256 = "15ywgh60xzmp5z8l1kzics7yi95isrjg1paz42dvp7dlpdfzpzfw";

     

       12
        
         };

     

       13
        
       

     

       14
       -
         buildInputs = [

     

       15
       -
           python pythonPackages.Babel

     

       16
       -
           pythonPackages.urwid pythonPackages.notify

     

       17
        
         ];

     

       18
        
       

     

       19
        
         patches = [

     
···

       31
        
         # !!! Should use makeWrapper.

     

       32
        
         postPatch = ''

     

       33
        
           # We don't have "python2".

     

       34
       -
           substituteInPlace wicd/wicd-daemon.py --replace 'misc.find_path("python2")' "'${python}/bin/python'"

     

       35
        
           

     

       36
        
           substituteInPlace in/scripts=wicd.in --subst-var-by TEMPLATE-DEFAULT $out/share/other/dhclient.conf.template.default

     

       37
        
       

     

       38
        
           sed -i "2iexport PATH=${python}/bin:${wpa_supplicant}/sbin:${dhcpcd}/sbin:${dhcp}/sbin:${wirelesstools}/sbin:${nettools}/sbin:${nettools}/bin:${iputils}/bin:${openresolv}/sbin:${iproute}/sbin\$\{PATH:+:\}\$PATH" in/scripts=wicd.in

     

       39
       -
           sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pygobject}):$(toPythonPath ${pythonDBus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd.in

     

       40
        
           sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-client.in

     

       41
       -
           sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-client.in

     

       42
        
           sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-gtk.in

     

       43
       -
           sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus}):$(toPythonPath ${pythonPackages.notify})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-gtk.in

     

       44
        
           sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-cli.in

     

       45
       -
           sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-cli.in

     

       46
        
           sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-curses.in

     

       47
       -
           sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus}):$(toPythonPath ${pythonPackages.urwid}):$(toPythonPath ${pythonPackages.curses})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-curses.in

     

       48
        
           rm po/ast.po

     

       49
        
         '';

     

       50
        
       

     
···

       90
        
         '';

     

       91
        
       

     

       92
        
         installPhase = ''

     

       93
       -
           python setup.py install --prefix=$out --install-lib=$out/lib/${python.libPrefix}/site-packages

     

       94
        
           mkdir -p $out/share/other

     

       95
        
           cp other/dhclient.conf.template.default $out/share/other/dhclient.conf.template.default

     

       96

···

       1
       +
       { stdenv, fetchurl, pythonPackages

     

       2
       +
       , wpa_supplicant, dhcp, dhcpcd, wirelesstools

     

       3
       +
       , nettools, openresolv, iproute, iputils

     

       4
       +
       , locale ? "C" }:

     

       5
        
       

     

       6
       +
       let

     

       7
       +
         inherit (pythonPackages) python pygobject dbus pyGtkGlade pycairo;

     

       8
       +
       in stdenv.mkDerivation rec {

     

       9
        
         name = "wicd-${version}";

     

       10
        
         version = "1.7.2.4";

     

       11
        
         

     
···

       14
        
           sha256 = "15ywgh60xzmp5z8l1kzics7yi95isrjg1paz42dvp7dlpdfzpzfw";

     

       15
        
         };

     

       16
        
       

     

       17
       +
         buildInputs = with pythonPackages; [

     

       18
       +
           python Babel urwid notify

     

       0
        
       
     

       19
        
         ];

     

       20
        
       

     

       21
        
         patches = [

     
···

       33
        
         # !!! Should use makeWrapper.

     

       34
        
         postPatch = ''

     

       35
        
           # We don't have "python2".

     

       36
       +
           substituteInPlace wicd/wicd-daemon.py --replace 'misc.find_path("python2")' "'${python.interpreter}'"

     

       37
        
           

     

       38
        
           substituteInPlace in/scripts=wicd.in --subst-var-by TEMPLATE-DEFAULT $out/share/other/dhclient.conf.template.default

     

       39
        
       

     

       40
        
           sed -i "2iexport PATH=${python}/bin:${wpa_supplicant}/sbin:${dhcpcd}/sbin:${dhcp}/sbin:${wirelesstools}/sbin:${nettools}/sbin:${nettools}/bin:${iputils}/bin:${openresolv}/sbin:${iproute}/sbin\$\{PATH:+:\}\$PATH" in/scripts=wicd.in

     

       41
       +
           sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pygobject}):$(toPythonPath ${dbus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd.in

     

       42
        
           sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-client.in

     

       43
       +
           sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${dbus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-client.in

     

       44
        
           sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-gtk.in

     

       45
       +
           sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${dbus}):$(toPythonPath ${pythonPackages.notify})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-gtk.in

     

       46
        
           sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-cli.in

     

       47
       +
           sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pycairo}):$(toPythonPath ${dbus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-cli.in

     

       48
        
           sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-curses.in

     

       49
       +
           sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pycairo}):$(toPythonPath ${dbus}):$(toPythonPath ${pythonPackages.urwid}):$(toPythonPath ${pythonPackages.curses})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-curses.in

     

       50
        
           rm po/ast.po

     

       51
        
         '';

     

       52
        
       

     
···

       92
        
         '';

     

       93
        
       

     

       94
        
         installPhase = ''

     

       95
       +
           python setup.py install --prefix=$out --install-lib=$out/${python.sitePackages}

     

       96
        
           mkdir -p $out/share/other

     

       97
        
           cp other/dhclient.conf.template.default $out/share/other/dhclient.conf.template.default

     

       98

-5

pkgs/tools/security/fail2ban/default.nix

···

       17
        
           ++ (stdenv.lib.optional stdenv.isLinux pythonPackages.systemd);

     

       18
        
       

     

       19
        
         preConfigure = ''

     

       20
       -
           for i in fail2ban-client fail2ban-regex fail2ban-server; do

     

       21
       -
             substituteInPlace $i \

     

       22
       -
               --replace /usr/share/fail2ban $out/share/fail2ban

     

       23
       -
           done

     

       24
       -
       

     

       25
        
           for i in config/action.d/sendmail*.conf; do

     

       26
        
             substituteInPlace $i \

     

       27
        
               --replace /usr/sbin/sendmail sendmail \

···

       17
        
           ++ (stdenv.lib.optional stdenv.isLinux pythonPackages.systemd);

     

       18
        
       

     

       19
        
         preConfigure = ''

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       20
        
           for i in config/action.d/sendmail*.conf; do

     

       21
        
             substituteInPlace $i \

     

       22
        
               --replace /usr/sbin/sendmail sendmail \

+4 -2

pkgs/tools/security/gnupg/21.nix

···

       27
        
           readline libusb gnutls adns openldap zlib bzip2

     

       28
        
         ];

     

       29
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       30
        
         postPatch = stdenv.lib.optionalString stdenv.isLinux ''

     

       31
        
           sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c

     

       32
        
         ''; #" fix Emacs syntax highlighting :-(

     

       33
        
       

     

       34
        
         configureFlags = optional x11Support "--with-pinentry-pgm=${pinentry}/bin/pinentry";

     

       35
       -
       

     

       36
       -
         postConfigure = "substituteAllInPlace tools/gpgkey2ssh.c";

     

       37
        
       

     

       38
        
         meta = with stdenv.lib; {

     

       39
        
           homepage = http://gnupg.org;

···

       27
        
           readline libusb gnutls adns openldap zlib bzip2

     

       28
        
         ];

     

       29
        
       

     

       30
       +
         # gpgsm-linking is fixed by commit (c49c43d7) in the gnupg master branch;

     

       31
       +
         # fix-gpgsm-linking.patch should be dropped after gnupg 2.1.15 is released

     

       32
       +
         patches = [ ./fix-gpgsm-linking.patch ];

     

       33
       +
       

     

       34
        
         postPatch = stdenv.lib.optionalString stdenv.isLinux ''

     

       35
        
           sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c

     

       36
        
         ''; #" fix Emacs syntax highlighting :-(

     

       37
        
       

     

       38
        
         configureFlags = optional x11Support "--with-pinentry-pgm=${pinentry}/bin/pinentry";

     

       0
        
       
     

       0
        
       
     

       39
        
       

     

       40
        
         meta = with stdenv.lib; {

     

       41
        
           homepage = http://gnupg.org;

+11

pkgs/tools/security/gnupg/fix-gpgsm-linking.patch

···

       1
       +
       --- a/tests/gpgscm/Makefile.in

     

       2
       +
       +++ b/tests/gpgscm/Makefile.in

     

       3
       +
       @@ -457,7 +457,7 @@

     

       4
       +
        	scheme-config.h opdefines.h scheme.c scheme.h scheme-private.h

     

       5
       +
        

     

       6
       +
        gpgscm_LDADD = $(LDADD) $(common_libs) \

     

       7
       +
       -	$(NETLIBS) $(LIBICONV) $(LIBREADLINE) \

     

       8
       +
       +	$(NETLIBS) $(LIBICONV) $(LIBREADLINE) $(LIBINTL) \

     

       9
       +
        	$(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS)

     

       10
       +
        

     

       11
       +
        t_child_SOURCES = t-child.c

+3 -3

pkgs/tools/security/knockknock/default.nix

···

       1
       -
       { stdenv, fetchFromGitHub, buildPythonApplication, python, pycrypto, hping }:

     

       2
        
       

     

       3
       -
       buildPythonApplication rec {

     

       4
        
         rev  = "bf14bbff";

     

       5
        
         name = "knockknock-r${rev}";

     

       6
        
       

     
···

       11
        
           sha256 = "1chpfs3w2vkjrgay69pbdr116z1jldv53fi768a1i05fdqhy1px4";

     

       12
        
         };

     

       13
        
       

     

       14
       -
         propagatedBuildInputs = [ pycrypto ];

     

       15
        
       

     

       16
        
         patchPhase = ''

     

       17
        
           sed -i '/build\//d' setup.py

···

       1
       +
       { stdenv, fetchFromGitHub, pythonPackages, buildPythonApplication, hping }:

     

       2
        
       

     

       3
       +
       pythonPackages.buildPythonApplication rec {

     

       4
        
         rev  = "bf14bbff";

     

       5
        
         name = "knockknock-r${rev}";

     

       6
        
       

     
···

       11
        
           sha256 = "1chpfs3w2vkjrgay69pbdr116z1jldv53fi768a1i05fdqhy1px4";

     

       12
        
         };

     

       13
        
       

     

       14
       +
         propagatedBuildInputs = [ pythonPackages.pycrypto ];

     

       15
        
       

     

       16
        
         patchPhase = ''

     

       17
        
           sed -i '/build\//d' setup.py

+5 -6

pkgs/tools/security/nmap/default.nix

···

       2
        
       , graphicalSupport ? false

     

       3
        
       , libX11 ? null

     

       4
        
       , gtk ? null

     

       5
       -
       , python ? null

     

       6
       -
       , pygtk ? null

     

       7
        
       , makeWrapper ? null

     

       8
       -
       , pygobject ? null

     

       9
       -
       , pycairo ? null

     

       10
       -
       , pysqlite ? null

     

       11
        
       }:

     

       12
        
       

     

       13
        
       with stdenv.lib;

     

       14
       -
       stdenv.mkDerivation rec {

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       15
        
         name = "nmap${optionalString graphicalSupport "-graphical"}-${version}";

     

       16
        
         version = "7.12";

     

       17

···

       2
        
       , graphicalSupport ? false

     

       3
        
       , libX11 ? null

     

       4
        
       , gtk ? null

     

       5
       +
       , pythonPackages

     

       0
        
       
     

       6
        
       , makeWrapper ? null

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       7
        
       }:

     

       8
        
       

     

       9
        
       with stdenv.lib;

     

       10
       +
       

     

       11
       +
       let

     

       12
       +
         inherit (pythonPackages) python pygtk pygobject pycairo pysqlite;

     

       13
       +
       in stdenv.mkDerivation rec {

     

       14
        
         name = "nmap${optionalString graphicalSupport "-graphical"}-${version}";

     

       15
        
         version = "7.12";

     

       16

+3 -5

pkgs/tools/security/volatility/default.nix

···

       1
       -
       { stdenv, fetchurl, buildPythonApplication, pycrypto }:

     

       2
        
       

     

       3
       -
       buildPythonApplication rec {

     

       4
       -
         namePrefix = "";

     

       5
        
         name = "volatility-2.4";

     

       6
       -
       

     

       7
        
       

     

       8
        
         src = fetchurl {

     

       9
        
           url = "http://downloads.volatilityfoundation.org/releases/2.4/${name}.tar.gz";

     
···

       12
        
       

     

       13
        
         doCheck = false;

     

       14
        
       

     

       15
       -
         propagatedBuildInputs = [ pycrypto ];

     

       16
        
       

     

       17
        
         meta = with stdenv.lib; {

     

       18
        
           homepage = https://code.google.com/p/volatility;

···

       1
       +
       { stdenv, fetchurl, pythonPackages }:

     

       2
        
       

     

       3
       +
       pythonPackages.buildPythonApplication rec {

     

       0
        
       
     

       4
        
         name = "volatility-2.4";

     

       0
        
       
     

       5
        
       

     

       6
        
         src = fetchurl {

     

       7
        
           url = "http://downloads.volatilityfoundation.org/releases/2.4/${name}.tar.gz";

     
···

       10
        
       

     

       11
        
         doCheck = false;

     

       12
        
       

     

       13
       +
         propagatedBuildInputs = [ pythonPackages.pycrypto ];

     

       14
        
       

     

       15
        
         meta = with stdenv.lib; {

     

       16
        
           homepage = https://code.google.com/p/volatility;

+1 -1

pkgs/tools/typesetting/tex/texlive-new/pkgs.nix

···

       22857
        
         version = "prot2.5";

     

       22858
        
       };

     

       22859
        
       "xdvi" = {

     

       22860
       -
         md5.run = "ada6dc1ceffd19a5fdd33d0536c8f82a";

     

       22861
        
         md5.doc = "eda28e06fbd79ed2bb26aff4d4d2fd22";

     

       22862
        
         hasRunfiles = true;

     

       22863
        
         version = "22.87";

···

       22857
        
         version = "prot2.5";

     

       22858
        
       };

     

       22859
        
       "xdvi" = {

     

       22860
       +
         md5.run = "0d66ffa281d713e3395ee0f5db93c9bd";

     

       22861
        
         md5.doc = "eda28e06fbd79ed2bb26aff4d4d2fd22";

     

       22862
        
         hasRunfiles = true;

     

       22863
        
         version = "22.87";

+1 -1

pkgs/tools/video/mjpegtools/default.nix

···

       30
        
       

     

       31
        
         meta = with stdenv.lib; {

     

       32
        
           description = "A suite of programs for processing MPEG or MJPEG video";

     

       33
       -
           homepage = http://mjpeg.sourceforge.net/;

     

       34
        
           license = licenses.gpl2;

     

       35
        
           platforms = platforms.unix;

     

       36
        
           maintainers = with maintainers; [ abbradar ];

···

       30
        
       

     

       31
        
         meta = with stdenv.lib; {

     

       32
        
           description = "A suite of programs for processing MPEG or MJPEG video";

     

       33
       +
           homepage = "http://mjpeg.sourceforge.net/";

     

       34
        
           license = licenses.gpl2;

     

       35
        
           platforms = platforms.unix;

     

       36
        
           maintainers = with maintainers; [ abbradar ];

+1 -5

pkgs/top-level/aliases.nix

···

       79
        
         qca-qt5 = qt5.qca-qt5;  # added 2015-12-19

     

       80
        
         QmidiNet = qmidinet;  # added 2016-05-22

     

       81
        
         quake3game = ioquake3; # added 2016-01-14

     

       82
       -
         quassel_kf5 = kde5.quassel; # added 2015-09-30

     

       83
       -
         quassel_qt5 = kde5.quassel_qt5; # added 2015-09-30

     

       84
       -
         quasselClient_kf5 = kde5.quasselClient; # added 2015-09-30

     

       85
       -
         quasselClient_qt5 = kde5.quasselClient_qt5; # added 2015-09-30

     

       86
       -
         quasselDaemon_qt5 = kde5.quasselDaemon; # added 2015-09-30

     

       87
        
         qwt6 = qt5.qwt;  # added 2015-12-19

     

       88
        
         rdiff_backup = rdiff-backup;  # added 2014-11-23

     

       89
        
         rekonqWrapper = rekonq; # added 2015-01

     
···

       111
        
         xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09

     

       112
        
         xlibs = xorg; # added 2015-09

     

       113
        
         youtubeDL = youtube-dl;  # added 2014-10-26

     

       0
        
       
     

       114
        
       }

···

       79
        
         qca-qt5 = qt5.qca-qt5;  # added 2015-12-19

     

       80
        
         QmidiNet = qmidinet;  # added 2016-05-22

     

       81
        
         quake3game = ioquake3; # added 2016-01-14

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       82
        
         qwt6 = qt5.qwt;  # added 2015-12-19

     

       83
        
         rdiff_backup = rdiff-backup;  # added 2014-11-23

     

       84
        
         rekonqWrapper = rekonq; # added 2015-01

     
···

       106
        
         xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09

     

       107
        
         xlibs = xorg; # added 2015-09

     

       108
        
         youtubeDL = youtube-dl;  # added 2014-10-26

     

       109
       +
         m3d-linux = m33-linux; # added 2016-08-13

     

       110
        
       }

+110 -179

pkgs/top-level/all-packages.nix

···

       646
        
           sha256 = "0p2sxrpzd0vsk11zf3kb5h12yl1nq4yypb5mpjrm8ww0cfaijck2";

     

       647
        
         };

     

       648
        
       

     

       649
       -
         btfs = callPackage ../os-specific/linux/btfs {

     

       650
       -
           libtorrentRasterbar = libtorrentRasterbar_1_09;

     

       651
       -
         };

     

       652
        
       

     

       653
        
         cabal2nix = self.haskell.lib.overrideCabal self.haskellPackages.cabal2nix (drv: {

     

       654
        
           isLibrary = false;

     
···

       665
        
         });

     

       666
        
       

     

       667
        
         caddy = callPackage ../servers/caddy { };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       668
        
       

     

       669
        
         capstone = callPackage ../development/libraries/capstone { };

     

       670
        
       

     
···

       700
        
       

     

       701
        
         clib = callPackage ../tools/package-management/clib { };

     

       702
        
       

     

       0
        
       
     

       0
        
       
     

       703
        
         consul = callPackage ../servers/consul { };

     

       704
        
       

     

       705
        
         consul-ui = callPackage ../servers/consul/ui.nix { };

     
···

       733
        
         ddate = callPackage ../tools/misc/ddate { };

     

       734
        
       

     

       735
        
         deis = callPackage ../development/tools/deis {};

     

       736
       -
       

     

       737
       -
         dfilemanager = self.kde5.dfilemanager;

     

       738
        
       

     

       739
        
         diagrams-builder = callPackage ../tools/graphics/diagrams-builder {

     

       740
        
           inherit (haskellPackages) ghcWithPackages diagrams-builder;

     
···

       1394
        
         duo-unix = callPackage ../tools/security/duo-unix { };

     

       1395
        
       

     

       1396
        
         duplicity = callPackage ../tools/backup/duplicity {

     

       1397
       -
           inherit (pythonPackages) boto lockfile paramiko ecdsa pycrypto;

     

       1398
        
           gnupg = gnupg1;

     

       1399
        
         };

     

       1400
        
       

     
···

       1527
        
           hangul = callPackage ../tools/inputmethods/fcitx-engines/fcitx-hangul { };

     

       1528
        
       

     

       1529
        
           unikey = callPackage ../tools/inputmethods/fcitx-engines/fcitx-unikey { };

     

       1530
       -
           

     

       1531
        
           m17n = callPackage ../tools/inputmethods/fcitx-engines/fcitx-m17n { };

     

       1532
        
       

     

       1533
        
           mozc = callPackage ../tools/inputmethods/fcitx-engines/fcitx-mozc {

     
···

       2215
        
         knockknock = callPackage ../tools/security/knockknock { };

     

       2216
        
       

     

       2217
        
         kpcli = callPackage ../tools/security/kpcli { };

     

       0
        
       
     

       0
        
       
     

       2218
        
       

     

       2219
        
         kst = qt5.callPackage ../tools/graphics/kst { gsl = gsl_1; };

     

       2220
        
       

     
···

       2768
        
         nmap = callPackage ../tools/security/nmap { };

     

       2769
        
       

     

       2770
        
         nmap_graphical = callPackage ../tools/security/nmap {

     

       2771
       -
           inherit (pythonPackages) pysqlite;

     

       2772
        
           graphicalSupport = true;

     

       2773
        
         };

     

       2774
        
       

     
···

       3212
        
       

     

       3213
        
         openmodelica = callPackage ../applications/science/misc/openmodelica { };

     

       3214
        
       

     

       3215
       -
         qarte = callPackage ../applications/video/qarte {

     

       3216
       -
           sip = pythonPackages.sip_4_16;

     

       3217
       -
         };

     

       3218
        
       

     

       3219
        
         qnial = callPackage ../development/interpreters/qnial {};

     

       3220
        
       

     
···

       3620
        
       

     

       3621
        
         svnfs = callPackage ../tools/filesystems/svnfs { };

     

       3622
        
       

     

       3623
       -
         svtplay-dl = callPackage ../tools/misc/svtplay-dl {

     

       3624
       -
           inherit (pythonPackages) nose mock requests2;

     

       3625
       -
         };

     

       3626
        
       

     

       3627
        
         sysbench = callPackage ../development/tools/misc/sysbench {};

     

       3628
        
       

     
···

       4387
        
       

     

       4388
        
         cryptol = self.haskell.packages.lts.cryptol;

     

       4389
        
       

     

       4390
       -
         cython = pythonPackages.cython;

     

       4391
       -
         cython3 = python3Packages.cython;

     

       4392
       -
       

     

       4393
        
         devpi-client = callPackage ../development/tools/devpi-client {};

     

       4394
        
       

     

       4395
        
         drumstick = callPackage ../development/libraries/drumstick { };

     
···

       5940
        
         regina = callPackage ../development/interpreters/regina { };

     

       5941
        
       

     

       5942
        
         renpy = callPackage ../development/interpreters/renpy {

     

       5943
       -
           wrapPython = pythonPackages.wrapPython;

     

       5944
        
           ffmpeg = ffmpeg_2;

     

       5945
        
         };

     

       5946
        
       

     
···

       6092
        
       

     

       6093
        
         apacheAnt = callPackage ../development/tools/build-managers/apache-ant { };

     

       6094
        
       

     

       6095
       -
         apacheKafka = apacheKafka_0_9;

     

       6096
        
         apacheKafka_0_8 = callPackage ../servers/apache-kafka { majorVersion = "0.8"; };

     

       6097
        
         apacheKafka_0_9 = callPackage ../servers/apache-kafka { majorVersion = "0.9"; };

     

       0
        
       
     

       6098
        
       

     

       6099
        
         astyle = callPackage ../development/tools/misc/astyle { };

     

       6100
        
       

     
···

       6397
        
         geis = callPackage ../development/libraries/geis {

     

       6398
        
           inherit (xorg) libX11 libXext libXi libXtst;

     

       6399
        
         };

     

       0
        
       
     

       0
        
       
     

       6400
        
       

     

       6401
        
         global = callPackage ../development/tools/misc/global { };

     

       6402
        
       

     
···

       6567
        
       

     

       6568
        
         oprofile = callPackage ../development/tools/profiling/oprofile { };

     

       6569
        
       

     

       0
        
       
     

       0
        
       
     

       6570
        
         parse-cli-bin = callPackage ../development/tools/parse-cli-bin { };

     

       6571
        
       

     

       6572
        
         patchelf = callPackage ../development/tools/misc/patchelf { };

     
···

       6771
        
         ) // {

     

       6772
        
           ocamlPackages = ocamlPackages_4_02;

     

       6773
        
         });

     

       0
        
       
     

       0
        
       
     

       6774
        
       

     

       6775
        
         xc3sprog = callPackage ../development/tools/misc/xc3sprog { };

     

       6776
        
       

     
···

       8728
        
         minmay = callPackage ../development/libraries/minmay { };

     

       8729
        
       

     

       8730
        
         miro = callPackage ../applications/video/miro {

     

       8731
       -
           inherit (pythonPackages) pywebkitgtk pycurl mutagen;

     

       8732
        
           avahi = avahi.override {

     

       8733
        
             withLibdnssdCompat = true;

     

       8734
        
           };

     
···

       9720
        
         xcb-util-cursor = xorg.xcbutilcursor;

     

       9721
        
         xcb-util-cursor-HEAD = callPackage ../development/libraries/xcb-util-cursor/HEAD.nix { };

     

       9722
        
       

     

       0
        
       
     

       0
        
       
     

       9723
        
         xdo = callPackage ../tools/misc/xdo { };

     

       9724
        
       

     

       9725
        
         xineLib = callPackage ../development/libraries/xine-lib {

     
···

       9774
        
         zlib = callPackage ../development/libraries/zlib {

     

       9775
        
           fetchurl = fetchurlBoot;

     

       9776
        
         };

     

       0
        
       
     

       0
        
       
     

       9777
        
       

     

       9778
        
         zlog = callPackage ../development/libraries/zlog { };

     

       9779
        
       

     
···

       10019
        
           self = pypyPackages;

     

       10020
        
         };

     

       10021
        
       

     

       10022
       -
         bsddb3 = pythonPackages.bsddb3;

     

       10023
       -
       

     

       10024
       -
         ecdsa = pythonPackages.ecdsa;

     

       10025
       -
       

     

       10026
       -
         pycairo = pythonPackages.pycairo;

     

       10027
       -
       

     

       10028
        
         pycapnp = pythonPackages.pycapnp;

     

       10029
        
       

     

       10030
       -
         pycrypto = pythonPackages.pycrypto;

     

       10031
       -
       

     

       10032
       -
         pycups = pythonPackages.pycups;

     

       10033
       -
       

     

       10034
        
         pyexiv2 = pythonPackages.pyexiv2;

     

       10035
       -
       

     

       10036
       -
         pygame = pythonPackages.pygame;

     

       10037
        
       

     

       10038
        
         pygobject = pythonPackages.pygobject;

     

       10039
        
       

     
···

       10044
        
         pygtksourceview = pythonPackages.pygtksourceview;

     

       10045
        
       

     

       10046
        
         pyGtkGlade = pythonPackages.pyGtkGlade;

     

       10047
       -
       

     

       10048
       -
         pylint = pythonPackages.pylint;

     

       10049
       -
       

     

       10050
       -
         pyopenssl = pythonPackages.pyopenssl;

     

       10051
        
       

     

       10052
        
         rhpl = pythonPackages.rhpl;

     

       10053
        
       

     

       10054
       -
         pyqt4 = pythonPackages.pyqt4;

     

       10055
       -
       

     

       10056
        
         pysideApiextractor = pythonPackages.pysideApiextractor;

     

       10057
        
       

     

       10058
        
         pysideGeneratorrunner = pythonPackages.pysideGeneratorrunner;

     
···

       10069
        
       

     

       10070
        
         rebol =  callPackage ../development/interpreters/rebol { };

     

       10071
        
       

     

       10072
       -
         setuptools = pythonPackages.setuptools;

     

       10073
       -
       

     

       10074
        
         slowaes = pythonPackages.slowaes;

     

       10075
       -
       

     

       10076
       -
         twisted = pythonPackages.twisted;

     

       10077
        
       

     

       10078
        
         yolk = callPackage ../development/python-modules/yolk {};

     

       10079
        
       

     
···

       10896
        
       

     

       10897
        
         fatrace = callPackage ../os-specific/linux/fatrace { };

     

       10898
        
       

     

       10899
       -
         ffadoFull = callPackage ../os-specific/linux/ffado { };

     

       0
        
       
     

       0
        
       
     

       10900
        
         libffado = self.ffadoFull.override { prefix = "lib"; };

     

       10901
        
       

     

       10902
        
         fbterm = callPackage ../os-specific/linux/fbterm { };

     
···

       11119
        
             ];

     

       11120
        
         };

     

       11121
        
       

     

       11122
       -
         linux_4_5 = callPackage ../os-specific/linux/kernel/linux-4.5.nix {

     

       11123
       -
           kernelPatches =

     

       11124
       -
             [ kernelPatches.bridge_stp_helper

     

       11125
       -
               kernelPatches.hiddev_CVE_2016_5829

     

       11126
       -
             ]

     

       11127
       -
             ++ lib.optionals ((platform.kernelArch or null) == "mips")

     

       11128
       -
             [ kernelPatches.mips_fpureg_emu

     

       11129
       -
               kernelPatches.mips_fpu_sigill

     

       11130
       -
               kernelPatches.mips_ext3_n32

     

       11131
       -
             ];

     

       11132
       -
         };

     

       11133
       -
       

     

       11134
        
         linux_4_6 = callPackage ../os-specific/linux/kernel/linux-4.6.nix {

     

       11135
        
           kernelPatches =

     

       11136
        
             [ kernelPatches.bridge_stp_helper

     
···

       11320
        
         linuxPackages_3_18 = recurseIntoAttrs (self.linuxPackagesFor self.linux_3_18 linuxPackages_3_18);

     

       11321
        
         linuxPackages_4_1 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_1 linuxPackages_4_1);

     

       11322
        
         linuxPackages_4_4 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_4 linuxPackages_4_4);

     

       11323
       -
         linuxPackages_4_5 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_5 linuxPackages_4_5);

     

       11324
        
         linuxPackages_4_6 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_6 linuxPackages_4_6);

     

       11325
        
         linuxPackages_4_7 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_7 linuxPackages_4_7);

     

       11326
        
         # Don't forget to update linuxPackages_latest!

     
···

       12241
        
         alpine = callPackage ../applications/networking/mailreaders/alpine {

     

       12242
        
           tcl = tcl-8_5;

     

       12243
        
         };

     

       12244
       -
         realpine = callPackage ../applications/networking/mailreaders/realpine {

     

       12245
       -
           tcl = tcl-8_5;

     

       12246
       -
         };

     

       12247
        
       

     

       12248
        
         AMB-plugins = callPackage ../applications/audio/AMB-plugins { };

     

       12249
        
       

     
···

       12634
        
         };

     

       12635
        
       

     

       12636
        
         dfasma = qt5.callPackage ../applications/audio/dfasma { };

     

       0
        
       
     

       0
        
       
     

       12637
        
       

     

       12638
        
         dia = callPackage ../applications/graphics/dia {

     

       12639
        
           inherit (pkgs.gnome) libart_lgpl libgnomeui;

     
···

       13035
        
         gksu = callPackage ../applications/misc/gksu { };

     

       13036
        
       

     

       13037
        
         gnuradio = callPackage ../applications/misc/gnuradio {

     

       13038
       -
           inherit (pythonPackages) lxml numpy scipy matplotlib pyopengl wxPython;

     

       13039
        
           fftw = fftwFloat;

     

       13040
        
         };

     

       13041
        
       

     
···

       13213
        
         };

     

       13214
        
       

     

       13215
        
         gimpPlugins = recurseIntoAttrs (callPackage ../applications/graphics/gimp/plugins {});

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       13216
        
       

     

       13217
        
         gitAndTools = recurseIntoAttrs (callPackage ../applications/version-management/git-and-tools {});

     

       13218
        
       

     
···

       13522
        
         imagemagickBig = callPackage ../applications/graphics/ImageMagick { };

     

       13523
        
       

     

       13524
        
         # Impressive, formerly known as "KeyJNote".

     

       13525
       -
         impressive = callPackage ../applications/office/impressive {

     

       13526
       -
           # XXX These are the PyOpenGL dependencies, which we need here.

     

       13527
       -
           inherit (pythonPackages) pyopengl;

     

       13528
       -
           inherit (pythonPackages) pillow;

     

       13529
       -
         };

     

       13530
        
       

     

       13531
        
         inferno = callPackage_i686 ../applications/inferno { };

     

       13532
        
       

     
···

       13607
        
           boost = boost155;

     

       13608
        
         };

     

       13609
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       13610
        
         keepnote = callPackage ../applications/office/keepnote {

     

       13611
        
           pygtk = pyGtkGlade;

     

       13612
        
         };

     
···

       13627
        
           qt = qt4;

     

       13628
        
         };

     

       13629
        
       

     

       0
        
       
     

       0
        
       
     

       13630
        
         kino = callPackage ../applications/video/kino {

     

       13631
        
           inherit (gnome) libglade;

     

       13632
        
           ffmpeg = ffmpeg_2;

     
···

       13635
        
         kiwix = callPackage ../applications/misc/kiwix { };

     

       13636
        
       

     

       13637
        
         koji = callPackage ../tools/package-management/koji { };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       13638
        
       

     

       13639
        
         ksuperkey = callPackage ../tools/X11/ksuperkey { };

     

       13640
        
       

     
···

       13843
        
       

     

       13844
        
         mid2key = callPackage ../applications/audio/mid2key { };

     

       13845
        
       

     

       13846
       -
         midori-unwrapped = callPackage ../applications/networking/browsers/midori {

     

       13847
       -
           webkitgtk = webkitgtk24x;

     

       13848
       -
         };

     

       13849
        
         midori = wrapFirefox midori-unwrapped { };

     

       13850
        
       

     

       13851
        
         mikmod = callPackage ../applications/audio/mikmod { };

     
···

       14254
        
       

     

       14255
        
         pianobooster = callPackage ../applications/audio/pianobooster { };

     

       14256
        
       

     

       14257
       -
         picard = callPackage ../applications/audio/picard {

     

       14258
       -
           python-libdiscid = pythonPackages.discid;

     

       14259
       -
           mutagen = pythonPackages.mutagen;

     

       14260
       -
         };

     

       14261
        
       

     

       14262
        
         picocom = callPackage ../tools/misc/picocom { };

     

       14263
        
       

     
···

       14374
        
           inherit (darwin.stubs) rez setfile;

     

       14375
        
         };

     

       14376
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       14377
        
         qjackctl = callPackage ../applications/audio/qjackctl { };

     

       14378
        
       

     

       14379
        
         qmidinet = callPackage ../applications/audio/qmidinet { };

     
···

       14394
        
       

     

       14395
        
         qsynth = callPackage ../applications/audio/qsynth { };

     

       14396
        
       

     

       0
        
       
     

       0
        
       
     

       14397
        
         qtox = qt5.callPackage ../applications/networking/instant-messengers/qtox { };

     

       14398
        
       

     

       14399
        
         qtpass = qt5.callPackage ../applications/misc/qtpass { };

     
···

       14404
        
       

     

       14405
        
         qtscrobbler = callPackage ../applications/audio/qtscrobbler { };

     

       14406
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       14407
        
         quirc = callPackage ../tools/graphics/quirc {};

     

       14408
        
       

     

       14409
        
         quodlibet = callPackage ../applications/audio/quodlibet {

     
···

       14416
        
           gst_plugins_bad = null;

     

       14417
        
         };

     

       14418
        
       

     

       14419
       -
         qutebrowser = qt55.callPackage ../applications/networking/browsers/qutebrowser {

     

       14420
       -
           inherit (python34Packages) buildPythonApplication python pyqt5 jinja2 pygments pyyaml pypeg2;

     

       14421
       -
           inherit (gst_all_1) gst-plugins-base gst-plugins-good gst-plugins-bad gst-libav;

     

       14422
        
         };

     

       14423
        
       

     

       14424
        
         rabbitvcs = callPackage ../applications/version-management/rabbitvcs {};

     
···

       14451
        
         rdesktop = callPackage ../applications/networking/remote/rdesktop { };

     

       14452
        
       

     

       14453
        
         rdup = callPackage ../tools/backup/rdup { };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       14454
        
       

     

       14455
        
         recode = callPackage ../tools/text/recode { };

     

       14456
        
       

     
···

       14657
        
       

     

       14658
        
         printrun = callPackage ../applications/misc/printrun { };

     

       14659
        
       

     

       14660
       -
         sddm = kde5.sddm;

     

       0
        
       
     

       0
        
       
     

       14661
        
       

     

       14662
        
         slim = callPackage ../applications/display-managers/slim {

     

       14663
        
           libpng = libpng12;

     
···

       14917
        
       

     

       14918
        
         tribler = callPackage ../applications/networking/p2p/tribler { };

     

       14919
        
       

     

       14920
       -
         github-release = callPackage ../development/tools/github/github-release { };

     

       0
        
       
     

       14921
        
       

     

       14922
        
         tudu = callPackage ../applications/office/tudu { };

     

       14923
        
       

     
···

       15415
        
       

     

       15416
        
         yabar = callPackage ../applications/window-managers/yabar { };

     

       15417
        
       

     

       15418
       -
         yate = callPackage ../applications/misc/yate { };

     

       15419
       -
       

     

       15420
       -
         inherit (gnome3) yelp;

     

       15421
       -
       

     

       15422
       -
         inherit (python3Packages) you-get;

     

       15423
       -
       

     

       15424
       -
         inherit (pythonPackages) youtube-dl;

     

       15425
        
       

     

       15426
       -
         qgis = callPackage ../applications/gis/qgis {};

     

       15427
        
       

     

       15428
       -
         qgroundcontrol = qt55.callPackage ../applications/science/robotics/qgroundcontrol { };

     

       15429
        
       

     

       15430
       -
         qtbitcointrader = callPackage ../applications/misc/qtbitcointrader { };

     

       15431
        
       

     

       15432
       -
         pahole = callPackage ../development/tools/misc/pahole {};

     

       15433
       -
       

     

       15434
       -
         yarp = callPackage ../applications/science/robotics/yarp {};

     

       15435
       -
       

     

       15436
       -
         yed = callPackage ../applications/graphics/yed {};

     

       15437
        
       

     

       15438
        
         ykpers = callPackage ../applications/misc/ykpers {};

     

       15439
        
       

     

       15440
        
         yoshimi = callPackage ../applications/audio/yoshimi { };

     

       15441
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       15442
        
         zam-plugins = callPackage ../applications/audio/zam-plugins { };

     

       15443
        
       

     

       15444
        
         zathuraCollection = recurseIntoAttrs

     
···

       15454
        
         zeroc_ice = callPackage ../development/libraries/zeroc-ice { };

     

       15455
        
       

     

       15456
        
         zexy = callPackage ../applications/audio/pd-plugins/zexy  { };

     

       15457
       -
       

     

       15458
       -
         girara = callPackage ../applications/misc/girara {

     

       15459
       -
           gtk = gtk3;

     

       15460
       -
         };

     

       15461
       -
       

     

       15462
       -
         girara-light = callPackage ../applications/misc/girara {

     

       15463
       -
           gtk = gtk3;

     

       15464
       -
           withBuildColors = false;

     

       15465
       -
           ncurses = null;

     

       15466
       -
         };

     

       15467
        
       

     

       15468
        
         zgrviewer = callPackage ../applications/graphics/zgrviewer {};

     

       15469
        
       

     
···

       15503
        
         angband = callPackage ../games/angband { };

     

       15504
        
       

     

       15505
        
         anki = callPackage ../games/anki {

     

       15506
       -
           inherit (pythonPackages) wrapPython pysqlite sqlalchemy pyaudio beautifulsoup httplib2 matplotlib;

     

       15507
        
         };

     

       15508
        
       

     

       15509
        
         armagetronad = callPackage ../games/armagetronad { };

     
···

       16344
        
       

     

       16345
        
         numix-gtk-theme = callPackage ../misc/themes/numix { };

     

       16346
        
       

     

       16347
       -
         # We need QtWebkit which was deprecated in Qt 5.6 although it can still be build

     

       16348
       -
         trojita = with qt55; callPackage ../applications/networking/mailreaders/trojita { };

     

       16349
       -
       

     

       16350
       -
         kde5PackagesFun = self: with self; {

     

       16351
       -
       

     

       16352
       -
           calamares = callPackage ../tools/misc/calamares rec {

     

       16353
       -
             python = python3;

     

       16354
       -
             boost = pkgs.boost.override { python = python3; };

     

       16355
       -
             libyamlcpp = callPackage ../development/libraries/libyaml-cpp { boost = boost; };

     

       16356
       -
           };

     

       16357
       -
       

     

       16358
       -
           colord-kde = callPackage ../tools/misc/colord-kde/0.5.nix {};

     

       16359
       -
       

     

       16360
       -
           dfilemanager = callPackage ../applications/misc/dfilemanager { };

     

       16361
       -
       

     

       16362
       -
           fcitx-qt5 = callPackage ../tools/inputmethods/fcitx/fcitx-qt5.nix { };

     

       16363
       -
       

     

       16364
       -
           k9copy = callPackage ../applications/video/k9copy { };

     

       16365
       -
       

     

       16366
       -
           kdeconnect = callPackage ../applications/misc/kdeconnect { };

     

       16367
       -
       

     

       16368
       -
           kile = callPackage ../applications/editors/kile/frameworks.nix { };

     

       16369
       -
       

     

       16370
       -
           konversation = callPackage ../applications/networking/irc/konversation/1.6.nix { };

     

       16371
       -
       

     

       16372
       -
           kronometer = callPackage ../tools/misc/kronometer { };

     

       16373
       -
       

     

       16374
       -
           krita = callPackage ../applications/graphics/krita {

     

       16375
       -
             vc = vc_0_7;

     

       16376
       -
             openjpeg = openjpeg_1;

     

       16377
       -
           };

     

       16378
       -
       

     

       16379
       -
           quassel = callPackage ../applications/networking/irc/quassel/qt-5.nix {

     

       16380
       -
             monolithic = true;

     

       16381
       -
             daemon = false;

     

       16382
       -
             client = false;

     

       16383
       -
             withKDE = true;

     

       16384
       -
             dconf = gnome3.dconf;

     

       16385
       -
             tag = "-kf5";

     

       16386
       -
           };

     

       16387
       -
       

     

       16388
       -
           quasselClient = quassel.override {

     

       16389
       -
             monolithic = false;

     

       16390
       -
             client = true;

     

       16391
       -
             tag = "-client-kf5";

     

       16392
       -
           };

     

       16393
       -
       

     

       16394
       -
           quassel_qt5 = quassel.override {

     

       16395
       -
             withKDE = false;

     

       16396
       -
             tag = "-qt5";

     

       16397
       -
           };

     

       16398
       -
       

     

       16399
       -
           quasselClient_qt5 = quasselClient.override {

     

       16400
       -
             withKDE = false;

     

       16401
       -
             tag = "-client-qt5";

     

       16402
       -
           };

     

       16403
       -
       

     

       16404
       -
           quasselDaemon = quassel.override {

     

       16405
       -
             monolithic = false;

     

       16406
       -
             daemon = true;

     

       16407
       -
             tag = "-daemon-qt5";

     

       16408
       -
             withKDE = false;

     

       16409
       -
           };

     

       16410
       -
       

     

       16411
       -
           sddm = callPackage ../applications/display-managers/sddm {

     

       16412
       -
             themes = [];  # extra themes, etc.

     

       16413
       -
           };

     

       16414
       -
       

     

       16415
       -
           yakuake = callPackage ../applications/misc/yakuake/3.0.nix {};

     

       16416
       -
       

     

       16417
       -
         };

     

       16418
       -
       

     

       16419
        
         kde5 =

     

       16420
        
           let

     

       16421
        
             plasma = import ../desktops/kde-5/plasma { inherit pkgs; };

     
···

       16426
        
                 applications = applications self; }

     

       16427
        
               // qt5.kdeFrameworks

     

       16428
        
               // plasma self

     

       16429
       -
               // applications self

     

       16430
       -
               // kde5PackagesFun self;

     

       16431
        
           in

     

       16432
        
             recurseIntoAttrs (lib.makeScope qt5.newScope merged);

     

       16433
        
       

     
···

       17222
        
       

     

       17223
        
         lkproof = callPackage ../tools/typesetting/tex/lkproof { };

     

       17224
        
       

     

       17225
       -
         m3d-linux = callPackage ../misc/drivers/m3d-linux { };

     

       17226
        
       

     

       17227
        
         mnemonicode = callPackage ../misc/mnemonicode { };

     

       17228
        
       

     

       17229
        
         mysqlWorkbench = newScope gnome ../applications/misc/mysql-workbench {

     

       17230
        
           lua = lua5_1;

     

       17231
        
           libctemplate = libctemplate_2_2;

     

       17232
       -
           inherit (pythonPackages) pexpect paramiko;

     

       17233
        
         };

     

       17234
        
       

     

       17235
        
         redis-desktop-manager = qt55.callPackage ../applications/misc/redis-desktop-manager { };

···

       646
        
           sha256 = "0p2sxrpzd0vsk11zf3kb5h12yl1nq4yypb5mpjrm8ww0cfaijck2";

     

       647
        
         };

     

       648
        
       

     

       649
       +
         btfs = callPackage ../os-specific/linux/btfs { };

     

       0
        
       
     

       0
        
       
     

       650
        
       

     

       651
        
         cabal2nix = self.haskell.lib.overrideCabal self.haskellPackages.cabal2nix (drv: {

     

       652
        
           isLibrary = false;

     
···

       663
        
         });

     

       664
        
       

     

       665
        
         caddy = callPackage ../servers/caddy { };

     

       666
       +
       

     

       667
       +
         calamares = qt5.callPackage ../tools/misc/calamares rec {

     

       668
       +
           python = python3;

     

       669
       +
           boost = pkgs.boost.override { python=python3; };

     

       670
       +
           libyamlcpp = callPackage ../development/libraries/libyaml-cpp { makePIC=true; boost=boost; };

     

       671
       +
         };

     

       672
        
       

     

       673
        
         capstone = callPackage ../development/libraries/capstone { };

     

       674
        
       

     
···

       704
        
       

     

       705
        
         clib = callPackage ../tools/package-management/clib { };

     

       706
        
       

     

       707
       +
         colord-kde = qt5.callPackage ../tools/misc/colord-kde/0.5.nix {};

     

       708
       +
       

     

       709
        
         consul = callPackage ../servers/consul { };

     

       710
        
       

     

       711
        
         consul-ui = callPackage ../servers/consul/ui.nix { };

     
···

       739
        
         ddate = callPackage ../tools/misc/ddate { };

     

       740
        
       

     

       741
        
         deis = callPackage ../development/tools/deis {};

     

       0
        
       
     

       0
        
       
     

       742
        
       

     

       743
        
         diagrams-builder = callPackage ../tools/graphics/diagrams-builder {

     

       744
        
           inherit (haskellPackages) ghcWithPackages diagrams-builder;

     
···

       1398
        
         duo-unix = callPackage ../tools/security/duo-unix { };

     

       1399
        
       

     

       1400
        
         duplicity = callPackage ../tools/backup/duplicity {

     

       0
        
       
     

       1401
        
           gnupg = gnupg1;

     

       1402
        
         };

     

       1403
        
       

     
···

       1530
        
           hangul = callPackage ../tools/inputmethods/fcitx-engines/fcitx-hangul { };

     

       1531
        
       

     

       1532
        
           unikey = callPackage ../tools/inputmethods/fcitx-engines/fcitx-unikey { };

     

       1533
       +
       

     

       1534
        
           m17n = callPackage ../tools/inputmethods/fcitx-engines/fcitx-m17n { };

     

       1535
        
       

     

       1536
        
           mozc = callPackage ../tools/inputmethods/fcitx-engines/fcitx-mozc {

     
···

       2218
        
         knockknock = callPackage ../tools/security/knockknock { };

     

       2219
        
       

     

       2220
        
         kpcli = callPackage ../tools/security/kpcli { };

     

       2221
       +
       

     

       2222
       +
         kronometer = qt5.callPackage ../tools/misc/kronometer { };

     

       2223
        
       

     

       2224
        
         kst = qt5.callPackage ../tools/graphics/kst { gsl = gsl_1; };

     

       2225
        
       

     
···

       2773
        
         nmap = callPackage ../tools/security/nmap { };

     

       2774
        
       

     

       2775
        
         nmap_graphical = callPackage ../tools/security/nmap {

     

       0
        
       
     

       2776
        
           graphicalSupport = true;

     

       2777
        
         };

     

       2778
        
       

     
···

       3216
        
       

     

       3217
        
         openmodelica = callPackage ../applications/science/misc/openmodelica { };

     

       3218
        
       

     

       3219
       +
         qarte = callPackage ../applications/video/qarte { };

     

       0
        
       
     

       0
        
       
     

       3220
        
       

     

       3221
        
         qnial = callPackage ../development/interpreters/qnial {};

     

       3222
        
       

     
···

       3622
        
       

     

       3623
        
         svnfs = callPackage ../tools/filesystems/svnfs { };

     

       3624
        
       

     

       3625
       +
         svtplay-dl = callPackage ../tools/misc/svtplay-dl { };

     

       0
        
       
     

       0
        
       
     

       3626
        
       

     

       3627
        
         sysbench = callPackage ../development/tools/misc/sysbench {};

     

       3628
        
       

     
···

       4387
        
       

     

       4388
        
         cryptol = self.haskell.packages.lts.cryptol;

     

       4389
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       4390
        
         devpi-client = callPackage ../development/tools/devpi-client {};

     

       4391
        
       

     

       4392
        
         drumstick = callPackage ../development/libraries/drumstick { };

     
···

       5937
        
         regina = callPackage ../development/interpreters/regina { };

     

       5938
        
       

     

       5939
        
         renpy = callPackage ../development/interpreters/renpy {

     

       0
        
       
     

       5940
        
           ffmpeg = ffmpeg_2;

     

       5941
        
         };

     

       5942
        
       

     
···

       6088
        
       

     

       6089
        
         apacheAnt = callPackage ../development/tools/build-managers/apache-ant { };

     

       6090
        
       

     

       6091
       +
         apacheKafka = apacheKafka_0_10;

     

       6092
        
         apacheKafka_0_8 = callPackage ../servers/apache-kafka { majorVersion = "0.8"; };

     

       6093
        
         apacheKafka_0_9 = callPackage ../servers/apache-kafka { majorVersion = "0.9"; };

     

       6094
       +
         apacheKafka_0_10 = callPackage ../servers/apache-kafka { majorVersion = "0.10"; };

     

       6095
        
       

     

       6096
        
         astyle = callPackage ../development/tools/misc/astyle { };

     

       6097
        
       

     
···

       6394
        
         geis = callPackage ../development/libraries/geis {

     

       6395
        
           inherit (xorg) libX11 libXext libXi libXtst;

     

       6396
        
         };

     

       6397
       +
       

     

       6398
       +
         github-release = callPackage ../development/tools/github/github-release { };

     

       6399
        
       

     

       6400
        
         global = callPackage ../development/tools/misc/global { };

     

       6401
        
       

     
···

       6566
        
       

     

       6567
        
         oprofile = callPackage ../development/tools/profiling/oprofile { };

     

       6568
        
       

     

       6569
       +
         pahole = callPackage ../development/tools/misc/pahole {};

     

       6570
       +
       

     

       6571
        
         parse-cli-bin = callPackage ../development/tools/parse-cli-bin { };

     

       6572
        
       

     

       6573
        
         patchelf = callPackage ../development/tools/misc/patchelf { };

     
···

       6772
        
         ) // {

     

       6773
        
           ocamlPackages = ocamlPackages_4_02;

     

       6774
        
         });

     

       6775
       +
       

     

       6776
       +
         visualvm = callPackage ../development/tools/java/visualvm { };

     

       6777
        
       

     

       6778
        
         xc3sprog = callPackage ../development/tools/misc/xc3sprog { };

     

       6779
        
       

     
···

       8731
        
         minmay = callPackage ../development/libraries/minmay { };

     

       8732
        
       

     

       8733
        
         miro = callPackage ../applications/video/miro {

     

       0
        
       
     

       8734
        
           avahi = avahi.override {

     

       8735
        
             withLibdnssdCompat = true;

     

       8736
        
           };

     
···

       9722
        
         xcb-util-cursor = xorg.xcbutilcursor;

     

       9723
        
         xcb-util-cursor-HEAD = callPackage ../development/libraries/xcb-util-cursor/HEAD.nix { };

     

       9724
        
       

     

       9725
       +
         xcbutilxrm = callPackage ../servers/x11/xorg/xcb-util-xrm.nix { };

     

       9726
       +
       

     

       9727
        
         xdo = callPackage ../tools/misc/xdo { };

     

       9728
        
       

     

       9729
        
         xineLib = callPackage ../development/libraries/xine-lib {

     
···

       9778
        
         zlib = callPackage ../development/libraries/zlib {

     

       9779
        
           fetchurl = fetchurlBoot;

     

       9780
        
         };

     

       9781
       +
       

     

       9782
       +
         libdynd = callPackage ../development/libraries/libdynd { };

     

       9783
        
       

     

       9784
        
         zlog = callPackage ../development/libraries/zlog { };

     

       9785
        
       

     
···

       10025
        
           self = pypyPackages;

     

       10026
        
         };

     

       10027
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       10028
        
         pycapnp = pythonPackages.pycapnp;

     

       10029
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       10030
        
         pyexiv2 = pythonPackages.pyexiv2;

     

       0
        
       
     

       0
        
       
     

       10031
        
       

     

       10032
        
         pygobject = pythonPackages.pygobject;

     

       10033
        
       

     
···

       10038
        
         pygtksourceview = pythonPackages.pygtksourceview;

     

       10039
        
       

     

       10040
        
         pyGtkGlade = pythonPackages.pyGtkGlade;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       10041
        
       

     

       10042
        
         rhpl = pythonPackages.rhpl;

     

       10043
        
       

     

       0
        
       
     

       0
        
       
     

       10044
        
         pysideApiextractor = pythonPackages.pysideApiextractor;

     

       10045
        
       

     

       10046
        
         pysideGeneratorrunner = pythonPackages.pysideGeneratorrunner;

     
···

       10057
        
       

     

       10058
        
         rebol =  callPackage ../development/interpreters/rebol { };

     

       10059
        
       

     

       0
        
       
     

       0
        
       
     

       10060
        
         slowaes = pythonPackages.slowaes;

     

       0
        
       
     

       0
        
       
     

       10061
        
       

     

       10062
        
         yolk = callPackage ../development/python-modules/yolk {};

     

       10063
        
       

     
···

       10880
        
       

     

       10881
        
         fatrace = callPackage ../os-specific/linux/fatrace { };

     

       10882
        
       

     

       10883
       +
         ffadoFull = callPackage ../os-specific/linux/ffado {

     

       10884
       +
           inherit (pythonPackages) python pyqt4;

     

       10885
       +
         };

     

       10886
        
         libffado = self.ffadoFull.override { prefix = "lib"; };

     

       10887
        
       

     

       10888
        
         fbterm = callPackage ../os-specific/linux/fbterm { };

     
···

       11105
        
             ];

     

       11106
        
         };

     

       11107
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       11108
        
         linux_4_6 = callPackage ../os-specific/linux/kernel/linux-4.6.nix {

     

       11109
        
           kernelPatches =

     

       11110
        
             [ kernelPatches.bridge_stp_helper

     
···

       11294
        
         linuxPackages_3_18 = recurseIntoAttrs (self.linuxPackagesFor self.linux_3_18 linuxPackages_3_18);

     

       11295
        
         linuxPackages_4_1 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_1 linuxPackages_4_1);

     

       11296
        
         linuxPackages_4_4 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_4 linuxPackages_4_4);

     

       0
        
       
     

       11297
        
         linuxPackages_4_6 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_6 linuxPackages_4_6);

     

       11298
        
         linuxPackages_4_7 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_7 linuxPackages_4_7);

     

       11299
        
         # Don't forget to update linuxPackages_latest!

     
···

       12214
        
         alpine = callPackage ../applications/networking/mailreaders/alpine {

     

       12215
        
           tcl = tcl-8_5;

     

       12216
        
         };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       12217
        
       

     

       12218
        
         AMB-plugins = callPackage ../applications/audio/AMB-plugins { };

     

       12219
        
       

     
···

       12604
        
         };

     

       12605
        
       

     

       12606
        
         dfasma = qt5.callPackage ../applications/audio/dfasma { };

     

       12607
       +
       

     

       12608
       +
         dfilemanager = qt5.callPackage ../applications/misc/dfilemanager { };

     

       12609
        
       

     

       12610
        
         dia = callPackage ../applications/graphics/dia {

     

       12611
        
           inherit (pkgs.gnome) libart_lgpl libgnomeui;

     
···

       13007
        
         gksu = callPackage ../applications/misc/gksu { };

     

       13008
        
       

     

       13009
        
         gnuradio = callPackage ../applications/misc/gnuradio {

     

       13010
       +
           inherit (pythonPackages) lxml matplotlib numpy python pyopengl pyqt4 scipy wxPython;

     

       13011
        
           fftw = fftwFloat;

     

       13012
        
         };

     

       13013
        
       

     
···

       13185
        
         };

     

       13186
        
       

     

       13187
        
         gimpPlugins = recurseIntoAttrs (callPackage ../applications/graphics/gimp/plugins {});

     

       13188
       +
       

     

       13189
       +
         girara = callPackage ../applications/misc/girara {

     

       13190
       +
           gtk = gtk3;

     

       13191
       +
         };

     

       13192
       +
       

     

       13193
       +
         girara-light = callPackage ../applications/misc/girara {

     

       13194
       +
           gtk = gtk3;

     

       13195
       +
           withBuildColors = false;

     

       13196
       +
           ncurses = null;

     

       13197
       +
         };

     

       13198
        
       

     

       13199
        
         gitAndTools = recurseIntoAttrs (callPackage ../applications/version-management/git-and-tools {});

     

       13200
        
       

     
···

       13504
        
         imagemagickBig = callPackage ../applications/graphics/ImageMagick { };

     

       13505
        
       

     

       13506
        
         # Impressive, formerly known as "KeyJNote".

     

       13507
       +
         impressive = callPackage ../applications/office/impressive { };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       13508
        
       

     

       13509
        
         inferno = callPackage_i686 ../applications/inferno { };

     

       13510
        
       

     
···

       13585
        
           boost = boost155;

     

       13586
        
         };

     

       13587
        
       

     

       13588
       +
         k9copy = qt5.callPackage ../applications/video/k9copy {};

     

       13589
       +
       

     

       13590
       +
         kdeconnect = qt5.callPackage ../applications/misc/kdeconnect { };

     

       13591
       +
       

     

       13592
        
         keepnote = callPackage ../applications/office/keepnote {

     

       13593
        
           pygtk = pyGtkGlade;

     

       13594
        
         };

     
···

       13609
        
           qt = qt4;

     

       13610
        
         };

     

       13611
        
       

     

       13612
       +
         kile = kde5.callPackage ../applications/editors/kile/frameworks.nix { };

     

       13613
       +
       

     

       13614
        
         kino = callPackage ../applications/video/kino {

     

       13615
        
           inherit (gnome) libglade;

     

       13616
        
           ffmpeg = ffmpeg_2;

     
···

       13619
        
         kiwix = callPackage ../applications/misc/kiwix { };

     

       13620
        
       

     

       13621
        
         koji = callPackage ../tools/package-management/koji { };

     

       13622
       +
       

     

       13623
       +
         konversation = qt5.callPackage ../applications/networking/irc/konversation/1.6.nix { };

     

       13624
       +
       

     

       13625
       +
         krita = qt5.callPackage ../applications/graphics/krita {

     

       13626
       +
           vc = vc_0_7;

     

       13627
       +
           openjpeg = openjpeg_1;

     

       13628
       +
         };

     

       13629
        
       

     

       13630
        
         ksuperkey = callPackage ../tools/X11/ksuperkey { };

     

       13631
        
       

     
···

       13834
        
       

     

       13835
        
         mid2key = callPackage ../applications/audio/mid2key { };

     

       13836
        
       

     

       13837
       +
         midori-unwrapped = callPackage ../applications/networking/browsers/midori { };

     

       0
        
       
     

       0
        
       
     

       13838
        
         midori = wrapFirefox midori-unwrapped { };

     

       13839
        
       

     

       13840
        
         mikmod = callPackage ../applications/audio/mikmod { };

     
···

       14243
        
       

     

       14244
        
         pianobooster = callPackage ../applications/audio/pianobooster { };

     

       14245
        
       

     

       14246
       +
         picard = callPackage ../applications/audio/picard { };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       14247
        
       

     

       14248
        
         picocom = callPackage ../tools/misc/picocom { };

     

       14249
        
       

     
···

       14360
        
           inherit (darwin.stubs) rez setfile;

     

       14361
        
         };

     

       14362
        
       

     

       14363
       +
         qgis = callPackage ../applications/gis/qgis {};

     

       14364
       +
       

     

       14365
       +
         qgroundcontrol = qt55.callPackage ../applications/science/robotics/qgroundcontrol { };

     

       14366
       +
       

     

       14367
        
         qjackctl = callPackage ../applications/audio/qjackctl { };

     

       14368
        
       

     

       14369
        
         qmidinet = callPackage ../applications/audio/qmidinet { };

     
···

       14384
        
       

     

       14385
        
         qsynth = callPackage ../applications/audio/qsynth { };

     

       14386
        
       

     

       14387
       +
         qtbitcointrader = callPackage ../applications/misc/qtbitcointrader { };

     

       14388
       +
       

     

       14389
        
         qtox = qt5.callPackage ../applications/networking/instant-messengers/qtox { };

     

       14390
        
       

     

       14391
        
         qtpass = qt5.callPackage ../applications/misc/qtpass { };

     
···

       14396
        
       

     

       14397
        
         qtscrobbler = callPackage ../applications/audio/qtscrobbler { };

     

       14398
        
       

     

       14399
       +
         quassel = qt5.callPackage ../applications/networking/irc/quassel/qt-5.nix {

     

       14400
       +
           monolithic = true;

     

       14401
       +
           daemon = false;

     

       14402
       +
           client = false;

     

       14403
       +
           withKDE = true;

     

       14404
       +
           dconf = gnome3.dconf;

     

       14405
       +
           tag = "-kf5";

     

       14406
       +
         };

     

       14407
       +
       

     

       14408
       +
         quasselClient = quassel.override {

     

       14409
       +
           monolithic = false;

     

       14410
       +
           client = true;

     

       14411
       +
           tag = "-client-kf5";

     

       14412
       +
         };

     

       14413
       +
       

     

       14414
       +
         quasselDaemon = quassel.override {

     

       14415
       +
           monolithic = false;

     

       14416
       +
           daemon = true;

     

       14417
       +
           tag = "-daemon-qt5";

     

       14418
       +
           withKDE = false;

     

       14419
       +
         };

     

       14420
       +
       

     

       14421
        
         quirc = callPackage ../tools/graphics/quirc {};

     

       14422
        
       

     

       14423
        
         quodlibet = callPackage ../applications/audio/quodlibet {

     
···

       14430
        
           gst_plugins_bad = null;

     

       14431
        
         };

     

       14432
        
       

     

       14433
       +
         qutebrowser = qt5.callPackage ../applications/networking/browsers/qutebrowser {

     

       14434
       +
           inherit (python3Packages) buildPythonApplication pyqt5 jinja2 pygments pyyaml pypeg2;

     

       14435
       +
           inherit (gst_all_1) gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav;

     

       14436
        
         };

     

       14437
        
       

     

       14438
        
         rabbitvcs = callPackage ../applications/version-management/rabbitvcs {};

     
···

       14465
        
         rdesktop = callPackage ../applications/networking/remote/rdesktop { };

     

       14466
        
       

     

       14467
        
         rdup = callPackage ../tools/backup/rdup { };

     

       14468
       +
       

     

       14469
       +
         realpine = callPackage ../applications/networking/mailreaders/realpine {

     

       14470
       +
           tcl = tcl-8_5;

     

       14471
       +
         };

     

       14472
        
       

     

       14473
        
         recode = callPackage ../tools/text/recode { };

     

       14474
        
       

     
···

       14675
        
       

     

       14676
        
         printrun = callPackage ../applications/misc/printrun { };

     

       14677
        
       

     

       14678
       +
         sddm = qt5.callPackage ../applications/display-managers/sddm {

     

       14679
       +
           themes = [];  # extra themes, etc.

     

       14680
       +
         };

     

       14681
        
       

     

       14682
        
         slim = callPackage ../applications/display-managers/slim {

     

       14683
        
           libpng = libpng12;

     
···

       14937
        
       

     

       14938
        
         tribler = callPackage ../applications/networking/p2p/tribler { };

     

       14939
        
       

     

       14940
       +
         # We need QtWebkit which was deprecated in Qt 5.6 although it can still be build

     

       14941
       +
         trojita = with qt55; callPackage ../applications/networking/mailreaders/trojita { };

     

       14942
        
       

     

       14943
        
         tudu = callPackage ../applications/office/tudu { };

     

       14944
        
       

     
···

       15436
        
       

     

       15437
        
         yabar = callPackage ../applications/window-managers/yabar { };

     

       15438
        
       

     

       15439
       +
         yakuake = kde5.callPackage ../applications/misc/yakuake/3.0.nix {};

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       15440
        
       

     

       15441
       +
         yarp = callPackage ../applications/science/robotics/yarp {};

     

       15442
        
       

     

       15443
       +
         yate = callPackage ../applications/misc/yate { };

     

       15444
        
       

     

       15445
       +
         yed = callPackage ../applications/graphics/yed {};

     

       15446
        
       

     

       15447
       +
         inherit (gnome3) yelp;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       15448
        
       

     

       15449
        
         ykpers = callPackage ../applications/misc/ykpers {};

     

       15450
        
       

     

       15451
        
         yoshimi = callPackage ../applications/audio/yoshimi { };

     

       15452
        
       

     

       15453
       +
         inherit (python3Packages) you-get;

     

       15454
       +
       

     

       15455
       +
         inherit (pythonPackages) youtube-dl;

     

       15456
       +
       

     

       15457
        
         zam-plugins = callPackage ../applications/audio/zam-plugins { };

     

       15458
        
       

     

       15459
        
         zathuraCollection = recurseIntoAttrs

     
···

       15469
        
         zeroc_ice = callPackage ../development/libraries/zeroc-ice { };

     

       15470
        
       

     

       15471
        
         zexy = callPackage ../applications/audio/pd-plugins/zexy  { };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       15472
        
       

     

       15473
        
         zgrviewer = callPackage ../applications/graphics/zgrviewer {};

     

       15474
        
       

     
···

       15508
        
         angband = callPackage ../games/angband { };

     

       15509
        
       

     

       15510
        
         anki = callPackage ../games/anki {

     

       15511
       +
           inherit (pythonPackages) wrapPython pysqlite sqlalchemy pyaudio beautifulsoup httplib2 matplotlib pyqt4;

     

       15512
        
         };

     

       15513
        
       

     

       15514
        
         armagetronad = callPackage ../games/armagetronad { };

     
···

       16349
        
       

     

       16350
        
         numix-gtk-theme = callPackage ../misc/themes/numix { };

     

       16351
        
       

     

       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
        
       
     

       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
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       16352
        
         kde5 =

     

       16353
        
           let

     

       16354
        
             plasma = import ../desktops/kde-5/plasma { inherit pkgs; };

     
···

       16359
        
                 applications = applications self; }

     

       16360
        
               // qt5.kdeFrameworks

     

       16361
        
               // plasma self

     

       16362
       +
               // applications self;

     

       0
        
       
     

       16363
        
           in

     

       16364
        
             recurseIntoAttrs (lib.makeScope qt5.newScope merged);

     

       16365
        
       

     
···

       17154
        
       

     

       17155
        
         lkproof = callPackage ../tools/typesetting/tex/lkproof { };

     

       17156
        
       

     

       17157
       +
         m33-linux = callPackage ../misc/drivers/m33-linux { };

     

       17158
        
       

     

       17159
        
         mnemonicode = callPackage ../misc/mnemonicode { };

     

       17160
        
       

     

       17161
        
         mysqlWorkbench = newScope gnome ../applications/misc/mysql-workbench {

     

       17162
        
           lua = lua5_1;

     

       17163
        
           libctemplate = libctemplate_2_2;

     

       0
        
       
     

       17164
        
         };

     

       17165
        
       

     

       17166
        
         redis-desktop-manager = qt55.callPackage ../applications/misc/redis-desktop-manager { };

+68 -51

pkgs/top-level/python-packages.nix

···

       240
        
       

     

       241
        
         pyatspi = if isPy3k then callPackage ../development/python-modules/pyatspi { } else throw "pyatspi not supported for interpreter ${python.executable}";

     

       242
        
       

     

       243
       -
         pycairo = callPackage ../development/python-modules/pycairo {

     

       244
       -
         };

     

       245
        
       

     

       246
        
         pycangjie = if isPy3k then callPackage ../development/python-modules/pycangjie { } else throw "pycangjie not supported for interpreter ${python.executable}";

     

       247
        
       

     
···

       1941
        
             sha256 = "0grid93yz6i6jb2zggrqncp5awdf7qi88j5y2k7dq0k9r6b8zydw";

     

       1942
        
           };

     

       1943
        
       

     

       1944
       -
           propagatedBuildInputs = with stdenv.lib; with pkgs; [ modules.curses zlib xz ncompress gzip bzip2 gnutar p7zip cabextract lzma pycrypto ]

     

       1945
        
             ++ optional visualizationSupport [ pyqtgraph ];

     

       1946
        
       

     

       1947
        
           meta = with stdenv.lib; {

     
···

       4338
        
       

     

       4339
        
       

     

       4340
        
         pkginfo = buildPythonPackage rec {

     

       4341
       -
           version = "1.2.1";

     

       4342
        
           name = "pkginfo-${version}";

     

       4343
        
       

     

       4344
        
           src = pkgs.fetchurl {

     

       4345
        
             url = "mirror://pypi/p/pkginfo/${name}.tar.gz";

     

       4346
       -
             sha256 = "0g0g6avplfqw1adzqybbrh1a2z0kfjl8qn3annkrc7w3ibz6sgxd";

     

       4347
        
           };

     

       4348
        
       

     

       4349
        
           doCheck = false; # I don't know why, but with doCheck = true it fails.

     
···

       5753
        
             sha256 = "1ikj72kd4cdcq7pmmcd5p6s9dvp7wi0zw01635v4xzkid5vi598f";

     

       5754
        
           };

     

       5755
        
       

     

       5756
       -
           preConfigure = ''

     

       5757
       -
             substituteInPlace test-requirements.txt --replace 'nose==1.3' 'nose'

     

       5758
       -
           '';

     

       5759
       -
       

     

       5760
        
           doCheck = !isPy3k;  # lots of transient failures

     

       5761
        
           checkPhase = ''

     

       5762
        
             # Not worth the trouble

     
···

       5768
        
       

     

       5769
        
             nosetests -v --cover-min-percentage 1

     

       5770
        
           '';

     

       5771
       -
       

     

       5772
        
       

     

       5773
        
           buildInputs = with self; [ coverage tornado mock nose ];

     

       5774
        
       

     
···

       7744
        
             sha256 = "00e3f89f4e23a844844d082918a89c2cbb1e8231ecb011b81d592e7e3c33a74c";

     

       7745
        
           };

     

       7746
        
       

     

       7747
       -
           propagatedBuildInputs = [ pkgs.pyqt4 pkgs.pkgconfig pkgs.poppler_qt4 ];

     

       7748
        
       

     

       7749
        
           preBuild = "${python}/bin/${python.executable} setup.py build_ext" +

     

       7750
        
                      " --include-dirs=${pkgs.poppler_qt4.dev}/include/poppler/";

     
···

       10124
        
       

     

       10125
        
         flask_assets = buildPythonPackage rec {

     

       10126
        
           name = "Flask-Assets-${version}";

     

       10127
       -
           version = "0.10";

     

       10128
        
       

     

       10129
        
           src = pkgs.fetchurl {

     

       10130
        
             url = "mirror://pypi/F/Flask-Assets/${name}.tar.gz";

     

       10131
       -
             sha256 = "1v6ika3ias21xzhg7kglki99nwfx1i33rdhnw9kdqbwxkpwbwkyl";

     

       10132
        
           };

     

       10133
        
       

     

       10134
        
           propagatedBuildInputs = with self; [ flask webassets flask_script nose ];

     
···

       10137
        
             homepage = http://github.com/miracle2k/flask-assets;

     

       10138
        
             description = "Asset management for Flask, to compress and merge CSS and Javascript files";

     

       10139
        
             license = licenses.bsd2;

     

       10140
       -
             platforms = platforms.all;

     

       10141
        
             maintainers = with maintainers; [ abbradar ];

     

       10142
        
           };

     

       10143
        
         };

     
···

       10836
        
           # FAIL: test_sanitize_remove_src_javascript (genshi.filters.tests.html.HTMLSanitizerTestCase)

     

       10837
        
           doCheck = false;

     

       10838
        
       

     

       10839
       -
           buildInputs = with self; [ pkgs.setuptools ];

     

       10840
        
       

     

       10841
        
           meta = {

     

       10842
        
             description = "Python components for parsing HTML, XML and other textual content";

     
···

       10930
        
             sha256 = "c77d007cc32cdff836ecf8df6192371767976c108a75b055e057bb6f4a09cd42";

     

       10931
        
           };

     

       10932
        
       

     

       10933
       -
           buildInputs = with self; [ pkgs.setuptools ] ++ (optional isPy26 argparse);

     

       10934
        
       

     

       10935
        
           meta = {

     

       10936
        
             description = "Automatically generated zsh completion function for Python's option parser modules";

     
···

       14849
        
           };

     

       14850
        
         };

     

       14851
        
       

     

       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
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       14852
        
         livestreamer = buildPythonPackage rec {

     

       14853
        
           version = "1.12.2";

     

       14854
        
           name = "livestreamer-${version}";

     
···

       17796
        
       

     

       17797
        
         psutil = buildPythonPackage rec {

     

       17798
        
           name = "psutil-${version}";

     

       17799
       -
           version = "3.4.2";

     

       17800
        
       

     

       17801
        
           src = pkgs.fetchurl {

     

       17802
        
             url = "mirror://pypi/p/psutil/${name}.tar.gz";

     

       17803
       -
             sha256 = "b17fa01aa766daa388362d0eda5c215d77e03a8d37676b68971f37bf3913b725";

     

       17804
        
           };

     

       17805
       -
       

     

       17806
       -
           # Certain tests fail due to being in a chroot.

     

       17807
       -
           # See also the older issue: https://code.google.com/p/psutil/issues/detail?id=434

     

       17808
       -
           doCheck = false;

     

       17809
        
       

     

       17810
        
           buildInputs = with self; [ mock ] ++ optionals stdenv.isDarwin [ pkgs.darwin.IOKit ];

     

       17811
        
       

     
···

       18146
        
       

     

       18147
        
       

     

       18148
        
         Babel = buildPythonPackage (rec {

     

       18149
       -
           name = "Babel-2.2.0";

     

       18150
        
       

     

       18151
        
           src = pkgs.fetchurl {

     

       18152
        
             url = "mirror://pypi/B/Babel/${name}.tar.gz";

     

       18153
       -
             sha256 = "d8cb4c0e78148aee89560f9fe21587aa57739c975bb89ff66b1e842cc697428f";

     

       18154
        
           };

     

       18155
        
       

     

       18156
        
           buildInputs = with self; [ pytest ];

     
···

       20296
        
       

     

       20297
        
         requests2 = buildPythonPackage rec {

     

       20298
        
           name = "requests-${version}";

     

       20299
       -
           version = "2.9.1";

     

       20300
        
       

     

       20301
        
           src = pkgs.fetchurl {

     

       20302
        
             url = "mirror://pypi/r/requests/${name}.tar.gz";

     

       20303
       -
             sha256 = "0zsqrzlybf25xscgi7ja4s48y2abf9wvjkn47wh984qgs1fq2xy5";

     

       20304
        
           };

     

       20305
        
       

     

       20306
       -
           buildInputs = [ self.pytest ];

     

       20307
        
           # sadly, tests require networking

     

       20308
        
           doCheck = false;

     

       20309
        
       

     
···

       20376
        
       

     

       20377
        
             src = pkgs.qscintilla.src;

     

       20378
        
       

     

       20379
       -
             buildInputs = with pkgs; [ xorg.lndir qt4 pyqt4 python ];

     

       20380
        
       

     

       20381
        
             preConfigure = ''

     

       20382
        
               mkdir -p $out

     

       20383
       -
               lndir ${pkgs.pyqt4} $out

     

       20384
        
               cd Python

     

       20385
        
               ${python.executable} ./configure-old.py \

     

       20386
        
                   --destdir $out/lib/${python.libPrefix}/site-packages/PyQt4 \

     
···

       20712
        
       

     

       20713
        
           doCheck = false;  # too much

     

       20714
        
       

     

       20715
       -
           buildInputs = with self; [ mock tox pkgs.pylint ];

     

       20716
        
           meta = with stdenv.lib; {

     

       20717
        
             homepage = "https://github.com/geopy/geopy";

     

       20718
        
           };

     
···

       21027
        
           patches = [ ../development/python-modules/rpkg-buildfix.diff ];

     

       21028
        
       

     

       21029
        
           propagatedBuildInputs = with self; [ pycurl pkgs.koji GitPython pkgs.git

     

       21030
       -
                                     pkgs.rpm pkgs.pyopenssl ];

     

       21031
        
       

     

       21032
        
         });

     

       21033
        
       

     
···

       21073
        
       

     

       21074
        
         rsa = buildPythonPackage rec {

     

       21075
        
           name = "rsa-${version}";

     

       21076
       -
           version = "3.3";

     

       21077
        
       

     

       21078
        
           src = pkgs.fetchurl {

     

       21079
        
             url = "mirror://pypi/r/rsa/${name}.tar.gz";

     

       21080
       -
             sha256 = "03f3d9bebad06681771016b8752a40b12f615ff32363c7aa19b3798e73ccd615";

     

       21081
        
           };

     

       21082
        
       

     

       21083
        
           nativeBuildInputs = with self; [ unittest2 ];

     

       21084
        
           propagatedBuildInputs = with self; [ pyasn1 ];

     

       21085
        
       

     

       21086
       -
           checkPhase = ''

     

       21087
       -
             ${python.interpreter} run_tests.py

     

       21088
       -
           '';

     

       21089
       -
       

     

       21090
        
           meta = {

     

       21091
       -
             homepage = http://stuvel.eu/rsa;

     

       21092
        
             license = licenses.asl20;

     

       21093
        
             description = "A pure-Python RSA implementation";

     

       21094
        
           };

     
···

       21361
        
             sha256 = "768e568f3299966c294b7eb8cd114fc648f7bfaef422ee9cc750dd8d9d09e44b";

     

       21362
        
           };

     

       21363
        
       

     

       21364
       -
           buildInputs = with self; [ pkgs.cython nose numpy six ];

     

       21365
        
       

     

       21366
        
           propagatedBuildInputs = with self; [ pillow matplotlib networkx scipy ];

     

       21367
        
       

     
···

       22835
        
             sha256 = "00z0lzjs4ksr9yr31zs26csyacjvavhpz6r74xaw1r89kk75qg7q";

     

       22836
        
           };

     

       22837
        
       

     

       22838
       -
           buildInputs = with self; [ unittest2 scripttest pytz pkgs.pylint tempest-lib mock testtools ];

     

       22839
        
           propagatedBuildInputs = with self; [ pbr tempita decorator sqlalchemy six sqlparse ];

     

       22840
        
       

     

       22841
        
           checkPhase = ''

     
···

       23705
        
       

     

       23706
        
           PYTHON_EGG_CACHE = "`pwd`/.egg-cache";

     

       23707
        
       

     

       23708
       -
           propagatedBuildInputs = with self; [ genshi pkgs.setuptools modules.sqlite3 ];

     

       23709
        
       

     

       23710
        
           meta = {

     

       23711
        
             description = "Enhanced wiki and issue tracking system for software development projects";

     
···

       24640
        
       

     

       24641
        
       

     

       24642
        
         werkzeug = buildPythonPackage rec {

     

       24643
       -
           name = "Werkzeug-0.10.4";

     

       24644
        
       

     

       24645
        
           src = pkgs.fetchurl {

     

       24646
        
             url = "mirror://pypi/W/Werkzeug/${name}.tar.gz";

     

       24647
       -
             sha256 = "9d2771e4c89be127bc4bac056ab7ceaf0e0064c723d6b6e195739c3af4fd5c1d";

     

       24648
        
           };

     

       24649
        
       

     

       24650
        
           propagatedBuildInputs = with self; [ itsdangerous ];

     

       24651
       -
       

     

       24652
       -
           doCheck = false;            # tests fail, not sure why

     

       24653
        
       

     

       24654
        
           meta = {

     

       24655
        
             homepage = http://werkzeug.pocoo.org/;

     

       24656
        
             description = "A WSGI utility library for Python";

     

       24657
       -
             license = "BSD";

     

       24658
        
           };

     

       24659
        
         };

     

       24660
        
       

     
···

       26219
        
             sha256 = "472a4403fd5b5364939aee10e78f171b1489e5f6bfe6f150ed9cae8476410114";

     

       26220
        
           };

     

       26221
        
       

     

       26222
       -
           propagatedBuildInputs = with self; [ django_1_5 django_tagging modules.sqlite3 whisper pkgs.pycairo ldap memcached ];

     

       26223
        
       

     

       26224
        
           postInstall = ''

     

       26225
        
             wrapProgram $out/bin/run-graphite-devel-server.py \

     
···

       26592
        
         };

     

       26593
        
       

     

       26594
        
         flaskbabel = buildPythonPackage rec {

     

       26595
       -
           name = "Flask-Babel-0.9";

     

       26596
        
       

     

       26597
        
           src = pkgs.fetchurl {

     

       26598
        
             url = "mirror://pypi/F/Flask-Babel/${name}.tar.gz";

     

       26599
       -
             sha256 = "0k7vk4k54y55ma0nx2k5s0phfqbriwslhy5shh3b0d046q7ibzaa";

     

       26600
        
           };

     

       26601
        
       

     

       26602
        
           propagatedBuildInputs = with self; [ flask jinja2 speaklater Babel pytz ];

     
···

       26893
        
             url = mirror://pypi/g/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.8.tar.gz;

     

       26894
        
             sha256 = "0jy62y5bmaf1mb735lqwry1s5nx2qqrxvl5sxip9yg4miih3qkyb";

     

       26895
        
           };

     

       26896
       -
           propagatedBuildInputs = with self; [ boto-230 httplib2 google_api_python_client retry_decorator pkgs.pyopenssl socksipy-branch ];

     

       26897
        
           meta = {

     

       26898
        
             homepage = https://developers.google.com/storage/docs/gspythonlibrary;

     

       26899
        
             description = "Provides OAuth 2.0 credentials that can be used with Google Cloud Storage";

     
···

       26918
        
           };

     

       26919
        
       

     

       26920
        
           propagatedBuildInputs = with self; [ boto-230 crcmod httplib2 gcs-oauth2-boto-plugin google_api_python_client gflags

     

       26921
       -
                                                retry_decorator pkgs.pyopenssl socksipy-branch crcmod ];

     

       26922
        
         };

     

       26923
        
       

     

       26924
        
         svg2tikz = self.buildPythonPackage {

···

       240
        
       

     

       241
        
         pyatspi = if isPy3k then callPackage ../development/python-modules/pyatspi { } else throw "pyatspi not supported for interpreter ${python.executable}";

     

       242
        
       

     

       243
       +
         pycairo = callPackage ../development/python-modules/pycairo { };

     

       0
        
       
     

       244
        
       

     

       245
        
         pycangjie = if isPy3k then callPackage ../development/python-modules/pycangjie { } else throw "pycangjie not supported for interpreter ${python.executable}";

     

       246
        
       

     
···

       1940
        
             sha256 = "0grid93yz6i6jb2zggrqncp5awdf7qi88j5y2k7dq0k9r6b8zydw";

     

       1941
        
           };

     

       1942
        
       

     

       1943
       +
           propagatedBuildInputs = with stdenv.lib; with pkgs; [ modules.curses zlib xz ncompress gzip bzip2 gnutar p7zip cabextract lzma self.pycrypto ]

     

       1944
        
             ++ optional visualizationSupport [ pyqtgraph ];

     

       1945
        
       

     

       1946
        
           meta = with stdenv.lib; {

     
···

       4337
        
       

     

       4338
        
       

     

       4339
        
         pkginfo = buildPythonPackage rec {

     

       4340
       +
           version = "1.3.2";

     

       4341
        
           name = "pkginfo-${version}";

     

       4342
        
       

     

       4343
        
           src = pkgs.fetchurl {

     

       4344
        
             url = "mirror://pypi/p/pkginfo/${name}.tar.gz";

     

       4345
       +
             sha256 = "0qg4sq3m0pxvjahc3sncwhw42z5rfw22k0ybskmdqkl2agykay7q";

     

       4346
        
           };

     

       4347
        
       

     

       4348
        
           doCheck = false; # I don't know why, but with doCheck = true it fails.

     
···

       5752
        
             sha256 = "1ikj72kd4cdcq7pmmcd5p6s9dvp7wi0zw01635v4xzkid5vi598f";

     

       5753
        
           };

     

       5754
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       5755
        
           doCheck = !isPy3k;  # lots of transient failures

     

       5756
        
           checkPhase = ''

     

       5757
        
             # Not worth the trouble

     
···

       5763
        
       

     

       5764
        
             nosetests -v --cover-min-percentage 1

     

       5765
        
           '';

     

       0
        
       
     

       5766
        
       

     

       5767
        
           buildInputs = with self; [ coverage tornado mock nose ];

     

       5768
        
       

     
···

       7738
        
             sha256 = "00e3f89f4e23a844844d082918a89c2cbb1e8231ecb011b81d592e7e3c33a74c";

     

       7739
        
           };

     

       7740
        
       

     

       7741
       +
           propagatedBuildInputs = [ self.pyqt4 pkgs.pkgconfig pkgs.poppler_qt4 ];

     

       7742
        
       

     

       7743
        
           preBuild = "${python}/bin/${python.executable} setup.py build_ext" +

     

       7744
        
                      " --include-dirs=${pkgs.poppler_qt4.dev}/include/poppler/";

     
···

       10118
        
       

     

       10119
        
         flask_assets = buildPythonPackage rec {

     

       10120
        
           name = "Flask-Assets-${version}";

     

       10121
       +
           version = "0.11";

     

       10122
        
       

     

       10123
        
           src = pkgs.fetchurl {

     

       10124
        
             url = "mirror://pypi/F/Flask-Assets/${name}.tar.gz";

     

       10125
       +
             sha256 = "1vs59gygwhwqj37if8hiw6vd2rns09xkblaz4qkmpp6hpy3shrvf";

     

       10126
        
           };

     

       10127
        
       

     

       10128
        
           propagatedBuildInputs = with self; [ flask webassets flask_script nose ];

     
···

       10131
        
             homepage = http://github.com/miracle2k/flask-assets;

     

       10132
        
             description = "Asset management for Flask, to compress and merge CSS and Javascript files";

     

       10133
        
             license = licenses.bsd2;

     

       0
        
       
     

       10134
        
             maintainers = with maintainers; [ abbradar ];

     

       10135
        
           };

     

       10136
        
         };

     
···

       10829
        
           # FAIL: test_sanitize_remove_src_javascript (genshi.filters.tests.html.HTMLSanitizerTestCase)

     

       10830
        
           doCheck = false;

     

       10831
        
       

     

       10832
       +
           buildInputs = with self; [ setuptools ];

     

       10833
        
       

     

       10834
        
           meta = {

     

       10835
        
             description = "Python components for parsing HTML, XML and other textual content";

     
···

       10923
        
             sha256 = "c77d007cc32cdff836ecf8df6192371767976c108a75b055e057bb6f4a09cd42";

     

       10924
        
           };

     

       10925
        
       

     

       10926
       +
           buildInputs = with self; [ setuptools ] ++ (optional isPy26 argparse);

     

       10927
        
       

     

       10928
        
           meta = {

     

       10929
        
             description = "Automatically generated zsh completion function for Python's option parser modules";

     
···

       14842
        
           };

     

       14843
        
         };

     

       14844
        
       

     

       14845
       +
         dynd = buildPythonPackage rec {

     

       14846
       +
           version = "0.7.2";

     

       14847
       +
           name = "dynd-${version}";

     

       14848
       +
           disabled = isPyPy;

     

       14849
       +
       

     

       14850
       +
           src = pkgs.fetchFromGitHub {

     

       14851
       +
             owner = "libdynd";

     

       14852
       +
             repo = "dynd-python";

     

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

     

       14854
       +
             sha256 = "19igd6ibf9araqhq9bxmzbzdz05vp089zxvddkiik3b5gb7l17nh";

     

       14855
       +
           };

     

       14856
       +
       

     

       14857
       +
           # setup.py invokes git on build but we're fetching a tarball, so

     

       14858
       +
           # can't retrieve git version. We hardcode:

     

       14859
       +
           preConfigure = ''

     

       14860
       +
             substituteInPlace setup.py --replace "ver = check_output(['git', 'describe', '--dirty'," "ver = '${version}'"

     

       14861
       +
             substituteInPlace setup.py --replace "'--always', '--match', 'v*']).decode('ascii').strip('\n')" ""

     

       14862
       +
           '';

     

       14863
       +
       

     

       14864
       +
           # Python 3 works but has a broken import test that I couldn't

     

       14865
       +
           # figure out.

     

       14866
       +
           doCheck = !isPy3k;

     

       14867
       +
           buildInputs = with pkgs; [ cmake libdynd.dev self.cython ];

     

       14868
       +
           propagatedBuildInputs = with self; [ numpy pkgs.libdynd ];

     

       14869
       +
       

     

       14870
       +
           meta = {

     

       14871
       +
             homepage = http://libdynd.org;

     

       14872
       +
             license = licenses.bsd2;

     

       14873
       +
             description = "Python exposure of dynd";

     

       14874
       +
             maintainers = with maintainers; [ teh ];

     

       14875
       +
           };

     

       14876
       +
         };

     

       14877
       +
       

     

       14878
        
         livestreamer = buildPythonPackage rec {

     

       14879
        
           version = "1.12.2";

     

       14880
        
           name = "livestreamer-${version}";

     
···

       17822
        
       

     

       17823
        
         psutil = buildPythonPackage rec {

     

       17824
        
           name = "psutil-${version}";

     

       17825
       +
           version = "4.3.0";

     

       17826
        
       

     

       17827
        
           src = pkgs.fetchurl {

     

       17828
        
             url = "mirror://pypi/p/psutil/${name}.tar.gz";

     

       17829
       +
             sha256 = "1w4r09fvn6kd80m5mx4ws1wz100brkaq6hzzpwrns8cgjzjpl6c6";

     

       17830
        
           };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       17831
        
       

     

       17832
        
           buildInputs = with self; [ mock ] ++ optionals stdenv.isDarwin [ pkgs.darwin.IOKit ];

     

       17833
        
       

     
···

       18168
        
       

     

       18169
        
       

     

       18170
        
         Babel = buildPythonPackage (rec {

     

       18171
       +
           name = "Babel-2.3.4";

     

       18172
        
       

     

       18173
        
           src = pkgs.fetchurl {

     

       18174
        
             url = "mirror://pypi/B/Babel/${name}.tar.gz";

     

       18175
       +
             sha256 = "0x98qqqw35xllpcama013a9788ly84z8dm1w2wwfpxh2710c8df5";

     

       18176
        
           };

     

       18177
        
       

     

       18178
        
           buildInputs = with self; [ pytest ];

     
···

       20318
        
       

     

       20319
        
         requests2 = buildPythonPackage rec {

     

       20320
        
           name = "requests-${version}";

     

       20321
       +
           version = "2.11.0";

     

       20322
        
       

     

       20323
        
           src = pkgs.fetchurl {

     

       20324
        
             url = "mirror://pypi/r/requests/${name}.tar.gz";

     

       20325
       +
             sha256 = "11d3vrbiqrz30qbplv80y72y9i47hihs35p5n04fl4ggjcz0bzxj";

     

       20326
        
           };

     

       20327
        
       

     

       20328
       +
           nativeBuildInputs = [ self.pytest ];

     

       20329
        
           # sadly, tests require networking

     

       20330
        
           doCheck = false;

     

       20331
        
       

     
···

       20398
        
       

     

       20399
        
             src = pkgs.qscintilla.src;

     

       20400
        
       

     

       20401
       +
             buildInputs = with self; [ pkgs.xorg.lndir pyqt4.qt pyqt4 python ];

     

       20402
        
       

     

       20403
        
             preConfigure = ''

     

       20404
        
               mkdir -p $out

     

       20405
       +
               lndir ${self.pyqt4} $out

     

       20406
        
               cd Python

     

       20407
        
               ${python.executable} ./configure-old.py \

     

       20408
        
                   --destdir $out/lib/${python.libPrefix}/site-packages/PyQt4 \

     
···

       20734
        
       

     

       20735
        
           doCheck = false;  # too much

     

       20736
        
       

     

       20737
       +
           buildInputs = with self; [ mock tox pylint ];

     

       20738
        
           meta = with stdenv.lib; {

     

       20739
        
             homepage = "https://github.com/geopy/geopy";

     

       20740
        
           };

     
···

       21049
        
           patches = [ ../development/python-modules/rpkg-buildfix.diff ];

     

       21050
        
       

     

       21051
        
           propagatedBuildInputs = with self; [ pycurl pkgs.koji GitPython pkgs.git

     

       21052
       +
                                     pkgs.rpm pyopenssl ];

     

       21053
        
       

     

       21054
        
         });

     

       21055
        
       

     
···

       21095
        
       

     

       21096
        
         rsa = buildPythonPackage rec {

     

       21097
        
           name = "rsa-${version}";

     

       21098
       +
           version = "3.4.2";

     

       21099
        
       

     

       21100
        
           src = pkgs.fetchurl {

     

       21101
        
             url = "mirror://pypi/r/rsa/${name}.tar.gz";

     

       21102
       +
             sha256 = "1dcxvszbikgzh99ybdc7jq0zb9wspy2ds8z9mjsqiyv3q884xpr5";

     

       21103
        
           };

     

       21104
        
       

     

       21105
        
           nativeBuildInputs = with self; [ unittest2 ];

     

       21106
        
           propagatedBuildInputs = with self; [ pyasn1 ];

     

       21107
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       21108
        
           meta = {

     

       21109
       +
             homepage = "http://stuvel.eu/rsa";

     

       21110
        
             license = licenses.asl20;

     

       21111
        
             description = "A pure-Python RSA implementation";

     

       21112
        
           };

     
···

       21379
        
             sha256 = "768e568f3299966c294b7eb8cd114fc648f7bfaef422ee9cc750dd8d9d09e44b";

     

       21380
        
           };

     

       21381
        
       

     

       21382
       +
           buildInputs = with self; [ cython nose numpy six ];

     

       21383
        
       

     

       21384
        
           propagatedBuildInputs = with self; [ pillow matplotlib networkx scipy ];

     

       21385
        
       

     
···

       22853
        
             sha256 = "00z0lzjs4ksr9yr31zs26csyacjvavhpz6r74xaw1r89kk75qg7q";

     

       22854
        
           };

     

       22855
        
       

     

       22856
       +
           buildInputs = with self; [ unittest2 scripttest pytz pylint tempest-lib mock testtools ];

     

       22857
        
           propagatedBuildInputs = with self; [ pbr tempita decorator sqlalchemy six sqlparse ];

     

       22858
        
       

     

       22859
        
           checkPhase = ''

     
···

       23723
        
       

     

       23724
        
           PYTHON_EGG_CACHE = "`pwd`/.egg-cache";

     

       23725
        
       

     

       23726
       +
           propagatedBuildInputs = with self; [ genshi setuptools modules.sqlite3 ];

     

       23727
        
       

     

       23728
        
           meta = {

     

       23729
        
             description = "Enhanced wiki and issue tracking system for software development projects";

     
···

       24658
        
       

     

       24659
        
       

     

       24660
        
         werkzeug = buildPythonPackage rec {

     

       24661
       +
           name = "Werkzeug-0.11.10";

     

       24662
        
       

     

       24663
        
           src = pkgs.fetchurl {

     

       24664
        
             url = "mirror://pypi/W/Werkzeug/${name}.tar.gz";

     

       24665
       +
             sha256 = "1vpf98k4jp4yhbv2jbyq8dj5fdasrd26rkq34pacs5n7mkxxlr6c";

     

       24666
        
           };

     

       24667
        
       

     

       24668
        
           propagatedBuildInputs = with self; [ itsdangerous ];

     

       24669
       +
           nativeBuildInputs = with self; [ pytest requests ];

     

       0
        
       
     

       24670
        
       

     

       24671
        
           meta = {

     

       24672
        
             homepage = http://werkzeug.pocoo.org/;

     

       24673
        
             description = "A WSGI utility library for Python";

     

       24674
       +
             license = licenses.bsd3;

     

       24675
        
           };

     

       24676
        
         };

     

       24677
        
       

     
···

       26236
        
             sha256 = "472a4403fd5b5364939aee10e78f171b1489e5f6bfe6f150ed9cae8476410114";

     

       26237
        
           };

     

       26238
        
       

     

       26239
       +
           propagatedBuildInputs = with self; [ django_1_5 django_tagging modules.sqlite3 whisper pycairo ldap memcached ];

     

       26240
        
       

     

       26241
        
           postInstall = ''

     

       26242
        
             wrapProgram $out/bin/run-graphite-devel-server.py \

     
···

       26609
        
         };

     

       26610
        
       

     

       26611
        
         flaskbabel = buildPythonPackage rec {

     

       26612
       +
           name = "Flask-Babel-0.11.1";

     

       26613
        
       

     

       26614
        
           src = pkgs.fetchurl {

     

       26615
        
             url = "mirror://pypi/F/Flask-Babel/${name}.tar.gz";

     

       26616
       +
             sha256 = "16b80cipdba9xj3jlaiaq6wgrgpjb70w3j01jjy9hbp4k71kd6yj";

     

       26617
        
           };

     

       26618
        
       

     

       26619
        
           propagatedBuildInputs = with self; [ flask jinja2 speaklater Babel pytz ];

     
···

       26910
        
             url = mirror://pypi/g/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.8.tar.gz;

     

       26911
        
             sha256 = "0jy62y5bmaf1mb735lqwry1s5nx2qqrxvl5sxip9yg4miih3qkyb";

     

       26912
        
           };

     

       26913
       +
           propagatedBuildInputs = with self; [ boto-230 httplib2 google_api_python_client retry_decorator pyopenssl socksipy-branch ];

     

       26914
        
           meta = {

     

       26915
        
             homepage = https://developers.google.com/storage/docs/gspythonlibrary;

     

       26916
        
             description = "Provides OAuth 2.0 credentials that can be used with Google Cloud Storage";

     
···

       26935
        
           };

     

       26936
        
       

     

       26937
        
           propagatedBuildInputs = with self; [ boto-230 crcmod httplib2 gcs-oauth2-boto-plugin google_api_python_client gflags

     

       26938
       +
                                                retry_decorator pyopenssl socksipy-branch crcmod ];

     

       26939
        
         };

     

       26940
        
       

     

       26941
        
         svg2tikz = self.buildPythonPackage {