commit ef253212f4978eee85751c43f39adaf22a141d43 · pyrox.dev/nixpkgs

+57

doc/functions.xml

···

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

     

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

     

       3
       3
       +
       	 xml:id="chap-functions">

     

       4
       4
       +
       

     

       5
       5
       +
       <title>Functions reference</title>

     

       6
       6
       +
       

     

       7
       7
       +
       <para>

     

       8
       8
       +
         The nixpkgs repository has several utility functions to manipulate Nix expressions.

     

       9
       9
       +
       </para>

     

       10
       10
       +
       

     

       11
       11
       +
       <section xml:id="sec-pkgs-overridePackages">

     

       12
       12
       +
         <title>pkgs.overridePackages</title>

     

       13
       13
       +
       

     

       14
       14
       +
         <para>

     

       15
       15
       +
           This function inside the nixpkgs expression (<varname>pkgs</varname>)

     

       16
       16
       +
           can be used to override the set of packages itself.

     

       17
       17
       +
         </para>

     

       18
       18
       +
         <para>

     

       19
       19
       +
           Warning: this function is expensive and must not be used from within

     

       20
       20
       +
           the nixpkgs repository.

     

       21
       21
       +
         </para>

     

       22
       22
       +
         <para>

     

       23
       23
       +
           Example usage:

     

       24
       24
       +
       

     

       25
       25
       +
           <programlisting>let

     

       26
       26
       +
         pkgs = import &lt;nixpkgs&gt; {};

     

       27
       27
       +
         newpkgs = pkgs.overridePackages (self: super: {

     

       28
       28
       +
           foo = super.foo.override { ... };

     

       29
       29
       +
         };

     

       30
       30
       +
       in ...</programlisting>

     

       31
       31
       +
         </para>

     

       32
       32
       +
       

     

       33
       33
       +
         <para>

     

       34
       34
       +
           The resulting <varname>newpkgs</varname> will have the new <varname>foo</varname>

     

       35
       35
       +
           expression, and all other expressions depending on <varname>foo</varname> will also

     

       36
       36
       +
           use the new <varname>foo</varname> expression.

     

       37
       37
       +
         </para>

     

       38
       38
       +
       

     

       39
       39
       +
         <para>

     

       40
       40
       +
           The behavior of this function is similar to <link 

     

       41
       41
       +
           linkend="sec-modify-via-packageOverrides">config.packageOverrides</link>.

     

       42
       42
       +
         </para>

     

       43
       43
       +
       

     

       44
       44
       +
         <para>

     

       45
       45
       +
           The <varname>self</varname> parameter refers to the final package set with the

     

       46
       46
       +
           applied overrides. Using this parameter may lead to infinite recursion if not

     

       47
       47
       +
           used consciously.

     

       48
       48
       +
         </para>

     

       49
       49
       +
       

     

       50
       50
       +
         <para>

     

       51
       51
       +
           The <varname>super</varname> parameter refers to the old package set.

     

       52
       52
       +
           It's equivalent to <varname>pkgs</varname> in the above example.

     

       53
       53
       +
         </para>

     

       54
       54
       +
       

     

       55
       55
       +
       </section>

     

       56
       56
       +
       

     

       57
       57
       +
       </chapter>

+1

doc/manual.xml

···

       13
       13
        
         <xi:include href="quick-start.xml" />

     

       14
       14
        
         <xi:include href="stdenv.xml" />

     

       15
       15
        
         <xi:include href="packageconfig.xml" />

     

       16
       16
       +
         <xi:include href="functions.xml" />

     

       16
       17
        
         <xi:include href="meta.xml" />

     

       17
       18
        
         <xi:include href="language-support.xml" />

     

       18
       19
        
         <xi:include href="package-notes.xml" />

+2

lib/maintainers.nix

···

       31
       31
        
         astsmtl = "Alexander Tsamutali <astsmtl@yandex.ru>";

     

       32
       32
        
         aszlig = "aszlig <aszlig@redmoonstudios.org>";

     

       33
       33
        
         auntie = "Jonathan Glines <auntieNeo@gmail.com>";

     

       34
       34
       +
         avnik = "Alexander V. Nikolaev <avn@avnik.info>";

     

       34
       35
        
         aycanirican = "Aycan iRiCAN <iricanaycan@gmail.com>";

     

       35
       36
        
         balajisivaraman = "Balaji Sivaraman<sivaraman.balaji@gmail.com>";

     

       36
       37
        
         bbenoist = "Baptist BENOIST <return_0@live.com>";

     
···

       60
       61
        
         codyopel = "Cody Opel <codyopel@gmail.com>";

     

       61
       62
        
         copumpkin = "Dan Peebles <pumpkingod@gmail.com>";

     

       62
       63
        
         coroa = "Jonas Hörsch <jonas@chaoflow.net>";

     

       64
       64
       +
         couchemar = "Andrey Pavlov <couchemar@yandex.ru>";

     

       63
       65
        
         cstrahan = "Charles Strahan <charles.c.strahan@gmail.com>";

     

       64
       66
        
         cwoac = "Oliver Matthews <oliver@codersoffortune.net>";

     

       65
       67
        
         DamienCassou = "Damien Cassou <damien.cassou@gmail.com>";

+1 -1

nixos/modules/config/system-path.nix

···

       38
       38
        
             pkgs.nano

     

       39
       39
        
             pkgs.ncurses

     

       40
       40
        
             pkgs.netcat

     

       41
       41
       -
             pkgs.openssh

     

       41
       41
       +
             config.programs.ssh.package

     

       42
       42
        
             pkgs.perl

     

       43
       43
        
             pkgs.procps

     

       44
       44
        
             pkgs.rsync

+1 -1

nixos/modules/services/continuous-integration/jenkins/default.nix

···

       57
       57
        
             };

     

       58
       58
        
       

     

       59
       59
        
             packages = mkOption {

     

       60
       60
       -
               default = [ pkgs.stdenv pkgs.git pkgs.jdk pkgs.openssh pkgs.nix ];

     

       60
       60
       +
               default = [ pkgs.stdenv pkgs.git pkgs.jdk config.programs.ssh.package pkgs.nix ];

     

       61
       61
        
               type = types.listOf types.package;

     

       62
       62
        
               description = ''

     

       63
       63
        
                 Packages to add to PATH for the jenkins process.

+1

nixos/modules/services/mail/mlmmj.nix

···

       88
       88
        
       

     

       89
       89
        
           services.postfix = {

     

       90
       90
        
             enable = true;

     

       91
       91
       +
             recipientDelimiter= "+";

     

       91
       92
        
             extraMasterConf = ''

     

       92
       93
        
               mlmmj unix - n n - - pipe flags=ORhu user=mlmmj argv=${pkgs.mlmmj}/bin/mlmmj-receive -F -L ${spoolDir}/$nextHop

     

       93
       94
        
             '';

+10

nixos/modules/services/mail/postfix.nix

···

       77
       77
        
             smtpd_tls_key_file = ${cfg.sslKey}

     

       78
       78
        
       

     

       79
       79
        
             smtpd_use_tls = yes

     

       80
       80
       +
       

     

       81
       81
       +
             recipient_delimiter = ${cfg.recipientDelimiter}

     

       80
       82
        
           ''

     

       81
       83
        
           + optionalString (cfg.virtual != "") ''

     

       82
       84
        
             virtual_alias_maps = hash:/etc/postfix/virtual

     
···

       287
       289
        
             sslKey = mkOption {

     

       288
       290
        
               default = "";

     

       289
       291
        
               description = "SSL key to use.";

     

       292
       292
       +
             };

     

       293
       293
       +
       

     

       294
       294
       +
             recipientDelimiter = mkOption {

     

       295
       295
       +
               default = "";

     

       296
       296
       +
               example = "+";

     

       297
       297
       +
               description = "

     

       298
       298
       +
                 Delimiter for address extension: so mail to user+test can be handled by ~user/.forward+test

     

       299
       299
       +
               ";

     

       290
       300
        
             };

     

       291
       301
        
       

     

       292
       302
        
             virtual = mkOption {

+1 -1

nixos/modules/services/misc/gitolite.nix

···

       75
       75
        
             serviceConfig.Type = "oneshot";

     

       76
       76
        
             serviceConfig.RemainAfterExit = true;

     

       77
       77
        
       

     

       78
       78
       -
             path = [ pkgs.gitolite pkgs.git pkgs.perl pkgs.bash pkgs.openssh ];

     

       78
       78
       +
             path = [ pkgs.gitolite pkgs.git pkgs.perl pkgs.bash config.programs.ssh.package ];

     

       79
       79
        
             script = ''

     

       80
       80
        
               cd ${cfg.dataDir}

     

       81
       81
        
               mkdir -p .gitolite/logs

+34 -2

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

···

       47
       47
        
               ${optionalString cfg.requireSignedBinaryCaches ''

     

       48
       48
        
                 signed-binary-caches = *

     

       49
       49
        
               ''}

     

       50
       50
       +
               trusted-users = ${toString cfg.trustedUsers}

     

       51
       51
       +
               allowed-users = ${toString cfg.allowedUsers}

     

       50
       52
        
               $extraOptions

     

       51
       53
        
               END

     

       52
       54
        
             '';

     
···

       277
       279
        
               '';

     

       278
       280
        
             };

     

       279
       281
        
       

     

       282
       282
       +
             trustedUsers = mkOption {

     

       283
       283
       +
               type = types.listOf types.str;

     

       284
       284
       +
               default = [ "root" ];

     

       285
       285
       +
               example = [ "root" "alice" "@wheel" ];

     

       286
       286
       +
               description = ''

     

       287
       287
       +
                 A list of names of users that have additional rights when

     

       288
       288
       +
                 connecting to the Nix daemon, such as the ability to specify

     

       289
       289
       +
                 additional binary caches, or to import unsigned NARs. You

     

       290
       290
       +
                 can also specify groups by prefixing them with

     

       291
       291
       +
                 <literal>@</literal>; for instance,

     

       292
       292
       +
                 <literal>@wheel</literal> means all users in the wheel

     

       293
       293
       +
                 group.

     

       294
       294
       +
               '';

     

       295
       295
       +
             };

     

       296
       296
       +
       

     

       297
       297
       +
             allowedUsers = mkOption {

     

       298
       298
       +
               type = types.listOf types.str;

     

       299
       299
       +
               default = [ "*" ];

     

       300
       300
       +
               example = [ "@wheel" "@builders" "alice" "bob" ];

     

       301
       301
       +
               description = ''

     

       302
       302
       +
                 A list of names of users (separated by whitespace) that are

     

       303
       303
       +
                 allowed to connect to the Nix daemon. As with

     

       304
       304
       +
                 <option>nix.trustedUsers</option>, you can specify groups by

     

       305
       305
       +
                 prefixing them with <literal>@</literal>. Also, you can

     

       306
       306
       +
                 allow all users by specifying <literal>*</literal>. The

     

       307
       307
       +
                 default is <literal>*</literal>. Note that trusted users are

     

       308
       308
       +
                 always allowed to connect.

     

       309
       309
       +
               '';

     

       310
       310
       +
             };

     

       311
       311
       +
       

     

       280
       312
        
           };

     

       281
       313
        
       

     

       282
       314
        
         };

     
