diff --git a/.version b/.version index 07167f90842..af805b45bd8 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -14.02 \ No newline at end of file +14.04 \ No newline at end of file diff --git a/README.md b/README.md index 4a220e28ba6..8ded8807ede 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ Nixpkgs is a collection of packages for [Nix](http://nixos.org/nix/) package manager. Nixpkgs also includes [NixOS](http://nixos.org/nixos/) linux distribution source code. -* [NixOS installation instructions](http://nixos.org/nixos/manual/#idm139984689550080) +* [NixOS installation instructions](http://nixos.org/nixos/manual/#installing-nixos) * [Manual (How to write packages for Nix)](http://nixos.org/nixpkgs/manual/) * [Manual (NixOS)](http://nixos.org/nixos/manual/) * [Continuous build](http://hydra.nixos.org/jobset/nixos/trunk-combined) diff --git a/doc/coding-conventions.xml b/doc/coding-conventions.xml index e55f86ae3d3..61d373738f9 100644 --- a/doc/coding-conventions.xml +++ b/doc/coding-conventions.xml @@ -235,12 +235,7 @@ Most of the time, these are the same. For instance, the package bound to the variable name e2fsprogs in all-packages.nix, and the Nix expression is in pkgs/os-specific/linux/e2fsprogs/default.nix. -However, identifiers in the Nix language don’t allow certain -characters (e.g. dashes), so sometimes a different variable name -should be used. For instance, the -module-init-tools package is bound to the -module_init_tools variable in -all-packages.nix. + There are a few naming guidelines: @@ -261,17 +256,20 @@ should be used. For instance, the a package named hello-svn by nix-env. - Dashes in the package name should be changed to - underscores in variable names, rather than to camel case — e.g., - module_init_tools instead of - moduleInitTools. + Dashes in the package name should be preserved + in new variable names, rather than converted to underscores + (which was convention up to around 2013 and most names + still have underscores instead of dashes) — e.g., + http-parser instead of + http_parser. If there are multiple versions of a package, this should be reflected in the variable names in all-packages.nix, - e.g. hello_0_3 and hello_0_4. + e.g. json-c-0-9 and json-c-0-11. If there is an obvious “default” version, make an attribute like - hello = hello_0_4;. + json-c = json-c-0-9;. + See also @@ -288,7 +286,7 @@ dashes between words — not in camel case. For instance, it should be allPackages.nix or AllPackages.nix. -
Hierachy +
Hierarchy Each package should be stored in its own directory somewhere in the pkgs/ tree, i.e. in @@ -567,7 +565,7 @@ splitting up an existing category.
-
Versioning +
Versioning Because every version of a package in Nixpkgs creates a potential maintenance burden, old versions of a package should not be diff --git a/doc/stdenv.xml b/doc/stdenv.xml index f0cabe425a3..1846886919d 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -1156,12 +1156,27 @@ echo @foo@ to Qt’s path. + + gdk-pixbuf + Exports GDK_PIXBUF_MODULE_FILE + environment variable the the builder. Add librsvg package + to buildInputs to get svg support. + + GHC Creates a temporary package database and registers every Haskell build input in it (TODO: how?). + + GStreamer + Adds the + GStreamer plugins subdirectory of + each build input to the GST_PLUGIN_SYSTEM_PATH_1_0 or + GST_PLUGIN_SYSTEM_PATH environment variable. + + diff --git a/lib/maintainers.nix b/lib/maintainers.nix index ee3830e6d35..73c288231c8 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -28,6 +28,7 @@ garbas = "Rok Garbas "; goibhniu = "Cillian de Róiste "; guibert = "David Guibert "; + hinton = "Tom Hinton "; ianwookim = "Ian-Woo Kim "; iElectric = "Domen Kozar "; iyzsong = "Song Wenwu "; @@ -43,6 +44,7 @@ matejc = "Matej Cotman "; modulistic = "Pablo Costa "; mornfall = "Petr Ročkai "; + msackman = "Matthew Sackman "; ocharles = "Oliver Charles "; offline = "Jaka Hudoklin "; orbitz = "Malcolm Matalka "; @@ -57,6 +59,7 @@ rob = "Rob Vermaas "; roconnor = "Russell O'Connor "; roelof = "Roelof Wobben "; + romildo = "José Romildo Malaquias "; rszibele = "Richard Szibele "; sander = "Sander van der Burg "; shlevy = "Shea Levy "; @@ -67,12 +70,14 @@ the-kenny = "Moritz Ulrich "; thoughtpolice = "Austin Seipp "; tomberek = "Thomas Bereknyei "; + ttuegel = "Thomas Tuegel "; urkud = "Yury G. Kudryashov "; vcunat = "Vladimír Čunát "; viric = "Lluís Batlle i Rossell "; vizanto = "Danny Wilson "; vlstill = "Vladimír Štill "; winden = "Antonio Vargas Gonzalez "; + wizeman = "Ricardo M. Correia "; z77z = "Marco Maggesi "; zef = "Zef Hemel "; zimbatm = "zimbatm "; diff --git a/lib/types.nix b/lib/types.nix index 9bce56bf807..baf8aa5e574 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -10,7 +10,6 @@ with import ./strings.nix; rec { isType = type: x: (x._type or "") == type; - typeOf = x: x._type or ""; setType = typeName: value: value // { _type = typeName; diff --git a/nixos/doc/manual/installation.xml b/nixos/doc/manual/installation.xml index 6ccb12b115e..f6b477ed69b 100644 --- a/nixos/doc/manual/installation.xml +++ b/nixos/doc/manual/installation.xml @@ -1,5 +1,6 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xml:id="installing-nixos"> Installing NixOS diff --git a/nixos/doc/manual/release-notes.xml b/nixos/doc/manual/release-notes.xml index 4a0fc6a52e4..8899cbb2149 100644 --- a/nixos/doc/manual/release-notes.xml +++ b/nixos/doc/manual/release-notes.xml @@ -21,6 +21,10 @@ enhancements are the following: NixOS is now based on Glibc 2.18 and GCC 4.8. + The mysql55 service has been merged into the + mysql service, which no longer sets a default for the 'package + option. + diff --git a/nixos/lib/test-driver/test-driver.pl b/nixos/lib/test-driver/test-driver.pl index c6a707cdf6b..31f3281cefe 100644 --- a/nixos/lib/test-driver/test-driver.pl +++ b/nixos/lib/test-driver/test-driver.pl @@ -144,6 +144,13 @@ sub runTests { } }); + $log->nest("syncing", sub { + foreach my $vm (values %vms) { + next unless $vm->isUp(); + $vm->execute("sync /tmp/xchg"); + } + }); + if ($nrTests != 0) { $log->log("$nrSucceeded out of $nrTests tests succeeded", ($nrSucceeded < $nrTests ? { error => 1 } : { })); diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index 3407229e921..d5338bc04ca 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -67,62 +67,16 @@ rec { }; - # Generate a coverage report from the coverage data produced by - # runTests. - makeReport = x: runCommand "report" { buildInputs = [rsync]; } - '' - mkdir -p $TMPDIR/gcov/ - - for d in ${x}/coverage-data/*; do - echo "doing $d" - [ -n "$(ls -A "$d")" ] || continue - - for i in $(cd $d/nix/store && ls); do - if ! test -e $TMPDIR/gcov/nix/store/$i; then - echo "copying $i" - mkdir -p $TMPDIR/gcov/$(echo $i | cut -c34-) - rsync -rv /nix/store/$i/.build/* $TMPDIR/gcov/ - fi - done - - chmod -R u+w $TMPDIR/gcov - - find $TMPDIR/gcov -name "*.gcda" -exec rm {} \; - - for i in $(cd $d/nix/store && ls); do - rsync -rv $d/nix/store/$i/.build/* $TMPDIR/gcov/ - done - - find $TMPDIR/gcov -name "*.gcda" -exec chmod 644 {} \; - - echo "producing info..." - ${pkgs.lcov}/bin/geninfo --ignore-errors source,gcov $TMPDIR/gcov --output-file $TMPDIR/app.info - cat $TMPDIR/app.info >> $TMPDIR/full.info - done - - echo "making report..." - mkdir -p $out/coverage - ${pkgs.lcov}/bin/genhtml --show-details $TMPDIR/full.info -o $out/coverage - cp $TMPDIR/full.info $out/coverage/ - - mkdir -p $out/nix-support - cat ${x}/nix-support/hydra-build-products >> $out/nix-support/hydra-build-products - echo "report coverage $out/coverage" >> $out/nix-support/hydra-build-products - [ ! -e ${x}/nix-support/failed ] || touch $out/nix-support/failed - ''; # */ - - makeTest = testFun: complete (call testFun); makeTests = testsFun: lib.mapAttrs (name: complete) (call testsFun); apply = makeTest; # compatibility call = f: f { inherit pkgs system; }; - complete = t: t // rec { + complete = { testScript, ... } @ t: t // rec { + nodes = buildVirtualNetwork ( - if t ? nodes then t.nodes else - if t ? machine then { machine = t.machine; } - else { } ); + t.nodes or (if t ? machine then { machine = t.machine; } else { })); testScript = # Call the test script with the computed nodes. @@ -162,7 +116,7 @@ rec { test = runTests driver; - report = makeReport test; + report = releaseTools.gcovReport { coverageRuns = [ test ]; }; }; diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index e7cbe7a28f3..db4f1b43a11 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -77,7 +77,7 @@ in { }; package = mkOption { - type = types.path; + type = types.package; default = pulseaudio; example = literalExample "pulseaudio.override { jackaudioSupport = true; }"; description = '' diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index b6bc0458477..bf7cdcd3711 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -256,7 +256,7 @@ foreach my $fs (read_file("/proc/self/mountinfo")) { $mountPoint = "/" if $mountPoint eq ""; # Skip special filesystems. - next if in($mountPoint, "/proc") || in($mountPoint, "/dev") || in($mountPoint, "/sys") || in($mountPoint, "/run"); + next if in($mountPoint, "/proc") || in($mountPoint, "/dev") || in($mountPoint, "/sys") || in($mountPoint, "/run") || $mountPoint eq "/var/lib/nfs/rpc_pipefs"; # Skip the optional fields. my $n = 6; $n++ while $fields[$n] ne "-"; $n++; @@ -305,7 +305,15 @@ EOF fileSystems.\"$mountPoint\" = { device = \"$device\"; fsType = \"$fsType\"; - options = \"${\join ",", uniq(@extraOptions, @superOptions, @mountOptions)}\"; +EOF + + if (scalar @extraOptions > 0) { + $fileSystems .= <&2 "An error occured while looking for attribute names." + echo 1>&2 "An error occurred while looking for attribute names." echo $result fi fi diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 7e4c9b9b948..ae7a8234e07 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -113,6 +113,8 @@ munin = 102; logcheck = 103; nix-ssh = 104; + dictd = 105; + couchdb = 106; # When adding a uid, make sure it doesn't match an existing gid. @@ -204,6 +206,8 @@ connman = 94; munin = 95; keys = 96; + dictd = 105; + couchdb = 106; # When adding a gid, make sure it doesn't match an existing uid. diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 391cc2503bd..94c1667d39d 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -78,16 +78,17 @@ ./services/backup/bacula.nix ./services/backup/mysql-backup.nix ./services/backup/postgresql-backup.nix - ./services/backup/sitecopy-backup.nix ./services/backup/rsnapshot.nix + ./services/backup/sitecopy-backup.nix + ./services/backup/tarsnap.nix ./services/databases/4store-endpoint.nix ./services/databases/4store.nix + ./services/databases/couchdb.nix ./services/databases/firebird.nix ./services/databases/memcached.nix ./services/databases/mongodb.nix ./services/databases/redis.nix ./services/databases/mysql.nix - ./services/databases/mysql55.nix ./services/databases/openldap.nix ./services/databases/postgresql.nix ./services/databases/virtuoso.nix diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix index 7c1922cdfd8..489a7a4d269 100644 --- a/nixos/modules/programs/environment.nix +++ b/nixos/modules/programs/environment.nix @@ -45,7 +45,7 @@ in TERMINFO_DIRS = [ "${i}/share/terminfo" ]; PERL5LIB = [ "${i}/lib/perl5/site_perl" ]; ALSA_PLUGIN_DIRS = [ "${i}/lib/alsa-lib" ]; - GST_PLUGIN_PATH = [ "${i}/lib/gstreamer-0.10" ]; + GST_PLUGIN_SYSTEM_PATH = [ "${i}/lib/gstreamer-0.10" ]; KDEDIRS = [ "${i}" ]; STRIGI_PLUGIN_PATH = [ "${i}/lib/strigi/" ]; QT_PLUGIN_PATH = [ "${i}/lib/qt4/plugins" "${i}/lib/kde4/plugins" ]; diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 8393b5758f3..a26f930eda1 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -56,7 +56,7 @@ let inherit visible; }); } - { config = setTo (mkIf (fromOf options).isDefined (define (mkMerge (fromOf options).definitions))); + { config = setTo (mkMerge (if (fromOf options).isDefined then [ (define (mkMerge (fromOf options).definitions)) ] else [])); } ]; @@ -115,14 +115,12 @@ in zipModules ([] # !!! this hardcodes bash, could we detect from config which shell is actually used? ++ obsolete [ "environment" "promptInit" ] [ "programs" "bash" "promptInit" ] -++ obsolete [ "services" "xserver" "driSupport" ] [ "services" "mesa" "driSupport" ] -++ obsolete [ "services" "xserver" "driSupport32Bit" ] [ "services" "mesa" "driSupport32Bit" ] -++ obsolete [ "services" "xserver" "s3tcSupport" ] [ "services" "mesa" "s3tcSupport" ] -++ obsolete [ "services" "xserver" "videoDrivers" ] [ "services" "mesa" "videoDrivers" ] -++ obsolete [ "services" "mesa" "driSupport" ] [ "hardware" "opengl" "driSupport" ] -++ obsolete [ "services" "mesa" "driSupport32Bit" ] [ "hardware" "opengl" "driSupport32Bit" ] -++ obsolete [ "services" "mesa" "s3tcSupport" ] [ "hardware" "opengl" "s3tcSupport" ] -++ obsolete [ "services" "mesa" "videoDrivers" ] [ "hardware" "opengl" "videoDrivers" ] +++ obsolete [ "services" "xserver" "driSupport" ] [ "hardware" "opengl" "driSupport" ] +++ obsolete [ "services" "xserver" "driSupport32Bit" ] [ "hardware" "opengl" "driSupport32Bit" ] +++ obsolete [ "services" "xserver" "s3tcSupport" ] [ "hardware" "opengl" "s3tcSupport" ] +++ obsolete [ "services" "xserver" "videoDrivers" ] [ "hardware" "opengl" "videoDrivers" ] + +++ obsolete [ "services" "mysql55" ] [ "services" "mysql" ] # Options that are obsolete and have no replacement. ++ obsolete' [ "boot" "loader" "grub" "bootDevice" ] diff --git a/nixos/modules/services/backup/tarsnap.nix b/nixos/modules/services/backup/tarsnap.nix new file mode 100644 index 00000000000..03fbd29a191 --- /dev/null +++ b/nixos/modules/services/backup/tarsnap.nix @@ -0,0 +1,203 @@ +{ config, pkgs, ... }: + +with pkgs.lib; + +let + cfg = config.services.tarsnap; + + optionalNullStr = e: v: if e == null then "" else v; + + configFile = pkgs.writeText "tarsnap.conf" '' + cachedir ${cfg.cachedir} + keyfile ${cfg.keyfile} + ${optionalString cfg.nodump "nodump"} + ${optionalString cfg.printStats "print-stats"} + ${optionalNullStr cfg.checkpointBytes "checkpoint-bytes "+cfg.checkpointBytes} + ${optionalString cfg.aggressiveNetworking "aggressive-networking"} + ${concatStringsSep "\n" (map (v: "exclude "+v) cfg.excludes)} + ${concatStringsSep "\n" (map (v: "include "+v) cfg.includes)} + ${optionalString cfg.lowmem "lowmem"} + ${optionalString cfg.verylowmem "verylowmem"} + ''; +in +{ + options = { + services.tarsnap = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + If enabled, NixOS will periodically create backups of the + specified directories using the tarsnap + backup service. This installs a systemd + service called tarsnap-backup which is + periodically run by cron, or you may run it on-demand. + + See Getting Started + Tarsnap page. + ''; + }; + + label = mkOption { + type = types.str; + default = "nixos"; + description = '' + Specifies the label for archives created by Tarsnap. The + full name will be + label-$(date+"%Y%m%d%H%M%S"). For + example, by default your backups will look similar to + nixos-20140301021501. + ''; + }; + + cachedir = mkOption { + type = types.path; + default = "/var/cache/tarsnap"; + description = '' + Tarsnap operations use a "cache directory" which allows + Tarsnap to identify which blocks of data have been + previously stored; this directory is specified via the + cachedir option. If the cache directory + is lost or out of date, tarsnap creation/deletion operations + will exit with an error message instructing you to run + tarsnap --fsck to regenerate the cache + directory. + ''; + }; + + keyfile = mkOption { + type = types.path; + default = "/root/tarsnap.key"; + description = '' + Path to the keyfile which identifies the machine associated + with your Tarsnap account. This file can be created using + the tarsnap-keygen utility, and providing + your Tarsnap login credentials. + ''; + }; + + nodump = mkOption { + type = types.bool; + default = true; + description = '' + If set to true, then don't archive files + which have the nodump flag set. + ''; + }; + + printStats = mkOption { + type = types.bool; + default = true; + description = "Print statistics when creating archives."; + }; + + checkpointBytes = mkOption { + type = types.nullOr types.str; + default = "1G"; + description = '' + Create a checkpoint per a particular amount of uploaded + data. By default, Tarsnap will create checkpoints once per + GB of data uploaded. At minimum, + checkpointBytes must be 1GB. + + Can also be set to null to disable + checkpointing. + ''; + }; + + period = mkOption { + type = types.str; + default = "15 01 * * *"; + description = '' + This option defines (in the format used by cron) when + tarsnap is run for backups. The default is to update at + 01:15 at night every day. + ''; + }; + + aggressiveNetworking = mkOption { + type = types.bool; + default = false; + description = '' + Aggressive network behaviour: Use multiple TCP connections + when writing archives. Use of this option is recommended + only in cases where TCP congestion control is known to be + the limiting factor in upload performance. + ''; + }; + + directories = mkOption { + type = types.listOf types.path; + default = []; + description = "List of filesystem paths to archive."; + }; + + excludes = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Exclude files and directories matching the specified patterns. + ''; + }; + + includes = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Include only files and directories matching the specified patterns. + + Note that exclusions specified via + excludes take precedence over inclusions. + ''; + }; + + lowmem = mkOption { + type = types.bool; + default = false; + description = '' + Attempt to reduce tarsnap memory consumption. This option + will slow down the process of creating archives, but may + help on systems where the average size of files being backed + up is less than 1 MB. + ''; + }; + + verylowmem = mkOption { + type = types.bool; + default = false; + description = '' + Try even harder to reduce tarsnap memory consumption. This + can significantly slow down tarsnap, but reduces its memory + usage by an additional factor of 2 beyond what the + lowmem option does. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + assertions = + [ { assertion = cfg.directories != []; + message = "Must specify directories for Tarsnap to back up"; + } + { assertion = cfg.lowmem -> !cfg.verylowmem && (cfg.verylowmem -> !cfg.lowmem); + message = "You cannot set both lowmem and verylowmem"; + } + ]; + + systemd.services.tarsnap-backup = { + description = "Tarsnap Backup process"; + path = [ pkgs.tarsnap pkgs.coreutils ]; + script = '' + mkdir -p -m 0755 $(dirname ${cfg.cachedir}) + mkdir -p -m 0600 ${cfg.cachedir} + exec tarsnap --configfile ${configFile} -c -f ${cfg.label}-$(date +"%Y%m%d%H%M%S") ${concatStringsSep " " cfg.directories} + ''; + }; + + services.cron.systemCronJobs = optional cfg.enable + "${cfg.period} root ${config.systemd.package}/bin/systemctl start tarsnap-backup.service"; + + environment.systemPackages = [ pkgs.tarsnap ]; + }; +} diff --git a/nixos/modules/services/databases/couchdb.nix b/nixos/modules/services/databases/couchdb.nix new file mode 100644 index 00000000000..01631e9879a --- /dev/null +++ b/nixos/modules/services/databases/couchdb.nix @@ -0,0 +1,188 @@ +{ config, pkgs, ... }: + +with pkgs.lib; + +let + + cfg = config.services.couchdb; + configFile = pkgs.writeText "couchdb.ini" + '' + [couchdb] + database_dir = ${cfg.databaseDir} + uri_file = ${cfg.uriFile} + view_index_dir = ${cfg.viewIndexDir} + + [httpd] + port = ${toString cfg.port} + bind_address = ${cfg.bindAddress} + + [log] + file = ${cfg.logFile} + ''; + configExtraFile = pkgs.writeText "couchdb-extra.ini" cfg.extraConfig; + +in +{ + + ###### interface + + options = { + + services.couchdb = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to run CouchDB Server. + ''; + }; + + package = mkOption { + type = types.package; + default = pkgs.couchdb; + example = literalExample "pkgs.couchdb"; + description = '' + CouchDB package to use. + ''; + }; + + + user = mkOption { + type = types.string; + default = "couchdb"; + description = '' + User account under which couchdb runs. + ''; + }; + + group = mkOption { + type = types.string; + default = "couchdb"; + description = '' + Group account under which couchdb runs. + ''; + }; + + pidFile = mkOption { + type = types.path; + default = "/var/run/couchdb/couchdb.pid"; + description = '' + pid file. + ''; + }; + + # couchdb options: http://docs.couchdb.org/en/latest/config/index.html + + databaseDir = mkOption { + type = types.path; + default = "/var/lib/couchdb"; + description = '' + Specifies location of CouchDB database files (*.couch named). This + location should be writable and readable for the user the CouchDB + service runs as (couchdb by default). + ''; + }; + + uriFile = mkOption { + type = types.path; + default = "/var/run/couchdb/couchdb.uri"; + description = '' + This file contains the full URI that can be used to access this + instance of CouchDB. It is used to help discover the port CouchDB is + running on (if it was set to 0 (e.g. automatically assigned any free + one). This file should be writable and readable for the user that + runs the CouchDB service (couchdb by default). + ''; + }; + + viewIndexDir = mkOption { + type = types.path; + default = "/var/lib/couchdb"; + description = '' + Specifies location of CouchDB view index files. This location should + be writable and readable for the user that runs the CouchDB service + (couchdb by default). + ''; + }; + + bindAddress = mkOption { + type = types.string; + default = "127.0.0.1"; + description = '' + Defines the IP address by which CouchDB will be accessible. + ''; + }; + + port = mkOption { + type = types.int; + default = 5984; + description = '' + Defined the port number to listen. + ''; + }; + + logFile = mkOption { + type = types.path; + default = "/var/log/couchdb.log"; + description = '' + Specifies the location of file for logging output. + ''; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Extra configuration. Overrides any other cofiguration. + ''; + }; + }; + + }; + + ###### implementation + + config = mkIf config.services.couchdb.enable { + + environment.systemPackages = [ cfg.package ]; + + systemd.services.couchdb = { + description = "CouchDB Server"; + wantedBy = [ "multi-user.target" ]; + + preStart = + '' + mkdir -p `dirname ${cfg.pidFile}`; + mkdir -p `dirname ${cfg.uriFile}`; + mkdir -p `dirname ${cfg.logFile}`; + touch ${cfg.logFile}; + mkdir -p ${cfg.databaseDir}; + mkdir -p ${cfg.viewIndexDir}; + chown ${cfg.user}:${cfg.group} `dirname ${cfg.pidFile}` + chown ${cfg.user}:${cfg.group} `dirname ${cfg.uriFile}` + chown ${cfg.user}:${cfg.group} ${cfg.logFile} + chown ${cfg.user}:${cfg.group} ${cfg.databaseDir} + chown ${cfg.user}:${cfg.group} ${cfg.viewIndexDir} + ''; + + serviceConfig = { + PermissionsStartOnly = true; + User = cfg.user; + Group = cfg.group; + Type = "forking"; + ExecStart = "${cfg.package}/bin/couchdb -b -o /dev/null -e /dev/null -p ${cfg.pidFile} -a ${configFile} -a ${configExtraFile}"; + ExecStop = "${cfg.package}/bin/couchdb -d"; + }; + }; + + users.extraUsers.couchdb = { + description = "CouchDB Server user"; + group = "couchdb"; + uid = config.ids.uids.couchdb; + }; + + users.extraGroups.couchdb.gid = config.ids.gids.couchdb; + + }; +} diff --git a/nixos/modules/services/databases/firebird.nix b/nixos/modules/services/databases/firebird.nix index 75c225bdb67..f9f7e9d7c51 100644 --- a/nixos/modules/services/databases/firebird.nix +++ b/nixos/modules/services/databases/firebird.nix @@ -49,6 +49,7 @@ in package = mkOption { default = pkgs.firebirdSuper; + type = types.package; /* Example: package = pkgs.firebirdSuper.override { icu = pkgs.icu; }; which is not recommended for compatibility diff --git a/nixos/modules/services/databases/mongodb.nix b/nixos/modules/services/databases/mongodb.nix index 213a60687b2..a2f2593e797 100644 --- a/nixos/modules/services/databases/mongodb.nix +++ b/nixos/modules/services/databases/mongodb.nix @@ -39,6 +39,7 @@ in package = mkOption { default = pkgs.mongodb; + type = types.package; description = " Which MongoDB derivation to use. "; diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index 8be05a27cdc..62fbc2a1415 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -8,6 +8,10 @@ let mysql = cfg.package; + is55 = mysql.mysqlVersion == "5.5"; + + mysqldDir = if is55 then "${mysql}/bin" else "${mysql}/libexec"; + pidFile = "${cfg.pidDir}/mysqld.pid"; mysqldOptions = @@ -19,7 +23,7 @@ let [mysqld] ${optionalString (cfg.replication.role == "master" || cfg.replication.role == "slave") "log-bin=mysql-bin"} ${optionalString (cfg.replication.role == "master" || cfg.replication.role == "slave") "server-id = ${toString cfg.replication.serverId}"} - ${optionalString (cfg.replication.role == "slave") + ${optionalString (cfg.replication.role == "slave" && !is55) '' master-host = ${cfg.replication.masterHost} master-user = ${cfg.replication.masterUser} @@ -47,7 +51,8 @@ in }; package = mkOption { - default = pkgs.mysql; + type = types.package; + example = literalExample "pkgs.mysql"; description = " Which MySQL derivation to use. "; @@ -176,7 +181,7 @@ in chown -R ${cfg.user} ${cfg.pidDir} ''; - serviceConfig.ExecStart = "${mysql}/libexec/mysqld --defaults-extra-file=${myCnf} ${mysqldOptions}"; + serviceConfig.ExecStart = "${mysqldDir}/mysqld --defaults-extra-file=${myCnf} ${mysqldOptions}"; postStart = '' @@ -216,6 +221,16 @@ in fi '') cfg.initialDatabases} + ${optionalString (cfg.replication.role == "slave" && is55) + '' + # Set up the replication master + + ( echo "stop slave;" + echo "change master to master_host='${cfg.replication.masterHost}', master_user='${cfg.replication.masterUser}', master_password='${cfg.replication.masterPassword}';" + echo "start slave;" + ) | ${mysql}/bin/mysql -u root -N + ''} + ${optionalString (cfg.initialScript != null) '' # Execute initial script diff --git a/nixos/modules/services/databases/mysql55.nix b/nixos/modules/services/databases/mysql55.nix deleted file mode 100644 index fe8b29e3c6b..00000000000 --- a/nixos/modules/services/databases/mysql55.nix +++ /dev/null @@ -1,248 +0,0 @@ -{ config, pkgs, ... }: - -with pkgs.lib; - -let - - cfg = config.services.mysql55; - - mysql = cfg.package; - - pidFile = "${cfg.pidDir}/mysqld.pid"; - - mysqldOptions = - "--user=${cfg.user} --datadir=${cfg.dataDir} " + - "--pid-file=${pidFile}"; - - myCnf = pkgs.writeText "my.cnf" - '' - [mysqld] - ${optionalString (cfg.replication.role == "master" || cfg.replication.role == "slave") "log-bin=mysql-bin"} - ${optionalString (cfg.replication.role == "master" || cfg.replication.role == "slave") "server-id = ${toString cfg.replication.serverId}"} - ${cfg.extraOptions} - ''; - -in - -{ - - ###### interface - - options = { - - services.mysql55 = { - - enable = mkOption { - default = false; - description = " - Whether to enable the MySQL server. - "; - }; - - package = mkOption { - default = pkgs.mysql55; - description = " - Which MySQL derivation to use. - "; - }; - - port = mkOption { - default = "3306"; - description = "Port of MySQL"; - }; - - user = mkOption { - default = "mysql"; - description = "User account under which MySQL runs"; - }; - - dataDir = mkOption { - default = "/var/mysql"; # !!! should be /var/db/mysql - description = "Location where MySQL stores its table files"; - }; - - pidDir = mkOption { - default = "/var/run/mysql"; - description = "Location of the file which stores the PID of the MySQL server"; - }; - - extraOptions = mkOption { - default = ""; - example = '' - key_buffer_size = 6G - table_cache = 1600 - log-error = /var/log/mysql_err.log - ''; - description = '' - Provide extra options to the MySQL configuration file. - - Please note, that these options are added to the - [mysqld] section so you don't need to explicitly - state it again. - ''; - }; - - initialDatabases = mkOption { - default = []; - description = "List of database names and their initial schemas that should be used to create databases on the first startup of MySQL"; - example = [ - { name = "foodatabase"; schema = literalExample "./foodatabase.sql"; } - { name = "bardatabase"; schema = literalExample "./bardatabase.sql"; } - ]; - }; - - initialScript = mkOption { - default = null; - description = "A file containing SQL statements to be executed on the first startup. Can be used for granting certain permissions on the database"; - }; - - # FIXME: remove this option; it's a really bad idea. - rootPassword = mkOption { - default = null; - description = "Path to a file containing the root password, modified on the first startup. Not specifying a root password will leave the root password empty."; - }; - - replication = { - role = mkOption { - default = "none"; - description = "Role of the MySQL server instance. Can be either: master, slave or none"; - }; - - serverId = mkOption { - default = 1; - description = "Id of the MySQL server instance. This number must be unique for each instance"; - }; - - masterHost = mkOption { - description = "Hostname of the MySQL master server"; - }; - - masterUser = mkOption { - description = "Username of the MySQL replication user"; - }; - - masterPassword = mkOption { - description = "Password of the MySQL replication user"; - }; - - masterPort = mkOption { - default = 3306; - description = "Port number on which the MySQL master server runs"; - }; - }; - }; - - }; - - - ###### implementation - - config = mkIf config.services.mysql55.enable { - - users.extraUsers.mysql = { - description = "MySQL server user"; - group = "mysql"; - uid = config.ids.uids.mysql; - }; - - users.extraGroups.mysql.gid = config.ids.gids.mysql; - - environment.systemPackages = [mysql]; - - systemd.services.mysql = - { description = "MySQL Server"; - - wantedBy = [ "multi-user.target" ]; - - unitConfig.RequiresMountsFor = "${cfg.dataDir}"; - - preStart = - '' - if ! test -e ${cfg.dataDir}/mysql; then - mkdir -m 0700 -p ${cfg.dataDir} - chown -R ${cfg.user} ${cfg.dataDir} - ${mysql}/bin/mysql_install_db ${mysqldOptions} - touch /tmp/mysql_init - fi - - mkdir -m 0700 -p ${cfg.pidDir} - chown -R ${cfg.user} ${cfg.pidDir} - ''; - - serviceConfig.ExecStart = "${mysql}/bin/mysqld --defaults-extra-file=${myCnf} ${mysqldOptions}"; - - postStart = - '' - # Wait until the MySQL server is available for use - count=0 - while [ ! -e /tmp/mysql.sock ] - do - if [ $count -eq 30 ] - then - echo "Tried 30 times, giving up..." - exit 1 - fi - - echo "MySQL daemon not yet started. Waiting for 1 second..." - count=$((count++)) - sleep 1 - done - - if [ -f /tmp/mysql_init ] - then - ${concatMapStrings (database: - '' - # Create initial databases - if ! test -e "${cfg.dataDir}/${database.name}"; then - echo "Creating initial database: ${database.name}" - ( echo "create database ${database.name};" - echo "use ${database.name};" - - if [ -f "${database.schema}" ] - then - cat ${database.schema} - elif [ -d "${database.schema}" ] - then - cat ${database.schema}/mysql-databases/*.sql - fi - ) | ${mysql}/bin/mysql -u root -N - fi - '') cfg.initialDatabases} - - ${optionalString (cfg.replication.role == "slave") - '' - # Set up the replication master - - ( echo "stop slave;" - echo "change master to master_host='${cfg.replication.masterHost}', master_user='${cfg.replication.masterUser}', master_password='${cfg.replication.masterPassword}';" - echo "start slave;" - ) | ${mysql}/bin/mysql -u root -N - ''} - - ${optionalString (cfg.initialScript != null) - '' - # Execute initial script - cat ${cfg.initialScript} | ${mysql}/bin/mysql -u root -N - ''} - - ${optionalString (cfg.rootPassword != null) - '' - # Change root password - - ( echo "use mysql;" - echo "update user set Password=password('$(cat ${cfg.rootPassword})') where User='root';" - echo "flush privileges;" - ) | ${mysql}/bin/mysql -u root -N - ''} - - rm /tmp/mysql_init - fi - ''; # */ - - serviceConfig.ExecStop = - "${mysql}/bin/mysqladmin ${optionalString (cfg.rootPassword != null) "--user=root --password=\"$(cat ${cfg.rootPassword})\""} shutdown"; - }; - - }; - -} diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 265d26e8ce9..cc4230d4d6a 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -55,7 +55,7 @@ in }; package = mkOption { - type = types.path; + type = types.package; example = literalExample "pkgs.postgresql92"; description = '' PostgreSQL package to use. diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix index ea6399ba4f4..9a4ce36a5cb 100644 --- a/nixos/modules/services/databases/redis.nix +++ b/nixos/modules/services/databases/redis.nix @@ -45,6 +45,7 @@ in package = mkOption { default = pkgs.redis; description = "Which Redis derivation to use."; + type = types.package; }; user = mkOption { diff --git a/nixos/modules/services/misc/cgminer.nix b/nixos/modules/services/misc/cgminer.nix index f715013b51f..20b7c34e886 100644 --- a/nixos/modules/services/misc/cgminer.nix +++ b/nixos/modules/services/misc/cgminer.nix @@ -42,6 +42,7 @@ in package = mkOption { default = pkgs.cgminer; description = "Which cgminer derivation to use."; + type = types.package; }; user = mkOption { diff --git a/nixos/modules/services/misc/dictd.nix b/nixos/modules/services/misc/dictd.nix index b84fbb3e128..fd68f847010 100644 --- a/nixos/modules/services/misc/dictd.nix +++ b/nixos/modules/services/misc/dictd.nix @@ -43,10 +43,12 @@ with pkgs.lib; group = "dictd"; description = "DICT.org dictd server"; home = "${dictdb}/share/dictd"; + uid = config.ids.uids.dictd; }; users.extraGroups = singleton { name = "dictd"; + gid = config.ids.gids.dictd; }; jobs.dictd = diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 1a957993f98..785d4397347 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -58,7 +58,7 @@ in nix = { package = mkOption { - type = types.path; + type = types.package; default = pkgs.nix; description = '' This option specifies the Nix package instance to use throughout the system. diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix index 1a8b85db329..9a5b170d5e6 100644 --- a/nixos/modules/services/misc/nixos-manual.nix +++ b/nixos/modules/services/misc/nixos-manual.nix @@ -63,7 +63,7 @@ in services.nixosManual.showManual = mkOption { type = types.bool; - default = false; + default = true; description = '' Whether to show the NixOS manual on one of the virtual consoles. diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix index 3c0c51e6ec8..babde3e942b 100644 --- a/nixos/modules/services/networking/firewall.nix +++ b/nixos/modules/services/networking/firewall.nix @@ -128,6 +128,17 @@ in ''; }; + networking.firewall.allowedTCPPortRanges = mkOption { + default = []; + example = [ { from = 8999; to = 9003; } ]; + type = types.listOf (types.attrsOf types.int); + description = + '' + A range of TCP ports on which incoming connections are + accepted. + ''; + }; + networking.firewall.allowedUDPPorts = mkOption { default = []; example = [ 53 ]; @@ -138,6 +149,16 @@ in ''; }; + networking.firewall.allowedUDPPortRanges = mkOption { + default = []; + example = [ { from = 60000; to = 61000; } ]; + type = types.listOf (types.attrsOf types.int); + description = + '' + Range of open UDP ports. + ''; + }; + networking.firewall.allowPing = mkOption { default = false; type = types.bool; @@ -322,6 +343,15 @@ in ) cfg.allowedTCPPorts } + # Accept connections to the allowed TCP port ranges. + ${concatMapStrings (rangeAttr: + let range = toString rangeAttr.from + ":" + toString rangeAttr.to; in + '' + ip46tables -A nixos-fw -p tcp --dport ${range} -j nixos-fw-accept + '' + ) cfg.allowedTCPPortRanges + } + # Accept packets on the allowed UDP ports. ${concatMapStrings (port: '' @@ -330,6 +360,15 @@ in ) cfg.allowedUDPPorts } + # Accept packets on the allowed UDP port ranges. + ${concatMapStrings (rangeAttr: + let range = toString rangeAttr.from + ":" + toString rangeAttr.to; in + '' + ip46tables -A nixos-fw -p udp --dport ${range} -j nixos-fw-accept + '' + ) cfg.allowedUDPPortRanges + } + # Accept IPv4 multicast. Not a big security risk since # probably nobody is listening anyway. #iptables -A nixos-fw -d 224.0.0.0/4 -j nixos-fw-accept diff --git a/nixos/modules/services/networking/ntpd.nix b/nixos/modules/services/networking/ntpd.nix index cdab789cd28..3d388cb1064 100644 --- a/nixos/modules/services/networking/ntpd.nix +++ b/nixos/modules/services/networking/ntpd.nix @@ -17,6 +17,8 @@ let restrict default kod nomodify notrap nopeer noquery restrict -6 default kod nomodify notrap nopeer noquery + restrict 127.0.0.1 + restrict -6 ::1 ${toString (map (server: "server " + server + " iburst\n") config.services.ntp.servers)} ''; diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index b96f5cf159b..a22ef10312d 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -63,6 +63,7 @@ let enablePHP = false; phpOptions = ""; options = {}; + documentRoot = null; }; res = defaults // svcFunction { inherit config pkgs serverInfo php; }; in res; @@ -188,7 +189,11 @@ let subservices = callSubservices serverInfo cfg.extraSubservices; - documentRoot = if cfg.documentRoot != null then cfg.documentRoot else + maybeDocumentRoot = fold (svc: acc: + if acc == null then svc.documentRoot else assert svc.documentRoot == null; acc + ) null ([ cfg ] ++ subservices); + + documentRoot = if maybeDocumentRoot != null then maybeDocumentRoot else pkgs.runCommand "empty" {} "ensureDir $out"; documentRootConf = '' @@ -240,7 +245,7 @@ let ${robotsConf} - ${if isMainServer || cfg.documentRoot != null then documentRootConf else ""} + ${if isMainServer || maybeDocumentRoot != null then documentRootConf else ""} ${if cfg.enableUserDir then '' @@ -414,7 +419,7 @@ in }; package = mkOption { - type = types.path; + type = types.package; default = pkgs.apacheHttpd.override { mpm = mainCfg.multiProcessingModule; }; example = "pkgs.apacheHttpd_2_4"; description = '' diff --git a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix index af2e2cae797..f5669faebc9 100644 --- a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix +++ b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix @@ -126,7 +126,18 @@ in ''} - Alias ${config.urlPrefix} ${mediawikiRoot} + ${if config.urlPrefix != "" then "Alias ${config.urlPrefix} ${mediawikiRoot}" else '' + RewriteEngine On + RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-f + RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-d + RewriteRule ${if config.enableUploads + then "!^/images" + else "^.*\$" + } %{DOCUMENT_ROOT}/${if config.articleUrlPrefix == "" + then "" + else "${config.articleUrlPrefix}/" + }index.php [L] + ''} Order allow,deny @@ -139,6 +150,8 @@ in ''} ''; + documentRoot = if config.urlPrefix == "" then mediawikiRoot else null; + enablePHP = true; options = { diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 512da831aa3..1a39fe43bbe 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -25,6 +25,7 @@ in package = mkOption { default = pkgs.nginx; + type = types.package; description = " Nginx package to use. "; diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix index 70750770663..dde5b333f32 100644 --- a/nixos/modules/services/x11/desktop-managers/default.nix +++ b/nixos/modules/services/x11/desktop-managers/default.nix @@ -7,9 +7,9 @@ let xcfg = config.services.xserver; cfg = xcfg.desktopManager; - # Whether desktop manager `d' is capable of setting a background. - # If it isn't, the `feh' program is used as a fallback. - needBGCond = d: ! (d ? bgSupport && d.bgSupport); + # If desktop manager `d' isn't capable of setting a background and + # the xserver is enabled, the `feh' program is used as a fallback. + needBGCond = d: ! (d ? bgSupport && d.bgSupport) && xcfg.enable; in diff --git a/nixos/modules/services/x11/hardware/synaptics.nix b/nixos/modules/services/x11/hardware/synaptics.nix index 91e01f2e30b..fe9dcd51a7a 100644 --- a/nixos/modules/services/x11/hardware/synaptics.nix +++ b/nixos/modules/services/x11/hardware/synaptics.nix @@ -2,9 +2,23 @@ with pkgs.lib; -let cfg = config.services.xserver.synaptics; in - -{ +let cfg = config.services.xserver.synaptics; + tapConfig = if cfg.tapButtons then enabledTapConfig else disabledTapConfig; + enabledTapConfig = '' + Option "MaxTapTime" "180" + Option "MaxTapMove" "220" + Option "TapButton1" "${builtins.elemAt cfg.buttonsMap 0}" + Option "TapButton2" "${builtins.elemAt cfg.buttonsMap 1}" + Option "TapButton3" "${builtins.elemAt cfg.buttonsMap 2}" + ''; + disabledTapConfig = '' + Option "MaxTapTime" "0" + Option "MaxTapMove" "0" + Option "TapButton1" "0" + Option "TapButton2" "0" + Option "TapButton3" "0" + ''; +in { options = { @@ -106,15 +120,10 @@ let cfg = config.services.xserver.synaptics; in MatchIsTouchpad "on" ${optionalString (cfg.dev != null) ''MatchDevicePath "${cfg.dev}"''} Driver "synaptics" - Option "MaxTapTime" "180" - Option "MaxTapMove" "220" Option "MinSpeed" "${cfg.minSpeed}" Option "MaxSpeed" "${cfg.maxSpeed}" Option "AccelFactor" "${cfg.accelFactor}" - ${if cfg.tapButtons then "" else ''Option "MaxTapTime" "0"''} - Option "TapButton1" "${builtins.elemAt cfg.buttonsMap 0}" - Option "TapButton2" "${builtins.elemAt cfg.buttonsMap 1}" - Option "TapButton3" "${builtins.elemAt cfg.buttonsMap 2}" + ${optionalString cfg.tapButtons tapConfig} Option "ClickFinger1" "${builtins.elemAt cfg.buttonsMap 0}" Option "ClickFinger2" "${builtins.elemAt cfg.buttonsMap 1}" Option "ClickFinger3" "${builtins.elemAt cfg.buttonsMap 2}" diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index 2b075bf6a6d..327f3b7e112 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -159,7 +159,7 @@ in boot.kernel.sysctl."kernel.printk" = config.boot.consoleLogLevel; - boot.kernelModules = [ "loop" ]; + boot.kernelModules = [ "loop" "configs" ]; boot.initrd.availableKernelModules = [ # Note: most of these (especially the SATA/PATA modules) diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index 97c688ce590..d0f4576f811 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -14,7 +14,7 @@ fail() { # in an interactive shell. cat < libs/ardour/revision.cc + # The funny revision number is from `git describe rev` + printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${tag}-gce4d125\"; }\n' > libs/ardour/revision.cc # Note the different version number - sed -i '33i rev = \"3.5-308-g40d8c5a\"' wscript + sed -i '33i rev = \"3.5-357-gce4d125\"' wscript sed 's|/usr/include/libintl.h|${glibc}/include/libintl.h|' -i wscript sed -e 's|^#!/usr/bin/perl.*$|#!${perl}/bin/perl|g' -i tools/fmt-bindings sed -e 's|^#!/usr/bin/env.*$|#!${perl}/bin/perl|g' -i tools/*.pl diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index cf554f83c8b..4352e2e133a 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation { description = "A multiplatform music player"; license = licenses.gpl3Plus; platforms = platforms.linux; + maintainers = [ maintainers.ttuegel ]; }; } diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index 17d53a621ca..44b0e9ef0d7 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -1,19 +1,20 @@ -{ stdenv, fetchurl, python, gettext, intltool, pkgconfig, jackaudio, libsndfile -, glib, gtk, glibmm, gtkmm, fftw, librdf, ladspaH, boost }: +{ stdenv, fetchurl, avahi, boost, fftw, gettext, glib, glibmm, gtk +, gtkmm, intltool, jackaudio, ladspaH, librdf, libsndfile, lv2 +, pkgconfig, python }: stdenv.mkDerivation rec { name = "guitarix-${version}"; - version = "0.25.2"; + version = "0.28.3"; src = fetchurl { url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.bz2"; - sha256 = "1wcg3yc2iy72hj6z9l88393f00by0iwhhn8xrc3q55p4rj0mnrga"; + sha256 = "0ks5avylyicqfj9l1wf4gj62i8m6is2jmp0h11h5l2wbg3xiwxjd"; }; - buildInputs = - [ python gettext intltool pkgconfig jackaudio libsndfile glib gtk glibmm - gtkmm fftw librdf ladspaH boost - ]; + buildInputs = [ + avahi boost fftw gettext glib glibmm gtk gtkmm intltool jackaudio + ladspaH librdf libsndfile lv2 pkgconfig python + ]; configurePhase = "python waf configure --prefix=$out"; @@ -21,7 +22,7 @@ stdenv.mkDerivation rec { installPhase = "python waf install"; - meta = { + meta = with stdenv.lib; { description = "A virtual guitar amplifier for Linux running with JACK"; longDescription = '' guitarix is a virtual guitar amplifier for Linux running with @@ -46,8 +47,8 @@ stdenv.mkDerivation rec { crazy sounds never heard before. ''; homepage = http://guitarix.sourceforge.net/; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = [ stdenv.lib.maintainers.astsmtl ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ astsmtl goibhniu ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/lastwatch/default.nix b/pkgs/applications/audio/lastwatch/default.nix index 324a0b0bebc..c09d397eefa 100644 --- a/pkgs/applications/audio/lastwatch/default.nix +++ b/pkgs/applications/audio/lastwatch/default.nix @@ -19,8 +19,6 @@ pythonPackages.buildPythonPackage rec { propagatedBuildInputs = pythonPath; - installCommand = "python setup.py install --prefix=$out"; - meta = { homepage = "https://github.com/aszlig/LastWatch"; description = "An inotify-based last.fm audio scrobbler"; diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index b684fee37d5..04393372cf3 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -13,7 +13,7 @@ pythonPackages.buildPythonPackage rec { }; propagatedBuildInputs = with pythonPackages; [ - gst_python pygobject pykka pyspotify pylast cherrypy ws4py + gst_python pygobject pykka pyspotify pylast cherrypy ws4py gst_plugins_base gst_plugins_good ]; # python zip complains about old timestamps @@ -27,8 +27,7 @@ pythonPackages.buildPythonPackage rec { postInstall = '' for p in $out/bin/mopidy $out/bin/mopidy-scan; do wrapProgram $p \ - --prefix GST_PLUGIN_PATH : ${gst_plugins_good}/lib/gstreamer-0.10 \ - --prefix GST_PLUGIN_PATH : ${gst_plugins_base}/lib/gstreamer-0.10 + --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" done ''; diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix index f14e2764211..8d4b8d4d778 100644 --- a/pkgs/applications/audio/mpg123/default.nix +++ b/pkgs/applications/audio/mpg123/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, alsaLib }: stdenv.mkDerivation { - name = "mpg123-1.16.0"; + name = "mpg123-1.18.1"; src = fetchurl { - url = mirror://sourceforge/mpg123/mpg123-1.16.0.tar.bz2; - sha256 = "1lznnfdvg69a9qbbhvhfc9i86hxdmdqx67lvbkqbh8mmhpip43zh"; + url = mirror://sourceforge/mpg123/mpg123-1.18.1.tar.bz2; + sha256 = "0bb5hv0qw3ln09xisi7d19gb4p2y69sx3905rdc293q3gr7khvdw"; }; buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib; diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index f2f196acdd8..b8a283125fc 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -1,14 +1,15 @@ -{stdenv, fetchurl, alsaLib, gtk, pkgconfig }: +{ stdenv, fetchurl, alsaLib, gtk, pkgconfig }: stdenv.mkDerivation { - name = "praat-5323"; + name = "praat-5365"; + src = fetchurl { - url = http://www.fon.hum.uva.nl/praat/praat5323_sources.tar.gz; - sha256 = "1m0m5165h74mw5xhmnnyzh5ans3cn78w5rs9572sa1512cams203"; + url = http://www.fon.hum.uva.nl/praat/praat5365_sources.tar.gz; + sha256 = "1w3mcq0mipx88i7ckhvzhmdj0p67nhppnn7kbkp21d01yyyz5rgq"; }; configurePhase = '' - cp makefiles/makefile.defs.linux makefile.defs + cp makefiles/makefile.defs.linux.alsa makefile.defs ''; installPhase = '' @@ -22,5 +23,6 @@ stdenv.mkDerivation { description = "Doing phonetics by computer"; homepage = http://www.fon.hum.uva.nl/praat/; license = "GPLv2+"; # Has some 3rd-party code in it though + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index c865314cb17..de1aba2a7f6 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, buildPythonPackage, mutagen, pygtk, pygobject +{ stdenv, fetchurl, python, buildPythonPackage, mutagen, pygtk, pygobject, intltool , pythonDBus, gst_python, withGstPlugins ? false, gst_plugins_base ? null , gst_plugins_good ? null, gst_plugins_ugly ? null, gst_plugins_bad ? null }: @@ -29,6 +29,11 @@ buildPythonPackage { }) ]; + preConfigure = '' + # TODO: for now don't a apply gdist overrides, will be needed for shipping icons, gtk, etc + sed -i /distclass/d setup.py + ''; + sourceRoot = "quodlibet-${version}"; postUnpack = '' # the patch searches for plugins in directory ../plugins @@ -42,18 +47,13 @@ buildPythonPackage { ]; propagatedBuildInputs = [ - mutagen pygtk pygobject pythonDBus gst_python + mutagen pygtk pygobject pythonDBus gst_python intltool ]; postInstall = stdenv.lib.optionalString withGstPlugins '' # Wrap quodlibet so it finds the GStreamer plug-ins - wrapProgram "$out/bin/quodlibet" --prefix \ - GST_PLUGIN_PATH ":" \ - ${ stdenv.lib.concatStringsSep ":" - (map (s: s+"/lib/gstreamer-0.10") - (stdenv.lib.filter (s: s != null) [ - gst_plugins_base gst_plugins_good gst_plugins_ugly gst_plugins_bad - ])) } + wrapProgram "$out/bin/quodlibet" --prefix \ + GST_PLUGIN_SYSTEM_PATH ":" "$GST_PLUGIN_SYSTEM_PATH" \ ''; meta = { diff --git a/pkgs/applications/editors/emacs-modes/idris/default.nix b/pkgs/applications/editors/emacs-modes/idris/default.nix index 572ca8cdb22..289c8868876 100644 --- a/pkgs/applications/editors/emacs-modes/idris/default.nix +++ b/pkgs/applications/editors/emacs-modes/idris/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, emacs }: stdenv.mkDerivation rec { - name = "idris-mode-20140106"; + name = "idris-mode-20140223"; src = fetchgit { url = https://github.com/idris-hackers/idris-mode.git; - rev = "47df65dd5b554c1d7cf70a07c3bd06d80867f870"; - sha256 = "55df66d1bace134bea83f0547e01daf068fc96dc080cf88ea8945ddcb2d08ea4"; + rev = "486470533e74c55192e92a1afa050475915ee1e7"; + sha256 = "ff2e6bd8fbf421e8f2db0789d2ff56c5103775b911b99bab64e4652d332bad43"; }; buildInputs = [ emacs ]; diff --git a/pkgs/applications/editors/emacs-modes/structured-haskell-mode/default.nix b/pkgs/applications/editors/emacs-modes/structured-haskell-mode/default.nix new file mode 100644 index 00000000000..25055df8ea3 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/structured-haskell-mode/default.nix @@ -0,0 +1,23 @@ +{ cabal, emacs, haskellSrcExts }: + +cabal.mkDerivation (self: { + pname = "structured-haskell-mode"; + version = "1.0.2"; + sha256 = "1lwdhlr38y5hdr78nplplr3q0hrjhryw378f1857qh0lvp03gwl2"; + isLibrary = false; + isExecutable = true; + buildDepends = [ haskellSrcExts ]; + buildTools = [ emacs ]; + postInstall = '' + emacs -L elisp --batch -f batch-byte-compile "elisp/"*.el + install -d $out/share/emacs/site-lisp + install "elisp/"*.elc $out/share/emacs/site-lisp + ''; + meta = { + homepage = "https://github.com/chrisdone/structured-haskell-mode"; + description = "Structured editing Emacs mode for Haskell"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.pSub ]; + }; +}) diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index 7dd4a0519ce..67317490412 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -1,8 +1,10 @@ { stdenv, fetchhg, ncurses, gettext, pkgconfig }: stdenv.mkDerivation rec { - name = "vim-7.4.131"; - + name = "vim-${version}"; + + version = "7.4.131"; + src = fetchhg { url = "https://vim.googlecode.com/hg/"; tag = "v7-4-131"; @@ -10,7 +12,7 @@ stdenv.mkDerivation rec { }; enableParallelBuilding = true; - + buildInputs = [ ncurses pkgconfig ]; nativeBuildInputs = [ gettext ]; diff --git a/pkgs/applications/editors/vim/wrapper.nix b/pkgs/applications/editors/vim/wrapper.nix new file mode 100644 index 00000000000..709753ff8eb --- /dev/null +++ b/pkgs/applications/editors/vim/wrapper.nix @@ -0,0 +1,30 @@ +{ stdenv, makeWrapper, writeText, vim, vimrc }: + +let + + vimrcfile = writeText "vimrc" (if vimrc == null then "" else vimrc); + +in stdenv.mkDerivation rec { + name = "vimwrapper-${vim.version}"; + + buildInputs = [ makeWrapper vim vimrcfile ]; + + phases = [ "installPhase" ]; + + installPhase = '' + mkdir -p $out + cp -r ${vim}/* $out/ + + chmod u+w $out/bin + chmod u+w $out/share/vim + + ln -s ${vimrcfile} $out/share/vim/vimrc + wrapProgram $out/bin/vim --set VIM "$out/share/vim" + ''; + + meta = with stdenv.lib; { + description = "The most popular clone of the VI editor"; + homepage = http://www.vim.org; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/editors/yi/yi-contrib.nix b/pkgs/applications/editors/yi/yi-contrib.nix index e2fadcca345..0ed6e877862 100644 --- a/pkgs/applications/editors/yi/yi-contrib.nix +++ b/pkgs/applications/editors/yi/yi-contrib.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "yi-contrib"; - version = "0.7.0"; - sha256 = "12x9ps5yrszr8dlj15kmsm9myq3gzd9x9nacvl3x6cq91wk53mzj"; + version = "0.7.1"; + sha256 = "0915ikck01kc5npbvywd9r7azylqrhfymzc72rf4iaghz4w939li"; buildDepends = [ dataAccessor filepath mtl split yi ]; meta = { homepage = "http://haskell.org/haskellwiki/Yi"; diff --git a/pkgs/applications/editors/yi/yi.nix b/pkgs/applications/editors/yi/yi.nix index 4dfc60bef76..b504af14904 100644 --- a/pkgs/applications/editors/yi/yi.nix +++ b/pkgs/applications/editors/yi/yi.nix @@ -1,25 +1,24 @@ { cabal, alex, binary, Cabal, cautiousFile, concreteTyperep , dataAccessor, dataAccessorMtl, dataAccessorTemplate, derive, Diff -, dlist, dyre, filepath, fingertree, ghcPaths, glib, gtk, hashable -, hint, HUnit, mtl, pango, parsec, pointedlist, pureMD5, QuickCheck -, random, regexBase, regexTdfa, split, testFramework -, testFrameworkHunit, time, uniplate, unixCompat -, unorderedContainers, utf8String, vty, xdgBasedir +, dlist, dyre, filepath, fingertree, glib, gtk, hashable, hint +, HUnit, mtl, pango, parsec, pointedlist, QuickCheck, random +, regexBase, regexTdfa, split, testFramework, testFrameworkHunit +, time, uniplate, unixCompat, unorderedContainers, utf8String, vty +, xdgBasedir }: cabal.mkDerivation (self: { pname = "yi"; - version = "0.7.0"; - sha256 = "0mzcjgp12k5mxb37r6chxsk726b1qxds49ch656bpgrg7n22w2j1"; + version = "0.7.1"; + sha256 = "111xg7qpjhsqf6pfr136wh8km3lrgpzghd9h5rlypafr61w59vly"; isLibrary = true; isExecutable = true; buildDepends = [ binary Cabal cautiousFile concreteTyperep dataAccessor dataAccessorMtl dataAccessorTemplate derive Diff dlist dyre - filepath fingertree ghcPaths glib gtk hashable hint mtl pango - parsec pointedlist pureMD5 QuickCheck random regexBase regexTdfa - split time uniplate unixCompat unorderedContainers utf8String vty - xdgBasedir + filepath fingertree glib gtk hashable hint mtl pango parsec + pointedlist QuickCheck random regexBase regexTdfa split time + uniplate unixCompat unorderedContainers utf8String vty xdgBasedir ]; testDepends = [ filepath HUnit QuickCheck testFramework testFrameworkHunit diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 66a7f334dbd..35659cbfe6f 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -18,14 +18,14 @@ }: let - version = "6.8.7-6"; + version = "6.8.8-7"; in stdenv.mkDerivation rec { name = "ImageMagick-${version}"; src = fetchurl { url = "mirror://imagemagick/${name}.tar.xz"; - sha256 = "0cbfhk184kxdxz5czyyqxac29mbfiahygjji6k97z6hp8ngnqlvh"; + sha256 = "1x5jkbrlc10rx7vm344j7xrs74c80xk3n1akqx8w5c194fj56mza"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 1e920ff65c5..4f52e6dec0f 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -2,11 +2,11 @@ , libXinerama, curl }: stdenv.mkDerivation rec { - name = "feh-2.9.3"; + name = "feh-2.10"; src = fetchurl { url = "http://feh.finalrewind.org/${name}.tar.bz2"; - sha256 = "1wlhfbglzc1jzsh80s4s1fawclgzyjy2105ffzx2mw9s0c1xds5l"; + sha256 = "10ya8j0mxlni08qli3gdkyjhy54g4d2q2kc0hhragmzd9s42ly5w"; }; buildInputs = [makeWrapper x11 imlib2 giblib libjpeg libpng libXinerama curl ]; diff --git a/pkgs/applications/graphics/mirage/default.nix b/pkgs/applications/graphics/mirage/default.nix index cd5388c1b88..67b91fd6857 100644 --- a/pkgs/applications/graphics/mirage/default.nix +++ b/pkgs/applications/graphics/mirage/default.nix @@ -9,10 +9,6 @@ buildPythonPackage rec { sha256 = "d214a1b6d99d1d1e83da5848a2cef181f6781e0990e93f7ebff5880b0c43f43c"; }; - postInstall = '' - mv $out/lib/${python.libPrefix}/site-packages/*.egg/share $out - ''; - doCheck = false; buildInputs = [ stdenv libX11 gettext ]; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index c2672393bc5..f3d7c26fe5c 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "calibre-1.23.0"; + name = "calibre-1.25.0"; src = fetchurl { url = "mirror://sourceforge/calibre/${name}.tar.xz"; - sha256 = "1sm6v53c12nkqnpv7n4g1mzkwmzbn74a8v83bzvvjiz0i9c7cl59"; + sha256 = "1y221r5vgq426ldqjrx3qvgf3j3v2wncwzra747psvhwf95zd5fd"; }; inherit python; diff --git a/pkgs/applications/misc/gnuradio/default.nix b/pkgs/applications/misc/gnuradio/default.nix index 08d2b29a92a..3fc3e1e8e5f 100644 --- a/pkgs/applications/misc/gnuradio/default.nix +++ b/pkgs/applications/misc/gnuradio/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { name = "gnuradio-${version}"; - version = "3.7.1"; + version = "3.7.2.1"; src = fetchurl { url = "http://gnuradio.org/releases/gnuradio/${name}.tar.gz"; - sha256 = "1kfni8vpgr6v9rdiz3zsmwc07qj6zka9x22z2y0y4rak2xnzdxz9"; + sha256 = "101wr19nxfc5x7i4s10vgrypaa0vj2pkg8b2vn5j5s9iv8gpwswc"; }; buildInputs = [ @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { postInstall = '' printf "backend : Qt4Agg\n" > "$out/share/gnuradio/matplotlibrc" - for file in "$out"/bin/*; do + for file in "$out"/bin/* "$out"/share/gnuradio/examples/*/*.py; do wrapProgram "$file" \ --set PYTHONPATH $PYTHONPATH:$(toPythonPath "$out") \ --set MATPLOTLIBRC "$out/share/gnuradio" diff --git a/pkgs/applications/misc/lxappearance/default.nix b/pkgs/applications/misc/lxappearance/default.nix new file mode 100644 index 00000000000..9295eaabf32 --- /dev/null +++ b/pkgs/applications/misc/lxappearance/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl, intltool, pkgconfig, libX11, gtk }: + +stdenv.mkDerivation rec { + name = "lxappearance-0.5.5"; + src = fetchurl{ + url = "http://downloads.sourceforge.net/project/lxde/LXAppearance/${name}.tar.xz"; + sha256 = "8cae82e6425ba8a0267774e4d10096df2d91b0597520058331684a5ece068b4c"; + }; + buildInputs = [ intltool libX11 pkgconfig gtk ]; + meta = { + description = "A lightweight program for configuring the theme and fonts of gtk applications"; + maintainers = [ stdenv.lib.maintainers.hinton ]; + platforms = stdenv.lib.platforms.all; + license = stdenv.lib.licenses.gpl2; + homepage = "http://lxappearance.sourceforce.net/"; + }; +} diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 17b86910de0..57ac7da9b78 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -8,6 +8,13 @@ stdenv.mkDerivation rec { sha256 = "0y247nka5gkr1ajn47jrlp5rcnf6h4ff7dfsprma3h4wxqdv7a5b"; }; + patches = [(fetchurl { + name = "CVE-2014-2013.patch"; + url = "http://git.ghostscript.com/?p=mupdf.git;a=commitdiff_plain;" + + "h=60dabde18d7fe12b19da8b509bdfee9cc886aafc"; + sha256 = "1walj3wir9x50i6lph33bx14c8593r9xrn08gkd3v7r6d15lmjps"; + })]; + buildInputs = [ pkgconfig zlib freetype libjpeg jbig2dec openjpeg libX11 libXext ]; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/pkgs/applications/misc/pcmanfm/default.nix new file mode 100644 index 00000000000..f7180097961 --- /dev/null +++ b/pkgs/applications/misc/pcmanfm/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, glib, gtk, intltool, libfm, libX11, pango, pkgconfig }: + +stdenv.mkDerivation { + name = "pcmanfm-1.2.0"; + src = fetchurl { + url = "mirror://sourceforge/pcmanfm/pcmanfm-1.2.0.tar.xz"; + sha256 = "1cmskj7dpjgrrn89z7cc1h1nsmd6qq3bakf207ldrhrxxv3fxl2j"; + }; + + buildInputs = [ glib gtk intltool libfm libX11 pango pkgconfig ]; + + meta = with stdenv.lib; { + homepage = "http://blog.lxde.org/?cat=28/"; + license = licenses.gpl2Plus; + description = "File manager with GTK+ interface"; + maintainers = [ maintainers.ttuegel ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/twmn/default.nix b/pkgs/applications/misc/twmn/default.nix new file mode 100644 index 00000000000..65c2ccb5ff0 --- /dev/null +++ b/pkgs/applications/misc/twmn/default.nix @@ -0,0 +1,29 @@ +{ fetchurl, stdenv, fetchgit, qt4, pkgconfig, boost, dbus }: + +stdenv.mkDerivation rec { + rev = "9f52882688ba03d7aaab2e3fd83cb05cfbf1a374"; + name = "twmn-${rev}"; + + src = fetchgit { + inherit rev; + url = "https://github.com/sboli/twmn.git"; + sha256 = "1jd2y0ydcpjdmjbx77lw35710sqfwbgyrnpv66mi3gwvrbyiwpf3"; + }; + + buildInputs = [ qt4 pkgconfig boost ]; + propagatedBuildInputs = [ dbus ]; + + configurePhase = "qmake"; + + installPhase = '' + mkdir -p "$out/bin" + cp bin/* "$out/bin" + ''; + + meta = { + description = "A notification system for tiling window managers"; + homepage = "https://github.com/sboli/twmn"; + platforms = with stdenv.lib.platforms; linux; + maintainers = [ stdenv.lib.maintainers.matejc ]; + }; +} diff --git a/pkgs/applications/misc/xmobar/add-freeration-variable.patch b/pkgs/applications/misc/xmobar/add-freeration-variable.patch deleted file mode 100644 index a8c10e1a30d..00000000000 --- a/pkgs/applications/misc/xmobar/add-freeration-variable.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff --git a/readme.md b/readme.md -index f4f07e8..de679c7 100644 ---- a/readme.md -+++ b/readme.md -@@ -645,7 +645,7 @@ something like: - - Args: default monitor arguments - - Variables that can be used with the `-t`/`--template` argument: - `total`, `free`, `buffer`, `cache`, `rest`, `used`, -- `usedratio`, `usedbar`, `freebar` -+ `usedratio`, `usedbar`, `freeratio`, `freebar` - - Default template: `Mem: % (M)` - - ### `Swap Args RefreshRate` -diff --git a/src/Plugins/Monitors/Mem.hs b/src/Plugins/Monitors/Mem.hs -index 5c55ee2..3cf46c7 100644 ---- a/src/Plugins/Monitors/Mem.hs -+++ b/src/Plugins/Monitors/Mem.hs -@@ -19,8 +19,8 @@ import Plugins.Monitors.Common - memConfig :: IO MConfig - memConfig = mkMConfig - "Mem: % (M)" -- template -- ["usedbar", "freebar", "usedratio", "total", -- "free", "buffer", "cache", "rest", "used"] -- available replacements -+ ["usedbar", "freebar", "usedratio", "freeratio", "total", -+ "free", "buffer", "cache", "rest", "used"] -- available replacements - - fileMEM :: IO String - fileMEM = readFile "/proc/meminfo" -@@ -33,7 +33,8 @@ parseMEM = - rest = free + buffer + cache - used = total - rest - usedratio = used / total -- return [usedratio, total, free, buffer, cache, rest, used] -+ freeratio = free / total -+ return [usedratio, freeratio, total, free, buffer, cache, rest, used, freeratio] - - totalMem :: IO Float - totalMem = fmap ((*1024) . (!!1)) parseMEM -@@ -42,15 +43,16 @@ usedMem :: IO Float - usedMem = fmap ((*1024) . (!!6)) parseMEM - - formatMem :: [Float] -> Monitor [String] --formatMem (r:xs) = -+formatMem (r:fr:xs) = - do let f = showDigits 0 - rr = 100 * r - ub <- showPercentBar rr r - fb <- showPercentBar (100 - rr) (1 - r) - rs <- showPercentWithColors r -+ fs <- showPercentWithColors fr - s <- mapM (showWithColors f) xs -- return (ub:fb:rs:s) --formatMem _ = return $ replicate 9 "N/A" -+ return (ub:fb:rs:fs:s) -+formatMem _ = return $ replicate 10 "N/A" - - runMem :: [String] -> Monitor String - runMem _ = diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index 1d050182da3..a13dd76fd03 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, xorg, ncurses, freetype, fontconfig, pkgconfig }: stdenv.mkDerivation rec { - name = "xterm-300"; + name = "xterm-301"; src = fetchurl { url = "ftp://invisible-island.net/xterm/${name}.tgz"; - sha256 = "1k8p7q4d1gpk6zikb8hys8b30yq2v001nlp3r9g40my31ij9al31"; + sha256 = "040rarvv18zg0lk7qy0m3n7gv10mh40jic708wvng01z4rlbpfhz"; }; buildInputs = diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index b86107890d8..933882c940b 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk, girara, gettext, docutils, file, makeWrapper }: +{ stdenv, fetchurl, pkgconfig, gtk, girara, gettext, docutils, file, makeWrapper, zathura_icon }: stdenv.mkDerivation rec { version = "0.2.7"; @@ -21,7 +21,12 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" "RSTTOMAN=${docutils}/bin/rst2man.py" "VERBOSE=1" ]; postInstall = '' - wrapProgram "$out/bin/zathura" --prefix PATH ":" "${file}/bin" + wrapProgram "$out/bin/zathura" \ + --prefix PATH ":" "${file}/bin" \ + --prefix XDG_CONFIG_DIRS ":" "$out/etc" + + mkdir -pv $out/etc + echo "set window-icon ${zathura_icon}" > $out/etc/zathurarc ''; meta = { diff --git a/pkgs/applications/misc/zathura/default.nix b/pkgs/applications/misc/zathura/default.nix index 2ee32f77c1e..f943bff7bf0 100644 --- a/pkgs/applications/misc/zathura/default.nix +++ b/pkgs/applications/misc/zathura/default.nix @@ -3,8 +3,11 @@ rec { inherit (pkgs) stdenv; + icon = ./icon.xpm; + zathura_core = callPackage ./core { gtk = pkgs.gtk3; + zathura_icon = icon; }; zathura_pdf_poppler = callPackage ./pdf-poppler { }; @@ -19,7 +22,7 @@ rec { zathuraWrapper = stdenv.mkDerivation { - inherit zathura_core; + inherit zathura_core icon; name = "zathura-${zathura_core.version}"; @@ -29,8 +32,6 @@ rec { zathura_ps ]; - icon = ./icon.xpm; - builder = ./builder.sh; preferLocalBuild = true; diff --git a/pkgs/applications/networking/bittorrentsync/default.nix b/pkgs/applications/networking/bittorrentsync/default.nix index 895ebd7911b..c6277da704e 100644 --- a/pkgs/applications/networking/bittorrentsync/default.nix +++ b/pkgs/applications/networking/bittorrentsync/default.nix @@ -14,9 +14,9 @@ let else if stdenv.system == "i686-linux" then "ld-linux.so.2" else throw "Bittorrent Sync for: ${stdenv.system} not supported!"; - version = "1.2.82"; - sha256 = if stdenv.system == "x86_64-linux" then "0cqrscav57xwz7rag6wy06xw6z7ca97xailprgg6jdjv4pnc91ra" - else if stdenv.system == "i686-linux" then "1b9rnfk0wkhj1zybvfqwgd9dcqnxwdnp7m0vf6lhrgi75cydj7is" + version = "1.2.91"; + sha256 = if stdenv.system == "x86_64-linux" then "1rx5mmk3ffkh6dbm0m33nyx6spsxqjw9djclcf9x9bs3zfyzgmnd" + else if stdenv.system == "i686-linux" then "1566mp01149gsb57dv87420w1vq2f3adp6g1c90xdxjxzd67yqpw" else throw "Bittorrent Sync for: ${stdenv.system} not supported!"; in stdenv.mkDerivation { diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix index 64866243261..63b4c9033a3 100644 --- a/pkgs/applications/networking/browsers/chromium/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/sources.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { dev = { - version = "34.0.1847.3"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-34.0.1847.3.tar.xz"; - sha256 = "1jm9cr1qqfqd82fy3f1q4d0qg94vsrzyq8dbn4hrxyzqbjc4sclg"; + version = "35.0.1862.2"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-35.0.1862.2.tar.xz"; + sha256 = "19426x4x3bnx21qjhqc4sk27k7dnhm1pw84079h6gk0hyjzcwn0f"; }; beta = { - version = "33.0.1750.115"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-33.0.1750.115.tar.xz"; - sha256 = "1whr5vz8w8h9la219ah1bcsa5r84jby306w12gfzlsbk9czxchrp"; + version = "34.0.1847.14"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-34.0.1847.14.tar.xz"; + sha256 = "038bz2d40rgjppkalal9ycjhfvkhph926k35v8pc3618z2fy10cn"; }; stable = { - version = "33.0.1750.115"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-33.0.1750.115.tar.xz"; - sha256 = "1whr5vz8w8h9la219ah1bcsa5r84jby306w12gfzlsbk9czxchrp"; + version = "33.0.1750.146"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-33.0.1750.146.tar.xz"; + sha256 = "0x2a5kyaj38661c5s33pywhrwkm8kj2fbr1z940c5al6y2hfgc6m"; }; } diff --git a/pkgs/applications/networking/browsers/dwb/default.nix b/pkgs/applications/networking/browsers/dwb/default.nix index e10acf294bf..c638e2b1adb 100644 --- a/pkgs/applications/networking/browsers/dwb/default.nix +++ b/pkgs/applications/networking/browsers/dwb/default.nix @@ -2,12 +2,12 @@ m4, glib_networking, gsettings_desktop_schemas }: stdenv.mkDerivation { - name = "dwb-2014-01-29"; + name = "dwb-2014-03-01"; src = fetchgit { url = "https://bitbucket.org/portix/dwb.git"; - rev = "eaf090af9ad63341a846377cb9ce473feee8f032"; - sha256 = "1wqa5dry9p3x3y07zpq3km8ycr8wvz8c11754vf99pv1kzk8gq0n"; + rev = "e8d4b8d7937b70279d006da4938dfe52fb85f9e8"; + sha256 = "0m4730zqmnvb9k6xyydi221sh0wbanzbhg07xvwil3kn1d29340w"; }; buildInputs = [ pkgconfig makeWrapper libsoup webkit gtk3 gnutls json_c m4 ]; diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index c0cfb60420b..db89903c3ad 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -17,9 +17,9 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null; rec { - firefoxVersion = "27.0"; + firefoxVersion = "27.0.1"; - xulVersion = "27.0"; # this attribute is used by other packages + xulVersion = "27.0.1"; # this attribute is used by other packages src = fetchurl { @@ -29,7 +29,7 @@ rec { # Fall back to this url for versions not available at releases.mozilla.org. "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2" ]; - sha1 = "ec2031385237e30be829817ac79caa8e80cc2a14"; + sha256 = "13qd53yf8dn9m03p4x5ml9h3mys60nba5nz82lcvaq7ycp1pl1bn"; }; commonConfigureFlags = diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix index 7efdf7ed015..9b9d9ab6db1 100644 --- a/pkgs/applications/networking/browsers/links2/default.nix +++ b/pkgs/applications/networking/browsers/links2/default.nix @@ -8,12 +8,12 @@ }: stdenv.mkDerivation rec { - version = "2.5"; + version = "2.8"; name = "links2-${version}"; src = fetchurl { url = "${meta.homepage}/download/links-${version}.tar.bz2"; - sha256 = "1wlmj8s6bxgznh0pnawihyvhffzryciz3lkagcxhf7fp64zz5izm"; + sha256 = "15h07498z52jfdahzgvkphg1f7qvxnpbyfn2xmsls0d2dwwdll3r"; }; buildInputs = diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix index ecd51f7c110..8317f94e079 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -36,7 +36,7 @@ let # -> http://get.adobe.com/flashplayer/ - version = "11.2.202.336"; + version = "11.2.202.341"; src = if stdenv.system == "x86_64-linux" then @@ -47,7 +47,7 @@ let else rec { inherit version; url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz"; - sha256 = "1wri6y5vllgs452dfklv23k7bp5daajnaqblkn5cb2gl28l5xcni"; + sha256 = "0d1ic70awdig0v699svmq8mmnil8xmmwsap30sgi0r94saxmq49j"; } else if stdenv.system == "i686-linux" then if debug then { @@ -58,7 +58,7 @@ let } else rec { inherit version; url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz"; - sha256 = "0mjxjbj75r74gqpmqzqa6vlrk2wv7r358wcqbmg132bhv8kaph85"; + sha256 = "0bfz1id4035jnkwy4xm0dj8l9lygrrzqdbf8dgc9pcy8c63d1hac"; } else throw "Flash Player is not supported on this platform"; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix index 4f7d3feb8ad..e1bc4e977f6 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -45,20 +45,22 @@ in stdenv.mkDerivation rec { name = "google-talk-plugin-${version}"; - # Use the following to determine the current upstream version: - # curl -s http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-amd64/Packages | sed -nr 's/^Version: *([^ ]+)-1$/\1/p' - version = "4.2.1.0"; + + # You can get the upstream version and SHA-1 hash from the following URLs: + # http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-amd64/Packages + # http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-i386/Packages + version = "5.1.5.0"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "${baseURL}/google-talkplugin_${version}-1_amd64.deb"; - sha256 = "1g7kpz2lzzz1gri5rd3isp7cfyls6gzwcw2kc8jgrgrixq9iixfd"; + sha1 = "fc830f4c7f5816f4578ec73e6d4aef059ad4a0b1"; } else if stdenv.system == "i686-linux" then fetchurl { url = "${baseURL}/google-talkplugin_${version}-1_i386.deb"; - sha256 = "1z0zbblzlky9nyifxmnl49v4zafpqp3l08b9v1486sinm35rf58r"; + sha1 = "9b7043c3585b3479ba11aabb7b8af755a61df963"; } else throw "Google Talk does not support your platform."; diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix new file mode 100644 index 00000000000..34c3af16126 --- /dev/null +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -0,0 +1,127 @@ +{ stdenv, fetchurl, jre, bash, simpleBuildTool, python27Packages }: + +stdenv.mkDerivation rec { + name = "spark-${version}"; + version = "0.9.0"; + + src = fetchurl { + url = "http://d3kbcqa49mib13.cloudfront.net/${name}-incubating-bin-cdh4.tgz"; + sha256 = "0dgirq2ws25accijijanqij6d1mwxkrcqkmq1xsslfpz26svs1w1"; + }; + + unpackPhase = ''tar zxf $src''; + + untarDir = "spark-${version}-incubating-bin-cdh4"; + installPhase = '' + set -x + mkdir -p $out/lib $out/bin + mv ${untarDir} $out/lib + + cat > $out/bin/spark-class < []" >&2 + exit 1 + fi + + export SPARK_MEM=\''${SPARK_MEM:-1024m} + + JAVA_OPTS="" + JAVA_OPTS="\$JAVA_OPTS -Djava.library.path=\"\$SPARK_LIBRARY_PATH\"" + JAVA_OPTS="\$JAVA_OPTS -Xms\$SPARK_MEM -Xmx\$SPARK_MEM" + export JAVA_OPTS + + CLASSPATH=\`$out/lib/${untarDir}/bin/compute-classpath.sh\` + export CLASSPATH + + exec ${jre}/bin/java -cp "\$CLASSPATH" \$JAVA_OPTS "\$@" + EOF + chmod +x $out/bin/spark-class + + cat > $out/bin/spark-shell </dev/null) + if [[ ! \$? ]]; then + saved_stty="" + fi + + $out/bin/spark-class \$OPTIONS org.apache.spark.repl.Main "\$@" + + exit_status=\$? + onExit + EOF + chmod +x $out/bin/spark-shell + + cat > $out/bin/pyspark < $out/bin/spark-upload-scala < $out/bin/spark-upload-python < $out/bin/telegram < jdk != null && perl != null; stdenv.mkDerivation rec { - version = "1.8.5"; + version = "1.8.8"; name = "subversion-${version}"; src = fetchurl { url = "mirror://apache/subversion/${name}.tar.bz2"; - sha256 = "0r3mxrrlr1l9s2nh829bf0qmrfaafkq3di6ndr10j76sxkqjnlpx"; + sha256 = "1cqxwydjidyf59y4lgkxl7bra1sy28abqm2mi5971qjsv0f96s8m"; }; buildInputs = [ zlib apr aprutil sqlite ] diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix index c3b78b64d93..ef40d614a39 100644 --- a/pkgs/applications/video/gnash/default.nix +++ b/pkgs/applications/video/gnash/default.nix @@ -97,9 +97,7 @@ stdenv.mkDerivation rec { # (e.g., gst-ffmpeg is needed to watch movies such as YouTube's). for prog in "$out/bin/"* do - wrapProgram "$prog" --prefix \ - GST_PLUGIN_PATH ":" \ - "${gst_plugins_base}/lib/gstreamer-0.10:${gst_plugins_good}/lib/gstreamer-0.10:${gst_ffmpeg}/lib/gstreamer-0.10" + wrapProgram "$prog" --prefix GST_PLUGIN_SYSTEM_PATH ":" "$GST_PLUGIN_SYSTEM_PATH" done ''; diff --git a/pkgs/applications/video/kazam/bug_1190693.patch b/pkgs/applications/video/kazam/bug_1190693.patch new file mode 100644 index 00000000000..9f00c6b6079 --- /dev/null +++ b/pkgs/applications/video/kazam/bug_1190693.patch @@ -0,0 +1,14 @@ +=== modified file 'kazam/frontend/indicator.py' +--- a/kazam/frontend/indicator.py 2013-01-26 01:53:53 +0000 ++++ b/kazam/frontend/indicator.py 2013-06-13 18:18:37 +0000 +@@ -291,3 +291,9 @@ + def start_recording(self): + logger.debug("Recording started.") + self.indicator.set_from_icon_name("kazam-recording") ++ ++ def hide_it(self): ++ self.indicator.set_visible(False) ++ ++ def show_it(self): ++ self.indicator.set_visible(True) + diff --git a/pkgs/applications/video/kazam/datadir.patch b/pkgs/applications/video/kazam/datadir.patch new file mode 100644 index 00000000000..114d4228be2 --- /dev/null +++ b/pkgs/applications/video/kazam/datadir.patch @@ -0,0 +1,11 @@ +--- a/bin/kazam 2014-02-03 23:11:38.465614061 +0100 ++++ b/bin/kazam-1 2014-02-03 23:12:28.447058700 +0100 +@@ -68,7 +68,7 @@ + # when base install path is not /usr + curpath = os.path.abspath(__file__) + curpath = os.path.realpath(curpath) +- datadir = curpath.split('bin/')[0] + "share/kazam/" ++ datadir = os.path.realpath(os.path.join(curpath, "./../../", "share/kazam/")) + + try: + import platform diff --git a/pkgs/applications/video/kazam/default.nix b/pkgs/applications/video/kazam/default.nix new file mode 100644 index 00000000000..ed93f81b662 --- /dev/null +++ b/pkgs/applications/video/kazam/default.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchurl, python3Packages, gst_all_1, makeWrapper, gobjectIntrospection +, gtk3, libwnck3, keybinder, intltool, libcanberra }: + + +python3Packages.buildPythonPackage rec { + name = "kazam-${version}"; + version = "1.4.3"; + + src = fetchurl { + url = "https://launchpad.net/kazam/stable/${version}/+download/kazam-${version}.tar.gz"; + sha256 = "00bcn0yj9xrv87sf6xd3wpilsjgjpsj15zzpjh351ffpjnr0ica8"; + }; + + # TODO: keybinder, appindicator3 + buildInputs = with python3Packages; + [ pygobject3 pyxdg pycairo gst_all_1.gstreamer gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good gobjectIntrospection gtk3 libwnck3 distutils_extra + intltool dbus ]; + + # TODO: figure out why PYTHONPATH is not passed automatically for those programs + pythonPath = with python3Packages; + [ pygobject3 pyxdg pycairo dbus ]; + + patches = [ ./datadir.patch ./bug_1190693.patch ]; + prePatch = '' + rm setup.cfg + substituteInPlace kazam/backend/grabber.py --replace "/usr/bin/canberra-gtk-play" "${libcanberra}/bin/canberra-gtk-play" + ''; + + # no tests + doCheck = false; + + preFixup = '' + wrapProgram $out/bin/kazam \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --prefix LD_LIBRARY_PATH ":" "${gtk3}/lib:${gst_all_1.gstreamer}/lib:${keybinder}/lib" \ + --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \ + --prefix XDG_DATA_DIRS : "${gtk3}/share" \ + --set GST_REGISTRY "/tmp/kazam.gstreamer.registry"; + ''; + + + meta = with stdenv.lib; { + description = "Cross-platform, Friend-2-Friend and secure decentralised communication platform"; + homepage = https://code.launchpad.net/kazam; + #license = licenses.bsd2; + platforms = platforms.linux; + maintainers = [ maintainers.iElectric ]; + }; +} diff --git a/pkgs/applications/video/miro/default.nix b/pkgs/applications/video/miro/default.nix index 5ca6c80dc7c..14aeca62a71 100644 --- a/pkgs/applications/video/miro/default.nix +++ b/pkgs/applications/video/miro/default.nix @@ -40,10 +40,6 @@ buildPythonPackage rec { plat/resources.py ''; - installCommand = '' - python setup.py install --prefix= --root="$out" - ''; - # Disabled for now, because it requires networking and even if we skip those # tests, the whole test run takes around 10-20 minutes. doCheck = false; @@ -51,6 +47,12 @@ buildPythonPackage rec { HOME="$TEMPDIR" LANG=en_US.UTF-8 python miro.real --unittest ''; + preInstall = '' + # see https://bitbucket.org/pypa/setuptools/issue/130/install_data-doesnt-respect-prefix + ${python}/bin/${python.executable} setup.py install_data --root=$out + sed -i '/data_files=data_files/d' setup.py + ''; + postInstall = '' mv "$out/bin/miro.real" "$out/bin/miro" ''; diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index c38e4dea443..3df447fad62 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { name = "vlc-${version}"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { url = "http://download.videolan.org/pub/videolan/vlc/${version}/${name}.tar.xz"; - sha256 = "04d1lr7lxrq2767rjy4j0wr3sirx5sf1s9wdl3p4x500r7z64dp0"; + sha256 = "1lymhbb2bns73qivdaqanhggjjhyc9fwfgf5ikhng0a74msnqmiy"; }; buildInputs = diff --git a/pkgs/applications/virtualization/8086tiny/builder.sh b/pkgs/applications/virtualization/8086tiny/builder.sh new file mode 100644 index 00000000000..36c381becec --- /dev/null +++ b/pkgs/applications/virtualization/8086tiny/builder.sh @@ -0,0 +1,19 @@ + +source $stdenv/setup + +mkdir -p ./$name $out/bin $out/share/$name $out/share/doc/$name/images + +cd $name +tar xf $src +make 8086tiny + +install 8086tiny $out/bin +install bios $out/share/$name/8086tiny-bios +install fd.img $out/share/$name/8086tiny-floppy.img +install bios_source/bios.asm $out/share/$name/8086tiny-bios-src.asmn +install docs/8086tiny.css $out/share/doc/$name +install docs/doc.html $out/share/doc/$name +for i in docs/images/*.gif +do + install $i $out/share/doc/$name/images +done diff --git a/pkgs/applications/virtualization/8086tiny/default.nix b/pkgs/applications/virtualization/8086tiny/default.nix new file mode 100644 index 00000000000..0b4ff90e409 --- /dev/null +++ b/pkgs/applications/virtualization/8086tiny/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl +, localBios ? false, nasm ? null +, sdlSupport ? true, SDL ? null +}: + + +assert sdlSupport -> (SDL != null); + + +stdenv.mkDerivation rec { + + name = "8086tiny-${version}"; + version = "1.20"; + + src = fetchurl { + url ="http://www.megalith.co.uk/8086tiny/downloads/8086tiny_120.tar.bz2"; + sha256 = "0yapnr8wvlx7h1q1w98yfy2vsbf0rlp4wd99r3xb0b7l70b36mpw"; + }; + + buildInputs = with stdenv.lib; + optionals localBios [ nasm ] + ++ optionals sdlSupport [ SDL ]; + + builder = ./builder.sh; + + meta = { + description = "An open-source 8086 emulator"; + longDescription = '' + 8086tiny is a tiny, open source (MIT), portable (little-endian hosts) Intel PC emulator, powerful enough to run DOS, Windows 3.0, Excel, MS Flight Simulator, AutoCAD, Lotus 1-2-3, and similar applications. 8086tiny emulates a "late 80's era" PC XT-type machine. + + 8086tiny is based on an IOCCC 2013 winning entry. In fact that is the "unobfuscated" version :) + ''; + homepage = http://www.megalith.co.uk/8086tiny/index.html; + license = "MIT"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/window-managers/dwm/confnotify-6.0.patch b/pkgs/applications/window-managers/dwm/confnotify-6.0.patch deleted file mode 100644 index 5b5e2ebb68a..00000000000 --- a/pkgs/applications/window-managers/dwm/confnotify-6.0.patch +++ /dev/null @@ -1,36 +0,0 @@ -Fix SDL fullscreen problems when the resolution changes: -https://groups.google.com/d/msg/wmii/nJBrSjrnnq8/ZEYWOWE5pj4J - -diff -r ec4baab78314 dwm.c ---- a/dwm.c Mon Dec 19 15:38:30 2011 +0100 -+++ b/dwm.c Sat Jan 14 12:35:50 2012 +0100 -@@ -397,9 +397,10 @@ - showhide(m->stack); - else for(m = mons; m; m = m->next) - showhide(m->stack); -- if(m) -+ if(m) { - arrangemon(m); -- else for(m = mons; m; m = m->next) -+ restack(m); -+ } else for(m = mons; m; m = m->next) - arrangemon(m); - } - -@@ -408,7 +409,6 @@ - strncpy(m->ltsymbol, m->lt[m->sellt]->symbol, sizeof m->ltsymbol); - if(m->lt[m->sellt]->arrange) - m->lt[m->sellt]->arrange(m); -- restack(m); - } - - void -@@ -1827,6 +1827,8 @@ - .event_mask = ButtonPressMask|ExposureMask - }; - for(m = mons; m; m = m->next) { -+ if (m->barwin) -+ continue; - m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, DefaultDepth(dpy, screen), - CopyFromParent, DefaultVisual(dpy, screen), - CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa); diff --git a/pkgs/applications/window-managers/dwm/default.nix b/pkgs/applications/window-managers/dwm/default.nix index 82eb9e56935..b69dd9d8a49 100644 --- a/pkgs/applications/window-managers/dwm/default.nix +++ b/pkgs/applications/window-managers/dwm/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { prePatch = ''sed -i "s@/usr/local@$out@" config.mk''; # Allow users set their own list of patches - patches = [ ./confnotify-6.0.patch ] ++ patches; + inherit patches; buildPhase = " make "; diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index c6c294d5504..c4841c50d94 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -159,7 +159,7 @@ rec { # Debian. debian = [ - #ftp://ftp.au.debian.org/debian/ + ftp://ftp.au.debian.org/debian/ ftp://ftp.de.debian.org/debian/ ftp://ftp.es.debian.org/debian/ ftp://ftp.fr.debian.org/debian/ diff --git a/pkgs/build-support/release/default.nix b/pkgs/build-support/release/default.nix index acad3487dad..6288935ec2a 100644 --- a/pkgs/build-support/release/default.nix +++ b/pkgs/build-support/release/default.nix @@ -27,10 +27,14 @@ rec { } // args); coverageAnalysis = args: nixBuild ( - { inherit lcov enableCoverageInstrumentation makeCoverageAnalysisReport; + { inherit lcov enableGCOVInstrumentation makeGCOVReport; doCoverageAnalysis = true; } // args); + gcovReport = args: import ./gcov-report.nix ( + { inherit runCommand lcov rsync; + } // args); + rpmBuild = args: import ./rpm-build.nix ( { inherit vmTools; } // args); diff --git a/pkgs/build-support/release/gcov-report.nix b/pkgs/build-support/release/gcov-report.nix new file mode 100644 index 00000000000..8ce5c0488a7 --- /dev/null +++ b/pkgs/build-support/release/gcov-report.nix @@ -0,0 +1,49 @@ +{ runCommand, lcov, rsync, coverageRuns, lcovFilter ? [ "/nix/store/*" ], baseDirHack ? false }: + +runCommand "coverage" + { buildInputs = [ lcov rsync ]; + inherit lcovFilter baseDirHack; + } + '' + mkdir -p $TMPDIR/gcov $out/nix-support $out/coverage + info=$out/coverage/full.info + + for p in ${toString coverageRuns}; do + if [ -f $p/nix-support/hydra-build-products ]; then + cat $p/nix-support/hydra-build-products >> $out/nix-support/hydra-build-products + fi + + [ ! -e $p/nix-support/failed ] || touch $out/nix-support/failed + + opts= + for d in $p/coverage-data/*; do + for i in $(cd $d/nix/store && ls); do + if ! [ -e /nix/store/$i/.build ]; then continue; fi + if [ -e $TMPDIR/gcov/nix/store/$i ]; then continue; fi + echo "copying $i..." + rsync -a /nix/store/$i/.build/* $TMPDIR/gcov/ + if [ -n "$baseDirHack" ]; then + opts="-b $TMPDIR/gcov/$(cd /nix/store/$i/.build && ls)" + fi + done + + for i in $(cd $d/nix/store && ls); do + rsync -a $d/nix/store/$i/.build/* $TMPDIR/gcov/ --include '*/' --include '*.gcda' --exclude '*' + done + done + + chmod -R u+w $TMPDIR/gcov + + echo "producing info..." + geninfo --ignore-errors source,gcov $TMPDIR/gcov --output-file $TMPDIR/app.info $opts + cat $TMPDIR/app.info >> $info + done + + echo "making report..." + set -o noglob + lcov --remove $info ''$lcovFilter > $info.tmp + set +o noglob + mv $info.tmp $info + genhtml --show-details $info -o $out/coverage + echo "report coverage $out/coverage" >> $out/nix-support/hydra-build-products + '' diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix index 993f12bc300..8ebae24c673 100644 --- a/pkgs/build-support/release/nix-build.nix +++ b/pkgs/build-support/release/nix-build.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation ( prePhases = ["initPhase"] ++ prePhases; - buildInputs = buildInputs ++ stdenv.lib.optional doCoverageAnalysis args.makeCoverageAnalysisReport; + buildInputs = buildInputs ++ stdenv.lib.optional doCoverageAnalysis args.makeGCOVReport; lcovFilter = ["/nix/store/*"] ++ lcovFilter; diff --git a/pkgs/build-support/setup-hooks/enable-coverage-instrumentation.sh b/pkgs/build-support/setup-hooks/enable-coverage-instrumentation.sh index 08ef490e244..7175b408b02 100644 --- a/pkgs/build-support/setup-hooks/enable-coverage-instrumentation.sh +++ b/pkgs/build-support/setup-hooks/enable-coverage-instrumentation.sh @@ -1,3 +1,5 @@ +postPhases+=" cleanupBuildDir" + # Force GCC to build with coverage instrumentation. Also disable # optimisation, since it may confuse things. export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -O0 --coverage" @@ -12,3 +14,18 @@ postUnpack() { substituteInPlace $i --replace '*.$objext)' '*.$objext | *.gcno)' done } + +# Get rid of everything that isn't a gcno file or a C source file. +# Also strip the `.tmp_' prefix from gcno files. (The Linux kernel +# creates these.) +cleanupBuildDir() { + if ! [ -e $out/.build ]; then return; fi + + find $out/.build/ -type f -a ! \ + \( -name "*.c" -o -name "*.cc" -o -name "*.cpp" -o -name "*.h" -o -name "*.hh" -o -name "*.y" -o -name "*.l" -o -name "*.gcno" \) \ + | xargs rm -f -- + + for i in $(find $out/.build/ -name ".tmp_*.gcno"); do + mv "$i" "$(echo $i | sed s/.tmp_//)" + done +} diff --git a/pkgs/build-support/setup-hooks/keep-build-tree.sh b/pkgs/build-support/setup-hooks/keep-build-tree.sh new file mode 100644 index 00000000000..754900bfc33 --- /dev/null +++ b/pkgs/build-support/setup-hooks/keep-build-tree.sh @@ -0,0 +1,6 @@ +prePhases+=" moveBuildDir" + +moveBuildDir() { + mkdir -p $out/.build + cd $out/.build +} diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index c6b774fc06c..3dcb8aa1705 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1714,5 +1714,4 @@ rec { }; }; - -} +} // import ./windows pkgs diff --git a/pkgs/build-support/vm/windows/bootstrap.nix b/pkgs/build-support/vm/windows/bootstrap.nix new file mode 100644 index 00000000000..47afce5b5a3 --- /dev/null +++ b/pkgs/build-support/vm/windows/bootstrap.nix @@ -0,0 +1,83 @@ +{ stdenv, fetchurl, vmTools, writeScript, writeText, runCommand, makeInitrd +, python, perl, coreutils, dosfstools, gzip, mtools, netcat, openssh, qemu +, samba, socat, vde2, cdrkit, pathsFromGraph +}: + +{ isoFile, productKey, arch ? null }: + +with stdenv.lib; + +let + controller = import ./controller { + inherit stdenv writeScript vmTools makeInitrd; + inherit samba vde2 openssh socat netcat coreutils gzip; + }; + + mkCygwinImage = import ./cygwin-iso { + inherit stdenv fetchurl runCommand python perl cdrkit pathsFromGraph; + arch = let + defaultArch = if stdenv.is64bit then "x86_64" else "i686"; + in if arch == null then defaultArch else arch; + }; + + installer = import ./install { + inherit controller mkCygwinImage; + inherit stdenv runCommand openssh qemu writeText dosfstools mtools; + }; +in rec { + installedVM = installer { + inherit isoFile productKey; + }; + + runInVM = img: attrs: controller (attrs // { + inherit (installedVM) sshKey; + qemuArgs = attrs.qemuArgs or [] ++ [ + "-boot order=c" + "-drive file=${img},index=0,media=disk" + ]; + }); + + runAndSuspend = let + drives = { + s = { + source = "nixstore"; + target = "/nix/store"; + }; + x = { + source = "xchg"; + target = "/tmp/xchg"; + }; + }; + + genDriveCmds = letter: { source, target }: [ + "net use ${letter}: '\\\\192.168.0.2\\${source}' /persistent:yes" + "mkdir -p '${target}'" + "mount -o bind '/cygdrive/${letter}' '${target}'" + "echo '/cygdrive/${letter} ${target} none bind 0 0' >> /etc/fstab" + ]; + in runInVM "winvm.img" { + command = concatStringsSep " && " ([ + "net config server /autodisconnect:-1" + ] ++ concatLists (mapAttrsToList genDriveCmds drives)); + suspendTo = "state.gz"; + }; + + suspendedVM = stdenv.mkDerivation { + name = "cygwin-suspended-vm"; + buildCommand = '' + ${qemu}/bin/qemu-img create \ + -b "${installedVM}/disk.img" \ + -f qcow2 winvm.img + ${runAndSuspend} + ensureDir "$out" + cp winvm.img "$out/disk.img" + cp state.gz "$out/state.gz" + ''; + }; + + resumeAndRun = command: runInVM "${suspendedVM}/disk.img" { + resumeFrom = "${suspendedVM}/state.gz"; + qemuArgs = singleton "-snapshot"; + inherit command; + }; +} diff --git a/pkgs/build-support/vm/windows/controller/default.nix b/pkgs/build-support/vm/windows/controller/default.nix new file mode 100644 index 00000000000..fe4b5b7f6c2 --- /dev/null +++ b/pkgs/build-support/vm/windows/controller/default.nix @@ -0,0 +1,229 @@ +{ stdenv, writeScript, vmTools, makeInitrd +, samba, vde2, openssh, socat, netcat, coreutils, gzip +}: + +{ sshKey +, qemuArgs ? [] +, command ? "sync" +, suspendTo ? null +, resumeFrom ? null +, installMode ? false +}: + +with stdenv.lib; + +let + preInitScript = writeScript "preinit.sh" '' + #!${vmTools.initrdUtils}/bin/ash -e + export PATH=${vmTools.initrdUtils}/bin + mount -t proc none /proc + mount -t sysfs none /sys + for arg in $(cat /proc/cmdline); do + if [ "x''${arg#command=}" != "x$arg" ]; then + command="''${arg#command=}" + fi + done + + for i in $(cat ${modulesClosure}/insmod-list); do + insmod $i + done + + mkdir -p /dev /fs + + mount -t tmpfs none /dev + mknod /dev/null c 1 3 + mknod /dev/zero c 1 5 + mknod /dev/random c 1 8 + mknod /dev/urandom c 1 9 + mknod /dev/tty c 5 0 + + ifconfig lo up + ifconfig eth0 up 192.168.0.2 + + mount -t tmpfs none /fs + mkdir -p /fs/nix/store /fs/xchg /fs/dev /fs/sys /fs/proc /fs/etc /fs/tmp + + mount -o bind /dev /fs/dev + mount -t sysfs none /fs/sys + mount -t proc none /fs/proc + + mount -t 9p \ + -o trans=virtio,version=9p2000.L,msize=262144,cache=loose \ + store /fs/nix/store + + mount -t 9p \ + -o trans=virtio,version=9p2000.L,msize=262144,cache=loose \ + xchg /fs/xchg + + echo root:x:0:0::/root:/bin/false > /fs/etc/passwd + + set +e + chroot /fs $command $out + echo $? > /fs/xchg/in-vm-exit + + poweroff -f + ''; + + initrd = makeInitrd { + contents = singleton { + object = preInitScript; + symlink = "/init"; + }; + }; + + shellEscape = x: "'${replaceChars ["'"] [("'\\'" + "'")] x}'"; + + loopForever = "while :; do ${coreutils}/bin/sleep 1; done"; + + initScript = writeScript "init.sh" ('' + #!${stdenv.shell} + ${coreutils}/bin/cp -L "${sshKey}" /ssh.key + ${coreutils}/bin/chmod 600 /ssh.key + '' + (if installMode then '' + echo -n "Waiting for Windows installation to finish..." + while ! ${netcat}/bin/netcat -z 192.168.0.1 22; do + echo -n . + # Print a dot every 10 seconds only to shorten line length. + ${coreutils}/bin/sleep 10 + done + echo " success." + # Loop forever, because this VM is going to be killed. + ${loopForever} + '' else '' + ${coreutils}/bin/mkdir -p /etc/samba /etc/samba/private \ + /var/lib/samba /var/log /var/run + ${coreutils}/bin/cat > /etc/samba/smb.conf < saved-env + XCHG_DIR="$(${coreutils}/bin/mktemp -d nix-vm.XXXXXXXXXX --tmpdir)" + ${coreutils}/bin/mv saved-env "$XCHG_DIR/" + + eval "$preVM" + + QEMU_VDE_SOCKET="$(pwd)/vde.ctl" + MONITOR_SOCKET="$(pwd)/monitor" + ${vde2}/bin/vde_switch -s "$QEMU_VDE_SOCKET" & + echo 'alive?' | ${socat}/bin/socat - \ + UNIX-CONNECT:$QEMU_VDE_SOCKET/ctl,retry=20 + ''; + + bgBoth = optionalString (suspendTo != null) " &"; + + vmExec = if installMode then '' + ${vmTools.qemuProg} ${controllerQemuArgs} & + ${vmTools.qemuProg} ${cygwinQemuArgs}${bgBoth} + '' else '' + ${vmTools.qemuProg} ${cygwinQemuArgs} & + ${vmTools.qemuProg} ${controllerQemuArgs}${bgBoth} + ''; + + postVM = if suspendTo != null then '' + while ! test -e "$XCHG_DIR/suspend_now"; do sleep 1; done + ${socat}/bin/socat - UNIX-CONNECT:$MONITOR_SOCKET < '${suspendTo}'" + quit + CMD + wait %- + + eval "$postVM" + exit 0 + '' else if installMode then '' + eval "$postVM" + exit 0 + '' else '' + if ! test -e "$XCHG_DIR/in-vm-exit"; then + echo "Virtual machine didn't produce an exit code." + exit 1 + fi + + eval "$postVM" + exit $(< "$XCHG_DIR/in-vm-exit") + ''; + +in writeScript "run-cygwin-vm.sh" '' + #!${stdenv.shell} -e + ${preVM} + ${vmExec} + ${postVM} +'' diff --git a/pkgs/build-support/vm/windows/cygwin-iso/default.nix b/pkgs/build-support/vm/windows/cygwin-iso/default.nix new file mode 100644 index 00000000000..d9801428a88 --- /dev/null +++ b/pkgs/build-support/vm/windows/cygwin-iso/default.nix @@ -0,0 +1,56 @@ +{ stdenv, fetchurl, runCommand, python, perl, cdrkit, pathsFromGraph +, arch ? "x86_64" +}: + +{ packages ? [] +, mirror ? "http://ftp.gwdg.de/pub/linux/sources.redhat.com/cygwin" +, extraContents ? [] +}: + +let + cygPkgList = if arch == "x86_64" then fetchurl { + url = "${mirror}/x86_64/setup.ini"; + sha256 = "0ljsxdkx9s916wp28kcvql3bjx80zzzidan6jicby7i9s3sm96n9"; + } else fetchurl { + url = "${mirror}/x86/setup.ini"; + sha256 = "1slyj4qha7x649ggwdski9spmyrbs04z2d46vgk8krllg0kppnjv"; + }; + + cygwinCross = (import ../../../../top-level/all-packages.nix { + inherit (stdenv) system; + crossSystem = { + libc = "msvcrt"; + platform = {}; + openssl.system = "mingw64"; + inherit arch; + config = "${arch}-w64-mingw32"; + }; + }).windows.cygwinSetup.crossDrv; + + makeCygwinClosure = { packages, packageList }: let + expr = import (runCommand "cygwin.nix" { buildInputs = [ python ]; } '' + python ${./mkclosure.py} "${packages}" ${toString packageList} > "$out" + ''); + gen = { url, md5 }: { + source = fetchurl { + url = "${mirror}/${url}"; + inherit md5; + }; + target = url; + }; + in map gen expr; + +in import { + inherit stdenv perl cdrkit pathsFromGraph; + contents = [ + { source = "${cygwinCross}/bin/setup.exe"; + target = "setup.exe"; + } + { source = cygPkgList; + target = "setup.ini"; + } + ] ++ makeCygwinClosure { + packages = cygPkgList; + packageList = packages; + } ++ extraContents; +} diff --git a/pkgs/build-support/vm/windows/cygwin-iso/mkclosure.py b/pkgs/build-support/vm/windows/cygwin-iso/mkclosure.py new file mode 100644 index 00000000000..48d569a6bd3 --- /dev/null +++ b/pkgs/build-support/vm/windows/cygwin-iso/mkclosure.py @@ -0,0 +1,78 @@ +# Ugliest Python code I've ever written. -- aszlig +import sys + +def get_plist(path): + in_pack = False + in_str = False + current_key = None + buf = "" + packages = {} + package_name = None + package_attrs = {} + with open(path, 'r') as setup: + for line in setup: + if in_str and line.rstrip().endswith('"'): + package_attrs[current_key] = buf + line.rstrip()[:-1] + in_str = False + continue + elif in_str: + buf += line + continue + + if line.startswith('@'): + in_pack = True + package_name = line[1:].strip() + package_attrs = {} + elif in_pack and ':' in line: + key, value = line.split(':', 1) + if value.lstrip().startswith('"'): + if value.lstrip()[1:].rstrip().endswith('"'): + value = value.strip().strip('"') + else: + in_str = True + current_key = key.strip().lower() + buf = value.lstrip()[1:] + continue + package_attrs[key.strip().lower()] = value.strip() + elif in_pack: + in_pack = False + packages[package_name] = package_attrs + return packages + +def main(): + packages = get_plist(sys.argv[1]) + to_include = set() + + def traverse(package): + to_include.add(package) + attrs = packages.get(package, {}) + deps = attrs.get('requires', '').split() + for new_dep in set(deps) - to_include: + traverse(new_dep) + + map(traverse, sys.argv[2:]) + + sys.stdout.write('[\n') + for package, attrs in packages.iteritems(): + if package not in to_include: + cats = [c.lower() for c in attrs.get('category', '').split()] + if 'base' not in cats: + continue + + install_line = attrs.get('install') + if install_line is None: + continue + + url, size, md5 = install_line.split(' ', 2) + + pack = [ + ' {', + ' url = "{0}";'.format(url), + ' md5 = "{0}";'.format(md5), + ' }', + ]; + sys.stdout.write('\n'.join(pack) + '\n') + sys.stdout.write(']\n') + +if __name__ == '__main__': + main() diff --git a/pkgs/build-support/vm/windows/default.nix b/pkgs/build-support/vm/windows/default.nix new file mode 100644 index 00000000000..f9b44d450d9 --- /dev/null +++ b/pkgs/build-support/vm/windows/default.nix @@ -0,0 +1,48 @@ +pkgs: + +let + bootstrapper = import ./bootstrap.nix { + inherit (pkgs) stdenv vmTools writeScript writeText runCommand makeInitrd; + inherit (pkgs) coreutils dosfstools gzip mtools netcat openssh qemu samba; + inherit (pkgs) socat vde2 fetchurl python perl cdrkit pathsFromGraph; + }; + + builder = '' + source /tmp/xchg/saved-env 2> /dev/null || true + export NIX_STORE=/nix/store + export NIX_BUILD_TOP=/tmp + export TMPDIR=/tmp + export PATH=/empty + cd "$NIX_BUILD_TOP" + exec $origBuilder $origArgs + ''; + +in { + runInWindowsVM = drv: let + newDrv = drv.override { + stdenv = drv.stdenv.override { + shell = "/bin/sh"; + }; + }; + in pkgs.lib.overrideDerivation drv (attrs: let + bootstrap = bootstrapper attrs.windowsImage; + in { + requiredSystemFeatures = [ "kvm" ]; + builder = "${pkgs.stdenv.shell}"; + args = ["-e" (bootstrap.resumeAndRun builder)]; + windowsImage = bootstrap.suspendedVM; + origArgs = attrs.args; + origBuilder = if attrs.builder == attrs.stdenv.shell + then "/bin/sh" + else attrs.builder; + + postHook = '' + PATH=/usr/bin:/bin:/usr/sbin:/sbin + SHELL=/bin/sh + eval "$origPostHook" + ''; + + origPostHook = attrs.postHook or ""; + fixupPhase = ":"; + }); +} diff --git a/pkgs/build-support/vm/windows/install/default.nix b/pkgs/build-support/vm/windows/install/default.nix new file mode 100644 index 00000000000..10690bf6b28 --- /dev/null +++ b/pkgs/build-support/vm/windows/install/default.nix @@ -0,0 +1,74 @@ +{ stdenv, runCommand, openssh, qemu, controller, mkCygwinImage +, writeText, dosfstools, mtools +}: + +{ isoFile +, productKey +}: + +let + bootstrapAfterLogin = runCommand "bootstrap.sh" {} '' + cat > "$out" < ~/.ssh/authorized_keys < $out/lib/gdk-pixbuf/loaders.cache - export GDK_PIXBUF_MODULE_FILE=`readlink -e $out/lib/gdk-pixbuf/loaders.cache` - ''; - meta = with stdenv.lib; { platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/libgee/default.nix b/pkgs/desktops/gnome-3/core/libgee/default.nix index 03922778652..c7ed541082d 100644 --- a/pkgs/desktops/gnome-3/core/libgee/default.nix +++ b/pkgs/desktops/gnome-3/core/libgee/default.nix @@ -1,11 +1,14 @@ { stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobjectIntrospection }: - +let + ver_maj = "0.12"; + ver_min = "0"; +in stdenv.mkDerivation rec { - name = "libgee-0.13.90"; + name = "libgee-${ver_maj}.${ver_min}"; src = fetchurl { - url = "https://download.gnome.org/sources/libgee/0.13/${name}.tar.xz"; - sha256 = "9496f8fb249f7850db32b50e8675998db8b5276d4568cbf043faa7e745d7b7d6"; + url = "https://download.gnome.org/sources/libgee/${ver_maj}/${name}.tar.xz"; + sha256 = "19bf94ia1h5z8h0hdhwcd2b2p6ngffirg0dai7pdb98dzriys1ni"; }; doCheck = true; @@ -15,6 +18,8 @@ stdenv.mkDerivation rec { buildInputs = [ autoconf vala pkgconfig glib gobjectIntrospection ]; meta = with stdenv.lib; { + description = "Utility library providing GObject-based interfaces and classes for commonly used data structures"; + license = licenses.lgpl21Plus; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix index 551b9db1246..091e48626ae 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/default.nix +++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, libxml2, dbus_glib, shared_mime_info, libexif , gtk, gnome3, libunique, intltool, gobjectIntrospection -, libnotify, makeWrapper, exempi }: +, libnotify, makeWrapper, exempi, librsvg }: stdenv.mkDerivation rec { name = "nautilus-3.10.1"; @@ -12,13 +12,14 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-tracker=no" ]; - buildInputs = [ pkgconfig libxml2 dbus_glib shared_mime_info libexif gtk libunique intltool exempi - gnome3.gnome_desktop gnome3.gsettings_desktop_schemas libnotify makeWrapper ]; + buildInputs = [ pkgconfig libxml2 dbus_glib shared_mime_info libexif gtk libunique intltool exempi librsvg + gnome3.gnome_desktop gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic gnome3.gsettings_desktop_schemas libnotify makeWrapper ]; postInstall = '' wrapProgram "$out/bin/nautilus" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix XDG_DATA_DIRS : "${gtk}/share:${gnome3.gnome_icon_theme}:${gnome3.gsettings_desktop_schemas}/share:$out/share" + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk}/share:${gnome3.gnome_icon_theme}:${gnome3.gsettings_desktop_schemas}/share:$out/share" ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix index e6779abcffa..d84bd288707 100644 --- a/pkgs/desktops/gnome-3/core/yelp/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp/default.nix @@ -1,18 +1,18 @@ { stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib , file, librsvg, hicolor_icon_theme, gnome3, gdk_pixbuf -, bash, makeWrapper, itstool, libxml2, libxslt, icu }: +, bash, makeWrapper, itstool, libxml2, libxslt, icu }: stdenv.mkDerivation rec { name = "yelp-3.10.1"; src = fetchurl { - url = "https://download.gnome.org/sources/yelp/3.10/${name}.tar.xz"; + url = "mirror://gnome/sources/yelp/3.10/${name}.tar.xz"; sha256 = "17736479b7d0b1128c7d6cb3073f2b09e4bbc82670731b2a0d3a3219a520f816"; }; - propagatedUserEnvPkgs = [ librsvg gdk_pixbuf gnome3.gnome_themes_standard - gnome3.gnome_icon_theme hicolor_icon_theme - gnome3.gnome_icon_theme_symbolic ]; + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedBuildInputs = [ librsvg gdk_pixbuf gnome3.gnome_icon_theme + hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; @@ -20,13 +20,12 @@ stdenv.mkDerivation rec { libxml2 libxslt icu file makeWrapper gnome3.yelp_xsl gnome3.gsettings_desktop_schemas ]; - installFlags = "gsettingsschemadir=\${out}/share/${name}/glib-2.0/schemas/"; + installFlags = "gsettingsschemadir=\${out}/share/yelp/glib-2.0/schemas/"; postInstall = '' - cat ${gdk_pixbuf}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache ${librsvg}/lib/gdk-pixbuf/loaders.cache > $out/loaders.cache wrapProgram "$out/bin/yelp" \ - --set GDK_PIXBUF_MODULE_FILE `readlink -e $out/loaders.cache` \ - --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/:${gnome3.gnome_themes_standard}/share:${gnome3.gnome_icon_theme_symbolic}/share:${gnome3.yelp_xsl}/share/yelp-xsl:${gnome3.gnome_icon_theme}/share:${hicolor_icon_theme}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/${name}" + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/:${gnome3.gnome_themes_standard}/share:${gnome3.yelp_xsl}/share/yelp-xsl:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/yelp:$XDG_ICON_DIRS" ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 1c26c6949ca..15544eff922 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -20,6 +20,8 @@ rec { dconf = callPackage ./core/dconf { }; + empathy = callPackage ./core/empathy { }; + epiphany = callPackage ./core/epiphany { }; evince = callPackage ./core/evince { }; # ToDo: dbus would prevent compilation, enable tests @@ -50,6 +52,8 @@ rec { libgnome_keyring = callPackage ./core/libgnome-keyring { }; + folks = callPackage ./core/folks { }; + gnome_online_accounts = callPackage ./core/gnome-online-accounts { }; gnome_session = callPackage ./core/gnome-session { }; diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/pkgs/desktops/gnome-3/misc/gitg/default.nix index 629ff4a7700..26268f4c90c 100644 --- a/pkgs/desktops/gnome-3/misc/gitg/default.nix +++ b/pkgs/desktops/gnome-3/misc/gitg/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchgit, vala, intltool, libgit2, pkgconfig, gtk3, glib , json_glib, webkitgtk, makeWrapper, libpeas, bash, gobjectIntrospection -, gnome3, gtkspell3, shared_mime_info, libgee, libgit2-glib }: +, gnome3, gtkspell3, shared_mime_info, libgee, libgit2-glib, librsvg }: # TODO: icons and theme still does not work # use packaged gnome3.gnome_icon_theme_symbolic @@ -26,13 +26,14 @@ stdenv.mkDerivation rec { gnome3.gnome_themes_standard ]; buildInputs = [ vala intltool libgit2 pkgconfig gtk3 glib json_glib webkitgtk libgee libpeas - libgit2-glib gtkspell3 gnome3.gsettings_desktop_schemas gnome3.gtksourceview - gobjectIntrospection makeWrapper ]; + libgit2-glib gtkspell3 gnome3.gsettings_desktop_schemas gnome3.gtksourceview librsvg + gobjectIntrospection makeWrapper gnome3.gnome_icon_theme_symbolic gnome3.gnome_icon_theme ]; postInstall = '' wrapProgram "$out/bin/gitg" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share" + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share" ''; preFixup = '' diff --git a/pkgs/desktops/kde-4.11/kdewebdev/klinkstatus.nix b/pkgs/desktops/kde-4.11/kdewebdev/klinkstatus.nix index 33a4d8c6083..86a8b7c0a19 100644 --- a/pkgs/desktops/kde-4.11/kdewebdev/klinkstatus.nix +++ b/pkgs/desktops/kde-4.11/kdewebdev/klinkstatus.nix @@ -1,8 +1,8 @@ -{ kde, kdelibs, libxml2, libxslt, kdepimlibs, htmlTidy, boost, ruby18 }: +{ kde, kdelibs, libxml2, libxslt, kdepimlibs, htmlTidy, boost }: kde { - buildInputs = [ kdelibs kdepimlibs ruby18 htmlTidy boost ]; + buildInputs = [ kdelibs kdepimlibs htmlTidy boost ]; meta = { description = "A KDE link checker"; diff --git a/pkgs/desktops/xfce/applications/parole.nix b/pkgs/desktops/xfce/applications/parole.nix index c1a4ecd787d..598c5038092 100644 --- a/pkgs/desktops/xfce/applications/parole.nix +++ b/pkgs/desktops/xfce/applications/parole.nix @@ -18,21 +18,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ - makeWrapper gst_all_1.gst-plugins-base + makeWrapper gtk dbus_glib libxfce4ui libxfce4util xfconf taglib libnotify - ]; + ] ++ (with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav]); configureFlags = [ "--with-gstreamer=1.0" ]; postInstall = stdenv.lib.optionalString withGstPlugins '' wrapProgram "$out/bin/parole" --prefix \ - GST_PLUGIN_PATH ":" ${stdenv.lib.concatStringsSep ":" - (map (s: s+"/lib/gstreamer-1.0") (with gst_all_1; [ - gst-plugins-base gst-plugins-good - gst-plugins-bad gst-plugins-ugly - gst-libav - ])) } + GST_PLUGIN_SYSTEM_PATH_1_0 ":" "$GST_PLUGIN_SYSTEM_PATH_1_0" ''; meta = { diff --git a/pkgs/desktops/xfce/core/xfce4-power-manager.nix b/pkgs/desktops/xfce/core/xfce4-power-manager.nix index 5f38308f6d4..91ec6b40e23 100644 --- a/pkgs/desktops/xfce/core/xfce4-power-manager.nix +++ b/pkgs/desktops/xfce/core/xfce4-power-manager.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { brightness_patch = fetchurl { url = "http://git.xfce.org/xfce/xfce4-power-manager/patch/?id=05d12e12596512f7a31d3cdb4845a69dc2d4c611"; - sha256 = "0rbldvjwpj93hx59xrmvbdql1pgkbqzjh4vp6gkavn4z6sv535v8"; + sha256 = "1y8520s0s4d7x1abdwsm5qig4vgm3np7hhagfbdwd5ymiz5nn9mw"; }; name = "${p_name}-${ver_maj}.${ver_min}"; diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix index cbbb5608a46..76359de6575 100644 --- a/pkgs/development/compilers/nasm/default.nix +++ b/pkgs/development/compilers/nasm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "nasm-2.10"; + name = "nasm-2.11.01"; src = fetchurl { - url = "http://www.nasm.us/pub/nasm/releasebuilds/2.10/${name}.tar.bz2"; - sha256 = "1wcxm0il06b17wjarw8pbf9bagjhfcf7yayahmyip03qkfka2yk8"; + url = "http://www.nasm.us/pub/nasm/releasebuilds/2.11.01/${name}.tar.bz2"; + sha256 = "0p0rhq18in2hyv3gircgxj72n2b1mvr8bvjlqscpaz8m62cyvam7"; }; meta = { diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix index 61655e1bd1f..aa027401b4d 100644 --- a/pkgs/development/compilers/swi-prolog/default.nix +++ b/pkgs/development/compilers/swi-prolog/default.nix @@ -4,14 +4,14 @@ }: let - version = "6.6.1"; + version = "6.6.2"; in stdenv.mkDerivation { name = "swi-prolog-${version}"; src = fetchurl { url = "http://www.swi-prolog.org/download/stable/src/pl-${version}.tar.gz"; - sha256 = "033b7z60jd1907p9idaa3xzbid2aadhqcdwsa2g9c1c7q8fj1gy8"; + sha256 = "1kdnc1r5c4320v5s6axk6w0jnqbkza295hdi9s5kyd8r78v6x6g4"; }; buildInputs = [ gmp readline openssl libjpeg unixODBC libXinerama diff --git a/pkgs/development/guile-modules/guile-xcb/default.nix b/pkgs/development/guile-modules/guile-xcb/default.nix new file mode 100644 index 00000000000..fc02ab305a3 --- /dev/null +++ b/pkgs/development/guile-modules/guile-xcb/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, pkgconfig, guile, texinfo }: + +stdenv.mkDerivation { + name = "guile-xcb-1.3"; + + meta = with stdenv.lib; { + description = "XCB bindings for Guile"; + homepage = "http://www.markwitmer.com/guile-xcb/guile-xcb.html"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ iyzsong ]; + }; + + src = fetchurl { + url = "http://www.markwitmer.com/dist/guile-xcb-1.3.tar.gz"; + sha256 = "04dvbqdrrs67490gn4gkq9zk8mqy3mkls2818ha4p0ckhh0pm149"; + }; + + buildInputs = [ pkgconfig guile texinfo ]; + + preConfigure = '' + configureFlags=" + --with-guile-site-dir=$out/share/guile/site + --with-guile-site-ccache-dir=$out/share/guile/site + "; + ''; +} diff --git a/pkgs/development/interpreters/cython/2/default.nix b/pkgs/development/interpreters/cython/2/default.nix deleted file mode 100644 index 5b3cfd588c9..00000000000 --- a/pkgs/development/interpreters/cython/2/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, python, pkgconfig }: - -stdenv.mkDerivation { - name = "cython-0.20"; - - src = fetchurl { - url = http://www.cython.org/release/Cython-0.20.tar.gz; - sha256 = "1a3m7zhw8mdyr95fwx7n1scrz82drr433i99dzm1n9dxi0cx2qah"; - }; - - buildPhase = "python setup.py build --build-base $out"; - - installPhase = "python setup.py install --prefix=$out"; - - buildInputs = [ python pkgconfig ]; - - meta = { - description = "An interpreter to help writing C extensions for Python 2"; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/development/interpreters/cython/3/default.nix b/pkgs/development/interpreters/cython/3/default.nix deleted file mode 100644 index d977ea87b3e..00000000000 --- a/pkgs/development/interpreters/cython/3/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, python3, pkgconfig }: - -stdenv.mkDerivation { - name = "cython3-0.20"; - - src = fetchurl { - url = http://www.cython.org/release/Cython-0.20.tar.gz; - sha256 = "1a3m7zhw8mdyr95fwx7n1scrz82drr433i99dzm1n9dxi0cx2qah"; - }; - - buildPhase = "python3 setup.py build --build-base $out"; - - installPhase = "python3 setup.py install --prefix=$out"; - - buildInputs = [ python3 pkgconfig ]; - - meta = { - description = "An interpreter to help writing C extensions for Python3"; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/development/interpreters/erlang/default.nix b/pkgs/development/interpreters/erlang/default.nix index 9562a0dc452..077eaa9093b 100644 --- a/pkgs/development/interpreters/erlang/default.nix +++ b/pkgs/development/interpreters/erlang/default.nix @@ -26,6 +26,10 @@ stdenv.mkDerivation rec { configureFlags = "--with-ssl=${openssl}"; + postInstall = '' + ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call + ''; + # Some erlang bin/ scripts run sed and awk postFixup = '' wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/" diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index bf60e90d634..cc6e34b76fe 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -167,6 +167,10 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) configureFlags = ["--enable-ftp"]; }; + fpm = { + configureFlags = ["--enable-fpm"]; + }; + /* php is build within this derivation in order to add the xdebug lines to the php.ini. So both Apache and command line php both use xdebug without having to configure anything. @@ -208,6 +212,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) bz2Support = config.php.bz2 or false; zipSupport = config.php.zip or true; ftpSupport = config.php.ftp or true; + fpmSupport = config.php.fpm or true; }; configurePhase = '' diff --git a/pkgs/development/interpreters/pypy/2.2/default.nix b/pkgs/development/interpreters/pypy/2.2/default.nix index 231a0a7dfaa..2fee7bc74df 100644 --- a/pkgs/development/interpreters/pypy/2.2/default.nix +++ b/pkgs/development/interpreters/pypy/2.2/default.nix @@ -5,8 +5,8 @@ assert zlibSupport -> zlib != null; let - majorVersion = "2.2.1"; - version = "${majorVersion}"; + majorVersion = "2.2"; + version = "${majorVersion}.1"; pythonVersion = "2.7"; libPrefix = "pypy${majorVersion}"; diff --git a/pkgs/development/interpreters/python/3.4/default.nix b/pkgs/development/interpreters/python/3.4/default.nix new file mode 100644 index 00000000000..8d7da9d91e6 --- /dev/null +++ b/pkgs/development/interpreters/python/3.4/default.nix @@ -0,0 +1,88 @@ +{ stdenv, fetchurl +, bzip2 +, db +, gdbm +, libX11, xproto +, ncurses +, openssl +, readline +, sqlite +, tcl, tk +, zlib +}: + +assert readline != null -> ncurses != null; + +with stdenv.lib; + +let + majorVersion = "3.4"; + version = "${majorVersion}.0"; + fullVersion = "${version}rc2"; + + buildInputs = filter (p: p != null) [ + zlib bzip2 gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto + ]; +in +stdenv.mkDerivation { + name = "python3-${fullVersion}"; + inherit majorVersion version; + + src = fetchurl { + url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz"; + sha256 = "0v37mlkwzbc8m54h3nb04x6xm2yx5fmd7flq2shn37ixf9d0ih6z"; + }; + + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; + + preConfigure = '' + for i in /usr /sw /opt /pkg; do # improve purity + substituteInPlace ./setup.py --replace $i /no-such-path + done + ${optionalString stdenv.isDarwin ''export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2"''} + + configureFlagsArray=( --enable-shared --with-threads + CPPFLAGS="${concatStringsSep " " (map (p: "-I${p}/include") buildInputs)}" + LDFLAGS="${concatStringsSep " " (map (p: "-L${p}/lib") buildInputs)}" + LIBS="-lcrypt ${optionalString (ncurses != null) "-lncurses"}" + ) + ''; + + setupHook = ./setup-hook.sh; + + postInstall = '' + rm -rf "$out/lib/python${majorVersion}/test" + ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}" + ''; + + passthru = { + zlibSupport = zlib != null; + sqliteSupport = sqlite != null; + dbSupport = db != null; + readlineSupport = readline != null; + opensslSupport = openssl != null; + tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null); + libPrefix = "python${majorVersion}"; + executable = "python3.4m"; + is_py3k = true; + }; + + enableParallelBuilding = true; + + meta = { + homepage = http://python.org; + description = "A high-level dynamically-typed programming language"; + longDescription = '' + Python is a remarkably powerful dynamic programming language that + is used in a wide variety of application domains. Some of its key + distinguishing features include: clear, readable syntax; strong + introspection capabilities; intuitive object orientation; natural + expression of procedural code; full modularity, supporting + hierarchical packages; exception-based error handling; and very + high level dynamic data types. + ''; + license = stdenv.lib.licenses.psfl; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ simons chaoflow iElectric ]; + }; +} diff --git a/pkgs/development/interpreters/python/3.4/setup-hook.sh b/pkgs/development/interpreters/python/3.4/setup-hook.sh new file mode 100644 index 00000000000..ae71b4147ab --- /dev/null +++ b/pkgs/development/interpreters/python/3.4/setup-hook.sh @@ -0,0 +1,15 @@ +addPythonPath() { + addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/python3.4/site-packages +} + +toPythonPath() { + local paths="$1" + local result= + for i in $paths; do + p="$i/lib/python3.4/site-packages" + result="${result}${result:+:}$p" + done + echo $result +} + +envHooks=(${envHooks[@]} addPythonPath) diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index 34af23740d5..ccfbcfcdd42 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -1,5 +1,5 @@ { stdenv, python, buildEnv, makeWrapper, recursivePthLoader, extraLibs ? [], postBuild ? "" -, stdLibs ? stdenv.lib.attrValues python.modules +, stdLibs ? stdenv.lib.attrValues python.modules, ignoreCollisions ? false }: # Create a python executable that knows about additional packages. @@ -7,7 +7,8 @@ (buildEnv { name = "python-${python.version}-wrapper"; paths = stdenv.lib.filter (x : x ? pythonPath) (stdenv.lib.closePropagation extraLibs) ++ stdLibs ++ [ python recursivePthLoader ]; - ignoreCollisions = false; + + inherit ignoreCollisions; postBuild = '' . "${makeWrapper}/nix-support/setup-hook" diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index 60884fce69d..237e58b5f93 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, python, pkgconfig, wrapPython +{ stdenv, fetchurl, python, cython, pkgconfig, wrapPython , pygame, SDL, libpng, ffmpeg, freetype, glew, mesa, fribidi, zlib }: stdenv.mkDerivation { - name = "renpy-6.16.3"; + name = "renpy-6.17.3"; meta = { description = "Ren'Py Visual Novel Engine"; @@ -14,12 +14,12 @@ stdenv.mkDerivation { }; src = fetchurl { - url = "http://www.renpy.org/dl/6.16.3/renpy-6.16.3-source.tar.bz2"; - sha256 = "0yd7wj85kp0hlaqlrhl40irhkmcng89vcxypyx40pqmk87gjagqn"; + url = "http://www.renpy.org/dl/6.17.3/renpy-6.17.3-source.tar.bz2"; + sha256 = "1707xrjmnr4a209jqm4zkda0jyjd76f679g7d51g7vd5cs46s6ph"; }; buildInputs = [ - python pkgconfig wrapPython + python cython pkgconfig wrapPython SDL libpng ffmpeg freetype glew mesa fribidi zlib pygame ]; diff --git a/pkgs/development/libraries/aqbanking/default.nix b/pkgs/development/libraries/aqbanking/default.nix index 7dfc6a60a99..226f792c45a 100644 --- a/pkgs/development/libraries/aqbanking/default.nix +++ b/pkgs/development/libraries/aqbanking/default.nix @@ -1,23 +1,28 @@ -{ stdenv, fetchurl, gwenhywfar, pkgconfig, gmp, zlib }: +{ stdenv, fetchurl, gmp, gwenhywfar, libtool, libxml2, libxslt +, pkgconfig, xmlsec, zlib +}: stdenv.mkDerivation rec { - name = "aqbanking-5.0.21"; + name = "aqbanking-5.4.0beta"; src = fetchurl { - url = "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=91&file=01&dummy=aqbanking-5.0.21.tar.gz"; + url = "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=112&file=01&dummy=aqbanking-5.4.0beta.tar.gz"; name = "${name}.tar.gz"; - sha256 = "1xvzg640fswkrjrkrqzj0j9lnij7kcpnyvzd7nsg1by40wxwgp52"; + sha256 = "0yd588sw9grc2c0bfyx8h39mr30pa1zxrcbv31p6pz6szilk2agh"; }; - buildInputs = [ gwenhywfar gmp zlib ]; + buildInputs = [ gmp gwenhywfar libtool libxml2 libxslt xmlsec zlib ]; nativeBuildInputs = [ pkgconfig ]; configureFlags = "--with-gwen-dir=${gwenhywfar}"; - meta = { - maintainers = [ stdenv.lib.maintainers.urkud ]; - # Tries to install gwenhywfar plugin, thus `make install` fails + meta = with stdenv.lib; { + description = "An interface to banking tasks, file formats and country information"; + homepage = "http://www2.aquamaniac.de/sites/download/packages.php?package=03&showall=1"; hydraPlatforms = []; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ goibhniu urkud ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix new file mode 100644 index 00000000000..8297dc9d5da --- /dev/null +++ b/pkgs/development/libraries/clutter-gst/default.nix @@ -0,0 +1,26 @@ +{ fetchurl, stdenv, pkgconfig, clutter, gtk3, glib, cogl }: + +stdenv.mkDerivation rec { + name = "clutter-gst-2.0.10"; + + src = fetchurl { + url = "mirror://gnome/sources/clutter-gst/2.0/${name}.tar.xz"; + sha256 = "f00cf492a6d4f1036c70d8a0ebd2f0f47586ea9a9b49b1ffda79c9dc7eadca00"; + }; + + propagatedBuildInputs = [ clutter gtk3 glib cogl ]; + nativeBuildInputs = [ pkgconfig ]; + + postBuild = "rm -rf $out/share/gtk-doc"; + + meta = { + description = "Clutter-GST"; + + homepage = http://www.clutter-project.org/; + + license = "LGPLv2+"; + + maintainers = with stdenv.lib.maintainers; [ lethalman ]; + platforms = stdenv.lib.platforms.gnu; # arbitrary choice + }; +} diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix index 58732446111..040123d4276 100644 --- a/pkgs/development/libraries/clutter-gtk/default.nix +++ b/pkgs/development/libraries/clutter-gtk/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, pkgconfig, clutter, gtk3 }: stdenv.mkDerivation rec { - name = "clutter-gtk-1.0.4"; + name = "clutter-gtk-1.4.4"; src = fetchurl { - url = mirror://gnome/sources/clutter-gtk/1.0/clutter-gtk-1.0.4.tar.xz; - sha256 = "0kj6vsvaqxx6vqqk9acc8b0p40klrpwlf2wsjkams1kxxcpzsh87"; + url = "mirror://gnome/sources/clutter-gtk/1.4/${name}.tar.xz"; + sha256 = "bc3108594a01a08bb6d9b538afe995e4fd78634a8356064ee8137d87aad51b2e"; }; propagatedBuildInputs = [ clutter gtk3 ]; diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index 1fc1021156d..0f1c1dd82e2 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, pkgconfig, mesa_noglu, glib, gdk_pixbuf, xorg, libintlOrEmpty -, pangoSupport ? true, pango, cairo, gobjectIntrospection, wayland }: +, pangoSupport ? true, pango, cairo, gobjectIntrospection, wayland +, gstreamerSupport ? true, gst_all_1 }: let ver_maj = "1.16"; @@ -22,13 +23,15 @@ stdenv.mkDerivation rec { "--enable-kms-egl-platform" "--enable-wayland-egl-platform" "--enable-wayland-egl-server" - ]; + ] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst"; propagatedBuildInputs = with xorg; [ glib gdk_pixbuf gobjectIntrospection mesa_noglu libXrandr libXfixes libXcomposite libXdamage wayland ] - ++ libintlOrEmpty; + ++ libintlOrEmpty + ++ stdenv.lib.optionals gstreamerSupport [ gst_all_1.gstreamer + gst_all_1.gst-plugins-base ]; buildInputs = stdenv.lib.optionals pangoSupport [ pango cairo ]; diff --git a/pkgs/development/libraries/ffmpeg/2.x.nix b/pkgs/development/libraries/ffmpeg/2.x.nix index dd29e1e9e6b..931881fd142 100644 --- a/pkgs/development/libraries/ffmpeg/2.x.nix +++ b/pkgs/development/libraries/ffmpeg/2.x.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "ffmpeg-2.1.1"; + name = "ffmpeg-2.1.4"; src = fetchurl { url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; - sha256 = "1qnspbpwa6cflsb6mkm84ay4nfx60ism6d7lgvnasidck9dmxydy"; + sha256 = "00c1k84amgkc7vk5xkrg7z99q7jbfhbz3qk854cxnc38d2ynrd3z"; }; mp3Support = config.ffmpeg.mp3 or true; diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 7a06f08aea6..cd3e7631618 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { sha256 = "0ldhpdalbyi6q5k1dz498i9hqcsd51yxq0f91ck9p0h4v38blfx1"; }; + setupHook = ./setup-hook.sh; + # !!! We might want to factor out the gdk-pixbuf-xlib subpackage. buildInputs = [ libX11 libintlOrEmpty ]; diff --git a/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh b/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh new file mode 100644 index 00000000000..280d9aa4f1b --- /dev/null +++ b/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh @@ -0,0 +1,19 @@ +make_gtk_applications_find_pixbuf_loaders() { + + # set pixbuf loaders.cache for this package + mkdir -p "$out/lib/$name/gdk-pixbuf" + + if [ -f "$1/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" ]; then + cat "$1/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" >> "$out/lib/$name/gdk-pixbuf/loaders.cache" + fi + + if [ -f "$1/lib/gdk-pixbuf/loaders.cache" ]; then + cat "$1/lib/gdk-pixbuf/loaders.cache" >> "$out/lib/$name/gdk-pixbuf/loaders.cache" + fi + + # note, this is not a search path + export GDK_PIXBUF_MODULE_FILE=$(readlink -e "$out/lib/$name/gdk-pixbuf/loaders.cache") + +} + +envHooks+=(make_gtk_applications_find_pixbuf_loaders) diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index 1e9fdd4f0aa..53d447cf5ca 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, glib, libtool, intltool, gnutls2, libproxy +{stdenv, fetchurl, pkgconfig, glib, libtool, intltool, gnutls, libproxy , gsettings_desktop_schemas, libgcrypt, libtasn1 }: stdenv.mkDerivation { @@ -17,5 +17,5 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig intltool ]; propagatedBuildInputs = - [ glib libtool gnutls2 libproxy libgcrypt libtasn1 gsettings_desktop_schemas ]; + [ glib libtool gnutls libproxy libgcrypt libtasn1 gsettings_desktop_schemas ]; } diff --git a/pkgs/development/libraries/gnutls/2.12.nix b/pkgs/development/libraries/gnutls/2.12.nix deleted file mode 100644 index 59f0131b9d4..00000000000 --- a/pkgs/development/libraries/gnutls/2.12.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ fetchurl, stdenv, zlib, lzo, libtasn1, nettle -, guileBindings, guile, pkgconfig, perl }: - -assert guileBindings -> guile != null; - -stdenv.mkDerivation rec { - - name = "gnutls-2.12.23"; - - src = fetchurl { # missing on standard mirrors - url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v2.12/${name}.tar.bz2"; - sha256 = "1lkys703z4yxfgzarmgas5ccvn6m254w9wvm7s8v0zkj81z7m9nz"; - }; - - patches = [(fetchurl { - url = "http://anonscm.debian.org/viewvc/pkg-gnutls/packages/gnutls26/trunk/" - + "debian/patches/21_sanitycheck.diff?revision=1777&view=co"; - sha256 = "0k18a7q6irmgjzp647bd18zccjpsr82n2s9arpamnkakgnny4ks9"; - name = "CVE-2013-2116.patch"; - })]; - - configurePhase = '' - patchShebangs . - - ./configure --prefix="$out" \ - --disable-dependency-tracking --enable-fast-install \ - --with-lzo --with-libtasn1-prefix="${libtasn1}" \ - --without-p11-kit \ - ${if guileBindings - then "--enable-guile --with-guile-site-dir=\"$out/share/guile/site\"" - else ""} - ''; - - buildInputs = [ zlib lzo libtasn1 pkgconfig perl ] - ++ stdenv.lib.optional guileBindings guile; - - propagatedBuildInputs = [ nettle ]; - - doCheck = true; - - meta = { - description = "The GNU Transport Layer Security Library"; - - longDescription = '' - GnuTLS is a project that aims to develop a library which - provides a secure layer, over a reliable transport - layer. Currently the GnuTLS library implements the proposed - standards by the IETF's TLS working group. - - Quoting from the TLS protocol specification: - - "The TLS protocol provides communications privacy over the - Internet. The protocol allows client/server applications to - communicate in a way that is designed to prevent eavesdropping, - tampering, or message forgery." - ''; - - homepage = http://www.gnu.org/software/gnutls/; - license = "LGPLv2.1+"; - - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/3.1.nix similarity index 82% rename from pkgs/development/libraries/gnutls/default.nix rename to pkgs/development/libraries/gnutls/3.1.nix index 8750dd568f7..1046310946a 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/3.1.nix @@ -3,15 +3,17 @@ assert guileBindings -> guile != null; -stdenv.mkDerivation (rec { - - name = "gnutls-3.1.20"; +stdenv.mkDerivation rec { + name = "gnutls-3.1.22"; src = fetchurl { url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/${name}.tar.lz"; - sha256 = "1a8pzc29sn1kmbqvldljf4kmbz60pdk931dirk5jdd0qpf8fzd5x"; + sha256 = "177kmq4jn67s7mmb249722nwxmbjwjpphmib7bhzfk43z02j3pvh"; }; + # FreeBSD doesn't have , and Gnulib's `alloca' module isn't used. + patches = stdenv.lib.optional stdenv.isFreeBSD ./guile-gnulib-includes.patch; + # Note: GMP is a dependency of Nettle, whose public headers include # GMP headers, hence the hack. configurePhase = '' @@ -21,15 +23,14 @@ stdenv.mkDerivation (rec { --with-lzo --with-libtasn1-prefix="${libtasn1}" \ --with-libnettle-prefix="${nettle}" \ CPPFLAGS="-I${gmp}/include" \ - ${if guileBindings - then "--enable-guile --with-guile-site-dir=\"$out/share/guile/site\"" - else ""} + ${stdenv.lib.optionalString guileBindings + "--enable-guile --with-guile-site-dir=\"$out/share/guile/site\""} ''; # Build of the Guile bindings is not parallel-safe. See # # for the actual fix. - enableParallelBuilding = false; + enableParallelBuilding = !guileBindings; buildInputs = [ zlib lzo lzip ] ++ stdenv.lib.optional guileBindings guile; @@ -42,7 +43,7 @@ stdenv.mkDerivation (rec { # http://hydra.nixos.org/build/2962084/nixlog/1/raw . doCheck = (!stdenv.isFreeBSD && !stdenv.isDarwin); - meta = with stdenv.lib; { + meta = { description = "The GNU Transport Layer Security Library"; longDescription = '' @@ -61,13 +62,6 @@ stdenv.mkDerivation (rec { homepage = http://www.gnu.org/software/gnutls/; license = "LGPLv2.1+"; - maintainers = [ ]; + maintainers = [ stdenv.lib.maintainers.eelco ]; }; -} - -// - -(stdenv.lib.optionalAttrs stdenv.isFreeBSD { - # FreeBSD doesn't have , and Gnulib's `alloca' module isn't used. - patches = [ ./guile-gnulib-includes.patch ]; -})) +} \ No newline at end of file diff --git a/pkgs/development/libraries/gnutls/3.2.nix b/pkgs/development/libraries/gnutls/3.2.nix index ad873b3eae8..fff05ed8727 100644 --- a/pkgs/development/libraries/gnutls/3.2.nix +++ b/pkgs/development/libraries/gnutls/3.2.nix @@ -3,15 +3,19 @@ assert guileBindings -> guile != null; -stdenv.mkDerivation (rec { - - name = "gnutls-3.2.10"; +stdenv.mkDerivation rec { + name = "gnutls-3.2.12"; src = fetchurl { url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/${name}.tar.lz"; - sha256 = "1g1w93d66sz51977zbqd56641r501a1djcwhykbjm8alhyz1564h"; + sha256 = "1zwk9qkxn3190nssyamd7jsb3ag6mnnln3jwbgmjs1w306dzwafi"; }; + patches = + # FreeBSD doesn't have , and Gnulib's `alloca' module isn't used. + stdenv.lib.optional stdenv.isFreeBSD ./guile-gnulib-includes.patch + ; + # Note: GMP is a dependency of Nettle, whose public headers include # GMP headers, hence the hack. configurePhase = '' @@ -21,15 +25,14 @@ stdenv.mkDerivation (rec { --with-lzo --with-libtasn1-prefix="${libtasn1}" \ --with-libnettle-prefix="${nettle}" \ CPPFLAGS="-I${gmp}/include" \ - ${if guileBindings - then "--enable-guile --with-guile-site-dir=\"$out/share/guile/site\"" - else ""} + ${stdenv.lib.optionalString guileBindings + "--enable-guile --with-guile-site-dir=\"$out/share/guile/site\""} ''; # Build of the Guile bindings is not parallel-safe. See # # for the actual fix. - enableParallelBuilding = false; + enableParallelBuilding = !guileBindings; buildInputs = [ zlib lzo lzip ] ++ stdenv.lib.optional guileBindings guile; @@ -42,7 +45,7 @@ stdenv.mkDerivation (rec { # http://hydra.nixos.org/build/2962084/nixlog/1/raw . doCheck = (!stdenv.isFreeBSD && !stdenv.isDarwin); - meta = with stdenv.lib; { + meta = { description = "The GNU Transport Layer Security Library"; longDescription = '' @@ -61,25 +64,8 @@ stdenv.mkDerivation (rec { homepage = http://www.gnu.org/software/gnutls/; license = "LGPLv2.1+"; - maintainers = [ ]; - platforms = platforms.all; + maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = stdenv.lib.platforms.all; }; } -// - -(stdenv.lib.optionalAttrs stdenv.isFreeBSD { - # FreeBSD doesn't have , and Gnulib's `alloca' module isn't used. - patches = [ ./guile-gnulib-includes.patch ]; -}) - -// - -(stdenv.lib.optionalAttrs stdenv.isDarwin { - # multiple definitions of '_gnutls_x86_cpuid_s' cause linker to fail. - # the patch is: https://www.gitorious.org/gnutls/gnutls/commit/54768ca1cd9049bbd1c695696ef3c8595c6052db - # discussion: http://osdir.com/ml/gnutls-devel-gnu/2014-02/msg00012.html - patches = [ ./fix_gnutls_x86_cpuid_s_multi_definitions.patch ]; -}) - -) diff --git a/pkgs/development/libraries/gnutls/fix_gnutls_x86_cpuid_s_multi_definitions.patch b/pkgs/development/libraries/gnutls/fix_gnutls_x86_cpuid_s_multi_definitions.patch deleted file mode 100644 index 1bc3086faeb..00000000000 --- a/pkgs/development/libraries/gnutls/fix_gnutls_x86_cpuid_s_multi_definitions.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 54768ca1cd9049bbd1c695696ef3c8595c6052db Mon Sep 17 00:00:00 2001 -From: Nikos Mavrogiannopoulos -Date: Mon, 10 Feb 2014 10:43:52 +0100 -Subject: [PATCH] do not redefine the _gnutls_x86_cpuid_s symbol - ---- - lib/accelerated/x86/aes-cbc-x86-aesni.c | 2 -- - lib/accelerated/x86/aes-cbc-x86-ssse3.c | 2 -- - lib/accelerated/x86/x86.h | 3 ++- - 3 files changed, 2 insertions(+), 5 deletions(-) - -diff --git a/lib/accelerated/x86/aes-cbc-x86-aesni.c b/lib/accelerated/x86/aes-cbc-x86-aesni.c -index 6d4526f..1a2681f 100644 ---- a/lib/accelerated/x86/aes-cbc-x86-aesni.c -+++ b/lib/accelerated/x86/aes-cbc-x86-aesni.c -@@ -39,8 +39,6 @@ struct aes_ctx { - int enc; - }; - --unsigned int _gnutls_x86_cpuid_s[4]; -- - static int - aes_cipher_init(gnutls_cipher_algorithm_t algorithm, void **_ctx, int enc) - { -diff --git a/lib/accelerated/x86/aes-cbc-x86-ssse3.c b/lib/accelerated/x86/aes-cbc-x86-ssse3.c -index ff24578..2b2440a 100644 ---- a/lib/accelerated/x86/aes-cbc-x86-ssse3.c -+++ b/lib/accelerated/x86/aes-cbc-x86-ssse3.c -@@ -39,8 +39,6 @@ struct aes_ctx { - int enc; - }; - --unsigned int _gnutls_x86_cpuid_s[4]; -- - static int - aes_cipher_init(gnutls_cipher_algorithm_t algorithm, void **_ctx, int enc) - { -diff --git a/lib/accelerated/x86/x86.h b/lib/accelerated/x86/x86.h -index ae04d32..03fc8de 100644 ---- a/lib/accelerated/x86/x86.h -+++ b/lib/accelerated/x86/x86.h -@@ -22,6 +22,8 @@ - - #include - -+extern unsigned int _gnutls_x86_cpuid_s[4]; -+ - #if defined(ASM_X86) - - void gnutls_cpuid(unsigned int func, unsigned int *ax, unsigned int *bx, -@@ -43,5 +45,4 @@ unsigned int gnutls_have_cpuid(void); - (nettle_hash_digest_func *) digest_func \ - } - -- - #endif --- -1.7.1 - diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 85730c1bf25..881f31c66a6 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -23,4 +23,6 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ glib ]; + + setupHook = ./setup-hook.sh; } diff --git a/pkgs/development/libraries/gstreamer/core/setup-hook.sh b/pkgs/development/libraries/gstreamer/core/setup-hook.sh new file mode 100644 index 00000000000..4e75044e732 --- /dev/null +++ b/pkgs/development/libraries/gstreamer/core/setup-hook.sh @@ -0,0 +1,9 @@ +addGstreamerLibPath () { + if test -d "$1/lib/gstreamer-1.0" + then + export GST_PLUGIN_SYSTEM_PATH_1_0="${GST_PLUGIN_SYSTEM_PATH_1_0}${GST_PLUGIN_SYSTEM_PATH_1_0:+:}$1/lib/gstreamer-1.0" + fi +} + +envHooks=(${envHooks[@]} addGstreamerLibPath) + diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamer/setup-hook.sh b/pkgs/development/libraries/gstreamer/legacy/gstreamer/setup-hook.sh index ad184dc21e9..10671f9d227 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gstreamer/setup-hook.sh +++ b/pkgs/development/libraries/gstreamer/legacy/gstreamer/setup-hook.sh @@ -1,7 +1,7 @@ addGstreamerLibPath () { if test -d "$1/lib/gstreamer-0.10" then - export GST_PLUGIN_PATH="${GST_PLUGIN_PATH}${GST_PLUGIN_PATH:+:}$1/lib/gstreamer-0.10" + export GST_PLUGIN_SYSTEM_PATH="${GST_PLUGIN_SYSTEM_PATH}${GST_PLUGIN_SYSTEM_PATH:+:}$1/lib/gstreamer-0.10" fi } diff --git a/pkgs/development/libraries/gwenhywfar/default.nix b/pkgs/development/libraries/gwenhywfar/default.nix index 724524e2b26..b8ad3442729 100644 --- a/pkgs/development/libraries/gwenhywfar/default.nix +++ b/pkgs/development/libraries/gwenhywfar/default.nix @@ -1,19 +1,27 @@ -{ stdenv, fetchurl, qt4, gtk, pkgconfig, gnutls, libgcrypt }: +{ stdenv, fetchurl, gnutls, gtk, libgcrypt, pkgconfig, qt4 }: stdenv.mkDerivation rec { - name = "gwenhywfar-4.3.1"; + name = "gwenhywfar-4.10.0beta"; src = fetchurl { - url = "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=65&file=01&dummy=gwenhywfar-4.3.1.tar.gz"; + url = "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=73&file=01&dummy=gwenhywfar-4.10.0beta.tar.gz"; name = "${name}.tar.gz"; - sha256 = "1r8ayi1nwcdcs4mncd7zigl8pk707j7whb85klsyir4nif52fxrs"; + sha256 = "1ihg2s263g540hl42y6g9wqcc4am70kv01yivsqfrpa9fnhbxm7f"; }; propagatedBuildInputs = [ gnutls libgcrypt ]; - buildInputs = [ qt4 gtk ]; + buildInputs = [ gtk qt4 ]; nativeBuildInputs = [ pkgconfig ]; QTDIR = qt4; + + meta = with stdenv.lib; { + description = "OS abstraction functions used by aqbanking and related tools"; + homepage = "http://www2.aquamaniac.de/sites/download/packages.php?package=01&showall=1"; + license = licenses.lgpl21; + maintainers = with maintainers; [ goibhniu ]; + platforms = platforms.linux; + }; } diff --git a/pkgs/development/libraries/haskell/Agda/default.nix b/pkgs/development/libraries/haskell/Agda/default.nix index 749802f95b2..5a1f00a995c 100644 --- a/pkgs/development/libraries/haskell/Agda/default.nix +++ b/pkgs/development/libraries/haskell/Agda/default.nix @@ -1,4 +1,4 @@ -{ cabal, alex, binary, deepseq, filepath, geniplate, happy +{ cabal, alex, binary, deepseq, emacs, filepath, geniplate, happy , hashable, hashtables, haskeline, haskellSrcExts, mtl, parallel , QuickCheck, text, time, unorderedContainers, xhtml, zlib }: @@ -14,8 +14,11 @@ cabal.mkDerivation (self: { haskellSrcExts mtl parallel QuickCheck text time unorderedContainers xhtml zlib ]; - buildTools = [ alex happy ]; + buildTools = [ alex emacs happy ]; jailbreak = true; + postInstall = '' + $out/bin/agda-mode compile + ''; meta = { homepage = "http://wiki.portal.chalmers.se/agda/"; description = "A dependently typed functional programming language and proof assistant"; diff --git a/pkgs/development/libraries/haskell/Cabal/1.18.1.2.nix b/pkgs/development/libraries/haskell/Cabal/1.18.1.3.nix similarity index 89% rename from pkgs/development/libraries/haskell/Cabal/1.18.1.2.nix rename to pkgs/development/libraries/haskell/Cabal/1.18.1.3.nix index 024a4d5c135..0ef09dc49b1 100644 --- a/pkgs/development/libraries/haskell/Cabal/1.18.1.2.nix +++ b/pkgs/development/libraries/haskell/Cabal/1.18.1.3.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "Cabal"; - version = "1.18.1.2"; - sha256 = "0pbg9d40lskcps248fdcnm4hnib3vl10mbcdf830zw45q29gfkjr"; + version = "1.18.1.3"; + sha256 = "1m1m6f00sc4w0s5hnqy2z05rnaihaw1jy03bidc5pl6r1llkdi15"; buildDepends = [ deepseq filepath time ]; testDepends = [ extensibleExceptions filepath HUnit QuickCheck regexPosix diff --git a/pkgs/development/libraries/haskell/Chart/default.nix b/pkgs/development/libraries/haskell/Chart/default.nix index 3b08c2d0e2c..5f7e8c2cb4b 100644 --- a/pkgs/development/libraries/haskell/Chart/default.nix +++ b/pkgs/development/libraries/haskell/Chart/default.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { buildDepends = [ colour dataDefaultClass lens mtl operational time ]; + jailbreak = true; meta = { homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "A library for generating 2D Charts and Plots"; diff --git a/pkgs/development/libraries/haskell/HList/default.nix b/pkgs/development/libraries/haskell/HList/default.nix index aafa2fae825..fda43c09baf 100644 --- a/pkgs/development/libraries/haskell/HList/default.nix +++ b/pkgs/development/libraries/haskell/HList/default.nix @@ -1,12 +1,12 @@ { cabal, cmdargs, diffutils, doctest, filepath, hspec, lens, mtl -, syb +, syb, tagged }: cabal.mkDerivation (self: { pname = "HList"; - version = "0.3.2.0"; - sha256 = "1cv27y8jg38yvfca83zn3fzq7mkzhqw7j1y7kg5fkfh4wd8ixs1f"; - buildDepends = [ mtl ]; + version = "0.3.4.0"; + sha256 = "0jx0bfsc17c6bx621n7k0wfa5s59kcpi45p6wr8g4gyw846hjw9q"; + buildDepends = [ mtl tagged ]; testDepends = [ cmdargs doctest filepath hspec lens mtl syb ]; buildTools = [ diffutils ]; doCheck = false; diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.10.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.11.nix similarity index 88% rename from pkgs/development/libraries/haskell/HTTP/4000.2.10.nix rename to pkgs/development/libraries/haskell/HTTP/4000.2.11.nix index c893d2f1e75..f48642462c6 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.10.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.11.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "HTTP"; - version = "4000.2.10"; - sha256 = "1l97l6am45xgyg0dyxpfgbxc00wp8ishm7spd0hbgmwc5sgnvppg"; + version = "4000.2.11"; + sha256 = "17jlmh3v6k0mhd9nh1y5pf2br17lkx4wp9sa7q81wvprw998nw97"; buildDepends = [ mtl network parsec ]; testDepends = [ caseInsensitive conduit deepseq httpdShed httpTypes HUnit mtl diff --git a/pkgs/development/libraries/haskell/JuicyPixels/default.nix b/pkgs/development/libraries/haskell/JuicyPixels/default.nix index be9c67f797e..5e12adc39a8 100644 --- a/pkgs/development/libraries/haskell/JuicyPixels/default.nix +++ b/pkgs/development/libraries/haskell/JuicyPixels/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "JuicyPixels"; - version = "3.1.3.3"; - sha256 = "1j1kdr6x7rhpa45is04haxgf4i2jghcgak4km0f2i0k3pyiv647x"; + version = "3.1.4.1"; + sha256 = "12yq6wv0hs8kdckw1wgfssvnl8nvfanic8ciz8r2cjcwnlidh324"; buildDepends = [ binary deepseq mtl primitive transformers vector zlib ]; diff --git a/pkgs/development/libraries/haskell/MemoTrie/default.nix b/pkgs/development/libraries/haskell/MemoTrie/default.nix index f3bd183d137..5d8fc314819 100644 --- a/pkgs/development/libraries/haskell/MemoTrie/default.nix +++ b/pkgs/development/libraries/haskell/MemoTrie/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "MemoTrie"; - version = "0.6.1"; - sha256 = "1bx0xd28irxjrq181wirx0vdrdj4qg4n4wj7ya27lkh408mwsxm6"; + version = "0.6.2"; + sha256 = "1g4b82s30bqkfids3iywf873nyn8h7l8rp8l3xl58smj5lbi3p4x"; buildDepends = [ void ]; meta = { homepage = "http://haskell.org/haskellwiki/MemoTrie"; diff --git a/pkgs/development/libraries/haskell/SVGFonts/default.nix b/pkgs/development/libraries/haskell/SVGFonts/default.nix index de47bd200ee..509efd61968 100644 --- a/pkgs/development/libraries/haskell/SVGFonts/default.nix +++ b/pkgs/development/libraries/haskell/SVGFonts/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "SVGFonts"; - version = "1.4.0.1"; - sha256 = "0f878xg6qngl8ahk8zz03f1kyn2jq1dz05zw8av7s91x2ms8q3rg"; + version = "1.4.0.2"; + sha256 = "1a1f0jdz36zpj1196zv5qwg35rm4ra0b4z5spr1m3696292nj8ph"; buildDepends = [ attoparsec blazeMarkup blazeSvg dataDefaultClass diagramsLib parsec split text tuple vector vectorSpace xml diff --git a/pkgs/development/libraries/haskell/aeson/0.7.0.1.nix b/pkgs/development/libraries/haskell/aeson/0.7.0.1.nix index 551f62d0756..4b5c137d89b 100644 --- a/pkgs/development/libraries/haskell/aeson/0.7.0.1.nix +++ b/pkgs/development/libraries/haskell/aeson/0.7.0.1.nix @@ -1,6 +1,7 @@ -{ cabal, attoparsec, deepseq, dlist, hashable, HUnit, mtl -, QuickCheck, scientific, syb, testFramework, testFrameworkHunit -, testFrameworkQuickcheck2, text, time, unorderedContainers, vector +{ cabal, attoparsec, blazeBuilder, deepseq, dlist, hashable, HUnit +, mtl, QuickCheck, scientific, syb, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2, text, time +, unorderedContainers, vector }: cabal.mkDerivation (self: { @@ -8,14 +9,13 @@ cabal.mkDerivation (self: { version = "0.7.0.1"; sha256 = "17cwclxh2f2m0mvs867lfzrv14gd9grw8a9f8l95j3nd76y58kb3"; buildDepends = [ - attoparsec deepseq dlist hashable mtl scientific syb text time - unorderedContainers vector + attoparsec blazeBuilder deepseq dlist hashable mtl scientific syb + text time unorderedContainers vector ]; testDepends = [ attoparsec HUnit QuickCheck testFramework testFrameworkHunit testFrameworkQuickcheck2 text time unorderedContainers vector ]; - doCheck = false; meta = { homepage = "https://github.com/bos/aeson"; description = "Fast JSON parsing and encoding"; diff --git a/pkgs/development/libraries/haskell/amqp/default.nix b/pkgs/development/libraries/haskell/amqp/default.nix index 432d353a0af..200a736f331 100644 --- a/pkgs/development/libraries/haskell/amqp/default.nix +++ b/pkgs/development/libraries/haskell/amqp/default.nix @@ -1,18 +1,20 @@ -{ cabal, binary, clock, dataBinaryIeee754, hspec, hspecExpectations -, network, split, text, xml +{ cabal, binary, clock, connection, dataBinaryIeee754, hspec +, hspecExpectations, monadControl, network, split, text, xml }: cabal.mkDerivation (self: { pname = "amqp"; - version = "0.7.0"; - sha256 = "09zazmbdw8nphbjkmixn2dpwdgkjqjfbn6jv522ykvrcnsn35kc4"; + version = "0.8.1"; + sha256 = "10infzs2siw9vv8jgsndv7c82bsh22cs2drrb73nxpwf73hy3rzm"; isLibrary = true; isExecutable = true; buildDepends = [ - binary clock dataBinaryIeee754 network split text xml + binary clock connection dataBinaryIeee754 monadControl network + split text xml ]; testDepends = [ - binary dataBinaryIeee754 hspec hspecExpectations network split text + binary clock connection dataBinaryIeee754 hspec hspecExpectations + network split text ]; meta = { homepage = "https://github.com/hreinhardt/amqp"; diff --git a/pkgs/development/libraries/haskell/asn1-encoding/default.nix b/pkgs/development/libraries/haskell/asn1-encoding/default.nix index c151da0c7dd..623657ee762 100644 --- a/pkgs/development/libraries/haskell/asn1-encoding/default.nix +++ b/pkgs/development/libraries/haskell/asn1-encoding/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "asn1-encoding"; - version = "0.8.1.2"; - sha256 = "01i7zga9nfvccgjixnxza9mi7jj4k6308g8asnljr44s1k8rikwm"; + version = "0.8.1.3"; + sha256 = "000rajx9gdxfyx521yg2mvp1z8h61sr96w1lzwawiw7n5ng6v8ni"; isLibrary = true; isExecutable = true; buildDepends = [ asn1Types mtl text time ]; diff --git a/pkgs/development/libraries/haskell/assert-failure/default.nix b/pkgs/development/libraries/haskell/assert-failure/default.nix index bfb340147a8..b5cc0bdc446 100644 --- a/pkgs/development/libraries/haskell/assert-failure/default.nix +++ b/pkgs/development/libraries/haskell/assert-failure/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "assert-failure"; - version = "0.1"; - sha256 = "1xwd6rhka9gzmldkaw3d7262h51wxw9dwgip39q8pjkvvfs5kwkr"; + version = "0.1.1.0"; + sha256 = "09djlhhyn9w822a5r41y7gk4cqk74a2fy7skzml2bah2an166gm1"; buildDepends = [ prettyShow text ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/base-compat/default.nix b/pkgs/development/libraries/haskell/base-compat/default.nix index 6ce94b0d6c0..9e5375a24d8 100644 --- a/pkgs/development/libraries/haskell/base-compat/default.nix +++ b/pkgs/development/libraries/haskell/base-compat/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "base-compat"; - version = "0.3.0"; - sha256 = "0jjj953hr00jj99ld2977al6n6qk67ds9qfzkzwkh5ifgmi6f20i"; + version = "0.4.0"; + sha256 = "0ps26w4mjp465a3mh3hpzkdkc97yvfhzh86fcnlqszy9wgj13w65"; buildDepends = [ errorcallEqInstance ]; testDepends = [ hspec setenv ]; meta = { diff --git a/pkgs/development/libraries/haskell/cairo/default.nix b/pkgs/development/libraries/haskell/cairo/default.nix index b009f6763ab..25029618b23 100644 --- a/pkgs/development/libraries/haskell/cairo/default.nix +++ b/pkgs/development/libraries/haskell/cairo/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "cairo"; - version = "0.12.5.1"; - sha256 = "02a57kg7s1bjfvk7cnkppfva5g7akhpwsrsa1qzm0kdld51cs86l"; + version = "0.12.5.3"; + sha256 = "1g5wn7dzz8cc7my09igr284j96d795jlnmy1q2hhlvssfhwbbvg7"; buildDepends = [ mtl utf8String ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ cairo libc pkgconfig zlib ]; diff --git a/pkgs/development/libraries/haskell/classy-prelude/default.nix b/pkgs/development/libraries/haskell/classy-prelude/default.nix index f5429fb024d..abc0841c58e 100644 --- a/pkgs/development/libraries/haskell/classy-prelude/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "classy-prelude"; - version = "0.8.0"; - sha256 = "02zf6v7a6bjf9z391bravx10mw0w4m4p5b78zap08z2i6fk5h91g"; + version = "0.8.0.1"; + sha256 = "0mj6zz53w6irs16w1pk65imhvnhp1rq3vq8s1n1xkf9gr13v3y9r"; buildDepends = [ basicPrelude chunkedData enclosedExceptions hashable liftedBase monoTraversable semigroups systemFilepath text time transformers diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index bf28c20e714..c5fe6d9d379 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "conduit"; - version = "1.0.15"; - sha256 = "1ciys2b7a6n5k0ld66wpjxnrs5ys5dvg9n5k8282bc5zsd54mb59"; + version = "1.0.15.1"; + sha256 = "0pbrsa00x8qr856532iinw9lyliwh7gwzyd1pshdmj3gkbqpf2bv"; buildDepends = [ liftedBase mmorph monadControl mtl resourcet text textStreamDecode transformers transformersBase void diff --git a/pkgs/development/libraries/haskell/control-monad-free/default.nix b/pkgs/development/libraries/haskell/control-monad-free/default.nix new file mode 100644 index 00000000000..93fed5fae06 --- /dev/null +++ b/pkgs/development/libraries/haskell/control-monad-free/default.nix @@ -0,0 +1,14 @@ +{ cabal, deepseq, transformers }: + +cabal.mkDerivation (self: { + pname = "control-monad-free"; + version = "0.5.3"; + sha256 = "1igwawcdpg8irayjax1xdrlpa9587k1v4y28ib3xfb7yk0xv7vk1"; + buildDepends = [ deepseq transformers ]; + meta = { + homepage = "http://github.com/pepeiborra/control-monad-free"; + description = "Free monads and monad transformers"; + license = self.stdenv.lib.licenses.publicDomain; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix index ba5007e789f..264c420842a 100644 --- a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix +++ b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "crypto-pubkey-types"; - version = "0.4.1"; - sha256 = "1zs0hhpqcfsdyfr3z96m8lwxrxr3mf27wvjrpvih9jlvh64vp1pr"; + version = "0.4.2.2"; + sha256 = "18z1fnh2xjq600ya8m175m64nwr6bwscr2q47zjy7k38zlm9c8h5"; buildDepends = [ asn1Types ]; meta = { homepage = "http://github.com/vincenthz/hs-crypto-pubkey-types"; diff --git a/pkgs/development/libraries/haskell/dns/default.nix b/pkgs/development/libraries/haskell/dns/default.nix index 5434db27087..5b2d99fb90e 100644 --- a/pkgs/development/libraries/haskell/dns/default.nix +++ b/pkgs/development/libraries/haskell/dns/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "dns"; - version = "1.1.1"; - sha256 = "1vyi0rqddaqpnh87gjracp0j3f7ai18qzr6zl6rjkszw3zfngww9"; + version = "1.2.0"; + sha256 = "1pzwvb1qycjw6qw34xhd4ap9jl0cc79d3i09b23bg0vqcz80vmpr"; buildDepends = [ attoparsec attoparsecConduit binary blazeBuilder conduit iproute mtl network networkConduit random diff --git a/pkgs/development/libraries/haskell/esqueleto/default.nix b/pkgs/development/libraries/haskell/esqueleto/default.nix index 3bbd8681ddb..4d11aeaf700 100644 --- a/pkgs/development/libraries/haskell/esqueleto/default.nix +++ b/pkgs/development/libraries/haskell/esqueleto/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "esqueleto"; - version = "1.3.4.5"; - sha256 = "0fw57dn67gx5v7drd4g7xbj1z614sr3lxw7gcciypnjc7qkqjgv7"; + version = "1.3.4.6"; + sha256 = "1mqjgc1glnfivrmw77mk6mqr02gp6l3jlvpz5ysiii42c1bp55n0"; buildDepends = [ conduit monadLogger persistent resourcet tagged text transformers unorderedContainers diff --git a/pkgs/development/libraries/haskell/fb/default.nix b/pkgs/development/libraries/haskell/fb/default.nix new file mode 100644 index 00000000000..dbade4c9f84 --- /dev/null +++ b/pkgs/development/libraries/haskell/fb/default.nix @@ -0,0 +1,31 @@ +{ cabal, aeson, attoparsec, attoparsecConduit, base16Bytestring +, base64Bytestring, cereal, conduit, cryptoApi, cryptohash +, cryptohashCryptoapi, dataDefault, hspec, httpConduit, httpTypes +, HUnit, liftedBase, monadControl, monadLogger, QuickCheck +, resourcet, text, time, transformers, transformersBase +, unorderedContainers +}: + +cabal.mkDerivation (self: { + pname = "fb"; + version = "0.15.2"; + sha256 = "1nkgw4978kwhqs7h6rlsspx2f9dbmsywjn57v2fg1c1lg271rz1d"; + buildDepends = [ + aeson attoparsec attoparsecConduit base16Bytestring + base64Bytestring cereal conduit cryptoApi cryptohash + cryptohashCryptoapi dataDefault httpConduit httpTypes liftedBase + monadControl monadLogger resourcet text time transformers + transformersBase unorderedContainers + ]; + testDepends = [ + aeson conduit dataDefault hspec httpConduit HUnit liftedBase + monadControl QuickCheck text time transformers + ]; + doCheck = false; + meta = { + homepage = "https://github.com/meteficha/fb"; + description = "Bindings to Facebook's API"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/gio/default.nix b/pkgs/development/libraries/haskell/gio/default.nix index 6506800a174..19d51d93aab 100644 --- a/pkgs/development/libraries/haskell/gio/default.nix +++ b/pkgs/development/libraries/haskell/gio/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "gio"; - version = "0.12.5.0"; - sha256 = "08gg3dh3xsgvj3hwylg5pgrhdrvi1chsybkd0l4hd4bycpm3sx98"; + version = "0.12.5.3"; + sha256 = "1n9sima0m30w1bmfk0wb4fawrg76vgpvlzki0kwdh6f0sfczxywc"; buildDepends = [ glib mtl ]; buildTools = [ gtk2hsBuildtools ]; pkgconfigDepends = [ glib ]; diff --git a/pkgs/development/libraries/haskell/glib/default.nix b/pkgs/development/libraries/haskell/glib/default.nix index 4761c35127e..9ae07187f5a 100644 --- a/pkgs/development/libraries/haskell/glib/default.nix +++ b/pkgs/development/libraries/haskell/glib/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "glib"; - version = "0.12.5.0"; - sha256 = "0s3gw4xd6d84hylzniy3sjjzz2ia2q4249vplhqn6y64dj96l196"; + version = "0.12.5.3"; + sha256 = "0hn55x0bzc6xxsd5fhlnh2mpdn8n80295i2irgbgxqc1wn226frc"; buildDepends = [ utf8String ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc pkgconfig ]; diff --git a/pkgs/development/libraries/haskell/gnuplot/default.nix b/pkgs/development/libraries/haskell/gnuplot/default.nix new file mode 100644 index 00000000000..8390ef2520a --- /dev/null +++ b/pkgs/development/libraries/haskell/gnuplot/default.nix @@ -0,0 +1,22 @@ +{ cabal, dataAccessor, dataAccessorTransformers, deepseq, filepath +, temporary, time, transformers, utilityHt +}: + +cabal.mkDerivation (self: { + pname = "gnuplot"; + version = "0.5.2"; + sha256 = "11gma33bikx97jra04vgnhikylw9wm1l37hdrsknl7mgk2qbrs74"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + dataAccessor dataAccessorTransformers deepseq filepath temporary + time transformers utilityHt + ]; + jailbreak = true; + meta = { + homepage = "http://www.haskell.org/haskellwiki/Gnuplot"; + description = "2D and 3D plots using gnuplot"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/graph-wrapper/default.nix b/pkgs/development/libraries/haskell/graph-wrapper/default.nix new file mode 100644 index 00000000000..86d25c24fda --- /dev/null +++ b/pkgs/development/libraries/haskell/graph-wrapper/default.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "graph-wrapper"; + version = "0.2.4.2"; + sha256 = "0cf70xvmzn4w5pg1bxizajqgcbjwwk6jrd7hnb3kfqy1v3apifyf"; + meta = { + homepage = "http://www.github.com/batterseapower/graph-wrapper"; + description = "A wrapper around the standard Data.Graph with a less awkward interface"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/gtk/default.nix b/pkgs/development/libraries/haskell/gtk/default.nix index 9ac6fb2f6f2..8198960854c 100644 --- a/pkgs/development/libraries/haskell/gtk/default.nix +++ b/pkgs/development/libraries/haskell/gtk/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "gtk"; - version = "0.12.5.2"; - sha256 = "06jlwln3w2pgzahhy8n4sqv1chmh899naz8avqabr9ni4hmbrssb"; + version = "0.12.5.4"; + sha256 = "0vs31lzrmd3546q8dqql8sf1vfagyr24p5i6ddi792vw14mj3why"; buildDepends = [ cairo glib mtl pango ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc pkgconfig ]; diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix index b393aed07d5..445fb67386e 100644 --- a/pkgs/development/libraries/haskell/hamlet/default.nix +++ b/pkgs/development/libraries/haskell/hamlet/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "hamlet"; - version = "1.1.8"; - sha256 = "093igcaycg2d29ncj9l8qbzi21drynjk8kvqfl70zqvgsm8nai7x"; + version = "1.1.9.2"; + sha256 = "122wfkk23a2bvz29hrgxj24k6cf315fwdbz70ih3nclawh0bhani"; buildDepends = [ blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare systemFileio systemFilepath text time diff --git a/pkgs/development/libraries/haskell/haskell-names/default.nix b/pkgs/development/libraries/haskell/haskell-names/default.nix index 4d5e8388ea2..db9e92fc8ce 100644 --- a/pkgs/development/libraries/haskell/haskell-names/default.nix +++ b/pkgs/development/libraries/haskell/haskell-names/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "haskell-names"; - version = "0.3.2.4"; - sha256 = "1m3p64kkm8zv2diwila0zdincykavf2fvxpqzpsmfndwb24f5b3p"; + version = "0.3.2.5"; + sha256 = "1jp3109b742gr6ii7syacl167i1i91xsyw0200ghaad3ymrqkcvq"; buildDepends = [ aeson Cabal dataLens dataLensTemplate filepath haskellPackages haskellSrcExts hseCpp mtl tagged transformers traverseWithClass diff --git a/pkgs/development/libraries/haskell/haskell-packages/default.nix b/pkgs/development/libraries/haskell/haskell-packages/default.nix index 537ff52e3ff..4081e246a34 100644 --- a/pkgs/development/libraries/haskell/haskell-packages/default.nix +++ b/pkgs/development/libraries/haskell/haskell-packages/default.nix @@ -1,13 +1,13 @@ -{ cabal, aeson, Cabal, deepseq, EitherT, filepath, haskellSrcExts +{ cabal, aeson, Cabal, deepseq, either, filepath, haskellSrcExts , hseCpp, mtl, optparseApplicative, tagged }: cabal.mkDerivation (self: { pname = "haskell-packages"; - version = "0.2.3.3"; - sha256 = "1i3x392dwryhw6k02bd2r9wn9iwwmcqzjhk7gx5lx1vhyb470qr2"; + version = "0.2.3.4"; + sha256 = "0qj5n1yc481n5c8gi5dgk22pxj58gf7z30621spr7gwlv001sk1y"; buildDepends = [ - aeson Cabal deepseq EitherT filepath haskellSrcExts hseCpp mtl + aeson Cabal deepseq either filepath haskellSrcExts hseCpp mtl optparseApplicative tagged ]; meta = { diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix index 7744a705efc..9f8c10f86fb 100644 --- a/pkgs/development/libraries/haskell/hoogle/default.nix +++ b/pkgs/development/libraries/haskell/hoogle/default.nix @@ -1,19 +1,20 @@ { cabal, aeson, binary, blazeBuilder, Cabal, caseInsensitive , cmdargs, conduit, deepseq, filepath, haskellSrcExts, httpTypes -, parsec, random, safe, shake, tagsoup, text, time, transformers -, uniplate, wai, warp +, parsec, QuickCheck, random, safe, shake, tagsoup, text, time +, transformers, uniplate, vector, vectorAlgorithms, wai, warp }: cabal.mkDerivation (self: { pname = "hoogle"; - version = "4.2.28"; - sha256 = "0dd8qsspbcb76ld9v61x2jjsyxakrasww69gzzprb4dxzm58lsid"; + version = "4.2.29"; + sha256 = "0w4fgf0qvd5zsa7dk99vcbr2pnyyg1hl3k0zwvp5v26v1lfijzil"; isLibrary = true; isExecutable = true; buildDepends = [ aeson binary blazeBuilder Cabal caseInsensitive cmdargs conduit - deepseq filepath haskellSrcExts httpTypes parsec random safe shake - tagsoup text time transformers uniplate wai warp + deepseq filepath haskellSrcExts httpTypes parsec QuickCheck random + safe shake tagsoup text time transformers uniplate vector + vectorAlgorithms wai warp ]; testDepends = [ filepath ]; testTarget = "--test-option=--no-net"; diff --git a/pkgs/development/libraries/haskell/hsini/default.nix b/pkgs/development/libraries/haskell/hsini/default.nix new file mode 100644 index 00000000000..45e03ad7144 --- /dev/null +++ b/pkgs/development/libraries/haskell/hsini/default.nix @@ -0,0 +1,20 @@ +{ cabal, HUnit, mtl, parsec, QuickCheck, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2, testFrameworkTh +}: + +cabal.mkDerivation (self: { + pname = "hsini"; + version = "0.2"; + sha256 = "0d9dhzaw2v9r0hb4lywzw4f0inijbcw5brc5dh45zfkalmn3aqam"; + buildDepends = [ mtl parsec ]; + testDepends = [ + HUnit mtl parsec QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 testFrameworkTh + ]; + doCheck = false; + meta = { + description = "Package for user configuration files (INI)"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/hspec-expectations-lens/default.nix b/pkgs/development/libraries/haskell/hspec-expectations-lens/default.nix new file mode 100644 index 00000000000..9ea5ff57efc --- /dev/null +++ b/pkgs/development/libraries/haskell/hspec-expectations-lens/default.nix @@ -0,0 +1,15 @@ +{ cabal, hspec, hspecExpectations, HUnit, lens, silently }: + +cabal.mkDerivation (self: { + pname = "hspec-expectations-lens"; + version = "0.3.0.0"; + sha256 = "1v6j4z3gv41jlhbi8ngx7h6d78l1fazvd3bw3c67zsnlgqrvl1x5"; + buildDepends = [ hspec hspecExpectations HUnit lens ]; + testDepends = [ hspec lens silently ]; + meta = { + homepage = "http://supki.github.io/hspec-expectations-lens/"; + description = "Hspec expectations for the lens stuff"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index 8719028bf3d..3f938332c02 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -1,30 +1,23 @@ -{ cabal, asn1Data, base64Bytestring, blazeBuilder -, blazeBuilderConduit, caseInsensitive, certificate, conduit -, connection, cookie, cprngAes, dataDefaultClass, deepseq, failure -, filepath, hspec, httpClient, httpClientConduit +{ cabal, blazeBuilder, caseInsensitive, conduit, connection, cookie +, dataDefaultClass, hspec, httpClient, httpClientConduit , httpClientMultipart, httpClientTls, httpTypes, HUnit, liftedBase -, mimeTypes, monadControl, mtl, network, networkConduit -, publicsuffixlist, random, regexCompat, resourcet, socks, text -, time, transformers, transformersBase, utf8String, void, wai, warp -, warpTls, zlibConduit +, network, networkConduit, resourcet, text, time, transformers +, utf8String, wai, warp, warpTls }: cabal.mkDerivation (self: { pname = "http-conduit"; - version = "2.0.0.6"; - sha256 = "0jgv17cxf8javcy4vcaayw9ajbr7dj43pba23xr6416hs6cv21hl"; + version = "2.0.0.7"; + sha256 = "0rizmshpypllfbmipbrad7hkrs2asx0ijfhr53w3pj58w6h80m0i"; buildDepends = [ conduit httpClient httpClientConduit httpClientTls httpTypes liftedBase resourcet transformers ]; testDepends = [ - asn1Data base64Bytestring blazeBuilder blazeBuilderConduit - caseInsensitive certificate conduit connection cookie cprngAes - dataDefaultClass deepseq failure filepath hspec httpClient - httpClientMultipart httpTypes HUnit liftedBase mimeTypes - monadControl mtl network networkConduit publicsuffixlist random - regexCompat resourcet socks text time transformers transformersBase - utf8String void wai warp warpTls zlibConduit + blazeBuilder caseInsensitive conduit connection cookie + dataDefaultClass hspec httpClient httpClientMultipart httpTypes + HUnit liftedBase network networkConduit text time transformers + utf8String wai warp warpTls ]; doCheck = false; meta = { diff --git a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix index a8e0afc786e..f78205c49a0 100644 --- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix +++ b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix @@ -1,15 +1,15 @@ { cabal, basicPrelude, blazeBuilder, caseInsensitive, conduit -, dataDefault, hspec, httpClient, httpConduit, httpTypes +, dataDefaultClass, hspec, httpClient, httpConduit, httpTypes , liftedBase, monadControl, network, networkConduit, resourcet , text, transformers, wai, waiLogger, warp, word8 }: cabal.mkDerivation (self: { pname = "http-reverse-proxy"; - version = "0.3.0"; - sha256 = "0wwrcm3hhbq9kawk3s12s8ws82vancmc8a5d29f6871jfq3vvzc2"; + version = "0.3.0.1"; + sha256 = "01rbczzf300ivb08wncm19wq64m7n6r5xfbgh82phjxjmmx9h6wj"; buildDepends = [ - basicPrelude blazeBuilder caseInsensitive conduit dataDefault + basicPrelude blazeBuilder caseInsensitive conduit dataDefaultClass httpClient httpTypes liftedBase monadControl network networkConduit resourcet text wai waiLogger word8 ]; diff --git a/pkgs/development/libraries/haskell/interpolate/default.nix b/pkgs/development/libraries/haskell/interpolate/default.nix new file mode 100644 index 00000000000..6b0ee4b6e36 --- /dev/null +++ b/pkgs/development/libraries/haskell/interpolate/default.nix @@ -0,0 +1,18 @@ +{ cabal, doctest, haskellSrcMeta, hspec, QuickCheck +, quickcheckInstances, text +}: + +cabal.mkDerivation (self: { + pname = "interpolate"; + version = "0.0.2"; + sha256 = "0l9hrgwmvp7h2mgw90gk45zgp0yy00201ki9hwg26sh2wd0sj6f8"; + buildDepends = [ haskellSrcMeta ]; + testDepends = [ + doctest haskellSrcMeta hspec QuickCheck quickcheckInstances text + ]; + meta = { + description = "String interpolation done right"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/io-streams/default.nix b/pkgs/development/libraries/haskell/io-streams/default.nix index e582b0bce8f..fcc39dfad57 100644 --- a/pkgs/development/libraries/haskell/io-streams/default.nix +++ b/pkgs/development/libraries/haskell/io-streams/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "io-streams"; - version = "1.1.4.0"; - sha256 = "0fkys15ih3ld4l5rqjlsmhdkf9w3xnhj6hbbahazx7pj0xsv1hyh"; + version = "1.1.4.2"; + sha256 = "0x6d0j41wnxl2h9xzbybmzqrrna3hc17786k65cpiby2x3nlp799"; buildDepends = [ attoparsec blazeBuilder network primitive text time transformers vector zlibBindings diff --git a/pkgs/development/libraries/haskell/iproute/default.nix b/pkgs/development/libraries/haskell/iproute/default.nix index 045bb64035c..89a57614160 100644 --- a/pkgs/development/libraries/haskell/iproute/default.nix +++ b/pkgs/development/libraries/haskell/iproute/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "iproute"; - version = "1.2.11"; - sha256 = "14f96sb41f5m14186900rz84vwv7idjiylp8m5nsm6gganvh4sh4"; + version = "1.2.12"; + sha256 = "19pr6my4nw7qq9lsp6xvz55lm9svwzqka5qcqy79sfdkxg459rg5"; buildDepends = [ appar byteorder network ]; testDepends = [ appar byteorder doctest hspec network QuickCheck safe diff --git a/pkgs/development/libraries/haskell/largeword/default.nix b/pkgs/development/libraries/haskell/largeword/default.nix index da0cafb9ba7..18ea22d6cd0 100644 --- a/pkgs/development/libraries/haskell/largeword/default.nix +++ b/pkgs/development/libraries/haskell/largeword/default.nix @@ -1,15 +1,17 @@ -{ cabal, HUnit, QuickCheck, testFramework, testFrameworkHunit -, testFrameworkQuickcheck2 +{ cabal, binary, HUnit, QuickCheck, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2 }: cabal.mkDerivation (self: { pname = "largeword"; - version = "1.0.5"; - sha256 = "0icwqwpn59xd0qfpaihvwz1waax617qqcl05jv9f26sjdr8688dl"; + version = "1.1.1"; + sha256 = "0dizzyicfj41cmdr9s0k75gf7cqbd2z1qk9kkvlq6rcz0249fz0x"; + buildDepends = [ binary ]; testDepends = [ - HUnit QuickCheck testFramework testFrameworkHunit + binary HUnit QuickCheck testFramework testFrameworkHunit testFrameworkQuickcheck2 ]; + jailbreak = true; meta = { homepage = "https://github.com/idontgetoutmuch/largeword"; description = "Provides Word128, Word192 and Word256 and a way of producing other large words if required"; diff --git a/pkgs/development/libraries/haskell/lens-family-core/default.nix b/pkgs/development/libraries/haskell/lens-family-core/default.nix new file mode 100644 index 00000000000..7bfb401c756 --- /dev/null +++ b/pkgs/development/libraries/haskell/lens-family-core/default.nix @@ -0,0 +1,13 @@ +{ cabal, transformers }: + +cabal.mkDerivation (self: { + pname = "lens-family-core"; + version = "1.0.0"; + sha256 = "149wfxddw58h5q42r3nknmac8wsc9c8xzsw6vrlfb4yasg7bhw53"; + buildDepends = [ transformers ]; + meta = { + description = "Haskell 98 Lens Families"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/lens/4.0.3.nix b/pkgs/development/libraries/haskell/lens/4.0.4.nix similarity index 94% rename from pkgs/development/libraries/haskell/lens/4.0.3.nix rename to pkgs/development/libraries/haskell/lens/4.0.4.nix index 9aca42a77df..cd85c7a4e94 100644 --- a/pkgs/development/libraries/haskell/lens/4.0.3.nix +++ b/pkgs/development/libraries/haskell/lens/4.0.4.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "lens"; - version = "4.0.3"; - sha256 = "01gf0hxpd136555r9ilzjrc6fyw0ng9bmr8bmkhfnkba127y7hgx"; + version = "4.0.4"; + sha256 = "14xa500afjpdfx3qqxr9dg5x8mxrna7c3b5xchqsrwck9d00cphd"; buildDepends = [ aeson bifunctors comonad constraints contravariant distributive exceptions filepath hashable mtl parallel primitive profunctors diff --git a/pkgs/development/libraries/haskell/libjenkins/default.nix b/pkgs/development/libraries/haskell/libjenkins/default.nix new file mode 100644 index 00000000000..722e280c6e5 --- /dev/null +++ b/pkgs/development/libraries/haskell/libjenkins/default.nix @@ -0,0 +1,25 @@ +{ cabal, async, conduit, doctest, filepath, free, hspec +, hspecExpectationsLens, httpClient, httpConduit, httpTypes, lens +, monadControl, network, text, transformers, xmlConduit +}: + +cabal.mkDerivation (self: { + pname = "libjenkins"; + version = "0.4.2.0"; + sha256 = "11013klk2gvcaf2d2gmi0bf3jg2m82li19szqlwb325kdjmdf546"; + buildDepends = [ + async conduit free httpClient httpConduit httpTypes lens + monadControl network text transformers xmlConduit + ]; + testDepends = [ + async conduit doctest filepath free hspec hspecExpectationsLens + httpClient httpConduit httpTypes lens monadControl network text + transformers xmlConduit + ]; + doCheck = false; + meta = { + description = "Jenkins API interface"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/lushtags/default.nix b/pkgs/development/libraries/haskell/lushtags/default.nix new file mode 100644 index 00000000000..bf05cd5e63d --- /dev/null +++ b/pkgs/development/libraries/haskell/lushtags/default.nix @@ -0,0 +1,17 @@ +{ cabal, haskellSrcExts, text, vector }: + +cabal.mkDerivation (self: { + pname = "lushtags"; + version = "0.0.1"; + sha256 = "0325c064nsczypapvwdchx7x5n69jxjbyjs90ah7q5ydxbjl6w9c"; + isLibrary = false; + isExecutable = true; + buildDepends = [ haskellSrcExts text vector ]; + jailbreak = true; + meta = { + homepage = "https://github.com/bitc/lushtags"; + description = "Create ctags compatible tags files for Haskell programs"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/mime-mail/default.nix b/pkgs/development/libraries/haskell/mime-mail/default.nix index e88dee9fa51..fe8a9a35176 100644 --- a/pkgs/development/libraries/haskell/mime-mail/default.nix +++ b/pkgs/development/libraries/haskell/mime-mail/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "mime-mail"; - version = "0.4.4"; - sha256 = "1y0fss53z1mvykpfkp28zwic2mb7zhf02lwxdr22n34hjzk34g9b"; + version = "0.4.4.1"; + sha256 = "0jzbkrd62alvgyx9bkrzicz88hjjnnavpv6hl22cxnirz41h8hw0"; buildDepends = [ base64Bytestring blazeBuilder filepath random text ]; diff --git a/pkgs/development/libraries/haskell/mime/default.nix b/pkgs/development/libraries/haskell/mime/default.nix index b4d2f7d7e50..6e1a3482c04 100644 --- a/pkgs/development/libraries/haskell/mime/default.nix +++ b/pkgs/development/libraries/haskell/mime/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "mime"; - version = "0.4.0"; - sha256 = "159jp7dcyx26slda2743zdr2prnm707mnglcb9p66hr1wjh98kx4"; + version = "0.4.0.1"; + sha256 = "1m987sqnns54qbsg68332mnrjkh71z6s83cma2kwavf0y305mrp0"; buildDepends = [ text ]; meta = { homepage = "https://github.com/GaloisInc/mime"; diff --git a/pkgs/development/libraries/haskell/miniutter/default.nix b/pkgs/development/libraries/haskell/miniutter/default.nix index 346e1c6a428..389a79dd6e1 100644 --- a/pkgs/development/libraries/haskell/miniutter/default.nix +++ b/pkgs/development/libraries/haskell/miniutter/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "miniutter"; - version = "0.4.2"; - sha256 = "00027aqxa0631v3n1jsv4aj9kf39s5yivi3dl573s5nj0wibj008"; + version = "0.4.3.0"; + sha256 = "0hslks4vr1738pczgzzcl0mrb9jqs1986vjgw4xpvzz9p3ki1n50"; buildDepends = [ binary minimorph text ]; testDepends = [ HUnit testFramework testFrameworkHunit text ]; meta = { diff --git a/pkgs/development/libraries/haskell/mono-traversable/default.nix b/pkgs/development/libraries/haskell/mono-traversable/default.nix index 03eb64da753..f6c261145c1 100644 --- a/pkgs/development/libraries/haskell/mono-traversable/default.nix +++ b/pkgs/development/libraries/haskell/mono-traversable/default.nix @@ -1,19 +1,19 @@ -{ cabal, comonad, hashable, hspec, QuickCheck, semigroupoids +{ cabal, comonad, foldl, hashable, hspec, QuickCheck, semigroupoids , semigroups, text, transformers, unorderedContainers, vector , vectorInstances }: cabal.mkDerivation (self: { pname = "mono-traversable"; - version = "0.3.0.1"; - sha256 = "14vh6qhl6v46r857pfwkyhn8g8dh7q7vbm6z64zq1lhdw91ywn4f"; + version = "0.3.1"; + sha256 = "0a0vy0hp34sw1q7153jd614mqydzg79pw645kfxlihs3j7ac2b3j"; buildDepends = [ comonad hashable semigroupoids semigroups text transformers unorderedContainers vector vectorInstances ]; testDepends = [ - hspec QuickCheck semigroups text transformers unorderedContainers - vector + foldl hspec QuickCheck semigroups text transformers + unorderedContainers vector ]; meta = { homepage = "https://github.com/snoyberg/mono-traversable"; diff --git a/pkgs/development/libraries/haskell/multiarg/default.nix b/pkgs/development/libraries/haskell/multiarg/default.nix index 737ddbda5d6..e8e608f0e0b 100644 --- a/pkgs/development/libraries/haskell/multiarg/default.nix +++ b/pkgs/development/libraries/haskell/multiarg/default.nix @@ -1,10 +1,10 @@ -{ cabal, utf8String }: +{ cabal, bifunctors, utf8String }: cabal.mkDerivation (self: { pname = "multiarg"; - version = "0.24.0.2"; - sha256 = "0jqkqw0v9dzby6cm0ijj1ff5dpps8hbjnhrscf2qwja9x974686s"; - buildDepends = [ utf8String ]; + version = "0.26.0.0"; + sha256 = "0fjzjr66yan62911kfndnr7xmy3waidh4cqazabk6yr1cznpsx8m"; + buildDepends = [ bifunctors utf8String ]; meta = { homepage = "https://github.com/massysett/multiarg"; description = "Combinators to build command line parsers"; diff --git a/pkgs/development/libraries/haskell/multirec/default.nix b/pkgs/development/libraries/haskell/multirec/default.nix index 61de0cace5b..85c2a671dbf 100644 --- a/pkgs/development/libraries/haskell/multirec/default.nix +++ b/pkgs/development/libraries/haskell/multirec/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "multirec"; - version = "0.7.3"; - sha256 = "0k1wbjsvkl08nwjikflc8yyalk654mf8bvi1rhm28i4na52myi5y"; + version = "0.7.4"; + sha256 = "01mligrin7fp3fnnwgv8nrww5938ryghgyw9xyw153a615ryj8i9"; meta = { homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec"; description = "Generic programming for families of recursive datatypes"; diff --git a/pkgs/development/libraries/haskell/mysql-simple/default.nix b/pkgs/development/libraries/haskell/mysql-simple/default.nix new file mode 100644 index 00000000000..e61d493cdbe --- /dev/null +++ b/pkgs/development/libraries/haskell/mysql-simple/default.nix @@ -0,0 +1,19 @@ +{ cabal, attoparsec, base16Bytestring, blazeBuilder, blazeTextual +, mysql, pcreLight, text, time +}: + +cabal.mkDerivation (self: { + pname = "mysql-simple"; + version = "0.2.2.4"; + sha256 = "044grjly1gyrgba2bfrii2pa14ff7v14ncyk3kj01g1zdxnwqjh6"; + buildDepends = [ + attoparsec base16Bytestring blazeBuilder blazeTextual mysql + pcreLight text time + ]; + meta = { + homepage = "https://github.com/bos/mysql-simple"; + description = "A mid-level MySQL client library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/mysql/default.nix b/pkgs/development/libraries/haskell/mysql/default.nix new file mode 100644 index 00000000000..4deec5bb767 --- /dev/null +++ b/pkgs/development/libraries/haskell/mysql/default.nix @@ -0,0 +1,15 @@ +{ cabal, mysqlConfig, zlib }: + +cabal.mkDerivation (self: { + pname = "mysql"; + version = "0.1.1.6"; + sha256 = "1sxzx5f4ysxhq1nimkj4xwf87i7prwp5wg0kjbhv9pbn65zc9mmj"; + buildTools = [ mysqlConfig ]; + extraLibraries = [ zlib ]; + meta = { + homepage = "https://github.com/bos/mysql"; + description = "A low-level MySQL client library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/network-conduit-tls/default.nix b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix index 28cf920cf28..4884a462a6d 100644 --- a/pkgs/development/libraries/haskell/network-conduit-tls/default.nix +++ b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix @@ -1,17 +1,15 @@ -{ cabal, aeson, certificate, conduit, connection, cprngAes -, cryptoApi, cryptoRandomApi, dataDefault, HUnit, monadControl, mtl -, network, networkConduit, pem, systemFileio, systemFilepath, tls -, transformers +{ cabal, conduit, connection, cprngAes, dataDefault, HUnit +, monadControl, mtl, network, networkConduit, systemFileio +, systemFilepath, tls, transformers }: cabal.mkDerivation (self: { pname = "network-conduit-tls"; - version = "1.0.4.1"; - sha256 = "1l79v4ippyfw6pl4h3vqswh79vcif80phf6kq5fr4xmv3b6nbc06"; + version = "1.0.4.2"; + sha256 = "1pgb6k6g10hy2k4sihj88n6w7400d4grja2crhhv1cydqdn858rc"; buildDepends = [ - aeson certificate conduit connection cprngAes cryptoApi - cryptoRandomApi dataDefault monadControl network networkConduit pem - systemFileio systemFilepath tls transformers + conduit connection cprngAes dataDefault monadControl network + networkConduit systemFileio systemFilepath tls transformers ]; testDepends = [ conduit connection HUnit mtl networkConduit ]; meta = { diff --git a/pkgs/development/libraries/haskell/pango/default.nix b/pkgs/development/libraries/haskell/pango/default.nix index db426f39724..84823b90e47 100644 --- a/pkgs/development/libraries/haskell/pango/default.nix +++ b/pkgs/development/libraries/haskell/pango/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "pango"; - version = "0.12.5.0"; - sha256 = "06hchdnw4nfnpb46nb1gwgpwwk41dhp0xfimnbf310idiy0pavcg"; + version = "0.12.5.3"; + sha256 = "1n64ppz0jqrbzvimbz4avwnx3z0n5z2gbmbmca0hw9wqf9j6y79a"; buildDepends = [ cairo glib mtl ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc pkgconfig ]; diff --git a/pkgs/development/libraries/haskell/parsers/0.9.nix b/pkgs/development/libraries/haskell/parsers/0.9.nix deleted file mode 100644 index dc42228df66..00000000000 --- a/pkgs/development/libraries/haskell/parsers/0.9.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ cabal, charset, doctest, filepath, text, transformers -, unorderedContainers -}: - -cabal.mkDerivation (self: { - pname = "parsers"; - version = "0.9"; - sha256 = "04lbayvdv2hax4s9sqlnia7jpzv1sgls41ylql0xbi2zhz5rvyyi"; - buildDepends = [ charset text transformers unorderedContainers ]; - testDepends = [ doctest filepath ]; - meta = { - homepage = "http://github.com/ekmett/parsers/"; - description = "Parsing combinators"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/parsers/0.10.3.nix b/pkgs/development/libraries/haskell/parsers/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/parsers/0.10.3.nix rename to pkgs/development/libraries/haskell/parsers/default.nix diff --git a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix index 9853969d9f1..acb7b3ce5b5 100644 --- a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix +++ b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix @@ -10,6 +10,7 @@ cabal.mkDerivation (self: { aeson blazeBuilder conduit monadControl persistent postgresqlLibpq postgresqlSimple text time transformers ]; + jailbreak = true; meta = { homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using postgresql"; diff --git a/pkgs/development/libraries/haskell/pipes-binary/default.nix b/pkgs/development/libraries/haskell/pipes-binary/default.nix new file mode 100644 index 00000000000..33f9482ca3f --- /dev/null +++ b/pkgs/development/libraries/haskell/pipes-binary/default.nix @@ -0,0 +1,24 @@ +{ cabal, binary, lensFamilyCore, pipes, pipesBytestring, pipesParse +, smallcheck, tasty, tastyHunit, tastySmallcheck, transformers +}: + +cabal.mkDerivation (self: { + pname = "pipes-binary"; + version = "0.4.0"; + sha256 = "021shl5czrr82b06awy7biy93qf6nh0wwiadhr7qsawzdnzqz2vc"; + buildDepends = [ + binary pipes pipesBytestring pipesParse transformers + ]; + testDepends = [ + binary lensFamilyCore pipes pipesParse smallcheck tasty tastyHunit + tastySmallcheck transformers + ]; + # Depends on an out-of-date version of smallcheck + doCheck = false; + meta = { + homepage = "https://github.com/k0001/pipes-binary"; + description = "Encode and decode binary streams using the pipes and binary libraries"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/pipes-postgresql-simple/default.nix b/pkgs/development/libraries/haskell/pipes-postgresql-simple/default.nix index aced7c741ab..830f188fed8 100644 --- a/pkgs/development/libraries/haskell/pipes-postgresql-simple/default.nix +++ b/pkgs/development/libraries/haskell/pipes-postgresql-simple/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "pipes-postgresql-simple"; - version = "0.1.1.2"; - sha256 = "0m9p3ddrv73c24yh0a2q14zkr4iibfysy2q9bwp6m100z3qk1bgy"; + version = "0.1.2.0"; + sha256 = "12ij2msdwjzzc93mlvvizh6amam5ld9j1a0b9xsa2awdjd21mwc1"; buildDepends = [ async exceptions mtl pipes pipesConcurrency pipesSafe postgresqlSimple stm text transformers diff --git a/pkgs/development/libraries/haskell/poppler/default.nix b/pkgs/development/libraries/haskell/poppler/default.nix index 5af2ead5e8e..aecd54c3998 100644 --- a/pkgs/development/libraries/haskell/poppler/default.nix +++ b/pkgs/development/libraries/haskell/poppler/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "poppler"; - version = "0.12.2.2"; - sha256 = "1ln5akiarv1ng5gjrzf8bnkm556xzl50m209qvi5nk98g7fyhqs7"; + version = "0.12.3"; + sha256 = "1ny2r1cpsshpg00w6bd0f5mw26xsy99l7dgx2xq8f01zcwdy4nrp"; buildDepends = [ cairo glib gtk mtl ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc ]; diff --git a/pkgs/development/libraries/haskell/postgresql-libpq/default.nix b/pkgs/development/libraries/haskell/postgresql-libpq/default.nix index 2208955a9d8..d630f063391 100644 --- a/pkgs/development/libraries/haskell/postgresql-libpq/default.nix +++ b/pkgs/development/libraries/haskell/postgresql-libpq/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "postgresql-libpq"; - version = "0.8.2.6"; - sha256 = "0n3lqffscwc6pq0rfy4yjild9hcgnkpq9a8icbvgxv4si13ipsgh"; + version = "0.9.0.0"; + sha256 = "09bi0npvly02zjhp463bmzm1n8w1cqsln676z82xi2in86317pv3"; extraLibraries = [ postgresql ]; meta = { homepage = "http://github.com/lpsmith/postgresql-libpq"; diff --git a/pkgs/development/libraries/haskell/primitive/0.5.2.1.nix b/pkgs/development/libraries/haskell/primitive/0.5.2.1.nix new file mode 100644 index 00000000000..8f1090c09b1 --- /dev/null +++ b/pkgs/development/libraries/haskell/primitive/0.5.2.1.nix @@ -0,0 +1,14 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "primitive"; + version = "0.5.2.1"; + sha256 = "1vn3y5gh4lwvgvklhn8k1z7gxjy27ik621f4gpa9cb7gqa0nnl8f"; + meta = { + homepage = "https://github.com/haskell/primitive"; + description = "Primitive memory-related operations"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/scientific/default.nix b/pkgs/development/libraries/haskell/scientific/default.nix index 24c0759d6e9..aa57f9dc5df 100644 --- a/pkgs/development/libraries/haskell/scientific/default.nix +++ b/pkgs/development/libraries/haskell/scientific/default.nix @@ -8,6 +8,7 @@ cabal.mkDerivation (self: { sha256 = "0xwxds884pqywjbc4j6qkx27nbi64sihig8ps9v884sk08021wrp"; buildDepends = [ deepseq hashable text ]; testDepends = [ smallcheck tasty tastySmallcheck text ]; + jailbreak = true; meta = { homepage = "https://github.com/basvandijk/scientific"; description = "Arbitrary-precision floating-point numbers represented using scientific notation"; diff --git a/pkgs/development/libraries/haskell/scotty/default.nix b/pkgs/development/libraries/haskell/scotty/default.nix index b3ca635ac21..e51c2a7a64c 100644 --- a/pkgs/development/libraries/haskell/scotty/default.nix +++ b/pkgs/development/libraries/haskell/scotty/default.nix @@ -11,6 +11,7 @@ cabal.mkDerivation (self: { aeson blazeBuilder caseInsensitive conduit dataDefault httpTypes mtl regexCompat text transformers wai waiExtra warp ]; + jailbreak = true; meta = { homepage = "https://github.com/scotty-web/scotty"; description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp"; diff --git a/pkgs/development/libraries/haskell/shake/default.nix b/pkgs/development/libraries/haskell/shake/default.nix index f3ec1471cbe..f7505c62fc1 100644 --- a/pkgs/development/libraries/haskell/shake/default.nix +++ b/pkgs/development/libraries/haskell/shake/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "shake"; - version = "0.11.2"; - sha256 = "1mhll4h6za67pjcm4amdcibfd7ny2kfx4mfws0lrd903j1p5b00q"; + version = "0.11.3"; + sha256 = "0j4b9fd60kvkayf5zgr8d8w0i4k8ly2v0vnfg80k0lkwpka7nwzl"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/shakespeare-text/default.nix b/pkgs/development/libraries/haskell/shakespeare-text/default.nix index 95ae94a8f26..fa5b91dd469 100644 --- a/pkgs/development/libraries/haskell/shakespeare-text/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-text/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-text"; - version = "1.0.1"; - sha256 = "1vxy1d8r9wd8qijmy2jm7c7y7wg77qnzsh1ga0rlh3nklj9w01ml"; + version = "1.0.2"; + sha256 = "0vhk5g5pm3gz8gzr7cbvkp920x4lmb9pkb9k6yhlj8wfb93bg93q"; buildDepends = [ shakespeare text ]; testDepends = [ hspec HUnit text ]; meta = { diff --git a/pkgs/development/libraries/haskell/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix index 72b3e280b3b..720bbea8933 100644 --- a/pkgs/development/libraries/haskell/shelly/default.nix +++ b/pkgs/development/libraries/haskell/shelly/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "shelly"; - version = "1.4.4"; - sha256 = "0gxmwwpg7p5ai35ng8fsx743w3q9p5jl0c1c3ckiqvz4jbwgyf7y"; + version = "1.4.4.2"; + sha256 = "01h08bw7j7f5vi3bffd4ipvj5nmab8j5rqgxav688n2jm2342jzk"; buildDepends = [ async mtl systemFileio systemFilepath text time unixCompat ]; diff --git a/pkgs/development/libraries/haskell/singletons/default.nix b/pkgs/development/libraries/haskell/singletons/default.nix new file mode 100644 index 00000000000..48f12cd8825 --- /dev/null +++ b/pkgs/development/libraries/haskell/singletons/default.nix @@ -0,0 +1,16 @@ +{ cabal, mtl, syb, thDesugar }: + +cabal.mkDerivation (self: { + pname = "singletons"; + version = "0.9.3"; + sha256 = "0m90k3ygm04c0gjfiaw5rmajyn2yz0ldcqm2xmm39d10270skpb4"; + buildDepends = [ mtl syb thDesugar ]; + noHaddock = true; + meta = { + homepage = "http://www.cis.upenn.edu/~eir/packages/singletons"; + description = "A framework for generating singleton types"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/stripe/default.nix b/pkgs/development/libraries/haskell/stripe/default.nix new file mode 100644 index 00000000000..1759143eb9b --- /dev/null +++ b/pkgs/development/libraries/haskell/stripe/default.nix @@ -0,0 +1,20 @@ +{ cabal, aeson, httpConduit, httpTypes, mtl, text, time +, unorderedContainers, utf8String +}: + +cabal.mkDerivation (self: { + pname = "stripe"; + version = "0.7.0"; + sha256 = "02kyxipifdaf08bk85cbgksvm3jn7i648h9afb3jfxqam5j4a7a0"; + buildDepends = [ + aeson httpConduit httpTypes mtl text time unorderedContainers + utf8String + ]; + meta = { + homepage = "https://github.com/michaelschade/hs-stripe"; + description = "A Haskell implementation of the Stripe API"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/text-stream-decode/default.nix b/pkgs/development/libraries/haskell/text-stream-decode/default.nix index 9954dc4f6a2..eb55d68666c 100644 --- a/pkgs/development/libraries/haskell/text-stream-decode/default.nix +++ b/pkgs/development/libraries/haskell/text-stream-decode/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "text-stream-decode"; - version = "0.1.0.3"; - sha256 = "0gz5w7n7yb6z5mfzlg3yg9s89wsqnmmk4j94invj2da0rw7d03xv"; + version = "0.1.0.4"; + sha256 = "041winxbqkz1y6vx6sgbhl925n5qxii2q7ijcwa85sj4dkrqpafr"; buildDepends = [ text ]; testDepends = [ deepseq hspec text ]; meta = { diff --git a/pkgs/development/libraries/haskell/th-desugar/default.nix b/pkgs/development/libraries/haskell/th-desugar/default.nix new file mode 100644 index 00000000000..f3aa1628aae --- /dev/null +++ b/pkgs/development/libraries/haskell/th-desugar/default.nix @@ -0,0 +1,15 @@ +{ cabal, mtl, syb }: + +cabal.mkDerivation (self: { + pname = "th-desugar"; + version = "1.2.1"; + sha256 = "12a8m1vzfbn728psaiqxwngmksrbybci3g7a47z04rjbsjf3cy4v"; + buildDepends = [ mtl syb ]; + meta = { + homepage = "http://www.cis.upenn.edu/~eir/packages/th-desugar"; + description = "Functions to desugar Template Haskell"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/threepenny-gui/default.nix b/pkgs/development/libraries/haskell/threepenny-gui/default.nix index 70f96c8ac9d..1855f493812 100644 --- a/pkgs/development/libraries/haskell/threepenny-gui/default.nix +++ b/pkgs/development/libraries/haskell/threepenny-gui/default.nix @@ -1,17 +1,18 @@ -{ cabal, attoparsecEnumerator, dataDefault, deepseq, filepath -, hashable, json, MonadCatchIOTransformers, network, safe, snapCore -, snapServer, stm, text, time, transformers, unorderedContainers -, utf8String, vault, websockets, websocketsSnap +{ cabal, aeson, attoparsecEnumerator, dataDefault, deepseq +, filepath, hashable, MonadCatchIOTransformers, network, safe +, snapCore, snapServer, stm, text, time, transformers +, unorderedContainers, utf8String, vault, websockets +, websocketsSnap }: cabal.mkDerivation (self: { pname = "threepenny-gui"; - version = "0.4.0.2"; - sha256 = "0dx6jrpxvd6ypz314hmq8nngy0wjx3bwx3r9h1c6y70id31lr9pg"; + version = "0.4.1.0"; + sha256 = "0fafwnlbl96z9m5fr3wiyv090fga78cr9hrd4yd3vyiz44gfrpcw"; isLibrary = true; isExecutable = true; buildDepends = [ - attoparsecEnumerator dataDefault deepseq filepath hashable json + aeson attoparsecEnumerator dataDefault deepseq filepath hashable MonadCatchIOTransformers network safe snapCore snapServer stm text time transformers unorderedContainers utf8String vault websockets websocketsSnap diff --git a/pkgs/development/libraries/haskell/time/1.4.1.nix b/pkgs/development/libraries/haskell/time/1.4.2.nix similarity index 85% rename from pkgs/development/libraries/haskell/time/1.4.1.nix rename to pkgs/development/libraries/haskell/time/1.4.2.nix index 1e675110190..ff9818a387d 100644 --- a/pkgs/development/libraries/haskell/time/1.4.1.nix +++ b/pkgs/development/libraries/haskell/time/1.4.2.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "time"; - version = "1.4.1"; - sha256 = "04ndcp7m1a7mia4by15dqrwl5k0d2477x20s6xcrdb7in8w9ccvp"; + version = "1.4.2"; + sha256 = "1kpsak2wka23c8591ry6i1d7hmd54s7iw5n6hpx48jhcxf1w199h"; buildDepends = [ deepseq ]; testDepends = [ Cabal deepseq QuickCheck testFramework testFrameworkQuickcheck2 diff --git a/pkgs/development/libraries/haskell/trifecta/1.1.nix b/pkgs/development/libraries/haskell/trifecta/1.1.nix deleted file mode 100644 index 4f5841d6881..00000000000 --- a/pkgs/development/libraries/haskell/trifecta/1.1.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ cabal, ansiTerminal, ansiWlPprint, blazeBuilder, blazeHtml -, blazeMarkup, charset, comonad, deepseq, doctest, filepath -, fingertree, hashable, lens, mtl, parsers, reducers, semigroups -, transformers, unorderedContainers, utf8String -}: - -cabal.mkDerivation (self: { - pname = "trifecta"; - version = "1.1"; - sha256 = "19wnblpn31hvdi5dc8ir24s0hfjj4vvzr43gg9ydl2qdjq6s166w"; - buildDepends = [ - ansiTerminal ansiWlPprint blazeBuilder blazeHtml blazeMarkup - charset comonad deepseq fingertree hashable lens mtl parsers - reducers semigroups transformers unorderedContainers utf8String - ]; - testDepends = [ doctest filepath ]; - postPatch = '' - substituteInPlace trifecta.cabal \ - --replace "blaze-html >= 0.5 && < 0.6," "blaze-html >= 0.5 && < 0.8," \ - --replace "blaze-html >= 0.5 && < 0.7," "blaze-html >= 0.5 && < 0.8," \ - --replace "blaze-markup >= 0.5 && < 0.6," "blaze-markup >= 0.5 && < 0.7," \ - --replace "hashable >= 1.2.1 && < 1.3," "hashable >= 1.1 && < 1.3," \ - --replace "hashable >= 1.2 && < 1.3," "hashable >= 1.1 && < 1.3," \ - --replace "fingertree >= 0.0.1 && < 0.1," "fingertree >= 0.0.1 && < 0.2," \ - --replace "comonad == 3.*," "comonad >= 3 && < 5," \ - --replace "comonad >= 3 && < 4," "comonad >= 3 && < 5," - ''; - meta = { - homepage = "http://github.com/ekmett/trifecta/"; - description = "A modern parser combinator library with convenient diagnostics"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/trifecta/1.2.nix b/pkgs/development/libraries/haskell/trifecta/1.2.nix deleted file mode 100644 index fae592e73f0..00000000000 --- a/pkgs/development/libraries/haskell/trifecta/1.2.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ cabal, ansiTerminal, ansiWlPprint, blazeBuilder, blazeHtml -, blazeMarkup, charset, comonad, deepseq, doctest, filepath -, fingertree, hashable, lens, mtl, parsers, reducers, semigroups -, transformers, unorderedContainers, utf8String -}: - -cabal.mkDerivation (self: { - pname = "trifecta"; - version = "1.2.1.1"; - sha256 = "1bv35ip7g0h7r2w0s8pkcbvm0b9hx91vblf5w57q3jr843v9314c"; - buildDepends = [ - ansiTerminal ansiWlPprint blazeBuilder blazeHtml blazeMarkup - charset comonad deepseq fingertree hashable lens mtl parsers - reducers semigroups transformers unorderedContainers utf8String - ]; - testDepends = [ doctest filepath ]; - postPatch = '' - substituteInPlace trifecta.cabal \ - --replace "blaze-html >= 0.5 && < 0.6," "blaze-html >= 0.5 && < 0.8," \ - --replace "blaze-html >= 0.5 && < 0.7," "blaze-html >= 0.5 && < 0.8," \ - --replace "blaze-markup >= 0.5 && < 0.6," "blaze-markup >= 0.5 && < 0.7," \ - --replace "hashable >= 1.2.1 && < 1.3," "hashable >= 1.1 && < 1.3," \ - --replace "hashable >= 1.2 && < 1.3," "hashable >= 1.1 && < 1.3," \ - --replace "fingertree >= 0.0.1 && < 0.1," "fingertree >= 0.0.1 && < 0.2," \ - --replace "comonad == 3.*," "comonad >= 3 && < 5," \ - --replace "comonad >= 3 && < 4," "comonad >= 3 && < 5," - ''; - meta = { - homepage = "http://github.com/ekmett/trifecta/"; - description = "A modern parser combinator library with convenient diagnostics"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/trifecta/1.4.nix b/pkgs/development/libraries/haskell/trifecta/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/trifecta/1.4.nix rename to pkgs/development/libraries/haskell/trifecta/default.nix diff --git a/pkgs/development/libraries/haskell/utility-ht/default.nix b/pkgs/development/libraries/haskell/utility-ht/default.nix index 76ce975b11e..3a407cc4b59 100644 --- a/pkgs/development/libraries/haskell/utility-ht/default.nix +++ b/pkgs/development/libraries/haskell/utility-ht/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "utility-ht"; - version = "0.0.9"; - sha256 = "1m5mjxwf51jd00swp1f4cimaqaral6827y1sidbq61qkw7l6ss8r"; + version = "0.0.10"; + sha256 = "17ydzb0p8xhddvfvm4wjv5yjmy0v7nj6fsj11srnnpj91wc9k0xd"; testDepends = [ QuickCheck ]; meta = { description = "Various small helper functions for Lists, Maybes, Tuples, Functions"; diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index d3c1bdbd4c7..f5b0f683553 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "warp"; - version = "2.0.3.2"; - sha256 = "1aapwhgqn693cvdhj4zafyww2xrpjn8wzdgrwxz8k6mq0f2lh599"; + version = "2.0.3.3"; + sha256 = "02wh8jf8pcjb03xxdim9q92vr4jk9jibqqzl8kvccqlqfi5giq0f"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable httpDate httpTypes liftedBase network networkConduit simpleSendfile diff --git a/pkgs/development/libraries/haskell/wizards/default.nix b/pkgs/development/libraries/haskell/wizards/default.nix new file mode 100644 index 00000000000..08c88138101 --- /dev/null +++ b/pkgs/development/libraries/haskell/wizards/default.nix @@ -0,0 +1,13 @@ +{ cabal, controlMonadFree, haskeline, mtl, transformers }: + +cabal.mkDerivation (self: { + pname = "wizards"; + version = "1.0.1"; + sha256 = "08dn24injfzvhs34yw39y336pyi6p98bdrafx3lhd6lcbp531sca"; + buildDepends = [ controlMonadFree haskeline mtl transformers ]; + meta = { + description = "High level, generic library for interrogative user interfaces"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/x509/default.nix b/pkgs/development/libraries/haskell/x509/default.nix index 0aababd4715..24ebf746202 100644 --- a/pkgs/development/libraries/haskell/x509/default.nix +++ b/pkgs/development/libraries/haskell/x509/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "x509"; - version = "1.4.7"; - sha256 = "0bm5sijahpih2c6scz3y32904wzvmllgslg9d547cksbgy7lyx1h"; + version = "1.4.10"; + sha256 = "1xsq0g7f5ki6l9yx604j6bsl1k7s3p1xr6hh2086hsgl9fp1f9ap"; buildDepends = [ asn1Encoding asn1Parse asn1Types cryptohash cryptoPubkeyTypes filepath mtl pem time diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index 56048aeb627..3831cac76e4 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "1.2.5.3"; - sha256 = "0rpyx9p3si5453166v9paq18nz209w6lxz3hy5nxg1hyihwh8gy9"; + version = "1.2.6"; + sha256 = "1w7svh49zqdrw1qp8v7df6y6mvkf40cn27k5ckxjyfin00rz0x31"; buildDepends = [ aeson authenticate blazeHtml blazeMarkup dataDefault emailValidate fileEmbed hamlet httpConduit httpTypes liftedBase mimeMail network diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix index a466da06d41..59eeac6e3cf 100644 --- a/pkgs/development/libraries/haskell/yesod-bin/default.nix +++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix @@ -1,27 +1,27 @@ { cabal, attoparsec, base64Bytestring, blazeBuilder, Cabal, conduit -, dataDefault, fileEmbed, filepath, fsnotify, ghcPaths, httpConduit -, httpReverseProxy, httpTypes, liftedBase, network, networkConduit -, optparseApplicative, parsec, projectTemplate, resourcet -, shakespeare, shakespeareCss, shakespeareJs, shakespeareText -, split, systemFileio, systemFilepath, tar, text, time -, transformers, unixCompat, unorderedContainers, wai, warp, yaml -, zlib +, dataDefaultClass, fileEmbed, filepath, fsnotify, ghcPaths +, httpConduit, httpReverseProxy, httpTypes, liftedBase, network +, networkConduit, optparseApplicative, parsec, projectTemplate +, resourcet, shakespeare, shakespeareCss, shakespeareJs +, shakespeareText, split, systemFileio, systemFilepath, tar, text +, time, transformers, unixCompat, unorderedContainers, wai, warp +, yaml, zlib }: cabal.mkDerivation (self: { pname = "yesod-bin"; - version = "1.2.6"; - sha256 = "10p0j5w8s2lfjlmkyw4f2lslfr4xb8mzx5ijwavcpc7q9zw9zjk5"; + version = "1.2.6.1"; + sha256 = "0w3qar315w96139j16fq4py4qs83bhm6pab9pzjbx8h451sqjarh"; isLibrary = false; isExecutable = true; buildDepends = [ - attoparsec base64Bytestring blazeBuilder Cabal conduit dataDefault - fileEmbed filepath fsnotify ghcPaths httpConduit httpReverseProxy - httpTypes liftedBase network networkConduit optparseApplicative - parsec projectTemplate resourcet shakespeare shakespeareCss - shakespeareJs shakespeareText split systemFileio systemFilepath tar - text time transformers unixCompat unorderedContainers wai warp yaml - zlib + attoparsec base64Bytestring blazeBuilder Cabal conduit + dataDefaultClass fileEmbed filepath fsnotify ghcPaths httpConduit + httpReverseProxy httpTypes liftedBase network networkConduit + optparseApplicative parsec projectTemplate resourcet shakespeare + shakespeareCss shakespeareJs shakespeareText split systemFileio + systemFilepath tar text time transformers unixCompat + unorderedContainers wai warp yaml zlib ]; meta = { homepage = "http://www.yesodweb.com/"; diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index 7474884d4a0..7a7d1f16e05 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "yesod-form"; - version = "1.3.5.1"; - sha256 = "0jvza4ly3kjfsbayjcggf8fq0lcb8n9f6cp0q6fcif1xkwkkhmdh"; + version = "1.3.5.2"; + sha256 = "0ppzj04c5y02k2daw52g2pkzf85mhsg7n4hbkm05xk1crzbrbcxj"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi dataDefault emailValidate hamlet network persistent resourcet diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index b1c154badd8..5b19323f943 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -1,17 +1,22 @@ { stdenv, fetchurl, x11, libjpeg, libtiff, libungif, libpng, bzip2, pkgconfig }: stdenv.mkDerivation rec { - name = "imlib2-1.4.5"; + name = "imlib2-1.4.6"; src = fetchurl { url = "mirror://sourceforge/enlightenment/${name}.tar.bz2"; - sha256 = "0nllbhf8vfwdm40z35yj27n83k2mjf5vbd62khad4f0qjf9hsw14"; + sha256 = "0x1j0ylpclkp8cfpwfpkjywqz124bqskyxbw8pvwzkv2gmrbwldg"; }; buildInputs = [ x11 libjpeg libtiff libungif libpng bzip2 ]; nativeBuildInputs = [ pkgconfig ]; + preConfigure = '' + substituteInPlace imlib2-config.in \ + --replace "@my_libs@" "" + ''; + meta = { hydraPlatforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/iso-codes/default.nix b/pkgs/development/libraries/iso-codes/default.nix index 3c408e6bc78..987e1a25d35 100644 --- a/pkgs/development/libraries/iso-codes/default.nix +++ b/pkgs/development/libraries/iso-codes/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, gettext, python, xz}: stdenv.mkDerivation rec { - name = "iso-codes-3.49"; + name = "iso-codes-3.51"; src = fetchurl { url = "http://pkg-isocodes.alioth.debian.org/downloads/${name}.tar.xz"; - sha256 = "1ryk5i467p7xxrbrqynb35ci046yj9k9b4d3hfxzass962lz9q04"; + sha256 = "0zyp99l4m8cd6301x8zi3xxhziam6v0ic1h8qxb1l0mcjafzf8jj"; }; patchPhase = '' for i in `find . -name \*.py` diff --git a/pkgs/development/libraries/lesstif/default.nix b/pkgs/development/libraries/lesstif/default.nix index 21b4eac30af..8d01c2f2f43 100644 --- a/pkgs/development/libraries/lesstif/default.nix +++ b/pkgs/development/libraries/lesstif/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, x11, libXp, libXau}: +{stdenv, fetchurl, xlibsWrapper, libXp, libXau}: stdenv.mkDerivation { name = "lesstif-0.95.0-p2"; @@ -6,7 +6,7 @@ stdenv.mkDerivation { url = mirror://sourceforge/lesstif/lesstif-0.95.0.tar.bz2; md5 = "ab895165c149d7f95843c7584b1c7ad4"; }; - buildInputs = [x11]; + buildInputs = [xlibsWrapper]; propagatedBuildInputs = [libXp libXau]; # The last stable release of lesstif was in June 2006. These diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix index 499639b3a87..15b80053218 100644 --- a/pkgs/development/libraries/libass/default.nix +++ b/pkgs/development/libraries/libass/default.nix @@ -1,17 +1,34 @@ -{ stdenv, fetchurl, freetype, fontconfig, pkgconfig, enca ? null }: +{ stdenv, fetchurl, pkgconfig, yasm +, freetype, fribidi, fontconfig +, enca ? null +, harfbuzz ? null +}: -stdenv.mkDerivation rec { - name = "libass-0.9.11"; +let + version = "0.11.1"; + sha256 = "1b0ki1zdkhflszzj5qr45j9qsd0rfbb6ws5pqkny8jhih0l3lxwx"; + baseurl = "https://github.com/libass/libass/releases/download"; +in stdenv.mkDerivation rec { + name = "libass-${version}"; src = fetchurl { - url = "http://libass.googlecode.com/files/${name}.tar.bz2"; - sha256 = "0p3li523s8n85kfh5xdbbfffr17z8xdh2qcgvdg7ki1myv6agl7z"; + url = "${baseurl}/${version}/${name}.tar.xz"; + inherit sha256; }; - buildInputs = [ freetype fontconfig enca pkgconfig ]; + nativeBuildInputs = [ pkgconfig yasm ]; + + buildInputs = [ + freetype fribidi fontconfig + enca harfbuzz + ]; meta = { + description = "Portable ASS/SSA subtitle renderer"; homepage = http://code.google.com/p/libass/; + license = stdenv.lib.licenses.isc; + platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.urkud ]; + repositories.git = git://github.com/libass/libass.git; }; } diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix new file mode 100644 index 00000000000..7a005c9fda2 --- /dev/null +++ b/pkgs/development/libraries/libfm/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, glib, gtk, intltool, menu-cache, pango, pkgconfig, vala }: + +stdenv.mkDerivation { + name = "libfm-1.2.0"; + src = fetchurl { + url = "mirror://sourceforge/pcmanfm/libfm-1.2.0.tar.xz"; + sha256 = "08pwdrmfm9rl41lj2niyjqq2bdvydxk7v2shjxh5gk1xwj238lgh"; + }; + + buildInputs = [ glib gtk intltool menu-cache pango pkgconfig vala ]; + + meta = with stdenv.lib; { + homepage = "http://blog.lxde.org/?cat=28/"; + license = licenses.gpl2Plus; + description = "A glib-based library for file management"; + maintainers = [ maintainers.ttuegel ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix index c305239e6e2..c7513b0a167 100644 --- a/pkgs/development/libraries/libinfinity/default.nix +++ b/pkgs/development/libraries/libinfinity/default.nix @@ -11,10 +11,10 @@ let in stdenv.mkDerivation rec { - name = "libinfinity-0.5.4"; + name = "libinfinity-0.5.5"; src = fetchurl { url = "http://releases.0x539.de/libinfinity/${name}.tar.gz"; - sha256 = "1i7nj8qjay6amg455mwhhfqjvxnfyyql9y40a6a4a3ky170ly004"; + sha256 = "1i4cnwbvfv56m7zyyf9wki2bj000r8md414yv3cf1jdz4jbyxij7"; }; buildInputs = [ pkgconfig glib libxml2 gsasl libidn gss ] diff --git a/pkgs/development/libraries/libmemcached/default.nix b/pkgs/development/libraries/libmemcached/default.nix index 9ab1962806a..ebd0d08717d 100644 --- a/pkgs/development/libraries/libmemcached/default.nix +++ b/pkgs/development/libraries/libmemcached/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cyrus_sasl, libevent }: stdenv.mkDerivation rec { - name = "libmemcached-1.0.8"; + name = "libmemcached-1.0.18"; src = fetchurl { - url = https://launchpad.net/libmemcached/1.0/1.0.8/+download/libmemcached-1.0.8.tar.gz; - sha256 = "198wcvhrqjnak0cjnkxmjsr3xkjc1k6yq2a77nlk852gcf8ypx03"; + url = https://launchpad.net/libmemcached/1.0/1.0.18/+download/libmemcached-1.0.18.tar.gz; + sha256 = "10jzi14j32lpq0if0p9vygcl2c1352hwbywzvr9qzq7x6aq0nb72"; }; buildInputs = [ cyrus_sasl libevent ]; diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix index 3354161baef..d9dfaa004de 100644 --- a/pkgs/development/libraries/libmicrohttpd/default.nix +++ b/pkgs/development/libraries/libmicrohttpd/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, curl, libgcrypt}: stdenv.mkDerivation rec { - name = "libmicrohttpd-0.9.33"; + name = "libmicrohttpd-0.9.34"; src = fetchurl { url = "mirror://gnu/libmicrohttpd/${name}.tar.gz"; - sha256 = "0nfm3h7mfb03hf4kfyap8dr35shm6sppsq6da03853sljy27wn6r"; + sha256 = "122snbhhn10s8az46f0lrkirhj0k38lq7hmqav3n1prdzpabz8i9"; }; buildInputs = [ curl libgcrypt ]; diff --git a/pkgs/development/libraries/libmilter/default.nix b/pkgs/development/libraries/libmilter/default.nix index c8fa978534d..7f925cd9b2a 100644 --- a/pkgs/development/libraries/libmilter/default.nix +++ b/pkgs/development/libraries/libmilter/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, m4}: stdenv.mkDerivation rec { - name = "libmilter-8.14.4"; + name = "libmilter-8.14.8"; src = fetchurl { - url = "ftp://ftp.sendmail.org/pub/sendmail/sendmail.8.14.4.tar.gz"; - sha256 = "1cbwz5ynl8snrdkl7ay1qhqknbyv0qsvdvcri7mb662hgi1hj0dw"; + url = "ftp://ftp.sendmail.org/pub/sendmail/sendmail.8.14.8.tar.gz"; + sha256 = "1zmhzkj3gzx8022hsrysr3nzlcmv1qisb5i4jbx91661bw96ksq2"; }; buildPhase = '' diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index 87e2a641654..11eccb0a0e3 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, flex, bison }: stdenv.mkDerivation rec { - name = "libpcap-1.4.0"; + name = "libpcap-1.5.3"; src = fetchurl { url = "http://www.tcpdump.org/release/${name}.tar.gz"; - sha256 = "01klphfqxvkyjvic0hmc10qmiicqz6pv6kvb9s00kaz8f57jlskw"; + sha256 = "14wyjywrdi1ikaj6yc9c72m6m2r64z94lb0gm7k1a3q6q5cj3scs"; }; nativeBuildInputs = [ flex bison ]; diff --git a/pkgs/development/libraries/libsearpc/default.nix b/pkgs/development/libraries/libsearpc/default.nix new file mode 100644 index 00000000000..863a42b741b --- /dev/null +++ b/pkgs/development/libraries/libsearpc/default.nix @@ -0,0 +1,32 @@ +{stdenv, fetchurl, automake, autoconf, pkgconfig, libtool, python, pythonPackages, glib, jansson}: + +stdenv.mkDerivation rec +{ + version = "1.2.1"; + seafileVersion = "2.1.1"; + name = "libsearpc-${version}"; + + src = fetchurl + { + url = "https://github.com/haiwen/libsearpc/archive/v${seafileVersion}.tar.gz"; + sha256 = "c0e7cc812c642ebb1339c3701570e78ff5b8c8aa2a521e5a505e28d9666e89ec"; + }; + + patches = [ ./libsearpc.pc.patch ]; + + buildInputs = [ automake autoconf pkgconfig libtool python pythonPackages.simplejson ]; + propagatedBuildInputs = [ glib jansson ]; + + preConfigure = "./autogen.sh"; + + buildPhase = "make -j1"; + + meta = + { + homepage = "https://github.com/haiwen/libsearpc"; + description = "A simple and easy-to-use C language RPC framework (including both server side & client side) based on GObject System."; + license = stdenv.lib.licenses.lgpl3; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.calrama ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/libraries/libsearpc/libsearpc.pc.patch b/pkgs/development/libraries/libsearpc/libsearpc.pc.patch new file mode 100644 index 00000000000..6f30932ba6d --- /dev/null +++ b/pkgs/development/libraries/libsearpc/libsearpc.pc.patch @@ -0,0 +1,10 @@ +From: Aaron Lindsay + +--- a/libsearpc.pc.in 2013-01-10 01:35:24.000000000 -0500 ++++ b/libsearpc.pc.in 2013-01-19 11:31:50.479301798 -0500 +@@ -1,4 +1,4 @@ +-prefix=(DESTDIR)@prefix@ ++prefix=@prefix@ + exec_prefix=@exec_prefix@ + libdir=@libdir@ + includedir=@includedir@ diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix index 0a06452d5d8..c201eda69e6 100644 --- a/pkgs/development/libraries/libssh/default.nix +++ b/pkgs/development/libraries/libssh/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, cmake, zlib, libgcrypt }: +{ stdenv, fetchurl, pkgconfig, cmake, zlib, libgcrypt }: stdenv.mkDerivation rec { - name = "libssh-0.5.5"; + name = "libssh-0.6.3"; src = fetchurl { - url = "https://red.libssh.org/attachments/download/51/${name}.tar.gz"; - sha256 = "17cfdff4hc0ijzrr15biq29fiabafz0bw621zlkbwbc1zh2hzpy0"; + url = "https://red.libssh.org/attachments/download/87/${name}.tar.xz"; + sha256 = "1jyaj9h1iglvn02hrvcchbx8ycjpj8b91h8mi459k7q5jp2xgd9b"; }; buildInputs = [ zlib libgcrypt ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake pkgconfig ]; cmakeFlags = "-DWITH_GCRYPT=ON"; diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index 6e8567d2c46..9c4d3bfd2dd 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libtorrent-rasterbar-${version}"; - version = "0.16.14"; + version = "0.16.15"; src = fetchurl { - url = mirror://sourceforge/libtorrent/libtorrent-rasterbar-0.16.14.tar.gz; - sha256 = "0s4f36f28cgq55pgx4h99q18a0p566bhifxmqxjhlb63a1w20m2c"; + url = mirror://sourceforge/libtorrent/libtorrent-rasterbar-0.16.15.tar.gz; + sha256 = "0xcz4hphgkcdxcbmgzk27mxn7478hy417pn55zn5hnpllgndy3w2"; }; buildInputs = [ boost pkgconfig openssl zlib python libiconvOrNull geoip ]; diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 91f9e4f2f2b..81336aed8aa 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -2,8 +2,8 @@ , libconfig, pkgconfig }: let - version = "dbe256cc82"; - date = "20140203"; + version = "388b1229b"; + date = "20140220"; in stdenv.mkDerivation rec { name = "tox-core-${date}-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/irungentoo/ProjectTox-Core/tarball/${version}"; name = "${name}.tar.gz"; - sha256 = "0mqbwwqbm15p16ya8nlij23fgbafjdmnc44nm2vh47m8pyb119lc"; + sha256 = "12vggiv0gyv8a2rd5qrv04b7yhfhxb7r0yh75gg5n4jdpcbhvgsd"; }; preConfigure = '' diff --git a/pkgs/development/libraries/libzdb/default.nix b/pkgs/development/libraries/libzdb/default.nix new file mode 100644 index 00000000000..90692569f08 --- /dev/null +++ b/pkgs/development/libraries/libzdb/default.nix @@ -0,0 +1,24 @@ +{stdenv, fetchurl, sqlite}: + +stdenv.mkDerivation rec +{ + version = "3.0"; + name = "libzdb-${version}"; + + src = fetchurl + { + url = "http://www.tildeslash.com/libzdb/dist/libzdb-${version}.tar.gz"; + sha256 = "e334bcb9ca1410e863634a164e3b1b5784018eb6e90b6c2b527780fc29a123c8"; + }; + + buildInputs = [ sqlite ]; + + meta = + { + homepage = "http://www.tildeslash.com/libzdb/"; + description = "A small, easy to use Open Source Database Connection Pool Library."; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.calrama ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix index 914157c7a0c..be50a58c54a 100644 --- a/pkgs/development/libraries/libzip/default.nix +++ b/pkgs/development/libraries/libzip/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { - name = "libzip-0.11.1"; + name = "libzip-0.11.2"; src = fetchurl { url = "http://www.nih.at/libzip/${name}.tar.gz"; - sha256 = "15fwscng2lk0ypg45awk4y2grjqm987frnjcsnbxznfgpckrq7yy"; + sha256 = "1mcqrz37vjrfr4gnss37z1m7xih9x9miq3mms78zf7wn7as1znw3"; }; propagatedBuildInputs = [ zlib ]; diff --git a/pkgs/development/libraries/menu-cache/default.nix b/pkgs/development/libraries/menu-cache/default.nix new file mode 100644 index 00000000000..8e2e202f432 --- /dev/null +++ b/pkgs/development/libraries/menu-cache/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, glib, pkgconfig }: + +stdenv.mkDerivation { + name = "menu-cache-0.5.1"; + src = fetchurl { + url = "mirror://sourceforge/lxde/menu-cache-0.5.1.tar.gz"; + sha256 = "08m1msgbl6j7j72cwcg18klb99jif8h1phkcnbplxkdf3w15irh8"; + }; + + buildInputs = [ glib pkgconfig ]; + + meta = with stdenv.lib; { + homepage = "http://blog.lxde.org/?tag=menu-cache"; + license = licenses.gpl2Plus; + description = "Library to read freedesktop.org menu files"; + maintainers = [ maintainers.ttuegel ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index 2b6f952696c..8aa8edfd3b9 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl }: -let version = "4.10.2"; in +let version = "4.10.3"; in stdenv.mkDerivation { name = "nspr-${version}"; src = fetchurl { url = "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${version}/src/nspr-${version}.tar.gz"; - sha1 = "650e4aa35d58624bc1083ed585c81c4af09cf23c"; + sha256 = "1r81rc2v8rlvc9wfsmi98h7k4qwsqb37v5ww1c4v1nk5lsqpjmzj"; }; preConfigure = "cd nspr"; diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix index 67be64921e7..be6216b758c 100644 --- a/pkgs/development/libraries/p11-kit/default.nix +++ b/pkgs/development/libraries/p11-kit/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libiconv, pkgconfig, libffi, libtasn1 }: stdenv.mkDerivation rec { - name = "p11-kit-0.20.1"; + name = "p11-kit-0.20.2"; src = fetchurl { url = "${meta.homepage}releases/${name}.tar.gz"; - sha256 = "0lsaxd1rg74ax1vkclq7r52b43rhy14mn5i14xqvb8dzlgq4hiaj"; + sha256 = "0z7gwmsj9hcmpk3ai2lwla59y3h9jc13xmqk5rijnv645zcm3v84"; }; postInstall = "rm -frv $out/share/gtk-doc"; diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix index 34d5bac6adb..f405e30433f 100644 --- a/pkgs/development/libraries/portaudio/default.nix +++ b/pkgs/development/libraries/portaudio/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, alsaLib, pkgconfig }: stdenv.mkDerivation rec { - name = "portaudio-19-20111121"; + name = "portaudio-19-20140130"; src = fetchurl { - url = http://www.portaudio.com/archives/pa_stable_v19_20111121.tgz; - sha256 = "168vmcag3c5y3zwf7h5298ydh83g72q5bznskrw9cr2h1lrx29lw"; + url = http://www.portaudio.com/archives/pa_stable_v19_20140130.tgz; + sha256 = "0mwddk4qzybaf85wqfhxqlf0c5im9il8z03rd4n127k8y2jj9q4g"; }; buildInputs = [ pkgconfig ] diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix index 48bbd3aa785..cd56287f6ca 100644 --- a/pkgs/development/libraries/science/math/arpack/default.nix +++ b/pkgs/development/libraries/science/math/arpack/default.nix @@ -1,17 +1,22 @@ { stdenv, fetchurl, gfortran, openblas }: -let version = "3.1.4"; +let version = "3.1.5"; in stdenv.mkDerivation { name = "arpack-${version}"; src = fetchurl { url = "http://forge.scilab.org/index.php/p/arpack-ng/downloads/get/arpack-ng_${version}.tar.gz"; - sha256 = "0m4cqy3d7fpzx1nac3brhr298qj7vx3fchjdz5b7n0pp616cmcm1"; + sha256 = "05fmg4m0yri47rzgsl2mnr1qbzrs7qyd557p3v9wwxxw0rwcwsd2"; }; buildInputs = [ gfortran ]; propagatedBuildInputs = [ openblas ]; + preConfigure = '' + substituteInPlace arpack.pc.in \ + --replace "@BLAS_LIBS@" "-L${openblas}/lib @BLAS_LIBS@" + ''; + # Auto-detection fails because gfortran brings in BLAS by default configureFlags="--with-blas=-lopenblas --with-lapack=-lopenblas"; @@ -20,5 +25,6 @@ stdenv.mkDerivation { description = "A collection of Fortran77 subroutines to solve large scale eigenvalue problems"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.bsd3; + maintainers = [ stdenv.lib.maintainers.ttuegel ]; }; } diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix index f6aa7c35f39..f874804c001 100644 --- a/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/pkgs/development/libraries/silgraphite/graphite2.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { meta = { description = "An advanced font engine"; maintainers = [ stdenv.lib.maintainers.raskin ]; - hydraPlatforms = stdenv.lib.platforms.linux; + hydraPlatforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/t1lib/default.nix b/pkgs/development/libraries/t1lib/default.nix index 9a4ba00e1d3..ebd8699dc17 100644 --- a/pkgs/development/libraries/t1lib/default.nix +++ b/pkgs/development/libraries/t1lib/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, x11, libXaw, libXpm}: +{stdenv, fetchurl, xlibsWrapper, libXaw, libXpm}: stdenv.mkDerivation { name = "t1lib-5.1.2"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "0nbvjpnmcznib1nlgg8xckrmsw3haa154byds2h90y2g0nsjh4w2"; }; - buildInputs = [x11 libXaw libXpm]; + buildInputs = [xlibsWrapper libXaw libXpm]; buildFlags = "without_doc"; } diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix index 615641a8309..516ebc5f273 100644 --- a/pkgs/development/libraries/telepathy/glib/default.nix +++ b/pkgs/development/libraries/telepathy/glib/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, dbus_glib, glib, python, pkgconfig, libxslt -, gobjectIntrospection }: +, gobjectIntrospection, valaSupport ? true, vala }: stdenv.mkDerivation rec { name = "telepathy-glib-0.22.0"; @@ -9,9 +9,11 @@ stdenv.mkDerivation rec { sha256 = "0mqrq2azw70rm50vy21acfnzn8mmh0w7dxh87mwr1lyk0jn1n232"; }; + configureFlags = stdenv.lib.optional valaSupport "--enable-vala-bindings"; + propagatedBuildInputs = [dbus_glib glib python gobjectIntrospection]; - buildInputs = [pkgconfig libxslt]; + buildInputs = [pkgconfig libxslt] ++ stdenv.lib.optional valaSupport vala; meta = { homepage = http://telepathy.freedesktop.org; diff --git a/pkgs/development/mobile/androidenv/emulate-app.nix b/pkgs/development/mobile/androidenv/emulate-app.nix index 53687868102..278c073dc58 100644 --- a/pkgs/development/mobile/androidenv/emulate-app.nix +++ b/pkgs/development/mobile/androidenv/emulate-app.nix @@ -2,9 +2,9 @@ { name, app ? null , platformVersion ? "8", abiVersion ? "armeabi-v7a", useGoogleAPIs ? false , enableGPU ? false, extraAVDFiles ? [] -, package ? null, activity ? null}: - -assert app != null -> package != null && activity != null; +, package ? null, activity ? null +, avdHomeDir ? null +}: let androidsdkComposition = androidsdk { @@ -20,7 +20,7 @@ stdenv.mkDerivation { mkdir -p $out/bin cat > $out/bin/run-test-emulator << "EOF" - #!/bin/sh -e + #! ${stdenv.shell} -e # We need a TMPDIR if [ "$TMPDIR" = "" ] @@ -28,8 +28,13 @@ stdenv.mkDerivation { export TMPDIR=/tmp fi - # Store the virtual devices somewhere else, instead of polluting a user's HOME directory - export ANDROID_SDK_HOME=$(mktemp -d $TMPDIR/nix-android-vm-XXXX) + ${if avdHomeDir == null then '' + # Store the virtual devices somewhere else, instead of polluting a user's HOME directory + export ANDROID_SDK_HOME=$(mktemp -d $TMPDIR/nix-android-vm-XXXX) + '' else '' + mkdir -p "${avdHomeDir}" + export ANDROID_SDK_HOME="${avdHomeDir}" + ''} # We have to look for a free TCP port @@ -54,17 +59,22 @@ stdenv.mkDerivation { export ANDROID_SERIAL="emulator-$port" - # Create a virtual android device - yes "" | ${androidsdkComposition}/libexec/android-sdk-*/tools/android create avd -n device -t ${if useGoogleAPIs then "'Google Inc.:Google APIs:"+platformVersion+"'" else "android-"+platformVersion} $NIX_ANDROID_AVD_FLAGS + # Create a virtual android device for testing if it does not exists - ${stdenv.lib.optionalString enableGPU '' - # Enable GPU acceleration - echo "hw.gpu.enabled=yes" >> $ANDROID_SDK_HOME/.android/avd/device.avd/config.ini - ''} + if [ "$(android list avd | grep 'Name: device')" = "" ] + then + # Create a virtual android device + yes "" | ${androidsdkComposition}/libexec/android-sdk-*/tools/android create avd -n device -t ${if useGoogleAPIs then "'Google Inc.:Google APIs:"+platformVersion+"'" else "android-"+platformVersion} $NIX_ANDROID_AVD_FLAGS - ${stdenv.lib.concatMapStrings (extraAVDFile: '' - ln -sf ${extraAVDFile} $ANDROID_SDK_HOME/.android/avd/device.avd - '') extraAVDFiles} + ${stdenv.lib.optionalString enableGPU '' + # Enable GPU acceleration + echo "hw.gpu.enabled=yes" >> $ANDROID_SDK_HOME/.android/avd/device.avd/config.ini + ''} + + ${stdenv.lib.concatMapStrings (extraAVDFile: '' + ln -sf ${extraAVDFile} $ANDROID_SDK_HOME/.android/avd/device.avd + '') extraAVDFiles} + fi # Launch the emulator ${androidsdkComposition}/libexec/android-sdk-*/tools/emulator -avd device -no-boot-anim -port $port $NIX_ANDROID_EMULATOR_FLAGS & @@ -94,19 +104,24 @@ stdenv.mkDerivation { echo "ready" >&2 ${stdenv.lib.optionalString (app != null) '' - # Install the App through the debugger + # Install the App through the debugger, if it has not been installed yet - if [ -d "${app}" ] + if [ -z "${package}" ] || [ "$(adb -s emulator-$port shell pm list packages | grep package:${package})" = "" ] then - appPath="$(echo ${app}/*.apk)" - else - appPath="${app}" + if [ -d "${app}" ] + then + appPath="$(echo ${app}/*.apk)" + else + appPath="${app}" + fi + + ${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port install "$appPath" fi - - ${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port install "$appPath" # Start the application - ${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port shell am start -a android.intent.action.MAIN -n ${package}/.${activity} + ${stdenv.lib.optionalString (package != null && activity != null) '' + ${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port shell am start -a android.intent.action.MAIN -n ${package}/${activity} + ''} ''} EOF chmod +x $out/bin/run-test-emulator diff --git a/pkgs/development/mobile/flashtool/default.nix b/pkgs/development/mobile/flashtool/default.nix new file mode 100644 index 00000000000..92b8c9a1845 --- /dev/null +++ b/pkgs/development/mobile/flashtool/default.nix @@ -0,0 +1,64 @@ +{ stdenv, requireFile, p7zip, jre, libusb1, platformTools, gtk2, glib, libXtst }: + +assert stdenv.system == "i686-linux"; + +# TODO: +# +# The FlashTool and FlashToolConsole scripts are messy and should probably we +# replaced entirely. All these scripts do is try to guess the environment in +# which to run the Java binary (and they guess wrong on NixOS). +# +# The FlashTool scripts run 'chmod' on the binaries installed in the Nix +# store. These commands fail, naturally, because the Nix story is (hopefully) +# mounted read-only. This doesn't matter, though, because the build +# instructions fix the executable bits already. + +stdenv.mkDerivation rec { + name = "flashtool-0.9.14.0"; + + src = requireFile { + url = "http://dfiles.eu/files/n8c1c3pgc"; + name = "flashtool-0.9.14.0-linux.tar.7z"; + sha256 = "0mfjdjj7clz2dhkg7lzy1m8hk8ngla7zgcryf51aki1gnpbb2zc1"; + }; + + buildInputs = [ p7zip jre ]; + + unpackPhase = '' + 7z e ${src} + tar xf ${name}-linux.tar + sourceRoot=FlashTool + ''; + + buildPhase = '' + ln -s ${platformTools}/platform-tools/adb x10flasher_lib/adb.linux + ln -s ${platformTools}/platform-tools/fastboot x10flasher_lib/fastboot.linux + ln -s ${libusb1}/lib/libusb-1.0.so.0 ./x10flasher_lib/linux/lib32/libusbx-1.0.so + + chmod +x x10flasher_lib/unyaffs.linux.x86 x10flasher_lib/bin2elf x10flasher_lib/bin2sin + patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" x10flasher_lib/unyaffs.linux.x86 + ln -sf unyaffs.linux.x86 x10flasher_lib/unyaffs.linux + + ln -s swt32.jar x10flasher_lib/swtlin/swt.jar + + sed -i \ + -e 's|$(uname -m)|i686|' \ + -e 's|export JAVA_HOME=.*|export JAVA_HOME=${jre}|' \ + -e 's|export LD_LIBRARY_PATH=.*|export LD_LIBRARY_PATH=${libXtst}/lib:${glib}/lib:${gtk2}/lib:./x10flasher_lib/linux/lib32|' \ + FlashTool FlashToolConsole + ''; + + installPhase = '' + mkdir -p $out + mv * $out/ + ''; + + meta = { + homepage = "http://www.flashtool.net/"; + description = "S1 flashing software for Sony phones from X10 to Xperia Z Ultra"; + license = stdenv.lib.licenses.unfreeRedistributableFirmware; + platforms = stdenv.lib.platforms.linux; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; +} diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index 8a0a8f460de..1e32cce9c72 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -126,7 +126,7 @@ stdenv.mkDerivation { ${if target == "android" && release then "" else if target == "android" then - ''cp $(ls build/android/bin/*.apk | grep -v '\-unsigned.apk') $out'' + ''cp "$(ls build/android/bin/*.apk | grep -v '\-unsigned.apk')" $out'' else if target == "iphone" && release then '' cp -av build/iphone/build/* $out diff --git a/pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix index 5187b0e0238..cad4503dc96 100644 --- a/pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix @@ -6,5 +6,5 @@ androidenv.emulateApp { platformVersion = "16"; useGoogleAPIs = true; package = "com.appcelerator.kitchensink"; - activity = "KitchensinkActivity"; + activity = ".KitchensinkActivity"; } diff --git a/pkgs/development/python-modules/distutils-cfg/default.nix b/pkgs/development/python-modules/distutils-cfg/default.nix new file mode 100644 index 00000000000..190c663b471 --- /dev/null +++ b/pkgs/development/python-modules/distutils-cfg/default.nix @@ -0,0 +1,31 @@ +# global distutils configuration, see http://docs.python.org/2/install/index.html#distutils-configuration-files + +{ stdenv, python, writeText, extraCfg ? "" }: + + +let + distutilsCfg = writeText "distutils.cfg" '' + [easy_install] + + # don't allow network connections during build to ensure purity + allow-hosts = None + + # make sure we always unzip installed packages otherwise setup hooks won't work + zip_ok = 0 + + ${extraCfg} + ''; +in stdenv.mkDerivation { + name = "${python.libPrefix}-distutils.cfg"; + + buildInputs = [ python ]; + + unpackPhase = "true"; + + installPhase = '' + dest="$out/lib/${python.libPrefix}/site-packages/distutils" + mkdir -p $dest + ln -s ${python}/lib/${python.libPrefix}/distutils/* $dest + ln -s ${distutilsCfg} $dest/distutils.cfg + ''; +} diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 6a7d5e5f3d5..067a1cdf2e2 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -1,84 +1,112 @@ /* This function provides a generic Python package builder. It is - intended to work with packages that use `setuptools' + intended to work with packages that use `distutils/setuptools' (http://pypi.python.org/pypi/setuptools/), which represents a large number of Python packages nowadays. */ -{ python, setuptools, wrapPython, lib, offlineDistutils, recursivePthLoader }: +{ python, setuptools, wrapPython, lib, recursivePthLoader, distutils-cfg }: -{ name, namePrefix ? python.libPrefix + "-" +{ name + +# by default prefix `name` e.g. "python3.3-${name}" +, namePrefix ? python.libPrefix + "-" , buildInputs ? [] +# pass extra information to the distutils global configuration (think as global setup.cfg) +, distutilsExtraCfg ? "" + +# propagate build dependencies so in case we have A -> B -> C, +# C can import propagated packages by A , propagatedBuildInputs ? [] -, # List of packages that should be added to the PYTHONPATH - # environment variable in programs built by this function. Packages - # in the standard `propagatedBuildInputs' variable are also added. - # The difference is that `pythonPath' is not propagated to the user - # environment. This is preferrable for programs because it doesn't - # pollute the user environment. - pythonPath ? [] +# passed to "python setup.py install" +, setupPyInstallFlags ? [] -, installCommand ? - '' - easy_install --always-unzip --prefix="$out" . - '' - -, preConfigure ? "true" - -, buildPhase ? "true" +# passed to "python setup.py build" +, setupPyBuildFlags ? [] +# enable tests by default , doCheck ? true -, checkPhase ? - '' - runHook preCheck - ${python}/bin/${python.executable} setup.py test - runHook postCheck - '' - -, preInstall ? "" -, postInstall ? "" +# List of packages that should be added to the PYTHONPATH +# environment variable in programs built by this function. Packages +# in the standard `propagatedBuildInputs' variable are also added. +# The difference is that `pythonPath' is not propagated to the user +# environment. This is preferrable for programs because it doesn't +# pollute the user environment. +, pythonPath ? [] , meta ? {} , ... } @ attrs: -# Keep extra attributes from ATTR, e.g., `patchPhase', etc. +# Keep extra attributes from `attrs`, e.g., `patchPhase', etc. python.stdenv.mkDerivation (attrs // { - inherit doCheck buildPhase checkPhase; + inherit doCheck; name = namePrefix + name; - # default to python's platforms and add maintainer(s) to every - # package - meta = { - platforms = python.meta.platforms; - } // meta // { - maintainers = (meta.maintainers or []) ++ [ lib.maintainers.chaoflow lib.maintainers.iElectric ]; - }; - - # checkPhase after installPhase to run tests on installed packages - phases = "unpackPhase patchPhase configurePhase buildPhase installPhase checkPhase fixupPhase distPhase"; - - buildInputs = [ python wrapPython setuptools ] ++ buildInputs ++ pythonPath; + buildInputs = [ python wrapPython setuptools (distutils-cfg.override { extraCfg = distutilsExtraCfg; }) ] ++ buildInputs ++ pythonPath; propagatedBuildInputs = propagatedBuildInputs ++ [ recursivePthLoader ]; pythonPath = [ setuptools ] ++ pythonPath; - preConfigure = '' + configurePhase = attrs.configurePhase or '' + runHook preConfigure + + # patch python interpreter to write null timestamps when compiling python files + # with following var we tell python to activate the patch so that python doesn't + # try to update them when we freeze timestamps in nix store export DETERMINISTIC_BUILD=1 - PYTHONPATH="${offlineDistutils}/lib/${python.libPrefix}/site-packages:$PYTHONPATH" - ${preConfigure} + + # prepend following line to import setuptools before distutils + # this way we make sure setuptools monkeypatches distutils commands + # this way setuptools provides extra helpers such as "python setup.py test" + sed -i '0,/import distutils/s//import setuptools;import distutils/' setup.py + sed -i '0,/from distutils/s//import setuptools;from distutils/' setup.py + + runHook postConfigure ''; - installPhase = preInstall + '' + checkPhase = attrs.checkPhase or '' + runHook preCheck + + ${python}/bin/${python.executable} setup.py test + + runHook postCheck + ''; + + buildPhase = attrs.buildPhase or '' + runHook preBuild + + ${python}/bin/${python.executable} setup.py build ${lib.concatStringsSep " " setupPyBuildFlags} + + runHook postBuild + ''; + + installPhase = attrs.installPhase or '' + runHook preInstall + mkdir -p "$out/lib/${python.libPrefix}/site-packages" - echo "installing \`${name}' with \`easy_install'..." export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" - ${installCommand} + + ${python}/bin/${python.executable} setup.py install \ + --install-lib=$out/lib/${python.libPrefix}/site-packages \ + --old-and-unmanageable \ + --prefix="$out" ${lib.concatStringsSep " " setupPyInstallFlags} + + # --install-lib: + # sometimes packages specify where files should be installed outside the usual + # python lib prefix, we override that back so all infrastructure (setup hooks) + # work as expected + + # --old-and-unmanagable: + # instruct setuptools not to use eggs but fallback to plan package install + # this also reduces one .pth file in the chain, but the main reason is to + # force install process to install only scripts for the package we are + # installing (otherwise it will install scripts also for dependencies) # A pth file might have been generated to load the package from # within its own site-packages, rename this package not to @@ -94,21 +122,22 @@ python.stdenv.mkDerivation (attrs // { # corresponding site.py needs to be included in the PYTHONPATH. rm -f "$out/lib/${python.libPrefix}"/site-packages/site.py* - ${postInstall} + runHook postInstall ''; postFixup = '' wrapPythonPrograms - # If a user installs a Python package, she probably also wants its - # dependencies in the user environment (since Python modules don't - # have something like an RPATH, so the only way to find the + # If a user installs a Python package, they probably also wants its + # dependencies in the user environment profile (only way to find the # dependencies is to have them in the PYTHONPATH variable). + # Allows you to do: $ PYTHONPATH=~/.nix-profile/lib/python2.7/site-packages python if test -e $out/nix-support/propagated-build-inputs; then ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages fi + # TODO: document createBuildInputsPth build-inputs "$buildInputStrings" for inputsfile in propagated-build-inputs propagated-native-build-inputs; do if test -e $out/nix-support/$inputsfile; then @@ -116,4 +145,13 @@ python.stdenv.mkDerivation (attrs // { fi done ''; + + meta = with lib.maintainers; { + # default to python's platforms + platforms = python.meta.platforms; + } // meta // { + # add extra maintainer(s) to every package + maintainers = (meta.maintainers or []) ++ [ chaoflow iElectric ]; + }; + }) diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh index a7c839799b1..282aeca9ed1 100644 --- a/pkgs/development/python-modules/generic/wrap.sh +++ b/pkgs/development/python-modules/generic/wrap.sh @@ -5,7 +5,7 @@ wrapPythonPrograms() { wrapPythonProgramsIn() { local dir="$1" local pythonPath="$2" - local python="$(type -p python)" + local python="@executable@" local i declare -A pythonPathsSeen=() @@ -18,11 +18,11 @@ wrapPythonProgramsIn() { for i in $(find "$dir" -type f -perm +0100); do # Rewrite "#! .../env python" to "#! /nix/store/.../python". - if head -n1 "$i" | grep -q '#!.*/env.*python'; then - sed -i "$i" -e "1 s^.*/env[ ]*python^#! $python^" + if head -n1 "$i" | grep -q '#!.*/env.*\(python\|pypy\)'; then + sed -i "$i" -e "1 s^.*/env[ ]*\(python\|pypy\)^#! $python^" fi - if head -n1 "$i" | grep -q /python; then + if head -n1 "$i" | grep -q '/python\|/pypy'; then # dont wrap EGG-INFO scripts since they are called from python if echo "$i" | grep -v EGG-INFO/scripts; then echo "wrapping \`$i'..." diff --git a/pkgs/development/python-modules/offline-distutils/default.nix b/pkgs/development/python-modules/offline-distutils/default.nix deleted file mode 100644 index 269f67bf5cd..00000000000 --- a/pkgs/development/python-modules/offline-distutils/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -# Used during module installation to prevent easy_install and python -# setup.py install/test from downloading - -{ stdenv, python }: - -stdenv.mkDerivation { - name = "python-offline-distutils-${python.version}"; - - buildInputs = [ python ]; - - unpackPhase = "true"; - installPhase = '' - dst="$out/lib/${python.libPrefix}/site-packages" - ensureDir $dst/distutils - ln -s ${python}/lib/${python.libPrefix}/distutils/* $dst/distutils/ - cat < $dst/distutils/distutils.cfg -[easy_install] -allow-hosts = None -EOF - ''; -} diff --git a/pkgs/development/python-modules/pil/default.nix b/pkgs/development/python-modules/pil/default.nix index 1dfdfee08fb..0b462cb4e52 100644 --- a/pkgs/development/python-modules/pil/default.nix +++ b/pkgs/development/python-modules/pil/default.nix @@ -14,16 +14,15 @@ buildPythonPackage { doCheck = true; - configurePhase = '' + preConfigure = '' sed -i "setup.py" \ -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = libinclude("${freetype}")|g ; s|^JPEG_ROOT =.*$|JPEG_ROOT = libinclude("${libjpeg}")|g ; s|^ZLIB_ROOT =.*$|ZLIB_ROOT = libinclude("${zlib}")|g ;' ''; - buildPhase = "python setup.py build_ext -i"; checkPhase = "python selftest.py"; - #installPhase = "python setup.py install --prefix=$out"; + buildPhase = "python setup.py build_ext -i"; meta = { homepage = http://www.pythonware.com/products/pil/; diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix index 1e8ceed6878..54a50a2b71f 100644 --- a/pkgs/development/python-modules/pycairo/default.nix +++ b/pkgs/development/python-modules/pycairo/default.nix @@ -1,11 +1,24 @@ { stdenv, fetchurl, python, pkgconfig, cairo, x11 }: -stdenv.mkDerivation { - name = "pycairo-1.8.8"; - src = fetchurl { - url = http://cairographics.org/releases/pycairo-1.8.8.tar.gz; - sha256 = "0q18hd4ai4raljlvd76ylgi30kxpr2qq83ka6gzwh0ya8fcmjlig"; - }; +stdenv.mkDerivation rec { + version = "1.10.0"; + name = "pycairo-${version}"; + src = if python.is_py3k or false + then fetchurl { + url = "http://cairographics.org/releases/pycairo-${version}.tar.bz2"; + sha256 = "1gjkf8x6hyx1skq3hhwcbvwifxvrf9qxis5vx8x5igmmgs70g94s"; + } + else fetchurl { + url = "http://cairographics.org/releases/py2cairo-${version}.tar.bz2"; + sha256 = "0cblk919wh6w0pgb45zf48xwxykfif16qk264yga7h9fdkq3j16k"; + }; buildInputs = [ python pkgconfig cairo x11 ]; + preConfigure = '' + sed -e 's@#!/usr/bin/env python@#!${python.executable}@' -i waf + head waf + ''; + configurePhase = "${python.executable} waf configure --prefix=$out"; + buildPhase = "${python.executable} waf"; + installPhase = "${python.executable} waf install"; } diff --git a/pkgs/development/python-modules/pycrypto/default.nix b/pkgs/development/python-modules/pycrypto/default.nix index ec741ba247e..5da727a08db 100644 --- a/pkgs/development/python-modules/pycrypto/default.nix +++ b/pkgs/development/python-modules/pycrypto/default.nix @@ -9,17 +9,7 @@ buildPythonPackage rec { sha256 = "0g0ayql5b9mkjam8hym6zyg6bv77lbh66rv1fyvgqb17kfc1xkpj"; }; - buildInputs = [ python gmp ]; - - buildPhase = - '' - python ./setup.py build_ext --library-dirs=${gmp}/lib - ''; - -# installPhase = -# '' -# python ./setup.py install --prefix=$out -# ''; + buildInputs = [ gmp ]; meta = { homepage = "http://www.pycrypto.org/"; diff --git a/pkgs/development/python-modules/pygtk/default.nix b/pkgs/development/python-modules/pygtk/default.nix index e291544911c..dfe805ec9e4 100644 --- a/pkgs/development/python-modules/pygtk/default.nix +++ b/pkgs/development/python-modules/pygtk/default.nix @@ -14,7 +14,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ gtk pygobject pycairo ]; - installCommand = "make install"; + configurePhase = "configurePhase"; + + buildPhase = "buildPhase"; + + installPhase = "installPhase"; + checkPhase = stdenv.lib.optionalString (libglade == null) '' sed -i -e "s/glade = importModule('gtk.glade', buildDir)//" \ diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index d45d724ae58..df95e56377d 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pythonPackages }: pythonPackages.buildPythonPackage rec { - name = "pylint-0.26.0"; + name = "pylint-0.28.0"; namePrefix = ""; src = fetchurl { url = "http://download.logilab.org/pub/pylint/${name}.tar.gz"; - sha256 = "1mg1ywpj0klklv63s2hwn5xwxi3wfwgnyz9d4pz32hzb53azq835"; + sha256 = "1077hs8zpl1q5yc6wcg645nfqc4pwbdk8vjcv0qrldbb87f3yv7a"; }; propagatedBuildInputs = [ pythonPackages.logilab_astng ]; diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index e0c3e7837b4..e33c815d23b 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -1,26 +1,26 @@ -{ stdenv, fetchurl, python, wrapPython }: +{ stdenv, fetchurl, python, wrapPython, distutils-cfg }: stdenv.mkDerivation rec { shortName = "setuptools-${version}"; name = "${python.executable}-${shortName}"; - version = "2.0.2"; + version = "2.1"; src = fetchurl { url = "http://pypi.python.org/packages/source/s/setuptools/${shortName}.tar.gz"; - sha256 = "09nv5x45y8fgc0kjmmw4gig3hr0is9xlc5rq053vnbmkxr5q5xmi"; + sha256 = "1m8qjvj5bfbphdags5s6pgmvk3xnw509lgdlq9whkq5a9mgxf8m7"; }; - buildInputs = [ python wrapPython ]; + buildInputs = [ python wrapPython distutils-cfg ]; - buildPhase = "${python}/bin/${python.executable} setup.py build --build-base $out"; + buildPhase = "${python}/bin/${python.executable} setup.py build"; installPhase = '' dst=$out/lib/${python.libPrefix}/site-packages mkdir -p $dst PYTHONPATH="$dst:$PYTHONPATH" - ${python}/bin/${python.executable} setup.py install --prefix=$out + ${python}/bin/${python.executable} setup.py install --prefix=$out --install-lib=$out/lib/${python.libPrefix}/site-packages wrapPythonPrograms ''; diff --git a/pkgs/development/python-modules/setuptools/distribute-skip-sdist_with_utf8_encoded_filename.patch b/pkgs/development/python-modules/setuptools/distribute-skip-sdist_with_utf8_encoded_filename.patch deleted file mode 100644 index 96a4f81ee58..00000000000 --- a/pkgs/development/python-modules/setuptools/distribute-skip-sdist_with_utf8_encoded_filename.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -r f5ac515f062a setuptools/tests/test_sdist.py ---- a/setuptools/tests/test_sdist.py Fri Jul 26 09:52:26 2013 +0200 -+++ b/setuptools/tests/test_sdist.py Sat Jul 27 20:22:17 2013 +0200 -@@ -3,12 +3,14 @@ - - - import os -+import locale - import shutil - import sys - import tempfile - import unittest - import unicodedata - -+from setuptools.tests.py26compat import skipIf - from setuptools.compat import StringIO, unicode - from setuptools.command.sdist import sdist - from setuptools.command.egg_info import manifest_maker -@@ -318,6 +320,9 @@ - filename = filename.decode('latin-1') - self.assertFalse(filename in cmd.filelist.files) - -+ -+ @skipIf(sys.version_info >= (3,) and locale.getpreferredencoding() != 'UTF-8', -+ 'Unittest fails if locale is not utf-8 but the manifests is recorded correctly') - def test_sdist_with_utf8_encoded_filename(self): - # Test for #303. - dist = Distribution(SETUP_ATTRS) diff --git a/pkgs/development/python-modules/setuptools/site.nix b/pkgs/development/python-modules/setuptools/site.nix deleted file mode 100644 index 34e7b478595..00000000000 --- a/pkgs/development/python-modules/setuptools/site.nix +++ /dev/null @@ -1,16 +0,0 @@ -# Propagated by buildPythonPackge to process pth files - -{ stdenv, python, setuptools }: - -stdenv.mkDerivation { - name = "python-setuptools-site-${setuptools.version}"; - - buildInputs = [ python setuptools ]; - - unpackPhase = "true"; - installPhase = '' - dst="$out/lib/${python.libPrefix}/site-packages" - ensureDir $dst - ln -s ${setuptools}/lib/${python.libPrefix}/site-packages/site.* $dst/ - ''; -} diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index 5b2de20e33f..b3769245bbe 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -4,14 +4,14 @@ let name = "cppcheck"; - version = "1.63"; + version = "1.64"; in stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { url = "mirror://sourceforge/${name}/${name}-${version}.tar.bz2"; - sha256 = "0r10z44qydqxxxlxiggl2nzksd3gkb7bp784dfmpnnr1jd2zqjwj"; + sha256 = "0n2hrg99rsp77b3plpip315pyk0x4gh8gljs9z3iwcbcg14mliff"; }; configurePhase = "makeFlags=PREFIX=$out"; diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 97b50d0019f..f8466e5aafd 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, unzip, jdk, makeWrapper }: stdenv.mkDerivation rec { - name = "gradle-1.8"; + name = "gradle-1.11"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "00spxad9b5vddshp02cic0ds8icgb1clknl7494f467x2pxbnhm3"; + sha256 = "14a0qdzjiar97l9a0i3ds2y48p1lrqkj7skkkvhz0r29hbgkbqh7"; }; installPhase = '' @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { makeWrapper ${jdk}/bin/java $out/bin/gradle \ --set JAVA_HOME ${jdk} \ - --add-flags "-classpath $out/lib/gradle-launcher-1.8.jar org.gradle.launcher.GradleMain" + --add-flags "-classpath $out/lib/gradle-launcher-1.11.jar org.gradle.launcher.GradleMain" ''; phases = "unpackPhase installPhase"; diff --git a/pkgs/development/tools/build-managers/leiningen/builder.sh b/pkgs/development/tools/build-managers/leiningen/builder.sh index e1dd9d5a786..c28854ca089 100644 --- a/pkgs/development/tools/build-managers/leiningen/builder.sh +++ b/pkgs/development/tools/build-managers/leiningen/builder.sh @@ -20,4 +20,5 @@ patchShebangs $out wrapProgram $out_bin \ --prefix PATH ":" "${rlwrap}/bin:${coreutils}/bin:${findutils}/bin" \ - --set LEIN_GPG ${gnupg}/bin/gpg + --set LEIN_GPG ${gnupg}/bin/gpg \ + --set JAVA_CMD ${jdk}/bin/java diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index 2c039b3fa0c..ff21e518936 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/pkgs/development/tools/build-managers/leiningen/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { patches = ./lein_2.3.0.patch; - inherit rlwrap clojure gnupg findutils coreutils; + inherit rlwrap clojure gnupg findutils coreutils jdk; builder = ./builder.sh; diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix index 11d81c3beb7..c6856dae565 100644 --- a/pkgs/development/tools/build-managers/scons/default.nix +++ b/pkgs/development/tools/build-managers/scons/default.nix @@ -2,7 +2,7 @@ let name = "scons"; - version = "2.3.0"; + version = "2.3.1"; in stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/scons/${name}-${version}.tar.gz"; - sha256 = "0jrv8v5dpdp231n1gsfmirqy27f7qas6m255jjm2qjygk6chchll"; + sha256 = "00822ax62cfi2fvz9zhw80hl1273524d97xfycq4q276z1lb86h9"; }; buildInputs = [python makeWrapper]; diff --git a/pkgs/development/tools/documentation/doxygen/1.7.nix b/pkgs/development/tools/documentation/doxygen/1.7.nix deleted file mode 100644 index f530ed70e37..00000000000 --- a/pkgs/development/tools/documentation/doxygen/1.7.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ stdenv, fetchurl, perl, flex, bison, qt4 }: - -let - name = "doxygen-1.7.4"; -in -stdenv.mkDerivation { - inherit name; - - src = fetchurl { - url = "ftp://ftp.stack.nl/pub/users/dimitri/${name}.src.tar.gz"; - sha256 = "0rnzyp5f8c454fdkgpg5hpxwmx642spgxcpw3blbvnyw8129jp44"; - }; - - patches = [ ./tmake.patch ]; - - buildInputs = - [ perl flex bison ] - ++ stdenv.lib.optional (qt4 != null) qt4; - - prefixKey = "--prefix "; - - configureFlags = - [ "--dot dot" ] - ++ stdenv.lib.optional (qt4 != null) "--with-doxywizard"; - - preConfigure = stdenv.lib.optionalString (qt4 != null) - '' - echo "using QTDIR=${qt4}..." - export QTDIR=${qt4} - ''; - - makeFlags = "MAN1DIR=share/man/man1"; - - enableParallelBuilding = true; - - meta = { - license = "GPLv2+"; - homepage = "http://doxygen.org/"; - description = "Doxygen, a source code documentation generator tool"; - - longDescription = '' - Doxygen is a documentation system for C++, C, Java, Objective-C, - Python, IDL (CORBA and Microsoft flavors), Fortran, VHDL, PHP, - C\#, and to some extent D. It can generate an on-line - documentation browser (in HTML) and/or an off-line reference - manual (in LaTeX) from a set of documented source files. - ''; - - maintainers = [stdenv.lib.maintainers.simons]; - platforms = if qt4 != null then stdenv.lib.platforms.linux else stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index 69c1f4181cc..9a8979aaa6c 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -1,20 +1,20 @@ -{ stdenv, fetchurl, perl, flex, bison, qt4 }: +{ stdenv, fetchurl, perl, python, flex, bison, qt4 }: let - name = "doxygen-1.8.5"; + name = "doxygen-1.8.6"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "ftp://ftp.stack.nl/pub/users/dimitri/${name}.src.tar.gz"; - sha256 = "09fcsz1rd4a9njsz3as7z8s3mk621pvcclavxbb6ib8jvdkqnfi4"; + sha256 = "0pskjlkbj76m9ka7zi66yj8ffjcv821izv3qxqyyphf0y0jqcwba"; }; patches = [ ./tmake.patch ]; buildInputs = - [ perl flex bison ] + [ perl python flex bison ] ++ stdenv.lib.optional (qt4 != null) qt4; prefixKey = "--prefix "; @@ -23,7 +23,10 @@ stdenv.mkDerivation { [ "--dot dot" ] ++ stdenv.lib.optional (qt4 != null) "--with-doxywizard"; - preConfigure = stdenv.lib.optionalString (qt4 != null) + preConfigure = + '' + patchShebangs . + '' + stdenv.lib.optionalString (qt4 != null) '' echo "using QTDIR=${qt4}..." export QTDIR=${qt4} diff --git a/pkgs/development/tools/haskell/ghc-events-analyze/default.nix b/pkgs/development/tools/haskell/ghc-events-analyze/default.nix new file mode 100644 index 00000000000..7744a3071cc --- /dev/null +++ b/pkgs/development/tools/haskell/ghc-events-analyze/default.nix @@ -0,0 +1,20 @@ +{ cabal, diagramsLib, diagramsSvg, filepath, ghcEvents, lens, mtl +, optparseApplicative, parsec, SVGFonts, thLift, transformers +}: + +cabal.mkDerivation (self: { + pname = "ghc-events-analyze"; + version = "0.2.0"; + sha256 = "04px1p0pnx54414m7sdpmdhj2dpsi1z8bjm8jq2yzh66854xiyh4"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + diagramsLib diagramsSvg filepath ghcEvents lens mtl + optparseApplicative parsec SVGFonts thLift transformers + ]; + meta = { + description = "Analyze and visualize event logs"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/tools/misc/cpphs/default.nix b/pkgs/development/tools/misc/cpphs/default.nix index fca4efc8661..2f86e8ad012 100644 --- a/pkgs/development/tools/misc/cpphs/default.nix +++ b/pkgs/development/tools/misc/cpphs/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cpphs"; - version = "1.18.1"; - sha256 = "1fshsd1dzmrl3qbpwf7r2c30d08l77080j9cfchcgy1lijjr9vhm"; + version = "1.18.2"; + sha256 = "0b8hkb2sfacmpi3rwr62myn4kfpwbfdlv9k0vnhk3wvl1v4wf29l"; isLibrary = true; isExecutable = true; meta = { diff --git a/pkgs/development/tools/misc/dfu-programmer/default.nix b/pkgs/development/tools/misc/dfu-programmer/default.nix new file mode 100644 index 00000000000..93dceb60f8d --- /dev/null +++ b/pkgs/development/tools/misc/dfu-programmer/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, libusb1 }: +let + version = "0.6.2"; +in +stdenv.mkDerivation rec { + name="dfu-programmer-${version}"; + + buildInputs = [ libusb1 ]; + + src = fetchurl { + url = "mirror://sourceforge/dfu-programmer/${name}.tar.gz"; + sha256 = "0rdg4h5alpa3py3v3xgvn2vcgmnbj077am90jqj83nad89m9c801"; + }; + + preConfigure = '' + substituteInPlace configure \ + --replace "/usr/include/libusb-1.0" "${libusb1}/include/libusb-1.0" + ''; + + meta = with stdenv.lib; { + license = licenses.gpl2; + description = "A Device Firmware Update based USB programmer for Atmel chips with a USB bootloader."; + homepage = http://dfu-programmer.sourceforge.net/; + maintainers = [ maintainers.the-kenny ]; + }; +} diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index a3e1348f940..2d60a06fb3e 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, gettext, LocaleGettext, makeWrapper }: stdenv.mkDerivation rec { - name = "help2man-1.43.3"; + name = "help2man-1.44.1"; src = fetchurl { - url = "mirror://gnu/help2man/${name}.tar.gz"; - sha256 = "00yk86rvvaavg7y6i5bvk5xhm417jl9dpr8bqvqdksw0i48qv5v7"; + url = "mirror://gnu/help2man/${name}.tar.xz"; + sha256 = "1yyyfw9zrfdvslnv91bnhyqmazwx243wmkc9wdaz888rfx36ipi2"; }; buildInputs = [ makeWrapper perl gettext LocaleGettext ]; diff --git a/pkgs/development/tools/misc/swig/2.x.nix b/pkgs/development/tools/misc/swig/2.x.nix index 2066ead51a1..b51ce0f2d5a 100644 --- a/pkgs/development/tools/misc/swig/2.x.nix +++ b/pkgs/development/tools/misc/swig/2.x.nix @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { # Licensing is a mess: http://www.swig.org/Release/LICENSE . license = "BSD-style"; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ urkud ]; }; } diff --git a/pkgs/development/tools/misc/swig/default.nix b/pkgs/development/tools/misc/swig/default.nix index 1f37fd87f8a..d489feba4dc 100644 --- a/pkgs/development/tools/misc/swig/default.nix +++ b/pkgs/development/tools/misc/swig/default.nix @@ -39,6 +39,8 @@ stdenv.mkDerivation rec { # Licensing is a mess: http://www.swig.org/Release/LICENSE . license = "BSD-style"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/ocaml/opam/1.1.nix b/pkgs/development/tools/ocaml/opam/1.1.nix index c5093db107d..2c71f8ba49f 100644 --- a/pkgs/development/tools/ocaml/opam/1.1.nix +++ b/pkgs/development/tools/ocaml/opam/1.1.nix @@ -30,13 +30,13 @@ let sha256 = "5421559aa12b4debffef947f7e1039c22e9dffd87a4aa68445a687a20764ae81"; }; opam = fetchurl { - url = "https://github.com/ocaml/opam/archive/1.1.0.zip"; - sha256 = "38a5edc1428f9e8e0d13e7017c97e1614dd651b75b4c234c80ff22f103d38bf7"; + url = "https://github.com/ocaml/opam/archive/1.1.1.zip"; + sha256 = "9c69eeb448af5a38950b2664446401ce240b9f028e0b4d26b6ac1a96938a5f03"; }; }; in stdenv.mkDerivation rec { - name = "opam-1.1.0"; + name = "opam-1.1.1"; buildInputs = [unzip curl ncurses ocaml]; diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/development/tools/selenium/server/default.nix new file mode 100644 index 00000000000..efb1e85c2d7 --- /dev/null +++ b/pkgs/development/tools/selenium/server/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "selenium-server-standalone-${version}"; + version = "2.39.0"; + + src = fetchurl { + url = "https://selenium.googlecode.com/files/${name}.jar"; + sha256 = "11ixh5x5f9kia2va8wssd3n7y57dkv3snw6xvk85y4qhzg64b65f"; + }; + + unpack = ""; + + buildCommand = '' + mkdir -p $out/share/lib/${name} + cp $src $out/share/lib/${name}/${name}.jar + ''; + + meta = with stdenv.lib; { + homepage = https://code.google.com/p/selenium; + description = "Selenium Server for remote WebDriver."; + maintainers = [ maintainers.coconnor ]; + platforms = platforms.all; + hydraPlatforms = []; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 80fc093822f..d0870e82b72 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -4,18 +4,18 @@ assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; stdenv.mkDerivation rec { - name = "vagrant-1.4.0"; + name = "vagrant-1.4.3"; src = if stdenv.system == "x86_64-linux" then fetchurl { - url = https://dl.bintray.com/mitchellh/vagrant/vagrant_1.4.0_x86_64.deb; - sha256 = "0hggajqdwk1qlkhf5sgdlmyxhan33q3pdgks9n5i2cw6f2ckw3rh"; + url = https://dl.bintray.com/mitchellh/vagrant/vagrant_1.4.3_x86_64.deb; + sha256 = "dbd06de0f3560e2d046448d627bca0cbb0ee34b036ef605aa87ed20e6ad2684b"; } else fetchurl { - url = https://dl.bintray.com/mitchellh/vagrant/vagrant_1.4.0_i686.deb; - sha256 = "03jcmsdl4na5n08phyvx65dnfv1gq9vgn07kcyqc2f8nq7vmcmkm"; + url = https://dl.bintray.com/mitchellh/vagrant/vagrant_1.4.3_i686.deb; + sha256 = "66e613fc1c9e31ecaf8e5f1d07d2ae4fca3d4fc2e43593543962664258d9af9b"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index 2c2d343838c..062d7f4ec06 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -6,7 +6,7 @@ let ln -sv /usr/sbin/dtrace $out/bin ''; - version = "0.10.25"; + version = "0.10.26"; # !!! Should we also do shared libuv? deps = { @@ -26,7 +26,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz"; - sha256 = "0vxkyvl8hyhxxpkh96zws4j6i9f3ykqpqbrbvj0j0nj7snwz7vj6"; + sha256 = "1ahx9cf2irp8injh826sk417wd528awi4l1mh7vxg7k8yak4wppg"; }; configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps); diff --git a/pkgs/games/LambdaHack/default.nix b/pkgs/games/LambdaHack/default.nix index c9fd9706c0e..93277eb15a2 100644 --- a/pkgs/games/LambdaHack/default.nix +++ b/pkgs/games/LambdaHack/default.nix @@ -1,18 +1,19 @@ -{ cabal, assertFailure, binary, ConfigFile, deepseq, enummapsetTh -, filepath, gtk, hashable, keys, miniutter, mtl, prettyShow, random -, stm, text, transformers, unorderedContainers, zlib +{ cabal, assertFailure, binary, deepseq, enummapsetTh, filepath +, gtk, hashable, hsini, keys, miniutter, mtl, prettyShow, random +, stm, text, transformers, unorderedContainers, vector +, vectorBinaryInstances, zlib }: cabal.mkDerivation (self: { pname = "LambdaHack"; - version = "0.2.10.6"; - sha256 = "19ak0ygw38b51wkm4p10xgdk3h9mh5vvb8c60qhs7cmgzjcph38n"; + version = "0.2.12"; + sha256 = "0ics1z376qyagkzg58mqqw7cbkjpkik57l8570qmk589nkhck86n"; isLibrary = true; isExecutable = true; buildDepends = [ - assertFailure binary ConfigFile deepseq enummapsetTh filepath gtk - hashable keys miniutter mtl prettyShow random stm text transformers - unorderedContainers zlib + assertFailure binary deepseq enummapsetTh filepath gtk hashable + hsini keys miniutter mtl prettyShow random stm text transformers + unorderedContainers vector vectorBinaryInstances zlib ]; jailbreak = true; meta = { diff --git a/pkgs/games/gtypist/default.nix b/pkgs/games/gtypist/default.nix index 19567918377..3db7aecfe1a 100644 --- a/pkgs/games/gtypist/default.nix +++ b/pkgs/games/gtypist/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, ncurses}: stdenv.mkDerivation { - name = "gtypist-2.9.3"; + name = "gtypist-2.9.4"; src = fetchurl { - url = "mirror://gnu/gtypist/gtypist-2.9.3.tar.xz"; - sha256 = "0srwa841caci69hzqb47xfbxxf7fvz3640qka083p72vm8z9hsxw"; + url = "mirror://gnu/gtypist/gtypist-2.9.4.tar.xz"; + sha256 = "18f54lh7ihhfvgwk3xd9d087kmganrgi2jd7avhvwn5gcc31vrqq"; }; buildInputs = [ncurses]; diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix index b3c71c89191..7e750d9c9b3 100644 --- a/pkgs/misc/screensavers/xlockmore/default.nix +++ b/pkgs/misc/screensavers/xlockmore/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { - name = "xlockmore-5.38"; + name = "xlockmore-5.43"; src = fetchurl { url = "http://www.tux.org/~bagleyd/xlock/${name}/${name}.tar.bz2"; - sha256 = "15x5l43zdjn881xf2m9psz9s2hvd2l8py2kzdhdh1v9m4ml20nf4"; + sha256 = "1l36n8x51j7lwdalv6yi37cil290vzd3djjqydhsm0pnm8hiz499"; }; # Optionally, it can use GTK+. diff --git a/pkgs/misc/seafile-shared/0003-Add-autoconfiguration-for-libjansson.patch b/pkgs/misc/seafile-shared/0003-Add-autoconfiguration-for-libjansson.patch new file mode 100644 index 00000000000..7966d1e683b --- /dev/null +++ b/pkgs/misc/seafile-shared/0003-Add-autoconfiguration-for-libjansson.patch @@ -0,0 +1,121 @@ +diff -r -u a/app/Makefile.am b/app/Makefile.am +--- a/app/Makefile.am 2014-01-10 11:38:46.000000000 +0100 ++++ b/app/Makefile.am 2014-01-16 14:22:24.584094619 +0100 +@@ -21,7 +21,7 @@ + seafile_LDADD = @CCNET_LIBS@ \ + $(top_builddir)/lib/libseafile.la \ + $(top_builddir)/lib/libseafile_common.la \ +- @SEARPC_LIBS@ \ ++ @SEARPC_LIBS@ @JANSSON_LIBS@ \ + @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 + + seafile_LDFALGS = @STATIC_COMPILE@ @CONSOLE@ +@@ -29,7 +29,7 @@ + if COMPILE_SERVER + seafserv_tool_SOURCES = seafserv-tool.c + seafserv_tool_LDADD = @CCNET_LIBS@ \ +- $(top_builddir)/lib/libseafile.la @SEARPC_LIBS@ \ ++ $(top_builddir)/lib/libseafile.la @SEARPC_LIBS@ @JANSSON_LIBS@ \ + @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 + + seafserv_tool_LDFLAGS = @STATIC_COMPILE@ @CONSOLE@ @SERVER_PKG_RPATH@ +diff -r -u a/configure.ac b/configure.ac +--- a/configure.ac 2014-01-10 11:38:46.000000000 +0100 ++++ b/configure.ac 2014-01-16 14:22:24.584094619 +0100 +@@ -233,6 +233,7 @@ + GLIB_REQUIRED=2.16.0 + CCNET_REQUIRED=0.9.3 + SEARPC_REQUIRED=1.0 ++JANSSON_REQUIRED=2.2.1 + ZDB_REQUIRED=2.10 + #LIBNAUTILUS_EXTENSION_REQUIRED=2.30.1 + CURL_REQUIRED=7.17 +@@ -254,6 +255,11 @@ + AC_SUBST(SEARPC_CFLAGS) + AC_SUBST(SEARPC_LIBS) + ++PKG_CHECK_MODULES(JANSSON, [jansson >= $JANSSON_REQUIRED]) ++AC_SUBST(JANSSON_CFLAGS) ++AC_SUBST(JANSSON_LIBS) ++ ++ + PKG_CHECK_MODULES(LIBEVENT, [libevent >= $LIBEVENT_REQUIRED]) + AC_SUBST(LIBEVENT_CFLAGS) + AC_SUBST(LIBEVENT_LIBS) +diff -r -u a/daemon/Makefile.am b/daemon/Makefile.am +--- a/daemon/Makefile.am 2014-01-10 11:38:46.000000000 +0100 ++++ b/daemon/Makefile.am 2014-01-16 14:22:24.587427993 +0100 +@@ -139,7 +139,7 @@ + @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 -levent \ + $(top_builddir)/common/cdc/libcdc.la \ + $(top_builddir)/common/index/libindex.la ${LIB_WS32} \ +- @SEARPC_LIBS@ @CCNET_LIBS@ @GNOME_KEYRING_LIBS@ ++ @SEARPC_LIBS@ @CCNET_LIBS@ @GNOME_KEYRING_LIBS@ @JANSSON_LIBS@ + + seaf_daemon_LDFLAGS = @STATIC_COMPILE@ @CONSOLE@ + +diff -r -u a/server/gc/Makefile.am b/server/gc/Makefile.am +--- a/server/gc/Makefile.am 2014-01-10 11:38:46.000000000 +0100 ++++ b/server/gc/Makefile.am 2014-01-16 14:23:20.991449822 +0100 +@@ -50,7 +50,7 @@ + $(top_builddir)/common/cdc/libcdc.la \ + $(top_builddir)/lib/libseafile_common.la \ + @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 -levent \ +- @SEARPC_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ ${LIB_WS32} ++ @SEARPC_LIBS@ @JANSSON_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ ${LIB_WS32} + + seafserv_gc_LDFLAGS = @STATIC_COMPILE@ @SERVER_PKG_RPATH@ + +@@ -63,6 +63,6 @@ + $(top_builddir)/common/cdc/libcdc.la \ + $(top_builddir)/lib/libseafile_common.la \ + @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 -levent \ +- @SEARPC_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ ${LIB_WS32} ++ @SEARPC_LIBS@ @JANSSON_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ ${LIB_WS32} + + seaf_fsck_LDFLAGS = @STATIC_COMPILE@ @SERVER_PKG_RPATH@ +diff -r -u a/server/Makefile.am b/server/Makefile.am +--- a/server/Makefile.am 2014-01-10 11:38:46.000000000 +0100 ++++ b/server/Makefile.am 2014-01-16 14:23:40.498354610 +0100 +@@ -99,6 +99,6 @@ + $(top_builddir)/common/index/libindex.la \ + @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 -levent \ + $(top_builddir)/common/cdc/libcdc.la \ +- @SEARPC_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ ${LIB_WS32} ++ @SEARPC_LIBS@ @JANSSON_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ ${LIB_WS32} + + seaf_server_LDFLAGS = @STATIC_COMPILE@ @SERVER_PKG_RPATH@ +diff -r -u a/httpserver/Makefile.am b/httpserver/Makefile.am +--- a/httpserver/Makefile.am 2014-01-10 11:38:46.000000000 +0100 ++++ b/httpserver/Makefile.am 2014-01-16 14:26:48.673985279 +0100 +@@ -50,7 +50,7 @@ + @CCNET_LIBS@ \ + $(top_builddir)/lib/libseafile.la \ + $(top_builddir)/common/cdc/libcdc.la \ +- @SEARPC_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ \ ++ @SEARPC_LIBS@ @JANSSON_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ \ + @LIBARCHIVE_LIBS@ ${LIB_WS32} + + httpserver_LDFLAGS = @STATIC_COMPILE@ +diff -r -u a/controller/Makefile.am b/controller/Makefile.am +--- a/controller/Makefile.am 2014-01-10 11:38:46.000000000 +0100 ++++ b/controller/Makefile.am 2014-01-16 14:29:42.076102675 +0100 +@@ -18,6 +18,6 @@ + seafile_controller_LDADD = @CCNET_LIBS@ \ + $(top_builddir)/lib/libseafile_common.la \ + @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -levent \ +- @SEARPC_LIBS@ ++ @SEARPC_LIBS@ @JANSSON_LIBS@ + + seafile_controller_LDFLAGS = @STATIC_COMPILE@ @SERVER_PKG_RPATH@ +diff -r -u a/fuse/Makefile.am b/fuse/Makefile.am +--- a/fuse/Makefile.am 2014-01-10 11:38:46.000000000 +0100 ++++ b/fuse/Makefile.am 2014-01-16 14:31:44.764267711 +0100 +@@ -43,6 +43,6 @@ + @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ \ + -lsqlite3 -levent \ + $(top_builddir)/common/cdc/libcdc.la \ +- @SEARPC_LIBS@ @ZDB_LIBS@ @FUSE_LIBS@ ++ @SEARPC_LIBS@ @JANSSON_LIBS@ @ZDB_LIBS@ @FUSE_LIBS@ + + seaf_fuse_LDFLAGS = @STATIC_COMPILE@ @SERVER_PKG_RPATH@ diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix new file mode 100644 index 00000000000..53092e3a8b7 --- /dev/null +++ b/pkgs/misc/seafile-shared/default.nix @@ -0,0 +1,43 @@ +{stdenv, fetchurl, which, automake, autoconf, pkgconfig, libtool, vala, python, intltool, fuse, ccnet}: + +stdenv.mkDerivation rec +{ + version = "2.1.1"; + name = "seafile-shared-${version}"; + + src = fetchurl + { + url = "https://github.com/haiwen/seafile/archive/v${version}.tar.gz"; + sha256 = "f07b09ab1eb1cb33f92cee74e499d0350941624396910a4c1a7d79abb45acaa6"; + }; + + patches = [ ./0003-Add-autoconfiguration-for-libjansson.patch ]; + + buildInputs = [ which automake autoconf pkgconfig libtool vala python intltool fuse ]; + propagatedBuildInputs = [ ccnet ]; + + preConfigure = '' + sed -ie 's|/bin/bash|/bin/sh|g' ./autogen.sh + ./autogen.sh + ''; + + configureFlags = "--disable-server --disable-console"; + + buildPhase = "make -j1"; + + postInstall = '' + # Remove seafile binary + rm -rf "$out/bin/seafile" + # Remove cli client binary + rm -rf "$out/bin/seaf-cli" + ''; + + meta = + { + homepage = "https://github.com/haiwen/seafile"; + description = "Shared components of Seafile: seafile-daemon, libseafile, libseafile python bindings, manuals, and icons"; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.calrama ]; + }; +} diff --git a/pkgs/misc/solfege/default.nix b/pkgs/misc/solfege/default.nix index b40ebe84bcb..9426684165d 100644 --- a/pkgs/misc/solfege/default.nix +++ b/pkgs/misc/solfege/default.nix @@ -28,10 +28,9 @@ stdenv.mkDerivation rec { postInstall = '' set -x - find "${librsvg}" "${gdk_pixbuf}" -name loaders.cache -print0 | xargs -0 cat > "$out/gdk-pixbuf.loaders" wrapProgram "$out/bin/solfege" \ --prefix PYTHONPATH ':' "$PYTHONPATH" \ - --set GDK_PIXBUF_MODULE_FILE "$out/gdk-pixbuf.loaders" + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" ''; meta = with stdenv.lib; { diff --git a/pkgs/misc/themes/qtcurve/default.nix b/pkgs/misc/themes/qtcurve/default.nix index 017a47349a9..ec5feb27c85 100644 --- a/pkgs/misc/themes/qtcurve/default.nix +++ b/pkgs/misc/themes/qtcurve/default.nix @@ -28,10 +28,11 @@ stdenv.mkDerivation { -DQTC_QT4_ENABLE_KWIN=ON ''; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/QtCurve/qtcurve; description = "Widget styles for Qt4/KDE4 and gtk2"; - platforms = stdenv.lib.platforms.linux; - license = "LGPLv2.1+"; + platforms = platforms.linux; + license = licenses.lgpl21Plus; + maintainers = [ maintainers.ttuegel ]; }; } diff --git a/pkgs/os-specific/linux/acpid/default.nix b/pkgs/os-specific/linux/acpid/default.nix index c1f92476b87..a0ae59a5a5b 100644 --- a/pkgs/os-specific/linux/acpid/default.nix +++ b/pkgs/os-specific/linux/acpid/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "acpid-2.0.20"; + name = "acpid-2.0.21"; src = fetchurl { url = "mirror://sourceforge/acpid2/${name}.tar.xz"; - sha256 = "0l7pzjcpf1935bn44kzgc16h00clbx73cjm2dlyhzvvb5ksvl7ka"; + sha256 = "0vv3zz8p3wxhlp35aqgqvzn6lda595wzn7php3k47jwci1cpxrn4"; }; preBuild = '' diff --git a/pkgs/os-specific/linux/bbswitch/default.nix b/pkgs/os-specific/linux/bbswitch/default.nix index 373f814f6e0..e12c80e0886 100644 --- a/pkgs/os-specific/linux/bbswitch/default.nix +++ b/pkgs/os-specific/linux/bbswitch/default.nix @@ -2,7 +2,7 @@ let baseName = "bbswitch"; - version = "0.7"; + version = "0.8"; name = "${baseName}-${version}-${kernel.version}"; in @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://github.com/Bumblebee-Project/${baseName}/archive/v${version}.tar.gz"; - sha256 = "0na6gfnvmp5fjbm430ms342hmrsbr6cf78n6hldqb8js2ry3f8dw"; + sha256 = "0xql1nv8dafnrcg54f3jsi3ny3cd2ca9iv73pxpgxd2gfczvvjkn"; }; preBuild = '' diff --git a/pkgs/os-specific/linux/checksec/default.nix b/pkgs/os-specific/linux/checksec/default.nix index 5e5ed6da1c9..0f3b87361f8 100644 --- a/pkgs/os-specific/linux/checksec/default.nix +++ b/pkgs/os-specific/linux/checksec/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { meta = { description = "A tool for checking security bits on executables"; + homepage = "http://www.trapkit.de/tools/checksec.html"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; diff --git a/pkgs/os-specific/linux/gradm/default.nix b/pkgs/os-specific/linux/gradm/default.nix new file mode 100644 index 00000000000..680547be57c --- /dev/null +++ b/pkgs/os-specific/linux/gradm/default.nix @@ -0,0 +1,51 @@ +{ fetchurl, stdenv, bison, flex, pam, + gcc, coreutils, findutils, binutils, bash }: + +stdenv.mkDerivation rec { + name = "gradm-${version}"; + version = "3.0-201401291757"; + + src = fetchurl { + url = "http://grsecurity.net/stable/${name}.tar.gz"; + sha256 = "19p7kaqbvf41scc63n69b5v5xzpw3mbf5zy691rply8hdm7736cw"; + }; + + buildInputs = [ gcc coreutils findutils binutils pam flex bison bash ]; + preBuild = '' + substituteInPlace ./Makefile --replace "/usr/include/security/pam_" "${pam}/include/security/pam_" + substituteInPlace ./gradm_defs.h --replace "/sbin/grlearn" "$out/sbin/grlearn" + substituteInPlace ./gradm_defs.h --replace "/sbin/gradm" "$out/sbin/gradm" + substituteInPlace ./gradm_defs.h --replace "/sbin/gradm_pam" "$out/sbin/gradm_pam" + ''; + + postInstall = '' + mkdir -p $out/lib/udev/rules.d + cat > $out/lib/udev/rules.d/80-grsec.rules < readline != null; stdenv.mkDerivation rec { - version = "2.0"; + version = "2.1"; name = "wpa_supplicant-${version}"; src = fetchurl { url = "http://hostap.epitest.fi/releases/${name}.tar.gz"; - sha256 = "02cy6wrs4nzm7wbq9mc1vby8lnj58k4sb10h718ks8mmzc4mc49c"; + sha256 = "0xxjw7lslvql1ykfbwmbhdrnjsjljf59fbwf837418s97dz2wqwi"; }; extraConfig = diff --git a/pkgs/os-specific/windows/cygwin-setup/default.nix b/pkgs/os-specific/windows/cygwin-setup/default.nix new file mode 100644 index 00000000000..d0995ffc662 --- /dev/null +++ b/pkgs/os-specific/windows/cygwin-setup/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchcvs, autoconf, automake, libtool, flex, bison, pkgconfig +, zlib, bzip2, lzma, libgcrypt_1_6 +}: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "cygwin-setup-${version}"; + version = "20131101"; + + src = fetchcvs { + cvsRoot = ":pserver:anoncvs@cygwin.com:/cvs/cygwin-apps"; + module = "setup"; + date = version; + sha256 = "024wxaaxkf7p1i78bh5xrsqmfz7ss2amigbfl2r5w9h87zqn9aq3"; + }; + + nativeBuildInputs = [ autoconf automake libtool flex bison pkgconfig ]; + + buildInputs = let + mkStatic = flip overrideDerivation (o: { + dontDisableStatic = true; + configureFlags = toList (o.configureFlags or []) ++ [ "--enable-static" ]; + buildInputs = map mkStatic (o.buildInputs or []); + propagatedBuildInputs = map mkStatic (o.propagatedBuildInputs or []); + }); + in map mkStatic [ zlib bzip2 lzma libgcrypt_1_6 ]; + + configureFlags = "--disable-shared"; + + dontDisableStatic = true; + + preConfigure = '' + autoreconf -vfi + ''; + + installPhase = '' + install -vD setup.exe "$out/bin/setup.exe" + ''; + + meta = { + homepage = https://sourceware.org/cygwin-apps/setup.html; + description = "A tool for installing Cygwin"; + license = licenses.gpl2Plus; + }; +} diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index b609c6686a2..db8db908d1e 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, openssl, libtool, perl, libxml2 }: -let version = "9.9.4-P2"; in +let version = "9.9.5-W1"; in stdenv.mkDerivation rec { @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; - sha256 = "128aqizcjbakrqrijjpy54qffqz1jafa94lhnqig7lr63r1wdwsh"; + sha256 = "1b3ycb376b1j2fc0k6w16k8j9vgsfrzy3nlw1vxzzi41fgyqmcd3"; }; patchPhase = '' diff --git a/pkgs/servers/http/couchdb/default.nix b/pkgs/servers/http/couchdb/default.nix index 08bc45443a3..808a86946b0 100644 --- a/pkgs/servers/http/couchdb/default.nix +++ b/pkgs/servers/http/couchdb/default.nix @@ -1,21 +1,39 @@ -args @ {stdenv, fetchurl, erlang, spidermonkey, - icu, getopt, curl, ...}: - -let s = import ./src-for-default.nix; in +{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey, curl, help2man, python +, sphinx, which, file, pkgconfig, getopt }: stdenv.mkDerivation rec { - inherit (s) name; + name = "couchdb-${version}"; + version = "1.5.0"; + src = fetchurl { - inherit (s) url; - sha256 = s.hash; + url = "mirror://apache/couchdb/source/${version}/apache-couchdb-${version}.tar.gz"; + sha256 = "1vwgcckp3svgifmagyjmgazm6387i9m6z182p6ja891i8fkb5gdb"; }; - buildInputs = [erlang spidermonkey icu curl]; + buildInputs = [ + erlang icu openssl spidermonkey curl help2man sphinx which file pkgconfig + ]; postInstall = '' sed -i -e "s|\`getopt|\`${getopt}/bin/getopt|" $out/bin/couchdb ''; - configureFlags = "--with-erlang=${erlang}/lib/erlang/usr/include --with-js-include=${spidermonkey}/include --with-js-lib=${spidermonkey}/lib"; + /* + Versions of SpiderMonkey after the js185-1.0.0 release remove the optional + enforcement of preventing anonymous functions in a statement context. This + will most likely break your existing JavaScript code as well as render all + example code invalid. + If you wish to ignore this error pass --enable-js-trunk to ./configure. + */ + configureFlags = '' + --enable-js-trunk + ''; + + meta = { + description = "Apache CouchDB is a database that uses JSON for documents, JavaScript for MapReduce queries, and regular HTTP for an API"; + homepage = "http://couchdb.apache.org"; + license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; [ viric garbas ]; + }; } diff --git a/pkgs/servers/http/couchdb/src-for-default.nix b/pkgs/servers/http/couchdb/src-for-default.nix deleted file mode 100644 index 6e07077d333..00000000000 --- a/pkgs/servers/http/couchdb/src-for-default.nix +++ /dev/null @@ -1,9 +0,0 @@ -rec { - version="1.2.0"; - name="couchdb-1.2.0"; - hash="0dswinmg32zn217049dkbx3pab3qwihzmlbc7i6vq7a7lbg4s98g"; - url="mirror://apache/couchdb/releases/1.2.0/apache-couchdb-${version}.tar.gz"; - advertisedUrl="http://www.apache.org/dist/couchdb/releases/1.2.0/apache-couchdb-1.2.0.tar.gz"; - - -} diff --git a/pkgs/servers/http/couchdb/src-info-for-default.nix b/pkgs/servers/http/couchdb/src-info-for-default.nix deleted file mode 100644 index 5904bdcb232..00000000000 --- a/pkgs/servers/http/couchdb/src-info-for-default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - downloadPage = "http://couchdb.apache.org/downloads.html"; - baseName = "couchdb"; - choiceCommand = ''head -1 | sed -re "$skipRedirectApache" ''; - mirrorSedScript = ''$apacheMirror''; -} - diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix index 4504d49edbb..f2bc0765636 100644 --- a/pkgs/servers/http/nginx/default.nix +++ b/pkgs/servers/http/nginx/default.nix @@ -5,10 +5,10 @@ , moreheaders ? false}: let - version = "1.4.5"; + version = "1.4.6"; mainSrc = fetchurl { url = "http://nginx.org/download/nginx-${version}.tar.gz"; - sha256 = "0zh7w1bz8rcxrs5bwp39m91nzm454mxlf3m5krkv1wm8ar1h5sdd"; + sha256 = "1ihjb3dqw4icc5pvgaqbp740cyr4m8zxjfvj3v3bkd88swamp2vs"; }; rtmp-ext = fetchgit { diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index 49550647921..522d0b60f00 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "opensmtpd-${version}"; - version = "201307151923p1"; + version = "5.4.2p1"; buildInputs = [ libevent zlib openssl db bison pam ]; src = fetchurl { url = "http://www.opensmtpd.org/archives/${name}.tar.gz"; - sha256 = "0cggq60zzz5mgj093pmgwjp4bm6znnhyv6ibp1vhkba7cxjavr4g"; + sha256 = "18nrzfjhv9znb5dbhc5k3fi31a3vr1r8j36q3fzghkh47n6z9yjg"; }; configureFlags = [ @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { "--with-sock-dir=/run" "--with-privsep-user=smtpd" "--with-queue-user=smtpq" + "--with-ca-file=/etc/ssl/certs/ca-bundle.crt" ]; meta = { diff --git a/pkgs/servers/mail/spamassassin/default.nix b/pkgs/servers/mail/spamassassin/default.nix index dc316267e6c..03e579bda20 100644 --- a/pkgs/servers/mail/spamassassin/default.nix +++ b/pkgs/servers/mail/spamassassin/default.nix @@ -13,11 +13,11 @@ # buildPerlPackage rec { - name = "SpamAssassin-3.3.2"; + name = "SpamAssassin-3.4.0"; src = fetchurl { url = "http://apache.imsam.info/spamassassin/source/Mail-${name}.tar.bz2"; - sha256 = "01d2jcpy423zfnhg123wlhzysih1hmb93nxfspiaajzh9r5rn8y7"; + sha256 = "0527rv6m5qd41l756fqh9q7sm9m2xfhhy2jchlhbmd39x6x3jfsm"; }; buildInputs = [ makeWrapper HTMLParser NetDNS NetAddrIP DBFile HTTPDate MailDKIM diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 3b0069b8118..7a2f3538fb8 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -27,10 +27,10 @@ let mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}"; in stdenv.mkDerivation rec { - name = "mpd-0.18.5"; + name = "mpd-0.18.9"; src = fetchurl { url = "http://www.musicpd.org/download/mpd/stable/${name}.tar.gz"; - sha256 = "1jhkpbwjmzicnkjl8nsfjdgsvqvkcdjm497rl081sy8mq1jzr80c"; + sha256 = "0mgfyrhjlalwngx9j3xxfpfwygh9a31k1ni1isi898bb2x8zsl08"; }; buildInputs = [ pkgconfig glib ] diff --git a/pkgs/servers/serfdom/default.nix b/pkgs/servers/serfdom/default.nix new file mode 100644 index 00000000000..13c878888e2 --- /dev/null +++ b/pkgs/servers/serfdom/default.nix @@ -0,0 +1,101 @@ +{ stdenv, fetchurl, fetchgit, go, lib }: + +let + goDeps = [ + { + dir = "github.com/hashicorp"; + name = "serf"; + rev = "21113c8207d8e02b7ff738c9be80fcaabf67251d"; + sha256 = "10lmgb0caffp0x02nriahyfq9p6qkhr8carfq38m8cjxqxs2v0nk"; + } + { + dir = "github.com/armon"; + name = "go-metrics"; + rev = "8ceaed1d0bc3a25db6e65e79ee4f895013313c17"; + sha256 = "1yzajmx26br4812m9gz4v7qj6fcmhg4a9jz9l3i20hh2x06srmpg"; + } + { + dir = "github.com/hashicorp"; + name = "logutils"; + rev = "8e0820fe7ac5eb2b01626b1d99df47c5449eb2d8"; + sha256 = "184lnn7x1v3xvj6zz1rg9s0252wkkd59kij2iyrrm7y80bym2jys"; + } + { + dir = "github.com/hashicorp"; + name = "memberlist"; + rev = "825ad4aca57c7323e8dadde149bfdec9d9621ffe"; + sha256 = "0mm0hm2kncafq5ml58ki7ilh3b47ni0w19n50ilahhhm4lsfry7z"; + } + { + dir = "github.com/ugorji"; + name = "go"; + rev = "cdeae7b76625959e4164eab9eb303087a794f2cc"; + sha256 = "0pcjlbhp6vxnksy12rav6c8bvi2v010407l5hibxqdvnampvhlkb"; + } + { + dir = "github.com/mitchellh"; + name = "cli"; + rev = "69f0b65ce53b27f729b1b807b88dc88007f41dd3"; + sha256 = "0hnnqd8vg5ca2hglkrj141ba2akdh7crl2lsrgz8d6ipw6asszx3"; + } + { + dir = "github.com/armon"; + name = "mdns"; + rev = "17be83de467449f38a8395c30534a9cf0c03e5ea"; + sha256 = "1fhb6vldclgdx9aqqh1gl87cl5sw3nbq9b7mibkljhbk3cdajyxn"; + } + { + dir = "github.com/miekg"; + name = "dns"; + rev = "5eec7f362c392f0a7eaadea69b13667d665feb82"; + sha256 = "0irlzhd78qmn3lyfbkxmwajv0mm6jp6x0cg7hb9hyj6d01ynlv09"; + } + { + dir = "github.com/mitchellh"; + name = "mapstructure"; + rev = "57bb2fa7a7e00b26c80e4c4b0d4f15a210d94039"; + sha256 = "13lvd5vw8y6h5zl3samkrb7237kk778cky7k7ys1cm46mfd957zy"; + } + ]; + createGoPathCmds = + lib.concatStrings + (map (desc: + let + fetched = fetchgit { url = "https://${desc.dir}/${desc.name}"; + inherit (desc) rev sha256; }; + in '' + mkdir -p $GOPATH/src/${desc.dir} + ln -s ${fetched} $GOPATH/src/${desc.dir}/${desc.name} + '') goDeps); +in + stdenv.mkDerivation rec { + version = "0.4.1"; + name = "serfdom-${version}"; + + src = fetchurl { + url = "https://github.com/hashicorp/serf/archive/v${version}.tar.gz"; + sha256 = "0f4fxhw2r31ks9rs9h3wx9lsymnp8szk0gzggvibwhl2bm6kn6d8"; + }; + + buildInputs = [ go ]; + + buildPhase = '' + mkdir $TMPDIR/go + export GOPATH=$TMPDIR/go + ${createGoPathCmds} + go build -v -o bin/serf + ''; + + installPhase = '' + ensureDir $out/bin + cp bin/serf $out/bin + ''; + + meta = with stdenv.lib; { + description = "Serf is a service discovery and orchestration tool that is decentralized, highly available, and fault tolerant"; + homepage = http://www.serfdom.io/; + license = licenses.mpl20; + maintainers = [ maintainers.msackman ]; + platforms = platforms.linux; + }; + } diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix new file mode 100644 index 00000000000..db6797a8d68 --- /dev/null +++ b/pkgs/servers/sql/mariadb/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, cmake, ncurses, openssl, bison, boost, libxml2, libaio, judy, libevent, groff }: + +stdenv.mkDerivation rec { + name = "mariadb-10.0.8"; + + src = fetchurl { + url = "http://tweedo.com/mirror/mariadb/${name}/kvm-tarbake-jaunty-x86/${name}.tar.gz"; + md5 = "2b925d0beae8101f1f3f98102da91bf7"; + }; + + buildInputs = [ cmake ncurses openssl bison boost libxml2 libaio judy libevent groff ]; + + cmakeFlags = [ "-DWITH_READLINE=yes" "-DWITH_EMBEDDED_SERVER=yes" "-DWITHOUT_TOKUDB=1" "-DINSTALL_SCRIPTDIR=bin" ]; + + enableParallelBuilding = true; + + passthru.mysqlVersion = "5.5"; + + meta = { + description = "An enhanced, drop-in replacement for MySQL"; + homepage = https://mariadb.org/; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.shlevy ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/servers/sql/mysql/5.1.x.nix b/pkgs/servers/sql/mysql/5.1.x.nix index c210c996532..c309158a670 100644 --- a/pkgs/servers/sql/mysql/5.1.x.nix +++ b/pkgs/servers/sql/mysql/5.1.x.nix @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { rm -rf $out/mysql-test $out/sql-bench $out/share/info ''; + passthru.mysqlVersion = "5.1"; + meta = { homepage = http://www.mysql.com/; description = "The world's most popular open source database"; diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix index bd30b7db75f..e8da8a48d65 100644 --- a/pkgs/servers/sql/mysql/5.5.x.nix +++ b/pkgs/servers/sql/mysql/5.5.x.nix @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { rm -rf $out/mysql-test $out/sql-bench ''; + passthru.mysqlVersion = "5.5"; + meta = { homepage = http://www.mysql.com/; description = "The world's most popular open source database"; diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix index b027d0093e8..58d7159034a 100644 --- a/pkgs/servers/sql/postgresql/8.4.x.nix +++ b/pkgs/servers/sql/postgresql/8.4.x.nix @@ -1,24 +1,28 @@ { stdenv, fetchurl, zlib, ncurses, readline }: -let version = "8.4.19"; in +let version = "8.4.20"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "f744d04a5d9feeea516fa57fea92be5568527bab03a84cf660a06ce90f90dcea"; + sha256 = "e84e46083a6accd2bf37f0bd7253415649afcafc49f2564bc8481c10ed90d7c1"; }; buildInputs = [ zlib ncurses readline ]; LC_ALL = "C"; + patches = [ ./less-is-more.patch ]; + passthru = { inherit readline; }; meta = { homepage = http://www.postgresql.org/; description = "A powerful, open source object-relational database system"; license = "bsd"; + maintainers = [ stdenv.lib.maintainers.ocharles ]; + hydraPlatforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix index 40878fc6e78..033328cbcfe 100644 --- a/pkgs/servers/sql/postgresql/9.0.x.nix +++ b/pkgs/servers/sql/postgresql/9.0.x.nix @@ -1,19 +1,21 @@ { stdenv, fetchurl, zlib, readline }: -let version = "9.0.15"; in +let version = "9.0.16"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "a45acd27d546e425911ecd371247066be5dafd96304e50e0708c84b918c28f9d"; + sha256 = "900f6ab00fc36c94b17430e7cb22499708025da1e34d7a70aefaf9a875f0fabf"; }; buildInputs = [ zlib readline ]; LC_ALL = "C"; + patches = [ ./less-is-more.patch ]; + passthru = { inherit readline; psqlSchema = "9.0"; @@ -23,5 +25,7 @@ stdenv.mkDerivation rec { homepage = http://www.postgresql.org/; description = "A powerful, open source object-relational database system"; license = "bsd"; + maintainers = [ stdenv.lib.maintainers.ocharles ]; + hydraPlatforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix index 9eefe708798..7e876322808 100644 --- a/pkgs/servers/sql/postgresql/9.1.x.nix +++ b/pkgs/servers/sql/postgresql/9.1.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, readline }: -let version = "9.1.11"; in +let version = "9.1.12"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "ccbc35aae1490ee5878b97a6aea48dad7465cdad296b380542e4303b68cc6f74"; + sha256 = "0b267ebab5feb39ad6ef945b9588787886e7f7e5284467921d18cc7b76bcb383"; }; buildInputs = [ zlib readline ]; @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { LC_ALL = "C"; + patches = [ ./less-is-more.patch ]; + postInstall = '' mkdir -p $out/share/man @@ -31,5 +33,7 @@ stdenv.mkDerivation rec { homepage = http://www.postgresql.org/; description = "A powerful, open source object-relational database system"; license = "bsd"; + maintainers = [ stdenv.lib.maintainers.ocharles ]; + hydraPlatforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/servers/sql/postgresql/9.2.x.nix b/pkgs/servers/sql/postgresql/9.2.x.nix index 8f78dffb4ba..da0516a9618 100644 --- a/pkgs/servers/sql/postgresql/9.2.x.nix +++ b/pkgs/servers/sql/postgresql/9.2.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, readline }: -let version = "9.2.6"; in +let version = "9.2.7"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "4ba98053a66e5678af93dbc2956e8b04623f759e174f48940c41f4251cf0f886"; + sha256 = "83c042c3f61c69b176d3e4344e59104f844bc8b8628dad2bb9022a64cf5afe86"; }; buildInputs = [ zlib readline ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { makeFlags = [ "world" ]; - patches = [ ./disable-resolve_symlinks.patch ]; + patches = [ ./disable-resolve_symlinks.patch ./less-is-more.patch ]; installTargets = [ "install-world" ]; @@ -31,5 +31,7 @@ stdenv.mkDerivation rec { homepage = http://www.postgresql.org/; description = "A powerful, open source object-relational database system"; license = "bsd"; + maintainers = [ stdenv.lib.maintainers.ocharles ]; + hydraPlatforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/servers/sql/postgresql/9.3.x.nix b/pkgs/servers/sql/postgresql/9.3.x.nix index cb33c6f2921..7f6e2d25d18 100644 --- a/pkgs/servers/sql/postgresql/9.3.x.nix +++ b/pkgs/servers/sql/postgresql/9.3.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, readline }: -let version = "9.3.2"; in +let version = "9.3.3"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "700da51a71857e092f6af1c85fcd86b46d7d5cd2f2ba343cafb1f206c20232d7"; + sha256 = "e925d8abe7157bd8bece6b7c0dd0c343d87a2b4336f85f4681ce596af99c3879"; }; buildInputs = [ zlib readline ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { makeFlags = [ "world" ]; - patches = [ ./disable-resolve_symlinks.patch ]; + patches = [ ./disable-resolve_symlinks.patch ./less-is-more.patch ]; installTargets = [ "install-world" ]; @@ -31,5 +31,7 @@ stdenv.mkDerivation rec { homepage = http://www.postgresql.org/; description = "A powerful, open source object-relational database system"; license = "bsd"; + maintainers = [ stdenv.lib.maintainers.ocharles ]; + hydraPlatforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/servers/sql/postgresql/less-is-more.patch b/pkgs/servers/sql/postgresql/less-is-more.patch new file mode 100644 index 00000000000..d640d24bdaa --- /dev/null +++ b/pkgs/servers/sql/postgresql/less-is-more.patch @@ -0,0 +1,12 @@ +diff -Naur postgresql-9.2.7-orig/src/bin/psql/print.h postgresql-9.2.7/src/bin/psql/print.h +--- postgresql-9.2.7-orig/src/bin/psql/print.h 2014-02-17 14:38:15.000000000 -0500 ++++ postgresql-9.2.7/src/bin/psql/print.h 2014-03-04 14:42:28.874014415 -0500 +@@ -178,7 +178,7 @@ + extern const printTextFormat *get_line_style(const printTableOpt *opt); + + #ifndef __CYGWIN__ +-#define DEFAULT_PAGER "more" ++#define DEFAULT_PAGER "less" + #else + #define DEFAULT_PAGER "less" + #endif diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index a0cc0c7b148..beca7414c36 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -79,6 +79,16 @@ let buildInputs = [pkgconfig ]; })) // {inherit ;}; + dri3proto = (stdenv.mkDerivation ((if overrides ? dri3proto then overrides.dri3proto else x: x) { + name = "dri3proto-1.0"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/proto/dri3proto-1.0.tar.bz2; + sha256 = "0x609xvnl8jky5m8jdklw4nymx3irkv32w99dfd8nl800bblkgh1"; + }; + buildInputs = [pkgconfig ]; + })) // {inherit ;}; + encodings = (stdenv.mkDerivation ((if overrides ? encodings then overrides.encodings else x: x) { name = "encodings-1.0.4"; builder = ./builder.sh; @@ -909,6 +919,16 @@ let buildInputs = [pkgconfig kbproto libX11 ]; })) // {inherit kbproto libX11 ;}; + libxshmfence = (stdenv.mkDerivation ((if overrides ? libxshmfence then overrides.libxshmfence else x: x) { + name = "libxshmfence-1.1"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/lib/libxshmfence-1.1.tar.bz2; + sha256 = "1gnfb1z8sbbdc3xpz1zmm94lv7yvfh4kvip9s5pj37ya4llxphnv"; + }; + buildInputs = [pkgconfig xproto ]; + })) // {inherit xproto ;}; + lndir = (stdenv.mkDerivation ((if overrides ? lndir then overrides.lndir else x: x) { name = "lndir-1.0.3"; builder = ./builder.sh; @@ -959,6 +979,16 @@ let buildInputs = [pkgconfig libfontenc freetype xproto zlib ]; })) // {inherit libfontenc freetype xproto zlib ;}; + presentproto = (stdenv.mkDerivation ((if overrides ? presentproto then overrides.presentproto else x: x) { + name = "presentproto-1.0"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/proto/presentproto-1.0.tar.bz2; + sha256 = "1kir51aqg9cwazs14ivcldcn3mzadqgykc9cg87rm40zf947sb41"; + }; + buildInputs = [pkgconfig ]; + })) // {inherit ;}; + printproto = (stdenv.mkDerivation ((if overrides ? printproto then overrides.printproto else x: x) { name = "printproto-1.0.5"; builder = ./builder.sh; @@ -1180,11 +1210,11 @@ let })) // {inherit gperf m4 libxcb xproto ;}; xcbutilwm = (stdenv.mkDerivation ((if overrides ? xcbutilwm then overrides.xcbutilwm else x: x) { - name = "xcb-util-wm-0.4.0"; + name = "xcb-util-wm-0.4.1"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/xcb-util-wm-0.4.0.tar.bz2; - sha256 = "07zmlaaqkasihmkfwcac4wclb8zws915inz57y3kr3frywc7ryb6"; + url = http://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2; + sha256 = "0gra7hfyxajic4mjd63cpqvd20si53j1q3rbdlkqkahfciwq3gr8"; }; buildInputs = [pkgconfig gperf m4 libxcb xproto ]; })) // {inherit gperf m4 libxcb xproto ;}; diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list index 90c8e489e1e..867e050bce0 100644 --- a/pkgs/servers/x11/xorg/extra.list +++ b/pkgs/servers/x11/xorg/extra.list @@ -5,5 +5,5 @@ http://xcb.freedesktop.org/dist/xcb-util-0.3.9.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-image-0.3.9.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-keysyms-0.3.9.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.8.tar.bz2 -http://xcb.freedesktop.org/dist/xcb-util-wm-0.4.0.tar.bz2 +http://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2 http://xorg.freedesktop.org/releases/individual/util/util-macros-1.17.tar.bz2 diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 2eb08b1831d..24279ac70f9 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -5,6 +5,8 @@ mirror://xorg/X11R7.7/src/everything/compositeproto-0.4.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/damageproto-1.2.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/dmxproto-2.3.1.tar.bz2 mirror://xorg/individual/proto/dri2proto-2.8.tar.bz2 +mirror://xorg/individual/proto/dri3proto-1.0.tar.bz2 +mirror://xorg/individual/proto/presentproto-1.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/encodings-1.0.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/fixesproto-5.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-adobe-100dpi-1.0.3.tar.bz2 @@ -50,6 +52,7 @@ mirror://xorg/individual/proto/inputproto-2.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/kbproto-1.0.6.tar.bz2 mirror://xorg/X11R7.7/src/everything/libAppleWM-1.4.1.tar.bz2 mirror://xorg/individual/lib/libdmx-1.1.3.tar.bz2 +mirror://xorg/individual/lib/libxshmfence-1.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/libfontenc-1.1.1.tar.bz2 mirror://xorg/individual/lib/libFS-1.0.5.tar.bz2 mirror://xorg/X11R7.7/src/everything/libICE-1.0.8.tar.bz2 diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index cb7e3ba925f..0e45ad05531 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -187,51 +187,13 @@ rec { { mkDerivation = args: stdenv.mkDerivation (args // extraAttrs); }; - /* Return a modified stdenv that performs the build under $out/.build - instead of in $TMPDIR. Thus, the sources are kept available. - This is useful for things like debugging or generation of - dynamic analysis reports. */ - keepBuildTree = stdenv: - addAttrsToDerivation - { prePhases = "moveBuildDir"; - - moveBuildDir = - '' - mkdir -p $out/.build - cd $out/.build - ''; - } stdenv; - - - cleanupBuildTree = stdenv: - addAttrsToDerivation - { postPhases = "cleanupBuildDir"; - - # Get rid of everything that isn't a gcno file or a C source - # file. This also includes the gcda files; we're not - # interested in coverage resulting from the package's own test - # suite. Also strip the `.tmp_' prefix from gcno files. (The - # Linux kernel creates these.) - cleanupBuildDir = - '' - find $out/.build/ -type f -a ! \ - \( -name "*.c" -o -name "*.h" -o -name "*.gcno" \) \ - | xargs rm -f -- - - for i in $(find $out/.build/ -name ".tmp_*.gcno"); do - mv "$i" "$(echo $i | sed s/.tmp_//)" - done - ''; - } stdenv; - - /* Return a modified stdenv that builds packages with GCC's coverage instrumentation. The coverage note files (*.gcno) are stored in $out/.build, along with the source code of the package, to enable programs like lcov to produce pretty-printed reports. */ addCoverageInstrumentation = stdenv: - cleanupBuildTree (keepBuildTree (overrideInStdenv stdenv [ pkgs.enableCoverageInstrumentation ])); + overrideInStdenv stdenv [ pkgs.enableGCOVInstrumentation pkgs.keepBuildTree ]; /* Replace the meta.maintainers field of a derivation. This is useful diff --git a/pkgs/tools/X11/winswitch/default.nix b/pkgs/tools/X11/winswitch/default.nix index bd160940b57..2db0d172173 100644 --- a/pkgs/tools/X11/winswitch/default.nix +++ b/pkgs/tools/X11/winswitch/default.nix @@ -29,12 +29,10 @@ let }' winswitch/util/distro_packaging_util.py ''; - buildPhase = '' - python setup.py build - ''; - - installCommand = '' - PREFIX="$out" python ./setup.py install --prefix="$out" + preInstall = '' + # see https://bitbucket.org/pypa/setuptools/issue/130/install_data-doesnt-respect-prefix + python setup.py install_data --install-dir=$out --root=$out + sed -i '/data_files = data_files/d' setup.py ''; doCheck = false; diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 35370ae2128..f96fa577323 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; buildInputs = [ - python cython pkgconfig + cython pkgconfig xorg.libX11 xorg.renderproto xorg.libXrender xorg.libXi xorg.inputproto xorg.kbproto xorg.randrproto xorg.damageproto xorg.compositeproto xorg.xextproto xorg.recordproto @@ -33,9 +33,15 @@ buildPythonPackage rec { # they don't have automated testing out of the box? http://xpra.org/trac/ticket/177 doCheck = false; - buildPhase = '' - NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-2.0) $(pkg-config --cflags pygtk-2.0) $(pkg-config --cflags xtst)" - python ./setup.py build --enable-Xdummy + preBuild = '' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-2.0) $(pkg-config --cflags pygtk-2.0) $(pkg-config --cflags xtst)" + ''; + setupPyBuildFlags = ["--enable-Xdummy"]; + + preInstall = '' + # see https://bitbucket.org/pypa/setuptools/issue/130/install_data-doesnt-respect-prefix + ${python}/bin/${python.executable} setup.py install_data --install-dir=$out --root=$out + sed -i '/ = data_files/d' setup.py ''; meta = { diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix index 44a421e2ba3..d4c45b7ba96 100644 --- a/pkgs/tools/admin/gtk-vnc/default.nix +++ b/pkgs/tools/admin/gtk-vnc/default.nix @@ -1,62 +1,41 @@ -x@{builderDefsPackage - , python, gtk, pygtk, gnutls, cairo, libtool, glib, pkgconfig, libtasn1 - , libffi, cyrus_sasl, intltool, perl, perlPackages, firefoxPkgs - , kbproto, libX11, libXext, xextproto, pygobject, libgcrypt - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - ["perlPackages" "firefoxPkgs"]; +{ stdenv, fetchurl +, python, gtk, pygtk, gnutls, cairo, libtool, glib, pkgconfig, libtasn1 +, libffi, cyrus_sasl, intltool, perl, perlPackages, firefoxPkgs, pulseaudio +, kbproto, libX11, libXext, xextproto, pygobject, libgcrypt }: - buildInputs = (map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames))) - ++ [perlPackages.TextCSV firefoxPkgs.xulrunner ]; - sourceInfo = rec { - baseName="gtk-vnc"; - majorVersion="0.4"; - minorVersion="2"; - version="${majorVersion}.${minorVersion}"; - name="${baseName}-${version}"; - url="mirror://gnome/sources/${baseName}/${majorVersion}/${name}.tar.gz"; - hash="1fkhzwpw50rnwp51lsbny16p2ckzx5rkcaiaqvkd90vwnm2cccls"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; + +stdenv.mkDerivation rec { + name = "gtk-vnc-${version}"; + version = "0.5.3"; + + src = fetchurl { + url = "mirror://gnome/sources/gtk-vnc/0.5/${name}.tar.xz"; + sha256 = "1bww2ihxb3zzvifdrcsy1lifr664pvikq17hmr1hsm8fyk4ad46l"; }; - inherit (sourceInfo) name version; - inherit buildInputs; + buildInputs = [ + python gtk pygtk gnutls cairo libtool pkgconfig glib libffi libgcrypt + intltool cyrus_sasl pulseaudio pygobject perl perlPackages.TextCSV + ]; + NIX_CFLAGS_COMPILE = "-fstack-protector-all"; configureFlags = [ "--with-python" "--with-examples" ]; - /* doConfigure should be removed if not needed */ - phaseNames = ["fixMakefiles" "doConfigure" "doMakeInstall"]; + makeFlags = "CODEGENDIR=${pygobject}/share/pygobject/2.0/codegen/ DEFSDIR=${pygtk}/share/pygtk/2.0/defs/"; - fixMakefiles = a.fullDepEntry '' - find . -name 'Makefile*' -exec sed -i '{}' -e 's@=codegendir pygtk-2.0@=codegendir pygobject-2.0@' ';' - '' ["minInit" "doUnpack"]; - - meta = { + meta = with stdenv.lib; { description = "A GTK VNC widget"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; - license = a.lib.licenses.lgpl21; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.linux; + license = licenses.lgpl21; }; + passthru = { updateInfo = { downloadPage = "http://ftp.gnome.org/pub/GNOME/sources/gtk-vnc"; }; }; -}) x - +} diff --git a/pkgs/tools/archivers/xarchiver/default.nix b/pkgs/tools/archivers/xarchiver/default.nix new file mode 100644 index 00000000000..fc5b984bd90 --- /dev/null +++ b/pkgs/tools/archivers/xarchiver/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, gtk2, pkgconfig, intltool }: + +stdenv.mkDerivation rec { + version = "0.5.3"; + name = "xarchiver-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/xarchiver/${name}.tar.bz2"; + sha256 = "10bdq406xkl2q6rl6qvvipdr3ini5lnh1sjykgw66fp8jns9r2f5"; + }; + + buildInputs = [ gtk2 pkgconfig intltool ]; + + meta = { + description = "GTK+2 only frontend to 7z,zip,rar,tar,bzip2, gzip,arj, lha, rpm and deb (open and extract only)"; + homepage = http://sourceforge.net/projects/xarchiver/; + mainatainers = [ stdenv.lib.maintainers.iElectric ]; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index 48f2757db86..ec4c00880d4 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, python, librsync, ncftp, gnupg, boto, makeWrapper }: let - version = "0.6.22"; + version = "0.6.23"; in stdenv.mkDerivation { name = "duplicity-${version}"; src = fetchurl { url = "http://code.launchpad.net/duplicity/0.6-series/${version}/+download/duplicity-${version}.tar.gz"; - sha256 = "04jskh1j85s35vfzm9gylpl7ysn5njbl0gcg92bhc7v88l29nj3g"; + sha256 = "0q0ckkmyq9z7xfbb1jajflmbzjwxpcjkkiab43rxrplm0ghz25vs"; }; installPhase = '' diff --git a/pkgs/tools/bluetooth/obex-data-server/default.nix b/pkgs/tools/bluetooth/obex-data-server/default.nix index 790b57f4a76..53e854c34eb 100644 --- a/pkgs/tools/bluetooth/obex-data-server/default.nix +++ b/pkgs/tools/bluetooth/obex-data-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libusb, glib, dbus_glib, bluez, openobex }: +{ stdenv, fetchurl, pkgconfig, libusb, glib, dbus_glib, bluez, openobex, dbus_libs }: stdenv.mkDerivation rec { name = "obex-data-server-0.4.6"; @@ -8,7 +8,14 @@ stdenv.mkDerivation rec { sha256 = "0kq940wqs9j8qjnl58d6l3zhx0jaszci356xprx23l6nvdfld6dk"; }; - buildInputs = [ pkgconfig libusb glib dbus_glib bluez openobex ]; + buildInputs = [ pkgconfig libusb glib dbus_glib bluez openobex dbus_libs ]; + + patches = [ ./obex-data-server-0.4.6-build-fixes-1.patch ]; + + preConfigure = '' + addToSearchPath PKG_CONFIG_PATH ${openobex}/lib64/pkgconfig + export PKG_CONFIG_PATH="${dbus_libs}/lib/pkgconfig:$PKG_CONFIG_PATH" + ''; meta = { homepage = http://wiki.muiline.com/obex-data-server; diff --git a/pkgs/tools/bluetooth/obex-data-server/obex-data-server-0.4.6-build-fixes-1.patch b/pkgs/tools/bluetooth/obex-data-server/obex-data-server-0.4.6-build-fixes-1.patch new file mode 100644 index 00000000000..b5fde8db589 --- /dev/null +++ b/pkgs/tools/bluetooth/obex-data-server/obex-data-server-0.4.6-build-fixes-1.patch @@ -0,0 +1,56 @@ +Submitted By: Armin K. +Date: 2012-07-06 +Initial Package Version: 0.4.6 +Upstream Status: Unknown +Origin: Self +Description: Some build fixes. + +--- obex-data-server.orig/src/ods-obex.c 2011-02-10 10:14:42.000000000 +0100 ++++ obex-data-server/src/ods-obex.c 2012-07-06 20:10:09.208712553 +0200 +@@ -412,7 +412,7 @@ + goto err; + } + +- interfaces_num = OBEX_FindInterfaces(obex_context->obex_handle, &obex_intf); ++ interfaces_num = OBEX_EnumerateInterfaces(obex_context->obex_handle); + if (intf_num >= interfaces_num) { + g_set_error (error, ODS_ERROR, ODS_ERROR_FAILED, "Invalid interface number"); + goto err; +@@ -1928,7 +1928,7 @@ + gchar *uname; + gsize uname_len; + +- if (action != OBEX_ACTION_SETPERM) ++ if (action != 0x03) + g_assert (src && dst); + + object = OBEX_ObjectNew (obex_context->obex_handle, OBEX_CMD_ACTION); +@@ -1974,7 +1974,7 @@ + OBEX_HDR_ACTION_ID, hv, 1, 0); + + /* permissions header */ +- if (action == OBEX_ACTION_SETPERM) { ++ if (action == 0x03) { + hv.bq4 = perms; + ret = OBEX_ObjectAddHeader (obex_context->obex_handle, object, + OBEX_HDR_PERMISSIONS, hv, 4, 0); +--- obex-data-server.orig/src/ods-session.c 2011-02-10 09:57:31.000000000 +0100 ++++ obex-data-server/src/ods-session.c 2012-07-06 20:10:09.208712553 +0200 +@@ -1761,7 +1761,7 @@ + DBusGMethodInvocation *context) + { + return ods_session_remote_action (session, remote_source, +- remote_destination, OBEX_ACTION_COPY, ++ remote_destination, 0x00, + context); + } + +@@ -1772,7 +1772,7 @@ + DBusGMethodInvocation *context) + { + return ods_session_remote_action (session, remote_source, +- remote_destination, OBEX_ACTION_MOVE, ++ remote_destination, 0x01, + context); + } + diff --git a/pkgs/tools/cd-dvd/vobsub2srt/default.nix b/pkgs/tools/cd-dvd/vobsub2srt/default.nix new file mode 100644 index 00000000000..30ae07f9dbd --- /dev/null +++ b/pkgs/tools/cd-dvd/vobsub2srt/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchgit, cmake, libtiff, pkgconfig, tesseract }: + +let rev = "b70b6f584e8151f70f9d90df054af0911ea7475e"; + shortRev = builtins.substring 0 7 rev; +in +stdenv.mkDerivation { + name = "vobsub2srt-git-20140226-${shortRev}"; + + src = fetchgit { + inherit rev; + url = https://github.com/ruediger/VobSub2SRT.git; + sha256 = "15437eba07e674cec66bc54cfa42ffe8b05816975401c9950bf9016e3881cd6a"; + }; + + buildInputs = [ cmake libtiff pkgconfig ]; + propagatedBuildInputs = [ tesseract ]; + + meta = { + homepage = https://github.com/ruediger/VobSub2SRT; + description = "Converts VobSub subtitles into SRT subtitles"; + license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/tools/filesystems/mtools/default.nix b/pkgs/tools/filesystems/mtools/default.nix index f5c07b031b8..0b666f38942 100644 --- a/pkgs/tools/filesystems/mtools/default.nix +++ b/pkgs/tools/filesystems/mtools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "mtools-4.0.17"; + name = "mtools-4.0.18"; src = fetchurl { url = "mirror://gnu/mtools/${name}.tar.bz2"; - sha256 = "1dpch2wsiwhyg7xhsdvmc1pws8biwqkmnqjc3mdj2bd76273bk0f"; + sha256 = "119gdfnsxc6hzicnsf718k0fxgy2q14pxn7557rc96aki20czsar"; }; doCheck = true; diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix index 4befab17b6f..98cf3c533ae 100644 --- a/pkgs/tools/filesystems/sshfs-fuse/default.nix +++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, fuse }: stdenv.mkDerivation rec { - name = "sshfs-fuse-2.4"; + name = "sshfs-fuse-2.5"; src = fetchurl { url = "mirror://sourceforge/fuse/${name}.tar.gz"; - sha256 = "1ladfxflg0pzd5br0p9n5790sf1975va7igr9z4r702n4a2vm4rw"; + sha256 = "0gp6qr33l2p0964j0kds0dfmvyyf5lpgsn11daf0n5fhwm9185z9"; }; buildInputs = [ pkgconfig glib fuse ]; diff --git a/pkgs/tools/graphics/pstoedit/default.nix b/pkgs/tools/graphics/pstoedit/default.nix index efdeffe1ad7..62816705b8f 100644 --- a/pkgs/tools/graphics/pstoedit/default.nix +++ b/pkgs/tools/graphics/pstoedit/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, ghostscript, gd, zlib, plotutils }: stdenv.mkDerivation { - name = "pstoedit-3.50"; + name = "pstoedit-3.62"; src = fetchurl { - url = mirror://sourceforge/pstoedit/pstoedit-3.50.tar.gz; - sha256 = "04ap21fxj2zn6vj9mv7zknj4svcbkb1gxwfzxkw5i0sksx969c92"; + url = mirror://sourceforge/pstoedit/pstoedit-3.62.tar.gz; + sha256 = "0j410dm9nqwa7n03yiyz0jwvln0jlqc3n9iv4nls33yl6x3c8x40"; }; buildInputs = [ pkgconfig ghostscript gd zlib plotutils ]; diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index 00d2f759be4..50af2a12c24 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -2,11 +2,11 @@ , pkgconfig, gtkmm, libxml2 }: stdenv.mkDerivation rec { - name = "gparted-0.15.0"; + name = "gparted-0.18.0"; src = fetchurl { url = "mirror://sourceforge/gparted/${name}.tar.bz2"; - sha256 = "03s9dp2q281lkkfjgk9ahc8i6dk4d2a03z4bh2d19a7r3b2mmdww"; + sha256 = "0slyf0sbv7a7xvdcpn9ibnixpy0w4s6zwpz6sklkxcyfybw1j7xz"; }; configureFlags = "--disable-doc"; diff --git a/pkgs/tools/misc/i3minator/default.nix b/pkgs/tools/misc/i3minator/default.nix index cb12cb33c76..08e012128c2 100644 --- a/pkgs/tools/misc/i3minator/default.nix +++ b/pkgs/tools/misc/i3minator/default.nix @@ -15,11 +15,11 @@ let }; in buildPythonPackage rec { name = "i3minator-${version}"; - version = "0.0.3"; + version = "0.0.4"; src = fetchurl { - url = "https://github.com/carlesso/i3minator/archive/v${version}.tar.gz"; - sha256 = "0ksb0frrhq10k5rjzk72kj5rjzak1irr9q4x4f22w2vylxq19xxa"; + url = "https://github.com/carlesso/i3minator/archive/${version}.tar.gz"; + sha256 = "11dn062788kwfs8k2ry4v8zr2gn40r6lsw770s9g2gvhl5n469dw"; }; propagatedBuildInputs = [ pythonPackages.pyyaml i3-py ]; diff --git a/pkgs/tools/misc/kde-gtk-config/default.nix b/pkgs/tools/misc/kde-gtk-config/default.nix index e9f0af2815a..873d2adde7f 100644 --- a/pkgs/tools/misc/kde-gtk-config/default.nix +++ b/pkgs/tools/misc/kde-gtk-config/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { -DKDE4_LIBEXEC_INSTALL_DIR=lib/kde4/libexec ''; - meta = { + meta = with stdenv.lib; { homepage = https://projects.kde.org/projects/extragear/base/kde-gtk-config; description = "GTK configuration module for KDE System Settings"; longDescription = '' @@ -43,7 +43,8 @@ stdenv.mkDerivation { - Select GTK applications default fonts. - Easily browse and install new GTK2 and GTK3 themes. ''; - platforms = stdenv.lib.platforms.linux; - license = "GPLv3"; + platforms = platforms.linux; + license = licenses.gpl3; + maintainers = [ maintainers.ttuegel ]; }; } diff --git a/pkgs/tools/misc/memtest86/default.nix b/pkgs/tools/misc/memtest86/default.nix index 978bb2729f8..ebf0a89a707 100644 --- a/pkgs/tools/misc/memtest86/default.nix +++ b/pkgs/tools/misc/memtest86/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "memtest86-4.1.0"; + name = "memtest86-4.3.3"; src = fetchurl { - url = http://www.memtest86.com/downloads/memtest86-4.1.0-src.tar.gz; - sha256 = "1kdvq16s8hvk7plprws33mfh7cnhmfl1m32sfgbmzygbhk5wqxxq"; + url = http://www.memtest86.com/downloads/memtest86-4.3.3-src.tar.gz; + sha256 = "1fzpk0s97lx8h1wbv2bgr6m8v4ag8i58kzr8fa25bvwyl8hks9sl"; }; preBuild = '' diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix index 47b96023ce0..ff751eb40da 100644 --- a/pkgs/tools/misc/ncdu/default.nix +++ b/pkgs/tools/misc/ncdu/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ncdu-${version}"; - version = "1.8"; + version = "1.10"; src = fetchurl { url = "http://dev.yorhel.nl/download/${name}.tar.gz"; - sha256 = "42aaf0418c05e725b39b220166a9c604a9c54c0fbf7692c9c119b36d0ed5d099"; + sha256 = "0rqc5wpqcbfqpcwxgh3jxwa0yw2py0hv0acpsf0a9g6v9144m6gm"; }; buildInputs = [ ncurses ]; diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index d58b57196d2..fa6f147efe4 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl }: stdenv.mkDerivation rec { - name = "parallel-20130422"; + name = "parallel-20140222"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "0aygc6d2sf2xrnyldv62a17masfs5am4zfm68k4fhvymwcfbp41h"; + sha256 = "0zb3hg92br6a53jn0pzfl16ffc1hfw81jk7nzw5spkshsdrcqx3y"; }; patchPhase = diff --git a/pkgs/tools/misc/pv/default.nix b/pkgs/tools/misc/pv/default.nix index bf0c44de141..480e00c850d 100644 --- a/pkgs/tools/misc/pv/default.nix +++ b/pkgs/tools/misc/pv/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl } : stdenv.mkDerivation rec { - name = "pv-1.4.12"; + name = "pv-1.5.2"; src = fetchurl { url = "http://www.ivarch.com/programs/sources/${name}.tar.bz2"; - sha256 = "0hnpv4l5kidfwxzba7ibm9wjs71ing9gzx0m80bgr3ia8k4s8nka"; + sha256 = "1sz5ishd66xliwnhv0x3vr48fbp7id4xd8fsrbm66y7f5mfd7qp2"; }; meta = { diff --git a/pkgs/tools/misc/xsel/default.nix b/pkgs/tools/misc/xsel/default.nix index 5c8d6f37c7c..74eadaf5e2e 100644 --- a/pkgs/tools/misc/xsel/default.nix +++ b/pkgs/tools/misc/xsel/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, x11}: stdenv.mkDerivation { - name = "xsel-0.9.6"; + name = "xsel-1.2.0"; src = fetchurl { - url = http://www.vergenet.net/~conrad/software/xsel/download/xsel-0.9.6.tar.gz; - md5 = "cec2fb09a4101b7f2beab8094234e2f4"; + url = http://www.vergenet.net/~conrad/software/xsel/download/xsel-1.2.0.tar.gz; + sha256 = "070lbcpw77j143jrbkh0y1v10ppn1jwmjf92800w7x42vh4cw9xr"; }; buildInputs = [x11]; diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index ef4bc68b1c8..8f27798d08a 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, python, zip }: let - version = "2014.02.19.1"; + version = "2014.03.04.2"; in stdenv.mkDerivation rec { name = "youtube-dl-${version}"; src = fetchurl { url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "0bilardg46xikw4gl4n50bg9wrmarmnzhrhhwhdcyrx0p0idl4fn"; + sha256 = "1plqrjs7z4vbfa4h67zgd14j9ka9rnkzkqiwd948k9y3krxijg4p"; }; buildInputs = [ python ]; diff --git a/pkgs/tools/networking/ccnet/0001-Add-autoconfiguration-for-libjansson.patch b/pkgs/tools/networking/ccnet/0001-Add-autoconfiguration-for-libjansson.patch new file mode 100644 index 00000000000..83cdbad7bba --- /dev/null +++ b/pkgs/tools/networking/ccnet/0001-Add-autoconfiguration-for-libjansson.patch @@ -0,0 +1,72 @@ +From f730ba82d641029dd262d05e8533fc7643f4c4b9 Mon Sep 17 00:00:00 2001 +From: Aaron Lindsay +Date: Wed, 15 Jan 2014 13:49:40 -0500 +Subject: [PATCH] Add autoconfiguration for libjansson + +--- + configure.ac | 5 +++++ + net/daemon/Makefile.am | 4 ++-- + net/server/Makefile.am | 2 +- + 3 files changed, 8 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 64e74b5..0911671 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -248,6 +248,7 @@ SEARPC_REQUIRED=1.0 + ZDB_REQUIRED=2.10 + LIBNAUTILUS_EXTENSION_REQUIRED=2.30.1 + SEARPC_REQUIRED=1.0 ++JANSSON_REQUIRED=2.2.1 + CURL_REQUIRED=7.17 + + PKG_CHECK_MODULES(GLIB2, [glib-2.0 >= $GLIB_REQUIRED]) +@@ -262,6 +263,10 @@ PKG_CHECK_MODULES(SEARPC, [libsearpc >= $SEARPC_REQUIRED]) + AC_SUBST(SEARPC_CFLAGS) + AC_SUBST(SEARPC_LIBS) + ++PKG_CHECK_MODULES(JANSSON, [jansson >= $JANSSON_REQUIRED]) ++AC_SUBST(JANSSON_CFLAGS) ++AC_SUBST(JANSSON_LIBS) ++ + if test x${compile_python} = xyes; then + AM_PATH_PYTHON([2.6]) + +diff --git a/net/daemon/Makefile.am b/net/daemon/Makefile.am +index 35d1a3c..0e28c6a 100644 +--- a/net/daemon/Makefile.am ++++ b/net/daemon/Makefile.am +@@ -95,7 +95,7 @@ ccnet_SOURCES = ccnet-daemon.c \ + + ccnet_LDADD = -levent $(top_builddir)/lib/libccnetd.la \ + @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 \ +- @LIB_WS32@ @LIB_INTL@ @LIB_IPHLPAPI@ @SEARPC_LIBS@ ++ @LIB_WS32@ @LIB_INTL@ @LIB_IPHLPAPI@ @SEARPC_LIBS@ @JANSSON_LIBS@ + + + ccnet_LDFLAGS = @STATIC_COMPILE@ @CONSOLE@ @SERVER_PKG_RPATH@ -no-undefined +@@ -106,7 +106,7 @@ ccnet_test_SOURCES = ccnet-test.c daemon-session.c $(common_srcs) + + ccnet_test_LDADD = -levent $(top_builddir)/lib/libccnetd.la \ + @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 \ +- @LIB_WS32@ @LIB_INTL@ @LIB_IPHLPAPI@ @SEARPC_LIBS@ ++ @LIB_WS32@ @LIB_INTL@ @LIB_IPHLPAPI@ @SEARPC_LIBS@ @JANSSON_LIBS@ + + ccnet_test_LDFLAGS = @STATIC_COMPILE@ -no-undefined @CONSOLE@ + +diff --git a/net/server/Makefile.am b/net/server/Makefile.am +index d587f48..b048936 100644 +--- a/net/server/Makefile.am ++++ b/net/server/Makefile.am +@@ -103,7 +103,7 @@ ccnet_server_LDADD = -levent $(top_builddir)/lib/libccnetd.la \ + @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 \ + -lpthread \ + @LIB_WS32@ @LIB_INTL@ @LIB_IPHLPAPI@ @SEARPC_LIBS@ @ZDB_LIBS@ \ +- @LDAP_LIBS@ ++ @LDAP_LIBS@ @JANSSON_LIBS@ + + + ccnet_server_LDFLAGS = @STATIC_COMPILE@ @CONSOLE@ @SERVER_PKG_RPATH@ -no-undefined +-- +1.8.5.2 + diff --git a/pkgs/tools/networking/ccnet/default.nix b/pkgs/tools/networking/ccnet/default.nix new file mode 100644 index 00000000000..14b88ddafe8 --- /dev/null +++ b/pkgs/tools/networking/ccnet/default.nix @@ -0,0 +1,37 @@ +{stdenv, fetchurl, which, automake, autoconf, pkgconfig, libtool, vala, python, libsearpc, libzdb, libuuid, libevent, sqlite, openssl}: + +stdenv.mkDerivation rec +{ + version = "1.4.0"; + seafileVersion = "2.1.1"; + name = "ccnet-${version}"; + + src = fetchurl + { + url = "https://github.com/haiwen/ccnet/archive/v${seafileVersion}.tar.gz"; + sha256 = "6882eb1a3066897e4f91fb60a3405b3f58b4b794334deaca73617003f77a7eb0"; + }; + + patches = [ ./libccnet.pc.patch ./0001-Add-autoconfiguration-for-libjansson.patch ]; + + buildInputs = [ which automake autoconf pkgconfig libtool vala python ]; + propagatedBuildInputs = [ libsearpc libzdb libuuid libevent sqlite openssl ]; + + preConfigure = '' + sed -ie 's|/bin/bash|/bin/sh|g' ./autogen.sh + ./autogen.sh + ''; + + configureFlags = "--enable-server"; + + buildPhase = "make -j1"; + + meta = + { + homepage = "https://github.com/haiwen/ccnet"; + description = "A framework for writing networked applications in C."; + license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.calrama ]; + }; +} diff --git a/pkgs/tools/networking/ccnet/libccnet.pc.patch b/pkgs/tools/networking/ccnet/libccnet.pc.patch new file mode 100644 index 00000000000..0d9fea552bc --- /dev/null +++ b/pkgs/tools/networking/ccnet/libccnet.pc.patch @@ -0,0 +1,10 @@ +From: Aaron Lindsay + +--- a/libccnet.pc.in 2013-01-10 01:35:24.000000000 -0500 ++++ b/libccnet.pc.in 2013-01-19 11:31:50.479301798 -0500 +@@ -1,4 +1,4 @@ +-prefix=(DESTDIR)@prefix@ ++prefix=@prefix@ + exec_prefix=@exec_prefix@ + libdir=@libdir@ + includedir=@includedir@ diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix index 80d29835da5..6d9666506b8 100644 --- a/pkgs/tools/networking/getmail/default.nix +++ b/pkgs/tools/networking/getmail/default.nix @@ -11,8 +11,6 @@ buildPythonPackage rec { doCheck = false; - installCommand = "python setup.py install --prefix=\"\$prefix\""; - meta = { description = "A program for retrieving mail"; maintainers = [ stdenv.lib.maintainers.raskin stdenv.lib.maintainers.iElectric ]; diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix index 24d73ff4d6f..295cb0bf139 100644 --- a/pkgs/tools/networking/inetutils/default.nix +++ b/pkgs/tools/networking/inetutils/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "inetutils-1.9.1"; + name = "inetutils-1.9.2"; src = fetchurl { url = "mirror://gnu/inetutils/${name}.tar.gz"; - sha256 = "0azzg6njgq79byl6960kb0wihfhhzf49snslhxgvi30ribgfpa82"; + sha256 = "04wrm0v7l4890mmbaawd6wjwdv08bkglgqhpz0q4dkb0l50fl8q4"; }; buildInputs = [ ncurses /* for `talk' */ ]; diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 8a8306ea30c..20102aedeb9 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, intltool, wirelesstools, pkgconfig, dbus_glib, xz , udev, libnl, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables , libgcrypt, dnsmasq, avahi, bind, perl, bluez5, substituteAll -, gobjectIntrospection, modemmanager }: +, gobjectIntrospection, modemmanager, openresolv }: stdenv.mkDerivation rec { name = "network-manager-${version}"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { "--with-dhcpcd=no" "--with-iptables=${iptables}/sbin/iptables" "--with-udev-dir=\${out}/lib/udev" - "--without-resolvconf" + "--with-resolvconf=${openresolv}/sbin/resolvconf" "--sysconfdir=/etc" "--localstatedir=/var" "--with-dbus-sys-dir=\${out}/etc/dbus-1/system.d" "--with-crypto=gnutls" "--disable-more-warnings" diff --git a/pkgs/tools/networking/openresolv/default.nix b/pkgs/tools/networking/openresolv/default.nix index 36d3bfeca56..98a76dc98b1 100644 --- a/pkgs/tools/networking/openresolv/default.nix +++ b/pkgs/tools/networking/openresolv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, makeWrapper, coreutils }: stdenv.mkDerivation rec { name = "openresolv-3.5.6"; @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1n3cw1vbm7mh5d95ykhzdn2mrrf3pm65sp61p8iwydz1gqkp2inv"; }; + buildInputs = [ makeWrapper ]; + configurePhase = '' cat > config.mk < /dev/null + LD_LIBRARY_PATH=${ldLibraryPath} Browser/firefox --help 1> /dev/null echo "Checking tor..." LD_LIBRARY_PATH=${torEnv}/lib:Tor Tor/tor --help 1> /dev/null ''; @@ -53,7 +56,7 @@ in stdenv.mkDerivation rec { echo "pref(\"extensions.torlauncher.tordatadir_path\", \"\$HOME/Data/Tor/\");" >> \ ~/Data/Browser/profile.default/preferences/extension-overrides.js fi - export LD_LIBRARY_PATH=${torEnv}/lib:$out/share/tor-browser/Tor + export LD_LIBRARY_PATH=${ldLibraryPath}:$out/share/tor-browser/Tor $out/share/tor-browser/Browser/firefox -no-remote -profile ~/Data/Browser/profile.default "$@" EOF chmod +x $out/bin/tor-browser @@ -65,6 +68,6 @@ in stdenv.mkDerivation rec { description = "Tor Browser Bundle for GNU/Linux, everything you need to safely browse the Internet"; homepage = https://www.torproject.org/; platforms = ["i686-linux" "x86_64-linux"]; - maintainers = [ maintainers.offline ]; + maintainers = [ maintainers.offline maintainers.matejc ]; }; } diff --git a/pkgs/tools/system/dd_rescue/default.nix b/pkgs/tools/system/dd_rescue/default.nix index 57f9a1a57d5..9c7f0413421 100644 --- a/pkgs/tools/system/dd_rescue/default.nix +++ b/pkgs/tools/system/dd_rescue/default.nix @@ -1,63 +1,37 @@ -x@{builderDefsPackage - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ stdenv, fetchurl, autoconf }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="dd_rescue"; - version="1.22"; - name="${baseName}-${version}"; +stdenv.mkDerivation rec { + name = "dd_rescue-1.42.1"; + + src = fetchurl { + sha256 = "0g2d292m1cnp8syy19hh5jvly3zy7lcvcj563wgjnf20ppm2diaq"; url="http://www.garloff.de/kurt/linux/ddrescue/${name}.tar.gz"; - hash="0n0vs4cn5csdcsmlndg3z36ws68zlckj17zrbm6wynrbs8iirclp"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; - }; - dd_rhelp_src = a.fetchurl { - url = "http://www.kalysto.org/pkg/dd_rhelp-0.1.2.tar.gz"; - sha256 = "0fhzkflg1ygiaj5ha0bf594d76vlgjsfwlpcmwrbady9frxvlkvv"; }; - inherit (sourceInfo) name version; - inherit buildInputs; + dd_rhelp_src = fetchurl { + url = "http://www.kalysto.org/pkg/dd_rhelp-0.3.0.tar.gz"; + sha256 = "0br6fs23ybmic3i5s1w4k4l8c2ph85ax94gfp2lzjpxbvl73cz1g"; + }; - /* doConfigure should be removed if not needed */ - phaseNames = ["doMakeInstall" "install_dd_rhelp" "fixPaths"]; - makeFlags=[ - ''prefix="$out"'' - ''DESTDIR="$out"'' - ''INSTASROOT='' - ]; + buildInputs = [ autoconf ]; - fixPaths = a.doPatchShebangs ''$out/bin''; + preBuild = '' + substituteInPlace Makefile \ + --replace "\$(DESTDIR)/usr" "$out" \ + --replace "-o root" "" \ + --replace "-g root" "" + ''; + makeFlags = [ "LIBDIR=$out" ]; - install_dd_rhelp = a.fullDepEntry ('' + postInstall = '' mkdir -p "$out/share/dd_rescue" "$out/bin" tar xf "${dd_rhelp_src}" -C "$out/share/dd_rescue" cp "$out/share/dd_rescue"/dd_rhelp*/dd_rhelp "$out/bin" - '') ["minInit" "defEnsureDir"]; + ''; - meta = { + meta = with stdenv.lib; { description = "A tool to copy data from a damaged block device"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; + maintainers = with maintainers; [ raskin iElectric ]; + platforms = with platforms; linux; }; - passthru = { - updateInfo = { - downloadPage = "http://www.garloff.de/kurt/linux/ddrescue/"; - }; - }; -}) x - +} diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/tools/system/ddrescue/default.nix index 9afad675bb9..d2ace27b1fd 100644 --- a/pkgs/tools/system/ddrescue/default.nix +++ b/pkgs/tools/system/ddrescue/default.nix @@ -1,13 +1,15 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, lzip }: stdenv.mkDerivation rec { - name = "ddrescue-1.16"; + name = "ddrescue-1.17"; src = fetchurl { - url = "mirror://gnu/ddrescue/${name}.tar.gz"; - sha256 = "1rixya7p8c4jrn4p0flf6h5dqwybrilf3hrj4r7x41h3zgjz5cvn"; + url = "mirror://gnu/ddrescue/${name}.tar.lz"; + sha256 = "0bvmsbzli2j4czwkabzs978n1y6vx31axh02kpgcf7033cc6rydy"; }; + buildInputs = [ lzip ]; + doCheck = true; meta = { @@ -41,6 +43,6 @@ stdenv.mkDerivation rec { license = "GPLv3+"; platforms = stdenv.lib.platforms.all; - maintainers = [ ]; + maintainers = with stdenv.lib.maintainers; [ iElectric ]; }; } diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index e1e515aaf01..e5ec557a79a 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl, libX11, xproto, libXt, xextproto, libXext}: stdenv.mkDerivation rec { - name = "plan9port-20110103"; + name = "plan9port-20140228"; builder = ./builder.sh; src = fetchurl { url = "http://swtch.com/plan9port/${name}.tgz"; - sha256 = "12hq3k03jgva72498qa1dyndakbhbfg0sc1jhcap9cxqj04xf0dc"; + sha256 = "1l7nsjfrrcq0l43kw0f1437jz3nyl9qw7i2vn0sbmcsv5vmsj0cr"; }; buildInputs = [ libX11 xproto libXt xextproto libXext ]; diff --git a/pkgs/tools/typesetting/biber/default.nix b/pkgs/tools/typesetting/biber/default.nix new file mode 100644 index 00000000000..1769a59520b --- /dev/null +++ b/pkgs/tools/typesetting/biber/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, buildPerlPackage, autovivification, BusinessISBN +, BusinessISMN, BusinessISSN, ConfigAutoConf, DataCompare, DataDump, DateSimple +, EncodeEUCJPASCII, EncodeHanExtra, EncodeJIS2K, ExtUtilsLibBuilder +, FileSlurp, IPCRun3, Log4Perl, LWPProtocolHttps, ListAllUtils, ListMoreUtils +, ModuleBuild, MozillaCA, ReadonlyXS, RegexpCommon, TextBibTeX, UnicodeCollate +, UnicodeLineBreak, URI, XMLLibXMLSimple, XMLLibXSLT, XMLWriter }: + +let + version = "1.8"; + pn = "biblatex-biber"; +in +buildPerlPackage { + name = "biber-${version}"; + src = fetchurl { + url = "mirror://sourceforge/project/${pn}/${pn}/${version}/${pn}.tar.gz"; + sha256 = "0ffry64pdvg5g487r7qab5b3cs4kq8rq8n3bymxrr1qh3mp79k4n"; + }; + + buildInputs = [ + autovivification BusinessISBN BusinessISMN BusinessISSN ConfigAutoConf + DataCompare DataDump DateSimple EncodeEUCJPASCII EncodeHanExtra EncodeJIS2K + ExtUtilsLibBuilder FileSlurp IPCRun3 Log4Perl LWPProtocolHttps ListAllUtils + ListMoreUtils ModuleBuild MozillaCA ReadonlyXS RegexpCommon TextBibTeX + UnicodeCollate UnicodeLineBreak URI XMLLibXMLSimple XMLLibXSLT XMLWriter + ]; + preConfigure = "touch Makefile.PL"; + buildPhase = "perl Build.PL --prefix=$out; ./Build build"; + checkPhase = "./Build test"; + installPhase = "./Build install"; + + # Tests seem to be broken + doCheck = false; + + meta = { + description = "Backend for BibLaTeX"; + license = "perl"; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/tools/typesetting/lout/default.nix b/pkgs/tools/typesetting/lout/default.nix index 0d160214376..61e94d4d618 100644 --- a/pkgs/tools/typesetting/lout/default.nix +++ b/pkgs/tools/typesetting/lout/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, ghostscript}: stdenv.mkDerivation rec { - name = "lout-3.39"; + name = "lout-3.40"; src = fetchurl { urls = [ @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { # XXX: We could add the CTAN mirrors # (see http://www.ctan.org/tex-archive/support/lout/). ]; - sha256 = "12gkyqrn0kaa8xq7sc7v3wm407pz2fxg9ngc75aybhi5z825b9vq"; + sha256 = "1gb8vb1wl7ikn269dd1c7ihqhkyrwk19jwx5kd0rdvbk6g7g25ix"; }; buildInputs = [ ghostscript ]; diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 3158f285933..98a8a0fd810 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -5,14 +5,16 @@ rec { sha256 = "1idgyim6r4bi3id245k616qrdarfh65xv3gi2psarqqmsw504yhd"; }; + texmfVersion = "2013.20140215"; texmfSrc = fetchurl { - url = mirror://debian/pool/main/t/texlive-base/texlive-base_2013.20140123.orig.tar.xz; - sha256 = "1lwvqryfykz0d9pcjkhq1qh7dlcb6lsvjp7fizl18ji6166159iw"; + url = "mirror://debian/pool/main/t/texlive-base/texlive-base_${texmfVersion}.orig.tar.xz"; + sha256 = "0f1xqa1a1yklsiqz12rgihdc6viw8ghdbx2s2pw2k3h0dfsd6ss3"; }; + langTexmfVersion = "2013.20140215"; langTexmfSrc = fetchurl { - url = mirror://debian/pool/main/t/texlive-lang/texlive-lang_2013.20140123.orig.tar.xz; - sha256 = "1smzkg31msn9ci7fc69xq5klhxab00z8bcxmz5daqzcal8ak3d2d"; + url = "mirror://debian/pool/main/t/texlive-lang/texlive-lang_${langTexmfVersion}.orig.tar.xz"; + sha256 = "0igz9kpd1rfbq7smb1wyd75cz396rinbh25rk19lxqh25dix0xzj"; }; passthru = { inherit texmfSrc langTexmfSrc; }; @@ -43,7 +45,7 @@ rec { NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${icu}/include/layout"; - ./Build --prefix="$out" --datadir="$out/share" --mandir "$out/share/man" --infodir "$out/share/info" \ + ./Build --prefix="$out" --datadir="$out/share" --mandir="$out/share/man" --infodir="$out/share/info" \ ${args.lib.concatStringsSep " " configureFlags} cd Work '' ) [ "minInit" "doUnpack" "addInputs" "defEnsureDir" ]; @@ -114,14 +116,22 @@ rec { configureFlags = [ "--with-x11" "--enable-ipc" "--with-mktexfmt" "--enable-shared" "--disable-native-texlive-build" "--with-system-zziplib" - "--with-system-libgs" "--with-system-t1lib" "--with-system-freetype2" - "--with-system-freetype=no" "--disable-ttf2pk" "--enable-ttf2pk2" - ] - ++ ( if stdenv.isDarwin - # ironically, couldn't get xetex compiling on darwin - then [ "--disable-xetex" "--disable-xdv2pdf" "--disable-xdvipdfmx" ] - # couldn't seem to get system icu working on darwin - else [ "--with-system-icu" ] ); + "--with-system-libgs" "--with-system-t1lib" "--with-system-freetype2" + "--with-system-freetype=no" "--disable-ttf2pk" "--enable-ttf2pk2" ] + ++ stdenv.lib.optionals stdenv.isDarwin [ + # Complains about a missing ICU directory + "--disable-bibtex-x" + + # TODO: We should be able to fix these tests + "--disable-devnag" + "--disable-dvisvgm" + "--disable-xdv2pdf" + "--disable-xdvipdfmx" + "--disable-xetex" + + "--with-system-harfbuzz=no" + "--with-system-icu=no" + ]; phaseNames = [ "addInputs" "doMainBuild" "doMakeInstall" "doPostInstall" ]; diff --git a/pkgs/tools/typesetting/tex/texlive/extra.nix b/pkgs/tools/typesetting/tex/texlive/extra.nix index c6624e469e5..056c7e0bf4e 100644 --- a/pkgs/tools/typesetting/tex/texlive/extra.nix +++ b/pkgs/tools/typesetting/tex/texlive/extra.nix @@ -1,9 +1,11 @@ args: with args; rec { - name = "texlive-extra-2013"; + name = "texlive-extra-2013"; + version = "2013.20140215"; + src = fetchurl { - url = mirror://debian/pool/main/t/texlive-extra/texlive-extra_2013.20131219.orig.tar.xz; - sha256 = "09iijzq0y5kq16f3lv2jrln190ldbbzywpwr33hrmnw5yp3izmrh"; + url = "mirror://debian/pool/main/t/texlive-extra/texlive-extra_${version}.orig.tar.xz"; + sha256 = "04a67pns6q8kw1nl2v6x5p443kvhk8fr26qkcj7z098n68fpwls8"; }; buildInputs = [texLive xz]; diff --git a/pkgs/tools/video/mjpegtools/default.nix b/pkgs/tools/video/mjpegtools/default.nix index b70d8f4c9ba..33b497fa3eb 100644 --- a/pkgs/tools/video/mjpegtools/default.nix +++ b/pkgs/tools/video/mjpegtools/default.nix @@ -6,10 +6,10 @@ # - libXxf86dga support? checking for XF86DGAQueryExtension in -lXxf86dga... no stdenv.mkDerivation rec { - name = "mjpegtools-2.0.0"; + name = "mjpegtools-2.1.0"; src = fetchurl { url = "mirror://sourceforge/mjpeg/${name}.tar.gz"; - sha256 = "bf3541593e71602f7b440c2e7d81b433f53d0511e74642f35bea9b3feded7a97"; + sha256 = "01y4xpfdvd4zgv6fmcjny9mr1gbfd4y2i4adp657ydw6fqyi8kw6"; }; buildInputs = [ gtk libdv libjpeg libpng libX11 pkgconfig SDL SDL_gfx ]; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d017d85bb86..9441da57ccd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -396,10 +396,12 @@ let fixDarwinDylibNames = makeSetupHook { } ../build-support/setup-hooks/fix-darwin-dylib-names.sh; - enableCoverageInstrumentation = makeSetupHook { } ../build-support/setup-hooks/enable-coverage-instrumentation.sh; + keepBuildTree = makeSetupHook { } ../build-support/setup-hooks/keep-build-tree.sh; - makeCoverageAnalysisReport = makeSetupHook - { deps = [ pkgs.lcov pkgs.enableCoverageInstrumentation ]; } + enableGCOVInstrumentation = makeSetupHook { } ../build-support/setup-hooks/enable-coverage-instrumentation.sh; + + makeGCOVReport = makeSetupHook + { deps = [ pkgs.lcov pkgs.enableGCOVInstrumentation ]; } ../build-support/setup-hooks/make-coverage-analysis-report.sh; @@ -424,6 +426,8 @@ let aescrypt = callPackage ../tools/misc/aescrypt { }; + cb0cat = callPackage ../tools/security/cb0cat { }; + ahcpd = callPackage ../tools/networking/ahcpd { }; aircrackng = callPackage ../tools/networking/aircrack-ng { }; @@ -568,6 +572,8 @@ let catdoc = callPackage ../tools/text/catdoc { }; + ccnet = callPackage ../tools/networking/ccnet { }; + ditaa = callPackage ../tools/graphics/ditaa { }; direnv = callPackage ../tools/misc/direnv { }; @@ -610,6 +616,15 @@ let bgs = callPackage ../tools/X11/bgs { }; + biber = callPackage ../tools/typesetting/biber { + inherit (perlPackages) + autovivification BusinessISBN BusinessISMN BusinessISSN ConfigAutoConf + DataCompare DataDump DateSimple EncodeEUCJPASCII EncodeHanExtra EncodeJIS2K + ExtUtilsLibBuilder FileSlurp IPCRun3 Log4Perl LWPProtocolHttps ListAllUtils + ListMoreUtils ModuleBuild MozillaCA ReadonlyXS RegexpCommon TextBibTeX + UnicodeCollate UnicodeLineBreak URI XMLLibXMLSimple XMLLibXSLT XMLWriter; + }; + bibtextools = callPackage ../tools/typesetting/bibtex-tools { inherit (strategoPackages016) strategoxt sdf; }; @@ -923,6 +938,10 @@ let fio = callPackage ../tools/system/fio { }; + flashtool = callPackage_i686 ../development/mobile/flashtool { + platformTools = androidenv.platformTools; + }; + flpsed = callPackage ../applications/editors/flpsed { }; flvstreamer = callPackage ../tools/networking/flvstreamer { }; @@ -1226,6 +1245,8 @@ let jwhois = callPackage ../tools/networking/jwhois { }; + kazam = callPackage ../applications/video/kazam { }; + kexectools = callPackage ../os-specific/linux/kexectools { }; keychain = callPackage ../tools/misc/keychain { }; @@ -1970,6 +1991,8 @@ let tinc = callPackage ../tools/networking/tinc { }; + tiny8086 = callPackage ../applications/virtualization/8086tiny { }; + tmpwatch = callPackage ../tools/misc/tmpwatch { }; tmux = callPackage ../tools/misc/tmux { }; @@ -2046,6 +2069,8 @@ let vobcopy = callPackage ../tools/cd-dvd/vobcopy { }; + vobsub2srt = callPackage ../tools/cd-dvd/vobsub2srt { }; + vorbisgain = callPackage ../tools/misc/vorbisgain { }; vpnc = callPackage ../tools/networking/vpnc { }; @@ -2121,6 +2146,8 @@ let xarchive = callPackage ../tools/archivers/xarchive { }; + xarchiver = callPackage ../tools/archivers/xarchiver { }; + unarj = callPackage ../tools/archivers/unarj { }; unshield = callPackage ../tools/archivers/unshield { }; @@ -2358,8 +2385,8 @@ let cmucl_binary = callPackage ../development/compilers/cmucl/binary.nix { }; - cython = callPackage ../development/interpreters/cython/2 { }; - cython3 = callPackage ../development/interpreters/cython/3 { }; + cython = pythonPackages.cython; + cython3 = python3Packages.cython; dylan = callPackage ../development/compilers/gwydion-dylan { dylan = callPackage ../development/compilers/gwydion-dylan/binary.nix { }; @@ -3136,6 +3163,10 @@ let jmeter = callPackage ../applications/networking/jmeter {}; + davmail = callPackage ../applications/networking/davmail {}; + + lxappearance = callPackage ../applications/misc/lxappearance {}; + kona = callPackage ../development/interpreters/kona {}; love = callPackage ../development/interpreters/love {lua=lua5;}; @@ -3227,8 +3258,9 @@ let }; python3 = hiPrio (callPackage ../development/interpreters/python/3.3 { }); - python33 = callPackage ../development/interpreters/python/3.3 { }; python32 = callPackage ../development/interpreters/python/3.2 { }; + python33 = callPackage ../development/interpreters/python/3.3 { }; + python34 = callPackage ../development/interpreters/python/3.4 { }; python = python27; python26 = callPackage ../development/interpreters/python/2.6 { @@ -3303,6 +3335,8 @@ let scheme48 = callPackage ../development/interpreters/scheme48 { }; + spark = callPackage ../applications/networking/cluster/spark { }; + spidermonkey = callPackage ../development/interpreters/spidermonkey { }; spidermonkey_1_8_0rc1 = callPackage ../development/interpreters/spidermonkey/1.8.0-rc1.nix { }; spidermonkey_185 = callPackage ../development/interpreters/spidermonkey/185-1.0.0.nix { }; @@ -3376,6 +3410,8 @@ let guile_ncurses = callPackage ../development/guile-modules/guile-ncurses { }; + guile-xcb = callPackage ../development/guile-modules/guile-xcb { }; + srecord = callPackage ../development/tools/misc/srecord { }; windowssdk = ( @@ -3526,6 +3562,8 @@ let inherit (gnome3) gnome_icon_theme; }; + dfu-programmer = callPackage ../development/tools/misc/dfu-programmer { }; + ddd = callPackage ../development/tools/misc/ddd { }; distcc = callPackage ../development/tools/misc/distcc { }; @@ -3556,15 +3594,11 @@ let inherit python pil makeWrapper; }; - doxygen = lowPrio (doxygen_gui.override { qt4 = null; }); - - /* XXX: The LaTeX output with Doxygen 1.8.0 makes LaTeX barf. - See . */ - doxygen_1_7 = callPackage ../development/tools/documentation/doxygen/1.7.nix { + doxygen = callPackage ../development/tools/documentation/doxygen { qt4 = null; }; - doxygen_gui = callPackage ../development/tools/documentation/doxygen { }; + doxygen_gui = lowPrio (doxygen.override { inherit qt4; }); drush = callPackage ../development/tools/misc/drush { }; @@ -3730,6 +3764,8 @@ let jre = jdk; }; + selenium-server-standalone = callPackage ../development/tools/selenium/server { }; + scons = callPackage ../development/tools/build-managers/scons { }; simpleBuildTool = callPackage ../development/tools/build-managers/simple-build-tool { }; @@ -3968,6 +4004,8 @@ let clutter = callPackage ../development/libraries/clutter { }; + clutter-gst = callPackage ../development/libraries/clutter-gst { }; + clutter_gtk = callPackage ../development/libraries/clutter-gtk { }; clutter_gtk_0_10 = callPackage ../development/libraries/clutter-gtk/0.10.8.nix { }; @@ -4344,20 +4382,16 @@ let gnu-efi = callPackage ../development/libraries/gnu-efi { }; gnutls = gnutls32; - gnutls31 = callPackage ../development/libraries/gnutls { - guileBindings = config.gnutls.guile or true; - }; - gnutls2 = callPackage ../development/libraries/gnutls/2.12.nix { - guileBindings = config.gnutls.guile or true; + gnutls31 = callPackage ../development/libraries/gnutls/3.1.nix { + guileBindings = config.gnutls.guile or false; }; gnutls32 = callPackage ../development/libraries/gnutls/3.2.nix { - guileBindings = config.gnutls.guile or true; + guileBindings = config.gnutls.guile or false; }; - gnutls_without_guile = lowPrio (gnutls.override { guileBindings = false; }); - gnutls2_without_guile = lowPrio (gnutls2.override { guileBindings = false; }); + gnutls_with_guile = lowPrio (gnutls.override { guileBindings = true; }); gpac = callPackage ../applications/video/gpac { }; @@ -4706,6 +4740,8 @@ let libelf = callPackage ../development/libraries/libelf { }; + libfm = callPackage ../development/libraries/libfm { }; + libgadu = callPackage ../development/libraries/libgadu { }; libgdata = gnome3.libgdata; @@ -4977,6 +5013,8 @@ let librsync = callPackage ../development/libraries/librsync { }; + libsearpc = callPackage ../development/libraries/libsearpc { }; + libsigcxx = callPackage ../development/libraries/libsigcxx { }; libsigcxx12 = callPackage ../development/libraries/libsigcxx/1.2.nix { }; @@ -5135,6 +5173,8 @@ let libzip = callPackage ../development/libraries/libzip { }; + libzdb = callPackage ../development/libraries/libzdb { }; + libzrtpcpp = callPackage ../development/libraries/libzrtpcpp { }; libzrtpcpp_1_6 = callPackage ../development/libraries/libzrtpcpp/1.6.nix { ccrtp = ccrtp_1_8; @@ -5174,6 +5214,8 @@ let # failed to build mediastreamer = callPackage ../development/libraries/mediastreamer { }; + menu-cache = callPackage ../development/libraries/menu-cache { }; + mesaSupported = lib.elem system lib.platforms.mesaPlatforms; mesa_original = callPackage ../development/libraries/mesa { llvm = llvm_33; }; @@ -6045,6 +6087,12 @@ let python = python33; }); + python34Packages = import ./python-packages.nix { + inherit pkgs; + inherit (lib) lowPrio; + python = python34; + }; + python32Packages = import ./python-packages.nix { inherit pkgs; inherit (lib) lowPrio; @@ -6165,6 +6213,8 @@ let couchdb = callPackage ../servers/http/couchdb { spidermonkey = spidermonkey_185; + python = python27; + sphinx = python27Packages.sphinx; }; dico = callPackage ../servers/dico { }; @@ -6286,6 +6336,8 @@ let #monetdb = callPackage ../servers/sql/monetdb { }; + mariadb = callPackage ../servers/sql/mariadb {}; + mongodb = callPackage ../servers/nosql/mongodb { }; riak = callPackage ../servers/nosql/riak/1.3.1.nix { }; @@ -6380,6 +6432,8 @@ let libunwind = null; }); + serfdom = callPackage ../servers/serfdom { }; + shishi = callPackage ../servers/shishi { }; sipwitch = callPackage ../servers/sip/sipwitch { }; @@ -6577,6 +6631,8 @@ let gpm = callPackage ../servers/gpm { }; + gradm = callPackage ../os-specific/linux/gradm { }; + hdparm = callPackage ../os-specific/linux/hdparm { }; hibernate = callPackage ../os-specific/linux/hibernate { }; @@ -6688,7 +6744,7 @@ let })) (args: grsecurityOverrider args)); linux_3_13_grsecurity = lowPrio (lib.overrideDerivation (linux_3_13.override (args: { - kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_13_3 kernelPatches.grsec_path ]; + kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_13_5 kernelPatches.grsec_path ]; argsOverride = { modDirVersion = "${linux_3_13.modDirVersion}-grsec"; }; @@ -6813,10 +6869,14 @@ let frandom = callPackage ../os-specific/linux/frandom { }; + ktap = callPackage ../os-specific/linux/ktap { }; + lttngModules = callPackage ../os-specific/linux/lttng-modules { }; broadcom_sta = callPackage ../os-specific/linux/broadcom-sta/default.nix { }; + nvidiabl = callPackage ../os-specific/linux/nvidiabl { }; + nvidia_x11 = callPackage ../os-specific/linux/nvidia-x11 { }; nvidia_x11_legacy173 = callPackage ../os-specific/linux/nvidia-x11/legacy173.nix { }; @@ -6983,6 +7043,10 @@ let pam_usb = callPackage ../os-specific/linux/pam_usb { }; + paxctl = callPackage ../os-specific/linux/paxctl { }; + + pax-utils = callPackage ../os-specific/linux/pax-utils { }; + pcmciaUtils = callPackage ../os-specific/linux/pcmciautils { firmware = config.pcmciaUtils.firmware or []; config = config.pcmciaUtils.config or null; @@ -7133,6 +7197,8 @@ let }; windows = rec { + cygwinSetup = callPackage ../os-specific/windows/cygwin-setup { }; + jom = callPackage ../os-specific/windows/jom { }; w32api = callPackage ../os-specific/windows/w32api { @@ -7321,6 +7387,8 @@ let stdmanpages = callPackage ../data/documentation/std-man-pages { }; + symbola = callPackage ../data/fonts/symbola { }; + iana_etc = callPackage ../data/misc/iana-etc { }; poppler_data = callPackage ../data/misc/poppler-data { }; @@ -7368,8 +7436,6 @@ let a2jmidid = callPackage ../applications/audio/a2jmidid { }; - aangifte2005 = callPackage_i686 ../applications/taxes/aangifte-2005 { }; - aangifte2006 = callPackage_i686 ../applications/taxes/aangifte-2006 { }; aangifte2007 = callPackage_i686 ../applications/taxes/aangifte-2007 { }; @@ -7384,6 +7450,8 @@ let aangifte2012 = callPackage_i686 ../applications/taxes/aangifte-2012 { }; + aangifte2013 = callPackage_i686 ../applications/taxes/aangifte-2013 { }; + abcde = callPackage ../applications/audio/abcde { inherit (perlPackages) DigestSHA MusicBrainz MusicBrainzDiscID; libcdio = libcdio082; @@ -7411,7 +7479,6 @@ let ardour3 = lowPrio (callPackage ../applications/audio/ardour/ardour3.nix { inherit (gnome) libgnomecanvas libgnomecanvasmm; - boost = boost149; }); arora = callPackage ../applications/networking/browsers/arora { }; @@ -7476,9 +7543,7 @@ let bitcoin = callPackage ../applications/misc/bitcoin { }; bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee { - # For some reason, TLS support is broken when using GnuTLS 3.0 (can't - # connect to jabber.org, for instance.) - gnutls = gnutls2; + gnutls = gnutls; libotr = libotr_3_2; }; @@ -7751,6 +7816,10 @@ let ocamlMode = callPackage ../applications/editors/emacs-modes/ocaml { }; + structuredHaskellMode = callPackage ../applications/editors/emacs-modes/structured-haskell-mode { + inherit (haskellPackages) cabal haskellSrcExts; + }; + tuaregMode = callPackage ../applications/editors/emacs-modes/tuareg { }; hol_light_mode = callPackage ../applications/editors/emacs-modes/hol_light { }; @@ -7808,6 +7877,8 @@ let emacs23Packages = emacsPackages emacs23 pkgs.emacs23Packages; emacs24Packages = recurseIntoAttrs (emacsPackages emacs24 pkgs.emacs24Packages); + inherit (gnome3) empathy; + epdfview = callPackage ../applications/misc/epdfview { }; inherit (gnome3) epiphany; @@ -7887,7 +7958,7 @@ let gtimelog = pythonPackages.gtimelog; inherit (gnome3) gucharmap; - + guitarix = callPackage ../applications/audio/guitarix { fftw = fftwSinglePrec; }; @@ -8133,6 +8204,8 @@ let herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { }; + hexchat = callPackage ../applications/networking/irc/hexchat { }; + hexedit = callPackage ../applications/editors/hexedit { }; hipchat = callPackage_i686 ../applications/networking/instant-messengers/hipchat { }; @@ -8153,7 +8226,7 @@ let inherit (xorg) libxkbfile; cairo = cairo.override { xcbSupport = true; }; }; - + i3minator = callPackage ../tools/misc/i3minator { }; i3status = callPackage ../applications/window-managers/i3/status.nix { }; @@ -8250,6 +8323,8 @@ let jigdo = callPackage ../applications/misc/jigdo { }; + jitsi = callPackage ../applications/networking/instant-messengers/jitsi { }; + joe = callPackage ../applications/editors/joe { }; jbrout = callPackage ../applications/graphics/jbrout { @@ -8498,6 +8573,8 @@ let mutt = callPackage ../applications/networking/mailreaders/mutt { }; + pcmanfm = callPackage ../applications/misc/pcmanfm { }; + ruby_gpgme = callPackage ../development/libraries/ruby_gpgme { ruby = ruby19; hoe = rubyLibs.hoe; @@ -8749,6 +8826,8 @@ let inherit (gnome) libart_lgpl; }; + seafile-client = callPackage ../applications/networking/seafile-client { }; + seeks = callPackage ../tools/networking/p2p/seeks { opencv = opencv_2_1; }; @@ -8895,6 +8974,8 @@ let taskwarrior = callPackage ../applications/misc/taskwarrior { }; + telegram-cli = callPackage ../applications/networking/instant-messengers/telegram-cli/default.nix { }; + telepathy_gabble = callPackage ../applications/networking/instant-messengers/telepathy/gabble { inherit (pkgs.gnome) libsoup; }; @@ -8957,6 +9038,8 @@ let tribler = callPackage ../applications/networking/p2p/tribler { }; + twmn = callPackage ../applications/misc/twmn { }; + twinkle = callPackage ../applications/networking/instant-messengers/twinkle { ccrtp = ccrtp_1_8; libzrtpcpp = libzrtpcpp_1_6; @@ -9003,6 +9086,11 @@ let else stdenv; }; + vimwrapper = callPackage ../applications/editors/vim/wrapper.nix { + inherit vim; + vimrc = config.vim.vimrc or null; + }; + vimHugeX = vim_configurable; vim_configurable = callPackage ../applications/editors/vim/configurable.nix { @@ -10285,6 +10373,8 @@ let saneFrontends = callPackage ../applications/graphics/sane/frontends.nix { }; + seafile-shared = callPackage ../misc/seafile-shared { }; + slock = callPackage ../misc/screensavers/slock { }; sourceAndTags = import ../misc/source-and-tags { diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index a3c3a10b44c..3034367c39e 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -80,7 +80,7 @@ cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; }; prettyShow = self.prettyShow_1_2; binary = self.binary_0_6_0_0; - Cabal_1_18_1_2 = self.Cabal_1_18_1_2.override { deepseq = self.deepseq_1_3_0_2; }; + Cabal_1_18_1_3 = self.Cabal_1_18_1_3.override { deepseq = self.deepseq_1_3_0_2; }; quickcheckIo = self.quickcheckIo.override { HUnit = self.HUnit_1_2_5_2; QuickCheck = self.QuickCheck2; @@ -102,7 +102,7 @@ cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; }; prettyShow = self.prettyShow_1_2; binary = self.binary_0_6_0_0; - Cabal_1_18_1_2 = self.Cabal_1_18_1_2.override { deepseq = self.deepseq_1_3_0_2; }; + Cabal_1_18_1_3 = self.Cabal_1_18_1_3.override { deepseq = self.deepseq_1_3_0_2; }; quickcheckIo = self.quickcheckIo.override { HUnit = self.HUnit_1_2_5_2; QuickCheck = self.QuickCheck2; @@ -126,7 +126,7 @@ cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; }; prettyShow = self.prettyShow_1_2; binary = self.binary_0_6_0_0; - Cabal_1_18_1_2 = self.Cabal_1_18_1_2.override { deepseq = self.deepseq_1_3_0_2; }; + Cabal_1_18_1_3 = self.Cabal_1_18_1_3.override { deepseq = self.deepseq_1_3_0_2; }; quickcheckIo = self.quickcheckIo.override { HUnit = self.HUnit_1_2_5_2; QuickCheck = self.QuickCheck2; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index dd996a0d576..5ac472e27db 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -151,7 +151,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x haskellSrc = self.haskellSrc_1_0_1_5; hashable = self.hashable_1_2_1_0; html = self.html_1_0_1_2; - HTTP = self.HTTP_4000_2_10; + HTTP = self.HTTP_4000_2_11; HUnit = self.HUnit_1_2_5_2; mtl = self.mtl_2_1_2; network = self.network_2_4_2_2; @@ -177,7 +177,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x alex = self.alex_3_1_3; haddock = self.haddock_2_13_2_1; happy = self.happy_1_19_3; - primitive = self.primitive_0_5_1_0; # semi-official, but specified + primitive = self.primitive_0_5_2_1; # semi-official, but specified }; haskellPlatformArgs_2013_2_0_0 = self : { @@ -527,8 +527,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x adjunctions = callPackage ../development/libraries/haskell/adjunctions {}; aeson_0_6_2_1 = callPackage ../development/libraries/haskell/aeson/0.6.2.1.nix {}; - aeson_0_7_0_1 = callPackage ../development/libraries/haskell/aeson/0.7.0.1.nix {}; - aeson = self.aeson_0_6_2_1; + aeson_0_7_0_1 = callPackage ../development/libraries/haskell/aeson/0.7.0.1.nix { + blazeBuilder = if (pkgs.stdenv.lib.versionOlder ghc.version "7.6") then self.blazeBuilder else null; + }; + aeson = self.aeson_0_7_0_1; aesonLens = callPackage ../development/libraries/haskell/aeson-lens {}; @@ -553,14 +555,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x ansiWlPprint = callPackage ../development/libraries/haskell/ansi-wl-pprint {}; ariadne = callPackage ../development/libraries/haskell/ariadne { - Cabal = self.Cabal_1_18_1_2; + Cabal = self.Cabal_1_18_1_3; haskellPackages = self.haskellPackages.override { - Cabal = self.Cabal_1_18_1_2; + Cabal = self.Cabal_1_18_1_3; }; haskellNames = self.haskellNames.override { - Cabal = self.Cabal_1_18_1_2; + Cabal = self.Cabal_1_18_1_3; haskellPackages = self.haskellPackages.override { - Cabal = self.Cabal_1_18_1_2; + Cabal = self.Cabal_1_18_1_3; }; }; }; @@ -707,7 +709,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x Cabal_1_14_0 = callPackage ../development/libraries/haskell/Cabal/1.14.0.nix { cabal = self.cabal.override { Cabal = null; }; }; Cabal_1_16_0_3 = callPackage ../development/libraries/haskell/Cabal/1.16.0.3.nix { cabal = self.cabal.override { Cabal = null; }; }; - Cabal_1_18_1_2 = callPackage ../development/libraries/haskell/Cabal/1.18.1.2.nix { cabal = self.cabal.override { Cabal = null; }; }; + Cabal_1_18_1_3 = callPackage ../development/libraries/haskell/Cabal/1.18.1.3.nix { cabal = self.cabal.override { Cabal = null; }; }; Cabal = null; # core package in GHC cabalFileTh = callPackage ../development/libraries/haskell/cabal-file-th {}; @@ -816,6 +818,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x constraints = callPackage ../development/libraries/haskell/constraints {}; + controlMonadFree = callPackage ../development/libraries/haskell/control-monad-free {}; + controlMonadLoop = callPackage ../development/libraries/haskell/control-monad-loop {}; convertible = callPackage ../development/libraries/haskell/convertible {}; @@ -939,12 +943,24 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x dice = callPackage ../development/libraries/haskell/dice {}; diagrams = callPackage ../development/libraries/haskell/diagrams/diagrams.nix {}; - diagramsCairo = callPackage ../development/libraries/haskell/diagrams/cairo.nix {}; - diagramsCore = callPackage ../development/libraries/haskell/diagrams/core.nix {}; - diagramsContrib = callPackage ../development/libraries/haskell/diagrams/contrib.nix {}; - diagramsLib = callPackage ../development/libraries/haskell/diagrams/lib.nix {}; - diagramsPostscript = callPackage ../development/libraries/haskell/diagrams/postscript.nix {}; - diagramsSvg = callPackage ../development/libraries/haskell/diagrams/svg.nix {}; + diagramsCairo = callPackage ../development/libraries/haskell/diagrams/cairo.nix { + lens = self.lens_3_10_2; + }; + diagramsCore = callPackage ../development/libraries/haskell/diagrams/core.nix { + lens = self.lens_3_10_2; + }; + diagramsContrib = callPackage ../development/libraries/haskell/diagrams/contrib.nix { + lens = self.lens_3_10_2; + }; + diagramsLib = callPackage ../development/libraries/haskell/diagrams/lib.nix { + lens = self.lens_3_10_2; + }; + diagramsPostscript = callPackage ../development/libraries/haskell/diagrams/postscript.nix { + lens = self.lens_3_10_2; + }; + diagramsSvg = callPackage ../development/libraries/haskell/diagrams/svg.nix { + lens = self.lens_3_10_2; + }; Diff = callPackage ../development/libraries/haskell/Diff {}; @@ -956,10 +972,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x digestiveFunctors = callPackage ../development/libraries/haskell/digestive-functors {}; - digestiveFunctorsAeson = callPackage ../development/libraries/haskell/digestive-functors-aeson { - aeson = self.aeson_0_7_0_1; - lens = self.lens_4_0_3; - }; + digestiveFunctorsAeson = callPackage ../development/libraries/haskell/digestive-functors-aeson {}; digestiveFunctorsHeist = callPackage ../development/libraries/haskell/digestive-functors-heist {}; @@ -1081,6 +1094,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x fastLogger = callPackage ../development/libraries/haskell/fast-logger {}; + fb = callPackage ../development/libraries/haskell/fb {}; + fclabels = callPackage ../development/libraries/haskell/fclabels {}; FerryCore = callPackage ../development/libraries/haskell/FerryCore {}; @@ -1112,7 +1127,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x foldl = callPackage ../development/libraries/haskell/foldl {}; - forceLayout = callPackage ../development/libraries/haskell/force-layout {}; + forceLayout = callPackage ../development/libraries/haskell/force-layout { + lens = self.lens_3_10_2; + }; free = callPackage ../development/libraries/haskell/free {}; @@ -1134,6 +1151,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x ghcEvents = callPackage ../development/libraries/haskell/ghc-events {}; + ghcEventsAnalyze = callPackage ../development/tools/haskell/ghc-events-analyze {}; + ghcHeapView = callPackage ../development/libraries/haskell/ghc-heap-view { cabal = self.cabal.override { enableLibraryProfiling = false; }; # pkg cannot be built with profiling enabled }; @@ -1210,6 +1229,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x gnuidn = callPackage ../development/libraries/haskell/gnuidn {}; + gnuplot = callPackage ../development/libraries/haskell/gnuplot {}; + gnutls = callPackage ../development/libraries/haskell/gnutls { inherit (pkgs) gnutls; }; gsasl = callPackage ../development/libraries/haskell/gsasl { inherit (pkgs) gsasl; }; @@ -1231,6 +1252,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x graphviz = callPackage ../development/libraries/haskell/graphviz {}; + graphWrapper = callPackage ../development/libraries/haskell/graph-wrapper {}; + groups = callPackage ../development/libraries/haskell/groups {}; groupoids = callPackage ../development/libraries/haskell/groupoids {}; @@ -1303,8 +1326,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x HTTP_4000_2_3 = callPackage ../development/libraries/haskell/HTTP/4000.2.3.nix {}; HTTP_4000_2_5 = callPackage ../development/libraries/haskell/HTTP/4000.2.5.nix {}; HTTP_4000_2_8 = callPackage ../development/libraries/haskell/HTTP/4000.2.8.nix {}; - HTTP_4000_2_10 = callPackage ../development/libraries/haskell/HTTP/4000.2.10.nix {}; - HTTP = self.HTTP_4000_2_10; + HTTP_4000_2_11 = callPackage ../development/libraries/haskell/HTTP/4000.2.11.nix {}; + HTTP = self.HTTP_4000_2_11; httpAttoparsec = callPackage ../development/libraries/haskell/http-attoparsec {}; @@ -1408,6 +1431,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x HSH = callPackage ../development/libraries/haskell/HSH {}; + hsini = callPackage ../development/libraries/haskell/hsini {}; + HsSyck = callPackage ../development/libraries/haskell/HsSyck {}; HsOpenSSL = callPackage ../development/libraries/haskell/HsOpenSSL {}; @@ -1424,6 +1449,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x hspecExpectations = callPackage ../development/libraries/haskell/hspec-expectations {}; + hspecExpectationsLens = callPackage ../development/libraries/haskell/hspec-expectations-lens {}; + hspecMeta = callPackage ../development/libraries/haskell/hspec-meta {}; hstatsd = callPackage ../development/libraries/haskell/hstatsd {}; @@ -1482,6 +1509,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x interlude = callPackage ../development/libraries/haskell/interlude {}; + interpolate = callPackage ../development/libraries/haskell/interpolate {}; + interpolatedstringPerl6 = callPackage ../development/libraries/haskell/interpolatedstring-perl6 {}; intervals = callPackage ../development/libraries/haskell/intervals {}; @@ -1523,10 +1552,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x json = callPackage ../development/libraries/haskell/json {}; - jsonAssertions = callPackage ../development/libraries/haskell/json-assertions { - aeson = self.aeson_0_7_0_1; - lens = self.lens_4_0_3; - }; + jsonAssertions = callPackage ../development/libraries/haskell/json-assertions {}; jsonTypes = callPackage ../development/libraries/haskell/jsonTypes {}; @@ -1561,21 +1587,23 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x leksahServer = callPackage ../development/libraries/haskell/leksah/leksah-server.nix {}; lens_3_10_2 = callPackage ../development/libraries/haskell/lens/3.10.2.nix {}; - lens_4_0_3 = callPackage ../development/libraries/haskell/lens/4.0.3.nix { - aeson = self.aeson_0_7_0_1; - }; - lens = self.lens_3_10_2; + lens_4_0_4 = callPackage ../development/libraries/haskell/lens/4.0.4.nix {}; + lens = self.lens_4_0_4; lensAeson = callPackage ../development/libraries/haskell/lens-aeson {}; lensDatetime = callPackage ../development/libraries/haskell/lens-datetime {}; + lensFamilyCore = callPackage ../development/libraries/haskell/lens-family-core {}; + lenses = callPackage ../development/libraries/haskell/lenses {}; libffi = callPackage ../development/libraries/haskell/libffi { libffi = pkgs.libffi; }; + libjenkins = callPackage ../development/libraries/haskell/libjenkins {}; + libmpd = callPackage ../development/libraries/haskell/libmpd {}; liblastfm = callPackage ../development/libraries/haskell/liblastfm {}; @@ -1586,9 +1614,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x liftedBase = callPackage ../development/libraries/haskell/lifted-base {}; - linear = callPackage ../development/libraries/haskell/linear { - lens = self.lens_4_0_3; - }; + linear = callPackage ../development/libraries/haskell/linear {}; List = callPackage ../development/libraries/haskell/List {}; @@ -1622,6 +1648,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x logict = callPackage ../development/libraries/haskell/logict {}; + lushtags = callPackage ../development/libraries/haskell/lushtags {}; + maccatcher = callPackage ../development/libraries/haskell/maccatcher {}; markdownUnlit = callPackage ../development/libraries/haskell/markdown-unlit {}; @@ -1731,6 +1759,13 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x mwcRandom = callPackage ../development/libraries/haskell/mwc-random {}; + mysql = callPackage ../development/libraries/haskell/mysql { + mysqlConfig = pkgs.mysql; + inherit (pkgs) zlib; + }; + + mysqlSimple = callPackage ../development/libraries/haskell/mysql-simple {}; + NanoProlog = callPackage ../development/libraries/haskell/NanoProlog {}; nanospec = callPackage ../development/libraries/haskell/nanospec {}; @@ -1862,9 +1897,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x parsec3 = self.parsec_3_1_5; parsec = self.parsec3; - parsers_0_9 = callPackage ../development/libraries/haskell/parsers/0.9.nix {}; - parsers_0_10_3 = callPackage ../development/libraries/haskell/parsers/0.10.3.nix {}; - parsers = self.parsers_0_10_3; + parsers = callPackage ../development/libraries/haskell/parsers {}; parsimony = callPackage ../development/libraries/haskell/parsimony {}; @@ -1898,6 +1931,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x pipesAttoparsec = callPackage ../development/libraries/haskell/pipes-attoparsec {}; + pipesBinary = callPackage ../development/libraries/haskell/pipes-binary { + binary = self.binary_0_7_1_0; + }; + pipesBytestring = callPackage ../development/libraries/haskell/pipes-bytestring {}; pipesConcurrency = callPackage ../development/libraries/haskell/pipes-concurrency {}; @@ -1956,8 +1993,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x punycode = callPackage ../development/libraries/haskell/punycode {}; primitive_0_5_0_1 = callPackage ../development/libraries/haskell/primitive/0.5.0.1.nix {}; - primitive_0_5_1_0 = callPackage ../development/libraries/haskell/primitive/0.5.1.0.nix {}; - primitive = self.primitive_0_5_1_0; + primitive_0_5_2_1 = callPackage ../development/libraries/haskell/primitive/0.5.2.1.nix {}; + primitive = self.primitive_0_5_0_1; profunctors = callPackage ../development/libraries/haskell/profunctors {}; @@ -2164,10 +2201,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x socks = callPackage ../development/libraries/haskell/socks {}; - sparse = callPackage ../development/libraries/haskell/sparse { - lens = self.lens_4_0_3; - linear = self.linear.override { lens = self.lens_4_0_3; }; - }; + sparse = callPackage ../development/libraries/haskell/sparse {}; srcloc = callPackage ../development/libraries/haskell/srcloc {}; @@ -2251,6 +2285,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x show = callPackage ../development/libraries/haskell/show {}; + singletons = callPackage ../development/libraries/haskell/singletons {}; + SMTPClient = callPackage ../development/libraries/haskell/SMTPClient {}; socketActivation = callPackage ../development/libraries/haskell/socket-activation {}; @@ -2287,6 +2323,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x stringbuilder = callPackage ../development/libraries/haskell/stringbuilder {}; + stripe = callPackage ../development/libraries/haskell/stripe { + aeson = self.aeson_0_6_2_1; + }; + svgcairo = callPackage ../development/libraries/haskell/svgcairo { libc = pkgs.stdenv.gcc.libc; }; @@ -2375,6 +2415,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x thespian = callPackage ../development/libraries/haskell/thespian {}; + thDesugar = callPackage ../development/libraries/haskell/th-desugar {}; + thExtras = callPackage ../development/libraries/haskell/th-extras {}; thLift = callPackage ../development/libraries/haskell/th-lift {}; @@ -2390,7 +2432,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x threepennyGui = callPackage ../development/libraries/haskell/threepenny-gui {}; time_1_1_2_4 = callPackage ../development/libraries/haskell/time/1.1.2.4.nix {}; - time_1_4_1 = callPackage ../development/libraries/haskell/time/1.4.1.nix {}; + time_1_4_2 = callPackage ../development/libraries/haskell/time/1.4.2.nix {}; # time is in the core package set. It should only be necessary to # pass it explicitly in rare circumstances. time = null; @@ -2422,12 +2464,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x traverseWithClass = callPackage ../development/libraries/haskell/traverse-with-class {}; - trifecta_1_1 = callPackage ../development/libraries/haskell/trifecta/1.1.nix { - parsers = self.parsers_0_9; - }; - trifecta_1_2 = callPackage ../development/libraries/haskell/trifecta/1.2.nix {}; - trifecta_1_4 = callPackage ../development/libraries/haskell/trifecta/1.4.nix {}; - trifecta = self.trifecta_1_4; + trifecta = callPackage ../development/libraries/haskell/trifecta {}; tuple = callPackage ../development/libraries/haskell/tuple {}; @@ -2574,6 +2611,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x wlPprintText = callPackage ../development/libraries/haskell/wl-pprint-text {}; + wizards = callPackage ../development/libraries/haskell/wizards {}; + word8 = callPackage ../development/libraries/haskell/word8 {}; wx = callPackage ../development/libraries/haskell/wxHaskell/wx.nix {}; @@ -2781,8 +2820,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x darcs = callPackage ../applications/version-management/darcs {}; idris_plain = callPackage ../development/compilers/idris { - parsers = self.parsers_0_9; - trifecta = self.trifecta_1_1; llvmGeneral = self.llvmGeneral_3_3_8_2; llvmGeneralPure = self.llvmGeneralPure_3_3_8_2; }; @@ -2826,7 +2863,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x cabalInstall_0_14_0 = callPackage ../tools/package-management/cabal-install/0.14.0.nix {}; cabalInstall_1_16_0_2 = callPackage ../tools/package-management/cabal-install/1.16.0.2.nix {}; cabalInstall_1_18_0_2 = callPackage ../tools/package-management/cabal-install/1.18.0.2.nix { - Cabal = self.Cabal_1_18_1_2; + Cabal = self.Cabal_1_18_1_3; }; cabalInstall = self.cabalInstall_1_18_0_2; @@ -2848,7 +2885,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x # Games. - LambdaHack = callPackage ../games/LambdaHack {}; + LambdaHack = callPackage ../games/LambdaHack { + binary = self.binary_0_7_1_0; + vectorBinaryInstances = self.vectorBinaryInstances.override { binary = self.binary_0_7_1_0; }; + }; MazesOfMonad = callPackage ../games/MazesOfMonad {}; diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index f2b7328f35a..93e965235fc 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -1,6 +1,25 @@ { self, fetchurl, fetchgit ? null, lib }: { + by-spec."Base64"."~0.2.0" = + self.by-version."Base64"."0.2.0"; + by-version."Base64"."0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "node-Base64-0.2.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/Base64/-/Base64-0.2.0.tgz"; + name = "Base64-0.2.0.tgz"; + sha1 = "448879efb6803979daaf7f36e7807e8a1d291205"; + }) + ]; + buildInputs = + (self.nativeDeps."Base64" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "Base64" ]; + }; by-spec."CSSselect"."0.x" = self.by-version."CSSselect"."0.5.0"; by-version."CSSselect"."0.5.0" = lib.makeOverridable self.buildNodePackage { @@ -15,7 +34,7 @@ buildInputs = (self.nativeDeps."CSSselect" or []); deps = [ - self.by-version."CSSwhat"."0.4.2" + self.by-version."CSSwhat"."0.4.5" self.by-version."domutils"."1.4.0" self.by-version."boolbase"."1.0.0" self.by-version."nth-check"."1.0.0" @@ -38,7 +57,7 @@ buildInputs = (self.nativeDeps."CSSselect" or []); deps = [ - self.by-version."CSSwhat"."0.4.2" + self.by-version."CSSwhat"."0.4.5" self.by-version."domutils"."1.4.0" ]; peerDependencies = [ @@ -46,14 +65,14 @@ passthru.names = [ "CSSselect" ]; }; by-spec."CSSwhat"."0.4" = - self.by-version."CSSwhat"."0.4.2"; - by-version."CSSwhat"."0.4.2" = lib.makeOverridable self.buildNodePackage { - name = "node-CSSwhat-0.4.2"; + self.by-version."CSSwhat"."0.4.5"; + by-version."CSSwhat"."0.4.5" = lib.makeOverridable self.buildNodePackage { + name = "node-CSSwhat-0.4.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/CSSwhat/-/CSSwhat-0.4.2.tgz"; - name = "CSSwhat-0.4.2.tgz"; - sha1 = "7291585b71c5707ee7f49bbf3e9ae413ea715ff5"; + url = "http://registry.npmjs.org/CSSwhat/-/CSSwhat-0.4.5.tgz"; + name = "CSSwhat-0.4.5.tgz"; + sha1 = "85d7b2799ff3d98055353c802949e39913e16a62"; }) ]; buildInputs = @@ -64,6 +83,48 @@ ]; passthru.names = [ "CSSwhat" ]; }; + by-spec."JSONStream"."~0.6.4" = + self.by-version."JSONStream"."0.6.4"; + by-version."JSONStream"."0.6.4" = lib.makeOverridable self.buildNodePackage { + name = "node-JSONStream-0.6.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/JSONStream/-/JSONStream-0.6.4.tgz"; + name = "JSONStream-0.6.4.tgz"; + sha1 = "4b2c8063f8f512787b2375f7ee9db69208fa2dcb"; + }) + ]; + buildInputs = + (self.nativeDeps."JSONStream" or []); + deps = [ + self.by-version."jsonparse"."0.0.5" + self.by-version."through"."2.2.7" + ]; + peerDependencies = [ + ]; + passthru.names = [ "JSONStream" ]; + }; + by-spec."JSONStream"."~0.7.1" = + self.by-version."JSONStream"."0.7.1"; + by-version."JSONStream"."0.7.1" = lib.makeOverridable self.buildNodePackage { + name = "node-JSONStream-0.7.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/JSONStream/-/JSONStream-0.7.1.tgz"; + name = "JSONStream-0.7.1.tgz"; + sha1 = "0a6bf7f85459beb1319486927d293c7cef8a0260"; + }) + ]; + buildInputs = + (self.nativeDeps."JSONStream" or []); + deps = [ + self.by-version."jsonparse"."0.0.5" + self.by-version."through"."2.2.7" + ]; + peerDependencies = [ + ]; + passthru.names = [ "JSONStream" ]; + }; by-spec."StringScanner"."~0.0.3" = self.by-version."StringScanner"."0.0.3"; by-version."StringScanner"."0.0.3" = lib.makeOverridable self.buildNodePackage { @@ -106,6 +167,27 @@ self.by-version."abbrev"."1.0.4"; by-spec."abbrev"."~1.0.4" = self.by-version."abbrev"."1.0.4"; + by-spec."accepts"."1.0.0" = + self.by-version."accepts"."1.0.0"; + by-version."accepts"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-accepts-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/accepts/-/accepts-1.0.0.tgz"; + name = "accepts-1.0.0.tgz"; + sha1 = "3604c765586c3b9cf7877b6937cdbd4587f947dc"; + }) + ]; + buildInputs = + (self.nativeDeps."accepts" or []); + deps = [ + self.by-version."mime"."1.2.11" + self.by-version."negotiator"."0.3.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "accepts" ]; + }; by-spec."active-x-obfuscator"."0.0.1" = self.by-version."active-x-obfuscator"."0.0.1"; by-version."active-x-obfuscator"."0.0.1" = lib.makeOverridable self.buildNodePackage { @@ -412,7 +494,7 @@ buildInputs = (self.nativeDeps."archiver" or []); deps = [ - self.by-version."readable-stream"."1.0.25" + self.by-version."readable-stream"."1.0.26" self.by-version."zip-stream"."0.1.4" self.by-version."lazystream"."0.1.0" self.by-version."file-utils"."0.1.5" @@ -466,6 +548,25 @@ }; by-spec."argparse"."~ 0.1.11" = self.by-version."argparse"."0.1.15"; + by-spec."ascii-json"."~0.2" = + self.by-version."ascii-json"."0.2.0"; + by-version."ascii-json"."0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "node-ascii-json-0.2.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ascii-json/-/ascii-json-0.2.0.tgz"; + name = "ascii-json-0.2.0.tgz"; + sha1 = "10ddb361fd48f72595309fd10a6ea2e7bf2c9218"; + }) + ]; + buildInputs = + (self.nativeDeps."ascii-json" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "ascii-json" ]; + }; by-spec."ascli"."*" = self.by-version."ascli"."0.3.0"; by-version."ascli"."0.3.0" = lib.makeOverridable self.buildNodePackage { @@ -527,6 +628,8 @@ passthru.names = [ "assert" ]; }; "assert" = self.by-version."assert"."1.1.1"; + by-spec."assert"."~1.1.0" = + self.by-version."assert"."1.1.1"; by-spec."assert-plus"."0.1.2" = self.by-version."assert-plus"."0.1.2"; by-version."assert-plus"."0.1.2" = lib.makeOverridable self.buildNodePackage { @@ -565,6 +668,26 @@ ]; passthru.names = [ "assertion-error" ]; }; + by-spec."astw"."~0.1.0" = + self.by-version."astw"."0.1.0"; + by-version."astw"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-astw-0.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/astw/-/astw-0.1.0.tgz"; + name = "astw-0.1.0.tgz"; + sha1 = "098be2758a6e9e9e15465d4fc4ba36265de11085"; + }) + ]; + buildInputs = + (self.nativeDeps."astw" or []); + deps = [ + self.by-version."esprima-six"."0.0.3" + ]; + peerDependencies = [ + ]; + passthru.names = [ "astw" ]; + }; by-spec."async"."*" = self.by-version."async"."0.2.10"; by-version."async"."0.2.10" = lib.makeOverridable self.buildNodePackage { @@ -648,6 +771,8 @@ self.by-version."async"."0.2.10"; by-spec."async"."~0.1.22" = self.by-version."async"."0.1.22"; + by-spec."async"."~0.2.10" = + self.by-version."async"."0.2.10"; by-spec."async"."~0.2.6" = self.by-version."async"."0.2.10"; by-spec."async"."~0.2.7" = @@ -757,14 +882,14 @@ passthru.names = [ "aws-sign2" ]; }; by-spec."backbone"."*" = - self.by-version."backbone"."1.1.1"; - by-version."backbone"."1.1.1" = lib.makeOverridable self.buildNodePackage { - name = "node-backbone-1.1.1"; + self.by-version."backbone"."1.1.2"; + by-version."backbone"."1.1.2" = lib.makeOverridable self.buildNodePackage { + name = "node-backbone-1.1.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/backbone/-/backbone-1.1.1.tgz"; - name = "backbone-1.1.1.tgz"; - sha1 = "8091197fef3a58fdeae24de70d96e23ce432f399"; + url = "http://registry.npmjs.org/backbone/-/backbone-1.1.2.tgz"; + name = "backbone-1.1.2.tgz"; + sha1 = "c2c04c66bf87268fb82c177acebeff7d37ba6f2d"; }) ]; buildInputs = @@ -776,7 +901,7 @@ ]; passthru.names = [ "backbone" ]; }; - "backbone" = self.by-version."backbone"."1.1.1"; + "backbone" = self.by-version."backbone"."1.1.2"; by-spec."backoff"."2.1.0" = self.by-version."backoff"."2.1.0"; by-version."backoff"."2.1.0" = lib.makeOverridable self.buildNodePackage { @@ -796,6 +921,25 @@ ]; passthru.names = [ "backoff" ]; }; + by-spec."base64-js"."~0.0.4" = + self.by-version."base64-js"."0.0.6"; + by-version."base64-js"."0.0.6" = lib.makeOverridable self.buildNodePackage { + name = "node-base64-js-0.0.6"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/base64-js/-/base64-js-0.0.6.tgz"; + name = "base64-js-0.0.6.tgz"; + sha1 = "7b859f79f0bbbd55867ba67a7fab397e24a20947"; + }) + ]; + buildInputs = + (self.nativeDeps."base64-js" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "base64-js" ]; + }; by-spec."base64id"."0.1.0" = self.by-version."base64id"."0.1.0"; by-version."base64id"."0.1.0" = lib.makeOverridable self.buildNodePackage { @@ -1041,7 +1185,7 @@ self.by-version."decompress-zip"."0.0.4" self.by-version."fstream"."0.1.25" self.by-version."fstream-ignore"."0.0.7" - self.by-version."glob"."3.2.8" + self.by-version."glob"."3.2.9" self.by-version."graceful-fs"."2.0.2" self.by-version."handlebars"."1.0.12" self.by-version."inquirer"."0.3.5" @@ -1235,14 +1379,14 @@ passthru.names = [ "bower-registry-client" ]; }; by-spec."bower2nix"."*" = - self.by-version."bower2nix"."3.0.0"; - by-version."bower2nix"."3.0.0" = lib.makeOverridable self.buildNodePackage { - name = "bower2nix-3.0.0"; + self.by-version."bower2nix"."2.1.0"; + by-version."bower2nix"."2.1.0" = lib.makeOverridable self.buildNodePackage { + name = "bower2nix-2.1.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/bower2nix/-/bower2nix-3.0.0.tgz"; - name = "bower2nix-3.0.0.tgz"; - sha1 = "afe3c676baff67b86e06f5514a325be45b317184"; + url = "http://registry.npmjs.org/bower2nix/-/bower2nix-2.1.0.tgz"; + name = "bower2nix-2.1.0.tgz"; + sha1 = "213f507a729b20a1c3cb48f995a034f9c05f53e6"; }) ]; buildInputs = @@ -1251,6 +1395,9 @@ self.by-version."temp"."0.6.0" self.by-version."fs.extra"."1.2.1" self.by-version."bower-json"."0.4.0" + self.by-version."bower-endpoint-parser"."0.2.1" + self.by-version."bower-logger"."0.2.1" + self.by-version."bower"."1.2.8" self.by-version."argparse"."0.1.15" self.by-version."clone"."0.1.11" self.by-version."semver"."2.2.1" @@ -1260,7 +1407,7 @@ ]; passthru.names = [ "bower2nix" ]; }; - "bower2nix" = self.by-version."bower2nix"."3.0.0"; + "bower2nix" = self.by-version."bower2nix"."2.1.0"; by-spec."broadway"."0.2.9" = self.by-version."broadway"."0.2.9"; by-version."broadway"."0.2.9" = lib.makeOverridable self.buildNodePackage { @@ -1287,15 +1434,59 @@ }; by-spec."broadway"."0.2.x" = self.by-version."broadway"."0.2.9"; - by-spec."browserchannel"."*" = - self.by-version."browserchannel"."1.0.8"; - by-version."browserchannel"."1.0.8" = lib.makeOverridable self.buildNodePackage { - name = "node-browserchannel-1.0.8"; + by-spec."browser-pack"."~2.0.0" = + self.by-version."browser-pack"."2.0.1"; + by-version."browser-pack"."2.0.1" = lib.makeOverridable self.buildNodePackage { + name = "browser-pack-2.0.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/browserchannel/-/browserchannel-1.0.8.tgz"; - name = "browserchannel-1.0.8.tgz"; - sha1 = "96da83d139d8943f5bd616c334f148bd008dbac4"; + url = "http://registry.npmjs.org/browser-pack/-/browser-pack-2.0.1.tgz"; + name = "browser-pack-2.0.1.tgz"; + sha1 = "5d1c527f56c582677411c4db2a128648ff6bf150"; + }) + ]; + buildInputs = + (self.nativeDeps."browser-pack" or []); + deps = [ + self.by-version."JSONStream"."0.6.4" + self.by-version."through"."2.3.4" + self.by-version."combine-source-map"."0.3.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "browser-pack" ]; + }; + by-spec."browser-resolve"."~1.2.1" = + self.by-version."browser-resolve"."1.2.2"; + by-version."browser-resolve"."1.2.2" = lib.makeOverridable self.buildNodePackage { + name = "node-browser-resolve-1.2.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/browser-resolve/-/browser-resolve-1.2.2.tgz"; + name = "browser-resolve-1.2.2.tgz"; + sha1 = "83b1eaed8f120b906f56078e134669db0a4a5c11"; + }) + ]; + buildInputs = + (self.nativeDeps."browser-resolve" or []); + deps = [ + self.by-version."resolve"."0.6.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "browser-resolve" ]; + }; + by-spec."browser-resolve"."~1.2.2" = + self.by-version."browser-resolve"."1.2.2"; + by-spec."browserchannel"."*" = + self.by-version."browserchannel"."1.1.1"; + by-version."browserchannel"."1.1.1" = lib.makeOverridable self.buildNodePackage { + name = "node-browserchannel-1.1.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/browserchannel/-/browserchannel-1.1.1.tgz"; + name = "browserchannel-1.1.1.tgz"; + sha1 = "223aeddf06892314e11f15fd2d4e2ade64a1bba5"; }) ]; buildInputs = @@ -1303,13 +1494,78 @@ deps = [ self.by-version."hat"."0.0.3" self.by-version."connect"."2.13.0" - self.by-version."request"."2.33.0" + self.by-version."request"."2.34.0" + self.by-version."ascii-json"."0.2.0" ]; peerDependencies = [ ]; passthru.names = [ "browserchannel" ]; }; - "browserchannel" = self.by-version."browserchannel"."1.0.8"; + "browserchannel" = self.by-version."browserchannel"."1.1.1"; + by-spec."browserify"."~3.31.2" = + self.by-version."browserify"."3.31.2"; + by-version."browserify"."3.31.2" = lib.makeOverridable self.buildNodePackage { + name = "browserify-3.31.2"; + src = [ + (self.patchSource fetchurl { + url = "http://registry.npmjs.org/browserify/-/browserify-3.31.2.tgz"; + name = "browserify-3.31.2.tgz"; + sha1 = "ec5bbd7fff284645db59280c340d972868e0ab1b"; + }) + ]; + buildInputs = + (self.nativeDeps."browserify" or []); + deps = [ + self.by-version."module-deps"."1.7.1" + self.by-version."browser-pack"."2.0.1" + self.by-version."deps-sort"."0.1.1" + self.by-version."shell-quote"."0.0.1" + self.by-version."through"."2.3.4" + self.by-version."duplexer"."0.1.1" + self.by-version."stream-combiner"."0.0.4" + self.by-version."concat-stream"."1.4.1" + self.by-version."insert-module-globals"."3.2.0" + self.by-version."syntax-error"."0.1.0" + self.by-version."browser-resolve"."1.2.2" + self.by-version."inherits"."2.0.1" + self.by-version."JSONStream"."0.7.1" + self.by-version."umd"."2.0.0" + self.by-version."parents"."0.0.2" + self.by-version."deep-equal"."0.1.2" + self.by-version."constants-browserify"."0.0.1" + self.by-version."os-browserify"."0.1.1" + self.by-version."console-browserify"."1.0.3" + self.by-version."vm-browserify"."0.0.4" + self.by-version."zlib-browserify"."0.0.3" + self.by-version."assert"."1.1.1" + self.by-version."http-browserify"."1.3.2" + self.by-version."crypto-browserify"."1.0.9" + self.by-version."util"."0.10.3" + self.by-version."events"."1.0.0" + self.by-version."buffer"."2.1.4" + self.by-version."url"."0.7.9" + self.by-version."https-browserify"."0.0.0" + self.by-version."path-browserify"."0.0.0" + self.by-version."querystring"."0.2.0" + self.by-version."stream-browserify"."0.1.3" + self.by-version."string_decoder"."0.0.1" + self.by-version."tty-browserify"."0.0.0" + self.by-version."timers-browserify"."1.0.1" + self.by-version."punycode"."1.2.4" + self.by-version."defined"."0.0.0" + self.by-version."domain-browser"."1.1.1" + self.by-version."derequire"."0.6.1" + self.by-version."commondir"."0.0.1" + self.by-version."shallow-copy"."0.0.1" + self.by-version."subarg"."0.0.1" + self.by-version."resolve"."0.6.1" + self.by-version."glob"."3.2.9" + self.by-version."builtins"."0.0.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "browserify" ]; + }; by-spec."bson"."0.1.8" = self.by-version."bson"."0.1.8"; by-version."bson"."0.1.8" = lib.makeOverridable self.buildNodePackage { @@ -1367,15 +1623,15 @@ ]; passthru.names = [ "bson" ]; }; - by-spec."bson"."0.2.6" = - self.by-version."bson"."0.2.6"; - by-version."bson"."0.2.6" = lib.makeOverridable self.buildNodePackage { - name = "node-bson-0.2.6"; + by-spec."bson"."0.2.7" = + self.by-version."bson"."0.2.7"; + by-version."bson"."0.2.7" = lib.makeOverridable self.buildNodePackage { + name = "node-bson-0.2.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/bson/-/bson-0.2.6.tgz"; - name = "bson-0.2.6.tgz"; - sha1 = "d001aa3d20b92e3f9cbc19d542515a748586a743"; + url = "http://registry.npmjs.org/bson/-/bson-0.2.7.tgz"; + name = "bson-0.2.7.tgz"; + sha1 = "6793161c40e5a9757091d7ee7d52a4717950236b"; }) ]; buildInputs = @@ -1387,6 +1643,27 @@ ]; passthru.names = [ "bson" ]; }; + by-spec."buffer"."~2.1.4" = + self.by-version."buffer"."2.1.4"; + by-version."buffer"."2.1.4" = lib.makeOverridable self.buildNodePackage { + name = "node-buffer-2.1.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/buffer/-/buffer-2.1.4.tgz"; + name = "buffer-2.1.4.tgz"; + sha1 = "0283e62870b4f450b636e00eb9fd527cd9ae1341"; + }) + ]; + buildInputs = + (self.nativeDeps."buffer" or []); + deps = [ + self.by-version."base64-js"."0.0.6" + self.by-version."ieee754"."1.1.3" + ]; + peerDependencies = [ + ]; + passthru.names = [ "buffer" ]; + }; by-spec."buffer-crc32"."0.1.1" = self.by-version."buffer-crc32"."0.1.1"; by-version."buffer-crc32"."0.1.1" = lib.makeOverridable self.buildNodePackage { @@ -1485,6 +1762,25 @@ ]; passthru.names = [ "buffertools" ]; }; + by-spec."builtins"."0.0.2" = + self.by-version."builtins"."0.0.2"; + by-version."builtins"."0.0.2" = lib.makeOverridable self.buildNodePackage { + name = "node-builtins-0.0.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/builtins/-/builtins-0.0.2.tgz"; + name = "builtins-0.0.2.tgz"; + sha1 = "b738db1ea166b752f7e0144c76f6ad5289448e51"; + }) + ]; + buildInputs = + (self.nativeDeps."builtins" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "builtins" ]; + }; by-spec."bunyan"."0.21.1" = self.by-version."bunyan"."0.21.1"; by-version."bunyan"."0.21.1" = lib.makeOverridable self.buildNodePackage { @@ -1585,6 +1881,25 @@ }; by-spec."bytes"."~0.2.1" = self.by-version."bytes"."0.2.1"; + by-spec."callsite"."~1.0.0" = + self.by-version."callsite"."1.0.0"; + by-version."callsite"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-callsite-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz"; + name = "callsite-1.0.0.tgz"; + sha1 = "280398e5d664bd74038b6f0905153e6e8af1bc20"; + }) + ]; + buildInputs = + (self.nativeDeps."callsite" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "callsite" ]; + }; by-spec."cardinal"."~0.4.0" = self.by-version."cardinal"."0.4.4"; by-version."cardinal"."0.4.4" = lib.makeOverridable self.buildNodePackage { @@ -1599,7 +1914,7 @@ buildInputs = (self.nativeDeps."cardinal" or []); deps = [ - self.by-version."redeyed"."0.4.2" + self.by-version."redeyed"."0.4.4" self.by-version."ansicolors"."0.2.1" ]; peerDependencies = [ @@ -1648,6 +1963,28 @@ ]; passthru.names = [ "chainsaw" ]; }; + by-spec."chalk"."^0.4.0" = + self.by-version."chalk"."0.4.0"; + by-version."chalk"."0.4.0" = lib.makeOverridable self.buildNodePackage { + name = "node-chalk-0.4.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz"; + name = "chalk-0.4.0.tgz"; + sha1 = "5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"; + }) + ]; + buildInputs = + (self.nativeDeps."chalk" or []); + deps = [ + self.by-version."has-color"."0.1.4" + self.by-version."ansi-styles"."1.0.0" + self.by-version."strip-ansi"."0.1.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "chalk" ]; + }; by-spec."chalk"."~0.1.1" = self.by-version."chalk"."0.1.1"; by-version."chalk"."0.1.1" = lib.makeOverridable self.buildNodePackage { @@ -1715,26 +2052,6 @@ }; by-spec."chalk"."~0.4.0" = self.by-version."chalk"."0.4.0"; - by-version."chalk"."0.4.0" = lib.makeOverridable self.buildNodePackage { - name = "node-chalk-0.4.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz"; - name = "chalk-0.4.0.tgz"; - sha1 = "5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"; - }) - ]; - buildInputs = - (self.nativeDeps."chalk" or []); - deps = [ - self.by-version."has-color"."0.1.4" - self.by-version."ansi-styles"."1.0.0" - self.by-version."strip-ansi"."0.1.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "chalk" ]; - }; by-spec."character-parser"."1.2.0" = self.by-version."character-parser"."1.2.0"; by-version."character-parser"."1.2.0" = lib.makeOverridable self.buildNodePackage { @@ -1916,35 +2233,15 @@ ]; passthru.names = [ "class-extend" ]; }; - by-spec."clean-css"."2.0.x" = - self.by-version."clean-css"."2.0.8"; - by-version."clean-css"."2.0.8" = lib.makeOverridable self.buildNodePackage { - name = "clean-css-2.0.8"; + by-spec."clean-css"."2.1.x" = + self.by-version."clean-css"."2.1.4"; + by-version."clean-css"."2.1.4" = lib.makeOverridable self.buildNodePackage { + name = "clean-css-2.1.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/clean-css/-/clean-css-2.0.8.tgz"; - name = "clean-css-2.0.8.tgz"; - sha1 = "e937cdfdcc5781a00817aec4079e85b3ec157a20"; - }) - ]; - buildInputs = - (self.nativeDeps."clean-css" or []); - deps = [ - self.by-version."commander"."2.0.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "clean-css" ]; - }; - by-spec."clean-css"."~2.1.0" = - self.by-version."clean-css"."2.1.0"; - by-version."clean-css"."2.1.0" = lib.makeOverridable self.buildNodePackage { - name = "clean-css-2.1.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/clean-css/-/clean-css-2.1.0.tgz"; - name = "clean-css-2.1.0.tgz"; - sha1 = "2884698408337a94c33cc028acd13ea4a532132e"; + url = "http://registry.npmjs.org/clean-css/-/clean-css-2.1.4.tgz"; + name = "clean-css-2.1.4.tgz"; + sha1 = "82b59182c8aa02d7050329b0b977f7651bf9875e"; }) ]; buildInputs = @@ -1956,6 +2253,8 @@ ]; passthru.names = [ "clean-css" ]; }; + by-spec."clean-css"."~2.1.0" = + self.by-version."clean-css"."2.1.4"; by-spec."cli"."0.4.x" = self.by-version."cli"."0.4.5"; by-version."cli"."0.4.5" = lib.makeOverridable self.buildNodePackage { @@ -1970,7 +2269,7 @@ buildInputs = (self.nativeDeps."cli" or []); deps = [ - self.by-version."glob"."3.2.8" + self.by-version."glob"."3.2.9" ]; peerDependencies = [ ]; @@ -2349,6 +2648,28 @@ ]; passthru.names = [ "columnify" ]; }; + by-spec."combine-source-map"."~0.3.0" = + self.by-version."combine-source-map"."0.3.0"; + by-version."combine-source-map"."0.3.0" = lib.makeOverridable self.buildNodePackage { + name = "node-combine-source-map-0.3.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/combine-source-map/-/combine-source-map-0.3.0.tgz"; + name = "combine-source-map-0.3.0.tgz"; + sha1 = "d9e74f593d9cd43807312cb5d846d451efaa9eb7"; + }) + ]; + buildInputs = + (self.nativeDeps."combine-source-map" or []); + deps = [ + self.by-version."inline-source-map"."0.3.0" + self.by-version."convert-source-map"."0.3.3" + self.by-version."source-map"."0.1.33" + ]; + peerDependencies = [ + ]; + passthru.names = [ "combine-source-map" ]; + }; by-spec."combined-stream"."~0.0.4" = self.by-version."combined-stream"."0.0.4"; by-version."combined-stream"."0.0.4" = lib.makeOverridable self.buildNodePackage { @@ -2447,8 +2768,6 @@ ]; passthru.names = [ "commander" ]; }; - by-spec."commander"."2.0.x" = - self.by-version."commander"."2.0.0"; by-spec."commander"."2.1.0" = self.by-version."commander"."2.1.0"; by-version."commander"."2.1.0" = lib.makeOverridable self.buildNodePackage { @@ -2472,6 +2791,25 @@ self.by-version."commander"."2.1.0"; by-spec."commander"."~0.6.1" = self.by-version."commander"."0.6.1"; + by-spec."commondir"."0.0.1" = + self.by-version."commondir"."0.0.1"; + by-version."commondir"."0.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-commondir-0.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/commondir/-/commondir-0.0.1.tgz"; + name = "commondir-0.0.1.tgz"; + sha1 = "89f00fdcd51b519c578733fec563e6a6da7f5be2"; + }) + ]; + buildInputs = + (self.nativeDeps."commondir" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "commondir" ]; + }; by-spec."compressible"."1.0.0" = self.by-version."compressible"."1.0.0"; by-version."compressible"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -2491,6 +2829,30 @@ ]; passthru.names = [ "compressible" ]; }; + by-spec."concat-stream"."^1.4.1" = + self.by-version."concat-stream"."1.4.1"; + by-version."concat-stream"."1.4.1" = lib.makeOverridable self.buildNodePackage { + name = "node-concat-stream-1.4.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/concat-stream/-/concat-stream-1.4.1.tgz"; + name = "concat-stream-1.4.1.tgz"; + sha1 = "20358b86fe36e5ac3de29cec76f4d04ad8ff1423"; + }) + ]; + buildInputs = + (self.nativeDeps."concat-stream" or []); + deps = [ + self.by-version."inherits"."2.0.1" + self.by-version."typedarray"."0.0.5" + self.by-version."readable-stream"."1.1.11" + ]; + peerDependencies = [ + ]; + passthru.names = [ "concat-stream" ]; + }; + by-spec."concat-stream"."~1.4.1" = + self.by-version."concat-stream"."1.4.1"; by-spec."config"."0.4.15" = self.by-version."config"."0.4.15"; by-version."config"."0.4.15" = lib.makeOverridable self.buildNodePackage { @@ -2575,7 +2937,7 @@ (self.nativeDeps."configstore" or []); deps = [ self.by-version."mkdirp"."0.3.5" - self.by-version."js-yaml"."3.0.1" + self.by-version."js-yaml"."3.0.2" self.by-version."osenv"."0.0.3" self.by-version."graceful-fs"."2.0.2" self.by-version."uuid"."1.4.1" @@ -2849,7 +3211,7 @@ buildInputs = (self.nativeDeps."connect-jade-static" or []); deps = [ - self.by-version."jade"."1.1.5" + self.by-version."jade"."1.3.0" ]; peerDependencies = [ ]; @@ -2915,6 +3277,25 @@ ]; passthru.names = [ "console-browserify" ]; }; + by-spec."console-browserify"."~1.0.1" = + self.by-version."console-browserify"."1.0.3"; + by-version."console-browserify"."1.0.3" = lib.makeOverridable self.buildNodePackage { + name = "node-console-browserify-1.0.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/console-browserify/-/console-browserify-1.0.3.tgz"; + name = "console-browserify-1.0.3.tgz"; + sha1 = "d3898d2c3a93102f364197f8874b4f92b5286a8e"; + }) + ]; + buildInputs = + (self.nativeDeps."console-browserify" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "console-browserify" ]; + }; by-spec."constantinople"."~1.0.1" = self.by-version."constantinople"."1.0.2"; by-version."constantinople"."1.0.2" = lib.makeOverridable self.buildNodePackage { @@ -2937,6 +3318,64 @@ }; by-spec."constantinople"."~1.0.2" = self.by-version."constantinople"."1.0.2"; + by-spec."constantinople"."~2.0.0" = + self.by-version."constantinople"."2.0.0"; + by-version."constantinople"."2.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-constantinople-2.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/constantinople/-/constantinople-2.0.0.tgz"; + name = "constantinople-2.0.0.tgz"; + sha1 = "0558c3f340095a43acf2386149e5537074330e49"; + }) + ]; + buildInputs = + (self.nativeDeps."constantinople" or []); + deps = [ + self.by-version."uglify-js"."2.4.12" + ]; + peerDependencies = [ + ]; + passthru.names = [ "constantinople" ]; + }; + by-spec."constants-browserify"."~0.0.1" = + self.by-version."constants-browserify"."0.0.1"; + by-version."constants-browserify"."0.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-constants-browserify-0.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/constants-browserify/-/constants-browserify-0.0.1.tgz"; + name = "constants-browserify-0.0.1.tgz"; + sha1 = "92577db527ba6c4cf0a4568d84bc031f441e21f2"; + }) + ]; + buildInputs = + (self.nativeDeps."constants-browserify" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "constants-browserify" ]; + }; + by-spec."convert-source-map"."~0.3.0" = + self.by-version."convert-source-map"."0.3.3"; + by-version."convert-source-map"."0.3.3" = lib.makeOverridable self.buildNodePackage { + name = "node-convert-source-map-0.3.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.3.tgz"; + name = "convert-source-map-0.3.3.tgz"; + sha1 = "f77f130ded4e611d313a1bcf78f988990831c69b"; + }) + ]; + buildInputs = + (self.nativeDeps."convert-source-map" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "convert-source-map" ]; + }; by-spec."cookie"."0.0.4" = self.by-version."cookie"."0.0.4"; by-version."cookie"."0.0.4" = lib.makeOverridable self.buildNodePackage { @@ -3070,6 +3509,25 @@ ]; passthru.names = [ "cookie-signature" ]; }; + by-spec."cookie-signature"."1.0.3" = + self.by-version."cookie-signature"."1.0.3"; + by-version."cookie-signature"."1.0.3" = lib.makeOverridable self.buildNodePackage { + name = "node-cookie-signature-1.0.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.3.tgz"; + name = "cookie-signature-1.0.3.tgz"; + sha1 = "91cd997cc51fb641595738c69cda020328f50ff9"; + }) + ]; + buildInputs = + (self.nativeDeps."cookie-signature" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "cookie-signature" ]; + }; by-spec."cookiejar"."1.3.0" = self.by-version."cookiejar"."1.3.0"; by-version."cookiejar"."1.3.0" = lib.makeOverridable self.buildNodePackage { @@ -3162,7 +3620,7 @@ buildInputs = (self.nativeDeps."couch-login" or []); deps = [ - self.by-version."request"."2.33.0" + self.by-version."request"."2.34.0" ]; peerDependencies = [ ]; @@ -3290,6 +3748,25 @@ ]; passthru.names = [ "crypto" ]; }; + by-spec."crypto-browserify"."~1.0.9" = + self.by-version."crypto-browserify"."1.0.9"; + by-version."crypto-browserify"."1.0.9" = lib.makeOverridable self.buildNodePackage { + name = "node-crypto-browserify-1.0.9"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/crypto-browserify/-/crypto-browserify-1.0.9.tgz"; + name = "crypto-browserify-1.0.9.tgz"; + sha1 = "cc5449685dfb85eb11c9828acc7cb87ab5bbfcc0"; + }) + ]; + buildInputs = + (self.nativeDeps."crypto-browserify" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "crypto-browserify" ]; + }; by-spec."css"."~1.0.8" = self.by-version."css"."1.0.8"; by-version."css"."1.0.8" = lib.makeOverridable self.buildNodePackage { @@ -3593,7 +4070,7 @@ self.by-version."mkpath"."0.1.0" self.by-version."binary"."0.3.0" self.by-version."touch"."0.0.2" - self.by-version."readable-stream"."1.1.10" + self.by-version."readable-stream"."1.1.11" self.by-version."nopt"."2.1.2" ]; peerDependencies = [ @@ -3658,6 +4135,27 @@ ]; passthru.names = [ "deep-equal" ]; }; + by-spec."deep-equal"."~0.0.0" = + self.by-version."deep-equal"."0.0.0"; + by-spec."deep-equal"."~0.1.0" = + self.by-version."deep-equal"."0.1.2"; + by-version."deep-equal"."0.1.2" = lib.makeOverridable self.buildNodePackage { + name = "node-deep-equal-0.1.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.1.2.tgz"; + name = "deep-equal-0.1.2.tgz"; + sha1 = "b246c2b80a570a47c11be1d9bd1070ec878b87ce"; + }) + ]; + buildInputs = + (self.nativeDeps."deep-equal" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "deep-equal" ]; + }; by-spec."deep-extend"."~0.2.5" = self.by-version."deep-extend"."0.2.8"; by-version."deep-extend"."0.2.8" = lib.makeOverridable self.buildNodePackage { @@ -3677,8 +4175,27 @@ ]; passthru.names = [ "deep-extend" ]; }; - by-spec."deep-extend"."~0.2.6" = + by-spec."deep-extend"."~0.2.8" = self.by-version."deep-extend"."0.2.8"; + by-spec."defined"."~0.0.0" = + self.by-version."defined"."0.0.0"; + by-version."defined"."0.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-defined-0.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/defined/-/defined-0.0.0.tgz"; + name = "defined-0.0.0.tgz"; + sha1 = "f35eea7d705e933baf13b2f03b3f83d921403b3e"; + }) + ]; + buildInputs = + (self.nativeDeps."defined" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "defined" ]; + }; by-spec."delayed-stream"."0.0.5" = self.by-version."delayed-stream"."0.0.5"; by-version."delayed-stream"."0.0.5" = lib.makeOverridable self.buildNodePackage { @@ -3698,6 +4215,71 @@ ]; passthru.names = [ "delayed-stream" ]; }; + by-spec."deps-sort"."~0.1.1" = + self.by-version."deps-sort"."0.1.1"; + by-version."deps-sort"."0.1.1" = lib.makeOverridable self.buildNodePackage { + name = "deps-sort-0.1.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/deps-sort/-/deps-sort-0.1.1.tgz"; + name = "deps-sort-0.1.1.tgz"; + sha1 = "940d9da1f84a3891c7218ad240ec5ed6084bc8d6"; + }) + ]; + buildInputs = + (self.nativeDeps."deps-sort" or []); + deps = [ + self.by-version."through"."2.3.4" + self.by-version."JSONStream"."0.6.4" + self.by-version."minimist"."0.0.8" + ]; + peerDependencies = [ + ]; + passthru.names = [ "deps-sort" ]; + }; + by-spec."derequire"."~0.6.0" = + self.by-version."derequire"."0.6.1"; + by-version."derequire"."0.6.1" = lib.makeOverridable self.buildNodePackage { + name = "node-derequire-0.6.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/derequire/-/derequire-0.6.1.tgz"; + name = "derequire-0.6.1.tgz"; + sha1 = "cce8ee25380de715deb61900f0bdd38222928788"; + }) + ]; + buildInputs = + (self.nativeDeps."derequire" or []); + deps = [ + self.by-version."estraverse"."1.5.0" + self.by-version."esprima-six"."0.0.3" + self.by-version."esrefactor"."0.1.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "derequire" ]; + }; + by-spec."detective"."~2.4.0" = + self.by-version."detective"."2.4.1"; + by-version."detective"."2.4.1" = lib.makeOverridable self.buildNodePackage { + name = "node-detective-2.4.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/detective/-/detective-2.4.1.tgz"; + name = "detective-2.4.1.tgz"; + sha1 = "943b8eec4c346f6ac501de25da2ea1a57ed77819"; + }) + ]; + buildInputs = + (self.nativeDeps."detective" or []); + deps = [ + self.by-version."escodegen"."1.1.0" + self.by-version."esprima-six"."0.0.3" + ]; + peerDependencies = [ + ]; + passthru.names = [ "detective" ]; + }; by-spec."di"."~0.0.1" = self.by-version."di"."0.0.1"; by-version."di"."0.0.1" = lib.makeOverridable self.buildNodePackage { @@ -3799,6 +4381,25 @@ ]; passthru.names = [ "dkim-signer" ]; }; + by-spec."domain-browser"."~1.1.0" = + self.by-version."domain-browser"."1.1.1"; + by-version."domain-browser"."1.1.1" = lib.makeOverridable self.buildNodePackage { + name = "node-domain-browser-1.1.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/domain-browser/-/domain-browser-1.1.1.tgz"; + name = "domain-browser-1.1.1.tgz"; + sha1 = "0123c1b9afe3bb7c8a9e856177b2059440957de0"; + }) + ]; + buildInputs = + (self.nativeDeps."domain-browser" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "domain-browser" ]; + }; by-spec."domelementtype"."1" = self.by-version."domelementtype"."1.1.1"; by-version."domelementtype"."1.1.1" = lib.makeOverridable self.buildNodePackage { @@ -4194,6 +4795,8 @@ passthru.names = [ "escape-html" ]; }; "escape-html" = self.by-version."escape-html"."1.0.1"; + by-spec."escape-html"."1.0.1" = + self.by-version."escape-html"."1.0.1"; by-spec."escodegen"."*" = self.by-version."escodegen"."1.2.0"; by-version."escodegen"."1.2.0" = lib.makeOverridable self.buildNodePackage { @@ -4211,7 +4814,7 @@ self.by-version."esprima"."1.0.4" self.by-version."estraverse"."1.5.0" self.by-version."esutils"."1.0.0" - self.by-version."source-map"."0.1.32" + self.by-version."source-map"."0.1.33" ]; peerDependencies = [ ]; @@ -4233,7 +4836,7 @@ deps = [ self.by-version."esprima"."1.0.4" self.by-version."estraverse"."0.0.4" - self.by-version."source-map"."0.1.32" + self.by-version."source-map"."0.1.33" ]; peerDependencies = [ ]; @@ -4256,12 +4859,55 @@ self.by-version."esprima"."1.0.4" self.by-version."estraverse"."1.5.0" self.by-version."esutils"."1.0.0" - self.by-version."source-map"."0.1.32" + self.by-version."source-map"."0.1.33" ]; peerDependencies = [ ]; passthru.names = [ "escodegen" ]; }; + by-spec."escodegen"."~1.1.0" = + self.by-version."escodegen"."1.1.0"; + by-version."escodegen"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "escodegen-1.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/escodegen/-/escodegen-1.1.0.tgz"; + name = "escodegen-1.1.0.tgz"; + sha1 = "c663923f6e20aad48d0c0fa49f31c6d4f49360cf"; + }) + ]; + buildInputs = + (self.nativeDeps."escodegen" or []); + deps = [ + self.by-version."esprima"."1.0.4" + self.by-version."estraverse"."1.5.0" + self.by-version."esutils"."1.0.0" + self.by-version."source-map"."0.1.33" + ]; + peerDependencies = [ + ]; + passthru.names = [ "escodegen" ]; + }; + by-spec."escope"."~0.0.13" = + self.by-version."escope"."0.0.16"; + by-version."escope"."0.0.16" = lib.makeOverridable self.buildNodePackage { + name = "node-escope-0.0.16"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/escope/-/escope-0.0.16.tgz"; + name = "escope-0.0.16.tgz"; + sha1 = "418c7a0afca721dafe659193fd986283e746538f"; + }) + ]; + buildInputs = + (self.nativeDeps."escope" or []); + deps = [ + self.by-version."estraverse"."1.5.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "escope" ]; + }; by-spec."esprima"."1.0.x" = self.by-version."esprima"."1.0.4"; by-version."esprima"."1.0.4" = lib.makeOverridable self.buildNodePackage { @@ -4283,12 +4929,53 @@ }; by-spec."esprima"."~ 1.0.2" = self.by-version."esprima"."1.0.4"; - by-spec."esprima"."~1.0.0" = - self.by-version."esprima"."1.0.4"; by-spec."esprima"."~1.0.2" = self.by-version."esprima"."1.0.4"; by-spec."esprima"."~1.0.4" = self.by-version."esprima"."1.0.4"; + by-spec."esprima-six"."0.0.3" = + self.by-version."esprima-six"."0.0.3"; + by-version."esprima-six"."0.0.3" = lib.makeOverridable self.buildNodePackage { + name = "esprima-six-0.0.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/esprima-six/-/esprima-six-0.0.3.tgz"; + name = "esprima-six-0.0.3.tgz"; + sha1 = "8eb750435b02d3e50cf09b5736cbce4606a4399f"; + }) + ]; + buildInputs = + (self.nativeDeps."esprima-six" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "esprima-six" ]; + }; + by-spec."esprima-six"."~0.0.3" = + self.by-version."esprima-six"."0.0.3"; + by-spec."esrefactor"."~0.1.0" = + self.by-version."esrefactor"."0.1.0"; + by-version."esrefactor"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-esrefactor-0.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/esrefactor/-/esrefactor-0.1.0.tgz"; + name = "esrefactor-0.1.0.tgz"; + sha1 = "d142795a282339ab81e936b5b7a21b11bf197b13"; + }) + ]; + buildInputs = + (self.nativeDeps."esrefactor" or []); + deps = [ + self.by-version."esprima"."1.0.4" + self.by-version."estraverse"."0.0.4" + self.by-version."escope"."0.0.16" + ]; + peerDependencies = [ + ]; + passthru.names = [ "esrefactor" ]; + }; by-spec."estraverse"."*" = self.by-version."estraverse"."1.5.0"; by-version."estraverse"."1.5.0" = lib.makeOverridable self.buildNodePackage { @@ -4308,6 +4995,8 @@ ]; passthru.names = [ "estraverse" ]; }; + by-spec."estraverse".">= 0.0.2" = + self.by-version."estraverse"."1.5.0"; by-spec."estraverse"."~0.0.4" = self.by-version."estraverse"."0.0.4"; by-version."estraverse"."0.0.4" = lib.makeOverridable self.buildNodePackage { @@ -4428,6 +5117,25 @@ }; by-spec."eventemitter2"."~0.4.13" = self.by-version."eventemitter2"."0.4.13"; + by-spec."events"."~1.0.0" = + self.by-version."events"."1.0.0"; + by-version."events"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-events-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/events/-/events-1.0.0.tgz"; + name = "events-1.0.0.tgz"; + sha1 = "63c0f80c74d1435e8eb03b54306a9d8e8f6f9da0"; + }) + ]; + buildInputs = + (self.nativeDeps."events" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "events" ]; + }; by-spec."events.node".">= 0.4.0" = self.by-version."events.node"."0.4.9"; by-version."events.node"."0.4.9" = lib.makeOverridable self.buildNodePackage { @@ -4495,7 +5203,7 @@ ]; passthru.names = [ "execSync" ]; }; - by-spec."exit"."~0.1.1" = + by-spec."exit"."0.1.x" = self.by-version."exit"."0.1.2"; by-version."exit"."0.1.2" = lib.makeOverridable self.buildNodePackage { name = "node-exit-0.1.2"; @@ -4514,38 +5222,42 @@ ]; passthru.names = [ "exit" ]; }; + by-spec."exit"."~0.1.1" = + self.by-version."exit"."0.1.2"; by-spec."express"."*" = - self.by-version."express"."3.4.8"; - by-version."express"."3.4.8" = lib.makeOverridable self.buildNodePackage { - name = "express-3.4.8"; + self.by-version."express"."4.0.0-rc2"; + by-version."express"."4.0.0-rc2" = lib.makeOverridable self.buildNodePackage { + name = "node-express-4.0.0-rc2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/express/-/express-3.4.8.tgz"; - name = "express-3.4.8.tgz"; - sha1 = "aa7a8986de07053337f4bc5ed9a6453d9cc8e2e1"; + url = "http://registry.npmjs.org/express/-/express-4.0.0-rc2.tgz"; + name = "express-4.0.0-rc2.tgz"; + sha1 = "0b3fc3b853b393cdb5042dc9960498015ed06b96"; }) ]; buildInputs = (self.nativeDeps."express" or []); deps = [ - self.by-version."connect"."2.12.0" - self.by-version."commander"."1.3.2" - self.by-version."range-parser"."0.0.4" - self.by-version."mkdirp"."0.3.5" + self.by-version."accepts"."1.0.0" + self.by-version."type-is"."1.0.0" + self.by-version."range-parser"."1.0.0" self.by-version."cookie"."0.1.0" self.by-version."buffer-crc32"."0.2.1" - self.by-version."fresh"."0.2.0" + self.by-version."fresh"."0.2.2" self.by-version."methods"."0.1.0" - self.by-version."send"."0.1.4" - self.by-version."cookie-signature"."1.0.1" - self.by-version."merge-descriptors"."0.0.1" + self.by-version."send"."0.2.0" + self.by-version."cookie-signature"."1.0.3" + self.by-version."merge-descriptors"."0.0.2" + self.by-version."utils-merge"."1.0.0" + self.by-version."escape-html"."1.0.1" + self.by-version."qs"."0.6.6" self.by-version."debug"."0.7.4" ]; peerDependencies = [ ]; passthru.names = [ "express" ]; }; - "express" = self.by-version."express"."3.4.8"; + "express" = self.by-version."express"."4.0.0-rc2"; by-spec."express"."2.5.11" = self.by-version."express"."2.5.11"; by-version."express"."2.5.11" = lib.makeOverridable self.buildNodePackage { @@ -4631,6 +5343,35 @@ }; by-spec."express"."3.x" = self.by-version."express"."3.4.8"; + by-version."express"."3.4.8" = lib.makeOverridable self.buildNodePackage { + name = "express-3.4.8"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/express/-/express-3.4.8.tgz"; + name = "express-3.4.8.tgz"; + sha1 = "aa7a8986de07053337f4bc5ed9a6453d9cc8e2e1"; + }) + ]; + buildInputs = + (self.nativeDeps."express" or []); + deps = [ + self.by-version."connect"."2.12.0" + self.by-version."commander"."1.3.2" + self.by-version."range-parser"."0.0.4" + self.by-version."mkdirp"."0.3.5" + self.by-version."cookie"."0.1.0" + self.by-version."buffer-crc32"."0.2.1" + self.by-version."fresh"."0.2.0" + self.by-version."methods"."0.1.0" + self.by-version."send"."0.1.4" + self.by-version."cookie-signature"."1.0.1" + self.by-version."merge-descriptors"."0.0.1" + self.by-version."debug"."0.7.4" + ]; + peerDependencies = [ + ]; + passthru.names = [ "express" ]; + }; by-spec."express"."~3.1.1" = self.by-version."express"."3.1.2"; by-version."express"."3.1.2" = lib.makeOverridable self.buildNodePackage { @@ -4666,14 +5407,14 @@ by-spec."express"."~3.4.8" = self.by-version."express"."3.4.8"; by-spec."express-form"."*" = - self.by-version."express-form"."0.10.1"; - by-version."express-form"."0.10.1" = lib.makeOverridable self.buildNodePackage { - name = "node-express-form-0.10.1"; + self.by-version."express-form"."0.12.0"; + by-version."express-form"."0.12.0" = lib.makeOverridable self.buildNodePackage { + name = "node-express-form-0.12.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/express-form/-/express-form-0.10.1.tgz"; - name = "express-form-0.10.1.tgz"; - sha1 = "542f43cf276c33f8ec8836b571aa3365505609a8"; + url = "http://registry.npmjs.org/express-form/-/express-form-0.12.0.tgz"; + name = "express-form-0.12.0.tgz"; + sha1 = "0525ce1365760fd90fb785829a430122aceb893a"; }) ]; buildInputs = @@ -4688,7 +5429,7 @@ ]; passthru.names = [ "express-form" ]; }; - "express-form" = self.by-version."express-form"."0.10.1"; + "express-form" = self.by-version."express-form"."0.12.0"; by-spec."express-partials"."0.0.6" = self.by-version."express-partials"."0.0.6"; by-version."express-partials"."0.0.6" = lib.makeOverridable self.buildNodePackage { @@ -4865,7 +5606,7 @@ self.by-version."bower-endpoint-parser"."0.2.1" self.by-version."bower-logger"."0.2.1" self.by-version."bower"."1.2.8" - self.by-version."glob"."3.2.8" + self.by-version."glob"."3.2.9" ]; peerDependencies = [ ]; @@ -4913,7 +5654,7 @@ self.by-version."lodash"."2.1.0" self.by-version."iconv-lite"."0.2.11" self.by-version."rimraf"."2.2.6" - self.by-version."glob"."3.2.8" + self.by-version."glob"."3.2.9" self.by-version."minimatch"."0.2.14" self.by-version."findup-sync"."0.1.2" self.by-version."isbinaryfile"."0.1.9" @@ -4939,21 +5680,21 @@ (self.nativeDeps."fileset" or []); deps = [ self.by-version."minimatch"."0.2.14" - self.by-version."glob"."3.2.8" + self.by-version."glob"."3.2.9" ]; peerDependencies = [ ]; passthru.names = [ "fileset" ]; }; by-spec."findit".">=1.1.0 <2.0.0" = - self.by-version."findit"."1.1.0"; - by-version."findit"."1.1.0" = lib.makeOverridable self.buildNodePackage { - name = "node-findit-1.1.0"; + self.by-version."findit"."1.1.1"; + by-version."findit"."1.1.1" = lib.makeOverridable self.buildNodePackage { + name = "node-findit-1.1.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/findit/-/findit-1.1.0.tgz"; - name = "findit-1.1.0.tgz"; - sha1 = "7104c60060f838d2298bd526b16add6ce733f9ac"; + url = "http://registry.npmjs.org/findit/-/findit-1.1.1.tgz"; + name = "findit-1.1.1.tgz"; + sha1 = "b460e2f7633d78ed2c217c77c4209ecacaf8262a"; }) ]; buildInputs = @@ -5357,15 +6098,15 @@ ]; passthru.names = [ "fresh" ]; }; - by-spec."fresh"."~0.2.1" = - self.by-version."fresh"."0.2.1"; - by-version."fresh"."0.2.1" = lib.makeOverridable self.buildNodePackage { - name = "node-fresh-0.2.1"; + by-spec."fresh"."0.2.2" = + self.by-version."fresh"."0.2.2"; + by-version."fresh"."0.2.2" = lib.makeOverridable self.buildNodePackage { + name = "node-fresh-0.2.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/fresh/-/fresh-0.2.1.tgz"; - name = "fresh-0.2.1.tgz"; - sha1 = "13cc0b1f53fe0e6fa6a70c18d52ce3c5c56be066"; + url = "http://registry.npmjs.org/fresh/-/fresh-0.2.2.tgz"; + name = "fresh-0.2.2.tgz"; + sha1 = "9731dcf5678c7faeb44fb903c4f72df55187fa77"; }) ]; buildInputs = @@ -5376,6 +6117,8 @@ ]; passthru.names = [ "fresh" ]; }; + by-spec."fresh"."~0.2.1" = + self.by-version."fresh"."0.2.2"; by-spec."fs-extra"."~0.6.1" = self.by-version."fs-extra"."0.6.4"; by-version."fs-extra"."0.6.4" = lib.makeOverridable self.buildNodePackage { @@ -5765,14 +6508,14 @@ passthru.names = [ "github-url-from-username-repo" ]; }; by-spec."glob"."3" = - self.by-version."glob"."3.2.8"; - by-version."glob"."3.2.8" = lib.makeOverridable self.buildNodePackage { - name = "node-glob-3.2.8"; + self.by-version."glob"."3.2.9"; + by-version."glob"."3.2.9" = lib.makeOverridable self.buildNodePackage { + name = "node-glob-3.2.9"; src = [ (fetchurl { - url = "http://registry.npmjs.org/glob/-/glob-3.2.8.tgz"; - name = "glob-3.2.8.tgz"; - sha1 = "5506f4311721bcc618c7d8dba144188750307073"; + url = "http://registry.npmjs.org/glob/-/glob-3.2.9.tgz"; + name = "glob-3.2.9.tgz"; + sha1 = "56af2289aa43d07d7702666480373eb814d91d40"; }) ]; buildInputs = @@ -5829,13 +6572,13 @@ passthru.names = [ "glob" ]; }; by-spec."glob"."3.2.x" = - self.by-version."glob"."3.2.8"; + self.by-version."glob"."3.2.9"; by-spec."glob"."3.x" = - self.by-version."glob"."3.2.8"; + self.by-version."glob"."3.2.9"; by-spec."glob".">= 3.1.4" = - self.by-version."glob"."3.2.8"; + self.by-version."glob"."3.2.9"; by-spec."glob".">=3.2.7 <4" = - self.by-version."glob"."3.2.8"; + self.by-version."glob"."3.2.9"; by-spec."glob"."~3.1.21" = self.by-version."glob"."3.1.21"; by-version."glob"."3.1.21" = lib.makeOverridable self.buildNodePackage { @@ -5859,13 +6602,15 @@ passthru.names = [ "glob" ]; }; by-spec."glob"."~3.2.0" = - self.by-version."glob"."3.2.8"; + self.by-version."glob"."3.2.9"; by-spec."glob"."~3.2.1" = - self.by-version."glob"."3.2.8"; + self.by-version."glob"."3.2.9"; by-spec."glob"."~3.2.6" = - self.by-version."glob"."3.2.8"; + self.by-version."glob"."3.2.9"; by-spec."glob"."~3.2.7" = - self.by-version."glob"."3.2.8"; + self.by-version."glob"."3.2.9"; + by-spec."glob"."~3.2.8" = + self.by-version."glob"."3.2.9"; by-spec."graceful-fs"."2" = self.by-version."graceful-fs"."2.0.2"; by-version."graceful-fs"."2.0.2" = lib.makeOverridable self.buildNodePackage { @@ -6009,6 +6754,8 @@ ]; passthru.names = [ "grunt" ]; }; + by-spec."grunt"."^0.4.0" = + self.by-version."grunt"."0.4.2"; by-spec."grunt"."~0.4" = self.by-version."grunt"."0.4.2"; by-spec."grunt"."~0.4.0" = @@ -6067,29 +6814,29 @@ by-spec."grunt-cli"."~0.1.7" = self.by-version."grunt-cli"."0.1.13"; by-spec."grunt-contrib-cssmin"."*" = - self.by-version."grunt-contrib-cssmin"."0.8.0"; - by-version."grunt-contrib-cssmin"."0.8.0" = lib.makeOverridable self.buildNodePackage { - name = "node-grunt-contrib-cssmin-0.8.0"; + self.by-version."grunt-contrib-cssmin"."0.9.0"; + by-version."grunt-contrib-cssmin"."0.9.0" = lib.makeOverridable self.buildNodePackage { + name = "node-grunt-contrib-cssmin-0.9.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-0.8.0.tgz"; - name = "grunt-contrib-cssmin-0.8.0.tgz"; - sha1 = "eb58cbfa466e6c96136c0220f191789eb22908b8"; + url = "http://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-0.9.0.tgz"; + name = "grunt-contrib-cssmin-0.9.0.tgz"; + sha1 = "27241f0160a8866659dab40dc8c2776c01ec7ce2"; }) ]; buildInputs = (self.nativeDeps."grunt-contrib-cssmin" or []); deps = [ self.by-version."chalk"."0.4.0" - self.by-version."clean-css"."2.1.0" - self.by-version."grunt-lib-contrib"."0.6.1" + self.by-version."clean-css"."2.1.4" + self.by-version."maxmin"."0.1.0" ]; peerDependencies = [ self.by-version."grunt"."0.4.2" ]; passthru.names = [ "grunt-contrib-cssmin" ]; }; - "grunt-contrib-cssmin" = self.by-version."grunt-contrib-cssmin"."0.8.0"; + "grunt-contrib-cssmin" = self.by-version."grunt-contrib-cssmin"."0.9.0"; by-spec."grunt-contrib-jshint"."*" = self.by-version."grunt-contrib-jshint"."0.8.0"; by-version."grunt-contrib-jshint"."0.8.0" = lib.makeOverridable self.buildNodePackage { @@ -6104,7 +6851,7 @@ buildInputs = (self.nativeDeps."grunt-contrib-jshint" or []); deps = [ - self.by-version."jshint"."2.4.3" + self.by-version."jshint"."2.4.4" ]; peerDependencies = [ self.by-version."grunt"."0.4.2" @@ -6113,20 +6860,20 @@ }; "grunt-contrib-jshint" = self.by-version."grunt-contrib-jshint"."0.8.0"; by-spec."grunt-contrib-less"."*" = - self.by-version."grunt-contrib-less"."0.9.0"; - by-version."grunt-contrib-less"."0.9.0" = lib.makeOverridable self.buildNodePackage { - name = "node-grunt-contrib-less-0.9.0"; + self.by-version."grunt-contrib-less"."0.10.0"; + by-version."grunt-contrib-less"."0.10.0" = lib.makeOverridable self.buildNodePackage { + name = "node-grunt-contrib-less-0.10.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-0.9.0.tgz"; - name = "grunt-contrib-less-0.9.0.tgz"; - sha1 = "af1e6e76511c2bc328ef8d284058643ca5887675"; + url = "http://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-0.10.0.tgz"; + name = "grunt-contrib-less-0.10.0.tgz"; + sha1 = "542bf636ffb35f6e14c2e931855c1151b4a291b3"; }) ]; buildInputs = (self.nativeDeps."grunt-contrib-less" or []); deps = [ - self.by-version."less"."1.6.3" + self.by-version."less"."1.7.0" self.by-version."grunt-lib-contrib"."0.6.1" self.by-version."chalk"."0.4.0" ]; @@ -6135,16 +6882,16 @@ ]; passthru.names = [ "grunt-contrib-less" ]; }; - "grunt-contrib-less" = self.by-version."grunt-contrib-less"."0.9.0"; + "grunt-contrib-less" = self.by-version."grunt-contrib-less"."0.10.0"; by-spec."grunt-contrib-requirejs"."*" = - self.by-version."grunt-contrib-requirejs"."0.4.1"; - by-version."grunt-contrib-requirejs"."0.4.1" = lib.makeOverridable self.buildNodePackage { - name = "node-grunt-contrib-requirejs-0.4.1"; + self.by-version."grunt-contrib-requirejs"."0.4.3"; + by-version."grunt-contrib-requirejs"."0.4.3" = lib.makeOverridable self.buildNodePackage { + name = "node-grunt-contrib-requirejs-0.4.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/grunt-contrib-requirejs/-/grunt-contrib-requirejs-0.4.1.tgz"; - name = "grunt-contrib-requirejs-0.4.1.tgz"; - sha1 = "862ba167141b8a8f36af5444feab3272bb8cf4bd"; + url = "http://registry.npmjs.org/grunt-contrib-requirejs/-/grunt-contrib-requirejs-0.4.3.tgz"; + name = "grunt-contrib-requirejs-0.4.3.tgz"; + sha1 = "ac243dc312af5c85cd095169da1b3177bfe89c59"; }) ]; buildInputs = @@ -6157,31 +6904,31 @@ ]; passthru.names = [ "grunt-contrib-requirejs" ]; }; - "grunt-contrib-requirejs" = self.by-version."grunt-contrib-requirejs"."0.4.1"; + "grunt-contrib-requirejs" = self.by-version."grunt-contrib-requirejs"."0.4.3"; by-spec."grunt-contrib-uglify"."*" = - self.by-version."grunt-contrib-uglify"."0.3.2"; - by-version."grunt-contrib-uglify"."0.3.2" = lib.makeOverridable self.buildNodePackage { - name = "node-grunt-contrib-uglify-0.3.2"; + self.by-version."grunt-contrib-uglify"."0.4.0"; + by-version."grunt-contrib-uglify"."0.4.0" = lib.makeOverridable self.buildNodePackage { + name = "node-grunt-contrib-uglify-0.4.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-0.3.2.tgz"; - name = "grunt-contrib-uglify-0.3.2.tgz"; - sha1 = "865b00ae0d11d1f5fafca3967c9b099f8929684b"; + url = "http://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-0.4.0.tgz"; + name = "grunt-contrib-uglify-0.4.0.tgz"; + sha1 = "6a4df3e85ccf4bbae484b0328cc71c9f102e80be"; }) ]; buildInputs = (self.nativeDeps."grunt-contrib-uglify" or []); deps = [ self.by-version."uglify-js"."2.4.12" - self.by-version."grunt-lib-contrib"."0.6.1" self.by-version."chalk"."0.4.0" + self.by-version."maxmin"."0.1.0" ]; peerDependencies = [ self.by-version."grunt"."0.4.2" ]; passthru.names = [ "grunt-contrib-uglify" ]; }; - "grunt-contrib-uglify" = self.by-version."grunt-contrib-uglify"."0.3.2"; + "grunt-contrib-uglify" = self.by-version."grunt-contrib-uglify"."0.4.0"; by-spec."grunt-karma"."*" = self.by-version."grunt-karma"."0.7.2"; by-version."grunt-karma"."0.7.2" = lib.makeOverridable self.buildNodePackage { @@ -6205,7 +6952,7 @@ passthru.names = [ "grunt-karma" ]; }; "grunt-karma" = self.by-version."grunt-karma"."0.7.2"; - by-spec."grunt-lib-contrib"."~0.6.0" = + by-spec."grunt-lib-contrib"."~0.6.1" = self.by-version."grunt-lib-contrib"."0.6.1"; by-version."grunt-lib-contrib"."0.6.1" = lib.makeOverridable self.buildNodePackage { name = "node-grunt-lib-contrib-0.6.1"; @@ -6225,8 +6972,6 @@ ]; passthru.names = [ "grunt-lib-contrib" ]; }; - by-spec."grunt-lib-contrib"."~0.6.1" = - self.by-version."grunt-lib-contrib"."0.6.1"; by-spec."grunt-sed"."*" = self.by-version."grunt-sed"."0.1.1"; by-version."grunt-sed"."0.1.1" = lib.makeOverridable self.buildNodePackage { @@ -6264,16 +7009,37 @@ (self.nativeDeps."guifi-earth" or []); deps = [ self.by-version."coffee-script"."1.7.1" - self.by-version."jade"."1.1.5" + self.by-version."jade"."1.3.0" self.by-version."q"."1.0.0" self.by-version."xml2js"."0.4.1" - self.by-version."msgpack"."0.2.1" + self.by-version."msgpack"."0.2.2" ]; peerDependencies = [ ]; passthru.names = [ "guifi-earth" ]; }; "guifi-earth" = self.by-version."guifi-earth"."0.2.1"; + by-spec."gzip-size"."^0.1.0" = + self.by-version."gzip-size"."0.1.0"; + by-version."gzip-size"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "gzip-size-0.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/gzip-size/-/gzip-size-0.1.0.tgz"; + name = "gzip-size-0.1.0.tgz"; + sha1 = "2beaecdaf4917bd151fe9a9d43ae199392d6c32a"; + }) + ]; + buildInputs = + (self.nativeDeps."gzip-size" or []); + deps = [ + self.by-version."concat-stream"."1.4.1" + self.by-version."zlib-browserify"."0.0.3" + ]; + peerDependencies = [ + ]; + passthru.names = [ "gzip-size" ]; + }; by-spec."gzippo"."*" = self.by-version."gzippo"."0.2.0"; by-version."gzippo"."0.2.0" = lib.makeOverridable self.buildNodePackage { @@ -6644,7 +7410,7 @@ self.by-version."domhandler"."2.0.3" self.by-version."domutils"."1.1.6" self.by-version."domelementtype"."1.1.1" - self.by-version."readable-stream"."1.0.25" + self.by-version."readable-stream"."1.0.26" ]; peerDependencies = [ ]; @@ -6667,7 +7433,7 @@ self.by-version."domhandler"."2.1.0" self.by-version."domutils"."1.1.6" self.by-version."domelementtype"."1.1.1" - self.by-version."readable-stream"."1.0.25" + self.by-version."readable-stream"."1.0.26" ]; peerDependencies = [ ]; @@ -6690,7 +7456,7 @@ self.by-version."domhandler"."2.2.0" self.by-version."domutils"."1.3.0" self.by-version."domelementtype"."1.1.1" - self.by-version."readable-stream"."1.1.10" + self.by-version."readable-stream"."1.1.11" ]; peerDependencies = [ ]; @@ -6717,6 +7483,27 @@ ]; passthru.names = [ "http-auth" ]; }; + by-spec."http-browserify"."~1.3.1" = + self.by-version."http-browserify"."1.3.2"; + by-version."http-browserify"."1.3.2" = lib.makeOverridable self.buildNodePackage { + name = "node-http-browserify-1.3.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/http-browserify/-/http-browserify-1.3.2.tgz"; + name = "http-browserify-1.3.2.tgz"; + sha1 = "b562c34479349a690d7a6597df495aefa8c604f5"; + }) + ]; + buildInputs = + (self.nativeDeps."http-browserify" or []); + deps = [ + self.by-version."Base64"."0.2.0" + self.by-version."inherits"."2.0.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "http-browserify" ]; + }; by-spec."http-proxy"."git://github.com/samalba/node-http-proxy" = self.by-version."http-proxy"."0.10.3"; by-version."http-proxy"."0.10.3" = lib.makeOverridable self.buildNodePackage { @@ -6807,6 +7594,25 @@ ]; passthru.names = [ "http-signature" ]; }; + by-spec."https-browserify"."~0.0.0" = + self.by-version."https-browserify"."0.0.0"; + by-version."https-browserify"."0.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-https-browserify-0.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/https-browserify/-/https-browserify-0.0.0.tgz"; + name = "https-browserify-0.0.0.tgz"; + sha1 = "b3ffdfe734b2a3d4a9efd58e8654c91fce86eafd"; + }) + ]; + buildInputs = + (self.nativeDeps."https-browserify" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "https-browserify" ]; + }; by-spec."humanize"."~0.0.9" = self.by-version."humanize"."0.0.9"; by-version."humanize"."0.0.9" = lib.makeOverridable self.buildNodePackage { @@ -6913,6 +7719,44 @@ }; by-spec."iconv-lite"."~0.2.11" = self.by-version."iconv-lite"."0.2.11"; + by-spec."ieee754"."~1.1.1" = + self.by-version."ieee754"."1.1.3"; + by-version."ieee754"."1.1.3" = lib.makeOverridable self.buildNodePackage { + name = "node-ieee754-1.1.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ieee754/-/ieee754-1.1.3.tgz"; + name = "ieee754-1.1.3.tgz"; + sha1 = "1d4baae872e15ba69f6ab7588a965e09d485ec50"; + }) + ]; + buildInputs = + (self.nativeDeps."ieee754" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "ieee754" ]; + }; + by-spec."indexof"."0.0.1" = + self.by-version."indexof"."0.0.1"; + by-version."indexof"."0.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-indexof-0.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz"; + name = "indexof-0.0.1.tgz"; + sha1 = "82dc336d232b9062179d05ab3293a66059fd435d"; + }) + ]; + buildInputs = + (self.nativeDeps."indexof" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "indexof" ]; + }; by-spec."inherits"."1" = self.by-version."inherits"."1.0.0"; by-version."inherits"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -6959,6 +7803,8 @@ self.by-version."inherits"."1.0.0"; by-spec."inherits"."~2.0.0" = self.by-version."inherits"."2.0.1"; + by-spec."inherits"."~2.0.1" = + self.by-version."inherits"."2.0.1"; by-spec."ini"."1" = self.by-version."ini"."1.1.0"; by-version."ini"."1.1.0" = lib.makeOverridable self.buildNodePackage { @@ -7000,12 +7846,32 @@ self.by-version."read"."1.0.5" self.by-version."read-package-json"."1.1.7" self.by-version."semver"."2.2.1" - self.by-version."glob"."3.2.8" + self.by-version."glob"."3.2.9" ]; peerDependencies = [ ]; passthru.names = [ "init-package-json" ]; }; + by-spec."inline-source-map"."~0.3.0" = + self.by-version."inline-source-map"."0.3.0"; + by-version."inline-source-map"."0.3.0" = lib.makeOverridable self.buildNodePackage { + name = "node-inline-source-map-0.3.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/inline-source-map/-/inline-source-map-0.3.0.tgz"; + name = "inline-source-map-0.3.0.tgz"; + sha1 = "ad2acca97d82fcb9d0a56221ee72e8043116424a"; + }) + ]; + buildInputs = + (self.nativeDeps."inline-source-map" or []); + deps = [ + self.by-version."source-map"."0.1.33" + ]; + peerDependencies = [ + ]; + passthru.names = [ "inline-source-map" ]; + }; by-spec."inquirer"."~0.3.0" = self.by-version."inquirer"."0.3.5"; by-version."inquirer"."0.3.5" = lib.makeOverridable self.buildNodePackage { @@ -7034,14 +7900,14 @@ by-spec."inquirer"."~0.3.4" = self.by-version."inquirer"."0.3.5"; by-spec."inquirer"."~0.4.0" = - self.by-version."inquirer"."0.4.0"; - by-version."inquirer"."0.4.0" = lib.makeOverridable self.buildNodePackage { - name = "node-inquirer-0.4.0"; + self.by-version."inquirer"."0.4.1"; + by-version."inquirer"."0.4.1" = lib.makeOverridable self.buildNodePackage { + name = "node-inquirer-0.4.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/inquirer/-/inquirer-0.4.0.tgz"; - name = "inquirer-0.4.0.tgz"; - sha1 = "62782d60c8a71d6328d8b4e9a5a71933cfda8f33"; + url = "http://registry.npmjs.org/inquirer/-/inquirer-0.4.1.tgz"; + name = "inquirer-0.4.1.tgz"; + sha1 = "6cf74eb1a347f97a1a207bea8ad1c987d0ff4b81"; }) ]; buildInputs = @@ -7052,11 +7918,36 @@ self.by-version."cli-color"."0.2.3" self.by-version."mute-stream"."0.0.4" self.by-version."through"."2.3.4" + self.by-version."readline2"."0.1.0" ]; peerDependencies = [ ]; passthru.names = [ "inquirer" ]; }; + by-spec."insert-module-globals"."~3.2.0" = + self.by-version."insert-module-globals"."3.2.0"; + by-version."insert-module-globals"."3.2.0" = lib.makeOverridable self.buildNodePackage { + name = "insert-module-globals-3.2.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/insert-module-globals/-/insert-module-globals-3.2.0.tgz"; + name = "insert-module-globals-3.2.0.tgz"; + sha1 = "5692a834207adebb3effa9f9def7cf314890a63b"; + }) + ]; + buildInputs = + (self.nativeDeps."insert-module-globals" or []); + deps = [ + self.by-version."lexical-scope"."0.1.0" + self.by-version."process"."0.5.2" + self.by-version."through"."2.3.4" + self.by-version."JSONStream"."0.7.1" + self.by-version."concat-stream"."1.4.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "insert-module-globals" ]; + }; by-spec."insight"."~0.3.0" = self.by-version."insight"."0.3.1"; by-version."insight"."0.3.1" = lib.makeOverridable self.buildNodePackage { @@ -7075,7 +7966,7 @@ self.by-version."request"."2.27.0" self.by-version."configstore"."0.2.2" self.by-version."async"."0.2.10" - self.by-version."inquirer"."0.4.0" + self.by-version."inquirer"."0.4.1" self.by-version."object-assign"."0.1.2" self.by-version."lodash.debounce"."2.4.1" ]; @@ -7121,14 +8012,14 @@ self.by-version."nconf"."0.6.9" self.by-version."fs-walk"."0.0.1" self.by-version."async"."0.2.10" - self.by-version."express"."3.4.8" - self.by-version."jade"."1.1.5" + self.by-version."express"."4.0.0-rc2" + self.by-version."jade"."1.3.0" self.by-version."passport"."0.2.0" self.by-version."passport-http"."0.2.2" - self.by-version."js-yaml"."3.0.1" - self.by-version."mongoose"."3.8.7" + self.by-version."js-yaml"."3.0.2" + self.by-version."mongoose"."3.8.8" self.by-version."gridfs-stream"."0.4.1" - self.by-version."temp"."0.6.0" + self.by-version."temp"."0.7.0" self.by-version."kue"."0.7.5" self.by-version."redis"."0.10.1" self.by-version."hiredis"."0.1.16" @@ -7222,7 +8113,7 @@ self.by-version."abbrev"."1.0.4" self.by-version."wordwrap"."0.0.2" self.by-version."resolve"."0.6.1" - self.by-version."js-yaml"."3.0.1" + self.by-version."js-yaml"."3.0.2" ]; peerDependencies = [ ]; @@ -7260,14 +8151,14 @@ passthru.names = [ "istanbul" ]; }; by-spec."jade"."*" = - self.by-version."jade"."1.1.5"; - by-version."jade"."1.1.5" = lib.makeOverridable self.buildNodePackage { - name = "jade-1.1.5"; + self.by-version."jade"."1.3.0"; + by-version."jade"."1.3.0" = lib.makeOverridable self.buildNodePackage { + name = "jade-1.3.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/jade/-/jade-1.1.5.tgz"; - name = "jade-1.1.5.tgz"; - sha1 = "e884d3d3565807e280f5ba760f68addb176627a3"; + url = "http://registry.npmjs.org/jade/-/jade-1.3.0.tgz"; + name = "jade-1.3.0.tgz"; + sha1 = "776cae93f1ad5af6b61eff2340fcdc19a3225d48"; }) ]; buildInputs = @@ -7278,14 +8169,14 @@ self.by-version."transformers"."2.1.0" self.by-version."character-parser"."1.2.0" self.by-version."monocle"."1.1.51" - self.by-version."with"."2.0.0" - self.by-version."constantinople"."1.0.2" + self.by-version."with"."3.0.0" + self.by-version."constantinople"."2.0.0" ]; peerDependencies = [ ]; passthru.names = [ "jade" ]; }; - "jade" = self.by-version."jade"."1.1.5"; + "jade" = self.by-version."jade"."1.3.0"; by-spec."jade"."0.26.3" = self.by-version."jade"."0.26.3"; by-version."jade"."0.26.3" = lib.makeOverridable self.buildNodePackage { @@ -7330,8 +8221,32 @@ }; by-spec."jade"."1.1.5" = self.by-version."jade"."1.1.5"; + by-version."jade"."1.1.5" = lib.makeOverridable self.buildNodePackage { + name = "jade-1.1.5"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/jade/-/jade-1.1.5.tgz"; + name = "jade-1.1.5.tgz"; + sha1 = "e884d3d3565807e280f5ba760f68addb176627a3"; + }) + ]; + buildInputs = + (self.nativeDeps."jade" or []); + deps = [ + self.by-version."commander"."2.1.0" + self.by-version."mkdirp"."0.3.5" + self.by-version."transformers"."2.1.0" + self.by-version."character-parser"."1.2.0" + self.by-version."monocle"."1.1.51" + self.by-version."with"."2.0.0" + self.by-version."constantinople"."1.0.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "jade" ]; + }; by-spec."jade".">= 0.0.1" = - self.by-version."jade"."1.1.5"; + self.by-version."jade"."1.3.0"; by-spec."jade"."~0.35.0" = self.by-version."jade"."0.35.0"; by-version."jade"."0.35.0" = lib.makeOverridable self.buildNodePackage { @@ -7359,26 +8274,26 @@ passthru.names = [ "jade" ]; }; by-spec."jayschema"."*" = - self.by-version."jayschema"."0.2.3"; - by-version."jayschema"."0.2.3" = lib.makeOverridable self.buildNodePackage { - name = "jayschema-0.2.3"; + self.by-version."jayschema"."0.2.5"; + by-version."jayschema"."0.2.5" = lib.makeOverridable self.buildNodePackage { + name = "jayschema-0.2.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/jayschema/-/jayschema-0.2.3.tgz"; - name = "jayschema-0.2.3.tgz"; - sha1 = "8f2e99d7f9dabda8d171eef2093ce9054671790d"; + url = "http://registry.npmjs.org/jayschema/-/jayschema-0.2.5.tgz"; + name = "jayschema-0.2.5.tgz"; + sha1 = "314e87687eac703a0a2557d77dbb3f175a0e7ada"; }) ]; buildInputs = (self.nativeDeps."jayschema" or []); deps = [ - self.by-version."when"."2.2.1" + self.by-version."when"."2.8.0" ]; peerDependencies = [ ]; passthru.names = [ "jayschema" ]; }; - "jayschema" = self.by-version."jayschema"."0.2.3"; + "jayschema" = self.by-version."jayschema"."0.2.5"; by-spec."jedediah"."~0.1.0" = self.by-version."jedediah"."0.1.1"; by-version."jedediah"."0.1.1" = lib.makeOverridable self.buildNodePackage { @@ -7399,14 +8314,14 @@ passthru.names = [ "jedediah" ]; }; by-spec."js-yaml"."*" = - self.by-version."js-yaml"."3.0.1"; - by-version."js-yaml"."3.0.1" = lib.makeOverridable self.buildNodePackage { - name = "js-yaml-3.0.1"; + self.by-version."js-yaml"."3.0.2"; + by-version."js-yaml"."3.0.2" = lib.makeOverridable self.buildNodePackage { + name = "js-yaml-3.0.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/js-yaml/-/js-yaml-3.0.1.tgz"; - name = "js-yaml-3.0.1.tgz"; - sha1 = "76405fea5bce30fc8f405d48c6dca7f0a32c6afe"; + url = "http://registry.npmjs.org/js-yaml/-/js-yaml-3.0.2.tgz"; + name = "js-yaml-3.0.2.tgz"; + sha1 = "9937865f8e897a5e894e73c2c5cf2e89b32eb771"; }) ]; buildInputs = @@ -7419,7 +8334,7 @@ ]; passthru.names = [ "js-yaml" ]; }; - "js-yaml" = self.by-version."js-yaml"."3.0.1"; + "js-yaml" = self.by-version."js-yaml"."3.0.2"; by-spec."js-yaml"."0.3.x" = self.by-version."js-yaml"."0.3.7"; by-version."js-yaml"."0.3.7" = lib.makeOverridable self.buildNodePackage { @@ -7462,8 +8377,27 @@ }; by-spec."js-yaml"."3.0.1" = self.by-version."js-yaml"."3.0.1"; + by-version."js-yaml"."3.0.1" = lib.makeOverridable self.buildNodePackage { + name = "js-yaml-3.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/js-yaml/-/js-yaml-3.0.1.tgz"; + name = "js-yaml-3.0.1.tgz"; + sha1 = "76405fea5bce30fc8f405d48c6dca7f0a32c6afe"; + }) + ]; + buildInputs = + (self.nativeDeps."js-yaml" or []); + deps = [ + self.by-version."argparse"."0.1.15" + self.by-version."esprima"."1.0.4" + ]; + peerDependencies = [ + ]; + passthru.names = [ "js-yaml" ]; + }; by-spec."js-yaml"."3.x" = - self.by-version."js-yaml"."3.0.1"; + self.by-version."js-yaml"."3.0.2"; by-spec."js-yaml"."~2.0.5" = self.by-version."js-yaml"."2.0.5"; by-version."js-yaml"."2.0.5" = lib.makeOverridable self.buildNodePackage { @@ -7507,7 +8441,7 @@ passthru.names = [ "js-yaml" ]; }; by-spec."js-yaml"."~3.0.1" = - self.by-version."js-yaml"."3.0.1"; + self.by-version."js-yaml"."3.0.2"; by-spec."jsesc"."0.4.3" = self.by-version."jsesc"."0.4.3"; by-version."jsesc"."0.4.3" = lib.makeOverridable self.buildNodePackage { @@ -7530,14 +8464,14 @@ by-spec."jsesc"."~0.4.3" = self.by-version."jsesc"."0.4.3"; by-spec."jshint"."*" = - self.by-version."jshint"."2.4.3"; - by-version."jshint"."2.4.3" = lib.makeOverridable self.buildNodePackage { - name = "jshint-2.4.3"; + self.by-version."jshint"."2.4.4"; + by-version."jshint"."2.4.4" = lib.makeOverridable self.buildNodePackage { + name = "jshint-2.4.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/jshint/-/jshint-2.4.3.tgz"; - name = "jshint-2.4.3.tgz"; - sha1 = "1beb074b4d9f817773bb5aa16882fd67164c216a"; + url = "http://registry.npmjs.org/jshint/-/jshint-2.4.4.tgz"; + name = "jshint-2.4.4.tgz"; + sha1 = "4162238314c649f987752651e8e064e30a68706e"; }) ]; buildInputs = @@ -7549,14 +8483,15 @@ self.by-version."minimatch"."0.2.14" self.by-version."htmlparser2"."3.3.0" self.by-version."console-browserify"."0.1.6" + self.by-version."exit"."0.1.2" ]; peerDependencies = [ ]; passthru.names = [ "jshint" ]; }; - "jshint" = self.by-version."jshint"."2.4.3"; + "jshint" = self.by-version."jshint"."2.4.4"; by-spec."jshint"."~2.4.0" = - self.by-version."jshint"."2.4.3"; + self.by-version."jshint"."2.4.4"; by-spec."json-schema"."0.2.2" = self.by-version."json-schema"."0.2.2"; by-version."json-schema"."0.2.2" = lib.makeOverridable self.buildNodePackage { @@ -7633,6 +8568,44 @@ ]; passthru.names = [ "jsonfile" ]; }; + by-spec."jsonify"."~0.0.0" = + self.by-version."jsonify"."0.0.0"; + by-version."jsonify"."0.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-jsonify-0.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz"; + name = "jsonify-0.0.0.tgz"; + sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73"; + }) + ]; + buildInputs = + (self.nativeDeps."jsonify" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "jsonify" ]; + }; + by-spec."jsonparse"."0.0.5" = + self.by-version."jsonparse"."0.0.5"; + by-version."jsonparse"."0.0.5" = lib.makeOverridable self.buildNodePackage { + name = "node-jsonparse-0.0.5"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/jsonparse/-/jsonparse-0.0.5.tgz"; + name = "jsonparse-0.0.5.tgz"; + sha1 = "330542ad3f0a654665b778f3eb2d9a9fa507ac64"; + }) + ]; + buildInputs = + (self.nativeDeps."jsonparse" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "jsonparse" ]; + }; by-spec."jsontool"."*" = self.by-version."jsontool"."7.0.1"; by-version."jsontool"."7.0.1" = lib.makeOverridable self.buildNodePackage { @@ -7711,7 +8684,7 @@ self.by-version."di"."0.0.1" self.by-version."socket.io"."0.9.16" self.by-version."chokidar"."0.8.1" - self.by-version."glob"."3.2.8" + self.by-version."glob"."3.2.9" self.by-version."minimatch"."0.2.14" self.by-version."http-proxy"."0.10.4" self.by-version."optimist"."0.6.1" @@ -7721,11 +8694,11 @@ self.by-version."colors"."0.6.2" self.by-version."lodash"."2.4.1" self.by-version."mime"."1.2.11" - self.by-version."log4js"."0.6.10" + self.by-version."log4js"."0.6.12" self.by-version."useragent"."2.0.7" self.by-version."graceful-fs"."2.0.2" self.by-version."connect"."2.12.0" - self.by-version."source-map"."0.1.32" + self.by-version."source-map"."0.1.33" ]; peerDependencies = [ ]; @@ -7865,7 +8838,7 @@ buildInputs = (self.nativeDeps."karma-sauce-launcher" or []); deps = [ - self.by-version."wd"."0.2.10" + self.by-version."wd"."0.2.11" self.by-version."sauce-connect-launcher"."0.2.2" self.by-version."q"."0.9.7" self.by-version."saucelabs"."0.1.1" @@ -8096,7 +9069,7 @@ buildInputs = (self.nativeDeps."lazystream" or []); deps = [ - self.by-version."readable-stream"."1.0.25" + self.by-version."readable-stream"."1.0.26" ]; peerDependencies = [ ]; @@ -8135,37 +9108,57 @@ buildInputs = (self.nativeDeps."lcov-result-merger" or []); deps = [ - self.by-version."glob"."3.2.8" + self.by-version."glob"."3.2.9" ]; peerDependencies = [ ]; passthru.names = [ "lcov-result-merger" ]; }; "lcov-result-merger" = self.by-version."lcov-result-merger"."0.0.2"; - by-spec."less"."~1.6.0" = - self.by-version."less"."1.6.3"; - by-version."less"."1.6.3" = lib.makeOverridable self.buildNodePackage { - name = "less-1.6.3"; + by-spec."less"."~1.7.0" = + self.by-version."less"."1.7.0"; + by-version."less"."1.7.0" = lib.makeOverridable self.buildNodePackage { + name = "less-1.7.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/less/-/less-1.6.3.tgz"; - name = "less-1.6.3.tgz"; - sha1 = "71ce89ec30b774b3567f254c67958f2f2c193bde"; + url = "http://registry.npmjs.org/less/-/less-1.7.0.tgz"; + name = "less-1.7.0.tgz"; + sha1 = "6f1293bac1f402c932c2ce21ba7337f7c635ba84"; }) ]; buildInputs = (self.nativeDeps."less" or []); deps = [ self.by-version."mime"."1.2.11" - self.by-version."request"."2.33.0" + self.by-version."request"."2.34.0" self.by-version."mkdirp"."0.3.5" - self.by-version."clean-css"."2.0.8" - self.by-version."source-map"."0.1.32" + self.by-version."clean-css"."2.1.4" + self.by-version."source-map"."0.1.33" ]; peerDependencies = [ ]; passthru.names = [ "less" ]; }; + by-spec."lexical-scope"."~0.1.0" = + self.by-version."lexical-scope"."0.1.0"; + by-version."lexical-scope"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-lexical-scope-0.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/lexical-scope/-/lexical-scope-0.1.0.tgz"; + name = "lexical-scope-0.1.0.tgz"; + sha1 = "8f30004c80234ffac083b990079d7b267e18441b"; + }) + ]; + buildInputs = + (self.nativeDeps."lexical-scope" or []); + deps = [ + self.by-version."astw"."0.1.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "lexical-scope" ]; + }; by-spec."libxmljs"."~0.8.1" = self.by-version."libxmljs"."0.8.1"; by-version."libxmljs"."0.8.1" = lib.makeOverridable self.buildNodePackage { @@ -8581,14 +9574,14 @@ passthru.names = [ "log-driver" ]; }; by-spec."log4js"."~0.6.3" = - self.by-version."log4js"."0.6.10"; - by-version."log4js"."0.6.10" = lib.makeOverridable self.buildNodePackage { - name = "node-log4js-0.6.10"; + self.by-version."log4js"."0.6.12"; + by-version."log4js"."0.6.12" = lib.makeOverridable self.buildNodePackage { + name = "node-log4js-0.6.12"; src = [ (fetchurl { - url = "http://registry.npmjs.org/log4js/-/log4js-0.6.10.tgz"; - name = "log4js-0.6.10.tgz"; - sha1 = "3a47a2551dc6362672901b73f7f47aee6310f785"; + url = "http://registry.npmjs.org/log4js/-/log4js-0.6.12.tgz"; + name = "log4js-0.6.12.tgz"; + sha1 = "ef806ec669ea3fc7bf5be92a95891fb67517e642"; }) ]; buildInputs = @@ -8596,7 +9589,7 @@ deps = [ self.by-version."async"."0.1.15" self.by-version."semver"."1.1.4" - self.by-version."readable-stream"."1.0.25" + self.by-version."readable-stream"."1.0.26" ]; peerDependencies = [ ]; @@ -8800,6 +9793,30 @@ ]; passthru.names = [ "mailcomposer" ]; }; + by-spec."maxmin"."^0.1.0" = + self.by-version."maxmin"."0.1.0"; + by-version."maxmin"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-maxmin-0.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/maxmin/-/maxmin-0.1.0.tgz"; + name = "maxmin-0.1.0.tgz"; + sha1 = "95d81c5289e3a9d30f7fc7dc559c024e5030c9d0"; + }) + ]; + buildInputs = + (self.nativeDeps."maxmin" or []); + deps = [ + self.by-version."gzip-size"."0.1.0" + self.by-version."pretty-bytes"."0.1.0" + self.by-version."chalk"."0.4.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "maxmin" ]; + }; + by-spec."maxmin"."~0.1.0" = + self.by-version."maxmin"."0.1.0"; by-spec."meat"."*" = self.by-version."meat"."0.2.5"; by-version."meat"."0.2.5" = lib.makeOverridable self.buildNodePackage { @@ -8867,6 +9884,25 @@ ]; passthru.names = [ "merge-descriptors" ]; }; + by-spec."merge-descriptors"."0.0.2" = + self.by-version."merge-descriptors"."0.0.2"; + by-version."merge-descriptors"."0.0.2" = lib.makeOverridable self.buildNodePackage { + name = "node-merge-descriptors-0.0.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/merge-descriptors/-/merge-descriptors-0.0.2.tgz"; + name = "merge-descriptors-0.0.2.tgz"; + sha1 = "c36a52a781437513c57275f39dd9d317514ac8c7"; + }) + ]; + buildInputs = + (self.nativeDeps."merge-descriptors" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "merge-descriptors" ]; + }; by-spec."methods"."0.0.1" = self.by-version."methods"."0.0.1"; by-version."methods"."0.0.1" = lib.makeOverridable self.buildNodePackage { @@ -9095,14 +10131,14 @@ by-spec."minimatch"."~0.2.9" = self.by-version."minimatch"."0.2.14"; by-spec."minimist"."~0.0.1" = - self.by-version."minimist"."0.0.7"; - by-version."minimist"."0.0.7" = lib.makeOverridable self.buildNodePackage { - name = "node-minimist-0.0.7"; + self.by-version."minimist"."0.0.8"; + by-version."minimist"."0.0.8" = lib.makeOverridable self.buildNodePackage { + name = "node-minimist-0.0.8"; src = [ (fetchurl { - url = "http://registry.npmjs.org/minimist/-/minimist-0.0.7.tgz"; - name = "minimist-0.0.7.tgz"; - sha1 = "dc4c620253c542eda0d2eb91c3c6a971a11e63e7"; + url = "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; + name = "minimist-0.0.8.tgz"; + sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; }) ]; buildInputs = @@ -9113,6 +10149,10 @@ ]; passthru.names = [ "minimist" ]; }; + by-spec."minimist"."~0.0.5" = + self.by-version."minimist"."0.0.8"; + by-spec."minimist"."~0.0.7" = + self.by-version."minimist"."0.0.8"; by-spec."ministyle"."~0.1.3" = self.by-version."ministyle"."0.1.3"; by-version."ministyle"."0.1.3" = lib.makeOverridable self.buildNodePackage { @@ -9277,6 +10317,33 @@ passthru.names = [ "mocha-unfunk-reporter" ]; }; "mocha-unfunk-reporter" = self.by-version."mocha-unfunk-reporter"."0.4.0"; + by-spec."module-deps"."~1.7.0" = + self.by-version."module-deps"."1.7.1"; + by-version."module-deps"."1.7.1" = lib.makeOverridable self.buildNodePackage { + name = "module-deps-1.7.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/module-deps/-/module-deps-1.7.1.tgz"; + name = "module-deps-1.7.1.tgz"; + sha1 = "1e9a6809727282323abf1d5eee5ce8860b2e7bbf"; + }) + ]; + buildInputs = + (self.nativeDeps."module-deps" or []); + deps = [ + self.by-version."through"."2.3.4" + self.by-version."JSONStream"."0.7.1" + self.by-version."browser-resolve"."1.2.2" + self.by-version."resolve"."0.6.1" + self.by-version."concat-stream"."1.4.1" + self.by-version."minimist"."0.0.8" + self.by-version."parents"."0.0.2" + self.by-version."detective"."2.4.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "module-deps" ]; + }; by-spec."moment"."2.1.0" = self.by-version."moment"."2.1.0"; by-version."moment"."2.1.0" = lib.makeOverridable self.buildNodePackage { @@ -9315,7 +10382,7 @@ ]; passthru.names = [ "moment" ]; }; - by-spec."moment"."~2.5.0" = + by-spec."moment"."~2.5.1" = self.by-version."moment"."2.5.1"; by-version."moment"."2.5.1" = lib.makeOverridable self.buildNodePackage { name = "node-moment-2.5.1"; @@ -9335,27 +10402,27 @@ passthru.names = [ "moment" ]; }; by-spec."mongodb"."*" = - self.by-version."mongodb"."1.4.0-rc7"; - by-version."mongodb"."1.4.0-rc7" = lib.makeOverridable self.buildNodePackage { - name = "node-mongodb-1.4.0-rc7"; + self.by-version."mongodb"."1.4.0-rc8"; + by-version."mongodb"."1.4.0-rc8" = lib.makeOverridable self.buildNodePackage { + name = "node-mongodb-1.4.0-rc8"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.0-rc7.tgz"; - name = "mongodb-1.4.0-rc7.tgz"; - sha1 = "efa6da4ef5d1bf0fdf48b4f0e369e3d2186d3401"; + url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.0-rc8.tgz"; + name = "mongodb-1.4.0-rc8.tgz"; + sha1 = "3c6048070935d2b1c7e997dd77be70119e33cced"; }) ]; buildInputs = (self.nativeDeps."mongodb" or []); deps = [ - self.by-version."bson"."0.2.6" + self.by-version."bson"."0.2.7" self.by-version."kerberos"."0.0.3" ]; peerDependencies = [ ]; passthru.names = [ "mongodb" ]; }; - "mongodb" = self.by-version."mongodb"."1.4.0-rc7"; + "mongodb" = self.by-version."mongodb"."1.4.0-rc8"; by-spec."mongodb"."1.2.14" = self.by-version."mongodb"."1.2.14"; by-version."mongodb"."1.2.14" = lib.makeOverridable self.buildNodePackage { @@ -9421,14 +10488,14 @@ by-spec."mongodb"."1.3.x" = self.by-version."mongodb"."1.3.23"; by-spec."mongoose"."*" = - self.by-version."mongoose"."3.8.7"; - by-version."mongoose"."3.8.7" = lib.makeOverridable self.buildNodePackage { - name = "node-mongoose-3.8.7"; + self.by-version."mongoose"."3.8.8"; + by-version."mongoose"."3.8.8" = lib.makeOverridable self.buildNodePackage { + name = "node-mongoose-3.8.8"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mongoose/-/mongoose-3.8.7.tgz"; - name = "mongoose-3.8.7.tgz"; - sha1 = "0ce98a491097944c25b9d0d1bfe2899198284a00"; + url = "http://registry.npmjs.org/mongoose/-/mongoose-3.8.8.tgz"; + name = "mongoose-3.8.8.tgz"; + sha1 = "ab046f1fa17b0bdf090a04b6d034d87d240a47c2"; }) ]; buildInputs = @@ -9442,7 +10509,7 @@ self.by-version."mpromise"."0.4.3" self.by-version."mpath"."0.1.1" self.by-version."regexp-clone"."0.0.1" - self.by-version."mquery"."0.5.2" + self.by-version."mquery"."0.5.3" ]; peerDependencies = [ ]; @@ -9678,15 +10745,15 @@ ]; passthru.names = [ "mpromise" ]; }; - by-spec."mquery"."0.5.2" = - self.by-version."mquery"."0.5.2"; - by-version."mquery"."0.5.2" = lib.makeOverridable self.buildNodePackage { - name = "node-mquery-0.5.2"; + by-spec."mquery"."0.5.3" = + self.by-version."mquery"."0.5.3"; + by-version."mquery"."0.5.3" = lib.makeOverridable self.buildNodePackage { + name = "node-mquery-0.5.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mquery/-/mquery-0.5.2.tgz"; - name = "mquery-0.5.2.tgz"; - sha1 = "3b844d772af24e370c52e6eca1ddbb87af8b5a71"; + url = "http://registry.npmjs.org/mquery/-/mquery-0.5.3.tgz"; + name = "mquery-0.5.3.tgz"; + sha1 = "b8a04d096ecf90bf17a81cc39b80dd4e5abcecec"; }) ]; buildInputs = @@ -9720,14 +10787,14 @@ passthru.names = [ "ms" ]; }; by-spec."msgpack".">= 0.0.1" = - self.by-version."msgpack"."0.2.1"; - by-version."msgpack"."0.2.1" = lib.makeOverridable self.buildNodePackage { - name = "msgpack-0.2.1"; + self.by-version."msgpack"."0.2.2"; + by-version."msgpack"."0.2.2" = lib.makeOverridable self.buildNodePackage { + name = "msgpack-0.2.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/msgpack/-/msgpack-0.2.1.tgz"; - name = "msgpack-0.2.1.tgz"; - sha1 = "5da246daa2138b4163640e486c00c4f3961e92ac"; + url = "http://registry.npmjs.org/msgpack/-/msgpack-0.2.2.tgz"; + name = "msgpack-0.2.2.tgz"; + sha1 = "e7aec9bea24d9b07940dee6cfa536c469cd1776c"; }) ]; buildInputs = @@ -9752,7 +10819,7 @@ buildInputs = (self.nativeDeps."multiparty" or []); deps = [ - self.by-version."readable-stream"."1.1.10" + self.by-version."readable-stream"."1.1.11" self.by-version."stream-counter"."0.2.0" ]; peerDependencies = [ @@ -10023,6 +11090,8 @@ ]; passthru.names = [ "negotiator" ]; }; + by-spec."negotiator"."~0.3.0" = + self.by-version."negotiator"."0.3.0"; by-spec."net-ping"."1.1.7" = self.by-version."net-ping"."1.1.7"; by-version."net-ping"."1.1.7" = lib.makeOverridable self.buildNodePackage { @@ -10128,7 +11197,7 @@ self.by-version."semver"."2.1.0" self.by-version."sprintf"."0.1.3" self.by-version."temp"."0.6.0" - self.by-version."wrench"."1.5.7" + self.by-version."wrench"."1.5.8" self.by-version."uglify-js"."2.3.6" self.by-version."xmldom"."0.1.19" ]; @@ -10158,6 +11227,39 @@ }; "node-expat" = self.by-version."node-expat"."2.1.4"; by-spec."node-gyp"."*" = + self.by-version."node-gyp"."0.13.0"; + by-version."node-gyp"."0.13.0" = lib.makeOverridable self.buildNodePackage { + name = "node-gyp-0.13.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.13.0.tgz"; + name = "node-gyp-0.13.0.tgz"; + sha1 = "84e216991a64ce5f03d50c95518bd72ca9e10f1e"; + }) + ]; + buildInputs = + (self.nativeDeps."node-gyp" or []); + deps = [ + self.by-version."glob"."3.2.9" + self.by-version."graceful-fs"."2.0.2" + self.by-version."fstream"."0.1.25" + self.by-version."minimatch"."0.2.14" + self.by-version."mkdirp"."0.3.5" + self.by-version."nopt"."2.2.0" + self.by-version."npmlog"."0.0.6" + self.by-version."osenv"."0.0.3" + self.by-version."request"."2.34.0" + self.by-version."rimraf"."2.2.6" + self.by-version."semver"."2.2.1" + self.by-version."tar"."0.1.19" + self.by-version."which"."1.0.5" + ]; + peerDependencies = [ + ]; + passthru.names = [ "node-gyp" ]; + }; + "node-gyp" = self.by-version."node-gyp"."0.13.0"; + by-spec."node-gyp"."~0.12.2" = self.by-version."node-gyp"."0.12.2"; by-version."node-gyp"."0.12.2" = lib.makeOverridable self.buildNodePackage { name = "node-gyp-0.12.2"; @@ -10171,7 +11273,7 @@ buildInputs = (self.nativeDeps."node-gyp" or []); deps = [ - self.by-version."glob"."3.2.8" + self.by-version."glob"."3.2.9" self.by-version."graceful-fs"."2.0.2" self.by-version."fstream"."0.1.25" self.by-version."minimatch"."0.2.14" @@ -10179,7 +11281,7 @@ self.by-version."nopt"."2.2.0" self.by-version."npmlog"."0.0.6" self.by-version."osenv"."0.0.3" - self.by-version."request"."2.33.0" + self.by-version."request"."2.34.0" self.by-version."rimraf"."2.2.6" self.by-version."semver"."2.2.1" self.by-version."tar"."0.1.19" @@ -10189,36 +11291,36 @@ ]; passthru.names = [ "node-gyp" ]; }; - "node-gyp" = self.by-version."node-gyp"."0.12.2"; - by-spec."node-gyp"."~0.12.2" = - self.by-version."node-gyp"."0.12.2"; by-spec."node-inspector"."*" = - self.by-version."node-inspector"."0.7.0-2"; - by-version."node-inspector"."0.7.0-2" = lib.makeOverridable self.buildNodePackage { - name = "node-inspector-0.7.0-2"; + self.by-version."node-inspector"."0.7.0"; + by-version."node-inspector"."0.7.0" = lib.makeOverridable self.buildNodePackage { + name = "node-inspector-0.7.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/node-inspector/-/node-inspector-0.7.0-2.tgz"; - name = "node-inspector-0.7.0-2.tgz"; - sha1 = "e26d3c5ee74fe99fc5c8b2adb5634dac0ca86e81"; + url = "http://registry.npmjs.org/node-inspector/-/node-inspector-0.7.0.tgz"; + name = "node-inspector-0.7.0.tgz"; + sha1 = "b035e94e4bca3279ebabbb4df871ad8931919d9c"; }) ]; buildInputs = (self.nativeDeps."node-inspector" or []); deps = [ - self.by-version."socket.io"."0.9.16" self.by-version."express"."3.4.8" self.by-version."async"."0.2.10" - self.by-version."glob"."3.2.8" - self.by-version."rc"."0.3.3" + self.by-version."glob"."3.2.9" + self.by-version."rc"."0.3.4" self.by-version."strong-data-uri"."0.1.1" self.by-version."debug"."0.7.4" + self.by-version."ws"."0.4.31" + self.by-version."opener"."1.3.0" + self.by-version."yargs"."1.1.3" + self.by-version."which"."1.0.5" ]; peerDependencies = [ ]; passthru.names = [ "node-inspector" ]; }; - "node-inspector" = self.by-version."node-inspector"."0.7.0-2"; + "node-inspector" = self.by-version."node-inspector"."0.7.0"; by-spec."node-protobuf"."*" = self.by-version."node-protobuf"."1.0.10"; by-version."node-protobuf"."1.0.10" = lib.makeOverridable self.buildNodePackage { @@ -10429,7 +11531,7 @@ (self.nativeDeps."nodemailer" or []); deps = [ self.by-version."mailcomposer"."0.2.8" - self.by-version."simplesmtp"."0.3.21" + self.by-version."simplesmtp"."0.3.22" self.by-version."optimist"."0.6.1" ]; peerDependencies = [ @@ -10437,14 +11539,14 @@ passthru.names = [ "nodemailer" ]; }; by-spec."nodemon"."*" = - self.by-version."nodemon"."1.0.14"; - by-version."nodemon"."1.0.14" = lib.makeOverridable self.buildNodePackage { - name = "nodemon-1.0.14"; + self.by-version."nodemon"."1.0.15"; + by-version."nodemon"."1.0.15" = lib.makeOverridable self.buildNodePackage { + name = "nodemon-1.0.15"; src = [ (fetchurl { - url = "http://registry.npmjs.org/nodemon/-/nodemon-1.0.14.tgz"; - name = "nodemon-1.0.14.tgz"; - sha1 = "415499efd9262b6a76cbf37385876c3343f4f0c6"; + url = "http://registry.npmjs.org/nodemon/-/nodemon-1.0.15.tgz"; + name = "nodemon-1.0.15.tgz"; + sha1 = "32efa6b8134d579dca8894cd9e8a27d381387f11"; }) ]; buildInputs = @@ -10457,7 +11559,7 @@ ]; passthru.names = [ "nodemon" ]; }; - "nodemon" = self.by-version."nodemon"."1.0.14"; + "nodemon" = self.by-version."nodemon"."1.0.15"; by-spec."nomnom"."1.6.x" = self.by-version."nomnom"."1.6.2"; by-version."nomnom"."1.6.2" = lib.makeOverridable self.buildNodePackage { @@ -10568,14 +11670,14 @@ by-spec."nopt"."~2.1.2" = self.by-version."nopt"."2.1.2"; by-spec."normalize-package-data"."~0.2.9" = - self.by-version."normalize-package-data"."0.2.9"; - by-version."normalize-package-data"."0.2.9" = lib.makeOverridable self.buildNodePackage { - name = "node-normalize-package-data-0.2.9"; + self.by-version."normalize-package-data"."0.2.12"; + by-version."normalize-package-data"."0.2.12" = lib.makeOverridable self.buildNodePackage { + name = "node-normalize-package-data-0.2.12"; src = [ (fetchurl { - url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-0.2.9.tgz"; - name = "normalize-package-data-0.2.9.tgz"; - sha1 = "8be8a1c0a0b55a7df07bee2b488c67c1d8862a4b"; + url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-0.2.12.tgz"; + name = "normalize-package-data-0.2.12.tgz"; + sha1 = "c8284cf0cb0466ea60ee64276b9070722c1da768"; }) ]; buildInputs = @@ -10590,14 +11692,14 @@ passthru.names = [ "normalize-package-data" ]; }; by-spec."npm"."*" = - self.by-version."npm"."1.4.3"; - by-version."npm"."1.4.3" = lib.makeOverridable self.buildNodePackage { - name = "npm-1.4.3"; + self.by-version."npm"."1.4.4"; + by-version."npm"."1.4.4" = lib.makeOverridable self.buildNodePackage { + name = "npm-1.4.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm/-/npm-1.4.3.tgz"; - name = "npm-1.4.3.tgz"; - sha1 = "c0b18a662731d93cfdac37df5c2b3a0cda39613c"; + url = "http://registry.npmjs.org/npm/-/npm-1.4.4.tgz"; + name = "npm-1.4.4.tgz"; + sha1 = "076616f7af95bcd08a4c5ad5cce18c5f370e0935"; }) ]; buildInputs = @@ -10621,7 +11723,7 @@ self.by-version."lru-cache"."2.5.0" self.by-version."node-gyp"."0.12.2" self.by-version."fstream-npm"."0.1.6" - self.by-version."uid-number"."0.0.4" + self.by-version."uid-number"."0.0.5" self.by-version."archy"."0.0.2" self.by-version."chownr"."0.0.1" self.by-version."npmlog"."0.0.6" @@ -10635,7 +11737,7 @@ self.by-version."lockfile"."0.4.2" self.by-version."retry"."0.6.0" self.by-version."once"."1.3.0" - self.by-version."npmconf"."0.1.12" + self.by-version."npmconf"."0.1.13" self.by-version."opener"."1.3.0" self.by-version."chmodr"."0.1.0" self.by-version."cmd-shim"."1.1.1" @@ -10648,7 +11750,7 @@ self.by-version."text-table"."0.2.0" self.by-version."ansicolors"."0.3.2" self.by-version."ansistyles"."0.1.3" - self.by-version."path-is-inside"."1.0.0" + self.by-version."path-is-inside"."1.0.1" self.by-version."columnify"."0.1.2" self.by-version."npm-install-checks"."1.0.0" ]; @@ -10656,7 +11758,7 @@ ]; passthru.names = [ "npm" ]; }; - "npm" = self.by-version."npm"."1.4.3"; + "npm" = self.by-version."npm"."1.4.4"; by-spec."npm-install-checks"."~1.0.0" = self.by-version."npm-install-checks"."1.0.0"; by-version."npm-install-checks"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -10692,7 +11794,7 @@ buildInputs = (self.nativeDeps."npm-registry-client" or []); deps = [ - self.by-version."request"."2.33.0" + self.by-version."request"."2.34.0" self.by-version."graceful-fs"."2.0.2" self.by-version."semver"."2.0.11" self.by-version."slide"."1.1.5" @@ -10721,35 +11823,7 @@ buildInputs = (self.nativeDeps."npm-registry-client" or []); deps = [ - self.by-version."request"."2.33.0" - self.by-version."graceful-fs"."2.0.2" - self.by-version."semver"."2.2.1" - self.by-version."slide"."1.1.5" - self.by-version."chownr"."0.0.1" - self.by-version."mkdirp"."0.3.5" - self.by-version."rimraf"."2.2.6" - self.by-version."retry"."0.6.0" - self.by-version."npmlog"."0.0.6" - ]; - peerDependencies = [ - ]; - passthru.names = [ "npm-registry-client" ]; - }; - by-spec."npm-registry-client"."~0.3.3" = - self.by-version."npm-registry-client"."0.3.6"; - by-version."npm-registry-client"."0.3.6" = lib.makeOverridable self.buildNodePackage { - name = "node-npm-registry-client-0.3.6"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.3.6.tgz"; - name = "npm-registry-client-0.3.6.tgz"; - sha1 = "c48a2a03643769acc49672860f7920ec6bffac6e"; - }) - ]; - buildInputs = - (self.nativeDeps."npm-registry-client" or []); - deps = [ - self.by-version."request"."2.33.0" + self.by-version."request"."2.34.0" self.by-version."graceful-fs"."2.0.2" self.by-version."semver"."2.2.1" self.by-version."slide"."1.1.5" @@ -10763,6 +11837,8 @@ ]; passthru.names = [ "npm-registry-client" ]; }; + by-spec."npm-registry-client"."~0.4.4" = + self.by-version."npm-registry-client"."0.4.4"; by-spec."npm-user-validate"."0.0.3" = self.by-version."npm-user-validate"."0.0.3"; by-version."npm-user-validate"."0.0.3" = lib.makeOverridable self.buildNodePackage { @@ -10803,7 +11879,7 @@ self.by-version."tar"."0.1.17" self.by-version."temp"."0.6.0" self.by-version."fs.extra"."1.2.1" - self.by-version."findit"."1.1.0" + self.by-version."findit"."1.1.1" ]; peerDependencies = [ ]; @@ -10865,14 +11941,14 @@ passthru.names = [ "npmconf" ]; }; by-spec."npmconf"."~0.1.12" = - self.by-version."npmconf"."0.1.12"; - by-version."npmconf"."0.1.12" = lib.makeOverridable self.buildNodePackage { - name = "node-npmconf-0.1.12"; + self.by-version."npmconf"."0.1.13"; + by-version."npmconf"."0.1.13" = lib.makeOverridable self.buildNodePackage { + name = "node-npmconf-0.1.13"; src = [ (fetchurl { - url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.12.tgz"; - name = "npmconf-0.1.12.tgz"; - sha1 = "7b89bbbb93fbbc449d7fac109e8164b47d105e90"; + url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.13.tgz"; + name = "npmconf-0.1.13.tgz"; + sha1 = "d47241b5b074f554ced90cd888d0dc96e4b1a4da"; }) ]; buildInputs = @@ -10891,8 +11967,10 @@ ]; passthru.names = [ "npmconf" ]; }; + by-spec."npmconf"."~0.1.13" = + self.by-version."npmconf"."0.1.13"; by-spec."npmconf"."~0.1.2" = - self.by-version."npmconf"."0.1.12"; + self.by-version."npmconf"."0.1.13"; by-spec."npmlog"."*" = self.by-version."npmlog"."0.0.6"; by-version."npmlog"."0.0.6" = lib.makeOverridable self.buildNodePackage { @@ -11209,7 +12287,7 @@ (self.nativeDeps."optimist" or []); deps = [ self.by-version."wordwrap"."0.0.2" - self.by-version."minimist"."0.0.7" + self.by-version."minimist"."0.0.8" ]; peerDependencies = [ ]; @@ -11271,7 +12349,7 @@ (self.nativeDeps."optimist" or []); deps = [ self.by-version."wordwrap"."0.0.2" - self.by-version."minimist"."0.0.7" + self.by-version."minimist"."0.0.8" ]; peerDependencies = [ ]; @@ -11281,12 +12359,12 @@ self.by-version."optimist"."0.6.1"; by-spec."optimist"."~0.3" = self.by-version."optimist"."0.3.7"; - by-spec."optimist"."~0.3.4" = - self.by-version."optimist"."0.3.7"; by-spec."optimist"."~0.3.5" = self.by-version."optimist"."0.3.7"; by-spec."optimist"."~0.6.0" = self.by-version."optimist"."0.6.1"; + by-spec."optimist"."~0.6.1" = + self.by-version."optimist"."0.6.1"; by-spec."options".">=0.0.5" = self.by-version."options"."0.0.5"; by-version."options"."0.0.5" = lib.makeOverridable self.buildNodePackage { @@ -11347,6 +12425,25 @@ "optparse" = self.by-version."optparse"."1.0.5"; by-spec."optparse".">= 1.0.3" = self.by-version."optparse"."1.0.5"; + by-spec."os-browserify"."~0.1.1" = + self.by-version."os-browserify"."0.1.1"; + by-version."os-browserify"."0.1.1" = lib.makeOverridable self.buildNodePackage { + name = "node-os-browserify-0.1.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/os-browserify/-/os-browserify-0.1.1.tgz"; + name = "os-browserify-0.1.1.tgz"; + sha1 = "c1c6b8b27be18cb09da7fa87476e0bcf3b465cbe"; + }) + ]; + buildInputs = + (self.nativeDeps."os-browserify" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "os-browserify" ]; + }; by-spec."osenv"."0" = self.by-version."osenv"."0.0.3"; by-version."osenv"."0.0.3" = lib.makeOverridable self.buildNodePackage { @@ -11410,6 +12507,27 @@ ]; passthru.names = [ "p-throttler" ]; }; + by-spec."parents"."0.0.2" = + self.by-version."parents"."0.0.2"; + by-version."parents"."0.0.2" = lib.makeOverridable self.buildNodePackage { + name = "parents-0.0.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/parents/-/parents-0.0.2.tgz"; + name = "parents-0.0.2.tgz"; + sha1 = "67147826e497d40759aaf5ba4c99659b6034d302"; + }) + ]; + buildInputs = + (self.nativeDeps."parents" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "parents" ]; + }; + by-spec."parents"."~0.0.1" = + self.by-version."parents"."0.0.2"; by-spec."passport"."*" = self.by-version."passport"."0.2.0"; by-version."passport"."0.2.0" = lib.makeOverridable self.buildNodePackage { @@ -11453,10 +12571,10 @@ ]; passthru.names = [ "passport" ]; }; - by-spec."passport"."~0.1.18" = - self.by-version."passport"."0.1.18"; by-spec."passport"."~0.1.3" = self.by-version."passport"."0.1.18"; + by-spec."passport"."~0.2.0" = + self.by-version."passport"."0.2.0"; by-spec."passport-http"."*" = self.by-version."passport-http"."0.2.2"; by-version."passport-http"."0.2.2" = lib.makeOverridable self.buildNodePackage { @@ -11522,15 +12640,34 @@ ]; passthru.names = [ "passport-strategy" ]; }; - by-spec."path-is-inside"."~1.0.0" = - self.by-version."path-is-inside"."1.0.0"; - by-version."path-is-inside"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-path-is-inside-1.0.0"; + by-spec."path-browserify"."~0.0.0" = + self.by-version."path-browserify"."0.0.0"; + by-version."path-browserify"."0.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-path-browserify-0.0.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.0.tgz"; - name = "path-is-inside-1.0.0.tgz"; - sha1 = "8ec1c42a4c1a039e3e75f6e9e6029bd0c699016e"; + url = "http://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz"; + name = "path-browserify-0.0.0.tgz"; + sha1 = "a0b870729aae214005b7d5032ec2cbbb0fb4451a"; + }) + ]; + buildInputs = + (self.nativeDeps."path-browserify" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "path-browserify" ]; + }; + by-spec."path-is-inside"."~1.0.0" = + self.by-version."path-is-inside"."1.0.1"; + by-version."path-is-inside"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-path-is-inside-1.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.1.tgz"; + name = "path-is-inside-1.0.1.tgz"; + sha1 = "98d8f1d030bf04bd7aeee4a1ba5485d40318fd89"; }) ]; buildInputs = @@ -11629,14 +12766,14 @@ by-spec."pkginfo"."0.x.x" = self.by-version."pkginfo"."0.3.0"; by-spec."plist-native"."*" = - self.by-version."plist-native"."0.2.2"; - by-version."plist-native"."0.2.2" = lib.makeOverridable self.buildNodePackage { - name = "node-plist-native-0.2.2"; + self.by-version."plist-native"."0.2.3"; + by-version."plist-native"."0.2.3" = lib.makeOverridable self.buildNodePackage { + name = "node-plist-native-0.2.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/plist-native/-/plist-native-0.2.2.tgz"; - name = "plist-native-0.2.2.tgz"; - sha1 = "6abde856b07a52f0d6bc027f7750f4d97ff93858"; + url = "http://registry.npmjs.org/plist-native/-/plist-native-0.2.3.tgz"; + name = "plist-native-0.2.3.tgz"; + sha1 = "76843a2da80d587b75dcbcc1634c6f3968a2af17"; }) ]; buildInputs = @@ -11648,7 +12785,7 @@ ]; passthru.names = [ "plist-native" ]; }; - "plist-native" = self.by-version."plist-native"."0.2.2"; + "plist-native" = self.by-version."plist-native"."0.2.3"; by-spec."policyfile"."0.0.4" = self.by-version."policyfile"."0.0.4"; by-version."policyfile"."0.0.4" = lib.makeOverridable self.buildNodePackage { @@ -11707,6 +12844,44 @@ ]; passthru.names = [ "posix-getopt" ]; }; + by-spec."pretty-bytes"."^0.1.0" = + self.by-version."pretty-bytes"."0.1.0"; + by-version."pretty-bytes"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "pretty-bytes-0.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/pretty-bytes/-/pretty-bytes-0.1.0.tgz"; + name = "pretty-bytes-0.1.0.tgz"; + sha1 = "2cad1cdd7838fe59018ae5e0ccf7cae741942f8e"; + }) + ]; + buildInputs = + (self.nativeDeps."pretty-bytes" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "pretty-bytes" ]; + }; + by-spec."process"."~0.5.1" = + self.by-version."process"."0.5.2"; + by-version."process"."0.5.2" = lib.makeOverridable self.buildNodePackage { + name = "node-process-0.5.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/process/-/process-0.5.2.tgz"; + name = "process-0.5.2.tgz"; + sha1 = "1638d8a8e34c2f440a91db95ab9aeb677fc185cf"; + }) + ]; + buildInputs = + (self.nativeDeps."process" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "process" ]; + }; by-spec."promise"."~2.0" = self.by-version."promise"."2.0.0"; by-version."promise"."2.0.0" = lib.makeOverridable self.buildNodePackage { @@ -11870,6 +13045,25 @@ ]; passthru.names = [ "punycode" ]; }; + by-spec."punycode".">=1.0.0 <1.1.0" = + self.by-version."punycode"."1.0.0"; + by-version."punycode"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-punycode-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/punycode/-/punycode-1.0.0.tgz"; + name = "punycode-1.0.0.tgz"; + sha1 = "ce9e6c6e9c1db5827174fceb12ff4938700a1bd3"; + }) + ]; + buildInputs = + (self.nativeDeps."punycode" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "punycode" ]; + }; by-spec."punycode"."~1.2.3" = self.by-version."punycode"."1.2.4"; by-spec."q".">= 0.0.1" = @@ -12057,6 +13251,44 @@ self.by-version."qs"."0.5.6"; by-spec."qs"."~0.6.0" = self.by-version."qs"."0.6.6"; + by-spec."querystring".">=0.1.0 <0.2.0" = + self.by-version."querystring"."0.1.0"; + by-version."querystring"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-querystring-0.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/querystring/-/querystring-0.1.0.tgz"; + name = "querystring-0.1.0.tgz"; + sha1 = "cb76a26cda0a10a94163fcdb3e132827f04b7b10"; + }) + ]; + buildInputs = + (self.nativeDeps."querystring" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "querystring" ]; + }; + by-spec."querystring"."https://github.com/substack/querystring/archive/0.2.0-ie8.tar.gz" = + self.by-version."querystring"."0.2.0"; + by-version."querystring"."0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "node-querystring-0.2.0"; + src = [ + (fetchurl { + url = "https://github.com/substack/querystring/archive/0.2.0-ie8.tar.gz"; + name = "querystring-0.2.0.tgz"; + sha256 = "9476079402605957bae231ea3ec5ae83b454b2de68ddaa3450096821996be8f5"; + }) + ]; + buildInputs = + (self.nativeDeps."querystring" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "querystring" ]; + }; by-spec."rai"."~0.1" = self.by-version."rai"."0.1.9"; by-version."rai"."0.1.9" = lib.makeOverridable self.buildNodePackage { @@ -12095,7 +13327,7 @@ ]; passthru.names = [ "range-parser" ]; }; - by-spec."range-parser"."~1.0.0" = + by-spec."range-parser"."1.0.0" = self.by-version."range-parser"."1.0.0"; by-version."range-parser"."1.0.0" = lib.makeOverridable self.buildNodePackage { name = "node-range-parser-1.0.0"; @@ -12114,7 +13346,9 @@ ]; passthru.names = [ "range-parser" ]; }; - by-spec."raven"."~0.6.0" = + by-spec."range-parser"."~1.0.0" = + self.by-version."range-parser"."1.0.0"; + by-spec."raven"."~0.6.2" = self.by-version."raven"."0.6.2"; by-version."raven"."0.6.2" = lib.makeOverridable self.buildNodePackage { name = "raven-0.6.2"; @@ -12216,20 +13450,20 @@ }; "rbytes" = self.by-version."rbytes"."1.0.0"; by-spec."rc"."~0.3.0" = - self.by-version."rc"."0.3.3"; - by-version."rc"."0.3.3" = lib.makeOverridable self.buildNodePackage { - name = "rc-0.3.3"; + self.by-version."rc"."0.3.4"; + by-version."rc"."0.3.4" = lib.makeOverridable self.buildNodePackage { + name = "rc-0.3.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/rc/-/rc-0.3.3.tgz"; - name = "rc-0.3.3.tgz"; - sha1 = "2eac52d221dfdf5ba512def3ea27500a68dc3c07"; + url = "http://registry.npmjs.org/rc/-/rc-0.3.4.tgz"; + name = "rc-0.3.4.tgz"; + sha1 = "01101660fb38363c22afbddfad46ecdb92b42df9"; }) ]; buildInputs = (self.nativeDeps."rc" or []); deps = [ - self.by-version."optimist"."0.3.7" + self.by-version."minimist"."0.0.8" self.by-version."deep-extend"."0.2.8" self.by-version."ini"."1.1.0" ]; @@ -12237,8 +13471,8 @@ ]; passthru.names = [ "rc" ]; }; - by-spec."rc"."~0.3.2" = - self.by-version."rc"."0.3.3"; + by-spec."rc"."~0.3.4" = + self.by-version."rc"."0.3.4"; by-spec."read"."1" = self.by-version."read"."1.0.5"; by-version."read"."1.0.5" = lib.makeOverridable self.buildNodePackage { @@ -12325,9 +13559,9 @@ buildInputs = (self.nativeDeps."read-package-json" or []); deps = [ - self.by-version."glob"."3.2.8" + self.by-version."glob"."3.2.9" self.by-version."lru-cache"."2.5.0" - self.by-version."normalize-package-data"."0.2.9" + self.by-version."normalize-package-data"."0.2.12" self.by-version."graceful-fs"."2.0.2" ]; peerDependencies = [ @@ -12337,14 +13571,14 @@ by-spec."read-package-json"."~1.1.7" = self.by-version."read-package-json"."1.1.7"; by-spec."readable-stream"."1.0" = - self.by-version."readable-stream"."1.0.25"; - by-version."readable-stream"."1.0.25" = lib.makeOverridable self.buildNodePackage { - name = "node-readable-stream-1.0.25"; + self.by-version."readable-stream"."1.0.26"; + by-version."readable-stream"."1.0.26" = lib.makeOverridable self.buildNodePackage { + name = "node-readable-stream-1.0.26"; src = [ (fetchurl { - url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.25.tgz"; - name = "readable-stream-1.0.25.tgz"; - sha1 = "df19f64e6f74fd37ecf9d3ab8dbf1e2d11c9a045"; + url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.26.tgz"; + name = "readable-stream-1.0.26.tgz"; + sha1 = "12a9c4415f6a85374abe18b7831ba52d43105766"; }) ]; buildInputs = @@ -12357,14 +13591,14 @@ passthru.names = [ "readable-stream" ]; }; by-spec."readable-stream"."1.1" = - self.by-version."readable-stream"."1.1.10"; - by-version."readable-stream"."1.1.10" = lib.makeOverridable self.buildNodePackage { - name = "node-readable-stream-1.1.10"; + self.by-version."readable-stream"."1.1.11"; + by-version."readable-stream"."1.1.11" = lib.makeOverridable self.buildNodePackage { + name = "node-readable-stream-1.1.11"; src = [ (fetchurl { - url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.10.tgz"; - name = "readable-stream-1.1.10.tgz"; - sha1 = "d4dc2e5319e9c90d1e71c69390ef62cd90827f65"; + url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.11.tgz"; + name = "readable-stream-1.1.11.tgz"; + sha1 = "76ae0d88df2ac36c59e7c205e0cafc81c57bc07d"; }) ]; buildInputs = @@ -12379,15 +13613,15 @@ passthru.names = [ "readable-stream" ]; }; by-spec."readable-stream"."~1.0.17" = - self.by-version."readable-stream"."1.0.25"; + self.by-version."readable-stream"."1.0.26"; by-spec."readable-stream"."~1.0.2" = - self.by-version."readable-stream"."1.0.25"; + self.by-version."readable-stream"."1.0.26"; by-spec."readable-stream"."~1.0.24" = - self.by-version."readable-stream"."1.0.25"; + self.by-version."readable-stream"."1.0.26"; by-spec."readable-stream"."~1.1.8" = - self.by-version."readable-stream"."1.1.10"; + self.by-version."readable-stream"."1.1.11"; by-spec."readable-stream"."~1.1.9" = - self.by-version."readable-stream"."1.1.10"; + self.by-version."readable-stream"."1.1.11"; by-spec."readdirp"."~0.2.3" = self.by-version."readdirp"."0.2.5"; by-version."readdirp"."0.2.5" = lib.makeOverridable self.buildNodePackage { @@ -12408,15 +13642,37 @@ ]; passthru.names = [ "readdirp" ]; }; - by-spec."redeyed"."~0.4.0" = - self.by-version."redeyed"."0.4.2"; - by-version."redeyed"."0.4.2" = lib.makeOverridable self.buildNodePackage { - name = "node-redeyed-0.4.2"; + by-spec."readline2"."~0.1.0" = + self.by-version."readline2"."0.1.0"; + by-version."readline2"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-readline2-0.1.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/redeyed/-/redeyed-0.4.2.tgz"; - name = "redeyed-0.4.2.tgz"; - sha1 = "f0133b990cb972bdbcf2d2dce0aec36595f419bc"; + url = "http://registry.npmjs.org/readline2/-/readline2-0.1.0.tgz"; + name = "readline2-0.1.0.tgz"; + sha1 = "6a272ef89731225b448e4c6799b6e50d5be12b98"; + }) + ]; + buildInputs = + (self.nativeDeps."readline2" or []); + deps = [ + self.by-version."mute-stream"."0.0.4" + self.by-version."lodash"."2.4.1" + self.by-version."chalk"."0.4.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "readline2" ]; + }; + by-spec."redeyed"."~0.4.0" = + self.by-version."redeyed"."0.4.4"; + by-version."redeyed"."0.4.4" = lib.makeOverridable self.buildNodePackage { + name = "node-redeyed-0.4.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/redeyed/-/redeyed-0.4.4.tgz"; + name = "redeyed-0.4.4.tgz"; + sha1 = "37e990a6f2b21b2a11c2e6a48fd4135698cba97f"; }) ]; buildInputs = @@ -12590,14 +13846,14 @@ passthru.names = [ "replace" ]; }; by-spec."request"."2" = - self.by-version."request"."2.33.0"; - by-version."request"."2.33.0" = lib.makeOverridable self.buildNodePackage { - name = "node-request-2.33.0"; + self.by-version."request"."2.34.0"; + by-version."request"."2.34.0" = lib.makeOverridable self.buildNodePackage { + name = "node-request-2.34.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.33.0.tgz"; - name = "request-2.33.0.tgz"; - sha1 = "5167878131726070ec633752ea230a2379dc65ff"; + url = "http://registry.npmjs.org/request/-/request-2.34.0.tgz"; + name = "request-2.34.0.tgz"; + sha1 = "b5d8b9526add4a2d4629f4d417124573996445ae"; }) ]; buildInputs = @@ -12621,9 +13877,9 @@ passthru.names = [ "request" ]; }; by-spec."request"."2 >=2.20.0" = - self.by-version."request"."2.33.0"; + self.by-version."request"."2.34.0"; by-spec."request"."2 >=2.25.0" = - self.by-version."request"."2.33.0"; + self.by-version."request"."2.34.0"; by-spec."request"."2.16.2" = self.by-version."request"."2.16.2"; by-version."request"."2.16.2" = lib.makeOverridable self.buildNodePackage { @@ -12703,10 +13959,10 @@ ]; passthru.names = [ "request" ]; }; - by-spec."request".">=2.12.0" = - self.by-version."request"."2.33.0"; + by-spec."request".">=2.33.0" = + self.by-version."request"."2.34.0"; by-spec."request"."~2" = - self.by-version."request"."2.33.0"; + self.by-version."request"."2.34.0"; by-spec."request"."~2.25.0" = self.by-version."request"."2.25.0"; by-version."request"."2.25.0" = lib.makeOverridable self.buildNodePackage { @@ -12833,6 +14089,35 @@ }; by-spec."request"."~2.33.0" = self.by-version."request"."2.33.0"; + by-version."request"."2.33.0" = lib.makeOverridable self.buildNodePackage { + name = "node-request-2.33.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/request/-/request-2.33.0.tgz"; + name = "request-2.33.0.tgz"; + sha1 = "5167878131726070ec633752ea230a2379dc65ff"; + }) + ]; + buildInputs = + (self.nativeDeps."request" or []); + deps = [ + self.by-version."qs"."0.6.6" + self.by-version."json-stringify-safe"."5.0.0" + self.by-version."forever-agent"."0.5.2" + self.by-version."node-uuid"."1.4.1" + self.by-version."mime"."1.2.11" + self.by-version."tough-cookie"."0.12.1" + self.by-version."form-data"."0.1.2" + self.by-version."tunnel-agent"."0.3.0" + self.by-version."http-signature"."0.10.0" + self.by-version."oauth-sign"."0.3.0" + self.by-version."hawk"."1.0.0" + self.by-version."aws-sign2"."0.5.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "request" ]; + }; by-spec."request-progress"."~0.3.0" = self.by-version."request-progress"."0.3.1"; by-version."request-progress"."0.3.1" = lib.makeOverridable self.buildNodePackage { @@ -12913,7 +14198,7 @@ ]; passthru.names = [ "resolve" ]; }; - by-spec."resolve"."0.6.x" = + by-spec."resolve"."0.6.1" = self.by-version."resolve"."0.6.1"; by-version."resolve"."0.6.1" = lib.makeOverridable self.buildNodePackage { name = "node-resolve-0.6.1"; @@ -12932,7 +14217,9 @@ ]; passthru.names = [ "resolve" ]; }; - by-spec."resolve"."~0.3.1" = + by-spec."resolve"."0.6.x" = + self.by-version."resolve"."0.6.1"; + by-spec."resolve"."~0.3.0" = self.by-version."resolve"."0.3.1"; by-version."resolve"."0.3.1" = lib.makeOverridable self.buildNodePackage { name = "node-resolve-0.3.1"; @@ -12951,6 +14238,12 @@ ]; passthru.names = [ "resolve" ]; }; + by-spec."resolve"."~0.3.1" = + self.by-version."resolve"."0.3.1"; + by-spec."resolve"."~0.6.0" = + self.by-version."resolve"."0.6.1"; + by-spec."resolve"."~0.6.1" = + self.by-version."resolve"."0.6.1"; by-spec."restify"."2.4.1" = self.by-version."restify"."2.4.1"; by-version."restify"."2.4.1" = lib.makeOverridable self.buildNodePackage { @@ -13048,6 +14341,29 @@ ]; passthru.names = [ "revalidator" ]; }; + by-spec."rfile"."~1.0" = + self.by-version."rfile"."1.0.0"; + by-version."rfile"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-rfile-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/rfile/-/rfile-1.0.0.tgz"; + name = "rfile-1.0.0.tgz"; + sha1 = "59708cf90ca1e74c54c3cfc5c36fdb9810435261"; + }) + ]; + buildInputs = + (self.nativeDeps."rfile" or []); + deps = [ + self.by-version."callsite"."1.0.0" + self.by-version."resolve"."0.3.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "rfile" ]; + }; + by-spec."rfile"."~1.0.0" = + self.by-version."rfile"."1.0.0"; by-spec."rimraf"."1.x.x" = self.by-version."rimraf"."1.0.9"; by-version."rimraf"."1.0.9" = lib.makeOverridable self.buildNodePackage { @@ -13138,6 +14454,29 @@ self.by-version."rimraf"."2.2.6"; by-spec."rimraf"."~2.2.5" = self.by-version."rimraf"."2.2.6"; + by-spec."rimraf"."~2.2.6" = + self.by-version."rimraf"."2.2.6"; + by-spec."ruglify"."~1.0.0" = + self.by-version."ruglify"."1.0.0"; + by-version."ruglify"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-ruglify-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ruglify/-/ruglify-1.0.0.tgz"; + name = "ruglify-1.0.0.tgz"; + sha1 = "dc8930e2a9544a274301cc9972574c0d0986b675"; + }) + ]; + buildInputs = + (self.nativeDeps."ruglify" or []); + deps = [ + self.by-version."rfile"."1.0.0" + self.by-version."uglify-js"."2.2.5" + ]; + peerDependencies = [ + ]; + passthru.names = [ "ruglify" ]; + }; by-spec."s3http"."*" = self.by-version."s3http"."0.0.5"; by-version."s3http"."0.0.5" = lib.makeOverridable self.buildNodePackage { @@ -13246,14 +14585,14 @@ passthru.names = [ "sax" ]; }; by-spec."selenium-webdriver"."*" = - self.by-version."selenium-webdriver"."2.39.0"; - by-version."selenium-webdriver"."2.39.0" = lib.makeOverridable self.buildNodePackage { - name = "node-selenium-webdriver-2.39.0"; + self.by-version."selenium-webdriver"."2.40.0"; + by-version."selenium-webdriver"."2.40.0" = lib.makeOverridable self.buildNodePackage { + name = "node-selenium-webdriver-2.40.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.39.0.tgz"; - name = "selenium-webdriver-2.39.0.tgz"; - sha1 = "546225f2f4f53f1f490a3077e5f14092fad3d205"; + url = "http://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.40.0.tgz"; + name = "selenium-webdriver-2.40.0.tgz"; + sha1 = "ca4603c08311ec3688d67e1c8e8263cb9c1c1450"; }) ]; buildInputs = @@ -13264,7 +14603,7 @@ ]; passthru.names = [ "selenium-webdriver" ]; }; - "selenium-webdriver" = self.by-version."selenium-webdriver"."2.39.0"; + "selenium-webdriver" = self.by-version."selenium-webdriver"."2.40.0"; by-spec."semver"."*" = self.by-version."semver"."2.2.1"; by-version."semver"."2.2.1" = lib.makeOverridable self.buildNodePackage { @@ -13393,7 +14732,7 @@ deps = [ self.by-version."debug"."0.7.4" self.by-version."mime"."1.2.11" - self.by-version."fresh"."0.2.1" + self.by-version."fresh"."0.2.2" self.by-version."range-parser"."1.0.0" ]; peerDependencies = [ @@ -13469,6 +14808,8 @@ ]; passthru.names = [ "send" ]; }; + by-spec."send"."0.2.0" = + self.by-version."send"."0.2.0"; by-spec."sequence"."2.2.1" = self.by-version."sequence"."2.2.1"; by-version."sequence"."2.2.1" = lib.makeOverridable self.buildNodePackage { @@ -13505,12 +14846,50 @@ (self.nativeDeps."sha" or []); deps = [ self.by-version."graceful-fs"."2.0.2" - self.by-version."readable-stream"."1.0.25" + self.by-version."readable-stream"."1.0.26" ]; peerDependencies = [ ]; passthru.names = [ "sha" ]; }; + by-spec."shallow-copy"."0.0.1" = + self.by-version."shallow-copy"."0.0.1"; + by-version."shallow-copy"."0.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-shallow-copy-0.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/shallow-copy/-/shallow-copy-0.0.1.tgz"; + name = "shallow-copy-0.0.1.tgz"; + sha1 = "415f42702d73d810330292cc5ee86eae1a11a170"; + }) + ]; + buildInputs = + (self.nativeDeps."shallow-copy" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "shallow-copy" ]; + }; + by-spec."shell-quote"."~0.0.1" = + self.by-version."shell-quote"."0.0.1"; + by-version."shell-quote"."0.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-shell-quote-0.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/shell-quote/-/shell-quote-0.0.1.tgz"; + name = "shell-quote-0.0.1.tgz"; + sha1 = "1a41196f3c0333c482323593d6886ecf153dd986"; + }) + ]; + buildInputs = + (self.nativeDeps."shell-quote" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "shell-quote" ]; + }; by-spec."shelljs"."0.1.x" = self.by-version."shelljs"."0.1.4"; by-version."shelljs"."0.1.4" = lib.makeOverridable self.buildNodePackage { @@ -13552,14 +14931,14 @@ passthru.names = [ "shelljs" ]; }; by-spec."should"."*" = - self.by-version."should"."3.1.2"; - by-version."should"."3.1.2" = lib.makeOverridable self.buildNodePackage { - name = "node-should-3.1.2"; + self.by-version."should"."3.1.3"; + by-version."should"."3.1.3" = lib.makeOverridable self.buildNodePackage { + name = "node-should-3.1.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/should/-/should-3.1.2.tgz"; - name = "should-3.1.2.tgz"; - sha1 = "4bc206253d736c2fb902153477982c2b2e988c02"; + url = "http://registry.npmjs.org/should/-/should-3.1.3.tgz"; + name = "should-3.1.3.tgz"; + sha1 = "900ff485c1497f873de0aa3bfcf9d8b913fdda24"; }) ]; buildInputs = @@ -13570,7 +14949,7 @@ ]; passthru.names = [ "should" ]; }; - "should" = self.by-version."should"."3.1.2"; + "should" = self.by-version."should"."3.1.3"; by-spec."sigmund"."~1.0.0" = self.by-version."sigmund"."1.0.0"; by-version."sigmund"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -13633,14 +15012,14 @@ passthru.names = [ "simple-lru-cache" ]; }; by-spec."simplesmtp".">= 0.1.22" = - self.by-version."simplesmtp"."0.3.21"; - by-version."simplesmtp"."0.3.21" = lib.makeOverridable self.buildNodePackage { - name = "node-simplesmtp-0.3.21"; + self.by-version."simplesmtp"."0.3.22"; + by-version."simplesmtp"."0.3.22" = lib.makeOverridable self.buildNodePackage { + name = "node-simplesmtp-0.3.22"; src = [ (fetchurl { - url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.21.tgz"; - name = "simplesmtp-0.3.21.tgz"; - sha1 = "79aa14d72a915bb5853ff53a8a44b0823fbe1a8f"; + url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.22.tgz"; + name = "simplesmtp-0.3.22.tgz"; + sha1 = "5bef8fef60e7e3c4ff57117e3502190447de11e5"; }) ]; buildInputs = @@ -13870,8 +15249,6 @@ }; by-spec."socket.io"."~0.9.13" = self.by-version."socket.io"."0.9.16"; - by-spec."socket.io"."~0.9.14" = - self.by-version."socket.io"."0.9.16"; by-spec."socket.io-client"."0.9.11" = self.by-version."socket.io-client"."0.9.11"; by-version."socket.io-client"."0.9.11" = lib.makeOverridable self.buildNodePackage { @@ -13941,14 +15318,14 @@ }; "sockjs" = self.by-version."sockjs"."0.3.8"; by-spec."source-map"."*" = - self.by-version."source-map"."0.1.32"; - by-version."source-map"."0.1.32" = lib.makeOverridable self.buildNodePackage { - name = "node-source-map-0.1.32"; + self.by-version."source-map"."0.1.33"; + by-version."source-map"."0.1.33" = lib.makeOverridable self.buildNodePackage { + name = "node-source-map-0.1.33"; src = [ (fetchurl { - url = "http://registry.npmjs.org/source-map/-/source-map-0.1.32.tgz"; - name = "source-map-0.1.32.tgz"; - sha1 = "c8b6c167797ba4740a8ea33252162ff08591b266"; + url = "http://registry.npmjs.org/source-map/-/source-map-0.1.33.tgz"; + name = "source-map-0.1.33.tgz"; + sha1 = "c659297a73af18c073b0aa2e7cc91e316b5c570c"; }) ]; buildInputs = @@ -13960,17 +15337,17 @@ ]; passthru.names = [ "source-map" ]; }; - "source-map" = self.by-version."source-map"."0.1.32"; + "source-map" = self.by-version."source-map"."0.1.33"; by-spec."source-map"."0.1.x" = - self.by-version."source-map"."0.1.32"; + self.by-version."source-map"."0.1.33"; by-spec."source-map".">= 0.1.2" = - self.by-version."source-map"."0.1.32"; + self.by-version."source-map"."0.1.33"; by-spec."source-map"."~0.1.30" = - self.by-version."source-map"."0.1.32"; + self.by-version."source-map"."0.1.33"; by-spec."source-map"."~0.1.31" = - self.by-version."source-map"."0.1.32"; + self.by-version."source-map"."0.1.33"; by-spec."source-map"."~0.1.7" = - self.by-version."source-map"."0.1.32"; + self.by-version."source-map"."0.1.33"; by-spec."spdy"."1.7.1" = self.by-version."spdy"."1.7.1"; by-version."spdy"."1.7.1" = lib.makeOverridable self.buildNodePackage { @@ -14032,27 +15409,6 @@ ]; passthru.names = [ "ssh-agent" ]; }; - by-spec."ssh2"."~0.2.16" = - self.by-version."ssh2"."0.2.17"; - by-version."ssh2"."0.2.17" = lib.makeOverridable self.buildNodePackage { - name = "node-ssh2-0.2.17"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/ssh2/-/ssh2-0.2.17.tgz"; - name = "ssh2-0.2.17.tgz"; - sha1 = "ce7773e4c7c4f78a8ab19227dcc3afae0b149291"; - }) - ]; - buildInputs = - (self.nativeDeps."ssh2" or []); - deps = [ - self.by-version."streamsearch"."0.1.2" - self.by-version."asn1"."0.1.11" - ]; - peerDependencies = [ - ]; - passthru.names = [ "ssh2" ]; - }; by-spec."stack-trace"."0.0.7" = self.by-version."stack-trace"."0.0.7"; by-version."stack-trace"."0.0.7" = lib.makeOverridable self.buildNodePackage { @@ -14073,14 +15429,14 @@ passthru.names = [ "stack-trace" ]; }; by-spec."stack-trace"."0.0.x" = - self.by-version."stack-trace"."0.0.8"; - by-version."stack-trace"."0.0.8" = lib.makeOverridable self.buildNodePackage { - name = "node-stack-trace-0.0.8"; + self.by-version."stack-trace"."0.0.9"; + by-version."stack-trace"."0.0.9" = lib.makeOverridable self.buildNodePackage { + name = "node-stack-trace-0.0.9"; src = [ (fetchurl { - url = "http://registry.npmjs.org/stack-trace/-/stack-trace-0.0.8.tgz"; - name = "stack-trace-0.0.8.tgz"; - sha1 = "8a9c30543ed9697f77739c67b053d8b030d86f3e"; + url = "http://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"; + name = "stack-trace-0.0.9.tgz"; + sha1 = "a8f6eaeca90674c333e7c43953f275b451510695"; }) ]; buildInputs = @@ -14091,6 +15447,26 @@ ]; passthru.names = [ "stack-trace" ]; }; + by-spec."stackdriver-statsd-backend"."*" = + self.by-version."stackdriver-statsd-backend"."0.1.5"; + by-version."stackdriver-statsd-backend"."0.1.5" = lib.makeOverridable self.buildNodePackage { + name = "node-stackdriver-statsd-backend-0.1.5"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/stackdriver-statsd-backend/-/stackdriver-statsd-backend-0.1.5.tgz"; + name = "stackdriver-statsd-backend-0.1.5.tgz"; + sha1 = "6f0cda0903fd149c6f69d0e50a9e8b4efd85141b"; + }) + ]; + buildInputs = + (self.nativeDeps."stackdriver-statsd-backend" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "stackdriver-statsd-backend" ]; + }; + "stackdriver-statsd-backend" = self.by-version."stackdriver-statsd-backend"."0.1.5"; by-spec."statsd"."*" = self.by-version."statsd"."0.7.1"; by-version."statsd"."0.7.1" = lib.makeOverridable self.buildNodePackage { @@ -14114,6 +15490,47 @@ passthru.names = [ "statsd" ]; }; "statsd" = self.by-version."statsd"."0.7.1"; + by-spec."statsd-librato-backend"."*" = + self.by-version."statsd-librato-backend"."0.1.2"; + by-version."statsd-librato-backend"."0.1.2" = lib.makeOverridable self.buildNodePackage { + name = "node-statsd-librato-backend-0.1.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/statsd-librato-backend/-/statsd-librato-backend-0.1.2.tgz"; + name = "statsd-librato-backend-0.1.2.tgz"; + sha1 = "228718018361ef352109bb69e2e6b3af9ab7d12d"; + }) + ]; + buildInputs = + (self.nativeDeps."statsd-librato-backend" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "statsd-librato-backend" ]; + }; + "statsd-librato-backend" = self.by-version."statsd-librato-backend"."0.1.2"; + by-spec."stream-browserify"."~0.1.0" = + self.by-version."stream-browserify"."0.1.3"; + by-version."stream-browserify"."0.1.3" = lib.makeOverridable self.buildNodePackage { + name = "node-stream-browserify-0.1.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/stream-browserify/-/stream-browserify-0.1.3.tgz"; + name = "stream-browserify-0.1.3.tgz"; + sha1 = "95cf1b369772e27adaf46352265152689c6c4be9"; + }) + ]; + buildInputs = + (self.nativeDeps."stream-browserify" or []); + deps = [ + self.by-version."inherits"."2.0.1" + self.by-version."process"."0.5.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "stream-browserify" ]; + }; by-spec."stream-combiner"."~0.0.2" = self.by-version."stream-combiner"."0.0.4"; by-version."stream-combiner"."0.0.4" = lib.makeOverridable self.buildNodePackage { @@ -14148,7 +15565,7 @@ buildInputs = (self.nativeDeps."stream-counter" or []); deps = [ - self.by-version."readable-stream"."1.0.25" + self.by-version."readable-stream"."1.0.26" ]; peerDependencies = [ ]; @@ -14168,7 +15585,7 @@ buildInputs = (self.nativeDeps."stream-counter" or []); deps = [ - self.by-version."readable-stream"."1.1.10" + self.by-version."readable-stream"."1.1.11" ]; peerDependencies = [ ]; @@ -14195,25 +15612,6 @@ passthru.names = [ "stream-splitter-transform" ]; }; "stream-splitter-transform" = self.by-version."stream-splitter-transform"."0.0.4"; - by-spec."streamsearch"."0.1.2" = - self.by-version."streamsearch"."0.1.2"; - by-version."streamsearch"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "node-streamsearch-0.1.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz"; - name = "streamsearch-0.1.2.tgz"; - sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a"; - }) - ]; - buildInputs = - (self.nativeDeps."streamsearch" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "streamsearch" ]; - }; by-spec."string"."1.6.1" = self.by-version."string"."1.6.1"; by-version."string"."1.6.1" = lib.makeOverridable self.buildNodePackage { @@ -14233,6 +15631,25 @@ ]; passthru.names = [ "string" ]; }; + by-spec."string_decoder"."~0.0.0" = + self.by-version."string_decoder"."0.0.1"; + by-version."string_decoder"."0.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-string_decoder-0.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/string_decoder/-/string_decoder-0.0.1.tgz"; + name = "string_decoder-0.0.1.tgz"; + sha1 = "f5472d0a8d1650ec823752d24e6fd627b39bf141"; + }) + ]; + buildInputs = + (self.nativeDeps."string_decoder" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "string_decoder" ]; + }; by-spec."string_decoder"."~0.10.x" = self.by-version."string_decoder"."0.10.25"; by-version."string_decoder"."0.10.25" = lib.makeOverridable self.buildNodePackage { @@ -14311,6 +15728,31 @@ passthru.names = [ "strong-data-uri" ]; }; by-spec."stylus"."*" = + self.by-version."stylus"."0.42.3"; + by-version."stylus"."0.42.3" = lib.makeOverridable self.buildNodePackage { + name = "stylus-0.42.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/stylus/-/stylus-0.42.3.tgz"; + name = "stylus-0.42.3.tgz"; + sha1 = "23e8b3e71eb7f60bc4a657de498c8feb9c366c32"; + }) + ]; + buildInputs = + (self.nativeDeps."stylus" or []); + deps = [ + self.by-version."css-parse"."1.7.0" + self.by-version."mkdirp"."0.3.5" + self.by-version."debug"."0.7.4" + self.by-version."sax"."0.5.8" + self.by-version."glob"."3.2.9" + ]; + peerDependencies = [ + ]; + passthru.names = [ "stylus" ]; + }; + "stylus" = self.by-version."stylus"."0.42.3"; + by-spec."stylus"."0.42.2" = self.by-version."stylus"."0.42.2"; by-version."stylus"."0.42.2" = lib.makeOverridable self.buildNodePackage { name = "stylus-0.42.2"; @@ -14328,15 +15770,32 @@ self.by-version."mkdirp"."0.3.5" self.by-version."debug"."0.7.4" self.by-version."sax"."0.5.8" - self.by-version."glob"."3.2.8" + self.by-version."glob"."3.2.9" ]; peerDependencies = [ ]; passthru.names = [ "stylus" ]; }; - "stylus" = self.by-version."stylus"."0.42.2"; - by-spec."stylus"."0.42.2" = - self.by-version."stylus"."0.42.2"; + by-spec."subarg"."0.0.1" = + self.by-version."subarg"."0.0.1"; + by-version."subarg"."0.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-subarg-0.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/subarg/-/subarg-0.0.1.tgz"; + name = "subarg-0.0.1.tgz"; + sha1 = "3d56b07dacfbc45bbb63f7672b43b63e46368e3a"; + }) + ]; + buildInputs = + (self.nativeDeps."subarg" or []); + deps = [ + self.by-version."minimist"."0.0.8" + ]; + peerDependencies = [ + ]; + passthru.names = [ "subarg" ]; + }; by-spec."sudo-block"."~0.2.0" = self.by-version."sudo-block"."0.2.1"; by-version."sudo-block"."0.2.1" = lib.makeOverridable self.buildNodePackage { @@ -14495,6 +15954,48 @@ }; by-spec."sylvester".">= 0.0.8" = self.by-version."sylvester"."0.0.21"; + by-spec."syntax-error"."~0.1.0" = + self.by-version."syntax-error"."0.1.0"; + by-version."syntax-error"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-syntax-error-0.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/syntax-error/-/syntax-error-0.1.0.tgz"; + name = "syntax-error-0.1.0.tgz"; + sha1 = "8cb515e730fe4f19d3a887035f8630e6494aac65"; + }) + ]; + buildInputs = + (self.nativeDeps."syntax-error" or []); + deps = [ + self.by-version."esprima-six"."0.0.3" + ]; + peerDependencies = [ + ]; + passthru.names = [ "syntax-error" ]; + }; + by-spec."tape"."~0.2.2" = + self.by-version."tape"."0.2.2"; + by-version."tape"."0.2.2" = lib.makeOverridable self.buildNodePackage { + name = "tape-0.2.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/tape/-/tape-0.2.2.tgz"; + name = "tape-0.2.2.tgz"; + sha1 = "64ccfa4b7ecf4a0060007e61716d424781671637"; + }) + ]; + buildInputs = + (self.nativeDeps."tape" or []); + deps = [ + self.by-version."jsonify"."0.0.0" + self.by-version."deep-equal"."0.0.0" + self.by-version."defined"."0.0.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "tape" ]; + }; by-spec."tar"."*" = self.by-version."tar"."0.1.19"; by-version."tar"."0.1.19" = lib.makeOverridable self.buildNodePackage { @@ -14549,6 +16050,27 @@ by-spec."tar"."~0.1.19" = self.by-version."tar"."0.1.19"; by-spec."temp"."*" = + self.by-version."temp"."0.7.0"; + by-version."temp"."0.7.0" = lib.makeOverridable self.buildNodePackage { + name = "node-temp-0.7.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/temp/-/temp-0.7.0.tgz"; + name = "temp-0.7.0.tgz"; + sha1 = "d34bdc8e7f955da2a6a473fea07ad601d68ba78f"; + }) + ]; + buildInputs = + (self.nativeDeps."temp" or []); + deps = [ + self.by-version."rimraf"."2.2.6" + ]; + peerDependencies = [ + ]; + passthru.names = [ "temp" ]; + }; + "temp" = self.by-version."temp"."0.7.0"; + by-spec."temp"."0.6.0" = self.by-version."temp"."0.6.0"; by-version."temp"."0.6.0" = lib.makeOverridable self.buildNodePackage { name = "node-temp-0.6.0"; @@ -14569,9 +16091,6 @@ ]; passthru.names = [ "temp" ]; }; - "temp" = self.by-version."temp"."0.6.0"; - by-spec."temp"."0.6.0" = - self.by-version."temp"."0.6.0"; by-spec."temp"."~0.5.1" = self.by-version."temp"."0.5.1"; by-version."temp"."0.5.1" = lib.makeOverridable self.buildNodePackage { @@ -14594,6 +16113,8 @@ }; by-spec."temp"."~0.6.0" = self.by-version."temp"."0.6.0"; + by-spec."temp"."~0.7.0" = + self.by-version."temp"."0.7.0"; by-spec."tempfile"."~0.1.2" = self.by-version."tempfile"."0.1.2"; by-version."tempfile"."0.1.2" = lib.makeOverridable self.buildNodePackage { @@ -14671,6 +16192,25 @@ ]; passthru.names = [ "throttleit" ]; }; + by-spec."through"."~2.2.7" = + self.by-version."through"."2.2.7"; + by-version."through"."2.2.7" = lib.makeOverridable self.buildNodePackage { + name = "node-through-2.2.7"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/through/-/through-2.2.7.tgz"; + name = "through-2.2.7.tgz"; + sha1 = "6e8e21200191d4eb6a99f6f010df46aa1c6eb2bd"; + }) + ]; + buildInputs = + (self.nativeDeps."through" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "through" ]; + }; by-spec."through"."~2.3.4" = self.by-version."through"."2.3.4"; by-version."through"."2.3.4" = lib.makeOverridable self.buildNodePackage { @@ -14704,13 +16244,33 @@ buildInputs = (self.nativeDeps."through2" or []); deps = [ - self.by-version."readable-stream"."1.0.25" + self.by-version."readable-stream"."1.0.26" self.by-version."xtend"."2.1.2" ]; peerDependencies = [ ]; passthru.names = [ "through2" ]; }; + by-spec."timers-browserify"."~1.0.1" = + self.by-version."timers-browserify"."1.0.1"; + by-version."timers-browserify"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-timers-browserify-1.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/timers-browserify/-/timers-browserify-1.0.1.tgz"; + name = "timers-browserify-1.0.1.tgz"; + sha1 = "7c93257b543cb1e3003d3663b57d560ee1d27057"; + }) + ]; + buildInputs = + (self.nativeDeps."timers-browserify" or []); + deps = [ + self.by-version."process"."0.5.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "timers-browserify" ]; + }; by-spec."timespan"."~2.3.0" = self.by-version."timespan"."2.3.0"; by-version."timespan"."2.3.0" = lib.makeOverridable self.buildNodePackage { @@ -14797,7 +16357,7 @@ self.by-version."sprintf"."0.1.3" self.by-version."temp"."0.6.0" self.by-version."winston"."0.6.2" - self.by-version."wrench"."1.5.7" + self.by-version."wrench"."1.5.8" ]; peerDependencies = [ ]; @@ -14943,6 +16503,25 @@ ]; passthru.names = [ "truncate" ]; }; + by-spec."tty-browserify"."~0.0.0" = + self.by-version."tty-browserify"."0.0.0"; + by-version."tty-browserify"."0.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-tty-browserify-0.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz"; + name = "tty-browserify-0.0.0.tgz"; + sha1 = "a157ba402da24e9bf957f9aa69d524eed42901a6"; + }) + ]; + buildInputs = + (self.nativeDeps."tty-browserify" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "tty-browserify" ]; + }; by-spec."tunnel-agent"."~0.2.0" = self.by-version."tunnel-agent"."0.2.0"; by-version."tunnel-agent"."0.2.0" = lib.makeOverridable self.buildNodePackage { @@ -15000,6 +16579,26 @@ ]; passthru.names = [ "type-detect" ]; }; + by-spec."type-is"."1.0.0" = + self.by-version."type-is"."1.0.0"; + by-version."type-is"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-type-is-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/type-is/-/type-is-1.0.0.tgz"; + name = "type-is-1.0.0.tgz"; + sha1 = "4ff424e97349a1ee1910b4bfc488595ecdc443fc"; + }) + ]; + buildInputs = + (self.nativeDeps."type-is" or []); + deps = [ + self.by-version."mime"."1.2.11" + ]; + peerDependencies = [ + ]; + passthru.names = [ "type-is" ]; + }; by-spec."typechecker"."~2.0.1" = self.by-version."typechecker"."2.0.8"; by-version."typechecker"."2.0.8" = lib.makeOverridable self.buildNodePackage { @@ -15019,6 +16618,25 @@ ]; passthru.names = [ "typechecker" ]; }; + by-spec."typedarray"."~0.0.5" = + self.by-version."typedarray"."0.0.5"; + by-version."typedarray"."0.0.5" = lib.makeOverridable self.buildNodePackage { + name = "node-typedarray-0.0.5"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/typedarray/-/typedarray-0.0.5.tgz"; + name = "typedarray-0.0.5.tgz"; + sha1 = "c4158fcd96c8ef91ef03cc72584c95e032877664"; + }) + ]; + buildInputs = + (self.nativeDeps."typedarray" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "typedarray" ]; + }; by-spec."uglify-js"."1.2.5" = self.by-version."uglify-js"."1.2.5"; by-version."uglify-js"."1.2.5" = lib.makeOverridable self.buildNodePackage { @@ -15053,7 +16671,30 @@ (self.nativeDeps."uglify-js" or []); deps = [ self.by-version."async"."0.2.10" - self.by-version."source-map"."0.1.32" + self.by-version."source-map"."0.1.33" + self.by-version."optimist"."0.3.7" + self.by-version."uglify-to-browserify"."1.0.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "uglify-js" ]; + }; + by-spec."uglify-js"."^2.4.0" = + self.by-version."uglify-js"."2.4.12"; + by-version."uglify-js"."2.4.12" = lib.makeOverridable self.buildNodePackage { + name = "uglify-js-2.4.12"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.12.tgz"; + name = "uglify-js-2.4.12.tgz"; + sha1 = "2354d9659f85330c1e3e2910f8acd77fe14bb4a8"; + }) + ]; + buildInputs = + (self.nativeDeps."uglify-js" or []); + deps = [ + self.by-version."async"."0.2.10" + self.by-version."source-map"."0.1.33" self.by-version."optimist"."0.3.7" self.by-version."uglify-to-browserify"."1.0.2" ]; @@ -15080,7 +16721,7 @@ ]; passthru.names = [ "uglify-js" ]; }; - by-spec."uglify-js"."~2.2.5" = + by-spec."uglify-js"."~2.2" = self.by-version."uglify-js"."2.2.5"; by-version."uglify-js"."2.2.5" = lib.makeOverridable self.buildNodePackage { name = "uglify-js-2.2.5"; @@ -15094,13 +16735,15 @@ buildInputs = (self.nativeDeps."uglify-js" or []); deps = [ - self.by-version."source-map"."0.1.32" + self.by-version."source-map"."0.1.33" self.by-version."optimist"."0.3.7" ]; peerDependencies = [ ]; passthru.names = [ "uglify-js" ]; }; + by-spec."uglify-js"."~2.2.5" = + self.by-version."uglify-js"."2.2.5"; by-spec."uglify-js"."~2.3" = self.by-version."uglify-js"."2.3.6"; by-version."uglify-js"."2.3.6" = lib.makeOverridable self.buildNodePackage { @@ -15116,7 +16759,7 @@ (self.nativeDeps."uglify-js" or []); deps = [ self.by-version."async"."0.2.10" - self.by-version."source-map"."0.1.32" + self.by-version."source-map"."0.1.33" self.by-version."optimist"."0.3.7" ]; peerDependencies = [ @@ -15127,27 +16770,8 @@ self.by-version."uglify-js"."2.3.6"; by-spec."uglify-js"."~2.4.0" = self.by-version."uglify-js"."2.4.12"; - by-version."uglify-js"."2.4.12" = lib.makeOverridable self.buildNodePackage { - name = "uglify-js-2.4.12"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.12.tgz"; - name = "uglify-js-2.4.12.tgz"; - sha1 = "2354d9659f85330c1e3e2910f8acd77fe14bb4a8"; - }) - ]; - buildInputs = - (self.nativeDeps."uglify-js" or []); - deps = [ - self.by-version."async"."0.2.10" - self.by-version."source-map"."0.1.32" - self.by-version."optimist"."0.3.7" - self.by-version."uglify-to-browserify"."1.0.2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "uglify-js" ]; - }; + by-spec."uglify-js"."~2.4.12" = + self.by-version."uglify-js"."2.4.12"; by-spec."uglify-to-browserify"."~1.0.0" = self.by-version."uglify-to-browserify"."1.0.2"; by-version."uglify-to-browserify"."1.0.2" = lib.makeOverridable self.buildNodePackage { @@ -15167,15 +16791,15 @@ ]; passthru.names = [ "uglify-to-browserify" ]; }; - by-spec."uid-number"."0" = - self.by-version."uid-number"."0.0.4"; - by-version."uid-number"."0.0.4" = lib.makeOverridable self.buildNodePackage { - name = "node-uid-number-0.0.4"; + by-spec."uid-number"."0.0.5" = + self.by-version."uid-number"."0.0.5"; + by-version."uid-number"."0.0.5" = lib.makeOverridable self.buildNodePackage { + name = "node-uid-number-0.0.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/uid-number/-/uid-number-0.0.4.tgz"; - name = "uid-number-0.0.4.tgz"; - sha1 = "5ea1d068b8c0dd1866c13aa0b76fa6e4f240cbdf"; + url = "http://registry.npmjs.org/uid-number/-/uid-number-0.0.5.tgz"; + name = "uid-number-0.0.5.tgz"; + sha1 = "5a3db23ef5dbd55b81fce0ec9a2ac6fccdebb81e"; }) ]; buildInputs = @@ -15205,6 +16829,29 @@ ]; passthru.names = [ "uid2" ]; }; + by-spec."umd"."~2.0.0" = + self.by-version."umd"."2.0.0"; + by-version."umd"."2.0.0" = lib.makeOverridable self.buildNodePackage { + name = "umd-2.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/umd/-/umd-2.0.0.tgz"; + name = "umd-2.0.0.tgz"; + sha1 = "749683b0d514728ae0e1b6195f5774afc0ad4f8f"; + }) + ]; + buildInputs = + (self.nativeDeps."umd" or []); + deps = [ + self.by-version."rfile"."1.0.0" + self.by-version."ruglify"."1.0.0" + self.by-version."through"."2.3.4" + self.by-version."uglify-js"."2.4.12" + ]; + peerDependencies = [ + ]; + passthru.names = [ "umd" ]; + }; by-spec."underscore"."*" = self.by-version."underscore"."1.6.0"; by-version."underscore"."1.6.0" = lib.makeOverridable self.buildNodePackage { @@ -15342,14 +16989,14 @@ passthru.names = [ "unfunk-diff" ]; }; by-spec."ungit"."*" = - self.by-version."ungit"."0.6.2"; - by-version."ungit"."0.6.2" = lib.makeOverridable self.buildNodePackage { - name = "ungit-0.6.2"; + self.by-version."ungit"."0.7.1"; + by-version."ungit"."0.7.1" = lib.makeOverridable self.buildNodePackage { + name = "ungit-0.7.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/ungit/-/ungit-0.6.2.tgz"; - name = "ungit-0.6.2.tgz"; - sha1 = "e1a01531bdd987c27bd9890d973c0a8549f1e191"; + url = "http://registry.npmjs.org/ungit/-/ungit-0.7.1.tgz"; + name = "ungit-0.7.1.tgz"; + sha1 = "9b1b768ecd97a66f7b97b5d7a1b36f29682e2bf7"; }) ]; buildInputs = @@ -15358,20 +17005,19 @@ self.by-version."express"."3.4.8" self.by-version."superagent"."0.16.0" self.by-version."lodash"."2.4.1" - self.by-version."temp"."0.6.0" + self.by-version."temp"."0.7.0" self.by-version."socket.io"."0.9.16" self.by-version."moment"."2.5.1" - self.by-version."async"."0.2.9" - self.by-version."ssh2"."0.2.17" - self.by-version."rc"."0.3.3" + self.by-version."async"."0.2.10" + self.by-version."rc"."0.3.4" self.by-version."uuid"."1.4.1" self.by-version."winston"."0.7.2" - self.by-version."passport"."0.1.18" + self.by-version."passport"."0.2.0" self.by-version."passport-local"."0.1.6" self.by-version."semver"."2.2.1" self.by-version."forever-monitor"."1.1.0" self.by-version."open"."0.0.4" - self.by-version."optimist"."0.6.0" + self.by-version."optimist"."0.6.1" self.by-version."crossroads"."0.12.0" self.by-version."signals"."1.0.0" self.by-version."hasher"."1.2.0" @@ -15382,15 +17028,17 @@ self.by-version."deep-extend"."0.2.8" self.by-version."raven"."0.6.2" self.by-version."knockout"."3.0.0" - self.by-version."npm-registry-client"."0.3.6" - self.by-version."npmconf"."0.1.12" + self.by-version."npm-registry-client"."0.4.4" + self.by-version."npmconf"."0.1.13" self.by-version."mkdirp"."0.3.5" + self.by-version."less"."1.7.0" + self.by-version."browserify"."3.31.2" ]; peerDependencies = [ ]; passthru.names = [ "ungit" ]; }; - "ungit" = self.by-version."ungit"."0.6.2"; + "ungit" = self.by-version."ungit"."0.7.1"; by-spec."update-notifier"."~0.1.3" = self.by-version."update-notifier"."0.1.7"; by-version."update-notifier"."0.1.7" = lib.makeOverridable self.buildNodePackage { @@ -15416,6 +17064,27 @@ }; by-spec."update-notifier"."~0.1.7" = self.by-version."update-notifier"."0.1.7"; + by-spec."url"."~0.7.9" = + self.by-version."url"."0.7.9"; + by-version."url"."0.7.9" = lib.makeOverridable self.buildNodePackage { + name = "node-url-0.7.9"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/url/-/url-0.7.9.tgz"; + name = "url-0.7.9.tgz"; + sha1 = "1959b1a8b361fc017b59513a7c7fa9827f5e4ed0"; + }) + ]; + buildInputs = + (self.nativeDeps."url" or []); + deps = [ + self.by-version."querystring"."0.1.0" + self.by-version."punycode"."1.0.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "url" ]; + }; by-spec."useragent"."~2.0.4" = self.by-version."useragent"."2.0.7"; by-version."useragent"."2.0.7" = lib.makeOverridable self.buildNodePackage { @@ -15495,6 +17164,26 @@ ]; passthru.names = [ "util" ]; }; + by-spec."util"."~0.10.1" = + self.by-version."util"."0.10.3"; + by-version."util"."0.10.3" = lib.makeOverridable self.buildNodePackage { + name = "node-util-0.10.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/util/-/util-0.10.3.tgz"; + name = "util-0.10.3.tgz"; + sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9"; + }) + ]; + buildInputs = + (self.nativeDeps."util" or []); + deps = [ + self.by-version."inherits"."2.0.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "util" ]; + }; by-spec."utile"."0.1.x" = self.by-version."utile"."0.1.7"; by-version."utile"."0.1.7" = lib.makeOverridable self.buildNodePackage { @@ -15551,6 +17240,25 @@ self.by-version."utile"."0.1.7"; by-spec."utile"."~0.2.1" = self.by-version."utile"."0.2.1"; + by-spec."utils-merge"."1.0.0" = + self.by-version."utils-merge"."1.0.0"; + by-version."utils-merge"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-utils-merge-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"; + name = "utils-merge-1.0.0.tgz"; + sha1 = "0294fb922bb9375153541c4f7096231f287c8af8"; + }) + ]; + buildInputs = + (self.nativeDeps."utils-merge" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "utils-merge" ]; + }; by-spec."uuid"."1.4.1" = self.by-version."uuid"."1.4.1"; by-version."uuid"."1.4.1" = lib.makeOverridable self.buildNodePackage { @@ -15713,6 +17421,26 @@ passthru.names = [ "view-helpers" ]; }; "view-helpers" = self.by-version."view-helpers"."0.1.4"; + by-spec."vm-browserify"."~0.0.1" = + self.by-version."vm-browserify"."0.0.4"; + by-version."vm-browserify"."0.0.4" = lib.makeOverridable self.buildNodePackage { + name = "node-vm-browserify-0.0.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz"; + name = "vm-browserify-0.0.4.tgz"; + sha1 = "5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"; + }) + ]; + buildInputs = + (self.nativeDeps."vm-browserify" or []); + deps = [ + self.by-version."indexof"."0.0.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "vm-browserify" ]; + }; by-spec."vows".">=0.5.13" = self.by-version."vows"."0.7.0"; by-version."vows"."0.7.0" = lib.makeOverridable self.buildNodePackage { @@ -15814,14 +17542,14 @@ passthru.names = [ "watch" ]; }; by-spec."wd"."~0.2.8" = - self.by-version."wd"."0.2.10"; - by-version."wd"."0.2.10" = lib.makeOverridable self.buildNodePackage { - name = "wd-0.2.10"; + self.by-version."wd"."0.2.11"; + by-version."wd"."0.2.11" = lib.makeOverridable self.buildNodePackage { + name = "wd-0.2.11"; src = [ (fetchurl { - url = "http://registry.npmjs.org/wd/-/wd-0.2.10.tgz"; - name = "wd-0.2.10.tgz"; - sha1 = "c4ac58eff5f32cc8e79e8f272a4c365c4240a68e"; + url = "http://registry.npmjs.org/wd/-/wd-0.2.11.tgz"; + name = "wd-0.2.11.tgz"; + sha1 = "27889d290facf3d19e050b3c789f2e852ca03f10"; }) ]; buildInputs = @@ -15840,14 +17568,14 @@ passthru.names = [ "wd" ]; }; by-spec."webdrvr"."*" = - self.by-version."webdrvr"."2.39.0-0"; - by-version."webdrvr"."2.39.0-0" = lib.makeOverridable self.buildNodePackage { - name = "webdrvr-2.39.0-0"; + self.by-version."webdrvr"."2.40.0"; + by-version."webdrvr"."2.40.0" = lib.makeOverridable self.buildNodePackage { + name = "webdrvr-2.40.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/webdrvr/-/webdrvr-2.39.0-0.tgz"; - name = "webdrvr-2.39.0-0.tgz"; - sha1 = "07b4867993c2d3e35869269cb8fe096e81571e0f"; + url = "http://registry.npmjs.org/webdrvr/-/webdrvr-2.40.0.tgz"; + name = "webdrvr-2.40.0.tgz"; + sha1 = "689f5d3fad5008ffc7b273d607eea9dd7d26ca42"; }) ]; buildInputs = @@ -15856,7 +17584,7 @@ self.by-version."adm-zip"."0.4.4" self.by-version."kew"."0.1.7" self.by-version."mkdirp"."0.3.5" - self.by-version."npmconf"."0.1.12" + self.by-version."npmconf"."0.1.13" self.by-version."phantomjs"."1.9.7-1" self.by-version."tmp"."0.0.23" self.by-version."follow-redirects"."0.0.3" @@ -15865,7 +17593,7 @@ ]; passthru.names = [ "webdrvr" ]; }; - "webdrvr" = self.by-version."webdrvr"."2.39.0-0"; + "webdrvr" = self.by-version."webdrvr"."2.40.0"; by-spec."websocket-driver".">=0.3.0" = self.by-version."websocket-driver"."0.3.2"; by-version."websocket-driver"."0.3.2" = lib.makeOverridable self.buildNodePackage { @@ -15887,15 +17615,15 @@ }; by-spec."websocket-driver".">=0.3.1" = self.by-version."websocket-driver"."0.3.2"; - by-spec."when"."~2.2.1" = - self.by-version."when"."2.2.1"; - by-version."when"."2.2.1" = lib.makeOverridable self.buildNodePackage { - name = "node-when-2.2.1"; + by-spec."when"."~2.8.0" = + self.by-version."when"."2.8.0"; + by-version."when"."2.8.0" = lib.makeOverridable self.buildNodePackage { + name = "node-when-2.8.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/when/-/when-2.2.1.tgz"; - name = "when-2.2.1.tgz"; - sha1 = "b1def994017350b8087f6e9a7596ab2833bdc712"; + url = "http://registry.npmjs.org/when/-/when-2.8.0.tgz"; + name = "when-2.8.0.tgz"; + sha1 = "a15eda8b6998ce74c6f4e220dbda18ce2ab3b026"; }) ]; buildInputs = @@ -15972,7 +17700,7 @@ self.by-version."eyes"."0.1.8" self.by-version."pkginfo"."0.3.0" self.by-version."request"."2.16.6" - self.by-version."stack-trace"."0.0.8" + self.by-version."stack-trace"."0.0.9" ]; peerDependencies = [ ]; @@ -15999,7 +17727,7 @@ self.by-version."eyes"."0.1.8" self.by-version."pkginfo"."0.2.3" self.by-version."request"."2.9.203" - self.by-version."stack-trace"."0.0.8" + self.by-version."stack-trace"."0.0.9" ]; peerDependencies = [ ]; @@ -16072,6 +17800,26 @@ ]; passthru.names = [ "with" ]; }; + by-spec."with"."~3.0.0" = + self.by-version."with"."3.0.0"; + by-version."with"."3.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-with-3.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/with/-/with-3.0.0.tgz"; + name = "with-3.0.0.tgz"; + sha1 = "38f5d5859bb974c9dad8812372b51dae4b9594cc"; + }) + ]; + buildInputs = + (self.nativeDeps."with" or []); + deps = [ + self.by-version."uglify-js"."2.4.12" + ]; + peerDependencies = [ + ]; + passthru.names = [ "with" ]; + }; by-spec."wordwrap"."0.0.x" = self.by-version."wordwrap"."0.0.2"; by-version."wordwrap"."0.0.2" = lib.makeOverridable self.buildNodePackage { @@ -16115,14 +17863,14 @@ passthru.names = [ "wrench" ]; }; by-spec."wrench"."~1.5.0" = - self.by-version."wrench"."1.5.7"; - by-version."wrench"."1.5.7" = lib.makeOverridable self.buildNodePackage { - name = "node-wrench-1.5.7"; + self.by-version."wrench"."1.5.8"; + by-version."wrench"."1.5.8" = lib.makeOverridable self.buildNodePackage { + name = "node-wrench-1.5.8"; src = [ (fetchurl { - url = "http://registry.npmjs.org/wrench/-/wrench-1.5.7.tgz"; - name = "wrench-1.5.7.tgz"; - sha1 = "95fcbb5a35b748ba8e29d755c9490ba69f033819"; + url = "http://registry.npmjs.org/wrench/-/wrench-1.5.8.tgz"; + name = "wrench-1.5.8.tgz"; + sha1 = "7a31c97f7869246d76c5cf2f5c977a1c4c8e5ab5"; }) ]; buildInputs = @@ -16134,7 +17882,7 @@ passthru.names = [ "wrench" ]; }; by-spec."wrench"."~1.5.4" = - self.by-version."wrench"."1.5.7"; + self.by-version."wrench"."1.5.8"; by-spec."ws"."0.4.x" = self.by-version."ws"."0.4.31"; by-version."ws"."0.4.31" = lib.makeOverridable self.buildNodePackage { @@ -16158,6 +17906,8 @@ ]; passthru.names = [ "ws" ]; }; + by-spec."ws"."~0.4.31" = + self.by-version."ws"."0.4.31"; by-spec."wu"."*" = self.by-version."wu"."0.1.8"; by-version."wu"."0.1.8" = lib.makeOverridable self.buildNodePackage { @@ -16377,6 +18127,26 @@ ]; passthru.names = [ "xtend" ]; }; + by-spec."yargs"."~1.1.2" = + self.by-version."yargs"."1.1.3"; + by-version."yargs"."1.1.3" = lib.makeOverridable self.buildNodePackage { + name = "node-yargs-1.1.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/yargs/-/yargs-1.1.3.tgz"; + name = "yargs-1.1.3.tgz"; + sha1 = "c44ed2bb9c86d55b557f2179fea7c7013fe4c42a"; + }) + ]; + buildInputs = + (self.nativeDeps."yargs" or []); + deps = [ + self.by-version."minimist"."0.0.8" + ]; + peerDependencies = [ + ]; + passthru.names = [ "yargs" ]; + }; by-spec."yeoman-generator"."~0.13.0" = self.by-version."yeoman-generator"."0.13.4"; by-version."yeoman-generator"."0.13.4" = lib.makeOverridable self.buildNodePackage { @@ -16400,7 +18170,7 @@ self.by-version."underscore.string"."2.3.3" self.by-version."lodash"."1.3.1" self.by-version."mkdirp"."0.3.5" - self.by-version."glob"."3.2.8" + self.by-version."glob"."3.2.9" self.by-version."debug"."0.7.4" self.by-version."isbinaryfile"."0.1.9" self.by-version."dargs"."0.1.0" @@ -16437,7 +18207,7 @@ self.by-version."underscore.string"."2.3.3" self.by-version."lodash"."2.2.1" self.by-version."mkdirp"."0.3.5" - self.by-version."glob"."3.2.8" + self.by-version."glob"."3.2.9" self.by-version."debug"."0.7.4" self.by-version."isbinaryfile"."0.1.9" self.by-version."dargs"."0.1.0" @@ -16477,12 +18247,12 @@ self.by-version."underscore.string"."2.3.3" self.by-version."lodash"."2.4.1" self.by-version."mkdirp"."0.3.5" - self.by-version."glob"."3.2.8" + self.by-version."glob"."3.2.9" self.by-version."debug"."0.7.4" self.by-version."isbinaryfile"."2.0.1" self.by-version."dargs"."0.1.0" self.by-version."async"."0.2.10" - self.by-version."inquirer"."0.4.0" + self.by-version."inquirer"."0.4.1" self.by-version."iconv-lite"."0.2.11" self.by-version."shelljs"."0.2.6" self.by-version."findup-sync"."0.1.2" @@ -16567,7 +18337,7 @@ buildInputs = (self.nativeDeps."zip-stream" or []); deps = [ - self.by-version."readable-stream"."1.0.25" + self.by-version."readable-stream"."1.0.26" self.by-version."lodash.defaults"."2.4.1" ]; peerDependencies = [ @@ -16593,4 +18363,26 @@ ]; passthru.names = [ "zlib-browserify" ]; }; + by-spec."zlib-browserify"."^0.0.3" = + self.by-version."zlib-browserify"."0.0.3"; + by-version."zlib-browserify"."0.0.3" = lib.makeOverridable self.buildNodePackage { + name = "node-zlib-browserify-0.0.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/zlib-browserify/-/zlib-browserify-0.0.3.tgz"; + name = "zlib-browserify-0.0.3.tgz"; + sha1 = "240ccdbfd0203fa842b130deefb1414122c8cc50"; + }) + ]; + buildInputs = + (self.nativeDeps."zlib-browserify" or []); + deps = [ + self.by-version."tape"."0.2.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "zlib-browserify" ]; + }; + by-spec."zlib-browserify"."~0.0.3" = + self.by-version."zlib-browserify"."0.0.3"; } diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index c7660c7a0a2..6539fc3e6dd 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -73,6 +73,8 @@ , "generator-webapp" , "generator-angular" , "statsd" +, "statsd-librato-backend" +, "stackdriver-statsd-backend" , "ungit" , { "node-uptime": "https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7" } , { "guifi-earth": "https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " } diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 902d28c685f..c463fb9f83b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -304,6 +304,19 @@ let self = _self // overrides; _self = with self; { }; }; + autovivification = buildPerlPackage { + name = "autovivification-0.12"; + src = fetchurl { + url = mirror://cpan/authors/id/V/VP/VPIT/autovivification-0.12.tar.gz; + sha256 = "6ef8686766c63571389880e5d87a0ca1d46f7d127982e8ef38aca7568c44840c"; + }; + meta = { + homepage = http://search.cpan.org/dist/autovivification/; + description = "Lexically disable autovivification"; + license = "perl"; + }; + }; + BerkeleyDB = import ../development/perl-modules/BerkeleyDB { inherit buildPerlPackage fetchurl; inherit (pkgs) db; @@ -385,6 +398,56 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ModuleBuildWithXSpp ExtUtilsTypemapsDefault ]; }; + BusinessISBN = buildPerlPackage { + name = "Business-ISBN-2.07"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BD/BDFOY/Business-ISBN-2.07.tar.gz; + sha256 = "4c11279580872bf3cc7176bb75c25b165d4b59a2828fc43d9a355cec3d0a45ff"; + }; + propagatedBuildInputs = [ BusinessISBNData URI ]; + meta = { + description = "Parse and validate ISBNs"; + license = "perl"; + }; + }; + + BusinessISBNData = buildPerlPackage { + name = "Business-ISBN-Data-20120719.001"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BD/BDFOY/Business-ISBN-Data-20120719.001.tar.gz; + sha256 = "745f6bf8f7bd912c0a1865aa5f7e49343804de27783f544b2e2c714e14a704a3"; + }; + meta = { + description = "Data pack for Business::ISBN"; + license = "perl"; + }; + }; + + BusinessISMN = buildPerlPackage { + name = "Business-ISMN-1.11"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BD/BDFOY/Business-ISMN-1.11.tar.gz; + sha256 = "76d5240a5672c7a8b1ba9e9ea8238a5c8882139911acbb67b7059b5ee3da342d"; + }; + propagatedBuildInputs = [ TieCycle ]; + meta = { + description = "Work with International Standard Music Numbers"; + license = "perl"; + }; + }; + + BusinessISSN = buildPerlPackage { + name = "Business-ISSN-0.91"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BD/BDFOY/Business-ISSN-0.91.tar.gz; + sha256 = "f15b192c0f547bb2967811072b3d343b94bc5ea58d02704c19122f7ae0a9d6b5"; + }; + meta = { + description = "Work with International Standard Serial Numbers"; + license = "perl"; + }; + }; + CacheCache = buildPerlPackage rec { name = "Cache-Cache-1.06"; src = fetchurl { @@ -1935,6 +1998,17 @@ let self = _self // overrides; _self = with self; { }; }; + DateSimple = buildPerlPackage { + name = "Date-Simple-3.03"; + src = fetchurl { + url = mirror://cpan/authors/id/I/IZ/IZUT/Date-Simple-3.03.tar.gz; + sha256 = "29a1926314ce1681a312d6155c29590c771ddacf91b7485873ce449ef209dd04"; + }; + meta = { + license = "unknown"; + }; + }; + DateTime = buildPerlModule { name = "DateTime-1.07"; src = fetchurl { @@ -2996,6 +3070,40 @@ let self = _self // overrides; _self = with self; { }; }; + EncodeEUCJPASCII = buildPerlPackage { + name = "Encode-EUCJPASCII-0.03"; + src = fetchurl { + url = mirror://cpan/authors/id/N/NE/NEZUMI/Encode-EUCJPASCII-0.03.tar.gz; + sha256 = "f998d34d55fd9c82cf910786a0448d1edfa60bf68e2c2306724ca67c629de861"; + }; + meta = { + description = "EucJP-ascii - An eucJP-open mapping"; + license = "perl"; + }; + }; + + EncodeHanExtra = buildPerlPackage { + name = "Encode-HanExtra-0.23"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AU/AUDREYT/Encode-HanExtra-0.23.tar.gz; + sha256 = "1fd4b06cada70858003af153f94c863b3b95f2e3d03ba18d0451a81d51db443a"; + }; + meta = { + description = "Extra sets of Chinese encodings"; + license = "mit"; + }; + }; + + EncodeJIS2K = buildPerlPackage { + name = "Encode-JIS2K-0.02"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-JIS2K-0.02.tar.gz; + sha256 = "5d718add5857f37fc270f24360bc9d100b72e0e13a11ca3149fe4e4d7c7cc4bf"; + }; + meta = { + }; + }; + EncodeLocale = buildPerlPackage rec { name = "Encode-Locale-1.03"; src = fetchurl { @@ -5027,6 +5135,18 @@ let self = _self // overrides; _self = with self; { }; }; + MIMECharset = buildPerlPackage { + name = "MIME-Charset-1.011.1"; + src = fetchurl { + url = mirror://cpan/authors/id/N/NE/NEZUMI/MIME-Charset-1.011.1.tar.gz; + sha256 = "2955a3b617fe12654efc2a13ae1dc7d32aad81d35cfae21f74337213cf2435d5"; + }; + meta = { + description = "Charset Information for MIME"; + license = "perl"; + }; + }; + mimeConstruct = buildPerlPackage rec { name = "mime-construct-1.11"; src = fetchurl { @@ -5138,6 +5258,19 @@ let self = _self // overrides; _self = with self; { }; }; + ModuleInfo = buildPerlPackage rec { + name = "Module-Info-0.35"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MB/MBARBON/Module-Info-0.35.tar.gz"; + sha256 = "0r7vxg1iy3lam0jgb2sk8ghgpmp3x5fskvzqlgkb09bssq83s1xb"; + }; + buildInputs = [ TestPod TestPodCoverage ]; + meta = { + description = "Information about Perl modules"; + license = "perl"; + }; + }; + ModuleInstall = buildPerlPackage { name = "Module-Install-1.06"; src = fetchurl { @@ -5901,6 +6034,18 @@ let self = _self // overrides; _self = with self; { doCheck = false; # check can't find its own Mouse::Tiny module }; + MozillaCA = buildPerlPackage { + name = "Mozilla-CA-20130114"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AB/ABH/Mozilla-CA-20130114.tar.gz; + sha256 = "82342614add1dbca8a00daa1ee55af3e0036245aed7d445537918c045008ccd7"; + }; + meta = { + description = "Mozilla's CA cert bundle in PEM format"; + license = "unknown"; + }; + }; + MROCompat = buildPerlPackage { name = "MRO-Compat-0.12"; src = fetchurl { @@ -8885,6 +9030,18 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DevelStackTrace Moose ]; }; + TieCycle = buildPerlPackage { + name = "Tie-Cycle-1.19"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BD/BDFOY/Tie-Cycle-1.19.tar.gz; + sha256 = "bd315874c85feaf8948eeb2f40fe2768a6ca00f089e35b32bfe88f3f384f9ca1"; + }; + meta = { + description = "Cycle through a list of values via a scalar"; + license = "perl"; + }; + }; + TieIxHash = buildPerlPackage { name = "Tie-IxHash-1.22"; src = fetchurl { @@ -9037,6 +9194,18 @@ let self = _self // overrides; _self = with self; { }; }; + UnicodeCollate = buildPerlPackage { + name = "Unicode-Collate-1.04"; + src = fetchurl { + url = mirror://cpan/authors/id/S/SA/SADAHIRO/Unicode-Collate-1.04.tar.gz; + sha256 = "4e3a2300b961d3aaf3789cdbfb95601edaaffb4109ed6cdb912a664d5c7bd706"; + }; + meta = { + description = "Unicode Collation Algorithm"; + license = "perl"; + }; + }; + UnicodeICUCollator = buildPerlPackage { name = "Unicode-ICU-Collator-0.002"; src = fetchurl { @@ -9052,6 +9221,19 @@ let self = _self // overrides; _self = with self; { buildInputs = [ pkgs.icu ]; }; + UnicodeLineBreak = buildPerlPackage { + name = "Unicode-LineBreak-2013.11"; + src = fetchurl { + url = mirror://cpan/authors/id/N/NE/NEZUMI/Unicode-LineBreak-2013.11.tar.gz; + sha256 = "8946b883ae687ff652e93d6185e23a936c7f337f2e115851fdfed72e1f73c7f9"; + }; + propagatedBuildInputs = [ MIMECharset ]; + meta = { + description = "UAX #14 Unicode Line Breaking Algorithm"; + license = "perl"; + }; + }; + UnixGetrusage = buildPerlPackage { name = "Unix-Getrusage-0.03"; src = fetchurl { @@ -9264,6 +9446,19 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ XMLSAX ]; }; + XMLLibXMLSimple = buildPerlPackage { + name = "XML-LibXML-Simple-0.93"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MA/MARKOV/XML-LibXML-Simple-0.93.tar.gz; + sha256 = "f2eb1c1523d6414cf2a646a289b0325b489954382c862928d165a03a7cce767c"; + }; + propagatedBuildInputs = [ FileSlurp XMLLibXML ]; + meta = { + description = "XML::LibXML based XML::Simple clone"; + license = "perl"; + }; + }; + XMLLibXSLT = buildPerlPackage rec { name = "XML-LibXSLT-1.87"; src = fetchurl { diff --git a/pkgs/top-level/python-packages-generated.nix b/pkgs/top-level/python-packages-generated.nix index e7308e2b816..29a9bc91a1e 100644 --- a/pkgs/top-level/python-packages-generated.nix +++ b/pkgs/top-level/python-packages-generated.nix @@ -5349,5 +5349,26 @@ in }; + "xlrd" = self."xlrd-0.9.2"; + + "xlrd-0.9.2" = self.buildPythonPackage { + name = "xlrd-0.9.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/x/xlrd/xlrd-0.9.2.tar.gz"; + md5 = "91a81ee76233e9f3115acaaa1b251b0e"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; + meta = { + description = '' + Library for developers to extract data from Microsoft Excel (tm) spreadsheet files + ''; + homepage = "http://www.python-excel.org/"; + license = "BSD"; + }; + }; + } diff --git a/pkgs/top-level/python-packages.json b/pkgs/top-level/python-packages.json index aefd911a558..b5b7afab85b 100644 --- a/pkgs/top-level/python-packages.json +++ b/pkgs/top-level/python-packages.json @@ -134,6 +134,8 @@ { "name": "psycopg2", "buildInputs": [ "pkgs.postgresql" ], "doCheck": false + }, + { "name": "xlrd", + "doCheck": false } - ] diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2958120f907..2c7123a98d4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20,24 +20,20 @@ pythonPackages = modules // import ./python-packages-generated.nix { callPackage = pkgs.lib.callPackageWith (pkgs // pythonPackages); - buildPythonPackage = import ../development/python-modules/generic { - inherit (pkgs) lib; - inherit python wrapPython setuptools recursivePthLoader offlineDistutils; - }; + # global distutils config used by buildPythonPackage + distutils-cfg = callPackage ../development/python-modules/distutils-cfg { }; + + buildPythonPackage = callPackage ../development/python-modules/generic { }; wrapPython = pkgs.makeSetupHook { deps = pkgs.makeWrapper; substitutions.libPrefix = python.libPrefix; + substitutions.executable = "${python}/bin/${python.executable}"; } ../development/python-modules/generic/wrap.sh; # specials - offlineDistutils = import ../development/python-modules/offline-distutils { - inherit (pkgs) stdenv; - inherit python; - }; - recursivePthLoader = import ../development/python-modules/recursive-pth-loader { inherit (pkgs) stdenv; inherit python; @@ -45,12 +41,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { setuptools = import ../development/python-modules/setuptools { inherit (pkgs) stdenv fetchurl; - inherit python wrapPython; - }; - - setuptoolsSite = import ../development/python-modules/setuptools/site.nix { - inherit (pkgs) stdenv; - inherit python setuptools; + inherit python wrapPython distutils-cfg; }; # packages defined elsewhere @@ -297,10 +288,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { ]; postInstall = '' - ln -s ${pyramid}/bin/pserve $out/bin ln -s ${pkgs.bacula}/bin/bconsole $out/bin - wrapProgram "$out/bin/pserve" \ - --suffix PYTHONPATH : "$out/lib/python2.7/site-packages" ''; meta = { @@ -554,7 +542,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; # tests depend on $HOME setting - configurePhase = "export HOME=$TMPDIR"; + preConfigure = "export HOME=$TMPDIR"; propagatedBuildInputs = [ pythonPackages.pyyaml @@ -1135,6 +1123,24 @@ pythonPackages = modules // import ./python-packages-generated.nix { propagatedBuildInputs = [ pythonPackages.coverage ]; }; + cython = buildPythonPackage rec { + name = "Cython-0.20.1"; + + src = fetchurl { + url = "http://www.cython.org/release/${name}.tar.gz"; + sha256 = "0v3nc9z5ynnnjdgcgkyy5g9wazmkjv53nnpjal1v3mr199s6799i"; + }; + + setupPyBuildFlags = ["--build-base=$out"]; + + buildInputs = [ pkgs.pkgconfig ]; + + meta = { + description = "An interpreter to help writing C extensions for Python 2"; + platforms = stdenv.lib.platforms.all; + }; + }; + cryptacular = buildPythonPackage rec { name = "cryptacular-1.4.1"; @@ -1241,21 +1247,32 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; pytest = buildPythonPackage rec { - name = "pytest-2.3.5"; + name = "pytest-2.5.1"; src = fetchurl { url = "http://pypi.python.org/packages/source/p/pytest/${name}.tar.gz"; - md5 = "18f150e7be96b5fe3c388b0e817b8087"; + md5 = "4e155a0134e6757b37cc6698c20f3e9f"; }; - propagatedBuildInputs = [ pythonPackages.py ] + preCheck = '' + # broken on python3, fixed in master, remove in next release + rm doc/en/plugins_index/test_plugins_index.py + + # don't test bash builtins + rm testing/test_argcomplete.py + + # yaml test are failing + rm doc/en/example/nonpython/test_simple.yml + ''; + + propagatedBuildInputs = [ py ] ++ stdenv.lib.optional pkgs.config.pythonPackages.pytest.selenium or false pythonPackages.selenium; meta = with stdenv.lib; { maintainers = with maintainers; [ iElectric lovek323 ]; - platforms = platforms.unix; + platforms = platforms.unix; }; }; @@ -1596,7 +1613,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { buildInputs = [ fudge nose ]; }; - fedora_cert = buildPythonPackage (rec { + fedora_cert = stdenv.mkDerivation (rec { name = "fedora-cert-0.5.9.2"; meta.maintainers = [ stdenv.lib.maintainers.mornfall ]; @@ -1604,10 +1621,12 @@ pythonPackages = modules // import ./python-packages-generated.nix { url = "https://fedorahosted.org/releases/f/e/fedora-packager/fedora-packager-0.5.9.2.tar.bz2"; sha256 = "105swvzshgn3g6bjwk67xd8pslnhpxwa63mdsw6cl4c7cjp2blx9"; }; - installCommand = "make install"; - propagatedBuildInputs = [ python_fedora ]; + + propagatedBuildInputs = [ python python_fedora wrapPython ]; postInstall = "mv $out/bin/fedpkg $out/bin/fedora-cert-fedpkg"; doCheck = false; + + postFixup = "wrapPythonPrograms"; }); fedpkg = buildPythonPackage (rec { @@ -1697,14 +1716,23 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; gtimelog = buildPythonPackage rec { - name = "gtimelog-0.8.1"; + name = "gtimelog-${version}"; + version = "0.8.1"; + src = fetchurl { - url = https://launchpad.net/gtimelog/devel/0.8.1/+download/gtimelog-0.8.1.tar.gz; - sha256 = "010sbw4rmslf5ifg9bgicn0f6mgsy76v8218xi0jndi9z6pva7y6"; + url = "https://github.com/gtimelog/gtimelog/archive/${version}.tar.gz"; + sha256 = "0nwpfv284b26q97mfpagqkqb4n2ilw46cx777qsyi3plnywk1xa0"; }; + propagatedBuildInputs = [ pygtk ]; + + checkPhase = '' + patchShebangs ./runtests + ./runtests + ''; + meta = with stdenv.lib; { - description = "A small Gtk+ app for keeping track of your time. It's main goal is to be as unintrusive as possible."; + description = "A small Gtk+ app for keeping track of your time. It's main goal is to be as unintrusive as possible"; homepage = http://mg.pov.lt/gtimelog/; license = licenses.gpl2Plus; maintainers = [ maintainers.ocharles ]; @@ -1712,6 +1740,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; }; + # TODO: this shouldn't use a buildPythonPackage koji = buildPythonPackage (rec { name = "koji-1.8"; meta.maintainers = [ stdenv.lib.maintainers.mornfall ]; @@ -1721,19 +1750,20 @@ pythonPackages = modules // import ./python-packages-generated.nix { sha256 = "10dph209h4jgajb5jmbjhqy4z4hd22i7s2d93vm3ikdf01i8iwf1"; }; + configurePhase = ":"; buildPhase = ":"; - installCommand = "make install DESTDIR=$out/ && cp -R $out/nix/store/*/* $out/ && rm -rf $out/nix"; + installPhase = "make install DESTDIR=$out/ && cp -R $out/nix/store/*/* $out/ && rm -rf $out/nix"; doCheck = false; propagatedBuildInputs = [ pythonPackages.pycurl ]; }); logilab_astng = buildPythonPackage rec { - name = "logilab-astng-0.24.1"; + name = "logilab-astng-0.24.3"; src = fetchurl { url = "http://download.logilab.org/pub/astng/${name}.tar.gz"; - sha256 = "00qxaxsax80sknwv25xl1r49lc4gbhkxs1kjywji4ad8y1npax0s"; + sha256 = "0np4wpxyha7013vkkrdy54dvnil67gzi871lg60z8lap0l5h67wn"; }; propagatedBuildInputs = [ logilab_common ]; @@ -1741,12 +1771,12 @@ pythonPackages = modules // import ./python-packages-generated.nix { paver = buildPythonPackage rec { - version = "1.2.1"; + version = "1.2.2"; name = "Paver-${version}"; src = fetchurl { url = "https://pypi.python.org/packages/source/P/Paver/Paver-${version}.tar.gz"; - sha256 = "1b1023jks1gi1rwphdy3y2zx7dh4bvwk2050kclp95j7xym1ya0y"; + sha256 = "0lix9d33ndb3yk56sm1zlj80fbmxp0w60yk0d9pr2xqxiwi88sqy"; }; buildInputs = [ cogapp mock virtualenv ]; @@ -1782,6 +1812,23 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; }; + pew = buildPythonPackage rec { + name = "pew-0.1.9"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/pew/${name}.tar.gz"; + md5 = "90a82400074b50a9e73c3045ed9ac217"; + }; + + propagatedBuildInputs = [ virtualenv virtualenv-clone ]; + + meta = with stdenv.lib; { + description = "Tools to manage multiple virtualenvs written in pure python, a virtualenvwrapper rewrite"; + license = licenses.mit; + platforms = platforms.all; + }; + }; + pudb = buildPythonPackage rec { name = "pudb-2013.3.6"; @@ -2195,6 +2242,10 @@ pythonPackages = modules // import ./python-packages-generated.nix { sha256 = "0d2if633m3kbiricd5hgn1csccd8xab6lnab1bq9prdr9ks9i8h6"; }; + preConfigure = '' + sed -i "/use_setuptools/d" setup.py + ''; + buildInputs = [ pkgs.alsaLib pkgs.jackaudio ]; meta = with stdenv.lib; { @@ -2476,17 +2527,14 @@ pythonPackages = modules // import ./python-packages-generated.nix { dulwich = buildPythonPackage rec { - name = "dulwich-0.8.1"; + name = "dulwich-0.8.7"; src = fetchurl { url = "http://samba.org/~jelmer/dulwich/${name}.tar.gz"; - sha256 = "1a1619e9c7e63fe9bdc93356ee893be1016b7ea12ad953f4e1f1f5c0c5056ee8"; + sha256 = "041qp5v2x8fbwkmws6hwwiny74lavkz723dj8gwbm40b2383d8vv"; }; buildPhase = "make build"; - installCommand = '' - ${python}/bin/${python.executable} setup.py install --prefix="$out" --root=/ --record="$out/lib/${python.libPrefix}/site-packages/dulwich/list.txt" --single-version-externally-managed - ''; # For some reason "python setup.py test" doesn't work with Python 2.6. # pretty sure that is about import behaviour. @@ -3429,11 +3477,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; logilab_common = buildPythonPackage rec { - name = "logilab-common-0.58.2"; + name = "logilab-common-0.61.0"; src = fetchurl { url = "http://download.logilab.org/pub/common/${name}.tar.gz"; - sha256 = "0qfdyj2is0scpnkgpnqm12lh4yl27617l0irlilhk25cpgbbfbf9"; + sha256 = "09apsrcvjliawbxmfrmi1l8hlbaj87mb7n4lrlivy5maxs6yg4hd"; }; propagatedBuildInputs = [ unittest2 ]; @@ -3448,9 +3496,6 @@ pythonPackages = modules // import ./python-packages-generated.nix { buildInputs = [ pkgs.libxml2 pkgs.libxslt ]; propagatedBuildInputs = [ ]; doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; meta = { description = "Pythonic binding for the libxml2 and libxslt libraries"; @@ -3502,21 +3547,15 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; }; - magic = pkgs.stdenv.mkDerivation rec { - name = "python-${pkgs.file.name}"; + magic = buildPythonPackage rec { + name = "${pkgs.file.name}"; src = pkgs.file.src; patches = [ ../tools/misc/file/python.patch ]; buildInputs = [ python pkgs.file ]; - configurePhase = "cd python"; - - buildPhase = "${python}/bin/${python.executable} setup.py build"; - - installPhase = '' - ${python}/bin/${python.executable} setup.py install --prefix=$out - ''; + preConfigure = "cd python"; meta = { description = "A Python wrapper around libmagic"; @@ -3536,7 +3575,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { buildInputs = [ pkgs.swig pkgs.openssl ]; - buildPhase = "${python}/bin/${python.executable} setup.py build_ext --openssl=${pkgs.openssl}"; + preBuild = "${python}/bin/${python.executable} setup.py build_ext --openssl=${pkgs.openssl}"; doCheck = false; # another test that depends on the network. @@ -3823,13 +3862,19 @@ pythonPackages = modules // import ./python-packages-generated.nix { mrbob = buildPythonPackage rec { name = "mrbob-${version}"; - version = "0.1a9"; + version = "0.1.1"; src = fetchurl { url = "http://pypi.python.org/packages/source/m/mr.bob/mr.bob-${version}.zip"; - md5 = "2d27d9bd1fc6269a3ecfd1a1ae47cd8a"; + md5 = "84a117c9a75b86842b0fa5f5c9c767f3"; }; + # some files in tests dir include unicode names + preBuild = '' + export LOCALE_ARCHIVE=${pkgs.glibcLocales}/lib/locale/locale-archive + export LC_ALL="en_US.UTF-8" + ''; + buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ argparse jinja2 six modules.readline ] ++ @@ -4210,19 +4255,14 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; }); - notmuch = pkgs.stdenv.mkDerivation rec { + notmuch = buildPythonPackage rec { name = "python-${pkgs.notmuch.name}"; src = pkgs.notmuch.src; + sourceRoot = "${pkgs.notmuch.name}/bindings/python"; + buildInputs = [ python pkgs.notmuch ]; - #propagatedBuildInputs = [ python pkgs.notmuch ]; - - configurePhase = "cd bindings/python"; - - buildPhase = "python setup.py build"; - - installPhase = "python setup.py install --prefix=$out"; meta = { description = "A Python wrapper around notmuch"; @@ -4241,15 +4281,15 @@ pythonPackages = modules // import ./python-packages-generated.nix { preConfigure = '' sed -i 's/-faltivec//' numpy/distutils/system_info.py + sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py ''; - # TODO: add ATLAS=${pkgs.atlas} - installCommand = '' + preBuild = '' export BLAS=${pkgs.blas} LAPACK=${pkgs.liblapack} - ${python}/bin/${python.executable} setup.py build --fcompiler="gnu95" - ${python}/bin/${python.executable} setup.py install --prefix=$out ''; + setupPyBuildFlags = ["--fcompiler='gnu95'"]; + # error: invalid command 'test' doCheck = false; @@ -4528,6 +4568,22 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; }; + paypalrestsdk = buildPythonPackage rec { + name = "paypalrestsdk-0.7.0"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/paypalrestsdk/${name}.tar.gz"; + sha256 = "117kfipzfahf9ysv414bh1mmm5cc9ck5zb6rhpslx1f8gk3frvd6"; + }; + + propagatedBuildInputs = [ httplib2 ]; + + meta = { + homepage = https://developer.paypal.com/; + description = "Python APIs to create, process and manage payment"; + license = "PayPal SDK License"; + }; + }; pep8 = buildPythonPackage rec { name = "pep8-${version}"; @@ -4618,16 +4674,13 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; pip = buildPythonPackage rec { - version = "1.4.1"; + version = "1.5"; name = "pip-${version}"; src = fetchurl { url = "http://pypi.python.org/packages/source/p/pip/pip-${version}.tar.gz"; - sha256 = "0knhj3c1nqqzxgqin8l0gzy6nzsbcxinyr0cbp1j99hi8xahcyjf"; + sha256 = "0j700f70mj0brdlvs2cz4a7h4jwmzgymgp8qk1qb3lsm1qd1vy15"; }; - buildInputs = [ mock scripttest virtualenv nose ]; - # ValueError: Working directory tests not found, or not a directory - # see https://github.com/pypa/pip/issues/92 - doCheck = false; + buildInputs = [ mock scripttest virtualenv pytest ]; }; @@ -4644,17 +4697,17 @@ pythonPackages = modules // import ./python-packages-generated.nix { pillow = buildPythonPackage rec { - name = "Pillow-2.2.1"; + name = "Pillow-2.3.0"; src = fetchurl { url = "http://pypi.python.org/packages/source/P/Pillow/${name}.zip"; - md5 = "d1d20d3db5d1ab312da0951ff061e6bf"; + md5 = "56b6614499aacb7d6b5983c4914daea7"; }; buildInputs = [ pkgs.freetype pkgs.libjpeg pkgs.unzip pkgs.zlib pkgs.libtiff pkgs.libwebp ]; # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp. - configurePhase = '' + preConfigure = '' sed -i "setup.py" \ -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = _lib_include("${pkgs.freetype}")|g ; s|^JPEG_ROOT =.*$|JPEG_ROOT = _lib_include("${pkgs.libjpeg}")|g ; @@ -4663,7 +4716,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { s|^TIFF_ROOT =.*$|TIFF_ROOT = _lib_include("${pkgs.libtiff}")|g ;' ''; - doCheck = true; + meta = { homepage = http://python-imaging.github.com/Pillow; @@ -4774,10 +4827,6 @@ pythonPackages = modules // import ./python-packages-generated.nix { protobuf = buildPythonPackage rec { inherit (pkgs.protobuf) name src; - buildPhase = '' - python setup.py build - ''; - propagatedBuildInputs = [pkgs.protobuf]; sourceRoot = "${name}/python"; @@ -4807,14 +4856,14 @@ pythonPackages = modules // import ./python-packages-generated.nix { psycopg2 = buildPythonPackage rec { - name = "psycopg2-2.5.1"; + name = "psycopg2-2.5.2"; # error: invalid command 'test' doCheck = false; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/psycopg2/psycopg2-2.5.1.tar.gz"; - sha256 = "1v7glzzzykbaqj7dhpr0qds9cf4maxmn7f5aazpqnbg0ly40r9v5"; + url = "https://pypi.python.org/packages/source/p/psycopg2/${name}.tar.gz"; + sha256 = "0bmxlmi9k995n6pz16awjaap0y02y1v2d31jbxhkqv510f3jsf2h"; }; propagatedBuildInputs = [ pkgs.postgresql ]; @@ -4844,11 +4893,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { py = buildPythonPackage rec { - name = "py-1.4.19"; + name = "py-1.4.20"; src = fetchurl { url = "https://pypi.python.org/packages/source/p/py/${name}.tar.gz"; - md5 = "3857dc8309d5f284669b81184253c2bb"; + md5 = "5f1708be5482f3ff6711dfd6cafd45e0"; }; }; @@ -4924,14 +4973,14 @@ pythonPackages = modules // import ./python-packages-generated.nix { Babel = buildPythonPackage (rec { - name = "Babel-0.9.6"; + name = "Babel-1.3"; src = fetchurl { url = "http://pypi.python.org/packages/source/B/Babel/${name}.tar.gz"; - sha256 = "4a3a085ecf1fcd2736573538ffa114f1f4331b3bbbdd69381e6e172c49c9750f"; + sha256 = "0bnin777lc53nxd1hp3apq410jj5wx92n08h7h4izpl4f4sx00lz"; }; - buildInputs = [ pytz ]; + propagatedBuildInputs = [ pytz ]; meta = { homepage = http://babel.edgewall.org; @@ -5199,6 +5248,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { propagatedBuildInputs = [ urlgrabber ]; checkPhase = '' + export PYTHONPATH="$PYTHONPATH:." ${python}/bin/${python.executable} tests/baseclass.py -vv ''; @@ -5277,7 +5327,8 @@ pythonPackages = modules // import ./python-packages-generated.nix { propagatedBuildInputs = [ pkgs.parted ]; checkPhase = '' - ${python}/bin/${python.executable} -m unittest discover -v + patchShebangs Makefile + make test PYTHON=${python.executable} ''; meta = { @@ -5319,14 +5370,14 @@ pythonPackages = modules // import ./python-packages-generated.nix { }); python_fedora = buildPythonPackage (rec { - name = "python-fedora-0.3.32.3"; + name = "python-fedora-0.3.33"; meta.maintainers = [ stdenv.lib.maintainers.mornfall ]; src = fetchurl { - url = "https://fedorahosted.org/releases/p/y/python-fedora/python-fedora-0.3.32.3.tar.gz"; - sha256 = "0qwmbid4pkdj6z9gwa43fzs97fr6ci2h2vj1hyk0gp0vqim4kv4l"; + url = "https://fedorahosted.org/releases/p/y/python-fedora/${name}.tar.gz"; + sha256 = "1g05bh7d5d0gzrlnhpnca7jpqbgs2rgnlzzbvzzxmdbmlkqi3mws"; }; - propagatedBuildInputs = [ kitchen requests bunch ]; + propagatedBuildInputs = [ kitchen requests bunch paver ]; doCheck = false; }); @@ -5631,7 +5682,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { # There seems to be no way to pass that path to configure. NIX_CFLAGS_COMPILE="-I${pkgs.aprutil}/include/apr-1"; - configurePhase = '' + preConfigure = '' cd Source python setup.py backport python setup.py configure \ @@ -5663,11 +5714,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { pytz = buildPythonPackage rec { - name = "pytz-2012c"; + name = "pytz-2013.9"; src = fetchurl { url = "http://pypi.python.org/packages/source/p/pytz/${name}.tar.bz2"; - md5 = "660e0cee7f6c419ca2665db460f65131"; + md5 = "ec7076947a46a8a3cb33cbf2983a562c"; }; meta = { @@ -5753,11 +5804,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { pyyaml = buildPythonPackage (rec { - name = "PyYAML-3.09"; + name = "PyYAML-3.10"; src = fetchurl { - url = "http://pyyaml.org/download/pyyaml/PyYAML-3.09.zip"; - sha256 = "204aca8b42dbe90e460794d743dd16182011da85507bfd4f092f9f76e0688040"; + url = "http://pyyaml.org/download/pyyaml/${name}.zip"; + sha256 = "1r127fa354ppb667f4acxlzwxixap1jgzjrr790bw8mcpxv2hqaa"; }; buildInputs = [ pkgs.unzip pkgs.pyrex ]; @@ -5821,6 +5872,21 @@ pythonPackages = modules // import ./python-packages-generated.nix { homepage = http://docs.python-requests.org/en/latest/; }; }; + + + requests2 = buildPythonPackage rec { + name = "requests-2.2.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/r/requests/${name}.tar.gz"; + md5 = "ac27081135f58d1a43e4fb38258d6f4e"; + }; + + meta = { + description = "Requests is an Apache2 Licensed HTTP library, written in Python, for human beings.."; + homepage = http://docs.python-requests.org/en/latest/; + }; + }; requests_oauthlib = buildPythonPackage rec { @@ -6182,16 +6248,17 @@ pythonPackages = modules // import ./python-packages-generated.nix { buildInputs = [pkgs.gfortran]; propagatedBuildInputs = [ numpy ]; + # TODO: add ATLAS=${pkgs.atlas} + preConfigure = '' + export BLAS=${pkgs.blas} LAPACK=${pkgs.liblapack} + sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py + ''; + + setupPyBuildFlags = [ "--fcompiler='gnu95'" ]; + # error: invalid command 'test' doCheck = false; - # TODO: add ATLAS=${pkgs.atlas} - installCommand = '' - export BLAS=${pkgs.blas} LAPACK=${pkgs.liblapack} - ${python}/bin/${python.executable} setup.py build --fcompiler="gnu95" - ${python}/bin/${python.executable} setup.py install --prefix=$out - ''; - meta = { description = "SciPy (pronounced 'Sigh Pie') is open-source software for mathematics, science, and engineering. "; homepage = http://www.scipy.org/; @@ -6200,15 +6267,15 @@ pythonPackages = modules // import ./python-packages-generated.nix { scripttest = buildPythonPackage rec { - version = "1.1.1"; + version = "1.3"; name = "scripttest-${version}"; src = fetchurl { - url = "http://pypi.python.org/packages/source/S/ScriptTest/ScriptTest-${version}.tar.gz"; - md5 = "592ce890764c3f546d35b4d7c40c32ef"; + url = "http://pypi.python.org/packages/source/s/scripttest/scripttest-${version}.tar.gz"; + md5 = "1d1c5117ccfc7b5961cae6c1020c0848"; }; - buildInputs = [ nose ]; + buildInputs = [ nose pytest ]; meta = { description = "A library for testing interactive command-line applications"; @@ -6322,7 +6389,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { md5 = "93c93725674c0702583a638f5a09c9e4"; }; - propagatedBuildInputs = [ jinja2 markdown pillow pilkit clint argh ]; + propagatedBuildInputs = [ jinja2 markdown pillow pilkit clint argh pytest ]; meta = with stdenv.lib; { description = "Yet another simple static gallery generator"; @@ -6573,6 +6640,23 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; }; + sorl_thumbnail = buildPythonPackage rec { + name = "sorl-thumbnail-11.12"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/s/sorl-thumbnail/${name}.tar.gz"; + sha256 = "050b9kzbx7jvs3qwfxxshhis090hk128maasy8pi5wss6nx5kyw4"; + }; + + # Disabled due to an improper configuration error when tested against django. This looks like something broken in the test cases for sorl. + doCheck = false; + + meta = { + homepage = http://sorl-thumbnail.readthedocs.org/en/latest/; + description = "Thumbnails for Django"; + license = stdenv.lib.licenses.bsd3; + }; + }; supervisor = buildPythonPackage rec { name = "supervisor-3.0"; @@ -6583,7 +6667,10 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; buildInputs = [ mock ]; - propagatedBuildInputs = [ meld3 ]; + propagatedBuildInputs = [ meld3 ]; + + # failing tests when building under chroot as root user doesn't exist + doCheck = false; meta = { description = "A system for controlling process state under UNIX"; @@ -6723,10 +6810,16 @@ pythonPackages = modules // import ./python-packages-generated.nix { md5 = "051dd9de0757714d33c3ecd5ab37b97d"; }; - buildInputs = [ pytest webob pkgs.imagemagick ]; + buildInputs = [ pytest webob pkgs.imagemagick nose ]; propagatedBuildInputs = [ sqlalchemy8 wand ]; - checkPhase = "cd tests && LD_LIBRARY_PATH=${pkgs.imagemagick}/lib py.test"; + checkPhase = '' + cd tests + export LD_LIBRARY_PATH=${pkgs.imagemagick}/lib + export PYTHONPATH=$PYTHONPATH:../ + py.test + cd .. + ''; meta = { homepage = https://github.com/crosspop/sqlalchemy-imageattach; @@ -6980,16 +7073,18 @@ pythonPackages = modules // import ./python-packages-generated.nix { # TODO - # py.error.EACCES: [Permission denied]: mkdir('/homeless-shelter',) - # builder for `/nix/store/0czwg0n3pfkmpjphqv1jxfjlgkbziwsx-python-tox-1.4.3.drv' failed with exit code 1 - # tox = buildPythonPackage rec { - # name = "tox-1.4.3"; + # Installs correctly but fails tests that involve simple things like: + # cmd.run("tox", "-h") + # also, buildPythonPackage needs to supply the tox.ini correctly for projects that use tox for their tests # - # buildInputs = [ py virtualenv ]; + # tox = buildPythonPackage rec { + # name = "tox-1.7.0"; + # + # propagatedBuildInputs = [ py virtualenv ]; # # src = fetchurl { - # url = "https://pypi.python.org/packages/source/t/tox/tox-1.4.3.tar.gz"; - # md5 = "3727d5b0600d92edf2229a7ce6a0f752"; + # url = "https://pypi.python.org/packages/source/t/tox/${name}.tar.gz"; + # md5 = "5314ceca2b179ad4a9c79f4d817b8a99"; # }; # }; @@ -7054,6 +7149,9 @@ pythonPackages = modules // import ./python-packages-generated.nix { md5 = "2472204a2abd0d8cd4d11ff0fbf36ae7"; }; + # tests fail, see http://hydra.nixos.org/build/4316603/log/raw + doCheck = false; + propagatedBuildInputs = [ zope_interface zope_testing ]; meta = { description = "A tool which computes a dependency graph between active Python eggs"; @@ -7206,10 +7304,10 @@ pythonPackages = modules // import ./python-packages-generated.nix { }); virtualenv = buildPythonPackage rec { - name = "virtualenv-1.10"; + name = "virtualenv-1.11.4"; src = fetchurl { url = "http://pypi.python.org/packages/source/v/virtualenv/${name}.tar.gz"; - md5 = "9745c28256c70c76d36adb3767a00212"; + md5 = "9accc2d3f0ec1da479ce2c3d1fdff06e"; }; inherit recursivePthLoader; @@ -7231,6 +7329,27 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; }; + virtualenv-clone = buildPythonPackage rec { + name = "virtualenv-clone-0.2.4"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/v/virtualenv-clone/${name}.tar.gz"; + md5 = "71168b975eaaa91e65559bcc79290b3b"; + }; + + buildInputs = [pytest]; + propagatedBuildInputs = [virtualenv]; + + # needs tox to run the tests + doCheck = false; + + meta = with stdenv.lib; { + description = "Script to clone virtualenvs"; + license = licenses.mit; + platforms = platforms.all; + }; + }; + waitress = buildPythonPackage rec { name = "waitress-0.8.7"; @@ -7826,8 +7945,8 @@ pythonPackages = modules // import ./python-packages-generated.nix { propagatedBuildInputs = [ zope_proxy ]; # ignore circular dependency on zope_schema - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . + preBuild = '' + sed -i '/zope.schema/d' setup.py ''; doCheck = false; @@ -7880,12 +7999,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { md5 = "e7e581af8193551831560a736a53cf58"; }; - propagatedBuildInputs = [ zope_event zope_interface zope_testing ] ++ optional isPy26 ordereddict; - - # ignore circular dependency on zope_location - installCommand = '' - easy_install --no-deps --prefix="$out" . - ''; + propagatedBuildInputs = [ zope_location zope_event zope_interface zope_testing ] ++ optional isPy26 ordereddict; meta = { maintainers = [ stdenv.lib.maintainers.goibhniu ]; @@ -8528,6 +8642,77 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; }; + searx = buildPythonPackage rec { + name = "searx-${version}"; + version = "0.2.0"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/s/searx/${name}.tar.gz"; + sha256 = "19hxjg3vhq7fygcvfhsr3i40c8kbi7i76ym9cv2s03b3zijd38w0"; + }; + + propagatedBuildInputs = [ pyyaml lxml grequests flaskbabel flask requests gevent speaklater Babel pytz ]; + + meta = { + homepage = https://github.com/asciimoo/searx; + description = "A privacy-respecting, hackable metasearch engine."; + license = stdenv.lib.licenses.agpl3Plus; + maintainers = [ stdenv.lib.maintainers.matejc ]; + }; + }; + + grequests = buildPythonPackage rec { + name = "grequests-0.2.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/g/grequests/${name}.tar.gz"; + sha256 = "0lafzax5igbh8y4x0krizr573wjsxz7bhvwygiah6qwrzv83kv5c"; + }; + + buildInputs = [ requests gevent ]; + + meta = { + description = "GRequests allows you to use Requests with Gevent to make asyncronous HTTP Requests easily."; + homepage = https://github.com/kennethreitz/grequests; + license = "bsd"; + maintainers = [ stdenv.lib.maintainers.matejc ]; + }; + }; + + flaskbabel = buildPythonPackage rec { + name = "Flask-Babel-0.9"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/F/Flask-Babel/${name}.tar.gz"; + sha256 = "0k7vk4k54y55ma0nx2k5s0phfqbriwslhy5shh3b0d046q7ibzaa"; + }; + + buildInputs = [ flask jinja2 speaklater Babel pytz ]; + + meta = { + description = "Adds i18n/l10n support to Flask applications"; + homepage = https://github.com/mitsuhiko/flask-babel; + license = "bsd"; + maintainers = [ stdenv.lib.maintainers.matejc ]; + }; + }; + + speaklater = buildPythonPackage rec { + name = "speaklater-1.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/s/speaklater/${name}.tar.gz"; + sha256 = "1ab5dbfzzgz6cnz4xlwx79gz83id4bhiw67k1cgqrlzfs0va7zjr"; + }; + + meta = { + description = "implements a lazy string for python useful for use with gettext"; + homepage = https://github.com/mitsuhiko/speaklater; + license = "bsd"; + maintainers = [ stdenv.lib.maintainers.matejc ]; + }; + }; + # python2.7 specific eggs } // pkgs.lib.optionalAttrs (python.majorVersion == "2.7") { diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 84ae44ec449..cb22983e6c3 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -35,8 +35,10 @@ let # Ensure that X11/GTK+ are in order. jobs.thunderbird.x86_64-linux jobs.thunderbird.i686-linux + /* not ready yet jobs.glib-tested.x86_64-linux # standard glib doesn't do checks jobs.glib-tested.i686-linux + */ ]; };