commit 06fc1ec34dbae8bba4673475e64a8241026089f6 · pyrox.dev/nixpkgs

+14

lib/licenses.nix

···

       88
       88
        
           url = http://www.eclipse.org/legal/epl-v10.html;

     

       89
       89
        
         };

     

       90
       90
        
       

     

       91
       91
       +
         free = "free";

     

       92
       92
       +
       

     

       91
       93
        
         gpl2 = {

     

       92
       94
        
           shortName = "GPLv2";

     

       93
       95
        
           fullName = "GNU General Public License version 2";

     
···

       128
       130
        
           shortName = "ISC";

     

       129
       131
        
           fullName = "Internet Systems Consortium License";

     

       130
       132
        
           url = http://www.opensource.org/licenses/ISC;

     

       133
       133
       +
         };

     

       134
       134
       +
       

     

       135
       135
       +
         ipa = {

     

       136
       136
       +
           shortName = "IPA 1.0";

     

       137
       137
       +
           fullName = "IPA Font License v1.0";

     

       138
       138
       +
           url = http://ipafont.ipa.go.jp/ipafont/;

     

       131
       139
        
         };

     

       132
       140
        
       

     

       133
       141
        
         ipl10 = {

     
···

       242
       250
        
         unfreeRedistributable = "unfree-redistributable";

     

       243
       251
        
       

     

       244
       252
        
         unfreeRedistributableFirmware = "unfree-redistributable-firmware";

     

       253
       253
       +
       

     

       254
       254
       +
         wadalab = {

     

       255
       255
       +
           shortName = "wadalab";

     

       256
       256
       +
           fullName = "Wadalab Font License";

     

       257
       257
       +
           url = https://fedoraproject.org/wiki/Licensing:Wadalab?rd=Licensing/Wadalab;

     

       258
       258
       +
         };

     

       245
       259
        
       

     

       246
       260
        
         zlib = {

     

       247
       261
        
           shortName = "zlib";

+2

lib/maintainers.nix

···

       6
       6
        
       

     

       7
       7
        
         _1126 = "Christian Lask <mail@elfsechsundzwanzig.de>";

     

       8
       8
        
         aforemny = "Alexander Foremny <alexanderforemny@googlemail.com>";

     

       9
       9
       +
         ak = "Alexander Kjeldaas <ak@formalprivacy.com>";

     

       9
       10
        
         akc = "Anders Claesson <akc@akc.is>";

     

       10
       11
        
         algorith = "Dries Van Daele <dries_van_daele@telenet.be>";

     

       11
       12
        
         all = "Nix Committers <nix-commits@lists.science.uu.nl>";

     
···

       37
       38
        
         emery = "Emery Hemingway <emery@vfemail.net>";

     

       38
       39
        
         ertes = "Ertugrul Söylemez <ertesx@gmx.de>";

     

       39
       40
        
         falsifian = "James Cook <james.cook@utoronto.ca>";

     

       41
       41
       +
         flosse = "Markus Kohlhase <mail@markus-kohlhase.de>";

     

       40
       42
        
         fuuzetsu = "Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>";

     

       41
       43
        
         garbas = "Rok Garbas <rok@garbas.si>";

     

       42
       44
        
         goibhniu = "Cillian de Róiste <cillian.deroiste@gmail.com>";

+1 -1

lib/modules.nix

···

       194
       194
        
       

     

       195
       195
        
            is transformed into

     

       196
       196
        
       

     

       197
       197
       -
              [ { boot = set1; } { boot = mkIf cond set2; services mkIf cond set3; } ].

     

       197
       197
       +
              [ { boot = set1; } { boot = mkIf cond set2; services = mkIf cond set3; } ].

     

       198
       198
        
       

     

       199
       199
        
            This transform is the critical step that allows mkIf conditions

     

       200
       200
        
            to refer to the full configuration without creating an infinite

+2 -2

nixos/lib/test-driver/log2html.xsl

···

       9
       9
        
         <xsl:template match="logfile">

     

       10
       10
        
           <html>

     

       11
       11
        
             <head>

     

       12
       12
       -
               <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>

     

       13
       13
       -
               <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.3/jquery-ui.min.js"></script>

     

       12
       12
       +
               <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>

     

       13
       13
       +
               <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.10.3/jquery-ui.min.js"></script>

     

       14
       14
        
               <script type="text/javascript" src="treebits.js" />

     

       15
       15
        
               <link rel="stylesheet" href="logfile.css" type="text/css" />

     

       16
       16
        
               <title>Log File</title>

+5 -3

nixos/lib/testing.nix

···

       37
       37
        
         # `driver' is the script that runs the network.

     

       38
       38
        
         runTests = driver:

     

       39
       39
        
           stdenv.mkDerivation {

     

       40
       40
       -
             name = "vm-test-run";

     

       40
       40
       +
             name = "vm-test-run-${driver.testName}";

     

       41
       41
        
       

     

       42
       42
        
             requiredSystemFeatures = [ "kvm" "nixos-test" ];

     

       43
       43
        
       

     
···

       68
       68
        
       

     

       69
       69
        
       

     

       70
       70
        
         makeTest =

     

       71
       71
       -
           { testScript, makeCoverageReport ? false, ... } @ t:

     

       71
       71
       +
           { testScript, makeCoverageReport ? false, name ? "unnamed", ... } @ t:

     

       72
       72
        
       

     

       73
       73
        
           let

     

       74
       74
       +
             testDriverName = "nixos-test-driver-${name}";

     

       74
       75
        
       

     

       75
       76
        
             nodes = buildVirtualNetwork (

     

       76
       77
        
               t.nodes or (if t ? machine then { machine = t.machine; } else { }));

     
···

       88
       89
        
             # Generate onvenience wrappers for running the test driver

     

       89
       90
        
             # interactively with the specified network, and for starting the

     

       90
       91
        
             # VMs from the command line.

     

       91
       91
       -
             driver = runCommand "nixos-test-driver"

     

       92
       92
       +
             driver = runCommand testDriverName

     

       92
       93
        
               { buildInputs = [ makeWrapper];

     

       93
       94
        
                 testScript = testScript';

     

       94
       95
        
                 preferLocalBuild = true;

     

       96
       96
       +
                 testName = name;

     

       95
       97
        
               }

     

       96
       98
        
               ''

     

       97
       99
        
                 mkdir -p $out/bin

+2 -2

nixos/modules/config/krb5.nix

···

       32
       32
        
       

     

       33
       33
        
             kdc = mkOption {

     

       34
       34
        
               default = "kerberos.mit.edu";

     

       35
       35
       -
               description = "Kerberos Domain Controller";

     

       35
       35
       +
               description = "Kerberos Domain Controller.";

     

       36
       36
        
             };

     

       37
       37
        
       

     

       38
       38
        
             kerberosAdminServer = mkOption {

     

       39
       39
        
               default = "kerberos.mit.edu";

     

       40
       40
       -
               description = "Kerberos Admin Server";

     

       40
       40
       +
               description = "Kerberos Admin Server.";

     

       41
       41
        
             };

     

       42
       42
        
       

     

       43
       43
        
           };

+6 -2

nixos/modules/config/sysctl.nix

···

       6
       6
        
       

     

       7
       7
        
         sysctlOption = mkOptionType {

     

       8
       8
        
           name = "sysctl option value";

     

       9
       9
       -
           check = x: isBool x || isString x || isInt x || isNull x;

     

       10
       10
       -
           merge = args: defs: (last defs).value; # FIXME: hacky way to allow overriding in configuration.nix.

     

       9
       9
       +
           check = val:

     

       10
       10
       +
             let

     

       11
       11
       +
               checkType = x: isBool x || isString x || isInt x || isNull x;

     

       12
       12
       +
             in

     

       13
       13
       +
               checkType val || (val._type or "" == "override" && checkType val.content);

     

       14
       14
       +
           merge = loc: defs: mergeOneOption loc (filterOverrides defs);

     

       11
       15
        
         };

     

       12
       16
        
       

     

       13
       17
        
       in

+10

nixos/modules/installer/tools/nixos-rebuild.sh

···

       97
       97
        
           nix-channel --update nixos

     

       98
       98
        
       fi

     

       99
       99
        
       

     

       100
       100
       +
       # Make sure that we use the Nix package we depend on, not something

     

       101
       101
       +
       # else from the PATH for nix-{env,instantiate,build}.  This is

     

       102
       102
       +
       # important, because NixOS defaults the architecture of the rebuilt

     

       103
       103
       +
       # system to the architecture of the nix-* binaries used.  So if on an

     

       104
       104
       +
       # amd64 system the user has an i686 Nix package in her PATH, then we

     

       105
       105
       +
       # would silently downgrade the whole system to be i686 NixOS on the

     

       106
       106
       +
       # next reboot.

     

       107
       107
       +
       if [ -z "$_NIXOS_REBUILD_REEXEC" ]; then

     

       108
       108
       +
           export PATH=@nix@/bin:$PATH

     

       109
       109
       +
       fi

     

       100
       110
        
       

     

       101
       111
        
       # Re-execute nixos-rebuild from the Nixpkgs tree.

     

       102
       112
        
       if [ -z "$_NIXOS_REBUILD_REEXEC" -a -n "$canRun" ]; then

+1

nixos/modules/installer/tools/tools.nix

···

       32
       32
        
         nixos-rebuild = makeProg {

     

       33
       33
        
           name = "nixos-rebuild";

     

       34
       34
        
           src = ./nixos-rebuild.sh;

     

       35
       35
       +
           nix = config.nix.package;

     

       35
       36
        
         };

     

       36
       37
        
       

     

       37
       38
        
         nixos-generate-config = makeProg {

+1

nixos/modules/misc/ids.nix

···

       134
       134
        
             teamspeak = 124;

     

       135
       135
        
             influxdb = 125;

     

       136
       136
        
             nsd = 126;

     

       137
       137
       +
             gitolite = 127;

     

       137
       138
        
       

     

       138
       139
        
             # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!

     

       139
       140

+2

nixos/modules/module-list.nix

···

       147
       147
        
         ./services/misc/felix.nix

     

       148
       148
        
         ./services/misc/folding-at-home.nix

     

       149
       149
        
         ./services/misc/gpsd.nix

     

       150
       150
       +
         ./services/misc/gitolite.nix

     

       150
       151
        
         ./services/misc/nix-daemon.nix

     

       151
       152
        
         ./services/misc/nix-gc.nix

     

       152
       153
        
         ./services/misc/nix-ssh-serve.nix

     
···

       216
       217
        
         ./services/networking/prayer.nix

     

       217
       218
        
         ./services/networking/privoxy.nix

     

       218
       219
        
         ./services/networking/quassel.nix

     

       220
       220
       +
         ./services/networking/radicale.nix

     

       219
       221
        
         ./services/networking/radvd.nix

     

       220
       222
        
         ./services/networking/rdnssd.nix

     

       221
       223
        
         ./services/networking/rpcbind.nix

+1 -1

nixos/modules/programs/atop.nix

···

       22
       22
        
                 interval = 5;

     

       23
       23
        
               };

     

       24
       24
        
               description = ''

     

       25
       25
       -
                 Parameters to be written to <filename>/etc/atoprc</filename>

     

       25
       25
       +
                 Parameters to be written to <filename>/etc/atoprc</filename>.

     

       26
       26
        
               '';

     

       27
       27
        
             };

     

       28
       28

+2 -2

nixos/modules/programs/environment.nix

···

       19
       19
        
           environment.variables =

     

       20
       20
        
             { LOCATE_PATH = "/var/cache/locatedb";

     

       21
       21
        
               NIXPKGS_CONFIG = "/etc/nix/nixpkgs-config.nix";

     

       22
       22
       -
               PAGER = "less -R";

     

       23
       23
       -
               EDITOR = "nano";

     

       22
       22
       +
               PAGER = mkDefault "less -R";

     

       23
       23
       +
               EDITOR = mkDefault "nano";

     

       24
       24
        
             };

     

       25
       25
        
       

     

       26
       26
        
           environment.sessionVariables =

+3 -1

nixos/modules/security/pam.nix

···

       189
       189
        
                 session required pam_env.so envfile=${config.system.build.pamEnvironment}

     

       190
       190
        
                 session required pam_unix.so

     

       191
       191
        
                 ${optionalString cfg.setLoginUid

     

       192
       192
       -
                     "session required pam_loginuid.so"}

     

       192
       192
       +
                     "session ${

     

       193
       193
       +
                       if config.boot.isContainer then "optional" else "required"

     

       194
       194
       +
                     } pam_loginuid.so"}

     

       193
       195
        
                 ${optionalString cfg.updateWtmp

     

       194
       196
        
                     "session required ${pkgs.pam}/lib/security/pam_lastlog.so silent"}

     

       195
       197
        
                 ${optionalString config.users.ldap.enable

+1 -1

nixos/modules/services/databases/openldap.nix

···

       68
       68
        
       

     

       69
       69
        
           users.extraUsers = optionalAttrs (cfg.user == "openldap") (singleton

     

       70
       70
        
             { name = "openldap";

     

       71
       71
       -
               group = "openldap";

     

       71
       71
       +
               group = cfg.group;

     

       72
       72
        
               uid = config.ids.uids.openldap;

     

       73
       73
        
             });

     

       74
       74

+12 -12

nixos/modules/services/databases/redis.nix

···

       50
       50
        
       

     

       51
       51
        
             user = mkOption {

     

       52
       52
        
               default = "redis";

     

       53
       53
       -
               description = "User account under which Redis runs";

     

       53
       53
       +
               description = "User account under which Redis runs.";

     

       54
       54
        
             };

     

       55
       55
        
       

     

       56
       56
        
             pidFile = mkOption {

     
···

       60
       60
        
       

     

       61
       61
        
             port = mkOption {

     

       62
       62
        
               default = 6379;

     

       63
       63
       -
               description = "The port for Redis to listen to";

     

       63
       63
       +
               description = "The port for Redis to listen to.";

     

       64
       64
        
               type = with types; int;

     

       65
       65
        
             };

     

       66
       66
        
       

     

       67
       67
        
             bind = mkOption {

     

       68
       68
        
               default = null; # All interfaces

     

       69
       69
       -
               description = "The IP interface to bind to";

     

       69
       69
       +
               description = "The IP interface to bind to.";

     

       70
       70
        
               example = "127.0.0.1";

     

       71
       71
        
             };

     

       72
       72
        
       

     

       73
       73
        
             unixSocket = mkOption {

     

       74
       74
        
               default = null;

     

       75
       75
       -
               description = "The path to the socket to bind to";

     

       75
       75
       +
               description = "The path to the socket to bind to.";

     

       76
       76
        
               example = "/var/run/redis.sock";

     

       77
       77
        
             };

     

       78
       78
        
       

     

       79
       79
        
             logLevel = mkOption {

     

       80
       80
        
               default = "notice"; # debug, verbose, notice, warning

     

       81
       81
        
               example = "debug";

     

       82
       82
       -
               description = "Specify the server verbosity level, options: debug, verbose, notice, warning";

     

       82
       82
       +
               description = "Specify the server verbosity level, options: debug, verbose, notice, warning.";

     

       83
       83
        
               type = with types; string;

     

       84
       84
        
             };

     

       85
       85
        
       

     
···

       110
       110
        
       

     

       111
       111
        
             dbFilename = mkOption {

     

       112
       112
        
               default = "dump.rdb";

     

       113
       113
       -
               description = "The filename where to dump the DB";

     

       113
       113
       +
               description = "The filename where to dump the DB.";

     

       114
       114
        
               type = with types; string;

     

       115
       115
        
             };

     

       116
       116
        
       

     

       117
       117
        
             dbpath = mkOption {

     

       118
       118
        
               default = "/var/lib/redis";

     

       119
       119
       -
               description = "The DB will be written inside this directory, with the filename specified using the 'dbFilename' configuration";

     

       119
       119
       +
               description = "The DB will be written inside this directory, with the filename specified using the 'dbFilename' configuration.";

     

       120
       120
        
               type = with types; string;

     

       121
       121
        
             };

     

       122
       122
        
       

     

       123
       123
        
             slaveOf = mkOption {

     

       124
       124
        
               default = null; # { ip, port }

     

       125
       125
       -
               description = "An attribute set with two attributes: ip and port to which this redis instance acts as a slave";

     

       125
       125
       +
               description = "An attribute set with two attributes: ip and port to which this redis instance acts as a slave.";

     

       126
       126
        
               example = { ip = "192.168.1.100"; port = 6379; };

     

       127
       127
        
             };

     

       128
       128
        
       

     
···

       154
       154
        
       

     

       155
       155
        
             appendFsync = mkOption {

     

       156
       156
        
               default = "everysec"; # no, always, everysec

     

       157
       157
       -
               description = "How often to fsync the append-only log, options: no, always, everysec";

     

       157
       157
       +
               description = "How often to fsync the append-only log, options: no, always, everysec.";

     

       158
       158
        
               type = with types; string;

     

       159
       159
        
             };

     

       160
       160
        
       

     

       161
       161
        
             slowLogLogSlowerThan = mkOption {

     

       162
       162
        
               default = 10000;

     

       163
       163
       -
               description = "Log queries whose execution take longer than X in milliseconds";

     

       163
       163
       +
               description = "Log queries whose execution take longer than X in milliseconds.";

     

       164
       164
        
               example = 1000;

     

       165
       165
        
               type = with types; int;

     

       166
       166
        
             };

     

       167
       167
        
       

     

       168
       168
        
             slowLogMaxLen = mkOption {

     

       169
       169
        
               default = 128;

     

       170
       170
       -
               description = "Maximum number of items to keep in slow log";

     

       170
       170
       +
               description = "Maximum number of items to keep in slow log.";

     

       171
       171
        
               type = with types; int;

     

       172
       172
        
             };

     

       173
       173
        
       

     

       174
       174
        
             extraConfig = mkOption {

     

       175
       175
        
               default = "";

     

       176
       176
       -
               description = "Extra configuration options for redis.conf";

     

       176
       176
       +
               description = "Extra configuration options for redis.conf.";

     

       177
       177
        
               type = with types; string;

     

       178
       178
        
             };

     

       179
       179
        
           };

+7 -2

nixos/modules/services/logging/logstash.nix

···

       17
       17
        
               description = "Enable logstash";

     

       18
       18
        
             };

     

       19
       19
        
       

     

       20
       20
       +
             enableWeb = mkOption {

     

       21
       21
       +
               default = false;

     

       22
       22
       +
               description = "Enable logstash web interface";

     

       23
       23
       +
             };

     

       24
       24
       +
       

     

       20
       25
        
             inputConfig = mkOption {

     

       21
       26
        
               default = ''stdin { type => "example" }'';

     

       22
       27
        
               description = "Logstash input configuration";

     
···

       62
       67
        
       

     

       63
       68
        
         config = mkIf cfg.enable {

     

       64
       69
        
           systemd.services.logstash = with pkgs; {

     

       65
       65
       -
             description = "Logstash daemon";

     

       70
       70
       +
             description = "Logstash Daemon";

     

       66
       71
        
             wantedBy = [ "multi-user.target" ];

     

       67
       72
        
       

     

       68
       73
        
             serviceConfig = {

     
···

       78
       83
        
                 output {

     

       79
       84
        
                   ${cfg.outputConfig}

     

       80
       85
        
                 }

     

       81
       81
       -
               ''}";

     

       86
       86
       +
               ''} ${optionalString cfg.enableWeb "-- web"}";

     

       82
       87
        
             };

     

       83
       88
        
           };

     

       84
       89
        
         };

+66

nixos/modules/services/misc/gitolite.nix

···

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

     

       2
       2
       +
       

     

       3
       3
       +
       with lib;

     

       4
       4
       +
       

     

       5
       5
       +
       let

     

       6
       6
       +
         cfg = config.services.gitolite;

     

       7
       7
       +
         pubkeyFile = pkgs.writeText "gitolite-admin.pub" cfg.adminPubkey;

     

       8
       8
       +
       in

     

       9
       9
       +
       {

     

       10
       10
       +
         options = {

     

       11
       11
       +
           services.gitolite = {

     

       12
       12
       +
             enable = mkOption {

     

       13
       13
       +
               type = types.bool;

     

       14
       14
       +
               default = false;

     

       15
       15
       +
               description = ''

     

       16
       16
       +
                 Enable gitolite management under the

     

       17
       17
       +
                 <literal>gitolite</literal> user. The Gitolite home

     

       18
       18
       +
                 directory is <literal>/var/lib/gitolite</literal>. After

     

       19
       19
       +
                 switching to a configuration with Gitolite enabled, you can

     

       20
       20
       +
                 then run <literal>git clone

     

       21
       21
       +
                 gitolite@host:gitolite-admin.git</literal> to manage it further.

     

       22
       22
       +
               '';

     

       23
       23
       +
             };

     

       24
       24
       +
       

     

       25
       25
       +
             adminPubkey = mkOption {

     

       26
       26
       +
               type = types.str;

     

       27
       27
       +
               description = ''

     

       28
       28
       +
                 Initial administrative public key for Gitolite. This should

     

       29
       29
       +
                 be an SSH Public Key. Note that this key will only be used

     

       30
       30
       +
                 once, upon the first initialization of the Gitolite user.

     

       31
       31
       +
               '';

     

       32
       32
       +
             };

     

       33
       33
       +
           };

     

       34
       34
       +
         };

     

       35
       35
       +
       

     

       36
       36
       +
         config = mkIf cfg.enable {

     

       37
       37
       +
           users.extraUsers.gitolite = {

     

       38
       38
       +
             description     = "Gitolite user";

     

       39
       39
       +
             home            = "/var/lib/gitolite";

     

       40
       40
       +
             createHome      = true;

     

       41
       41
       +
             uid             = config.ids.uids.gitolite;

     

       42
       42
       +
             useDefaultShell = true;

     

       43
       43
       +
           };

     

       44
       44
       +
       

     

       45
       45
       +
           systemd.services."gitolite-init" = {

     

       46
       46
       +
             description = "Gitolite initialization";

     

       47
       47
       +
             wantedBy    = [ "multi-user.target" ];

     

       48
       48
       +
       

     

       49
       49
       +
             serviceConfig.User = "gitolite";

     

       50
       50
       +
             serviceConfig.Type = "oneshot";

     

       51
       51
       +
             serviceConfig.RemainAfterExit = true;

     

       52
       52
       +
       

     

       53
       53
       +
             path = [ pkgs.gitolite pkgs.git pkgs.perl pkgs.bash pkgs.openssh ];

     

       54
       54
       +
             script = ''

     

       55
       55
       +
               cd /var/lib/gitolite

     

       56
       56
       +
               mkdir -p .gitolite/logs

     

       57
       57
       +
               if [ ! -d repositories ]; then

     

       58
       58
       +
                 gitolite setup -pk ${pubkeyFile}

     

       59
       59
       +
               fi

     

       60
       60
       +
               gitolite setup # Upgrade if needed

     

       61
       61
       +
             '';

     

       62
       62
       +
           };

     

       63
       63
       +
       

     

       64
       64
       +
           environment.systemPackages = [ pkgs.gitolite pkgs.git ];

     

       65
       65
       +
         };

     

       66
       66
       +
       }

+48

nixos/modules/services/networking/radicale.nix

···

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

     

       2
       2
       +
       

     

       3
       3
       +
       with lib;

     

       4
       4
       +
       

     

       5
       5
       +
       let

     

       6
       6
       +
       

     

       7
       7
       +
         cfg = config.services.radicale;

     

       8
       8
       +
       

     

       9
       9
       +
         confFile = pkgs.writeText "radicale.conf" cfg.config;

     

       10
       10
       +
       

     

       11
       11
       +
       in

     

       12
       12
       +
       

     

       13
       13
       +
       {

     

       14
       14
       +
       

     

       15
       15
       +
         options = {

     

       16
       16
       +
       

     

       17
       17
       +
           services.radicale.enable = mkOption {

     

       18
       18
       +
             type = types.bool;

     

       19
       19
       +
             default = false;

     

       20
       20
       +
             description = ''

     

       21
       21
       +
                 Enable Radicale CalDAV and CardDAV server

     

       22
       22
       +
             '';

     

       23
       23
       +
           };

     

       24
       24
       +
       

     

       25
       25
       +
           services.radicale.config = mkOption {

     

       26
       26
       +
             type = types.string;

     

       27
       27
       +
             default = "";

     

       28
       28
       +
             description = ''

     

       29
       29
       +
               Radicale configuration, this will set the service

     

       30
       30
       +
               configuration file

     

       31
       31
       +
             '';

     

       32
       32
       +
             };

     

       33
       33
       +
         };

     

       34
       34
       +
       

     

       35
       35
       +
         config = mkIf cfg.enable {

     

       36
       36
       +
       

     

       37
       37
       +
           environment.systemPackages = [ pkgs.pythonPackages.radicale ];

     

       38
       38
       +
       

     

       39
       39
       +
           jobs.radicale = {

     

       40
       40
       +
             description = "A Simple Calendar and Contact Server";

     

       41
       41
       +
             startOn = "started network-interfaces";

     

       42
       42
       +
             exec = "${pkgs.pythonPackages.radicale}/bin/radicale -C ${confFile} -d";

     

       43
       43
       +
             daemonType = "fork";

     

       44
       44
       +
           };

     

       45
       45
       +
       

     

       46
       46
       +
         };

     

       47
       47
       +
       

     

       48
       48
       +
       }

+9 -9

nixos/modules/services/search/elasticsearch.nix

···

       27
       27
        
       

     

       28
       28
        
         options.services.elasticsearch = {

     

       29
       29
        
           enable = mkOption {

     

       30
       30
       -
             description = "Whether to enable elasticsearch";

     

       30
       30
       +
             description = "Whether to enable elasticsearch.";

     

       31
       31
        
             default = false;

     

       32
       32
        
             type = types.uniq types.bool;

     

       33
       33
        
           };

     

       34
       34
        
       

     

       35
       35
        
           host = mkOption {

     

       36
       36
       -
             description = "Elasticsearch listen address";

     

       36
       36
       +
             description = "Elasticsearch listen address.";

     

       37
       37
        
             default = "127.0.0.1";

     

       38
       38
        
             type = types.str;

     

       39
       39
        
           };

     

       40
       40
        
       

     

       41
       41
        
           port = mkOption {

     

       42
       42
       -
             description = "Elasticsearch port to listen for HTTP traffic";

     

       42
       42
       +
             description = "Elasticsearch port to listen for HTTP traffic.";

     

       43
       43
        
             default = 9200;

     

       44
       44
        
             type = types.int;

     

       45
       45
        
           };

     

       46
       46
        
       

     

       47
       47
        
           tcp_port = mkOption {

     

       48
       48
       -
             description = "Elasticsearch port for the node to node communication";

     

       48
       48
       +
             description = "Elasticsearch port for the node to node communication.";

     

       49
       49
        
             default = 9300;

     

       50
       50
        
             type = types.int;

     

       51
       51
        
           };

     

       52
       52
        
       

     

       53
       53
        
           cluster_name = mkOption {

     

       54
       54
       -
             description = "Elasticsearch name that identifies your cluster for auto-discovery";

     

       54
       54
       +
             description = "Elasticsearch name that identifies your cluster for auto-discovery.";

     

       55
       55
        
             default = "elasticsearch";

     

       56
       56
        
             type = types.str;

     

       57
       57
        
           };

     

       58
       58
        
       

     

       59
       59
        
           extraConf = mkOption {

     

       60
       60
       -
             description = "Extra configuration for elasticsearch";

     

       60
       60
       +
             description = "Extra configuration for elasticsearch.";

     

       61
       61
        
             default = "";

     

       62
       62
        
             type = types.str;

     

       63
       63
        
             example = ''

     
···

       70
       70
        
           };

     

       71
       71
        
       

     

       72
       72
        
           logging = mkOption {

     

       73
       73
       -
             description = "Elasticsearch logging configuration";

     

       73
       73
       +
             description = "Elasticsearch logging configuration.";

     

       74
       74
        
             default = ''

     

       75
       75
        
               rootLogger: INFO, console

     

       76
       76
        
               logger:

     
···

       95
       95
        
           };

     

       96
       96
        
       

     

       97
       97
        
           extraCmdLineOptions = mkOption {

     

       98
       98
       -
             description = "Extra command line options for the elasticsearch launcher";

     

       98
       98
       +
             description = "Extra command line options for the elasticsearch launcher.";

     

       99
       99
        
             default = [];

     

       100
       100
        
             type = types.listOf types.string;

     

       101
       101
        
             example = [ "-Djava.net.preferIPv4Stack=true" ];

     
···

       107
       107
        
       

     

       108
       108
        
         config = mkIf cfg.enable {

     

       109
       109
        
           systemd.services.elasticsearch = {

     

       110
       110
       -
             description = "Elasticsearch daemon";

     

       110
       110
       +
             description = "Elasticsearch Daemon";

     

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

     

       112
       112
        
             after = [ "network-interfaces.target" ];

     

       113
       113
        
             environment = { ES_HOME = cfg.dataDir; };

+5 -5

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

···

       594
       594
        
                            message = "SSL is enabled for HTTPD, but sslServerCert and/or sslServerKey haven't been specified."; }

     

       595
       595
        
                        ];

     

       596
       596
        
       

     

       597
       597
       -
           users.extraUsers = optional (mainCfg.user == "wwwrun")

     

       597
       597
       +
           users.extraUsers = optionalAttrs (mainCfg.user == "wwwrun") (singleton

     

       598
       598
        
             { name = "wwwrun";

     

       599
       599
       -
               group = "wwwrun";

     

       599
       599
       +
               group = mainCfg.group;

     

       600
       600
        
               description = "Apache httpd user";

     

       601
       601
        
               uid = config.ids.uids.wwwrun;

     

       602
       602
       -
             };

     

       602
       602
       +
             });

     

       603
       603
        
       

     

       604
       604
       -
           users.extraGroups = optional (mainCfg.group == "wwwrun")

     

       604
       604
       +
           users.extraGroups = optionalAttrs (mainCfg.group == "wwwrun") (singleton

     

       605
       605
        
             { name = "wwwrun";

     

       606
       606
        
               gid = config.ids.gids.wwwrun;

     

       607
       607
       -
             };

     

       607
       607
       +
             });

     

       608
       608
        
       

     

       609
       609
        
           environment.systemPackages = [httpd] ++ concatMap (svc: svc.extraPath) allSubservices;

     

       610
       610

+4 -4

nixos/modules/tasks/encrypted-devices.nix

···

       16
       16
        
             enable = mkOption {

     

       17
       17
        
               default = false;

     

       18
       18
        
               type = types.bool;

     

       19
       19
       -
               description = "The block device is backed by an encrypted one, adds this device as a initrd luks entry";

     

       19
       19
       +
               description = "The block device is backed by an encrypted one, adds this device as a initrd luks entry.";

     

       20
       20
        
             };

     

       21
       21
        
       

     

       22
       22
        
             blkDev = mkOption {

     

       23
       23
        
               default = null;

     

       24
       24
        
               example = "/dev/sda1";

     

       25
       25
        
               type = types.uniq (types.nullOr types.string);

     

       26
       26
       -
               description = "Location of the backing encrypted device";

     

       26
       26
       +
               description = "Location of the backing encrypted device.";

     

       27
       27
        
             };

     

       28
       28
        
       

     

       29
       29
        
             label = mkOption {

     

       30
       30
        
               default = null;

     

       31
       31
        
               example = "rootfs";

     

       32
       32
        
               type = types.uniq (types.nullOr types.string);

     

       33
       33
       -
               description = "Label of the backing encrypted device";

     

       33
       33
       +
               description = "Label of the backing encrypted device.";

     

       34
       34
        
             };

     

       35
       35
        
       

     

       36
       36
        
             keyFile = mkOption {

     

       37
       37
        
               default = null;

     

       38
       38
        
               example = "/root/.swapkey";

     

       39
       39
        
               type = types.uniq (types.nullOr types.string);

     

       40
       40
       -
               description = "File system location of keyfile";

     

       40
       40
       +
               description = "File system location of keyfile.";

     

       41
       41
        
             };

     

       42
       42
        
           };

     

       43
       43
        
         };

+1

nixos/tests/avahi.nix

···

       1
       1
        
       # Test whether `avahi-daemon' and `libnss-mdns' work as expected.

     

       2
       2
        
       

     

       3
       3
        
       import ./make-test.nix {

     

       4
       4
       +
         name = "avahi";

     

       4
       5
        
       

     

       5
       6
        
         nodes = {

     

       6
       7
        
           one =

+1

nixos/tests/bittorrent.nix

···

       23
       23
        
       in

     

       24
       24
        
       

     

       25
       25
        
       {

     

       26
       26
       +
         name = "bittorrent";

     

       26
       27
        
       

     

       27
       28
        
         nodes =

     

       28
       29
        
           { tracker =

+2

nixos/tests/check-filesystems.nix

···

       6
       6
        
       with import ../lib/build-vms.nix { inherit nixos nixpkgs system; };

     

       7
       7
        
       

     

       8
       8
        
       rec {

     

       9
       9
       +
         name = "check-filesystems";

     

       10
       10
       +
       

     

       9
       11
        
         nodes = {

     

       10
       12
        
           share = {pkgs, config, ...}: {

     

       11
       13
        
             services.nfs.server.enable = true;

+1

nixos/tests/containers.nix

···

       1
       1
        
       # Test for NixOS' container support.

     

       2
       2
        
       

     

       3
       3
        
       import ./make-test.nix {

     

       4
       4
       +
         name = "containers";

     

       4
       5
        
       

     

       5
       6
        
         machine =

     

       6
       7
        
           { config, pkgs, ... }:

+1

nixos/tests/firefox.nix

···

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

     

       2
       2
       +
         name = "firefox";

     

       2
       3
        
       

     

       3
       4
        
         machine =

     

       4
       5
        
           { config, pkgs, ... }:

+1

nixos/tests/firewall.nix

···

       1
       1
        
       # Test the firewall module.

     

       2
       2
        
       

     

       3
       3
        
       import ./make-test.nix {

     

       4
       4
       +
         name = "firewall";

     

       4
       5
        
       

     

       5
       6
        
         nodes =

     

       6
       7
        
           { walled =

+1

nixos/tests/gnome3.nix

···

       1
       1
        
       import ./make-test.nix {

     

       2
       2
       +
         name = "gnome3";

     

       2
       3
        
       

     

       3
       4
        
         machine =

     

       4
       5
        
           { config, pkgs, ... }:

+1

nixos/tests/gnome3_12.nix

···

       1
       1
        
       import ./make-test.nix {

     

       2
       2
       +
         name = "gnome3_12";

     

       2
       3
        
       

     

       3
       4
        
         machine =

     

       4
       5
        
           { config, pkgs, ... }:

+2

nixos/tests/influxdb.nix

···

       1
       1
        
       # This test runs influxdb and checks if influxdb is up and running

     

       2
       2
        
       

     

       3
       3
        
       import ./make-test.nix {

     

       4
       4
       +
         name = "influxdb";

     

       5
       5
       +
       

     

       4
       6
        
         nodes = {

     

       5
       7
        
           one = { config, pkgs, ... }: {

     

       6
       8
        
             services.influxdb.enable = true;

+9 -7

nixos/tests/installer.nix

···

       215
       215
        
           '';

     

       216
       216
        
       

     

       217
       217
        
       

     

       218
       218
       -
         makeInstallerTest =

     

       218
       218
       +
         makeInstallerTest = name:

     

       219
       219
        
           { createPartitions, testChannel ? false, useEFI ? false, grubVersion ? 2, grubDevice ? "/dev/vda" }:

     

       220
       220
        
           makeTest {

     

       221
       221
        
             inherit iso;

     

       222
       222
       +
             name = "installer-" + name;

     

       222
       223
        
             nodes = if testChannel then { inherit webserver; } else { };

     

       223
       224
        
             testScript = testScriptFun {

     

       224
       225
        
               inherit createPartitions testChannel useEFI grubVersion grubDevice;

     
···

       233
       234
        
       

     

       234
       235
        
         # The (almost) simplest partitioning scheme: a swap partition and

     

       235
       236
        
         # one big filesystem partition.

     

       236
       236
       -
         simple = makeInstallerTest

     

       237
       237
       +
         simple = makeInstallerTest "simple"

     

       237
       238
        
           { createPartitions =

     

       238
       239
        
               ''

     

       239
       240
        
                 $machine->succeed(

     
···

       251
       252
        
           };

     

       252
       253
        
       

     

       253
       254
        
         # Same as the previous, but now with a separate /boot partition.

     

       254
       254
       -
         separateBoot = makeInstallerTest

     

       255
       255
       +
         separateBoot = makeInstallerTest "separateBoot"

     

       255
       256
        
           { createPartitions =

     

       256
       257
        
               ''

     

       257
       258
        
                 $machine->succeed(

     
···

       273
       274
        
       

     

       274
       275
        
         # Create two physical LVM partitions combined into one volume group

     

       275
       276
        
         # that contains the logical swap and root partitions.

     

       276
       276
       -
         lvm = makeInstallerTest

     

       277
       277
       +
         lvm = makeInstallerTest "lvm"

     

       277
       278
        
           { createPartitions =

     

       278
       279
        
               ''

     

       279
       280
        
                 $machine->succeed(

     
···

       295
       296
        
               '';

     

       296
       297
        
           };

     

       297
       298
        
       

     

       298
       298
       -
         swraid = makeInstallerTest

     

       299
       299
       +
         swraid = makeInstallerTest "swraid"

     

       299
       300
        
           { createPartitions =

     

       300
       301
        
               ''

     

       301
       302
        
                 $machine->succeed(

     
···

       328
       329
        
           };

     

       329
       330
        
       

     

       330
       331
        
         # Test a basic install using GRUB 1.

     

       331
       331
       -
         grub1 = makeInstallerTest

     

       332
       332
       +
         grub1 = makeInstallerTest "grub1"

     

       332
       333
        
           { createPartitions =

     

       333
       334
        
               ''

     

       334
       335
        
                 $machine->succeed(

     
···

       348
       349
        
           };

     

       349
       350
        
       

     

       350
       351
        
         # Test an EFI install.

     

       351
       351
       -
         efi = makeInstallerTest

     

       352
       352
       +
         efi = makeInstallerTest "efi"

     

       352
       353
        
           { createPartitions =

     

       353
       354
        
               ''

     

       354
       355
        
                 $machine->succeed(

     
···

       369
       370
        
         # Rebuild the CD configuration with a little modification.

     

       370
       371
        
         rebuildCD = makeTest

     

       371
       372
        
           { inherit iso;

     

       373
       373
       +
             name = "rebuild-CD";

     

       372
       374
        
             nodes = { };

     

       373
       375
        
             testScript =

     

       374
       376
        
               ''

+1

nixos/tests/ipv6.nix

···

       2
       2
        
       # solicication/advertisement using radvd works.

     

       3
       3
        
       

     

       4
       4
        
       import ./make-test.nix {

     

       5
       5
       +
         name = "ipv6";

     

       5
       6
        
       

     

       6
       7
        
         nodes =

     

       7
       8
        
           { client = { config, pkgs, ... }: { };

+1

nixos/tests/jenkins.nix

···

       4
       4
        
       #   3. jenkins service not started on slave node

     

       5
       5
        
       

     

       6
       6
        
       import ./make-test.nix {

     

       7
       7
       +
         name = "jenkins";

     

       7
       8
        
       

     

       8
       9
        
         nodes = {

     

       9
       10

+1

nixos/tests/kde4.nix

···

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

     

       2
       2
       +
         name = "kde4";

     

       2
       3
        
       

     

       3
       4
        
         machine =

     

       4
       5
        
           { config, pkgs, ... }:

+1

nixos/tests/kexec.nix

···

       1
       1
        
       # Test whether fast reboots via kexec work.

     

       2
       2
        
       

     

       3
       3
        
       import ./make-test.nix  {

     

       4
       4
       +
         name = "kexec";

     

       4
       5
        
       

     

       5
       6
        
         machine = { config, pkgs, ... }:

     

       6
       7
        
           { virtualisation.vlans = [ ]; };

+1

nixos/tests/login.nix

···

       1
       1
        
       import ./make-test.nix ({ pkgs, latestKernel ? false, ... }:

     

       2
       2
        
       

     

       3
       3
        
       {

     

       4
       4
       +
         name = "login";

     

       4
       5
        
       

     

       5
       6
        
         machine =

     

       6
       7
        
           { config, pkgs, lib, ... }:

+1

nixos/tests/logstash.nix

···

       2
       2
        
       # elasticsearch is started.

     

       3
       3
        
       

     

       4
       4
        
       import ./make-test.nix {

     

       5
       5
       +
         name = "logstash";

     

       5
       6
        
       

     

       6
       7
        
         nodes = {

     

       7
       8
        
           one =

+1

nixos/tests/misc.nix

···

       1
       1
        
       # Miscellaneous small tests that don't warrant their own VM run.

     

       2
       2
        
       

     

       3
       3
        
       import ./make-test.nix {

     

       4
       4
       +
         name = "misc";

     

       4
       5
        
       

     

       5
       6
        
         machine =

     

       6
       7
        
           { config, lib, pkgs, ... }:

+2

nixos/tests/mpich.nix

···

       1
       1
        
       # Simple example to showcase distributed tests using NixOS VMs.

     

       2
       2
        
       

     

       3
       3
        
       import ./make-test.nix {

     

       4
       4
       +
         name = "mpich";

     

       5
       5
       +
       

     

       4
       6
        
         nodes = {

     

       5
       7
        
           master =

     

       6
       8
        
             { config, pkgs, ... }: {

+2

nixos/tests/mumble.nix

···

       7
       7
        
         };

     

       8
       8
        
       in

     

       9
       9
        
       {

     

       10
       10
       +
         name = "mumble";

     

       11
       11
       +
       

     

       10
       12
        
         nodes = {

     

       11
       13
        
           server = { config, pkgs, ... }: {

     

       12
       14
        
             services.murmur.enable       = true;

+1

nixos/tests/munin.nix

···

       2
       2
        
       # machine.

     

       3
       3
        
       

     

       4
       4
        
       import ./make-test.nix {

     

       5
       5
       +
         name = "munin";

     

       5
       6
        
       

     

       6
       7
        
         nodes = {

     

       7
       8
        
           one =

+2

nixos/tests/mysql-replication.nix

···

       6
       6
        
       in

     

       7
       7
        
       

     

       8
       8
        
       {

     

       9
       9
       +
         name = "mysql-replication";

     

       10
       10
       +
       

     

       9
       11
        
         nodes = {

     

       10
       12
        
           master =

     

       11
       13
        
             { pkgs, config, ... }:

+1

nixos/tests/mysql.nix

···

       1
       1
        
       import ./make-test.nix {

     

       2
       2
       +
         name = "mysql";

     

       2
       3
        
       

     

       3
       4
        
         nodes = {

     

       4
       5
        
           master =

+1

nixos/tests/nat.nix

···

       5
       5
        
       # for the client.

     

       6
       6
        
       

     

       7
       7
        
       import ./make-test.nix {

     

       8
       8
       +
         name = "nat";

     

       8
       9
        
       

     

       9
       10
        
         nodes =

     

       10
       11
        
           { client =

+1

nixos/tests/nfs.nix

···

       17
       17
        
       in

     

       18
       18
        
       

     

       19
       19
        
       {

     

       20
       20
       +
         name = "nfs";

     

       20
       21
        
       

     

       21
       22
        
         nodes =

     

       22
       23
        
           { client1 = client;

+40 -9

nixos/tests/openssh.nix

···

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

     

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

     

       2
       2
       +
       

     

       3
       3
       +
       let

     

       4
       4
       +
         snakeOilPrivateKey = pkgs.writeText "privkey.snakeoil" ''

     

       5
       5
       +
           -----BEGIN EC PRIVATE KEY-----

     

       6
       6
       +
           MHcCAQEEIHQf/khLvYrQ8IOika5yqtWvI0oquHlpRLTZiJy5dRJmoAoGCCqGSM49

     

       7
       7
       +
           AwEHoUQDQgAEKF0DYGbBwbj06tA3fd/+yP44cvmwmHBWXZCKbS+RQlAKvLXMWkpN

     

       8
       8
       +
           r1lwMyJZoSGgBHoUahoYjTh9/sJL7XLJtA==

     

       9
       9
       +
           -----END EC PRIVATE KEY-----

     

       10
       10
       +
         '';

     

       11
       11
       +
       

     

       12
       12
       +
         snakeOilPublicKey = pkgs.lib.concatStrings [

     

       13
       13
       +
           "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHA"

     

       14
       14
       +
           "yNTYAAABBBChdA2BmwcG49OrQN33f/sj+OHL5sJhwVl2Qim0vkUJQCry1zFpKTa"

     

       15
       15
       +
           "9ZcDMiWaEhoAR6FGoaGI04ff7CS+1yybQ= sakeoil"

     

       16
       16
       +
         ];

     

       17
       17
       +
       

     

       18
       18
       +
       in {

     

       19
       19
       +
         name = "openssh";

     

       2
       20
        
       

     

       3
       21
        
         nodes = {

     

       4
       22
        
       

     
···

       9
       27
        
               services.openssh.enable = true;

     

       10
       28
        
               security.pam.services.sshd.limits =

     

       11
       29
        
                 [ { domain = "*"; item = "memlock"; type = "-"; value = 1024; } ];

     

       30
       30
       +
               users.extraUsers.root.openssh.authorizedKeys.keys = [

     

       31
       31
       +
                 snakeOilPublicKey

     

       32
       32
       +
               ];

     

       12
       33
        
             };

     

       13
       34
        
       

     

       14
       35
        
           client =

     
···

       23
       44
        
       

     

       24
       45
        
           $server->waitForUnit("sshd");

     

       25
       46
        
       

     

       26
       26
       -
           $server->succeed("mkdir -m 700 /root/.ssh");

     

       27
       27
       -
           $server->copyFileFromHost("key.pub", "/root/.ssh/authorized_keys");

     

       47
       47
       +
           subtest "manual-authkey", sub {

     

       48
       48
       +
             $server->succeed("mkdir -m 700 /root/.ssh");

     

       49
       49
       +
             $server->copyFileFromHost("key.pub", "/root/.ssh/authorized_keys");

     

       28
       50
        
       

     

       29
       29
       -
           $client->succeed("mkdir -m 700 /root/.ssh");

     

       30
       30
       -
           $client->copyFileFromHost("key", "/root/.ssh/id_dsa");

     

       31
       31
       -
           $client->succeed("chmod 600 /root/.ssh/id_dsa");

     

       51
       51
       +
             $client->succeed("mkdir -m 700 /root/.ssh");

     

       52
       52
       +
             $client->copyFileFromHost("key", "/root/.ssh/id_dsa");

     

       53
       53
       +
             $client->succeed("chmod 600 /root/.ssh/id_dsa");

     

       32
       54
        
       

     

       33
       33
       -
           $client->waitForUnit("network.target");

     

       34
       34
       -
           $client->succeed("ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'echo hello world' >&2");

     

       35
       35
       -
           $client->succeed("ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'ulimit -l' | grep 1024");

     

       55
       55
       +
             $client->waitForUnit("network.target");

     

       56
       56
       +
             $client->succeed("ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'echo hello world' >&2");

     

       57
       57
       +
             $client->succeed("ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'ulimit -l' | grep 1024");

     

       58
       58
       +
           };

     

       59
       59
       +
       

     

       60
       60
       +
           subtest "configured-authkey", sub {

     

       61
       61
       +
             $client->succeed("cat ${snakeOilPrivateKey} > privkey.snakeoil");

     

       62
       62
       +
             $client->succeed("chmod 600 privkey.snakeoil");

     

       63
       63
       +
             $client->succeed("ssh -o UserKnownHostsFile=/dev/null" .

     

       64
       64
       +
                              " -o StrictHostKeyChecking=no -i privkey.snakeoil" .

     

       65
       65
       +
                              " server true");

     

       66
       66
       +
           };

     

       36
       67
        
         '';

     

       37
       68
        
       })

+2

nixos/tests/partition.nix

···

       63
       63
        
           logvol / --size=1000 --grow --fstype=ext4 --name=root --vgname=nixos

     

       64
       64
        
         '';

     

       65
       65
        
       in {

     

       66
       66
       +
         name = "partitiion";

     

       67
       67
       +
       

     

       66
       68
        
         machine = { config, pkgs, ... }: {

     

       67
       69
        
           environment.systemPackages = [

     

       68
       70
        
             pkgs.pythonPackages.nixpart

+1

nixos/tests/phabricator.nix

···

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

     

       2
       2
       +
         name = "phabricator";

     

       2
       3
        
       

     

       3
       4
        
         nodes = {

     

       4
       5
        
           storage =

+1

nixos/tests/printing.nix

···

       1
       1
        
       # Test printing via CUPS.

     

       2
       2
        
       

     

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

     

       4
       4
       +
         name = "printing";

     

       4
       5
        
       

     

       5
       6
        
         nodes = {

     

       6
       7

+1

nixos/tests/proxy.nix

···

       14
       14
        
       in

     

       15
       15
        
       

     

       16
       16
        
       {

     

       17
       17
       +
         name = "proxy";

     

       17
       18
        
       

     

       18
       19
        
         nodes =

     

       19
       20
        
           { proxy =

+1

nixos/tests/quake3.nix

···

       13
       13
        
       in

     

       14
       14
        
       

     

       15
       15
        
       rec {

     

       16
       16
       +
         name = "quake3";

     

       16
       17
        
       

     

       17
       18
        
         makeCoverageReport = true;

     

       18
       19

+1

nixos/tests/rabbitmq.nix

···

       1
       1
        
       # This test runs rabbitmq and checks if rabbitmq is up and running.

     

       2
       2
        
       

     

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

     

       4
       4
       +
         name = "rabbitmq";

     

       4
       5
        
       

     

       5
       6
        
         nodes = {

     

       6
       7
        
           one = { config, pkgs, ... }: {

+1

nixos/tests/simple.nix

···

       1
       1
        
       import ./make-test.nix {

     

       2
       2
       +
         name = "simple"

     

       2
       3
        
       

     

       3
       4
        
         machine = { config, pkgs, ... }: { };

     

       4
       5

+1

nixos/tests/subversion.nix

···

       32
       32
        
       in

     

       33
       33
        
       

     

       34
       34
        
       {

     

       35
       35
       +
         name = "subversion";

     

       35
       36
        
       

     

       36
       37
        
         nodes =

     

       37
       38
        
           { webserver =

+1

nixos/tests/tomcat.nix

···

       1
       1
        
       import ./make-test.nix {

     

       2
       2
       +
         name = "tomcat";

     

       2
       3
        
       

     

       3
       4
        
         nodes = {

     

       4
       5
        
           server =

+1

nixos/tests/trac.nix

···

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

     

       2
       2
       +
         name = "trac";

     

       2
       3
        
       

     

       3
       4
        
         nodes = {

     

       4
       5
        
           storage =

+1

nixos/tests/udisks2.nix

···

       10
       10
        
       in

     

       11
       11
        
       

     

       12
       12
        
       {

     

       13
       13
       +
         name = "udisks2";

     

       13
       14
        
       

     

       14
       15
        
         machine =

     

       15
       16
        
           { config, pkgs, ... }:

+1

nixos/tests/xfce.nix

···

       1
       1
        
       import ./make-test.nix {

     

       2
       2
       +
         name = "xfce";

     

       2
       3
        
       

     

       3
       4
        
         machine =

     

       4
       5
        
           { config, pkgs, ... }:

+25

pkgs/applications/audio/transcode/default.nix

···

       1
       1
       +
       { stdenv, fetchurl, flac, lame, zlib, libjpeg, libvorbis, libtheora, libxml2

     

       2
       2
       +
       , lzo, libdvdread, pkgconfig, x264, libmpeg2, xvidcore }:

     

       3
       3
       +
       

     

       4
       4
       +
       stdenv.mkDerivation rec {

     

       5
       5
       +
         name = "transcode-1.1.7";

     

       6
       6
       +
         src = fetchurl {

     

       7
       7
       +
           url = "https://bitbucket.org/france/transcode-tcforge/downloads/${name}.tar.bz2";

     

       8
       8
       +
           sha256 = "1e4e72d8e0dd62a80b8dd90699f5ca64c9b0cb37a5c9325c184166a9654f0a92";

     

       9
       9
       +
         };

     

       10
       10
       +
       

     

       11
       11
       +
         buildInputs = [ flac lame zlib libjpeg libvorbis libtheora libxml2 lzo

     

       12
       12
       +
                         libdvdread pkgconfig x264 libmpeg2 xvidcore ];

     

       13
       13
       +
         configureFlags = "--disable-ffmpeg --disable-libavcodec --disable-libavformat

     

       14
       14
       +
           --enable-lzo --enable-ogg --enable-vorbis --enable-theora --enable-libxml2

     

       15
       15
       +
           --enable-x264 --enable-libmpeg2 --enable-xvid";

     

       16
       16
       +
       

     

       17
       17
       +
         enableParallelBuilding = true;

     

       18
       18
       +
       

     

       19
       19
       +
         meta = with stdenv.lib; {

     

       20
       20
       +
           description = "Suite of command line utilities for transcoding video and audio codecs, and for converting beween different container formats";

     

       21
       21
       +
           homepage = http://www.transcoding.org/;

     

       22
       22
       +
           license = licenses.lgpl2Plus;

     

       23
       23
       +
           platforms = platforms.linux;

     

       24
       24
       +
         };

     

       25
       25
       +
       }

+6 -5

pkgs/applications/editors/emacs-modes/structured-haskell-mode/default.nix

···

       1
       1
       -
       { cabal, emacs, haskellSrcExts }:

     

       1
       1
       +
       { cabal, emacs, haskellMode, haskellSrcExts }:

     

       2
       2
        
       

     

       3
       3
        
       cabal.mkDerivation (self: {

     

       4
       4
        
         pname = "structured-haskell-mode";

     

       5
       5
       -
         version = "1.0.2";

     

       6
       6
       -
         sha256 = "1lwdhlr38y5hdr78nplplr3q0hrjhryw378f1857qh0lvp03gwl2";

     

       5
       5
       +
         version = "1.0.3";

     

       6
       6
       +
         sha256 = "0axmw8bj51q8v0wd4jp6giw9dnv0mp7kp8yd16s4nm4hcqgrh5h2";

     

       7
       7
        
         isLibrary = false;

     

       8
       8
        
         isExecutable = true;

     

       9
       9
       -
         buildDepends = [ haskellSrcExts ];

     

       9
       9
       +
         buildDepends = [ haskellSrcExts haskellMode ];

     

       10
       10
        
         buildTools = [ emacs ];

     

       11
       11
        
         postInstall = ''

     

       12
       12
       -
           emacs -L elisp --batch -f batch-byte-compile "elisp/"*.el

     

       12
       12
       +
           emacs -L elisp -L ${haskellMode}/share/emacs/site-lisp \

     

       13
       13
       +
             --batch -f batch-byte-compile "elisp/"*.el

     

       13
       14
        
           install -d $out/share/emacs/site-lisp

     

       14
       15
        
           install "elisp/"*.el "elisp/"*.elc  $out/share/emacs/site-lisp

     

       15
       16
        
         '';

+1 -1

pkgs/applications/editors/vim/configurable.nix

···

       21
       21
        
               # latest release

     

       22
       22
        
             args.fetchhg {

     

       23
       23
        
                   url = "https://vim.googlecode.com/hg/";

     

       24
       24
       -
                   tag = "v7-4-316";

     

       24
       24
       +
                   rev = "v7-4-316";

     

       25
       25
        
                   sha256 = "0scxx33p1ky0wihk04xqpd6rygp1crm0hx446zbjwbsjj6xxn7sx";

     

       26
       26
        
             };

     

       27
       27

+1 -1

pkgs/applications/editors/vim/default.nix

···

       7
       7
        
       

     

       8
       8
        
         src = fetchhg {

     

       9
       9
        
           url = "https://vim.googlecode.com/hg/";

     

       10
       10
       -
           tag = "v7-4-316";

     

       10
       10
       +
           rev = "v7-4-316";

     

       11
       11
        
           sha256 = "0scxx33p1ky0wihk04xqpd6rygp1crm0hx446zbjwbsjj6xxn7sx";

     

       12
       12
        
         };

     

       13
       13

+1 -1

pkgs/applications/graphics/photivo/default.nix

···

       6
       6
        
       

     

       7
       7
        
         src = fetchhg {

     

       8
       8
        
           url = "http://code.google.com/p/photivo/";

     

       9
       9
       -
           tag = "d687864489da";

     

       9
       9
       +
           rev = "d687864489da";

     

       10
       10
        
           sha256 = "0f6y18k7db2ci6xn664zcwm1g1k04sdv7gg1yd5jk41bndjb7z8h";

     

       11
       11
        
         };

     

       12
       12

+31

pkgs/applications/misc/camlistore/default.nix

···

       1
       1
       +
       { stdenv, lib, go, fetchurl }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         version = "0.7";

     

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

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchurl {

     

       8
       8
       +
           url = "https://github.com/bradfitz/camlistore/archive/0.7.tar.gz";

     

       9
       9
       +
           sha256 = "0lc35x2b9llrnma0m5czivly0c3l4lh3ldw9hwn83lkh8n0bzn11";

     

       10
       10
       +
         };

     

       11
       11
       +
       

     

       12
       12
       +
         buildInputs = [ go ];

     

       13
       13
       +
       

     

       14
       14
       +
         buildPhase = ''

     

       15
       15
       +
           go run make.go

     

       16
       16
       +
           rm bin/README

     

       17
       17
       +
         '';

     

       18
       18
       +
       

     

       19
       19
       +
         installPhase = ''

     

       20
       20
       +
           ensureDir $out/bin

     

       21
       21
       +
           cp bin/* $out/bin

     

       22
       22
       +
         '';

     

       23
       23
       +
       

     

       24
       24
       +
         meta = with stdenv.lib; {

     

       25
       25
       +
           description = "Camlistore is a way of storing, syncing, sharing, modelling and backing up content";

     

       26
       26
       +
           homepage = https://camlistore.org;

     

       27
       27
       +
           license = licenses.asl20;

     

       28
       28
       +
           maintainers = with maintainers; [ cstrahan ];

     

       29
       29
       +
           platforms = platforms.unix;

     

       30
       30
       +
         };

     

       31
       31
       +
       }

+5 -5

pkgs/applications/misc/kdeconnect/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, gettext, kdelibs, makeWrapper, qca2, qca2_ossl, qjson }:

     

       1
       1
       +
       { stdenv, fetchurl, gettext, kdelibs, libXtst, makeWrapper, qca2, qca2_ossl, qjson }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

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

     

       5
       5
       -
         version = "0.5.2.1";

     

       5
       5
       +
         version = "0.7";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
       -
           url = "http://download.kde.org/unstable/kdeconnect/0.5.2/src/kdeconnect-kde-${version}.tar.xz";

     

       9
       9
       -
           sha256 = "0g632ha7xcqf839c4h0dz5637bz6gnn2gz76dc0qq09zbrq49i08";

     

       8
       8
       +
           url = "http://download.kde.org/unstable/kdeconnect/${version}/src/kdeconnect-kde-${version}.tar.xz";

     

       9
       9
       +
           sha256 = "0a8g3avg9x5j07cf3c16i4w65q3fn1cbs8zxgq0vl14rzdy09q2j";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         buildInputs = [ gettext kdelibs makeWrapper qca2 qca2_ossl qjson ];

     

       12
       12
       +
         buildInputs = [ gettext kdelibs libXtst makeWrapper qca2 qca2_ossl qjson ];

     

       13
       13
        
       

     

       14
       14
        
         postInstall = ''

     

       15
       15
        
           wrapProgram $out/lib/kde4/libexec/kdeconnectd --prefix QT_PLUGIN_PATH : ${qca2_ossl}/lib/qt4/plugins

+11 -9

pkgs/applications/misc/makeself/default.nix

···

       1
       1
       -
       { stdenv, fetchurl }:

     

       1
       1
       +
       { stdenv, fetchgit }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "makeself-2.1.5";

     

       5
       5
       -
         src = fetchurl {

     

       6
       6
       -
           url = "http://megastep.org/makeself/makeself.run";

     

       7
       7
       -
           sha256 = "0khs19xpid4ng0igrjyz3vsi6a5xyixrrrhgdxpdhd2wnf5nc9w2";

     

       4
       4
       +
         name = "makeself-2.2.0";

     

       5
       5
       +
         src = fetchgit {

     

       6
       6
       +
           url = "https://github.com/megastep/makeself.git";

     

       7
       7
       +
           rev = "b836b9281ae99abe1865608b065551da56c80719";

     

       8
       8
       +
           sha256 = "f7c97f0f8ad8128f2f1b54383319f2cc44cbb05b60ced222784debdf326f23ad";

     

       8
       9
        
         };

     

       9
       9
       -
         unpackPhase = "sh ${src}";

     

       10
       10
        
         installPhase = ''

     

       11
       11
       -
           cd ${name}

     

       12
       11
        
           mkdir -p $out/{bin,share/{${name},man/man1}}

     

       13
       13
       -
           mv makeself.lsm README $out/share/${name}

     

       12
       12
       +
           mv makeself.lsm README.md $out/share/${name}

     

       14
       13
        
           mv makeself.sh $out/bin/makeself

     

       15
       14
        
           mv makeself.1  $out/share/man/man1/

     

       16
       15
        
           mv makeself-header.sh $out/share/${name}

     

       17
       16
        
           sed -e 's|HEADER=`dirname $0`/makeself-header.sh|HEADER=`dirname $0`/../share/${name}/makeself-header.sh|' -i $out/bin/makeself

     

       18
       17
        
         '';

     

       19
       19
       -
         meta = {

     

       18
       18
       +
         meta = with stdenv.lib; {

     

       20
       19
        
           homepage = http://megastep.org/makeself;

     

       21
       20
        
           description = "Utility to create self-extracting packages";

     

       21
       21
       +
           license = licenses.gpl2;

     

       22
       22
       +
           maintainer = maintainers.wmertens;

     

       23
       23
       +
           platforms = platforms.all;

     

       22
       24
        
         };

     

       23
       25
        
       }

+3 -3

pkgs/applications/misc/nc-indicators/default.nix

···

       2
       2
        
       

     

       3
       3
        
       cabal.mkDerivation (self: {

     

       4
       4
        
         pname = "nc-indicators";

     

       5
       5
       -
         version = "0.1";

     

       6
       6
       -
         sha256 = "19amwfcbwfxcj0gr7w0vgxl427l43q3l2s3n3zsxhqwkfblxmfy5";

     

       5
       5
       +
         version = "0.2";

     

       6
       6
       +
         sha256 = "0z3h0d3cl0xapysq5sh1rnbp8fg8adlq0x3i4ql9xin9in29q27q";

     

       7
       7
        
         isLibrary = false;

     

       8
       8
        
         isExecutable = true;

     

       9
       9
        
         buildDepends = [ attoparsec gtk hflags lens pipes stm ];

     

       10
       10
        
         meta = {

     

       11
       11
       -
           homepage = "https://github.com/nilcons/nc-indicators/issues";

     

       11
       11
       +
           homepage = "https://github.com/nilcons/nc-indicators";

     

       12
       12
        
           description = "CPU load and memory usage indicators for i3bar";

     

       13
       13
        
           license = self.stdenv.lib.licenses.asl20;

     

       14
       14
        
           platforms = self.ghc.meta.platforms;

+1 -1

pkgs/applications/misc/ocropus/default.nix

···

       40
       40
        
       

     

       41
       41
        
         src = fetchhg {

     

       42
       42
        
           url = "https://code.google.com/p/ocropus.ocropy";

     

       43
       43
       -
           tag = "a6e0fbd820ce";

     

       43
       43
       +
           rev = "a6e0fbd820ce";

     

       44
       44
        
           sha256 = "1s0v0gd6psfjp6lghwl2dj49h18mgf2n2z8hqzw8430nzhglnlvr";

     

       45
       45
        
         };

     

       46
       46

+2 -2

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

···

       1
       1
        
       { stdenv, fetchgit, pkgconfig, makeWrapper, libsoup, webkit, gtk3, gnutls, json_c,

     

       2
       2
       -
         m4, glib_networking, gsettings_desktop_schemas }:

     

       2
       2
       +
         m4, glib_networking, gsettings_desktop_schemas, dconf }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation {

     

       5
       5
        
         name = "dwb-2014-06-17";

     
···

       19
       19
        
       

     

       20
       20
        
         preFixup=''

     

       21
       21
        
           wrapProgram "$out/bin/dwb" \

     

       22
       22
       -
            --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \

     

       22
       22
       +
            --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules:${dconf}/lib/gio/modules" \

     

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

     

       24
       24
        
           wrapProgram "$out/bin/dwbem" \

     

       25
       25
        
            --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules"

+337

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

···

       1
       1
       +
       # This file is generated from generate_nix.rb

     

       2
       2
       +
       # Execute the following command in a temporary directory to update the file.

     

       3
       3
       +
       #

     

       4
       4
       +
       # ruby generate_nix.rb > default.nix

     

       5
       5
       +
       

     

       6
       6
       +
       { stdenv, fetchurl, config

     

       7
       7
       +
       , alsaLib

     

       8
       8
       +
       , atk

     

       9
       9
       +
       , cairo

     

       10
       10
       +
       , cups

     

       11
       11
       +
       , dbus_glib

     

       12
       12
       +
       , dbus_libs

     

       13
       13
       +
       , fontconfig

     

       14
       14
       +
       , freetype

     

       15
       15
       +
       , gconf

     

       16
       16
       +
       , gdk_pixbuf

     

       17
       17
       +
       , glib

     

       18
       18
       +
       , glibc

     

       19
       19
       +
       , gst_plugins_base

     

       20
       20
       +
       , gstreamer

     

       21
       21
       +
       , gtk

     

       22
       22
       +
       , libX11

     

       23
       23
       +
       , libXScrnSaver

     

       24
       24
       +
       , libXext

     

       25
       25
       +
       , libXinerama

     

       26
       26
       +
       , libXrender

     

       27
       27
       +
       , libXt

     

       28
       28
       +
       , libcanberra

     

       29
       29
       +
       , libgnome

     

       30
       30
       +
       , libgnomeui

     

       31
       31
       +
       , mesa

     

       32
       32
       +
       , nspr

     

       33
       33
       +
       , nss

     

       34
       34
       +
       , pango

     

       35
       35
       +
       , heimdal

     

       36
       36
       +
       , pulseaudio

     

       37
       37
       +
       , systemd

     

       38
       38
       +
       }:

     

       39
       39
       +
       

     

       40
       40
       +
       let

     

       41
       41
       +
         version = "30.0";

     

       42
       42
       +
         sources = [

     

       43
       43
       +
           { locale = "ach"; arch = "linux-i686"; sha256 = "44d2fc9d491b6c001e35cff6e5f1c38c8561d24f8fe2dfb4d79365bcabe965ea"; }

     

       44
       44
       +
           { locale = "ach"; arch = "linux-x86_64"; sha256 = "e9fb52a3b82a1434b7fa3bae606749819672c96ce8678c51f1fdbc68520e26bf"; }

     

       45
       45
       +
           { locale = "af"; arch = "linux-i686"; sha256 = "bfce74c891ea370ce4e0fe43d578c3c0050d2655fff7372806ed6be338b2c438"; }

     

       46
       46
       +
           { locale = "af"; arch = "linux-x86_64"; sha256 = "18408a9c3f3b8c4d9f8cfe067ac23ddcdd3d3a7a22892ba8d74de5679a064db6"; }

     

       47
       47
       +
           { locale = "an"; arch = "linux-i686"; sha256 = "601efbf7944408ba1ac35831eaa92c4910cd904bfadc32895ff8d756c70ae934"; }

     

       48
       48
       +
           { locale = "an"; arch = "linux-x86_64"; sha256 = "0ba4c272ebac9ecafe5dbfb7fbba1cd2790d126f5b1756ab9a323c94b644df0b"; }

     

       49
       49
       +
           { locale = "ar"; arch = "linux-i686"; sha256 = "23ea3168aea75b044fa217b78b01a2dc8c9dd92171d726c4a78c23cffc474469"; }

     

       50
       50
       +
           { locale = "ar"; arch = "linux-x86_64"; sha256 = "dae2c1634e17b8c3e276e4c758c4d4c3b1b0d6006adac8e420c13b6f09a6cf53"; }

     

       51
       51
       +
           { locale = "as"; arch = "linux-i686"; sha256 = "7d36bd4589556374822f2ab5dd102d557257b5e0b529d1c963f96e9ab6a08850"; }

     

       52
       52
       +
           { locale = "as"; arch = "linux-x86_64"; sha256 = "c13ccf3546bafcfeb41c33762e41af249306d4bcfd3ad7fc957db481372be0dc"; }

     

       53
       53
       +
           { locale = "ast"; arch = "linux-i686"; sha256 = "853310674d7011956d760883af15b8e343250f8fc3acb3067e0f5a3d978c06ff"; }

     

       54
       54
       +
           { locale = "ast"; arch = "linux-x86_64"; sha256 = "2b938081e8672ed5ae16c40c6300e585a26f54da278726f48b98f3ca3e065662"; }

     

       55
       55
       +
           { locale = "be"; arch = "linux-i686"; sha256 = "b9acce210f2adf188ba9a3d92774a846a263baa5e076bb9452b89ca5609d6ac8"; }

     

       56
       56
       +
           { locale = "be"; arch = "linux-x86_64"; sha256 = "dd2a33ee1ed8c848454b6e64a0c1527f193d070e4d867c4f13fa84f39c9bfecd"; }

     

       57
       57
       +
           { locale = "bg"; arch = "linux-i686"; sha256 = "ee060cd395ef28bbad4be74aa42e2a51e7ad866183d139bffbcc7634dc94d738"; }

     

       58
       58
       +
           { locale = "bg"; arch = "linux-x86_64"; sha256 = "11a5dd807083da8c3132d9d6518dc674642418eff1fccf68e451ac67b90f141a"; }

     

       59
       59
       +
           { locale = "bn-BD"; arch = "linux-i686"; sha256 = "339d286f7f8f469bb6f9f85a8b21a745ecc42717dc91c21c7db88822e9be661a"; }

     

       60
       60
       +
           { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "fc3f06743a84a7684e43cd4efedb02a126dd119f6141da49c6120f1bbcdf9392"; }

     

       61
       61
       +
           { locale = "bn-IN"; arch = "linux-i686"; sha256 = "c585982368f258a8a728f782c37428311f0b6a6512231c077a439dd93645c3a2"; }

     

       62
       62
       +
           { locale = "bn-IN"; arch = "linux-x86_64"; sha256 = "00b9af4425050ec42b4a45a3c4a16700edcc66297331b601950fb81421ef8eb4"; }

     

       63
       63
       +
           { locale = "br"; arch = "linux-i686"; sha256 = "b86d944592f16f5f0e558106e3464248e3d686f45527a40fb64aaa79d9f73422"; }

     

       64
       64
       +
           { locale = "br"; arch = "linux-x86_64"; sha256 = "b894c12508f0b0a892154ea61fb2bb01947929041a63518f7c405ed976cc4d3f"; }

     

       65
       65
       +
           { locale = "bs"; arch = "linux-i686"; sha256 = "f7da0fead608f63c4a5be92fed9e0109fbe7288948d15dde05e10bba80b47743"; }

     

       66
       66
       +
           { locale = "bs"; arch = "linux-x86_64"; sha256 = "1cb090f9b16bcae95055377bc14a531697c480ad50e3a098dbd572770924d558"; }

     

       67
       67
       +
           { locale = "ca"; arch = "linux-i686"; sha256 = "0b36330715f8909e1515c535a06f4e3fdd7660de11b3424b4ce88f336561935f"; }

     

       68
       68
       +
           { locale = "ca"; arch = "linux-x86_64"; sha256 = "c6e9e545d09e589fd5fbfd2c6482a5ef366c470e294823b3ba05c5e728bca2c2"; }

     

       69
       69
       +
           { locale = "cs"; arch = "linux-i686"; sha256 = "ff1ca239be0e99b923c63c5bbc425dd2989bc40dbdc82dd731d7173fd539406a"; }

     

       70
       70
       +
           { locale = "cs"; arch = "linux-x86_64"; sha256 = "fe8472d6a4bf9fcda3caef51449fc3e20e1fbadbb772b330a012ffa7219afae3"; }

     

       71
       71
       +
           { locale = "csb"; arch = "linux-i686"; sha256 = "db1b7dbc7b0cd564a04b3a37827e8d77277cd7ba6a59403c45115d34e637f463"; }

     

       72
       72
       +
           { locale = "csb"; arch = "linux-x86_64"; sha256 = "023dd75e02f41a2ce9991fb40a8a46767f1a10da876a390035a084c5b97bd9d2"; }

     

       73
       73
       +
           { locale = "cy"; arch = "linux-i686"; sha256 = "9a6ac60099b03bdeb71c1a7739dafeff4b1682ffc43997191196e1f590421afa"; }

     

       74
       74
       +
           { locale = "cy"; arch = "linux-x86_64"; sha256 = "a5f2030fb08c0dd6dff95310209ed7c6ee613680dd500f00e30e26c547f9c249"; }

     

       75
       75
       +
           { locale = "da"; arch = "linux-i686"; sha256 = "99a893ac19b0ca28177c8957d7296e6deef9ddb36a6b5b17823cb1e6fc9ec683"; }

     

       76
       76
       +
           { locale = "da"; arch = "linux-x86_64"; sha256 = "69f29e795f203fe47e22daf1259c2ecfb39c362babefbbccb31405f4632f236b"; }

     

       77
       77
       +
           { locale = "de"; arch = "linux-i686"; sha256 = "925aac0800ce63a88fadc945da40b00ed6dde327637821518a372d7affb6e450"; }

     

       78
       78
       +
           { locale = "de"; arch = "linux-x86_64"; sha256 = "d86c5d2102a95ff5a6e580a1ca7af25c2f470211182ef70e988b29b195be6dd4"; }

     

       79
       79
       +
           { locale = "el"; arch = "linux-i686"; sha256 = "af07fac82dea32d33bd6bc440e2a645eb160d196cf0d4883b878d3d2c584f81a"; }

     

       80
       80
       +
           { locale = "el"; arch = "linux-x86_64"; sha256 = "fcc96c25422837f19f9ff6cde02c81c4a5a3b7c8e6809b90c8761519571db1f6"; }

     

       81
       81
       +
           { locale = "en-GB"; arch = "linux-i686"; sha256 = "758f7bb669743d6067e416c26f43806b16ddd16511a6818373e70960cbbd7151"; }

     

       82
       82
       +
           { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "d46ba3d642bf43fca46dfb29efb5d08a15f114eb9facc868e86c31f7c9c98014"; }

     

       83
       83
       +
           { locale = "en-US"; arch = "linux-i686"; sha256 = "4bca44a1ba94bf5616f7ea650e37cd3e5a719546def9e4a08ee88aedbc3a4db6"; }

     

       84
       84
       +
           { locale = "en-US"; arch = "linux-x86_64"; sha256 = "3303cc600153d0198dace9826b6883aa510d4e380aa985b092b1da67ad865625"; }

     

       85
       85
       +
           { locale = "en-ZA"; arch = "linux-i686"; sha256 = "13736870573863aab644bf2be2219fe4b5c6bde4bd79b84f22e12d39e7cda6e0"; }

     

       86
       86
       +
           { locale = "en-ZA"; arch = "linux-x86_64"; sha256 = "7e88fa9f355f6787d38e75d86d5b592a1a2cec208255f276887f53a12beb9e97"; }

     

       87
       87
       +
           { locale = "eo"; arch = "linux-i686"; sha256 = "ae4446e223c0169dd0b56db58760fdb323a2bec8135e45c79d385d895b64cee8"; }

     

       88
       88
       +
           { locale = "eo"; arch = "linux-x86_64"; sha256 = "202f61dd8e5506594ae70bbee9150d86c8037887f8345871dc5c1c9e498b1d66"; }

     

       89
       89
       +
           { locale = "es-AR"; arch = "linux-i686"; sha256 = "8fb276ed26fd46fceb029fbade706cb6e55d2958f03400ec1290784c533888c4"; }

     

       90
       90
       +
           { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "78130525d30d7c592bb63d7cedf3ab5db804d457c4d127d90b93d94501ad7b3c"; }

     

       91
       91
       +
           { locale = "es-CL"; arch = "linux-i686"; sha256 = "ef6bf393a681f4a08031eeda61bba3614ebfab222fed43f9f8b21cfa8eb3862e"; }

     

       92
       92
       +
           { locale = "es-CL"; arch = "linux-x86_64"; sha256 = "e56224bca0ebfab9eedecafafd792e48cb67e3f8741c4d5a94c8f74f634cecf6"; }

     

       93
       93
       +
           { locale = "es-ES"; arch = "linux-i686"; sha256 = "9e007e6aa0f8aa3d1fac5dc13e98f81c23e6ff1e574545c021f8f7feeff86ce2"; }

     

       94
       94
       +
           { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "d4ff94f46fd086300992a30a1c4a8aa97ad7164d6cd26e82b20b5d0680b38169"; }

     

       95
       95
       +
           { locale = "es-MX"; arch = "linux-i686"; sha256 = "9db42a0557838b23ac4937adfec407804e624e679e9ffd6da739d17cdfbaab78"; }

     

       96
       96
       +
           { locale = "es-MX"; arch = "linux-x86_64"; sha256 = "d42d619d6da78d0bbcb32b0a93a2eaa623eadb3a5af43e5b8b14400e6e969779"; }

     

       97
       97
       +
           { locale = "et"; arch = "linux-i686"; sha256 = "5947822f3f02bd4ba530ad978de1a9d237981e3abdf1598e44095c650794d1ff"; }

     

       98
       98
       +
           { locale = "et"; arch = "linux-x86_64"; sha256 = "7521a4db287bb928f50b64817f3631e96ea4cead81b1a84ab7c3b930b3450e86"; }

     

       99
       99
       +
           { locale = "eu"; arch = "linux-i686"; sha256 = "44095e98e74205fa012a2c0c636de3fe9cfb79d5729abf15214c1e7734946014"; }

     

       100
       100
       +
           { locale = "eu"; arch = "linux-x86_64"; sha256 = "2032dfbc82a9aca1a2f4cf67e6089400bf305d13906f048c5c9b906a7201a9fb"; }

     

       101
       101
       +
           { locale = "fa"; arch = "linux-i686"; sha256 = "469b8008287c93e152e762e82fb61644384c1e2631a6c45033503652daed09b1"; }

     

       102
       102
       +
           { locale = "fa"; arch = "linux-x86_64"; sha256 = "61ea0d8941d22083f918d014d56a613788d1f4f549e5a62d50a1f9071439a36f"; }

     

       103
       103
       +
           { locale = "ff"; arch = "linux-i686"; sha256 = "81a0083e5e4136e3ab3e6db0e2adcedfae7572722655a9cb8b9ca388c6057342"; }

     

       104
       104
       +
           { locale = "ff"; arch = "linux-x86_64"; sha256 = "0efe16da918288754a3af816d72448a73690eb71b110cf3ff0586ee7505b9735"; }

     

       105
       105
       +
           { locale = "fi"; arch = "linux-i686"; sha256 = "a0ee069e7c3100b921aab7c54c5d32741df4e058f52cb7f42acb2643bd534b30"; }

     

       106
       106
       +
           { locale = "fi"; arch = "linux-x86_64"; sha256 = "55c84d504603d648e7d72a2fb8badb0bc9148cb376bb0cc6054f091867cb2613"; }

     

       107
       107
       +
           { locale = "fr"; arch = "linux-i686"; sha256 = "9c9abea13db23ef5ef8c9a3ccb5a0702b44a8db2402f43f01a478eb61e7ddf34"; }

     

       108
       108
       +
           { locale = "fr"; arch = "linux-x86_64"; sha256 = "ce26fc67cbc2031880ffa3529a59ca4122016258ab1c023e23247c26308b6a3e"; }

     

       109
       109
       +
           { locale = "fy-NL"; arch = "linux-i686"; sha256 = "4a734880ed65a207d98630647a341644df4f68149c50ce5e683bb21b5c27f2c6"; }

     

       110
       110
       +
           { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "bace955c686456d7894ca7bc1cf854eb158d6183050318efc73768e232c9a413"; }

     

       111
       111
       +
           { locale = "ga-IE"; arch = "linux-i686"; sha256 = "4801f40ebd820b8f229cfcd04a04351fcee9f78268af1c9863089ef6c64d736a"; }

     

       112
       112
       +
           { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "c417c0182e6f706473bc4b7cf8c14aec96f96e21c17b8593b71ff38c97f7e9d2"; }

     

       113
       113
       +
           { locale = "gd"; arch = "linux-i686"; sha256 = "15a9d316d472d2918eff0c6f02600e40a8f62d7ef53ab14c57537fdda0b5257a"; }

     

       114
       114
       +
           { locale = "gd"; arch = "linux-x86_64"; sha256 = "8fcdcf093148222865a905586774dae5d805ef22c01afadeaabe3f0c7b315dba"; }

     

       115
       115
       +
           { locale = "gl"; arch = "linux-i686"; sha256 = "83b0ccfe7cf7166899d17b2c9b1ea8effda9cf02024698f8db8f943a388bb3dc"; }

     

       116
       116
       +
           { locale = "gl"; arch = "linux-x86_64"; sha256 = "550026595e6e59405b5869183af056ba5a60a303270f1a176ef25e3db1c70289"; }

     

       117
       117
       +
           { locale = "gu-IN"; arch = "linux-i686"; sha256 = "7e7dc86fa805808931ba57455b99c9273a4b0aa60998affce3c4b06f0ae7fc70"; }

     

       118
       118
       +
           { locale = "gu-IN"; arch = "linux-x86_64"; sha256 = "e0f35d7fe7875785e3749131cf86c5cbea5cbd7b3abd2c2c69f5f8376d3e53d7"; }

     

       119
       119
       +
           { locale = "he"; arch = "linux-i686"; sha256 = "5c200c8da3209c2120a8576c30ab609331b52807d0640daaa1a70f665c776969"; }

     

       120
       120
       +
           { locale = "he"; arch = "linux-x86_64"; sha256 = "6923a64d1ac5453453f148d38f116faca41be5b1d0a13d4f128bb73db67cb8e2"; }

     

       121
       121
       +
           { locale = "hi-IN"; arch = "linux-i686"; sha256 = "6a7e5d06169d6dd87e505012604c93a28440156a3f81e6fe24d567f9c2b2a919"; }

     

       122
       122
       +
           { locale = "hi-IN"; arch = "linux-x86_64"; sha256 = "56801593b9dd5ecefed8d7eaf438879dd23006ffff9a31c543861259dedf8263"; }

     

       123
       123
       +
           { locale = "hr"; arch = "linux-i686"; sha256 = "4573cd0269639d122496bcaf842d8c741f4d54e8f57d0690b97d8e7e86ee7e74"; }

     

       124
       124
       +
           { locale = "hr"; arch = "linux-x86_64"; sha256 = "753984384829229601fbe55d0b6615f3432fdf9babe908fb642f6ac79c749727"; }

     

       125
       125
       +
           { locale = "hu"; arch = "linux-i686"; sha256 = "c330478e6e77eff117bce58e17661b83a30308f0a680f648fbf06d1c00f3883c"; }

     

       126
       126
       +
           { locale = "hu"; arch = "linux-x86_64"; sha256 = "9d118ba236aa7a9b517278c375aa4e4fa65f85c71b8bea9c41702f6ae7b815cb"; }

     

       127
       127
       +
           { locale = "hy-AM"; arch = "linux-i686"; sha256 = "48c1691073b6ede77f5c5d5ae07af7372f17b9f52fd92950c2cca0a01b3b340e"; }

     

       128
       128
       +
           { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "beda26cefeeeeee59ea52fdd28e1e3025ca4cc3124541fc6825100a61eb398d8"; }

     

       129
       129
       +
           { locale = "id"; arch = "linux-i686"; sha256 = "8cf6d0bc2d4bcc68a5ddc935c3bd6ed19a63284dc3227e849be729645a6171d4"; }

     

       130
       130
       +
           { locale = "id"; arch = "linux-x86_64"; sha256 = "8be5900b83840871ffb6faba08fea9b35f9f396cae08b228c68e333719fb819f"; }

     

       131
       131
       +
           { locale = "is"; arch = "linux-i686"; sha256 = "7c167389105063b84d507b09c689fa18bf854fd695010c8273b9711b21a24034"; }

     

       132
       132
       +
           { locale = "is"; arch = "linux-x86_64"; sha256 = "c79321c83c9e654f6eaf96ddf5d24f279d517fbf35dfdf923acf026124919598"; }

     

       133
       133
       +
           { locale = "it"; arch = "linux-i686"; sha256 = "a3eb17e0eda3cbf8ffbbd1ecd1716929ac87a801f060dd8ed5291298667775a9"; }

     

       134
       134
       +
           { locale = "it"; arch = "linux-x86_64"; sha256 = "3742453f0748911b393fed804e5827f014cc595a9df4516438dfa163d5050411"; }

     

       135
       135
       +
           { locale = "ja"; arch = "linux-i686"; sha256 = "fa030c64e04766ae5200370586c08b2f25627343586cd8a0486e583f345c466e"; }

     

       136
       136
       +
           { locale = "ja"; arch = "linux-x86_64"; sha256 = "fddeae03ffdfef0f6cc999807e001ea931c15b1833da48655bcb5845f1e017a3"; }

     

       137
       137
       +
           { locale = "kk"; arch = "linux-i686"; sha256 = "39d94b10fa751faf7423e5d43cd07ef4485ff26e21e47d106d2268058e2f33d9"; }

     

       138
       138
       +
           { locale = "kk"; arch = "linux-x86_64"; sha256 = "1dc7138dd5c08088479c5e7e8054d7ed640504860a0043ecea2c8b0c9c1892f9"; }

     

       139
       139
       +
           { locale = "km"; arch = "linux-i686"; sha256 = "0d12a305de4a63fc6c6394bd4044f44ca3626cbc41ca9ef1adad6d5041f6f1fd"; }

     

       140
       140
       +
           { locale = "km"; arch = "linux-x86_64"; sha256 = "7710091695dd100b7f33585fce58c54fec462a96540a7d791f1935088f21fadf"; }

     

       141
       141
       +
           { locale = "kn"; arch = "linux-i686"; sha256 = "b039e6a1114522ccae10b89ab794a222966fbf0914513b3c14f05c082a78b922"; }

     

       142
       142
       +
           { locale = "kn"; arch = "linux-x86_64"; sha256 = "cf82965b25d3990a57d861d688f1bd69e5b069fe281937274060ebe36ddbb8a6"; }

     

       143
       143
       +
           { locale = "ko"; arch = "linux-i686"; sha256 = "8b9378d39d7b42852c2bb537b0e85312760c343e6485826ed949ab4617293025"; }

     

       144
       144
       +
           { locale = "ko"; arch = "linux-x86_64"; sha256 = "4b946a0cbedad2b8d0c3598c04eeb058cea05d6d7e6388e4cfa3146a40f7c449"; }

     

       145
       145
       +
           { locale = "ku"; arch = "linux-i686"; sha256 = "11950c4a54c6a165e924fb6e68bcc46d63b5fddfcd2561c58a0ce401c0146d36"; }

     

       146
       146
       +
           { locale = "ku"; arch = "linux-x86_64"; sha256 = "37a07a4e059580c31433b419bcd61d928ad1db7e607cf8443378472d54b61b78"; }

     

       147
       147
       +
           { locale = "lij"; arch = "linux-i686"; sha256 = "c0efca49f31800a3773b0d05add56b195d1cbea287108803bb1ef5249a0dc94f"; }

     

       148
       148
       +
           { locale = "lij"; arch = "linux-x86_64"; sha256 = "6e4b2d8c5e9942bc469f722110ba310b2ccdc4dda6e3baee93ae54012ae658a2"; }

     

       149
       149
       +
           { locale = "lt"; arch = "linux-i686"; sha256 = "acde9010aa815f6645868b03f3d68d9a24c450ed830f063e2846ac1219ee628b"; }

     

       150
       150
       +
           { locale = "lt"; arch = "linux-x86_64"; sha256 = "c2491cd3e5d11c302d7ec3191d646e2073c46f69966fc382901a93d16fb0c902"; }

     

       151
       151
       +
           { locale = "lv"; arch = "linux-i686"; sha256 = "7411de62c4d8c01c8bb15b3f2dfc2e2ed17755e2f9856ead8e5e0fd05971ffd5"; }

     

       152
       152
       +
           { locale = "lv"; arch = "linux-x86_64"; sha256 = "e8e57e629396eb180e0041a50ae98ecb2292f514d423423748e4d4cebc54fb59"; }

     

       153
       153
       +
           { locale = "mai"; arch = "linux-i686"; sha256 = "26a053e48f4e6f04e4856a0dcb26e577a6ddb99afc883786d9c260d57e5e4a6d"; }

     

       154
       154
       +
           { locale = "mai"; arch = "linux-x86_64"; sha256 = "86be2c736aa5ccf926d44f24afdb2d40c28444b5bd6cf090f9a847199b38b492"; }

     

       155
       155
       +
           { locale = "mk"; arch = "linux-i686"; sha256 = "dcf7759bcde70158298ad9e2434e37d4e8240e00589a83dd8dbba53c35466a58"; }

     

       156
       156
       +
           { locale = "mk"; arch = "linux-x86_64"; sha256 = "056297d6404794a8da78aeceb620b0ebbcb38a693ee1079cc02e4d0411e40ec3"; }

     

       157
       157
       +
           { locale = "ml"; arch = "linux-i686"; sha256 = "2d632b3a5b60f18955906adca80b7ac7af3bfa39d03afd308efd1136cfc8971d"; }

     

       158
       158
       +
           { locale = "ml"; arch = "linux-x86_64"; sha256 = "b54a9d47cadeae4f92d22a362ca887a18a16ef64500149ac8eb9355dbbe5971b"; }

     

       159
       159
       +
           { locale = "mr"; arch = "linux-i686"; sha256 = "e66b22488bf2c772fa6d29cf43f3e9c1aa2a1a867620a1144af8cb92c2647651"; }

     

       160
       160
       +
           { locale = "mr"; arch = "linux-x86_64"; sha256 = "da982205e9b659dd66ab05ca815324642bed2117e668e67ad620bb2d87c5d1c8"; }

     

       161
       161
       +
           { locale = "ms"; arch = "linux-i686"; sha256 = "ad39ffa6d6d765c1e983d885f5d139a28e481d536068d517b4807137fa8d3036"; }

     

       162
       162
       +
           { locale = "ms"; arch = "linux-x86_64"; sha256 = "fb1b6ed5e2e7247beb69f3d0ad937f76ce7c1107ccdad742ff5085d4b3a8da98"; }

     

       163
       163
       +
           { locale = "nb-NO"; arch = "linux-i686"; sha256 = "5220da4627863f9fa1c11886e9c19c315547afafa96c98b22a1a4359c75f1056"; }

     

       164
       164
       +
           { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "5f9d60faadc7b76b010cd9cf35922b1881377b535e8afc5d9b974651156df866"; }

     

       165
       165
       +
           { locale = "nl"; arch = "linux-i686"; sha256 = "357b28841ea861b8297a4986460d1d265b27202c37bb296dcc69224f9b07fc51"; }

     

       166
       166
       +
           { locale = "nl"; arch = "linux-x86_64"; sha256 = "9a8505da2fe045ab6c2a2277d2d043374a26f106a5966b00f42e22fb26cf929a"; }

     

       167
       167
       +
           { locale = "nn-NO"; arch = "linux-i686"; sha256 = "f115bb50d1e052584caf7363db875ae222ee37449fa151e2f313c157a6274d76"; }

     

       168
       168
       +
           { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "2e7829a8a20c946bddce13b7b3d1b3600f90d90d2438f3eb69188d47203b264d"; }

     

       169
       169
       +
           { locale = "or"; arch = "linux-i686"; sha256 = "9ad48bdf2b7f1deedb05bdcc49740d5075ebf6ec228d82a7ed455c6bb36d7cb0"; }

     

       170
       170
       +
           { locale = "or"; arch = "linux-x86_64"; sha256 = "a007bc73fb1ea7765016e9faebac2c4f5e0111a45b3d75d1e55f4de8931796a2"; }

     

       171
       171
       +
           { locale = "pa-IN"; arch = "linux-i686"; sha256 = "8a38d2b1516ed4b58e36d266cd25a5bd10548f9e412076c9b4f1f27256c98c2a"; }

     

       172
       172
       +
           { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "664fa562261532d0f6bad10b84e15d47b69073768c2d12986c8d776eb1af8ddd"; }

     

       173
       173
       +
           { locale = "pl"; arch = "linux-i686"; sha256 = "3bb8963f1e3dcdb22cc55feebb2583fefd6f3760f4e6f2cc754174079d4ca07f"; }

     

       174
       174
       +
           { locale = "pl"; arch = "linux-x86_64"; sha256 = "710f1d86d2974d6ad3c63ebc0873518fd59f218ba07b27d06fb75c83af2c632e"; }

     

       175
       175
       +
           { locale = "pt-BR"; arch = "linux-i686"; sha256 = "cd2fafbd2291bad8481c4086db3c2973a7869b28a5e68a5ff199079814c6b3fc"; }

     

       176
       176
       +
           { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "f0ba5dc2366757841afb9c9f7799c40667304c36efe7da284202e8e7a45aa1fc"; }

     

       177
       177
       +
           { locale = "pt-PT"; arch = "linux-i686"; sha256 = "051af14810ad0cee4487757833f1f5b4a6f6f903f3cecf00d00410c1324d9ce4"; }

     

       178
       178
       +
           { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "82102b33dc1989bc3aa49da3915baf7e4012afe6e4bd7f80a301dfe847f3dbbe"; }

     

       179
       179
       +
           { locale = "rm"; arch = "linux-i686"; sha256 = "02051668e46d98f4e2e5becc3192f6173dfdf3a48cc82264c5821be06c5e12a0"; }

     

       180
       180
       +
           { locale = "rm"; arch = "linux-x86_64"; sha256 = "9600c1d272785b946058ffac9e57a8b1701d065f24fa940ad22e4b5aec2efad9"; }

     

       181
       181
       +
           { locale = "ro"; arch = "linux-i686"; sha256 = "7f17cbd3041396135eee08eac597c8c6a936e5a33d67d2b5de8ae157a56719ad"; }

     

       182
       182
       +
           { locale = "ro"; arch = "linux-x86_64"; sha256 = "ba1de85abe53a7d66f6311d6a202d91f86e871bace168cf60a759ab0e17eccdb"; }

     

       183
       183
       +
           { locale = "ru"; arch = "linux-i686"; sha256 = "9dcd0c2b5671fc5849b01f2932504a7217fca9a4b4eca8e9b6ff8f5a146517e2"; }

     

       184
       184
       +
           { locale = "ru"; arch = "linux-x86_64"; sha256 = "725214900968e4e648d3d13635bf72d34910eb31a30b83a3e7ba9c5c4085c2d7"; }

     

       185
       185
       +
           { locale = "si"; arch = "linux-i686"; sha256 = "d22ed75aa727351efcdba1cffe8e24ff305943c9a3072cac08b004677cf6a028"; }

     

       186
       186
       +
           { locale = "si"; arch = "linux-x86_64"; sha256 = "89d60c682413949a6dad4b7fd49cc4508c4e067fe5847c5f21d5e25a953f195f"; }

     

       187
       187
       +
           { locale = "sk"; arch = "linux-i686"; sha256 = "4ecbc58df00eaf4fafb1c33a93493bdd3e544562a67c60e2d4d93da90d369261"; }

     

       188
       188
       +
           { locale = "sk"; arch = "linux-x86_64"; sha256 = "75baa2c5153e282e2671d6222b7fc8c3b9cfc2b9ee0a595a4451fd314a928fb4"; }

     

       189
       189
       +
           { locale = "sl"; arch = "linux-i686"; sha256 = "53e2ae3525d0bd2005a86bf7ed3f27ca66906ddfceb85a738bd60e46ba2df773"; }

     

       190
       190
       +
           { locale = "sl"; arch = "linux-x86_64"; sha256 = "2dcc5592a49767dc3f2a7d40387bb550fd36724419ff567f9d107e32b2cf2d6d"; }

     

       191
       191
       +
           { locale = "son"; arch = "linux-i686"; sha256 = "d3b7372c59b21d0393768197517b3666ab78705b04a6e84a3345da031bad3776"; }

     

       192
       192
       +
           { locale = "son"; arch = "linux-x86_64"; sha256 = "fc017e7a18701880c7a54c23a0f77a6521aae17880dbc562e2b37167ba918fa0"; }

     

       193
       193
       +
           { locale = "sq"; arch = "linux-i686"; sha256 = "7f9c9100c559ebfbfff35adc694199079930f4bf9f1f6a820c0e17d80ea0e12b"; }

     

       194
       194
       +
           { locale = "sq"; arch = "linux-x86_64"; sha256 = "0f3fcddabab8263eb4c238942c45c0b5efc20c169948da24c56ed401a85209dc"; }

     

       195
       195
       +
           { locale = "sr"; arch = "linux-i686"; sha256 = "6281e2f849b3c530ff383cfd4cdc4ab06115362c3d57ba8133a9f799af08e815"; }

     

       196
       196
       +
           { locale = "sr"; arch = "linux-x86_64"; sha256 = "368ca83faa5ef3640f71d977916614369ebac1622681e828b75e9abf6ebeb425"; }

     

       197
       197
       +
           { locale = "sv-SE"; arch = "linux-i686"; sha256 = "9f77f497fc3e8c585bd546c0bb95c92f9f37d683e092c0762b3fe0022b6d39b5"; }

     

       198
       198
       +
           { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "0aa21764f0ca58591e3cfebba75196edd51a8fdbadb738f036994178c9612a67"; }

     

       199
       199
       +
           { locale = "ta"; arch = "linux-i686"; sha256 = "463ce70405d84945c201cca56c84171e097e6a0420d38cd453a0836fad82f09c"; }

     

       200
       200
       +
           { locale = "ta"; arch = "linux-x86_64"; sha256 = "db7e78bc1f4bcb573474806d19324eca58f42008fb0b0fa856f701f1430aeefd"; }

     

       201
       201
       +
           { locale = "te"; arch = "linux-i686"; sha256 = "18643daf675f8ef9785a0039d012c3a8ce96f4d228426651c5f09c292cbfb335"; }

     

       202
       202
       +
           { locale = "te"; arch = "linux-x86_64"; sha256 = "d9f8a260fc47b608fd523c61e9c6981776997f4b7fc247e794be32d177abfbc0"; }

     

       203
       203
       +
           { locale = "th"; arch = "linux-i686"; sha256 = "e03b80d55d2a545ab3219c5e88ed6b7d6974945e32321a2fc96039a6996638f6"; }

     

       204
       204
       +
           { locale = "th"; arch = "linux-x86_64"; sha256 = "0416fd2b7e7ddde59a101fcba8258622a83b739effb327984fa8405e634c2121"; }

     

       205
       205
       +
           { locale = "tr"; arch = "linux-i686"; sha256 = "75a49ce141c9a04254185b62af72c7e8c214e19e5257ff308b294aee6ac49a28"; }

     

       206
       206
       +
           { locale = "tr"; arch = "linux-x86_64"; sha256 = "0845a554b299b848d35894144d3ba5c7e0b808bcc9b2732e904463258ca73cb7"; }

     

       207
       207
       +
           { locale = "uk"; arch = "linux-i686"; sha256 = "a89f58c0f20a3ff7e609f572a4786f06b48886b7e2d303824417f42af49c8df2"; }

     

       208
       208
       +
           { locale = "uk"; arch = "linux-x86_64"; sha256 = "b45768588aaf80917c8ad40d62835cc96c3dadf97715234e66542b96eeb8db8e"; }

     

       209
       209
       +
           { locale = "vi"; arch = "linux-i686"; sha256 = "3fc35e59ecbbdf1b76b5b66e962a60eb724d9514d622879108725bcf7881fd1e"; }

     

       210
       210
       +
           { locale = "vi"; arch = "linux-x86_64"; sha256 = "88116edeeecbfe1ac03af0da26aff84bc3aa5ba00574e899ec08e0d68243f509"; }

     

       211
       211
       +
           { locale = "xh"; arch = "linux-i686"; sha256 = "a3afd3ac14049c72a9be28fb9a0849e4d3c5c2f13cb160c480988c4231679329"; }

     

       212
       212
       +
           { locale = "xh"; arch = "linux-x86_64"; sha256 = "569587e9cc4cd99899d2939367d56f2e4e9ae333b583064a648f05a8b0b58e2c"; }

     

       213
       213
       +
           { locale = "zh-CN"; arch = "linux-i686"; sha256 = "358e44998142e56356b839a51dff97fe85e6293424bd0c148decf61f01b6125b"; }

     

       214
       214
       +
           { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "7b5a84dbbe361a775aaadad8fd328e24f6cf2e336297f1d5906f51ff5d3dfae7"; }

     

       215
       215
       +
           { locale = "zh-TW"; arch = "linux-i686"; sha256 = "cf2cb9bed37dffe178a524ef5fe983e0e8b18f17c999e98474ae13e012da54da"; }

     

       216
       216
       +
           { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "aa0f1c5fb96dc4585e70fbcc291c6842be25e5d59be8bf39e8dc0232e9f1a76c"; }

     

       217
       217
       +
           { locale = "zu"; arch = "linux-i686"; sha256 = "775f6507ae8d6c2ef6e29e6b4d00453dcf9a0c9651eb9da482c78b5ebe64f2cd"; }

     

       218
       218
       +
           { locale = "zu"; arch = "linux-x86_64"; sha256 = "603510372a52497a8e41468dbc193afa25b0615f504f4548201deb89f27bd354"; }

     

       219
       219
       +
         ];

     

       220
       220
       +
       

     

       221
       221
       +
         arch = if stdenv.system == "i686-linux"

     

       222
       222
       +
           then "linux-i686"

     

       223
       223
       +
           else "linux-x86_64";

     

       224
       224
       +
       

     

       225
       225
       +
         isPrefixOf = prefix: string:

     

       226
       226
       +
           builtins.substring 0 (builtins.stringLength prefix) string == prefix;

     

       227
       227
       +
       

     

       228
       228
       +
         sourceMatches = locale: source:

     

       229
       229
       +
             (isPrefixOf source.locale locale) && source.arch == arch;

     

       230
       230
       +
       

     

       231
       231
       +
         systemLocale = config.i18n.defaultLocale or "en-US";

     

       232
       232
       +
       

     

       233
       233
       +
         defaultSource = stdenv.lib.findFirst (sourceMatches "en-US") {} sources;

     

       234
       234
       +
       

     

       235
       235
       +
         source = stdenv.lib.findFirst (sourceMatches systemLocale) defaultSource sources;

     

       236
       236
       +
       

     

       237
       237
       +
       in

     

       238
       238
       +
       

     

       239
       239
       +
       stdenv.mkDerivation {

     

       240
       240
       +
         name = "firefox-bin-${version}";

     

       241
       241
       +
       

     

       242
       242
       +
         src = fetchurl {

     

       243
       243
       +
           url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/${version}/${source.arch}/${source.locale}/firefox-${version}.tar.bz2";

     

       244
       244
       +
           inherit (source) sha256;

     

       245
       245
       +
         };

     

       246
       246
       +
       

     

       247
       247
       +
         phases = "unpackPhase installPhase";

     

       248
       248
       +
       

     

       249
       249
       +
         libPath = stdenv.lib.makeLibraryPath

     

       250
       250
       +
           [ stdenv.gcc.gcc

     

       251
       251
       +
             alsaLib

     

       252
       252
       +
             atk

     

       253
       253
       +
             cairo

     

       254
       254
       +
             cups

     

       255
       255
       +
             dbus_glib

     

       256
       256
       +
             dbus_libs

     

       257
       257
       +
             fontconfig

     

       258
       258
       +
             freetype

     

       259
       259
       +
             gconf

     

       260
       260
       +
             gdk_pixbuf

     

       261
       261
       +
             glib

     

       262
       262
       +
             glibc

     

       263
       263
       +
             gst_plugins_base

     

       264
       264
       +
             gstreamer

     

       265
       265
       +
             gtk

     

       266
       266
       +
             libX11

     

       267
       267
       +
             libXScrnSaver

     

       268
       268
       +
             libXext

     

       269
       269
       +
             libXinerama

     

       270
       270
       +
             libXrender

     

       271
       271
       +
             libXt

     

       272
       272
       +
             libcanberra

     

       273
       273
       +
             libgnome

     

       274
       274
       +
             libgnomeui

     

       275
       275
       +
             mesa

     

       276
       276
       +
             nspr

     

       277
       277
       +
             nss

     

       278
       278
       +
             pango

     

       279
       279
       +
             heimdal

     

       280
       280
       +
             pulseaudio

     

       281
       281
       +
             systemd

     

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

     

       283
       283
       +
             stdenv.gcc.gcc

     

       284
       284
       +
           ];

     

       285
       285
       +
       

     

       286
       286
       +
         # "strip" after "patchelf" may break binaries.

     

       287
       287
       +
         # See: https://github.com/NixOS/patchelf/issues/10

     

       288
       288
       +
         dontStrip = 1;

     

       289
       289
       +
       

     

       290
       290
       +
         installPhase =

     

       291
       291
       +
           ''

     

       292
       292
       +
             mkdir -p "$prefix/usr/lib/firefox-bin-${version}"

     

       293
       293
       +
             cp -r * "$prefix/usr/lib/firefox-bin-${version}"

     

       294
       294
       +
       

     

       295
       295
       +
             mkdir -p "$out/bin"

     

       296
       296
       +
             ln -s "$prefix/usr/lib/firefox-bin-${version}/firefox" "$out/bin/"

     

       297
       297
       +
       

     

       298
       298
       +
             for executable in \

     

       299
       299
       +
               firefox mozilla-xremote-client firefox-bin plugin-container \

     

       300
       300
       +
               updater crashreporter webapprt-stub

     

       301
       301
       +
             do

     

       302
       302
       +
               patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       303
       303
       +
                 "$out/usr/lib/firefox-bin-${version}/$executable"

     

       304
       304
       +
             done

     

       305
       305
       +
       

     

       306
       306
       +
             for executable in \

     

       307
       307
       +
               firefox mozilla-xremote-client firefox-bin plugin-container \

     

       308
       308
       +
               updater crashreporter webapprt-stub libxul.so

     

       309
       309
       +
             do

     

       310
       310
       +
               patchelf --set-rpath "$libPath" \

     

       311
       311
       +
                 "$out/usr/lib/firefox-bin-${version}/$executable"

     

       312
       312
       +
             done

     

       313
       313
       +
       

     

       314
       314
       +
             # Create a desktop item.

     

       315
       315
       +
             mkdir -p $out/share/applications

     

       316
       316
       +
             cat > $out/share/applications/firefox.desktop <<EOF

     

       317
       317
       +
             [Desktop Entry]

     

       318
       318
       +
             Type=Application

     

       319
       319
       +
             Exec=$out/bin/firefox

     

       320
       320
       +
             Icon=$out/lib/firefox-bin-${version}/chrome/icons/default/default256.png

     

       321
       321
       +
             Name=Firefox

     

       322
       322
       +
             GenericName=Web Browser

     

       323
       323
       +
             Categories=Application;Network;

     

       324
       324
       +
             EOF

     

       325
       325
       +
           '';

     

       326
       326
       +
       

     

       327
       327
       +
         meta = with stdenv.lib; {

     

       328
       328
       +
           description = "Mozilla Firefox, free web browser";

     

       329
       329
       +
           homepage = http://www.mozilla.org/firefox/;

     

       330
       330
       +
           license = {

     

       331
       331
       +
             shortName = "unfree"; # not sure

     

       332
       332
       +
             fullName = "unfree";

     

       333
       333
       +
             url = http://www.mozilla.org/en-US/foundation/trademarks/policy/;

     

       334
       334
       +
           };

     

       335
       335
       +
           platforms = platforms.linux;

     

       336
       336
       +
         };

     

       337
       337
       +
       }

+217

pkgs/applications/networking/browsers/firefox-bin/generate_nix.rb

···

       1
       1
       +
       # TODO share code with thunderbird-bin/generate_nix.rb

     

       2
       2
       +
       

     

       3
       3
       +
       version = if ARGV.empty?

     

       4
       4
       +
                   "latest"

     

       5
       5
       +
                 else

     

       6
       6
       +
                   ARGV[0]

     

       7
       7
       +
                 end

     

       8
       8
       +
       

     

       9
       9
       +
       base_path = "download-installer.cdn.mozilla.net/pub/firefox/releases"

     

       10
       10
       +
       

     

       11
       11
       +
       arches = ["linux-i686", "linux-x86_64"]

     

       12
       12
       +
       

     

       13
       13
       +
       arches.each do |arch|

     

       14
       14
       +
         system("wget", "--recursive", "--continue", "--no-parent", "--reject-regex", ".*\\?.*", "--reject", "xpi", "http://#{base_path}/#{version}/#{arch}/")

     

       15
       15
       +
       end

     

       16
       16
       +
       

     

       17
       17
       +
       locales = Dir.glob("#{base_path}/#{version}/#{arches[0]}/*").map do |path|

     

       18
       18
       +
         File.basename(path)

     

       19
       19
       +
       end.sort

     

       20
       20
       +
       

     

       21
       21
       +
       locales.delete("index.html")

     

       22
       22
       +
       locales.delete("xpi")

     

       23
       23
       +
       

     

       24
       24
       +
       # real version number, e.g. "30.0" instead of "latest".

     

       25
       25
       +
       real_version = Dir.glob("#{base_path}/#{version}/#{arches[0]}/#{locales[0]}/firefox-*")[0].match(/firefox-([0-9.]*)/)[1][0..-2]

     

       26
       26
       +
       

     

       27
       27
       +
       locale_arch_path_tuples = locales.flat_map do |locale|

     

       28
       28
       +
         arches.map do |arch|

     

       29
       29
       +
           path = Dir.glob("#{base_path}/#{version}/#{arch}/#{locale}/firefox-*")[0]

     

       30
       30
       +
       

     

       31
       31
       +
           [locale, arch, path]

     

       32
       32
       +
         end

     

       33
       33
       +
       end

     

       34
       34
       +
       

     

       35
       35
       +
       paths = locale_arch_path_tuples.map do |tuple| tuple[2] end

     

       36
       36
       +
       

     

       37
       37
       +
       hashes = IO.popen(["sha256sum", "--binary", *paths]) do |input|

     

       38
       38
       +
         input.each_line.map do |line|

     

       39
       39
       +
           $stderr.puts(line)

     

       40
       40
       +
       

     

       41
       41
       +
           line.match(/^[0-9a-f]*/)[0]

     

       42
       42
       +
         end

     

       43
       43
       +
       end

     

       44
       44
       +
       

     

       45
       45
       +
       

     

       46
       46
       +
       puts(<<"EOH")

     

       47
       47
       +
       # This file is generated from generate_nix.rb

     

       48
       48
       +
       # Execute the following command in a temporary directory to update the file.

     

       49
       49
       +
       #

     

       50
       50
       +
       # ruby generate_nix.rb > default.nix

     

       51
       51
       +
       

     

       52
       52
       +
       { stdenv, fetchurl, config

     

       53
       53
       +
       , alsaLib

     

       54
       54
       +
       , atk

     

       55
       55
       +
       , cairo

     

       56
       56
       +
       , cups

     

       57
       57
       +
       , dbus_glib

     

       58
       58
       +
       , dbus_libs

     

       59
       59
       +
       , fontconfig

     

       60
       60
       +
       , freetype

     

       61
       61
       +
       , gconf

     

       62
       62
       +
       , gdk_pixbuf

     

       63
       63
       +
       , glib

     

       64
       64
       +
       , glibc

     

       65
       65
       +
       , gst_plugins_base

     

       66
       66
       +
       , gstreamer

     

       67
       67
       +
       , gtk

     

       68
       68
       +
       , libX11

     

       69
       69
       +
       , libXScrnSaver

     

       70
       70
       +
       , libXext

     

       71
       71
       +
       , libXinerama

     

       72
       72
       +
       , libXrender

     

       73
       73
       +
       , libXt

     

       74
       74
       +
       , libcanberra

     

       75
       75
       +
       , libgnome

     

       76
       76
       +
       , libgnomeui

     

       77
       77
       +
       , mesa

     

       78
       78
       +
       , nspr

     

       79
       79
       +
       , nss

     

       80
       80
       +
       , pango

     

       81
       81
       +
       , heimdal

     

       82
       82
       +
       , pulseaudio

     

       83
       83
       +
       , systemd

     

       84
       84
       +
       }:

     

       85
       85
       +
       

     

       86
       86
       +
       let

     

       87
       87
       +
         version = "#{real_version}";

     

       88
       88
       +
         sources = [

     

       89
       89
       +
       EOH

     

       90
       90
       +
       

     

       91
       91
       +
       locale_arch_path_tuples.zip(hashes) do |tuple, hash|

     

       92
       92
       +
         locale, arch, path = tuple

     

       93
       93
       +
       

     

       94
       94
       +
         puts(%Q|    { locale = "#{locale}"; arch = "#{arch}"; sha256 = "#{hash}"; }|)

     

       95
       95
       +
       end

     

       96
       96
       +
       

     

       97
       97
       +
       puts(<<'EOF')

     

       98
       98
       +
         ];

     

       99
       99
       +
       

     

       100
       100
       +
         arch = if stdenv.system == "i686-linux"

     

       101
       101
       +
           then "linux-i686"

     

       102
       102
       +
           else "linux-x86_64";

     

       103
       103
       +
       

     

       104
       104
       +
         isPrefixOf = prefix: string:

     

       105
       105
       +
           builtins.substring 0 (builtins.stringLength prefix) string == prefix;

     

       106
       106
       +
       

     

       107
       107
       +
         sourceMatches = locale: source:

     

       108
       108
       +
             (isPrefixOf source.locale locale) && source.arch == arch;

     

       109
       109
       +
       

     

       110
       110
       +
         systemLocale = config.i18n.defaultLocale or "en-US";

     

       111
       111
       +
       

     

       112
       112
       +
         defaultSource = stdenv.lib.findFirst (sourceMatches "en-US") {} sources;

     

       113
       113
       +
       

     

       114
       114
       +
         source = stdenv.lib.findFirst (sourceMatches systemLocale) defaultSource sources;

     

       115
       115
       +
       

     

       116
       116
       +
       in

     

       117
       117
       +
       

     

       118
       118
       +
       stdenv.mkDerivation {

     

       119
       119
       +
         name = "firefox-bin-${version}";

     

       120
       120
       +
       

     

       121
       121
       +
         src = fetchurl {

     

       122
       122
       +
           url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/${version}/${source.arch}/${source.locale}/firefox-${version}.tar.bz2";

     

       123
       123
       +
           inherit (source) sha256;

     

       124
       124
       +
         };

     

       125
       125
       +
       

     

       126
       126
       +
         phases = "unpackPhase installPhase";

     

       127
       127
       +
       

     

       128
       128
       +
         libPath = stdenv.lib.makeLibraryPath

     

       129
       129
       +
           [ stdenv.gcc.gcc

     

       130
       130
       +
             alsaLib

     

       131
       131
       +
             atk

     

       132
       132
       +
             cairo

     

       133
       133
       +
             cups

     

       134
       134
       +
             dbus_glib

     

       135
       135
       +
             dbus_libs

     

       136
       136
       +
             fontconfig

     

       137
       137
       +
             freetype

     

       138
       138
       +
             gconf

     

       139
       139
       +
             gdk_pixbuf

     

       140
       140
       +
             glib

     

       141
       141
       +
             glibc

     

       142
       142
       +
             gst_plugins_base

     

       143
       143
       +
             gstreamer

     

       144
       144
       +
             gtk

     

       145
       145
       +
             libX11

     

       146
       146
       +
             libXScrnSaver

     

       147
       147
       +
             libXext

     

       148
       148
       +
             libXinerama

     

       149
       149
       +
             libXrender

     

       150
       150
       +
             libXt

     

       151
       151
       +
             libcanberra

     

       152
       152
       +
             libgnome

     

       153
       153
       +
             libgnomeui

     

       154
       154
       +
             mesa

     

       155
       155
       +
             nspr

     

       156
       156
       +
             nss

     

       157
       157
       +
             pango

     

       158
       158
       +
             heimdal

     

       159
       159
       +
             pulseaudio

     

       160
       160
       +
             systemd

     

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

     

       162
       162
       +
             stdenv.gcc.gcc

     

       163
       163
       +
           ];

     

       164
       164
       +
       

     

       165
       165
       +
         # "strip" after "patchelf" may break binaries.

     

       166
       166
       +
         # See: https://github.com/NixOS/patchelf/issues/10

     

       167
       167
       +
         dontStrip = 1;

     

       168
       168
       +
       

     

       169
       169
       +
         installPhase =

     

       170
       170
       +
           ''

     

       171
       171
       +
             mkdir -p "$prefix/usr/lib/firefox-bin-${version}"

     

       172
       172
       +
             cp -r * "$prefix/usr/lib/firefox-bin-${version}"

     

       173
       173
       +
       

     

       174
       174
       +
             mkdir -p "$out/bin"

     

       175
       175
       +
             ln -s "$prefix/usr/lib/firefox-bin-${version}/firefox" "$out/bin/"

     

       176
       176
       +
       

     

       177
       177
       +
             for executable in \

     

       178
       178
       +
               firefox mozilla-xremote-client firefox-bin plugin-container \

     

       179
       179
       +
               updater crashreporter webapprt-stub

     

       180
       180
       +
             do

     

       181
       181
       +
               patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       182
       182
       +
                 "$out/usr/lib/firefox-bin-${version}/$executable"

     

       183
       183
       +
             done

     

       184
       184
       +
       

     

       185
       185
       +
             for executable in \

     

       186
       186
       +
               firefox mozilla-xremote-client firefox-bin plugin-container \

     

       187
       187
       +
               updater crashreporter webapprt-stub libxul.so

     

       188
       188
       +
             do

     

       189
       189
       +
               patchelf --set-rpath "$libPath" \

     

       190
       190
       +
                 "$out/usr/lib/firefox-bin-${version}/$executable"

     

       191
       191
       +
             done

     

       192
       192
       +
       

     

       193
       193
       +
             # Create a desktop item.

     

       194
       194
       +
             mkdir -p $out/share/applications

     

       195
       195
       +
             cat > $out/share/applications/firefox.desktop <<EOF

     

       196
       196
       +
             [Desktop Entry]

     

       197
       197
       +
             Type=Application

     

       198
       198
       +
             Exec=$out/bin/firefox

     

       199
       199
       +
             Icon=$out/lib/firefox-bin-${version}/chrome/icons/default/default256.png

     

       200
       200
       +
             Name=Firefox

     

       201
       201
       +
             GenericName=Web Browser

     

       202
       202
       +
             Categories=Application;Network;

     

       203
       203
       +
             EOF

     

       204
       204
       +
           '';

     

       205
       205
       +
       

     

       206
       206
       +
         meta = with stdenv.lib; {

     

       207
       207
       +
           description = "Mozilla Firefox, free web browser";

     

       208
       208
       +
           homepage = http://www.mozilla.org/firefox/;

     

       209
       209
       +
           license = {

     

       210
       210
       +
             shortName = "unfree"; # not sure

     

       211
       211
       +
             fullName = "unfree";

     

       212
       212
       +
             url = http://www.mozilla.org/en-US/foundation/trademarks/policy/;

     

       213
       213
       +
           };

     

       214
       214
       +
           platforms = platforms.linux;

     

       215
       215
       +
         };

     

       216
       216
       +
       }

     

       217
       217
       +
       EOF

+6 -2

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

···

       4
       4
        
       , gsm, speex, portaudio, spandsp, libuuid

     

       5
       5
        
       }:

     

       6
       6
        
       stdenv.mkDerivation rec {

     

       7
       7
       -
         version = "0.4.3";

     

       7
       7
       +
         version = "0.4.11";

     

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

     

       9
       9
        
         src=fetchurl {

     

       10
       10
        
           url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz";

     

       11
       11
       -
           sha256 = "03vpzn0c3mybnwn84ha3yci780qsjm669dwja1srj0hbrq81rbil";

     

       11
       11
       +
           sha256 = "1ql5h9ily9jncp9w302v3b2ldx613kc60zlqv0v0ln8hsm8q6bc5";

     

       12
       12
        
         };

     

       13
       13
        
         buildInputs = [zlib openssl libre librem pkgconfig

     

       14
       14
        
           cairo mpg123 gstreamer gst_ffmpeg gst_plugins_base gst_plugins_bad gst_plugins_good

     
···

       41
       41
        
           platforms = with stdenv.lib.platforms; linux;

     

       42
       42
        
           maintainers = with stdenv.lib.maintainers; [raskin];

     

       43
       43
        
           license = with stdenv.lib.licenses; bsd3;

     

       44
       44
       +
           inherit version;

     

       45
       45
       +
           downloadPage = "http://www.creytiv.com/pub/";

     

       46
       46
       +
           updateWalker = true;

     

       47
       47
       +
           downloadURLRegexp = "/baresip-.*[.]tar[.].*";

     

       44
       48
        
         };

     

       45
       49
        
       }

+9 -10

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

···

       1
       1
       -
       { stdenv, fetchurl, alsaLib, libXv, libXi, libXrender, libXrandr, zlib, glib

     

       1
       1
       +
       { stdenv, fetchurl, libXv, libXi, libXrender, libXrandr, zlib, glib

     

       2
       2
        
       , libXext, libX11, libXScrnSaver, libSM, qt4, libICE, freetype, fontconfig

     

       3
       3
       -
       , pulseaudio, usePulseAudio, lib }:

     

       3
       3
       +
       , pulseaudio, lib, ... }:

     

       4
       4
        
       

     

       5
       5
        
       assert stdenv.system == "i686-linux";

     

       6
       6
        
       

     

       7
       7
        
       stdenv.mkDerivation rec {

     

       8
       8
       -
         name = "skype-4.2.0.13";

     

       8
       8
       +
         name = "skype-4.3.0.37";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchurl {

     

       11
       11
        
           url = "http://download.skype.com/linux/${name}.tar.bz2";

     

       12
       12
       -
           sha256 = "137kp6c0v4z7n7pp4hwrx4gjgk4knwj815dc6swh44lb5cj1c5m5";

     

       12
       12
       +
           sha256 = "0bc9kck99rcsqzxzw3j6vnw5byvr8c9wixrx609zp255g0wxr6cc";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
       -
         buildInputs =

     

       16
       16
       -
           lib.optional usePulseAudio pulseaudio ++ [

     

       17
       17
       -
           alsaLib

     

       15
       15
       +
         buildInputs = [

     

       18
       16
        
           stdenv.glibc

     

       19
       17
        
           stdenv.gcc.gcc

     

       20
       18
        
           libXv

     
···

       27
       25
        
           libXi

     

       28
       26
        
           libXrender

     

       29
       27
        
           libXrandr

     

       28
       28
       +
           pulseaudio

     

       30
       29
        
           freetype

     

       31
       30
        
           fontconfig

     

       32
       31
        
           zlib

     
···

       44
       43
        
             fullPath=$fullPath''${fullPath:+:}$i/lib

     

       45
       44
        
           done

     

       46
       45
        
       

     

       47
       47
       -
           dynlinker="$(cat $NIX_GCC/nix-support/dynamic-linker)"

     

       46
       46
       +
           patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       47
       47
       +
               --set-rpath "$fullPath" $out/libexec/skype/skype

     

       48
       48
        
       

     

       49
       49
        
           cat > $out/bin/skype << EOF

     

       50
       50
        
           #!${stdenv.shell}

     

       51
       51
        
           export PULSE_LATENCY_MSEC=60  # workaround for pulseaudio glitches

     

       52
       52
       -
           export LD_LIBRARY_PATH=$fullPath:$LD_LIBRARY_PATH

     

       53
       53
       -
           $dynlinker $out/libexec/skype/skype --resources=$out/libexec/skype "\$@"

     

       52
       52
       +
           $out/libexec/skype/skype --resources=$out/libexec/skype "\$@"

     

       54
       53
        
           EOF

     

       55
       54
        
       

     

       56
       55
        
           chmod +x $out/bin/skype

-11

pkgs/applications/networking/irc/bip/bip-0.8.8-yyparse.patch

···

       1
       1
       -
       --- bip-0.8.8/src/lex.l.orig

     

       2
       2
       -
       +++ bip-0.8.8/src/lex.l

     

       3
       3
       -
       @@ -16,7 +16,7 @@

     

       4
       4
       -
        int linec;

     

       5
       5
       -
        #include "util.h"

     

       6
       6
       -
        extern list_t *root_list;

     

       7
       7
       -
       -void yyparse(void);

     

       8
       8
       -
       +int yyparse(void);

     

       9
       9
       -
        void free_conf(list_t*);

     

       10
       10
       -
        int conf_error;

     

       11
       11
       -
        typedef struct bip bip_t;

+4 -9

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

···

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
       

     

       5
       5
       -
         version = "0.8.8";

     

       6
       6
       -
         sha256 = "7ca3fb96f5ee6b76eb398d7ea45344ea24855344ced11632241a33353bba05d7";

     

       5
       5
       +
         version = "0.8.9";

     

       6
       6
       +
         sha256 = "0q942g9lyd8pjvqimv547n6vik5759r9npw3ws3bdj4ixxqhz59w";

     

       7
       7
        
       

     

       8
       8
        
         # fetches patches from a gentoo mirror

     

       9
       9
        
         fetchPatch =

     
···

       25
       25
        
       

     

       26
       26
        
         # includes an important security patch

     

       27
       27
        
         patches = map fetchPatch [

     

       28
       28
       -
           { file = "bip-0.8.8-configure.patch";

     

       29
       29
       -
             sha256 = "286e169745e6cd768f0cb95bbc9589ca2bda497eb06461174549b80a459d901c";

     

       30
       30
       -
           }

     

       31
       31
       -
           { file = "bip-CVE-2012-0806.patch";

     

       32
       32
       -
             sha256 = "e47523095ee1d717c762ca0195520026c6ea2c30d8adcf434d276d42f052d506";

     

       33
       33
       -
           }

     

       34
       28
        
           { file = "bip-freenode.patch";

     

       35
       29
        
             sha256 = "a67e582f89cc6a32d5bb48c7e8ceb647b889808c2c8798ae3eb27d88869b892f";

     

       36
       30
        
           }

     

       37
       31
        
         ];

     

       38
       32
        
       

     

       39
       33
        
         postPatch = ''

     

       40
       40
       -
           patch -p1 < ${./bip-0.8.8-yyparse.patch}

     

       41
       34
        
         '';

     

       42
       35
        
       

     

       43
       36
        
         configureFlags = [ "--disable-pie" ];

     
···

       48
       41
        
           description = "An IRC proxy (bouncer)";

     

       49
       42
        
           homepage = http://bip.milkypond.org/;

     

       50
       43
        
           license = stdenv.lib.licenses.gpl2;

     

       44
       44
       +
           downloadPage= "https://projects.duckcorp.org/projects/bip/files";

     

       45
       45
       +
           inherit version;

     

       51
       46
        
         };

     

       52
       47
        
       }

+33 -62

pkgs/applications/office/libreoffice/default.nix

···

       14
       14
        
       , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr

     

       15
       15
        
       , libwpg, dbus_glib, glibc, qt4, kde4, clucene_core, libcdr, lcms, vigra

     

       16
       16
        
       , unixODBC, mdds, saneBackends, mythes, libexttextcat, libvisio

     

       17
       17
       -
       , fontsConf, pkgconfig, libzip, bluez5, libtool, maven

     

       17
       17
       +
       , fontsConf, pkgconfig, libzip, bluez5, libtool, maven, libe-book_00

     

       18
       18
       +
       , libmwaw_02, libatomic_ops, graphite2, harfbuzz

     

       18
       19
        
       , langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" ]

     

       19
       20
        
       }:

     

       20
       21
        
       

     

       21
       22
        
       let

     

       22
       23
        
         langsSpaces = stdenv.lib.concatStringsSep " " langs;

     

       23
       24
        
         major = "4";

     

       24
       24
       -
         minor = "0";

     

       25
       25
       +
         minor = "2";

     

       25
       26
        
         patch = "5";

     

       26
       27
        
         tweak = "2";

     

       27
       28
        
         subdir = "${major}.${minor}.${patch}";

     

       28
       29
        
         version = "${subdir}${if tweak == "" then "" else "."}${tweak}";

     

       29
       29
       -
       

     

       30
       30
       -
         # configure phase dependency

     

       31
       31
       -
         liborcus = stdenv.mkDerivation rec {

     

       32
       32
       -
            version = "0.3.0";

     

       33
       33
       -
            name = "liborcus-${version}";

     

       34
       34
       -
       

     

       35
       35
       -
            src = fetchurl {

     

       36
       36
       -
              url = "http://dev-www.libreoffice.org/src/8755aac23317494a9028569374dc87b2-liborcus_0.3.0.tar.bz2";

     

       37
       37
       -
              sha256 = "0xrw13s390mcpm50apclydl38sw2sdq27csrr1k0d39jna2990ih";

     

       38
       38
       -
            };

     

       39
       39
       -
       

     

       40
       40
       -
            configureFlags = "--disable-werror";

     

       41
       41
       -
       

     

       42
       42
       -
            buildInputs = [ zlib boost mdds pkgconfig libixion libzip ];

     

       43
       43
       -
         };

     

       44
       44
       -
       

     

       45
       45
       -
         # configure phase dependency

     

       46
       46
       -
         liblangtag = stdenv.mkDerivation rec {

     

       47
       47
       -
            version = "0.4.0";

     

       48
       48
       -
            name = "liblangtag-${version}";

     

       49
       49
       -
       

     

       50
       50
       -
            src = fetchurl {

     

       51
       51
       -
              url = "http://dev-www.libreoffice.org/src/54e578c91b1b68e69c72be22adcb2195-${name}.tar.bz2";

     

       52
       52
       -
              sha256 = "1bjb0fxjmvzxlhr5by9wgisf6w5yvy6wgfzfkjyw6igk39fivdyb";

     

       53
       53
       -
            };

     

       54
       54
       -
       

     

       55
       55
       -
            buildInputs = [ libtool pkgconfig libxml2 ];

     

       56
       56
       -
         };

     

       57
       57
       -
       

     

       58
       58
       -
         # doesn't work with srcs versioning

     

       59
       59
       -
         libmspub = stdenv.mkDerivation rec {

     

       60
       60
       -
            version = "0.0.6";

     

       61
       61
       -
            name = "libmspub-${version}";

     

       62
       62
       -
       

     

       63
       63
       -
            src = fetchurl {

     

       64
       64
       -
              url = "http://dev-www.libreoffice.org/src/${name}.tar.gz";

     

       65
       65
       -
              sha256 = "1zdcvnm0dpac5yqdv34hq9j38cnhyqzyjgb19iyp54ajnwfjhmcq";

     

       66
       66
       -
            };

     

       67
       67
       -
       

     

       68
       68
       -
            configureFlags = "--disable-werror";

     

       69
       69
       -
       

     

       70
       70
       -
            buildInputs = [ zlib libwpd libwpg pkgconfig boost icu ];

     

       71
       71
       -
         };

     

       72
       30
        
       

     

       73
       31
        
         # doesn't exist in srcs

     

       74
       32
        
         libixion = stdenv.mkDerivation rec {

     
···

       85
       43
        
            buildInputs = [ boost mdds pkgconfig ];

     

       86
       44
        
         };

     

       87
       45
        
       

     

       88
       88
       -
         fetchThirdParty = {name, md5}: fetchurl {

     

       46
       46
       +
         fetchThirdParty = {name, md5, brief}: fetchurl {

     

       89
       47
        
           inherit name md5;

     

       90
       90
       -
           url = "http://dev-www.libreoffice.org/src/${md5}-${name}";

     

       48
       48
       +
           url = if brief then

     

       49
       49
       +
                   "http://dev-www.libreoffice.org/src/${name}"

     

       50
       50
       +
                 else

     

       51
       51
       +
                   "http://dev-www.libreoffice.org/src/${md5}-${name}";

     

       91
       52
        
         };

     

       92
       53
        
       

     

       93
       54
        
         fetchSrc = {name, sha256}: fetchurl {

     
···

       104
       65
        
       

     

       105
       66
        
           translations = fetchSrc {

     

       106
       67
        
             name = "translations";

     

       107
       107
       -
             sha256 = "0x96wlwr5m7w4k3ygydzak3ycq35hjq60vfi6nfxczlr8pfjyjxv";

     

       68
       68
       +
             sha256 = "0nv47r043w151687ks06w786h8azi8gylxma9c7qyjbdj6cdb2ly";

     

       108
       69
        
           };

     

       109
       70
        
       

     

       110
       71
        
           # TODO: dictionaries

     

       111
       72
        
       

     

       112
       73
        
           help = fetchSrc {

     

       113
       74
        
             name = "help";

     

       114
       114
       -
             sha256 = "0nab5jcgrrgn0v1yrm18nl9avp4vifbas48l1absz3jmzf9wka7b";

     

       75
       75
       +
             sha256 = "1kbkdngq39gfq2804v6vnllax4gqs25zlfk6y561iiipld1ncc5v";

     

       115
       76
        
           };

     

       116
       77
        
       

     

       117
       78
        
         };

     
···

       121
       82
        
       

     

       122
       83
        
         src = fetchurl {

     

       123
       84
        
           url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";

     

       124
       124
       -
           sha256 = "195g1iab7j2x7sl326xbq7vya412ns57xrwpv9hqdrb7iiz2n8la";

     

       85
       85
       +
           sha256 = "4bf7898d7d0ba918a8f6668eff0904a549e5a2de837854716e6d996f121817d5";

     

       125
       86
        
         };

     

       126
       87
        
       

     

       127
       88
        
         # Openoffice will open libcups dynamically, so we link it directly

     
···

       135
       96
        
       

     

       136
       97
        
         postUnpack = ''

     

       137
       98
        
           mkdir -v $sourceRoot/src

     

       138
       138
       -
         '' + (stdenv.lib.concatMapStrings (f: "ln -sv ${f} $sourceRoot/src/${f.outputHash}-${f.name}\n") srcs.third_party)

     

       99
       99
       +
         '' + (stdenv.lib.concatMapStrings (f: "ln -sv ${f} $sourceRoot/src/${f.outputHash}-${f.name}\nln -sv ${f} $sourceRoot/src/${f.name}\n") srcs.third_party)

     

       139
       100
        
         + ''

     

       140
       101
        
           ln -sv ${srcs.help} $sourceRoot/src/${srcs.help.name}

     

       141
       102
        
           tar xf $sourceRoot/src/${srcs.help.name} -C $sourceRoot/../

     
···

       149
       110
        
             -e 's,! */usr/bin/perl,!${perl}/bin/perl,' -e 's,! */usr/bin/env perl,!${perl}/bin/perl,' \

     

       150
       111
        
             -e 's,! */usr/bin/python,!${python3}/bin/${python3.executable},' -e 's,! */usr/bin/env python,!${python3}/bin/${python3.executable},'

     

       151
       112
        
           #sed -i 's,ANT_OPTS+="\(.*\)",ANT_OPTS+=\1,' apache-commons/java/*/makefile.mk

     

       113
       113
       +
       

     

       114
       114
       +
           patch -Np1 -i ${./ooxmlexport.diff};

     

       152
       115
        
         '';

     

       153
       116
        
       

     

       154
       117
        
         QT4DIR = qt4;

     
···

       162
       125
        
             "--with-parallelism=$NIX_BUILD_CORES"

     

       163
       126
        
             "--with-lang=${langsSpaces}"

     

       164
       127
        
           );

     

       128
       128
       +
       

     

       129
       129
       +
           chmod a+x ./bin/unpack-sources

     

       130
       130
       +
           # It is used only as an indicator of the proper current directory

     

       131
       131
       +
           touch solenv/inc/target.mk

     

       165
       132
        
         '';

     

       166
       133
        
       

     

       167
       134
        
         makeFlags = "SHELL=${bash}/bin/bash";

     
···

       171
       138
        
         buildPhase = ''

     

       172
       139
        
           # This is required as some cppunittests require fontconfig configured

     

       173
       140
        
           export FONTCONFIG_FILE=${fontsConf}

     

       174
       174
       -
       

     

       175
       175
       -
           # Fix sysui: wants to create a tar for root

     

       176
       176
       -
           sed -i -e 's,--own.*root,,' sysui/desktop/slackware/makefile.mk

     

       177
       141
        
       

     

       178
       142
        
           # This to aovid using /lib:/usr/lib at linking

     

       179
       143
        
           sed -i '/gb_LinkTarget_LDFLAGS/{ n; /rpath-link/d;}' solenv/gbuild/platform/unxgcc.mk

     
···

       199
       163
        
         '';

     

       200
       164
        
       

     

       201
       165
        
         configureFlags = [

     

       202
       202
       -
           "--with-vender=NixOS"

     

       166
       166
       +
           "--with-vendor=NixOS"

     

       203
       167
        
       

     

       204
       168
        
           # Without these, configure does not finish

     

       205
       169
        
           "--without-junit"

     
···

       219
       183
        
           "--without-doxygen"

     

       220
       184
        
       

     

       221
       185
        
           # I imagine this helps. Copied from go-oo.

     

       222
       222
       -
           "--disable-epm"

     

       223
       223
       -
           "--disable-mathmldtd"

     

       186
       186
       +
           # Modified on every upgrade, though

     

       224
       187
        
           "--disable-kde"

     

       225
       188
        
           "--disable-postgresql-sdbc"

     

       226
       189
        
           "--with-package-format=native"

     

       190
       190
       +
           "--enable-epm"

     

       227
       191
        
           "--with-jdk-home=${jdk}/lib/openjdk"

     

       228
       192
        
           "--with-ant-home=${ant}/lib/ant"

     

       229
       193
        
           "--without-afms"

     
···

       235
       199
        
           "--without-system-jars"

     

       236
       200
        
           "--without-system-altlinuxhyph"

     

       237
       201
        
           "--without-system-lpsolve"

     

       238
       238
       -
           "--without-system-graphite"

     

       239
       202
        
           "--without-system-npapi-headers"

     

       240
       203
        
           "--without-system-libcmis"

     

       241
       241
       -
           "--without-system-mozilla"

     

       204
       204
       +
       

     

       205
       205
       +
           "--without-system-libetonyek"

     

       206
       206
       +
           "--without-system-libfreehand"

     

       207
       207
       +
           "--without-system-libodfgen"

     

       208
       208
       +
           "--without-system-libabw"

     

       209
       209
       +
           "--without-system-firebird"

     

       210
       210
       +
           "--without-system-orcus"

     

       211
       211
       +
           "--without-system-liblangtag"

     

       212
       212
       +
           "--without-system-libmspub"

     

       242
       213
        
         ];

     

       243
       214
        
       

     

       244
       215
        
         checkPhase = ''

     
···

       253
       224
        
             hunspell icu jdk kde4.kdelibs lcms libcdr libexttextcat unixODBC libjpeg

     

       254
       225
        
             libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11

     

       255
       226
        
             libXaw libXext libXi libXinerama libxml2 libxslt libXtst

     

       256
       256
       -
             libXdmcp libpthreadstubs mdds mesa mythes

     

       227
       227
       +
             libXdmcp libpthreadstubs mesa mythes

     

       257
       228
        
             neon nspr nss openldap openssl ORBit2 pam perl pkgconfigUpstream poppler

     

       258
       229
        
             python3 sablotron saneBackends tcsh unzip vigra which zip zlib

     

       259
       259
       -
             mdds bluez5 glibc libmspub libixion liborcus liblangtag

     

       260
       260
       -
             libxshmfence

     

       230
       230
       +
             mdds bluez5 glibc libixion

     

       231
       231
       +
             libxshmfence libe-book_00 libmwaw_02 libatomic_ops graphite2 harfbuzz

     

       261
       232
        
           ];

     

       262
       233
        
       

     

       263
       234
        
         meta = with stdenv.lib; {

+31 -7

pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh

···

       6
       6
        
       [

     

       7
       7
        
       EOF

     

       8
       8
        
       

     

       9
       9
       -
       read file

     

       10
       10
       -
       while read file; do

     

       11
       11
       -
         if [[ "$file" == @* ]]; then

     

       12
       12
       -
           break

     

       13
       13
       -
         fi

     

       9
       9
       +
       write_entry(){

     

       14
       10
        
         echo '{'

     

       15
       15
       -
         echo "  name = \"${file:33}\";"

     

       16
       16
       -
         echo "  md5 = \"${file:0:32}\";"

     

       11
       11
       +
         echo "  name = \"${name}\";"

     

       12
       12
       +
         echo "  md5 = \"${md5}\";"

     

       13
       13
       +
         echo "  brief = ${brief};"

     

       17
       14
        
         echo '}'

     

       15
       15
       +
       }

     

       16
       16
       +
       

     

       17
       17
       +
       while read line; do

     

       18
       18
       +
         case "$line" in

     

       19
       19
       +
           \#*)

     

       20
       20
       +
             echo Skipping comment: "$line" >&2;

     

       21
       21
       +
             ;;

     

       22
       22
       +
           *_MD5SUM\ :=*)

     

       23
       23
       +
             read tbline;

     

       24
       24
       +
             line=${line##* };

     

       25
       25
       +
             tbline=${tbline##* };

     

       26
       26
       +
             md5=$line

     

       27
       27
       +
             name=$tbline;

     

       28
       28
       +
             brief=true;

     

       29
       29
       +
             write_entry;

     

       30
       30
       +
             ;;

     

       31
       31
       +
           *_TARBALL\ :=*)

     

       32
       32
       +
             line=${line##* };

     

       33
       33
       +
             md5=${line:0:32};

     

       34
       34
       +
             name=${line:33};

     

       35
       35
       +
             brief=false;

     

       36
       36
       +
             write_entry;

     

       37
       37
       +
             ;;

     

       38
       38
       +
           *)

     

       39
       39
       +
             echo Skipping: "$line" >&2;

     

       40
       40
       +
             ;;

     

       41
       41
       +
         esac

     

       18
       42
        
       done

     

       19
       43
        
       

     

       20
       44
        
       echo ']'

+399 -46

pkgs/applications/office/libreoffice/libreoffice-srcs.nix

···

       1
       1
        
       [

     

       2
       2
        
       {

     

       3
       3
       -
         name = "glibc-2.1.3-stub.tar.gz";

     

       4
       4
       -
         md5 = "4a660ce8466c9df01f19036435425c3a";

     

       3
       3
       +
         name = "libabw-0.0.2.tar.bz2";

     

       4
       4
       +
         md5 = "40fa48e03b1e28ae0325cc34b35bc46d";

     

       5
       5
       +
         brief = true;

     

       5
       6
        
       }

     

       6
       7
        
       {

     

       7
       7
       -
         name = "ucpp-1.3.2.tar.gz";

     

       8
       8
       -
         md5 = "0168229624cfac409e766913506961a8";

     

       8
       8
       +
         name = "libcdr-0.0.15.tar.bz2";

     

       9
       9
       +
         md5 = "fbcd8619fc6646f41d527c1329102998";

     

       10
       10
       +
         brief = true;

     

       11
       11
       +
       }

     

       12
       12
       +
       {

     

       13
       13
       +
         name = "libe-book-0.0.3.tar.bz2";

     

       14
       14
       +
         md5 = "2f1ceaf2ac8752ed278e175447d9b978";

     

       15
       15
       +
         brief = true;

     

       16
       16
       +
       }

     

       17
       17
       +
       {

     

       18
       18
       +
         name = "libetonyek-0.0.4.tar.bz2";

     

       19
       19
       +
         md5 = "3c50bc60394d1f2675fbf9bd22581363";

     

       20
       20
       +
         brief = true;

     

       21
       21
       +
       }

     

       22
       22
       +
       {

     

       23
       23
       +
         name = "libfreehand-0.0.0.tar.bz2";

     

       24
       24
       +
         md5 = "496dd00028afcc19f896b01394769043";

     

       25
       25
       +
         brief = true;

     

       26
       26
       +
       }

     

       27
       27
       +
       {

     

       28
       28
       +
         name = "libmspub-0.0.6.tar.bz2";

     

       29
       29
       +
         md5 = "1120705cd0f0d9bd5506360bf57b6c2e";

     

       30
       30
       +
         brief = true;

     

       31
       31
       +
       }

     

       32
       32
       +
       {

     

       33
       33
       +
         name = "libmwaw-0.2.0.tar.bz2";

     

       34
       34
       +
         md5 = "d794625f156a9fb1c53b3f8a8aa13b5e";

     

       35
       35
       +
         brief = true;

     

       36
       36
       +
       }

     

       37
       37
       +
       {

     

       38
       38
       +
         name = "libodfgen-0.0.4.tar.bz2";

     

       39
       39
       +
         md5 = "e5483d1f0b71e64c367c1194b54b0f53";

     

       40
       40
       +
         brief = true;

     

       41
       41
       +
       }

     

       42
       42
       +
       {

     

       43
       43
       +
         name = "libvisio-0.0.31.tar.bz2";

     

       44
       44
       +
         md5 = "82628333418f101a20cd21f980cf9f40";

     

       45
       45
       +
         brief = true;

     

       46
       46
       +
       }

     

       47
       47
       +
       {

     

       48
       48
       +
         name = "Firebird-2.5.2.26540-0.tar.bz2";

     

       49
       49
       +
         md5 = "21154d2004e025c8a3666625b0357bb5";

     

       50
       50
       +
         brief = true;

     

       51
       51
       +
       }

     

       52
       52
       +
       {

     

       53
       53
       +
         name = "harfbuzz-0.9.23.tar.bz2";

     

       54
       54
       +
         md5 = "a4a9b548577e2ee22f0887937da5fd6c";

     

       55
       55
       +
         brief = true;

     

       56
       56
       +
       }

     

       57
       57
       +
       {

     

       58
       58
       +
         name = "libatomic_ops-7_2d.zip";

     

       59
       59
       +
         md5 = "c0b86562d5aa40761a87134f83e6adcf";

     

       60
       60
       +
         brief = true;

     

       61
       61
       +
       }

     

       62
       62
       +
       {

     

       63
       63
       +
         name = "libeot-0.01.tar.bz2";

     

       64
       64
       +
         md5 = "aa24f5dd2a2992f4a116aa72af817548";

     

       65
       65
       +
         brief = true;

     

       66
       66
       +
       }

     

       67
       67
       +
       {

     

       68
       68
       +
         name = "language-subtag-registry-2014-03-27.tar.bz2";

     

       69
       69
       +
         md5 = "504af523f5d1a5590bbeb6a4b55e8a97";

     

       70
       70
       +
         brief = true;

     

       71
       71
       +
       }

     

       72
       72
       +
       {

     

       73
       73
       +
         name = "Adobe-Core35_AFMs-314.tar.gz";

     

       74
       74
       +
         md5 = "1756c4fa6c616ae15973c104cd8cb256";

     

       75
       75
       +
         brief = false;

     

       76
       76
       +
       }

     

       77
       77
       +
       {

     

       78
       78
       +
         name = "commons-codec-1.6-src.tar.gz";

     

       79
       79
       +
         md5 = "2e482c7567908d334785ce7d69ddfff7";

     

       80
       80
       +
         brief = false;

     

       81
       81
       +
       }

     

       82
       82
       +
       {

     

       83
       83
       +
         name = "commons-httpclient-3.1-src.tar.gz";

     

       84
       84
       +
         md5 = "2c9b0f83ed5890af02c0df1c1776f39b";

     

       85
       85
       +
         brief = false;

     

       86
       86
       +
       }

     

       87
       87
       +
       {

     

       88
       88
       +
         name = "commons-lang-2.4-src.tar.gz";

     

       89
       89
       +
         md5 = "625ff5f2f968dd908bca43c9469d6e6b";

     

       90
       90
       +
         brief = false;

     

       9
       91
        
       }

     

       10
       92
        
       {

     

       11
       93
        
         name = "commons-logging-1.1.1-src.tar.gz";

     

       12
       94
        
         md5 = "3c219630e4302863a9a83d0efde889db";

     

       95
       95
       +
         brief = false;

     

       96
       96
       +
       }

     

       97
       97
       +
       {

     

       98
       98
       +
         name = "boost_1_54_0.tar.bz2";

     

       99
       99
       +
         md5 = "15cb8c0803064faef0c4ddf5bc5ca279";

     

       100
       100
       +
         brief = false;

     

       101
       101
       +
       }

     

       102
       102
       +
       {

     

       103
       103
       +
         name = "bsh-2.0b1-src.tar.gz";

     

       104
       104
       +
         md5 = "ea570af93c284aa9e5621cd563f54f4d";

     

       105
       105
       +
         brief = false;

     

       106
       106
       +
       }

     

       107
       107
       +
       {

     

       108
       108
       +
         name = "cairo-1.10.2.tar.gz";

     

       109
       109
       +
         md5 = "f101a9e88b783337b20b2e26dfd26d5f";

     

       110
       110
       +
         brief = false;

     

       111
       111
       +
       }

     

       112
       112
       +
       {

     

       113
       113
       +
         name = "clucene-core-2.3.3.4.tar.gz";

     

       114
       114
       +
         md5 = "48d647fbd8ef8889e5a7f422c1bfda94";

     

       115
       115
       +
         brief = false;

     

       116
       116
       +
       }

     

       117
       117
       +
       {

     

       118
       118
       +
         name = "libcmis-0.4.1.tar.gz";

     

       119
       119
       +
         md5 = "22f8a85daf4a012180322e1f52a7563b";

     

       120
       120
       +
         brief = false;

     

       121
       121
       +
       }

     

       122
       122
       +
       {

     

       123
       123
       +
         name = "cppunit-1.13.1.tar.gz";

     

       124
       124
       +
         md5 = "ac4781e01619be13461bb2d562b94a7b";

     

       125
       125
       +
         brief = false;

     

       126
       126
       +
       }

     

       127
       127
       +
       {

     

       128
       128
       +
         name = "ConvertTextToNumber-1.3.2.oxt";

     

       129
       129
       +
         md5 = "451ccf439a36a568653b024534669971";

     

       130
       130
       +
         brief = false;

     

       131
       131
       +
       }

     

       132
       132
       +
       {

     

       133
       133
       +
         name = "curl-7.33.0.tar.bz2";

     

       134
       134
       +
         md5 = "57409d6bf0bd97053b8378dbe0cadcef";

     

       135
       135
       +
         brief = false;

     

       136
       136
       +
       }

     

       137
       137
       +
       {

     

       138
       138
       +
         name = "epm-3.7.tar.gz";

     

       139
       139
       +
         md5 = "3ade8cfe7e59ca8e65052644fed9fca4";

     

       140
       140
       +
         brief = false;

     

       141
       141
       +
       }

     

       142
       142
       +
       {

     

       143
       143
       +
         name = "expat-2.1.0.tar.gz";

     

       144
       144
       +
         md5 = "dd7dab7a5fea97d2a6a43f511449b7cd";

     

       145
       145
       +
         brief = false;

     

       146
       146
       +
       }

     

       147
       147
       +
       {

     

       148
       148
       +
         name = "fontconfig-2.8.0.tar.gz";

     

       149
       149
       +
         md5 = "77e15a92006ddc2adbb06f840d591c0e";

     

       150
       150
       +
         brief = false;

     

       151
       151
       +
       }

     

       152
       152
       +
       {

     

       153
       153
       +
         name = "crosextrafonts-20130214.tar.gz";

     

       154
       154
       +
         md5 = "368f114c078f94214a308a74c7e991bc";

     

       155
       155
       +
         brief = false;

     

       156
       156
       +
       }

     

       157
       157
       +
       {

     

       158
       158
       +
         name = "crosextrafonts-carlito-20130920.tar.gz";

     

       159
       159
       +
         md5 = "c74b7223abe75949b4af367942d96c7a";

     

       160
       160
       +
         brief = false;

     

       161
       161
       +
       }

     

       162
       162
       +
       {

     

       163
       163
       +
         name = "dejavu-fonts-ttf-2.33.zip";

     

       164
       164
       +
         md5 = "f872f4ac066433d8ff92f5e316b36ff9";

     

       165
       165
       +
         brief = false;

     

       166
       166
       +
       }

     

       167
       167
       +
       {

     

       168
       168
       +
         name = "gentiumbasic-fonts-1.10.zip";

     

       169
       169
       +
         md5 = "35efabc239af896dfb79be7ebdd6e6b9";

     

       170
       170
       +
         brief = false;

     

       171
       171
       +
       }

     

       172
       172
       +
       {

     

       173
       173
       +
         name = "liberation-fonts-ttf-1.07.3.tar.gz";

     

       174
       174
       +
         md5 = "b3174b11c2b6a341f5c99b31088bd67b";

     

       175
       175
       +
         brief = false;

     

       176
       176
       +
       }

     

       177
       177
       +
       {

     

       178
       178
       +
         name = "liberation-fonts-ttf-2.00.1.tar.gz";

     

       179
       179
       +
         md5 = "5c781723a0d9ed6188960defba8e91cf";

     

       180
       180
       +
         brief = false;

     

       181
       181
       +
       }

     

       182
       182
       +
       {

     

       183
       183
       +
         name = "LinLibertineG-20120116.zip";

     

       184
       184
       +
         md5 = "e7a384790b13c29113e22e596ade9687";

     

       185
       185
       +
         brief = false;

     

       186
       186
       +
       }

     

       187
       187
       +
       {

     

       188
       188
       +
         name = "open-sans-font-ttf-1.10.tar.gz";

     

       189
       189
       +
         md5 = "7a15edea7d415ac5150ea403e27401fd";

     

       190
       190
       +
         brief = false;

     

       191
       191
       +
       }

     

       192
       192
       +
       {

     

       193
       193
       +
         name = "pt-serif-font-1.0000W.tar.gz";

     

       194
       194
       +
         md5 = "c3c1a8ba7452950636e871d25020ce0d";

     

       195
       195
       +
         brief = false;

     

       196
       196
       +
       }

     

       197
       197
       +
       {

     

       198
       198
       +
         name = "source-code-font-1.009.tar.gz";

     

       199
       199
       +
         md5 = "0279a21fab6f245e85a6f85fea54f511";

     

       200
       200
       +
         brief = false;

     

       201
       201
       +
       }

     

       202
       202
       +
       {

     

       203
       203
       +
         name = "source-sans-font-1.036.tar.gz";

     

       204
       204
       +
         md5 = "1e9ddfe25ac9577da709d7b2ea36f939";

     

       205
       205
       +
         brief = false;

     

       206
       206
       +
       }

     

       207
       207
       +
       {

     

       208
       208
       +
         name = "freetype-2.4.8.tar.bz2";

     

       209
       209
       +
         md5 = "dbf2caca1d3afd410a29217a9809d397";

     

       210
       210
       +
         brief = false;

     

       211
       211
       +
       }

     

       212
       212
       +
       {

     

       213
       213
       +
         name = "graphite2-1.2.3.tgz";

     

       214
       214
       +
         md5 = "7042305e4208af4c2d5249d814ccce58";

     

       215
       215
       +
         brief = false;

     

       216
       216
       +
       }

     

       217
       217
       +
       {

     

       218
       218
       +
         name = "hsqldb_1_8_0.zip";

     

       219
       219
       +
         md5 = "17410483b5b5f267aa18b7e00b65e6e0";

     

       220
       220
       +
         brief = false;

     

       221
       221
       +
       }

     

       222
       222
       +
       {

     

       223
       223
       +
         name = "hunspell-1.3.2.tar.gz";

     

       224
       224
       +
         md5 = "3121aaf3e13e5d88dfff13fb4a5f1ab8";

     

       225
       225
       +
         brief = false;

     

       226
       226
       +
       }

     

       227
       227
       +
       {

     

       228
       228
       +
         name = "hyphen-2.8.4.tar.gz";

     

       229
       229
       +
         md5 = "a2f6010987e1c601274ab5d63b72c944";

     

       230
       230
       +
         brief = false;

     

       231
       231
       +
       }

     

       232
       232
       +
       {

     

       233
       233
       +
         name = "icu4c-52_1-src.tgz";

     

       234
       234
       +
         md5 = "9e96ed4c1d99c0d14ac03c140f9f346c";

     

       235
       235
       +
         brief = false;

     

       236
       236
       +
       }

     

       237
       237
       +
       {

     

       238
       238
       +
         name = "flow-engine-0.9.4.zip";

     

       239
       239
       +
         md5 = "ba2930200c9f019c2d93a8c88c651a0f";

     

       240
       240
       +
         brief = false;

     

       241
       241
       +
       }

     

       242
       242
       +
       {

     

       243
       243
       +
         name = "flute-1.1.6.zip";

     

       244
       244
       +
         md5 = "d8bd5eed178db6e2b18eeed243f85aa8";

     

       245
       245
       +
         brief = false;

     

       246
       246
       +
       }

     

       247
       247
       +
       {

     

       248
       248
       +
         name = "libbase-1.1.6.zip";

     

       249
       249
       +
         md5 = "eeb2c7ddf0d302fba4bfc6e97eac9624";

     

       250
       250
       +
         brief = false;

     

       251
       251
       +
       }

     

       252
       252
       +
       {

     

       253
       253
       +
         name = "libfonts-1.1.6.zip";

     

       254
       254
       +
         md5 = "3bdf40c0d199af31923e900d082ca2dd";

     

       255
       255
       +
         brief = false;

     

       256
       256
       +
       }

     

       257
       257
       +
       {

     

       258
       258
       +
         name = "libformula-1.1.7.zip";

     

       259
       259
       +
         md5 = "3404ab6b1792ae5f16bbd603bd1e1d03";

     

       260
       260
       +
         brief = false;

     

       13
       261
        
       }

     

       14
       262
        
       {

     

       15
       263
        
         name = "liblayout-0.2.10.zip";

     

       16
       264
        
         md5 = "db60e4fde8dd6d6807523deb71ee34dc";

     

       265
       265
       +
         brief = false;

     

       17
       266
        
       }

     

       18
       267
        
       {

     

       19
       19
       -
         name = "hsqldb_1_8_0.zip";

     

       20
       20
       -
         md5 = "17410483b5b5f267aa18b7e00b65e6e0";

     

       268
       268
       +
         name = "libloader-1.1.6.zip";

     

       269
       269
       +
         md5 = "97b2d4dba862397f446b217e2b623e71";

     

       270
       270
       +
         brief = false;

     

       271
       271
       +
       }

     

       272
       272
       +
       {

     

       273
       273
       +
         name = "librepository-1.1.6.zip";

     

       274
       274
       +
         md5 = "8ce2fcd72becf06c41f7201d15373ed9";

     

       275
       275
       +
         brief = false;

     

       276
       276
       +
       }

     

       277
       277
       +
       {

     

       278
       278
       +
         name = "libserializer-1.1.6.zip";

     

       279
       279
       +
         md5 = "f94d9870737518e3b597f9265f4e9803";

     

       280
       280
       +
         brief = false;

     

       281
       281
       +
       }

     

       282
       282
       +
       {

     

       283
       283
       +
         name = "libxml-1.1.7.zip";

     

       284
       284
       +
         md5 = "ace6ab49184e329db254e454a010f56d";

     

       285
       285
       +
         brief = false;

     

       286
       286
       +
       }

     

       287
       287
       +
       {

     

       288
       288
       +
         name = "sacjava-1.3.zip";

     

       289
       289
       +
         md5 = "39bb3fcea1514f1369fcfc87542390fd";

     

       290
       290
       +
         brief = false;

     

       21
       291
        
       }

     

       22
       292
        
       {

     

       23
       23
       -
         name = "rhino1_5R5.zip";

     

       24
       24
       -
         md5 = "798b2ffdc8bcfe7bca2cf92b62caf685";

     

       293
       293
       +
         name = "jpegsrc.v8d.tar.gz";

     

       294
       294
       +
         md5 = "52654eb3b2e60c35731ea8fc87f1bd29";

     

       295
       295
       +
         brief = false;

     

       25
       296
        
       }

     

       26
       297
        
       {

     

       27
       27
       -
         name = "bsh-2.0b1-src.tar.gz";

     

       28
       28
       -
         md5 = "ea570af93c284aa9e5621cd563f54f4d";

     

       298
       298
       +
         name = "JLanguageTool-1.7.0.tar.bz2";

     

       299
       299
       +
         md5 = "b63e6340a02ff1cacfeadb2c42286161";

     

       300
       300
       +
         brief = false;

     

       301
       301
       +
       }

     

       302
       302
       +
       {

     

       303
       303
       +
         name = "lcms2-2.4.tar.gz";

     

       304
       304
       +
         md5 = "861ef15fa0bc018f9ddc932c4ad8b6dd";

     

       305
       305
       +
         brief = false;

     

       306
       306
       +
       }

     

       307
       307
       +
       {

     

       308
       308
       +
         name = "libexttextcat-3.4.3.tar.bz2";

     

       309
       309
       +
         md5 = "ae330b9493bd4503ac390106ff6060d7";

     

       310
       310
       +
         brief = false;

     

       311
       311
       +
       }

     

       312
       312
       +
       {

     

       313
       313
       +
         name = "liblangtag-0.5.1.tar.bz2";

     

       314
       314
       +
         md5 = "36271d3fa0d9dec1632029b6d7aac925";

     

       315
       315
       +
         brief = false;

     

       29
       316
        
       }

     

       30
       317
        
       {

     

       31
       318
        
         name = "xmlsec1-1.2.14.tar.gz";

     

       32
       319
        
         md5 = "1f24ab1d39f4a51faf22244c94a6203f";

     

       320
       320
       +
         brief = false;

     

       33
       321
        
       }

     

       34
       322
        
       {

     

       35
       35
       -
         name = "librepository-1.1.6.zip";

     

       36
       36
       -
         md5 = "8ce2fcd72becf06c41f7201d15373ed9";

     

       323
       323
       +
         name = "libxml2-2.9.1.tar.gz";

     

       324
       324
       +
         md5 = "9c0cfef285d5c4a5c80d00904ddab380";

     

       325
       325
       +
         brief = false;

     

       37
       326
        
       }

     

       38
       327
        
       {

     

       39
       39
       -
         name = "libbase-1.1.6.zip";

     

       40
       40
       -
         md5 = "eeb2c7ddf0d302fba4bfc6e97eac9624";

     

       328
       328
       +
         name = "libxslt-1.1.28.tar.gz";

     

       329
       329
       +
         md5 = "9667bf6f9310b957254fdcf6596600b7";

     

       330
       330
       +
         brief = false;

     

       41
       331
        
       }

     

       42
       332
        
       {

     

       43
       333
        
         name = "lp_solve_5.5.tar.gz";

     

       44
       334
        
         md5 = "26b3e95ddf3d9c077c480ea45874b3b8";

     

       335
       335
       +
         brief = false;

     

       45
       336
        
       }

     

       46
       337
        
       {

     

       47
       47
       -
         name = "libloader-1.1.6.zip";

     

       48
       48
       -
         md5 = "97b2d4dba862397f446b217e2b623e71";

     

       338
       338
       +
         name = "mariadb-native-client-1.0.0.tar.bz2";

     

       339
       339
       +
         md5 = "05f84c95b610c21c5fd510d10debcabf";

     

       340
       340
       +
         brief = false;

     

       49
       341
        
       }

     

       50
       342
        
       {

     

       51
       51
       -
         name = "graphite2-1.2.0.tgz";

     

       52
       52
       -
         md5 = "f5ef3f7f10fa8c3542c6a085a233080b";

     

       343
       343
       +
         name = "mdds_0.10.3.tar.bz2";

     

       344
       344
       +
         md5 = "aa5ca9d1ed1082890835afab26400a39";

     

       345
       345
       +
         brief = false;

     

       53
       346
        
       }

     

       54
       347
        
       {

     

       55
       55
       -
         name = "jakarta-tomcat-5.0.30-src.tar.gz";

     

       56
       56
       -
         md5 = "2a177023f9ea8ec8bd00837605c5df1b";

     

       348
       348
       +
         name = "mysql-connector-c++-1.1.0.tar.gz";

     

       349
       349
       +
         md5 = "0981bda6548a8c8233ffce2b6e4b2a23";

     

       350
       350
       +
         brief = false;

     

       57
       351
        
       }

     

       58
       352
        
       {

     

       59
       59
       -
         name = "hyphen-2.8.4.tar.gz";

     

       60
       60
       -
         md5 = "a2f6010987e1c601274ab5d63b72c944";

     

       353
       353
       +
         name = "mythes-1.2.3.tar.gz";

     

       354
       354
       +
         md5 = "46e92b68e31e858512b680b3b61dc4c1";

     

       355
       355
       +
         brief = false;

     

       61
       356
        
       }

     

       62
       357
        
       {

     

       63
       63
       -
         name = "libserializer-1.1.6.zip";

     

       64
       64
       -
         md5 = "f94d9870737518e3b597f9265f4e9803";

     

       358
       358
       +
         name = "neon-0.29.5.tar.gz";

     

       359
       359
       +
         md5 = "ff369e69ef0f0143beb5626164e87ae2";

     

       360
       360
       +
         brief = false;

     

       65
       361
        
       }

     

       66
       362
        
       {

     

       67
       67
       -
         name = "commons-lang-2.3-src.tar.gz";

     

       68
       68
       -
         md5 = "2ae988b339daec234019a7066f96733e";

     

       363
       363
       +
         name = "nss-3.15.3-with-nspr-4.10.2.tar.gz";

     

       364
       364
       +
         md5 = "06beb053e257d9e22641339c905c6eba";

     

       365
       365
       +
         brief = false;

     

       69
       366
        
       }

     

       70
       367
        
       {

     

       71
       71
       -
         name = "libxml-1.1.7.zip";

     

       72
       72
       -
         md5 = "ace6ab49184e329db254e454a010f56d";

     

       368
       368
       +
         name = "openldap-2.4.31.tgz";

     

       369
       369
       +
         md5 = "804c6cb5698db30b75ad0ff1c25baefd";

     

       370
       370
       +
         brief = false;

     

       73
       371
        
       }

     

       74
       372
        
       {

     

       75
       75
       -
         name = "commons-httpclient-3.1-src.tar.gz";

     

       76
       76
       -
         md5 = "2c9b0f83ed5890af02c0df1c1776f39b";

     

       373
       373
       +
         name = "openssl-1.0.1e.tar.gz";

     

       374
       374
       +
         md5 = "66bf6f10f060d561929de96f9dfe5b8c";

     

       375
       375
       +
         brief = false;

     

       376
       376
       +
       }

     

       377
       377
       +
       {

     

       378
       378
       +
         name = "liborcus-0.5.1.tar.bz2";

     

       379
       379
       +
         md5 = "ea2acaf140ae40a87a952caa75184f4d";

     

       380
       380
       +
         brief = false;

     

       381
       381
       +
       }

     

       382
       382
       +
       {

     

       383
       383
       +
         name = "pixman-0.24.4.tar.bz2";

     

       384
       384
       +
         md5 = "c63f411b3ad147db2bcce1bf262a0e02";

     

       385
       385
       +
         brief = false;

     

       386
       386
       +
       }

     

       387
       387
       +
       {

     

       388
       388
       +
         name = "libpng-1.5.10.tar.gz";

     

       389
       389
       +
         md5 = "9e5d864bce8f06751bbd99962ecf4aad";

     

       390
       390
       +
         brief = false;

     

       391
       391
       +
       }

     

       392
       392
       +
       {

     

       393
       393
       +
         name = "poppler-0.22.5.tar.gz";

     

       394
       394
       +
         md5 = "1cd27460f7e3379d1eb109cfd7bcdb39";

     

       395
       395
       +
         brief = false;

     

       396
       396
       +
       }

     

       397
       397
       +
       {

     

       398
       398
       +
         name = "postgresql-9.2.1.tar.bz2";

     

       399
       399
       +
         md5 = "c0b4799ea9850eae3ead14f0a60e9418";

     

       400
       400
       +
         brief = false;

     

       401
       401
       +
       }

     

       402
       402
       +
       {

     

       403
       403
       +
         name = "Python-3.3.3.tar.bz2";

     

       404
       404
       +
         md5 = "f3ebe34d4d8695bf889279b54673e10c";

     

       405
       405
       +
         brief = false;

     

       406
       406
       +
       }

     

       407
       407
       +
       {

     

       408
       408
       +
         name = "raptor2-2.0.9.tar.gz";

     

       409
       409
       +
         md5 = "4ceb9316488b0ea01acf011023cf7fff";

     

       410
       410
       +
         brief = false;

     

       77
       411
        
       }

     

       78
       412
        
       {

     

       79
       79
       -
         name = "commons-codec-1.3-src.tar.gz";

     

       80
       80
       -
         md5 = "af3c3acf618de6108d65fcdc92b492e1";

     

       413
       413
       +
         name = "rasqal-0.9.30.tar.gz";

     

       414
       414
       +
         md5 = "b12c5f9cfdb6b04efce5a4a186b8416b";

     

       415
       415
       +
         brief = false;

     

       81
       416
        
       }

     

       82
       417
        
       {

     

       83
       83
       -
         name = "libformula-1.1.7.zip";

     

       84
       84
       -
         md5 = "3404ab6b1792ae5f16bbd603bd1e1d03";

     

       418
       418
       +
         name = "redland-1.0.16.tar.gz";

     

       419
       419
       +
         md5 = "32f8e1417a64d3c6f2c727f9053f55ea";

     

       420
       420
       +
         brief = false;

     

       85
       421
        
       }

     

       86
       422
        
       {

     

       87
       87
       -
         name = "libcmis-0.3.0.tar.gz";

     

       88
       88
       -
         md5 = "b2371dc7cf4811c9d32146eec913d296";

     

       423
       423
       +
         name = "rhino1_5R5.zip";

     

       424
       424
       +
         md5 = "798b2ffdc8bcfe7bca2cf92b62caf685";

     

       425
       425
       +
         brief = false;

     

       89
       426
        
       }

     

       90
       427
        
       {

     

       91
       428
        
         name = "swingExSrc.zip";

     

       92
       429
        
         md5 = "35c94d2df8893241173de1d16b6034c0";

     

       430
       430
       +
         brief = false;

     

       93
       431
        
       }

     

       94
       432
        
       {

     

       95
       95
       -
         name = "flow-engine-0.9.4.zip";

     

       96
       96
       -
         md5 = "ba2930200c9f019c2d93a8c88c651a0f";

     

       433
       433
       +
         name = "ucpp-1.3.2.tar.gz";

     

       434
       434
       +
         md5 = "0168229624cfac409e766913506961a8";

     

       435
       435
       +
         brief = false;

     

       436
       436
       +
       }

     

       437
       437
       +
       {

     

       438
       438
       +
         name = "vigra1.6.0.tar.gz";

     

       439
       439
       +
         md5 = "d62650a6f908e85643e557a236ea989c";

     

       440
       440
       +
         brief = false;

     

       97
       441
        
       }

     

       98
       442
        
       {

     

       99
       99
       -
         name = "sacjava-1.3.zip";

     

       100
       100
       -
         md5 = "39bb3fcea1514f1369fcfc87542390fd";

     

       443
       443
       +
         name = "libwpd-0.9.9.tar.bz2";

     

       444
       444
       +
         md5 = "a3dcac551fae5ebbec16e844810828c4";

     

       445
       445
       +
         brief = false;

     

       101
       446
        
       }

     

       102
       447
        
       {

     

       103
       103
       -
         name = "libwps-0.2.7.tar.bz2";

     

       104
       104
       -
         md5 = "d197bd6211669a2fa4ca648faf04bcb1";

     

       448
       448
       +
         name = "libwpg-0.2.2.tar.bz2";

     

       449
       449
       +
         md5 = "b85436266b2ac91d351ab5684b181151";

     

       450
       450
       +
         brief = false;

     

       451
       451
       +
       }

     

       452
       452
       +
       {

     

       453
       453
       +
         name = "libwps-0.2.9.tar.bz2";

     

       454
       454
       +
         md5 = "46eb0e7f213ad61bd5dee0c494132cb0";

     

       455
       455
       +
         brief = false;

     

       105
       456
        
       }

     

       106
       457
        
       {

     

       107
       107
       -
         name = "libfonts-1.1.6.zip";

     

       108
       108
       -
         md5 = "3bdf40c0d199af31923e900d082ca2dd";

     

       458
       458
       +
         name = "xsltml_2.1.2.zip";

     

       459
       459
       +
         md5 = "a7983f859eafb2677d7ff386a023bc40";

     

       460
       460
       +
         brief = false;

     

       109
       461
        
       }

     

       110
       462
        
       {

     

       111
       111
       -
         name = "flute-1.1.6.zip";

     

       112
       112
       -
         md5 = "d8bd5eed178db6e2b18eeed243f85aa8";

     

       463
       463
       +
         name = "zlib-1.2.7.tar.bz2";

     

       464
       464
       +
         md5 = "2ab442d169156f34c379c968f3f482dd";

     

       465
       465
       +
         brief = false;

     

       113
       466
        
       }

     

       114
       467
        
       ]

+31

pkgs/applications/office/libreoffice/ooxmlexport.diff

···

       1
       1
       +
       --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx	2014-06-12 12:25:19.000000000 +0400

     

       2
       2
       +
       +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx	2014-06-12 12:25:20.000000000 +0400

     

       3
       3
       +
       @@ -547,17 +547,17 @@

     

       4
       4
       +
            getRun(xParagraph, 5, " After.");

     

       5
       5
       +
        }

     

       6
       6
       +
        

     

       7
       7
       +
       -DECLARE_OOXMLEXPORT_TEST(test1Table1Page, "1-table-1-page.docx")

     

       8
       8
       +
       -{

     

       9
       9
       +
       -    // 2 problem for this document after export:

     

       10
       10
       +
       -    //   - invalid sectPr inserted at the beginning of the page

     

       11
       11
       +
       -    //   - font of empty cell is not preserved, leading to change in rows height

     

       12
       12
       +
       -    uno::Reference<frame::XModel> xModel(mxComponent, uno::UNO_QUERY);

     

       13
       13
       +
       -    uno::Reference<text::XTextViewCursorSupplier> xTextViewCursorSupplier(xModel->getCurrentController(), uno::UNO_QUERY);

     

       14
       14
       +
       -    uno::Reference<text::XPageCursor> xCursor(xTextViewCursorSupplier->getViewCursor(), uno::UNO_QUERY);

     

       15
       15
       +
       -    xCursor->jumpToLastPage();

     

       16
       16
       +
       -    CPPUNIT_ASSERT_EQUAL(sal_Int16(1), xCursor->getPage());

     

       17
       17
       +
       -}

     

       18
       18
       +
       +///   DECLARE_OOXMLEXPORT_TEST(test1Table1Page, "1-table-1-page.docx")

     

       19
       19
       +
       +///   {

     

       20
       20
       +
       +///       // 2 problem for this document after export:

     

       21
       21
       +
       +///       //   - invalid sectPr inserted at the beginning of the page

     

       22
       22
       +
       +///       //   - font of empty cell is not preserved, leading to change in rows height

     

       23
       23
       +
       +///       uno::Reference<frame::XModel> xModel(mxComponent, uno::UNO_QUERY);

     

       24
       24
       +
       +///       uno::Reference<text::XTextViewCursorSupplier> xTextViewCursorSupplier(xModel->getCurrentController(), uno::UNO_QUERY);

     

       25
       25
       +
       +///       uno::Reference<text::XPageCursor> xCursor(xTextViewCursorSupplier->getViewCursor(), uno::UNO_QUERY);

     

       26
       26
       +
       +///       xCursor->jumpToLastPage();

     

       27
       27
       +
       +///       CPPUNIT_ASSERT_EQUAL(sal_Int16(1), xCursor->getPage());

     

       28
       28
       +
       +///   }

     

       29
       29
       +
        

     

       30
       30
       +
        DECLARE_OOXMLEXPORT_TEST(testTextFrames, "textframes.odt")

     

       31
       31
       +
        {

+2 -2

pkgs/applications/science/electronics/kicad/default.nix

···

       5
       5
        
       

     

       6
       6
        
         src = fetchbzr {

     

       7
       7
        
           url = "https://code.launchpad.net/~kicad-stable-committers/kicad/stable";

     

       8
       8
       -
           revision = 4024;

     

       8
       8
       +
           rev = 4024;

     

       9
       9
        
           sha256 = "1sv1l2zpbn6439ccz50p05hvqg6j551aqra551wck9h3929ghly5";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         srcLibrary = fetchbzr {

     

       13
       13
        
           url = "http://bazaar.launchpad.net/~kicad-lib-committers/kicad/library";

     

       14
       14
       -
           revision = 293;

     

       14
       14
       +
           rev = 293;

     

       15
       15
        
           sha256 = "1wn9a4nhqyjzzfkq6xm7ag8n5n10xy7gkq6i7yry7wxini7pzv1i";

     

       16
       16
        
         };

     

       17
       17

+1 -1

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

···

       6
       6
        
       

     

       7
       7
        
         src = fetchhg {

     

       8
       8
        
           url    = "https://bitbucket.org/alanmi/abc";

     

       9
       9
       -
           tag    = "03e221443d71e49e56cbc37f1907ee3b0ff3e7c9";

     

       9
       9
       +
           rev    = "03e221443d71e49e56cbc37f1907ee3b0ff3e7c9";

     

       10
       10
        
           sha256 = "0ahrqg718y7xpv939f6x8w1kqh7wsja4pw8hca7j67j0qjdgb4lm";

     

       11
       11
        
         };

     

       12
       12

+46

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

···

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, smlnj, rsync }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

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

     

       5
       5
       +
         version = "1.7.1";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchurl {

     

       8
       8
       +
           url = "http://twelf.plparty.org/releases/twelf-src-${version}.tar.gz";

     

       9
       9
       +
           sha256 = "0fi1kbs9hrdrm1x4k13angpjasxlyd1gc3ys8ah54i75qbcd9c4i";

     

       10
       10
       +
         };

     

       11
       11
       +
       

     

       12
       12
       +
         buildInputs = [ pkgconfig smlnj rsync ];

     

       13
       13
       +
       

     

       14
       14
       +
         buildPhase = ''

     

       15
       15
       +
           export SMLNJ_HOME=${smlnj}

     

       16
       16
       +
           make smlnj

     

       17
       17
       +
         '';

     

       18
       18
       +
       

     

       19
       19
       +
         installPhase = ''

     

       20
       20
       +
           ensureDir $out/bin

     

       21
       21
       +
           rsync -av bin/* $out/bin/

     

       22
       22
       +
       

     

       23
       23
       +
           ensureDir $out/share/emacs/site-lisp/twelf/

     

       24
       24
       +
           rsync -av emacs/ $out/share/emacs/site-lisp/twelf/

     

       25
       25
       +
       

     

       26
       26
       +
           ensureDir $out/share/twelf/examples

     

       27
       27
       +
           rsync -av examples/ $out/share/twelf/examples/

     

       28
       28
       +
           ensureDir $out/share/twelf/vim

     

       29
       29
       +
           rsync -av vim/ $out/share/twelf/vim/

     

       30
       30
       +
         '';

     

       31
       31
       +
       

     

       32
       32
       +
         meta = {

     

       33
       33
       +
           description = "Twelf logic proof assistant";

     

       34
       34
       +
           longDescription = ''

     

       35
       35
       +
             Twelf is a language used to specify, implement, and prove properties of

     

       36
       36
       +
             deductive systems such as programming languages and logics. Large

     

       37
       37
       +
             research projects using Twelf include the TALT typed assembly language,

     

       38
       38
       +
             a foundational proof-carrying-code system, and a type safety proof for

     

       39
       39
       +
             Standard ML.

     

       40
       40
       +
           '';

     

       41
       41
       +
           homepage = http://twelf.org/wiki/Main_Page;

     

       42
       42
       +
           license = "MIT";

     

       43
       43
       +
           maintainers = with stdenv.lib.maintainers; [ jwiegley ];

     

       44
       44
       +
           platforms = stdenv.lib.platforms.unix;

     

       45
       45
       +
         };

     

       46
       46
       +
       }

+1 -1

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

···

       9
       9
        
       

     

       10
       10
        
         src = fetchdarcs {

     

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

     

       12
       12
       -
           tag = "3.3";

     

       12
       12
       +
           rev = "3.3";

     

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

     

       14
       14
        
         };

     

       15
       15

+3

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

···

       95
       95
        
         darcsToGit = callPackage ./darcs-to-git { };

     

       96
       96
        
       

     

       97
       97
        
         gitflow = callPackage ./gitflow { };

     

       98
       98
       +
       

     

       99
       99
       +
         git-remote-hg = callPackage ./git-remote-hg { };

     

       100
       100
       +
       

     

       98
       101
        
       }

+35

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

···

       1
       1
       +
       { stdenv, fetchgit, mercurial, makeWrapper,

     

       2
       2
       +
         asciidoc, xmlto, dbus, docbook_xsl, docbook_xml_dtd_45, libxslt, libxml2

     

       3
       3
       +
       }:

     

       4
       4
       +
       

     

       5
       5
       +
       stdenv.mkDerivation rec {

     

       6
       6
       +
         rev = "185852eac44c25ae2e8d3b3fb6c9630e754e6363";

     

       7
       7
       +
         version = "v0.2-185852eac44c25ae2e8d3b3fb6c9630e754e6363";

     

       8
       8
       +
         name = "git-remote-hg-${version}";

     

       9
       9
       +
       

     

       10
       10
       +
         src = fetchgit {

     

       11
       11
       +
           inherit rev;

     

       12
       12
       +
           url = "git://github.com/felipec/git-remote-hg.git";

     

       13
       13
       +
           sha256 = "1hc65nvxq7if1imwffyxia0i6vnkbax09gfcl9vq9yffzi8xzzfy";

     

       14
       14
       +
         };

     

       15
       15
       +
       

     

       16
       16
       +
         buildInputs = [ mercurial.python mercurial makeWrapper

     

       17
       17
       +
           asciidoc xmlto dbus docbook_xsl docbook_xml_dtd_45 libxslt libxml2

     

       18
       18
       +
         ];

     

       19
       19
       +
       

     

       20
       20
       +
         doCheck = false;

     

       21
       21
       +
       

     

       22
       22
       +
         installFlags = "HOME=\${out}";

     

       23
       23
       +
       

     

       24
       24
       +
         postInstall = ''

     

       25
       25
       +
           wrapProgram $out/bin/git-remote-hg \

     

       26
       26
       +
             --prefix PYTHONPATH : "$(echo ${mercurial}/lib/python*/site-packages):$(echo ${mercurial.python}/lib/python*/site-packages)${stdenv.lib.concatMapStrings (x: ":$(echo ${x}/lib/python*/site-packages)") mercurial.pythonPackages}"

     

       27
       27
       +
         '';

     

       28
       28
       +
       

     

       29
       29
       +
         meta = with stdenv.lib; {

     

       30
       30
       +
           homepage = "https://github.com/felipec/git-remote-hg";

     

       31
       31
       +
           description = "semi-official Mercurial bridge from Git project, once installed, it allows you to clone, fetch and push to and from Mercurial repositories as if they were Git ones";

     

       32
       32
       +
           license = licenses.gpl2;

     

       33
       33
       +
           maintainers = [ maintainers.garbas ];

     

       34
       34
       +
         };

     

       35
       35
       +
       }

+2 -2

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

···

       10
       10
        
       

     

       11
       11
        
       let

     

       12
       12
        
       

     

       13
       13
       -
         version = "1.9.4";

     

       13
       13
       +
         version = "2.0.1";

     

       14
       14
        
       

     

       15
       15
        
         svn = subversionClient.override { perlBindings = true; };

     

       16
       16
        
       

     
···

       21
       21
        
       

     

       22
       22
        
         src = fetchurl {

     

       23
       23
        
           url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";

     

       24
       24
       -
           sha256 = "1shxa49lsxn81qpfi60wh7rn5ci4zjgljvr0qczdmnqzd8w1zyvb";

     

       24
       24
       +
           sha256 = "1pylqr2qzndy92x3pq8hkwsb3garww2jxb167s6hshrva81s24mb";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
        
         patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ./cert-path.patch ];

+37

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

···

       1
       1
       +
       { stdenv, fetchurl, perl, git, fetchgit }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

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

     

       5
       5
       +
         version = "3.6.1";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchgit {

     

       8
       8
       +
           url    = "git://github.com/sitaramc/gitolite";

     

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

     

       10
       10
       +
           sha256 = "47e0e9c3137b05af96c091494ba918d61d1d3396749a04d63e7949ebcc6c6dca";

     

       11
       11
       +
           leaveDotGit = true;

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         buildInputs = [ perl git ];

     

       15
       15
       +
         buildPhase = "true";

     

       16
       16
       +
       

     

       17
       17
       +
         patchPhase = ''

     

       18
       18
       +
           substituteInPlace ./install --replace " 2>/dev/null" ""

     

       19
       19
       +
           substituteInPlace src/lib/Gitolite/Hooks/PostUpdate.pm \

     

       20
       20
       +
             --replace /usr/bin/perl "/usr/bin/env perl"

     

       21
       21
       +
           substituteInPlace src/lib/Gitolite/Hooks/Update.pm \

     

       22
       22
       +
             --replace /usr/bin/perl "/usr/bin/env perl"

     

       23
       23
       +
         '';

     

       24
       24
       +
         installPhase = ''

     

       25
       25
       +
           mkdir -p $out/bin

     

       26
       26
       +
           git tag v${version} # Gitolite requires a tag for the version information :/

     

       27
       27
       +
           perl ./install -to $out/bin

     

       28
       28
       +
         '';

     

       29
       29
       +
       

     

       30
       30
       +
         meta = {

     

       31
       31
       +
           description = "Finely-grained git repository hosting";

     

       32
       32
       +
           homepage    = "http://gitolite.com/gitolite/index.html";

     

       33
       33
       +
           license     = stdenv.lib.licenses.gpl2;

     

       34
       34
       +
           platforms   = stdenv.lib.platforms.unix;

     

       35
       35
       +
           maintainers = [ stdenv.lib.maintainers.thoughtpolice ];

     

       36
       36
       +
         };

     

       37
       37
       +
       }

+1 -1

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

···

       5
       5
        
        

     

       6
       6
        
         src = fetchhg {

     

       7
       7
        
           url = http://hg.suckless.org/tabbed;

     

       8
       8
       -
           tag = "d7542a6f6dc5";

     

       8
       8
       +
           rev = "d7542a6f6dc5";

     

       9
       9
        
           sha256 = "1963jsazfmh5k7923c1mfwppz1xbh48z16j0sa64fiscq22as2gj";

     

       10
       10
        
         };

     

       11
       11

+1 -3

pkgs/build-support/cabal/default.nix

···

       82
       82
        
                   # the default download location for Cabal packages is Hackage,

     

       83
       83
        
                   # you still have to specify the checksum

     

       84
       84
        
                   src = fetchurl {

     

       85
       85
       -
                     # cannot use mirrors system because of subtly different directory structures

     

       86
       86
       -
                     urls = ["http://hackage.haskell.org/packages/archive/${self.pname}/${self.version}/${self.fname}.tar.gz"

     

       87
       87
       -
                             "http://hdiff.luite.com/packages/archive/${self.pname}/${self.fname}.tar.gz"];

     

       85
       85
       +
                     url = "mirror://hackage/${self.pname}/${self.fname}.tar.gz";

     

       88
       86
        
                     inherit (self) sha256;

     

       89
       87
        
                   };

     

       90
       88

+2 -2

pkgs/build-support/fetchbzr/builder.sh

···

       1
       1
        
       source "$stdenv/setup"

     

       2
       2
        
       

     

       3
       3
       -
       header "exporting \`$url' (revision $revision) into \`$out'"

     

       3
       3
       +
       header "exporting \`$url' (revision $rev) into \`$out'"

     

       4
       4
        
       

     

       5
       5
        
       # Perform a lightweight checkout so that we don't end up importing

     

       6
       6
        
       # all the repository's history.

     

       7
       7
       -
       bzr -Ossl.cert_reqs=none export -r "$revision" --format=dir "$out" "$url"

     

       7
       7
       +
       bzr -Ossl.cert_reqs=none export -r "$rev" --format=dir "$out" "$url"

     

       8
       8
        
       

     

       9
       9
        
       stopNest

+2 -2

pkgs/build-support/fetchbzr/default.nix

···

       1
       1
        
       { stdenv, bazaar }: 

     

       2
       2
       -
       { url, revision, sha256 }:

     

       2
       2
       +
       { url, rev, sha256 }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation {

     

       5
       5
        
         name = "bzr-export";

     
···

       11
       11
        
         outputHashMode = "recursive";

     

       12
       12
        
         outputHash = sha256;

     

       13
       13
        
         

     

       14
       14
       -
         inherit url revision;

     

       14
       14
       +
         inherit url rev;

     

       15
       15
        
       }

+3 -3

pkgs/build-support/fetchdarcs/builder.sh

···

       2
       2
        
       

     

       3
       3
        
       tagtext=""

     

       4
       4
        
       tagflags=""

     

       5
       5
       -
       if test -n "$tag"; then

     

       6
       6
       -
           tagtext="(tag $tag) "

     

       7
       7
       -
           tagflags="--tag=$tag"

     

       5
       5
       +
       if test -n "$rev"; then

     

       6
       6
       +
           tagtext="(tag $rev) "

     

       7
       7
       +
           tagflags="--tag=$rev"

     

       8
       8
        
       elif test -n "$context"; then

     

       9
       9
        
           tagtext="(context) "

     

       10
       10
        
           tagflags="--context=$context"

+2 -2

pkgs/build-support/fetchdarcs/default.nix

···

       1
       1
       -
       {stdenv, darcs, nix}: {url, tag ? null, context ? null, md5 ? "", sha256 ? ""}:

     

       1
       1
       +
       {stdenv, darcs, nix}: {url, rev ? null, context ? null, md5 ? "", sha256 ? ""}:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation {

     

       4
       4
        
         name = "fetchdarcs";

     
···

       9
       9
        
         outputHashMode = "recursive";

     

       10
       10
        
         outputHash = if sha256 == "" then md5 else sha256;

     

       11
       11
        
         

     

       12
       12
       -
         inherit url tag context;

     

       12
       12
       +
         inherit url rev context;

     

       13
       13
        
       }

+3 -1

pkgs/build-support/fetchgit/nix-prefetch-git

···

       217
       217
        
                   fi;;

     

       218
       218
        
           esac

     

       219
       219
        
       

     

       220
       220
       -
           echo "git revision is $(cd $dir && (git rev-parse $rev 2> /dev/null || git rev-parse refs/heads/fetchgit) | tail -n1)"

     

       220
       220
       +
           local full_revision=$(cd $dir && (git rev-parse $rev 2> /dev/null || git rev-parse refs/heads/fetchgit) | tail -n1)

     

       221
       221
       +
           echo "git revision is $full_revision"

     

       222
       222
       +
           echo "git human-readable version is $(cd $dir && (git describe $full_revision 2> /dev/null || git describe --tags $full_revision 2> /dev/null || echo -- none --))"

     

       221
       223
        
       

     

       222
       224
        
           # Allow doing additional processing before .git removal

     

       223
       225
        
           eval "$NIX_PREFETCH_GIT_CHECKOUT_HOOK"

+2 -2

pkgs/build-support/fetchhg/builder.sh

···

       1
       1
        
       source $stdenv/setup

     

       2
       2
       -
       header "getting $url${tag:+ ($tag)} into $out"

     

       2
       2
       +
       header "getting $url${rev:+ ($rev)} into $out"

     

       3
       3
        
       

     

       4
       4
        
       hg clone --insecure "$url" hg-clone

     

       5
       5
        
       

     

       6
       6
       -
       hg archive -q -y ${tag:+-r "$tag"} --cwd hg-clone $out

     

       6
       6
       +
       hg archive -q -y ${rev:+-r "$rev"} --cwd hg-clone $out

     

       7
       7
        
       rm -f $out/.hg_archival.txt

     

       8
       8
        
       

     

       9
       9
        
       stopNest

+2 -2

pkgs/build-support/fetchhg/default.nix

···

       1
       1
       -
       {stdenv, mercurial, nix}: {name ? null, url, tag ? null, md5 ? null, sha256 ? null}:

     

       1
       1
       +
       {stdenv, mercurial, nix}: {name ? null, url, rev ? null, md5 ? null, sha256 ? null}:

     

       2
       2
        
       

     

       3
       3
        
       # TODO: statically check if mercurial as the https support if the url starts woth https.

     

       4
       4
        
       stdenv.mkDerivation {

     
···

       13
       13
        
         outputHashMode = "recursive";

     

       14
       14
        
         outputHash = if md5 != null then md5 else sha256;

     

       15
       15
        
         

     

       16
       16
       -
         inherit url tag;

     

       16
       16
       +
         inherit url rev;

     

       17
       17
        
         preferLocalBuild = true;

     

       18
       18
        
       }

+6

pkgs/build-support/fetchurl/mirrors.nix

···

       20
       20
        
           http://kent.dl.sourceforge.net/sourceforge/

     

       21
       21
        
         ];

     

       22
       22
        
       

     

       23
       23
       +
         # SourceForge.jp.

     

       24
       24
       +
         sourceforgejp = [

     

       25
       25
       +
           http://osdn.dl.sourceforge.jp/

     

       26
       26
       +
           http://jaist.dl.sourceforge.jp/

     

       27
       27
       +
         ];

     

       28
       28
       +
       

     

       23
       29
        
         # GNU (http://www.gnu.org/prep/ftp.html).

     

       24
       30
        
         gnu = [

     

       25
       31
        
           # This one redirects to a (supposedly) nearby and (supposedly) up-to-date

+153

pkgs/build-support/fetchzip/nix-prefetch-zip

···

       1
       1
       +
       #! /bin/sh -e

     

       2
       2
       +
       

     

       3
       3
       +
       usage(){

     

       4
       4
       +
           echo  >&2 "syntax: nix-prefetch-zip [OPTIONS] [URL [EXPECTED-HASH]]

     

       5
       5
       +
       

     

       6
       6
       +
       Options:

     

       7
       7
       +
             --url         url    The url of the archive to fetch.

     

       8
       8
       +
             --name        name   The name to use for the store path (defaults to \`basename \$url\`).

     

       9
       9
       +
             --hash        hash   The hash of unpacked archive.

     

       10
       10
       +
             --hash-type   type   Use the specified cryptographic hash algorithm, which can be one of md5, sha1, and sha256.

     

       11
       11
       +
             --leave-root         Keep the root directory of the archive.

     

       12
       12
       +
             --help               Show this help text.

     

       13
       13
       +
       "

     

       14
       14
       +
           exit 1

     

       15
       15
       +
       }

     

       16
       16
       +
       

     

       17
       17
       +
       

     

       18
       18
       +
       argi=0

     

       19
       19
       +
       argfun=""

     

       20
       20
       +
       for arg; do

     

       21
       21
       +
         if test -z "$argfun"; then

     

       22
       22
       +
           case $arg in

     

       23
       23
       +
             --url) argfun=set_url;;

     

       24
       24
       +
             --name) argfun=set_name;;

     

       25
       25
       +
             --hash) argfun=set_expHash;;

     

       26
       26
       +
             --hash-type) argfun=set_hashType;;

     

       27
       27
       +
             --leave-root) leaveRoot=true;;

     

       28
       28
       +
             --help) usage;;

     

       29
       29
       +
             *) argi=$(($argi + 1))

     

       30
       30
       +
                case $argi in

     

       31
       31
       +
                  1) url=$arg;;

     

       32
       32
       +
                  2) rev=$arg;;

     

       33
       33
       +
                  3) expHash=$arg;;

     

       34
       34
       +
                  *) echo "Unexpected argument: $arg" >&2

     

       35
       35
       +
                     usage

     

       36
       36
       +
                     ;;

     

       37
       37
       +
                esac

     

       38
       38
       +
                ;;

     

       39
       39
       +
           esac

     

       40
       40
       +
         else

     

       41
       41
       +
           case $argfun in

     

       42
       42
       +
             set_*)

     

       43
       43
       +
               var=$(echo $argfun | sed 's,^set_,,')

     

       44
       44
       +
               eval "$var=\$arg"

     

       45
       45
       +
               ;;

     

       46
       46
       +
           esac

     

       47
       47
       +
           argfun=""

     

       48
       48
       +
         fi

     

       49
       49
       +
       done

     

       50
       50
       +
       

     

       51
       51
       +
       if [ -z "$url" ]; then

     

       52
       52
       +
         echo "Error: No --url flag given" >&2

     

       53
       53
       +
         usage

     

       54
       54
       +
       fi

     

       55
       55
       +
       

     

       56
       56
       +
       if [ -z "$name" ]; then

     

       57
       57
       +
         name=$(basename "$url")

     

       58
       58
       +
       fi

     

       59
       59
       +
       

     

       60
       60
       +
       if test -z "$hashType"; then

     

       61
       61
       +
         hashType=sha256

     

       62
       62
       +
       fi

     

       63
       63
       +
       

     

       64
       64
       +
       hashFormat="--base32"

     

       65
       65
       +
       

     

       66
       66
       +
       tmp=$(mktemp -d 2>/dev/null || mktemp -d -t "$$")

     

       67
       67
       +
       trap "rm -rf '$tmp'" EXIT

     

       68
       68
       +
       

     

       69
       69
       +
       unpackDir=$tmp/unpacked/$name

     

       70
       70
       +
       mkdir -p $unpackDir

     

       71
       71
       +
       downloadedFile=$tmp/$name

     

       72
       72
       +
       

     

       73
       73
       +
       unpackFile() {

     

       74
       74
       +
         local curSrc="$1"

     

       75
       75
       +
       

     

       76
       76
       +
         case "$curSrc" in

     

       77
       77
       +
           *.tar.xz | *.tar.lzma)

     

       78
       78
       +
             # Don't rely on tar knowing about .xz.

     

       79
       79
       +
             xz -d < $curSrc | tar xf -

     

       80
       80
       +
             ;;

     

       81
       81
       +
           *.tar | *.tar.* | *.tgz | *.tbz2)

     

       82
       82
       +
             # GNU tar can automatically select the decompression method

     

       83
       83
       +
             # (info "(tar) gzip").

     

       84
       84
       +
             tar xf $curSrc

     

       85
       85
       +
             ;;

     

       86
       86
       +
           *.zip)

     

       87
       87
       +
             unzip -qq $curSrc

     

       88
       88
       +
             ;;

     

       89
       89
       +
           *)

     

       90
       90
       +
             echo "source archive $curSrc has unknown type" >&2

     

       91
       91
       +
             exit 1

     

       92
       92
       +
             ;;

     

       93
       93
       +
         esac

     

       94
       94
       +
       }

     

       95
       95
       +
       

     

       96
       96
       +
       # If the hash was given, a file with that hash may already be in the

     

       97
       97
       +
       # store.

     

       98
       98
       +
       if test -n "$expHash"; then

     

       99
       99
       +
         finalPath=$(nix-store --print-fixed-path --recursive "$hashType" "$expHash" "$name")

     

       100
       100
       +
         if ! nix-store --check-validity "$finalPath" 2> /dev/null; then

     

       101
       101
       +
           finalPath=

     

       102
       102
       +
         fi

     

       103
       103
       +
         hash=$expHash

     

       104
       104
       +
       fi

     

       105
       105
       +
       

     

       106
       106
       +
       # If we don't know the hash or a path with that hash doesn't exist,

     

       107
       107
       +
       # download the file and add it to the store.

     

       108
       108
       +
       if test -z "$finalPath"; then

     

       109
       109
       +
         curl="curl \

     

       110
       110
       +
          --location --max-redirs 20 \

     

       111
       111
       +
          --disable-epsv \

     

       112
       112
       +
          --insecure"

     

       113
       113
       +
       

     

       114
       114
       +
         if ! $curl --fail "$url" --output "$downloadedFile"; then

     

       115
       115
       +
           echo "error: could not download $url" >&2

     

       116
       116
       +
           exit 1

     

       117
       117
       +
         fi

     

       118
       118
       +
       

     

       119
       119
       +
         cd $unpackDir

     

       120
       120
       +
         unpackFile "$downloadedFile"

     

       121
       121
       +
       

     

       122
       122
       +
         # FIXME: handle zip files that contain a single regular file.

     

       123
       123
       +
         if [ -z "$leaveRoot" ]; then

     

       124
       124
       +
           shopt -s dotglob

     

       125
       125
       +
           if [ $(ls -d $unpackDir/* | wc -l) != 1 ]; then

     

       126
       126
       +
             echo "error: zip file must contain a single directory."

     

       127
       127
       +
             exit 1

     

       128
       128
       +
           fi

     

       129
       129
       +
           fn=$(cd "$unpackDir" && echo *)

     

       130
       130
       +
           mv $unpackDir/$fn/* "$unpackDir/"

     

       131
       131
       +
           rmdir "$unpackDir/$fn"

     

       132
       132
       +
         fi

     

       133
       133
       +
       

     

       134
       134
       +
         # Compute the hash.

     

       135
       135
       +
         hash=$(nix-hash --type $hashType $hashFormat $unpackDir)

     

       136
       136
       +
         if ! test -n "$QUIET"; then echo "hash is $hash" >&2; fi

     

       137
       137
       +
       

     

       138
       138
       +
         # Add the downloaded file to the Nix store.

     

       139
       139
       +
         finalPath=$(nix-store --add-fixed --recursive "$hashType" $unpackDir)

     

       140
       140
       +
       

     

       141
       141
       +
         if test -n "$expHash" -a "$expHash" != "$hash"; then

     

       142
       142
       +
           echo "hash mismatch for URL \`$url'"

     

       143
       143
       +
           exit 1

     

       144
       144
       +
         fi

     

       145
       145
       +
       fi

     

       146
       146
       +
       

     

       147
       147
       +
       if ! test -n "$QUIET"; then echo "path is $finalPath" >&2; fi

     

       148
       148
       +
       

     

       149
       149
       +
       echo $hash

     

       150
       150
       +
       

     

       151
       151
       +
       if test -n "$PRINT_PATH"; then

     

       152
       152
       +
         echo $finalPath

     

       153
       153
       +
       fi

+18

pkgs/build-support/kernel/paths-from-graph.pl

···

       1
       1
       +
       # Parses a /nix/store/*-closure file and prints

     

       2
       2
       +
       # various information.

     

       3
       3
       +
       # By default, the nodes in the graph are printed to stdout.

     

       4
       4
       +
       # If the environment variable printManifest is set,

     

       5
       5
       +
       # then the graph is written as a manifest.

     

       6
       6
       +
       # If printRegistration is set, then the graph is written

     

       7
       7
       +
       # as a registration file for a manifest is written

     

       8
       8
       +
       # in the `nix-store --load-db' format.

     

       9
       9
       +
       

     

       1
       10
        
       use strict;

     

       2
       11
        
       use File::Basename;

     

       3
       12
        
       

     

       4
       13
        
       my %storePaths;

     

       5
       14
        
       my %refs;

     

       6
       15
        
       

     

       16
       16
       +
       # Each argument on the command line is a graph file.

     

       17
       17
       +
       # The graph file contains line-triples and a variable

     

       18
       18
       +
       # number of references:

     

       19
       19
       +
       # <store-path>

     

       20
       20
       +
       # <deriver>

     

       21
       21
       +
       # <count>

     

       22
       22
       +
       # <ref-#1>

     

       23
       23
       +
       # ...

     

       24
       24
       +
       # <ref-#count>

     

       7
       25
        
       foreach my $graph (@ARGV) {

     

       8
       26
        
           open GRAPH, "<$graph" or die;

     

       9
       27

+1 -1

pkgs/build-support/upstream-updater/update-walker-service-specific.sh

···

       5
       5
        
       }

     

       6
       6
        
       

     

       7
       7
        
       SF_version_dir () {

     

       8
       8
       -
         version_link 'http://sourceforge.net/.+/[0-9.]+/$'

     

       8
       8
       +
         version_link 'http://sourceforge.net/.+/'"$1"'[0-9.]+/$'

     

       9
       9
        
       }

     

       10
       10
        
       

     

       11
       11
        
       GH_latest () {

+49 -4

pkgs/build-support/upstream-updater/update-walker.sh

···

       2
       2
        
       

     

       3
       3
        
       own_dir="$(cd "$(dirname "$0")"; pwd)"

     

       4
       4
        
       

     

       5
       5
       +
       URL_WAS_SET=

     

       6
       6
       +
       DL_URL_RE=

     

       5
       7
        
       CURRENT_URL=

     

       6
       8
        
       CURRENT_REV=

     

       7
       9
        
       PREFETCH_COMMAND=

     

       8
       10
        
       NEED_TO_CHOOSE_URL=1

     

       9
       11
        
       

     

       10
       12
        
       url () {

     

       13
       13
       +
         URL_WAS_SET=1

     

       11
       14
        
         CURRENT_URL="$1"

     

       15
       15
       +
       }

     

       16
       16
       +
       

     

       17
       17
       +
       dl_url_re () {

     

       18
       18
       +
         DL_URL_RE="$1"

     

       12
       19
        
       }

     

       13
       20
        
       

     

       14
       21
        
       version_unpack () {

     
···

       101
       108
        
       

     

       102
       109
        
       ensure_attribute_name () {

     

       103
       110
        
         echo "Ensuring attribute name. CURRENT_ATTRIBUTE_NAME: $CURRENT_ATTRIBUTE_NAME" >&2

     

       111
       111
       +
         ensure_name

     

       104
       112
        
         [ -z "$CURRENT_ATTRIBUTE_NAME" ] && attribute_name "$CURRENT_NAME"

     

       105
       113
        
         echo "Resulting attribute name: $CURRENT_ATTRIBUTE_NAME"

     

       106
       114
        
       }

     

       107
       115
        
       

     

       116
       116
       +
       ensure_url () {

     

       117
       117
       +
         echo "Ensuring starting URL. CURRENT_URL: $CURRENT_URL" >&2

     

       118
       118
       +
         ensure_attribute_name

     

       119
       119
       +
         [ -z "$CURRENT_URL" ] && CURRENT_URL="$(retrieve_meta downloadPage)"

     

       120
       120
       +
         [ -z "$CURRENT_URL" ] && CURRENT_URL="$(retrieve_meta downloadpage)"

     

       121
       121
       +
         [ -z "$CURRENT_URL" ] && CURRENT_URL="$(retrieve_meta homepage)"

     

       122
       122
       +
         echo "Resulting URL: $CURRENT_URL"

     

       123
       123
       +
       }

     

       124
       124
       +
       

     

       108
       125
        
       ensure_choice () {

     

       109
       126
        
         echo "Ensuring that choice is made." >&2

     

       110
       127
        
         echo "NEED_TO_CHOOSE_URL: [$NEED_TO_CHOOSE_URL]." >&2

     

       111
       128
        
         echo "CURRENT_URL: $CURRENT_URL" >&2

     

       129
       129
       +
         [ -z "$URL_WAS_SET" ] && [ -z "$CURRENT_URL" ] && ensure_url

     

       112
       130
        
         [ -n "$NEED_TO_CHOOSE_URL" ] && {

     

       113
       113
       -
           version_link '[.]tar[.]([^./])+$'

     

       131
       131
       +
           version_link "${DL_URL_RE:-[.]tar[.]([^./])+\$}"

     

       114
       132
        
           unset NEED_TO_CHOOSE_URL

     

       115
       133
        
         }

     

       116
       134
        
         [ -z "$CURRENT_URL" ] && {

     
···

       153
       171
        
         echo "CURRENT_ATTRIBUTE_NAME: $CURRENT_ATTRIBUTE_NAME" >&2

     

       154
       172
        
       }

     

       155
       173
        
       

     

       174
       174
       +
       retrieve_meta () {

     

       175
       175
       +
         nix-instantiate --eval-only '<nixpkgs>' -A "$CURRENT_ATTRIBUTE_NAME".meta."$1" | xargs

     

       176
       176
       +
       }

     

       177
       177
       +
       

     

       156
       178
        
       retrieve_version () {

     

       157
       157
       -
         PACKAGED_VERSION="$(nix-instantiate --eval-only '<nixpkgs>' -A "$CURRENT_ATTRIBUTE_NAME".meta.version | xargs)"

     

       179
       179
       +
         PACKAGED_VERSION="$(retrieve_meta version)"

     

       180
       180
       +
       }

     

       181
       181
       +
       

     

       182
       182
       +
       ensure_dl_url_re () {

     

       183
       183
       +
         echo "Ensuring DL_URL_RE. DL_URL_RE: $DL_URL_RE" >&2

     

       184
       184
       +
         [ -z "$DL_URL_RE" ] && dl_url_re "$(retrieve_meta downloadURLRegexp)"

     

       185
       185
       +
         echo "DL_URL_RE: $DL_URL_RE" >&2

     

       158
       186
        
       }

     

       159
       187
        
       

     

       160
       188
        
       directory_of () {

     
···

       256
       284
        
         CONFIG_DIR="$(directory_of "$1")"

     

       257
       285
        
         CONFIG_NAME="$(basename "$1")"

     

       258
       286
        
         BEGIN_EXPRESSION='# Generated upstream information';

     

       259
       259
       -
         source "$CONFIG_DIR/$CONFIG_NAME"

     

       260
       260
       -
         ensure_name

     

       287
       287
       +
         if [ -f  "$CONFIG_DIR/$CONFIG_NAME" ] &&

     

       288
       288
       +
             [ "${CONFIG_NAME}" = "${CONFIG_NAME%.nix}" ]; then

     

       289
       289
       +
           source "$CONFIG_DIR/$CONFIG_NAME"

     

       290
       290
       +
         else

     

       291
       291
       +
           CONFIG_NAME="${CONFIG_NAME%.nix}"

     

       292
       292
       +
           ensure_attribute_name

     

       293
       293
       +
           [ -n "$(retrieve_meta updateWalker)" ] ||

     

       294
       294
       +
               [ -n "$FORCE_UPDATE_WALKER" ] || {

     

       295
       295
       +
             echo "Error: package not marked as safe for update-walker" >&2

     

       296
       296
       +
             echo "Set FORCE_UPDATE_WALKER=1 to override" >&2

     

       297
       297
       +
             exit 1;

     

       298
       298
       +
           }

     

       299
       299
       +
           [ -z "$(retrieve_meta fullRegenerate)" ] && eval "

     

       300
       300
       +
             do_overwrite(){

     

       301
       301
       +
               do_overwrite_just_version

     

       302
       302
       +
             }

     

       303
       303
       +
           "

     

       304
       304
       +
         fi

     

       261
       305
        
         ensure_attribute_name

     

       262
       306
        
         retrieve_version

     

       307
       307
       +
         ensure_dl_url_re

     

       263
       308
        
         ensure_choice

     

       264
       309
        
         ensure_version

     

       265
       310
        
         ensure_target

+3

pkgs/data/fonts/anonymous-pro/default.nix

···

       40
       40
        
           ];

     

       41
       41
        
           platforms = with a.lib.platforms;

     

       42
       42
        
             all;

     

       43
       43
       +
           license = with a.lib.licenses; ofl;

     

       44
       44
       +
           hydraPlatforms = [];

     

       45
       45
       +
           homepage = "http://www.marksimonson.com/fonts/view/anonymous-pro";

     

       43
       46
        
         };

     

       44
       47
        
         passthru = {

     

       45
       48
        
           updateInfo = {

+33

pkgs/data/fonts/ipafont/default.nix

···

       1
       1
       +
       { stdenv, fetchurl, unzip }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation {

     

       4
       4
       +
         name = "ipafont-003.03";

     

       5
       5
       +
       

     

       6
       6
       +
         src = fetchurl {

     

       7
       7
       +
           url = "http://ipafont.ipa.go.jp/ipafont/IPAfont00303.php";

     

       8
       8
       +
           sha256 = "f755ed79a4b8e715bed2f05a189172138aedf93db0f465b4e20c344a02766fe5";

     

       9
       9
       +
         };

     

       10
       10
       +
       

     

       11
       11
       +
         buildInputs = [ unzip ];

     

       12
       12
       +
       

     

       13
       13
       +
         unpackPhase = ''

     

       14
       14
       +
           unzip $src

     

       15
       15
       +
         '';

     

       16
       16
       +
       

     

       17
       17
       +
         installPhase = ''

     

       18
       18
       +
           mkdir -p $out/share/fonts/opentype

     

       19
       19
       +
           cp ./IPAfont00303/*.ttf $out/share/fonts/opentype/

     

       20
       20
       +
         '';

     

       21
       21
       +
       

     

       22
       22
       +
         meta = {

     

       23
       23
       +
           description = "Japanese font package with Mincho and Gothic fonts";

     

       24
       24
       +
           longDescription = ''

     

       25
       25
       +
             IPAFont is a Japanese font developed by the Information-technology

     

       26
       26
       +
             Promotion Agency of Japan. It provides both Mincho and Gothic fonts,

     

       27
       27
       +
             suitable for both display and printing.

     

       28
       28
       +
           '';

     

       29
       29
       +
           homepage = http://ipafont.ipa.go.jp/ipafont/;

     

       30
       30
       +
           license = stdenv.lib.licenses.ipa;

     

       31
       31
       +
           maintainers = [ stdenv.lib.maintainers.auntie ];

     

       32
       32
       +
         };

     

       33
       33
       +
       }

+34

pkgs/data/fonts/kochi-substitute-naga10/default.nix

···

       1
       1
       +
       { stdenv, fetchurl }:

     

       2
       2
       +
       

     

       3
       3
       +
       let version = "20030809";

     

       4
       4
       +
       in

     

       5
       5
       +
       stdenv.mkDerivation {

     

       6
       6
       +
         name = "kochi-substitute-naga10-${version}";

     

       7
       7
       +
       

     

       8
       8
       +
         src = fetchurl {

     

       9
       9
       +
           url = "mirror://sourceforgejp/efont/5411/kochi-substitute-${version}.tar.bz2";

     

       10
       10
       +
           sha256 = "f4d69b24538833bf7e2c4de5e01713b3f1440960a6cc2a5993cb3c68cd23148c";

     

       11
       11
       +
         };

     

       12
       12
       +
       

     

       13
       13
       +
         sourceRoot = "kochi-substitute-${version}";

     

       14
       14
       +
       

     

       15
       15
       +
         installPhase = ''

     

       16
       16
       +
           mkdir -p $out/share/fonts/truetype

     

       17
       17
       +
           cp ./kochi-gothic-subst.ttf $out/share/fonts/truetype/kochi-gothic-subst-naga10.ttf

     

       18
       18
       +
           cp ./kochi-mincho-subst.ttf $out/share/fonts/truetype/kochi-mincho-subst-naga10.ttf

     

       19
       19
       +
         '';

     

       20
       20
       +
       

     

       21
       21
       +
         meta = {

     

       22
       22
       +
           description = "Japanese font, non-free replacement for MS Gothic and MS Mincho.";

     

       23
       23
       +
           longDescription = ''

     

       24
       24
       +
             Kochi Gothic and Kochi Mincho were developed as free replacements for the

     

       25
       25
       +
             MS Gothic and MS Mincho fonts from Microsoft. This version of the fonts

     

       26
       26
       +
             includes some non-free glyphs from the naga10 font, which stipulate that

     

       27
       27
       +
             this font may not be sold commercially. See kochi-substitute for the free

     

       28
       28
       +
             Debian version.

     

       29
       29
       +
           '';

     

       30
       30
       +
           homepage = http://sourceforge.jp/projects/efont/;

     

       31
       31
       +
           license = stdenv.lib.licenses.unfreeRedistributable;

     

       32
       32
       +
           maintainers = [ stdenv.lib.maintainers.auntie ];

     

       33
       33
       +
         };

     

       34
       34
       +
       }

+43

pkgs/data/fonts/kochi-substitute/default.nix

···

       1
       1
       +
       { stdenv, fetchurl, dpkg }:

     

       2
       2
       +
       

     

       3
       3
       +
       let version = "20030809";

     

       4
       4
       +
       in

     

       5
       5
       +
       stdenv.mkDerivation {

     

       6
       6
       +
         name = "kochi-substitute-${version}";

     

       7
       7
       +
       

     

       8
       8
       +
         src = fetchurl {

     

       9
       9
       +
           url = "mirror://debian/pool/main/t/ttf-kochi/ttf-kochi-gothic_${version}-15_all.deb";

     

       10
       10
       +
           sha256 = "6e2311cd8e880a9328e4d3eef34a1c1f024fc87fba0dce177a0e1584a7360fea";

     

       11
       11
       +
         };

     

       12
       12
       +
       

     

       13
       13
       +
         src2 = fetchurl {

     

       14
       14
       +
           url = "mirror://debian/pool/main/t/ttf-kochi/ttf-kochi-mincho_${version}-15_all.deb";

     

       15
       15
       +
           sha256 = "91ce6c993a3a0f77ed85db76f62ce18632b4c0cbd8f864676359a17ae5e6fa3c";

     

       16
       16
       +
         };

     

       17
       17
       +
       

     

       18
       18
       +
         buildInputs = [ dpkg ];

     

       19
       19
       +
       

     

       20
       20
       +
         unpackCmd = ''

     

       21
       21
       +
           dpkg-deb --fsys-tarfile $src | tar xf - ./usr/share/fonts/truetype/kochi/kochi-gothic-subst.ttf

     

       22
       22
       +
           dpkg-deb --fsys-tarfile $src2 | tar xf - ./usr/share/fonts/truetype/kochi/kochi-mincho-subst.ttf

     

       23
       23
       +
         '';

     

       24
       24
       +
       

     

       25
       25
       +
         installPhase = ''

     

       26
       26
       +
           mkdir -p $out/share/fonts/truetype

     

       27
       27
       +
           cp ./share/fonts/truetype/kochi/kochi-gothic-subst.ttf $out/share/fonts/truetype/

     

       28
       28
       +
           cp ./share/fonts/truetype/kochi/kochi-mincho-subst.ttf $out/share/fonts/truetype/

     

       29
       29
       +
         '';

     

       30
       30
       +
       

     

       31
       31
       +
         meta = {

     

       32
       32
       +
           description = "Japanese font, a free replacement for MS Gothic and MS Mincho.";

     

       33
       33
       +
           longDescription = ''

     

       34
       34
       +
             Kochi Gothic and Kochi Mincho were developed as free replacements for the

     

       35
       35
       +
             MS Gothic and MS Mincho fonts from Microsoft. These are the Debian

     

       36
       36
       +
             versions of the fonts, which remove some non-free glyphs that were added

     

       37
       37
       +
             from the naga10 font.

     

       38
       38
       +
           '';

     

       39
       39
       +
           homepage = http://sourceforge.jp/projects/efont/;

     

       40
       40
       +
           license = stdenv.lib.licenses.wadalab;

     

       41
       41
       +
           maintainers = [ stdenv.lib.maintainers.auntie ];

     

       42
       42
       +
         };

     

       43
       43
       +
       }

+2 -5

pkgs/desktops/gnome-2/desktop/vte/default.nix

···

       11
       11
        
       

     

       12
       12
        
         patches = [

     

       13
       13
        
           ./alt.patch

     

       14
       14
       -
           ( fetchurl { # CVE-2012-2738

     

       15
       15
       -
             url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/x11-libs/"

     

       16
       16
       -
               + "vte/files/vte-0.28.2-limit-arguments.patch?revision=1.1";

     

       17
       17
       -
             sha256 = "1s8agx74wa7wlv9ybd5h3dp4hzf4ddg7piyan37g2ab3fnvg4jhn";

     

       18
       18
       -
           } )

     

       14
       14
       +
           # CVE-2012-2738

     

       15
       15
       +
           ./vte-0.28.2-limit-arguments.patch

     

       19
       16
        
         ];

     

       20
       17
        
       

     

       21
       18
        
         buildInputs = [ intltool pkgconfig glib gtk ncurses ] ++

+40

pkgs/desktops/gnome-2/desktop/vte/vte-0.28.2-limit-arguments.patch

···

       1
       1
       +
       From feeee4b5832b17641e505b7083e0d299fdae318e Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Christian Persch <chpe@gnome.org>

     

       3
       3
       +
       Date: Sat, 19 May 2012 17:36:09 +0000

     

       4
       4
       +
       Subject: emulation: Limit integer arguments to 65535

     

       5
       5
       +
       

     

       6
       6
       +
       To guard against malicious sequences containing excessively big numbers,

     

       7
       7
       +
       limit all parsed numbers to 16 bit range. Doing this here in the parsing

     

       8
       8
       +
       routine is a catch-all guard; this doesn't preclude enforcing

     

       9
       9
       +
       more stringent limits in the handlers themselves.

     

       10
       10
       +
       

     

       11
       11
       +
       https://bugzilla.gnome.org/show_bug.cgi?id=676090

     

       12
       12
       +
       ---

     

       13
       13
       +
       diff --git a/src/table.c b/src/table.c

     

       14
       14
       +
       index 140e8c8..85cf631 100644

     

       15
       15
       +
       --- a/src/table.c

     

       16
       16
       +
       +++ b/src/table.c

     

       17
       17
       +
       @@ -550,7 +550,7 @@ _vte_table_extract_numbers(GValueArray **array,

     

       18
       18
       +
        		if (G_UNLIKELY (*array == NULL)) {

     

       19
       19
       +
        			*array = g_value_array_new(1);

     

       20
       20
       +
        		}

     

       21
       21
       +
       -		g_value_set_long(&value, total);

     

       22
       22
       +
       +		g_value_set_long(&value, CLAMP (total, 0, G_MAXUSHORT));

     

       23
       23
       +
        		g_value_array_append(*array, &value);

     

       24
       24
       +
        	} while (i++ < arginfo->length);

     

       25
       25
       +
        	g_value_unset(&value);

     

       26
       26
       +
       diff --git a/src/vteseq.c b/src/vteseq.c

     

       27
       27
       +
       index 457c06a..46def5b 100644

     

       28
       28
       +
       --- a/src/vteseq.c

     

       29
       29
       +
       +++ b/src/vteseq.c

     

       30
       30
       +
       @@ -557,7 +557,7 @@ vte_sequence_handler_multiple(VteTerminal *terminal,

     

       31
       31
       +
                                      GValueArray *params,

     

       32
       32
       +
                                      VteTerminalSequenceHandler handler)

     

       33
       33
       +
        {

     

       34
       34
       +
       -        vte_sequence_handler_multiple_limited(terminal, params, handler, G_MAXLONG);

     

       35
       35
       +
       +        vte_sequence_handler_multiple_limited(terminal, params, handler, G_MAXUSHORT);

     

       36
       36
       +
        }

     

       37
       37
       +
        

     

       38
       38
       +
        static void

     

       39
       39
       +
       --

     

       40
       40
       +
       cgit v0.9.0.2

+1 -1

pkgs/desktops/gnome-3/3.10/core/libcroco/default.nix

···

       13
       13
        
         buildInputs = [ pkgconfig libxml2 glib ];

     

       14
       14
        
       

     

       15
       15
        
         meta = with stdenv.lib; {

     

       16
       16
       -
           platforms = platforms.linux;

     

       16
       16
       +
           platforms = platforms.unix;

     

       17
       17
        
         };

     

       18
       18
        
       }

+54

pkgs/development/compilers/go/gox.nix

···

       1
       1
       +
       { stdenv, lib, go, fetchFromGitHub }:

     

       2
       2
       +
       

     

       3
       3
       +
       let

     

       4
       4
       +
         goDeps = [

     

       5
       5
       +
           {

     

       6
       6
       +
             root = "github.com/mitchellh/gox";

     

       7
       7
       +
             src = fetchFromGitHub {

     

       8
       8
       +
               owner = "mitchellh";

     

       9
       9
       +
               repo = "gox";

     

       10
       10
       +
               rev = "c7329055e2aeb253a947e5cc876586ff4ca19199";

     

       11
       11
       +
               sha256 = "0zhb88jjxqn3sdc4bpzvajqvgi9igp5gk03q12gaksaxhy2wl4jy";

     

       12
       12
       +
             };

     

       13
       13
       +
           }

     

       14
       14
       +
           {

     

       15
       15
       +
             root = "github.com/mitchellh/iochan";

     

       16
       16
       +
             src = fetchFromGitHub {

     

       17
       17
       +
               owner = "mitchellh";

     

       18
       18
       +
               repo = "iochan";

     

       19
       19
       +
               rev = "b584a329b193e206025682ae6c10cdbe03b0cd77";

     

       20
       20
       +
               sha256 = "1fcwdhfci41ibpng2j4c1bqfng578cwzb3c00yw1lnbwwhaq9r6b";

     

       21
       21
       +
             };

     

       22
       22
       +
           }

     

       23
       23
       +
         ];

     

       24
       24
       +
         sources = stdenv.mkDerivation rec {

     

       25
       25
       +
           name = "go-deps";

     

       26
       26
       +
           buildCommand =

     

       27
       27
       +
             lib.concatStrings

     

       28
       28
       +
               (map (dep: ''

     

       29
       29
       +
                       mkdir -p $out/src/`dirname ${dep.root}`

     

       30
       30
       +
                       ln -s ${dep.src} $out/src/${dep.root}

     

       31
       31
       +
                     '') goDeps);

     

       32
       32
       +
         };

     

       33
       33
       +
       in

     

       34
       34
       +
       

     

       35
       35
       +
       stdenv.mkDerivation rec {

     

       36
       36
       +
         name = "gox";

     

       37
       37
       +
       

     

       38
       38
       +
         src = sources;

     

       39
       39
       +
       

     

       40
       40
       +
         propagatedBuildInputs = [ go ];

     

       41
       41
       +
       

     

       42
       42
       +
         installPhase = ''

     

       43
       43
       +
           ensureDir $out/bin

     

       44
       44
       +
           export GOPATH=$src

     

       45
       45
       +
           go build -v -o $out/bin/gox github.com/mitchellh/gox

     

       46
       46
       +
         '';

     

       47
       47
       +
       

     

       48
       48
       +
         meta = with lib; {

     

       49
       49
       +
           description = "A simple, no-frills tool for Go cross compilation that behaves a lot like standard go build";

     

       50
       50
       +
           homepage    = https://github.com/mitchellh/gox;

     

       51
       51
       +
           maintainers = with maintainers; [ cstrahan ];

     

       52
       52
       +
           platforms   = platforms.unix;

     

       53
       53
       +
         };

     

       54
       54
       +
       }

+175

pkgs/development/compilers/jdk/jdk-linux-base.nix

···

       1
       1
       +
       { productVersion

     

       2
       2
       +
       , patchVersion

     

       3
       3
       +
       , downloadUrl

     

       4
       4
       +
       , sha256_i686

     

       5
       5
       +
       , sha256_x86_64

     

       6
       6
       +
       , jceName

     

       7
       7
       +
       , jceDownloadUrl

     

       8
       8
       +
       , sha256JCE

     

       9
       9
       +
       }:

     

       10
       10
       +
       

     

       11
       11
       +
       { swingSupport ? true

     

       12
       12
       +
       , stdenv

     

       13
       13
       +
       , requireFile

     

       14
       14
       +
       , unzip

     

       15
       15
       +
       , file

     

       16
       16
       +
       , xlibs ? null

     

       17
       17
       +
       , installjdk ? true

     

       18
       18
       +
       , pluginSupport ? true

     

       19
       19
       +
       , installjce ? false

     

       20
       20
       +
       , glib

     

       21
       21
       +
       , libxml2

     

       22
       22
       +
       , libav_0_8

     

       23
       23
       +
       , ffmpeg

     

       24
       24
       +
       , libxslt

     

       25
       25
       +
       , mesa_noglu

     

       26
       26
       +
       , freetype

     

       27
       27
       +
       , fontconfig

     

       28
       28
       +
       , gnome

     

       29
       29
       +
       , cairo

     

       30
       30
       +
       , alsaLib

     

       31
       31
       +
       , atk

     

       32
       32
       +
       , gdk_pixbuf

     

       33
       33
       +
       }:

     

       34
       34
       +
       

     

       35
       35
       +
       assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";

     

       36
       36
       +
       assert swingSupport -> xlibs != null;

     

       37
       37
       +
       

     

       38
       38
       +
       let

     

       39
       39
       +
       

     

       40
       40
       +
         /**

     

       41
       41
       +
          * The JRE libraries are in directories that depend on the CPU.

     

       42
       42
       +
          */

     

       43
       43
       +
         architecture =

     

       44
       44
       +
           if stdenv.system == "i686-linux" then

     

       45
       45
       +
             "i386"

     

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

     

       47
       47
       +
             "amd64"

     

       48
       48
       +
           else

     

       49
       49
       +
             abort "jdk requires i686-linux or x86_64 linux";

     

       50
       50
       +
       

     

       51
       51
       +
         jce =

     

       52
       52
       +
           if installjce then

     

       53
       53
       +
             requireFile {

     

       54
       54
       +
               name = jceName;

     

       55
       55
       +
               url = jceDownloadUrl;

     

       56
       56
       +
               sha256 = sha256JCE;

     

       57
       57
       +
             }

     

       58
       58
       +
           else

     

       59
       59
       +
             "";

     

       60
       60
       +
       in

     

       61
       61
       +
       

     

       62
       62
       +
       stdenv.mkDerivation rec {

     

       63
       63
       +
         name =

     

       64
       64
       +
           if installjdk then "jdk-1.${productVersion}.0_${patchVersion}" else "jre-1.${productVersion}.0_${patchVersion}";

     

       65
       65
       +
       

     

       66
       66
       +
         src =

     

       67
       67
       +
           if stdenv.system == "i686-linux" then

     

       68
       68
       +
             requireFile {

     

       69
       69
       +
               name = "jdk-${productVersion}u${patchVersion}-linux-i586.tar.gz";

     

       70
       70
       +
               url = downloadUrl;

     

       71
       71
       +
               sha256 = sha256_i686;

     

       72
       72
       +
             }

     

       73
       73
       +
           else if stdenv.system == "x86_64-linux" then

     

       74
       74
       +
       

     

       75
       75
       +
             requireFile {

     

       76
       76
       +
               name = "jdk-${productVersion}u${patchVersion}-linux-x64.tar.gz";

     

       77
       77
       +
               url = downloadUrl;

     

       78
       78
       +
               sha256 = sha256_x86_64;

     

       79
       79
       +
             }

     

       80
       80
       +
           else

     

       81
       81
       +
             abort "jdk requires i686-linux or x86_64 linux";

     

       82
       82
       +
       

     

       83
       83
       +
         nativeBuildInputs = [ file ]

     

       84
       84
       +
           ++ stdenv.lib.optional installjce unzip;

     

       85
       85
       +
       

     

       86
       86
       +
         # See: https://github.com/NixOS/patchelf/issues/10

     

       87
       87
       +
         dontStrip = 1;

     

       88
       88
       +
         

     

       89
       89
       +
         installPhase = ''

     

       90
       90
       +
           cd ..

     

       91
       91
       +
       

     

       92
       92
       +
           # Set PaX markings

     

       93
       93
       +
           exes=$(file $sourceRoot/bin/* $sourceRoot/jre/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//')

     

       94
       94
       +
           for file in $exes; do

     

       95
       95
       +
             paxmark m "$file"

     

       96
       96
       +
             # On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well.

     

       97
       97
       +
             ${stdenv.lib.optionalString stdenv.isi686 ''paxmark msp "$file"''}

     

       98
       98
       +
           done

     

       99
       99
       +
       

     

       100
       100
       +
           if test -z "$installjdk"; then

     

       101
       101
       +
             mv $sourceRoot/jre $out

     

       102
       102
       +
           else

     

       103
       103
       +
             mv $sourceRoot $out

     

       104
       104
       +
           fi

     

       105
       105
       +
       

     

       106
       106
       +
           for file in $out/*

     

       107
       107
       +
           do

     

       108
       108
       +
             if test -f $file ; then

     

       109
       109
       +
               rm $file

     

       110
       110
       +
             fi

     

       111
       111
       +
           done

     

       112
       112
       +
       

     

       113
       113
       +
           if test -n "$installjdk"; then

     

       114
       114
       +
             for file in $out/jre/*

     

       115
       115
       +
             do

     

       116
       116
       +
               if test -f $file ; then

     

       117
       117
       +
                 rm $file

     

       118
       118
       +
               fi

     

       119
       119
       +
             done

     

       120
       120
       +
           fi

     

       121
       121
       +
       

     

       122
       122
       +
           # construct the rpath

     

       123
       123
       +
           rpath=

     

       124
       124
       +
           for i in $libraries; do

     

       125
       125
       +
               rpath=$rpath''${rpath:+:}$i/lib:$i/lib64

     

       126
       126
       +
           done

     

       127
       127
       +
       

     

       128
       128
       +
           if test -z "$installjdk"; then

     

       129
       129
       +
             jrePath=$out

     

       130
       130
       +
           else

     

       131
       131
       +
             jrePath=$out/jre

     

       132
       132
       +
           fi

     

       133
       133
       +
       

     

       134
       134
       +
           if test -n "${jce}"; then

     

       135
       135
       +
             unzip ${jce}

     

       136
       136
       +
             cp -v UnlimitedJCEPolicy/*.jar $jrePath/lib/security

     

       137
       137
       +
           fi

     

       138
       138
       +
       

     

       139
       139
       +
           rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture}/jli

     

       140
       140
       +
           rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture}/server

     

       141
       141
       +
           rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture}/xawt

     

       142
       142
       +
           rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture}

     

       143
       143
       +
           

     

       144
       144
       +
           # set all the dynamic linkers

     

       145
       145
       +
           find $out -type f -perm +100 \

     

       146
       146
       +
               -exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       147
       147
       +
               --set-rpath "$rpath" {} \;

     

       148
       148
       +
       

     

       149
       149
       +
           find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \;

     

       150
       150
       +
       

     

       151
       151
       +
           if test -z "$pluginSupport"; then

     

       152
       152
       +
             rm -f $out/bin/javaws

     

       153
       153
       +
             if test -n "$installjdk"; then

     

       154
       154
       +
               rm -f $out/jre/bin/javaws

     

       155
       155
       +
             fi

     

       156
       156
       +
           fi

     

       157
       157
       +
       

     

       158
       158
       +
           mkdir $jrePath/lib/${architecture}/plugins

     

       159
       159
       +
           ln -s $jrePath/lib/${architecture}/libnpjp2.so $jrePath/lib/${architecture}/plugins

     

       160
       160
       +
         '';

     

       161
       161
       +
       

     

       162
       162
       +
         inherit installjdk pluginSupport;

     

       163
       163
       +
       

     

       164
       164
       +
         /**

     

       165
       165
       +
          * libXt is only needed on amd64

     

       166
       166
       +
          */

     

       167
       167
       +
         libraries =

     

       168
       168
       +
           [stdenv.gcc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xlibs.libXxf86vm alsaLib fontconfig freetype gnome.pango gnome.gtk cairo gdk_pixbuf atk] ++

     

       169
       169
       +
           (if swingSupport then [xlibs.libX11 xlibs.libXext xlibs.libXtst xlibs.libXi xlibs.libXp xlibs.libXt xlibs.libXrender stdenv.gcc.gcc] else []);

     

       170
       170
       +
       

     

       171
       171
       +
         passthru.mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins";

     

       172
       172
       +
       

     

       173
       173
       +
         meta.license = "unfree";

     

       174
       174
       +
       }

     

       175
       175
       +

+9 -169

pkgs/development/compilers/jdk/jdk7-linux.nix

···

       1
       1
       -
       { swingSupport ? true

     

       2
       2
       -
       , stdenv

     

       3
       3
       -
       , requireFile

     

       4
       4
       -
       , unzip

     

       5
       5
       -
       , file

     

       6
       6
       -
       , xlibs ? null

     

       7
       7
       -
       , installjdk ? true

     

       8
       8
       -
       , pluginSupport ? true

     

       9
       9
       -
       , installjce ? false

     

       10
       10
       -
       , glib

     

       11
       11
       -
       , libxml2

     

       12
       12
       -
       , libav_0_8

     

       13
       13
       -
       , ffmpeg

     

       14
       14
       -
       , libxslt

     

       15
       15
       -
       , mesa_noglu

     

       16
       16
       -
       , freetype

     

       17
       17
       -
       , fontconfig

     

       18
       18
       -
       , gnome

     

       19
       19
       -
       , cairo

     

       20
       20
       -
       , alsaLib

     

       21
       21
       -
       , atk

     

       22
       22
       -
       , gdk_pixbuf

     

       23
       23
       -
       }:

     

       24
       24
       -
       

     

       25
       25
       -
       assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";

     

       26
       26
       -
       assert swingSupport -> xlibs != null;

     

       27
       27
       -
       

     

       28
       28
       -
       let

     

       29
       29
       -
       

     

       30
       30
       -
         /**

     

       31
       31
       -
          * The JRE libraries are in directories that depend on the CPU.

     

       32
       32
       -
          */

     

       33
       33
       -
         architecture =

     

       34
       34
       -
           if stdenv.system == "i686-linux" then

     

       35
       35
       -
             "i386"

     

       36
       36
       -
           else if stdenv.system == "x86_64-linux" then

     

       37
       37
       -
             "amd64"

     

       38
       38
       -
           else

     

       39
       39
       -
             abort "jdk requires i686-linux or x86_64 linux";

     

       40
       40
       -
       

     

       41
       41
       -
         jce =

     

       42
       42
       -
           if installjce then

     

       43
       43
       -
             requireFile {

     

       44
       44
       -
               name = "UnlimitedJCEPolicyJDK7.zip";

     

       45
       45
       -
               url = http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html;

     

       46
       46
       -
               sha256 = "7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d";

     

       47
       47
       -
             }

     

       48
       48
       -
           else

     

       49
       49
       -
             "";

     

       50
       50
       -
       in

     

       51
       51
       -
       

     

       52
       52
       -
       stdenv.mkDerivation rec {

     

       53
       53
       -
         patchversion = "55";

     

       54
       54
       -
       

     

       55
       55
       -
         name =

     

       56
       56
       -
           if installjdk then "jdk-1.7.0_${patchversion}" else "jre-1.7.0_${patchversion}";

     

       57
       57
       -
       

     

       58
       58
       -
         src =

     

       59
       59
       -
           if stdenv.system == "i686-linux" then

     

       60
       60
       -
             requireFile {

     

       61
       61
       -
               name = "jdk-7u${patchversion}-linux-i586.tar.gz";

     

       62
       62
       -
               url = http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html;

     

       63
       63
       -
               sha256 = "0y0v5ilbkdmf14jrvwa23x91rfdw90jji4y7hq0l494iy4wjnyc1";

     

       64
       64
       -
             }

     

       65
       65
       -
           else if stdenv.system == "x86_64-linux" then

     

       66
       66
       -
       

     

       67
       67
       -
             requireFile {

     

       68
       68
       -
               name = "jdk-7u${patchversion}-linux-x64.tar.gz";

     

       69
       69
       -
               url = http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html;

     

       70
       70
       -
               sha256 = "15sncxhjasv5i6p7hfrr92xq5ph9g6g12i4m52vp45l031bw5y46";

     

       71
       71
       -
             }

     

       72
       72
       -
           else

     

       73
       73
       -
             abort "jdk requires i686-linux or x86_64 linux";

     

       74
       74
       -
       

     

       75
       75
       -
         nativeBuildInputs = [ file ]

     

       76
       76
       -
           ++ stdenv.lib.optional installjce unzip;

     

       77
       77
       -
       

     

       78
       78
       -
         installPhase = ''

     

       79
       79
       -
           cd ..

     

       80
       80
       -
       

     

       81
       81
       -
           # Set PaX markings

     

       82
       82
       -
           exes=$(file $sourceRoot/bin/* $sourceRoot/jre/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//')

     

       83
       83
       -
           for file in $exes; do

     

       84
       84
       -
             paxmark m "$file"

     

       85
       85
       -
             # On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well.

     

       86
       86
       -
             ${stdenv.lib.optionalString stdenv.isi686 ''paxmark msp "$file"''}

     

       87
       87
       -
           done

     

       88
       88
       -
       

     

       89
       89
       -
           if test -z "$installjdk"; then

     

       90
       90
       -
             mv $sourceRoot/jre $out

     

       91
       91
       -
           else

     

       92
       92
       -
             mv $sourceRoot $out

     

       93
       93
       -
           fi

     

       94
       94
       -
       

     

       95
       95
       -
           for file in $out/*

     

       96
       96
       -
           do

     

       97
       97
       -
             if test -f $file ; then

     

       98
       98
       -
               rm $file

     

       99
       99
       -
             fi

     

       100
       100
       -
           done

     

       101
       101
       -
       

     

       102
       102
       -
           if test -n "$installjdk"; then

     

       103
       103
       -
             for file in $out/jre/*

     

       104
       104
       -
             do

     

       105
       105
       -
               if test -f $file ; then

     

       106
       106
       -
                 rm $file

     

       107
       107
       -
               fi

     

       108
       108
       -
             done

     

       109
       109
       -
           fi

     

       110
       110
       -
       

     

       111
       111
       -
           # construct the rpath

     

       112
       112
       -
           rpath=

     

       113
       113
       -
           for i in $libraries; do

     

       114
       114
       -
               rpath=$rpath''${rpath:+:}$i/lib''${rpath:+:}$i/lib64

     

       115
       115
       -
           done

     

       116
       116
       -
       

     

       117
       117
       -
           if test -z "$installjdk"; then

     

       118
       118
       -
             jrePath=$out

     

       119
       119
       -
           else

     

       120
       120
       -
             jrePath=$out/jre

     

       121
       121
       -
           fi

     

       122
       122
       -
       

     

       123
       123
       -
           if test -n "${jce}"; then

     

       124
       124
       -
             unzip ${jce}

     

       125
       125
       -
             cp -v UnlimitedJCEPolicy/*.jar $jrePath/lib/security

     

       126
       126
       -
           fi

     

       127
       127
       -
       

     

       128
       128
       -
           rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture}/jli

     

       129
       129
       -
           rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture}/server

     

       130
       130
       -
           rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture}/xawt

     

       131
       131
       -
           rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture}

     

       132
       132
       -
       

     

       133
       133
       -
           # set all the dynamic linkers

     

       134
       134
       -
           find $out -type f -perm +100 \

     

       135
       135
       -
               -exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       136
       136
       -
               --set-rpath "$rpath" {} \;

     

       137
       137
       -
       

     

       138
       138
       -
           find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \;

     

       139
       139
       -
       

     

       140
       140
       -
           # HACK: For some reason, appending atk to the global patchelf rpath paths causes:

     

       141
       141
       -
           #   java: relocation error: java: symbol , version GLIBC_2.2.5 not defined in file libc.so.6 with link time reference

     

       142
       142
       -
           # Because only libglass.so needs atk, we put it only in it's rpath.

     

       143
       143
       -
           # This seems to work fine.

     

       144
       144
       -
           test -f $out/jre/lib/${architecture}/libglass.so && patchelf --set-rpath "$rpath:${atk}/lib" $out/jre/lib/${architecture}/libglass.so

     

       145
       145
       -
       

     

       146
       146
       -
           if test -z "$pluginSupport"; then

     

       147
       147
       -
             rm -f $out/bin/javaws

     

       148
       148
       -
             if test -n "$installjdk"; then

     

       149
       149
       -
               rm -f $out/jre/bin/javaws

     

       150
       150
       -
             fi

     

       151
       151
       -
           fi

     

       152
       152
       -
       

     

       153
       153
       -
           mkdir $jrePath/lib/${architecture}/plugins

     

       154
       154
       -
           ln -s $jrePath/lib/${architecture}/libnpjp2.so $jrePath/lib/${architecture}/plugins

     

       155
       155
       -
         '';

     

       156
       156
       -
       

     

       157
       157
       -
         inherit installjdk pluginSupport;

     

       158
       158
       -
       

     

       159
       159
       -
         /**

     

       160
       160
       -
          * libXt is only needed on amd64

     

       161
       161
       -
          */

     

       162
       162
       -
         libraries =

     

       163
       163
       -
           [stdenv.gcc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xlibs.libXxf86vm alsaLib fontconfig freetype gnome.pango gnome.gtk cairo gdk_pixbuf] ++

     

       164
       164
       -
           (if swingSupport then [xlibs.libX11 xlibs.libXext xlibs.libXtst xlibs.libXi xlibs.libXp xlibs.libXt xlibs.libXrender stdenv.gcc.gcc] else []);

     

       165
       165
       -
       

     

       166
       166
       -
         passthru.mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins";

     

       167
       167
       -
       

     

       168
       168
       -
         meta.license = "unfree";

     

       1
       1
       +
       import ./jdk-linux-base.nix {

     

       2
       2
       +
         productVersion = "7";

     

       3
       3
       +
         patchVersion = "60";

     

       4
       4
       +
         downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html;

     

       5
       5
       +
         sha256_i686 = "d736fb4fd7c8ef50b76411daa640c6feeb48a5c275d29a90ffeb916a78d47a48";

     

       6
       6
       +
         sha256_x86_64 = "c7232b717573b057dbe828d937ee406b7a75fbc6aba7f1de98a049cbd42c6ae8";

     

       7
       7
       +
         jceName = "UnlimitedJCEPolicyJDK7.zip";

     

       8
       8
       +
         jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html;

     

       9
       9
       +
         sha256JCE = "7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d";

     

       169
       10
        
       }

     

       170
       170
       -

+10

pkgs/development/compilers/jdk/jdk8-linux.nix

···

       1
       1
       +
       import ./jdk-linux-base.nix {

     

       2
       2
       +
         productVersion = "8";

     

       3
       3
       +
         patchVersion = "5";

     

       4
       4
       +
         downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;

     

       5
       5
       +
         sha256_i686 = "779f83efb8dc9ce7c1143ba9bbd38fa2d8a1c49dcb61f7d36972d37d109c5fc9";

     

       6
       6
       +
         sha256_x86_64 = "44901389e9fb118971534ad0f58558ba8c43f315b369117135bd6617ae631edc";

     

       7
       7
       +
         jceName = "jce_policy-8.zip";

     

       8
       8
       +
         jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;

     

       9
       9
       +
         sha256JCE = "f3020a3922efd6626c2fff45695d527f34a8020e938a49292561f18ad1320b59";

     

       10
       10
       +
       }

+4 -3

pkgs/development/compilers/nasm/default.nix

···

       1
       1
        
       { stdenv, fetchurl }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "nasm-2.11.01";

     

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

     

       5
       5
       +
         version = "2.11.05";

     

       5
       6
        
         

     

       6
       7
        
         src = fetchurl {

     

       7
       7
       -
           url = "http://www.nasm.us/pub/nasm/releasebuilds/2.11.01/${name}.tar.bz2";

     

       8
       8
       -
           sha256 = "0p0rhq18in2hyv3gircgxj72n2b1mvr8bvjlqscpaz8m62cyvam7";

     

       8
       8
       +
           url = "http://www.nasm.us/pub/nasm/releasebuilds/${version}/${name}.tar.bz2";

     

       9
       9
       +
           sha256 = "1sgspnascc0asmwlv3jm1mq4vzx653sa7vlg48z20pfybk7pnhaa";

     

       9
       10
        
         };

     

       10
       11
        
       

     

       11
       12
        
         meta = {

+31

pkgs/development/compilers/sbcl/bootstrap.nix

···

       1
       1
       +
       { stdenv, fetchurl }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         name    = "sbcl-bootstrap-${version}";

     

       5
       5
       +
         version = "1.1.8";

     

       6
       6
       +
       

     

       7
       7
       +
         src = if stdenv.isDarwin

     

       8
       8
       +
           then fetchurl {

     

       9
       9
       +
             url = mirror://sourceforge/project/sbcl/sbcl/1.1.8/sbcl-1.1.8-x86-64-darwin-binary.tar.bz2;

     

       10
       10
       +
             sha256 = "006pr88053wclvbjfjdypnbiw8wymbzdzi7a6kbkpdfn4zf5943j";

     

       11
       11
       +
           }

     

       12
       12
       +
           else fetchurl {

     

       13
       13
       +
             url = mirror://sourceforge/project/sbcl/sbcl/1.1.8/sbcl-1.1.8-x86-64-linux-binary.tar.bz2;

     

       14
       14
       +
             sha256 = "0lh1jglxlfwk4cm6sgwk1jnb6ikhbrkx7p5aha2nbmkd6zl96prx";

     

       15
       15
       +
           };

     

       16
       16
       +
       

     

       17
       17
       +
         installPhase = ''

     

       18
       18
       +
           ensureDir $out/bin

     

       19
       19
       +
           cp -p src/runtime/sbcl $out/bin

     

       20
       20
       +
           ensureDir $out/share/sbcl

     

       21
       21
       +
           cp -p output/sbcl.core $out/share/sbcl

     

       22
       22
       +
         '';

     

       23
       23
       +
       

     

       24
       24
       +
         meta = {

     

       25
       25
       +
           description = "Lisp compiler";

     

       26
       26
       +
           homepage = "http://www.sbcl.org";

     

       27
       27
       +
           license = "bsd";

     

       28
       28
       +
           maintainers = [stdenv.lib.maintainers.raskin];

     

       29
       29
       +
           platforms = stdenv.lib.platforms.unix;

     

       30
       30
       +
         };

     

       31
       31
       +
       }

+35 -54

pkgs/development/compilers/sbcl/default.nix

···

       1
       1
       -
       a :  

     

       2
       2
       -
       let 

     

       3
       3
       -
         fetchurl = a.fetchurl;

     

       4
       4
       -
         s= # Generated upstream information

     

       5
       5
       -
         rec {

     

       6
       6
       -
           baseName="sbcl";

     

       7
       7
       -
           version="1.2.0";

     

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

     

       9
       9
       -
           hash="13k20sys1v4lvgis8cnbczww6zs93rw176vz07g4jx06418k53x2";

     

       10
       10
       -
           url="mirror://sourceforge/project/sbcl/sbcl/1.2.0/sbcl-1.2.0-source.tar.bz2";

     

       11
       11
       -
           sha256="13k20sys1v4lvgis8cnbczww6zs93rw176vz07g4jx06418k53x2";

     

       12
       12
       -
         };

     

       13
       13
       -
         buildInputs = with a; [

     

       14
       14
       -
           clisp makeWrapper

     

       15
       15
       -
         ];

     

       16
       16
       -
       in

     

       17
       17
       -
       rec {

     

       18
       18
       -
         src = a.fetchUrlFromSrcInfo s;

     

       1
       1
       +
       { stdenv, fetchurl, sbclBootstrap, clisp}:

     

       19
       2
        
       

     

       20
       20
       -
         inherit buildInputs;

     

       21
       21
       -
         configureFlags = [];

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

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

     

       5
       5
       +
         version = "1.2.0";

     

       22
       6
        
       

     

       23
       23
       -
         /* doConfigure should be removed if not needed */

     

       24
       24
       -
         phaseNames = ["setVars" "doFixNewer" "doFixTests" "setVersion" "doPatch" "doBuild" "doInstall" "doWrap"];

     

       7
       7
       +
         src = fetchurl {

     

       8
       8
       +
           url    = mirror://sourceforge/project/sbcl/sbcl/1.2.0/sbcl-1.2.0-source.tar.bz2;

     

       9
       9
       +
           sha256 = "13k20sys1v4lvgis8cnbczww6zs93rw176vz07g4jx06418k53x2";

     

       10
       10
       +
         };

     

       25
       11
        
       

     

       26
       26
       -
         setVars = a.fullDepEntry (''

     

       27
       27
       -
           export INSTALL_ROOT=$out

     

       28
       28
       -
           mkdir test-home

     

       29
       29
       -
           export HOME=$PWD/test-home

     

       30
       30
       -
         '') ["minInit"];

     

       12
       12
       +
         buildInputs = [ sbclBootstrap ] ++ stdenv.lib.optional stdenv.isLinux clisp;

     

       31
       13
        
       

     

       32
       32
       -
         setVersion = a.fullDepEntry (''

     

       33
       33
       -
           echo '"${s.version}.nixos"' > version.lisp-expr

     

       14
       14
       +
         patchPhase = ''

     

       15
       15
       +
           echo '"${version}.nixos"' > version.lisp-expr

     

       34
       16
        
           echo "

     

       35
       17
        
           (lambda (features)

     

       36
       18
        
             (flet ((enable (x)

     
···

       38
       20
        
                    (disable (x)

     

       39
       21
        
                      (setf features (remove x features))))

     

       40
       22
        
               (enable :sb-thread))) " > customize-target-features.lisp

     

       41
       41
       -
         '') ["minInit" "doUnpack"];

     

       42
       23
        
       

     

       43
       43
       -
         /* SBCL checks whether files are up-to-date in many places.. Unfortunately, same timestamp 

     

       44
       44
       -
            is not good enought

     

       45
       45
       -
         */

     

       46
       46
       -
         doFixNewer = a.fullDepEntry(''

     

       47
       24
        
           pwd

     

       48
       25
        
       

     

       26
       26
       +
           # SBCL checks whether files are up-to-date in many places..

     

       27
       27
       +
           # Unfortunately, same timestamp is not good enough

     

       49
       28
        
           sed -e 's@> x y@>= x y@' -i contrib/sb-aclrepl/repl.lisp

     

       50
       29
        
           sed -e '/(date)/i((= date 2208988801) 2208988800)' -i contrib/asdf/asdf.lisp

     

       51
       30
        
           sed -i src/cold/slam.lisp -e \

     
···

       56
       35
        
             '/date defaulted-fasl/a)'

     

       57
       36
        
           sed -i src/code/target-load.lisp -e \

     

       58
       37
        
             '/date defaulted-source/i(or (and (= 2208988801 (file-write-date defaulted-source-truename)) (= 2208988801 (file-write-date defaulted-fasl-truename)))'

     

       59
       59
       -
         '') ["minInit" "doUnpack"];

     

       60
       38
        
       

     

       61
       61
       -
         doWrap = a.fullDepEntry (''

     

       62
       62
       -
           wrapProgram "$out/bin/sbcl" --set "SBCL_HOME" "$out/lib/sbcl"

     

       63
       63
       -
         '') ["minInit" "addInputs"];

     

       64
       64
       -
       

     

       65
       65
       -
         doFixTests = a.fullDepEntry (''

     

       39
       39
       +
           # Fix the tests

     

       66
       40
        
           sed -e '/deftest pwent/inil' -i contrib/sb-posix/posix-tests.lisp

     

       67
       41
        
           sed -e '/deftest grent/inil' -i contrib/sb-posix/posix-tests.lisp

     

       68
       42
        
           sed -e '/deftest .*ent.non-existing/,+5d' -i contrib/sb-posix/posix-tests.lisp

     
···

       70
       44
        
       

     

       71
       45
        
           sed -e '5,$d' -i contrib/sb-bsd-sockets/tests.lisp

     

       72
       46
        
           sed -e '5,$d' -i contrib/sb-simple-streams/*test*.lisp

     

       73
       73
       -
         '') ["minInit" "doUnpack"];

     

       47
       47
       +
         '';

     

       74
       48
        
       

     

       75
       75
       -
         doBuild = a.fullDepEntry (''

     

       76
       76
       -
           sh make.sh clisp

     

       77
       77
       -
         '') ["minInit" "doUnpack" "addInputs"];

     

       49
       49
       +
         preBuild = ''

     

       50
       50
       +
           export INSTALL_ROOT=$out

     

       51
       51
       +
           ensureDir test-home

     

       52
       52
       +
           export HOME=$PWD/test-home

     

       53
       53
       +
         '';

     

       78
       54
        
       

     

       79
       79
       -
         doInstall = a.fullDepEntry (''

     

       80
       80
       -
           sh install.sh

     

       81
       81
       -
         '') ["doBuild" "minInit" "addInputs"];

     

       55
       55
       +
         buildPhase = if stdenv.isLinux

     

       56
       56
       +
           then ''

     

       57
       57
       +
             sh make.sh clisp --prefix=$out

     

       58
       58
       +
           ''

     

       59
       59
       +
           else ''

     

       60
       60
       +
             sh make.sh --prefix=$out --xc-host='${sbclBootstrap}/bin/sbcl --core ${sbclBootstrap}/share/sbcl/sbcl.core --disable-debugger --no-userinit --no-sysinit'

     

       61
       61
       +
           '';

     

       82
       62
        
       

     

       83
       83
       -
         inherit(s) name;

     

       84
       84
       -
         inherit(s) version;

     

       63
       63
       +
         installPhase = ''

     

       64
       64
       +
           INSTALL_ROOT=$out sh install.sh

     

       65
       65
       +
         '';

     

       66
       66
       +
       

     

       85
       67
        
         meta = {

     

       86
       68
        
           description = "Lisp compiler";

     

       87
       87
       -
           homepage = "http://www.sbcl.org";

     

       88
       88
       -
           license = "bsd";

     

       89
       89
       -
           maintainers = [a.lib.maintainers.raskin];

     

       90
       90
       -
           platforms = with a.lib.platforms; all;

     

       91
       91
       -
           inherit(s) version;

     

       69
       69
       +
           homepage = http://www.sbcl.org;

     

       70
       70
       +
           license = stdenv.lib.licenses.bsd3;

     

       71
       71
       +
           maintainers = [stdenv.lib.maintainers.raskin];

     

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

     

       92
       73
        
         };

     

       93
       74
        
       }

+3 -3

pkgs/development/compilers/scala/2.9.nix

···

       3
       3
        
       # at runtime, need jre or jdk

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
       -
         name = "scala-2.9.2";

     

       6
       6
       +
         name = "scala-2.9.3";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchurl {

     

       9
       9
       -
           url = "http://www.scala-lang.org/downloads/distrib/files/${name}.tgz";

     

       10
       10
       -
           sha256 = "0s1shpzw2hyz7bwxdqq19rcrzbpq4d7b0kvdvjvhy7h05x496b46";

     

       9
       9
       +
           url = "http://www.scala-lang.org/files/archive/${name}.tgz";

     

       10
       10
       +
           sha256 = "faaab229f78c945063e8fd31c045bc797c731194296d7a4f49863fd87fc4e7b9";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         installPhase = ''

+43

pkgs/development/compilers/smlnj/bootstrap.nix

···

       1
       1
       +
       { stdenv, fetchurl, cpio, rsync, makeWrapper }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         name = "smlnj-bootstrap-${version}";

     

       5
       5
       +
       

     

       6
       6
       +
         version = "110.76";

     

       7
       7
       +
       

     

       8
       8
       +
         src = fetchurl {

     

       9
       9
       +
           url = "http://smlnj.cs.uchicago.edu/dist/working/${version}/smlnj-x86-${version}.pkg";

     

       10
       10
       +
           sha256 = "0n3kdlqffqw97piya7i4lddrhjml2dp1q9hfq2jrd2hbzln8vdjf";

     

       11
       11
       +
         };

     

       12
       12
       +
       

     

       13
       13
       +
         buildInputs = [ cpio rsync makeWrapper ];

     

       14
       14
       +
       

     

       15
       15
       +
         unpackPhase = ''

     

       16
       16
       +
           /usr/bin/xar -xf $src

     

       17
       17
       +
           cd smlnj.pkg

     

       18
       18
       +
         '';

     

       19
       19
       +
       

     

       20
       20
       +
         buildPhase = ''

     

       21
       21
       +
           cat Payload | gunzip -dc | cpio -i

     

       22
       22
       +
         '';

     

       23
       23
       +
       

     

       24
       24
       +
         installPhase = ''

     

       25
       25
       +
           ensureDir $out/bin

     

       26
       26
       +
           rsync -av bin/ $out/bin/

     

       27
       27
       +
       

     

       28
       28
       +
           ensureDir $out/lib

     

       29
       29
       +
           rsync -av lib/ $out/lib/

     

       30
       30
       +
         '';

     

       31
       31
       +
       

     

       32
       32
       +
         postInstall = ''

     

       33
       33
       +
           wrapProgram "$out/bin/sml" --set "SMLNJ_HOME" "$out"

     

       34
       34
       +
         '';

     

       35
       35
       +
       

     

       36
       36
       +
         meta = {

     

       37
       37
       +
           description = "Compiler for the Standard ML '97 programming language";

     

       38
       38
       +
           homepage    = http://www.smlnj.org;

     

       39
       39
       +
           license     = stdenv.lib.licenses.free;

     

       40
       40
       +
           platforms   = stdenv.lib.platforms.darwin;

     

       41
       41
       +
           maintainers = [ stdenv.lib.maintainers.jwiegley ];

     

       42
       42
       +
         };

     

       43
       43
       +
       }

+26

pkgs/development/interpreters/lua-5/expat.nix

···

       1
       1
       +
       { stdenv, fetchurl, lua5, expat }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         version = "1.3.0";

     

       5
       5
       +
         name = "lua-expat-${version}";

     

       6
       6
       +
         isLibrary = true;

     

       7
       7
       +
         src = fetchurl {

     

       8
       8
       +
           url = "https://matthewwild.co.uk/projects/luaexpat/luaexpat-${version}.tar.gz";

     

       9
       9
       +
           sha256 = "1hvxqngn0wf5642i5p3vcyhg3pmp102k63s9ry4jqyyqc1wkjq6h";

     

       10
       10
       +
         };

     

       11
       11
       +
       

     

       12
       12
       +
         buildInputs = [ lua5 expat ];

     

       13
       13
       +
       

     

       14
       14
       +
         preBuild = ''

     

       15
       15
       +
           makeFlagsArray=(

     

       16
       16
       +
             LUA_LDIR="$out/share/lua/${lua5.luaversion}"

     

       17
       17
       +
             LUA_INC="-I${lua5}/include" LUA_CDIR="$out/lib/lua/${lua5.luaversion}"

     

       18
       18
       +
             EXPAT_INC="-I${expat}/include");

     

       19
       19
       +
         '';

     

       20
       20
       +
       

     

       21
       21
       +
         meta = {

     

       22
       22
       +
           homepage = "http://matthewwild.co.uk/projects/luaexpat";

     

       23
       23
       +
           platforms = stdenv.lib.platforms.linux;

     

       24
       24
       +
           maintainers = [ stdenv.lib.maintainers.flosse ];

     

       25
       25
       +
         };

     

       26
       26
       +
       }

+11

pkgs/development/interpreters/perl/5.20/cpp-precomp.patch

···

       1
       1
       +
       --- a/hints/darwin.sh	2013-05-08 11:13:45.000000000 -0600

     

       2
       2
       +
       +++ b/hints/darwin.sh	2013-05-08 11:15:04.000000000 -0600

     

       3
       3
       +
       @@ -129,7 +129,7 @@

     

       4
       4
       +
        

     

       5
       5
       +
        # Avoid Apple's cpp precompiler, better for extensions

     

       6
       6
       +
        if [ "X`echo | ${cc} -no-cpp-precomp -E - 2>&1 >/dev/null`" = "X" ]; then

     

       7
       7
       +
       -    cppflags="${cppflags} -no-cpp-precomp"

     

       8
       8
       +
       +    #cppflags="${cppflags} -no-cpp-precomp"

     

       9
       9
       +
        

     

       10
       10
       +
            # This is necessary because perl's build system doesn't

     

       11
       11
       +
            # apply cppflags to cc compile lines as it should.

+68

pkgs/development/interpreters/perl/5.20/default.nix

···

       1
       1
       +
       { stdenv, fetchurl }:

     

       2
       2
       +
       

     

       3
       3
       +
       let

     

       4
       4
       +
       

     

       5
       5
       +
         libc = if stdenv.gcc.libc or null != null then stdenv.gcc.libc else "/usr";

     

       6
       6
       +
       

     

       7
       7
       +
       in

     

       8
       8
       +
       

     

       9
       9
       +
       with {

     

       10
       10
       +
         inherit (stdenv.lib) optional optionalString;

     

       11
       11
       +
       };

     

       12
       12
       +
       

     

       13
       13
       +
       stdenv.mkDerivation rec {

     

       14
       14
       +
         name = "perl-5.20.0";

     

       15
       15
       +
       

     

       16
       16
       +
         src = fetchurl {

     

       17
       17
       +
           url = "mirror://cpan/src/${name}.tar.gz";

     

       18
       18
       +
           sha256 = "00ndpgw4bjing9gy2y6jvs3q46mv2ll6zrxjkhpr12fcdsnji32f";

     

       19
       19
       +
         };

     

       20
       20
       +
       

     

       21
       21
       +
         patches =

     

       22
       22
       +
           [ # Do not look in /usr etc. for dependencies.

     

       23
       23
       +
             ./no-sys-dirs.patch

     

       24
       24
       +
           ]

     

       25
       25
       +
           ++ optional stdenv.isSunOS ./ld-shared.patch

     

       26
       26
       +
           ++ stdenv.lib.optional stdenv.isDarwin [ ./cpp-precomp.patch ./no-libutil.patch ] ;

     

       27
       27
       +
       

     

       28
       28
       +
         # Build a thread-safe Perl with a dynamic libperls.o.  We need the

     

       29
       29
       +
         # "installstyle" option to ensure that modules are put under

     

       30
       30
       +
         # $out/lib/perl5 - this is the general default, but because $out

     

       31
       31
       +
         # contains the string "perl", Configure would select $out/lib.

     

       32
       32
       +
         # Miniperl needs -lm. perl needs -lrt.

     

       33
       33
       +
         configureFlags =

     

       34
       34
       +
           [ "-de"

     

       35
       35
       +
             "-Dcc=gcc"

     

       36
       36
       +
             "-Uinstallusrbinperl"

     

       37
       37
       +
             "-Dinstallstyle=lib/perl5"

     

       38
       38
       +
             "-Duseshrplib"

     

       39
       39
       +
             "-Dlocincpth=${libc}/include"

     

       40
       40
       +
             "-Dloclibpth=${libc}/lib"

     

       41
       41
       +
           ]

     

       42
       42
       +
           ++ optional (stdenv ? glibc) "-Dusethreads";

     

       43
       43
       +
       

     

       44
       44
       +
         configureScript = "${stdenv.shell} ./Configure";

     

       45
       45
       +
       

     

       46
       46
       +
         dontAddPrefix = true;

     

       47
       47
       +
       

     

       48
       48
       +
         enableParallelBuilding = true;

     

       49
       49
       +
       

     

       50
       50
       +
         preConfigure =

     

       51
       51
       +
           ''

     

       52
       52
       +
             configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3"

     

       53
       53
       +
       

     

       54
       54
       +
             ${optionalString stdenv.isArm ''

     

       55
       55
       +
               configureFlagsArray=(-Dldflags="-lm -lrt")

     

       56
       56
       +
             ''}

     

       57
       57
       +
           '';

     

       58
       58
       +
       

     

       59
       59
       +
         preBuild = optionalString (!(stdenv ? gcc && stdenv.gcc.nativeTools))

     

       60
       60
       +
           ''

     

       61
       61
       +
             # Make Cwd work on NixOS (where we don't have a /bin/pwd).

     

       62
       62
       +
             substituteInPlace dist/PathTools/Cwd.pm --replace "'/bin/pwd'" "'$(type -tP pwd)'"

     

       63
       63
       +
           '';

     

       64
       64
       +
       

     

       65
       65
       +
         setupHook = ./setup-hook.sh;

     

       66
       66
       +
       

     

       67
       67
       +
         passthru.libPrefix = "lib/perl5/site_perl";

     

       68
       68
       +
       }

+11

pkgs/development/interpreters/perl/5.20/ld-shared.patch

···

       1
       1
       +
       --- perl-5.16.2/hints/solaris_2.sh.orig	2013-02-14 19:29:49.453988140 +0000

     

       2
       2
       +
       +++ perl-5.16.2/hints/solaris_2.sh	2013-02-14 19:30:31.681631019 +0000

     

       3
       3
       +
       @@ -568,7 +568,7 @@

     

       4
       4
       +
        #		    ccflags="$ccflags -Wa,`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`"

     

       5
       5
       +
        #		fi

     

       6
       6
       +
        		ldflags="$ldflags -m64"

     

       7
       7
       +
       -		lddlflags="$lddlflags -G -m64"

     

       8
       8
       +
       +		lddlflags="$lddlflags -shared -m64"

     

       9
       9
       +
        		;;

     

       10
       10
       +
        	    *)

     

       11
       11
       +
        		getconfccflags="`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`"

+12

pkgs/development/interpreters/perl/5.20/no-libutil.patch

···

       1
       1
       +
       diff -ru -x '*~' perl-5.14.2-orig/Configure perl-5.14.2/Configure

     

       2
       2
       +
       --- perl-5.14.2-orig/Configure	2011-09-26 11:44:34.000000000 +0200

     

       3
       3
       +
       +++ perl-5.14.2/Configure	2012-02-16 17:24:50.779839039 +0100

     

       4
       4
       +
       @@ -1368,7 +1368,7 @@

     

       5
       5
       +
        : List of libraries we want.

     

       6
       6
       +
        : If anyone needs extra -lxxx, put those in a hint file.

     

       7
       7
       +
        libswanted="socket bind inet nsl nm ndbm gdbm dbm db malloc dl ld sun"

     

       8
       8
       +
       -libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD"

     

       9
       9
       +
       +libswanted="$libswanted m crypt sec c cposix posix ucb bsd BSD"

     

       10
       10
       +
        : We probably want to search /usr/shlib before most other libraries.

     

       11
       11
       +
        : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist.

     

       12
       12
       +
        glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'`

+250

pkgs/development/interpreters/perl/5.20/no-sys-dirs.patch

···

       1
       1
       +
       diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/Configure perl-5.20.0/Configure

     

       2
       2
       +
       --- perl-5.20.0-orig/Configure	2014-05-26 15:34:18.000000000 +0200

     

       3
       3
       +
       +++ perl-5.20.0/Configure	2014-06-25 10:43:35.368285986 +0200

     

       4
       4
       +
       @@ -106,15 +106,7 @@

     

       5
       5
       +
        fi

     

       6
       6
       +
        

     

       7
       7
       +
        : Proper PATH setting

     

       8
       8
       +
       -paths='/bin /usr/bin /usr/local/bin /usr/ucb /usr/local /usr/lbin'

     

       9
       9
       +
       -paths="$paths /opt/bin /opt/local/bin /opt/local /opt/lbin"

     

       10
       10
       +
       -paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin"

     

       11
       11
       +
       -paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin"

     

       12
       12
       +
       -paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb"

     

       13
       13
       +
       -paths="$paths /bsd4.3/usr/bin /usr/bsd /bsd43/bin /opt/ansic/bin /usr/ccs/bin"

     

       14
       14
       +
       -paths="$paths /etc /usr/lib /usr/ucblib /lib /usr/ccs/lib"

     

       15
       15
       +
       -paths="$paths /sbin /usr/sbin /usr/libexec"

     

       16
       16
       +
       -paths="$paths /system/gnu_library/bin"

     

       17
       17
       +
       +paths=''

     

       18
       18
       +
        

     

       19
       19
       +
        for p in $paths

     

       20
       20
       +
        do

     

       21
       21
       +
       @@ -1337,8 +1329,7 @@

     

       22
       22
       +
        archname=''

     

       23
       23
       +
        : Possible local include directories to search.

     

       24
       24
       +
        : Set locincpth to "" in a hint file to defeat local include searches.

     

       25
       25
       +
       -locincpth="/usr/local/include /opt/local/include /usr/gnu/include"

     

       26
       26
       +
       -locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include"

     

       27
       27
       +
       +locincpth=""

     

       28
       28
       +
        :

     

       29
       29
       +
        : no include file wanted by default

     

       30
       30
       +
        inclwanted=''

     

       31
       31
       +
       @@ -1349,17 +1340,12 @@

     

       32
       32
       +
        

     

       33
       33
       +
        libnames=''

     

       34
       34
       +
        : change the next line if compiling for Xenix/286 on Xenix/386

     

       35
       35
       +
       -xlibpth='/usr/lib/386 /lib/386'

     

       36
       36
       +
       +xlibpth=''

     

       37
       37
       +
        : Possible local library directories to search.

     

       38
       38
       +
       -loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib"

     

       39
       39
       +
       -loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib"

     

       40
       40
       +
       +loclibpth=""

     

       41
       41
       +
        

     

       42
       42
       +
        : general looking path for locating libraries

     

       43
       43
       +
       -glibpth="/lib /usr/lib $xlibpth"

     

       44
       44
       +
       -glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib"

     

       45
       45
       +
       -test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth"

     

       46
       46
       +
       -test -f /shlib/libc.so     && glibpth="/shlib $glibpth"

     

       47
       47
       +
       -test -d /usr/lib64         && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64"

     

       48
       48
       +
       +glibpth=""

     

       49
       49
       +
        

     

       50
       50
       +
        : Private path used by Configure to find libraries.  Its value

     

       51
       51
       +
        : is prepended to libpth. This variable takes care of special

     

       52
       52
       +
       @@ -1391,8 +1377,6 @@

     

       53
       53
       +
        libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD"

     

       54
       54
       +
        : We probably want to search /usr/shlib before most other libraries.

     

       55
       55
       +
        : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist.

     

       56
       56
       +
       -glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'`

     

       57
       57
       +
       -glibpth="/usr/shlib $glibpth"

     

       58
       58
       +
        : Do not use vfork unless overridden by a hint file.

     

       59
       59
       +
        usevfork=false

     

       60
       60
       +
        

     

       61
       61
       +
       @@ -2446,7 +2430,6 @@

     

       62
       62
       +
        zip

     

       63
       63
       +
        "

     

       64
       64
       +
        pth=`echo $PATH | sed -e "s/$p_/ /g"`

     

       65
       65
       +
       -pth="$pth $sysroot/lib $sysroot/usr/lib"

     

       66
       66
       +
        for file in $loclist; do

     

       67
       67
       +
        	eval xxx=\$$file

     

       68
       68
       +
        	case "$xxx" in

     

       69
       69
       +
       @@ -4936,7 +4919,7 @@

     

       70
       70
       +
        : Set private lib path

     

       71
       71
       +
        case "$plibpth" in

     

       72
       72
       +
        '') if ./mips; then

     

       73
       73
       +
       -	plibpth="$incpath/usr/lib $sysroot/usr/local/lib $sysroot/usr/ccs/lib"

     

       74
       74
       +
       +	plibpth="$incpath/usr/lib"

     

       75
       75
       +
            fi;;

     

       76
       76
       +
        esac

     

       77
       77
       +
        case "$libpth" in

     

       78
       78
       +
       @@ -8600,13 +8583,8 @@

     

       79
       79
       +
        echo " "

     

       80
       80
       +
        case "$sysman" in

     

       81
       81
       +
        '')

     

       82
       82
       +
       -	syspath='/usr/share/man/man1 /usr/man/man1'

     

       83
       83
       +
       -	syspath="$syspath /usr/man/mann /usr/man/manl /usr/man/local/man1"

     

       84
       84
       +
       -	syspath="$syspath /usr/man/u_man/man1"

     

       85
       85
       +
       -	syspath="$syspath /usr/catman/u_man/man1 /usr/man/l_man/man1"

     

       86
       86
       +
       -	syspath="$syspath /usr/local/man/u_man/man1 /usr/local/man/l_man/man1"

     

       87
       87
       +
       -	syspath="$syspath /usr/man/man.L /local/man/man1 /usr/local/man/man1"

     

       88
       88
       +
       -	sysman=`./loc . /usr/man/man1 $syspath`

     

       89
       89
       +
       +	syspath=''

     

       90
       90
       +
       +	sysman=''

     

       91
       91
       +
        	;;

     

       92
       92
       +
        esac

     

       93
       93
       +
        if $test -d "$sysman"; then

     

       94
       94
       +
       @@ -19900,9 +19878,10 @@

     

       95
       95
       +
        case "$full_ar" in

     

       96
       96
       +
        '') full_ar=$ar ;;

     

       97
       97
       +
        esac

     

       98
       98
       +
       +full_ar=ar

     

       99
       99
       +
        

     

       100
       100
       +
        : Store the full pathname to the sed program for use in the C program

     

       101
       101
       +
       -full_sed=$sed

     

       102
       102
       +
       +full_sed=sed

     

       103
       103
       +
        

     

       104
       104
       +
        : see what type gids are declared as in the kernel

     

       105
       105
       +
        echo " "

     

       106
       106
       +
       Only in perl-5.20.0/: Configure.orig

     

       107
       107
       +
       diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/ext/Errno/Errno_pm.PL perl-5.20.0/ext/Errno/Errno_pm.PL

     

       108
       108
       +
       --- perl-5.20.0-orig/ext/Errno/Errno_pm.PL	2014-05-26 15:34:20.000000000 +0200

     

       109
       109
       +
       +++ perl-5.20.0/ext/Errno/Errno_pm.PL	2014-06-25 10:31:24.317970047 +0200

     

       110
       110
       +
       @@ -126,11 +126,7 @@

     

       111
       111
       +
        	if ($dep =~ /(\S+errno\.h)/) {

     

       112
       112
       +
        	     $file{$1} = 1;

     

       113
       113
       +
        	}

     

       114
       114
       +
       -    } elsif ($^O eq 'linux' &&

     

       115
       115
       +
       -	      $Config{gccversion} ne '' && 

     

       116
       116
       +
       -	      $Config{gccversion} !~ /intel/i

     

       117
       117
       +
       -	      # might be using, say, Intel's icc

     

       118
       118
       +
       -	     ) {

     

       119
       119
       +
       +    } elsif (0) {

     

       120
       120
       +
            # When cross-compiling we may store a path for gcc's "sysroot" option:

     

       121
       121
       +
            my $sysroot = $Config{sysroot} || '';

     

       122
       122
       +
        	# Some Linuxes have weird errno.hs which generate

     

       123
       123
       +
       Only in perl-5.20.0/ext/Errno: Errno_pm.PL.orig

     

       124
       124
       +
       diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/freebsd.sh perl-5.20.0/hints/freebsd.sh

     

       125
       125
       +
       --- perl-5.20.0-orig/hints/freebsd.sh	2014-01-31 22:55:51.000000000 +0100

     

       126
       126
       +
       +++ perl-5.20.0/hints/freebsd.sh	2014-06-25 10:25:53.263964680 +0200

     

       127
       127
       +
       @@ -119,21 +119,21 @@

     

       128
       128
       +
                objformat=`/usr/bin/objformat`

     

       129
       129
       +
                if [ x$objformat = xaout ]; then

     

       130
       130
       +
                    if [ -e /usr/lib/aout ]; then

     

       131
       131
       +
       -                libpth="/usr/lib/aout /usr/local/lib /usr/lib"

     

       132
       132
       +
       -                glibpth="/usr/lib/aout /usr/local/lib /usr/lib"

     

       133
       133
       +
       +                libpth=""

     

       134
       134
       +
       +                glibpth=""

     

       135
       135
       +
                    fi

     

       136
       136
       +
                    lddlflags='-Bshareable'

     

       137
       137
       +
                else

     

       138
       138
       +
       -            libpth="/usr/lib /usr/local/lib"

     

       139
       139
       +
       -            glibpth="/usr/lib /usr/local/lib"

     

       140
       140
       +
       +            libpth=""

     

       141
       141
       +
       +            glibpth=""

     

       142
       142
       +
                    ldflags="-Wl,-E "

     

       143
       143
       +
                    lddlflags="-shared "

     

       144
       144
       +
                fi

     

       145
       145
       +
                cccdlflags='-DPIC -fPIC'

     

       146
       146
       +
                ;;

     

       147
       147
       +
        *)

     

       148
       148
       +
       -       libpth="/usr/lib /usr/local/lib"

     

       149
       149
       +
       -       glibpth="/usr/lib /usr/local/lib"

     

       150
       150
       +
       +       libpth=""

     

       151
       151
       +
       +       glibpth=""

     

       152
       152
       +
               ldflags="-Wl,-E "

     

       153
       153
       +
                lddlflags="-shared "

     

       154
       154
       +
                cccdlflags='-DPIC -fPIC'

     

       155
       155
       +
       diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/linux.sh perl-5.20.0/hints/linux.sh

     

       156
       156
       +
       --- perl-5.20.0-orig/hints/linux.sh	2014-05-26 15:34:20.000000000 +0200

     

       157
       157
       +
       +++ perl-5.20.0/hints/linux.sh	2014-06-25 10:33:47.354883843 +0200

     

       158
       158
       +
       @@ -150,25 +150,6 @@

     

       159
       159
       +
            ;;

     

       160
       160
       +
        esac

     

       161
       161
       +
        

     

       162
       162
       +
       -# Ubuntu 11.04 (and later, presumably) doesn't keep most libraries

     

       163
       163
       +
       -# (such as -lm) in /lib or /usr/lib.  So we have to ask gcc to tell us

     

       164
       164
       +
       -# where to look.  We don't want gcc's own libraries, however, so we

     

       165
       165
       +
       -# filter those out.

     

       166
       166
       +
       -# This could be conditional on Unbuntu, but other distributions may

     

       167
       167
       +
       -# follow suit, and this scheme seems to work even on rather old gcc's.

     

       168
       168
       +
       -# This unconditionally uses gcc because even if the user is using another

     

       169
       169
       +
       -# compiler, we still need to find the math library and friends, and I don't

     

       170
       170
       +
       -# know how other compilers will cope with that situation.

     

       171
       171
       +
       -# Morever, if the user has their own gcc earlier in $PATH than the system gcc,

     

       172
       172
       +
       -# we don't want its libraries. So we try to prefer the system gcc

     

       173
       173
       +
       -# Still, as an escape hatch, allow Configure command line overrides to

     

       174
       174
       +
       -# plibpth to bypass this check.

     

       175
       175
       +
       -if [ -x /usr/bin/gcc ] ; then

     

       176
       176
       +
       -    gcc=/usr/bin/gcc

     

       177
       177
       +
       -else

     

       178
       178
       +
       -    gcc=gcc

     

       179
       179
       +
       -fi

     

       180
       180
       +
       -

     

       181
       181
       +
        case "$plibpth" in

     

       182
       182
       +
        '') plibpth=`LANG=C LC_ALL=C $gcc $ccflags $ldflags -print-search-dirs | grep libraries |

     

       183
       183
       +
        	cut -f2- -d= | tr ':' $trnl | grep -v 'gcc' | sed -e 's:/$::'`

     

       184
       184
       +
       @@ -178,32 +159,6 @@

     

       185
       185
       +
            ;;

     

       186
       186
       +
        esac

     

       187
       187
       +
        

     

       188
       188
       +
       -case "$libc" in

     

       189
       189
       +
       -'')

     

       190
       190
       +
       -# If you have glibc, then report the version for ./myconfig bug reporting.

     

       191
       191
       +
       -# (Configure doesn't need to know the specific version since it just uses

     

       192
       192
       +
       -# gcc to load the library for all tests.)

     

       193
       193
       +
       -# We don't use __GLIBC__ and  __GLIBC_MINOR__ because they

     

       194
       194
       +
       -# are insufficiently precise to distinguish things like

     

       195
       195
       +
       -# libc-2.0.6 and libc-2.0.7.

     

       196
       196
       +
       -    for p in $plibpth

     

       197
       197
       +
       -    do

     

       198
       198
       +
       -        for trylib in libc.so.6 libc.so

     

       199
       199
       +
       -        do

     

       200
       200
       +
       -            if $test -e $p/$trylib; then

     

       201
       201
       +
       -                libc=`ls -l $p/$trylib | awk '{print $NF}'`

     

       202
       202
       +
       -                if $test "X$libc" != X; then

     

       203
       203
       +
       -                    break

     

       204
       204
       +
       -                fi

     

       205
       205
       +
       -            fi

     

       206
       206
       +
       -        done

     

       207
       207
       +
       -        if $test "X$libc" != X; then

     

       208
       208
       +
       -            break

     

       209
       209
       +
       -        fi

     

       210
       210
       +
       -    done

     

       211
       211
       +
       -    ;;

     

       212
       212
       +
       -esac

     

       213
       213
       +
       -

     

       214
       214
       +
        # Are we using ELF?  Thanks to Kenneth Albanowski <kjahds@kjahds.com>

     

       215
       215
       +
        # for this test.

     

       216
       216
       +
        cat >try.c <<'EOM'

     

       217
       217
       +
       @@ -367,33 +322,6 @@

     

       218
       218
       +
        	;;

     

       219
       219
       +
        esac

     

       220
       220
       +
        

     

       221
       221
       +
       -# SuSE8.2 has /usr/lib/libndbm* which are ld scripts rather than

     

       222
       222
       +
       -# true libraries. The scripts cause binding against static

     

       223
       223
       +
       -# version of -lgdbm which is a bad idea. So if we have 'nm'

     

       224
       224
       +
       -# make sure it can read the file

     

       225
       225
       +
       -# NI-S 2003/08/07

     

       226
       226
       +
       -case "$nm" in

     

       227
       227
       +
       -    '') ;;

     

       228
       228
       +
       -    *)

     

       229
       229
       +
       -    for p in $plibpth

     

       230
       230
       +
       -    do

     

       231
       231
       +
       -        if $test -r $p/libndbm.so; then

     

       232
       232
       +
       -            if $nm $p/libndbm.so >/dev/null 2>&1 ; then

     

       233
       233
       +
       -                echo 'Your shared -lndbm seems to be a real library.'

     

       234
       234
       +
       -                _libndbm_real=1

     

       235
       235
       +
       -                break

     

       236
       236
       +
       -            fi

     

       237
       237
       +
       -        fi

     

       238
       238
       +
       -    done

     

       239
       239
       +
       -    if $test "X$_libndbm_real" = X; then

     

       240
       240
       +
       -        echo 'Your shared -lndbm is not a real library.'

     

       241
       241
       +
       -        set `echo X "$libswanted "| sed -e 's/ ndbm / /'`

     

       242
       242
       +
       -        shift

     

       243
       243
       +
       -        libswanted="$*"

     

       244
       244
       +
       -    fi

     

       245
       245
       +
       -    ;;

     

       246
       246
       +
       -esac

     

       247
       247
       +
       -

     

       248
       248
       +
        # Linux on Synology.

     

       249
       249
       +
        if [ -f /etc/synoinfo.conf -a -d /usr/syno ]; then

     

       250
       250
       +
            # Tested on Synology DS213 and DS413

+5

pkgs/development/interpreters/perl/5.20/setup-hook.sh

···

       1
       1
       +
       addPerlLibPath () {

     

       2
       2
       +
           addToSearchPath PERL5LIB $1/lib/perl5/site_perl

     

       3
       3
       +
       }

     

       4
       4
       +
       

     

       5
       5
       +
       envHooks=(${envHooks[@]} addPerlLibPath)

+2 -2

pkgs/development/interpreters/php/5.4.nix

···

       9
       9
        
       

     

       10
       10
        
       composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {

     

       11
       11
        
       

     

       12
       12
       -
         version = "5.4.29";

     

       12
       12
       +
         version = "5.4.30";

     

       13
       13
        
       

     

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

     

       15
       15
        
       

     
···

       243
       243
        
       

     

       244
       244
        
         src = fetchurl {

     

       245
       245
        
           url = "http://www.php.net/distributions/php-${version}.tar.bz2";

     

       246
       246
       -
           sha256 = "19z2n6h1fvj30n6hl2mwhw2f4i1vwhbj3j7abq3gc16gcfh3rkk2";

     

       246
       246
       +
           sha256 = "1rkc977b4k0y6qg5nf8729g5zpica31h1isyds6khmrdwi23df1j";

     

       247
       247
        
         };

     

       248
       248
        
       

     

       249
       249
        
         meta = {

+32

pkgs/development/libraries/gloox/default.nix

···

       1
       1
       +
       { stdenv, fetchurl

     

       2
       2
       +
       , zlibSupport ? true, zlib ? null

     

       3
       3
       +
       , sslSupport ? true, openssl ? null

     

       4
       4
       +
       , idnSupport ? true, libidn ? null

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       assert zlibSupport -> zlib != null;

     

       8
       8
       +
       assert sslSupport -> openssl != null;

     

       9
       9
       +
       assert idnSupport -> libidn != null;

     

       10
       10
       +
       

     

       11
       11
       +
       let

     

       12
       12
       +
         version = "1.0.10";

     

       13
       13
       +
       in

     

       14
       14
       +
       stdenv.mkDerivation rec {

     

       15
       15
       +
         name = "gloox-${version}";

     

       16
       16
       +
       

     

       17
       17
       +
         src = fetchurl {

     

       18
       18
       +
           url = "http://camaya.net/download/gloox-${version}.tar.bz2";

     

       19
       19
       +
           sha256 = "300e756af97d43f3f70f1e68e4d4c7129d587dface61633f50d2c490876f58a3";

     

       20
       20
       +
         };

     

       21
       21
       +
       

     

       22
       22
       +
         buildInputs = [ ]

     

       23
       23
       +
           ++ stdenv.lib.optional zlibSupport zlib

     

       24
       24
       +
           ++ stdenv.lib.optional sslSupport openssl

     

       25
       25
       +
           ++ stdenv.lib.optional idnSupport libidn;

     

       26
       26
       +
       

     

       27
       27
       +
         meta = {

     

       28
       28
       +
           description = "A portable high-level Jabber/XMPP library for C++";

     

       29
       29
       +
           homepage = "http://camaya.net/gloox";

     

       30
       30
       +
           license = [ "GPLv3" ];

     

       31
       31
       +
         };

     

       32
       32
       +
       }

+15 -14

pkgs/development/libraries/gnu-efi/default.nix

···

       1
       1
       -
       { stdenv

     

       2
       2
       -
       , fetchurl

     

       3
       3
       -
       }:

     

       1
       1
       +
       { stdenv, fetchurl }:

     

       4
       2
        
       

     

       5
       5
       -
       let version = "3.0u"; in stdenv.mkDerivation {

     

       6
       6
       -
       

     

       7
       7
       -
         name = "gnu-efi-${version}";

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         name = "gnu-efi_${version}";

     

       5
       5
       +
         version = "3.0u";

     

       8
       6
        
       

     

       9
       7
        
         src = fetchurl {

     

       10
       10
       -
           url = "mirror://sourceforge/gnu-efi/gnu-efi_${version}.orig.tar.gz";

     

       8
       8
       +
           url = "mirror://sourceforge/gnu-efi/${name}.orig.tar.gz";

     

       11
       9
        
           sha256 = "0klkdxh1aqwwfm393q67nxww6liffyp2lfybbnh4q819b06la39w";

     

       12
       10
        
         };

     

       13
       11
        
       

     

       14
       14
       -
         meta = {

     

       15
       15
       -
           description = "GNU EFI development toolchain";

     

       16
       16
       -
           homepage = http://sourceforge.net/projects/gnu-efi/;

     

       17
       17
       -
           license = "GPL";

     

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

     

       19
       19
       -
           platforms = ["x86_64-linux" "i686-linux"];

     

       20
       20
       -
         };

     

       12
       12
       +
         arch = with stdenv.lib; head (splitString "-" stdenv.system);

     

       21
       13
        
       

     

       22
       14
        
         makeFlags = [

     

       23
       15
        
           "CC=gcc"

     
···

       34
       26
        
         '';

     

       35
       27
        
       

     

       36
       28
        
         installPhase = ''

     

       29
       29
       +
           mkdir -pv $out/include/efi/{protocol,$arch}

     

       37
       30
        
           make PREFIX="$out" $makeFlags install

     

       38
       31
        
           mkdir -pv $out/share/gnu-efi

     

       39
       32
        
           install -D -m644 apps/*.efi $out/share/gnu-efi

     

       40
       33
        
         '';

     

       34
       34
       +
       

     

       35
       35
       +
         meta = with stdenv.lib; {

     

       36
       36
       +
           description = "GNU EFI development toolchain";

     

       37
       37
       +
           homepage = http://sourceforge.net/projects/gnu-efi/;

     

       38
       38
       +
           license = licenses.bsd3;

     

       39
       39
       +
           maintainers = [ stdenv.lib.maintainers.shlevy ];

     

       40
       40
       +
           platforms = platforms.linux;

     

       41
       41
       +
         };

     

       41
       42
        
       }

+2 -2

pkgs/development/libraries/gperftools/default.nix

···

       8
       8
        
           sha256 = "0ks9gsnhxrs2vccc6ha9m8xmj83lmw09xcws4zc0k57q4jcy5bgk";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
       -
         buildInputs = [ libunwind ];

     

       11
       11
       +
         buildInputs = stdenv.lib.optional stdenv.isLinux libunwind;

     

       12
       12
        
       

     

       13
       13
        
         # some packages want to link to the static tcmalloc_minimal

     

       14
       14
        
         # to drop the runtime dependency on gperftools

     
···

       19
       19
        
         meta = {

     

       20
       20
        
           homepage = https://code.google.com/p/gperftools/;

     

       21
       21
        
           description = "Fast, multi-threaded malloc() and nifty performance analysis tools";

     

       22
       22
       -
           platforms = stdenv.lib.platforms.linux;

     

       22
       22
       +
           platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;

     

       23
       23
        
         };

     

       24
       24
        
       }

+14

pkgs/development/libraries/haskell/SHA2/default.nix

···

       1
       1
       +
       { cabal, aes, monadsTf, transformers }:

     

       2
       2
       +
       

     

       3
       3
       +
       cabal.mkDerivation (self: {

     

       4
       4
       +
         pname = "SHA2";

     

       5
       5
       +
         version = "0.2.5";

     

       6
       6
       +
         sha256 = "1zs79a327x6myfam3p2vr8lmszcaqnkll2qz8n4sy835vz328j40";

     

       7
       7
       +
         buildDepends = [ aes monadsTf transformers ];

     

       8
       8
       +
         meta = {

     

       9
       9
       +
           description = "Fast, incremental SHA hashing for bytestrings";

     

       10
       10
       +
           license = self.stdenv.lib.licenses.bsd3;

     

       11
       11
       +
           platforms = self.ghc.meta.platforms;

     

       12
       12
       +
         };

     

       13
       13
       +
       })

     

       14
       14
       +

+14

pkgs/development/libraries/haskell/Yampa/default.nix

···

       1
       1
       +
       { cabal, random }:

     

       2
       2
       +
       

     

       3
       3
       +
       cabal.mkDerivation (self: {

     

       4
       4
       +
         pname = "Yampa";

     

       5
       5
       +
         version = "0.9.5";

     

       6
       6
       +
         sha256 = "0r6fm2ccls7gbc5s0vbrzrqv6marnzlzc7zr4afkgfk9jsqfmqjh";

     

       7
       7
       +
         buildDepends = [ random ];

     

       8
       8
       +
         meta = {

     

       9
       9
       +
           homepage = "http://www.haskell.org/haskellwiki/Yampa";

     

       10
       10
       +
           description = "Library for programming hybrid systems";

     

       11
       11
       +
           license = self.stdenv.lib.licenses.bsd3;

     

       12
       12
       +
           platforms = self.ghc.meta.platforms;

     

       13
       13
       +
         };

     

       14
       14
       +
       })

+2 -2

pkgs/development/libraries/haskell/bson/default.nix

···

       4
       4
        
       

     

       5
       5
        
       cabal.mkDerivation (self: {

     

       6
       6
        
         pname = "bson";

     

       7
       7
       -
         version = "0.2.4";

     

       8
       8
       -
         sha256 = "1fr0xx9q2l3cb72j5lgrwdlr2gba7idh2v80s8d6dr69dhwaccd9";

     

       7
       7
       +
         version = "0.3";

     

       8
       8
       +
         sha256 = "0787z6970lf93mgrsyqcilnkx5bynny88ag15z2f07l1rhva6ac4";

     

       9
       9
        
         buildDepends = [

     

       10
       10
        
           binary cryptohash dataBinaryIeee754 mtl network text time

     

       11
       11
        
         ];

+16

pkgs/development/libraries/haskell/command-qq/default.nix

···

       1
       1
       +
       { cabal, doctest, hspec, text }:

     

       2
       2
       +
       

     

       3
       3
       +
       cabal.mkDerivation (self: {

     

       4
       4
       +
         pname = "command-qq";

     

       5
       5
       +
         version = "0.3.0.0";

     

       6
       6
       +
         sha256 = "1bqfb4gc5ja9d9jygijqpf6014bmfcxnsvpv7c5n4f1z2aj07jy5";

     

       7
       7
       +
         buildDepends = [ text ];

     

       8
       8
       +
         testDepends = [ doctest hspec text ];

     

       9
       9
       +
         doCheck = false;

     

       10
       10
       +
         meta = {

     

       11
       11
       +
           homepage = "http://biegunka.github.io/command-qq/";

     

       12
       12
       +
           description = "Quasiquoters for external commands";

     

       13
       13
       +
           license = self.stdenv.lib.licenses.bsd3;

     

       14
       14
       +
           platforms = self.ghc.meta.platforms;

     

       15
       15
       +
         };

     

       16
       16
       +
       })

+15

pkgs/development/libraries/haskell/deepseq-generics/default.nix

···

       1
       1
       +
       { cabal, deepseq, HUnit, testFramework, testFrameworkHunit }:

     

       2
       2
       +
       

     

       3
       3
       +
       cabal.mkDerivation (self: {

     

       4
       4
       +
         pname = "deepseq-generics";

     

       5
       5
       +
         version = "0.1.1.1";

     

       6
       6
       +
         sha256 = "1icc2gxsbnjjl150msnyysvr9r14kb6s2gm3izrj5a3mwf6l7s08";

     

       7
       7
       +
         buildDepends = [ deepseq ];

     

       8
       8
       +
         testDepends = [ deepseq HUnit testFramework testFrameworkHunit ];

     

       9
       9
       +
         meta = {

     

       10
       10
       +
           homepage = "https://github.com/hvr/deepseq-generics";

     

       11
       11
       +
           description = "GHC.Generics-based Control.DeepSeq.rnf implementation";

     

       12
       12
       +
           license = self.stdenv.lib.licenses.bsd3;

     

       13
       13
       +
           platforms = self.ghc.meta.platforms;

     

       14
       14
       +
         };

     

       15
       15
       +
       })

+1 -1

pkgs/development/libraries/haskell/extensible-effects/default.nix

···

       11
       11
        
           HUnit QuickCheck testFramework testFrameworkHunit

     

       12
       12
        
           testFrameworkQuickcheck2

     

       13
       13
        
         ];

     

       14
       14
       +
         jailbreak = true;

     

       14
       15
        
         meta = {

     

       15
       16
        
           homepage = "https://github.com/RobotGymnast/extensible-effects";

     

       16
       17
        
           description = "An Alternative to Monad Transformers";

     
···

       18
       19
        
           platforms = self.ghc.meta.platforms;

     

       19
       20
        
           maintainers = [ self.stdenv.lib.maintainers.ocharles ];

     

       20
       21
        
         };

     

       21
       21
       -
         jailbreak = true;

     

       22
       22
        
       })

+22

pkgs/development/libraries/haskell/folds/default.nix

···

       1
       1
       +
       { cabal, comonad, contravariant, deepseq, doctest, filepath, hlint

     

       2
       2
       +
       , lens, mtl, pointed, profunctors, reflection, semigroupoids

     

       3
       3
       +
       , semigroups, tagged, transformers, vector

     

       4
       4
       +
       }:

     

       5
       5
       +
       

     

       6
       6
       +
       cabal.mkDerivation (self: {

     

       7
       7
       +
         pname = "folds";

     

       8
       8
       +
         version = "0.6.1";

     

       9
       9
       +
         sha256 = "13p4kyr48g917ib87n14qpqaka6isp73cwy7mvvsqgprj1fghyj1";

     

       10
       10
       +
         buildDepends = [

     

       11
       11
       +
           comonad contravariant lens pointed profunctors reflection

     

       12
       12
       +
           semigroupoids tagged transformers vector

     

       13
       13
       +
         ];

     

       14
       14
       +
         testDepends = [ deepseq doctest filepath hlint mtl semigroups ];

     

       15
       15
       +
         doCheck = false;

     

       16
       16
       +
         meta = {

     

       17
       17
       +
           homepage = "http://github.com/ekmett/folds";

     

       18
       18
       +
           description = "Beautiful Folding";

     

       19
       19
       +
           license = self.stdenv.lib.licenses.bsd3;

     

       20
       20
       +
           platforms = self.ghc.meta.platforms;

     

       21
       21
       +
         };

     

       22
       22
       +
       })

+1

pkgs/development/libraries/haskell/ghc-mod/default.nix

···

       21
       21
        
         configureFlags = "--datasubdir=${self.pname}-${self.version}";

     

       22
       22
        
         postInstall = ''

     

       23
       23
        
           cd $out/share/$pname-$version

     

       24
       24
       +
           sed -i -e 's/"-b" "\\n" "-l"/"-l" "-b" "\\"\\\\n\\""/' ghc-process.el

     

       24
       25
        
           make

     

       25
       26
        
           rm Makefile

     

       26
       27
        
           cd ..

+2 -2

pkgs/development/libraries/haskell/hcltest/default.nix

···

       5
       5
        
       

     

       6
       6
        
       cabal.mkDerivation (self: {

     

       7
       7
        
         pname = "hcltest";

     

       8
       8
       -
         version = "0.3.1";

     

       9
       9
       -
         sha256 = "0qnf6ib01njcbjfbwxff8y4sqmrj6nyy9y9hb0l0kw21cxsgl7c9";

     

       8
       8
       +
         version = "0.3.2";

     

       9
       9
       +
         sha256 = "0q5b0v2gh0b3a15hg25bqj7scbckrkka2ckk49g2mrdz2gpr28bq";

     

       10
       10
        
         buildDepends = [

     

       11
       11
        
           dlist either filepath free lens mmorph monadControl mtl

     

       12
       12
        
           optparseApplicative randomShuffle split stm tagged tasty temporary

+14

pkgs/development/libraries/haskell/hdaemonize/default.nix

···

       1
       1
       +
       { cabal, extensibleExceptions, filepath, hsyslog, mtl }:

     

       2
       2
       +
       

     

       3
       3
       +
       cabal.mkDerivation (self: {

     

       4
       4
       +
         pname = "hdaemonize";

     

       5
       5
       +
         version = "0.4.5.0";

     

       6
       6
       +
         sha256 = "1b9aic08pgmp95qy74qcrmq9dn33k6knycy7mn1dg8c5svmchb2w";

     

       7
       7
       +
         buildDepends = [ extensibleExceptions filepath hsyslog mtl ];

     

       8
       8
       +
         meta = {

     

       9
       9
       +
           homepage = "http://github.com/madhadron/hdaemonize";

     

       10
       10
       +
           description = "Library to handle the details of writing daemons for UNIX";

     

       11
       11
       +
           license = self.stdenv.lib.licenses.bsd3;

     

       12
       12
       +
           platforms = self.ghc.meta.platforms;

     

       13
       13
       +
         };

     

       14
       14
       +
       })

+14

pkgs/development/libraries/haskell/ixset/default.nix

···

       1
       1
       +
       { cabal, safecopy, syb, sybWithClass }:

     

       2
       2
       +
       

     

       3
       3
       +
       cabal.mkDerivation (self: {

     

       4
       4
       +
         pname = "ixset";

     

       5
       5
       +
         version = "1.0.5";

     

       6
       6
       +
         sha256 = "1hznn7f8f13x5125n76dchayi16z72050qbwifnkrca54nf9q2ns";

     

       7
       7
       +
         buildDepends = [ safecopy syb sybWithClass ];

     

       8
       8
       +
         meta = {

     

       9
       9
       +
           homepage = "http://happstack.com";

     

       10
       10
       +
           description = "Efficient relational queries on Haskell sets";

     

       11
       11
       +
           license = self.stdenv.lib.licenses.bsd3;

     

       12
       12
       +
           platforms = self.ghc.meta.platforms;

     

       13
       13
       +
         };

     

       14
       14
       +
       })

+18

pkgs/development/libraries/haskell/monadloc-pp/default.nix

···

       1
       1
       +
       { cabal, filepath, haskellSrcExts, monadloc, syb }:

     

       2
       2
       +
       

     

       3
       3
       +
       cabal.mkDerivation (self: {

     

       4
       4
       +
         pname = "monadloc-pp";

     

       5
       5
       +
         version = "0.3";

     

       6
       6
       +
         sha256 = "0jr9ngcj3l6kd5cscll5kr3a4bp52sdjgrdxd1j5a21jyc3gdyvn";

     

       7
       7
       +
         isLibrary = false;

     

       8
       8
       +
         isExecutable = true;

     

       9
       9
       +
         buildDepends = [ filepath haskellSrcExts monadloc syb ];

     

       10
       10
       +
         jailbreak = true;

     

       11
       11
       +
         meta = {

     

       12
       12
       +
           homepage = "http://github.com/pepeiborra/monadloc";

     

       13
       13
       +
           description = "A preprocessor for generating monadic call traces";

     

       14
       14
       +
           license = self.stdenv.lib.licenses.publicDomain;

     

       15
       15
       +
           platforms = self.ghc.meta.platforms;

     

       16
       16
       +
           maintainers = [ self.stdenv.lib.maintainers.tomberek ];

     

       17
       17
       +
         };

     

       18
       18
       +
       })

+2 -2

pkgs/development/libraries/haskell/mongoDB/default.nix

···

       5
       5
        
       

     

       6
       6
        
       cabal.mkDerivation (self: {

     

       7
       7
        
         pname = "mongoDB";

     

       8
       8
       -
         version = "1.5.0";

     

       9
       9
       -
         sha256 = "0dvy8pa79c26hcngds6nnwnayrhsyz1flj18m9bcyrcvwb5q3dd6";

     

       8
       8
       +
         version = "2.0";

     

       9
       9
       +
         sha256 = "1dspx1x20903i44i825ziwmvaax75m8g08kz97cv34077bdir80h";

     

       10
       10
        
         buildDepends = [

     

       11
       11
        
           binary bson cryptohash hashtables liftedBase monadControl mtl

     

       12
       12
        
           network parsec random randomShuffle text transformersBase

+1

pkgs/development/libraries/haskell/pipes-aeson/default.nix

···

       10
       10
        
           aeson attoparsec pipes pipesAttoparsec pipesBytestring pipesParse

     

       11
       11
        
           transformers

     

       12
       12
        
         ];

     

       13
       13
       +
         jailbreak = true;

     

       13
       14
        
         meta = {

     

       14
       15
        
           homepage = "https://github.com/k0001/pipes-aeson";

     

       15
       16
        
           description = "Encode and decode JSON streams using Aeson and Pipes";

+1

pkgs/development/libraries/haskell/pipes-binary/default.nix

···

       13
       13
        
           binary lensFamilyCore pipes pipesParse smallcheck tasty tastyHunit

     

       14
       14
        
           tastySmallcheck transformers

     

       15
       15
        
         ];

     

       16
       16
       +
         jailbreak = true;

     

       16
       17
        
         doCheck = false;

     

       17
       18
        
         meta = {

     

       18
       19
        
           homepage = "https://github.com/k0001/pipes-binary";

+1 -2

pkgs/development/libraries/haskell/pipes-bytestring/default.nix

···

       1
       1
       -
       { cabal, pipes, pipesGroup, pipesParse, transformers

     

       2
       2
       -
       }:

     

       1
       1
       +
       { cabal, pipes, pipesGroup, pipesParse, transformers }:

     

       3
       2
        
       

     

       4
       3
        
       cabal.mkDerivation (self: {

     

       5
       4
        
         pname = "pipes-bytestring";

+1

pkgs/development/libraries/haskell/pipes-text/default.nix

···

       10
       10
        
           pipes pipesBytestring pipesGroup pipesParse pipesSafe profunctors

     

       11
       11
        
           streamingCommons text transformers

     

       12
       12
        
         ];

     

       13
       13
       +
         jailbreak = true;

     

       13
       14
        
         meta = {

     

       14
       15
        
           homepage = "https://github.com/michaelt/text-pipes";

     

       15
       16
        
           description = "Text pipes";

+2 -2

pkgs/development/libraries/haskell/quickcheck-property-monad/default.nix

···

       2
       2
        
       

     

       3
       3
        
       cabal.mkDerivation (self: {

     

       4
       4
        
         pname = "quickcheck-property-monad";

     

       5
       5
       -
         version = "0.2.1";

     

       6
       6
       -
         sha256 = "1ln8bcsc8hd8jyhd9rp2j90p5h5nhmwidb5my91p09h43y4z9xds";

     

       5
       5
       +
         version = "0.2.2";

     

       6
       6
       +
         sha256 = "1liixl4xxpx9f3877sss16m67y5bkwhxdmr8h40rpqdi7dz9s0mj";

     

       7
       7
        
         buildDepends = [ either QuickCheck transformers ];

     

       8
       8
        
         testDepends = [ doctest filepath QuickCheck ];

     

       9
       9
        
         meta = {

+14

pkgs/development/libraries/haskell/shellmate/default.nix

···

       1
       1
       +
       { cabal, filepath, temporary, time, transformers }:

     

       2
       2
       +
       

     

       3
       3
       +
       cabal.mkDerivation (self: {

     

       4
       4
       +
         pname = "shellmate";

     

       5
       5
       +
         version = "0.1.6";

     

       6
       6
       +
         sha256 = "17fpl0h58cw5hp6jzrajkl629mw2c6x15cmlcbdxqk9xlxqrg4hr";

     

       7
       7
       +
         buildDepends = [ filepath temporary time transformers ];

     

       8
       8
       +
         meta = {

     

       9
       9
       +
           homepage = "http://github.com/valderman/shellmate";

     

       10
       10
       +
           description = "Simple interface for shell scripting in Haskell";

     

       11
       11
       +
           license = self.stdenv.lib.licenses.bsd3;

     

       12
       12
       +
           platforms = self.ghc.meta.platforms;

     

       13
       13
       +
         };

     

       14
       14
       +
       })

+2 -2

pkgs/development/libraries/haskell/simple-sendfile/default.nix

···

       4
       4
        
       

     

       5
       5
        
       cabal.mkDerivation (self: {

     

       6
       6
        
         pname = "simple-sendfile";

     

       7
       7
       -
         version = "0.2.14";

     

       8
       8
       -
         sha256 = "00k9cachx7y4811b71f8p468kx018hzvpvw6jgf7zmjhc9v922ni";

     

       7
       7
       +
         version = "0.2.15";

     

       8
       8
       +
         sha256 = "1fa20h2zcvxwdb5j5a0nnhl38bry1p5ckya1l7lrxx9r2bvjkyj9";

     

       9
       9
        
         buildDepends = [ network resourcet ];

     

       10
       10
        
         testDepends = [

     

       11
       11
        
           conduit conduitExtra hspec HUnit network networkConduit resourcet

+4 -3

pkgs/development/libraries/haskell/snap/server.nix

···

       1
       1
        
       { cabal, attoparsec, attoparsecEnumerator, blazeBuilder

     

       2
       2
       -
       , blazeBuilderEnumerator, caseInsensitive, enumerator

     

       2
       2
       +
       , blazeBuilderEnumerator, caseInsensitive, enumerator, HsOpenSSL

     

       3
       3
        
       , MonadCatchIOTransformers, mtl, network, snapCore, text, time

     

       4
       4
        
       , unixCompat

     

       5
       5
        
       }:

     
···

       10
       10
        
         sha256 = "09399vlqgic0iwmx31c01bjpbdblw8gayxnz71lwzkixqibkbbip";

     

       11
       11
        
         buildDepends = [

     

       12
       12
        
           attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator

     

       13
       13
       -
           caseInsensitive enumerator MonadCatchIOTransformers mtl network

     

       14
       14
       -
           snapCore text time unixCompat

     

       13
       13
       +
           caseInsensitive enumerator HsOpenSSL MonadCatchIOTransformers mtl

     

       14
       14
       +
           network snapCore text time unixCompat

     

       15
       15
        
         ];

     

       16
       16
       +
         configureFlags = "-fopenssl";

     

       16
       17
        
         meta = {

     

       17
       18
        
           homepage = "http://snapframework.com/";

     

       18
       19
        
           description = "A fast, iteratee-based, epoll-enabled web server for the Snap Framework";

+23

pkgs/development/libraries/haskell/tables/default.nix

···

       1
       1
       +
       { cabal, binary, cereal, comonad, deepseq, doctest, filepath

     

       2
       2
       +
       , hashable, lens, profunctors, safecopy, transformers

     

       3
       3
       +
       , transformersCompat, unorderedContainers

     

       4
       4
       +
       }:

     

       5
       5
       +
       

     

       6
       6
       +
       cabal.mkDerivation (self: {

     

       7
       7
       +
         pname = "tables";

     

       8
       8
       +
         version = "0.4.1";

     

       9
       9
       +
         sha256 = "131c97lgni0b9pmkdfd5y0lwrb9yh9qyahknhrim8dzpkkfynk49";

     

       10
       10
       +
         buildDepends = [

     

       11
       11
       +
           binary cereal comonad deepseq hashable lens profunctors safecopy

     

       12
       12
       +
           transformers transformersCompat unorderedContainers

     

       13
       13
       +
         ];

     

       14
       14
       +
         testDepends = [

     

       15
       15
       +
           doctest filepath lens transformers unorderedContainers

     

       16
       16
       +
         ];

     

       17
       17
       +
         meta = {

     

       18
       18
       +
           homepage = "http://github.com/ekmett/tables/";

     

       19
       19
       +
           description = "In-memory storage with multiple keys using lenses and traversals";

     

       20
       20
       +
           license = self.stdenv.lib.licenses.bsd3;

     

       21
       21
       +
           platforms = self.ghc.meta.platforms;

     

       22
       22
       +
         };

     

       23
       23
       +
       })

+2 -2

pkgs/development/libraries/haskell/unix-compat/default.nix

···

       2
       2
        
       

     

       3
       3
        
       cabal.mkDerivation (self: {

     

       4
       4
        
         pname = "unix-compat";

     

       5
       5
       -
         version = "0.4.1.1";

     

       6
       6
       -
         sha256 = "1cjny6zca5wdj7d56kjkaxlad85kknn91pisrizjy6wngszyaigf";

     

       5
       5
       +
         version = "0.4.1.3";

     

       6
       6
       +
         sha256 = "1vfw3ffzdk9mshhgyp3dnbn8rihkz8qg6n5zqak8966dsdqhm4xb";

     

       7
       7
        
         meta = {

     

       8
       8
        
           homepage = "http://github.com/jystic/unix-compat";

     

       9
       9
        
           description = "Portable POSIX-compatibility layer";

+27

pkgs/development/libraries/haskell/webdriver/default.nix

···

       1
       1
       +
       { cabal, aeson, attoparsec, base64Bytestring, cond, dataDefault

     

       2
       2
       +
       , directoryTree, exceptions, filepath, HTTP, liftedBase

     

       3
       3
       +
       , monadControl, mtl, network, parallel, scientific, temporary, text

     

       4
       4
       +
       , time, transformers, transformersBase, unorderedContainers, vector

     

       5
       5
       +
       , zipArchive

     

       6
       6
       +
       }:

     

       7
       7
       +
       

     

       8
       8
       +
       cabal.mkDerivation (self: {

     

       9
       9
       +
         pname = "webdriver";

     

       10
       10
       +
         version = "0.5.4";

     

       11
       11
       +
         sha256 = "0839vw7drjn5iray4ma17f0pfgwx44q10ad8m564jvjgcml4yhvq";

     

       12
       12
       +
         buildDepends = [

     

       13
       13
       +
           aeson attoparsec base64Bytestring cond dataDefault directoryTree

     

       14
       14
       +
           exceptions filepath HTTP liftedBase monadControl mtl network

     

       15
       15
       +
           scientific temporary text time transformers transformersBase

     

       16
       16
       +
           unorderedContainers vector zipArchive

     

       17
       17
       +
         ];

     

       18
       18
       +
         testDepends = [ parallel text ];

     

       19
       19
       +
         jailbreak = true;

     

       20
       20
       +
         doCheck = false;

     

       21
       21
       +
         meta = {

     

       22
       22
       +
           homepage = "https://github.com/kallisti-dev/hs-webdriver";

     

       23
       23
       +
           description = "a Haskell client for the Selenium WebDriver protocol";

     

       24
       24
       +
           license = self.stdenv.lib.licenses.bsd3;

     

       25
       25
       +
           platforms = self.ghc.meta.platforms;

     

       26
       26
       +
         };

     

       27
       27
       +
       })

+28

pkgs/development/libraries/libatomic_ops/default.nix

···

       1
       1
       +
       {stdenv, fetchurl}:

     

       2
       2
       +
       let

     

       3
       3
       +
         s = # Generated upstream information

     

       4
       4
       +
         rec {

     

       5
       5
       +
           baseName="libatomic_ops";

     

       6
       6
       +
           version="7.4.2";

     

       7
       7
       +
           name="${baseName}-${version}";

     

       8
       8
       +
           hash="1pdm0h1y7bgkczr8byg20r6bq15m5072cqm5pny4f9crc9gn3yh4";

     

       9
       9
       +
           url="http://www.ivmaisoft.com/_bin/atomic_ops/libatomic_ops-7.4.2.tar.gz";

     

       10
       10
       +
           sha256="1pdm0h1y7bgkczr8byg20r6bq15m5072cqm5pny4f9crc9gn3yh4";

     

       11
       11
       +
         };

     

       12
       12
       +
         buildInputs = [

     

       13
       13
       +
         ];

     

       14
       14
       +
       in

     

       15
       15
       +
       stdenv.mkDerivation {

     

       16
       16
       +
         inherit (s) name version;

     

       17
       17
       +
         inherit buildInputs;

     

       18
       18
       +
         src = fetchurl {

     

       19
       19
       +
           inherit (s) url sha256;

     

       20
       20
       +
         };

     

       21
       21
       +
         meta = {

     

       22
       22
       +
           inherit (s) version;

     

       23
       23
       +
           description = ''A library for semi-portable access to hardware-provided atomic memory update operations'';

     

       24
       24
       +
           license = stdenv.lib.licenses.gpl2Plus ;

     

       25
       25
       +
           maintainers = [stdenv.lib.maintainers.raskin];

     

       26
       26
       +
           platforms = stdenv.lib.platforms.linux;

     

       27
       27
       +
         };

     

       28
       28
       +
       }

+1

pkgs/development/libraries/libatomic_ops/default.upstream

···

       1
       1
       +
       url https://github.com/ivmai/libatomic_ops/wiki/Download

+30

pkgs/development/libraries/libe-book/0.0.nix

···

       1
       1
       +
       {stdenv, fetchurl, gperf, pkgconfig, librevenge, libxml2, boost, icu, cppunit

     

       2
       2
       +
       , libwpd}:

     

       3
       3
       +
       let

     

       4
       4
       +
         s = # Generated upstream information

     

       5
       5
       +
         rec {

     

       6
       6
       +
           baseName="libe-book";

     

       7
       7
       +
           version="0.0.3";

     

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

     

       9
       9
       +
           hash="06xhg319wbqrkj8914npasv5lr7k2904mmy7wa78063mkh31365i";

     

       10
       10
       +
           url="mirror://sourceforge/project/libebook/libe-book-0.0.3/libe-book-0.0.3.tar.xz";

     

       11
       11
       +
           sha256="06xhg319wbqrkj8914npasv5lr7k2904mmy7wa78063mkh31365i";

     

       12
       12
       +
         };

     

       13
       13
       +
         buildInputs = [

     

       14
       14
       +
           gperf pkgconfig librevenge libxml2 boost icu cppunit libwpd

     

       15
       15
       +
         ];

     

       16
       16
       +
       in

     

       17
       17
       +
       stdenv.mkDerivation {

     

       18
       18
       +
         inherit (s) name version;

     

       19
       19
       +
         inherit buildInputs;

     

       20
       20
       +
         src = fetchurl {

     

       21
       21
       +
           inherit (s) url sha256;

     

       22
       22
       +
         };

     

       23
       23
       +
         meta = {

     

       24
       24
       +
           inherit (s) version;

     

       25
       25
       +
           description = ''Library for import of reflowable e-book formats'';

     

       26
       26
       +
           license = stdenv.lib.licenses.lgpl21Plus ;

     

       27
       27
       +
           maintainers = [stdenv.lib.maintainers.raskin];

     

       28
       28
       +
           platforms = stdenv.lib.platforms.linux;

     

       29
       29
       +
         };

     

       30
       30
       +
       }

+4

pkgs/development/libraries/libe-book/0.0.upstream

···

       1
       1
       +
       url http://sourceforge.net/projects/libebook/files/

     

       2
       2
       +
       SF_version_dir libe-book-0.0.

     

       3
       3
       +
       version_link '[.]tar.xz/download$'

     

       4
       4
       +
       SF_redirect

+29

pkgs/development/libraries/libe-book/default.nix

···

       1
       1
       +
       {stdenv, fetchurl, gperf, pkgconfig, librevenge, libxml2, boost, icu, cppunit}:

     

       2
       2
       +
       let

     

       3
       3
       +
         s = # Generated upstream information

     

       4
       4
       +
         rec {

     

       5
       5
       +
           baseName="libe-book";

     

       6
       6
       +
           version="0.1.1";

     

       7
       7
       +
           name="${baseName}-${version}";

     

       8
       8
       +
           hash="0awv96q92qgxk22w2vrf4vg90cab5qfsrkbhgz252722mrkd5p4a";

     

       9
       9
       +
           url="mirror://sourceforge/project/libebook/libe-book-0.1.1/libe-book-0.1.1.tar.xz";

     

       10
       10
       +
           sha256="0awv96q92qgxk22w2vrf4vg90cab5qfsrkbhgz252722mrkd5p4a";

     

       11
       11
       +
         };

     

       12
       12
       +
         buildInputs = [

     

       13
       13
       +
           gperf pkgconfig librevenge libxml2 boost icu cppunit

     

       14
       14
       +
         ];

     

       15
       15
       +
       in

     

       16
       16
       +
       stdenv.mkDerivation {

     

       17
       17
       +
         inherit (s) name version;

     

       18
       18
       +
         inherit buildInputs;

     

       19
       19
       +
         src = fetchurl {

     

       20
       20
       +
           inherit (s) url sha256;

     

       21
       21
       +
         };

     

       22
       22
       +
         meta = {

     

       23
       23
       +
           inherit (s) version;

     

       24
       24
       +
           description = ''Library for import of reflowable e-book formats'';

     

       25
       25
       +
           license = stdenv.lib.licenses.lgpl21Plus ;

     

       26
       26
       +
           maintainers = [stdenv.lib.maintainers.raskin];

     

       27
       27
       +
           platforms = stdenv.lib.platforms.linux;

     

       28
       28
       +
         };

     

       29
       29
       +
       }

+4

pkgs/development/libraries/libe-book/default.upstream

···

       1
       1
       +
       url http://sourceforge.net/projects/libebook/files/

     

       2
       2
       +
       SF_version_dir libe-book-

     

       3
       3
       +
       version_link '[.]tar.xz/download$'

     

       4
       4
       +
       SF_redirect

+29

pkgs/development/libraries/libmwaw/0.2.nix

···

       1
       1
       +
       {stdenv, fetchurl, boost, pkgconfig, cppunit, zlib, libwpg, libwpd, librevenge}:

     

       2
       2
       +
       let

     

       3
       3
       +
         s = # Generated upstream information

     

       4
       4
       +
         rec {

     

       5
       5
       +
           baseName="libmwaw";

     

       6
       6
       +
           version="0.2.1";

     

       7
       7
       +
           name="${baseName}-${version}";

     

       8
       8
       +
           hash="1fil1ll84pq0k3g6rcc2xfg1yrigkljp4ay5p2wpwd9qlmfvvvqn";

     

       9
       9
       +
           url="mirror://sourceforge/project/libmwaw/libmwaw/libmwaw-0.2.1/libmwaw-0.2.1.tar.xz";

     

       10
       10
       +
           sha256="1fil1ll84pq0k3g6rcc2xfg1yrigkljp4ay5p2wpwd9qlmfvvvqn";

     

       11
       11
       +
         };

     

       12
       12
       +
         buildInputs = [

     

       13
       13
       +
           boost pkgconfig cppunit zlib libwpg libwpd librevenge

     

       14
       14
       +
         ];

     

       15
       15
       +
       in

     

       16
       16
       +
       stdenv.mkDerivation {

     

       17
       17
       +
         inherit (s) name version;

     

       18
       18
       +
         inherit buildInputs;

     

       19
       19
       +
         src = fetchurl {

     

       20
       20
       +
           inherit (s) url sha256;

     

       21
       21
       +
         };

     

       22
       22
       +
         meta = {

     

       23
       23
       +
           inherit (s) version;

     

       24
       24
       +
           description = ''Import library for some old mac text documents'';

     

       25
       25
       +
           license = stdenv.lib.licenses.mpl20 ;

     

       26
       26
       +
           maintainers = [stdenv.lib.maintainers.raskin];

     

       27
       27
       +
           platforms = stdenv.lib.platforms.linux;

     

       28
       28
       +
         };

     

       29
       29
       +
       }

+4

pkgs/development/libraries/libmwaw/0.2.upstream

···

       1
       1
       +
       url http://sourceforge.net/projects/libmwaw/files/libmwaw/

     

       2
       2
       +
       SF_version_dir libmwaw-0.2.

     

       3
       3
       +
       version_link '[.]tar.xz/download$'

     

       4
       4
       +
       SF_redirect

+29

pkgs/development/libraries/libmwaw/default.nix

···

       1
       1
       +
       {stdenv, fetchurl, boost, pkgconfig, cppunit, zlib, libwpg, libwpd, librevenge}:

     

       2
       2
       +
       let

     

       3
       3
       +
         s = # Generated upstream information

     

       4
       4
       +
         rec {

     

       5
       5
       +
           baseName="libmwaw";

     

       6
       6
       +
           version="0.3.1";

     

       7
       7
       +
           name="${baseName}-${version}";

     

       8
       8
       +
           hash="0fa6nf4pxl853xnh2kdjw1nk3w6i39diixiampml7g9qygbd0vqb";

     

       9
       9
       +
           url="mirror://sourceforge/project/libmwaw/libmwaw/libmwaw-0.3.1/libmwaw-0.3.1.tar.xz";

     

       10
       10
       +
           sha256="0fa6nf4pxl853xnh2kdjw1nk3w6i39diixiampml7g9qygbd0vqb";

     

       11
       11
       +
         };

     

       12
       12
       +
         buildInputs = [

     

       13
       13
       +
           boost pkgconfig cppunit zlib libwpg libwpd librevenge

     

       14
       14
       +
         ];

     

       15
       15
       +
       in

     

       16
       16
       +
       stdenv.mkDerivation {

     

       17
       17
       +
         inherit (s) name version;

     

       18
       18
       +
         inherit buildInputs;

     

       19
       19
       +
         src = fetchurl {

     

       20
       20
       +
           inherit (s) url sha256;

     

       21
       21
       +
         };

     

       22
       22
       +
         meta = {

     

       23
       23
       +
           inherit (s) version;

     

       24
       24
       +
           description = ''Import library for some old mac text documents'';

     

       25
       25
       +
           license = stdenv.lib.licenses.mpl20 ;

     

       26
       26
       +
           maintainers = [stdenv.lib.maintainers.raskin];

     

       27
       27
       +
           platforms = stdenv.lib.platforms.linux;

     

       28
       28
       +
         };

     

       29
       29
       +
       }

+4

pkgs/development/libraries/libmwaw/default.upstream

···

       1
       1
       +
       url http://sourceforge.net/projects/libmwaw/files/libmwaw/

     

       2
       2
       +
       SF_version_dir libmwaw-

     

       3
       3
       +
       version_link '[.]tar.xz/download$'

     

       4
       4
       +
       SF_redirect

+29

pkgs/development/libraries/libodfgen/default.nix

···

       1
       1
       +
       {stdenv, fetchurl, boost, pkgconfig, cppunit, zlib, libwpg, libwpd, librevenge}:

     

       2
       2
       +
       let

     

       3
       3
       +
         s = # Generated upstream information

     

       4
       4
       +
         rec {

     

       5
       5
       +
           baseName="libodfgen";

     

       6
       6
       +
           version="0.1.1";

     

       7
       7
       +
           name="${baseName}-${version}";

     

       8
       8
       +
           hash="1p335m2l19c7glsss30rrm5dxfcyajk9fvj7rsclgn0kmb4y48cm";

     

       9
       9
       +
           url="mirror://sourceforge/project/libwpd/libodfgen/libodfgen-0.1.1/libodfgen-0.1.1.tar.xz";

     

       10
       10
       +
           sha256="1p335m2l19c7glsss30rrm5dxfcyajk9fvj7rsclgn0kmb4y48cm";

     

       11
       11
       +
         };

     

       12
       12
       +
         buildInputs = [

     

       13
       13
       +
           boost pkgconfig cppunit zlib libwpg libwpd librevenge

     

       14
       14
       +
         ];

     

       15
       15
       +
       in

     

       16
       16
       +
       stdenv.mkDerivation {

     

       17
       17
       +
         inherit (s) name version;

     

       18
       18
       +
         inherit buildInputs;

     

       19
       19
       +
         src = fetchurl {

     

       20
       20
       +
           inherit (s) url sha256;

     

       21
       21
       +
         };

     

       22
       22
       +
         meta = {

     

       23
       23
       +
           inherit (s) version;

     

       24
       24
       +
           description = ''A base library for generating ODF documents'';

     

       25
       25
       +
           license = stdenv.lib.licenses.mpl20 ;

     

       26
       26
       +
           maintainers = [stdenv.lib.maintainers.raskin];

     

       27
       27
       +
           platforms = stdenv.lib.platforms.linux;

     

       28
       28
       +
         };

     

       29
       29
       +
       }

+4

pkgs/development/libraries/libodfgen/default.upstream

···

       1
       1
       +
       url http://sourceforge.net/projects/libwpd/files/libodfgen/

     

       2
       2
       +
       SF_version_dir libodfgen-

     

       3
       3
       +
       version_link '[.]tar.xz/download$'

     

       4
       4
       +
       SF_redirect

+6 -2

pkgs/development/libraries/libre/default.nix

···

       1
       1
        
       {stdenv, fetchurl, zlib, openssl}:

     

       2
       2
        
       stdenv.mkDerivation rec {

     

       3
       3
       -
         version = "0.4.2";

     

       3
       3
       +
         version = "0.4.9";

     

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

     

       5
       5
        
         src=fetchurl {

     

       6
       6
        
           url = "http://www.creytiv.com/pub/re-${version}.tar.gz";

     

       7
       7
       -
           sha256 = "1c99ygs46qhd4a0ardxhdyjaw5p8clhzmsm8jydqxnmbakwy518m";

     

       7
       7
       +
           sha256 = "1i98z9qw3jpkaq419189vr8h3qcxqlz40dls77rbn4c0agc69703";

     

       8
       8
        
         };

     

       9
       9
        
         buildInputs = [zlib openssl];

     

       10
       10
        
         makeFlags = [

     
···

       19
       19
        
           platforms = with stdenv.lib.platforms; linux;

     

       20
       20
        
           maintainers = with stdenv.lib.maintainers; [raskin];

     

       21
       21
        
           license = with stdenv.lib.licenses; bsd3;

     

       22
       22
       +
           inherit version;

     

       23
       23
       +
           downloadPage = "http://www.creytiv.com/pub/";

     

       24
       24
       +
           updateWalker = true;

     

       25
       25
       +
           downloadURLRegexp = "/re-.*[.]tar[.].*";

     

       22
       26
        
         };

     

       23
       27
        
       }

+6 -2

pkgs/development/libraries/librem/default.nix

···

       1
       1
        
       {stdenv, fetchurl, zlib, openssl, libre}:

     

       2
       2
        
       stdenv.mkDerivation rec {

     

       3
       3
       -
         version = "0.4.2";

     

       3
       3
       +
         version = "0.4.6";

     

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

     

       5
       5
        
         src=fetchurl {

     

       6
       6
        
           url = "http://www.creytiv.com/pub/rem-${version}.tar.gz";

     

       7
       7
       -
           sha256 = "55c66118e3026c5ed42d8b9e0c668149baefe83f1aa76394cddba2d72f45d5c7";

     

       7
       7
       +
           sha256 = "0rgqy9pqn730ijxvz1gk0virsf6jwjmq02s99jqqrfm3p0g6zs3w";

     

       8
       8
        
         };

     

       9
       9
        
         buildInputs = [zlib openssl libre];

     

       10
       10
        
         makeFlags = [

     
···

       20
       20
        
           platforms = with stdenv.lib.platforms; linux;

     

       21
       21
        
           maintainers = with stdenv.lib.maintainers; [raskin];

     

       22
       22
        
           license = with stdenv.lib.licenses; bsd3;

     

       23
       23
       +
           inherit version;

     

       24
       24
       +
           downloadPage = "http://www.creytiv.com/pub/";

     

       25
       25
       +
           updateWalker = true;

     

       26
       26
       +
           downloadURLRegexp = "/rem-.*[.]tar[.].*";

     

       23
       27
        
         };

     

       24
       28
        
       }

+29

pkgs/development/libraries/librevenge/default.nix

···

       1
       1
       +
       {stdenv, fetchurl, boost, pkgconfig, cppunit, zlib}:

     

       2
       2
       +
       let

     

       3
       3
       +
         s = # Generated upstream information

     

       4
       4
       +
         rec {

     

       5
       5
       +
           baseName="librevenge";

     

       6
       6
       +
           version="0.0.1";

     

       7
       7
       +
           name="${baseName}-${version}";

     

       8
       8
       +
           hash="0zgfxvbqf11pypyc0vmcan73x197f7ia1ywin9qqy9hvvmrjgchc";

     

       9
       9
       +
           url="mirror://sourceforge/project/libwpd/librevenge/librevenge-0.0.1/librevenge-0.0.1.tar.xz";

     

       10
       10
       +
           sha256="0zgfxvbqf11pypyc0vmcan73x197f7ia1ywin9qqy9hvvmrjgchc";

     

       11
       11
       +
         };

     

       12
       12
       +
         buildInputs = [

     

       13
       13
       +
           boost pkgconfig cppunit zlib

     

       14
       14
       +
         ];

     

       15
       15
       +
       in

     

       16
       16
       +
       stdenv.mkDerivation {

     

       17
       17
       +
         inherit (s) name version;

     

       18
       18
       +
         inherit buildInputs;

     

       19
       19
       +
         src = fetchurl {

     

       20
       20
       +
           inherit (s) url sha256;

     

       21
       21
       +
         };

     

       22
       22
       +
         meta = {

     

       23
       23
       +
           inherit (s) version;

     

       24
       24
       +
           description = ''A base library for writing document import filters'';

     

       25
       25
       +
           license = stdenv.lib.licenses.mpl20 ;

     

       26
       26
       +
           maintainers = [stdenv.lib.maintainers.raskin];

     

       27
       27
       +
           platforms = stdenv.lib.platforms.linux;

     

       28
       28
       +
         };

     

       29
       29
       +
       }

+4

pkgs/development/libraries/librevenge/default.upstream

···

       1
       1
       +
       url http://sourceforge.net/projects/libwpd/files/librevenge/

     

       2
       2
       +
       SF_version_dir librevenge-

     

       3
       3
       +
       version_link '[.]tar.xz/download$'

     

       4
       4
       +
       SF_redirect

+9 -3

pkgs/development/libraries/mdds/default.nix

···

       1
       1
        
       { stdenv, fetchurl }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         version = "0.8.1";

     

       4
       4
       +
         version = "0.10.3";

     

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

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
       -
           url = "http://multidimalgorithm.googlecode.com/files/mdds_${version}.tar.bz2";

     

       9
       9
       -
           sha256 = "12w8rs8kb8yffndsw0g7qfjvy4gpnppkdzc7r7vvc9n800ixl1gn";

     

       8
       8
       +
           url = "http://kohei.us/files/mdds/src/mdds_${version}.tar.bz2";

     

       9
       9
       +
           sha256 = "1hp0472mcsgzrz1v60jpywxrrqmpb8bchfsi7ydmp6vypqnr646v";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       +
         postInstall = ''

     

       13
       13
       +
          mkdir -p "$out/lib/pkgconfig"

     

       14
       14
       +
          cp "$out/share/pkgconfig/"* "$out/lib/pkgconfig"

     

       15
       15
       +
         '';

     

       16
       16
       +
       

     

       12
       17
        
         meta = {

     

       18
       18
       +
           inherit version;

     

       13
       19
        
           homepage = https://code.google.com/p/multidimalgorithm/;

     

       14
       20
        
           description = "A collection of multi-dimensional data structure and indexing algorithm";

     

       15
       21
        
           platforms = stdenv.lib.platforms.all;

+10

pkgs/development/libraries/mdds/default.upstream

···

       1
       1
       +
       url https://code.google.com/p/multidimalgorithm/wiki/Downloads

     

       2
       2
       +
       version_link '[.]tar[.][a-z0-9]+$'

     

       3
       3
       +
       version '.*_([0-9.]+)[.]tar[.].*' '\1'

     

       4
       4
       +
       

     

       5
       5
       +
       do_overwrite(){

     

       6
       6
       +
         ensure_hash

     

       7
       7
       +
         ensure_version

     

       8
       8
       +
         set_var_value version $CURRENT_VERSION

     

       9
       9
       +
         set_var_value sha256 $CURRENT_HASH

     

       10
       10
       +
       }

+25

pkgs/development/libraries/nix-plugins/default.nix

···

       1
       1
       +
       { stdenv, fetchgit, nix }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation {

     

       4
       4
       +
         name = "nix-plugins-1.0.0";

     

       5
       5
       +
       

     

       6
       6
       +
         src = fetchgit {

     

       7
       7
       +
           url = git://github.com/shlevy/nix-plugins.git;

     

       8
       8
       +
           rev = "refs/tags/1.0.0";

     

       9
       9
       +
           sha256 = "e624de55cabc9014e77f21978d657089ae94ce161584b3d9dc3c9763658421b3";

     

       10
       10
       +
         };

     

       11
       11
       +
       

     

       12
       12
       +
         buildInputs = [ nix ];

     

       13
       13
       +
       

     

       14
       14
       +
         buildFlags = [ "NIX_INCLUDE=${nix}/include" ];

     

       15
       15
       +
       

     

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

     

       17
       17
       +
       

     

       18
       18
       +
         meta = {

     

       19
       19
       +
           description = "Collection of miscellaneous plugins for the nix expression language";

     

       20
       20
       +
           homepage = https://github.com/shlevy/nix-plugins;

     

       21
       21
       +
           license = stdenv.lib.licenses.mit;

     

       22
       22
       +
           maintaners = [ stdenv.lib.maintainers.shlevy ];

     

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

     

       24
       24
       +
         };

     

       25
       25
       +
       }

+41

pkgs/development/libraries/nvidia-texture-tools/default.nix

···

       1
       1
       +
       { stdenv, fetchsvn, cmake, libpng, ilmbase, libtiff, zlib, libjpeg

     

       2
       2
       +
       , mesa, libX11

     

       3
       3
       +
       }:

     

       4
       4
       +
       

     

       5
       5
       +
       stdenv.mkDerivation rec {

     

       6
       6
       +
         # No support yet for cg, cuda, glew, glut, openexr.

     

       7
       7
       +
       

     

       8
       8
       +
         name = "nvidia-texture-tools";

     

       9
       9
       +
       

     

       10
       10
       +
         src = fetchsvn {

     

       11
       11
       +
           url = "http://nvidia-texture-tools.googlecode.com/svn/trunk";

     

       12
       12
       +
           rev = "1388";

     

       13
       13
       +
           sha256 = "0pwxqx5l16nqidzm6mwd3rd4gbbknkz6q8cxnvf7sggjpbcvm2d6";

     

       14
       14
       +
         };

     

       15
       15
       +
       

     

       16
       16
       +
         buildInputs = [ cmake libpng ilmbase libtiff zlib libjpeg mesa libX11 ];

     

       17
       17
       +
       

     

       18
       18
       +
         patchPhase = ''

     

       19
       19
       +
           # Fix build due to missing dependnecies.

     

       20
       20
       +
           echo 'target_link_libraries(bc7 nvmath)' >> src/nvtt/bc7/CMakeLists.txt

     

       21
       21
       +
           echo 'target_link_libraries(bc6h nvmath)' >> src/nvtt/bc6h/CMakeLists.txt

     

       22
       22
       +
       

     

       23
       23
       +
           # Make a recently added pure virtual function just virtual,

     

       24
       24
       +
           # to keep compatibility.

     

       25
       25
       +
           sed -i 's/virtual void endImage() = 0;/virtual void endImage() {}/' src/nvtt/nvtt.h

     

       26
       26
       +
       

     

       27
       27
       +
           # Fix building shared libraries.

     

       28
       28
       +
           sed -i 's/SET(NVIMAGE_SHARED TRUE)/SET(NVIMAGE_SHARED TRUE)\nSET(NVTHREAD_SHARED TRUE)/' CMakeLists.txt

     

       29
       29
       +
         '';

     

       30
       30
       +
       

     

       31
       31
       +
         cmakeFlags = [

     

       32
       32
       +
           "-DNVTT_SHARED=TRUE"

     

       33
       33
       +
         ];

     

       34
       34
       +
       

     

       35
       35
       +
         meta = {

     

       36
       36
       +
           description = "A set of cuda-enabled texture tools and compressors";

     

       37
       37
       +
           homepage = "http://developer.nvidia.com/object/texture_tools.html";

     

       38
       38
       +
           license = "MIT";

     

       39
       39
       +
           platforms = stdenv.lib.platforms.linux;

     

       40
       40
       +
         };

     

       41
       41
       +
       }

+1 -1

pkgs/development/lisp-modules/lisp-packages.nix

···

       37
       37
        
           src = pkgs.fetchdarcs {

     

       38
       38
        
             url = "http://common-lisp.net/project/iterate/darcs/iterate";

     

       39
       39
        
             sha256 = "0m3q0s7h5s8varwx584m2akgdslj14df7kg4w1bj1fbgzsag5m1w";

     

       40
       40
       -
             tag=version;

     

       40
       40
       +
             rev = version;

     

       41
       41
        
           };

     

       42
       42
        
           overrides = x: {

     

       43
       43
        
             configurePhase="buildPhase(){ true; }";

+30

pkgs/development/tools/etcdctl/default.nix

···

       1
       1
       +
       { stdenv, lib, go, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         version = "0.4.3";

     

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

     

       6
       6
       +
       

     

       7
       7
       +
         src = import ./deps.nix {

     

       8
       8
       +
           inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub;

     

       9
       9
       +
         };

     

       10
       10
       +
       

     

       11
       11
       +
         buildInputs = [ go ];

     

       12
       12
       +
       

     

       13
       13
       +
         buildPhase = ''

     

       14
       14
       +
           export GOPATH=$src

     

       15
       15
       +
           go build -v -o etcdctl github.com/coreos/etcdctl

     

       16
       16
       +
         '';

     

       17
       17
       +
       

     

       18
       18
       +
         installPhase = ''

     

       19
       19
       +
           ensureDir $out/bin

     

       20
       20
       +
           mv etcdctl $out/bin

     

       21
       21
       +
         '';

     

       22
       22
       +
       

     

       23
       23
       +
         meta = with stdenv.lib; {

     

       24
       24
       +
           description = "A simple command line client for etcd";

     

       25
       25
       +
           homepage = http://coreos.com/using-coreos/etcd/;

     

       26
       26
       +
           license = licenses.asl20;

     

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

     

       28
       28
       +
           platforms = platforms.unix;

     

       29
       29
       +
         };

     

       30
       30
       +
       }

+27

pkgs/development/tools/etcdctl/deps.nix

···

       1
       1
       +
       { stdenv, lib, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }:

     

       2
       2
       +
       

     

       3
       3
       +
       let

     

       4
       4
       +
         goDeps = [

     

       5
       5
       +
           {

     

       6
       6
       +
             root = "github.com/coreos/etcdctl";

     

       7
       7
       +
             src = fetchFromGitHub {

     

       8
       8
       +
               owner = "coreos";

     

       9
       9
       +
               repo = "etcdctl";

     

       10
       10
       +
               rev = "061135b2a02797a6b3c2b6c01183517c1bc76a2c";

     

       11
       11
       +
               sha256 = "1hl9cz9ygr2k4d67qj9q1xj0n64b28qjy5sv7zylgg9h9ag2j2p4";

     

       12
       12
       +
             };

     

       13
       13
       +
           }

     

       14
       14
       +
         ];

     

       15
       15
       +
       

     

       16
       16
       +
       in

     

       17
       17
       +
       

     

       18
       18
       +
       stdenv.mkDerivation rec {

     

       19
       19
       +
         name = "go-deps";

     

       20
       20
       +
       

     

       21
       21
       +
         buildCommand =

     

       22
       22
       +
           lib.concatStrings

     

       23
       23
       +
             (map (dep: ''

     

       24
       24
       +
                     mkdir -p $out/src/`dirname ${dep.root}`

     

       25
       25
       +
                     ln -s ${dep.src} $out/src/${dep.root}

     

       26
       26
       +
                   '') goDeps);

     

       27
       27
       +
       }

+29

pkgs/development/tools/gocode/default.nix

···

       1
       1
       +
       { stdenv, lib, go, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         name = "gocode";

     

       5
       5
       +
       

     

       6
       6
       +
         src = import ./deps.nix {

     

       7
       7
       +
           inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub;

     

       8
       8
       +
         };

     

       9
       9
       +
       

     

       10
       10
       +
         buildInputs = [ go ];

     

       11
       11
       +
       

     

       12
       12
       +
         buildPhase = ''

     

       13
       13
       +
           export GOPATH=$src

     

       14
       14
       +
           go build -v -o gocode github.com/nsf/gocode

     

       15
       15
       +
         '';

     

       16
       16
       +
       

     

       17
       17
       +
         installPhase = ''

     

       18
       18
       +
           ensureDir $out/bin

     

       19
       19
       +
           mv gocode $out/bin

     

       20
       20
       +
         '';

     

       21
       21
       +
       

     

       22
       22
       +
         meta = with lib; {

     

       23
       23
       +
           description = "An autocompletion daemon for the Go programming language";

     

       24
       24
       +
           homepage = https://github.com/nsf/gocode;

     

       25
       25
       +
           license = licenses.mit;

     

       26
       26
       +
           maintainers = with maintainers; [ cstrahan ];

     

       27
       27
       +
           platforms = platforms.unix;

     

       28
       28
       +
         };

     

       29
       29
       +
       }

+27

pkgs/development/tools/gocode/deps.nix

···

       1
       1
       +
       { stdenv, lib, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }:

     

       2
       2
       +
       

     

       3
       3
       +
       let

     

       4
       4
       +
         goDeps = [

     

       5
       5
       +
           {

     

       6
       6
       +
             root = "github.com/nsf/gocode";

     

       7
       7
       +
             src = fetchFromGitHub {

     

       8
       8
       +
               owner = "nsf";

     

       9
       9
       +
               repo = "gocode";

     

       10
       10
       +
               rev = "9b760fdb16f18eafbe0cd274527efd2bd89dfa78";

     

       11
       11
       +
               sha256 = "0d1wl0x8jkaav6lcfzs70cr6gy0p88cbk5n3p19l6d0h9xz464ax";

     

       12
       12
       +
             };

     

       13
       13
       +
           }

     

       14
       14
       +
         ];

     

       15
       15
       +
       

     

       16
       16
       +
       in

     

       17
       17
       +
       

     

       18
       18
       +
       stdenv.mkDerivation rec {

     

       19
       19
       +
         name = "go-deps";

     

       20
       20
       +
       

     

       21
       21
       +
         buildCommand =

     

       22
       22
       +
           lib.concatStrings

     

       23
       23
       +
             (map (dep: ''

     

       24
       24
       +
                     mkdir -p $out/src/`dirname ${dep.root}`

     

       25
       25
       +
                     ln -s ${dep.src} $out/src/${dep.root}

     

       26
       26
       +
                   '') goDeps);

     

       27
       27
       +
       }

+5 -5

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

···

       3
       3
        
       let

     

       4
       4
        
         libphutil = fetchgit {

     

       5
       5
        
           url    = "git://github.com/facebook/libphutil.git";

     

       6
       6
       -
           rev    = "0027e97cd6cbafcbdc626b4ac6cf315b9508a14f";

     

       7
       7
       -
           sha256 = "4781a4e3e1cb72da24e97f89a9b879803be8e1cf6baa2a4517801dfb893eec26";

     

       6
       6
       +
           rev    = "8d1b522333caf4984180ac830be8635437bacedb";

     

       7
       7
       +
           sha256 = "e83da381cd8845b64a1cd3244d17736fb736aeabce37efd19754447f47cd4fe1";

     

       8
       8
        
         };

     

       9
       9
        
         arcanist = fetchgit {

     

       10
       10
        
           url    = "git://github.com/facebook/arcanist.git";

     

       11
       11
       -
           rev    = "680ec3670cd9d9195debf3e9b674b1b232156e61";

     

       12
       12
       -
           sha256 = "a70cde586960676c0d69f4d98e6936633e0d79c37c6f6cc5b0213146a6b18c83";

     

       11
       11
       +
           rev    = "0971c728fea89ac45a67e06cdb89349ad8040c60";

     

       12
       12
       +
           sha256 = "33e595b81dcbef181d3c71072ecf1c22db3f86f49dbb5276c671caefe83c8594";

     

       13
       13
        
         };

     

       14
       14
        
       in

     

       15
       15
        
       stdenv.mkDerivation rec {

     

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

     

       17
       17
       -
         version = "20140617";

     

       17
       17
       +
         version = "20140627";

     

       18
       18
        
       

     

       19
       19
        
         src = [ arcanist libphutil ];

     

       20
       20
        
         buildInputs = [ php makeWrapper flex ];

+35 -26

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

···

       1
       1
       -
       { stdenv, fetchurl, libftdi, libusb1 }:

     

       1
       1
       +
       { stdenv, fetchurl, libftdi, libusb1, pkgconfig }:

     

       2
       2
       +
       

     

       3
       3
       +
       # TODO: Add "hidapi" as dependency to gain access to CMSIS-DAP debuggers.

     

       4
       4
       +
       # Support should be auto-detected, but if not, pass "--enable-cmsis-dap" to

     

       5
       5
       +
       # configure.

     

       2
       6
        
       

     

       3
       7
        
       stdenv.mkDerivation rec {

     

       4
       8
        
         name = "openocd-${version}";

     

       5
       5
       -
         version = "0.7.0";

     

       9
       9
       +
         version = "0.8.0";

     

       6
       10
        
       

     

       7
       11
        
         src = fetchurl {

     

       8
       12
        
           url = "mirror://sourceforge/openocd/openocd-${version}.tar.bz2";

     

       9
       9
       -
           sha256 = "0qwfyd821sy5p0agz0ybgn5nd7vplipw4mhm485ldj1hcmw7n8sj";

     

       13
       13
       +
           sha256 = "0byk7hnccgmhw0f84qlkfhps38gp2xp628bfrsc03vq08hr6q1sv";

     

       10
       14
        
         };

     

       11
       15
        
       

     

       12
       12
       -
         configureFlags = [ "--enable-ft2232_libftdi"

     

       13
       13
       -
                            "--enable-jlink"

     

       14
       14
       -
                            "--enable-rlink"

     

       15
       15
       -
                            "--enable-ulink"

     

       16
       16
       -
                            "--enable-stlink" ];

     

       16
       16
       +
         buildInputs = [ libftdi libusb1 pkgconfig ];

     

       17
       17
        
       

     

       18
       18
       -
         buildInputs = [ libftdi libusb1 ];

     

       18
       18
       +
         configureFlags = [

     

       19
       19
       +
           "--enable-jtag_vpi"

     

       20
       20
       +
           "--enable-usb_blaster_libftdi"

     

       21
       21
       +
           "--enable-amtjtagaccel"

     

       22
       22
       +
           "--enable-gw16012"

     

       23
       23
       +
           "--enable-presto_libftdi"

     

       24
       24
       +
           "--enable-openjtag_ftdi"

     

       25
       25
       +
           "--enable-oocd_trace"

     

       26
       26
       +
           "--enable-buspirate"

     

       27
       27
       +
           "--enable-sysfsgpio"

     

       28
       28
       +
           "--enable-remote-bitbang"

     

       29
       29
       +
         ];

     

       19
       30
        
       

     

       20
       31
        
         postInstall = ''

     

       21
       32
        
           mkdir -p "$out/etc/udev/rules.d"

     

       22
       22
       -
           ln -s "$out/share/openocd/contrib/openocd.udev" "$out/etc/udev/rules.d/99-openocd.rules"

     

       33
       33
       +
           ln -s "$out/share/openocd/contrib/99-openocd.udev" "$out/etc/udev/rules.d/99-openocd.rules"

     

       23
       34
        
         '';

     

       24
       35
        
       

     

       25
       25
       -
         meta = {

     

       36
       36
       +
         meta = with stdenv.lib; {

     

       37
       37
       +
           description = "Free and Open On-Chip Debugging, In-System Programming and Boundary-Scan Testing";

     

       38
       38
       +
           longDescription = ''

     

       39
       39
       +
             OpenOCD provides on-chip programming and debugging support with a layered

     

       40
       40
       +
             architecture of JTAG interface and TAP support, debug target support

     

       41
       41
       +
             (e.g. ARM, MIPS), and flash chip drivers (e.g. CFI, NAND, etc.).  Several

     

       42
       42
       +
             network interfaces are available for interactiving with OpenOCD: HTTP,

     

       43
       43
       +
             telnet, TCL, and GDB.  The GDB server enables OpenOCD to function as a

     

       44
       44
       +
             "remote target" for source-level debugging of embedded systems using the

     

       45
       45
       +
             GNU GDB program.

     

       46
       46
       +
           '';

     

       26
       47
        
           homepage = http://openocd.sourceforge.net/;

     

       27
       27
       -
           description = "OpenOCD, an on-chip debugger";

     

       28
       28
       -
       

     

       29
       29
       -
           longDescription =

     

       30
       30
       -
             '' OpenOCD provides on-chip programming and debugging support with a

     

       31
       31
       -
                layered architecture of JTAG interface and TAP support, debug target

     

       32
       32
       -
                support (e.g. ARM, MIPS), and flash chip drivers (e.g. CFI, NAND,

     

       33
       33
       -
                etc.).  Several network interfaces are available for interactiving

     

       34
       34
       -
                with OpenOCD: HTTP, telnet, TCL, and GDB.  The GDB server enables

     

       35
       35
       -
                OpenOCD to function as a "remote target" for source-level debugging

     

       36
       36
       -
                of embedded systems using the GNU GDB program.

     

       37
       37
       -
             '';

     

       38
       38
       -
       

     

       39
       39
       -
           license = "GPLv2+";

     

       40
       40
       -
           maintainers = with stdenv.lib.maintainers; [ viric bjornfor ];

     

       41
       41
       -
           platforms = with stdenv.lib.platforms; linux;

     

       48
       48
       +
           license = licenses.gpl2Plus;

     

       49
       49
       +
           maintainers = with maintainers; [ viric bjornfor ];

     

       50
       50
       +
           platforms = platforms.linux;

     

       42
       51
        
         };

     

       43
       52
        
       }

+37

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

···

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

     

       2
       2
       +
       let

     

       3
       3
       +
         pname = "cppo";

     

       4
       4
       +
         version = "0.9.4";

     

       5
       5
       +
         webpage = "http://mjambon.com/${pname}.html";

     

       6
       6
       +
       in

     

       7
       7
       +
       stdenv.mkDerivation rec {

     

       8
       8
       +
       

     

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

     

       10
       10
       +
       

     

       11
       11
       +
         src = fetchurl {

     

       12
       12
       +
           url = "http://mjambon.com/releases/${pname}/${name}.tar.gz";

     

       13
       13
       +
           sha256 = "1m7cbja7cf74l45plqnmjrjjz55v8x65rvx0ikk9mg1ak8lcmvxa";

     

       14
       14
       +
         };

     

       15
       15
       +
       

     

       16
       16
       +
         buildInputs = [ ocaml findlib ];

     

       17
       17
       +
       

     

       18
       18
       +
         createFindlibDestdir = true;

     

       19
       19
       +
       

     

       20
       20
       +
         makeFlags = "PREFIX=$(out)";

     

       21
       21
       +
       

     

       22
       22
       +
         preBuild = ''

     

       23
       23
       +
           mkdir $out/bin

     

       24
       24
       +
         '';

     

       25
       25
       +
       

     

       26
       26
       +
         meta = {

     

       27
       27
       +
           description = "The C preprocessor for OCaml";

     

       28
       28
       +
           longDescription = ''

     

       29
       29
       +
             Cppo is an equivalent of the C preprocessor targeted at the OCaml language and its variants.

     

       30
       30
       +
           '';

     

       31
       31
       +
           homepage = "${webpage}";

     

       32
       32
       +
           license = "bsd";

     

       33
       33
       +
         };

     

       34
       34
       +
       }

     

       35
       35
       +
       

     

       36
       36
       +
       

     

       37
       37
       +

+35

pkgs/development/tools/packer/default.nix

···

       1
       1
       +
       { stdenv, lib, gox, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         name = "packer-0.6.0";

     

       5
       5
       +
       

     

       6
       6
       +
         src = import ./deps.nix {

     

       7
       7
       +
           inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub;

     

       8
       8
       +
         };

     

       9
       9
       +
       

     

       10
       10
       +
         buildInputs = [ gox ];

     

       11
       11
       +
       

     

       12
       12
       +
         installPhase = ''

     

       13
       13
       +
           export GOPATH=$src

     

       14
       14
       +
           XC_ARCH=$(go env GOARCH)

     

       15
       15
       +
           XC_OS=$(go env GOOS)

     

       16
       16
       +
       

     

       17
       17
       +
           ensureDir $out/bin

     

       18
       18
       +
       

     

       19
       19
       +
           cd $src/src/github.com/mitchellh/packer

     

       20
       20
       +
           gox \

     

       21
       21
       +
               -os="''${XC_OS}" \

     

       22
       22
       +
               -arch="''${XC_ARCH}" \

     

       23
       23
       +
               -output "$out/bin/packer-{{.Dir}}" \

     

       24
       24
       +
               ./...

     

       25
       25
       +
           mv $out/bin/packer{*packer*,}

     

       26
       26
       +
         '';

     

       27
       27
       +
       

     

       28
       28
       +
         meta = with stdenv.lib; {

     

       29
       29
       +
           description = "A tool for creating identical machine images for multiple platforms from a single source configuration";

     

       30
       30
       +
           homepage    = "http://www.packer.io";

     

       31
       31
       +
           license     = licenses.mpl20;

     

       32
       32
       +
           maintainers = with maintainers; [ cstrahan ];

     

       33
       33
       +
           platforms   = platforms.unix;

     

       34
       34
       +
         };

     

       35
       35
       +
       }

+307

pkgs/development/tools/packer/deps.nix

···

       1
       1
       +
       { stdenv, lib, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }:

     

       2
       2
       +
       

     

       3
       3
       +
       let

     

       4
       4
       +
         goDeps = [

     

       5
       5
       +
           {

     

       6
       6
       +
             root = "github.com/mitchellh/packer";

     

       7
       7
       +
             src = fetchFromGitHub {

     

       8
       8
       +
               owner = "mitchellh";

     

       9
       9
       +
               repo = "packer";

     

       10
       10
       +
               rev = "12e28f257f66299e3bb13a053bf06ccd236e7efd";

     

       11
       11
       +
               sha256 = "1r5j864kr7lx137c23kk5s82znk11hsrgq98zfz5r8sbzq1xpbzw";

     

       12
       12
       +
             };

     

       13
       13
       +
           }

     

       14
       14
       +
           {

     

       15
       15
       +
             root = "code.google.com/p/go.crypto";

     

       16
       16
       +
             src = fetchhg {

     

       17
       17
       +
               url = "http://code.google.com/p/go.crypto";

     

       18
       18
       +
               rev = "199";

     

       19
       19
       +
               sha256 = "0ibrpc6kknzl6a2g2fkxn03mvrd635lcnvf4a9rk1dfrpjbpcixh";

     

       20
       20
       +
             };

     

       21
       21
       +
           }

     

       22
       22
       +
           {

     

       23
       23
       +
             root = "code.google.com/p/goauth2";

     

       24
       24
       +
             src = fetchhg {

     

       25
       25
       +
               url = "http://code.google.com/p/goauth2";

     

       26
       26
       +
               rev = "67";

     

       27
       27
       +
               sha256 = "053vajj8hd9869by7z9qfgzn84h6avpcjvyxcyw5jml8dsln4bah";

     

       28
       28
       +
             };

     

       29
       29
       +
           }

     

       30
       30
       +
           {

     

       31
       31
       +
             root = "code.google.com/p/google-api-go-client";

     

       32
       32
       +
             src = fetchhg {

     

       33
       33
       +
               url = "http://code.google.com/p/google-api-go-client";

     

       34
       34
       +
               rev = "111";

     

       35
       35
       +
               sha256 = "1ib8i1c2mb86lkrr5w7bgwb70gkqmp860wa3h1j8080gxdx3yy16";

     

       36
       36
       +
             };

     

       37
       37
       +
           }

     

       38
       38
       +
           {

     

       39
       39
       +
             root = "code.google.com/p/gosshold";

     

       40
       40
       +
             src = fetchhg {

     

       41
       41
       +
               url = "http://code.google.com/p/gosshold";

     

       42
       42
       +
               rev = "2";

     

       43
       43
       +
               sha256 = "1ljl8pcxxfz5rv89b2ajd31gxxzifl57kzpksvdhyjdxh98gkvg8";

     

       44
       44
       +
             };

     

       45
       45
       +
           }

     

       46
       46
       +
           {

     

       47
       47
       +
             root = "github.com/ActiveState/tail";

     

       48
       48
       +
             src = fetchFromGitHub {

     

       49
       49
       +
               owner = "ActiveState";

     

       50
       50
       +
               repo = "tail";

     

       51
       51
       +
               rev = "8dcd1ad3e57aa8ce5614a837cbbdb21945fbb55a";

     

       52
       52
       +
               sha256 = "1jxj576dd7mawawwg5nzwf6k7sks0r3lp2x8f6kxaps50n3k1wiz";

     

       53
       53
       +
             };

     

       54
       54
       +
           }

     

       55
       55
       +
           {

     

       56
       56
       +
             root = "github.com/howeyc/fsnotify";

     

       57
       57
       +
             src = fetchFromGitHub {

     

       58
       58
       +
               owner = "howeyc";

     

       59
       59
       +
               repo = "fsnotify";

     

       60
       60
       +
               rev = "441bbc86b167f3c1f4786afae9931403b99fdacf";

     

       61
       61
       +
               sha256 = "1v5vrwhmidxjj6sppinyizf85v60zrmn7i6c9xk0pvx6k0kw2mr2";

     

       62
       62
       +
             };

     

       63
       63
       +
           }

     

       64
       64
       +
           {

     

       65
       65
       +
             root = "launchpad.net/tomb";

     

       66
       66
       +
             src = fetchbzr {

     

       67
       67
       +
               url = "https://launchpad.net/tomb";

     

       68
       68
       +
               rev = "17";

     

       69
       69
       +
               sha256 = "1cjw0sr9hald1darq6n8akfpkzcgrk3mcq59hga3ibf2lrg35ha0";

     

       70
       70
       +
             };

     

       71
       71
       +
           }

     

       72
       72
       +
           {

     

       73
       73
       +
             root = "github.com/going/toolkit";

     

       74
       74
       +
             src = fetchFromGitHub {

     

       75
       75
       +
               owner = "going";

     

       76
       76
       +
               repo = "toolkit";

     

       77
       77
       +
               rev = "6185c1893604d52d36a97dd6bb1247ace93a9b80";

     

       78
       78
       +
               sha256 = "1kzy5yppalcidsmv5yxmr6lpqplqj07kdqpn77fdp6fbb0y0sg11";

     

       79
       79
       +
             };

     

       80
       80
       +
           }

     

       81
       81
       +
           {

     

       82
       82
       +
             root = "code.google.com/p/goprotobuf";

     

       83
       83
       +
             src = fetchhg {

     

       84
       84
       +
               url = "http://code.google.com/p/goprotobuf";

     

       85
       85
       +
               rev = "246";

     

       86
       86
       +
               sha256 = "0k4wcv1dnkwcp0gdrajj6kr25f1lg4lgpbi0h5v9l9n7sdwzplf4";

     

       87
       87
       +
             };

     

       88
       88
       +
           }

     

       89
       89
       +
           {

     

       90
       90
       +
             root = "github.com/bmizerany/assert";

     

       91
       91
       +
             src = fetchFromGitHub {

     

       92
       92
       +
               owner = "bmizerany";

     

       93
       93
       +
               repo = "assert";

     

       94
       94
       +
               rev = "e17e99893cb6509f428e1728281c2ad60a6b31e3";

     

       95
       95
       +
               sha256 = "1lfrvqqmb09y6pcr76yjv4r84cshkd4s7fpmiy7268kfi2cvqnpc";

     

       96
       96
       +
             };

     

       97
       97
       +
           }

     

       98
       98
       +
           {

     

       99
       99
       +
             root = "github.com/kr/pretty";

     

       100
       100
       +
             src = fetchFromGitHub {

     

       101
       101
       +
               owner = "kr";

     

       102
       102
       +
               repo = "pretty";

     

       103
       103
       +
               rev = "bc9499caa0f45ee5edb2f0209fbd61fbf3d9018f";

     

       104
       104
       +
               sha256 = "1m61y592qsnwsqn76v54mm6h2pcvh4wlzbzscc1ag645x0j33vvl";

     

       105
       105
       +
             };

     

       106
       106
       +
           }

     

       107
       107
       +
           {

     

       108
       108
       +
             root = "github.com/kr/text";

     

       109
       109
       +
             src = fetchFromGitHub {

     

       110
       110
       +
               owner = "kr";

     

       111
       111
       +
               repo = "text";

     

       112
       112
       +
               rev = "6807e777504f54ad073ecef66747de158294b639";

     

       113
       113
       +
               sha256 = "1wkszsg08zar3wgspl9sc8bdsngiwdqmg3ws4y0bh02sjx5a4698";

     

       114
       114
       +
             };

     

       115
       115
       +
           }

     

       116
       116
       +
           {

     

       117
       117
       +
             root = "github.com/kr/pty";

     

       118
       118
       +
             src = fetchFromGitHub {

     

       119
       119
       +
               owner = "kr";

     

       120
       120
       +
               repo = "pty";

     

       121
       121
       +
               rev = "67e2db24c831afa6c64fc17b4a143390674365ef";

     

       122
       122
       +
               sha256 = "1l3z3wbb112ar9br44m8g838z0pq2gfxcp5s3ka0xvm1hjvanw2d";

     

       123
       123
       +
             };

     

       124
       124
       +
           }

     

       125
       125
       +
           {

     

       126
       126
       +
             root = "github.com/xiocode/toolkit";

     

       127
       127
       +
             src = fetchFromGitHub {

     

       128
       128
       +
               owner = "xiocode";

     

       129
       129
       +
               repo = "toolkit";

     

       130
       130
       +
               rev = "352fd7c6700074a81056cdfc9e82b3e8c5681ac5";

     

       131
       131
       +
               sha256 = "0p33zh57xpxyk2wyp9xahdxyrkq48ysihpr0n9kj713q0dh7x4a3";

     

       132
       132
       +
             };

     

       133
       133
       +
           }

     

       134
       134
       +
           {

     

       135
       135
       +
             root = "launchpad.net/gocheck";

     

       136
       136
       +
             src = fetchbzr {

     

       137
       137
       +
               url = "https://launchpad.net/gocheck";

     

       138
       138
       +
               rev = "87";

     

       139
       139
       +
               sha256 = "1y9fa2mv61if51gpik9isls48idsdz87zkm1p3my7swjdix7fcl0";

     

       140
       140
       +
             };

     

       141
       141
       +
           }

     

       142
       142
       +
           {

     

       143
       143
       +
             root = "github.com/hashicorp/go-version";

     

       144
       144
       +
             src = fetchFromGitHub {

     

       145
       145
       +
               owner = "hashicorp";

     

       146
       146
       +
               repo = "go-version";

     

       147
       147
       +
               rev = "bb92dddfa9792e738a631f04ada52858a139bcf7";

     

       148
       148
       +
               sha256 = "0fl5a6j6nk1xsxwjdpa24a24fxvgnvm3jjlgpyrnmbdn380zil3m";

     

       149
       149
       +
             };

     

       150
       150
       +
           }

     

       151
       151
       +
           {

     

       152
       152
       +
             root = "github.com/mitchellh/go-fs";

     

       153
       153
       +
             src = fetchFromGitHub {

     

       154
       154
       +
               owner = "mitchellh";

     

       155
       155
       +
               repo = "go-fs";

     

       156
       156
       +
               rev = "faaa223588dd7005e49bf66fa2d19e35c8c4d761";

     

       157
       157
       +
               sha256 = "19jsvy35g14f18ckymzxasy0zfd6n99zlqg6grpj1yqdfxfvqn9b";

     

       158
       158
       +
             };

     

       159
       159
       +
           }

     

       160
       160
       +
           {

     

       161
       161
       +
             root = "github.com/mitchellh/go-vnc";

     

       162
       162
       +
             src = fetchFromGitHub {

     

       163
       163
       +
               owner = "mitchellh";

     

       164
       164
       +
               repo = "go-vnc";

     

       165
       165
       +
               rev = "fc93dd80f5da4ccde0a9d97f0c73e56e04e0cf72";

     

       166
       166
       +
               sha256 = "03rwsp1frvfx6c7yxr711lq7jdgsr1gcwg14jw26xvbzzxwjvnsf";

     

       167
       167
       +
             };

     

       168
       168
       +
           }

     

       169
       169
       +
           {

     

       170
       170
       +
             root = "github.com/mitchellh/goamz";

     

       171
       171
       +
             src = fetchFromGitHub {

     

       172
       172
       +
               owner = "mitchellh";

     

       173
       173
       +
               repo = "goamz";

     

       174
       174
       +
               rev = "c3ff5f734c89f1ea1f290c6aadbbceeeb19a623c";

     

       175
       175
       +
               sha256 = "1nyi1p5yh21r161icnwkcgmj2y38b4m1jis47vvjbqinrp45w1gq";

     

       176
       176
       +
             };

     

       177
       177
       +
           }

     

       178
       178
       +
           {

     

       179
       179
       +
             root = "github.com/motain/gocheck";

     

       180
       180
       +
             src = fetchFromGitHub {

     

       181
       181
       +
               owner = "motain";

     

       182
       182
       +
               repo = "gocheck";

     

       183
       183
       +
               rev = "9beb271d26e640863a5bf4a3c5ea40ccdd466b84";

     

       184
       184
       +
               sha256 = "07arpwfdb51b5f7kzqnm5s5ndfmxv5j793hpn30nbdcya46diwjd";

     

       185
       185
       +
             };

     

       186
       186
       +
           }

     

       187
       187
       +
           {

     

       188
       188
       +
             root = "github.com/mitchellh/iochan";

     

       189
       189
       +
             src = fetchFromGitHub {

     

       190
       190
       +
               owner = "mitchellh";

     

       191
       191
       +
               repo = "iochan";

     

       192
       192
       +
               rev = "b584a329b193e206025682ae6c10cdbe03b0cd77";

     

       193
       193
       +
               sha256 = "1fcwdhfci41ibpng2j4c1bqfng578cwzb3c00yw1lnbwwhaq9r6b";

     

       194
       194
       +
             };

     

       195
       195
       +
           }

     

       196
       196
       +
           {

     

       197
       197
       +
             root = "github.com/mitchellh/mapstructure";

     

       198
       198
       +
             src = fetchFromGitHub {

     

       199
       199
       +
               owner = "mitchellh";

     

       200
       200
       +
               repo = "mapstructure";

     

       201
       201
       +
               rev = "743fcf103ac7cdbc159e540d9d0e3a7889b87d68";

     

       202
       202
       +
               sha256 = "1qqxsnxabd7c04n0ip1wmpr2g913qchqrbmblq0shrf5p1hnszgn";

     

       203
       203
       +
             };

     

       204
       204
       +
           }

     

       205
       205
       +
           {

     

       206
       206
       +
             root = "github.com/mitchellh/multistep";

     

       207
       207
       +
             src = fetchFromGitHub {

     

       208
       208
       +
               owner = "mitchellh";

     

       209
       209
       +
               repo = "multistep";

     

       210
       210
       +
               rev = "162146fc57112954184d90266f4733e900ed05a5";

     

       211
       211
       +
               sha256 = "0ydhbxziy9204qr43pjdh88y2jg34g2mhzdapjyfpf8a1rin6dn3";

     

       212
       212
       +
             };

     

       213
       213
       +
           }

     

       214
       214
       +
           {

     

       215
       215
       +
             root = "github.com/mitchellh/osext";

     

       216
       216
       +
             src = fetchFromGitHub {

     

       217
       217
       +
               owner = "mitchellh";

     

       218
       218
       +
               repo = "osext";

     

       219
       219
       +
               rev = "0dd3f918b21bec95ace9dc86c7e70266cfc5c702";

     

       220
       220
       +
               sha256 = "02pczqml6p1mnfdrygm3rs02g0r65qx8v1bi3x24dx8wv9dr5y23";

     

       221
       221
       +
             };

     

       222
       222
       +
           }

     

       223
       223
       +
           {

     

       224
       224
       +
             root = "github.com/mitchellh/panicwrap";

     

       225
       225
       +
             src = fetchFromGitHub {

     

       226
       226
       +
               owner = "mitchellh";

     

       227
       227
       +
               repo = "panicwrap";

     

       228
       228
       +
               rev = "1aedff2aaa8b8ff7f65ab58e94ef9f593e2e3bf4";

     

       229
       229
       +
               sha256 = "05brbpc7kizzbs1a128fmjddh7rdyg0jzzxgbvrl58cgklh4yzaa";

     

       230
       230
       +
             };

     

       231
       231
       +
           }

     

       232
       232
       +
           {

     

       233
       233
       +
             root = "github.com/rackspace/gophercloud";

     

       234
       234
       +
             src = fetchFromGitHub {

     

       235
       235
       +
               owner = "rackspace";

     

       236
       236
       +
               repo = "gophercloud";

     

       237
       237
       +
               rev = "2285a429874c1365ef6c6d3ceb08b1d428e26aca";

     

       238
       238
       +
               sha256 = "0py3h64r4wkl2r9j7xlh81nazpg2b0r5ba9iblh6d1380yk4fa7f";

     

       239
       239
       +
             };

     

       240
       240
       +
           }

     

       241
       241
       +
           {

     

       242
       242
       +
             root = "github.com/racker/perigee";

     

       243
       243
       +
             src = fetchFromGitHub {

     

       244
       244
       +
               owner = "racker";

     

       245
       245
       +
               repo = "perigee";

     

       246
       246
       +
               rev = "01db3191866051f2ec854c2d876ac1a179d3049c";

     

       247
       247
       +
               sha256 = "05pmlgwjynbr59bw50zhrklzhr5pgnij9ym5hqvijjrpw3qd9ivf";

     

       248
       248
       +
             };

     

       249
       249
       +
           }

     

       250
       250
       +
           {

     

       251
       251
       +
             root = "github.com/ugorji/go";

     

       252
       252
       +
             src = fetchFromGitHub {

     

       253
       253
       +
               owner = "ugorji";

     

       254
       254
       +
               repo = "go";

     

       255
       255
       +
               rev = "71c2886f5a673a35f909803f38ece5810165097b";

     

       256
       256
       +
               sha256 = "157f24xnkhclrjwwa1b7lmpj112ynlbf7g1cfw0c657iqny5720j";

     

       257
       257
       +
             };

     

       258
       258
       +
           }

     

       259
       259
       +
           {

     

       260
       260
       +
             root = "github.com/vmihailenco/msgpack";

     

       261
       261
       +
             src = fetchFromGitHub {

     

       262
       262
       +
               owner = "vmihailenco";

     

       263
       263
       +
               repo = "msgpack";

     

       264
       264
       +
               rev = "20c1b88a6c7fc5432037439f4e8c582e236fb205";

     

       265
       265
       +
               sha256 = "1dj5scpfhgnw0yrh0w6jlrb9d03halvsv4l3wgjhazrrimdqf0q0";

     

       266
       266
       +
             };

     

       267
       267
       +
           }

     

       268
       268
       +
           {

     

       269
       269
       +
             root = "github.com/ugorji/go-msgpack";

     

       270
       270
       +
             src = fetchFromGitHub {

     

       271
       271
       +
               owner = "ugorji";

     

       272
       272
       +
               repo = "go-msgpack";

     

       273
       273
       +
               rev = "75092644046c5e38257395b86ed26c702dc95b92";

     

       274
       274
       +
               sha256 = "1bmqi16bfiqw7qhb3d5hbh0dfzhx2bbq1g15nh2pxwxckwh80x98";

     

       275
       275
       +
             };

     

       276
       276
       +
           }

     

       277
       277
       +
           {

     

       278
       278
       +
             root = "launchpad.net/mgo";

     

       279
       279
       +
             src = fetchbzr {

     

       280
       280
       +
               url = "https://launchpad.net/mgo";

     

       281
       281
       +
               rev = "2";

     

       282
       282
       +
               sha256 = "0h1dxzyx5c4r4gfnmjxv92hlhjxrgx9p4g53p4fhmz6x2fdglb0x";

     

       283
       283
       +
             };

     

       284
       284
       +
           }

     

       285
       285
       +
           {

     

       286
       286
       +
             root = "github.com/vmihailenco/bufio";

     

       287
       287
       +
             src = fetchFromGitHub {

     

       288
       288
       +
               owner = "vmihailenco";

     

       289
       289
       +
               repo = "bufio";

     

       290
       290
       +
               rev = "24e7e48f60fc2d9e99e43c07485d9fff42051e66";

     

       291
       291
       +
               sha256 = "0x46qnf2f15v7m0j2dcb16raxjamk5rdc7hqwgyxfr1sqmmw3983";

     

       292
       292
       +
             };

     

       293
       293
       +
           }

     

       294
       294
       +
         ];

     

       295
       295
       +
       

     

       296
       296
       +
       in

     

       297
       297
       +
       

     

       298
       298
       +
       stdenv.mkDerivation rec {

     

       299
       299
       +
         name = "go-deps";

     

       300
       300
       +
       

     

       301
       301
       +
         buildCommand =

     

       302
       302
       +
           lib.concatStrings

     

       303
       303
       +
             (map (dep: ''

     

       304
       304
       +
                     mkdir -p $out/src/`dirname ${dep.root}`

     

       305
       305
       +
                     ln -s ${dep.src} $out/src/${dep.root}

     

       306
       306
       +
                   '') goDeps);

     

       307
       307
       +
       }

+2 -2

pkgs/development/tools/selenium/chromedriver/default.nix

···

       10
       10
        
         name = "chromedriver_linux64";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchurl {

     

       13
       13
       -
           url = "http://chromedriver.storage.googleapis.com/2.9/${name}.zip";

     

       14
       14
       -
           sha256 = "1m5xl5pz445igvhj31hby97xbizlw05b8fc6w53zq7faw7mzm665";

     

       13
       13
       +
           url = "http://chromedriver.storage.googleapis.com/2.10/${name}.zip";

     

       14
       14
       +
           sha256 = "1949lhrv4hrmgapvypsgwzyr75w7vpy7nkkkwjkjxn61dkwmx4jw";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         buildInputs = [ unzip makeWrapper ];

+2 -2

pkgs/development/web/nodejs/default.nix

···

       6
       6
        
           ln -sv /usr/sbin/dtrace $out/bin

     

       7
       7
        
         '';

     

       8
       8
        
       

     

       9
       9
       -
         version = "0.10.28";

     

       9
       9
       +
         version = "0.10.29";

     

       10
       10
        
       

     

       11
       11
        
         # !!! Should we also do shared libuv?

     

       12
       12
        
         deps = {

     
···

       30
       30
        
       

     

       31
       31
        
         src = fetchurl {

     

       32
       32
        
           url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz";

     

       33
       33
       -
           sha256 = "043pc6sb3y2b0aiakmmjvzvafgki7wly0id0v1p8y80g3r2cdpdb";

     

       33
       33
       +
           sha256 = "0pdib215ldypc149ad03wlfj0i8fwdfydd4q2hd7ry35yw0rsds7";

     

       34
       34
        
         };

     

       35
       35
        
       

     

       36
       36
        
         configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps);

+19

pkgs/games/0ad/data.nix

···

       1
       1
       +
       { stdenv, fetchurl, version, releaseType }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         name = "0ad-data-${version}";

     

       5
       5
       +
       

     

       6
       6
       +
         src = fetchurl {

     

       7
       7
       +
           url = "http://releases.wildfiregames.com/0ad-${version}-${releaseType}-unix-data.tar.xz";

     

       8
       8
       +
           sha256 = "0f16d41e81d7349fb16490f3abbfd38bcb3f2b89648355b2b281c5045ddafadc";

     

       9
       9
       +
         };

     

       10
       10
       +
       

     

       11
       11
       +
         patchPhase = ''

     

       12
       12
       +
           rm binaries/data/tools/fontbuilder/fonts/*.txt

     

       13
       13
       +
         '';

     

       14
       14
       +
       

     

       15
       15
       +
         installPhase = ''

     

       16
       16
       +
           mkdir -p $out/share/0ad

     

       17
       17
       +
           cp -r binaries/data/* $out/share/0ad/

     

       18
       18
       +
         '';

     

       19
       19
       +
       }

+120

pkgs/games/0ad/default.nix

···

       1
       1
       +
       { stdenv, stdenvType, callPackage, fetchurl, python27

     

       2
       2
       +
       , pkgconfig, spidermonkey_24, boost, icu, libxml2, libpng

     

       3
       3
       +
       , libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc

     

       4
       4
       +
       , openalSoft, mesa, xproto, libX11, libXcursor, nspr, SDL

     

       5
       5
       +
       , gloox, nvidia-texture-tools

     

       6
       6
       +
       , withEditor ? true, wxGTK ? null

     

       7
       7
       +
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       assert withEditor -> wxGTK != null;

     

       10
       10
       +
       

     

       11
       11
       +
       let

     

       12
       12
       +
         version = "0.0.16";

     

       13
       13
       +
       

     

       14
       14
       +
         releaseType = "alpha";

     

       15
       15
       +
       

     

       16
       16
       +
         zeroadData = callPackage ./data.nix { inherit version releaseType; };

     

       17
       17
       +
       

     

       18
       18
       +
         archForPremake =

     

       19
       19
       +
           if stdenv.lib.hasPrefix "x86_64-" stdenvType then "x64" else

     

       20
       20
       +
           if stdenv.lib.hasPrefix "i686-" stdenvType then "x32" else "ERROR";

     

       21
       21
       +
       

     

       22
       22
       +
       in

     

       23
       23
       +
       stdenv.mkDerivation rec {

     

       24
       24
       +
         name = "0ad-${version}";

     

       25
       25
       +
       

     

       26
       26
       +
         src = fetchurl {

     

       27
       27
       +
           url = "http://releases.wildfiregames.com/0ad-${version}-${releaseType}-unix-build.tar.xz";

     

       28
       28
       +
           sha256 = "cb965ef7e292bc3a2f1f598a9695e16ff4d786398f384a1ec7d5f9bfe2626de5";

     

       29
       29
       +
         };

     

       30
       30
       +
       

     

       31
       31
       +
         buildInputs = [

     

       32
       32
       +
           zeroadData python27 pkgconfig spidermonkey_24 boost icu

     

       33
       33
       +
           libxml2 libpng libjpeg zlib curl libogg libvorbis enet

     

       34
       34
       +
           miniupnpc openalSoft mesa xproto libX11 libXcursor nspr

     

       35
       35
       +
           SDL gloox nvidia-texture-tools

     

       36
       36
       +
         ] ++ stdenv.lib.optional withEditor wxGTK;

     

       37
       37
       +
       

     

       38
       38
       +
         NIX_CFLAGS_COMPILE = [

     

       39
       39
       +
           "-I${xproto}/include/X11"

     

       40
       40
       +
           "-I${libX11}/include/X11"

     

       41
       41
       +
           "-I${libXcursor}/include/X11"

     

       42
       42
       +
         ];

     

       43
       43
       +
       

     

       44
       44
       +
         configurePhase = ''

     

       45
       45
       +
           # Delete shipped libraries which we don't need.

     

       46
       46
       +
           rm -rf libraries/source/{enet,miniupnpc,nvtt,spidermonkey}

     

       47
       47
       +
       

     

       48
       48
       +
           # Build shipped premake.

     

       49
       49
       +
           make -C build/premake/premake4/build/gmake.unix

     

       50
       50
       +
       

     

       51
       51
       +
           # Run premake.

     

       52
       52
       +
           pushd build/premake

     

       53
       53
       +
           ./premake4/bin/release/premake4 \

     

       54
       54
       +
             --file="premake4.lua" \

     

       55
       55
       +
             --outpath="../workspaces/gcc/" \

     

       56
       56
       +
             --platform=${archForPremake} \

     

       57
       57
       +
             --os=linux \

     

       58
       58
       +
             --with-system-nvtt \

     

       59
       59
       +
             --with-system-enet \

     

       60
       60
       +
             --with-system-miniupnpc \

     

       61
       61
       +
             --with-system-mozjs24 \

     

       62
       62
       +
             ${ if withEditor then "--atlas" else "" } \

     

       63
       63
       +
             --collada \

     

       64
       64
       +
             --bindir="$out"/bin \

     

       65
       65
       +
             --libdir="$out"/lib/0ad \

     

       66
       66
       +
             --datadir="$out"/share/0ad \

     

       67
       67
       +
             gmake

     

       68
       68
       +
           popd

     

       69
       69
       +
         '';

     

       70
       70
       +
       

     

       71
       71
       +
         buildPhase = ''

     

       72
       72
       +
           # Build bundled fcollada.

     

       73
       73
       +
           make -C libraries/source/fcollada/src

     

       74
       74
       +
       

     

       75
       75
       +
           # Build 0ad.

     

       76
       76
       +
           make -C build/workspaces/gcc verbose=1

     

       77
       77
       +
         '';

     

       78
       78
       +
       

     

       79
       79
       +
         installPhase = ''

     

       80
       80
       +
           # Copy executables.

     

       81
       81
       +
           mkdir -p "$out"/bin

     

       82
       82
       +
           cp binaries/system/pyrogenesis "$out"/bin/

     

       83
       83
       +
           ((${ toString withEditor })) && cp binaries/system/ActorEditor "$out"/bin/

     

       84
       84
       +
       

     

       85
       85
       +
           # Copy l10n data.

     

       86
       86
       +
           mkdir -p "$out"/share/0ad

     

       87
       87
       +
           cp -r binaries/data/l10n "$out"/share/0ad/

     

       88
       88
       +
       

     

       89
       89
       +
           # Copy libraries.

     

       90
       90
       +
           mkdir -p "$out"/lib/0ad

     

       91
       91
       +
           cp binaries/system/libCollada.so "$out"/lib/0ad/

     

       92
       92
       +
           ((${ toString withEditor })) && cp binaries/system/libAtlasUI.so "$out"/lib/0ad/

     

       93
       93
       +
       

     

       94
       94
       +
           # Create links to data files.

     

       95
       95
       +
           ln -s -t "$out"/share/0ad "${zeroadData}"/share/0ad/*

     

       96
       96
       +
       

     

       97
       97
       +
           # Copy icon.

     

       98
       98
       +
           mkdir -p "$out"/share/icons

     

       99
       99
       +
           cp build/resources/0ad.png "$out"/share/icons/

     

       100
       100
       +
       

     

       101
       101
       +
           # Copy/fix desktop item.

     

       102
       102
       +
           mkdir -p "$out"/share/applications

     

       103
       103
       +
           while read LINE; do

     

       104
       104
       +
             if [[ $LINE = "Exec=0ad" ]]; then

     

       105
       105
       +
               echo "Exec=$out/bin/pyrogenesis"

     

       106
       106
       +
             elif [[ $LINE = "Icon=0ad" ]]; then

     

       107
       107
       +
               echo "Icon=$out/share/icons/0ad.png"

     

       108
       108
       +
             else

     

       109
       109
       +
               echo "$LINE"

     

       110
       110
       +
             fi

     

       111
       111
       +
           done <build/resources/0ad.desktop >"$out"/share/applications/0ad.desktop

     

       112
       112
       +
         '';

     

       113
       113
       +
       

     

       114
       114
       +
         meta = {

     

       115
       115
       +
           description = "A free, open-source game of ancient warfare";

     

       116
       116
       +
           homepage = "http://wildfiregames.com/0ad/";

     

       117
       117
       +
           license = [ "GPLv2" "LGPLv2.1" "MIT" "CC BY-SA 3.0" "zlib" ];

     

       118
       118
       +
           platforms = [ "x86_64-linux" "i686-linux" ];

     

       119
       119
       +
         };

     

       120
       120
       +
       }

+11 -7

pkgs/games/blobby/default.nix

···

       1
       1
       -
       {stdenv, fetchurl, SDL, SDL_image, mesa, cmake, physfs, boost, zip, zlib}:

     

       1
       1
       +
       {stdenv, fetchurl, SDL2, SDL2_image, mesa, cmake, physfs, boost, zip, zlib

     

       2
       2
       +
       , pkgconfig}:

     

       2
       3
        
       stdenv.mkDerivation rec {

     

       3
       3
       -
         version = "1.0-rc3";

     

       4
       4
       +
         version = "1.0";

     

       4
       5
        
         name = "blobby-volley-${version}";

     

       5
       6
        
       

     

       6
       7
        
         src = fetchurl {

     

       7
       7
       -
           url = "mirror://sourceforge/project/blobby/Blobby%20Volley%202%20%28Linux%29/1.0RC3/blobby2-linux-1.0rc3.tar.gz";

     

       8
       8
       -
           sha256 = "10f50b2ygw8cb9mp33wpdwv9p6lc10qlwc1xd44bbcby1d9v5ga5";

     

       8
       8
       +
           url = "http://softlayer-ams.dl.sourceforge.net/project/blobby/Blobby%20Volley%202%20%28Linux%29/1.0/blobby2-linux-1.0.tar.gz";

     

       9
       9
       +
           sha256 = "1qpmbdlyhfbrdsq4vkb6cb3b8mh27fpizb71q4a21ala56g08yms";

     

       9
       10
        
         };

     

       10
       11
        
       

     

       11
       11
       -
         buildInputs = [SDL SDL_image mesa cmake physfs boost zip zlib];

     

       12
       12
       +
         buildInputs = [SDL2 SDL2_image mesa cmake physfs boost zip zlib pkgconfig];

     

       12
       13
        
       

     

       13
       13
       -
         preConfigure = ''

     

       14
       14
       -
           sed -re '1i#include <cassert>' -i src/CrossCorrelation.h

     

       14
       14
       +
         preConfigure=''

     

       15
       15
       +
           sed -e '1i#include <iostream>' -i src/NetworkMessage.cpp

     

       15
       16
        
         '';

     

       16
       17
        
       

     

       17
       18
        
         meta = {

     
···

       19
       20
        
           license = with stdenv.lib.licenses; bsd3;

     

       20
       21
        
           platforms = with stdenv.lib.platforms; linux;

     

       21
       22
        
           maintainers = with stdenv.lib.maintainers; [raskin];

     

       23
       23
       +
           homepage = "http://blobby.sourceforge.net/";

     

       24
       24
       +
           downloadPage = "http://sourceforge.net/projects/blobby/files/Blobby%20Volley%202%20%28Linux%29/";

     

       25
       25
       +
           inherit version;

     

       22
       26
        
         };

     

       23
       27
        
       }

+8

pkgs/games/blobby/default.upstream

···

       1
       1
       +
       url http://sourceforge.net/projects/blobby/files/Blobby%20Volley%202%20%28Linux%29/

     

       2
       2
       +
       SF_version_dir

     

       3
       3
       +
       version_link '[.]tar[.][^.]+/download$'

     

       4
       4
       +
       SF_redirect

     

       5
       5
       +
       do_overwrite(){

     

       6
       6
       +
         do_overwrite_just_version

     

       7
       7
       +
         set_var_value url $CURRENT_URL

     

       8
       8
       +
       }

+1 -1

pkgs/games/dwarf-therapist/default.nix

···

       6
       6
        
       

     

       7
       7
        
         src = fetchhg {

     

       8
       8
        
           url = "https://code.google.com/r/splintermind-attributes/";

     

       9
       9
       -
           tag = rev;

     

       9
       9
       +
           inherit rev;

     

       10
       10
        
           sha256 = "0a9m967q6p2q3plrl6qysg1xrdmg65jzil6awjh2wr3g10x2x15z";

     

       11
       11
        
         };

     

       12
       12

+36

pkgs/games/openspades/default.nix

···

       1
       1
       +
       { stdenv, fetchurl, cmake, curl, glew, makeWrapper, mesa, SDL2,

     

       2
       2
       +
         SDL2_image, unzip, wget, zlib, withOpenal ? true, openal ? null }:

     

       3
       3
       +
       

     

       4
       4
       +
       assert withOpenal -> openal != null;

     

       5
       5
       +
       

     

       6
       6
       +
       stdenv.mkDerivation rec {

     

       7
       7
       +
         name = "openspades-${version}";

     

       8
       8
       +
         version = "0.0.12";

     

       9
       9
       +
       

     

       10
       10
       +
         src = fetchurl {

     

       11
       11
       +
           url = "https://github.com/yvt/openspades/archive/v${version}.tar.gz";

     

       12
       12
       +
           sha256 = "1aa848cck8qrp67ha9vrkzm3k24r2aiv1v4dxla6pi22rw98yxzm";

     

       13
       13
       +
         };

     

       14
       14
       +
       

     

       15
       15
       +
         nativeBuildInputs = 

     

       16
       16
       +
           with stdenv.lib;

     

       17
       17
       +
           [ cmake curl glew makeWrapper mesa SDL2 SDL2_image unzip wget zlib ]

     

       18
       18
       +
           ++ optional withOpenal openal;

     

       19
       19
       +
       

     

       20
       20
       +
         cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DOPENSPADES_INSTALL_BINARY=bin" ];

     

       21
       21
       +
       

     

       22
       22
       +
         # OpenAL is loaded dynamicly

     

       23
       23
       +
         postInstall = 

     

       24
       24
       +
           if withOpenal then ''

     

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

     

       26
       26
       +
               --prefix LD_LIBRARY_PATH : "${openal}/lib"

     

       27
       27
       +
           '' 

     

       28
       28
       +
           else null;

     

       29
       29
       +
       

     

       30
       30
       +
         meta = with stdenv.lib; {

     

       31
       31
       +
           description = "OpenSpades is a compatible client of Ace of Spades 0.75";

     

       32
       32
       +
           homepage    = "https://github.com/yvt/openspades/";

     

       33
       33
       +
           license     = licenses.gpl3;

     

       34
       34
       +
           platforms   = platforms.linux;

     

       35
       35
       +
         };

     

       36
       36
       +
       }

+1 -1

pkgs/games/opentyrian/default.nix

···

       6
       6
        
       

     

       7
       7
        
         src = fetchhg {

     

       8
       8
        
           url = "https://opentyrian.googlecode.com/hg/";

     

       9
       9
       -
           tag = "13ef8ce47362";

     

       9
       9
       +
           rev = "13ef8ce47362";

     

       10
       10
        
           md5 = "95c8f9e7ff3d4207f1c692c7cec6c9b0";

     

       11
       11
        
         };

     

       12
       12

+2 -3

pkgs/misc/emulators/wine/winetricks.nix

···

       2
       2
        
       , cabextract, unzip, p7zip, gnused, gnugrep, bash } :

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
       -
         rev = "1083";

     

       5
       5
       +
         rev = "1199";

     

       6
       6
        
         name = "winetricks-${rev}";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchsvn {

     

       9
       9
        
           url = "http://winetricks.googlecode.com/svn/trunk";

     

       10
       10
        
           inherit rev;

     

       11
       11
       -
           sha256 = "0zakwn7g2ni6xw92i1y3pngyaxsr93714s4jy11adf7rxdkj0a32";

     

       11
       11
       +
           sha256 = "1kji1n6ps09g8xnl9m7vqk3vkl03abzwnc43c52i8p0adnv06khb";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         buildInputs = [ perl which ];

     
···

       28
       28
        
           maintainers = with stdenv.lib.maintainers; [ the-kenny ];

     

       29
       29
        
         };

     

       30
       30
        
       }

     

       31
       31
       -

+17

pkgs/os-specific/linux/broadcom-sta/cfg80211_ibss_joined-channel-parameter.patch

···

       1
       1
       +
       Add channel parameter to cfg80211_ibss_joined call

     

       2
       2
       +
       

     

       3
       3
       +
       --- a/src/wl/sys/wl_cfg80211_hybrid.c

     

       4
       4
       +
       +++ b/src/wl/sys/wl_cfg80211_hybrid.c

     

       5
       5
       +
       @@ -1841,7 +1841,12 @@ wl_notify_connect_status(struct wl_cfg80211_priv *wl, struct net_device *ndev,

     

       6
       6
       +
        			wl_get_assoc_ies(wl);

     

       7
       7
       +
        			memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN);

     

       8
       8
       +
        			wl_update_bss_info(wl);

     

       9
       9
       +
       +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 15, 0)

     

       10
       10
       +
        			cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, GFP_KERNEL);

     

       11
       11
       +
       +#else

     

       12
       12
       +
       +			cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid,

     

       13
       13
       +
       +			                     &wl->conf->channel, GFP_KERNEL);

     

       14
       14
       +
       +#endif

     

       15
       15
       +
        			set_bit(WL_STATUS_CONNECTED, &wl->status);

     

       16
       16
       +
        			wl->profile->active = true;

     

       17
       17
       +
        		}

+1

pkgs/os-specific/linux/broadcom-sta/default.nix

···

       19
       19
        
         patches = [

     

       20
       20
        
           ./linux-recent.patch

     

       21
       21
        
           ./license.patch

     

       22
       22
       +
           ./cfg80211_ibss_joined-channel-parameter.patch

     

       22
       23
        
         ];

     

       23
       24
        
       

     

       24
       25
        
         makeFlags = "KBASE=${kernel.dev}/lib/modules/${kernel.modDirVersion}";

+25

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

···

       1
       1
       +
       { stdenv, lib, fetchurl }:

     

       2
       2
       +
       

     

       3
       3
       +
       let version = "0.7";

     

       4
       4
       +
       in stdenv.mkDerivation {

     

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

     

       6
       6
       +
         src = fetchurl {

     

       7
       7
       +
           url = "http://iomelt.com/s/iomelt-${version}.tar.gz";

     

       8
       8
       +
           sha256 = "1jhrdm5b7f1bcbrdwcc4yzg26790jxl4d2ndqiwd9brl2g5537im";

     

       9
       9
       +
         };

     

       10
       10
       +
       

     

       11
       11
       +
         preBuild = ''

     

       12
       12
       +
           ensureDir $out/bin

     

       13
       13
       +
           ensureDir $out/share/man/man1

     

       14
       14
       +
       

     

       15
       15
       +
           substituteInPlace Makefile \

     

       16
       16
       +
             --replace /usr $out

     

       17
       17
       +
         '';

     

       18
       18
       +
       

     

       19
       19
       +
         meta = with lib; {

     

       20
       20
       +
           description = "A simple yet effective way to benchmark disk IO in Linux systems";

     

       21
       21
       +
           homepage    = http://www.iomelt.com;

     

       22
       22
       +
           maintainers = with maintainers; [ cstrahan ];

     

       23
       23
       +
           platforms   = platforms.linux ++ platforms.darwin;

     

       24
       24
       +
         };

     

       25
       25
       +
       }

+30 -30

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

···

       78
       78
        
         CLS_U32_MARK y

     

       79
       79
        
       

     

       80
       80
        
         # Wireless networking.

     

       81
       81
       -
         CFG80211_WEXT y # Without it, ipw2200 drivers don't build

     

       82
       82
       -
         IPW2100_MONITOR y # support promiscuous mode

     

       83
       83
       -
         IPW2200_MONITOR y # support promiscuous mode

     

       84
       84
       -
         HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver

     

       85
       85
       -
         HOSTAP_FIRMWARE_NVRAM y

     

       86
       86
       -
         ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus

     

       87
       87
       -
         ATH9K_AHB y # Ditto, AHB bus

     

       81
       81
       +
         CFG80211_WEXT? y # Without it, ipw2200 drivers don't build

     

       82
       82
       +
         IPW2100_MONITOR? y # support promiscuous mode

     

       83
       83
       +
         IPW2200_MONITOR? y # support promiscuous mode

     

       84
       84
       +
         HOSTAP_FIRMWARE? y # Support downloading firmware images with Host AP driver

     

       85
       85
       +
         HOSTAP_FIRMWARE_NVRAM? y

     

       86
       86
       +
         ATH9K_PCI? y # Detect Atheros AR9xxx cards on PCI(e) bus

     

       87
       87
       +
         ATH9K_AHB? y # Ditto, AHB bus

     

       88
       88
        
         ${optionalString (versionAtLeast version "3.2") ''

     

       89
       89
       -
           B43_PHY_HT y

     

       89
       89
       +
           B43_PHY_HT? y

     

       90
       90
        
         ''}

     

       91
       91
       -
         BCMA_HOST_PCI y

     

       91
       91
       +
         BCMA_HOST_PCI? y

     

       92
       92
        
       

     

       93
       93
        
         # Enable various FB devices.

     

       94
       94
        
         FB y

     
···

       110
       110
        
         # Enable KMS for devices whose X.org driver supports it.

     

       111
       111
        
         DRM_I915_KMS y

     

       112
       112
        
         ${optionalString (versionOlder version "3.9") ''

     

       113
       113
       -
           DRM_RADEON_KMS y

     

       113
       113
       +
           DRM_RADEON_KMS? y

     

       114
       114
        
         ''}

     

       115
       115
        
         # Hybrid graphics support

     

       116
       116
        
         VGA_SWITCHEROO y

     
···

       145
       145
        
         EXT2_FS_XIP y # Ext2 execute in place support

     

       146
       146
        
         EXT4_FS_POSIX_ACL y

     

       147
       147
        
         EXT4_FS_SECURITY y

     

       148
       148
       -
         REISERFS_FS_XATTR y

     

       149
       149
       -
         REISERFS_FS_POSIX_ACL y

     

       150
       150
       -
         REISERFS_FS_SECURITY y

     

       151
       151
       -
         JFS_POSIX_ACL y

     

       152
       152
       -
         JFS_SECURITY y

     

       153
       153
       -
         XFS_QUOTA y

     

       154
       154
       -
         XFS_POSIX_ACL y

     

       155
       155
       -
         XFS_RT y # XFS Realtime subvolume support

     

       156
       156
       -
         OCFS2_DEBUG_MASKLOG n

     

       148
       148
       +
         REISERFS_FS_XATTR? y

     

       149
       149
       +
         REISERFS_FS_POSIX_ACL? y

     

       150
       150
       +
         REISERFS_FS_SECURITY? y

     

       151
       151
       +
         JFS_POSIX_ACL? y

     

       152
       152
       +
         JFS_SECURITY? y

     

       153
       153
       +
         XFS_QUOTA? y

     

       154
       154
       +
         XFS_POSIX_ACL? y

     

       155
       155
       +
         XFS_RT? y # XFS Realtime subvolume support

     

       156
       156
       +
         OCFS2_DEBUG_MASKLOG? n

     

       157
       157
        
         BTRFS_FS_POSIX_ACL y

     

       158
       158
        
         UBIFS_FS_XATTR? y

     

       159
       159
       -
         UBIFS_FS_ADVANCED_COMPR y

     

       159
       159
       +
         UBIFS_FS_ADVANCED_COMPR? y

     

       160
       160
        
         NFSD_V2_ACL y

     

       161
       161
        
         NFSD_V3 y

     

       162
       162
        
         NFSD_V3_ACL y

     
···

       192
       192
        
         ${optionalString (versionAtLeast version "3.3" && versionOlder version "3.13") ''

     

       193
       193
        
           AUDIT_LOGINUID_IMMUTABLE y

     

       194
       194
        
         ''}

     

       195
       195
       -
         B43_PCMCIA y

     

       195
       195
       +
         B43_PCMCIA? y

     

       196
       196
        
         BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support

     

       197
       197
        
         BLK_DEV_IDEACPI y # IDE ACPI support

     

       198
       198
        
         BLK_DEV_INTEGRITY y

     

       199
       199
        
         BSD_PROCESS_ACCT_V3 y

     

       200
       200
       -
         BT_HCIUART_BCSP y

     

       201
       201
       -
         BT_HCIUART_H4 y # UART (H4) protocol support

     

       202
       202
       -
         BT_HCIUART_LL y

     

       200
       200
       +
         BT_HCIUART_BCSP? y

     

       201
       201
       +
         BT_HCIUART_H4? y # UART (H4) protocol support

     

       202
       202
       +
         BT_HCIUART_LL? y

     

       203
       203
        
         BT_RFCOMM_TTY? y # RFCOMM TTY support

     

       204
       204
        
         CRASH_DUMP? n

     

       205
       205
        
         ${optionalString (versionOlder version "3.1") ''

     
···

       213
       213
        
         FUSION y # Fusion MPT device support

     

       214
       214
        
         IDE_GD_ATAPI y # ATAPI floppy support

     

       215
       215
        
         IRDA_ULTRA y # Ultra (connectionless) protocol

     

       216
       216
       -
         JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels

     

       217
       217
       -
         JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels

     

       218
       218
       -
         JOYSTICK_XPAD_FF y # X-Box gamepad rumble support

     

       219
       219
       -
         JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED

     

       216
       216
       +
         JOYSTICK_IFORCE_232? y # I-Force Serial joysticks and wheels

     

       217
       217
       +
         JOYSTICK_IFORCE_USB? y # I-Force USB joysticks and wheels

     

       218
       218
       +
         JOYSTICK_XPAD_FF? y # X-Box gamepad rumble support

     

       219
       219
       +
         JOYSTICK_XPAD_LEDS? y # LED Support for Xbox360 controller 'BigX' LED

     

       220
       220
        
         LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support

     

       221
       221
        
         LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger

     

       222
       222
        
         LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback

     
···

       315
       315
        
         ''}

     

       316
       316
        
       

     

       317
       317
        
         # Enable the 9P cache to speed up NixOS VM tests.

     

       318
       318
       -
         9P_FSCACHE y

     

       319
       319
       -
         9P_FS_POSIX_ACL y

     

       318
       318
       +
         9P_FSCACHE? y

     

       319
       319
       +
         9P_FS_POSIX_ACL? y

     

       320
       320
        
       

     

       321
       321
        
         # Enable transparent support for huge pages.

     

       322
       322
        
         TRANSPARENT_HUGEPAGE? y

+2

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

···

       95
       95
        
           '';

     

       96
       96
        
       

     

       97
       97
        
           installPhase = "mv .config $out";

     

       98
       98
       +
       

     

       99
       99
       +
           enableParallelBuilding = true;

     

       98
       100
        
         };

     

       99
       101
        
       

     

       100
       102
        
         kernel = buildLinux {

+2 -2

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

···

       1
       1
        
       { stdenv, fetchurl, ... } @ args:

     

       2
       2
        
       

     

       3
       3
        
       import ./generic.nix (args // rec {

     

       4
       4
       -
         version = "3.10.44";

     

       4
       4
       +
         version = "3.10.45";

     

       5
       5
        
         extraMeta.branch = "3.10";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";

     

       9
       9
       -
           sha256 = "06brvvxkgx4im4jzyl08y8hifgqb8ndxlhdkczwlqx3cgs6769c0";

     

       9
       9
       +
           sha256 = "0bsmqszc86d33g6qpwgrdckgrd1x37087br3vsc5151s2p22rk1f";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         features.iwlwifi = true;

+2 -2

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

···

       1
       1
        
       { stdenv, fetchurl, ... } @ args:

     

       2
       2
        
       

     

       3
       3
        
       import ./generic.nix (args // rec {

     

       4
       4
       -
         version = "3.12.22";

     

       4
       4
       +
         version = "3.12.23";

     

       5
       5
        
         extraMeta.branch = "3.12";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";

     

       9
       9
       -
           sha256 = "0c9rw11iihjimqb6mdmwn4q67ds7jg4qibj5ijj5pdmkdqzj7g54";

     

       9
       9
       +
           sha256 = "0aa9vnyk4p6hg4fp4rm4a95cn4p16j2dfrhc3cfznpcdkpi5q9m7";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         features.iwlwifi = true;

-17

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

···

       1
       1
       -
       { stdenv, fetchurl, ... } @ args:

     

       2
       2
       -
       

     

       3
       3
       -
       import ./generic.nix (args // rec {

     

       4
       4
       -
         version = "3.13.11";

     

       5
       5
       -
         extraMeta.branch = "3.13";

     

       6
       6
       -
       

     

       7
       7
       -
         src = fetchurl {

     

       8
       8
       -
           url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";

     

       9
       9
       -
           sha256 = "1nhi5m0nnrb7v2gqpa3181p32k5hm5jwkf647vs80r14750gxlpw";

     

       10
       10
       -
         };

     

       11
       11
       -
       

     

       12
       12
       -
         features.iwlwifi = true;

     

       13
       13
       -
         features.efiBootStub = true;

     

       14
       14
       -
         features.needsCifsUtils = true;

     

       15
       15
       -
         features.canDisableNetfilterConntrackHelpers = true;

     

       16
       16
       -
         features.netfilterRPFilter = true;

     

       17
       17
       -
       } // (args.argsOverride or {}))

+2 -2

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

···

       1
       1
        
       { stdenv, fetchurl, ... } @ args:

     

       2
       2
        
       

     

       3
       3
        
       import ./generic.nix (args // rec {

     

       4
       4
       -
         version = "3.14.8";

     

       4
       4
       +
         version = "3.14.9";

     

       5
       5
        
         extraMeta.branch = "3.14";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";

     

       9
       9
       -
           sha256 = "0l2k7c8i3vzcs8mwdy3h1yzlqli6vr56wbn6bxp4nyvxkwxlhs5d";

     

       9
       9
       +
           sha256 = "0rm68hzkxzzh6a1nw6fsxbg43d4b88957ail7b9ga589cagf3p94";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         features.iwlwifi = true;

+2 -2

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

···

       1
       1
        
       { stdenv, fetchurl, ... } @ args:

     

       2
       2
        
       

     

       3
       3
        
       import ./generic.nix (args // rec {

     

       4
       4
       -
         version = "3.15.1";

     

       4
       4
       +
         version = "3.15.2";

     

       5
       5
        
         extraMeta.branch = "3.15";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";

     

       9
       9
       -
           sha256 = "0bmzag945bb9v20xc2f6i4syx456prai3qj5cxhm8cb76wby4s8b";

     

       9
       9
       +
           sha256 = "09nq8q84xn6lwzdnn36pzfiqhn1lapi60yxn4hifb7v9ymhc5sv6";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         features.iwlwifi = true;

+2 -2

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

···

       1
       1
        
       { stdenv, fetchurl, ... } @ args:

     

       2
       2
        
       

     

       3
       3
        
       import ./generic.nix (args // rec {

     

       4
       4
       -
         version = "3.4.94";

     

       4
       4
       +
         version = "3.4.95";

     

       5
       5
        
         extraMeta.branch = "3.4";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";

     

       9
       9
       -
           sha256 = "0kc1s38zij39z8mrk9x29wizhbn4i7c7gyd796s1ib4826p3k48k";

     

       9
       9
       +
           sha256 = "1rv2jsfc2m12nk293v12rvvqnicyh73pwp6bcb28jdqdhm95k6l6";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         kernelPatches = args.kernelPatches ++

+3 -3

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

···

       2
       2
        
       

     

       3
       3
        
       import ./generic.nix (args // rec {

     

       4
       4
        
         # Reason to add:  RTL8192EE

     

       5
       5
       -
         version = "3.16-rc2";

     

       6
       6
       -
         modDirVersion = "3.16.0-rc2";

     

       5
       5
       +
         version = "3.16-rc3";

     

       6
       6
       +
         modDirVersion = "3.16.0-rc3";

     

       7
       7
        
         extraMeta.branch = "3.16";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchurl {

     

       10
       10
        
           url = "mirror://kernel/linux/kernel/v3.x/testing/linux-${version}.tar.xz";

     

       11
       11
       -
           sha256 = "12bxf62qqsf471ak6rj4gbvvjsybsamgwj9p8bphr98dp14js27w";

     

       11
       11
       +
           sha256 = "17jgv1hnx2im68f8721x11yfg8mpas7lsxg0j00qxv2fc6km2glm";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         features.iwlwifi = true;

+6 -6

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

···

       60
       60
        
         };

     

       61
       61
        
       

     

       62
       62
        
         grsecurity_stable = grsecPatch

     

       63
       63
       -
           { kversion  = "3.14.8";

     

       64
       64
       -
             revision  = "201406222110";

     

       63
       63
       +
           { kversion  = "3.14.9";

     

       64
       64
       +
             revision  = "201406262057";

     

       65
       65
        
             branch    = "stable";

     

       66
       66
       -
             sha256    = "0jar710hqpjkp4g3ldrbcpgc170v9qp8ykajq5fi8mxx4j54gjwa";

     

       66
       66
       +
             sha256    = "0rrcmlaz69028fwl45xnif1dc9wnl7lnrry1280mdg764wrc6g0n";

     

       67
       67
        
           };

     

       68
       68
        
       

     

       69
       69
        
         grsecurity_unstable = grsecPatch

     

       70
       70
       -
           { kversion  = "3.15.1";

     

       71
       71
       -
             revision  = "201406222112";

     

       70
       70
       +
           { kversion  = "3.15.2";

     

       71
       71
       +
             revision  = "201406262058";

     

       72
       72
        
             branch    = "test";

     

       73
       73
       -
             sha256    = "04sbpmzgfgn7hjiln9baynpgr7k67lm0b5wn2z8i2jsjigfmv0r4";

     

       73
       73
       +
             sha256    = "02r9xasg1hiw3bynwh50r9cqjzwffmhsyg4gmiyzs58izivl1hvd";

     

       74
       74
        
           };

     

       75
       75
        
       

     

       76
       76
        
         grsec_fix_path =

+10 -11

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

···

       1
       1
        
       { stdenv, fetchurl, gnumake, file }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "keyutils-1.5.8";

     

       4
       4
       +
         name = "keyutils-1.5.9";

     

       5
       5
        
         

     

       6
       6
        
         src = fetchurl {

     

       7
       7
        
           url = "http://people.redhat.com/dhowells/keyutils/${name}.tar.bz2";

     

       8
       8
       -
           sha256 = "17419fr7mph8wlhxpqb1bdrghz0db15bmjdgxg1anfgbf9ra6zbc";

     

       8
       8
       +
           sha256 = "1bl3w03ygxhc0hz69klfdlwqn33jvzxl1zfl2jmnb2v85iawb8jd";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
        
         buildInputs = [ file ];

     

       12
       12
        
       

     

       13
       13
        
         patchPhase = ''

     

       14
       14
       -
           sed -i -e "s,/usr/bin/make,${gnumake}/bin/make," \

     

       15
       15
       -
               -e "s, /etc, $out/etc," \

     

       16
       16
       -
               -e "s, /bin, $out/bin," \

     

       17
       17
       -
               -e "s, /sbin, $out/sbin," \

     

       18
       18
       -
               -e "s, /lib, $out/lib," \

     

       19
       19
       -
               -e "s, /lib64, $out/lib64," \

     

       20
       20
       -
               -e "s,/usr,$out," \

     

       14
       14
       +
           sed -i -e "s, /usr/bin/make, ${gnumake}/bin/make," \

     

       15
       15
       +
               -e "s, /usr, ," \

     

       16
       16
       +
               -e "s,\$(LNS) \$(LIBDIR)/\$(SONAME),\$(LNS) \$(SONAME)," \

     

       21
       17
        
               Makefile

     

       22
       18
        
         '';

     

       19
       19
       +
       

     

       20
       20
       +
         installPhase = "make install DESTDIR=$out";

     

       23
       21
        
         

     

       24
       24
       -
         meta = {

     

       22
       22
       +
         meta = with stdenv.lib; {

     

       25
       23
        
           homepage = http://people.redhat.com/dhowells/keyutils/;

     

       26
       24
        
           description = "Tools used to control the Linux kernel key management system";

     

       27
       27
       -
           license = "GPLv2+";

     

       25
       25
       +
           license = licenses.gpl2Plus;

     

       26
       26
       +
           platforms = platforms.linux;

     

       28
       27
        
         };

     

       29
       28
        
       }

+22 -10

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

···

       1
       1
        
       { stdenv, fetchurl, nasm, perl, libuuid }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "syslinux-4.07";

     

       4
       4
       +
         name = "syslinux-6.02";

     

       5
       5
        
       

     

       6
       6
        
         src = fetchurl {

     

       7
       7
       -
           url = "mirror://kernel/linux/utils/boot/syslinux/4.xx/${name}.tar.bz2";

     

       8
       8
       -
           sha256 = "0nm0lx45h4c5nxnsr538bvryzvqvj1p1p4vqxzd8nlcv47ja8h0j";

     

       7
       7
       +
           url = "mirror://kernel/linux/utils/boot/syslinux/${name}.tar.xz";

     

       8
       8
       +
           sha256 = "0y2ld2s64s6vc5pf8rj36w71rq2cfax3c1iafp0w1qbjpxy1p8xg";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
        
         patches = [ ./perl-deps.patch ];

     
···

       14
       14
        
       

     

       15
       15
        
         enableParallelBuilding = true;

     

       16
       16
        
       

     

       17
       17
       -
         preBuild =

     

       18
       18
       -
           ''

     

       19
       19
       -
             substituteInPlace gpxe/src/Makefile.housekeeping --replace /bin/echo $(type -P echo)

     

       20
       20
       -
             substituteInPlace gpxe/src/Makefile --replace /usr/bin/perl $(type -P perl)

     

       21
       21
       -
             makeFlagsArray=(BINDIR=$out/bin SBINDIR=$out/sbin LIBDIR=$out/lib INCDIR=$out/include DATADIR=$out/share MANDIR=$out/share/man PERL=perl)

     

       22
       22
       -
           '';

     

       17
       17
       +
         preBuild = ''

     

       18
       18
       +
           substituteInPlace Makefile --replace /bin/pwd $(type -P pwd)

     

       19
       19
       +
           substituteInPlace gpxe/src/Makefile.housekeeping --replace /bin/echo $(type -P echo)

     

       20
       20
       +
           substituteInPlace gpxe/src/Makefile --replace /usr/bin/perl $(type -P perl)

     

       21
       21
       +
         '';

     

       23
       22
        
       

     

       24
       24
       -
         meta = {

     

       23
       23
       +
         makeFlags = [

     

       24
       24
       +
           "BINDIR=$(out)/bin"

     

       25
       25
       +
           "SBINDIR=$(out)/sbin"

     

       26
       26
       +
           "LIBDIR=$(out)/lib"

     

       27
       27
       +
           "INCDIR=$(out)/include"

     

       28
       28
       +
           "DATADIR=$(out)/share"

     

       29
       29
       +
           "MANDIR=$(out)/share/man"

     

       30
       30
       +
           "PERL=perl"

     

       31
       31
       +
           "bios"

     

       32
       32
       +
         ];

     

       33
       33
       +
       

     

       34
       34
       +
         meta = with stdenv.lib; {

     

       25
       35
        
           homepage = http://www.syslinux.org/;

     

       26
       36
        
           description = "A lightweight bootloader";

     

       37
       37
       +
           license = licenses.gpl2;

     

       38
       38
       +
           platforms = platforms.linux;

     

       27
       39
        
         };

     

       28
       40
        
       }

+30

pkgs/servers/etcd/default.nix

···

       1
       1
       +
       { stdenv, lib, go, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         version = "0.4.3";

     

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

     

       6
       6
       +
       

     

       7
       7
       +
         src = import ./deps.nix {

     

       8
       8
       +
           inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub;

     

       9
       9
       +
         };

     

       10
       10
       +
       

     

       11
       11
       +
         buildInputs = [ go ];

     

       12
       12
       +
       

     

       13
       13
       +
         buildPhase = ''

     

       14
       14
       +
           export GOPATH=$src

     

       15
       15
       +
           go build -v -o etcd github.com/coreos/etcd

     

       16
       16
       +
         '';

     

       17
       17
       +
       

     

       18
       18
       +
         installPhase = ''

     

       19
       19
       +
           ensureDir $out/bin

     

       20
       20
       +
           mv etcd $out/bin/etcd

     

       21
       21
       +
         '';

     

       22
       22
       +
       

     

       23
       23
       +
         meta = with stdenv.lib; {

     

       24
       24
       +
           description = "A highly-available key value store for shared configuration and service discovery";

     

       25
       25
       +
           homepage = http://coreos.com/using-coreos/etcd/;

     

       26
       26
       +
           license = licenses.asl20;

     

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

     

       28
       28
       +
           platforms = platforms.unix;

     

       29
       29
       +
         };

     

       30
       30
       +
       }

+54

pkgs/servers/etcd/deps.nix

···

       1
       1
       +
       { stdenv, lib, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }:

     

       2
       2
       +
       

     

       3
       3
       +
       let

     

       4
       4
       +
         goDeps = [

     

       5
       5
       +
           {

     

       6
       6
       +
             root = "github.com/coreos/etcd";

     

       7
       7
       +
             src = fetchFromGitHub {

     

       8
       8
       +
               owner = "coreos";

     

       9
       9
       +
               repo = "etcd";

     

       10
       10
       +
               rev = "9970141f76241c909977af7bafe7b6f2c4923de8";

     

       11
       11
       +
               sha256 = "1bva46gfy4rkfw8k8pb3lsfzfg16csds01f0nvfrkh99pr7sp0sy";

     

       12
       12
       +
             };

     

       13
       13
       +
           }

     

       14
       14
       +
           {

     

       15
       15
       +
             root = "github.com/stathat/go";

     

       16
       16
       +
             src = fetchFromGitHub {

     

       17
       17
       +
               owner = "stathat";

     

       18
       18
       +
               repo = "go";

     

       19
       19
       +
               rev = "01d012b9ee2ecc107cb28b6dd32d9019ed5c1d77";

     

       20
       20
       +
               sha256 = "0mrn70wjfcs4rfkmga3hbfqmbjk33skcsc8pyqxp02bzpwdpc4bi";

     

       21
       21
       +
             };

     

       22
       22
       +
           }

     

       23
       23
       +
           {

     

       24
       24
       +
             root = "github.com/stretchr/objx";

     

       25
       25
       +
             src = fetchFromGitHub {

     

       26
       26
       +
               owner = "stretchr";

     

       27
       27
       +
               repo = "objx";

     

       28
       28
       +
               rev = "cbeaeb16a013161a98496fad62933b1d21786672";

     

       29
       29
       +
               sha256 = "1xn7iibjik77h6h0jilfvcjkkzaqz45baf44p3rb2i03hbmkqkp1";

     

       30
       30
       +
             };

     

       31
       31
       +
           }

     

       32
       32
       +
           {

     

       33
       33
       +
             root = "github.com/stretchr/testify";

     

       34
       34
       +
             src = fetchFromGitHub {

     

       35
       35
       +
               owner = "stretchr";

     

       36
       36
       +
               repo = "testify";

     

       37
       37
       +
               rev = "3e03dde72495487a4deb74152ac205d0619fbc8d";

     

       38
       38
       +
               sha256 = "1xd9sbi6y68cfwkxgybcz0dbfx4r6jmxq51wjj6six3wm9p7m8ls";

     

       39
       39
       +
             };

     

       40
       40
       +
           }

     

       41
       41
       +
         ];

     

       42
       42
       +
       

     

       43
       43
       +
       in

     

       44
       44
       +
       

     

       45
       45
       +
       stdenv.mkDerivation rec {

     

       46
       46
       +
         name = "go-deps";

     

       47
       47
       +
       

     

       48
       48
       +
         buildCommand =

     

       49
       49
       +
           lib.concatStrings

     

       50
       50
       +
             (map (dep: ''

     

       51
       51
       +
                     mkdir -p $out/src/`dirname ${dep.root}`

     

       52
       52
       +
                     ln -s ${dep.src} $out/src/${dep.root}

     

       53
       53
       +
                   '') goDeps);

     

       54
       54
       +
       }

+30

pkgs/servers/fleet/default.nix

···

       1
       1
       +
       { stdenv, lib, go, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         version = "0.5.0";

     

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

     

       6
       6
       +
       

     

       7
       7
       +
         src = import ./deps.nix {

     

       8
       8
       +
           inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub;

     

       9
       9
       +
         };

     

       10
       10
       +
       

     

       11
       11
       +
         buildInputs = [ go ];

     

       12
       12
       +
       

     

       13
       13
       +
         buildPhase = ''

     

       14
       14
       +
           export GOPATH=$src

     

       15
       15
       +
           go build -v -o fleet github.com/coreos/fleet

     

       16
       16
       +
         '';

     

       17
       17
       +
       

     

       18
       18
       +
         installPhase = ''

     

       19
       19
       +
           ensureDir $out/bin

     

       20
       20
       +
           mv fleet $out/bin

     

       21
       21
       +
         '';

     

       22
       22
       +
       

     

       23
       23
       +
         meta = with stdenv.lib; {

     

       24
       24
       +
           description = "A distributed init system";

     

       25
       25
       +
           homepage = http://coreos.com/using-coreos/clustering/;

     

       26
       26
       +
           license = licenses.asl20;

     

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

     

       28
       28
       +
           platforms = platforms.unix;

     

       29
       29
       +
         };

     

       30
       30
       +
       }

+81

pkgs/servers/fleet/deps.nix

···

       1
       1
       +
       { stdenv, lib, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }:

     

       2
       2
       +
       

     

       3
       3
       +
       let

     

       4
       4
       +
         goDeps = [

     

       5
       5
       +
           {

     

       6
       6
       +
             root = "code.google.com/p/gogoprotobuf";

     

       7
       7
       +
             src = fetchgit {

     

       8
       8
       +
               url = "https://code.google.com/p/gogoprotobuf";

     

       9
       9
       +
               rev = "7fd1620f09261338b6b1ca1289ace83aee0ec946";

     

       10
       10
       +
               sha256 = "0f13y29zpxkv7b7kwnszygvg04fd5m9r8vpkl1wa3gxnc6az54i9";

     

       11
       11
       +
             };

     

       12
       12
       +
           }

     

       13
       13
       +
           {

     

       14
       14
       +
             root = "github.com/coreos/etcd";

     

       15
       15
       +
             src = fetchFromGitHub {

     

       16
       16
       +
               owner = "coreos";

     

       17
       17
       +
               repo = "etcd";

     

       18
       18
       +
               rev = "1359d29fa451b059bb76b51260610d92853e7316";

     

       19
       19
       +
               sha256 = "0iz3vmf3nfp1i5r8al207wm0jvj68i47a814w90b1jl8g4f2amp7";

     

       20
       20
       +
             };

     

       21
       21
       +
           }

     

       22
       22
       +
           {

     

       23
       23
       +
             root = "github.com/coreos/fleet";

     

       24
       24
       +
             src = fetchFromGitHub {

     

       25
       25
       +
               owner = "coreos";

     

       26
       26
       +
               repo = "fleet";

     

       27
       27
       +
               rev = "da0a02ed3b07d83b0b542dcdee56e08d2457ab9c";

     

       28
       28
       +
               sha256 = "0b8aq4ppyv1fjvf3f2qjq80mvjvf9r104bf4048wgsrs0pccs6s8";

     

       29
       29
       +
             };

     

       30
       30
       +
           }

     

       31
       31
       +
           {

     

       32
       32
       +
             root = "github.com/coreos/raft";

     

       33
       33
       +
             src = fetchFromGitHub {

     

       34
       34
       +
               owner = "coreos";

     

       35
       35
       +
               repo = "raft";

     

       36
       36
       +
               rev = "67dca7288f1665b59860421673d46314f4348e45";

     

       37
       37
       +
               sha256 = "1l27kjkwcxgx89d2m537plagbp1wh6qlzxirza6lliblrgxry6mw";

     

       38
       38
       +
             };

     

       39
       39
       +
           }

     

       40
       40
       +
           {

     

       41
       41
       +
             root = "github.com/stathat/go";

     

       42
       42
       +
             src = fetchFromGitHub {

     

       43
       43
       +
               owner = "stathat";

     

       44
       44
       +
               repo = "go";

     

       45
       45
       +
               rev = "01d012b9ee2ecc107cb28b6dd32d9019ed5c1d77";

     

       46
       46
       +
               sha256 = "0mrn70wjfcs4rfkmga3hbfqmbjk33skcsc8pyqxp02bzpwdpc4bi";

     

       47
       47
       +
             };

     

       48
       48
       +
           }

     

       49
       49
       +
           {

     

       50
       50
       +
             root = "github.com/stretchr/objx";

     

       51
       51
       +
             src = fetchFromGitHub {

     

       52
       52
       +
               owner = "stretchr";

     

       53
       53
       +
               repo = "objx";

     

       54
       54
       +
               rev = "cbeaeb16a013161a98496fad62933b1d21786672";

     

       55
       55
       +
               sha256 = "1xn7iibjik77h6h0jilfvcjkkzaqz45baf44p3rb2i03hbmkqkp1";

     

       56
       56
       +
             };

     

       57
       57
       +
           }

     

       58
       58
       +
           {

     

       59
       59
       +
             root = "github.com/stretchr/testify";

     

       60
       60
       +
             src = fetchFromGitHub {

     

       61
       61
       +
               owner = "stretchr";

     

       62
       62
       +
               repo = "testify";

     

       63
       63
       +
               rev = "3e03dde72495487a4deb74152ac205d0619fbc8d";

     

       64
       64
       +
               sha256 = "1xd9sbi6y68cfwkxgybcz0dbfx4r6jmxq51wjj6six3wm9p7m8ls";

     

       65
       65
       +
             };

     

       66
       66
       +
           }

     

       67
       67
       +
         ];

     

       68
       68
       +
       

     

       69
       69
       +
       in

     

       70
       70
       +
       

     

       71
       71
       +
       stdenv.mkDerivation rec {

     

       72
       72
       +
         name = "go-deps";

     

       73
       73
       +
       

     

       74
       74
       +
         buildCommand =

     

       75
       75
       +
           lib.concatStrings

     

       76
       76
       +
             (map (dep: ''

     

       77
       77
       +
                     mkdir -p $out/src/`dirname ${dep.root}`

     

       78
       78
       +
                     ln -s ${dep.src} $out/src/${dep.root}

     

       79
       79
       +
                   '') goDeps);

     

       80
       80
       +
       }

     

       81
       81
       +

+61

pkgs/servers/http/nix-binary-cache/default.nix

···

       1
       1
       +
       {stdenv, fetchurl

     

       2
       2
       +
       , coreutils, findutils, nix, xz, bzip2, gnused, gnugrep, openssl

     

       3
       3
       +
       , lighttpd, iproute }:

     

       4
       4
       +
       stdenv.mkDerivation rec {

     

       5
       5
       +
         version = "2014-06-29-1";

     

       6
       6
       +
         name = "nix-binary-cache-${version}";

     

       7
       7
       +
       

     

       8
       8
       +
         phases = ["installPhase"];

     

       9
       9
       +
       

     

       10
       10
       +
         installPhase = ''

     

       11
       11
       +
           mkdir -p "$out/bin"

     

       12
       12
       +
           substitute "${./nix-binary-cache.cgi.in}" "$out"/bin/nix-binary-cache.cgi \

     

       13
       13
       +
             --replace @out@ "$out/bin" \

     

       14
       14
       +
             --replace @shell@ "${stdenv.shell}" \

     

       15
       15
       +
             --replace @coreutils@ "${coreutils}/bin" \

     

       16
       16
       +
             --replace @findutils@ "${findutils}/bin" \

     

       17
       17
       +
             --replace @nix@ "${nix}/bin" \

     

       18
       18
       +
             --replace @xz@ "${xz}/bin" \

     

       19
       19
       +
             --replace @bzip2@ "${bzip2}/bin" \

     

       20
       20
       +
             --replace @gnused@ "${gnused}/bin" \

     

       21
       21
       +
             --replace @gnugrep@ "${gnugrep}/bin" \

     

       22
       22
       +
             --replace @openssl@ "${openssl}/bin" \

     

       23
       23
       +
             --replace @lighttpd@ "${lighttpd}/sbin" \

     

       24
       24
       +
             --replace @iproute@ "${iproute}/sbin" \

     

       25
       25
       +
             --replace "xXxXx" "xXxXx"

     

       26
       26
       +
       

     

       27
       27
       +
           chmod a+x "$out/bin/nix-binary-cache.cgi"

     

       28
       28
       +
       

     

       29
       29
       +
           substitute "${./nix-binary-cache-start.in}" "$out"/bin/nix-binary-cache-start \

     

       30
       30
       +
             --replace @out@ "$out/bin" \

     

       31
       31
       +
             --replace @shell@ "${stdenv.shell}" \

     

       32
       32
       +
             --replace @coreutils@ "${coreutils}/bin" \

     

       33
       33
       +
             --replace @findutils@ "${findutils}/bin" \

     

       34
       34
       +
             --replace @nix@ "${nix}/bin" \

     

       35
       35
       +
             --replace @xz@ "${xz}/bin" \

     

       36
       36
       +
             --replace @bzip2@ "${bzip2}/bin" \

     

       37
       37
       +
             --replace @gnused@ "${gnused}/bin" \

     

       38
       38
       +
             --replace @gnugrep@ "${gnugrep}/bin" \

     

       39
       39
       +
             --replace @openssl@ "${openssl}/bin" \

     

       40
       40
       +
             --replace @lighttpd@ "${lighttpd}/sbin" \

     

       41
       41
       +
             --replace @iproute@ "${iproute}/sbin" \

     

       42
       42
       +
             --replace "xXxXx" "xXxXx"

     

       43
       43
       +
       

     

       44
       44
       +
           chmod a+x "$out/bin/nix-binary-cache-start"

     

       45
       45
       +
         '';

     

       46
       46
       +
       

     

       47
       47
       +
         meta = {

     

       48
       48
       +
           description = ''A set of scripts to serve the Nix store as a binary cache'';

     

       49
       49
       +
           longDescription = ''

     

       50
       50
       +
             This package installs a CGI script that serves Nix store path in the 

     

       51
       51
       +
             binary cache format. It also installs a launcher called 

     

       52
       52
       +
             nix-binary-cache-start that can be run without any setup to launch

     

       53
       53
       +
             a binary cache and get the example arguments for its usage.

     

       54
       54
       +
           '';

     

       55
       55
       +
           maintainers = [stdenv.lib.maintainers.raskin];

     

       56
       56
       +
           license = stdenv.lib.licenses.gpl2Plus;

     

       57
       57
       +
           inherit version;

     

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

     

       59
       59
       +
           hydraPlatforms = [];

     

       60
       60
       +
         };

     

       61
       61
       +
       }

+105

pkgs/servers/http/nix-binary-cache/nix-binary-cache-start.in

···

       1
       1
       +
       #! @shell@

     

       2
       2
       +
       

     

       3
       3
       +
       parse_opts () {

     

       4
       4
       +
         while @coreutils@/test -n "$1" && @coreutils@/test "x$1" != x-- ; do 

     

       5
       5
       +
           case "$1" in

     

       6
       6
       +
             --store-dir)

     

       7
       7
       +
               shift;

     

       8
       8
       +
               echo "STORE_DIR='$1'"

     

       9
       9
       +
               shift;

     

       10
       10
       +
               ;;

     

       11
       11
       +
             --priority)

     

       12
       12
       +
               shift;

     

       13
       13
       +
               echo "PRIORITY=$1";

     

       14
       14
       +
               shift;

     

       15
       15
       +
               ;;

     

       16
       16
       +
             --compression)

     

       17
       17
       +
               shift;

     

       18
       18
       +
               echo "COMPRESSION=$1";

     

       19
       19
       +
               shift;

     

       20
       20
       +
               ;;

     

       21
       21
       +
             --key)

     

       22
       22
       +
               shift;

     

       23
       23
       +
               echo "KEY=${1#*:}"

     

       24
       24
       +
               echo "KEYNAME=${1%%:*}"

     

       25
       25
       +
               shift;

     

       26
       26
       +
               ;;

     

       27
       27
       +
             --nix-remote)

     

       28
       28
       +
               shift;

     

       29
       29
       +
               echo "NIX_REMOTE=$1"

     

       30
       30
       +
               shift;

     

       31
       31
       +
               ;;

     

       32
       32
       +
             --mass-query)

     

       33
       33
       +
               shift;

     

       34
       34
       +
               echo "MASS_QUERY=$1"

     

       35
       35
       +
               shift;

     

       36
       36
       +
               ;;

     

       37
       37
       +
             --port)

     

       38
       38
       +
               shift;

     

       39
       39
       +
               echo "PORT=$1"

     

       40
       40
       +
               shift;

     

       41
       41
       +
               ;;

     

       42
       42
       +
             --help)

     

       43
       43
       +
               cat <<EOF >&2

     

       44
       44
       +
       "$0": start the Nix binary cache serving the Nix store dynamically.

     

       45
       45
       +
       

     

       46
       46
       +
       Recognized options:

     

       47
       47
       +
       

     

       48
       48
       +
       --port           server port

     

       49
       49
       +
       --store-dir      served Nix store

     

       50
       50
       +
       

     

       51
       51
       +
       --priority       binary cache priority

     

       52
       52
       +
       --mass-query     0 or 1 - whether binary cache expects queries for nix-env -qas

     

       53
       53
       +
       

     

       54
       54
       +
       --compression    compression to use: bzip2 or xz

     

       55
       55
       +
       --key            name:/path/to/key - key to use for narinfo signing

     

       56
       56
       +
       

     

       57
       57
       +
       --nix-remote     'daemon' or empty string '' - whether to use daemon for store

     

       58
       58
       +
                          operations

     

       59
       59
       +
       

     

       60
       60
       +
       --help           show help and exit

     

       61
       61
       +
       EOF

     

       62
       62
       +
       	exit 1;

     

       63
       63
       +
               ;;

     

       64
       64
       +
             *) shift ;;

     

       65
       65
       +
           esac;

     

       66
       66
       +
         done

     

       67
       67
       +
       }

     

       68
       68
       +
       

     

       69
       69
       +
       workingdir="$(@coreutils@/mktemp -d)"

     

       70
       70
       +
       cd "$workingdir"

     

       71
       71
       +
       

     

       72
       72
       +
       PORT=8080

     

       73
       73
       +
       (echo "STORE_DIR=${NIX_STORE_DIR:-/nix/store}"; parse_opts "$@" 

     

       74
       74
       +
         ) > nix-binary-cache.conf || exit

     

       75
       75
       +
       . "$workingdir/nix-binary-cache.conf"

     

       76
       76
       +
       

     

       77
       77
       +
       echo "

     

       78
       78
       +
       server.port = $PORT

     

       79
       79
       +
       server.modules = ( \"mod_cgi\", \"mod_setenv\", )

     

       80
       80
       +
       server.document-root = \"$workingdir\"

     

       81
       81
       +
       cgi.assign = ( \".cgi\" => \"@shell@\" )

     

       82
       82
       +
       setenv.add-request-header = ( \"NIX_BINARY_CACHE_CONFIG\" => \"$workingdir/nix-binary-cache.conf\" )

     

       83
       83
       +
       " > lighttpd.conf

     

       84
       84
       +
       

     

       85
       85
       +
       cp @out@/nix-binary-cache.cgi . 

     

       86
       86
       +
       cp @out@/nix-binary-cache.cgi ./nix-bc.cgi 

     

       87
       87
       +
       

     

       88
       88
       +
       ip="$(@iproute@/ip a | @gnugrep@/grep 'inet .* scope global' | @coreutils@/head -n 1)"

     

       89
       89
       +
       ip="${ip%%/*}"

     

       90
       90
       +
       ip="${ip##* }"

     

       91
       91
       +
       

     

       92
       92
       +
       url="http://$ip:$PORT/nix-bc.cgi?"

     

       93
       93
       +
       

     

       94
       94
       +
       echo "Working directory: $workingdir"

     

       95
       95
       +
       echo

     

       96
       96
       +
       echo "Address of the binary cache: $url"

     

       97
       97
       +
       echo

     

       98
       98
       +
       echo "Usage example: NIX_REMOTE= nix-store --option binary-caches '$url'"

     

       99
       99
       +
       echo

     

       100
       100
       +
       echo

     

       101
       101
       +
       

     

       102
       102
       +
       @lighttpd@/lighttpd -D -f "$workingdir/lighttpd.conf"

     

       103
       103
       +
       

     

       104
       104
       +
       cd /

     

       105
       105
       +
       @coreutils@/rm -rf "$workingdir"

+97

pkgs/servers/http/nix-binary-cache/nix-binary-cache.cgi.in

···

       1
       1
       +
       #! @shell@

     

       2
       2
       +
       

     

       3
       3
       +
       STORE_DIR="${NIX_STORE_DIR:-/nix/store}"

     

       4
       4
       +
       MASS_QUERY=0

     

       5
       5
       +
       PRIORITY=75

     

       6
       6
       +
       COMPRESSION=bzip2

     

       7
       7
       +
       KEY=

     

       8
       8
       +
       KEYNAME=na

     

       9
       9
       +
       

     

       10
       10
       +
       export NIX_REMOTE=daemon

     

       11
       11
       +
       

     

       12
       12
       +
       config="${NIX_BINARY_CACHE_CONFIG:-${HTTP_NIX_BINARY_CACHE_CONFIG:-/etc/nix/nix-binary-cache.cgi.conf}}"

     

       13
       13
       +
       config="$(cd "$(@coreutils@/dirname "$config")"; 

     

       14
       14
       +
         @coreutils@/pwd)/$(@coreutils@/basename "$config")"

     

       15
       15
       +
       @coreutils@/test -e "$config" && . "$config"

     

       16
       16
       +
       

     

       17
       17
       +
       header(){

     

       18
       18
       +
       	echo "Content-Type: text/plain; charset=utf-8"

     

       19
       19
       +
       	echo 

     

       20
       20
       +
       }

     

       21
       21
       +
       

     

       22
       22
       +
       clean_path() {

     

       23
       23
       +
       	@gnused@/sed -re "s@^$STORE_DIR/?@@" | @findutils@/xargs

     

       24
       24
       +
       }

     

       25
       25
       +
       

     

       26
       26
       +
       storeq(){

     

       27
       27
       +
       	@nix@/nix-store -q "$@"

     

       28
       28
       +
       }

     

       29
       29
       +
       

     

       30
       30
       +
       sign(){

     

       31
       31
       +
       	test -n "$1" && 

     

       32
       32
       +
       	  @coreutils@/sha256sum | @gnused@/sed -e 's/ .*//' | 

     

       33
       33
       +
       	  @openssl@/openssl rsautl -sign -inkey "$@" | @coreutils@/base64 -w 0

     

       34
       34
       +
       }

     

       35
       35
       +
       

     

       36
       36
       +
       case "$QUERY_STRING" in 

     

       37
       37
       +
       	"")

     

       38
       38
       +
       		header

     

       39
       39
       +
       		echo "Hello, this is a dynamically-generated Nix binary cache"

     

       40
       40
       +
       		;;

     

       41
       41
       +
       	/debug)

     

       42
       42
       +
       		header

     

       43
       43
       +
       		set

     

       44
       44
       +
       		;;

     

       45
       45
       +
       	/nix-cache-info)

     

       46
       46
       +
       		header

     

       47
       47
       +
       		echo "StoreDir: $STORE_DIR"

     

       48
       48
       +
       		echo "WantMassQuery: $MASS_QUERY"

     

       49
       49
       +
       		echo "Priority: $PRIORITY"

     

       50
       50
       +
       		;;

     

       51
       51
       +
       	*.narinfo)

     

       52
       52
       +
       		hash=${QUERY_STRING%.narinfo}

     

       53
       53
       +
       		hash=${hash#/}

     

       54
       54
       +
       		path="$(echo "$STORE_DIR/$hash-"* )"

     

       55
       55
       +
       		if [ -n "$path" ] && [ -e "$path" ]; then

     

       56
       56
       +
       			header

     

       57
       57
       +
       			info="$(

     

       58
       58
       +
       			echo "StorePath: $path"

     

       59
       59
       +
       			echo "URL: $(@coreutils@/basename "$path"

     

       60
       60
       +
       			  ).nar.$COMPRESSION"

     

       61
       61
       +
       			echo "Compression: $COMPRESSION"

     

       62
       62
       +
       			echo "NarHash: $(storeq --hash "$path")"

     

       63
       63
       +
       			echo "NarSize: $(storeq --size "$path")"

     

       64
       64
       +
       			echo "References: $(storeq --references "$path" | 

     

       65
       65
       +
       			  @coreutils@/tac | clean_path )"

     

       66
       66
       +
       			echo "Deriver: $(storeq --deriver "$path" | 

     

       67
       67
       +
       			  clean_path )"

     

       68
       68
       +
       			)"

     

       69
       69
       +
       			signature="$(echo "$info" | sign "$KEY")"

     

       70
       70
       +
       

     

       71
       71
       +
       			echo "$info"

     

       72
       72
       +
       			echo "Signature: 1;$KEYNAME;$signature"

     

       73
       73
       +
       

     

       74
       74
       +
       		else

     

       75
       75
       +
       			exit 1

     

       76
       76
       +
       		fi

     

       77
       77
       +
       		;;

     

       78
       78
       +
       	*.nar.xz)

     

       79
       79
       +
       		path="$STORE_DIR${QUERY_STRING%.nar.xz}"

     

       80
       80
       +
       		if [ -n "$path" ] && [ -e "$path" ]; then

     

       81
       81
       +
       			header

     

       82
       82
       +
       			@nix@/nix-store --dump "$path" | @xz@/xz

     

       83
       83
       +
       		else

     

       84
       84
       +
       			exit 1

     

       85
       85
       +
       		fi

     

       86
       86
       +
       		;;

     

       87
       87
       +
       	*.nar.bzip2)

     

       88
       88
       +
       		path="$STORE_DIR${QUERY_STRING%.nar.bzip2}"

     

       89
       89
       +
       		echo "$path" >&2;

     

       90
       90
       +
       		if [ -n "$path" ] && [ -e "$path" ]; then

     

       91
       91
       +
       			header

     

       92
       92
       +
       			@nix@/nix-store --dump "$path" | @bzip2@/bzip2

     

       93
       93
       +
       		else

     

       94
       94
       +
       			exit 1

     

       95
       95
       +
       		fi

     

       96
       96
       +
       		;;

     

       97
       97
       +
       esac

+37

pkgs/servers/nsq/default.nix

···

       1
       1
       +
       { stdenv, lib, go, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         version = "0.2.28";

     

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

     

       6
       6
       +
       

     

       7
       7
       +
         src = import ./deps.nix {

     

       8
       8
       +
           inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub;

     

       9
       9
       +
         };

     

       10
       10
       +
       

     

       11
       11
       +
         buildInputs = [ go ];

     

       12
       12
       +
       

     

       13
       13
       +
         buildPhase = ''

     

       14
       14
       +
           export GOPATH=$src

     

       15
       15
       +
           apps=(nsq_pubsub nsq_stat nsq_tail nsq_to_file nsq_to_http nsq_to_nsq nsqd nsqlookupd)

     

       16
       16
       +
       

     

       17
       17
       +
           mkdir build

     

       18
       18
       +
       

     

       19
       19
       +
           go build -v -o build/nsqadmin github.com/bitly/nsq/nsqadmin

     

       20
       20
       +
           for app in "''${apps[@]}"; do

     

       21
       21
       +
             go build -v -o build/$app github.com/bitly/nsq/apps/$app

     

       22
       22
       +
           done

     

       23
       23
       +
         '';

     

       24
       24
       +
       

     

       25
       25
       +
         installPhase = ''

     

       26
       26
       +
           ensureDir $out/bin

     

       27
       27
       +
           mv build/* $out/bin

     

       28
       28
       +
         '';

     

       29
       29
       +
       

     

       30
       30
       +
         meta = with stdenv.lib; {

     

       31
       31
       +
           description = "A realtime distributed messaging platform";

     

       32
       32
       +
           homepage = http://nsq.io/;

     

       33
       33
       +
           license = licenses.mit;

     

       34
       34
       +
           maintainers = with maintainers; [ cstrahan ];

     

       35
       35
       +
           platforms = platforms.unix;

     

       36
       36
       +
         };

     

       37
       37
       +
       }

+134

pkgs/servers/nsq/deps.nix

···

       1
       1
       +
       { stdenv, lib, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }:

     

       2
       2
       +
       

     

       3
       3
       +
       let

     

       4
       4
       +
         goDeps = [

     

       5
       5
       +
           {

     

       6
       6
       +
             root = "code.google.com/p/snappy-go";

     

       7
       7
       +
             src = fetchhg {

     

       8
       8
       +
               url = "http://code.google.com/p/snappy-go";

     

       9
       9
       +
               rev = "14";

     

       10
       10
       +
               sha256 = "0ywa52kcii8g2a9lbqcx8ghdf6y56lqq96sl5nl9p6h74rdvmjr7";

     

       11
       11
       +
             };

     

       12
       12
       +
           }

     

       13
       13
       +
           {

     

       14
       14
       +
             root = "github.com/BurntSushi/toml";

     

       15
       15
       +
             src = fetchFromGitHub {

     

       16
       16
       +
               owner = "BurntSushi";

     

       17
       17
       +
               repo = "toml";

     

       18
       18
       +
               rev = "f87ce853111478914f0bcffa34d43a93643e6eda";

     

       19
       19
       +
               sha256 = "0g8203y9ycf34j2q3ymxb8nh4habgwdrjn9vdgrginllx73yq565";

     

       20
       20
       +
             };

     

       21
       21
       +
           }

     

       22
       22
       +
           {

     

       23
       23
       +
             root = "github.com/bitly/go-hostpool";

     

       24
       24
       +
             src = fetchFromGitHub {

     

       25
       25
       +
               owner = "bitly";

     

       26
       26
       +
               repo = "go-hostpool";

     

       27
       27
       +
               rev = "fed86fae5cacdc77e7399937e2f8836563620a2e";

     

       28
       28
       +
               sha256 = "0nbssfp5ksj4hhc0d8lfq54afd9nqv6qzk3vi6rinxr3fgplrj44";

     

       29
       29
       +
             };

     

       30
       30
       +
           }

     

       31
       31
       +
           {

     

       32
       32
       +
             root = "github.com/bitly/go-nsq";

     

       33
       33
       +
             src = fetchFromGitHub {

     

       34
       34
       +
               owner = "bitly";

     

       35
       35
       +
               repo = "go-nsq";

     

       36
       36
       +
               rev = "c79a282f05364e340eadc2ce2f862a3d44eea9c0";

     

       37
       37
       +
               sha256 = "19jlwj5419p5xwjzfnzlddjnbh5g7ifnqhd00i5p0b6ww1gk011p";

     

       38
       38
       +
             };

     

       39
       39
       +
           }

     

       40
       40
       +
           {

     

       41
       41
       +
             root = "github.com/bitly/go-simplejson";

     

       42
       42
       +
             src = fetchFromGitHub {

     

       43
       43
       +
               owner = "bitly";

     

       44
       44
       +
               repo = "go-simplejson";

     

       45
       45
       +
               rev = "1cfceb0e12f47ec02665ef480212d7b531d6f4c5";

     

       46
       46
       +
               sha256 = "1d8x0himl58qn87lv418djy6mbs66p9ai3zpqq13nhkfl67fj3bi";

     

       47
       47
       +
             };

     

       48
       48
       +
           }

     

       49
       49
       +
           {

     

       50
       50
       +
             root = "github.com/bitly/nsq";

     

       51
       51
       +
             src = fetchFromGitHub {

     

       52
       52
       +
               owner = "bitly";

     

       53
       53
       +
               repo = "nsq";

     

       54
       54
       +
               rev = "048691a8242c9ec224fc46bf7d05f321026b69f8";

     

       55
       55
       +
               sha256 = "0drmf1j5w3q4l6f7xjy3y7d7cl50gcx0qwci6mahxsyaaclx60yx";

     

       56
       56
       +
             };

     

       57
       57
       +
           }

     

       58
       58
       +
           {

     

       59
       59
       +
             root = "github.com/bmizerany/assert";

     

       60
       60
       +
             src = fetchFromGitHub {

     

       61
       61
       +
               owner = "bmizerany";

     

       62
       62
       +
               repo = "assert";

     

       63
       63
       +
               rev = "e17e99893cb6509f428e1728281c2ad60a6b31e3";

     

       64
       64
       +
               sha256 = "1lfrvqqmb09y6pcr76yjv4r84cshkd4s7fpmiy7268kfi2cvqnpc";

     

       65
       65
       +
             };

     

       66
       66
       +
           }

     

       67
       67
       +
           {

     

       68
       68
       +
             root = "github.com/bmizerany/perks";

     

       69
       69
       +
             src = fetchFromGitHub {

     

       70
       70
       +
               owner = "bmizerany";

     

       71
       71
       +
               repo = "perks";

     

       72
       72
       +
               rev = "aac9e2eab5a334037057336897fd10b0289a5ae8";

     

       73
       73
       +
               sha256 = "1d027jgc327qz5xmal0hrpqvsj45i9yqmm9pxk3xp3hancvz3l3k";

     

       74
       74
       +
             };

     

       75
       75
       +
           }

     

       76
       76
       +
           {

     

       77
       77
       +
             root = "github.com/kr/pretty";

     

       78
       78
       +
             src = fetchFromGitHub {

     

       79
       79
       +
               owner = "kr";

     

       80
       80
       +
               repo = "pretty";

     

       81
       81
       +
               rev = "bc9499caa0f45ee5edb2f0209fbd61fbf3d9018f";

     

       82
       82
       +
               sha256 = "1m61y592qsnwsqn76v54mm6h2pcvh4wlzbzscc1ag645x0j33vvl";

     

       83
       83
       +
             };

     

       84
       84
       +
           }

     

       85
       85
       +
           {

     

       86
       86
       +
             root = "github.com/kr/pty";

     

       87
       87
       +
             src = fetchFromGitHub {

     

       88
       88
       +
               owner = "kr";

     

       89
       89
       +
               repo = "pty";

     

       90
       90
       +
               rev = "67e2db24c831afa6c64fc17b4a143390674365ef";

     

       91
       91
       +
               sha256 = "1l3z3wbb112ar9br44m8g838z0pq2gfxcp5s3ka0xvm1hjvanw2d";

     

       92
       92
       +
             };

     

       93
       93
       +
           }

     

       94
       94
       +
           {

     

       95
       95
       +
             root = "github.com/kr/text";

     

       96
       96
       +
             src = fetchFromGitHub {

     

       97
       97
       +
               owner = "kr";

     

       98
       98
       +
               repo = "text";

     

       99
       99
       +
               rev = "6807e777504f54ad073ecef66747de158294b639";

     

       100
       100
       +
               sha256 = "1wkszsg08zar3wgspl9sc8bdsngiwdqmg3ws4y0bh02sjx5a4698";

     

       101
       101
       +
             };

     

       102
       102
       +
           }

     

       103
       103
       +
           {

     

       104
       104
       +
             root = "github.com/mreiferson/go-options";

     

       105
       105
       +
             src = fetchFromGitHub {

     

       106
       106
       +
               owner = "mreiferson";

     

       107
       107
       +
               repo = "go-options";

     

       108
       108
       +
               rev = "896a539cd709f4f39d787562d1583c016ce7517e";

     

       109
       109
       +
               sha256 = "0hg0n5grcjcj5719rqchz0plp39wfk3znqxw8y354k4jwsqwmn17";

     

       110
       110
       +
             };

     

       111
       111
       +
           }

     

       112
       112
       +
           {

     

       113
       113
       +
             root = "github.com/mreiferson/go-snappystream";

     

       114
       114
       +
             src = fetchFromGitHub {

     

       115
       115
       +
               owner = "mreiferson";

     

       116
       116
       +
               repo = "go-snappystream";

     

       117
       117
       +
               rev = "97c96e6648e99c2ce4fe7d169aa3f7368204e04d";

     

       118
       118
       +
               sha256 = "08ylvx9r6b1fi76v6cqjvny4yqsvcqjfsg93jdrgs7hi4mxvxynn";

     

       119
       119
       +
             };

     

       120
       120
       +
           }

     

       121
       121
       +
         ];

     

       122
       122
       +
       

     

       123
       123
       +
       in

     

       124
       124
       +
       

     

       125
       125
       +
       stdenv.mkDerivation rec {

     

       126
       126
       +
         name = "go-deps";

     

       127
       127
       +
       

     

       128
       128
       +
         buildCommand =

     

       129
       129
       +
           lib.concatStrings

     

       130
       130
       +
             (map (dep: ''

     

       131
       131
       +
                     mkdir -p $out/src/`dirname ${dep.root}`

     

       132
       132
       +
                     ln -s ${dep.src} $out/src/${dep.root}

     

       133
       133
       +
                   '') goDeps);

     

       134
       134
       +
       }

+4

pkgs/servers/restund/default.nix

···

       24
       24
        
           platforms = with stdenv.lib.platforms; linux;

     

       25
       25
        
           maintainers = with stdenv.lib.maintainers; [raskin];

     

       26
       26
        
           license = with stdenv.lib.licenses; bsd3;

     

       27
       27
       +
           inherit version;

     

       28
       28
       +
           downloadPage = "http://www.creytiv.com/pub/";

     

       29
       29
       +
           updateWalker = true;

     

       30
       30
       +
           downloadURLRegexp = "/restund-.*[.]tar[.]";

     

       27
       31
        
         };

     

       28
       32
        
       }

+3 -3

pkgs/servers/samba/default.nix

···

       18
       18
        
       assert useKerberos -> kerberos != null;

     

       19
       19
        
       

     

       20
       20
        
       stdenv.mkDerivation rec {

     

       21
       21
       -
         name = "samba-3.6.22";

     

       21
       21
       +
         name = "samba-3.6.24";

     

       22
       22
        
       

     

       23
       23
        
         src = fetchurl {

     

       24
       24
       -
           url = "http://us3.samba.org/samba/ftp/stable/${name}.tar.gz";

     

       25
       25
       -
           sha256 = "1sny3irf1p4fjli5qa29swr3l217grg90cva35rmay48fw7g5g9h";

     

       24
       24
       +
           url = "http://samba.org/samba/ftp/stable/${name}.tar.gz";

     

       25
       25
       +
           sha256 = "19rln8m1k359bz6dhmlv39kzyjg7p296dz4y4mq1jwrlnw2bvl0i";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         buildInputs = [ readline pam openldap popt iniparser libunwind fam acl cups ]

+24 -120

pkgs/servers/serfdom/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, fetchgit, fetchhg, go, lib }:

     

       1
       1
       +
       { stdenv, lib, go, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }:

     

       2
       2
        
       

     

       3
       3
       -
       let

     

       4
       4
       -
         goDeps = [

     

       5
       5
       -
           {

     

       6
       6
       -
             dir     = "github.com/hashicorp";

     

       7
       7
       -
             name    = "serf";

     

       8
       8
       -
             rev     = "c5b41a9d1d261135117a8d501d3293efade3cc74";

     

       9
       9
       -
             sha256  = "a314d3c13fb370842a8f7c6650abfa907b51172a09c64f9184a240fab05b43df";

     

       10
       10
       -
             fetcher = git;

     

       11
       11
       -
           }

     

       12
       12
       -
           {

     

       13
       13
       -
             dir     = "github.com/armon";

     

       14
       14
       -
             name    = "go-metrics";

     

       15
       15
       -
             rev     = "e12c3591b520e819e8234bd585d592774f2b2ad5";

     

       16
       16
       -
             sha256  = "79476efefb68876fcad7e71e76d95f4a7eece2cfcdc5a9c10f998af3178230ba";

     

       17
       17
       -
             fetcher = git;

     

       18
       18
       -
           }

     

       19
       19
       -
           {

     

       20
       20
       -
             dir     = "github.com/hashicorp";

     

       21
       21
       -
             name    = "logutils";

     

       22
       22
       -
             rev     = "8e0820fe7ac5eb2b01626b1d99df47c5449eb2d8";

     

       23
       23
       -
             sha256  = "184lnn7x1v3xvj6zz1rg9s0252wkkd59kij2iyrrm7y80bym2jys";

     

       24
       24
       -
             fetcher = git;

     

       25
       25
       -
           }

     

       26
       26
       -
           {

     

       27
       27
       -
             dir     = "github.com/hashicorp";

     

       28
       28
       -
             name    = "memberlist";

     

       29
       29
       -
             rev     = "d5be01d1f4d75b086eba4ae808f2767c08cbbf73";

     

       30
       30
       -
             sha256  = "4ab2b610d439e96c169d9caf9ac0e009d71d3ef9a2fd2c812870b71eb6b27dfc";

     

       31
       31
       -
             fetcher = git;

     

       32
       32
       -
           }

     

       33
       33
       -
           {

     

       34
       34
       -
             dir     = "github.com/ugorji";

     

       35
       35
       -
             name    = "go";

     

       36
       36
       -
             rev     = "71c2886f5a673a35f909803f38ece5810165097b";

     

       37
       37
       -
             sha256  = "128853bcc5f114c300772cbce316b55e84206fa56705c5b9cc94c1693b11ee94";

     

       38
       38
       -
             fetcher = git;

     

       39
       39
       -
           }

     

       40
       40
       -
           {

     

       41
       41
       -
             dir     = "github.com/mitchellh";

     

       42
       42
       -
             name    = "cli";

     

       43
       43
       -
             rev     = "69f0b65ce53b27f729b1b807b88dc88007f41dd3";

     

       44
       44
       -
             sha256  = "0hnnqd8vg5ca2hglkrj141ba2akdh7crl2lsrgz8d6ipw6asszx3";

     

       45
       45
       -
             fetcher = git;

     

       46
       46
       -
           }

     

       47
       47
       -
           {

     

       48
       48
       -
             dir     = "github.com/armon";

     

       49
       49
       -
             name    = "mdns";

     

       50
       50
       -
             rev     = "8be7e3ac4e941555169a99d01abcabd3c982d87a";

     

       51
       51
       -
             sha256  = "87cd3a0ada3b094ee8fc4c4742158e0d051cde893da1ea320158a47d6254f69d";

     

       52
       52
       -
             fetcher = git;

     

       53
       53
       -
           }

     

       54
       54
       -
           {

     

       55
       55
       -
             dir     = "github.com/miekg";

     

       56
       56
       -
             name    = "dns";

     

       57
       57
       -
             rev     = "7ebb4c59b39d5984952a355086606dd91f6cfe86";

     

       58
       58
       -
             sha256  = "8418ad2d27e607cef1dc0003471416294443e467f2de9df135e3a2ab411e2512";

     

       59
       59
       -
             fetcher = git;

     

       60
       60
       -
           }

     

       61
       61
       -
           {

     

       62
       62
       -
             dir     = "github.com/mitchellh";

     

       63
       63
       -
             name    = "mapstructure";

     

       64
       64
       -
             rev     = "57bb2fa7a7e00b26c80e4c4b0d4f15a210d94039";

     

       65
       65
       -
             sha256  = "13lvd5vw8y6h5zl3samkrb7237kk778cky7k7ys1cm46mfd957zy";

     

       66
       66
       -
             fetcher = git;

     

       67
       67
       -
           }

     

       68
       68
       -
           {

     

       69
       69
       -
             dir     = "github.com/ryanuber";

     

       70
       70
       -
             name    = "columnize";

     

       71
       71
       -
             rev     = "d066e113d6e13232f45bda646a915dffeee7f1a4";

     

       72
       72
       -
             sha256  = "2aaec396a223fc4b45117a595e74c0a874bd5cd9604c742b8c4747436b4721e9";

     

       73
       73
       -
             fetcher = git;

     

       74
       74
       -
           }

     

       75
       75
       -
           {

     

       76
       76
       -
             dir     = "code.google.com/p";

     

       77
       77
       -
             name    = "go.net";

     

       78
       78
       -
             rev     = "89dbba2db2d4";

     

       79
       79
       -
             sha256  = "0168inai10nkdrz4g0rjlj8b5v34mv135v8bhyvh501vnqql50jn";

     

       80
       80
       -
             fetcher = hg;

     

       81
       81
       -
           }

     

       82
       82
       -
         ];

     

       83
       83
       -
         git = desc: fetchgit { url = "https://${desc.dir}/${desc.name}";

     

       84
       84
       -
                                inherit (desc) rev sha256; };

     

       85
       85
       -
         hg = desc: fetchhg { url = "https://${desc.dir}/${desc.name}";

     

       86
       86
       -
                              tag = desc.rev;

     

       87
       87
       -
                              inherit (desc) sha256; };

     

       88
       88
       -
         createGoPathCmds =

     

       89
       89
       -
           lib.concatStrings

     

       90
       90
       -
             (map (desc:

     

       91
       91
       -
                   let fetched = desc.fetcher desc; in ''

     

       92
       92
       -
                     mkdir -p $GOPATH/src/${desc.dir}

     

       93
       93
       -
                     ln -s ${fetched} $GOPATH/src/${desc.dir}/${desc.name}

     

       94
       94
       -
                   '') goDeps);

     

       95
       95
       -
       in

     

       96
       96
       -
         stdenv.mkDerivation rec {

     

       97
       97
       -
           version = "0.5.0";

     

       98
       98
       -
           name = "serfdom-${version}";

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         version = "0.6.2";

     

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

     

       99
       6
        
       

     

       100
       100
       -
           src = fetchurl {

     

       101
       101
       -
             url = "https://github.com/hashicorp/serf/archive/v${version}.tar.gz";

     

       102
       102
       -
             sha256 = "1p2cpkdx0gck1ypxc98im7gsv3275avpkizhsif3nxvl1xd8g1qp";

     

       103
       103
       -
           };

     

       7
       7
       +
         src = import ./deps.nix {

     

       8
       8
       +
           inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub;

     

       9
       9
       +
         };

     

       104
       10
        
       

     

       105
       105
       -
           buildInputs = [ go ];

     

       11
       11
       +
         buildInputs = [ go ];

     

       106
       12
        
       

     

       107
       107
       -
           buildPhase = ''

     

       108
       108
       -
             mkdir $TMPDIR/go

     

       109
       109
       -
             export GOPATH=$TMPDIR/go

     

       110
       110
       -
             ${createGoPathCmds}

     

       111
       111
       -
             go build -v -o bin/serf

     

       112
       112
       -
           '';

     

       13
       13
       +
         buildPhase = ''

     

       14
       14
       +
           export GOPATH=$src

     

       15
       15
       +
           go build -v -o serf github.com/hashicorp/serf

     

       16
       16
       +
         '';

     

       113
       17
        
       

     

       114
       114
       -
           installPhase = ''

     

       115
       115
       -
             mkdir -p $out/bin

     

       116
       116
       -
             cp bin/serf $out/bin

     

       117
       117
       -
           '';

     

       18
       18
       +
         installPhase = ''

     

       19
       19
       +
           mkdir -p $out/bin

     

       20
       20
       +
           mv serf $out/bin/serf

     

       21
       21
       +
         '';

     

       118
       22
        
       

     

       119
       119
       -
           meta = with stdenv.lib; {

     

       120
       120
       -
             description = "Serf is a service discovery and orchestration tool that is decentralized, highly available, and fault tolerant";

     

       121
       121
       -
             homepage = http://www.serfdom.io/;

     

       122
       122
       -
             license = licenses.mpl20;

     

       123
       123
       -
             maintainers = [ maintainers.msackman ];

     

       124
       124
       -
             platforms = platforms.linux;

     

       125
       125
       -
           };

     

       126
       126
       -
         }

     

       23
       23
       +
         meta = with stdenv.lib; {

     

       24
       24
       +
           description = "A service discovery and orchestration tool that is decentralized, highly available, and fault tolerant";

     

       25
       25
       +
           homepage = http://www.serfdom.io/;

     

       26
       26
       +
           license = licenses.mpl20;

     

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

     

       28
       28
       +
           platforms = platforms.unix;

     

       29
       29
       +
         };

     

       30
       30
       +
       }

+185

pkgs/servers/serfdom/deps.nix

···

       1
       1
       +
       { stdenv, lib, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }:

     

       2
       2
       +
       

     

       3
       3
       +
       let

     

       4
       4
       +
         goDeps = [

     

       5
       5
       +
           {

     

       6
       6
       +
             root = "code.google.com/p/go.net";

     

       7
       7
       +
             src = fetchhg {

     

       8
       8
       +
               url = "http://code.google.com/p/go.net";

     

       9
       9
       +
               rev = "134";

     

       10
       10
       +
               sha256 = "1jycpgrfwgkfac60zjbx6babcz7sgyn9xgy6cr3l811j6k8r2pbv";

     

       11
       11
       +
             };

     

       12
       12
       +
           }

     

       13
       13
       +
           {

     

       14
       14
       +
             root = "code.google.com/p/go.text";

     

       15
       15
       +
             src = fetchhg {

     

       16
       16
       +
               url = "http://code.google.com/p/go.text";

     

       17
       17
       +
               rev = "85";

     

       18
       18
       +
               sha256 = "1x8h6vq9g5gbi7iiwla6dkaaqqf7wmkdm4szj7wvzlsijf2x8dwr";

     

       19
       19
       +
             };

     

       20
       20
       +
           }

     

       21
       21
       +
           {

     

       22
       22
       +
             root = "github.com/armon/circbuf";

     

       23
       23
       +
             src = fetchFromGitHub {

     

       24
       24
       +
               owner = "armon";

     

       25
       25
       +
               repo = "circbuf";

     

       26
       26
       +
               rev = "f092b4f207b6e5cce0569056fba9e1a2735cb6cf";

     

       27
       27
       +
               sha256 = "06kwwdwa3hskdh6ws7clj1vim80dyc3ldim8k9y5qpd30x0avn5s";

     

       28
       28
       +
             };

     

       29
       29
       +
           }

     

       30
       30
       +
           {

     

       31
       31
       +
             root = "github.com/armon/go-metrics";

     

       32
       32
       +
             src = fetchFromGitHub {

     

       33
       33
       +
               owner = "armon";

     

       34
       34
       +
               repo = "go-metrics";

     

       35
       35
       +
               rev = "02567bbc4f518a43853d262b651a3c8257c3f141";

     

       36
       36
       +
               sha256 = "08fk3zmw0ywmdfp2qhrpv0vrk1y97hzqczrgr3y2yip3x8sr37ar";

     

       37
       37
       +
             };

     

       38
       38
       +
           }

     

       39
       39
       +
           {

     

       40
       40
       +
             root = "github.com/armon/mdns";

     

       41
       41
       +
             src = fetchFromGitHub {

     

       42
       42
       +
               owner = "armon";

     

       43
       43
       +
               repo = "mdns";

     

       44
       44
       +
               rev = "70462deb060d44247356ee238ebafd7699ddcffe";

     

       45
       45
       +
               sha256 = "0xkm3d0hsixdm1yrkx9c39723kfjkb3wvrzrmx3np9ylcwn6h5p5";

     

       46
       46
       +
             };

     

       47
       47
       +
           }

     

       48
       48
       +
           {

     

       49
       49
       +
             root = "github.com/hashicorp/go-syslog";

     

       50
       50
       +
             src = fetchFromGitHub {

     

       51
       51
       +
               owner = "hashicorp";

     

       52
       52
       +
               repo = "go-syslog";

     

       53
       53
       +
               rev = "ac3963b72ac367e48b1e68a831e62b93fb69091c";

     

       54
       54
       +
               sha256 = "1r9s1gsa4azcs05gx1179ixk7qvrkrik3v92wr4s8gwm00m0gf81";

     

       55
       55
       +
             };

     

       56
       56
       +
           }

     

       57
       57
       +
           {

     

       58
       58
       +
             root = "github.com/hashicorp/logutils";

     

       59
       59
       +
             src = fetchFromGitHub {

     

       60
       60
       +
               owner = "hashicorp";

     

       61
       61
       +
               repo = "logutils";

     

       62
       62
       +
               rev = "8e0820fe7ac5eb2b01626b1d99df47c5449eb2d8";

     

       63
       63
       +
               sha256 = "033rbkc066g657r0dnzysigjz2bs4biiz0kmiypd139d34jvslwz";

     

       64
       64
       +
             };

     

       65
       65
       +
           }

     

       66
       66
       +
           {

     

       67
       67
       +
             root = "github.com/hashicorp/memberlist";

     

       68
       68
       +
             src = fetchFromGitHub {

     

       69
       69
       +
               owner = "hashicorp";

     

       70
       70
       +
               repo = "memberlist";

     

       71
       71
       +
               rev = "17d39b695094be943bfb98442a80b082e6b9ac47";

     

       72
       72
       +
               sha256 = "0nvgjnwmfqhv2wvr77d2q5mq1bfw4xbpil6wgyj4fyrmhsfzrv3g";

     

       73
       73
       +
             };

     

       74
       74
       +
           }

     

       75
       75
       +
           {

     

       76
       76
       +
             root = "github.com/hashicorp/serf";

     

       77
       77
       +
             src = fetchFromGitHub {

     

       78
       78
       +
               owner = "hashicorp";

     

       79
       79
       +
               repo = "serf";

     

       80
       80
       +
               rev = "4232a3f7b52f755084caf6b2cc2789efa2948555";

     

       81
       81
       +
               sha256 = "1hxxqrjz08882d205ylakhvvwciahiqdzkwi2a7zwrmx6sxna7sr";

     

       82
       82
       +
             };

     

       83
       83
       +
           }

     

       84
       84
       +
           {

     

       85
       85
       +
             root = "github.com/miekg/dns";

     

       86
       86
       +
             src = fetchFromGitHub {

     

       87
       87
       +
               owner = "miekg";

     

       88
       88
       +
               repo = "dns";

     

       89
       89
       +
               rev = "fc67c4b981930a377f8a26a5a1f2c0ccd5dd1514";

     

       90
       90
       +
               sha256 = "1csjmkx0gl34r4hmkhdbdxb0693f1p10yrjaj8f2jwli9p9sl4mg";

     

       91
       91
       +
             };

     

       92
       92
       +
           }

     

       93
       93
       +
           {

     

       94
       94
       +
             root = "github.com/mitchellh/cli";

     

       95
       95
       +
             src = fetchFromGitHub {

     

       96
       96
       +
               owner = "mitchellh";

     

       97
       97
       +
               repo = "cli";

     

       98
       98
       +
               rev = "8262fe3f76f0da53b5674eb35c8c6436430794c3";

     

       99
       99
       +
               sha256 = "0pqkxh1q49kkxihggrfjs8174d927g4c5qqx00ggw8sqqsgrw6vn";

     

       100
       100
       +
             };

     

       101
       101
       +
           }

     

       102
       102
       +
           {

     

       103
       103
       +
             root = "github.com/mitchellh/mapstructure";

     

       104
       104
       +
             src = fetchFromGitHub {

     

       105
       105
       +
               owner = "mitchellh";

     

       106
       106
       +
               repo = "mapstructure";

     

       107
       107
       +
               rev = "6fb2c832bcac61d01212ab1d172f7a14a8585b07";

     

       108
       108
       +
               sha256 = "0mx855lwhv0rk461wmbnbzbpkhmq5p2ipmrm5bhzimagrr1w17hw";

     

       109
       109
       +
             };

     

       110
       110
       +
           }

     

       111
       111
       +
           {

     

       112
       112
       +
             root = "github.com/ryanuber/columnize";

     

       113
       113
       +
             src = fetchFromGitHub {

     

       114
       114
       +
               owner = "ryanuber";

     

       115
       115
       +
               repo = "columnize";

     

       116
       116
       +
               rev = "785d943a7b6886e0bb2f139a60487b823dd8d9de";

     

       117
       117
       +
               sha256 = "1h3sxzhiwz65vf3cvclirlf6zhdr97v01dpn5cmf3m09rxxpnp3f";

     

       118
       118
       +
             };

     

       119
       119
       +
           }

     

       120
       120
       +
           {

     

       121
       121
       +
             root = "github.com/ugorji/go";

     

       122
       122
       +
             src = fetchFromGitHub {

     

       123
       123
       +
               owner = "ugorji";

     

       124
       124
       +
               repo = "go";

     

       125
       125
       +
               rev = "71c2886f5a673a35f909803f38ece5810165097b";

     

       126
       126
       +
               sha256 = "157f24xnkhclrjwwa1b7lmpj112ynlbf7g1cfw0c657iqny5720j";

     

       127
       127
       +
             };

     

       128
       128
       +
           }

     

       129
       129
       +
           {

     

       130
       130
       +
             root = "github.com/ugorji/go-msgpack";

     

       131
       131
       +
             src = fetchFromGitHub {

     

       132
       132
       +
               owner = "ugorji";

     

       133
       133
       +
               repo = "go-msgpack";

     

       134
       134
       +
               rev = "75092644046c5e38257395b86ed26c702dc95b92";

     

       135
       135
       +
               sha256 = "1bmqi16bfiqw7qhb3d5hbh0dfzhx2bbq1g15nh2pxwxckwh80x98";

     

       136
       136
       +
             };

     

       137
       137
       +
           }

     

       138
       138
       +
           {

     

       139
       139
       +
             root = "github.com/vmihailenco/bufio";

     

       140
       140
       +
             src = fetchFromGitHub {

     

       141
       141
       +
               owner = "vmihailenco";

     

       142
       142
       +
               repo = "bufio";

     

       143
       143
       +
               rev = "24e7e48f60fc2d9e99e43c07485d9fff42051e66";

     

       144
       144
       +
               sha256 = "0x46qnf2f15v7m0j2dcb16raxjamk5rdc7hqwgyxfr1sqmmw3983";

     

       145
       145
       +
             };

     

       146
       146
       +
           }

     

       147
       147
       +
           {

     

       148
       148
       +
             root = "github.com/vmihailenco/msgpack";

     

       149
       149
       +
             src = fetchFromGitHub {

     

       150
       150
       +
               owner = "vmihailenco";

     

       151
       151
       +
               repo = "msgpack";

     

       152
       152
       +
               rev = "20c1b88a6c7fc5432037439f4e8c582e236fb205";

     

       153
       153
       +
               sha256 = "1dj5scpfhgnw0yrh0w6jlrb9d03halvsv4l3wgjhazrrimdqf0q0";

     

       154
       154
       +
             };

     

       155
       155
       +
           }

     

       156
       156
       +
           {

     

       157
       157
       +
             root = "launchpad.net/gocheck";

     

       158
       158
       +
             src = fetchbzr {

     

       159
       159
       +
               url = "https://launchpad.net/gocheck";

     

       160
       160
       +
               rev = "87";

     

       161
       161
       +
               sha256 = "1y9fa2mv61if51gpik9isls48idsdz87zkm1p3my7swjdix7fcl0";

     

       162
       162
       +
             };

     

       163
       163
       +
           }

     

       164
       164
       +
           {

     

       165
       165
       +
             root = "launchpad.net/mgo";

     

       166
       166
       +
             src = fetchbzr {

     

       167
       167
       +
               url = "https://launchpad.net/mgo";

     

       168
       168
       +
               rev = "2";

     

       169
       169
       +
               sha256 = "0h1dxzyx5c4r4gfnmjxv92hlhjxrgx9p4g53p4fhmz6x2fdglb0x";

     

       170
       170
       +
             };

     

       171
       171
       +
           }

     

       172
       172
       +
         ];

     

       173
       173
       +
       

     

       174
       174
       +
       in

     

       175
       175
       +
       

     

       176
       176
       +
       stdenv.mkDerivation rec {

     

       177
       177
       +
         name = "go-deps";

     

       178
       178
       +
       

     

       179
       179
       +
         buildCommand =

     

       180
       180
       +
           lib.concatStrings

     

       181
       181
       +
             (map (dep: ''

     

       182
       182
       +
                     mkdir -p $out/src/`dirname ${dep.root}`

     

       183
       183
       +
                     ln -s ${dep.src} $out/src/${dep.root}

     

       184
       184
       +
                   '') goDeps);

     

       185
       185
       +
       }

+3 -3

pkgs/shells/fish/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, ncurses, python27, which, groff, gettext, man_db, bc }:

     

       1
       1
       +
       { stdenv, fetchurl, ncurses, python, which, groff, gettext, man_db, bc }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

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

     
···

       12
       12
        
         buildInputs = [ ncurses ];

     

       13
       13
        
       

     

       14
       14
        
         # Required binaries during execution

     

       15
       15
       -
         # Python27: Autocompletion generated from manpages and config editing

     

       16
       16
       -
         propagatedBuildInputs = [ python27 which groff gettext man_db bc ];

     

       15
       15
       +
         # Python: Autocompletion generated from manpages and config editing

     

       16
       16
       +
         propagatedBuildInputs = [ python which groff gettext man_db bc ];

     

       17
       17
        
       

     

       18
       18
        
         postInstall = ''

     

       19
       19
        
           sed -i "s|bc|${bc}/bin/bc|" "$out/share/fish/functions/seq.fish"

+37

pkgs/tools/filesystems/ceph/default.nix

···

       1
       1
       +
       {stdenv, fetchgit, libatomic_ops, autoconf, automake, boost, btrfsProgs, cryptopp, curl, expat,

     

       2
       2
       +
        fcgi, fuse, gperftools, keyutils, leveldb, libaio, libedit, libtool,

     

       3
       3
       +
        libuuid, linuxHeaders, openssl, pkgconfig, python, snappy, which, xfsprogs, xz}:

     

       4
       4
       +
       

     

       5
       5
       +
       stdenv.mkDerivation rec {

     

       6
       6
       +
         baseName="ceph";

     

       7
       7
       +
         version="0.79";

     

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

     

       9
       9
       +
         buildInputs = [

     

       10
       10
       +
           fuse linuxHeaders pkgconfig libatomic_ops autoconf automake boost btrfsProgs cryptopp expat

     

       11
       11
       +
           fcgi fuse gperftools keyutils leveldb libaio libedit libtool libuuid openssl pkgconfig

     

       12
       12
       +
           python snappy which xfsprogs.lib xz

     

       13
       13
       +
         ];

     

       14
       14
       +
       

     

       15
       15
       +
         preConfigure = ''

     

       16
       16
       +
           ./autogen.sh

     

       17
       17
       +
         '';

     

       18
       18
       +
       

     

       19
       19
       +
         installFlags = "DESTDIR=\${out}";

     

       20
       20
       +
       

     

       21
       21
       +
         enableParallelBuilding = true;

     

       22
       22
       +
         src = fetchgit {

     

       23
       23
       +
           url = "https://github.com/ceph/ceph";

     

       24
       24
       +
           rev = "4c2d73a5095f527c3a2168deb5fa54b3c8991a6e";

     

       25
       25
       +
           sha256 = "0850m817wqqmw2qdnwm5jvbdgifzlc7kcd05jv526pdvmq1x92rf";

     

       26
       26
       +
         };

     

       27
       27
       +
       

     

       28
       28
       +
         meta = {

     

       29
       29
       +
           inherit version;

     

       30
       30
       +
           description = "Distributed storage system";

     

       31
       31
       +
           maintainers = [

     

       32
       32
       +
             stdenv.lib.maintainers.ak

     

       33
       33
       +
           ];

     

       34
       34
       +
           platforms = with stdenv.lib.platforms; 

     

       35
       35
       +
             linux;

     

       36
       36
       +
         };

     

       37
       37
       +
       }

+16 -1

pkgs/tools/filesystems/xfsprogs/default.nix

···

       12
       12
        
           sed -i s,/bin/bash,`type -P bash`, install-sh

     

       13
       13
        
         '';

     

       14
       14
        
       

     

       15
       15
       +
         outputs = ["out" "lib"];

     

       16
       16
       +
       

     

       17
       17
       +
         postInstall = ''

     

       18
       18
       +
           (cd include; make install-dev)

     

       19
       19
       +
           # The make install-dev target is broken when --disable-shared

     

       20
       20
       +
           mkdir -p $lib/lib $lib/include

     

       21
       21
       +
           cp ./libhandle/.libs/libhandle.a \

     

       22
       22
       +
              ./libxcmd/.libs/libxcmd.a \

     

       23
       23
       +
              ./libxlog/.libs/libxlog.a \

     

       24
       24
       +
              ./libxfs/.libs/libxfs.a $lib/lib

     

       25
       25
       +
           mv $out/include/* $lib/include

     

       26
       26
       +
         '';

     

       27
       27
       +
       

     

       28
       28
       +
         enableParallelBuilding = true;

     

       29
       29
       +
       

     

       15
       30
        
         buildInputs = [ libtool gettext libuuid ];

     

       16
       31
        
       

     

       17
       32
        
         configureFlags = "MAKE=make MSGFMT=msgfmt MSGMERGE=msgmerge XGETTEXT=xgettext ZIP=gzip AWK=gawk --disable-shared";

     

       18
       33
        
         preConfigure = ''

     

       19
       19
       -
           configureFlags="$configureFlags root_sbindir=$out/sbin root_libdir=$out/lib"

     

       34
       34
       +
           configureFlags="$configureFlags root_sbindir=$out/sbin root_libdir=$lib/lib"

     

       20
       35
        
         '';

     

       21
       36
        
         disableStatic = false;

     

       22
       37

+2 -2

pkgs/tools/graphics/povray/default.nix

···

       4
       4
        
         name = "povray-3.6";

     

       5
       5
        
       

     

       6
       6
        
         src = fetchurl {

     

       7
       7
       -
           url = http://www.povray.org/redirect/www.povray.org/ftp/pub/povray/Official/Unix/povray-3.6.tar.bz2;

     

       8
       8
       -
           sha256 = "0wvsfgkybx28mj2p76nnsq9rdq50192g5qb7d0xk81s8skn7z2jf";

     

       7
       7
       +
           url = http://www.povray.org/ftp/pub/povray/Old-Versions/Official-3.62/Unix/povray-3.6.tar.bz2;

     

       8
       8
       +
           sha256 = "4e8a7fecd44807343b6867e1f2440aa0e09613d6d69a7385ac48f4e5e7737a73";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
        
         # the installPhase wants to put files into $HOME. I let it put the files

+3 -3

pkgs/tools/misc/gummiboot/default.nix

···

       1
       1
        
       { stdenv, fetchurl, gnu-efi, unzip, pkgconfig, utillinux, libxslt, docbook_xsl, docbook_xml_dtd_42 }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "gummiboot-43";

     

       4
       4
       +
         name = "gummiboot-45";

     

       5
       5
        
       

     

       6
       6
        
         buildInputs = [ gnu-efi pkgconfig libxslt utillinux ];

     

       7
       7
        
       

     
···

       13
       13
        
         ];

     

       14
       14
        
       

     

       15
       15
        
         src = fetchurl {

     

       16
       16
       -
           url = http://pkgs.fedoraproject.org/repo/pkgs/gummiboot/gummiboot-43.tar.xz/c9b46a3504a2f7e335404a1475818d98/gummiboot-43.tar.xz;

     

       17
       17
       -
           sha256 = "1hwaan3985ap9r5ncf9bykbaixbm0xn4x09silssngwfl2srn4iv";

     

       16
       16
       +
           url = http://pkgs.fedoraproject.org/repo/pkgs/gummiboot/gummiboot-45.tar.xz/5d4957390e959cb9f325b87712ddd3f1/gummiboot-45.tar.xz;

     

       17
       17
       +
           md5 = "5d4957390e959cb9f325b87712ddd3f1";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         meta = {

+3 -3

pkgs/tools/misc/ngrok/default.nix

···

       30
       30
        
           url = "https://launchpad.net/goyaml";

     

       31
       31
        
           sha256 = "03is37cgw62cha316xrs5h7q97im46ry5qldkfvbhimjq3ww0swj";

     

       32
       32
        
           # Branch: "branch:lp:goyaml"

     

       33
       33
       -
           revision = 47;

     

       33
       33
       +
           rev = 47;

     

       34
       34
        
         };

     

       35
       35
        
         log4go = fetchhg {

     

       36
       36
        
           url = "https://code.google.com/p/log4go/";

     

       37
       37
       -
           tag = "c3294304d93f";

     

       37
       37
       +
           rev = "c3294304d93f";

     

       38
       38
        
           sha256 = "0q906sxrmwir295virfibqvdzlaj340qh2r4ysx1ccjrjazc0q5p";

     

       39
       39
        
         };

     

       40
       40
        
         osext = fetchhg {

     

       41
       41
        
           url = "https://bitbucket.org/kardianos/osext";

     

       42
       42
       -
           tag = "364fb57";

     

       42
       42
       +
           rev = "364fb57";

     

       43
       43
        
           sha256 = "1w9x2zj716agfd5x5497ajb9nz3ljar74768vjidsyly143vzjws";

     

       44
       44
        
         };

     

       45
       45
        
       in stdenv.mkDerivation rec {

+2 -2

pkgs/tools/networking/network-manager-applet/default.nix

···

       2
       2
        
       , libnotify, libsecret, dbus_glib, polkit, isocodes, libgnome_keyring 

     

       3
       3
        
       , mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas

     

       4
       4
        
       , makeWrapper, networkmanager_openvpn, networkmanager_vpnc

     

       5
       5
       -
       , networkmanager_openconnect, networkmanager_pptp, udev, hicolor_icon_theme }:

     

       5
       5
       +
       , networkmanager_openconnect, networkmanager_pptp, udev, hicolor_icon_theme, dconf }:

     

       6
       6
        
       

     

       7
       7
        
       let

     

       8
       8
        
         pn = "network-manager-applet";

     
···

       51
       51
        
       

     

       52
       52
        
         preFixup = ''

     

       53
       53
        
           wrapProgram "$out/bin/nm-applet" \

     

       54
       54
       -
             --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \

     

       54
       54
       +
             --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules:${dconf}/lib/gio/modules" \

     

       55
       55
        
             --prefix XDG_DATA_DIRS : "${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \

     

       56
       56
        
             --set GCONF_CONFIG_SOURCE "xml::~/.gconf" \

     

       57
       57
        
             --prefix PATH ":" "${gnome3.gconf}/bin"

+2 -2

pkgs/tools/package-management/cabal-install/1.20.0.2.nix pkgs/tools/package-management/cabal-install/1.20.0.3.nix

···

       5
       5
        
       

     

       6
       6
        
       cabal.mkDerivation (self: {

     

       7
       7
        
         pname = "cabal-install";

     

       8
       8
       -
         version = "1.20.0.2";

     

       9
       9
       -
         sha256 = "1nsc8qklhlg2xpaj7k158gg45rlrp7mn15zyfsgjpaqf3rjm9dl4";

     

       8
       8
       +
         version = "1.20.0.3";

     

       9
       9
       +
         sha256 = "050b9dc4khfc1fs283p1635zni25z4b55gi5ffwvg4mfpkrmdgfj";

     

       10
       10
        
         isLibrary = false;

     

       11
       11
        
         isExecutable = true;

     

       12
       12
        
         buildDepends = [

+9 -4

pkgs/tools/package-management/nix-prefetch-scripts/default.nix

···

       1
       1
       -
       { stdenv, makeWrapper, git, subversion, mercurial, bazaar, cvs }:

     

       1
       1
       +
       { stdenv, makeWrapper, git, subversion, mercurial, bazaar, cvs, unzip, curl, gnused }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation {

     

       4
       4
        
         name = "nix-prefetch-scripts";

     
···

       11
       11
        
           function copyScript {

     

       12
       12
        
             local name=nix-prefetch-$1;

     

       13
       13
        
             local src=$2;

     

       14
       14
       -
             local exe=$3/bin;

     

       14
       14
       +
             local wrapArgs=""

     

       15
       15
        
             cp $src $out/bin/$name;

     

       16
       16
       -
             wrapProgram $out/bin/$name --suffix PATH : "$exe"

     

       16
       16
       +
             for dep in ''${@:3}; do

     

       17
       17
       +
               wrapArgs="$wrapArgs --prefix PATH : $dep/bin"

     

       18
       18
       +
             done

     

       19
       19
       +
             wrapArgs="$wrapArgs --prefix PATH : ${gnused}/bin"

     

       20
       20
       +
             wrapProgram $out/bin/$name $wrapArgs

     

       17
       21
        
           }

     

       18
       22
        
       

     

       19
       23
        
           copyScript "hg" ${../../../build-support/fetchhg/nix-prefetch-hg} ${mercurial}

     
···

       21
       25
        
           copyScript "svn" ${../../../build-support/fetchsvn/nix-prefetch-svn} ${subversion}

     

       22
       26
        
           copyScript "bzr" ${../../../build-support/fetchbzr/nix-prefetch-bzr} ${bazaar}

     

       23
       27
        
           copyScript "cvs" ${../../../build-support/fetchcvs/nix-prefetch-cvs} ${cvs}

     

       28
       28
       +
           copyScript "zip" ${../../../build-support/fetchzip/nix-prefetch-zip} ${unzip} ${curl}

     

       24
       29
        
         '';

     

       25
       30
        
       

     

       26
       31
        
         meta = with stdenv.lib; {

     
···

       30
       35
        
           # Quicker to build than to download, I hope

     

       31
       36
        
           hydraPlatforms = [];

     

       32
       37
        
         };

     

       33
       33
       -
       }
     

       38
       38
       +
       }

+3 -1

pkgs/tools/package-management/nix/unstable.nix

···

       14
       14
        
       

     

       15
       15
        
         nativeBuildInputs = [ perl pkgconfig ];

     

       16
       16
        
       

     

       17
       17
       -
         buildInputs = [ curl openssl boehmgc sqlite ];

     

       17
       17
       +
         buildInputs = [ curl openssl sqlite ];

     

       18
       18
       +
       

     

       19
       19
       +
         propagatedBuildInputs = [ boehmgc ];

     

       18
       20
        
       

     

       19
       21
        
         # Note: bzip2 is not passed as a build input, because the unpack phase

     

       20
       22
        
         # would end up using the wrong bzip2 when cross-compiling.

+27 -8

pkgs/tools/security/ecryptfs/default.nix

···

       1
       1
       -
       {stdenv, fetchurl, fuse, python, perl, keyutils, pam, nss, nspr}:

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, perl, keyutils, nss, nspr, python, pam

     

       2
       2
       +
       , intltool, makeWrapper, coreutils, gettext, cryptsetup, lvm2, rsync, which }:

     

       3
       3
       +
       

     

       2
       4
        
       stdenv.mkDerivation {

     

       3
       3
       -
         name = "ecryptfs-82";

     

       5
       5
       +
         name = "ecryptfs-104";

     

       4
       6
        
       

     

       5
       7
        
         src = fetchurl {

     

       6
       6
       -
           url = http://launchpad.net/ecryptfs/trunk/82/+download/ecryptfs-utils_82.orig.tar.gz;

     

       7
       7
       -
           sha256 = "1w3swispgp71prz8h56hqby2wwnvam5vllqvc69rn8cf605i69a6";

     

       8
       8
       +
           url = http://launchpad.net/ecryptfs/trunk/104/+download/ecryptfs-utils_104.orig.tar.gz;

     

       9
       9
       +
           sha256 = "0f3lzpjw97vcdqzzgii03j3knd6pgwn1y0lpaaf46iidaiv0282a";

     

       8
       10
        
         };

     

       9
       11
        
       

     

       10
       10
       -
         NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss";

     

       12
       12
       +
         buildInputs = [ pkgconfig perl nss nspr python pam intltool makeWrapper ];

     

       13
       13
       +
         propagatedBuildInputs = [ coreutils gettext cryptsetup lvm2 rsync keyutils which ];

     

       11
       14
        
       

     

       12
       12
       -
         buildInputs = [ python perl keyutils pam nss nspr ];

     

       15
       15
       +
         postInstall = ''

     

       16
       16
       +
           FILES="$(grep -r '/bin/sh' $out/bin | sed 's,:.*,,' | uniq)"

     

       17
       17
       +
           for file in $FILES; do

     

       18
       18
       +
             sed -i $file -e "s,\(/sbin/u\?mount.ecryptfs\(_private\)\?\),$out\1," \

     

       19
       19
       +
               -e "s,\(/sbin/cryptsetup\),${cryptsetup}\1," \

     

       20
       20
       +
               -e "s,\(/sbin/dmsetup\),${lvm2}\1," \

     

       21
       21
       +
               -e 's,/sbin/\(unix_chkpwd\),\1,'

     

       22
       22
       +
             wrapProgram $file \

     

       23
       23
       +
               --prefix PATH ":" "${coreutils}/bin" \

     

       24
       24
       +
               --prefix PATH ":" "${gettext}/bin" \

     

       25
       25
       +
               --prefix PATH ":" "${rsync}/bin" \

     

       26
       26
       +
               --prefix PATH ":" "${keyutils}/bin" \

     

       27
       27
       +
               --prefix PATH ":" "${which}/bin" \

     

       28
       28
       +
               --prefix PATH ":" "$out/bin"

     

       29
       29
       +
           done

     

       30
       30
       +
         '';

     

       13
       31
        
       

     

       14
       14
       -
         meta = {

     

       32
       32
       +
         meta = with stdenv.lib; {

     

       15
       33
        
           description = "Enterprise-class stacked cryptographic filesystem";

     

       16
       16
       -
           license = "GPLv2+";

     

       34
       34
       +
           license = licenses.gpl2Plus;

     

       35
       35
       +
           platforms = platforms.linux;

     

       17
       36
        
         };

     

       18
       37
        
       }

+2 -2

pkgs/tools/security/gnupg/default.nix

···

       13
       13
        
       assert useCurl -> (curl != null);

     

       14
       14
        
       

     

       15
       15
        
       stdenv.mkDerivation rec {

     

       16
       16
       -
         name = "gnupg-2.0.22";

     

       16
       16
       +
         name = "gnupg-2.0.24";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchurl {

     

       19
       19
        
           url = "mirror://gnupg/gnupg/${name}.tar.bz2";

     

       20
       20
       -
           sha256 = "0lg210acj2rxq291q4cwamg9gx6gh2prb1xa93y5jhw5b6r0lza3";

     

       20
       20
       +
           sha256 = "0ch2hbindk832cy7ca00a7whw84ndm0nhqrl24a5fw4ldkca2x6r";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         buildInputs

+2 -2

pkgs/tools/security/gnupg1/default.nix

···

       1
       1
        
       { stdenv, fetchurl, readline, bzip2 }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "gnupg-1.4.16";

     

       4
       4
       +
         name = "gnupg-1.4.17";

     

       5
       5
        
       

     

       6
       6
        
         src = fetchurl {

     

       7
       7
        
           url = "mirror://gnupg/gnupg/${name}.tar.bz2";

     

       8
       8
       -
           sha256 = "0bsa1yqa3ybhvmc4ys73amdpcmckrlq1fsxjl2980cxada778fvv";

     

       8
       8
       +
           sha256 = "0nvv1bd8v13gh2m1429azws7ks0ix9y1yv87ak9k9i1dsqcrvpg6";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
        
         buildInputs = [ readline bzip2 ];

+1 -1

pkgs/tools/security/meo/default.nix

···

       5
       5
        
         

     

       6
       6
        
         src = fetchhg {

     

       7
       7
        
           url = http://oss.stamfest.net/hg/meo;

     

       8
       8
       -
           tag = "b48e5f16cff8";

     

       8
       8
       +
           rev = "b48e5f16cff8";

     

       9
       9
        
           sha256 = "0ifg7y28s89i9gwda6fyj1jbrykbcvq8bf1m6rxmdcv5afi3arbq";

     

       10
       10
        
         };

     

       11
       11

+22 -18

pkgs/tools/security/sudo/default.nix

···

       11
       11
        
           sha256 = "002l6h27pnhb77b65frhazbhknsxvrsnkpi43j7i0qw1lrgi7nkf";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         postConfigure = ''

     

       15
       15
       -
           cat >> pathnames.h <<EOF

     

       16
       16
       -
           #undef  _PATH_SUDO_LOGFILE

     

       17
       17
       -
           #define _PATH_SUDO_LOGFILE "/var/log/sudo.log"

     

       18
       18
       -
           #undef  _PATH_SUDO_TIMEDIR

     

       19
       19
       -
           #define _PATH_SUDO_TIMEDIR "/run/sudo"

     

       20
       20
       -
           #undef  _PATH_VI

     

       21
       21
       -
           #define _PATH_VI "/run/current-system/sw/bin/nano"

     

       22
       22
       -
           #undef  _PATH_MV

     

       23
       23
       -
           #define _PATH_MV "${coreutils}/bin/mv"

     

       24
       24
       -
           EOF

     

       14
       14
       +
         configureFlags = [

     

       15
       15
       +
           "--with-env-editor"

     

       16
       16
       +
           "--with-editor=/run/current-system/sw/bin/nano"

     

       17
       17
       +
           "--with-rundir=/var/run"

     

       18
       18
       +
           "--with-vardir=/var/db/sudo"

     

       19
       19
       +
           "--with-logpath=/var/log/sudo.log"

     

       20
       20
       +
         ];

     

       25
       21
        
       

     

       22
       22
       +
         postConfigure =

     

       23
       23
       +
           ''

     

       24
       24
       +
           cat >> pathnames.h <<'EOF'

     

       25
       25
       +
             #undef _PATH_MV

     

       26
       26
       +
             #define _PATH_MV "${coreutils}/bin/mv"

     

       27
       27
       +
           EOF

     

       26
       28
        
           makeFlags="install_uid=$(id -u) install_gid=$(id -g)"

     

       27
       27
       -
           installFlags="sudoers_uid=$(id -u) sudoers_gid=$(id -g) sysconfdir=$out/etc timedir=$TMPDIR/dummy"

     

       28
       28
       -
         '';

     

       29
       29
       +
           installFlags="sudoers_uid=$(id -u) sudoers_gid=$(id -g) sysconfdir=$out/etc rundir=$TMPDIR/dummy vardir=$TMPDIR/dummy"

     

       30
       30
       +
           '';

     

       29
       31
        
       

     

       30
       32
        
         buildInputs = [ coreutils pam groff ];

     

       31
       33
        
       

     

       32
       34
        
         enableParallelBuilding = true;

     

       33
       35
        
       

     

       34
       34
       -
         postInstall = ''

     

       35
       35
       -
           rm $out/share/doc/sudo/ChangeLog

     

       36
       36
       -
         '';

     

       36
       36
       +
         postInstall = 

     

       37
       37
       +
           ''

     

       38
       38
       +
           rm -f $out/share/doc/sudo/ChangeLog

     

       39
       39
       +
           '';

     

       37
       40
        
       

     

       38
       41
        
         meta = {

     

       39
       42
        
           description = "A command to run commands as root";

     

       40
       43
        
       

     

       41
       41
       -
           longDescription = ''

     

       44
       44
       +
           longDescription = 

     

       45
       45
       +
             ''

     

       42
       46
        
             Sudo (su "do") allows a system administrator to delegate

     

       43
       47
        
             authority to give certain users (or groups of users) the ability

     

       44
       48
        
             to run some (or all) commands as root or another user while

     

       45
       49
        
             providing an audit trail of the commands and their arguments.

     

       46
       46
       -
           '';

     

       50
       50
       +
             '';

     

       47
       51
        
       

     

       48
       52
        
           homepage = http://www.sudo.ws/;

     

       49
       53

+1 -1

pkgs/tools/system/storebrowse/default.nix

···

       14
       14
        
         # This source has license BSD

     

       15
       15
        
         srcGoSqlite = fetchhg {

     

       16
       16
        
           url = "https://code.google.com/p/gosqlite/";

     

       17
       17
       -
           tag = "5baefb109e18";

     

       17
       17
       +
           rev = "5baefb109e18";

     

       18
       18
        
           sha256 = "0mqfnx06jj15cs8pq9msny2z18x99hgk6mchnaxpg343nzdiz4zk";

     

       19
       19
        
         };

     

       20
       20

+8 -3

pkgs/tools/system/syslog-ng/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, eventlog, pkgconfig, glib, python }:

     

       1
       1
       +
       { stdenv, fetchurl, eventlog, pkgconfig, glib, python, systemd, perl }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation {

     

       4
       4
        
         name = "syslog-ng-3.5.4.1";

     
···

       8
       8
        
           sha256 = "0rkgrmnyx1x6m3jw5n49k7r1dcg79lxh900g74rgvd3j86g9dilj";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
       -
         buildInputs = [ eventlog pkgconfig glib python ];

     

       12
       12
       -
         configureFlags = "--enable-dynamic-linking";

     

       11
       11
       +
         buildInputs = [ eventlog pkgconfig glib python systemd perl ];

     

       12
       12
       +
       

     

       13
       13
       +
         configureFlags = [

     

       14
       14
       +
           "--enable-dynamic-linking"

     

       15
       15
       +
           "--enable-systemd"

     

       16
       16
       +
           "--with-systemdsystemunitdir=$(out)/etc/systemd/system"

     

       17
       17
       +
         ];

     

       13
       18
        
       

     

       14
       19
        
         meta = {

     

       15
       20
        
           homepage = "http://www.balabit.com/network-security/syslog-ng/";

+1 -1

pkgs/tools/text/diffstat/default.nix

···

       17
       17
        
           '';

     

       18
       18
        
           homepage = http://invisible-island.net/diffstat/;

     

       19
       19
        
           license = licenses.mit;

     

       20
       20
       -
           platforms = platforms.linux;

     

       20
       20
       +
           platforms = platforms.unix;

     

       21
       21
        
           maintainers = [ maintainers.bjornfor ];

     

       22
       22
        
         };

     

       23
       23
        
       }

+28

pkgs/tools/typesetting/djvu2pdf/default.nix

···

       1
       1
       +
       {stdenv, fetchurl, pkgconfig, djvulibre, ghostscript }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         version = "0.9.2";

     

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

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchurl {

     

       8
       8
       +
           url = "http://0x2a.at/site/projects/djvu2pdf/djvu2pdf-${version}.tar.gz";

     

       9
       9
       +
           sha256 = "0v2ax30m7j1yi4m02nzn9rc4sn4vzqh5vywdh96r64j4pwvn5s5g";

     

       10
       10
       +
         };

     

       11
       11
       +
       

     

       12
       12
       +
         buildInputs = [ pkgconfig ];

     

       13
       13
       +
         propagatedUserEnvPkgs = [ djvulibre ghostscript ];

     

       14
       14
       +
       

     

       15
       15
       +
         installPhase = ''

     

       16
       16
       +
           ensureDir $out/bin

     

       17
       17
       +
           cp -p djvu2pdf $out/bin

     

       18
       18
       +
           ensureDir $out/man/man1

     

       19
       19
       +
           cp -p djvu2pdf.1.gz $out/man/man1

     

       20
       20
       +
         '';

     

       21
       21
       +
       

     

       22
       22
       +
         meta = {

     

       23
       23
       +
           description = "Creates djvu files from PDF files";

     

       24
       24
       +
           homepage = http://0x2a.at/s/projects/djvu2pdf;

     

       25
       25
       +
           license = stdenv.lib.licenses.gpl2;

     

       26
       26
       +
           inherit version;

     

       27
       27
       +
         };

     

       28
       28
       +
       }

+108 -24

pkgs/top-level/all-packages.nix

···

       320
       320
        
       

     

       321
       321
        
         fetchmtn = callPackage ../build-support/fetchmtn (config.fetchmtn or {});

     

       322
       322
        
       

     

       323
       323
       +
         packer = callPackage ../development/tools/packer { };

     

       324
       324
       +
       

     

       323
       325
        
         fetchpatch = callPackage ../build-support/fetchpatch { };

     

       324
       326
        
       

     

       325
       327
        
         fetchsvn = import ../build-support/fetchsvn {

     
···

       725
       727
        
         cdrdao = callPackage ../tools/cd-dvd/cdrdao { };

     

       726
       728
        
       

     

       727
       729
        
         cdrkit = callPackage ../tools/cd-dvd/cdrkit { };

     

       730
       730
       +
       

     

       731
       731
       +
         ceph = callPackage ../tools/filesystems/ceph { };

     

       728
       732
        
       

     

       729
       733
        
         cfdg = builderDefsPackage ../tools/graphics/cfdg {

     

       730
       734
        
           inherit libpng bison flex ffmpeg;

     
···

       1594
       1598
        
       

     

       1595
       1599
        
         networkmanager_openconnect = callPackage ../tools/networking/network-manager/openconnect.nix { };

     

       1596
       1600
        
       

     

       1597
       1597
       -
         networkmanagerapplet = newScope gnome ../tools/networking/network-manager-applet { };

     

       1601
       1601
       +
         networkmanagerapplet = newScope gnome ../tools/networking/network-manager-applet { dconf = gnome3.dconf; };

     

       1598
       1602
        
       

     

       1599
       1603
        
         newsbeuter = callPackage ../applications/networking/feedreaders/newsbeuter { };

     

       1600
       1604
        
       

     
···

       2474
       2478
        
       

     

       2475
       2479
        
         dash = callPackage ../shells/dash { };

     

       2476
       2480
        
       

     

       2477
       2477
       -
         fish = callPackage ../shells/fish { };

     

       2481
       2481
       +
         fish = callPackage ../shells/fish {

     

       2482
       2482
       +
           python = python27Full;

     

       2483
       2483
       +
         };

     

       2478
       2484
        
       

     

       2479
       2485
        
         tcsh = callPackage ../shells/tcsh { };

     

       2480
       2486
        
       

     
···

       2971
       2977
        
       

     

       2972
       2978
        
         go = go_1_3;

     

       2973
       2979
        
       

     

       2980
       2980
       +
         gox = callPackage ../development/compilers/go/gox.nix { };

     

       2981
       2981
       +
       

     

       2974
       2982
        
         gprolog = callPackage ../development/compilers/gprolog { };

     

       2975
       2983
        
       

     

       2976
       2984
        
         gwt240 = callPackage ../development/compilers/gwt/2.4.0.nix { };

     
···

       3012
       3020
        
         jdk = if stdenv.isDarwin || stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"

     

       3013
       3021
        
           then pkgs.openjdk

     

       3014
       3022
        
           else pkgs.oraclejdk;

     

       3015
       3015
       -
         jre = if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"

     

       3023
       3023
       +
         jre = if stdenv.isDarwin || stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"

     

       3016
       3024
        
           then pkgs.openjre

     

       3017
       3025
        
           else pkgs.oraclejre;

     

       3018
       3026
        
       

     
···

       3020
       3028
        
       

     

       3021
       3029
        
         oraclejdk7 = pkgs.oraclejdk7distro true false;

     

       3022
       3030
        
       

     

       3031
       3031
       +
         oraclejdk8 = pkgs.oraclejdk8distro true false;

     

       3032
       3032
       +
       

     

       3023
       3033
        
         oraclejre = lowPrio (pkgs.jdkdistro false false);

     

       3024
       3034
        
       

     

       3025
       3035
        
         oraclejre7 = lowPrio (pkgs.oraclejdk7distro false false);

     

       3026
       3036
        
       

     

       3037
       3037
       +
         oraclejre8 = lowPrio (pkgs.oraclejdk8distro false false);

     

       3038
       3038
       +
       

     

       3027
       3039
        
         jrePlugin = lowPrio (pkgs.jdkdistro false true);

     

       3028
       3040
        
       

     

       3029
       3041
        
         supportsJDK =

     
···

       3039
       3051
        
           assert supportsJDK;

     

       3040
       3052
        
           (if pluginSupport then appendToName "with-plugin" else x: x)

     

       3041
       3053
        
             (callPackage ../development/compilers/jdk/jdk7-linux.nix { inherit installjdk; });

     

       3054
       3054
       +
       

     

       3055
       3055
       +
         oraclejdk8distro = installjdk: pluginSupport:

     

       3056
       3056
       +
           assert supportsJDK;

     

       3057
       3057
       +
           (if pluginSupport then appendToName "with-plugin" else x: x)

     

       3058
       3058
       +
             (callPackage ../development/compilers/jdk/jdk8-linux.nix { inherit installjdk; });

     

       3042
       3059
        
       

     

       3043
       3060
        
         jikes = callPackage ../development/compilers/jikes { };

     

       3044
       3061
        
       

     
···

       3161
       3178
        
           };

     

       3162
       3179
        
       

     

       3163
       3180
        
           ocaml_cairo = callPackage ../development/ocaml-modules/ocaml-cairo { };

     

       3181
       3181
       +
       

     

       3182
       3182
       +
           cppo = callPackage ../development/tools/ocaml/cppo { };

     

       3164
       3183
        
       

     

       3165
       3184
        
           cryptokit = callPackage ../development/ocaml-modules/cryptokit { };

     

       3166
       3185
        
       

     
···

       3278
       3297
        
       

     

       3279
       3298
        
         rust = callPackage ../development/compilers/rust {};

     

       3280
       3299
        
       

     

       3281
       3281
       -
         sbcl = builderDefsPackage (import ../development/compilers/sbcl) {

     

       3282
       3282
       -
           inherit makeWrapper;

     

       3300
       3300
       +
         sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {};

     

       3301
       3301
       +
         sbcl = callPackage ../development/compilers/sbcl {

     

       3283
       3302
        
           clisp = clisp_2_44_1;

     

       3284
       3303
        
         };

     

       3285
       3304
        
       

     
···

       3290
       3309
        
       

     

       3291
       3310
        
         sdcc = callPackage ../development/compilers/sdcc { };

     

       3292
       3311
        
       

     

       3312
       3312
       +
         smlnjBootstrap = callPackage ../development/compilers/smlnj/bootstrap.nix { };

     

       3293
       3313
        
         smlnj = callPackage_i686 ../development/compilers/smlnj { };

     

       3294
       3314
        
       

     

       3295
       3315
        
         stalin = callPackage ../development/compilers/stalin { };

     
···

       3435
       3455
        
         lua5 = lua5_1;

     

       3436
       3456
        
       

     

       3437
       3457
        
         lua5_sockets = callPackage ../development/interpreters/lua-5/sockets.nix {};

     

       3458
       3458
       +
         lua5_expat = callPackage ../development/interpreters/lua-5/expat.nix {};

     

       3438
       3459
        
       

     

       3439
       3460
        
         luarocks = callPackage ../development/tools/misc/luarocks {

     

       3440
       3461
        
            lua = lua5;

     
···

       3482
       3503
        
         perl516 = callPackage ../development/interpreters/perl/5.16 {

     

       3483
       3504
        
           fetchurl = fetchurlBoot;

     

       3484
       3505
        
         };

     

       3506
       3506
       +
       

     

       3507
       3507
       +
         perl520 = callPackage ../development/interpreters/perl/5.20 { };

     

       3485
       3508
        
       

     

       3486
       3509
        
         perl = if system != "i686-cygwin" then perl516 else sysPerl;

     

       3487
       3510
        
       

     
···

       4605
       4628
        
               ln -s $glibc32/lib $out/lib/32

     

       4606
       4629
        
               ln -s lib $out/lib64

     

       4607
       4630
        
       

     

       4631
       4631
       +
               # fixing ldd RLTDLIST

     

       4632
       4632
       +
               rm $out/bin

     

       4633
       4633
       +
               cp -rs $glibc64/bin $out

     

       4634
       4634
       +
               chmod u+w $out/bin

     

       4635
       4635
       +
               rm $out/bin/ldd

     

       4636
       4636
       +
               sed -e "s|^RTLDLIST=.*$|RTLDLIST=\"$out/lib/ld-2.19.so $out/lib/32/ld-linux.so.2\"|g" \

     

       4637
       4637
       +
                   $glibc64/bin/ldd > $out/bin/ldd

     

       4638
       4638
       +
               chmod 555 $out/bin/ldd

     

       4639
       4639
       +
       

     

       4608
       4640
        
               rm $out/include

     

       4609
       4641
        
               cp -rs $glibc32/include $out

     

       4610
       4642
        
               chmod -R u+w $out/include

     
···

       4615
       4647
        
         glm = callPackage ../development/libraries/glm { };

     

       4616
       4648
        
       

     

       4617
       4649
        
         glog = callPackage ../development/libraries/glog { };

     

       4650
       4650
       +
       

     

       4651
       4651
       +
         gloox = callPackage ../development/libraries/gloox { };

     

       4618
       4652
        
       

     

       4619
       4653
        
         glpk = callPackage ../development/libraries/glpk { };

     

       4620
       4654
        
       

     
···

       4949
       4983
        
       

     

       4950
       4984
        
         libassuan2_1 = callPackage ../development/libraries/libassuan/git.nix { };

     

       4951
       4985
        
       

     

       4986
       4986
       +
         libatomic_ops = callPackage ../development/libraries/libatomic_ops {};

     

       4987
       4987
       +
       

     

       4952
       4988
        
         libav = libav_10;

     

       4953
       4989
        
         libav_all = callPackage ../development/libraries/libav { };

     

       4954
       4990
        
         inherit (libav_all) libav_0_8 libav_9 libav_10;

     
···

       5081
       5117
        
       

     

       5082
       5118
        
         liblscp = callPackage ../development/libraries/liblscp { };

     

       5083
       5119
        
       

     

       5120
       5120
       +
         libe-book = callPackage ../development/libraries/libe-book {};

     

       5121
       5121
       +
         libe-book_00 = callPackage ../development/libraries/libe-book/0.0.nix {};

     

       5122
       5122
       +
       

     

       5084
       5123
        
         libev = builderDefsPackage ../development/libraries/libev { };

     

       5085
       5124
        
       

     

       5086
       5125
        
         libevent14 = callPackage ../development/libraries/libevent/1.4.nix { };

     
···

       5179
       5218
        
       

     

       5180
       5219
        
         libresample = callPackage ../development/libraries/libresample {};

     

       5181
       5220
        
       

     

       5221
       5221
       +
         librevenge = callPackage ../development/libraries/librevenge {};

     

       5222
       5222
       +
       

     

       5182
       5223
        
         librevisa = callPackage ../development/libraries/librevisa { };

     

       5183
       5224
        
       

     

       5184
       5225
        
         libsamplerate = callPackage ../development/libraries/libsamplerate {

     
···

       5287
       5328
        
       

     

       5288
       5329
        
         libmusicbrainz = libmusicbrainz3;

     

       5289
       5330
        
       

     

       5331
       5331
       +
         libmwaw = callPackage ../development/libraries/libmwaw { };

     

       5332
       5332
       +
         libmwaw_02 = callPackage ../development/libraries/libmwaw/0.2.nix { };

     

       5333
       5333
       +
       

     

       5290
       5334
        
         libmx = callPackage ../development/libraries/libmx { };

     

       5291
       5335
        
       

     

       5292
       5336
        
         libnet = callPackage ../development/libraries/libnet { };

     
···

       5302
       5346
        
         libnova = callPackage ../development/libraries/libnova { };

     

       5303
       5347
        
       

     

       5304
       5348
        
         libnxml = callPackage ../development/libraries/libnxml { };

     

       5349
       5349
       +
       

     

       5350
       5350
       +
         libodfgen = callPackage ../development/libraries/libodfgen { };

     

       5305
       5351
        
       

     

       5306
       5352
        
         libofa = callPackage ../development/libraries/libofa { };

     

       5307
       5353
        
       

     
···

       5680
       5726
        
       

     

       5681
       5727
        
         newt = callPackage ../development/libraries/newt { };

     

       5682
       5728
        
       

     

       5729
       5729
       +
         nix-plugins = callPackage ../development/libraries/nix-plugins {

     

       5730
       5730
       +
           nix = pkgs.nixUnstable;

     

       5731
       5731
       +
         };

     

       5732
       5732
       +
       

     

       5683
       5733
        
         nspr = callPackage ../development/libraries/nspr { };

     

       5684
       5734
        
       

     

       5685
       5735
        
         nss = lowPrio (callPackage ../development/libraries/nss { });

     
···

       5689
       5739
        
         };

     

       5690
       5740
        
       

     

       5691
       5741
        
         ntrack = callPackage ../development/libraries/ntrack { };

     

       5742
       5742
       +
       

     

       5743
       5743
       +
         nvidia-texture-tools = callPackage ../development/libraries/nvidia-texture-tools { };

     

       5692
       5744
        
       

     

       5693
       5745
        
         ode = builderDefsPackage (import ../development/libraries/ode) { };

     

       5694
       5746
        
       

     
···

       5747
       5799
        
           giflib = giflib_4_1;

     

       5748
       5800
        
           ffmpeg = ffmpeg_0_10;

     

       5749
       5801
        
         };

     

       5802
       5802
       +
       

     

       5803
       5803
       +
         openspades = callPackage ../games/openspades {};

     

       5750
       5804
        
       

     

       5751
       5805
        
         openssl = callPackage ../development/libraries/openssl {

     

       5752
       5806
        
           fetchurl = fetchurlBoot;

     
···

       6630
       6684
        
         dovecot22 = callPackage ../servers/mail/dovecot/2.2.x.nix { };

     

       6631
       6685
        
       

     

       6632
       6686
        
         dovecot_pigeonhole = callPackage ../servers/mail/dovecot-pigeonhole { };

     

       6687
       6687
       +
       

     

       6688
       6688
       +
         etcd = callPackage ../servers/etcd { };

     

       6633
       6689
        
       

     

       6634
       6690
        
         ejabberd = callPackage ../servers/xmpp/ejabberd {

     

       6635
       6691
        
           erlang = erlangR16;

     
···

       6637
       6693
        
       

     

       6638
       6694
        
         elasticmq = callPackage ../servers/elasticmq { };

     

       6639
       6695
        
       

     

       6696
       6696
       +
         etcdctl = callPackage ../development/tools/etcdctl { };

     

       6697
       6697
       +
       

     

       6640
       6698
        
         fcgiwrap = callPackage ../servers/fcgiwrap { };

     

       6641
       6699
        
       

     

       6642
       6700
        
         felix = callPackage ../servers/felix { };

     
···

       6647
       6705
        
       

     

       6648
       6706
        
         firebird = callPackage ../servers/firebird { icu = null; };

     

       6649
       6707
        
         firebirdSuper = callPackage ../servers/firebird { superServer = true; };

     

       6708
       6708
       +
       

     

       6709
       6709
       +
         fleet = callPackage ../servers/fleet { };

     

       6650
       6710
        
       

     

       6651
       6711
        
         freepops = callPackage ../servers/mail/freepops { };

     

       6652
       6712
        
       

     
···

       6708
       6768
        
       

     

       6709
       6769
        
         ngircd = callPackage ../servers/irc/ngircd { };

     

       6710
       6770
        
       

     

       6771
       6771
       +
         nix-binary-cache = callPackage ../servers/http/nix-binary-cache {};

     

       6772
       6772
       +
       

     

       6711
       6773
        
         nsd = callPackage ../servers/dns/nsd { };

     

       6774
       6774
       +
       

     

       6775
       6775
       +
         nsq = callPackage ../servers/nsq { };

     

       6712
       6776
        
       

     

       6713
       6777
        
         opensmtpd = callPackage ../servers/mail/opensmtpd { };

     

       6714
       6778
        
       

     
···

       7103
       7167
        
       

     

       7104
       7168
        
         ifplugd = callPackage ../os-specific/linux/ifplugd { };

     

       7105
       7169
        
       

     

       7170
       7170
       +
         iomelt = callPackage ../os-specific/linux/iomelt { };

     

       7171
       7171
       +
       

     

       7106
       7172
        
         iotop = callPackage ../os-specific/linux/iotop { };

     

       7107
       7173
        
       

     

       7108
       7174
        
         iproute = callPackage ../os-specific/linux/iproute { };

     
···

       7215
       7281
        
             ];

     

       7216
       7282
        
         };

     

       7217
       7283
        
       

     

       7218
       7218
       -
         linux_3_13 = makeOverridable (import ../os-specific/linux/kernel/linux-3.13.nix) {

     

       7219
       7219
       -
           inherit fetchurl stdenv perl buildLinux;

     

       7220
       7220
       -
           kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips")

     

       7221
       7221
       -
             [ kernelPatches.mips_fpureg_emu

     

       7222
       7222
       -
               kernelPatches.mips_fpu_sigill

     

       7223
       7223
       -
               kernelPatches.mips_ext3_n32

     

       7224
       7224
       -
             ];

     

       7225
       7225
       -
         };

     

       7226
       7226
       -
       

     

       7227
       7284
        
         linux_3_14 = makeOverridable (import ../os-specific/linux/kernel/linux-3.14.nix) {

     

       7228
       7285
        
           inherit fetchurl stdenv perl buildLinux;

     

       7229
       7286
        
           kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips")

     
···

       7388
       7445
        
         linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10 linuxPackages_3_10);

     

       7389
       7446
        
         linuxPackages_3_10_tuxonice = linuxPackagesFor pkgs.linux_3_10_tuxonice linuxPackages_3_10_tuxonice;

     

       7390
       7447
        
         linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12);

     

       7391
       7391
       -
         linuxPackages_3_13 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_13 linuxPackages_3_13);

     

       7392
       7448
        
         linuxPackages_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_14 linuxPackages_3_14);

     

       7393
       7449
        
         linuxPackages_3_15 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_15 linuxPackages_3_15);

     

       7394
       7450
        
         linuxPackages_testing = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing linuxPackages_testing);

     
···

       7480
       7536
        
         };

     

       7481
       7537
        
       

     

       7482
       7538
        
         numactl = callPackage ../os-specific/linux/numactl { };

     

       7539
       7539
       +
       

     

       7540
       7540
       +
         gocode = callPackage ../development/tools/gocode { };

     

       7483
       7541
        
       

     

       7484
       7542
        
         gogoclient = callPackage ../os-specific/linux/gogoclient { };

     

       7485
       7543
        
       

     
···

       7843
       7901
        
       

     

       7844
       7902
        
         inconsolata = callPackage ../data/fonts/inconsolata {};

     

       7845
       7903
        
       

     

       7904
       7904
       +
         ipafont = callPackage ../data/fonts/ipafont {};

     

       7905
       7905
       +
       

     

       7846
       7906
        
         junicode = callPackage ../data/fonts/junicode { };

     

       7847
       7907
        
       

     

       7908
       7908
       +
         kochi-substitute = callPackage ../data/fonts/kochi-substitute {};

     

       7909
       7909
       +
       

     

       7910
       7910
       +
         kochi-substitute-naga10 = callPackage ../data/fonts/kochi-substitute-naga10 {};

     

       7911
       7911
       +
       

     

       7848
       7912
        
         liberation_ttf = callPackage ../data/fonts/redhat-liberation-fonts { };

     

       7849
       7913
        
       

     

       7850
       7914
        
         libertine = builderDefsPackage (import ../data/fonts/libertine) {

     
···

       8065
       8129
        
       

     

       8066
       8130
        
         calibre = callPackage ../applications/misc/calibre { };

     

       8067
       8131
        
       

     

       8132
       8132
       +
         camlistore = callPackage ../applications/misc/camlistore { };

     

       8133
       8133
       +
       

     

       8068
       8134
        
         carrier = builderDefsPackage (import ../applications/networking/instant-messengers/carrier/2.5.0.nix) {

     

       8069
       8135
        
           inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 openssl nss

     

       8070
       8136
        
             gtkspell aspell gettext ncurses avahi dbus dbus_glib python

     
···

       8188
       8254
        
       

     

       8189
       8255
        
         djvulibre = callPackage ../applications/misc/djvulibre { };

     

       8190
       8256
        
       

     

       8257
       8257
       +
         djvu2pdf = callPackage ../tools/typesetting/djvu2pdf { };

     

       8258
       8258
       +
       

     

       8191
       8259
        
         djview = callPackage ../applications/graphics/djview { };

     

       8192
       8260
        
         djview4 = pkgs.djview;

     

       8193
       8261
        
       

     
···

       8212
       8280
        
       

     

       8213
       8281
        
         dvdauthor = callPackage ../applications/video/dvdauthor { };

     

       8214
       8282
        
       

     

       8215
       8215
       -
         dwb = callPackage ../applications/networking/browsers/dwb { };

     

       8283
       8283
       +
         dwb = callPackage ../applications/networking/browsers/dwb { dconf = gnome3.dconf; };

     

       8216
       8284
        
       

     

       8217
       8285
        
         dwm = callPackage ../applications/window-managers/dwm {

     

       8218
       8286
        
           patches = config.dwm.patches or [];

     
···

       8542
       8610
        
       

     

       8543
       8611
        
         firefoxWrapper = wrapFirefox { browser = firefoxPkgs.firefox; };

     

       8544
       8612
        
       

     

       8613
       8613
       +
         firefox-bin = callPackage ../applications/networking/browsers/firefox-bin {

     

       8614
       8614
       +
           gconf = pkgs.gnome.GConf;

     

       8615
       8615
       +
           inherit (pkgs.gnome) libgnome libgnomeui;

     

       8616
       8616
       +
           inherit (pkgs.xlibs) libX11 libXScrnSaver libXext

     

       8617
       8617
       +
             libXinerama libXrender libXt;

     

       8618
       8618
       +
         };

     

       8619
       8619
       +
       

     

       8545
       8620
        
         flac = callPackage ../applications/audio/flac { };

     

       8546
       8621
        
       

     

       8547
       8622
        
         flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer-11 {

     
···

       8607
       8682
        
           python = python27;

     

       8608
       8683
        
         };

     

       8609
       8684
        
       

     

       8685
       8685
       +
         gitolite = callPackage ../applications/version-management/gitolite { };

     

       8686
       8686
       +
       

     

       8610
       8687
        
         inherit (gnome3) gitg;

     

       8611
       8688
        
       

     

       8612
       8689
        
         giv = callPackage ../applications/graphics/giv {

     
···

       8924
       9001
        
           inherit (perlPackages) ArchiveZip CompressZlib;

     

       8925
       9002
        
           inherit (gnome) GConf ORBit2 gnome_vfs;

     

       8926
       9003
        
           zip = zip.override { enableNLS = false; };

     

       8927
       8927
       -
           boost = boost149;

     

       9004
       9004
       +
           boost = boost155;

     

       8928
       9005
        
           jdk = openjdk;

     

       8929
       9006
        
           fontsConf = makeFontsConf {

     

       8930
       9007
        
             fontDirectories = [

     
···

       8933
       9010
        
           };

     

       8934
       9011
        
           clucene_core = clucene_core_2;

     

       8935
       9012
        
           lcms = lcms2;

     

       8936
       8936
       -
           mdds = mdds_0_7_1;

     

       9013
       9013
       +
           harfbuzz = harfbuzz.override {

     

       9014
       9014
       +
             withIcu = true; withGraphite2 = true;

     

       9015
       9015
       +
           };

     

       8937
       9016
        
         };

     

       8938
       9017
        
       

     

       8939
       9018
        
         liferea = callPackage ../applications/networking/newsreaders/liferea { };

     
···

       9417
       9496
        
       

     

       9418
       9497
        
         siproxd = callPackage ../applications/networking/siproxd { };

     

       9419
       9498
        
       

     

       9420
       9420
       -
         skype = callPackage_i686 ../applications/networking/instant-messengers/skype {

     

       9421
       9421
       -
           usePulseAudio = config.pulseaudio or true;

     

       9422
       9422
       -
         };

     

       9499
       9499
       +
         skype = callPackage_i686 ../applications/networking/instant-messengers/skype { };

     

       9423
       9500
        
       

     

       9424
       9501
        
         skype4pidgin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/skype4pidgin { };

     

       9425
       9502
        
       

     
···

       9617
       9694
        
         };

     

       9618
       9695
        
       

     

       9619
       9696
        
         toxic = callPackage ../applications/networking/instant-messengers/toxic { };

     

       9697
       9697
       +
       

     

       9698
       9698
       +
         transcode = callPackage ../applications/audio/transcode { };

     

       9620
       9699
        
       

     

       9621
       9700
        
         transmission = callPackage ../applications/networking/p2p/transmission { };

     

       9622
       9701
        
         transmission_gtk = transmission.override { enableGTK3 = true; };

     
···

       9999
       10078
        
       

     

       10000
       10079
        
         blackshadeselite = callPackage ../games/blackshadeselite { };

     

       10001
       10080
        
       

     

       10002
       10002
       -
         blobby = callPackage ../games/blobby {

     

       10003
       10003
       -
           boost = boost149;

     

       10004
       10004
       -
         };

     

       10081
       10081
       +
         blobby = callPackage ../games/blobby { };

     

       10005
       10082
        
       

     

       10006
       10083
        
         bsdgames = callPackage ../games/bsdgames { };

     

       10007
       10084
        
       

     
···

       10317
       10394
        
       

     

       10318
       10395
        
         keen4 = callPackage ../games/keen4 { };

     

       10319
       10396
        
       

     

       10397
       10397
       +
         zeroad = callPackage ../games/0ad { };

     

       10320
       10398
        
       

     

       10321
       10399
        
         ### DESKTOP ENVIRONMENTS

     

       10322
       10400
        
       

     
···

       10711
       10789
        
         };

     

       10712
       10790
        
       

     

       10713
       10791
        
         tptp = callPackage ../applications/science/logic/tptp {};

     

       10792
       10792
       +
       

     

       10793
       10793
       +
         twelf = callPackage ../applications/science/logic/twelf {

     

       10794
       10794
       +
           smlnj = if stdenv.isDarwin

     

       10795
       10795
       +
             then smlnjBootstrap

     

       10796
       10796
       +
             else smlnj;

     

       10797
       10797
       +
         };

     

       10714
       10798
        
       

     

       10715
       10799
        
         verifast = callPackage ../applications/science/logic/verifast {};

     

       10716
       10800

+2 -2

pkgs/top-level/haskell-defaults.nix

···

       15
       15
        
         # Older compilers inherit the overrides from newer ones.

     

       16
       16
        
       

     

       17
       17
        
         ghcHEADPrefs = self : super : super // {

     

       18
       18
       -
           cabalInstall_1_20_0_2 = super.cabalInstall_1_20_0_2.override { Cabal = null; };

     

       18
       18
       +
           cabalInstall_1_20_0_3 = super.cabalInstall_1_20_0_3.override { Cabal = null; };

     

       19
       19
        
           mtl = self.mtl_2_2_1;

     

       20
       20
        
           transformersCompat = super.transformersCompat_0_3_3;

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         ghc782Prefs = self : super : ghcHEADPrefs self super // {

     

       24
       24
       -
           cabalInstall_1_20_0_2 = super.cabalInstall_1_20_0_2.override { Cabal = self.Cabal_1_20_0_1; };

     

       24
       24
       +
           cabalInstall_1_20_0_3 = super.cabalInstall_1_20_0_3.override { Cabal = self.Cabal_1_20_0_1; };

     

       25
       25
        
           codex = super.codex.override { hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_20_0_1; }; };

     

       26
       26
        
           mtl = self.mtl_2_1_2;

     

       27
       27
        
         };

+32 -7

pkgs/top-level/haskell-packages.nix

···

       437
       437
        
       

     

       438
       438
        
         compactStringFix = callPackage ../development/libraries/haskell/compact-string-fix {};

     

       439
       439
        
       

     

       440
       440
       -
         compdata = callPackage ../development/libraries/haskell/compdata {};

     

       440
       440
       +
         compdata = if (pkgs.stdenv.lib.versionOlder "7.8" ghc.version)

     

       441
       441
       +
                      then callPackage ../development/libraries/haskell/compdata {}

     

       442
       442
       +
                      else null;

     

       441
       443
        
       

     

       442
       444
        
         composition = callPackage ../development/libraries/haskell/composition {};

     

       443
       445
        
       

     
···

       587
       589
        
         deepseq_1_3_0_2 = callPackage ../development/libraries/haskell/deepseq/1.3.0.2.nix {};

     

       588
       590
        
         deepseq = null;               # core package since ghc >= 7.4.x

     

       589
       591
        
       

     

       592
       592
       +
         deepseqGenerics = callPackage ../development/libraries/haskell/deepseq-generics {};

     

       593
       593
       +
       

     

       590
       594
        
         deepseqTh = callPackage ../development/libraries/haskell/deepseq-th {};

     

       591
       595
        
       

     

       592
       596
        
         derive = callPackage ../development/libraries/haskell/derive {};

     
···

       636
       640
        
         directoryTree = callPackage ../development/libraries/haskell/directory-tree {};

     

       637
       641
        
       

     

       638
       642
        
         distributedStatic = callPackage ../development/libraries/haskell/distributed-static {};

     

       639
       639
       -
         

     

       643
       643
       +
       

     

       640
       644
        
         distributedProcess = callPackage ../development/libraries/haskell/distributed-process {};

     

       641
       645
        
       

     

       642
       646
        
         distributive = callPackage ../development/libraries/haskell/distributive {};

     
···

       798
       802
        
         fingertree = callPackage ../development/libraries/haskell/fingertree {};

     

       799
       803
        
       

     

       800
       804
        
         foldl = callPackage ../development/libraries/haskell/foldl {};

     

       805
       805
       +
       

     

       806
       806
       +
         folds = callPackage ../development/libraries/haskell/folds {};

     

       801
       807
        
       

     

       802
       808
        
         forceLayout = callPackage ../development/libraries/haskell/force-layout {};

     

       803
       809
        
       

     
···

       1066
       1072
        
       

     

       1067
       1073
        
         HaXml = callPackage ../development/libraries/haskell/HaXml {};

     

       1068
       1074
        
       

     

       1075
       1075
       +
         hdaemonize = callPackage ../development/libraries/haskell/hdaemonize {};

     

       1076
       1076
       +
       

     

       1069
       1077
        
         HDBC = callPackage ../development/libraries/haskell/HDBC/HDBC.nix {};

     

       1070
       1078
        
       

     

       1071
       1079
        
         HDBCOdbc = callPackage ../development/libraries/haskell/HDBC/HDBC-odbc.nix {

     
···

       1280
       1288
        
           preprocessorTools = self.preprocessorTools_0_1_3;

     

       1281
       1289
        
         };

     

       1282
       1290
        
       

     

       1291
       1291
       +
         ixset = callPackage ../development/libraries/haskell/ixset {};

     

       1292
       1292
       +
       

     

       1283
       1293
        
         ixShapable = callPackage ../development/libraries/haskell/ix-shapable {};

     

       1284
       1294
        
       

     

       1285
       1295
        
         jack = callPackage ../development/libraries/haskell/jack {};

     
···

       1466
       1476
        
       

     

       1467
       1477
        
         monadloc = callPackage ../development/libraries/haskell/monadloc {};

     

       1468
       1478
        
       

     

       1479
       1479
       +
         monadlocPp = callPackage ../development/libraries/haskell/monadloc-pp {};

     

       1480
       1480
       +
       

     

       1469
       1481
        
         monadLoops = callPackage ../development/libraries/haskell/monad-loops {};

     

       1470
       1482
        
       

     

       1471
       1483
        
         monadLogger = callPackage ../development/libraries/haskell/monad-logger {};

     
···

       1960
       1972
        
       

     

       1961
       1973
        
         setlocale = callPackage ../development/libraries/haskell/setlocale {};

     

       1962
       1974
        
       

     

       1975
       1975
       +
         shellmate = callPackage ../development/libraries/haskell/shellmate {};

     

       1976
       1976
       +
       

     

       1963
       1977
        
         shelly_0_15_4_1 = callPackage ../development/libraries/haskell/shelly/0.15.4.1.nix {};

     

       1964
       1978
        
         shelly_1_5_3_1 = callPackage ../development/libraries/haskell/shelly {};

     

       1965
       1979
        
         shelly = self.shelly_1_5_3_1;

     
···

       2079
       2093
        
         };

     

       2080
       2094
        
       

     

       2081
       2095
        
         SHA = callPackage ../development/libraries/haskell/SHA {};

     

       2096
       2096
       +
       

     

       2097
       2097
       +
         SHA2 = callPackage ../development/libraries/haskell/SHA2 {};

     

       2082
       2098
        
       

     

       2083
       2099
        
         shake = callPackage ../development/libraries/haskell/shake {};

     

       2084
       2100
        
       

     
···

       2160
       2176
        
       

     

       2161
       2177
        
         TableAlgebra = callPackage ../development/libraries/haskell/TableAlgebra {};

     

       2162
       2178
        
       

     

       2179
       2179
       +
         tables = callPackage ../development/libraries/haskell/tables {};

     

       2180
       2180
       +
       

     

       2163
       2181
        
         tabular = callPackage ../development/libraries/haskell/tabular {};

     

       2164
       2182
        
       

     

       2165
       2183
        
         tagged = callPackage ../development/libraries/haskell/tagged {};

     
···

       2462
       2480
        
       

     

       2463
       2481
        
         wcwidth = callPackage ../development/libraries/haskell/wcwidth {};

     

       2464
       2482
        
       

     

       2483
       2483
       +
         webdriver = callPackage ../development/libraries/haskell/webdriver {};

     

       2484
       2484
       +
       

     

       2465
       2485
        
         webRoutes = callPackage ../development/libraries/haskell/web-routes {};

     

       2466
       2486
        
       

     

       2467
       2487
        
         webRoutesBoomerang = callPackage ../development/libraries/haskell/web-routes-boomerang {};

     
···

       2547
       2567
        
       

     

       2548
       2568
        
         xssSanitize = callPackage ../development/libraries/haskell/xss-sanitize {};

     

       2549
       2569
        
       

     

       2570
       2570
       +
         Yampa = callPackage ../development/libraries/haskell/Yampa {};

     

       2571
       2571
       +
       

     

       2550
       2572
        
         yaml = callPackage ../development/libraries/haskell/yaml {};

     

       2551
       2573
        
       

     

       2552
       2574
        
         yamlLight = callPackage ../development/libraries/haskell/yaml-light {};

     
···

       2785
       2807
        
         cabalDelete = callPackage ../development/tools/haskell/cabal-delete {};

     

       2786
       2808
        
       

     

       2787
       2809
        
         cabalBounds = callPackage ../development/tools/haskell/cabal-bounds {

     

       2788
       2788
       -
           Cabal = if pkgs.stdenv.lib.versionOlder "7.7" ghc.version

     

       2789
       2789
       -
                     then null

     

       2790
       2790
       -
                     else self.Cabal_1_18_1_3;

     

       2810
       2810
       +
           Cabal = self.Cabal_1_20_0_1;

     

       2811
       2811
       +
           cabalLenses = self.cabalLenses.override {

     

       2812
       2812
       +
             Cabal = self.Cabal_1_20_0_1;

     

       2813
       2813
       +
           };

     

       2791
       2814
        
         };

     

       2792
       2815
        
       

     

       2793
       2816
        
         cabalMeta = callPackage ../development/tools/haskell/cabal-meta {};

     
···

       2803
       2826
        
         cabalInstall_0_14_0 = callPackage ../tools/package-management/cabal-install/0.14.0.nix {};

     

       2804
       2827
        
         cabalInstall_1_16_0_2 = callPackage ../tools/package-management/cabal-install/1.16.0.2.nix { Cabal = self.Cabal_1_16_0_3; };

     

       2805
       2828
        
         cabalInstall_1_18_0_3 = callPackage ../tools/package-management/cabal-install/1.18.0.3.nix { Cabal = self.Cabal_1_18_1_3; };

     

       2806
       2806
       -
         cabalInstall_1_20_0_2 = callPackage ../tools/package-management/cabal-install/1.20.0.2.nix { Cabal = self.Cabal_1_20_0_1; };

     

       2807
       2807
       -
         cabalInstall = self.cabalInstall_1_20_0_2;

     

       2829
       2829
       +
         cabalInstall_1_20_0_3 = callPackage ../tools/package-management/cabal-install/1.20.0.3.nix { Cabal = self.Cabal_1_20_0_1; };

     

       2830
       2830
       +
         cabalInstall = self.cabalInstall_1_20_0_3;

     

       2808
       2831
        
       

     

       2809
       2832
        
         codex = callPackage ../development/tools/haskell/codex {};

     

       2833
       2833
       +
       

     

       2834
       2834
       +
         commandQq = callPackage ../development/libraries/haskell/command-qq {};

     

       2810
       2835
        
       

     

       2811
       2836
        
         gitAnnex = callPackage ../applications/version-management/git-and-tools/git-annex {};

     

       2812
       2837

+53

pkgs/top-level/python-packages.nix

···

       67
       67
        
           inherit python;

     

       68
       68
        
         };

     

       69
       69
        
       

     

       70
       70
       +
         discid = buildPythonPackage rec {

     

       71
       71
       +
           name = "discid-1.1.0";

     

       72
       72
       +
       

     

       73
       73
       +
           meta = with stdenv.lib; {

     

       74
       74
       +
             description = "Python binding of libdiscid";

     

       75
       75
       +
             homepage    = "https://python-discid.readthedocs.org/";

     

       76
       76
       +
             license     = licenses.lgpl3Plus;

     

       77
       77
       +
             platforms   = platforms.linux;

     

       78
       78
       +
             maintainer  = with maintainers; [ iyzsong ];

     

       79
       79
       +
           };

     

       80
       80
       +
       

     

       81
       81
       +
           src = fetchurl {

     

       82
       82
       +
             url = "https://pypi.python.org/packages/source/d/discid/${name}.tar.gz";

     

       83
       83
       +
             md5 = "2ad2141452dd10b03ad96ccdad075235";

     

       84
       84
       +
           };

     

       85
       85
       +
       

     

       86
       86
       +
           patchPhase = ''

     

       87
       87
       +
             substituteInPlace discid/libdiscid.py \

     

       88
       88
       +
               --replace '_open_library(_LIB_NAME)' "_open_library('${pkgs.libdiscid}/lib/libdiscid.so.0')"

     

       89
       89
       +
           '';

     

       90
       90
       +
         };

     

       91
       91
       +
       

     

       70
       92
        
         ipython = import ../shells/ipython {

     

       71
       93
        
           inherit (pkgs) stdenv fetchurl sip pyqt4;

     

       72
       94
        
           inherit buildPythonPackage pythonPackages;

     
···

       2264
       2286
        
           };

     

       2265
       2287
        
         };

     

       2266
       2288
        
       

     

       2289
       2289
       +
         radicale = buildPythonPackage rec {

     

       2290
       2290
       +
           name = "radicale-${version}";

     

       2291
       2291
       +
           namePrefix = "";

     

       2292
       2292
       +
           version = "0.9b1";

     

       2293
       2293
       +
       

     

       2294
       2294
       +
           src = fetchurl {

     

       2295
       2295
       +
             url = "http://pypi.python.org/packages/source/R/Radicale/Radicale-${version}.tar.gz";

     

       2296
       2296
       +
             sha256 = "3a8451909de849f173f577ddec0a085f19040dbb6aa13d5256208a0f8e11d88d";

     

       2297
       2297
       +
           };

     

       2298
       2298
       +
       

     

       2299
       2299
       +
           propagatedBuildInputs = with pythonPackages; [

     

       2300
       2300
       +
             flup

     

       2301
       2301
       +
             ldap

     

       2302
       2302
       +
             sqlalchemy

     

       2303
       2303
       +
           ];

     

       2304
       2304
       +
       

     

       2305
       2305
       +
           doCheck = false;

     

       2306
       2306
       +
       

     

       2307
       2307
       +
           meta = {

     

       2308
       2308
       +
             homepage = "http://www.radicale.org/";

     

       2309
       2309
       +
             longDescription = ''

     

       2310
       2310
       +
               The Radicale Project is a complete CalDAV (calendar) and CardDAV

     

       2311
       2311
       +
               (contact) server solution. Calendars and address books are available for

     

       2312
       2312
       +
               both local and remote access, possibly limited through authentication

     

       2313
       2313
       +
               policies. They can be viewed and edited by calendar and contact clients

     

       2314
       2314
       +
               on mobile phones or computers.

     

       2315
       2315
       +
             '';

     

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

     

       2317
       2317
       +
             maintainers = [ stdenv.lib.maintainers.edwtjo ];

     

       2318
       2318
       +
           };

     

       2319
       2319
       +
         };

     

       2267
       2320
        
       

     

       2268
       2321
        
         raven = buildPythonPackage rec {

     

       2269
       2322
        
           name = "raven-3.4.1";