···

       296
       328
        
             { enable = cfg.buildMachines != [];

     

       297
       329
        
               text =

     

       298
       330
        
                 concatMapStrings (machine:

     

       299
       299
       -
                   "${machine.sshUser}@${machine.hostName} "

     

       331
       331
       +
                   "${if machine ? sshUser then "${machine.sshUser}@" else ""}${machine.hostName} "

     

       300
       332
        
                   + (if machine ? system then machine.system else concatStringsSep "," machine.systems)

     

       301
       333
        
                   + " ${machine.sshKey} ${toString machine.maxJobs} "

     

       302
       334
        
                   + (if machine ? speedFactor then toString machine.speedFactor else "1" )

     
···

       313
       345
        
           systemd.sockets.nix-daemon.wantedBy = [ "sockets.target" ];

     

       314
       346
        
       

     

       315
       347
        
           systemd.services.nix-daemon =

     

       316
       316
       -
             { path = [ nix pkgs.openssl pkgs.utillinux pkgs.openssh ]

     

       348
       348
       +
             { path = [ nix pkgs.openssl pkgs.utillinux config.programs.ssh.package ]

     

       317
       349
        
                 ++ optionals cfg.distributedBuilds [ pkgs.gzip ];

     

       318
       350
        
       

     

       319
       351
        
               environment = cfg.envVars

+84 -36

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

···

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

     

       2
       2
       +
       # http://codex.wordpress.org/Hardening_WordPress

     

       2
       3
        
       

     

       3
       4
        
       with lib;

     

       4
       5
        
       

     

       5
       6
        
       let

     

       6
       6
       -
         # https://wordpress.org/plugins/postgresql-for-wordpress/

     

       7
       7
       -
         # Wordpress plugin 'postgresql-for-wordpress' installation example

     

       8
       8
       -
         postgresqlForWordpressPlugin = pkgs.stdenv.mkDerivation {

     

       9
       9
       -
           name = "postgresql-for-wordpress-plugin";

     

       10
       10
       -
           # Download the theme from the wordpress site

     

       11
       11
       -
           src = pkgs.fetchurl {

     

       12
       12
       -
             url = https://downloads.wordpress.org/plugin/postgresql-for-wordpress.1.3.1.zip;

     

       13
       13
       -
             sha256 = "f11a5d76af884c7bec2bc653ed5bd29d3ede9a8657bd67ab7824e329e5d809e8";

     

       14
       14
       -
           };

     

       15
       15
       -
           # We need unzip to build this package

     

       16
       16
       -
           buildInputs = [ pkgs.unzip ];

     

       17
       17
       -
           # Installing simply means copying all files to the output directory

     

       18
       18
       -
           installPhase = "mkdir -p $out; cp -R * $out/";

     

       19
       19
       -
         };

     

       7
       7
       +
       

     

       8
       8
       +
         version = "4.2";

     

       9
       9
       +
         fullversion = "${version}.2";

     

       20
       10
        
       

     

       21
       11
        
         # Our bare-bones wp-config.php file using the above settings

     

       22
       12
        
         wordpressConfig = pkgs.writeText "wp-config.php" ''

     
···

       38
       28
        
           <IfModule mod_rewrite.c>

     

       39
       29
        
           RewriteEngine On

     

       40
       30
        
           RewriteBase /

     

       41
       41
       -
           RewriteCond %{REQUEST_FILENAME} !-f

     

       42
       42
       -
           RewriteCond %{REQUEST_FILENAME} !-d

     

       43
       43
       -
           RewriteRule . /index.php [L]

     

       31
       31
       +
           RewriteRule ^index\.php$ - [L]

     

       32
       32
       +
       

     

       33
       33
       +
           # add a trailing slash to /wp-admin

     

       34
       34
       +
           RewriteRule ^wp-admin$ wp-admin/ [R=301,L]

     

       35
       35
       +
       

     

       36
       36
       +
           RewriteCond %{REQUEST_FILENAME} -f [OR]

     

       37
       37
       +
           RewriteCond %{REQUEST_FILENAME} -d

     

       38
       38
       +
           RewriteRule ^ - [L]

     

       39
       39
       +
           RewriteRule ^(wp-(content|admin|includes).*) $1 [L]

     

       40
       40
       +
           RewriteRule ^(.*\.php)$ $1 [L]

     

       41
       41
       +
           RewriteRule . index.php [L]

     

       44
       42
        
           </IfModule>

     

       45
       43
        
         '';

     

       46
       44
        
       

     

       45
       45
       +
         # WP translation can be found here:

     

       46
       46
       +
         #   https://make.wordpress.org/polyglots/teams/

     

       47
       47
       +
         # FIXME: 

     

       48
       48
       +
         #  - add all these languages: 

     

       49
       49
       +
         #    sq ar az eu bs bg ca zh-cn zh-tw hr da nl en-au 

     

       50
       50
       +
         #    en-ca en-gb eo fi fr gl de el he hu is id it ja 

     

       51
       51
       +
         #    ko lt nb nn oci pl pt-br pt ro ru sr sk es-mx es 

     

       52
       52
       +
         #    sv th tr uk cy

     

       53
       53
       +
         #  - cache the files on github.com/qknight/WordpressLanguages and use fetchFromGithub instead

     

       54
       54
       +
         #    note: this implementation of supportedLanguages will only work for me (qknight) as i'm using nix-prefetch-url

     

       55
       55
       +
         #          as the sha256 changes like every download. 

     

       56
       56
       +
         # note: this is also true for plugins and themes but these are controlled not from withing wordpress.nix

     

       57
       57
       +
         supportedLanguages = {

     

       58
       58
       +
           en_GB = "1yf1sb6ji3l4lg8nkkjhckbwl81jly8z93jf06pvk6a1p6bsr6l6";

     

       59
       59
       +
           de_DE = "3881221f337799b88f9562df8b3f1560f2c49a8f662297561a5b25ce77f22e17";

     

       60
       60
       +
         };

     

       61
       61
       +
       

     

       62
       62
       +
         downloadLanguagePack = language: sha256:

     

       63
       63
       +
           pkgs.stdenv.mkDerivation rec {

     

       64
       64
       +
             name = "wp_${language}-${version}";

     

       65
       65
       +
             src = pkgs.fetchurl {

     

       66
       66
       +
               url = "https://downloads.wordpress.org/translation/core/${version}/${language}.zip";

     

       67
       67
       +
               sha256 = "${sha256}";

     

       68
       68
       +
             };

     

       69
       69
       +
             buildInputs = [ pkgs.unzip ];

     

       70
       70
       +
             unpackPhase = ''

     

       71
       71
       +
               unzip $src

     

       72
       72
       +
               export sourceRoot=.

     

       73
       73
       +
             '';

     

       74
       74
       +
             installPhase = "mkdir -p $out; cp -R * $out/";

     

       75
       75
       +
           };

     

       76
       76
       +
       

     

       77
       77
       +
         selectedLanguages = map (lang: downloadLanguagePack lang supportedLanguages.${lang}) (config.languages);

     

       78
       78
       +
       

     

       47
       79
        
         # The wordpress package itself

     

       48
       80
        
         wordpressRoot = pkgs.stdenv.mkDerivation rec {

     

       49
       81
        
           name = "wordpress";

     

       50
       50
       -
           # Fetch directly from the wordpress site, want to upgrade?

     

       51
       51
       -
           # Just change the version URL and update the hash

     

       52
       52
       -
           src = pkgs.fetchurl {

     

       53
       53
       -
             url = http://wordpress.org/wordpress-4.1.1.tar.gz;

     

       54
       54
       -
             sha256 = "1s9y0i9ms3m6dswb9gqrr95plnx6imahc07fyhvrp5g35f6c12k1";

     

       82
       82
       +
           src = pkgs.fetchFromGitHub {

     

       83
       83
       +
             owner = "WordPress";

     

       84
       84
       +
             repo = "WordPress";

     

       85
       85
       +
             rev = "${fullversion}";

     

       86
       86
       +
             sha256 = "0gq1j9b0d0rykql3jzdb2yn4adj0rrcsvqrmj3dzx11ir57ilsgc";

     

       55
       87
        
           };

     

       56
       88
        
           installPhase = ''

     

       57
       89
        
             mkdir -p $out

     

       58
       58
       -
             # Copy all the wordpress files we downloaded

     

       90
       90
       +
             # copy all the wordpress files we downloaded

     

       59
       91
        
             cp -R * $out/

     

       60
       60
       -
             # We'll symlink the wordpress config

     

       92
       92
       +
       

     

       93
       93
       +
             # symlink the wordpress config

     

       61
       94
        
             ln -s ${wordpressConfig} $out/wp-config.php

     

       62
       62
       -
             # As well as our custom .htaccess

     

       95
       95
       +
             # symlink custom .htaccess

     

       63
       96
        
             ln -s ${htaccess} $out/.htaccess

     

       64
       64
       -
             # And the uploads directory

     

       97
       97
       +
             # symlink uploads directory

     

       65
       98
        
             ln -s ${config.wordpressUploads} $out/wp-content/uploads

     

       66
       66
       -
             # And the theme(s)

     

       99
       99
       +
       

     

       100
       100
       +
             # remove bundled plugins(s) coming with wordpress

     

       101
       101
       +
             rm -Rf $out/wp-content/plugins/*

     

       102
       102
       +
             # remove bundled themes(s) coming with wordpress

     

       103
       103
       +
             rm -Rf $out/wp-content/themes/*

     

       104
       104
       +
       

     

       105
       105
       +
             # symlink additional theme(s)

     

       67
       106
        
             ${concatMapStrings (theme: "ln -s ${theme} $out/wp-content/themes/${theme.name}\n") config.themes}

     

       68
       68
       -
             # And the plugin(s)

     

       69
       69
       -
             # remove bundled plugin(s) coming with wordpress

     

       70
       70
       -
             rm -Rf $out/wp-content/plugins/akismet

     

       71
       71
       -
             # install plugins

     

       72
       72
       -
             ${concatMapStrings (plugin: "ln -s ${plugin} $out/wp-content/plugins/${plugin.name}\n") (config.plugins ++ [ postgresqlForWordpressPlugin]) }

     

       107
       107
       +
             # symlink additional plugin(s)

     

       108
       108
       +
             ${concatMapStrings (plugin: "ln -s ${plugin} $out/wp-content/plugins/${plugin.name}\n") (config.plugins) }

     

       109
       109
       +
       

     

       110
       110
       +
             # symlink additional translation(s) 

     

       111
       111
       +
             mkdir -p $out/wp-content/languages

     

       112
       112
       +
             ${concatMapStrings (language: "ln -s ${language}/*.mo ${language}/*.po $out/wp-content/languages/\n") (selectedLanguages) }

     

       73
       113
        
           '';

     

       74
       114
        
         };

     

       75
       115
        
       

     
···

       102
       142
        
           };

     

       103
       143
        
           dbUser = mkOption {

     

       104
       144
        
             default = "wordpress";

     

       105
       105
       -
             description = "The dbUser, read the username, for the database.";

     

       145
       145
       +
             description = "The dbUser, read: the username, for the database.";

     

       106
       146
        
             example = "wordpress";

     

       107
       147
        
           };

     

       108
       148
        
           dbPassword = mkOption {

     

       109
       149
        
             default = "wordpress";

     

       110
       110
       -
             description = "The password to the respective dbUser.";

     

       150
       150
       +
             description = "The mysql password to the respective dbUser.";

     

       111
       151
        
             example = "wordpress";

     

       112
       152
        
           };

     

       113
       153
        
           tablePrefix = mkOption {

     
···

       127
       167
        
             type = types.listOf types.path;

     

       128
       168
        
             description =

     

       129
       169
        
               ''

     

       130
       130
       -
                 List of path(s) to respective plugin(s) which are symlinked from the 'plugins' directory. Note: These plugins need to be packaged before use.

     

       170
       170
       +
                 List of path(s) to respective plugin(s) which are symlinked from the 'plugins' directory. Note: These plugins need to be packaged before use, see example.

     

       131
       171
        
               '';

     

       132
       172
        
             example = ''

     

       133
       173
        
               # Wordpress plugin 'akismet' installation example

     
···

       153
       193
        
             type = types.listOf types.path;

     

       154
       194
        
             description =

     

       155
       195
        
               ''

     

       156
       156
       -
                 List of path(s) to respective theme(s) which are symlinked from the 'theme' directory. Note: These themes need to be packaged before use.

     

       196
       196
       +
                 List of path(s) to respective theme(s) which are symlinked from the 'theme' directory. Note: These themes need to be packaged before use, see example.

     

       157
       197
        
               '';

     

       158
       198
        
             example = ''

     

       159
       199
        
               # For shits and giggles, let's package the responsive theme

     
···

       174
       214
        
                 themes = [ responsiveTheme ];

     

       175
       215
        
             '';

     

       176
       216
        
           };

     

       217
       217
       +
           languages = mkOption {

     

       218
       218
       +
                 default = [];

     

       219
       219
       +
                 description = "Installs wordpress language packs based on the list, see wordpress.nix for possible translations.";

     

       220
       220
       +
                 example = "[ \"en_GB\" \"de_DE\" ];";

     

       221
       221
       +
           };

     

       177
       222
        
           extraConfig = mkOption {

     

       178
       223
        
             default = "";

     

       179
       224
        
             example =

     
···

       198
       243
        
           # we should use systemd dependencies here

     

       199
       244
        
           #waitForUnit("network-interfaces.target");

     

       200
       245
        
           if [ ! -d ${serverInfo.fullConfig.services.mysql.dataDir}/${config.dbName} ]; then

     

       246
       246
       +
             echo "Need to create the database '${config.dbName}' and grant permissions to user named '${config.dbUser}'."

     

       201
       247
        
             # Wait until MySQL is up

     

       202
       248
        
             while [ ! -e /var/run/mysql/mysqld.pid ]; do

     

       203
       249
        
               sleep 1

     

       204
       250
        
             done

     

       205
       251
        
             ${pkgs.mysql}/bin/mysql -e 'CREATE DATABASE ${config.dbName};'

     

       206
       252
        
             ${pkgs.mysql}/bin/mysql -e 'GRANT ALL ON ${config.dbName}.* TO ${config.dbUser}@localhost IDENTIFIED BY "${config.dbPassword}";'

     

       253
       253
       +
           else 

     

       254
       254
       +
             echo "Good, no need to do anything database related."

     

       207
       255
        
           fi

     

       208
       256
        
         '';

     

       209
       257
        
       }

+4 -3

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

···

       21
       21
        
         config = mkIf cfg.enable {

     

       22
       22
        
           services.xserver.windowManager.session = singleton {

     

       23
       23
        
             name = "stumpwm";

     

       24
       24
       -
             start = "

     

       25
       25
       -
               ${pkgs.stumpwm}/bin/stumpwm

     

       26
       26
       -
             ";

     

       24
       24
       +
             start = ''

     

       25
       25
       +
               ${pkgs.stumpwm}/bin/stumpwm &

     

       26
       26
       +
               waitPID=$!

     

       27
       27
       +
             '';

     

       27
       28
        
           };

     

       28
       29
        
           environment.systemPackages = [ pkgs.stumpwm ];

     

       29
       30
        
         };

+1 -1

nixos/modules/virtualisation/ec2-data.nix

···

       91
       91
        
                   # can obtain it securely by parsing the output of

     

       92
       92
        
                   # ec2-get-console-output.

     

       93
       93
        
                   echo "-----BEGIN SSH HOST KEY FINGERPRINTS-----" > /dev/console

     

       94
       94
       -
                   ${pkgs.openssh}/bin/ssh-keygen -l -f /etc/ssh/ssh_host_dsa_key.pub > /dev/console

     

       94
       94
       +
                   ${config.programs.ssh.package}/bin/ssh-keygen -l -f /etc/ssh/ssh_host_dsa_key.pub > /dev/console

     

       95
       95
        
                   echo "-----END SSH HOST KEY FINGERPRINTS-----" > /dev/console

     

       96
       96
        
                 '';

     

       97
       97
        
               serviceConfig.Type = "oneshot";

+1 -1

nixos/modules/virtualisation/nova.nix

···

       100
       100
        
       

     

       101
       101
        
               # `openssl' is required to generate the CA.  `openssh' is

     

       102
       102
        
               # required to generate key pairs.

     

       103
       103
       -
               path = [ pkgs.openssl pkgs.openssh pkgs.bash ];

     

       103
       103
       +
               path = [ pkgs.openssl config.programs.ssh.package pkgs.bash ];

     

       104
       104
        
       

     

       105
       105
        
               respawn = false;

     

       106
       106

+35

pkgs/applications/misc/qtpass/default.nix

···

       1
       1
       +
       { stdenv, fetchurl, git, gnupg, makeWrapper, pass, qt5 }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

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

     

       5
       5
       +
         version = "0.8.4";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchurl {

     

       8
       8
       +
           url = "https://github.com/IJHack/qtpass/archive/v${version}.tar.gz";

     

       9
       9
       +
           sha256 = "14avh04q559p64ska1w814pbwv0742aaqln036pw99fjxav685g0";

     

       10
       10
       +
         };

     

       11
       11
       +
       

     

       12
       12
       +
         buildInputs = [ git gnupg makeWrapper pass qt5.base ];

     

       13
       13
       +
       

     

       14
       14
       +
         configurePhase = "qmake CONFIG+=release PREFIX=$out DESTDIR=$out";

     

       15
       15
       +
       

     

       16
       16
       +
         installPhase = ''

     

       17
       17
       +
           mkdir $out/bin

     

       18
       18
       +
           mv $out/qtpass $out/bin

     

       19
       19
       +
         '';

     

       20
       20
       +
       

     

       21
       21
       +
         postInstall = ''

     

       22
       22
       +
           wrapProgram $out/bin/qtpass \

     

       23
       23
       +
               --suffix PATH : ${git}/bin \

     

       24
       24
       +
               --suffix PATH : ${gnupg}/bin \

     

       25
       25
       +
               --suffix PATH : ${pass}/bin

     

       26
       26
       +
         '';

     

       27
       27
       +
       

     

       28
       28
       +
         meta = with stdenv.lib; {

     

       29
       29
       +
           description = "A multi-platform GUI for pass, the standard unix password manager";

     

       30
       30
       +
           homepage = https://github.com/IJHack/qtpass;

     

       31
       31
       +
           license = licenses.gpl3;

     

       32
       32
       +
           maintainers = [ maintainers.hrdinka ];

     

       33
       33
       +
           platforms = platforms.all;

     

       34
       34
       +
         };

     

       35
       35
       +
       }

+2 -2

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

···

       30
       30
        
       , nspr

     

       31
       31
        
       , nss

     

       32
       32
        
       , pango

     

       33
       33
       -
       , heimdal

     

       33
       33
       +
       , libheimdal

     

       34
       34
        
       , libpulseaudio

     

       35
       35
        
       , systemd

     

       36
       36
        
       }:

     
···

       102
       102
        
             nspr

     

       103
       103
        
             nss

     

       104
       104
        
             pango

     

       105
       105
       -
             heimdal

     

       105
       105
       +
             libheimdal

     

       106
       106
        
             libpulseaudio

     

       107
       107
        
             systemd

     

       108
       108
        
           ] + ":" + stdenv.lib.makeSearchPath "lib64" [

+2 -2

pkgs/applications/office/zotero/firefox-bin/default.nix

···

       30
       30
        
       , nspr

     

       31
       31
        
       , nss

     

       32
       32
        
       , pango

     

       33
       33
       -
       , heimdal

     

       33
       33
       +
       , libheimdal

     

       34
       34
        
       , libpulseaudio

     

       35
       35
        
       , systemd

     

       36
       36
        
       }:

     
···

       102
       102
        
             nspr

     

       103
       103
        
             nss

     

       104
       104
        
             pango

     

       105
       105
       -
             heimdal

     

       105
       105
       +
             libheimdal

     

       106
       106
        
             libpulseaudio

     

       107
       107
        
             systemd

     

       108
       108
        
           ] + ":" + stdenv.lib.makeSearchPath "lib64" [

+7 -2

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

···

       1
       1
       -
       { stdenv, fetchurl, ocaml, findlib, dypgen, bolt, ansiterminal,

     

       1
       1
       +
       { stdenv, fetchurl, ocaml, findlib, dypgen, bolt, ansiterminal, camlp4,

     

       2
       2
        
         buildBytecode ? true,

     

       3
       3
        
         buildNative ? true,

     

       4
       4
        
         installExamples ? true,

     
···

       22
       22
        
           sha256 = "1k1ldqg34bwmgdpmi9gry9czlsk85ycjxnkd25fhlf3mmgg4n9p6";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
       -
         buildInputs = [ ocaml findlib dypgen bolt ansiterminal ];

     

       25
       25
       +
         buildInputs = [ ocaml findlib dypgen bolt ansiterminal camlp4 ];

     

       26
       26
        
       

     

       27
       27
        
         patches = [ ./install-emacs-to-site-lisp.patch

     

       28
       28
        
                     ./use-nix-ocaml-byteflags.patch ];

     

       29
       29
       +
       

     

       30
       30
       +
         postPatch = stdenv.lib.optionalString (camlp4 != null) ''

     

       31
       31
       +
           substituteInPlace src/Makefile.master.in \

     

       32
       32
       +
             --replace "+camlp4" "${camlp4}/lib/ocaml/${getVersion ocaml}/site-lib/camlp4/"

     

       33
       33
       +
         '';

     

       29
       34
        
       

     

       30
       35
        
         # The bytecode executable is dependent on the dynamic library provided by

     

       31
       36
        
         # ANSITerminal. We can use the -dllpath flag of ocamlc (analogous to

+2 -2

pkgs/applications/science/logic/coq/8.3.nix

···

       1
       1
        
       # - coqide compilation can be disabled by setting lablgtk to null;

     

       2
       2
        
       

     

       3
       3
       -
       {stdenv, fetchurl, ocaml, findlib, camlp5, ncurses, lablgtk ? null}:

     

       3
       3
       +
       { stdenv, make, fetchurl, ocaml, findlib, camlp5, ncurses, lablgtk ? null }:

     

       4
       4
        
       

     

       5
       5
        
       let 

     

       6
       6
        
         version = "8.3pl4";

     
···

       21
       21
        
           sha256 = "17d3lmchmqir1rawnr52g78srg4wkd7clzpzfsivxc4y1zp6rwkr";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
       -
         buildInputs = [ ocaml findlib camlp5 ncurses lablgtk ];

     

       24
       24
       +
         buildInputs = [ make ocaml findlib camlp5 ncurses lablgtk ];

     

       25
       25
        
       

     

       26
       26
        
         prefixKey = "-prefix ";

     

       27
       27

+3 -7

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

···

       1
       1
       -
       { stdenv, fetchurl, which, texLive }:

     

       1
       1
       +
       { stdenv, fetchurl, which }:

     

       2
       2
        
       let

     

       3
       3
        
         s = # Generated upstream information

     

       4
       4
        
         rec {

     
···

       18
       18
        
           inherit (s) url sha256;

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
       -
         buildInputs = [which texLive];

     

       21
       21
       +
         buildInputs = [ which ];

     

       22
       22
        
       

     

       23
       23
        
         preConfigure = "sed -e 's@^EXECPATH\\s.*@EXECPATH = '\$out'/bin@' -i Makefile.vars";

     

       24
       24
        
       

     

       25
       25
        
         buildPhase = "make install";

     

       26
       26
        
       

     

       27
       27
       -
         # HOME=. allows to build missing TeX formats

     

       28
       27
        
         installPhase = ''

     

       29
       28
        
           mkdir -p $out/bin

     

       30
       29
        
           make install

     

       31
       31
       -
           HOME=. make documentation

     

       32
       32
       -
           mkdir -p $out/share/doc

     

       33
       33
       -
           cp -r DOC $out/share/doc/EProver

     

       34
       30
        
           echo eproof -xAuto --tstp-in --tstp-out '"$@"' > $out/bin/eproof-tptp

     

       35
       31
        
           chmod a+x $out/bin/eproof-tptp

     

       36
       32
        
         '';

     

       37
       33
        
       

     

       38
       34
        
         meta = {

     

       39
       35
        
           inherit (s) version;

     

       40
       40
       -
           description = "E automated theorem prover";

     

       36
       36
       +
           description = "Automated theorem prover for full first-order logic with equality";

     

       41
       37
        
           maintainers = [stdenv.lib.maintainers.raskin];

     

       42
       38
        
           platforms = stdenv.lib.platforms.all;

     

       43
       39
        
         };

+3 -3

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

···

       1
       1
       -
       { stdenv, fetchdarcs, ocaml, findlib,  lablgl, camlimages, mesa, freeglut, ocaml_mysql, mlgmp, mpfr, gmp, libtiff, libjpeg, libpng, giflib }:

     

       1
       1
       +
       { stdenv, fetchdarcs, ocaml, findlib,  lablgl, camlimages, mesa, freeglut, ocaml_mysql, mysql, mlgmp, mpfr, gmp, libtiff, libjpeg, libpng, giflib }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         ocaml_version = (builtins.parseDrvName ocaml.name).version;

     
···

       10
       10
        
         src = fetchdarcs {

     

       11
       11
        
           url = "http://lama.univ-savoie.fr/~raffalli/GlSurf";

     

       12
       12
        
           rev = "3.3";

     

       13
       13
       -
           sha256 = ""; md5="";

     

       13
       13
       +
           sha256 = "0ljvvzz31j7l8rvsv63x1kj70nhw3al3k294m79hpmwjvym1mzfa";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         buildInputs = [ ocaml findlib freeglut mesa

     

       17
       17
       -
         	          lablgl camlimages ocaml_mysql mlgmp mpfr gmp

     

       17
       17
       +
         	          lablgl camlimages ocaml_mysql mysql.lib mlgmp mpfr gmp

     

       18
       18
        
       		  libtiff libjpeg libpng giflib ];

     

       19
       19
        
       

     

       20
       20
        
         installPhase = ''

-23

pkgs/applications/version-management/codeville/0.8.0.nix

···

       1
       1
       -
       args : with args; 

     

       2
       2
       -
       

     

       3
       3
       -
       if (! python ? dbSupport) || (! python.dbSupport) then 

     

       4
       4
       -
         throw ''Python DB4 support is required for codeville.'' 

     

       5
       5
       -
       else

     

       6
       6
       -
       

     

       7
       7
       -
       rec {

     

       8
       8
       -
         src = fetchurl {

     

       9
       9
       -
           url = http://codeville.org/download/Codeville-0.8.0.tar.gz;

     

       10
       10
       -
           sha256 = "1p8zc4ijwcwf5bxl34n8d44mlxk1zhbpca68r93ywxqkqm2aqz37";

     

       11
       11
       -
         };

     

       12
       12
       -
       

     

       13
       13
       -
         buildInputs = [python makeWrapper];

     

       14
       14
       -
         configureFlags = [];

     

       15
       15
       -
       

     

       16
       16
       -
         /* doConfigure should be specified separately */

     

       17
       17
       -
         phaseNames = ["installPythonPackage" (makeManyWrappers ''$out/bin/*'' ''--prefix PYTHONPATH : $(toPythonPath $out)'')];

     

       18
       18
       -
             

     

       19
       19
       -
         name = "codeville-0.8.0";

     

       20
       20
       -
         meta = {

     

       21
       21
       -
           description = "RCS with powerful merge";

     

       22
       22
       -
         };

     

       23
       23
       -
       }

+4 -4

pkgs/applications/video/k9copy/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, cmake, automoc4, kf5, dvdauthor, xineLib, libmpeg2, libav,

     

       2
       2
       -
       libdvdread, libdvdnav, dvdplusrwtools }:

     

       1
       1
       +
       { stdenv, fetchurl, cmake, automoc4, qt5, kf5, dvdauthor, xineLib, libmpeg2, libav,

     

       2
       2
       +
       libdvdread, libdvdnav, dvdplusrwtools, phonon_qt5 }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         version = "3.0.3";

     
···

       31
       31
        
           libdvdnav

     

       32
       32
        
           dvdplusrwtools

     

       33
       33
        
           automoc4

     

       34
       34
       +
           phonon_qt5

     

       34
       35
        
         ] ++ (with kf5; [

     

       35
       36
        
           extra-cmake-modules

     

       36
       37
        
           kio

     

       37
       38
        
           solid

     

       38
       38
       -
           scope.Phonon4Qt5

     

       39
       39
       -
           scope.Qt5X11Extras

     

       39
       39
       +
           qt5.x11extras

     

       40
       40
        
           kiconthemes

     

       41
       41
        
           ki18n

     

       42
       42
        
           kdesu

+8 -2

pkgs/applications/video/obs-studio/default.nix

···

       7
       7
        
       , qt5

     

       8
       8
        
       , libv4l

     

       9
       9
        
       , x264

     

       10
       10
       +
       

     

       11
       11
       +
       , pulseaudioSupport ? false

     

       12
       12
       +
       , libpulseaudio

     

       10
       13
        
       }:

     

       11
       14
        
       

     

       12
       12
       -
       stdenv.mkDerivation rec {

     

       15
       15
       +
       let

     

       16
       16
       +
         optional = stdenv.lib.optional;

     

       17
       17
       +
       in stdenv.mkDerivation rec {

     

       13
       18
        
         name = "obs-studio-${version}";

     

       14
       19
        
         version = "0.10.0";

     

       15
       20
        
       

     
···

       26
       31
        
                         qt5.base

     

       27
       32
        
                         qt5.x11extras

     

       28
       33
        
                         x264

     

       29
       29
       -
                       ];

     

       34
       34
       +
                       ]

     

       35
       35
       +
                       ++ optional pulseaudioSupport libpulseaudio;

     

       30
       36
        
       

     

       31
       37
        
         # obs attempts to dlopen libobs-opengl, it fails unless we make sure

     

       32
       38
        
         # DL_OPENGL is an explicit path. Not sure if there's a better way

+2

pkgs/applications/window-managers/stumpwm/default.nix

···

       41
       41
        
       

     

       42
       42
        
         preBuild = ''

     

       43
       43
        
           cp -r --no-preserve=mode ${contrib} modules

     

       44
       44
       +
           substituteInPlace  head.lisp \

     

       45
       45
       +
             --replace 'run-shell-command "xdpyinfo' 'run-shell-command "${xdpyinfo}/bin/xdpyinfo'

     

       44
       46
        
         '';

     

       45
       47
        
       

     

       46
       48
        
         installPhase = ''

+2 -2

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

···

       2
       2
        
       , libcanberra, libcanberra_gtk3, accountsservice, libpwquality, libpulseaudio, fontconfig

     

       3
       3
        
       , gdk_pixbuf, hicolor_icon_theme, librsvg, libxkbfile, libnotify

     

       4
       4
        
       , libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk

     

       5
       5
       -
       , cracklib, python, krb5, networkmanagerapplet, networkmanager

     

       5
       5
       +
       , cracklib, python, libkrb5, networkmanagerapplet, networkmanager

     

       6
       6
        
       , libwacom, samba, shared_mime_info, tzdata, icu, libtool, udev

     

       7
       7
        
       , docbook_xsl, docbook_xsl_ns, modemmanager, clutter, clutter_gtk }:

     

       8
       8
        
       

     
···

       25
       25
        
           [ pkgconfig intltool ibus gtk glib upower libcanberra gsettings_desktop_schemas

     

       26
       26
        
             libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus

     

       27
       27
        
             gnome_online_accounts libsoup colord libpulseaudio fontconfig colord-gtk libpwquality

     

       28
       28
       -
             accountsservice krb5 networkmanagerapplet libwacom samba libnotify libxkbfile

     

       28
       28
       +
             accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify libxkbfile

     

       29
       29
        
             shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo

     

       30
       30
        
             gdk_pixbuf gnome3.defaultIconTheme librsvg clutter clutter_gtk

     

       31
       31
        
             gnome3.vino udev libcanberra_gtk3

+1

pkgs/desktops/gnome-3/3.16/default.nix

···

       16
       16
        
         corePackages = with gnome3; [

     

       17
       17
        
           pkgs.desktop_file_utils pkgs.ibus

     

       18
       18
        
           pkgs.shared_mime_info # for update-mime-database

     

       19
       19
       +
           glib # for gsettings

     

       19
       20
        
           gtk3 # for gtk-update-icon-cache

     

       20
       21
        
           glib_networking gvfs dconf gnome-backgrounds gnome_control_center

     

       21
       22
        
           gnome-menus gnome_settings_daemon gnome_shell

+2 -2

pkgs/development/compilers/hhvm/default.nix

···

       1
       1
        
       { stdenv, fetchgit, cmake, pkgconfig, boost, libunwind, libmemcached, pcre

     

       2
       2
        
       , libevent, gd, curl, libxml2, icu, flex, bison, openssl, zlib, php, re2c

     

       3
       3
       -
       , expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog, krb5

     

       3
       3
       +
       , expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog, libkrb5

     

       4
       4
        
       , bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng

     

       5
       5
        
       , libxslt, ocaml, freetype, gdb, git, perl, mariadb, gmp, libyaml, libedit

     

       6
       6
        
       , libvpx, imagemagick, fribidi

     
···

       22
       22
        
           [ cmake pkgconfig boost libunwind mariadb libmemcached pcre gdb git perl

     

       23
       23
        
             libevent gd curl libxml2 icu flex bison openssl zlib php expat libcap

     

       24
       24
        
             oniguruma libdwarf libmcrypt tbb gperftools bzip2 openldap readline

     

       25
       25
       -
             libelf uwimap binutils cyrus_sasl pam glog libpng libxslt ocaml krb5

     

       25
       25
       +
             libelf uwimap binutils cyrus_sasl pam glog libpng libxslt ocaml libkrb5

     

       26
       26
        
             gmp libyaml libedit libvpx imagemagick fribidi

     

       27
       27
        
           ];

     

       28
       28

+6

pkgs/development/compilers/ocaml/4.02.1.nix

···

       9
       9
        
       let

     

       10
       10
        
          useNativeCompilers = !stdenv.isMips;

     

       11
       11
        
          inherit (stdenv.lib) optionals optionalString;

     

       12
       12
       +
          patchOcamlBuild = fetchurl {

     

       13
       13
       +
            url = https://github.com/ocaml/ocaml/pull/117.patch;

     

       14
       14
       +
            sha256 = "0x2cdn2sgzq29qzqg5y2ial0jqy8gjg5a7jf8qqch55dc4vkyjw0";

     

       15
       15
       +
          };

     

       12
       16
        
       in

     

       13
       17
        
       

     

       14
       18
        
       stdenv.mkDerivation rec {

     
···

       23
       27
        
           url = "http://caml.inria.fr/pub/distrib/ocaml-4.02/${name}.tar.xz";

     

       24
       28
        
           sha256 = "1p7lqvh64xpykh99014mz21q8fs3qyjym2qazhhbq8scwldv1i38";

     

       25
       29
        
         };

     

       30
       30
       +
       

     

       31
       31
       +
         patches = [ patchOcamlBuild ];

     

       26
       32
        
       

     

       27
       33
        
         prefixKey = "-prefix ";

     

       28
       34
        
         configureFlags = optionals useX11 [ "-x11lib" x11lib

+87

pkgs/development/interpreters/erlang/R18.nix

···

       1
       1
       +
       { stdenv, fetchurl, perl, gnum4, ncurses, openssl

     

       2
       2
       +
       , gnused, gawk, makeWrapper

     

       3
       3
       +
       , odbcSupport ? false, unixODBC ? null

     

       4
       4
       +
       , wxSupport ? true, mesa ? null, wxGTK ? null, xlibs ? null, wxmac ? null

     

       5
       5
       +
       , javacSupport ? false, openjdk ? null

     

       6
       6
       +
       , enableHipe ? true

     

       7
       7
       +
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       assert wxSupport -> (if stdenv.isDarwin

     

       10
       10
       +
         then wxmac != null

     

       11
       11
       +
         else mesa != null && wxGTK != null && xlibs != null);

     

       12
       12
       +
       

     

       13
       13
       +
       assert odbcSupport -> unixODBC != null;

     

       14
       14
       +
       assert javacSupport ->  openjdk != null;

     

       15
       15
       +
       

     

       16
       16
       +
       with stdenv.lib;

     

       17
       17
       +
       

     

       18
       18
       +
       stdenv.mkDerivation rec {

     

       19
       19
       +
         name = "erlang-" + version + "${optionalString odbcSupport "-odbc"}"

     

       20
       20
       +
         + "${optionalString javacSupport "-javac"}";

     

       21
       21
       +
         version = "18.0";

     

       22
       22
       +
       

     

       23
       23
       +
         src = fetchurl {

     

       24
       24
       +
           url = "http://www.erlang.org/download/otp_src_${version}.tar.gz";

     

       25
       25
       +
           sha256 = "1ahi865ii3iqzd00yyn3nrxjb9qa2by9d7ixssvqw8ag9firvdm0";

     

       26
       26
       +
         };

     

       27
       27
       +
       

     

       28
       28
       +
         buildInputs =

     

       29
       29
       +
           [ perl gnum4 ncurses openssl makeWrapper

     

       30
       30
       +
           ] ++ optional wxSupport (if stdenv.isDarwin then [ wxmac ] else [ mesa wxGTK xlibs.libX11 ])

     

       31
       31
       +
             ++ optional odbcSupport [ unixODBC ]

     

       32
       32
       +
             ++ optional javacSupport [ openjdk ];

     

       33
       33
       +
       

     

       34
       34
       +
         patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure '';

     

       35
       35
       +
       

     

       36
       36
       +
         preConfigure = ''

     

       37
       37
       +
           export HOME=$PWD/../

     

       38
       38
       +
           sed -e s@/bin/pwd@pwd@g -i otp_build

     

       39
       39
       +
         '';

     

       40
       40
       +
       

     

       41
       41
       +
         configureFlags= [

     

       42
       42
       +
           "--with-ssl=${openssl}"

     

       43
       43
       +
         ] ++ optional enableHipe "--enable-hipe"

     

       44
       44
       +
           ++ optional wxSupport "--enable-wx"

     

       45
       45
       +
           ++ optional odbcSupport "--with-odbc=${unixODBC}"

     

       46
       46
       +
           ++ optional javacSupport "--with-javac"

     

       47
       47
       +
           ++ optional stdenv.isDarwin "--enable-darwin-64bit";

     

       48
       48
       +
       

     

       49
       49
       +
         postInstall = let

     

       50
       50
       +
           manpages = fetchurl {

     

       51
       51
       +
             url = "http://www.erlang.org/download/otp_doc_man_${version}.tar.gz";

     

       52
       52
       +
             sha256 = "0wsnp7sp21ydinwkg3rkazyrs382pdzwra9apikkhs70dv1hwkz4";

     

       53
       53
       +
           };

     

       54
       54
       +
         in ''

     

       55
       55
       +
           ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call

     

       56
       56
       +
           tar xf "${manpages}" -C "$out/lib/erlang"

     

       57
       57
       +
           for i in "$out"/lib/erlang/man/man[0-9]/*.[0-9]; do

     

       58
       58
       +
             prefix="''${i%/*}"

     

       59
       59
       +
             ensureDir "$out/share/man/''${prefix##*/}"

     

       60
       60
       +
             ln -s "$i" "$out/share/man/''${prefix##*/}/''${i##*/}erl"

     

       61
       61
       +
           done

     

       62
       62
       +
         '';

     

       63
       63
       +
       

     

       64
       64
       +
         # Some erlang bin/ scripts run sed and awk

     

       65
       65
       +
         postFixup = ''

     

       66
       66
       +
           wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/"

     

       67
       67
       +
           wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${gnused}/bin/:${gawk}/bin"

     

       68
       68
       +
         '';

     

       69
       69
       +
       

     

       70
       70
       +
         meta = {

     

       71
       71
       +
           homepage = "http://www.erlang.org/";

     

       72
       72
       +
           description = "Programming language used for massively scalable soft real-time systems";

     

       73
       73
       +
       

     

       74
       74
       +
           longDescription = ''

     

       75
       75
       +
             Erlang is a programming language used to build massively scalable

     

       76
       76
       +
             soft real-time systems with requirements on high availability.

     

       77
       77
       +
             Some of its uses are in telecoms, banking, e-commerce, computer

     

       78
       78
       +
             telephony and instant messaging. Erlang's runtime system has

     

       79
       79
       +
             built-in support for concurrency, distribution and fault

     

       80
       80
       +
             tolerance.

     

       81
       81
       +
           '';

     

       82
       82
       +
       

     

       83
       83
       +
           platforms = platforms.unix;

     

       84
       84
       +
           maintainers = with maintainers; [ the-kenny sjmackenzie couchemar ];

     

       85
       85
       +
           license = licenses.asl20;

     

       86
       86
       +
         };

     

       87
       87
       +
       }

+37

pkgs/development/libraries/libtsm/darwin.patch

···

       1
       1
       +
       From 4e7b7b1124bfbccb43820997164b00720bf5ca31 Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Florian Gilcher <florian.gilcher@asquera.de>

     

       3
       3
       +
       Date: Sun, 23 Mar 2014 23:05:44 +0100

     

       4
       4
       +
       Subject: [PATCH] Remove GCC specific flags

     

       5
       5
       +
       

     

       6
       6
       +
       ---

     

       7
       7
       +
        Makefile.am | 10 ++--------

     

       8
       8
       +
        1 file changed, 2 insertions(+), 8 deletions(-)

     

       9
       9
       +
       

     

       10
       10
       +
       diff --git a/Makefile.am b/Makefile.am

     

       11
       11
       +
       index f1e872b..c011f02 100644

     

       12
       12
       +
       --- a/Makefile.am

     

       13
       13
       +
       +++ b/Makefile.am

     

       14
       14
       +
       @@ -69,11 +69,7 @@ AM_CFLAGS = \

     

       15
       15
       +
        AM_CPPFLAGS = \

     

       16
       16
       +
        	-include $(top_builddir)/config.h \

     

       17
       17
       +
        	-I $(srcdir)/src

     

       18
       18
       +
       -AM_LDFLAGS = \

     

       19
       19
       +
       -	-Wl,--as-needed \

     

       20
       20
       +
       -	-Wl,--gc-sections \

     

       21
       21
       +
       -	-Wl,-z,relro \

     

       22
       22
       +
       -	-Wl,-z,now

     

       23
       23
       +
       +AM_LDFLAGS =

     

       24
       24
       +
        

     

       25
       25
       +
        if BUILD_ENABLE_DEBUG

     

       26
       26
       +
        AM_CFLAGS += -g

     

       27
       27
       +
       @@ -134,9 +130,7 @@ libtsm_la_CPPFLAGS = $(AM_CPPFLAGS)

     

       28
       28
       +
        libtsm_la_LIBADD = libshl.la

     

       29
       29
       +
        EXTRA_libtsm_la_DEPENDENCIES = $(top_srcdir)/docs/libtsm.sym

     

       30
       30
       +
        libtsm_la_LDFLAGS = \

     

       31
       31
       +
       -	$(AM_LDFLAGS) \

     

       32
       32
       +
       -	-version-info $(LIBTSM_CURRENT):$(LIBTSM_REVISION):$(LIBTSM_AGE) \

     

       33
       33
       +
       -	-Wl,--version-script="$(top_srcdir)/docs/libtsm.sym"

     

       34
       34
       +
       +	$(AM_LDFLAGS)

     

       35
       35
       +
        

     

       36
       36
       +
        if BUILD_HAVE_XKBCOMMON

     

       37
       37
       +
        libtsm_la_CPPFLAGS += $(XKBCOMMON_CFLAGS)

+13 -5

pkgs/development/libraries/libtsm/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, libxkbcommon, pkgconfig }:

     

       1
       1
       +
       { stdenv, lib, fetchurl, libxkbcommon, pkgconfig, autoconf, automake }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "libtsm-3";

     
···

       8
       8
        
           sha256 = "01ygwrsxfii0pngfikgqsb4fxp8n1bbs47l7hck81h9b9bc1ah8i";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
       -
         buildInputs = [ libxkbcommon pkgconfig ];

     

       11
       11
       +
         buildInputs = [ libxkbcommon pkgconfig ] ++ lib.optionals stdenv.isDarwin [

     

       12
       12
       +
           autoconf automake

     

       13
       13
       +
          ];

     

       14
       14
       +
       

     

       15
       15
       +
         preConfigure = lib.optionalString stdenv.isDarwin ''

     

       16
       16
       +
           aclocal

     

       17
       17
       +
         '';

     

       12
       18
        
       

     

       13
       19
        
         configureFlags = [ "--disable-debug" ];

     

       14
       20
        
       

     

       15
       15
       -
         meta = {

     

       21
       21
       +
         patches = lib.optional stdenv.isDarwin ./darwin.patch;

     

       22
       22
       +
       

     

       23
       23
       +
         meta = with lib; {

     

       16
       24
        
           description = "Terminal-emulator State Machine";

     

       17
       25
        
           homepage = "http://www.freedesktop.org/wiki/Software/kmscon/libtsm/";

     

       18
       18
       -
           license = stdenv.lib.licenses.mit;

     

       19
       19
       -
           maintainers = [ stdenv.lib.maintainers.shlevy ];

     

       26
       26
       +
           license = licenses.mit;

     

       27
       27
       +
           maintainers = with maintainers; [ shlevy cstrahan ];

     

       20
       28
        
         };

     

       21
       29
        
       }

+2 -2

pkgs/development/libraries/ti-rpc/default.nix

···

       1
       1
       -
       { fetchurl, stdenv, krb5 }:

     

       1
       1
       +
       { fetchurl, stdenv, libkrb5 }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "libtirpc-0.3.0";

     
···

       8
       8
        
           sha256 = "07d1wlfzf3ia09mjn3f3ay8isk7yx4a6ckfkzx5khnqlc7amkzna";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
       -
         propagatedBuildInputs = [ krb5 ];

     

       11
       11
       +
         propagatedBuildInputs = [ libkrb5 ];

     

       12
       12
        
       

     

       13
       13
        
         # http://www.sourcemage.org/projects/grimoire/repository/revisions/d6344b6a3a94b88ed67925a474de5930803acfbf

     

       14
       14
        
         preConfigure = ''

+15 -2

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

···

       1
       1
       -
       { stdenv, fetchurl, ocaml, findlib, which }:

     

       1
       1
       +
       { stdenv, fetchurl, ocaml, findlib, which, camlp4 }:

     

       2
       2
        
       

     

       3
       3
        
       let inherit (stdenv.lib) getVersion versionAtLeast; in

     

       4
       4
        
       

     
···

       14
       14
        
           sha256 = "1c807wrpxra9sbb34lajhimwra28ldxv04m570567lh2b04n38zy";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       -
         buildInputs = [ ocaml findlib which ];

     

       17
       17
       +
         buildInputs = [ ocaml findlib which camlp4 ];

     

       18
       18
       +
       

     

       19
       19
       +
         patchPhase = ''

     

       20
       20
       +
           patch myocamlbuild.ml <<EOF

     

       21
       21
       +
       70,74c70

     

       22
       22
       +
       <         let camlp4of =

     

       23
       23
       +
       <           try

     

       24
       24
       +
       <             let path_bin = Filename.concat (Sys.getenv "PATH_OCAML_PREFIX") "bin" in

     

       25
       25
       +
       <             Filename.concat path_bin "camlp4of"

     

       26
       26
       +
       <           with _ -> "camlp4of" in

     

       27
       27
       +
       ---

     

       28
       28
       +
       >         let camlp4of = "camlp4of" in

     

       29
       29
       +
       EOF

     

       30
       30
       +
         '';

     

       18
       31
        
       

     

       19
       32
        
         # The custom `configure` script does not expect the --prefix

     

       20
       33
        
         # option. Installation is handled by ocamlfind.

+24

pkgs/development/ocaml-modules/eliom/camlp4.patch

···

       1
       1
       +
       --- a/src/_tags	2014-10-01 16:19:35.000000000 +0100

     

       2
       2
       +
       +++ b/src/_tags	2014-11-09 16:55:34.470663377 +0000

     

       3
       3
       +
       @@ -39,7 +39,7 @@

     

       4
       4
       +
        <lib/server/monitor/*.ml{,i}>:I(src/lib/server)

     

       5
       5
       +
        

     

       6
       6
       +
        <syntax/pa_*.ml{,i}>: syntax(camlp4o),package(camlp4.quotations.o,camlp4.extend)

     

       7
       7
       +
       -<syntax/pa_*.ml{,i}>: I(+camlp4/Camlp4Parsers)

     

       8
       8
       +
       +<syntax/pa_*.ml{,i}>: use_camlp4_full

     

       9
       9
       +
        

     

       10
       10
       +
        

     

       11
       11
       +
        <ocamlbuild/ocamlbuild_eliom.ml{,i}>: package(ocamlbuild,js_of_ocaml.ocamlbuild)

     

       12
       12
       +
       

     

       13
       13
       +
       --- a/src/lib/eliom_registration.server.ml	2014-10-01 16:19:35.000000000 +0100

     

       14
       14
       +
       +++ b/src/lib/eliom_registration.server.ml	2014-11-09 17:26:16.093198699 +0000

     

       15
       15
       +
       @@ -2440,7 +2440,7 @@

     

       16
       16
       +
              (Ocaml.register_post_coservice'

     

       17
       17
       +
                 ?scope ?options ?charset ?code ?content_type ?headers ?secure_session ?name

     

       18
       18
       +
                 ?csrf_safe ?csrf_scope ?csrf_secure ?max_use ?timeout ?https ?error_handler

     

       19
       19
       +
       -         ~post_params:Eliom_parameter.(ocaml "argument" argument_type)

     

       20
       20
       +
       +         ~post_params:(Eliom_parameter.ocaml "argument" argument_type)

     

       21
       21
       +
                 (fun () argument -> f argument))

     

       22
       22
       +
              (Eliom_wrap.create_unwrapper

     

       23
       23
       +
                 (Eliom_wrap.id_of_int Eliom_common_base.server_function_unwrap_id_int))

     

       24
       24
       +

+2

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

···

       14
       14
        
           sha256 = "10v7mrq3zsbxdlg8k8xif777mbvcdpabvnd1g7p2yqivr7f1qm24";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       +
         patches = [ ./camlp4.patch ];

     

       18
       18
       +
       

     

       17
       19
        
         buildInputs = [ocaml which ocsigen_server findlib ocsigen_deriving

     

       18
       20
        
                        js_of_ocaml ocaml_optcomp opam];

     

       19
       21

+2 -2

pkgs/development/ocaml-modules/lablgtk/2.14.0.nix

···

       1
       1
       -
       {stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk, libgnomecanvas, libglade, gtksourceview}:

     

       1
       1
       +
       { stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk, libgnomecanvas, libglade, gtksourceview, camlp4 }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         ocaml_version = (builtins.parseDrvName ocaml.name).version;

     
···

       14
       14
        
           sha256 = "1fnh0amm7lwgyjdhmlqgsp62gwlar1140425yc1j6inwmgnsp0a9";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       -
         buildInputs = [ocaml findlib pkgconfig gtk libgnomecanvas libglade gtksourceview];

     

       17
       17
       +
         buildInputs = [ ocaml findlib pkgconfig gtk libgnomecanvas libglade gtksourceview camlp4 ];

     

       18
       18
        
       

     

       19
       19
        
         configureFlags = "--with-libdir=$(out)/lib/ocaml/${ocaml_version}/site-lib";

     

       20
       20
        
         buildFlags = "world";

+2 -2

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

···

       1
       1
       -
       {stdenv, fetchurl, ocaml, findlib, mysql}:

     

       1
       1
       +
       { stdenv, fetchurl, ocaml, findlib, mysql, camlp4 }:

     

       2
       2
        
       

     

       3
       3
        
       # TODO: la versione stabile da' un errore di compilazione dovuto a

     

       4
       4
        
       # qualche cambiamento negli header .h

     
···

       23
       23
        
            "--libdir=$out/lib/ocaml/${ocaml_version}/site-lib/mysql"

     

       24
       24
        
         ];

     

       25
       25
        
       

     

       26
       26
       -
         buildInputs = [ocaml findlib mysql.lib ];

     

       26
       26
       +
         buildInputs = [ocaml findlib mysql.lib camlp4 ];

     

       27
       27
        
       

     

       28
       28
        
         createFindlibDestdir = true;

     

       29
       29

+3 -2

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

···

       1
       1
       -
       {stdenv, fetchurl, ocaml, findlib }:

     

       1
       1
       +
       { stdenv, fetchurl, ocaml, findlib, camlp4 }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         ocaml_version = (builtins.parseDrvName ocaml.name).version;

     
···

       17
       17
        
       

     

       18
       18
        
         createFindlibDestdir = true;

     

       19
       19
        
       

     

       20
       20
       -
         buildInputs = [ocaml findlib];

     

       20
       20
       +
         buildInputs = [ ocaml findlib ];

     

       21
       21
       +
         propagatedBuildInputs = [ camlp4 ];

     

       21
       22
        
       

     

       22
       23
        
         buildFlags = "all all.opt";

     

       23
       24

+2 -2

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

···

       1
       1
        
       { fetchurl, stdenv, makeWrapper, perl, openssh, rsync }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "autobuild-3.5";

     

       4
       4
       +
         name = "autobuild-5.3";

     

       5
       5
        
       

     

       6
       6
        
         src = fetchurl {

     

       7
       7
        
           url = "http://savannah.spinellicreations.com/autobuild/${name}.tar.gz";

     

       8
       8
       -
           sha256 = "0ik13913x1yj8lsaf65chpiw13brl3q6kx7s1fa41a7s2krl1xvi";

     

       8
       8
       +
           sha256 = "0gv7g61ja9q9zg1m30k4snqwwy1kq7b4df6sb7d2qra7kbdq8af1";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
        
         buildInputs = [ makeWrapper perl openssh rsync ];

+2 -2

pkgs/development/tools/ocaml/js_of_ocaml/default.nix

···

       9
       9
        
           };

     

       10
       10
        
         

     

       11
       11
        
         buildInputs = [ocaml findlib menhir ocsigen_deriving

     

       12
       12
       -
                        cmdliner tyxml camlp4 reactivedata];

     

       13
       13
       -
         propagatedBuildInputs = [ ocaml_lwt ];

     

       12
       12
       +
                        cmdliner tyxml reactivedata];

     

       13
       13
       +
         propagatedBuildInputs = [ ocaml_lwt camlp4 ];

     

       14
       14
        
       

     

       15
       15
        
         patches = [ ./Makefile.conf.diff ];  

     

       16
       16

+45 -48

pkgs/misc/vim-plugins/default.nix

···

       81
       81
        
         watchdogs           = vim-watchdogs;

     

       82
       82
        
         webapi-vim          = WebAPI;

     

       83
       83
        
         yankring            = YankRing;

     

       84
       84
       -
         

     

       85
       84
        
       

     

       86
       85
        
         Gist = buildVimPluginFrom2Nix { # created by nix#NixDerivation

     

       87
       87
       -
           name = "Gist-2015-06-09";

     

       86
       86
       +
           name = "Gist-2015-06-24";

     

       88
       87
        
           src = fetchgit {

     

       89
       88
        
             url = "git://github.com/mattn/gist-vim";

     

       90
       90
       -
             rev = "c39e5e317d88da71da338c07af492c7a27efcf0a";

     

       91
       91
       -
             sha256 = "97fa171cf239b54ee4ab102dd9f87810744bfa3edd34fe04d4dd8a879b22d5b4";

     

       89
       89
       +
             rev = "297c4b90511b6daf7b35c219652a56ac2f0209ee";

     

       90
       90
       +
             sha256 = "f7da15fd5c4dbd0e7fb5a66b7212f11db1f05ccbe53ccc06c9d3b1d4bd205923";

     

       92
       91
        
           };

     

       93
       92
        
           dependencies = [];

     

       94
       93
        
       

     
···

       139
       138
        
         };

     

       140
       139
        
       

     

       141
       140
        
         Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation

     

       142
       142
       -
           name = "Syntastic-2015-06-12";

     

       141
       141
       +
           name = "Syntastic-2015-06-26";

     

       143
       142
        
           src = fetchgit {

     

       144
       143
        
             url = "git://github.com/scrooloose/syntastic";

     

       145
       145
       -
             rev = "b8682c3029de5913e0a63a45e5f4d6f3b5e4920e";

     

       146
       146
       -
             sha256 = "6ec2a6a3b4b3998612d21fcdccdb82799f8cf4022d6bc38e16f85ece8692d3a3";

     

       144
       144
       +
             rev = "8e672780e76c0a774b7fe834eed9652ccd684c24";

     

       145
       145
       +
             sha256 = "10b113c456387ebe2b08f81f6464408382a525d9b37e4e6b3fd54808dd25c1a4";

     

       147
       146
        
           };

     

       148
       147
        
           dependencies = [];

     

       149
       148
        
       

     
···

       161
       160
        
         };

     

       162
       161
        
       

     

       163
       162
        
         Tagbar = buildVimPluginFrom2Nix { # created by nix#NixDerivation

     

       164
       164
       -
           name = "Tagbar-2015-05-10";

     

       163
       163
       +
           name = "Tagbar-2015-06-19";

     

       165
       164
        
           src = fetchgit {

     

       166
       165
        
             url = "git://github.com/majutsushi/tagbar";

     

       167
       167
       -
             rev = "399b75256ac7333d7119d11047f6b3aff8fa2828";

     

       168
       168
       -
             sha256 = "8562fac0f2d690537b4c1049ba67b440116135167b48b9feb21655c9931b875c";

     

       166
       166
       +
             rev = "7b36c46d17d57db34fdb0adac9ba6382d0bb5e66";

     

       167
       167
       +
             sha256 = "346773e772772d1c68318effd8e6c8c8b36f61cfd9c72a85c0bfcec9843f13c7";

     

       169
       168
        
           };

     

       170
       169
        
           dependencies = [];

     

       171
       170
        
       

     
···

       183
       182
        
         };

     

       184
       183
        
       

     

       185
       184
        
         The_NERD_tree = buildVimPluginFrom2Nix { # created by nix#NixDerivation

     

       186
       186
       -
           name = "The_NERD_tree-2015-05-13";

     

       185
       185
       +
           name = "The_NERD_tree-2015-06-17";

     

       187
       186
        
           src = fetchgit {

     

       188
       187
        
             url = "git://github.com/scrooloose/nerdtree";

     

       189
       189
       -
             rev = "af85499edace2acca27ce41790ac333f62b689bb";

     

       190
       190
       -
             sha256 = "12f68eb374ccc8cbfcf88b85cf44a4a18856be4e30a50850b8f3d0b186207f0c";

     

       188
       188
       +
             rev = "96c07746b46c12d0aca7a5276cc5bd0a260b82fe";

     

       189
       189
       +
             sha256 = "0a3854121674fed598b21154f749a5eadd590a2e5632dd6fc8a9307bdb4cf4d8";

     

       191
       190
        
           };

     

       192
       191
        
           dependencies = [];

     

       193
       192
        
       

     
···

       364
       363
        
         };

     

       365
       364
        
       

     

       366
       365
        
         idris-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation

     

       367
       367
       -
           name = "idris-vim-2014-12-29";

     

       366
       366
       +
           name = "idris-vim-2015-06-23";

     

       368
       367
        
           src = fetchgit {

     

       369
       368
        
             url = "git://github.com/idris-hackers/idris-vim";

     

       370
       370
       -
             rev = "6bdb44b85406b75e3b3a4fa265deab1dbe8c6ff1";

     

       371
       371
       -
             sha256 = "87677f3aa81f15dbaf4337f709952fd47c9fa28e8086033f2cfbd5b1f256e5ff";

     

       369
       369
       +
             rev = "4c1723c34a434aad2455c7c2f2a30d97ed691191";

     

       370
       370
       +
             sha256 = "db09ad5a7c75d9ac2ccb1be2b85d6ed9cd507ec0fc736e994d8d315c5916170d";

     

       372
       371
        
           };

     

       373
       372
        
           dependencies = [];

     

       374
       373
        
       

     
···

       397
       396
        
         };

     

       398
       397
        
       

     

       399
       398
        
         vim-ipython = buildVimPluginFrom2Nix { # created by nix#NixDerivation

     

       400
       400
       -
           name = "vim-ipython-2015-05-30";

     

       399
       399
       +
           name = "vim-ipython-2015-06-23";

     

       401
       400
        
           src = fetchgit {

     

       402
       401
        
             url = "git://github.com/ivanov/vim-ipython";

     

       403
       403
       -
             rev = "5876b483902313143adc2dcdfd8de94036e191a6";

     

       404
       404
       -
             sha256 = "6c0f3011dca269d8c862abb5477bcdbe3ec2fbe4fc6cebeb38e7f0816cedaae5";

     

       402
       402
       +
             rev = "42499f094b805b90b683afa5009cee99abd0bb75";

     

       403
       403
       +
             sha256 = "7f59c3edde4c2b8555d703c96e855ca36665aacdca5a30d1e9e21c31bc252f2d";

     

       405
       404
        
           };

     

       406
       405
        
           dependencies = [];

     

       407
       406
        
       

     
···

       507
       506
        
         };

     

       508
       507
        
       

     

       509
       508
        
         vim-easymotion = buildVimPluginFrom2Nix { # created by nix#NixDerivation

     

       510
       510
       -
           name = "vim-easymotion-2015-04-21";

     

       509
       509
       +
           name = "vim-easymotion-2015-06-22";

     

       511
       510
        
           src = fetchgit {

     

       512
       511
        
             url = "git://github.com/lokaltog/vim-easymotion";

     

       513
       513
       -
             rev = "9f1c449edfce6d61c7f620e3a9c1389b7b7e334f";

     

       514
       514
       -
             sha256 = "ba358f3acc120d9cf1854205bde0fa345d156e7f69a1854987e74bb137889c54";

     

       512
       512
       +
             rev = "ef0cb2b0a0feee865e70c42fdaf03a4f8e621f38";

     

       513
       513
       +
             sha256 = "13f0d18f0c822dc7ba99f2365539de1e2c63817b89a6d0d2e9c2e8689ee85cb7";

     

       515
       514
        
           };

     

       516
       515
        
           dependencies = [];

     

       517
       516
        
       

     
···

       566
       565
        
         };

     

       567
       566
        
       

     

       568
       567
        
         racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation

     

       569
       569
       -
           name = "racer-2015-06-15";

     

       568
       568
       +
           name = "racer-2015-06-24";

     

       570
       569
        
           src = fetchgit {

     

       571
       570
        
             url = "git://github.com/phildawes/racer";

     

       572
       572
       -
             rev = "dd0671b8d6e66e3e503bd7049561fb08e7815ed3";

     

       573
       573
       -
             sha256 = "ec996e7cbf46aec545b70781108f4290dacecd02b599a0d13b8b0cf431205403";

     

       571
       571
       +
             rev = "8f9d14b381a1624389df78ed8d3a38bc1c85d0f4";

     

       572
       572
       +
             sha256 = "34db058ca1d5dd979db1208b5f90716145eb416c931445213a8dfac3d8b0bcdb";

     

       574
       573
        
           };

     

       575
       574
        
           dependencies = [];

     

       576
       575
        
           buildPhase = ''

     
···

       580
       579
        
         };

     

       581
       580
        
       

     

       582
       581
        
         neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation

     

       583
       583
       -
           name = "neocomplete-vim-2015-06-15";

     

       582
       582
       +
           name = "neocomplete-vim-2015-06-23";

     

       584
       583
        
           src = fetchgit {

     

       585
       584
        
             url = "git://github.com/shougo/neocomplete.vim";

     

       586
       586
       -
             rev = "15c6a63ca8807493df273c77be0754f44d68d30b";

     

       587
       587
       -
             sha256 = "1a2a30da610e5f252bbe43717cf2cad76b8b09916c2082541fc3bb456b9b97a9";

     

       585
       585
       +
             rev = "72bf34c349078ae0e4691f7e00dd2a7ab5714a69";

     

       586
       586
       +
             sha256 = "72dff487613de3e18c561b45658ec2eda66a686e1d73159c03bee1313d6d74ff";

     

       588
       587
        
           };

     

       589
       588
        
           dependencies = [];

     

       590
       589
        
       

     

       591
       590
        
         };

     

       592
       591
        
       

     

       593
       592
        
         neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation

     

       594
       594
       -
           name = "neosnippet-snippets-2015-06-11";

     

       593
       593
       +
           name = "neosnippet-snippets-2015-06-26";

     

       595
       594
        
           src = fetchgit {

     

       596
       595
        
             url = "git://github.com/shougo/neosnippet-snippets";

     

       597
       597
       -
             rev = "522c38e28949ae53af8c96d7bcbda192b92e3656";

     

       598
       598
       -
             sha256 = "ff0c09fb5a70e011cb7570951a67ef0253f544b3f61c8e7741d65d27b4d418c1";

     

       596
       596
       +
             rev = "81c7c9840352126d1fa3748c014d00188b5a1afa";

     

       597
       597
       +
             sha256 = "977ef9fd855a03ba16c01b990bfd4121eb3a4516e7446bcb8806c41490515ec3";

     

       599
       598
        
           };

     

       600
       599
        
           dependencies = [];

     

       601
       600
        
       

     

       602
       601
        
         };

     

       603
       602
        
       

     

       604
       603
        
         neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation

     

       605
       605
       -
           name = "neosnippet-vim-2015-06-13";

     

       604
       604
       +
           name = "neosnippet-vim-2015-06-23";

     

       606
       605
        
           src = fetchgit {

     

       607
       606
        
             url = "git://github.com/shougo/neosnippet.vim";

     

       608
       608
       -
             rev = "3cfe8368cfccffdeab660ca1019696e0fd1aa944";

     

       609
       609
       -
             sha256 = "049555be6a2aedee7fffc583d43c0cbe3aecc2f0efcf6cfab826e30b2e83f2fd";

     

       607
       607
       +
             rev = "f1980468b0a397d36318a409d3677bc13d307392";

     

       608
       608
       +
             sha256 = "b28bf490a809e4dee474480436e0aa1c64612e4788c4f9a0afe856cf2432cfaf";

     

       610
       609
        
           };

     

       611
       610
        
           dependencies = [];

     

       612
       611
        
       

     
···

       629
       628
        
         };

     

       630
       629
        
       

     

       631
       630
        
         vimshell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation

     

       632
       632
       -
           name = "vimshell-vim-2015-05-01";

     

       631
       631
       +
           name = "vimshell-vim-2015-06-21";

     

       633
       632
        
           src = fetchgit {

     

       634
       633
        
             url = "git://github.com/shougo/vimshell.vim";

     

       635
       635
       -
             rev = "4939e10609c434becf6423b2f3876bb9c2be3464";

     

       636
       636
       -
             sha256 = "72bc6ca7b8ebcdf1d4617c73fc2688486f71a9f8b8601627fbbada3a4cfb28ca";

     

       634
       634
       +
             rev = "ce5ce77133dd16bd33a57b0776de0cbaead45722";

     

       635
       635
       +
             sha256 = "7c44556f28a06083ba9485af74fcc2e510e3e1830cfce6670c899329c2c85012";

     

       637
       636
        
           };

     

       638
       637
        
           dependencies = [ "vimproc-vim" ];

     

       639
       638
        
         };

     
···

       683
       682
        
         };

     

       684
       683
        
       

     

       685
       684
        
         youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation

     

       686
       686
       -
           name = "youcompleteme-2015-06-12";

     

       685
       685
       +
           name = "youcompleteme-2015-06-23";

     

       687
       686
        
           src = fetchgit {

     

       688
       687
        
             url = "git://github.com/valloric/youcompleteme";

     

       689
       689
       -
             rev = "d77ef96ebcca90381f38604d7fb2e90da91bd503";

     

       690
       690
       -
             sha256 = "7a794986eebd8fa952be3dc903588d124dd14377a07bff1b877279c3b7d498f9";

     

       688
       688
       +
             rev = "66dcc9581c7d237f4d839389bee055df6788fbc9";

     

       689
       689
       +
             sha256 = "91971f0640d462622a31ea64c5c41df7649a6c6e6e4d93220554a7d910a11fdf";

     

       691
       690
        
           };

     

       692
       691
        
           dependencies = [];

     

       693
       692
        
           buildInputs = [

     
···

       773
       772
        
         };

     

       774
       773
        
       

     

       775
       774
        
         vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation

     

       776
       776
       -
           name = "vim-wakatime-2015-06-11";

     

       775
       775
       +
           name = "vim-wakatime-2015-06-23";

     

       777
       776
        
           src = fetchgit {

     

       778
       777
        
             url = "git://github.com/wakatime/vim-wakatime";

     

       779
       779
       -
             rev = "b2dcc7ccc2247274fe63168952de5db595a01e1c";

     

       780
       780
       -
             sha256 = "883f92fcd45a824009e613d8a527effd1eac8bef0fe4299c0df366376afb6273";

     

       778
       778
       +
             rev = "2ee2b4ea56ae1b56ce77a1b9e5d2c51fc6768842";

     

       779
       779
       +
             sha256 = "440b6027921fce801255eedd29d24b43975038e78dfe465a381ae76e443480c2";

     

       781
       780
        
           };

     

       782
       781
        
           dependencies = [];

     

       783
       782
        
           buildInputs = [ python ];

     
···

       1174
       1173
        
         };

     

       1175
       1174
        
       

     

       1176
       1175
        
         vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation

     

       1177
       1177
       -
           name = "vim-airline-2015-06-09";

     

       1176
       1176
       +
           name = "vim-airline-2015-06-26";

     

       1178
       1177
        
           src = fetchgit {

     

       1179
       1178
        
             url = "git://github.com/bling/vim-airline";

     

       1180
       1180
       -
             rev = "b29e01fa22ee8b8eb02cf505382a90b045b4bc64";

     

       1181
       1181
       -
             sha256 = "e943dd5900d4d49a6f7dd02434b394167a3802d68d17072fc767552a9fd16001";

     

       1179
       1179
       +
             rev = "9afda181dddd0a0ae34aa10e7faad4a66e94676b";

     

       1180
       1180
       +
             sha256 = "1e3b540353b4e047de7c26d8e02de5e68c02a5a1fccc946faa494bcad44bc6b1";

     

       1182
       1181
        
           };

     

       1183
       1182
        
           dependencies = [];

     

       1184
       1183
        
       

     
···

       1306
       1305
        
           meta = {

     

       1307
       1306
        
              url = "http://www.vim.org/scripts/script.php?script_id=2465";

     

       1308
       1307
        
           };

     

       1309
       1309
       -
       

     

       1310
       1310
       -
       

     

       1311
       1308
        
         };

     

       1312
       1309
        
       

     

       1313
       1310
        
       }

+1 -1

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

···

       396
       396
        
           KVM_CLOCK? y

     

       397
       397
        
         ''}

     

       398
       398
        
         ${optionalString (versionAtLeast version "4.0") ''

     

       399
       399
       -
           KVM_COMPAT y

     

       399
       399
       +
           KVM_COMPAT? y

     

       400
       400
        
         ''}

     

       401
       401
        
         ${optionalString (versionAtLeast version "3.10") ''

     

       402
       402
        
           KVM_DEVICE_ASSIGNMENT? y

+3 -1

pkgs/servers/nosql/cassandra/2.0.nix

···

       6
       6
        
       , gawk

     

       7
       7
        
       , bash

     

       8
       8
        
       , getopt

     

       9
       9
       +
       , procps

     

       9
       10
        
       }:

     

       10
       11
        
       

     

       11
       12
        
       let

     
···

       34
       35
        
               --set JAVA_HOME ${jre} \

     

       35
       36
        
               --prefix PATH : ${bash}/bin \

     

       36
       37
        
               --prefix PATH : ${getopt}/bin \

     

       37
       37
       -
               --prefix PATH : ${gawk}/bin

     

       38
       38
       +
               --prefix PATH : ${gawk}/bin \

     

       39
       39
       +
               --prefix PATH : ${procps}/bin

     

       38
       40
        
           done

     

       39
       41
        
       

     

       40
       42
        
           wrapProgram $out/bin/cqlsh --prefix PATH : ${python}/bin

+3 -1

pkgs/servers/nosql/cassandra/2.1.nix

···

       6
       6
        
       , gawk

     

       7
       7
        
       , bash

     

       8
       8
        
       , getopt

     

       9
       9
       +
       , procps

     

       9
       10
        
       }:

     

       10
       11
        
       

     

       11
       12
        
       let

     
···

       34
       35
        
               --set JAVA_HOME ${jre} \

     

       35
       36
        
               --prefix PATH : ${bash}/bin \

     

       36
       37
        
               --prefix PATH : ${getopt}/bin \

     

       37
       37
       -
               --prefix PATH : ${gawk}/bin

     

       38
       38
       +
               --prefix PATH : ${gawk}/bin \

     

       39
       39
       +
               --prefix PATH : ${procps}/bin

     

       38
       40
        
           done

     

       39
       41
        
       

     

       40
       42
        
           wrapProgram $out/bin/cqlsh --prefix PATH : ${python}/bin

+48

pkgs/servers/vault/default.nix

···

       1
       1
       +
       { stdenv, fetchgit, go, gox }:

     

       2
       2
       +
       

     

       3
       3
       +
       let

     

       4
       4
       +
         name = "vault";

     

       5
       5
       +
         version = "0.1.2";

     

       6
       6
       +
         namespace = "github.com/hashicorp/vault";

     

       7
       7
       +
       in

     

       8
       8
       +
       stdenv.mkDerivation rec {

     

       9
       9
       +
         name = "vault-${version}";

     

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

     

       11
       11
       +
       

     

       12
       12
       +
         src = fetchgit {

     

       13
       13
       +
           url = "https://github.com/hashicorp/vault";

     

       14
       14
       +
           sha256 = "a4267105dab56c6d0571f69ea0abc167c5debd3b6c0795b8b69e15a285e12f01";

     

       15
       15
       +
           rev = "refs/tags/${rev}";

     

       16
       16
       +
         };

     

       17
       17
       +
       

     

       18
       18
       +
         buildInputs = [ go gox ];

     

       19
       19
       +
       

     

       20
       20
       +
         buildPhase = ''

     

       21
       21
       +
           mkdir -p "$(dirname Godeps/_workspace/src/${namespace})"

     

       22
       22
       +
           ln -sf $src "Godeps/_workspace/src/${namespace}"

     

       23
       23
       +
           export GOPATH=$PWD/Godeps/_workspace

     

       24
       24
       +
           XC_OS=$(go env GOOS)

     

       25
       25
       +
           XC_ARCH=$(go env GOARCH)

     

       26
       26
       +
           mkdir -p bin/

     

       27
       27
       +
           gox \

     

       28
       28
       +
             -os "$XC_OS" \

     

       29
       29
       +
             -arch "$XC_ARCH" \

     

       30
       30
       +
             -ldflags "-X github.com/hashicorp/vault/cli.GitCommit ${rev}" \

     

       31
       31
       +
             -output $PWD/bin/vault \

     

       32
       32
       +
             -verbose \

     

       33
       33
       +
             .

     

       34
       34
       +
         '';

     

       35
       35
       +
       

     

       36
       36
       +
         installPhase = ''

     

       37
       37
       +
           mkdir -p $out/bin

     

       38
       38
       +
           cp bin/vault $out/bin/vault

     

       39
       39
       +
         '';

     

       40
       40
       +
       

     

       41
       41
       +
         meta = with stdenv.lib; {

     

       42
       42
       +
           homepage = "https://www.vaultproject.io";

     

       43
       43
       +
           description = "A tool for securely accessing secrets";

     

       44
       44
       +
           maintainers = with maintainers; [ avnik ];

     

       45
       45
       +
           license     = licenses.mit ;

     

       46
       46
       +
           platforms   = platforms.all;

     

       47
       47
       +
         };

     

       48
       48
       +
       }

+4 -1

pkgs/tools/misc/file/default.nix

···

       6
       6
        
         buildInputs = [ zlib ];

     

       7
       7
        
       

     

       8
       8
        
         src = fetchurl {

     

       9
       9
       -
           url = "ftp://ftp.astron.com/pub/file/${name}.tar.gz";

     

       9
       9
       +
           urls = [

     

       10
       10
       +
             "ftp://ftp.astron.com/pub/file/${name}.tar.gz"

     

       11
       11
       +
             "http://distfiles.macports.org/file/${name}.tar.gz"

     

       12
       12
       +
           ];

     

       10
       13
        
           sha256 = "0z0mwqayrrf3w734rjp9rysf0y8az191ff7fxjsxyb1y2kzv72ic";

     

       11
       14
        
         };

     

       12
       15

+2

pkgs/tools/misc/stow/default.nix

···

       10
       10
        
       

     

       11
       11
        
         buildInputs = [ perl perlPackages.TestOutput ];

     

       12
       12
        
       

     

       13
       13
       +
         patches = [ ./precedence-issue.patch ];

     

       14
       14
       +
       

     

       13
       15
        
         doCheck = true;

     

       14
       16
        
       

     

       15
       17
        
         meta = {

+15

pkgs/tools/misc/stow/precedence-issue.patch

···

       1
       1
       +
       diff --git a/lib/Stow.pm.in b/lib/Stow.pm.in

     

       2
       2
       +
       index 101a422..f80b1ac 100755

     

       3
       3
       +
       --- a/lib/Stow.pm.in

     

       4
       4
       +
       +++ b/lib/Stow.pm.in

     

       5
       5
       +
       @@ -1732,8 +1732,8 @@ sub read_a_link {

     

       6
       6
       +
            }

     

       7
       7
       +
            elsif (-l $path) {

     

       8
       8
       +
                debug(4, "  read_a_link($path): real link");

     

       9
       9
       +
       -        return readlink $path

     

       10
       10
       +
       -            or error("Could not read link: $path");

     

       11
       11
       +
       +        my $target = readlink $path or error("Could not read link: $path ($!)");

     

       12
       12
       +
       +        return $target;

     

       13
       13
       +
            }

     

       14
       14
       +
            internal_error("read_a_link() passed a non link path: $path\n");

     

       15
       15
       +
        }

+3 -3

pkgs/tools/system/rsyslog/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, libestr, json_c, zlib, pythonPackages

     

       2
       2
       -
       , krb5 ? null, systemd ? null, jemalloc ? null, libmysql ? null, postgresql ? null

     

       2
       2
       +
       , libkrb5 ? null, systemd ? null, jemalloc ? null, libmysql ? null, postgresql ? null

     

       3
       3
        
       , libdbi ? null, net_snmp ? null, libuuid ? null, curl ? null, gnutls ? null

     

       4
       4
        
       , libgcrypt ? null, liblognorm ? null, openssl ? null, librelp ? null

     

       5
       5
        
       , libgt ? null, liblogging ? null, libnet ? null, hadoop ? null, rdkafka ? null

     
···

       20
       20
        
       

     

       21
       21
        
         buildInputs = [

     

       22
       22
        
           pkgconfig libestr json_c zlib pythonPackages.docutils

     

       23
       23
       -
           krb5 jemalloc libmysql postgresql libdbi net_snmp libuuid curl gnutls

     

       23
       23
       +
           libkrb5 jemalloc libmysql postgresql libdbi net_snmp libuuid curl gnutls

     

       24
       24
        
           libgcrypt liblognorm openssl librelp libgt liblogging libnet hadoop rdkafka

     

       25
       25
        
           libmongo-client czmq rabbitmq-c hiredis

     

       26
       26
        
         ] ++ stdenv.lib.optional stdenv.isLinux systemd;

     
···

       31
       31
        
           "--with-systemdsystemunitdir=\${out}/etc/systemd/system"

     

       32
       32
        
           (mkFlag true                      "largefile")

     

       33
       33
        
           (mkFlag true                      "regexp")

     

       34
       34
       -
           (mkFlag (krb5 != null)            "gssapi-krb5")

     

       34
       34
       +
           (mkFlag (libkrb5 != null)         "gssapi-krb5")

     

       35
       35
        
           (mkFlag true                      "klog")

     

       36
       36
        
           (mkFlag true                      "kmsg")

     

       37
       37
        
           (mkFlag (systemd != null)         "imjournal")

+3 -1

pkgs/tools/typesetting/tex/texlive/default.nix

···

       1
       1
        
       args : with args;

     

       2
       2
       +
       

     

       2
       3
        
       rec {

     

       3
       3
       -
         src = fetchurl {

     

       4
       4
       +
         src = assert !config.inHydra or false; fetchurl {

     

       4
       5
        
           url = mirror://debian/pool/main/t/texlive-bin/texlive-bin_2014.20140926.35254.orig.tar.xz;

     

       5
       6
        
           sha256 = "1c39x059jhn5jsy6i9j3akjbkm1kmmzssy1jyi1aw20rl2vp86w3";

     

       6
       7
        
         };

     
···

       147
       148
        
           license     = stdenv.lib.licenses.gpl2;

     

       148
       149
        
           maintainers = with maintainers; [ lovek323 raskin jwiegley ];

     

       149
       150
        
           platforms   = platforms.unix;

     

       151
       151
       +
           hydraPlatforms = [];

     

       150
       152
        
         };

     

       151
       153
        
       }

+49 -28

pkgs/top-level/all-packages.nix

···

       100
       100
        
         # ... pkgs.foo ...").

     

       101
       101
        
         pkgs = applyGlobalOverrides (config.packageOverrides or (pkgs: {}));

     

       102
       102
        
       

     

       103
       103
       +
         mkOverrides = pkgsOrig: overrides: overrides //

     

       104
       104
       +
               (lib.optionalAttrs (pkgsOrig.stdenv ? overrides && crossSystem == null) (pkgsOrig.stdenv.overrides pkgsOrig));

     

       103
       105
        
       

     

       104
       106
        
         # Return the complete set of packages, after applying the overrides

     

       105
       107
        
         # returned by the `overrider' function (see above).  Warning: this

     
···

       110
       112
        
             # in the case of cross-building, or otherwise the basic

     

       111
       113
        
             # overrided packages will not be built with the crossStdenv

     

       112
       114
        
             # adapter.

     

       113
       113
       -
             overrides = overrider pkgsOrig //

     

       114
       114
       -
               (lib.optionalAttrs (pkgsOrig.stdenv ? overrides && crossSystem == null) (pkgsOrig.stdenv.overrides pkgsOrig));

     

       115
       115
       +
             overrides = mkOverrides pkgsOrig (overrider pkgsOrig);

     

       115
       116
        
       

     

       116
       117
        
             # The un-overriden packages, passed to `overrider'.

     

       117
       118
        
             pkgsOrig = pkgsFun pkgs {};

     
···

       142
       143
        
       

     

       143
       144
        
         newScope = extra: lib.callPackageWith (defaultScope // extra);

     

       144
       145
        
       

     

       146
       146
       +
         # Easily override this package set.

     

       147
       147
       +
         # Warning: this function is very expensive and must not be used

     

       148
       148
       +
         # from within the nixpkgs repository.

     

       149
       149
       +
         #

     

       150
       150
       +
         # Example:

     

       151
       151
       +
         #  pkgs.overridePackages (self: super: {

     

       152
       152
       +
         #    foo = super.foo.override { ... };

     

       153
       153
       +
         #  }

     

       154
       154
       +
         #

     

       155
       155
       +
         # The result is `pkgs' where all the derivations depending on `foo'

     

       156
       156
       +
         # will use the new version.

     

       157
       157
       +
         overridePackages = f:

     

       158
       158
       +
           let

     

       159
       159
       +
             newpkgs = pkgsFun newpkgs overrides;

     

       160
       160
       +
             overrides = mkOverrides pkgs (f newpkgs pkgs);

     

       161
       161
       +
           in newpkgs;

     

       145
       162
        
       

     

       146
       163
        
         # Override system. This is useful to build i686 packages on x86_64-linux.

     

       147
       164
        
         forceSystem = system: kernel: (import ./all-packages.nix) {

     
···

       890
       907
        
         };

     

       891
       908
        
       

     

       892
       909
        
         rsyslog-light = callPackage ../tools/system/rsyslog {

     

       893
       893
       -
           krb5 = null;

     

       910
       910
       +
           libkrb5 = null;

     

       894
       911
        
           systemd = null;

     

       895
       912
        
           jemalloc = null;

     

       896
       913
        
           libmysql = null;

     
···

       4339
       4356
        
       

     

       4340
       4357
        
           mezzo = callPackage ../development/compilers/mezzo { };

     

       4341
       4358
        
       

     

       4342
       4342
       -
           mldonkey = callPackage ../applications/networking/p2p/mldonkey { };

     

       4343
       4343
       -
       

     

       4344
       4359
        
           mlgmp =  callPackage ../development/ocaml-modules/mlgmp { };

     

       4345
       4360
        
       

     

       4346
       4361
        
           ocaml_batteries = callPackage ../development/ocaml-modules/batteries { };

     
···

       4719
       4734
        
         erlangR17_odbc = callPackage ../development/interpreters/erlang/R17.nix { odbcSupport = true; };

     

       4720
       4735
        
         erlangR17_javac = callPackage ../development/interpreters/erlang/R17.nix { javacSupport = true; };

     

       4721
       4736
        
         erlangR17_odbc_javac = callPackage ../development/interpreters/erlang/R17.nix { javacSupport = true; odbcSupport = true; };

     

       4722
       4722
       -
         erlang = erlangR17;

     

       4723
       4723
       -
         erlang_odbc = erlangR17_odbc;

     

       4724
       4724
       -
         erlang_javac = erlangR17_javac;

     

       4725
       4725
       -
         erlang_odbc_javac = erlangR17_odbc_javac;

     

       4737
       4737
       +
         erlangR18 = callPackage ../development/interpreters/erlang/R18.nix { };

     

       4738
       4738
       +
         erlangR18_odbc = callPackage ../development/interpreters/erlang/R18.nix { odbcSupport = true; };

     

       4739
       4739
       +
         erlangR18_javac = callPackage ../development/interpreters/erlang/R18.nix { javacSupport = true; };

     

       4740
       4740
       +
         erlangR18_odbc_javac = callPackage ../development/interpreters/erlang/R18.nix { javacSupport = true; odbcSupport = true; };

     

       4741
       4741
       +
         erlang = erlangR18;

     

       4742
       4742
       +
         erlang_odbc = erlangR18_odbc;

     

       4743
       4743
       +
         erlang_javac = erlangR18_javac;

     

       4744
       4744
       +
         erlang_odbc_javac = erlangR18_odbc_javac;

     

       4726
       4745
        
       

     

       4727
       4746
        
         rebar = callPackage ../development/tools/build-managers/rebar { };

     

       4728
       4747
        
       

     
···

       6368
       6387
        
       

     

       6369
       6388
        
         # TODO : Add MIT Kerberos and let admin choose.

     

       6370
       6389
        
         # TODO : Fix kerberos on Darwin

     

       6371
       6371
       -
         kerberos = if stdenv.isDarwin then null else heimdal;

     

       6390
       6390
       +
         kerberos = if stdenv.isDarwin then null else libheimdal;

     

       6372
       6391
        
       

     

       6373
       6392
        
         heimdal = callPackage ../development/libraries/kerberos/heimdal.nix {

     

       6374
       6393
        
           openldap = openldap.override {

     
···

       6376
       6395
        
           };

     

       6377
       6396
        
           cyrus_sasl = cyrus_sasl.override { kerberos = null; };

     

       6378
       6397
        
         };

     

       6398
       6398
       +
         libheimdal = heimdal;

     

       6379
       6399
        
       

     

       6380
       6400
        
         harfbuzz = callPackage ../development/libraries/harfbuzz { };

     

       6381
       6401
        
         harfbuzz-icu = callPackage ../development/libraries/harfbuzz {

     
···

       6512
       6532
        
           };

     

       6513
       6533
        
           inherit (darwin) bootstrap_cmds;

     

       6514
       6534
        
         };

     

       6535
       6535
       +
         libkrb5 = krb5;

     

       6515
       6536
        
       

     

       6516
       6537
        
         LASzip = callPackage ../development/libraries/LASzip { };

     

       6517
       6538
        
       

     
···

       7166
       7187
        
       

     

       7167
       7188
        
         libtoxcore = callPackage ../development/libraries/libtoxcore { };

     

       7168
       7189
        
       

     

       7169
       7169
       -
         libtsm = callPackage ../development/libraries/libtsm { };

     

       7190
       7190
       +
         libtsm = callPackage ../development/libraries/libtsm {

     

       7191
       7191
       +
           automake = automake114x;

     

       7192
       7192
       +
         };

     

       7170
       7193
        
       

     

       7171
       7194
        
         libtunepimp = callPackage ../development/libraries/libtunepimp { };

     

       7172
       7195
        
       

     
···

       8610
       8633
        
         ### SERVERS

     

       8611
       8634
        
       

     

       8612
       8635
        
         "389-ds-base" = callPackage ../servers/ldap/389 {

     

       8613
       8613
       -
           kerberos = krb5;

     

       8636
       8636
       +
           kerberos = libkrb5;

     

       8614
       8637
        
         };

     

       8615
       8638
        
       

     

       8616
       8639
        
         rdf4store = callPackage ../servers/http/4store { };

     
···

       9016
       9039
        
       

     

       9017
       9040
        
         samba4 = callPackage ../servers/samba/4.x.nix {

     

       9018
       9041
        
           python = python2;

     

       9019
       9019
       -
           kerberos = heimdal;

     

       9042
       9042
       +
           kerberos = null;  # Bundle kerberos because samba uses internal, non-stable functions

     

       9020
       9043
        
           gnutls = gnutls33;

     

       9021
       9044
        
           # enableLDAP

     

       9022
       9045
        
         };

     
···

       9133
       9156
        
       

     

       9134
       9157
        
         xwayland = with xorg; callPackage ../servers/x11/xorg/xwayland.nix { };

     

       9135
       9158
        
       

     

       9136
       9136
       -
         yaws = callPackage ../servers/http/yaws { };

     

       9159
       9159
       +
         yaws = callPackage ../servers/http/yaws { erlang = erlangR17; };

     

       9137
       9160
        
       

     

       9138
       9161
        
         zabbix = recurseIntoAttrs (import ../servers/monitoring/zabbix {

     

       9139
       9162
        
           inherit fetchurl stdenv pkgconfig postgresql curl openssl zlib;

     
···

       10705
       10728
        
         codeblocks = callPackage ../applications/editors/codeblocks { };

     

       10706
       10729
        
         codeblocksFull = callPackage ../applications/editors/codeblocks { contribPlugins = true; };

     

       10707
       10730
        
       

     

       10708
       10708
       -
         codeville = builderDefsPackage (import ../applications/version-management/codeville/0.8.0.nix) {

     

       10709
       10709
       -
           inherit makeWrapper;

     

       10710
       10710
       -
           python = pythonFull;

     

       10711
       10711
       -
         };

     

       10712
       10712
       -
       

     

       10713
       10731
        
         comical = callPackage ../applications/graphics/comical { };

     

       10714
       10732
        
       

     

       10715
       10733
        
         conkeror = callPackage ../applications/networking/browsers/conkeror { };

     
···

       11820
       11838
        
         };

     

       11821
       11839
        
       

     

       11822
       11840
        
         mjpg-streamer = callPackage ../applications/video/mjpg-streamer { };

     

       11841
       11841
       +
       

     

       11842
       11842
       +
         mldonkey = callPackage ../applications/networking/p2p/mldonkey { };

     

       11823
       11843
        
       

     

       11824
       11844
        
         mmex = callPackage ../applications/office/mmex { };

     

       11825
       11845
        
       

     
···

       12034
       12054
        
           inherit (gnome) libglade;

     

       12035
       12055
        
         };

     

       12036
       12056
        
       

     

       12037
       12037
       -
         obs-studio = callPackage ../applications/video/obs-studio { };

     

       12057
       12057
       +
         obs-studio = callPackage ../applications/video/obs-studio {

     

       12058
       12058
       +
           pulseaudioSupport = config.pulseaudio or false;

     

       12059
       12059
       +
         };

     

       12038
       12060
        
       

     

       12039
       12061
        
         ocrad = callPackage ../applications/graphics/ocrad { };

     

       12040
       12062
        
       

     
···

       12210
       12232
        
         qsynth = callPackage ../applications/audio/qsynth { };

     

       12211
       12233
        
       

     

       12212
       12234
        
         qtox = callPackage ../applications/networking/instant-messengers/qtox { };

     

       12235
       12235
       +
       

     

       12236
       12236
       +
         qtpass = callPackage ../applications/misc/qtpass { };

     

       12213
       12237
        
       

     

       12214
       12238
        
         qtpfsgui = callPackage ../applications/graphics/qtpfsgui { };

     

       12215
       12239
        
       

     
···

       14042
       14066
        
         };

     

       14043
       14067
        
       

     

       14044
       14068
        
         coq_8_3 = callPackage ../applications/science/logic/coq/8.3.nix {

     

       14069
       14069
       +
           make = gnumake3;

     

       14045
       14070
        
           inherit (ocamlPackages_3_12_1) ocaml findlib;

     

       14046
       14071
        
           camlp5 = ocamlPackages_3_12_1.camlp5_transitional;

     

       14047
       14072
        
           lablgtk = ocamlPackages_3_12_1.lablgtk_2_14;

     
···

       14111
       14136
        
       

     

       14112
       14137
        
         ekrhyper = callPackage ../applications/science/logic/ekrhyper {};

     

       14113
       14138
        
       

     

       14114
       14114
       -
         eprover = callPackage ../applications/science/logic/eprover {

     

       14115
       14115
       -
           texLive = texLiveAggregationFun {

     

       14116
       14116
       -
             paths = [

     

       14117
       14117
       -
               texLive texLiveExtra

     

       14118
       14118
       -
             ];

     

       14119
       14119
       -
           };

     

       14120
       14120
       -
         };

     

       14139
       14139
       +
         eprover = callPackage ../applications/science/logic/eprover { };

     

       14121
       14140
        
       

     

       14122
       14141
        
         gappa = callPackage ../applications/science/logic/gappa { };

     

       14123
       14142
        
       

     
···

       14655
       14674
        
           inherit builderDefs zlib bzip2 ncurses libpng ed lesstif ruby potrace

     

       14656
       14675
        
             gd t1lib freetype icu perl expat curl xz pkgconfig zziplib texinfo

     

       14657
       14676
        
             libjpeg bison python fontconfig flex poppler libpaper graphite2

     

       14658
       14658
       -
             makeWrapper gmp mpfr xpdf;

     

       14677
       14677
       +
             makeWrapper gmp mpfr xpdf config;

     

       14659
       14678
        
           inherit (xlibs) libXaw libX11 xproto libXt libXpm

     

       14660
       14679
        
             libXmu libXext xextproto libSM libICE;

     

       14661
       14680
        
           ghostscript = ghostscriptX;

     
···

       14727
       14746
        
         tvheadend = callPackage ../servers/tvheadend { };

     

       14728
       14747
        
       

     

       14729
       14748
        
         utf8proc = callPackage ../development/libraries/utf8proc { };

     

       14749
       14749
       +
       

     

       14750
       14750
       +
         vault = callPackage ../servers/vault {};

     

       14730
       14751
        
       

     

       14731
       14752
        
         vbam = callPackage ../misc/emulators/vbam {

     

       14732
       14753
        
           inherit (xlibs) libpthreadstubs;

+28

pkgs/top-level/python-packages.nix

···

       6502
       6502
        
           };

     

       6503
       6503
        
         };

     

       6504
       6504
        
       

     

       6505
       6505
       +
         j2cli = buildPythonPackage rec {

     

       6506
       6506
       +
           name = "j2cli-${version}";

     

       6507
       6507
       +
           version = "0.3.1-0";

     

       6508
       6508
       +
       

     

       6509
       6509
       +
           src = pkgs.fetchurl {

     

       6510
       6510
       +
             url = "https://pypi.python.org/packages/source/j/j2cli/${name}.tar.gz";

     

       6511
       6511
       +
             sha256 = "0y3w1x9935qzx8w6m2r6g4ghyjmxn33wryiif6xb56q7cj9w1433";

     

       6512
       6512
       +
           };

     

       6513
       6513
       +
       

     

       6514
       6514
       +
           disabled = ! (isPy26 || isPy27);

     

       6515
       6515
       +
       

     

       6516
       6516
       +
           buildInputs = [ self.nose ];

     

       6517
       6517
       +
       

     

       6518
       6518
       +
           propagatedBuildInputs = with self; [ jinja2 pyyaml ];

     

       6519
       6519
       +
       

     

       6520
       6520
       +
           meta = {

     

       6521
       6521
       +
             homepage = https://github.com/kolypto/j2cli;

     

       6522
       6522
       +
             description = "Jinja2 Command-Line Tool";

     

       6523
       6523
       +
             license = licenses.bsd3;

     

       6524
       6524
       +
             longDescription = ''

     

       6525
       6525
       +
               J2Cli is a command-line tool for templating in shell-scripts,

     

       6526
       6526
       +
               leveraging the Jinja2 library.

     

       6527
       6527
       +
             '';

     

       6528
       6528
       +
             platforms = platforms.all;

     

       6529
       6529
       +
             maintainers = with maintainers; [ rushmorem ];

     

       6530
       6530
       +
           };

     

       6531
       6531
       +
         };

     

       6532
       6532
       +
       

     

       6505
       6533
        
         jinja2 = buildPythonPackage rec {

     

       6506
       6534
        
           name = "Jinja2-2.7.3";

     

       6507
       6535

+1

pkgs/top-level/release-lib.nix

···

       7
       7
        
         # Ensure that we don't build packages marked as unfree.

     

       8
       8
        
         allPackages = args: packageSet (args // {

     

       9
       9
        
           config.allowUnfree = false;

     

       10
       10
       +
           config.inHydra = true;

     

       10
       11
        
         });

     

       11
       12
        
       

     

       12
       13
        
         pkgs = pkgsFor "x86_64-linux";