diff --git a/doc/language-support.xml b/doc/language-support.xml index da709b34a94..1e1bdf75eda 100644 --- a/doc/language-support.xml +++ b/doc/language-support.xml @@ -245,14 +245,14 @@ are provided with all modules included. Name of the folder in ${python}/lib/ for corresponding interpreter. - + interpreter Alias for ${python}/bin/${executable}. - + buildEnv @@ -260,29 +260,29 @@ are provided with all modules included. See for usage and documentation. - + sitePackages Alias for lib/${libPrefix}/site-packages. - + executable Name of the interpreter executable, ie python3.4. - +
<varname>buildPythonPackage</varname> function - + The function is implemented in pkgs/development/python-modules/generic/default.nix. Example usage: - + twisted = buildPythonPackage { name = "twisted-8.1.0"; @@ -308,27 +308,27 @@ twisted = buildPythonPackage { python27Packages, python32Packages, python33Packages, python34Packages and pypyPackages. - + buildPythonPackage mainly does four things: - + In the configurePhase, it patches setup.py to always include setuptools before distutils for monkeypatching machinery to take place. - + - In the buildPhase, it calls + In the buildPhase, it calls ${python.interpreter} setup.py build ... - + - In the installPhase, it calls + In the installPhase, it calls ${python.interpreter} setup.py install ... - + In the postFixup phase, wrapPythonPrograms bash function is called to wrap all programs in $out/bin/* @@ -337,23 +337,23 @@ twisted = buildPythonPackage { - - By default doCheck = true is set and tests are run with + + By default doCheck = true is set and tests are run with ${python.interpreter} setup.py test command in checkPhase. - + propagatedBuildInputs packages are propagated to user environment. - + By default meta.platforms is set to the same value as the interpreter unless overriden otherwise. - + <varname>buildPythonPackage</varname> parameters (all parameters from <varname>mkDerivation</varname> function are still supported) - + namePrefix @@ -363,7 +363,7 @@ twisted = buildPythonPackage { if you're packaging an application or a command line tool. - + disabled @@ -373,21 +373,21 @@ twisted = buildPythonPackage { for examples. - + setupPyInstallFlags List of flags passed to setup.py install command. - + setupPyBuildFlags List of flags passed to setup.py build command. - + pythonPath @@ -396,21 +396,21 @@ twisted = buildPythonPackage { (contrary to propagatedBuildInputs). - + preShellHook Hook to execute commands before shellHook. - + postShellHook Hook to execute commands after shellHook. - + distutilsExtraCfg @@ -419,15 +419,29 @@ twisted = buildPythonPackage { configuration). - + + + makeWrapperArgs + + A list of strings. Arguments to be passed to + makeWrapper, which wraps generated binaries. By + default, the arguments to makeWrapper set + PATH and PYTHONPATH environment + variables before calling the binary. Additional arguments here can + allow a developer to set environment variables which will be + available when the binary is run. For example, + makeWrapperArgs = ["--set FOO BAR" "--set BAZ QUX"]. + + + - +
<function>python.buildEnv</function> function Create Python environments using low-level pkgs.buildEnv function. Example default.nix: - + {}; @@ -436,31 +450,31 @@ python.buildEnv.override { ignoreCollisions = true; }]]> - + Running nix-build will create /nix/store/cf1xhjwzmdki7fasgr4kz6di72ykicl5-python-2.7.8-env with wrapped binaries in bin/. - + <function>python.buildEnv</function> arguments - + extraLibs List of packages installed inside the environment. - + postBuild Shell command executed after the build of environment. - + ignoreCollisions @@ -504,13 +518,13 @@ exist in community to help save time. No tool is preferred at the moment. additional logic inside shellPhase to run ${python.interpreter} setup.py develop for the package. - + shellPhase is executed only if setup.py exists. - + Given a default.nix: - + {}; @@ -522,18 +536,18 @@ buildPythonPackage { src = ./.; }]]> - + Running nix-shell with no arguments should give you the environment in which the package would be build with nix-build. - + Shortcut to setup environments with C headers/libraries and python packages: - + $ nix-shell -p pythonPackages.pyramid zlib libjpeg git - + There is a boolean value lib.inNixShell set to true if nix-shell is invoked. @@ -562,12 +576,12 @@ buildPythonPackage { Known bug in setuptools install_data does not respect --prefix. Example of such package using the feature is pkgs/tools/X11/xpra/default.nix. As workaround install it as an extra preInstall step: - + ${python.interpreter} setup.py install_data --install-dir=$out --root=$out sed -i '/ = data_files/d' setup.py - + Rationale of non-existent global site-packages @@ -616,7 +630,7 @@ sed -i '/ = data_files/d' setup.py this into a nix expression that contains all Gem dependencies automatically. For example, to package sensu, we did: - + - Though, more complicated package should be placed in a seperate file in + Though, more complicated package should be placed in a seperate file in pkgs/development/lua-modules. diff --git a/lib/licenses.nix b/lib/licenses.nix index 08376b7e7e0..4ac155a9bed 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -403,6 +403,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "The Unlicense"; }; + vim = spdx { + spdxId = "Vim"; + fullName = "Vim License"; + }; + vsl10 = spdx { spdxId = "VSL-1.0"; fullName = "Vovida Software License v1.0"; diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 0d42ca79987..059bfaecbb4 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -8,6 +8,7 @@ abaldeau = "Andreas Baldeau "; abbradar = "Nikolay Amiantov "; aforemny = "Alexander Foremny "; + aflatter = "Alexander Flatter "; aherrmann = "Andreas Herrmann "; ak = "Alexander Kjeldaas "; akc = "Anders Claesson "; @@ -71,6 +72,7 @@ eikek = "Eike Kettner "; ellis = "Ellis Whitehead "; emery = "Emery Hemingway "; + ericbmerritt = "Eric Merritt "; ertes = "Ertugrul Söylemez "; exlevan = "Alexey Levan "; falsifian = "James Cook "; @@ -98,6 +100,7 @@ iand675 = "Ian Duncan "; ianwookim = "Ian-Woo Kim "; iElectric = "Domen Kozar "; + ikervagyok = "Balázs Lengyel "; iyzsong = "Song Wenwu "; j-keck = "Jürgen Keck "; jagajaga = "Arseniy Seroka "; @@ -111,6 +114,7 @@ joelteon = "Joel Taylor "; jpbernardy = "Jean-Philippe Bernardy "; jwiegley = "John Wiegley "; + jwilberding = "Jordan Wilberding "; jzellner = "Jeff Zellner "; kkallio = "Karn Kallio "; koral = "Koral "; @@ -134,6 +138,7 @@ meditans = "Carlo Nucera "; meisternu = "Matt Miemiec "; michelk = "Michel Kuhlmann "; + mirdhyn = "Merlin Gaillard "; mschristiansen = "Mikkel Christiansen "; modulistic = "Pablo Costa "; mornfall = "Petr Ročkai "; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 3b6305179f0..d7b8b34aefe 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -202,6 +202,7 @@ ./services/misc/mediatomb.nix ./services/misc/mesos-master.nix ./services/misc/mesos-slave.nix + ./services/misc/mwlib.nix ./services/misc/nix-daemon.nix ./services/misc/nix-gc.nix ./services/misc/nixos-manual.nix @@ -222,6 +223,7 @@ ./services/monitoring/bosun.nix ./services/monitoring/cadvisor.nix ./services/monitoring/collectd.nix + ./services/monitoring/das_watchdog.nix ./services/monitoring/dd-agent.nix ./services/monitoring/graphite.nix ./services/monitoring/monit.nix @@ -266,6 +268,7 @@ ./services/networking/dhcpd.nix ./services/networking/dnscrypt-proxy.nix ./services/networking/dnsmasq.nix + ./services/networking/docker-registry-server.nix ./services/networking/ejabberd.nix ./services/networking/firefox/sync-server.nix ./services/networking/firewall.nix @@ -306,6 +309,7 @@ ./services/networking/privoxy.nix ./services/networking/prosody.nix ./services/networking/quassel.nix + ./services/networking/racoon.nix ./services/networking/radicale.nix ./services/networking/radvd.nix ./services/networking/rdnssd.nix @@ -406,6 +410,7 @@ ./services/x11/xserver.nix ./system/activation/activation-script.nix ./system/activation/top-level.nix + ./system/boot/coredump.nix ./system/boot/emergency-mode.nix ./system/boot/kernel.nix ./system/boot/kexec.nix @@ -437,6 +442,7 @@ ./tasks/filesystems.nix ./tasks/filesystems/btrfs.nix ./tasks/filesystems/cifs.nix + ./tasks/filesystems/exfat.nix ./tasks/filesystems/ext.nix ./tasks/filesystems/f2fs.nix ./tasks/filesystems/jfs.nix diff --git a/nixos/modules/profiles/minimal.nix b/nixos/modules/profiles/minimal.nix index 69729923e03..3b18ae129b9 100644 --- a/nixos/modules/profiles/minimal.nix +++ b/nixos/modules/profiles/minimal.nix @@ -8,4 +8,5 @@ with lib; { environment.noXlibs = mkDefault true; i18n.supportedLocales = [ config.i18n.defaultLocale ]; + services.nixosManual.enable = mkDefault false; } diff --git a/nixos/modules/services/misc/mwlib.nix b/nixos/modules/services/misc/mwlib.nix new file mode 100644 index 00000000000..fb4a24253df --- /dev/null +++ b/nixos/modules/services/misc/mwlib.nix @@ -0,0 +1,258 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.mwlib; + pypkgs = pkgs.python27Packages; + + inherit (pypkgs) python mwlib; + + user = mkOption { + default = "nobody"; + type = types.str; + description = "User to run as."; + }; + +in +{ + + options.services.mwlib = { + + nserve = { + enable = mkOption { + default = false; + type = types.bool; + description = '' + Whether to enable nserve. Nserve is a HTTP + server. The Collection extension is talking to + that program directly. Nserve uses at least + one qserve instance in order to distribute + and manage jobs. + ''; + }; # nserve.enable + + port = mkOption { + default = 8899; + type = types.int; + description = "Specify port to listen on."; + }; # nserve.port + + address = mkOption { + default = "127.0.0.1"; + type = types.str; + description = "Specify network interface to listen on."; + }; # nserve.address + + qserve = mkOption { + default = [ "${cfg.qserve.address}:${toString cfg.qserve.port}" ]; + type = types.listOf types.str; + description = "Register qserve instance."; + }; # nserve.qserve + + inherit user; + }; # nserve + + qserve = { + enable = mkOption { + default = false; + type = types.bool; + description = '' + A job queue server used to distribute and manage + jobs. You should start one qserve instance + for each machine that is supposed to render pdf + files. Unless you’re operating the Wikipedia + installation, one machine should suffice. + ''; + }; # qserve.enable + + port = mkOption { + default = 14311; + type = types.int; + description = "Specify port to listen on."; + }; # qserve.port + + address = mkOption { + default = "127.0.0.1"; + type = types.str; + description = "Specify network interface to listen on."; + }; # qserve.address + + datadir = mkOption { + default = "/var/lib/mwlib-qserve"; + type = types.path; + description = "qserve data directory (FIXME: unused?)"; + }; # qserve.datadir + + allow = mkOption { + default = [ "127.0.0.1" ]; + type = types.listOf types.str; + description = "List of allowed client IPs. Empty means any."; + }; # qserve.allow + + inherit user; + }; # qserve + + nslave = { + enable = mkOption { + default = cfg.qserve.enable; + type = types.bool; + description = '' + Pulls new jobs from exactly one qserve instance + and calls the zip and render programs + in order to download article collections and + convert them to different output formats. Nslave + uses a cache directory to store the generated + documents. Nslave also starts an internal http + server serving the content of the cache directory. + ''; + }; # nslave.enable + + cachedir = mkOption { + default = "/var/cache/mwlib-nslave"; + type = types.path; + description = "Directory to store generated documents."; + }; # nslave.cachedir + + numprocs = mkOption { + default = 10; + type = types.int; + description = "Number of parallel jobs to be executed."; + }; # nslave.numprocs + + http = mkOption { + default = {}; + description = '' + Internal http server serving the content of the cache directory. + You have to enable it, or use your own way for serving files + and set the http.url option accordingly. + ''; + type = types.submodule ({ + options = { + enable = mkOption { + default = true; + type = types.bool; + description = "Enable internal http server."; + }; # nslave.http.enable + + port = mkOption { + default = 8898; + type = types.int; + description = "Port to listen to when serving files from cache."; + }; # nslave.http.port + + address = mkOption { + default = "127.0.0.1"; + type = types.str; + description = "Specify network interface to listen on."; + }; # nslave.http.address + + url = mkOption { + default = "http://localhost:${toString cfg.nslave.http.port}/cache"; + type = types.str; + description = '' + Specify URL for accessing generated files from cache. + The Collection extension of Mediawiki won't be able to + download files without it. + ''; + }; # nslave.http.url + }; + }); # types.submodule + }; # nslave.http + + inherit user; + }; # nslave + + }; # options.services + + config = { + + systemd.services.mwlib-nserve = mkIf cfg.nserve.enable + { + description = "mwlib network interface"; + + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" "mwlib-qserve.service" ]; + + serviceConfig = { + ExecStart = concatStringsSep " " ( + [ + "${mwlib}/bin/nserve" + "--port ${toString cfg.nserve.port}" + "--interface ${cfg.nserve.address}" + ] ++ cfg.nserve.qserve + ); + User = cfg.nserve.user; + }; + }; # systemd.services.mwlib-nserve + + systemd.services.mwlib-qserve = mkIf cfg.qserve.enable + { + description = "mwlib job queue server"; + + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" "local-fs.target" ]; + + preStart = '' + mkdir -pv '${cfg.qserve.datadir}' + chown -Rc ${cfg.qserve.user}:`id -ng ${cfg.qserve.user}` '${cfg.qserve.datadir}' + chmod -Rc u=rwX,go= '${cfg.qserve.datadir}' + ''; + + serviceConfig = { + ExecStart = concatStringsSep " " ( + [ + "${mwlib}/bin/mw-qserve" + "-p ${toString cfg.qserve.port}" + "-i ${cfg.qserve.address}" + "-d ${cfg.qserve.datadir}" + ] ++ map (a: "-a ${a}") cfg.qserve.allow + ); + User = cfg.qserve.user; + PermissionsStartOnly = true; + }; + }; # systemd.services.mwlib-qserve + + systemd.services.mwlib-nslave = mkIf cfg.nslave.enable + { + description = "mwlib worker"; + + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" "local-fs.target" ]; + + preStart = '' + mkdir -pv '${cfg.nslave.cachedir}' + chown -Rc ${cfg.nslave.user}:`id -ng ${cfg.nslave.user}` '${cfg.nslave.cachedir}' + chmod -Rc u=rwX,go= '${cfg.nslave.cachedir}' + ''; + + environment = { + PYTHONPATH = concatMapStringsSep ":" + (m: "${pypkgs.${m}}/lib/${python.libPrefix}/site-packages") + [ "mwlib-rl" "mwlib-ext" "pygments" ]; + }; + + serviceConfig = { + ExecStart = concatStringsSep " " ( + [ + "${mwlib}/bin/nslave" + "--cachedir ${cfg.nslave.cachedir}" + "--numprocs ${toString cfg.nslave.numprocs}" + "--url ${cfg.nslave.http.url}" + ] ++ ( + if cfg.nslave.http.enable then + [ + "--serve-files-port ${toString cfg.nslave.http.port}" + "--serve-files-address ${cfg.nslave.http.address}" + ] else + [ + "--no-serve-files" + ] + )); + User = cfg.nslave.user; + PermissionsStartOnly = true; + }; + }; # systemd.services.mwlib-nslave + + }; # config +} diff --git a/nixos/modules/services/monitoring/das_watchdog.nix b/nixos/modules/services/monitoring/das_watchdog.nix new file mode 100644 index 00000000000..785b4289dff --- /dev/null +++ b/nixos/modules/services/monitoring/das_watchdog.nix @@ -0,0 +1,34 @@ +# A general watchdog for the linux operating system that should run in the +# background at all times to ensure a realtime process won't hang the machine +{ config, lib, pkgs, ... }: + +with lib; + +let + + inherit (pkgs) das_watchdog; + +in { + ###### interface + + options = { + services.das_watchdog.enable = mkEnableOption "Whether to enable realtime watchdog"; + }; + + ###### implementation + + config = mkIf config.services.das_watchdog.enable { + environment.systemPackages = [ das_watchdog ]; + systemd.services.das_watchdog = { + description = "Watchdog to ensure a realtime process won't hang the machine"; + after = [ "multi-user.target" "sound.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + User = "root"; + Type = "oneshot"; + ExecStart = "${das_watchdog}/bin/das_watchdog"; + RemainAfterExit = true; + }; + }; + }; +} diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix index 92f6396b358..5802d8b95b3 100644 --- a/nixos/modules/services/networking/ddclient.nix +++ b/nixos/modules/services/networking/ddclient.nix @@ -126,6 +126,8 @@ in description = "Dynamic DNS Client"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; + + environment.SSL_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt"; serviceConfig = { # Uncomment this if too many problems occur: # Type = "forking"; diff --git a/nixos/modules/services/networking/docker-registry-server.nix b/nixos/modules/services/networking/docker-registry-server.nix new file mode 100644 index 00000000000..093d20ecb16 --- /dev/null +++ b/nixos/modules/services/networking/docker-registry-server.nix @@ -0,0 +1,98 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.nodeDockerRegistry; + +in { + options.services.nodeDockerRegistry = { + enable = mkEnableOption "Whether to enable docker registry service."; + + port = mkOption { + description = "Docker registry listening port."; + default = 8080; + type = types.int; + }; + + users = mkOption { + description = "Docker registry list of users."; + default = []; + options = [{ + user = mkOption { + description = "Docker registry user username."; + type = types.str; + }; + + pass = mkOption { + description = "Docker registry user password."; + type = types.str; + }; + }]; + type = types.listOf types.optionSet; + }; + + onTag = mkOption { + description = "Docker registry hook triggered when an image is tagged."; + default = ""; + type = types.str; + }; + + onImage = mkOption { + description = "Docker registry hook triggered when an image metadata is uploaded."; + default = ""; + type = types.str; + }; + + onLayer = mkOption { + description = "Docker registry hook triggered when an when an image layer is uploaded."; + default = ""; + type = types.str; + }; + + onVerify = mkOption { + description = "Docker registry hook triggered when an image layer+metadata has been verified."; + default = ""; + type = types.str; + }; + + onIndex = mkOption { + description = "Docker registry hook triggered when an when an image file system data has been indexed."; + default = ""; + type = types.str; + }; + + dataDir = mkOption { + description = "Docker registry data directory"; + default = "/var/lib/docker-registry"; + type = types.path; + }; + }; + + config = mkIf cfg.enable { + systemd.services.docker-registry-server = { + description = "Docker Registry Service."; + wantedBy = ["multi-user.target"]; + after = ["network.target"]; + script = '' + ${pkgs.nodePackages.docker-registry-server}/bin/docker-registry-server \ + --dir ${cfg.dataDir} \ + --port ${toString cfg.port} \ + ${concatMapStringsSep " " (u: "--user ${u.user}:${u.pass}") cfg.users} \ + ${optionalString (cfg.onTag != "") "--on-tag '${cfg.onTag}'"} \ + ${optionalString (cfg.onImage != "") "--on-image '${cfg.onImage}'"} \ + ${optionalString (cfg.onVerify != "") "--on-verify '${cfg.onVerify}'"} \ + ${optionalString (cfg.onIndex != "") "--on-index '${cfg.onIndex}'"} + ''; + + serviceConfig.User = "docker-registry"; + }; + + users.extraUsers.docker-registry = { + uid = config.ids.uids.docker-registry; + description = "Docker registry user"; + createHome = true; + home = cfg.dataDir; + }; + }; +} diff --git a/nixos/modules/services/networking/racoon.nix b/nixos/modules/services/networking/racoon.nix new file mode 100644 index 00000000000..00986bbbd84 --- /dev/null +++ b/nixos/modules/services/networking/racoon.nix @@ -0,0 +1,42 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.racoon; +in { + options.services.racoon = { + enable = mkEnableOption "Whether to enable racoon."; + + config = mkOption { + description = "Contents of racoon configuration file."; + default = ""; + type = types.str; + }; + + configPath = mkOption { + description = "Location of racoon config if config is not provided."; + default = "/etc/racoon/racoon.conf"; + type = types.path; + }; + }; + + config = mkIf cfg.enable { + systemd.services.racoon = { + description = "Racoon Daemon"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + serviceConfig = { + ExecStart = "${pkgs.ipsecTools}/bin/racoon -f ${ + if (cfg.config != "") then pkgs.writeText "racoon.conf" cfg.config + else cfg.configPath + }"; + ExecReload = "${pkgs.ipsecTools}/bin/racoonctl reload-config"; + PIDFile = "/var/run/racoon.pid"; + Type = "forking"; + Restart = "always"; + }; + preStart = "rm /var/run/racoon.pid || true"; + }; + }; +} diff --git a/nixos/modules/system/boot/coredump.nix b/nixos/modules/system/boot/coredump.nix new file mode 100644 index 00000000000..25b11ed9c8a --- /dev/null +++ b/nixos/modules/system/boot/coredump.nix @@ -0,0 +1,51 @@ +{ config, lib, pkgs, ... }: + +with lib; + +{ + + options = { + + systemd.coredump = { + + enable = mkOption { + default = false; + type = types.bool; + description = '' + Enables storing core dumps in systemd. + Note that this alone is not enough to enable core dumps. The maximum + file size for core dumps must be specified in limits.conf as well. See + as well as the limits.conf(5) + man page. + ''; + }; + + extraConfig = mkOption { + default = ""; + type = types.lines; + example = "Storage=journal"; + description = '' + Extra config options for systemd-coredump. See coredump.conf(5) man page + for available options. + ''; + }; + }; + + }; + + config = mkIf config.systemd.coredump.enable { + + environment.etc."systemd/coredump.conf".text = + '' + [Coredump] + ${config.systemd.coredump.extraConfig} + ''; + + # Have the kernel pass core dumps to systemd's coredump helper binary. + # From systemd's 50-coredump.conf file. See: + # + boot.kernel.sysctl."kernel.core_pattern" = "|${pkgs.systemd}/lib/systemd/systemd-coredump %p %u %g %s %t %e"; + + }; + +} diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 585c8854fee..c790e05f51b 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -21,13 +21,13 @@ let grubEfi = # EFI version of Grub v2 - if (cfg.devices != ["nodev"]) && cfg.efiSupport && (cfg.version == 2) + if cfg.efiSupport && (cfg.version == 2) then realGrub.override { efiSupport = cfg.efiSupport; } else null; f = x: if x == null then "" else "" + x; - grubConfig = pkgs.writeText "grub-config.xml" (builtins.toXML + grubConfig = args: pkgs.writeText "grub-config.xml" (builtins.toXML { splashImage = f config.boot.loader.grub.splashImage; grub = f grub; grubTarget = f (grub.grubTarget or ""); @@ -35,11 +35,14 @@ let fullVersion = (builtins.parseDrvName realGrub.name).version; grubEfi = f grubEfi; grubTargetEfi = if cfg.efiSupport && (cfg.version == 2) then f (grubEfi.grubTarget or "") else ""; - inherit (efi) efiSysMountPoint canTouchEfiVariables; + bootPath = args.path; + efiSysMountPoint = if args.efiSysMountPoint == null then args.path else args.efiSysMountPoint; + inherit (args) devices; + inherit (efi) canTouchEfiVariables; inherit (cfg) version extraConfig extraPerEntryConfig extraEntries extraEntriesBeforeNixOS extraPrepareConfig configurationLimit copyKernels timeout - default devices fsIdentifier efiSupport; + default fsIdentifier efiSupport; path = (makeSearchPath "bin" ([ pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.findutils pkgs.diffutils pkgs.btrfsProgs pkgs.utillinux ] ++ (if cfg.efiSupport && (cfg.version == 2) then [pkgs.efibootmgr ] else []) @@ -48,6 +51,9 @@ let ]); }); + bootDeviceCounters = fold (device: attr: attr // { "${device}" = (attr."${device}" or 0) + 1; }) {} + (concatMap (args: args.devices) cfg.mirroredBoots); + in { @@ -101,6 +107,53 @@ in ''; }; + mirroredBoots = mkOption { + default = [ ]; + example = [ + { path = "/boot1"; devices = [ "/dev/sda" ]; } + { path = "/boot2"; devices = [ "/dev/sdb" ]; } + ]; + description = '' + Mirror the boot configuration to multiple partitions and install grub + to the respective devices corresponding to those partitions. + ''; + + type = types.listOf types.optionSet; + + options = { + + path = mkOption { + example = "/boot1"; + type = types.str; + description = '' + The path to the boot directory where grub will be written. Generally + this boot parth should double as an efi path. + ''; + }; + + efiSysMountPoint = mkOption { + default = null; + example = "/boot1/efi"; + type = types.nullOr types.str; + description = '' + The path to the efi system mount point. Usually this is the same + partition as the above path and can be left as null. + ''; + }; + + devices = mkOption { + default = [ ]; + example = [ "/dev/sda" "/dev/sdb" ]; + type = types.listOf types.str; + description = '' + The path to the devices which will have the grub mbr written. + Note these are typically device paths and not paths to partitions. + ''; + }; + + }; + }; + configurationName = mkOption { default = ""; example = "Stable 2.6.21"; @@ -291,13 +344,18 @@ in boot.loader.grub.devices = optional (cfg.device != "") cfg.device; - system.build.installBootLoader = - if cfg.devices == [] then - throw "You must set the option ‘boot.loader.grub.device’ to make the system bootable." - else - "PERL5LIB=${makePerlPath (with pkgs.perlPackages; [ FileSlurp XMLLibXML XMLSAX ListCompare ])} " + - (if cfg.enableCryptodisk then "GRUB_ENABLE_CRYPTODISK=y " else "") + - "${pkgs.perl}/bin/perl ${./install-grub.pl} ${grubConfig}"; + boot.loader.grub.mirroredBoots = optionals (cfg.devices != [ ]) [ + { path = "/boot"; inherit (cfg) devices; inherit (efi) efiSysMountPoint; } + ]; + + system.build.installBootLoader = pkgs.writeScript "install-grub.sh" ('' + #!${pkgs.stdenv.shell} + set -e + export PERL5LIB=${makePerlPath (with pkgs.perlPackages; [ FileSlurp XMLLibXML XMLSAX ListCompare ])} + ${optionalString cfg.enableCryptodisk "export GRUB_ENABLE_CRYPTODISK=y"} + '' + flip concatMapStrings cfg.mirroredBoots (args: '' + ${pkgs.perl}/bin/perl ${./install-grub.pl} ${grubConfig args} + '')); system.build.grub = grub; @@ -312,13 +370,37 @@ in ${pkgs.coreutils}/bin/cp -pf "${v}" "/boot/${n}" '') config.boot.loader.grub.extraFiles); - assertions = [{ assertion = !cfg.zfsSupport || cfg.version == 2; - message = "Only grub version 2 provides zfs support";}] - ++ flip map cfg.devices (dev: { - assertion = dev == "nodev" || hasPrefix "/" dev; - message = "Grub devices must be absolute paths, not ${dev}"; - }); - + assertions = [ + { + assertion = !cfg.zfsSupport || cfg.version == 2; + message = "Only grub version 2 provides zfs support"; + } + { + assertion = cfg.mirroredBoots != [ ]; + message = "You must set the option ‘boot.loader.grub.devices’ or " + + "'boot.loader.grub.mirroredBoots' to make the system bootable."; + } + { + assertion = all (c: c < 2) (mapAttrsToList (_: c: c) bootDeviceCounters); + message = "You cannot have duplicated devices in mirroredBoots"; + } + ] ++ flip concatMap cfg.mirroredBoots (args: [ + { + assertion = args.devices != [ ]; + message = "A boot path cannot have an empty devices string in ${arg.path}"; + } + { + assertion = hasPrefix "/" args.path; + message = "Boot paths must be absolute, not ${args.path}"; + } + { + assertion = if args.efiSysMountPoint == null then true else hasPrefix "/" args.efiSysMountPoint; + message = "Efi paths must be absolute, not ${args.efiSysMountPoint}"; + } + ] ++ flip map args.devices (device: { + assertion = device == "nodev" || hasPrefix "/" device; + message = "Grub devices must be absolute paths, not ${dev} in ${args.path}"; + })); }) ]; diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index 81009e9fb82..a0384d23f82 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -11,7 +11,7 @@ require List::Compare; use POSIX; use Cwd; -my $defaultConfig = $ARGV[1] or die; +my $defaultConfig = $ARGV[0] or die; my $dom = XML::LibXML->load_xml(location => $ARGV[0]); @@ -54,6 +54,7 @@ my $defaultEntry = int(get("default")); my $fsIdentifier = get("fsIdentifier"); my $grubEfi = get("grubEfi"); my $grubTargetEfi = get("grubTargetEfi"); +my $bootPath = get("bootPath"); my $canTouchEfiVariables = get("canTouchEfiVariables"); my $efiSysMountPoint = get("efiSysMountPoint"); $ENV{'PATH'} = get("path"); @@ -62,16 +63,16 @@ die "unsupported GRUB version\n" if $grubVersion != 1 && $grubVersion != 2; print STDERR "updating GRUB $grubVersion menu...\n"; -mkpath("/boot/grub", 0, 0700); +mkpath("$bootPath/grub", 0, 0700); -# Discover whether /boot is on the same filesystem as / and +# Discover whether the bootPath is on the same filesystem as / and # /nix/store. If not, then all kernels and initrds must be copied to -# /boot. -if (stat("/boot")->dev != stat("/nix/store")->dev) { +# the bootPath. +if (stat($bootPath)->dev != stat("/nix/store")->dev) { $copyKernels = 1; } -# Discover information about the location of /boot +# Discover information about the location of the bootPath struct(Fs => { device => '$', type => '$', @@ -206,7 +207,7 @@ sub GrubFs { } return Grub->new(path => $path, search => $search); } -my $grubBoot = GrubFs("/boot"); +my $grubBoot = GrubFs($bootPath); my $grubStore; if ($copyKernels == 0) { $grubStore = GrubFs("/nix/store"); @@ -221,7 +222,7 @@ if ($grubVersion == 1) { timeout $timeout "; if ($splashImage) { - copy $splashImage, "/boot/background.xpm.gz" or die "cannot copy $splashImage to /boot\n"; + copy $splashImage, "$bootPath/background.xpm.gz" or die "cannot copy $splashImage to $bootPath\n"; $conf .= "splashimage " . $grubBoot->path . "/background.xpm.gz\n"; } } @@ -264,7 +265,7 @@ else { if ($splashImage) { # FIXME: GRUB 1.97 doesn't resize the background image if it # doesn't match the video resolution. - copy $splashImage, "/boot/background.png" or die "cannot copy $splashImage to /boot\n"; + copy $splashImage, "$bootPath/background.png" or die "cannot copy $splashImage to $bootPath\n"; $conf .= " insmod png if background_image " . $grubBoot->path . "/background.png; then @@ -285,14 +286,14 @@ $conf .= "$extraConfig\n"; $conf .= "\n"; my %copied; -mkpath("/boot/kernels", 0, 0755) if $copyKernels; +mkpath("$bootPath/kernels", 0, 0755) if $copyKernels; sub copyToKernelsDir { my ($path) = @_; return $grubStore->path . substr($path, length("/nix/store")) unless $copyKernels; $path =~ /\/nix\/store\/(.*)/ or die; my $name = $1; $name =~ s/\//-/g; - my $dst = "/boot/kernels/$name"; + my $dst = "$bootPath/kernels/$name"; # Don't copy the file if $dst already exists. This means that we # have to create $dst atomically to prevent partially copied # kernels or initrd if this script is ever interrupted. @@ -396,14 +397,14 @@ if ($extraPrepareConfig ne "") { } # Atomically update the GRUB config. -my $confFile = $grubVersion == 1 ? "/boot/grub/menu.lst" : "/boot/grub/grub.cfg"; +my $confFile = $grubVersion == 1 ? "$bootPath/grub/menu.lst" : "$bootPath/grub/grub.cfg"; my $tmpFile = $confFile . ".tmp"; writeFile($tmpFile, $conf); rename $tmpFile, $confFile or die "cannot rename $tmpFile to $confFile\n"; -# Remove obsolete files from /boot/kernels. -foreach my $fn (glob "/boot/kernels/*") { +# Remove obsolete files from $bootPath/kernels. +foreach my $fn (glob "$bootPath/kernels/*") { next if defined $copied{$fn}; print STDERR "removing obsolete file $fn\n"; unlink $fn; @@ -422,7 +423,7 @@ struct(GrubState => { }); sub readGrubState { my $defaultGrubState = GrubState->new(version => "", efi => "", devices => "", efiMountPoint => "" ); - open FILE, "; chomp($version); @@ -491,10 +492,10 @@ if (($requireNewInstall != 0) && ($efiTarget eq "no" || $efiTarget eq "both")) { next if $dev eq "nodev"; print STDERR "installing the GRUB $grubVersion boot loader on $dev...\n"; if ($grubTarget eq "") { - system("$grub/sbin/grub-install", "--recheck", Cwd::abs_path($dev)) == 0 + system("$grub/sbin/grub-install", "--recheck", "--boot-directory=$bootPath", Cwd::abs_path($dev)) == 0 or die "$0: installation of GRUB on $dev failed\n"; } else { - system("$grub/sbin/grub-install", "--recheck", "--target=$grubTarget", Cwd::abs_path($dev)) == 0 + system("$grub/sbin/grub-install", "--recheck", "--boot-directory=$bootPath", "--target=$grubTarget", Cwd::abs_path($dev)) == 0 or die "$0: installation of GRUB on $dev failed\n"; } } @@ -505,10 +506,10 @@ if (($requireNewInstall != 0) && ($efiTarget eq "no" || $efiTarget eq "both")) { if (($requireNewInstall != 0) && ($efiTarget eq "only" || $efiTarget eq "both")) { print STDERR "installing the GRUB $grubVersion EFI boot loader into $efiSysMountPoint...\n"; if ($canTouchEfiVariables eq "true") { - system("$grubEfi/sbin/grub-install", "--recheck", "--target=$grubTargetEfi", "--efi-directory=$efiSysMountPoint") == 0 + system("$grubEfi/sbin/grub-install", "--recheck", "--target=$grubTargetEfi", "--boot-directory=$bootPath", "--efi-directory=$efiSysMountPoint") == 0 or die "$0: installation of GRUB EFI into $efiSysMountPoint failed\n"; } else { - system("$grubEfi/sbin/grub-install", "--recheck", "--target=$grubTargetEfi", "--efi-directory=$efiSysMountPoint", "--no-nvram") == 0 + system("$grubEfi/sbin/grub-install", "--recheck", "--target=$grubTargetEfi", "--boot-directory=$bootPath", "--efi-directory=$efiSysMountPoint", "--no-nvram") == 0 or die "$0: installation of GRUB EFI into $efiSysMountPoint failed\n"; } } @@ -516,7 +517,7 @@ if (($requireNewInstall != 0) && ($efiTarget eq "only" || $efiTarget eq "both")) # update GRUB state file if ($requireNewInstall != 0) { - open FILE, ">/boot/grub/state" or die "cannot create /boot/grub/state: $!\n"; + open FILE, ">$bootPath/grub/state" or die "cannot create $bootPath/grub/state: $!\n"; print FILE get("fullVersion"), "\n" or die; print FILE $efiTarget, "\n" or die; print FILE join( ":", @deviceTargets ), "\n" or die; diff --git a/nixos/modules/tasks/filesystems/exfat.nix b/nixos/modules/tasks/filesystems/exfat.nix new file mode 100644 index 00000000000..963bc940b4f --- /dev/null +++ b/nixos/modules/tasks/filesystems/exfat.nix @@ -0,0 +1,11 @@ +{ config, lib, pkgs, ... }: + +with lib; + +{ + config = mkIf (any (fs: fs == "exfat") config.boot.supportedFilesystems) { + + system.fsPackages = [ pkgs.exfat-utils pkgs.fuse_exfat ]; + + }; +} diff --git a/nixos/modules/tasks/trackpoint.nix b/nixos/modules/tasks/trackpoint.nix index 778cdc5d30d..bd340869d69 100644 --- a/nixos/modules/tasks/trackpoint.nix +++ b/nixos/modules/tasks/trackpoint.nix @@ -45,6 +45,16 @@ with lib; ''; }; + fakeButtons = mkOption { + default = false; + type = types.bool; + description = '' + Switch to "bare" PS/2 mouse support in case Trackpoint buttons are not recognized + properly. This can happen for example on models like the L430, T450, T450s, on + which the Trackpoint buttons are actually a part of the Synaptics touchpad. + ''; + }; + }; }; @@ -52,11 +62,13 @@ with lib; ###### implementation - config = mkMerge [ - (mkIf config.hardware.trackpoint.enable { + config = + let cfg = config.hardware.trackpoint; in + mkMerge [ + (mkIf cfg.enable { services.udev.extraRules = '' - ACTION=="add|change", SUBSYSTEM=="input", ATTR{name}=="TPPS/2 IBM TrackPoint", ATTR{device/speed}="${toString config.hardware.trackpoint.speed}", ATTR{device/sensitivity}="${toString config.hardware.trackpoint.sensitivity}" + ACTION=="add|change", SUBSYSTEM=="input", ATTR{name}=="TPPS/2 IBM TrackPoint", ATTR{device/speed}="${toString cfg.speed}", ATTR{device/sensitivity}="${toString cfg.sensitivity}" ''; system.activationScripts.trackpoint = @@ -65,20 +77,22 @@ with lib; ''; }) - (mkIf config.hardware.trackpoint.emulateWheel { - services.xserver.config = - '' - Section "InputClass" - Identifier "Trackpoint Wheel Emulation" - MatchProduct "Elantech PS/2 TrackPoint|TPPS/2 IBM TrackPoint|DualPoint Stick|Synaptics Inc. Composite TouchPad / TrackPoint|ThinkPad USB Keyboard with TrackPoint|USB Trackpoint pointing device|Composite TouchPad / TrackPoint" - MatchDevicePath "/dev/input/event*" - Option "EmulateWheel" "true" - Option "EmulateWheelButton" "2" - Option "Emulate3Buttons" "false" - Option "XAxisMapping" "6 7" - Option "YAxisMapping" "4 5" - EndSection - ''; + (mkIf (cfg.emulateWheel) { + services.xserver.inputClassSections = + ['' + Identifier "Trackpoint Wheel Emulation" + MatchProduct "${if cfg.fakeButtons then "PS/2 Generic Mouse" else "Elantech PS/2 TrackPoint|TPPS/2 IBM TrackPoint|DualPoint Stick|Synaptics Inc. Composite TouchPad / TrackPoint|ThinkPad USB Keyboard with TrackPoint|USB Trackpoint pointing device|Composite TouchPad / TrackPoint"}" + MatchDevicePath "/dev/input/event*" + Option "EmulateWheel" "true" + Option "EmulateWheelButton" "2" + Option "Emulate3Buttons" "false" + Option "XAxisMapping" "6 7" + Option "YAxisMapping" "4 5" + '']; + }) + + (mkIf cfg.fakeButtons { + boot.extraModprobeConfig = "options psmouse proto=bare"; }) ]; } diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix index 5be76b2682f..49170f2220b 100644 --- a/nixos/modules/virtualisation/docker.nix +++ b/nixos/modules/virtualisation/docker.nix @@ -45,7 +45,7 @@ in }; extraOptions = mkOption { - type = types.str; + type = types.separatedString " "; default = ""; description = '' diff --git a/nixos/modules/virtualisation/nova-image.nix b/nixos/modules/virtualisation/nova-image.nix index 2523dacc0b5..20ec6b024e9 100644 --- a/nixos/modules/virtualisation/nova-image.nix +++ b/nixos/modules/virtualisation/nova-image.nix @@ -46,16 +46,20 @@ with lib; # Register the paths in the Nix database. printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \ - chroot /mnt ${config.nix.package}/bin/nix-store --load-db + chroot /mnt ${config.nix.package}/bin/nix-store --load-db --option build-users-group "" # Create the system profile to allow nixos-rebuild to work. - chroot /mnt ${config.nix.package}/bin/nix-env \ + chroot /mnt ${config.nix.package}/bin/nix-env --option build-users-group "" \ -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel} # `nixos-rebuild' requires an /etc/NIXOS. mkdir -p /mnt/etc touch /mnt/etc/NIXOS + # `switch-to-configuration' requires a /bin/sh + mkdir -p /mnt/bin + ln -s ${config.system.build.binsh}/bin/sh /mnt/bin/sh + # Install a configuration.nix. mkdir -p /mnt/etc/nixos cp ${./nova-config.nix} /mnt/etc/nixos/configuration.nix @@ -104,10 +108,6 @@ with lib; boot.initrd.supportedFilesystems = [ "unionfs-fuse" ]; */ - # Since Nova allows VNC access to instances, it's nice to start to - # start a few virtual consoles. - services.mingetty.ttys = [ "tty1" "tty2" ]; - # Allow root logins only using the SSH key that the user specified # at instance creation time. services.openssh.enable = true; diff --git a/nixos/modules/virtualisation/openvswitch.nix b/nixos/modules/virtualisation/openvswitch.nix index c1579d94657..69ca13a7147 100644 --- a/nixos/modules/virtualisation/openvswitch.nix +++ b/nixos/modules/virtualisation/openvswitch.nix @@ -7,35 +7,36 @@ with lib; let cfg = config.virtualisation.vswitch; -in +in { -{ - - options = { - - virtualisation.vswitch.enable = mkOption { + options.virtualisation.vswitch = { + enable = mkOption { type = types.bool; default = false; - description = - '' - Enable Open vSwitch. A configuration - daemon (ovs-server) will be started. + description = '' + Whether to enable Open vSwitch. A configuration daemon (ovs-server) + will be started. ''; }; - - virtualisation.vswitch.package = mkOption { + package = mkOption { type = types.package; default = pkgs.openvswitch; - description = - '' + description = '' Open vSwitch package to use. - ''; + ''; }; + ipsec = mkOption { + type = types.bool; + default = false; + description = '' + Whether to start racoon service for openvswitch. + ''; + }; }; - config = mkIf cfg.enable (let + config = mkIf cfg.enable (let # Where the communication sockets live runDir = "/var/run/openvswitch"; @@ -43,7 +44,7 @@ in # Where the config database live (can't be in nix-store) stateDir = "/var/db/openvswitch"; - # The path to the an initialized version of the database + # The path to the an initialized version of the database db = pkgs.stdenv.mkDerivation { name = "vswitch.db"; unpackPhase = "true"; @@ -51,15 +52,12 @@ in buildInputs = with pkgs; [ cfg.package ]; - installPhase = - '' - ensureDir $out/ - ''; + installPhase = "mkdir -p $out"; }; - in { + in (mkMerge [{ - environment.systemPackages = [ cfg.package ]; + environment.systemPackages = [ cfg.package pkgs.ipsecTools ]; boot.kernelModules = [ "tun" "openvswitch" ]; @@ -73,7 +71,7 @@ in path = [ cfg.package ]; restartTriggers = [ db cfg.package ]; # Create the config database - preStart = + preStart = '' mkdir -p ${runDir} mkdir -p /var/db/openvswitch @@ -85,23 +83,27 @@ in fi chmod -R +w /var/db/openvswitch ''; - serviceConfig.ExecStart = - '' - ${cfg.package}/bin/ovsdb-server \ - --remote=punix:${runDir}/db.sock \ - --private-key=db:Open_vSwitch,SSL,private_key \ - --certificate=db:Open_vSwitch,SSL,certificate \ - --bootstrap-ca-cert=db:Open_vSwitch,SSL,ca_cert \ - --unixctl=ovsdb.ctl.sock \ - /var/db/openvswitch/conf.db - ''; - serviceConfig.Restart = "always"; - serviceConfig.RestartSec = 3; - postStart = - '' + serviceConfig = { + ExecStart = + '' + ${cfg.package}/bin/ovsdb-server \ + --remote=punix:${runDir}/db.sock \ + --private-key=db:Open_vSwitch,SSL,private_key \ + --certificate=db:Open_vSwitch,SSL,certificate \ + --bootstrap-ca-cert=db:Open_vSwitch,SSL,ca_cert \ + --unixctl=ovsdb.ctl.sock \ + --pidfile=/var/run/openvswitch/ovsdb.pid \ + --detach \ + /var/db/openvswitch/conf.db + ''; + Restart = "always"; + RestartSec = 3; + PIDFile = "/var/run/openvswitch/ovsdb.pid"; + Type = "forking"; + }; + postStart = '' ${cfg.package}/bin/ovs-vsctl --timeout 3 --retry --no-wait init - ''; - + ''; }; systemd.services.vswitchd = { @@ -109,9 +111,55 @@ in bindsTo = [ "ovsdb.service" ]; after = [ "ovsdb.service" ]; path = [ cfg.package ]; - serviceConfig.ExecStart = ''${cfg.package}/bin/ovs-vswitchd''; + serviceConfig = { + ExecStart = '' + ${cfg.package}/bin/ovs-vswitchd \ + --pidfile=/var/run/openvswitch/ovs-vswitchd.pid \ + --detach + ''; + PIDFile = "/var/run/openvswitch/ovs-vswitchd.pid"; + Type = "forking"; + }; }; - }); + } + (mkIf cfg.ipsec { + services.racoon.enable = true; + services.racoon.configPath = "${runDir}/ipsec/etc/racoon/racoon.conf"; + + networking.firewall.extraCommands = '' + iptables -I INPUT -t mangle -p esp -j MARK --set-mark 1/1 + iptables -I INPUT -t mangle -p udp --dport 4500 -j MARK --set-mark 1/1 + ''; + + systemd.services.ovs-monitor-ipsec = { + description = "Open_vSwitch Ipsec Daemon"; + wantedBy = [ "multi-user.target" ]; + requires = [ "racoon.service" ]; + after = [ "vswitchd.service" ]; + environment.UNIXCTLPATH = "/tmp/ovsdb.ctl.sock"; + serviceConfig = { + ExecStart = '' + ${cfg.package}/bin/ovs-monitor-ipsec \ + --root-prefix ${runDir}/ipsec \ + --pidfile /var/run/openvswitch/ovs-monitor-ipsec.pid \ + --monitor --detach \ + unix:/var/run/openvswitch/db.sock + ''; + PIDFile = "/var/run/openvswitch/ovs-monitor-ipsec.pid"; + Type = "forking"; + }; + + preStart = '' + rm -r ${runDir}/ipsec/etc/racoon/certs || true + mkdir -p ${runDir}/ipsec/{etc/racoon,etc/init.d/,usr/sbin/} + ln -fs ${pkgs.ipsecTools}/bin/setkey ${runDir}/ipsec/usr/sbin/setkey + ln -fs ${pkgs.writeScript "racoon-restart" '' + #!${pkgs.stdenv.shell} + /var/run/current-system/sw/bin/systemctl $1 racoon + ''} ${runDir}/ipsec/etc/init.d/racoon + ''; + }; + })])); } diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 64f98141cc0..603dfbe224f 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -120,7 +120,7 @@ let hdFlags =''hda => "harddisk", hdaInterface => "${iface}", ''; in '' - createDisk("harddisk", 4 * 1024); + createDisk("harddisk", 8 * 1024); my $machine = createMachine({ ${hdFlags} cdrom => glob("${iso}/iso/*.iso"), diff --git a/nixos/tests/lightdm.nix b/nixos/tests/lightdm.nix new file mode 100644 index 00000000000..dba20a49dbd --- /dev/null +++ b/nixos/tests/lightdm.nix @@ -0,0 +1,25 @@ +import ./make-test.nix { + name = "lightdm"; + + machine = { lib, ... }: { + imports = [ ./common/user-account.nix ]; + services.xserver.enable = true; + services.xserver.displayManager.lightdm.enable = true; + services.xserver.windowManager.default = "icewm"; + services.xserver.windowManager.icewm.enable = true; + services.xserver.desktopManager.default = "none"; + }; + + enableOCR = true; + + testScript = { nodes, ... }: let + user = nodes.machine.config.users.extraUsers.alice; + in '' + startAll; + $machine->waitForText(qr/${user.description}/); + $machine->screenshot("lightdm"); + $machine->sendChars("${user.password}\n"); + $machine->waitForText(qr/^\d{2}(?::\d{2}){2} (?:AM|PM)$/m); + $machine->screenshot("session"); + ''; +} diff --git a/pkgs/applications/audio/bitmeter/default.nix b/pkgs/applications/audio/bitmeter/default.nix new file mode 100644 index 00000000000..2084ab481fa --- /dev/null +++ b/pkgs/applications/audio/bitmeter/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, jack2, gtk2, pkgconfig }: + +stdenv.mkDerivation rec { + name = "bitmeter-${version}"; + version = "1.2"; + + src = fetchurl { + url = "http://devel.tlrmx.org/audio/source/${name}.tar.gz"; + sha256 = "09ck2gxqky701dc1p0ip61rrn16v0pdc7ih2hc2sd63zcw53g2a7"; + }; + + buildInputs = [ jack2 gtk2 pkgconfig ]; + + meta = with stdenv.lib; { + homepage = http://devel.tlrmx.org/audio/bitmeter/; + description = "Also known as jack bitscope. Useful to detect denormals."; + license = licenses.gpl2; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/eq10q/default.nix b/pkgs/applications/audio/eq10q/default.nix new file mode 100644 index 00000000000..61c97953422 --- /dev/null +++ b/pkgs/applications/audio/eq10q/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, cmake, fftw, gtkmm, libxcb, lv2, pkgconfig, xlibs }: +stdenv.mkDerivation rec { + name = "eq10q-2-${version}"; + version = "beta7.1"; + src = fetchurl { + url = "http://downloads.sourceforge.net/project/eq10q/${name}.tar.gz"; + sha256 = "1jmrcx4jlx8kgsy5n4jcxa6qkjqvx7d8l2p7dsmw4hj20s39lgyi"; + }; + + buildInputs = [ cmake fftw gtkmm libxcb lv2 pkgconfig xlibs.libpthreadstubs xlibs.libXdmcp xlibs.libxshmfence ]; + + installFlags = '' + DESTDIR=$(out) + ''; + + fixupPhase = '' + cp -r $out/var/empty/local/lib $out + rm -R $out/var + ''; + + meta = { + description = "LV2 EQ plugins and more, with 64 bit processing"; + longDescription = '' + Up to 10-Bands parametric equalizer with mono and stereo versions. + Versatile noise-gate plugin with mono and stereo versions. + Compressor plugin with mono and stereo versions. + BassUp plugin - Enhanceing the bass guitar sound or other low frequency sounding instruments. + Improved high frequency response for peaking filter (in equalizers). + 64 bits floating point internal audio processing. + Nice GUI with powerful metering for every plugin. + ''; + homepage = http://eq10q.sourceforge.net/; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/audio/foo-yc20/default.nix b/pkgs/applications/audio/foo-yc20/default.nix new file mode 100644 index 00000000000..d0de8c9f9a7 --- /dev/null +++ b/pkgs/applications/audio/foo-yc20/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, jack2, gtk2, lv2, faust, pkgconfig }: + +stdenv.mkDerivation rec { + version = "git-2015-05-21"; + name = "foo-yc20-${version}"; + src = fetchFromGitHub { + owner = "sampov2"; + repo = "foo-yc20"; + rev = "edd9d14c91229429b14270a181743e1046160ca8"; + sha256 = "0i8261n95n4xic766h70xkrpbvw3sag96n1883ahmg6h7yb94avq"; + }; + + buildInputs = [ jack2 gtk2 lv2 faust pkgconfig ]; + + makeFlags = "PREFIX=$(out)"; + + # remove lv2 until https://github.com/sampov2/foo-yc20/issues/6 is resolved + postInstallFixup = "rm -rf $out/lib/lv2"; + + meta = { + description = "A Faust implementation of a 1969 designed Yamaha combo organ, the YC-20"; + homepage = https://github.com/sampov2/foo-yc20; + license = "BSD"; + maintainers = stdenv.lib.maintainers.magnetophon; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/audio/tetraproc/default.nix b/pkgs/applications/audio/tetraproc/default.nix new file mode 100644 index 00000000000..de351a72022 --- /dev/null +++ b/pkgs/applications/audio/tetraproc/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, jack2, libclthreads, libclxclient, fftwFloat, libsndfile, freetype, x11 +}: + +stdenv.mkDerivation rec { + name = "tetraproc-${version}"; + version = "0.8.2"; + src = fetchurl { + url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; + sha256 = "17y3vbm5f6h5cmh3yfxjgqz4xhfwpkla3lqfspnbm4ndlzmfpykv"; + }; + + buildInputs = [ + jack2 libclthreads libclxclient fftwFloat libsndfile freetype x11 + ]; + + patchPhase = '' + cd source + sed -e "s@#include @#include <${libclthreads}/include>@" -i tetraproc.cc + sed -e "s@#include @#include <${libclxclient}/include>@" -i *.h + sed -e "s@#include @#include <${libclthreads}/include>@" -i *.h + sed -e "s@#include @#include <${libclxclient}/include>@" -i png2img.* + sed -e "s@/usr/local@$out@" -i Makefile + ''; + + meta = { + description = "Converts the A-format signals from a tetrahedral Ambisonic microphone into B-format signals ready for recording"; + version = "${version}"; + homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/"; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/editors/bviplus/default.nix b/pkgs/applications/editors/bviplus/default.nix new file mode 100644 index 00000000000..0a8d7081b23 --- /dev/null +++ b/pkgs/applications/editors/bviplus/default.nix @@ -0,0 +1,21 @@ +{ stdenv, lib, fetchurl, ncurses }: + +stdenv.mkDerivation rec { + name = "bviplus-${version}"; + version = "0.9.4"; + src = fetchurl { + url = "http://downloads.sourceforge.net/project/bviplus/bviplus/${version}/bviplus-${version}.tgz"; + sha256 = "10x6fbn8v6i0y0m40ja30pwpyqksnn8k2vqd290vxxlvlhzah4zb"; + }; + buildInputs = [ + ncurses + ]; + makeFlags = "PREFIX=$(out)"; + meta = with lib; { + description = "ncurses based hex editor with a vim-like interface"; + homepage = "http://bviplus.sourceforge.net"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ cstrahan ]; + }; +} diff --git a/pkgs/applications/editors/heme/default.nix b/pkgs/applications/editors/heme/default.nix new file mode 100644 index 00000000000..092b7ef6865 --- /dev/null +++ b/pkgs/applications/editors/heme/default.nix @@ -0,0 +1,27 @@ +{ stdenv, lib, fetchurl, ncurses }: + +stdenv.mkDerivation rec { + name = "heme-${version}"; + version = "0.4.2"; + src = fetchurl { + url = "http://downloads.sourceforge.net/project/heme/heme/heme-${version}/heme-${version}.tar.gz"; + sha256 = "0wsrnj5mrlazgqs4252k30aw8m86qw0z9dmrsli9zdxl7j4cg99v"; + }; + postPatch = '' + substituteInPlace Makefile \ + --replace "/usr/local" "$out" \ + --replace "CFLAGS = " "CFLAGS = -I${ncurses}/include " \ + --replace "LDFLAGS = " "LDFLAGS = -L${ncurses}/lib " + ''; + preBuild = '' + mkdir -p $out/bin + mkdir -p $out/man/man1 + ''; + meta = with lib; { + description = "Portable and fast console hex editor for unix operating systems"; + homepage = "http://heme.sourceforge.net/"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ cstrahan ]; + }; +} diff --git a/pkgs/applications/editors/hexcurse/default.nix b/pkgs/applications/editors/hexcurse/default.nix new file mode 100644 index 00000000000..861bf88f7dd --- /dev/null +++ b/pkgs/applications/editors/hexcurse/default.nix @@ -0,0 +1,22 @@ +{ stdenv, lib, fetchFromGitHub, ncurses }: + +stdenv.mkDerivation rec { + name = "hexcurse-${version}"; + version = "1.58"; + src = fetchFromGitHub { + owner = "LonnyGomes"; + repo = "hexcurse"; + rev = "hexcurse-${version}"; + sha256 = "0hm9mms2ija3wqba0mkk9i8fhb8q1pam6d6pjlingkzz6ygxnnp7"; + }; + buildInputs = [ + ncurses + ]; + meta = with lib; { + description = "ncurses-based console hexeditor written in C"; + homepage = "https://github.com/LonnyGomes/hexcurse"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ cstrahan ]; + }; +} diff --git a/pkgs/applications/editors/ht/default.nix b/pkgs/applications/editors/ht/default.nix new file mode 100644 index 00000000000..b7acdb7f1d5 --- /dev/null +++ b/pkgs/applications/editors/ht/default.nix @@ -0,0 +1,20 @@ +{ stdenv, lib, fetchurl, ncurses }: + +stdenv.mkDerivation rec { + name = "ht-${version}"; + version = "2.1.0"; + src = fetchurl { + url = "http://sourceforge.net/projects/hte/files/ht-source/ht-${version}.tar.bz2"; + sha256 = "0w2xnw3z9ws9qrdpb80q55h6ynhh3aziixcfn45x91bzrbifix9i"; + }; + buildInputs = [ + ncurses + ]; + meta = with lib; { + description = "File editor/viewer/analyzer for executables"; + homepage = "http://hte.sourceforge.net"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ cstrahan ]; + }; +} diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 9d42aecf5f0..d22f03d56d9 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -273,25 +273,25 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "4.5"; - build = "141.1116"; + version = "4.5.1"; + build = "141.1245"; description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0igx62rijalppsd1nwrri1r4m1597n93ncglyb6b94m3fm32fca6"; + sha256 = "1rjl8r863cm7bn3bkp8kbkb9f35rb344pycg5qlvjlvwvp2f448f"; }; }; pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "4.5"; - build = "141.1116"; + version = "4.5.1"; + build = "141.1245"; description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0zga8sxwrvjvyw9v1pvq40gasp485r1d627jj6jvwzcv78il50d9"; + sha256 = "1wwyggl6941hd034xfsb3avjgvvah9lh0pdmzlndmvm677cdgzz1"; }; }; @@ -309,13 +309,13 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "10.0.2"; - build = "141.728"; + version = "10.0.3"; + build = "141.1237"; description = "Professional IDE for Web and JavaScript devlopment"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "0ghv1r145qb5kmp2x375f5674b86d51w024fz390znlnniclizqx"; + sha256 = "06m852mbiij2dbmiz5y10bd4mhsdg5dmpy8arg75psl2j354spf8"; }; }; diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 1c1c050b000..f19c1b65e13 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -1,65 +1,88 @@ -{ stdenv, fetchgit, fetchurl, unzip, callPackage, ncurses, gettext, pkgconfig, -cmake, pkgs, lpeg, lua, luajit, luaMessagePack, luabitop }: +{ stdenv, fetchFromGitHub, cmake, gettext, glib, libmsgpack +, libtermkey, libtool, libuv, lpeg, lua, luajit, luaMessagePack +, luabitop, ncurses, perl, pkgconfig, unibilium +, withJemalloc ? true, jemalloc }: +let version = "2015-05-26"; in stdenv.mkDerivation rec { - name = "neovim-nightly"; + name = "neovim-${version}"; - version = "nightly"; - - src = fetchgit { - url = "https://github.com/neovim/neovim"; - rev = "68fcd8b696dae33897303c9f8265629a31afbf17"; - sha256 = "0hxkcy641jpn4qka44gfvhmb6q3dkjx6lvn9748lcl2gx2d36w4i"; + src = fetchFromGitHub { + sha256 = "0sszpqlq0yp6r62zgcjcmnllc058wzzh9ccvgb2jh9k19ksszyhc"; + rev = "5a9ad68b258f33ebd7fa0a5da47b308f50f1e5e7"; + repo = "neovim"; + owner = "neovim"; }; - libmsgpack = stdenv.mkDerivation rec { - version = "0.5.9"; - name = "libmsgpack-${version}"; + # FIXME: this is NOT the libvterm already in nixpkgs, but some NIH silliness: + neovimLibvterm = let version = "2015-02-23"; in stdenv.mkDerivation rec { + name = "neovim-libvterm-${version}"; - src = fetchgit { - rev = "ecf4b09acd29746829b6a02939db91dfdec635b4"; - url = "https://github.com/msgpack/msgpack-c"; - sha256 = "076ygqgxrc3vk2l20l8x2cgcv05py3am6mjjkknr418pf8yav2ww"; + src = fetchFromGitHub { + sha256 = "0i2h74jrx4fy90sv57xj8g4lbjjg4nhrq2rv6rz576fmqfpllcc5"; + rev = "20ad1396c178c72873aeeb2870bd726f847acb70"; + repo = "libvterm"; + owner = "neovim"; }; - buildInputs = [ cmake ]; + buildInputs = [ libtool perl ]; + + makeFlags = "PREFIX=$(out)"; + + enableParallelBuilding = true; meta = with stdenv.lib; { - description = "MessagePack implementation for C and C++"; - homepage = http://msgpack.org; - maintainers = [ maintainers.manveru ]; - license = licenses.asl20; - platforms = platforms.all; + description = "VT220/xterm/ECMA-48 terminal emulator library"; + homepage = http://www.leonerd.org.uk/code/libvterm/; + license = licenses.mit; + maintainers = with maintainers; [ nckx ]; + platforms = platforms.unix; }; }; enableParallelBuilding = true; buildInputs = [ - ncurses - pkgconfig cmake - pkgs.libuvVersions.v0_11_29 + glib + libtermkey + libuv luajit lua lpeg luaMessagePack luabitop libmsgpack + ncurses + neovimLibvterm + pkgconfig + unibilium + ] ++ stdenv.lib.optional withJemalloc jemalloc; + nativeBuildInputs = [ + gettext ]; - nativeBuildInputs = [ gettext ]; LUA_CPATH="${lpeg}/lib/lua/${lua.luaversion}/?.so;${luabitop}/lib/lua/5.2/?.so"; LUA_PATH="${luaMessagePack}/share/lua/5.1/?.lua"; - cmakeFlags = [ - "-DUSE_BUNDLED_MSGPACK=ON" - ]; meta = with stdenv.lib; { - description = "Aggressive refactor of Vim"; - homepage = http://www.neovim.org; - maintainers = with maintainers; [ manveru ]; + description = "Vim text editor fork focused on extensibility and agility"; + longDescription = '' + Neovim is a project that seeks to aggressively refactor Vim in order to: + - Simplify maintenance and encourage contributions + - Split the work between multiple developers + - Enable the implementation of new/modern user interfaces without any + modifications to the core source + - Improve extensibility with a new plugin architecture + ''; + homepage = http://www.neovim.io; + # "Contributions committed before b17d96 by authors who did not sign the + # Contributor License Agreement (CLA) remain under the Vim license. + # Contributions committed after b17d96 are licensed under Apache 2.0 unless + # those contributions were copied from Vim (identified in the commit logs + # by the vim-patch token). See LICENSE for details." + license = with licenses; [ asl20 vim ]; + maintainers = with maintainers; [ manveru nckx ]; platforms = platforms.unix; }; } - diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index e6c2cacc49a..b40e797f7ea 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -190,6 +190,7 @@ composableDerivation { meta = with stdenv.lib; { description = "The most popular clone of the VI editor"; homepage = http://www.vim.org; + license = with licenses; [ vim ]; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index 4f14aade5a5..b13925fe14e 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -49,6 +49,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The most popular clone of the VI editor"; homepage = http://www.vim.org; + license = with licenses; [ vim ]; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index 784be80ecf4..4519d4c2626 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -87,6 +87,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Vim - the text editor - for Mac OS X"; homepage = https://github.com/b4winckler/macvim; + license = with licenses; [ vim ]; maintainers = with maintainers; [ cstrahan ]; platforms = platforms.darwin; }; diff --git a/pkgs/applications/editors/vim/qvim.nix b/pkgs/applications/editors/vim/qvim.nix index b9e3d668d62..42ed3daa688 100644 --- a/pkgs/applications/editors/vim/qvim.nix +++ b/pkgs/applications/editors/vim/qvim.nix @@ -118,6 +118,7 @@ composableDerivation { meta = with stdenv.lib; { description = "The most popular clone of the VI editor (Qt GUI fork)"; homepage = https://bitbucket.org/equalsraf/vim-qt/wiki/Home; + license = with licenses; [ vim ]; maintainers = with maintainers; [ smironov ttuegel ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 49c7870b212..ac0a2ec0d4c 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -2,11 +2,11 @@ , libXinerama, curl, libexif }: stdenv.mkDerivation rec { - name = "feh-2.13"; + name = "feh-2.13.1"; src = fetchurl { url = "http://feh.finalrewind.org/${name}.tar.bz2"; - sha256 = "06fa9zh1zpi63l90kw3l9a0sfavf424j7ksi396ifg9669gx35gn"; + sha256 = "1059mflgw8hl398lwy55fj50a98xryvdf23wkpbn4s0z9388hl46"; }; buildInputs = [ makeWrapper x11 imlib2 libjpeg libpng libXinerama curl libexif ]; diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix index 12eeb62dc04..c1d74c247ce 100644 --- a/pkgs/applications/misc/rxvt_unicode/default.nix +++ b/pkgs/applications/misc/rxvt_unicode/default.nix @@ -45,6 +45,11 @@ stdenv.mkDerivation (rec { ln -s $out/{lib/urxvt,lib/perl5/site_perl} ''; + postInstall = '' + mkdir -p $out/nix-support + echo "$terminfo" >> $out/nix-support/propagated-user-env-packages + ''; + meta = { description = "A clone of the well-known terminal emulator rxvt"; homepage = "http://software.schmorp.de/pkg/rxvt-unicode.html"; diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix index 521f568ff5b..4ebfddf82e1 100644 --- a/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/pkgs/applications/networking/instant-messengers/viber/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, dpkg, makeWrapper, xlibs, qt5, gstreamer, zlib, sqlite, libxslt }: +{ fetchurl, stdenv, dpkg, makeWrapper, xlibs, qt5Full, gstreamer, zlib, sqlite, libxslt }: assert stdenv.system == "x86_64-linux"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { unpackPhase = "true"; libPath = stdenv.lib.makeLibraryPath [ - qt5 + qt5Full xlibs.libX11 gstreamer zlib diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index b8940bcd96e..8c26bf8d10e 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -2,16 +2,18 @@ stdenv.mkDerivation rec { name = "irssi-0.8.17"; - + src = fetchurl { - url = "http://irssi.org/files/${name}.tar.bz2"; + urls = [ "https://distfiles.macports.org/irssi/${name}.tar.bz2" + "http://irssi.org/files/${name}.tar.bz2" + ]; sha256 = "01v82q2pfiimx6lh271kdvgp8hl4pahc3srg04fqzxgdsb5015iw"; }; - + buildInputs = [ pkgconfig ncurses glib openssl perl libintlOrEmpty ]; - + NIX_LDFLAGS = ncurses.ldflags; - + configureFlags = "--with-proxy --with-ncurses --enable-ssl --with-perl=yes"; meta = { diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix index 8544ccc0f79..446b65c9882 100644 --- a/pkgs/applications/networking/remote/x2goclient/default.nix +++ b/pkgs/applications/networking/remote/x2goclient/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cups, libssh, libXpm, nxproxy, openldap, makeWrapper, qt4 }: -let version = "4.0.3.2"; in +let version = "4.0.4.0"; in stdenv.mkDerivation rec { name = "x2goclient-${version}"; src = fetchurl { url = "http://code.x2go.org/releases/source/x2goclient/${name}.tar.gz"; - sha256 = "0vqcz9kmnbvlj8kns68zl60019fdz97rydz4wsgnsgdf7r370npn"; + sha256 = "0mqn4nvq2w7qja5i4vx9fg2spwzl01p0hmfwbjb0mzir03hmrl46"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 54e4e64cdcf..cea9329d9c8 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -4,12 +4,12 @@ with goPackages; buildGoPackage rec { name = "syncthing-${version}"; - version = "0.11.5"; + version = "0.11.6"; goPackagePath = "github.com/syncthing/syncthing"; src = fetchgit { url = "git://github.com/syncthing/syncthing.git"; rev = "refs/tags/v${version}"; - sha256 = "3a68cdecaec8d00b0fbf6348fb9b8adc628910e9572a89d9a413d6e7b79e7a06"; + sha256 = "7fe7d7034c0e502036e2a0bb1b94b1701bd194cc82f07495da8a41c4b097c6a3"; }; subPackages = [ "cmd/syncthing" ]; diff --git a/pkgs/applications/networking/umurmur/default.nix b/pkgs/applications/networking/umurmur/default.nix index a8ae393598d..194b22f0fd7 100644 --- a/pkgs/applications/networking/umurmur/default.nix +++ b/pkgs/applications/networking/umurmur/default.nix @@ -13,7 +13,10 @@ stdenv.mkDerivation rec { buildInputs = [ autoreconfHook openssl protobufc libconfig ]; - configureFlags = "--with-ssl=openssl"; + configureFlags = [ + "--with-ssl=openssl" + "--enable-shmapi" + ]; meta = with stdenv.lib; { description = "Minimalistic Murmur (Mumble server)"; diff --git a/pkgs/applications/science/biology/arb/default.nix b/pkgs/applications/science/biology/arb/default.nix deleted file mode 100644 index 2f622e94057..00000000000 --- a/pkgs/applications/science/biology/arb/default.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ stdenv, fetchurl, glew, mesa, libpng, lesstif, lynx, freeglut -, libtiff, rxp, sablotron, perl, jdk, transfig, gv, gnuplot, xorg }: - -# NOTE: This package does not build on 64-bit systems. Because of some faulty -# int->pointer arithmatic. The build scripts are abnormal - but it appears to -# work. - -stdenv.mkDerivation { - name = "arb-2007-Dec-07"; - - src = fetchurl { - url = http://download.arb-home.de/release/2007_12_07/arbsrc.tgz; - sha256 = "04l7qj0wigg1h56a9d70hxhdr343v3dg5dhqrc7fahc1v4h8f1rd"; - }; - - patches = [ ./makefile.patch ]; - - buildInputs = - [ glew mesa libpng xorg.libXpm lesstif lynx freeglut libtiff rxp - sablotron xorg.libXaw perl jdk transfig xorg.libX11 xorg.libXext - xorg.libXt gv gnuplot - ]; - - unpackPhase = '' - tar xzf $src - ''; - - buildPhase = '' - echo `make` # avoids error signal - export ARBHOME=`pwd` - export PATH=$ARBHOME/bin:$PATH - make all - ''; - - installPhase = '' - mkdir -p $out/lib - shareddir=/nix/var/lib/arb - # link out writable shared location lib/pts - mkdir -p $shareddir/lib/pts - cp -vau lib/pts $shareddir/lib - rm -vrf lib/pts - ln -vs $shareddir/lib/pts $out/lib/pts - chmod a+rwx $shareddir/lib/pts - # link out writable shared location lib/nas/ - mkdir -p $shareddir/lib/nas - cp -vau lib/nas $shareddir/lib - rm -vrf lib/nas - ln -vs $shareddir/lib/nas $out/lib/nas - chmod a+rwx $shareddir/lib/nas - # link out shared lib/pixmaps (not sure about this, yet): - mkdir -p $shareddir/lib/pixmaps - cp -vau lib/pixmaps $shareddir/lib - rm -vrf lib/pixmaps - ln -vs $shareddir/lib/pixmaps $out/lib/pixmaps - chmod a+rwx $shareddir/lib/pixmaps - # bulk copy - cp -vau * $out - - # replace arb script - mv $out/bin/arb $out/bin/arb.orig - cat > $out/bin/arb << ARB - #!/bin/sh - - echo Starting Nix compiled arb from $out - echo Shared databases are located in $shareddir - # sometimes local profiles override these: - export ARBHOME=$out - export LD_LIBRARY=$ARBHOME/lib - - $out/bin/arb_ntree $* - - ARB - - chmod +x $out/bin/arb - ''; - - meta = { - description = "Software for sequence database handling and analysis"; - longDescription = ''The ARB software is a graphically oriented package comprising various tools for sequence database handling and data analysis. A central database of processed (aligned) sequences and any type of additional data linked to the respective sequence entries is structured according to phylogeny or other user defined criteria. Note that this package includes its own older versions of clustal etc.''; - license = "non-free"; - pkgMaintainer = "http://BioLib.open-bio.org/"; - homepage = http://www.arb-home.de/; - priority = "10"; # because it includes binaries of clustal etc. - broken = true; - }; -} diff --git a/pkgs/applications/science/biology/arb/makefile.patch b/pkgs/applications/science/biology/arb/makefile.patch deleted file mode 100644 index 8e7962511af..00000000000 --- a/pkgs/applications/science/biology/arb/makefile.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -r a1e04cdafd13 Makefile ---- a/Makefile Thu Sep 25 11:59:19 2008 +0200 -+++ b/Makefile Thu Sep 25 11:59:27 2008 +0200 -@@ -109,7 +109,7 @@ endif - - ALLOWED_GCC_295_VERSIONS=2.95.3 - ALLOWED_GCC_3xx_VERSIONS=3.2 3.3.1 3.3.3 3.3.4 3.3.5 3.3.6 3.4.0 3.4.2 3.4.3 --ALLOWED_GCC_4xx_VERSIONS=4.0.0 4.0.2 4.0.3 4.1.1 4.1.2 4.1.3 4.2.0 4.2.1 4.2.3 -+ALLOWED_GCC_4xx_VERSIONS=4.0.0 4.0.2 4.0.3 4.1.1 4.1.2 4.1.3 4.2.0 4.2.1 4.2.3 4.2.4 - ALLOWED_GCC_VERSIONS=$(ALLOWED_GCC_295_VERSIONS) $(ALLOWED_GCC_3xx_VERSIONS) $(ALLOWED_GCC_4xx_VERSIONS) - - GCC_VERSION_FOUND=$(shell $(GCC) -dumpversion) diff --git a/pkgs/applications/science/geometry/tetgen/1.4.nix b/pkgs/applications/science/geometry/tetgen/1.4.nix new file mode 100644 index 00000000000..d542bf87c79 --- /dev/null +++ b/pkgs/applications/science/geometry/tetgen/1.4.nix @@ -0,0 +1,21 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "tetgen-1.4.3"; + + src = fetchurl { + url = "${meta.homepage}/files/tetgen1.4.3.tar.gz"; + sha256 = "0d70vjqdapmy1ghlsxjlvl5z9yp310zw697bapc4zxmp0sxi29wm"; + }; + + installPhase = '' + mkdir -p $out/bin + cp tetgen $out/bin + ''; + + meta = { + description = "Quality Tetrahedral Mesh Generator and 3D Delaunay Triangulator"; + homepage = "http://tetgen.org/"; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/applications/science/geometry/tetgen/default.nix b/pkgs/applications/science/geometry/tetgen/default.nix index ddfb92def95..8a0565fce10 100644 --- a/pkgs/applications/science/geometry/tetgen/default.nix +++ b/pkgs/applications/science/geometry/tetgen/default.nix @@ -1,11 +1,12 @@ {stdenv, fetchurl}: -stdenv.mkDerivation rec { - name = "tetgen-1.4.3"; +let version = "1.5.0"; in +stdenv.mkDerivation { + name = "tetgen-${version}"; src = fetchurl { - url = "${meta.homepage}/files/tetgen1.4.3.tar.gz"; - sha256 = "0d70vjqdapmy1ghlsxjlvl5z9yp310zw697bapc4zxmp0sxi29wm"; + url = "http://wias-berlin.de/software/tetgen/1.5/src/tetgen${version}.tar.gz"; + sha256 = "1www3x2r6r7pck43ismlwy82x0j6xj2qiwvfs2pn687gsmhlh4ad"; }; installPhase = '' @@ -14,8 +15,9 @@ stdenv.mkDerivation rec { ''; meta = { + inherit version; description = "Quality Tetrahedral Mesh Generator and 3D Delaunay Triangulator"; homepage = "http://tetgen.org/"; - license = stdenv.lib.licenses.mit; + license = stdenv.lib.licenses.agpl3Plus; }; } diff --git a/pkgs/applications/science/logic/gappa/default.nix b/pkgs/applications/science/logic/gappa/default.nix new file mode 100644 index 00000000000..71114d2f9e1 --- /dev/null +++ b/pkgs/applications/science/logic/gappa/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, gmp, mpfr, boost }: + +stdenv.mkDerivation { + name = "gappa-1.2"; + + src = fetchurl { + url = https://gforge.inria.fr/frs/download.php/file/34787/gappa-1.2.0.tar.gz; + sha256 = "03hfzmaf5jm54sjpbks20q7qixpmagrfbnyyc276vgmiyslk4dkh"; + }; + + buildInputs = [ gmp mpfr boost.dev ]; + + buildPhase = "./remake"; + installPhase = "./remake install"; + + meta = { + homepage = http://gappa.gforge.inria.fr/; + description = "Verifying and formally proving properties on numerical programs dealing with floating-point or fixed-point arithmetic"; + license = with stdenv.lib.licenses; [ cecill20 gpl2 ]; + maintainers = with stdenv.lib.maintainers; [ vbgl ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/applications/version-management/gitolite/default.nix b/pkgs/applications/version-management/gitolite/default.nix index 72640662ead..60e0a794705 100644 --- a/pkgs/applications/version-management/gitolite/default.nix +++ b/pkgs/applications/version-management/gitolite/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, perl, git }: +{ stdenv, fetchurl, git, nettools, perl }: stdenv.mkDerivation rec { name = "gitolite-${version}"; - version = "3.6.2"; + version = "3.6.3"; src = fetchurl { url = "https://github.com/sitaramc/gitolite/archive/v${version}.tar.gz"; - sha256 = "1gsgzi9ayb4rablki3mqr11b0h8db4xg43df660marfpacmkfb01"; + sha256 = "16cxifjxnri719qb6zzwkdf61x5y957acbdhcgqcan23x1mfn84v"; }; - buildInputs = [ perl git ]; + buildInputs = [ git nettools perl ]; buildPhase = "true"; patchPhase = '' @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { --replace /usr/bin/perl "${perl}/bin/perl" substituteInPlace src/lib/Gitolite/Hooks/Update.pm \ --replace /usr/bin/perl "${perl}/bin/perl" + substituteInPlace src/lib/Gitolite/Setup.pm \ + --replace hostname "${nettools}/bin/hostname" ''; installPhase = '' @@ -30,6 +32,6 @@ stdenv.mkDerivation rec { homepage = http://gitolite.com/gitolite/index.html; license = licenses.gpl2; platforms = platforms.unix; - maintainers = [ maintainers.thoughtpolice ]; + maintainers = [ maintainers.thoughtpolice maintainers.lassulus ]; }; } diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index 0d7534e6758..b1dc6e7be31 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -76,6 +76,9 @@ in , # If set, don't download the file, but write a list of all possible # URLs (resulting from resolving mirror:// URLs) to $out. showURLs ? false + +, # Meta information, if any. + meta ? {} }: assert builtins.isList urls; @@ -120,4 +123,6 @@ if (!hasHash) then throw "Specify hash for fetchurl fixed-output derivation: ${s # Doing the download on a remote machine just duplicates network # traffic, so don't do that. preferLocalBuild = true; + + inherit meta; } diff --git a/pkgs/build-support/ocaml/default.nix b/pkgs/build-support/ocaml/default.nix new file mode 100644 index 00000000000..87bfa6cea12 --- /dev/null +++ b/pkgs/build-support/ocaml/default.nix @@ -0,0 +1,36 @@ +{ stdenv, writeText, ocaml, findlib, camlp4 }: + +{ name, version, buildInputs ? [], + createFindlibDestdir ? true, + dontStrip ? true, + minimumSupportedOcamlVersion ? null, + hasSharedObjects ? false, + setupHook ? null, + meta ? {}, ... +}@args: +let + ocaml_version = (builtins.parseDrvName ocaml.name).version; + defaultMeta = { + platforms = ocaml.meta.platforms; + }; +in + assert minimumSupportedOcamlVersion != null -> + stdenv.lib.versionOlder minimumSupportedOcamlVersion ocaml_version; + +stdenv.mkDerivation (args // { + name = "ocaml-${name}-${version}"; + + buildInputs = [ ocaml findlib camlp4 ] ++ buildInputs; + + setupHook = if setupHook == null && hasSharedObjects + then writeText "setupHook.sh" '' + export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml_version}/site-lib/${name}/" + '' + else setupHook; + + inherit ocaml_version; + inherit createFindlibDestdir; + inherit dontStrip; + + meta = defaultMeta // meta; +}) diff --git a/pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix index cebbce78177..7d610c79b49 100644 --- a/pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix @@ -2,16 +2,16 @@ , pkgconfig, gtk3, glib, hicolor_icon_theme , makeWrapper, itstool, gnupg, libsoup , gnome3, librsvg, gdk_pixbuf, gpgme -, libsecret, avahi, p11_kit }: +, libsecret, avahi, p11_kit, openssh }: let - majVer = "3.14"; + majVer = gnome3.version; in stdenv.mkDerivation rec { - name = "seahorse-${majVer}.1"; + name = "seahorse-${majVer}.0"; src = fetchurl { url = "mirror://gnome/sources/seahorse/${majVer}/${name}.tar.xz"; - sha256 = "14syy2qxxrim220aj64mbp76jbrrc6wmdwc4lfl4sngsh84qjah9"; + sha256 = "0cg1grgpwbfkiny5148n17rzpc8kswyr5yff0kpm8l3lp01my2kp"; }; doCheck = true; @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { gnome3.gsettings_desktop_schemas makeWrapper gnupg gdk_pixbuf gnome3.adwaita-icon-theme librsvg gpgme libsecret avahi libsoup p11_kit vala gnome3.gcr - hicolor_icon_theme gnome3.adwaita-icon-theme ]; + hicolor_icon_theme gnome3.adwaita-icon-theme openssh ]; preFixup = '' wrapProgram "$out/bin/seahorse" \ diff --git a/pkgs/desktops/gnome-3/3.16/core/mutter/default.nix b/pkgs/desktops/gnome-3/3.16/core/mutter/default.nix index 3df5d9f55d9..9b91cd98777 100644 --- a/pkgs/desktops/gnome-3/3.16/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/mutter/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { - name = "mutter-${gnome3.version}.1.1"; + name = "mutter-${gnome3.version}.2"; src = fetchurl { url = "mirror://gnome/sources/mutter/${gnome3.version}/${name}.tar.xz"; - sha256 = "07059jmwhc7zf2gww2xw94hhy4csjj2v30ivyzllbas2nvv88l3r"; + sha256 = "0qq7gpkljn1z45sg2sxvmia52krj4ck2541iar89z99s1cppaasa"; }; # fatal error: gio/gunixfdlist.h: No such file or directory @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; + patches = [ ./x86.patch ]; + meta = with stdenv.lib; { platforms = platforms.linux; maintainers = [ maintainers.lethalman ]; diff --git a/pkgs/desktops/gnome-3/3.16/core/mutter/x86.patch b/pkgs/desktops/gnome-3/3.16/core/mutter/x86.patch new file mode 100644 index 00000000000..bc8829de42f --- /dev/null +++ b/pkgs/desktops/gnome-3/3.16/core/mutter/x86.patch @@ -0,0 +1,20 @@ +--- mutter-3.16.2/src/core/window.c.orig 2015-05-26 10:52:41.382834963 +0200 ++++ mutter-3.16.2/src/core/window.c 2015-05-26 10:53:03.039948034 +0200 +@@ -3499,7 +3499,7 @@ + + static MetaMonitorInfo * + find_monitor_by_winsys_id (MetaWindow *window, +- guint winsys_id) ++ gint winsys_id) + { + int i; + +@@ -3618,7 +3618,7 @@ + */ + + gboolean did_placement; +- guint old_output_winsys_id; ++ gint old_output_winsys_id; + MetaRectangle unconstrained_rect; + MetaRectangle constrained_rect; + MetaMoveResizeResultFlags result = 0; diff --git a/pkgs/development/compilers/gcc/gfortran-darwin.nix b/pkgs/development/compilers/gcc/gfortran-darwin.nix new file mode 100644 index 00000000000..954b236ff6f --- /dev/null +++ b/pkgs/development/compilers/gcc/gfortran-darwin.nix @@ -0,0 +1,26 @@ +# This is a derivation specific to OS X (Darwin). It may work on other +# systems as well but has not been tested. +{gmp, mpfr, libmpc, fetchurl, stdenv}: + +stdenv.mkDerivation rec { + name = "gfortran-${version}"; + version = "5.1.0"; + buildInputs = [gmp mpfr libmpc]; + src = fetchurl { + url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2"; + sha256 = "1bd5vj4px3s8nlakbgrh38ynxq4s654m6nxz7lrj03mvkkwgvnmp"; + }; + configureFlags = '' + --enable-languages=fortran --enable-checking=release --disable-bootstrap + --with-gmp=${gmp} + --with-mpfr=${mpfr} + --with-mpc=${libmpc} + ''; + makeFlags = ["CC=clang"]; + meta = with stdenv.lib; { + description = "GNU Fortran compiler, part of the GNU Compiler Collection."; + homepage = "https://gcc.gnu.org/fortran/"; + license = licenses.gpl3Plus; + platforms = platforms.darwin; + }; +} diff --git a/pkgs/development/compilers/llvm/3.6/clang/default.nix b/pkgs/development/compilers/llvm/3.6/clang/default.nix index 898ca37558e..ecca67398ec 100644 --- a/pkgs/development/compilers/llvm/3.6/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.6/clang/default.nix @@ -6,7 +6,7 @@ in stdenv.mkDerivation { name = "clang-${version}"; unpackPhase = '' - unpackFile ${fetch "cfe" "0b8825mvdhfk5r9gwcwp1j2dl9kw5glgyk7pybq2dzhrh4vnj3my"} + unpackFile ${fetch "cfe" "1myssbxlyln0nggfz04nfrbzdckljksmaxp82nq7hrmqjc62vybl"} mv cfe-${version}.src clang sourceRoot=$PWD/clang unpackFile ${clang-tools-extra_src} diff --git a/pkgs/development/compilers/llvm/3.6/default.nix b/pkgs/development/compilers/llvm/3.6/default.nix index 624fc68c21a..3321e38949f 100644 --- a/pkgs/development/compilers/llvm/3.6/default.nix +++ b/pkgs/development/compilers/llvm/3.6/default.nix @@ -2,7 +2,7 @@ let callPackage = newScope (self // { inherit isl version fetch; }); - version = "3.6.0"; + version = "3.6.1"; fetch = fetch_v version; fetch_v = ver: name: sha256: fetchurl { @@ -10,8 +10,8 @@ let inherit sha256; }; - compiler-rt_src = fetch "compiler-rt" "04bbn946jninynkrjyp337xqs8ihn4fkz5xgvmywxkddwmwznjbz"; - clang-tools-extra_src = fetch "clang-tools-extra" "04n83gsmy2ghvn7vp9hamsgn332rx2g7sa4paskr0d4ihax4ka9s"; + compiler-rt_src = fetch "compiler-rt" "17v4gf4y5krgkrd12r95hfxbw5q4c4jlf3513kqlfq5yfw663gzw"; + clang-tools-extra_src = fetch "clang-tools-extra" "1dljzdk2jmrwyh8z92rljxl9wzdggp74i9f6g8aajl6mf3c71vpl"; self = { llvm = callPackage ./llvm.nix { diff --git a/pkgs/development/compilers/llvm/3.6/libc++/default.nix b/pkgs/development/compilers/llvm/3.6/libc++/default.nix index a01d15e186b..5bc122fa5ce 100644 --- a/pkgs/development/compilers/llvm/3.6/libc++/default.nix +++ b/pkgs/development/compilers/llvm/3.6/libc++/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "libc++-${version}"; - src = fetch "libcxx" "1dzvhyrzj54v823biadag5lwxfz37gm8a65aq72pjsh8n211x719"; + src = fetch "libcxx" "1yf0ns4cvvirp1ml5a8h29lysnw5c23715b09x68v5zkxhxnap2s"; # instead of allowing libc++ to link with /usr/lib/libc++abi.dylib, # force it to link with our copy diff --git a/pkgs/development/compilers/llvm/3.6/libc++abi.nix b/pkgs/development/compilers/llvm/3.6/libc++abi.nix index ddc9c267edd..6cd08e46e63 100644 --- a/pkgs/development/compilers/llvm/3.6/libc++abi.nix +++ b/pkgs/development/compilers/llvm/3.6/libc++abi.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "libc++abi-${version}"; - src = fetch "libcxxabi" "1xclv63l7cmrxkl129w6j9fsxgdm8jjlcm8gswl2y9qmh3dwz2zp"; + src = fetch "libcxxabi" "0pgimy1b5vj4favzdz2830n917fyz65hm3khdgkbgnfs43s8g0xw"; buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin) libunwind; diff --git a/pkgs/development/compilers/llvm/3.6/lldb.nix b/pkgs/development/compilers/llvm/3.6/lldb.nix index d4f496a1749..4740c97cb9b 100644 --- a/pkgs/development/compilers/llvm/3.6/lldb.nix +++ b/pkgs/development/compilers/llvm/3.6/lldb.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { name = "lldb-${version}"; - src = fetch "lldb" "1cphxbc8c0yqs2rxn94vcn8his465m97rnynklpzm8sf5kad26ib"; + src = fetch "lldb" "1fmaz7zcc1f54ns4x8rx9nvhh4pyrhbz103bl02sv1cfwxj5ryyf"; patchPhase = '' sed -i 's|/usr/bin/env||' \ diff --git a/pkgs/development/compilers/llvm/3.6/llvm.nix b/pkgs/development/compilers/llvm/3.6/llvm.nix index 736ffca295f..f23ac614b5c 100644 --- a/pkgs/development/compilers/llvm/3.6/llvm.nix +++ b/pkgs/development/compilers/llvm/3.6/llvm.nix @@ -15,7 +15,7 @@ }: let - src = fetch "llvm" "1kmr5vlnz1419nnvyc7lsrcfx09n65ravjbmzxrqz7ml07jnk6mk"; + src = fetch "llvm" "0ypwcqrld91jn0zz4mkdksl2mbb0ds9lh5gf0xkbb81sj4awc01g"; in stdenv.mkDerivation rec { name = "llvm-${version}"; diff --git a/pkgs/development/compilers/rustc/1.0.0.nix b/pkgs/development/compilers/rustc/1.0.0.nix index bd02397986b..a85ed9290fe 100644 --- a/pkgs/development/compilers/rustc/1.0.0.nix +++ b/pkgs/development/compilers/rustc/1.0.0.nix @@ -2,7 +2,7 @@ callPackage ./makeRustcDerivation.nix { shortVersion = "1.0.0"; isRelease = true; - srcSha = "1fjyk5xhg9dx85d1kkjmb1jai7awvdmzcjf2fdmi2pdjyzacn163"; + srcSha = "14brziw91d3r88fa1kvpvhap5ws4z8h2mas7h6k9lpsc2zl9blak"; snapshotHashLinux686 = "1ef82402ed16f5a6d2f87a9a62eaa83170e249ec"; snapshotHashLinux64 = "ef2154372e97a3cb687897d027fd51c8f2c5f349"; snapshotHashDarwin686 = "0310b1a970f2da7e61770fd14dbbbdca3b518234"; diff --git a/pkgs/development/compilers/rustc/makeRustcDerivation.nix b/pkgs/development/compilers/rustc/makeRustcDerivation.nix index ae3981f1add..6208190f8df 100644 --- a/pkgs/development/compilers/rustc/makeRustcDerivation.nix +++ b/pkgs/development/compilers/rustc/makeRustcDerivation.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, fetchgit, which, file, perl, curl, python27, makeWrapper -, tzdata, git, valgrind, procps, coreutils +{ stdenv, fetchurl, fetchgit, fetchzip, which, file, perl, curl, python27 +, makeWrapper, tzdata, git, valgrind, procps, coreutils , shortVersion, isRelease , srcSha, srcRev ? "" @@ -85,7 +85,7 @@ stdenv.mkDerivation { inherit meta; src = if isRelease then - fetchurl { + fetchzip { url = "http://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"; sha256 = srcSha; } diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 1432b9361db..ce7b8b27d32 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -115,9 +115,6 @@ self: super: { # Cannot compile its own test suite: https://github.com/haskell/network-uri/issues/10. network-uri = dontCheck super.network-uri; - # Agda-2.4.2.2 needs these overrides to compile. - Agda = super.Agda.override { equivalence = self.equivalence_0_2_5; cpphs = self.cpphs_1_18_9; }; - # Help libconfig find it's C language counterpart. libconfig = (dontCheck super.libconfig).override { config = pkgs.libconfig; }; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 178a5906e6c..678faa1c54c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -127,7 +127,7 @@ self: super: { # Until the changes have been pushed to Hackage mueval = appendPatch super.mueval (pkgs.fetchpatch { url = "https://github.com/gwern/mueval/commit/c41aa40ed63b74c069d1e4e3caa8c8d890cde960.patch"; - sha256 = "1gs8p89d1qsrd1qycbhf6kv4qw0sbb8m6dy106dqkmdzcjzcyq74"; + sha256 = "0h1lx4z15imq009k0qmwkn5l3hmigw463ahvwffdnszi2n618kpg"; }); present = appendPatch super.present (pkgs.fetchpatch { url = "https://github.com/chrisdone/present/commit/6a61f099bf01e2127d0c68f1abe438cd3eaa15f7.patch"; @@ -166,7 +166,7 @@ self: super: { misfortune = appendPatch super.misfortune (pkgs.fetchpatch { url = "https://github.com/mokus0/misfortune/commit/9e0a38cf8d59a0de9ae1156034653f32099610e4.patch"; - sha256 = "15frwdallm3i6k7mil26bbjd4wl6k9h20ixf3cmyris3q3jhlcfh"; + sha256 = "01m1l199ihq85j9pyc3n0wqv1z4my453hhhcvg3yz3gpz3lf224r"; }); timezone-series = doJailbreak super.timezone-series; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 74bf9011231..2f03b30e0ad 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -654,26 +654,25 @@ self: { "Agda" = callPackage ({ mkDerivation, alex, array, base, binary, boxes, bytestring - , containers, cpphs, data-hash, deepseq, directory, emacs - , equivalence, filepath, geniplate, happy, hashable, hashtables - , haskeline, haskell-src-exts, mtl, parallel, pretty, process - , QuickCheck, STMonadTrans, strict, template-haskell, text, time - , transformers, unordered-containers, xhtml, zlib + , containers, cpphs, data-hash, deepseq, directory, edit-distance + , emacs, equivalence, filepath, geniplate-mirror, happy, hashable + , hashtables, haskeline, haskell-src-exts, mtl, parallel, pretty + , process, QuickCheck, strict, template-haskell, text, time + , transformers, transformers-compat, unordered-containers, xhtml + , zlib }: mkDerivation { pname = "Agda"; - version = "2.4.2.2"; - revision = "1"; - sha256 = "1hxvapnvlkx6imifswc70ng869zll0zfsygivhc2mjyhaiv10i13"; - editedCabalFile = "b604adb3c6609d27384834ce1d9483841245ac3d59e07571bc1ec114a080dcf3"; + version = "2.4.2.3"; + sha256 = "09vvipvab6bys8g7cdka1iirs0wc0jzcyynncccgb614wd2yyvdw"; isLibrary = true; isExecutable = true; buildDepends = [ array base binary boxes bytestring containers data-hash deepseq - directory equivalence filepath geniplate hashable hashtables - haskeline haskell-src-exts mtl parallel pretty process QuickCheck - STMonadTrans strict template-haskell text time transformers - unordered-containers xhtml zlib + directory edit-distance equivalence filepath geniplate-mirror + hashable hashtables haskeline haskell-src-exts mtl parallel pretty + process QuickCheck strict template-haskell text time transformers + transformers-compat unordered-containers xhtml zlib ]; buildTools = [ alex cpphs emacs happy ]; jailbreak = true; @@ -1057,8 +1056,8 @@ self: { }: mkDerivation { pname = "BNFC"; - version = "2.7.1"; - sha256 = "1n9l64wzga3i7ifh2k5rwhxp60gb0av5fszygw5mvr31r64cf4fp"; + version = "2.8"; + sha256 = "0d3zcxspxcpnifv3kqg8d6gp01wxybakcbw7jh69gqg8rzfmzgi1"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -8944,10 +8943,8 @@ self: { }: mkDerivation { pname = "JuicyPixels"; - version = "3.2.4"; - revision = "1"; - sha256 = "113w66rd6h04x0zbkqh34x33pf15hmrn3l9yy8kirs55kbg266w0"; - editedCabalFile = "0ea6de6b2defec5f1be0f98fc995b3a9654fbf8d3b34cd3fa77a0f2e3919dc2b"; + version = "3.2.5.1"; + sha256 = "11wpk4lr7h7s7mhl48i27dq1wwvzjviv2fnq3yl8dnikcl00k6dq"; buildDepends = [ base binary bytestring containers deepseq mtl primitive transformers vector zlib @@ -12643,16 +12640,16 @@ self: { }) {}; "Rasterific" = callPackage - ({ mkDerivation, base, dlist, FontyFruity, free, JuicyPixels, mtl - , primitive, vector, vector-algorithms + ({ mkDerivation, base, bytestring, containers, dlist, FontyFruity + , free, JuicyPixels, mtl, primitive, vector, vector-algorithms }: mkDerivation { pname = "Rasterific"; - version = "0.5.2.1"; - sha256 = "1wd12l4vpav3jsjf2mib5yrblys5aifwq6xniqm4l92qs5vjh4a2"; + version = "0.6.1"; + sha256 = "1y9jciiaam0dn2falhxc0nb97vy35dfvv71xzc1bhiw4gn66n4rm"; buildDepends = [ - base dlist FontyFruity free JuicyPixels mtl primitive vector - vector-algorithms + base bytestring containers dlist FontyFruity free JuicyPixels mtl + primitive vector vector-algorithms ]; description = "A pure haskell drawing engine"; license = stdenv.lib.licenses.bsd3; @@ -17385,7 +17382,9 @@ self: { mkDerivation { pname = "aeson-native"; version = "0.3.3.2"; + revision = "1"; sha256 = "1s5i88r8sdd7ayrpjw6f18273k6r0igk0sswb503hzvjagzmzffh"; + editedCabalFile = "c9519a30bce75564cfbe84aade5ffb99fad12ecea1c7d2c362cca2234b8ae497"; buildDepends = [ attoparsec base blaze-builder blaze-textual-native bytestring containers deepseq hashable mtl old-locale syb text time @@ -20824,21 +20823,21 @@ self: { }) {}; "asciidiagram" = callPackage - ({ mkDerivation, base, containers, filepath, FontyFruity - , JuicyPixels, lens, linear, mtl, optparse-applicative + ({ mkDerivation, base, bytestring, containers, directory, filepath + , FontyFruity, JuicyPixels, lens, linear, mtl, optparse-applicative , rasterific-svg, svg-tree, text, vector }: mkDerivation { pname = "asciidiagram"; - version = "1.1"; - sha256 = "0vd4m3i4997vdd5wzy3jbidaz4rcsncqjdz0pf5ggrm9c5a8jb2y"; + version = "1.1.1.1"; + sha256 = "0nzg4m1nd41x6fyki5qva5jj80sl7jd1z1gd674v50zchkw71a9m"; isLibrary = true; isExecutable = true; buildDepends = [ - base containers filepath FontyFruity JuicyPixels lens linear mtl - optparse-applicative rasterific-svg svg-tree text vector + base bytestring containers directory filepath FontyFruity + JuicyPixels lens linear mtl optparse-applicative rasterific-svg + svg-tree text vector ]; - jailbreak = true; description = "Pretty rendering of Ascii diagram into svg or png"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -23032,8 +23031,8 @@ self: { ({ mkDerivation, base, ghc-prim, hspec }: mkDerivation { pname = "base-orphans"; - version = "0.3.1"; - sha256 = "12nabqwniywwxsysdk0kh1zscdwyjk10z1fk3iqqcg0bqmyb67i5"; + version = "0.3.2"; + sha256 = "1qbnhxchl2kdjbwqz3mp7rq963w6y6ws4kflmv6hmcp25aaqh6pl"; buildDepends = [ base ghc-prim ]; testDepends = [ base hspec ]; homepage = "https://github.com/haskell-compat/base-orphans#readme"; @@ -35590,6 +35589,7 @@ self: { base cprng-aes crypto-random crypto-random-effect extensible-effects ]; + jailbreak = true; homepage = "https://github.com/ibotty/crypto-random-effect"; description = "Run random effect using cprng-aes, a crypto pseudo number generator"; license = stdenv.lib.licenses.mit; @@ -36491,6 +36491,7 @@ self: { base bytestring crypto-random extensible-effects securemem transformers ]; + jailbreak = true; homepage = "https://github.com/ibotty/crypto-random-effect"; description = "A random effect using crypto-random"; license = stdenv.lib.licenses.mit; @@ -37813,21 +37814,19 @@ self: { "darkplaces-rcon-util" = callPackage ({ mkDerivation, base, bytestring, ConfigFile, containers , darkplaces-rcon, darkplaces-text, directory, filepath, haskeline - , HostAndPort, hspec, hspec-core, mtl, old-locale - , optparse-applicative, text, time, utf8-string + , HostAndPort, hspec, hspec-core, mtl, optparse-applicative, text + , time, utf8-string }: mkDerivation { pname = "darkplaces-rcon-util"; - version = "0.1"; - revision = "3"; - sha256 = "0accwwwifhmlnrc5rqb9kc44mcrpbfibakip8pwi2aqs7xvchavr"; - editedCabalFile = "c26b82e362cada670c0edc2c27c5c571f1898edb5ec29ab4c35d913c537b264d"; + version = "0.1.1"; + sha256 = "1xv9906ag2vgkzbk66f9r6lr5j6qwlwss246hjl7iriq315dmqlg"; isLibrary = true; isExecutable = true; buildDepends = [ base bytestring ConfigFile containers darkplaces-rcon darkplaces-text directory filepath haskeline HostAndPort mtl - old-locale optparse-applicative text time utf8-string + optparse-applicative text time utf8-string ]; testDepends = [ base bytestring darkplaces-rcon darkplaces-text hspec hspec-core @@ -46625,6 +46624,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "exherbo-cabal" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers + , haddock-library, http-client, pcre-light, pretty + }: + mkDerivation { + pname = "exherbo-cabal"; + version = "0.1.0.0"; + sha256 = "0ap3j5shgy5l1crsyq6dkz2g4gd9y7r8vx4rsppib7y0gqqczpfm"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + base bytestring Cabal containers haddock-library http-client + pcre-light pretty + ]; + jailbreak = true; + description = "Exheres generator for cabal packages"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "exif" = callPackage ({ mkDerivation, base, exif }: mkDerivation { @@ -46984,19 +47003,20 @@ self: { "extensible-effects" = callPackage ({ mkDerivation, base, HUnit, QuickCheck, test-framework - , test-framework-hunit, test-framework-quickcheck2, transformers - , transformers-base, type-aligned, void + , test-framework-hunit, test-framework-quickcheck2 + , test-framework-th, transformers, transformers-base, type-aligned + , void }: mkDerivation { pname = "extensible-effects"; - version = "1.9.2.2"; - sha256 = "07mhvwxbqzn8bhhcgyc9b7bzbf1axbxsg3ps8b3zsz35r480irc3"; + version = "1.10.0.1"; + sha256 = "0zj72lnwncy9diagicp1xkvryakal17p5fslv1pl731z8janal1s"; buildDepends = [ base transformers transformers-base type-aligned void ]; testDepends = [ base HUnit QuickCheck test-framework test-framework-hunit - test-framework-quickcheck2 void + test-framework-quickcheck2 test-framework-th void ]; homepage = "https://github.com/suhailshergill/extensible-effects"; description = "An Alternative to Monad Transformers"; @@ -47776,8 +47796,8 @@ self: { }: mkDerivation { pname = "feed"; - version = "0.3.9.4"; - sha256 = "18jq1zw1qb2z6lga2vpn4z7dsylglgzl4bskb9x2skw9wv7pgsnk"; + version = "0.3.9.5"; + sha256 = "1kbi0hb2ywp5qbhjw65p86bj4cxag9ngi5dvjcjd63r673kwicv1"; buildDepends = [ base old-locale old-time time time-locale-compat utf8-string xml ]; @@ -48231,8 +48251,8 @@ self: { ({ mkDerivation, base, bytestring, clock, directory, zip-archive }: mkDerivation { pname = "file-collection"; - version = "0.1.1.6"; - sha256 = "12rsizcxisys6bf3z3ghmqpm2201pyqpihhyhhx2s14mgmf53l7l"; + version = "0.1.1.9"; + sha256 = "06bcj143j85p8m519zn88z6qn4bg5ifrw5pv5yva5x49gc3jq6gc"; buildDepends = [ base bytestring clock directory zip-archive ]; homepage = "https://github.com/joelwilliamson/file-collection"; description = "Provide a uniform interface over file archives and directories"; @@ -48317,8 +48337,8 @@ self: { }: mkDerivation { pname = "filediff"; - version = "1.0.0.5"; - sha256 = "1mi0qywbaw0v3ilscmrn3cq467f8y2p09v4xsfa1hk90aybyz2lv"; + version = "2.0.0"; + sha256 = "15a02dya0qhgxq98whxza268vqsrkw6b1ipdskw3hwnjp02hnc9p"; buildDepends = [ base bytestring data-default data-memocombinators directory either hashmap mtl rainbow tasty tasty-hunit text threads time @@ -51823,9 +51843,10 @@ self: { ({ mkDerivation, base, mtl, template-haskell }: mkDerivation { pname = "geniplate-mirror"; - version = "0.6.0.6"; - sha256 = "1fgs9aak7l7r3xlgna1kbq43zm55nd43phsv0w4ssy305dqylshj"; + version = "0.6.0.7"; + sha256 = "0az8q9jjakbi891ypzm4qg8ys78102zqxqpznk6mm08ng2hzb0wz"; buildDepends = [ base mtl template-haskell ]; + homepage = "https://github.com/danr/geniplate"; description = "Use Template Haskell to generate Uniplate-like functions"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -56079,21 +56100,37 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "hBDD"; - version = "0.0.2"; - sha256 = "15pq6r8kz7ki1siz9xihd85qck9gnkp17cdz331srgr5kzij3lgv"; + version = "0.0.3"; + sha256 = "1jj8hj8wl95fy0n1qixhra4sqlmgddgn080plk7q7iv000qv67gk"; buildDepends = [ base ]; description = "An abstraction layer for BDD libraries"; license = "LGPL"; }) {}; + "hBDD-CMUBDD" = callPackage + ({ mkDerivation, base, bdd, c2hs, containers, deepseq, hBDD, mem + , unix + }: + mkDerivation { + pname = "hBDD-CMUBDD"; + version = "0.0.3"; + sha256 = "16pvi496qi3q2rrw08p6lndnsz6d6p65i8m10ldjlh143y8k9ga9"; + buildDepends = [ base containers deepseq hBDD unix ]; + buildTools = [ c2hs ]; + extraLibraries = [ bdd mem ]; + description = "An FFI binding to CMU/Long's BDD library"; + license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) { bdd = null; mem = null;}; + "hBDD-CUDD" = callPackage ({ mkDerivation, base, c2hs, containers, cudd, deepseq, epd, hBDD , mtr, st, unix, util }: mkDerivation { pname = "hBDD-CUDD"; - version = "0.0.2"; - sha256 = "0rjfycxnhwwylpdb5sm4kqzypfbigzmx6azrs44sixmkq0cv5yb4"; + version = "0.0.3"; + sha256 = "1r94nj23pj134bd5b2mqk01g8xvbcn4ik2xs9yp01v1jg2clhjha"; buildDepends = [ base containers deepseq hBDD unix ]; buildTools = [ c2hs ]; extraLibraries = [ cudd epd mtr st util ]; @@ -61877,7 +61914,9 @@ self: { mkDerivation { pname = "hbro"; version = "1.4.0.0"; + revision = "1"; sha256 = "08vw5j3a22gszbsjhjp13dkgvxj2875zjsx6w3w7c2dkjg4lijpr"; + editedCabalFile = "331a844037ba6df7831151e45e40223eed66313dabef7dc0285a6e658747b15c"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -62081,12 +62120,12 @@ self: { }: mkDerivation { pname = "hdaemonize"; - version = "0.5.0.0"; - sha256 = "15dyaa9rbmsjp3sg9yxg1i90kfy9rvlzmwg5kl8kwal69ajzjjgv"; + version = "0.5.0.1"; + sha256 = "03daf8qb8x0503h5k2vr6r4lyv6fv1a5n6mhykx5872khl81d8ms"; buildDepends = [ base extensible-exceptions filepath hsyslog mtl unix ]; - homepage = "http://github.com/madhadron/hdaemonize"; + homepage = "http://github.com/greydot/hdaemonize"; description = "Library to handle the details of writing daemons for UNIX"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -64824,8 +64863,8 @@ self: { }: mkDerivation { pname = "hjsonschema"; - version = "0.5.3.2"; - sha256 = "0w4m50glqvqipv99bk55jipzdga8dwics0sw1k52kmbf34qac5ih"; + version = "0.6.0.0"; + sha256 = "01v2nb77bp94jx9va757b2iimvvi9p73aqw7izyrqp1li4gd6yq2"; buildDepends = [ aeson base bytestring file-embed hashable hjsonpointer http-client http-types regexpr scientific text unordered-containers vector @@ -69076,10 +69115,9 @@ self: { ({ mkDerivation, base, hslogger, mtl, template-haskell }: mkDerivation { pname = "hslogger-template"; - version = "2.0.2"; - sha256 = "0qkyclj9fajvzbfcs0ik8ncy66x916r40jd85r4wi5nh482i7sp3"; + version = "2.0.3"; + sha256 = "1q5g2jgx4yjzvbrc22qcxrb3r9cma64jg90wzx9yc19yxq0fa95k"; buildDepends = [ base hslogger mtl template-haskell ]; - jailbreak = true; description = "Automatic generation of hslogger functions"; license = stdenv.lib.licenses.publicDomain; }) {}; @@ -73001,8 +73039,8 @@ self: { }: mkDerivation { pname = "ide-backend-common"; - version = "0.9.1.1"; - sha256 = "1k3sp9byqmhk80l918jnklck635dp1cfx48akah483jkhzjph0fj"; + version = "0.9.1.2"; + sha256 = "1cj594vq0x87h9mvwsj9mplacrdn999bbsknjwdpvrpsbadlx5q7"; buildDepends = [ aeson async attoparsec base binary bytestring bytestring-trie containers crypto-api data-accessor directory filepath fingertree @@ -73011,6 +73049,7 @@ self: { ]; description = "Shared library used be ide-backend and ide-backend-server"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ide-backend-rts" = callPackage @@ -73044,6 +73083,7 @@ self: { ]; description = "An IDE backend server"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ideas" = callPackage @@ -74389,8 +74429,8 @@ self: { }: mkDerivation { pname = "inline-c"; - version = "0.5.0.1"; - sha256 = "1gkk9ldlac8jfiibyw15madrxa731fk2qbll22c8lm0l83r9kpsa"; + version = "0.5.2.0"; + sha256 = "1i0x80g8sy7lb7wln22n4hbh3i553v1ky9gz7x72xf0gifszlr4y"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -76554,13 +76594,13 @@ self: { , bifunctors, byteable, bytestring, crypto-pubkey , crypto-pubkey-types, crypto-random, cryptohash , data-default-class, ghc-prim, hspec, integer-gmp, lens - , network-uri, old-locale, safe, semigroups, template-haskell, text - , time, unordered-containers, vector, x509 + , network-uri, safe, semigroups, template-haskell, text, time + , unordered-containers, vector, x509 }: mkDerivation { pname = "jose"; - version = "0.3.41.1"; - sha256 = "1grb1yq3knm7hniqiivkx76mxkgacyq2qa12mv5lz097w7bldf4l"; + version = "0.3.41.2"; + sha256 = "0pamg1wkp85zpwnbsvmsszy7nxsifl3zhbxvfmh44n0b6d2wg4w5"; buildDepends = [ aeson attoparsec base base64-bytestring bifunctors byteable bytestring crypto-pubkey crypto-pubkey-types crypto-random @@ -76571,9 +76611,9 @@ self: { testDepends = [ aeson attoparsec base base64-bytestring bifunctors byteable bytestring crypto-pubkey crypto-pubkey-types crypto-random - cryptohash data-default-class hspec lens network-uri old-locale - safe semigroups template-haskell text time unordered-containers - vector x509 + cryptohash data-default-class hspec lens network-uri safe + semigroups template-haskell text time unordered-containers vector + x509 ]; jailbreak = true; homepage = "https://github.com/frasertweedale/hs-jose"; @@ -78685,9 +78725,9 @@ self: { mkDerivation { pname = "lambdabot-utils"; version = "4.2.2"; - revision = "1"; + revision = "3"; sha256 = "0mmz9rn6vv8xnavmz66g164h1liir3rzg1n7lmbcsgwcyhm925d7"; - editedCabalFile = "1936d25bbfb2ce39465857c136e0d77c656714feb2c1936024da4d763e9dbbf3"; + editedCabalFile = "f54d43d6964d63f1d8796606419b512a6e7b87b1defe960748c27c7417f59a08"; buildDepends = [ base binary bytestring containers haskell-src mtl network old-time process random regex-compat regex-posix syb tagsoup unix @@ -80103,8 +80143,8 @@ self: { }: mkDerivation { pname = "leksah"; - version = "0.14.4.0"; - sha256 = "13p6fil3s8pgjgicxgkn1qfcdhvv5j0lilk85a66nz7vw4rg3x2v"; + version = "0.15.0.1"; + sha256 = "169vrqdxcx8xkilrw3dh5zmdsb876fny4n0k5gzvi8fian0dl8nh"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -80122,7 +80162,6 @@ self: { leksah-server ltk monad-loops QuickCheck text transformers webkitgtk3 ]; - jailbreak = true; homepage = "http://www.leksah.org"; description = "Haskell IDE written in Haskell"; license = "GPL"; @@ -80130,31 +80169,30 @@ self: { }) {}; "leksah-server" = callPackage - ({ mkDerivation, attoparsec, attoparsec-conduit, base, binary - , binary-shared, bytestring, Cabal, conduit, conduit-extra - , containers, deepseq, directory, executable-path, filepath, ghc - , haddock-api, hslogger, HTTP, HUnit, ltk, network, network-uri - , parsec, pretty, process, resourcet, strict, text, time - , transformers, unix + ({ mkDerivation, attoparsec, attoparsec-conduit, base + , bin-package-db, binary, binary-shared, bytestring, Cabal, conduit + , conduit-extra, containers, deepseq, directory, executable-path + , filepath, ghc, haddock-api, haddock-library, hslogger, HTTP + , HUnit, ltk, network, network-uri, parsec, pretty, process + , resourcet, strict, text, time, transformers, unix }: mkDerivation { pname = "leksah-server"; - version = "0.14.3.2"; - sha256 = "0gbjxbma0jyw0jli63f3apfsap9by6nr75qx77773nj2l48hxz3w"; + version = "0.15.0.1"; + sha256 = "04sxfzl8p9fk8qkzmwnm7fkg5sgrzjx0992kivgbrnyx7wh06xsp"; isLibrary = true; isExecutable = true; buildDepends = [ - attoparsec attoparsec-conduit base binary binary-shared bytestring - Cabal conduit conduit-extra containers deepseq directory - executable-path filepath ghc haddock-api hslogger HTTP ltk network - network-uri parsec pretty process resourcet strict text time - transformers unix + attoparsec attoparsec-conduit base bin-package-db binary + binary-shared bytestring Cabal conduit conduit-extra containers + deepseq directory executable-path filepath ghc haddock-api + haddock-library hslogger HTTP ltk network network-uri parsec pretty + process resourcet strict text time transformers unix ]; testDepends = [ base conduit conduit-extra hslogger HUnit process resourcet transformers ]; - jailbreak = true; homepage = "http://leksah.org"; description = "Metadata collection for leksah"; license = "GPL"; @@ -81564,8 +81602,8 @@ self: { ({ mkDerivation, base, containers, ghc-prim, mtl, transformers }: mkDerivation { pname = "linearscan"; - version = "0.5.0.0"; - sha256 = "0n8xcj5pkz50mkx4cvqh1iywlf9vrk6bk4d3lv8fa22ik88mdr15"; + version = "0.5.1.0"; + sha256 = "123gs28vfb1lx9izzjran79caqj92p1l0v051pd0pf2nfm6iymgb"; buildDepends = [ base containers ghc-prim mtl transformers ]; homepage = "http://github.com/jwiegley/linearscan"; description = "Linear scan register allocator, formally verified in Coq"; @@ -81579,8 +81617,8 @@ self: { }: mkDerivation { pname = "linearscan-hoopl"; - version = "0.5.0.0"; - sha256 = "0z8lhi4q89f1b2fk5a3vn0a9q9h4w81b0wjqdypb7bz5lisvvg0s"; + version = "0.5.1.0"; + sha256 = "147ryhliilbpmzy87bda7aapfpfhw4r6rcy6jla2ampy7qvvvbyk"; buildDepends = [ base containers free hoopl linearscan transformers ]; @@ -83447,8 +83485,8 @@ self: { }: mkDerivation { pname = "ltk"; - version = "0.15.0.0"; - sha256 = "1hl9cbr8n2nczsz8gkd4lkcmf3bhzcji82p8ym176abzyz2i3h09"; + version = "0.15.0.1"; + sha256 = "0qw689ip8kibczjvar6bicns6g8a0zwlb6vdcmpicxxmpr1p7g16"; buildDepends = [ base Cabal containers filepath ghc glib gtk3 mtl parsec pretty text transformers @@ -85771,8 +85809,8 @@ self: { }: mkDerivation { pname = "memory"; - version = "0.2"; - sha256 = "05v7ywbxn61bk8gk8sc4fpm1n76kcvbab1jgvbq82m6g56dhmrh0"; + version = "0.3"; + sha256 = "17dry2yfnj7vldrdh0kynyaa4pfyy88k3035w3hxggh7n325dfir"; buildDepends = [ base bytestring deepseq ghc-prim ]; testDepends = [ base tasty tasty-hunit tasty-quickcheck ]; homepage = "https://github.com/vincenthz/hs-memory"; @@ -88178,7 +88216,9 @@ self: { mkDerivation { pname = "mono-traversable"; version = "0.9.1"; + revision = "1"; sha256 = "0hzqlldilkkfmrq3pkymwkzpp9dn40v6fa18kahxlf4qiyih0xzc"; + editedCabalFile = "28392123a8b245f7bc2c13bb63f5c3008118ed38e107cf0534be37461fb64daf"; buildDepends = [ base bytestring comonad containers dlist dlist-instances hashable semigroupoids semigroups text transformers unordered-containers @@ -89762,8 +89802,8 @@ self: { }: mkDerivation { pname = "mvc"; - version = "1.0.4"; - sha256 = "0mbbcjcvd05ql76ys5fmsr57aif1bysasz91rvmp795a9wj3i83i"; + version = "1.0.5"; + sha256 = "1lrq0nkxi0ljs6pxf7p4awhrf9ix9dqwvwsydph6fw356ypc39r2"; buildDepends = [ async base contravariant foldl managed mmorph pipes pipes-concurrency transformers @@ -92963,12 +93003,12 @@ self: { }) {}; "observable-sharing" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, unordered-containers }: mkDerivation { pname = "observable-sharing"; - version = "0.1.0.0"; - sha256 = "1l9l7jjk1zxc6wzw2n89l4mr964ys87b37sc55jsm73km19q07jy"; - buildDepends = [ base ]; + version = "0.2.0.0"; + sha256 = "01lri324xygda17nzc7bg6s3f52nivi8qjigbx9ack7zxhm9jyd7"; + buildDepends = [ base unordered-containers ]; description = "Simple observable sharing"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -94271,8 +94311,8 @@ self: { }: mkDerivation { pname = "orgmode-parse"; - version = "0.1.1.0"; - sha256 = "1hrbfifm9476n28l2gxyr9m00hjibnl78anc5m7inqm8wr1s3cl0"; + version = "0.1.1.1"; + sha256 = "17slf2i7k8bk1d47l165awn38dlpq2rdw6glzvp8if1dir2l2jl7"; buildDepends = [ aeson attoparsec base bytestring containers free hashable old-locale text thyme unordered-containers @@ -94808,10 +94848,8 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.1.0.2"; - revision = "1"; - sha256 = "0mnksd8wl6y9qh4z5p6nzf64lic2cxws0hm2n1aj8vq8asfy28af"; - editedCabalFile = "c209bec5811d40360ca07a9218404186ab8564ee649b14d6e3ece04b4006204f"; + version = "0.1.1.0"; + sha256 = "1z6q9sb5h0bbvkdlv6abvhgz0cgw4vixs3pv531l9jpkmvfri8r4"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -95353,8 +95391,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "parsek"; - version = "1.0.1.2"; - sha256 = "0ybh76cx5y73ywhlv4g2z74x1mvg5n2rxl045mscs6dwcyw9vhbd"; + version = "1.0.1.3"; + sha256 = "184cbw9gz3vv2jbr2wzkygv25y70jayxd8d76pgpvjcaps4qqxp7"; buildDepends = [ base ]; description = "Parallel Parsing Processes"; license = stdenv.lib.licenses.gpl3; @@ -98921,10 +98959,13 @@ self: { mkDerivation { pname = "pool-conduit"; version = "0.1.2.3"; + revision = "1"; sha256 = "1myjbmbh0jm89ycx9d961mpgw8hp7al8wgnsls4p19gvr73gcbfv"; + editedCabalFile = "b894f71054b3824a0a05753e8273efbc7c1dc48efa9c6d56625ba4411a74afa5"; buildDepends = [ base monad-control resource-pool resourcet transformers ]; + jailbreak = true; homepage = "http://www.yesodweb.com/book/persistent"; description = "Resource pool allocations via ResourceT. (deprecated)"; license = stdenv.lib.licenses.mit; @@ -101168,6 +101209,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pseudo-boolean" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder + , containers, deepseq, dlist, hashable, HUnit, parsec, QuickCheck + , tasty, tasty-hunit, tasty-quickcheck, tasty-th, temporary + }: + mkDerivation { + pname = "pseudo-boolean"; + version = "0.1.0.0"; + sha256 = "1dqy8zpf7016rm3wyvgwipllm95wmrr9na04v4x402k1f8pvkdvc"; + buildDepends = [ + attoparsec base bytestring bytestring-builder containers deepseq + dlist hashable parsec + ]; + testDepends = [ + base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck + tasty-th temporary + ]; + homepage = "https://github.com/msakai/pseudo-boolean"; + description = "Reading\/Writing OPB\/WBO files used in pseudo boolean competition"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pseudo-trie" = callPackage ({ mkDerivation, base, semigroups }: mkDerivation { @@ -103070,8 +103134,8 @@ self: { }: mkDerivation { pname = "rasterific-svg"; - version = "0.2.2.1"; - sha256 = "1p8bpy9kh1j2lhczw8wyj1918h26yf7w7ii370g6m63szx6v1lj6"; + version = "0.2.3"; + sha256 = "1gr050dlvq8pfp77g21ywc6cknbgmkw8bcc4d8klw8jpf0ppar45"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -112551,16 +112615,19 @@ self: { }) {}; "smallcheck-series" = callPackage - ({ mkDerivation, base, bytestring, doctest, Glob, smallcheck, text + ({ mkDerivation, base, bytestring, containers, doctest, Glob + , logict, smallcheck, text, transformers }: mkDerivation { pname = "smallcheck-series"; - version = "0.2"; - sha256 = "1666pf3ki46w3zi01c3lzih7jh0jgqx9jyc1ykrjs056mlnbxp3v"; - buildDepends = [ base bytestring smallcheck text ]; + version = "0.3"; + sha256 = "1vdwafwdv38n1bvjf1rybfhh42a0q0g0g4wmw0v4fgxh73qndfdv"; + buildDepends = [ + base bytestring containers logict smallcheck text transformers + ]; testDepends = [ base doctest Glob ]; homepage = "https://github.com/jdnavarro/smallcheck-series"; - description = "Extra SmallCheck series"; + description = "Extra SmallCheck series and utilities"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -113916,6 +113983,7 @@ self: { homepage = "https://github.com/dbp/snaplet-wordpress"; description = "A snaplet that communicates with wordpress over its api"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snappy" = callPackage @@ -116655,8 +116723,8 @@ self: { }: mkDerivation { pname = "stm-conduit"; - version = "2.6.0"; - sha256 = "0lhqhsvisyn4wgj5qk0slzbgy7lbmzgcryi4vlw1d058nsjnpxwj"; + version = "2.6.1"; + sha256 = "0cd99aj9azlr6d9bayjyrbigbzll9yfny7qan1wnrh413i1z1x0p"; buildDepends = [ async base cereal cereal-conduit conduit conduit-combinators conduit-extra directory ghc-prim lifted-async lifted-base @@ -122069,16 +122137,16 @@ self: { }: mkDerivation { pname = "th-typegraph"; - version = "0.14"; - sha256 = "1f2wgr429hkv687mk9qgaqnr1n9nznl90cy7w74w4jzp6fd6rskp"; + version = "0.17"; + sha256 = "0k6bjf3r6g64h5al7gxcrkwb5b67kjpx8y4ib6f3a6l00p620297"; buildDepends = [ base containers data-default haskell-src-exts lens mtl syb template-haskell th-desugar th-orphans ]; testDepends = [ - array base bytestring containers deepseq ghc-prim hspec hspec-core - lens mtl syb template-haskell text th-desugar th-orphans - th-reify-many + array base bytestring containers data-default deepseq ghc-prim + hspec hspec-core lens mtl syb template-haskell text th-desugar + th-orphans th-reify-many ]; homepage = "https://github.com/seereason/th-typegraph"; description = "Graph of the subtype relation"; @@ -123656,17 +123724,17 @@ self: { }) {}; "topkata" = callPackage - ({ mkDerivation, ALUT, array, base, filepath, GLUT, OpenAL, OpenGL - , random + ({ mkDerivation, ALUT, array, base, filepath, GLFW-b, OpenAL + , OpenGL, parseargs, random }: mkDerivation { pname = "topkata"; - version = "0.2.3"; - sha256 = "19lm9i65ywh3a8hsrqnihq8gkfxmz81zznyqlqgcf1914w826i3a"; + version = "0.2.4"; + sha256 = "06b938i2362c4jcd0923lwrcf6hqgxdscizj91ns51wx73nm8fxi"; isLibrary = false; isExecutable = true; buildDepends = [ - ALUT array base filepath GLUT OpenAL OpenGL random + ALUT array base filepath GLFW-b OpenAL OpenGL parseargs random ]; homepage = "http://home.arcor.de/chr_bauer/topkata.html"; description = "OpenGL Arcade Game"; @@ -135621,6 +135689,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "yesod-raml" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, hspec + , network-uri, optparse-applicative, regex-posix, template-haskell + , text, unordered-containers, yaml, yesod-core + }: + mkDerivation { + pname = "yesod-raml"; + version = "0.1.0"; + sha256 = "1vcllxsyqvr26a27l9vfi76kpdzld3ws1i0q6g9jnwhkr16bmc3f"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson base bytestring containers network-uri optparse-applicative + regex-posix template-haskell text unordered-containers yaml + yesod-core + ]; + testDepends = [ + aeson base bytestring containers hspec network-uri regex-posix + template-haskell text unordered-containers yaml yesod-core + ]; + description = "RAML style route definitions for Yesod"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-recaptcha" = callPackage ({ mkDerivation, base, bytestring, data-default, http-conduit , http-types, lifted-base, network, network-info, resourcet, text diff --git a/pkgs/development/interpreters/ruby/bundler.nix b/pkgs/development/interpreters/ruby/bundler.nix index 88e0af2a21b..336d4054422 100644 --- a/pkgs/development/interpreters/ruby/bundler.nix +++ b/pkgs/development/interpreters/ruby/bundler.nix @@ -1,7 +1,8 @@ -{ buildRubyGem, coreutils }: +{ buildRubyGem, makeWrapper, ruby, coreutils }: buildRubyGem { name = "bundler-1.9.2"; + namePrefix = ""; sha256 = "0ck9bnqg7miimggj1d6qlabrsa5h9yaw241fqn15cvqh915209zk"; dontPatchShebangs = true; postInstall = '' @@ -9,5 +10,8 @@ buildRubyGem { substituteInPlace $f \ --replace "/usr/bin/env" "${coreutils}/bin/env" done + + wrapProgram $out/bin/bundler \ + --prefix PATH ":" ${ruby}/bin ''; } diff --git a/pkgs/development/libraries/catch/default.nix b/pkgs/development/libraries/catch/default.nix new file mode 100644 index 00000000000..49376b74c17 --- /dev/null +++ b/pkgs/development/libraries/catch/default.nix @@ -0,0 +1,36 @@ +{ stdenv, lib, cmake, fetchFromGitHub }: + +stdenv.mkDerivation rec { + + name = "catch-${version}"; + version = "1.1-3"; + + src = fetchFromGitHub { + owner = "philsquared"; + repo = "Catch"; + rev = "c51e86819dc993d590e5d0adaf1952f4b53e5355"; + sha256 = "0kgi7wxxysgjbpisqfj4dj0k19cyyai92f001zi8gzkybd4fkgv5"; + }; + + buildInputs = [ cmake ]; + dontUseCmakeConfigure = true; + + buildPhase = '' + cmake -Hprojects/CMake -BBuild -DCMAKE_BUILD_TYPE=Release + cd Build + make + cd .. + ''; + + installPhase = '' + mkdir -p $out + mv include $out/. + ''; + + meta = with stdenv.lib; { + description = "A multi-paradigm automated test framework for C++ and Objective-C (and, maybe, C)"; + homepage = "http://catch-lib.net"; + license = licenses.boost; + maintainers = with maintainers; [ edwtjo ]; + }; +} diff --git a/pkgs/development/libraries/ccrtp/1.8.nix b/pkgs/development/libraries/ccrtp/1.8.nix index 5105bd29876..5574e18ffa0 100644 --- a/pkgs/development/libraries/ccrtp/1.8.nix +++ b/pkgs/development/libraries/ccrtp/1.8.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; + broken = true; # fails to compile with libgcrypt >= 1.6 }; } diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index ab7e312762f..087be3bb6de 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -1,16 +1,23 @@ -{ stdenv, fetchurl, cmake, mesa, libXrandr, libXi, libXxf86vm, libXfixes, x11 }: +{ stdenv, fetchurl, cmake, mesa, libXrandr, libXi, libXxf86vm, libXfixes, x11 +, libXinerama, libXcursor +}: stdenv.mkDerivation rec { - name = "glfw-3.0.4"; + name = "glfw-3.1.1"; src = fetchurl { url = "mirror://sourceforge/glfw/${name}.tar.bz2"; - sha256 = "1h7g16ncgkl38w19x4dvnn17k9j0kqfvbb9whw9qc71lkq5xf2ag"; + sha256 = "0q9dhbj2az7jwwi556zai0qr8zmg6d2lyxcqngppkw0x7hi1d1aa"; }; enableParallelBuilding = true; - buildInputs = [ cmake mesa libXrandr libXi libXxf86vm libXfixes x11 ]; + buildInputs = [ + cmake mesa libXrandr libXi libXxf86vm libXfixes x11 + libXinerama libXcursor + ]; + + cmakeFlags = "-DBUILD_SHARED_LIBS=ON"; meta = with stdenv.lib; { description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time"; diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix index 4796ce078df..6ec5e5d9e0a 100644 --- a/pkgs/development/libraries/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/default.nix @@ -18,4 +18,6 @@ rec { gnonlin = callPackage ./gnonlin { inherit gst-plugins-base; }; gst-editing-services = callPackage ./ges { inherit gnonlin; }; + + gst-vaapi = callPackage ./vaapi { inherit gst-plugins-base gstreamer gst-plugins-bad; }; } diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix new file mode 100644 index 00000000000..a1f936e20af --- /dev/null +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, pkgconfig, gst-plugins-base, bzip2, libva +, libdrm, udev, xorg, mesa, yasm, gstreamer, gst-plugins-bad, nasm +, libvpx +}: + +stdenv.mkDerivation rec { + name = "gst-vaapi-${version}"; + version = "0.5.10"; + + src = fetchurl { + url = "${meta.homepage}/software/vaapi/releases/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.bz2"; + sha256 = "179wnz4c4gnw9ibfgjrad9b44icygadaknsgjfw24lr2pz3kdlhd"; + }; + + nativeBuildInputs = with stdenv.lib; [ pkgconfig bzip2 ]; + + buildInputs = with stdenv.lib; [ gstreamer gst-plugins-base gst-plugins-bad libva libdrm udev + xorg.libX11 xorg.libXext xorg.libXv xorg.libXrandr mesa nasm libvpx ]; + + preConfigure = " + export GST_PLUGIN_PATH_1_0=$out/lib/gstreamer-1.0 + mkdir -p $GST_PLUGIN_PATH_1_0 + "; + configureFlags = "--disable-builtin-libvpx --with-gstreamer-api=1.0"; + + meta = { + homepage = "http://www.freedesktop.org"; + license = stdenv.lib.licenses.lgpl21Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ tstrobel ]; + }; +} diff --git a/pkgs/development/libraries/iniparser/default.nix b/pkgs/development/libraries/iniparser/default.nix index f71c273f6d0..8d6e0b91ca0 100644 --- a/pkgs/development/libraries/iniparser/default.nix +++ b/pkgs/development/libraries/iniparser/default.nix @@ -1,5 +1,9 @@ { stdenv, fetchurl }: +let + inherit (stdenv.lib) optional; + isClang = (stdenv.cc.cc.isClang or false); +in stdenv.mkDerivation rec{ name = "iniparser-3.1"; @@ -10,12 +14,12 @@ stdenv.mkDerivation rec{ patches = ./no-usr.patch; - buildFlags = "libiniparser.so"; + # TODO: Build dylib on Darwin + buildFlags = (if stdenv.isDarwin then [ "libiniparser.a" ] else [ "libiniparser.so" ]) + ++ optional isClang "CC=clang"; installPhase = '' mkdir -p $out/lib - cp libiniparser.so.0 $out/lib - ln -s libiniparser.so.0 $out/lib/libiniparser.so mkdir -p $out/include cp src/*.h $out/include @@ -25,7 +29,13 @@ stdenv.mkDerivation rec{ bzip2 -c -9 $i > $out/share/doc/${name}/$i.bz2; done; cp -r html $out/share/doc/${name} - ''; + + '' + (if stdenv.isDarwin then '' + cp libiniparser.a $out/lib + '' else '' + cp libiniparser.so.0 $out/lib + ln -s libiniparser.so.0 $out/lib/libiniparser.so + ''); meta = { homepage = http://ndevilla.free.fr/iniparser; diff --git a/pkgs/development/libraries/lesstif-0.93/c-bad_integer_cast.patch b/pkgs/development/libraries/lesstif-0.93/c-bad_integer_cast.patch deleted file mode 100644 index 620d702f0f0..00000000000 --- a/pkgs/development/libraries/lesstif-0.93/c-bad_integer_cast.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- lesstif2-0.94.4.orig/include/Motif-2.1/XmI/XpmI.h -+++ lesstif2-0.94.4/include/Motif-2.1/XmI/XpmI.h -@@ -217,8 +217,8 @@ - FUNC(xpmHashSlot, xpmHashAtom *, (xpmHashTable *table, char *s)); - FUNC(xpmHashIntern, int, (xpmHashTable *table, char *tag, void *data)); - --#define HashAtomData(i) ((void *)i) --#define HashColorIndex(slot) ((unsigned int)((*slot)->data)) -+#define HashAtomData(i) ((void *)(uintptr_t)i) -+#define HashColorIndex(slot) ((uintptr_t)((*slot)->data)) - #define USE_HASHTABLE (cpp > 2 && ncolors > 4) - - /* I/O utility */ diff --git a/pkgs/development/libraries/lesstif-0.93/c-render_table_crash.patch b/pkgs/development/libraries/lesstif-0.93/c-render_table_crash.patch deleted file mode 100644 index 1699dbe1908..00000000000 --- a/pkgs/development/libraries/lesstif-0.93/c-render_table_crash.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- lesstif2-0.95.0.orig/lib/Xm-2.1/RenderTable.c -+++ lesstif2-0.95.0/lib/Xm-2.1/RenderTable.c -@@ -465,7 +465,7 @@ - DEBUGOUT(_LtDebug(__FILE__, w, "_XmRenderTableFinaliseTag(%s)\n", tag)); - #if 1 - /* Experimental start */ -- if (r->dpy == 0) -+ if (r->dpy == 0 && w) - r->dpy = XtDisplay(w); - /* Experimental end */ - #endif diff --git a/pkgs/development/libraries/lesstif-0.93/c-xim_chained_list_crash.patch b/pkgs/development/libraries/lesstif-0.93/c-xim_chained_list_crash.patch deleted file mode 100644 index 10bdf8d0b97..00000000000 --- a/pkgs/development/libraries/lesstif-0.93/c-xim_chained_list_crash.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ru lesstif2-0.94.4-old/lib/Xm-2.1/XmIm.c lesstif2-0.94.4/lib/Xm-2.1/XmIm.c ---- lesstif2-0.94.4-old/lib/Xm-2.1/XmIm.c 2004-10-20 21:32:11.000000000 +0200 -+++ lesstif2-0.94.4/lib/Xm-2.1/XmIm.c 2007-03-28 14:39:27.000000000 +0200 -@@ -133,7 +133,10 @@ - p->next = q->next; - } - -- XtFree((char *)stuff); -+ /* if count!=0 then someone uses the stuff as orig_xim -+ so unlink it but not free it */ -+ if (!stuff->count) -+ XtFree((char *)stuff); - } - - /* -@@ -1060,6 +1063,8 @@ - XCloseIM(stuff->xim); - DEBUGOUT(_LtDebug(__FILE__, w, "XCloseIM(%p)\n", stuff->xim)); - stuff->orig_xim->xim = NULL; -+ /* stuff->orig_xim is now useless */ -+ XtFree(stuff->orig_xim); - } else { - DEBUGOUT(_LtDebug(__FILE__, w, "XmImCloseXIM(%p), count -> %d\n", - stuff->xim, stuff->orig_xim->count)); diff --git a/pkgs/development/libraries/lesstif-0.93/default.nix b/pkgs/development/libraries/lesstif-0.93/default.nix deleted file mode 100644 index e8ec3d5e659..00000000000 --- a/pkgs/development/libraries/lesstif-0.93/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, x11, libXp, libXau }: - -stdenv.mkDerivation { - name = "lesstif-0.93.94"; - - src = fetchurl { - url = http://prdownloads.sourceforge.net/lesstif/lesstif-0.93.94.tar.bz2; - sha256 = "0v4l46ill6dhhswsw1hk6rqyng98d85nsr214vhd2k0mfajpig1y"; - }; - - buildInputs = [x11]; - - propagatedBuildInputs = [libXp libXau]; - - # This is an older release of lesstif which works with arb. - patches = - [ ./c-bad_integer_cast.patch - ./c-xim_chained_list_crash.patch - ./c-render_table_crash.patch - ./stdint.patch - ]; - - meta = { - priority = "5"; - }; -} diff --git a/pkgs/development/libraries/lesstif-0.93/stdint.patch b/pkgs/development/libraries/lesstif-0.93/stdint.patch deleted file mode 100644 index 8b202704abd..00000000000 --- a/pkgs/development/libraries/lesstif-0.93/stdint.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -r 97ac365bfcd6 lesstif-0.93.94/lib/Xm-2.1/Xpm.c ---- lesstif-0.93.94/lib/Xm-2.1/Xpm.c Mon Oct 06 15:52:50 2008 +0200 -+++ lesstif-0.93.94/lib/Xm-2.1/Xpm.c Mon Oct 06 15:53:16 2008 +0200 -@@ -54,6 +54,7 @@ - #include - #endif - -+#include - #include /* Avoid re-definition of Pixel-type */ - - #include diff --git a/pkgs/development/libraries/libpqxx/default.nix b/pkgs/development/libraries/libpqxx/default.nix new file mode 100644 index 00000000000..5b02cfec7e3 --- /dev/null +++ b/pkgs/development/libraries/libpqxx/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchurl, postgresql, python }: + +stdenv.mkDerivation rec { + name = "libpqxx-4.0.1"; + + src = fetchurl { + url = "http://pqxx.org/download/software/libpqxx/${name}.tar.gz"; + sha256 = "0f6wxspp6rx12fkasanb0z2g2gc8dhcfwnxagx8wwqbpg6ifsz09"; + }; + + buildInputs = [ postgresql python ]; + + preConfigure = '' + patchShebangs . + ''; + + configureFlags = "--enable-shared"; + + meta = { + description = "A C++ library to access PostgreSQL databases"; + homepage = http://pqxx.org/development/libpqxx/; + license = lib.licenses.postgresql; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.eelco ]; + }; +} diff --git a/pkgs/development/libraries/libssh/0001-Reintroduce-ssh_forward_listen-Fixes-194.patch b/pkgs/development/libraries/libssh/0001-Reintroduce-ssh_forward_listen-Fixes-194.patch new file mode 100644 index 00000000000..030983d5c55 --- /dev/null +++ b/pkgs/development/libraries/libssh/0001-Reintroduce-ssh_forward_listen-Fixes-194.patch @@ -0,0 +1,28 @@ +From 3c8fe6e2c595ee019408249c364b3019b6c31a8a Mon Sep 17 00:00:00 2001 +From: Mike DePaulo +Date: Fri, 15 May 2015 22:22:13 -0400 +Subject: [PATCH] Reintroduce ssh_forward_listen() (Fixes: #194) + +--- + src/channels.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/channels.c b/src/channels.c +index 7a4e71f..db5f83a 100644 +--- a/src/channels.c ++++ b/src/channels.c +@@ -2206,6 +2206,11 @@ error: + } + + /* DEPRECATED */ ++int ssh_forward_listen(ssh_session session, const char *address, int port, int *bound_port) { ++ return ssh_channel_listen_forward(session, address, port, bound_port); ++} ++ ++/* DEPRECATED */ + ssh_channel ssh_forward_accept(ssh_session session, int timeout_ms) { + return ssh_channel_accept(session, SSH_CHANNEL_FORWARDED_TCPIP, timeout_ms, NULL); + } +-- +2.1.4 + diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix index 83efa5e65c9..8ea2ac72da0 100644 --- a/pkgs/development/libraries/libssh/default.nix +++ b/pkgs/development/libraries/libssh/default.nix @@ -30,10 +30,12 @@ stdenv.mkDerivation rec { name = "libssh-0.7.0"; src = fetchurl { - url = "https://red.libssh.org/attachments/download/140/libssh-0.7.0.tar.xz"; - sha256 = "0as07vz3h5qa14ysvgsddb90m1qh605p6ccv6kf1sr1k3wsbql85"; + url = "https://git.libssh.org/projects/libssh.git/snapshot/libssh-0.7.0.tar.gz"; + sha256 = "1wfrdqhv97f4ycd9bcpgb6gw47kr7b2iq8cz5knk8a6n9c6870k0"; }; + patches = [ ./0001-Reintroduce-ssh_forward_listen-Fixes-194.patch ]; + postPatch = '' # Fix headers to use libsodium instead of NaCl sed -i 's,nacl/,sodium/,g' ./include/libssh/curve25519.h src/curve25519.c diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index e779957a6fb..67d95f97e07 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gfortran, perl, liblapack, config }: +{ stdenv, fetchurl, gfortran, perl, liblapack, config, coreutils }: with stdenv.lib; @@ -7,6 +7,7 @@ let local = config.openblas.preferLocalBuild or false; { i686-linux = "32"; x86_64-linux = "64"; + x86_64-darwin = "64"; }."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}"); genericFlags = [ @@ -29,14 +30,18 @@ stdenv.mkDerivation rec { preBuild = "cp ${liblapack.src} lapack-${liblapack.meta.version}.tgz"; - nativeBuildInputs = [gfortran perl]; + nativeBuildInputs = optionals stdenv.isDarwin [coreutils] ++ [gfortran perl]; makeFlags = (if local then localFlags else genericFlags) ++ + optionals stdenv.isDarwin ["MACOSX_DEPLOYMENT_TARGET=10.9"] + ++ [ "FC=gfortran" - "CC=gcc" + # Note that clang is available through the stdenv on OSX and + # thus is not an explicit dependency. + "CC=${if stdenv.isDarwin then "clang" else "gcc"}" ''PREFIX="''$(out)"'' "INTERFACE64=1" ]; @@ -45,7 +50,7 @@ stdenv.mkDerivation rec { description = "Basic Linear Algebra Subprograms"; license = licenses.bsd3; homepage = "https://github.com/xianyi/OpenBLAS"; - platforms = with platforms; linux; + platforms = with platforms; unix; maintainers = with maintainers; [ ttuegel ]; }; } diff --git a/pkgs/development/libraries/webkitgtk/2.4.nix b/pkgs/development/libraries/webkitgtk/2.4.nix index 30d69a0253b..3800a6f78dd 100644 --- a/pkgs/development/libraries/webkitgtk/2.4.nix +++ b/pkgs/development/libraries/webkitgtk/2.4.nix @@ -59,8 +59,7 @@ stdenv.mkDerivation rec { (if withGtk2 then gtk2 else gtk3) ]; - # Probably OK now, see: - # https://bugs.webkit.org/show_bug.cgi?id=79498 - enableParallelBuilding = true; -} + # Still fails with transient errors in version 2.4.9. + enableParallelBuilding = false; +} diff --git a/pkgs/development/ocaml-modules/alcotest/default.nix b/pkgs/development/ocaml-modules/alcotest/default.nix new file mode 100644 index 00000000000..68edfca25a8 --- /dev/null +++ b/pkgs/development/ocaml-modules/alcotest/default.nix @@ -0,0 +1,20 @@ +{stdenv, buildOcaml, fetchurl, ounit, re, cmdliner}: + +buildOcaml rec { + name = "alcotest"; + version = "0.3.1"; + + src = fetchurl { + url = "https://github.com/samoht/alcotest/archive/${version}.tar.gz"; + sha256 = "a0e6c9a33c59b206ecc949655fa6e17bdd1078c8b610b14d8f6f0f1b489b0b43"; + }; + + propagatedBuildInputs = [ ounit re cmdliner ]; + + meta = with stdenv.lib; { + homepage = https://github.com/samoht/alcotest; + description = "A lightweight and colourful test framework"; + license = stdenv.lib.licenses.isc; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/async/default.nix b/pkgs/development/ocaml-modules/async/default.nix new file mode 100644 index 00000000000..2b84519036c --- /dev/null +++ b/pkgs/development/ocaml-modules/async/default.nix @@ -0,0 +1,23 @@ +{stdenv, buildOcaml, fetchurl, async_kernel, + async_unix, async_extra, pa_ounit}: + +buildOcaml rec { + name = "async"; + version = "112.24.00"; + + minimumSupportedOcamlVersion = "4.02"; + + src = fetchurl { + url = "https://github.com/janestreet/async/archive/${version}.tar.gz"; + sha256 = "ecc4ca939ab098e689332921b110dbaacd06d9f8d8bf697023dfff3ca37dc1e9"; + }; + + propagatedBuildInputs = [ async_kernel async_unix async_extra pa_ounit ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/async; + description = "Jane Street Capital's asynchronous execution library"; + license = licenses.asl20; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/async_extra/default.nix b/pkgs/development/ocaml-modules/async_extra/default.nix new file mode 100644 index 00000000000..2d1e1dea69c --- /dev/null +++ b/pkgs/development/ocaml-modules/async_extra/default.nix @@ -0,0 +1,26 @@ +{stdenv, buildOcaml, fetchurl, async_kernel, async_unix, + bin_prot, core, custom_printf, fieldslib, herelib, pa_ounit, + pipebang, pa_test, sexplib}: + +buildOcaml rec { + name = "async_extra"; + version = "112.24.00"; + + minimumSupportedOcamlVersion = "4.02"; + + src = fetchurl { + url = "https://github.com/janestreet/async_extra/archive/${version}.tar.gz"; + sha256 = "51f6f67a9ad56fe5dcf09faeeca6ec2fea53a7a975a72bc80504b90841212e28"; + }; + + buildInputs = [ pa_test pa_ounit ]; + propagatedBuildInputs = [ async_kernel async_unix core bin_prot custom_printf + fieldslib herelib pipebang sexplib ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/async_extra; + description = "Jane Street Capital's asynchronous execution library (extra)"; + license = licenses.asl20; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/async_find/default.nix b/pkgs/development/ocaml-modules/async_find/default.nix new file mode 100644 index 00000000000..ae10e931ce2 --- /dev/null +++ b/pkgs/development/ocaml-modules/async_find/default.nix @@ -0,0 +1,22 @@ +{stdenv, buildOcaml, fetchurl, async, core, sexplib}: + +buildOcaml rec { + name = "async_find"; + version = "111.28.00"; + + minimumSupportedOcamlVersion = "4.02"; + + src = fetchurl { + url = "https://github.com/janestreet/async_find/archive/${version}.tar.gz"; + sha256 = "4e3fda72f50174f05d96a5a09323f236c041b1a685890c155822956f3deb8803"; + }; + + propagatedBuildInputs = [ async core sexplib ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/async_find; + description = "Directory traversal with Async"; + license = licenses.asl20; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/async_kernel/default.nix b/pkgs/development/ocaml-modules/async_kernel/default.nix new file mode 100644 index 00000000000..8c0d8d7c851 --- /dev/null +++ b/pkgs/development/ocaml-modules/async_kernel/default.nix @@ -0,0 +1,25 @@ +{stdenv, buildOcaml, fetchurl, core_kernel, + bin_prot, fieldslib, pa_ounit, pa_test, + sexplib, herelib}: + +buildOcaml rec { + name = "async_kernel"; + version = "112.24.00"; + + minimumSupportedOcamlVersion = "4.02"; + + src = fetchurl { + url = "https://github.com/janestreet/async_kernel/archive/${version}.tar.gz"; + sha256 = "95caf4249b55c5a6b38da56e314845e9ea9a0876eedd4cf0ddcb6c8dd660c6a0"; + }; + + buildInputs = [ pa_test pa_ounit ]; + propagatedBuildInputs = [ core_kernel bin_prot fieldslib herelib sexplib ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/async_kernel; + description = "Jane Street Capital's asynchronous execution library (core) "; + license = licenses.asl20; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/async_shell/default.nix b/pkgs/development/ocaml-modules/async_shell/default.nix new file mode 100644 index 00000000000..75755833a5f --- /dev/null +++ b/pkgs/development/ocaml-modules/async_shell/default.nix @@ -0,0 +1,22 @@ +{stdenv, buildOcaml, fetchurl, async, core, core_extended}: + +buildOcaml rec { + name = "async_shell"; + version = "109.28.03"; + + minimumSupportedOcamlVersion = "4.02"; + + src = fetchurl { + url = "https://github.com/janestreet/async_shell/archive/${version}.tar.gz"; + sha256 = "0b4497bea9124c5a665ee58fb0a73c5cbf2f757479df902e6870627196e6c105"; + }; + + propagatedBuildInputs = [ async core core_extended ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/async_shell; + description = "Shell helpers for Async"; + license = licenses.asl20; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/async_ssl/default.nix b/pkgs/development/ocaml-modules/async_ssl/default.nix new file mode 100644 index 00000000000..527d56ceaa0 --- /dev/null +++ b/pkgs/development/ocaml-modules/async_ssl/default.nix @@ -0,0 +1,25 @@ +{stdenv, buildOcaml, fetchurl, async, comparelib, core, ctypes, openssl, + fieldslib, herelib, pa_bench, pa_ounit, pipebang, pa_test, sexplib}: + +buildOcaml rec { + name = "async_ssl"; + version = "112.24.03"; + + minimumSupportedOcamlVersion = "4.02"; + + src = fetchurl { + url = "https://github.com/janestreet/async_ssl/archive/${version}.tar.gz"; + sha256 = "1b0bea92142eef11da6bf649bbe229bd4b8d9cc807303d8142406908c0d28c68"; + }; + + buildInputs = [ pa_bench pa_test ]; + propagatedBuildInputs = [ ctypes async comparelib core fieldslib pa_ounit + herelib pipebang sexplib openssl ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/async_ssl; + description = "Async wrappers for ssl"; + license = licenses.asl20; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/async_unix/default.nix b/pkgs/development/ocaml-modules/async_unix/default.nix new file mode 100644 index 00000000000..81fbd6a9918 --- /dev/null +++ b/pkgs/development/ocaml-modules/async_unix/default.nix @@ -0,0 +1,27 @@ +{stdenv, buildOcaml, fetchurl, async_kernel, + bin_prot, comparelib, core, fieldslib, herelib, pa_ounit, + pipebang, pa_test, sexplib}: + +buildOcaml rec { + name = "async_unix"; + version = "112.24.00"; + + minimumSupportedOcamlVersion = "4.02"; + + src = fetchurl { + url = "https://github.com/janestreet/async_unix/archive/${version}.tar.gz"; + sha256 = "d490b1dc42f0987a131fa9695b55f215ad90cdaffbfac35b7f9f88f3834337ab"; + }; + + hasSharedObjects = true; + buildInputs = [ pa_ounit ]; + propagatedBuildInputs = [ async_kernel core bin_prot comparelib + fieldslib herelib pipebang pa_test sexplib ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/async_unix; + description = "Jane Street Capital's asynchronous execution library (unix)"; + license = licenses.asl20; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/atd/default.nix b/pkgs/development/ocaml-modules/atd/default.nix new file mode 100644 index 00000000000..c7f8bc3d10f --- /dev/null +++ b/pkgs/development/ocaml-modules/atd/default.nix @@ -0,0 +1,26 @@ +{stdenv, menhir, easy-format, buildOcaml, fetchurl, which}: + +buildOcaml rec { + name = "atd"; + version = "1.1.2"; + + src = fetchurl { + url = "https://github.com/mjambon/atd/archive/v${version}.tar.gz"; + sha256 = "0ef10c63192aed75e9a4274e89c5f9ca27efb1ef230d9949eda53ad4a9a37291"; + }; + + installPhase = '' + mkdir -p $out/bin + make PREFIX=$out install + ''; + + buildInputs = [ which ]; + propagatedBuildInputs = [ menhir easy-format ]; + + meta = with stdenv.lib; { + homepage = https://github.com/mjambon/atd; + description = "Syntax for cross-language type definitions"; + license = licenses.bsd3; + maintainers = [ maintainers.jwilberding ]; + }; +} diff --git a/pkgs/development/ocaml-modules/atdgen/default.nix b/pkgs/development/ocaml-modules/atdgen/default.nix new file mode 100644 index 00000000000..bab2541fd74 --- /dev/null +++ b/pkgs/development/ocaml-modules/atdgen/default.nix @@ -0,0 +1,25 @@ +{stdenv, atd, yojson, menhir, easy-format, biniou, cppo, buildOcaml, fetchurl, which}: + +buildOcaml rec { + name = "atdgen"; + version = "1.6.0"; + + src = fetchurl { + url = "https://github.com/mjambon/atdgen/archive/v${version}.tar.gz"; + sha256 = "1icdxgb7qqq1pcbfqi0ikryiwaljd594z3acyci8g3bnlq0yc7zn"; + }; + + installPhase = '' + mkdir -p $out/bin + make PREFIX=$out install + ''; + + buildInputs = [ which atd biniou yojson ]; + + meta = with stdenv.lib; { + homepage = https://github.com/mjambon/atdgen; + description = "Generates optimized boilerplate OCaml code for JSON and Biniou IO from type definitions"; + license = licenses.bsd3; + maintainers = [ maintainers.jwilberding ]; + }; +} diff --git a/pkgs/development/ocaml-modules/bin_prot/default.nix b/pkgs/development/ocaml-modules/bin_prot/default.nix new file mode 100644 index 00000000000..4a2b9846271 --- /dev/null +++ b/pkgs/development/ocaml-modules/bin_prot/default.nix @@ -0,0 +1,24 @@ +{stdenv, writeText, buildOcaml, fetchurl, type_conv}: + +buildOcaml rec { + name = "bin_prot"; + version = "112.24.00"; + + minimumSupportedOcamlVersion = "4.00"; + + src = fetchurl { + url = "https://github.com/janestreet/bin_prot/archive/${version}.tar.gz"; + sha256 = "dc0c978a825c7c123990af3317637c218f61079e6f35dc878260651084f1adb4"; + }; + + propagatedBuildInputs = [ type_conv ]; + + hasSharedObjects = true; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/bin_prot; + description = "Binary protocol generator "; + license = licenses.asl20; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix new file mode 100644 index 00000000000..e219b59de5d --- /dev/null +++ b/pkgs/development/ocaml-modules/cohttp/default.nix @@ -0,0 +1,29 @@ +{stdenv, buildOcaml, fetchurl, cmdliner, re, uri, fieldslib, sexplib, conduit, + stringext, base64, magic-mime, ounit, alcotest, lwt ? null, + async ? null, async_ssl ? null}: + +buildOcaml rec { + name = "cohttp"; + version = "0.17.1"; + + minimumSupportedOcamlVersion = "4.02"; + + src = fetchurl { + url = "https://github.com/mirage/ocaml-cohttp/archive/v${version}.tar.gz"; + sha256 = "fb124fb2fb5ff2e74559bf380627f6a537e208c1518ddcb01f0d37b62b55f673"; + }; + + buildInputs = [ alcotest ]; + propagatedBuildInputs = [ cmdliner re uri fieldslib sexplib sexplib + conduit stringext base64 magic-mime ounit async + async_ssl lwt ]; + + buildFlags = "PREFIX=$(out)"; + + meta = with stdenv.lib; { + homepage = https://github.com/mirage/ocaml-cohttp; + description = "Very lightweight HTTP server using Lwt or Async"; + license = licenses.mit; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/comparelib/default.nix b/pkgs/development/ocaml-modules/comparelib/default.nix new file mode 100644 index 00000000000..95001215814 --- /dev/null +++ b/pkgs/development/ocaml-modules/comparelib/default.nix @@ -0,0 +1,22 @@ +{stdenv, buildOcaml, fetchurl, type_conv}: + +buildOcaml rec { + name = "comparelib"; + version = "109.60.00"; + + minimumSupportedOcamlVersion = "4.00"; + + src = fetchurl { + url = "https://github.com/janestreet/comparelib/archive/${version}.tar.gz"; + sha256 = "1075fb05e0d1e290f71ad0f6163f32b2cb4cebdc77568491c7eb38ba91f5db7e"; + }; + + propagatedBuildInputs = [ type_conv ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/comparelib; + description = "Syntax extension for deriving \"compare\" functions automatically"; + license = licenses.asl20; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/conduit/default.nix b/pkgs/development/ocaml-modules/conduit/default.nix new file mode 100644 index 00000000000..dbb83f4c8cf --- /dev/null +++ b/pkgs/development/ocaml-modules/conduit/default.nix @@ -0,0 +1,24 @@ +{stdenv, buildOcaml, fetchurl, sexplib, stringext, uri, cstruct, ipaddr, + async ? null, async_ssl ? null, lwt ? null}: + +buildOcaml rec { + name = "conduit"; + version = "0.8.3"; + + src = fetchurl { + url = "https://github.com/mirage/ocaml-conduit/archive/v${version}.tar.gz"; + sha256 = "5cf1a46aa0254345e5143feebe6b54bdef96314e9987f44e69f24618d620faa1"; + }; + + propagatedBuildInputs = ([ sexplib stringext uri cstruct ipaddr ] + ++ stdenv.lib.optional (lwt != null) lwt + ++ stdenv.lib.optional (async != null) async + ++ stdenv.lib.optional (async_ssl != null) async_ssl); + + meta = with stdenv.lib; { + homepage = https://github.com/mirage/ocaml-conduit; + description = "Resolve URIs into communication channels for Async or Lwt "; + license = licenses.mit; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/core/default.nix b/pkgs/development/ocaml-modules/core/default.nix new file mode 100644 index 00000000000..96fd80087d6 --- /dev/null +++ b/pkgs/development/ocaml-modules/core/default.nix @@ -0,0 +1,30 @@ +{stdenv, buildOcaml, fetchurl, type_conv, + core_kernel, bin_prot, comparelib, custom_printf, enumerate, + fieldslib, herelib, pa_bench, pa_test, pa_ounit, + pipebang, sexplib, typerep, variantslib}: + +buildOcaml rec { + name = "core"; + version = "112.24.01"; + + minimumSupportedOcamlVersion = "4.02"; + + src = fetchurl { + url = "https://github.com/janestreet/core/archive/${version}.tar.gz"; + sha256 = "be5d53ebd4fd04ef23ebf9b3b2840c7aeced6bc4cc6cd3f5e89f71c9949000f4"; + }; + + hasSharedObjects = true; + + buildInputs = [ pa_bench pa_test pa_ounit ]; + propagatedBuildInputs = [ type_conv core_kernel bin_prot comparelib + custom_printf enumerate fieldslib herelib + pipebang sexplib typerep variantslib ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/core; + description = "Jane Street Capital's standard library overlay"; + license = licenses.asl20; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/core_extended/default.nix b/pkgs/development/ocaml-modules/core_extended/default.nix new file mode 100644 index 00000000000..f311aae3d30 --- /dev/null +++ b/pkgs/development/ocaml-modules/core_extended/default.nix @@ -0,0 +1,26 @@ +{stdenv, buildOcaml, fetchurl, bin_prot, comparelib, core, custom_printf, + fieldslib, pa_bench, pa_ounit, pipebang, pa_test, textutils, re2, sexplib}: + +buildOcaml rec { + name = "core_extended"; + version = "112.24.00"; + + minimumSupportedOcamlVersion = "4.02"; + + src = fetchurl { + url = "https://github.com/janestreet/core_extended/archive/${version}.tar.gz"; + sha256 = "f87b0661b6c2cfb545ec61d1cb2ab1b9c4967b6ac14e651de41d3a6fb7f0f1e3"; + }; + + hasSharedObjects = true; + buildInputs = [ pa_bench pa_test pa_ounit ]; + propagatedBuildInputs = [bin_prot comparelib core custom_printf fieldslib + pipebang textutils re2 sexplib ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/core_extended; + description = "Jane Street Capital's standard library overlay"; + license = licenses.asl20; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/core_kernel/default.nix b/pkgs/development/ocaml-modules/core_kernel/default.nix new file mode 100644 index 00000000000..0fed12b195d --- /dev/null +++ b/pkgs/development/ocaml-modules/core_kernel/default.nix @@ -0,0 +1,30 @@ +{stdenv, buildOcaml, fetchurl, type_conv, + bin_prot, comparelib, custom_printf, enumerate, + fieldslib, herelib, pa_bench, pa_test, pa_ounit, + pipebang, sexplib, typerep, variantslib}: + +buildOcaml rec { + name = "core_kernel"; + version = "112.24.00"; + + minimumSupportedOcamlVersion = "4.02"; + + src = fetchurl { + url = "https://github.com/janestreet/core_kernel/archive/${version}.tar.gz"; + sha256 = "93e1f21e35ade98a2bfbe45ba76eef4a8ad3fed97cdc0769f96e0fcc86d6a761"; + }; + + hasSharedObjects = true; + + buildInputs = [ pa_test pa_ounit ]; + propagatedBuildInputs = [ type_conv pa_bench bin_prot comparelib custom_printf + enumerate fieldslib herelib pipebang sexplib + typerep variantslib ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/core_kernel; + description = "Jane Street Capital's standard library overlay (kernel)"; + license = licenses.asl20; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/cstruct/default.nix b/pkgs/development/ocaml-modules/cstruct/default.nix index 194a852e7ef..d62b9397a73 100644 --- a/pkgs/development/ocaml-modules/cstruct/default.nix +++ b/pkgs/development/ocaml-modules/cstruct/default.nix @@ -1,27 +1,31 @@ -{ stdenv, fetchzip, ocaml, findlib, sexplib, ocplib-endian, lwt, camlp4 }: +{stdenv, writeText, fetchurl, ocaml, ocplib-endian, sexplib, findlib, + async ? null, lwt ? null, camlp4}: -let version = "1.6.0"; in +let + ocaml_version = (builtins.parseDrvName ocaml.name).version; +in stdenv.mkDerivation { - name = "ocaml-cstruct-${version}"; + name = "ocaml-cstruct-1.6.0"; - src = fetchzip { - url = "https://github.com/mirage/ocaml-cstruct/archive/v${version}.tar.gz"; - sha256 = "09qw3rhfiq2kkns6660p9cwm5610k72md52a04cy91gr6gsig6ic"; + src = fetchurl { + url = https://github.com/mirage/ocaml-cstruct/archive/v1.6.0.tar.gz; + sha256 = "0f90a1b7a03091cf22a3ccb11a0cce03b6500f064ad3766b5ed81418ac008ece"; }; - buildInputs = [ ocaml findlib lwt camlp4 ]; - propagatedBuildInputs = [ ocplib-endian sexplib ]; - - configureFlags = "--enable-lwt"; + configureFlags = stdenv.lib.strings.concatStringsSep " " ((if lwt != null then ["--enable-lwt"] else []) ++ + (if async != null then ["--enable-async"] else [])); + buildInputs = [ocaml findlib camlp4]; + propagatedBuildInputs = [ocplib-endian sexplib lwt async]; createFindlibDestdir = true; + dontStrip = true; - meta = { - description = "Map OCaml arrays onto C-like structs"; + meta = with stdenv.lib; { homepage = https://github.com/mirage/ocaml-cstruct; + description = "Map OCaml arrays onto C-like structs"; license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + maintainers = [ maintainers.vbgl maintainers.ericbmerritt ]; platforms = ocaml.meta.platforms; }; } diff --git a/pkgs/development/ocaml-modules/ctypes/default.nix b/pkgs/development/ocaml-modules/ctypes/default.nix new file mode 100644 index 00000000000..43c7ddbb290 --- /dev/null +++ b/pkgs/development/ocaml-modules/ctypes/default.nix @@ -0,0 +1,32 @@ +{stdenv, buildOcaml, fetchurl, libffi, pkgconfig, ncurses}: + +buildOcaml rec { + name = "ctypes"; + version = "0.4.1"; + + src = fetchurl { + url = "https://github.com/ocamllabs/ocaml-ctypes/archive/${version}.tar.gz"; + sha256 = "74564e049de5d3c0e76ea284c225cb658ac1a2b483345be1efb9be4b3c1702f5"; + }; + + buildInputs = [ ncurses pkgconfig ]; + propagatedBuildInputs = [ libffi ]; + + hasSharedObjects = true; + + buildPhase = '' + make XEN=false libffi.config ctypes-base ctypes-stubs + make XEN=false ctypes-foreign + ''; + + installPhase = '' + make install XEN=false + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/ocamllabs/ocaml-ctypes; + description = "Library for binding to C libraries using pure OCaml"; + license = licenses.mit; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/custom_printf/default.nix b/pkgs/development/ocaml-modules/custom_printf/default.nix new file mode 100644 index 00000000000..05a8ecfe616 --- /dev/null +++ b/pkgs/development/ocaml-modules/custom_printf/default.nix @@ -0,0 +1,23 @@ +{stdenv, buildOcaml, fetchurl, type_conv, sexplib, pa_ounit}: + +buildOcaml rec { + name = "custom_printf"; + version = "112.24.00"; + + minimumSupportedOcamlVersion = "4.02"; + + src = fetchurl { + url = "https://github.com/janestreet/custom_printf/archive/${version}.tar.gz"; + sha256 = "dad3aface92c53e8fbcc12cc9358c4767cb1cb09857d4819a10ed98eccaca8f9"; + }; + + buildInputs = [ pa_ounit ]; + propagatedBuildInputs = [ type_conv sexplib ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/custom_printf; + description = "Syntax extension for printf format strings"; + license = licenses.asl20; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index 9700a1d8cc5..54644d83699 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, ocaml, findlib, which, ocsigen_server, ocsigen_deriving, js_of_ocaml, ocaml_react, ocaml_lwt, calendar, cryptokit, tyxml, - ocaml_ipaddr, ocamlnet, ocaml_ssl, ocaml_pcre, ocaml_optcomp, + ipaddr, ocamlnet, ocaml_ssl, ocaml_pcre, ocaml_optcomp, reactivedata, opam}: stdenv.mkDerivation rec @@ -17,7 +17,7 @@ stdenv.mkDerivation rec buildInputs = [ocaml which ocsigen_server findlib ocsigen_deriving js_of_ocaml ocaml_optcomp opam]; - propagatedBuildInputs = [ ocaml_lwt reactivedata tyxml ocaml_ipaddr + propagatedBuildInputs = [ ocaml_lwt reactivedata tyxml ipaddr calendar cryptokit ocamlnet ocaml_react ocaml_ssl ocaml_pcre ]; diff --git a/pkgs/development/ocaml-modules/fieldslib/default.nix b/pkgs/development/ocaml-modules/fieldslib/default.nix index 28b83d3af46..38548790329 100644 --- a/pkgs/development/ocaml-modules/fieldslib/default.nix +++ b/pkgs/development/ocaml-modules/fieldslib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocaml_typeconv, camlp4 }: +{ stdenv, fetchurl, ocaml, findlib, type_conv, camlp4 }: assert stdenv.lib.versionOlder "4.00" (stdenv.lib.getVersion ocaml); @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; buildInputs = [ ocaml findlib ]; - propagatedBuildInputs = [ ocaml_typeconv camlp4 ]; + propagatedBuildInputs = [ type_conv camlp4 ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/herelib/default.nix b/pkgs/development/ocaml-modules/herelib/default.nix new file mode 100644 index 00000000000..fd955602844 --- /dev/null +++ b/pkgs/development/ocaml-modules/herelib/default.nix @@ -0,0 +1,20 @@ +{stdenv, buildOcaml, fetchurl}: + +buildOcaml rec { + version = "109.35.02"; + name = "herelib"; + + minimumSupportedOcamlVersion = "4.02"; + + src = fetchurl { + url = "https://github.com/janestreet/herelib/archive/${version}.tar.gz"; + sha256 = "7f8394169cb63f6d41e91c9affa1b8ec240d5f6e9dfeda3fbb611df521d4b05a"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/herelib; + description = "Syntax extension for inserting the current location"; + license = stdenv.lib.licenses.asl20; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/ipaddr/default.nix b/pkgs/development/ocaml-modules/ipaddr/default.nix new file mode 100644 index 00000000000..749b6a1d94e --- /dev/null +++ b/pkgs/development/ocaml-modules/ipaddr/default.nix @@ -0,0 +1,32 @@ +{stdenv, buildOcaml, fetchurl, sexplib}: + +buildOcaml rec { + name = "ipaddr"; + version = "2.6.1"; + + src = fetchurl { + url = "https://github.com/mirage/ocaml-ipaddr/archive/${version}.tar.gz"; + sha256 = "7051013d8f58abff433187d70cd7ddd7a6b49a6fbe6cad1893f571f65b8ed3d0"; + }; + + propagatedBuildInputs = [ sexplib ]; + + configurePhase = '' + ocaml setup.ml -configure --prefix $out + ''; + + buildPhase = '' + make build + ''; + + installPhase = '' + make install + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/mirage/ocaml-ipaddr; + description = "A library for manipulation of IP (and MAC) address representations "; + license = licenses.mit; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/jingoo/default.nix b/pkgs/development/ocaml-modules/jingoo/default.nix new file mode 100644 index 00000000000..4f42f51c16e --- /dev/null +++ b/pkgs/development/ocaml-modules/jingoo/default.nix @@ -0,0 +1,23 @@ +{stdenv, buildOcaml, fetchurl, batteries, pcre}: + +buildOcaml rec { + name = "jingoo"; + version = "1.2.7"; + + src = fetchurl { + url = "https://github.com/tategakibunko/jingoo/archive/v${version}.tar.gz"; + sha256 = "8ffc5723d77b323a12761981d048c046af77db47543a4b1076573aa5f4003009"; + }; + + propagatedBuildInputs = [ batteries pcre ]; + + preInstall = "mkdir -p $out/bin"; + installFlags = "BINDIR=$(out)/bin"; + + meta = with stdenv.lib; { + homepage = https://github.com/tategakibunko/jingoo; + description = "OCaml template engine almost compatible with jinja2"; + license = licenses.mit; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index 20acb75d931..0c81775f236 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -16,9 +16,9 @@ stdenv.mkDerivation { sha256 = "0idci0zadpb8hmblszsrvg6yf36w5a9y6rsdwjc3jww71dgrw5d9"; }; - buildInputs = [ocaml_oasis pkgconfig which cryptopp ocaml findlib glib libev ncurses camlp4]; + buildInputs = [ocaml_oasis pkgconfig which cryptopp ocaml findlib glib ncurses camlp4]; - propagatedBuildInputs = [ ocaml_react ocaml_ssl ocaml_text ]; + propagatedBuildInputs = [ ocaml_react ocaml_ssl ocaml_text libev ]; configureFlags = [ "--enable-react" "--enable-glib" "--enable-ssl" "--enable-text" "--disable-ppx" ] ++ optional (versionAtLeast ocaml_version "4.0" && ! versionAtLeast ocaml_version "4.02") "--enable-toplevel"; diff --git a/pkgs/development/ocaml-modules/ocaml-ipaddr/default.nix b/pkgs/development/ocaml-modules/ocaml-ipaddr/default.nix deleted file mode 100644 index 09cfe1c350d..00000000000 --- a/pkgs/development/ocaml-modules/ocaml-ipaddr/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ocaml, findlib, stdenv, fetchurl, ocaml_sexplib}: -assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12"; -stdenv.mkDerivation { - name = "ocaml-ipaddr-2.5.0"; - - src = fetchurl { - url = https://github.com/mirage/ocaml-ipaddr/archive/2.5.0.tar.gz; - sha256 = "0zpslxzjs5zdw20j3jaf6fr0w2imnidhrzggmnvwp198r76aq917"; - }; - - buildInputs = [ocaml findlib]; - propagatedBuildInputs = [ocaml_sexplib]; - - createFindlibDestdir = true; - - meta = with stdenv.lib; { - description = "An OCaml library for manipulation of IP (and MAC) address representations"; - license = licenses.isc; - maintainers = [ maintainers.vbgl ]; - platforms = ocaml.meta.platforms; - }; - -} diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix index d5c066ae2aa..58d8b047ec1 100644 --- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -1,17 +1,17 @@ {stdenv, fetchurl, ocaml, findlib, which, ocaml_react, ocaml_ssl, -ocaml_lwt, ocamlnet, ocaml_pcre, cryptokit, tyxml, ocaml_ipaddr, zlib, +ocaml_lwt, ocamlnet, ocaml_pcre, cryptokit, tyxml, ipaddr, zlib, libev, openssl, ocaml_sqlite3, tree, uutf}: stdenv.mkDerivation { name = "ocsigenserver-2.5"; - + src = fetchurl { url = https://github.com/ocsigen/ocsigenserver/archive/2.5.tar.gz; sha256 = "0ayzlzjwg199va4sclsldlcp0dnwdj45ahhg9ckb51m28c2pw46r"; }; buildInputs = [ocaml which findlib ocaml_react ocaml_ssl ocaml_lwt - ocamlnet ocaml_pcre cryptokit tyxml ocaml_ipaddr zlib libev openssl + ocamlnet ocaml_pcre cryptokit tyxml ipaddr zlib libev openssl ocaml_sqlite3 tree uutf]; configureFlags = "--root $(out) --prefix /"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; - postFixup = + postFixup = '' rm -rf $out/var/run ''; diff --git a/pkgs/development/ocaml-modules/odn/default.nix b/pkgs/development/ocaml-modules/odn/default.nix index bfffb67d4b0..eaeb7e7b22f 100644 --- a/pkgs/development/ocaml-modules/odn/default.nix +++ b/pkgs/development/ocaml-modules/odn/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, ocaml_typeconv, ounit, camlp4}: +{stdenv, fetchurl, ocaml, findlib, type_conv, ounit, camlp4}: stdenv.mkDerivation { name = "ocaml-data-notation-0.0.11"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "09a8zdyifpc2nl4hdvg9206142y31cq95ajgij011s1qcg3z93lj"; }; - buildInputs = [ocaml findlib ocaml_typeconv ounit camlp4]; + buildInputs = [ocaml findlib type_conv ounit camlp4]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/pa_bench/default.nix b/pkgs/development/ocaml-modules/pa_bench/default.nix new file mode 100644 index 00000000000..d8ce0dbc7ea --- /dev/null +++ b/pkgs/development/ocaml-modules/pa_bench/default.nix @@ -0,0 +1,23 @@ +{stdenv, buildOcaml, fetchurl, type_conv, pa_ounit}: + +buildOcaml rec { + name = "pa_bench"; + version = "112.06.00"; + + minimumSupportedOcamlVersion = "4.00"; + + src = fetchurl { + url = "https://github.com/janestreet/pa_bench/archive/${version}.tar.gz"; + sha256 = "e3401e37f1d3d4acb957fd46a192d0ffcefeb0bedee63bbeb26969af1d540870"; + }; + + buildInputs = [ pa_ounit ]; + propagatedBuildInputs = [ type_conv ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/pa_bench; + description = "Syntax extension for inline benchmarks"; + license = stdenv.lib.licenses.asl20; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/pa_ounit/default.nix b/pkgs/development/ocaml-modules/pa_ounit/default.nix new file mode 100644 index 00000000000..5970aba1e50 --- /dev/null +++ b/pkgs/development/ocaml-modules/pa_ounit/default.nix @@ -0,0 +1,20 @@ +{stdenv, buildOcaml, fetchurl, ounit}: + +buildOcaml rec { + name = "pa_ounit"; + version = "112.24.00"; + + src = fetchurl { + url = "https://github.com/janestreet/pa_ounit/archive/${version}.tar.gz"; + sha256 = "fa04e72fe1db41e6dc64f9707cf5705cb9b957aa93265120c875c808eb9b9b96"; + }; + + propagatedBuildInputs = [ ounit ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/pa_ounit; + description = "OCaml inline testing"; + license = licenses.asl20; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/pa_test/default.nix b/pkgs/development/ocaml-modules/pa_test/default.nix new file mode 100644 index 00000000000..faf17e20dc1 --- /dev/null +++ b/pkgs/development/ocaml-modules/pa_test/default.nix @@ -0,0 +1,23 @@ +{stdenv, buildOcaml, fetchurl, type_conv, pa_ounit, sexplib, herelib}: + +buildOcaml rec { + name = "pa_test"; + version = "112.24.00"; + + minimumSupportedOcamlVersion = "4.00"; + + src = fetchurl { + url = "https://github.com/janestreet/pa_test/archive/${version}.tar.gz"; + sha256 = "b03d13c2bc9fa9a4b1c507d7108d965202160f83e9781d430d3b53a1993e30d6"; + }; + + buildInputs = [ pa_ounit ]; + propagatedBuildInputs = [ type_conv sexplib herelib ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/pa_test; + description = "Syntax to reduce boiler plate in testing"; + license = licenses.asl20; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/pipebang/default.nix b/pkgs/development/ocaml-modules/pipebang/default.nix new file mode 100644 index 00000000000..fa9a9f8f86a --- /dev/null +++ b/pkgs/development/ocaml-modules/pipebang/default.nix @@ -0,0 +1,20 @@ +{stdenv, buildOcaml, fetchurl}: + +buildOcaml rec { + name = "pipebang"; + version = "110.01.00"; + + minimumSupportedOcamlVersion = "4.00"; + + src = fetchurl { + url = "https://github.com/janestreet/pipebang/archive/${version}.tar.gz"; + sha256 = "a8858d9607c15cdf0a775196be060c8d91de724fc80a347d7a76ef1d38329096"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/pipebang; + description = "Syntax extension to transform x |! f into f x"; + license = licenses.asl20; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/re2/Makefile.patch b/pkgs/development/ocaml-modules/re2/Makefile.patch new file mode 100644 index 00000000000..fcb6eefe62b --- /dev/null +++ b/pkgs/development/ocaml-modules/re2/Makefile.patch @@ -0,0 +1,17 @@ +--- ./lib/Makefile 2014-11-18 08:16:19.000000000 -0800 ++++ ./lib/Makefile 2015-05-23 14:48:31.000000000 -0700 +@@ -6,12 +6,12 @@ + all: libre2_stubs.a dllre2_stubs.so + + dllre2_stubs.so libre2_stubs.a: stubs.o $(LIBRE2) +- ocamlmklib -oc re2_stubs stubs.o $(LIBRE2) -lstdc++ ++ ocamlmklib -oc re2_stubs stubs.o $(LIBRE2) -lc++ + rm libre2_stubs.a # ocamlmklib just includes $(LIBRE2) inside the stubs archive + cp $(LIBRE2) libre2_stubs.a && ar r libre2_stubs.a stubs.o + + stubs.o: stubs.cpp stubs.h util.h enum_x_macro.h +- g++ -O2 -DPIC -fPIC -g -pipe -DCAML_NAME_SPACE -Wall -I. -I../../../include \ ++ $(CXX) -O2 -DPIC -fPIC -g -pipe -DCAML_NAME_SPACE -Wall -I. -I../../../include \ + -I$(RE2_HOME) -I$(ocaml-version-selected-include-path) -c stubs.cpp + + #stubs.o: %.o: %.cpp %.h diff --git a/pkgs/development/ocaml-modules/re2/default.nix b/pkgs/development/ocaml-modules/re2/default.nix new file mode 100644 index 00000000000..e89e28fe1e5 --- /dev/null +++ b/pkgs/development/ocaml-modules/re2/default.nix @@ -0,0 +1,29 @@ +{stdenv, buildOcaml, fetchurl, ocaml, core, pa_ounit, pa_test, + bin_prot, comparelib, sexplib, rsync}: + +buildOcaml rec { + name = "re2"; + version = "112.06.00"; + + minimumSupportedOcamlVersion = "4.00"; + + src = fetchurl { + url = "https://github.com/janestreet/re2/archive/${version}.tar.gz"; + sha256 = "a538765872363fcb67f12b95c07455a0afd68f5ae9008b59bb85a996d97cc752"; + }; + patches = if stdenv.isDarwin + then [./Makefile.patch ./myocamlbuild.patch] + else null; + + buildInputs = [ pa_ounit pa_test rsync ]; + propagatedBuildInputs = [ core bin_prot comparelib sexplib ]; + + hasSharedObjects = true; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/re2; + description = "OCaml bindings for RE2"; + license = stdenv.lib.licenses.asl20; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/re2/myocamlbuild.patch b/pkgs/development/ocaml-modules/re2/myocamlbuild.patch new file mode 100644 index 00000000000..46ad6fa801b --- /dev/null +++ b/pkgs/development/ocaml-modules/re2/myocamlbuild.patch @@ -0,0 +1,24 @@ +--- ./myocamlbuild.ml 2015-05-23 14:35:18.000000000 -0700 ++++ ./myocamlbuild.ml 2015-05-23 15:05:24.000000000 -0700 +@@ -626,16 +626,18 @@ + rule "Generate lib/options.ml" + ~prod:"lib/options.ml" + ~deps:["lib/options.mlp"; "lib/enum_x_macro.h"] +- (fun _ _ -> Cmd (S[A"gcc"; A"-E"; A"-P"; A"-x"; A"c"; ++ (fun _ _ -> Cmd (S[A"cc"; A"-E"; A"-P"; A"-x"; A"c"; + P"lib/options.mlp"; A"-o"; P"lib/options.ml"])); + + flag ["ocaml"; "link"; "library"; "native"] (S[A"-cclib"; A"-Llib"; + A"-cclib"; A"-lre2_stubs"; +- A"-cclib"; A"-lstdc++"]); ++ A"-ccopt"; A"--stdlib=libc++"; ++ A"-cclib"; A"-lc++"]); + flag ["ocaml"; "link"; "library"; "byte"] (S[A"-dllib"; A"dllre2_stubs.so"; + A"-cclib"; A"-Llib"; + A"-cclib"; A"-lre2_stubs"; +- A"-cclib"; A"-lstdc++"]); ++ A"-ccopt"; A"--stdlib=libc++"; ++ A"-cclib"; A"-lc++"]); + | _ -> + () + diff --git a/pkgs/development/ocaml-modules/sexplib/108.08.00.nix b/pkgs/development/ocaml-modules/sexplib/108.08.00.nix index bde9c271371..dd9e89bcef7 100644 --- a/pkgs/development/ocaml-modules/sexplib/108.08.00.nix +++ b/pkgs/development/ocaml-modules/sexplib/108.08.00.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, typeconv, camlp4}: +{stdenv, fetchurl, ocaml, findlib, type_conv, camlp4}: let ocaml_version = (builtins.parseDrvName ocaml.name).version; @@ -15,7 +15,7 @@ stdenv.mkDerivation { }; buildInputs = [ocaml findlib]; - propagatedBuildInputs = [typeconv camlp4]; + propagatedBuildInputs = [type_conv camlp4]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/sexplib/default.nix b/pkgs/development/ocaml-modules/sexplib/111.25.00.nix similarity index 75% rename from pkgs/development/ocaml-modules/sexplib/default.nix rename to pkgs/development/ocaml-modules/sexplib/111.25.00.nix index a32c6a0e2ce..61d46e205fa 100644 --- a/pkgs/development/ocaml-modules/sexplib/default.nix +++ b/pkgs/development/ocaml-modules/sexplib/111.25.00.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, ocaml_typeconv, camlp4}: +{stdenv, fetchurl, ocaml, findlib, type_conv, camlp4}: let ocaml_version = (builtins.parseDrvName ocaml.name).version; @@ -7,7 +7,7 @@ in assert stdenv.lib.versionOlder "4.00" ocaml_version; stdenv.mkDerivation { - name = "ocaml-sexplib-111.25.0"; + name = "ocaml-sexplib-111.25.00"; src = fetchurl { url = https://ocaml.janestreet.com/ocaml-core/111.25.00/individual/sexplib-111.25.00.tar.gz; @@ -15,7 +15,7 @@ stdenv.mkDerivation { }; buildInputs = [ocaml findlib]; - propagatedBuildInputs = [ocaml_typeconv camlp4]; + propagatedBuildInputs = [type_conv camlp4]; createFindlibDestdir = true; @@ -23,7 +23,7 @@ stdenv.mkDerivation { homepage = https://ocaml.janestreet.com/; description = "Library for serializing OCaml values to and from S-expressions"; license = licenses.asl20; - maintainers = [ maintainers.vbgl ]; + maintainers = [ maintainers.vbgl maintainers.ericbmerritt ]; platforms = ocaml.meta.platforms; }; } diff --git a/pkgs/development/ocaml-modules/sexplib/112.24.01.nix b/pkgs/development/ocaml-modules/sexplib/112.24.01.nix new file mode 100644 index 00000000000..b63b5af05e8 --- /dev/null +++ b/pkgs/development/ocaml-modules/sexplib/112.24.01.nix @@ -0,0 +1,21 @@ +{stdenv, buildOcaml, fetchurl, type_conv, camlp4}: + +buildOcaml rec { + minimumSupportedOcamlVersion = "4.02"; + name = "sexplib"; + version = "112.24.01"; + + src = fetchurl { + url = "https://github.com/janestreet/sexplib/archive/${version}.tar.gz"; + sha256 = "5f776aee295cc51c952aecd4b74b52dd2b850c665cc25b3d69bc42014d3ba073"; + }; + + propagatedBuildInputs = [ type_conv camlp4 ]; + + meta = with stdenv.lib; { + homepage = https://ocaml.janestreet.com/; + description = "Library for serializing OCaml values to and from S-expressions"; + license = licenses.asl20; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/textutils/default.nix b/pkgs/development/ocaml-modules/textutils/default.nix new file mode 100644 index 00000000000..377b94eff8b --- /dev/null +++ b/pkgs/development/ocaml-modules/textutils/default.nix @@ -0,0 +1,23 @@ +{stdenv, buildOcaml, fetchurl, core, pa_ounit, pa_test, sexplib}: + +buildOcaml rec { + name = "textutils"; + version = "112.17.00"; + + minimalSupportedOcamlVersion = "4.02"; + + src = fetchurl { + url = "https://github.com/janestreet/textutils/archive/${version}.tar.gz"; + sha256 = "605d9fde66dc2d777721c936aa521e17169c143efaf9ff29619a7f273a7d0052"; + }; + + buildInputs = [ pa_test ]; + propagatedBuildInputs = [ core pa_ounit sexplib ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/textutils; + description = ""; + license = stdenv.lib.licenses.asl20; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/typeconv/108.08.00.nix b/pkgs/development/ocaml-modules/type_conv/108.08.00.nix similarity index 95% rename from pkgs/development/ocaml-modules/typeconv/108.08.00.nix rename to pkgs/development/ocaml-modules/type_conv/108.08.00.nix index 24daa366b2a..d3e32105f7d 100644 --- a/pkgs/development/ocaml-modules/typeconv/108.08.00.nix +++ b/pkgs/development/ocaml-modules/type_conv/108.08.00.nix @@ -7,7 +7,7 @@ in assert stdenv.lib.versionOlder "3.12" ocaml_version; stdenv.mkDerivation { - name = "ocaml-typeconv-108.08.00"; + name = "ocaml-type_conv-108.08.00"; src = fetchurl { url = https://ocaml.janestreet.com/ocaml-core/108.08.00/individual/type_conv-108.08.00.tar.gz; diff --git a/pkgs/development/ocaml-modules/typeconv/default.nix b/pkgs/development/ocaml-modules/type_conv/109.60.01.nix similarity index 95% rename from pkgs/development/ocaml-modules/typeconv/default.nix rename to pkgs/development/ocaml-modules/type_conv/109.60.01.nix index 359f906ce34..fe42dd5ddcb 100644 --- a/pkgs/development/ocaml-modules/typeconv/default.nix +++ b/pkgs/development/ocaml-modules/type_conv/109.60.01.nix @@ -7,7 +7,7 @@ in assert stdenv.lib.versionOlder "4.00" ocaml_version; stdenv.mkDerivation { - name = "ocaml-typeconv-109.60.01"; + name = "ocaml-type_conv-109.60.01"; src = fetchurl { url = https://github.com/janestreet/type_conv/archive/109.60.01.tar.gz; diff --git a/pkgs/development/ocaml-modules/type_conv/112.01.01.nix b/pkgs/development/ocaml-modules/type_conv/112.01.01.nix new file mode 100644 index 00000000000..e65306d1501 --- /dev/null +++ b/pkgs/development/ocaml-modules/type_conv/112.01.01.nix @@ -0,0 +1,20 @@ +{stdenv, fetchurl, buildOcaml}: + +buildOcaml rec { + minimumSupportedOcamlVersion = "4.02"; + + name = "type_conv"; + version = "112.01.01"; + + src = fetchurl { + url = "https://github.com/janestreet/type_conv/archive/${version}.tar.gz"; + sha256 = "dbbc33b7ab420e8442d79ba4308ea6c0c16903b310d33525be18841159aa8855"; + }; + + meta = { + homepage = "https://github.com/janestreet/type_conv/"; + description = "Support library for preprocessor type conversions"; + license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; [ z77z ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/typerep/default.nix b/pkgs/development/ocaml-modules/typerep/default.nix new file mode 100644 index 00000000000..9500579e245 --- /dev/null +++ b/pkgs/development/ocaml-modules/typerep/default.nix @@ -0,0 +1,23 @@ +{stdenv, buildOcaml, fetchurl, type_conv}: + +buildOcaml rec { + name = "typerep"; + version = "112.24.00"; + + minimumSupportedOcamlVersion = "4.00"; + + src = fetchurl { + url = "https://github.com/janestreet/typerep/archive/${version}.tar.gz"; + sha256 = "4f1ab611a00aaf774e9774b26b687233e0c70d91f684415a876f094a9969eada"; + }; + + propagatedBuildInputs = [ type_conv ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/typerep; + description = "Runtime types for OCaml (beta version)"; + license = licenses.asl20; + maintainers = [ maintainers.ericbmerritt ]; + }; + +} diff --git a/pkgs/development/ocaml-modules/variantslib/default.nix b/pkgs/development/ocaml-modules/variantslib/default.nix new file mode 100644 index 00000000000..cb25b844606 --- /dev/null +++ b/pkgs/development/ocaml-modules/variantslib/default.nix @@ -0,0 +1,22 @@ +{stdenv, buildOcaml, fetchurl, type_conv}: + +buildOcaml rec { + name = "variantslib"; + version = "109.15.03"; + + minimumSupportedOcamlVersion = "4.00"; + + src = fetchurl { + url = "https://github.com/janestreet/variantslib/archive/${version}.tar.gz"; + sha256 = "a948dcdd4ca54786fe0646386b6e37a9db03bf276c6557ea374d82740bf18055"; + }; + + propagatedBuildInputs = [ type_conv ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/variantslib; + description = "OCaml variants as first class values"; + license = licenses.asl20; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/pure-modules/audio/default.nix b/pkgs/development/pure-modules/audio/default.nix new file mode 100644 index 00000000000..7b14b20dc83 --- /dev/null +++ b/pkgs/development/pure-modules/audio/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, pure, portaudio, fftw, libsndfile, libsamplerate }: + +stdenv.mkDerivation rec { + baseName = "audio"; + version = "0.6"; + name = "pure-${baseName}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + sha256 = "c1f2a5da73983efb5a54f86d57ba93713ebed20ff0c72de9b3467f10f2904ee0"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ pure portaudio fftw libsndfile libsamplerate ]; + makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + setupHook = ../generic-setup-hook.sh; + + meta = { + description = "A digital audio interface for the Pure programming language"; + homepage = http://puredocs.bitbucket.org/pure-audio.html; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} diff --git a/pkgs/development/pure-modules/avahi/default.nix b/pkgs/development/pure-modules/avahi/default.nix new file mode 100644 index 00000000000..e22e1fae220 --- /dev/null +++ b/pkgs/development/pure-modules/avahi/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, pure, avahi }: + +stdenv.mkDerivation rec { + baseName = "avahi"; + version = "0.3"; + name = "pure-${baseName}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + sha256 = "5fac8a6e3a54e45648ceb207ee0061b22eac8c4e668b8d53f13eb338b09c9160"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ pure avahi ]; + makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + setupHook = ../generic-setup-hook.sh; + + meta = { + description = "A digital audio interface for the Pure programming language"; + homepage = http://puredocs.bitbucket.org/pure-avahi.html; + license = stdenv.lib.licenses.lgpl3Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} diff --git a/pkgs/development/pure-modules/csv/default.nix b/pkgs/development/pure-modules/csv/default.nix new file mode 100644 index 00000000000..6d41f2c5e6a --- /dev/null +++ b/pkgs/development/pure-modules/csv/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, pure }: + +stdenv.mkDerivation rec { + baseName = "csv"; + version = "1.6"; + name = "pure-${baseName}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + sha256 = "fe7c4edebe8208c54d5792a9eefaeb28c4a58b9094d161a6dda8126f0823ab3c"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ pure ]; + makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + setupHook = ../generic-setup-hook.sh; + + meta = { + description = "Comma Separated Value Interface for the Pure Programming Language"; + homepage = http://puredocs.bitbucket.org/pure-csv.html; + license = stdenv.lib.licenses.free; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} diff --git a/pkgs/development/pure-modules/doc/default.nix b/pkgs/development/pure-modules/doc/default.nix new file mode 100644 index 00000000000..68a08334375 --- /dev/null +++ b/pkgs/development/pure-modules/doc/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, pkgconfig, pure }: + +stdenv.mkDerivation rec { + baseName = "doc"; + version = "0.7"; + name = "pure-${baseName}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + sha256 = "cfa880573941f37868269bcc443a09fecd2a141a78556383d2213f6c9f45ddd9"; + }; + + buildInputs = [ pkgconfig pure ]; + makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + + meta = { + description = "A simple utility for literate programming and documenting source code written in the Pure programming language"; + homepage = http://puredocs.bitbucket.org/pure-doc.html; + license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} diff --git a/pkgs/development/pure-modules/fastcgi/default.nix b/pkgs/development/pure-modules/fastcgi/default.nix new file mode 100644 index 00000000000..f1bc49c5ecc --- /dev/null +++ b/pkgs/development/pure-modules/fastcgi/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, pure, fcgi }: + +stdenv.mkDerivation rec { + baseName = "fastcgi"; + version = "0.6"; + name = "pure-${baseName}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + sha256 = "aa5789cc1e17521c01f349ee82ce2a00500e025b3f8494f89a7ebe165b5aabc7"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ pure fcgi ]; + makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + setupHook = ../generic-setup-hook.sh; + + meta = { + description = "Lets you write FastCGI scripts with Pure, to be run by web servers like Apache"; + homepage = http://puredocs.bitbucket.org/pure-fastcgi.html; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} diff --git a/pkgs/development/pure-modules/faust/default.nix b/pkgs/development/pure-modules/faust/default.nix new file mode 100644 index 00000000000..7f5c4801d5d --- /dev/null +++ b/pkgs/development/pure-modules/faust/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, pure, faust, libtool }: + +stdenv.mkDerivation rec { + baseName = "faust"; + version = "0.11"; + name = "pure-${baseName}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + sha256 = "51278a3b0807c4770163dc2ce423507dcf0ffec9cd1c1fbc08426d07294f6ae0"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ pure faust libtool ]; + makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + setupHook = ../generic-setup-hook.sh; + + meta = { + description = "Lets you load and run Faust-generated signal processing modules in Pure"; + homepage = http://puredocs.bitbucket.org/pure-faust.html; + license = stdenv.lib.licenses.lgpl3Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} diff --git a/pkgs/development/pure-modules/ffi/default.nix b/pkgs/development/pure-modules/ffi/default.nix new file mode 100644 index 00000000000..a9a3a56ebb8 --- /dev/null +++ b/pkgs/development/pure-modules/ffi/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, pure, libffi }: + +stdenv.mkDerivation rec { + baseName = "ffi"; + version = "0.14"; + name = "pure-${baseName}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + sha256 = "0331f48efaae40af21b23cf286fd7eac0ea0a249d08fd97bf23246929c0ea71a"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ pure libffi ]; + makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + setupHook = ../generic-setup-hook.sh; + + meta = { + description = "Provides an interface to libffi which enables you to call C functions from Pure and vice versa"; + homepage = http://puredocs.bitbucket.org/pure-ffi.html; + license = stdenv.lib.licenses.lgpl3Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} diff --git a/pkgs/development/pure-modules/gen/default.nix b/pkgs/development/pure-modules/gen/default.nix new file mode 100644 index 00000000000..082a8c88c61 --- /dev/null +++ b/pkgs/development/pure-modules/gen/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchurl, + pkgconfig, pure, haskellPackages }: + +stdenv.mkDerivation rec { + baseName = "gen"; + version = "0.20"; + name = "pure-${baseName}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + sha256 = "cfadd99a378b296325937d2492347611cc1e1d9f24594f91f3c2293eca01a4a8"; + }; + + hsEnv = haskellPackages.ghcWithPackages (hsPkgs : [hsPkgs.language-c]); + buildInputs = [ pkgconfig hsEnv pure ]; + makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + + meta = { + description = "Pure interface generator"; + homepage = http://puredocs.bitbucket.org/pure-gen.html; + license = stdenv.lib.licenses.free; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} diff --git a/pkgs/development/pure-modules/pure-gsl/setup-hook.sh b/pkgs/development/pure-modules/generic-setup-hook.sh similarity index 100% rename from pkgs/development/pure-modules/pure-gsl/setup-hook.sh rename to pkgs/development/pure-modules/generic-setup-hook.sh diff --git a/pkgs/development/pure-modules/gl/default.nix b/pkgs/development/pure-modules/gl/default.nix new file mode 100644 index 00000000000..37026ad9344 --- /dev/null +++ b/pkgs/development/pure-modules/gl/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, pure, freeglut, mesa, x11 }: + +stdenv.mkDerivation rec { + baseName = "gl"; + version = "0.9"; + name = "pure-${baseName}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + sha256 = "edd594222f89ae372067eda6679a37488986b9739b5b79b4a25ac48255d31bba"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ pure freeglut mesa x11 ]; + makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + setupHook = ../generic-setup-hook.sh; + + meta = { + description = "Fairly complete Pure bindings for the OpenGL graphics library, which allow you to do 2D and 3D graphics programming with Pure"; + homepage = http://puredocs.bitbucket.org/pure-gl.html; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} diff --git a/pkgs/development/pure-modules/glpk/default.nix b/pkgs/development/pure-modules/glpk/default.nix new file mode 100644 index 00000000000..22d2bc17738 --- /dev/null +++ b/pkgs/development/pure-modules/glpk/default.nix @@ -0,0 +1,39 @@ +{ lib, stdenv, fetchurl, + pkgconfig, pure, glpk, gmp, libtool, libmysql, libiodbc, zlib }: + +stdenv.mkDerivation rec { + baseName = "glpk"; + version = "0.5"; + name = "pure-${baseName}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + sha256 = "5d6dc11706985dda02d96d481ea5f164c9e95ee446432fc4fc3d0db61a076346"; + }; + + glpkWithExtras = lib.overrideDerivation glpk (attrs: { + propagatedNativeBuildInputs = [ gmp libtool libmysql libiodbc ]; + + preConfigure = '' + substituteInPlace configure \ + --replace /usr/include/mysql ${libmysql}/include/mysql + ''; + configureFlags = [ "--enable-dl" + "--enable-odbc" + "--enable-mysql" + "--with-gmp=yes" ]; + }); + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ pure glpkWithExtras ]; + makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + setupHook = ../generic-setup-hook.sh; + + meta = { + description = "GLPK interface for the Pure Programming Language"; + homepage = http://puredocs.bitbucket.org/pure-glpk.html; + license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} diff --git a/pkgs/development/pure-modules/gplot/default.nix b/pkgs/development/pure-modules/gplot/default.nix new file mode 100644 index 00000000000..acaf1efdaaa --- /dev/null +++ b/pkgs/development/pure-modules/gplot/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, pure, gnuplot }: + +stdenv.mkDerivation rec { + baseName = "gplot"; + version = "0.1"; + name = "pure-${baseName}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + sha256 = "841ded98e4d1cdfaf78f95481e5995d0440bfda2d5df533d6741a6e7058a882c"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ pure gnuplot ]; + makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + setupHook = ../generic-setup-hook.sh; + + meta = { + description = "a pure binding to gnuplot"; + homepage = http://puredocs.bitbucket.org/pure-gplot.html; + license = stdenv.lib.licenses.lgpl3Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} diff --git a/pkgs/development/pure-modules/pure-gsl/default.nix b/pkgs/development/pure-modules/gsl/default.nix similarity index 60% rename from pkgs/development/pure-modules/pure-gsl/default.nix rename to pkgs/development/pure-modules/gsl/default.nix index bbad1e380d5..10eddeeb797 100644 --- a/pkgs/development/pure-modules/pure-gsl/default.nix +++ b/pkgs/development/pure-modules/gsl/default.nix @@ -1,22 +1,19 @@ { stdenv, fetchurl, pure, pkgconfig, gsl }: -stdenv.mkDerivation { - name = "pure-gsl-0.12"; +stdenv.mkDerivation rec { + baseName = "gsl"; + version = "0.12"; + name = "pure-${baseName}-${version}"; + src = fetchurl { - url = https://bitbucket.org/purelang/pure-lang/downloads/pure-gsl-0.12.tar.gz; + url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; sha256 = "06bdd873d5417d90ca35093056a060b77365123ed24c3ac583cd3922d4c78a75"; }; buildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure gsl ]; - - installPhase = '' - mkdir -p $out/lib/pure/gsl - install gsl.pure gsl$(pkg-config pure --variable DLL) $out/lib/pure - install gsl/*.pure $out/lib/pure/gsl - ''; - - setupHook = ./setup-hook.sh; + makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + setupHook = ../generic-setup-hook.sh; meta = { description = "GNU Scientific Library interface for Pure"; @@ -25,4 +22,4 @@ stdenv.mkDerivation { platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ asppsa ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/pure-modules/gtk/default.nix b/pkgs/development/pure-modules/gtk/default.nix new file mode 100644 index 00000000000..fd2460b5c1b --- /dev/null +++ b/pkgs/development/pure-modules/gtk/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, pure, pure-ffi, gtk2 }: + +stdenv.mkDerivation rec { + baseName = "gtk"; + version = "0.13"; + name = "pure-${baseName}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + sha256 = "e659ff1bc5809ce35b810f8ac3fb7e8cadaaef13996537d8632e2f86ed76d203"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ pure pure-ffi gtk2 ]; + makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + setupHook = ../generic-setup-hook.sh; + + meta = { + description = "A collection of bindings to use the GTK+ GUI toolkit version 2.x with Pure"; + homepage = http://puredocs.bitbucket.org/pure-gtk.html; + license = stdenv.lib.licenses.lgpl3Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} diff --git a/pkgs/development/pure-modules/liblo/default.nix b/pkgs/development/pure-modules/liblo/default.nix new file mode 100644 index 00000000000..a68d04f901f --- /dev/null +++ b/pkgs/development/pure-modules/liblo/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, pure, liblo }: + +stdenv.mkDerivation rec { + baseName = "liblo"; + version = "0.9"; + name = "pure-${baseName}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + sha256 = "c2ba4d6f94489acf8a8fac73982ae03d5ad4113146eb1f7d6558a956c57cb8ee"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ pure liblo ]; + makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + setupHook = ../generic-setup-hook.sh; + + meta = { + description = "A quick and dirty Pure wrapper for the liblo library, which implements Berkeley’s Open Sound Control (OSC) protocol"; + homepage = http://puredocs.bitbucket.org/pure-liblo.html; + license = stdenv.lib.licenses.lgpl3Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} diff --git a/pkgs/development/pure-modules/lilv/default.nix b/pkgs/development/pure-modules/lilv/default.nix new file mode 100644 index 00000000000..4f2d5abba1e --- /dev/null +++ b/pkgs/development/pure-modules/lilv/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, pure, lilv, lv2, serd, sord, sratom }: + +stdenv.mkDerivation rec { + baseName = "lilv"; + version = "0.4"; + name = "pure-${baseName}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + sha256 = "af20982fe43e8dce62d50bf7a78e461ab36c308325b123cddbababf0d3beaf9f"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ pure lilv lv2 serd sord sratom ]; + makeFlags = "CFLAGS=-I${lilv}/include/lilv-0 libdir=$(out)/lib prefix=$(out)/"; + setupHook = ../generic-setup-hook.sh; + + meta = { + description = "A Pure module for David Robillard’s Lilv, a library for LV2 plugin host writers"; + homepage = http://puredocs.bitbucket.org/pure-lilv.html; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} diff --git a/pkgs/development/pure-modules/lv2/default.nix b/pkgs/development/pure-modules/lv2/default.nix new file mode 100644 index 00000000000..63a8cafc474 --- /dev/null +++ b/pkgs/development/pure-modules/lv2/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, pure, lv2 }: + +stdenv.mkDerivation rec { + baseName = "lv2"; + version = "0.2"; + name = "pure-${baseName}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + sha256 = "721cacd831781d8309e7ecabb0ee7c01da17e75c5642a5627cf158bfb36093e1"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ pure lv2 ]; + makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + setupHook = ../generic-setup-hook.sh; + + meta = { + description = "A generic LV2 plugin wrapper for Pure which can be linked with batch-compiled Pure scripts to obtain LV2 plugin modules"; + homepage = http://puredocs.bitbucket.org/pure-lv2.html; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} diff --git a/pkgs/development/pure-modules/midi/default.nix b/pkgs/development/pure-modules/midi/default.nix new file mode 100644 index 00000000000..bbf20b66c29 --- /dev/null +++ b/pkgs/development/pure-modules/midi/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, pure, portmidi }: + +stdenv.mkDerivation rec { + baseName = "midi"; + version = "0.6"; + name = "pure-${baseName}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + sha256 = "817ae9fa5f443a8c478a6770f36091e3cf99f3515c74e00d09ca958dead1e7eb"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ pure portmidi ]; + makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + setupHook = ../generic-setup-hook.sh; + + meta = { + description = "A MIDI interface for the Pure programming language"; + homepage = http://puredocs.bitbucket.org/pure-midi.html; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} diff --git a/pkgs/development/pure-modules/mpfr/default.nix b/pkgs/development/pure-modules/mpfr/default.nix new file mode 100644 index 00000000000..ccc32739a49 --- /dev/null +++ b/pkgs/development/pure-modules/mpfr/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, pure }: + +stdenv.mkDerivation rec { + baseName = "mpfr"; + version = "0.5"; + name = "pure-${baseName}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + sha256 = "39d2255c2c0c2d60ce727be178b5e5a06f7c92eb365976c49c4a34b1edc576e7"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ pure ]; + makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + setupHook = ../generic-setup-hook.sh; + + meta = { + description = "This module makes the MPFR multiprecision floats available in Pure"; + homepage = http://puredocs.bitbucket.org/pure-mpfr.html; + license = stdenv.lib.licenses.lgpl3Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} diff --git a/pkgs/development/pure-modules/octave/default.nix b/pkgs/development/pure-modules/octave/default.nix new file mode 100644 index 00000000000..6a039313f0e --- /dev/null +++ b/pkgs/development/pure-modules/octave/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, pure, octave }: + +stdenv.mkDerivation rec { + baseName = "octave"; + version = "0.6"; + name = "pure-${baseName}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + sha256 = "5a42e8dff8023f6bf1214ed31b7999645d88ce2f103d9fba23b527259da9a0df"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ pure octave ]; + makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + setupHook = ../generic-setup-hook.sh; + + meta = { + description = "An Octave module for the Pure programming language"; + homepage = http://puredocs.bitbucket.org/pure-octave.html; + license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} diff --git a/pkgs/development/pure-modules/odbc/default.nix b/pkgs/development/pure-modules/odbc/default.nix new file mode 100644 index 00000000000..666cf55044d --- /dev/null +++ b/pkgs/development/pure-modules/odbc/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, pure, libiodbc }: + +stdenv.mkDerivation rec { + baseName = "odbc"; + version = "0.10"; + name = "pure-${baseName}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + sha256 = "1907e9ebca11cc68762cf7046084b31e9e2bf056df85c40ccbcbe9f02221ff8d"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ pure libiodbc ]; + makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + setupHook = ../generic-setup-hook.sh; + + meta = { + description = "A simple ODBC interface for the Pure programming language"; + homepage = http://puredocs.bitbucket.org/pure-odbc.html; + license = stdenv.lib.licenses.lgpl3Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} diff --git a/pkgs/development/pure-modules/pandoc/default.nix b/pkgs/development/pure-modules/pandoc/default.nix new file mode 100644 index 00000000000..b51f2ff5e87 --- /dev/null +++ b/pkgs/development/pure-modules/pandoc/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, pkgconfig, pure, pandoc, gawk, getopt }: + +stdenv.mkDerivation rec { + baseName = "pandoc"; + version = "0.1"; + name = "pure-${baseName}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + sha256 = "0f23a17549048ca3a8f4936ea9e931feb05997390b486850936b746996350cda"; + }; + + buildInputs = [ pkgconfig pure ]; + propagatedBuildInputs = [ pandoc gawk getopt ]; + makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + preInstall = '' + mkdir -p $out/bin + mkdir -p $out/share/man/man1 + ''; + + meta = { + description = "Converts Sphinx-formatted Pure documentation files to Markdown and other formats using Pandoc"; + homepage = http://puredocs.bitbucket.org/pure-pandoc.html; + license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} diff --git a/pkgs/development/pure-modules/rational/default.nix b/pkgs/development/pure-modules/rational/default.nix new file mode 100644 index 00000000000..42ead62b256 --- /dev/null +++ b/pkgs/development/pure-modules/rational/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, pure }: + +stdenv.mkDerivation rec { + baseName = "rational"; + version = "0.1"; + name = "pure-${baseName}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + sha256 = "62cb4079a0dadd232a859e577e97e50e9718ccfcc5983c4d9c4c32cac7a9bafa"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ pure ]; + makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + setupHook = ../generic-setup-hook.sh; + + meta = { + description = "A collection of utility functions for rational numbers, and a module for doing interval arithmetic in Pure"; + homepage = http://puredocs.bitbucket.org/pure-rational.html; + license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} diff --git a/pkgs/development/pure-modules/readline/default.nix b/pkgs/development/pure-modules/readline/default.nix new file mode 100644 index 00000000000..e93207943b0 --- /dev/null +++ b/pkgs/development/pure-modules/readline/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, pure, readline }: + +stdenv.mkDerivation rec { + baseName = "readline"; + version = "0.3"; + name = "pure-${baseName}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + sha256 = "db8e6663b1c085466c09662fe86d952b6f4ffdafeecffe805c681ab91c910886"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ pure readline ]; + makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + setupHook = ../generic-setup-hook.sh; + + meta = { + description = "A trivial wrapper around GNU readline, which gives Pure scripts access to the most important facilities of the readline interface"; + homepage = http://puredocs.bitbucket.org/pure-readline.html; + license = stdenv.lib.licenses.free; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} diff --git a/pkgs/development/pure-modules/sockets/default.nix b/pkgs/development/pure-modules/sockets/default.nix new file mode 100644 index 00000000000..522446104ff --- /dev/null +++ b/pkgs/development/pure-modules/sockets/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, pure }: + +stdenv.mkDerivation rec { + baseName = "sockets"; + version = "0.7"; + name = "pure-${baseName}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + sha256 = "4f2769618ae5818cf6005bb08bcf02fe359a2e31998d12dc0c72f0494e9c0420"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ pure ]; + makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + setupHook = ../generic-setup-hook.sh; + + meta = { + description = "A Pure interface to the Berkeley socket functions"; + homepage = http://puredocs.bitbucket.org/pure-sockets.html; + license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} diff --git a/pkgs/development/pure-modules/sql3/default.nix b/pkgs/development/pure-modules/sql3/default.nix new file mode 100644 index 00000000000..f937b9eb530 --- /dev/null +++ b/pkgs/development/pure-modules/sql3/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, pure, sqlite }: + +stdenv.mkDerivation rec { + baseName = "sql3"; + version = "0.5"; + name = "pure-${baseName}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + sha256 = "b9f79dd443c8ffc5cede51e2af617f24726f5c0409aab4948c9847e6adb53c37"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ pure sqlite ]; + makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + setupHook = ../generic-setup-hook.sh; + + meta = { + description = "A SQLite module for the Pure programming language"; + homepage = http://puredocs.bitbucket.org/pure-sql3.html; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} diff --git a/pkgs/development/pure-modules/stldict/default.nix b/pkgs/development/pure-modules/stldict/default.nix new file mode 100644 index 00000000000..abfc0d0fdef --- /dev/null +++ b/pkgs/development/pure-modules/stldict/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, pure }: + +stdenv.mkDerivation rec { + baseName = "stldict"; + version = "0.8"; + name = "pure-${baseName}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + sha256 = "5b894ae6dc574c7022258e2732bea649c82c959ec4d0be13fb5a3e8ba8488f28"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ pure ]; + makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + setupHook = ../generic-setup-hook.sh; + + meta = { + description = "A Pure interface to the C++ dictionary containers map and unordered_map"; + homepage = http://puredocs.bitbucket.org/pure-stldict.html; + license = stdenv.lib.licenses.lgpl3Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} diff --git a/pkgs/development/pure-modules/stllib/default.nix b/pkgs/development/pure-modules/stllib/default.nix new file mode 100644 index 00000000000..3be7bccf2a4 --- /dev/null +++ b/pkgs/development/pure-modules/stllib/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, pure }: + +stdenv.mkDerivation rec { + baseName = "stllib"; + version = "0.6"; + name = "pure-${baseName}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-stllib-${version}.tar.gz"; + sha256 = "1d550764fc2f8ba6ddbd1fbd3da2d6965b69e2c992747265d9ebe4f16aa5e455"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ pure ]; + makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + setupHook = ../generic-setup-hook.sh; + + meta = { + description = "An “umbrella” package that contains a pair of Pure addons, pure-stlvec and pure-stlmap"; + homepage = http://puredocs.bitbucket.org/pure-stllib.html; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} diff --git a/pkgs/development/pure-modules/tk/default.nix b/pkgs/development/pure-modules/tk/default.nix new file mode 100644 index 00000000000..b36a58279fa --- /dev/null +++ b/pkgs/development/pure-modules/tk/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, pure, tcl, tk, x11 }: + +stdenv.mkDerivation rec { + baseName = "tk"; + version = "0.5"; + name = "pure-${baseName}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + sha256 = "3b6e97e2d723d5a05bf25f4ac62068ac17a1fd81db03e1986366097bf071a516"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ pure tcl tk x11 ]; + makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + setupHook = ../generic-setup-hook.sh; + + meta = { + description = "A basic interface between Pure and Tcl/Tk"; + homepage = http://puredocs.bitbucket.org/pure-tk.html; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} diff --git a/pkgs/development/pure-modules/xml/default.nix b/pkgs/development/pure-modules/xml/default.nix new file mode 100644 index 00000000000..ed08cdf5209 --- /dev/null +++ b/pkgs/development/pure-modules/xml/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, pure, libxml2, libxslt }: + +stdenv.mkDerivation rec { + baseName = "xml"; + version = "0.7"; + name = "pure-${baseName}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + sha256 = "e862dec060917a285bc3befc90f4eb70b6cc33136fb524ad3aa173714a35b0f7"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ pure libxml2 libxslt ]; + makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + setupHook = ../generic-setup-hook.sh; + + meta = { + description = "A simplified interface to the Gnome libxml2 and libxslt libraries for Pure"; + homepage = http://puredocs.bitbucket.org/pure-xml.html; + license = stdenv.lib.licenses.lgpl3Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index b962e9f8472..378f047939f 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -47,11 +47,19 @@ # Execute after shell hook , postShellHook ? "" +# Additional arguments to pass to the makeWrapper function, which wraps +# generated binaries. +, makeWrapperArgs ? [] + , ... } @ attrs: # Keep extra attributes from `attrs`, e.g., `patchPhase', etc. -if disabled then throw "${name} not supported for interpreter ${python.executable}" else python.stdenv.mkDerivation (attrs // { +if disabled +then throw "${name} not supported for interpreter ${python.executable}" +else + +python.stdenv.mkDerivation (attrs // { inherit doCheck; name = namePrefix + name; diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh index 45f86df4dcf..33b9a06f608 100644 --- a/pkgs/development/python-modules/generic/wrap.sh +++ b/pkgs/development/python-modules/generic/wrap.sh @@ -41,9 +41,16 @@ wrapPythonProgramsIn() { # wrapProgram creates the executable shell script described # above. The script will set PYTHONPATH and PATH variables.! # (see pkgs/build-support/setup-hooks/make-wrapper.sh) - wrapProgram $f \ - --prefix PYTHONPATH ':' $program_PYTHONPATH \ - --prefix PATH ':' $program_PATH + local wrap_args="$f \ + --prefix PYTHONPATH ':' $program_PYTHONPATH \ + --prefix PATH ':' $program_PATH" + + # Add any additional arguments provided by makeWrapperArgs + # argument to buildPythonPackage. + for arg in $makeWrapperArgs; do + wrap_args="$wrap_args $arg" + done + wrapProgram $wrap_args fi fi done diff --git a/pkgs/development/tools/activator/default.nix b/pkgs/development/tools/activator/default.nix new file mode 100644 index 00000000000..72bed9d46ca --- /dev/null +++ b/pkgs/development/tools/activator/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, unzip, jre }: + +stdenv.mkDerivation rec { + + name = "${pname}-${version}"; + pname = "activator"; + version = "1.3.2"; + + src = fetchurl { + url = "http://downloads.typesafe.com/typesafe-${pname}/${version}/typesafe-${name}.zip"; + sha256 = "0a6x4w63829fbp13gk1l37p6di11lfmgla26gqnr065vzpkg90y6"; + }; + + buildInputs = [ unzip jre ]; + + installPhase = '' + mkdir -p $out/{bin,lib} + mv repository $out/lib + sed -i -e "s,declare.*activator_home.*=.*,declare -r activator_home=$out/lib/,g" activator + mv activator $out/bin + mv activator-launch-${version}.jar $out/lib + ''; + + meta = with stdenv.lib; { + description = "A scafollding tool for setting up reactive projects"; + homepage = "http://typesafe.com/activator"; + license = licenses.asl20; + maintainers = with maintainers; [ edwtjo ]; + }; + +} diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix index 7c4aefee639..6668df6a828 100644 --- a/pkgs/development/tools/database/sqldeveloper/default.nix +++ b/pkgs/development/tools/database/sqldeveloper/default.nix @@ -1,13 +1,13 @@ -{ stdenv, makeWrapper, requireFile, unzip, oraclejdk7, bash}: +{ stdenv, makeWrapper, requireFile, unzip, oraclejdk8, bash}: stdenv.mkDerivation rec { - version = "4.0.3.16.84"; + version = "4.1.0.19.07"; name = "sqldeveloper-${version}"; src = requireFile { name = "${name}-no-jre.zip"; url = http://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/index.html; - sha256 = "1qbqjkfda7xry716da2hdbbazks96rgyslrw1lw0azmqdp1mir7g"; + sha256 = "09gr40n4574fw9hg47xi4dk8vwgawzkjzzzj2h5jaicy0fdjkpbx"; }; buildInputs = [ makeWrapper unzip ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { chmod +x $out/sqldeveloper/bin/sqldeveloper wrapProgram $out/bin/sqldeveloper \ - --set JAVA_HOME "${oraclejdk7}" + --set JAVA_HOME "${oraclejdk8}" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/goimports/default.nix b/pkgs/development/tools/goimports/default.nix new file mode 100644 index 00000000000..91bd207581d --- /dev/null +++ b/pkgs/development/tools/goimports/default.nix @@ -0,0 +1,34 @@ +{ stdenv, lib, go, fetchurl, fetchgit, fetchFromGitHub }: + +stdenv.mkDerivation rec { + rev = "7534f4943d94a318edde90212439e538ed54cdde"; + version = "git-2015-04-26"; + name = "goimports-${version}"; + + buildInputs = [ go ]; + + src = fetchFromGitHub { + inherit rev; + owner = "golang"; + repo = "tools"; + sha256 = "12ybykrn92l7awav0wkx9yqpc5z0pdwwi29qs9mdr2xspx61rb50"; + }; + + buildPhase = '' + export GOPATH=$src + go build -v -o goimports golang.org/x/tools/cmd/goimports + ''; + + installPhase = '' + mkdir -p $out/bin + mv goimports $out/bin + ''; + + meta = with lib; { + description = "Import management tool for go"; + homepage = https://godoc.org/golang.org/x/tools/cmd/goimports; + license = licenses.bsd3; + maintainers = with maintainers; [ jzellner ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index 73b11508374..d14e2272614 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -7,11 +7,11 @@ mkDerivation rec { pname = "cabal2nix"; - version = "20150518"; + version = "20150525"; src = fetchgit { url = "http://github.com/NixOS/cabal2nix.git"; - rev = "bf850da9044b16efb9ef06a05c645fa981513444"; - sha256 = "0kwiwakff1iaglf7mfvz096smqi73pgcfd975dvp5w1cd8yazd73"; + rev = "a7998916868af0d09882468b3e43f5854082860f"; + sha256 = "07bz2z4ramrs2dmvvf6a82fliq51m61c11vmhkkz31nr09l25k6y"; deepClone = true; }; isExecutable = true; diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/development/tools/heroku/default.nix new file mode 100644 index 00000000000..df5f6454f6d --- /dev/null +++ b/pkgs/development/tools/heroku/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, postgresql, ruby }: + +with stdenv.lib; +stdenv.mkDerivation rec { + version = "3.32.0"; + name = "heroku-${version}"; + + meta = { + homepage = "https://toolbelt.heroku.com"; + description = "Everything you need to get started using Heroku"; + maintainers = with maintainers; [ aflatter mirdhyn ]; + license = licenses.mit; + }; + + src = fetchurl { + url = "https://s3.amazonaws.com/assets.heroku.com/heroku-client/heroku-client-${version}.tgz"; + sha256 = "1596zmnlwshx15xiccfskm71syrlm87jf40y2x0y7wn0vfcyis5s"; + }; + + installPhase = '' + mkdir -p $out + cp -R * $out/ + ''; + + buildInputs = [ ruby postgresql ]; +} diff --git a/pkgs/development/tools/ocaml/oasis/default.nix b/pkgs/development/tools/ocaml/oasis/default.nix index 29507f49c18..e823466f417 100644 --- a/pkgs/development/tools/ocaml/oasis/default.nix +++ b/pkgs/development/tools/ocaml/oasis/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, ocaml_data_notation, ocaml_typeconv, camlp4, +{stdenv, fetchurl, ocaml, findlib, ocaml_data_notation, type_conv, camlp4, ocamlmod, ocamlify, ounit, expect}: stdenv.mkDerivation { @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ - ocaml findlib ocaml_typeconv ocamlmod ocamlify ounit camlp4 + ocaml findlib type_conv ocamlmod ocamlify ounit camlp4 ]; propagatedBuildInputs = [ ocaml_data_notation ]; diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index 283bd581a13..0d765ec93bb 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -38,7 +38,7 @@ let }; opam = fetchurl { url = "https://github.com/ocaml/opam/archive/1.2.2.zip"; - sha256 = "1fxd5axlh9f3jb47y9paa9ld78qwcyp7pv3m60k401ym1dps32jk"; + sha256 = "c590ce55ae69ec74f46215cf16a156a02b23c5f3ecb22f23a3ad9ba3d91ddb6e"; }; }; in stdenv.mkDerivation rec { diff --git a/pkgs/games/xbomb/default.nix b/pkgs/games/xbomb/default.nix new file mode 100644 index 00000000000..787aebef2d5 --- /dev/null +++ b/pkgs/games/xbomb/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, libX11, libXaw }: + +stdenv.mkDerivation rec { + name = "xbomb-2.2b"; + src = fetchurl { + url = "http://www.gedanken.org.uk/software/xbomb/download/${name}.tgz"; + sha256 = "0692gjw28qvh8wj9l58scjw6kxj7jdyb3yzgcgs9wcznq11q839m"; + }; + + buildInputs = [ libX11 libXaw ]; + + preBuild = '' + substituteInPlace Makefile \ + --replace /usr/local $out + ''; + + meta = with stdenv.lib; { + homepage = http://www.gedanken.org.uk/software/xbomb/; + description = "Minesweeper for X11 with various grid sizes and shapes"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/misc/screensavers/alock/default.nix b/pkgs/misc/screensavers/alock/default.nix index c2405c9c380..9083a90f6f5 100644 --- a/pkgs/misc/screensavers/alock/default.nix +++ b/pkgs/misc/screensavers/alock/default.nix @@ -2,13 +2,13 @@ , libX11, pam, libgcrypt, libXrender, imlib2 }: stdenv.mkDerivation rec { - date = "20141209"; + date = "20150418"; name = "alock-${date}"; src = fetchgit { url = https://github.com/Arkq/alock; - rev = "5ab7e6014faa1659c2d55bf9734bfa3ce7137443"; - sha256 = "07wf3vxh54ncxslp3zf8m7szpqbissxf8q9rs5zgvg333zdqd49s"; + rev = "69b547602d965733d415f877eb59d05966bd158d"; + sha256 = "c1f00bf90c966b2b76e00061cc4b54a3c0bc6547e788731ab694b43f55a216ab"; }; preConfigure = "autoreconf -fvi"; diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 769381355d4..f073a09dd0b 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "4.0-rc7"; - modDirVersion = "4.0.0-rc7"; - extraMeta.branch = "4.0"; + version = "4.1-rc5"; + modDirVersion = "4.1.0-rc5"; + extraMeta.branch = "4.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "1261p44zmsaq7gf08b8sd9xng2y46d4v7jyfipjlgrrmlkyfgqki"; + sha256 = "0kqw5y5p8x1qyljlzj78vhg5zmj9ngn3m76c9qyji6izclh3y8vv"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 348b26b3d3b..9072371d33c 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -66,16 +66,16 @@ rec { grsecurity_stable = grsecPatch { kversion = "3.14.43"; - revision = "201505191737"; + revision = "201505222221"; branch = "stable"; - sha256 = "1ijrqmdwpdbkp10lhjw8msv0y02d98v5xgq6xb62ksrdb6k27fiw"; + sha256 = "1qmlcp1lg9c56p0fx6ancavxqxpvkh6h8fpxnr2ks35s4wln5y7x"; }; grsecurity_unstable = grsecPatch { kversion = "4.0.4"; - revision = "201505182014"; + revision = "201505222222"; branch = "test"; - sha256 = "1l1s00zbyzr53p46yj6yh75dbayg9kigv5r6g9mr5irfs5p8s2ay"; + sha256 = "0ampby10y3kr36f7rvzm5fdk9f2gcfmcdgkzf67b5kj78y52ypfz"; }; grsec_fix_path = diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix index 2e25c0383b7..67cbbd13826 100644 --- a/pkgs/os-specific/linux/openvswitch/default.nix +++ b/pkgs/os-specific/linux/openvswitch/default.nix @@ -1,47 +1,62 @@ -{ stdenv, fetchurl, openssl, python27, iproute, perl, kernel ? null}: +{ stdenv, fetchurl, makeWrapper +, openssl, python27, iproute, perl, kernel ? null }: + +with stdenv.lib; + let - - version = "2.1.2"; - - skipKernelMod = kernel == null; - -in -stdenv.mkDerivation { - version = "2.1.2"; + _kernel = kernel; +in stdenv.mkDerivation rec { + version = "2.3.1"; name = "openvswitch-${version}"; + src = fetchurl { - url = "http://openvswitch.org/releases/openvswitch-2.1.2.tar.gz"; - sha256 = "16q7faqrj2pfchhn0x5s9ggi5ckcg9n62f6bnqaih064aaq2jm47"; + url = "http://openvswitch.org/releases/${name}.tar.gz"; + sha256 = "1lmwyhm5wmdv1l4v1v5xd36d5ra21jz9ix57nh1lgm8iqc0lj5r1"; }; - kernel = if skipKernelMod then null else kernel.dev; - buildInputs = [ - openssl - python27 - perl - ]; + + kernel = optional (_kernel != null) _kernel.dev; + + buildInputs = [ makeWrapper openssl python27 perl ]; + configureFlags = [ "--localstatedir=/var" "--sharedstatedir=/var" "--sbindir=$(out)/bin" - ] ++ (if skipKernelMod then [] else ["--with-linux"]); + ] ++ (optionals (_kernel != null) ["--with-linux"]); + # Leave /var out of this! installFlags = [ "LOGDIR=$(TMPDIR)/dummy" "RUNDIR=$(TMPDIR)/dummy" "PKIDIR=$(TMPDIR)/dummy" ]; + + postInstall = '' + cp debian/ovs-monitor-ipsec $out/share/openvswitch/scripts + makeWrapper \ + $out/share/openvswitch/scripts/ovs-monitor-ipsec \ + $out/bin/ovs-monitor-ipsec \ + --prefix PYTHONPATH : "$out/share/openvswitch/python" + substituteInPlace $out/share/openvswitch/scripts/ovs-monitor-ipsec \ + --replace "UnixctlServer.create(None)" "UnixctlServer.create(os.environ['UNIXCTLPATH'])" + substituteInPlace $out/share/openvswitch/scripts/ovs-monitor-ipsec \ + --replace "self.psk_file" "root_prefix + self.psk_file" + substituteInPlace $out/share/openvswitch/scripts/ovs-monitor-ipsec \ + --replace "self.cert_dir" "root_prefix + self.cert_dir" + ''; + meta = { - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; description = "A multilayer virtual switch"; - longDescription = + longDescription = '' - Open vSwitch is a production quality, multilayer virtual switch - licensed under the open source Apache 2.0 license. It is - designed to enable massive network automation through - programmatic extension, while still supporting standard - management interfaces and protocols (e.g. NetFlow, sFlow, SPAN, - RSPAN, CLI, LACP, 802.1ag). In addition, it is designed to - support distribution across multiple physical servers similar + Open vSwitch is a production quality, multilayer virtual switch + licensed under the open source Apache 2.0 license. It is + designed to enable massive network automation through + programmatic extension, while still supporting standard + management interfaces and protocols (e.g. NetFlow, sFlow, SPAN, + RSPAN, CLI, LACP, 802.1ag). In addition, it is designed to + support distribution across multiple physical servers similar to VMware's vNetwork distributed vswitch or Cisco's Nexus 1000V. ''; homepage = "http://openvswitch.org/"; diff --git a/pkgs/os-specific/linux/statifier/default.nix b/pkgs/os-specific/linux/statifier/default.nix index b4e37a36ff5..0e1ecdd6d7d 100644 --- a/pkgs/os-specific/linux/statifier/default.nix +++ b/pkgs/os-specific/linux/statifier/default.nix @@ -1,31 +1,25 @@ -a : -let - fetchurl = a.fetchurl; +{ stdenv, fetchurl, gcc_multi, glibc_multi }: + +let version = "1.7.3"; in +stdenv.mkDerivation { + name = "statifier-${version}"; - version = a.lib.attrByPath ["version"] "1.6.15" a; - buildInputs = with a; [ - - ]; -in -rec { src = fetchurl { url = "mirror://sourceforge/statifier/statifier-${version}.tar.gz"; - sha256 = "0lhdbp7hc15nn6r31yxx7i993a5k8926n5r6j2gi2vvkmf1hciqf"; + sha256 = "0jc67kq3clkdwvahpr2bjp2zix4j7z7z8b7bcn1b3g3sybh1cbd6"; }; - inherit buildInputs; - configureFlags = []; + buildInputs = [ gcc_multi glibc_multi ]; - /* doConfigure should be removed if not needed */ - phaseNames = ["fixPaths" "doMakeInstall"]; + phaseNames = [ "patchPhase" "installPhase" ]; - fixPaths = a.fullDepEntry ('' + postPatch = '' sed -e s@/usr/@"$out/"@g -i */Makefile src/statifier - sed -e s@/bin/bash@"$shell"@g -i src/*.sh - '') ["minInit" "doUnpack"]; + sed -e s@/bin/bash@"${stdenv.shell}"@g -i src/*.sh + ''; - name = "statifier-" + version; - meta = { + meta = with stdenv.lib; { description = "Tool for creating static Linux binaries"; + platforms = with platforms; [ linux ]; }; } diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 70d88b2a968..604908a4522 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -55,6 +55,11 @@ stdenv.mkDerivation rec { optReadline optLibcap optIdnkit optLibiconv optPostgresql optLibmysql optDb optOpenldap ]; + # TODO(wkennington): Remove this hack once we fix header / .la / .pc files + propagatedBuildInputs = [ + optKerberos optOpenssl optLibxml2 optJson_c + optLibseccomp optLibcap + ]; configureFlags = [ (mkOther "localstatedir" "/var") diff --git a/pkgs/servers/http/apache-modules/mod_python/default.nix b/pkgs/servers/http/apache-modules/mod_python/default.nix index 08f5d745684..d156576b21a 100644 --- a/pkgs/servers/http/apache-modules/mod_python/default.nix +++ b/pkgs/servers/http/apache-modules/mod_python/default.nix @@ -10,6 +10,12 @@ stdenv.mkDerivation rec { patches = [ ./install.patch ]; + postPatch = '' + substituteInPlace dist/version.sh \ + --replace 'GIT=`git describe --always`' "" \ + --replace '-$GIT' "" + ''; + preInstall = '' installFlags="LIBEXECDIR=$out/modules $installFlags" mkdir -p $out/modules $out/bin diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix index de964f1776a..87a4cc398a9 100644 --- a/pkgs/servers/http/nginx/default.nix +++ b/pkgs/servers/http/nginx/default.nix @@ -57,8 +57,8 @@ let lua-ext = fetchFromGitHub { owner = "openresty"; repo = "lua-nginx-module"; - rev = "v0.9.15"; - sha256 = "0kicfs0gyfb5fhjmrwr6p09c5x6g0jwsh0wg5bsp3p209rnbq94q"; + rev = "v0.9.16rc1"; + sha256 = "0fdrzfkzdrxykbyxrpas7ns6kxzjf9s6h0fj7k4423wfwybi0kic"; }; set-misc-ext = fetchFromGitHub { diff --git a/pkgs/servers/monitoring/prometheus/collectd_exporter/default.nix b/pkgs/servers/monitoring/prometheus/collectd_exporter/default.nix new file mode 100644 index 00000000000..a859c437701 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/collectd_exporter/default.nix @@ -0,0 +1,24 @@ +{ goPackages, lib, fetchFromGitHub }: + +goPackages.buildGoPackage rec { + name = "prometheus-collectd-exporter-${rev}"; + rev = "0.1.0"; + goPackagePath = "github.com/prometheus/collectd_exporter"; + + src = fetchFromGitHub { + owner = "prometheus"; + repo = "collectd_exporter"; + inherit rev; + sha256 = "165zsdn0lffb6fvxz75szmm152a6wmia5skb96k1mv59qbmn9fi1"; + }; + + buildInputs = [ goPackages.prometheus.client_golang ]; + + meta = with lib; { + description = "Relay server for exporting metrics from collectd to Prometheus"; + homepage = "https://github.com/prometheus/alertmanager"; + license = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/monitoring/prometheus/mysqld_exporter/default.nix b/pkgs/servers/monitoring/prometheus/mysqld_exporter/default.nix new file mode 100644 index 00000000000..0b399d0cfff --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/mysqld_exporter/default.nix @@ -0,0 +1,27 @@ +{ goPackages, lib, fetchFromGitHub }: + +goPackages.buildGoPackage rec { + name = "prometheus-mysqld-exporter-${rev}"; + rev = "0.1.0"; + goPackagePath = "github.com/prometheus/mysqld_exporter"; + + src = fetchFromGitHub { + owner = "prometheus"; + repo = "mysqld_exporter"; + inherit rev; + sha256 = "10xnyxyb6saz8pq3ijp424hxy59cvm1b5c9zcbw7ddzzkh1f6jd9"; + }; + + buildInputs = with goPackages; [ + mysql + prometheus.client_golang + ]; + + meta = with lib; { + description = "Prometheus exporter for MySQL server metrics"; + homepage = https://github.com/prometheus/mysqld_exporter; + license = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/monitoring/prometheus/prom2json/default.nix b/pkgs/servers/monitoring/prometheus/prom2json/default.nix new file mode 100644 index 00000000000..95457758cd2 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/prom2json/default.nix @@ -0,0 +1,28 @@ +{ goPackages, lib, fetchFromGitHub }: + +goPackages.buildGoPackage rec { + name = "prom2json-${rev}"; + rev = "0.1.0"; + goPackagePath = "github.com/prometheus/prom2json"; + + src = fetchFromGitHub { + owner = "prometheus"; + repo = "prom2json"; + inherit rev; + sha256 = "0wwh3mz7z81fwh8n78sshvj46akcgjhxapjgfic5afc4nv926zdl"; + }; + + buildInputs = with goPackages; [ + golang_protobuf_extensions + prometheus.client_golang + protobuf + ]; + + meta = with lib; { + description = "A tool to scrape a Prometheus client and dump the result as JSON."; + homepage = https://github.com/prometheus/prom2json; + license = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/shells/ipython/default.nix b/pkgs/shells/ipython/default.nix index 47705a05cc8..a9c672471a8 100644 --- a/pkgs/shells/ipython/default.nix +++ b/pkgs/shells/ipython/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, buildPythonPackage, pythonPackages, pyqt4 ? null , notebookSupport ? true # ipython notebook , qtconsoleSupport ? true # ipython qtconsole -, pylabSupport ? true # ipython --pylab (backend: agg - no gui, just file) -, pylabQtSupport ? true # ipython --pylab=qt (backend: Qt4Agg - plot to window) +, pylabSupport ? true # '%pylab' magic (backend: agg - no gui, just file) +, pylabQtSupport ? true # '%pylab qt' (backend: Qt4Agg - plot to window) }: # ipython qtconsole works with both pyside and pyqt4. But ipython --pylab=qt diff --git a/pkgs/tools/audio/darkice/default.nix b/pkgs/tools/audio/darkice/default.nix new file mode 100644 index 00000000000..8a9393cd1f6 --- /dev/null +++ b/pkgs/tools/audio/darkice/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, alsaLib, faac, jack2, lame, libopus, libpulseaudio, libsamplerate, libvorbis }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "darkice-${version}"; + version = "1.2"; + + src = fetchurl { + url = "mirror://sourceforge/darkice/${version}/darkice-${version}.tar.gz"; + sha256 = "0m5jzmja7a9x15zl1634bhxrg3rccph9rkar0rmz6wlw5nzakyxk"; + }; + + configureFlags = [ + "--with-alsa-prefix=${alsaLib}" + "--with-faac-prefix=${faac}" + "--with-jack-prefix=${jack2}" + "--with-lame-prefix=${lame}" + "--with-opus-prefix=${libopus}" + "--with-pulseaudio-prefix=${libpulseaudio}" + "--with-samplerate-prefix=${libsamplerate}" + "--with-vorbis-prefix=${libvorbis}" +# "--with-aacplus-prefix=${aacplus}" ### missing: aacplus +# "--with-twolame-prefix=${twolame}" ### missing: twolame + ]; + + meta = { + homepage = http://darkice.org/; + description = "Live audio streamer"; + license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ ikervagyok ]; + }; +} diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix index bbe99eaccbe..c542386cb5a 100644 --- a/pkgs/tools/audio/pasystray/default.nix +++ b/pkgs/tools/audio/pasystray/default.nix @@ -1,15 +1,17 @@ -{stdenv, fetchurl, unzip, autoconf, automake, makeWrapper, pkgconfig +{stdenv, fetchFromGitHub, autoconf, automake, makeWrapper, pkgconfig , gnome3, avahi, gtk3, libnotify, pulseaudio, x11}: stdenv.mkDerivation rec { - name = "pasystray-0.4.0"; + name = "pasystray-0.5.2"; - src = fetchurl { - url = "https://github.com/christophgysin/pasystray/archive/${name}.zip"; - sha256 = "1gpb7yqcxqglv50iqbkg2lg3r0z07jm4ir2zqmvns6sgddks590w"; + src = fetchFromGitHub { + owner = "christophgysin"; + repo = "pasystray"; + rev = "6709fc1e9f792baf4f7b4507a887d5876b2cfa70"; + sha256 = "1z21wassdiwfnlcrkpdqh8ylblpd1xxjxcmib5mwix9va2lykdfv"; }; - buildInputs = [ unzip autoconf automake makeWrapper pkgconfig + buildInputs = [ autoconf automake makeWrapper pkgconfig gnome3.defaultIconTheme avahi gtk3 libnotify pulseaudio x11 ]; diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix index 85a544ccd4c..aa44c1924bf 100644 --- a/pkgs/tools/bootloaders/refind/default.nix +++ b/pkgs/tools/bootloaders/refind/default.nix @@ -26,9 +26,13 @@ stdenv.mkDerivation rec { sed -e 's|-m64|-maccumulate-outgoing-args -m64|g' -i filesystems/Make.gnuefi ''; - buildPhase = '' - make prefix= EFIINC=${gnu-efi}/include/efi EFILIB=${gnu-efi}/lib GNUEFILIB=${gnu-efi}/lib EFICRT0=${gnu-efi}/lib LDSCRIPT=${gnu-efi}/lib/elf_x86_64_efi.lds gnuefi fs_gnuefi - ''; + buildPhase = + let ldScript = + if stdenv.system == "x86_64-linux" then "elf_x86_64_efi.lds" + else if stdenv.system == "i686-linux" then "elf_ia32_efi.lds" else "null"; + in '' + make prefix= EFIINC=${gnu-efi}/include/efi EFILIB=${gnu-efi}/lib GNUEFILIB=${gnu-efi}/lib EFICRT0=${gnu-efi}/lib LDSCRIPT=${gnu-efi}/lib/${ldScript} gnuefi fs_gnuefi + ''; installPhase = '' install -d $out/bin/ diff --git a/pkgs/tools/filesystems/jmtpfs/default.nix b/pkgs/tools/filesystems/jmtpfs/default.nix index 86dad1cc0fa..2a2ff0a47a5 100644 --- a/pkgs/tools/filesystems/jmtpfs/default.nix +++ b/pkgs/tools/filesystems/jmtpfs/default.nix @@ -1,23 +1,22 @@ -{ stdenv, fetchurl -, autoconf, automake -, unzip, pkgconfig -, file, fuse, libmtp }: +{ stdenv, fetchFromGitHub, pkgconfig, file, fuse, libmtp }: -stdenv.mkDerivation rec { - version = "0.5"; +let version = "0.5"; in +stdenv.mkDerivation { name = "jmtpfs-${version}"; - src = fetchurl { - url = "https://github.com/JasonFerrara/jmtpfs/archive/v0.5.zip"; - sha256 = "09fw4g350mjz1mnga7ws5nvnsnfzs8s7cscl300mas1m9s6vmhz6"; + src = fetchFromGitHub { + sha256 = "1pm68agkhrwgrplrfrnbwdcvx5lrivdmqw8pb5gdmm3xppnryji1"; + rev = "v${version}"; + repo = "jmtpfs"; + owner = "JasonFerrara"; }; - buildInputs = [ autoconf automake file fuse libmtp pkgconfig unzip ]; + buildInputs = [ file fuse libmtp pkgconfig ]; - meta = { + meta = with stdenv.lib; { description = "A FUSE filesystem for MTP devices like Android phones"; homepage = https://github.com/JasonFerrara/jmtpfs; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.coconnor ]; + license = licenses.gpl3; + maintainers = [ maintainers.coconnor ]; }; } diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index fcd8a37382e..f8dd35576ff 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ++ lib.optional withTeXLive texLive ++ lib.optional withLua lua ++ lib.optionals withX [ libX11 libXpm libXt libXaw ] - ++ lib.optional withQt [ qt.base ] + ++ lib.optional withQt [ qt ] # compiling with wxGTK causes a malloc (double free) error on darwin ++ lib.optional (withWxGTK && !stdenv.isDarwin) wxGTK; diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index 3b14e46d0d3..9b6c35f41a4 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -14,8 +14,8 @@ let }; patches = [ (fetchurl { - url = "mirror://debian/pool/main/m/makedev/makedev_2.3.1-89.diff.gz"; - sha256 = "1zbifw2jkq6471fb67y893nq4lq009xbfbi57jbjwxnhqmrppcy9"; + url = "mirror://debian/pool/main/m/makedev/makedev_2.3.1-93.diff.gz"; + sha256 = "08328779mc0b20xkj76ilpf9c8bw6zkz5xiw5l2kwm690dxp9nvw"; }) ]; # TODO install man @@ -32,13 +32,13 @@ in stdenv.mkDerivation { - name = "debootstrap-1.0.66"; + name = "debootstrap-1.0.67"; src = fetchurl { # git clone git://git.debian.org/d-i/debootstrap.git # I'd like to use the source. However it's lacking the lanny script ? (still true?) - url = mirror://debian/pool/main/d/debootstrap/debootstrap_1.0.66.tar.gz; - sha256 = "15gh6pvk7f0fib8ggz2zx53pg2jzqk4x0s8ihkpqxqdf4rlns91k"; + url = mirror://debian/pool/main/d/debootstrap/debootstrap_1.0.67.tar.gz; + sha256 = "06x5zw6fskw37qh62hvqx006319l4wgnnw8sf53ms67zpfif04ha"; }; buildInputs = [ dpkg gettext gawk perl ]; diff --git a/pkgs/tools/misc/lolcat/Gemfile b/pkgs/tools/misc/lolcat/Gemfile new file mode 100644 index 00000000000..63f6c6633b3 --- /dev/null +++ b/pkgs/tools/misc/lolcat/Gemfile @@ -0,0 +1,2 @@ +source "http://rubygems.org" +gem "lolcat" \ No newline at end of file diff --git a/pkgs/tools/misc/lolcat/Gemfile.lock b/pkgs/tools/misc/lolcat/Gemfile.lock new file mode 100644 index 00000000000..4b318ea1473 --- /dev/null +++ b/pkgs/tools/misc/lolcat/Gemfile.lock @@ -0,0 +1,14 @@ +GEM + remote: http://rubygems.org/ + specs: + lolcat (42.1.0) + paint (~> 0.8.3) + trollop (~> 1.16.2) + paint (0.8.7) + trollop (1.16.2) + +PLATFORMS + ruby + +DEPENDENCIES + lolcat diff --git a/pkgs/tools/misc/lolcat/default.nix b/pkgs/tools/misc/lolcat/default.nix new file mode 100644 index 00000000000..21355652d3e --- /dev/null +++ b/pkgs/tools/misc/lolcat/default.nix @@ -0,0 +1,18 @@ +{ stdenv, lib, bundlerEnv, gpgme, ruby, ncurses, writeText, zlib, xapian +, pkgconfig, which }: + +bundlerEnv { + name = "lolcat-42.1.0"; + + inherit ruby; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + + meta = with lib; { + description = "A rainbow version of cat"; + homepage = https://github.com/busyloop/lolcat; + license = licenses.wtfpl; + maintainers = with maintainers; [ pSub ]; + }; +} diff --git a/pkgs/tools/misc/lolcat/gemset.nix b/pkgs/tools/misc/lolcat/gemset.nix new file mode 100644 index 00000000000..85acf7767a8 --- /dev/null +++ b/pkgs/tools/misc/lolcat/gemset.nix @@ -0,0 +1,27 @@ +{ + "lolcat" = { + version = "42.1.0"; + source = { + type = "gem"; + sha256 = "1jp0g7k958dg709dm1qs7nr8dmi4vlgvmcvqcr1zhk8ygx89rwgc"; + }; + dependencies = [ + "paint" + "trollop" + ]; + }; + "paint" = { + version = "0.8.7"; + source = { + type = "gem"; + sha256 = "0nl1x0190d44bfczlxdy16gxsvm95y14kxv3k9n92h9ap2zvdyd8"; + }; + }; + "trollop" = { + version = "1.16.2"; + source = { + type = "gem"; + sha256 = "0frrp90dw266h3kf9g925dppir9l7p8jxknw6dn5nz6fa6c4g5lg"; + }; + }; +} \ No newline at end of file diff --git a/pkgs/tools/misc/w3c-css-validator/default.nix b/pkgs/tools/misc/w3c-css-validator/default.nix deleted file mode 100644 index 3c7aa5261a2..00000000000 --- a/pkgs/tools/misc/w3c-css-validator/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ stdenv, fetchurl, sourceFromHead, apacheAnt, tomcat, jre }: - -let - - sources = - [ (fetchurl { - name = "jigsaw_2.2.6.tar.gz"; - url="http://jigsaw.w3.org/Distrib/jigsaw_2.2.6.tar.gz"; - sha256 = "01cjpqjcs8gbvvzy0f488cb552f9b38hvwr97wydglrzndmcwypd"; - }) - (fetchurl { - name = "commons-collectionurl3.2.1-bin.tar.gz"; - url="http://www.apache.org/dist/commons/collections/binaries/commons-collections-3.2.1-bin.tar.gz"; - sha256 = "7843f8307495b2be446353b10c25218793b776fa3e22615a1f50f067d81713ce"; - }) - (fetchurl { - name = "commons-lang-2.4-bin.tar.gz"; - url="http://www.apache.org/dist/commons/lang/binaries/commons-lang-2.4-bin.tar.gz"; - sha256 = "0phwlgnvwj3n3j1aka2pkm0biacvgs72qc0ldir6s69i9qbv7rh0"; - }) - (fetchurl { - name = "velocity-1.6.1.tar.gz"; - url="http://www.apache.org/dist/velocity/engine/1.6.1/velocity-1.6.1.tar.gz"; - sha256 = "125s8yp8whx947kahm902wc49ms44knxdj6yfskhpk0a8h0rz9jm"; - }) - (fetchurl { - name = "Xerces-J-bin.2.9.1.tar.gz"; - url="http://www.apache.org/dist/xerces/j/Xerces-J-bin.2.9.1.tar.gz"; - sha256 = "1xlrrznfgdars0a9m9z5k9q8arbqskdfdfjx4s0pp52wn3r0gbns"; - }) - ]; - -in - -stdenv.mkDerivation { - name = "w3c-css-validator"; - - # REGION AUTO UPDATE: { name="w3c-css-validator"; type="cvs"; cvsRoot=":pserver:anonymous:anonymous@dev.w3.org:/sources/public"; module="2002/css-validator"; } - src = sourceFromHead "w3c-css-validator-F_17-52-37.tar.gz" - (fetchurl { url = "http://mawercer.de/~nix/repos/w3c-css-validator-F_17-52-37.tar.gz"; sha256 = "b6f05d4812eaa464906d101242689effa8b5516d32d6420315740a77d8ee11fd"; }); - # END - - buildInputs = [ apacheAnt ]; - - # prepare target downloads dependency .tar.gz into tmp - # note: There is a .war as well which could be deployed to tomcat - installPhase = '' - cd css-validator - mkdir tmp - ${ stdenv.lib.concatStringsSep "\n" (map (src: "tar xfz ${src} -C tmp") sources) } - sed -i -e 's@@@' \ - -e '/dest="tmp\//d' \ - -e '/untar/d' \ - build.xml - ant - mkdir -p $out/{bin,lib} - JAR=$out/lib/css-validator.jar - cat >> $out/bin/css-validator << EOF - #!/bin/sh - exec ${jre}/bin/java -jar $JAR "\$@" - EOF - chmod +x $out/bin/css-validator - cp css-validator.jar $out/lib - cp -r lib $out/lib/lib - ''; - - meta = { - description = "W3C CSS validator"; - homepage = http://dev.w3.org/cvsweb/2002/css-validator/; - # dependencies ship their own license files - # I think all .java files are covered by this license (?) - license = stdenv.lib.licenses.w3c; - maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = stdenv.lib.platforms.linux; - broken = true; - }; -} diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index efd04e33d7f..3167f7ffc22 100644 --- a/pkgs/tools/networking/aria2/default.nix +++ b/pkgs/tools/networking/aria2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "aria2-${version}"; - version = "1.18.10"; + version = "1.19.0"; src = fetchurl { - url = "mirror://sourceforge/aria2/stable/${name}/${name}.tar.bz2"; - sha256 = "1vvc3pv1100xb4293bmgqpxvy3pdvivnz415b9q78n7190kag3a5"; + url = "mirror://sourceforge/aria2/stable/${name}/${name}.tar.xz"; + sha256 = "0xm4fmap9gp2pz6z01mnnpmazw6pnhzs8qc58181m5ai4gy5ksp2"; }; buildInputs = [ pkgconfig c-ares openssl libxml2 sqlite zlib ]; diff --git a/pkgs/tools/networking/darkstat/default.nix b/pkgs/tools/networking/darkstat/default.nix index af15f6a62e5..bc48bb6cf47 100644 --- a/pkgs/tools/networking/darkstat/default.nix +++ b/pkgs/tools/networking/darkstat/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, libpcap, zlib }: stdenv.mkDerivation rec { - version = "3.0.718"; + version = "3.0.719"; name = "darkstat-${version}"; src = fetchurl { url = "${meta.homepage}/${name}.tar.bz2"; - sha256 = "1zxd4bxdfk1pjpcxhrcp54l991g0lljl4sr312nsd7p8yi9kwbv8"; + sha256 = "1mzddlim6dhd7jhr4smh0n2fa511nvyjhlx76b03vx7phnar1bxf"; }; buildInputs = [ libpcap zlib ]; diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix index 4bf321d1ac0..6b3bf4fcedb 100644 --- a/pkgs/tools/networking/dhcp/default.nix +++ b/pkgs/tools/networking/dhcp/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { # due to an uninitialized variable. CFLAGS = "-g -O2 -Wall"; - buildInputs = [ perl makeWrapper openldap ]; + buildInputs = [ perl makeWrapper openldap bind ]; configureFlags = [ "--with-libbind=${bind}" diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index 95700cb3806..a89d1e3e888 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, udev }: stdenv.mkDerivation rec { - name = "dhcpcd-6.8.1"; + name = "dhcpcd-6.9.0"; src = fetchurl { url = "mirror://roy/dhcpcd/${name}.tar.bz2"; - sha256 = "10mg68yxvl4kn1ya8ziifg2dm71c10r12sg7y7k1k0vafazhrdi7"; + sha256 = "0s0a29ml9x108lxv5yz55f3l5kvlx4hcbxigfq3hr245yy7aarhm"; }; buildInputs = [ pkgconfig udev ]; diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index b16aa46cc75..d0011c66766 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib }: stdenv.mkDerivation rec { - name = "nbd-3.10"; + name = "nbd-3.11"; src = fetchurl { url = "mirror://sourceforge/nbd/${name}.tar.xz"; - sha256 = "1kj772zv6s3rjmvr0gi3yhagzlq2nmv5n5gfhrjphv5bcxx3mibg"; + sha256 = "187jwc43dhxbv9rrszimm3bvwr1hcpyixv82jfd61p0nrds0yhhl"; }; buildInputs = [ pkgconfig glib ] ++ stdenv.lib.optional (stdenv ? glibc) stdenv.glibc.kernelHeaders; diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index 2a100fd2873..298e2251368 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -1,13 +1,13 @@ { pkgs, fetchurl, buildPythonPackage, sqlite3 }: buildPythonPackage rec { - version = "6.5.6"; + version = "6.5.7"; name = "offlineimap-${version}"; namePrefix = ""; src = fetchurl { url = "https://github.com/OfflineIMAP/offlineimap/archive/v${version}.tar.gz"; - sha256 = "1hr8yxb6r8lmdzzly4hafa1l1z9pfx14rsgc8qiy2zxfpg6ijcn2"; + sha256 = "18whwc4f8nk8gi3mjw9153c9cvwd3i9i7njmpdbhcplrv33m5pmp"; }; doCheck = false; diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index 03e193dacc7..184f8a59d28 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, pythonPackages, unzip, systemd, gamin }: +{ stdenv, fetchzip, python, pythonPackages, unzip, systemd, gamin }: let version = "0.9.1"; in @@ -6,10 +6,10 @@ pythonPackages.buildPythonPackage { name = "fail2ban-${version}"; namePrefix = ""; - src = fetchurl { - url = "https://github.com/fail2ban/fail2ban/zipball/${version}"; - name = "fail2ban-${version}.zip"; - sha256 = "0lk720r212mbpk1654qihyxcj5wmglzkg7v4pyiy5qq9qy58jmyr"; + src = fetchzip { + name = "fail2ban-${version}-src"; + url = "https://github.com/fail2ban/fail2ban/archive/${version}.tar.gz"; + sha256 = "111xvy2gxwn868kn0zy2fmdfa423z6fk57i7wsfrc0l74p1cdvs5"; }; buildInputs = [ unzip ]; diff --git a/pkgs/tools/system/das_watchdog/default.nix b/pkgs/tools/system/das_watchdog/default.nix new file mode 100644 index 00000000000..465ae48063b --- /dev/null +++ b/pkgs/tools/system/das_watchdog/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchgit, libgtop, xmessage, which, pkgconfig }: + +stdenv.mkDerivation rec { + name = "das_watchdog-${version}"; + version = "git-2015-04-02"; + + src = fetchgit { + url = "https://github.com/kmatheussen/das_watchdog.git"; + rev = "1c203d9a55455c4670c164f945ea2dd9fd197ba9"; + sha256 = "c817491d67d31297dcd6177b9c33b5c3977c1c383eac588026631dd6961ba6bf"; + }; + + buildInputs = [ libgtop xmessage which pkgconfig ]; + + installPhase = '' + mkdir -p $out/bin/ + cp das_watchdog $out/bin/ + cp test_rt $out/bin/ + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/kmatheussen/das_watchdog; + description = "A general watchdog for the linux operating system"; + longDescription = '' + It should run in the background at all times to ensure a realtime process + won't hang the machine."; + ''; + license = licenses.free; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/text/dos2unix/default.nix b/pkgs/tools/text/dos2unix/default.nix index 83b3d49b253..30b546361f2 100644 --- a/pkgs/tools/text/dos2unix/default.nix +++ b/pkgs/tools/text/dos2unix/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, perl, gettext }: stdenv.mkDerivation rec { - name = "dos2unix-7.2.1"; + name = "dos2unix-7.2.2"; src = fetchurl { url = "http://waterlan.home.xs4all.nl/dos2unix/${name}.tar.gz"; - sha256 = "1ws5d66gjs3iqc92d0qxwivixl9092540kxqq2gr6jdzmflqm4jk"; + sha256 = "04i6kkl6l1vp1b81i0wncixwyab2dzmh7vp1cvma8zr6jrr908ww"; }; configurePhase = '' diff --git a/pkgs/tools/text/tidy-html5/default.nix b/pkgs/tools/text/tidy-html5/default.nix new file mode 100644 index 00000000000..e2651e20293 --- /dev/null +++ b/pkgs/tools/text/tidy-html5/default.nix @@ -0,0 +1,24 @@ +{ stdenv, lib, cmake, fetchFromGitHub, ... }: + +stdenv.mkDerivation rec { + + name = "tidy-html5"; + version = "4.9.30"; + + src = fetchFromGitHub { + owner = "htacg"; + repo = "tidy-html5"; + rev = version; + sha256 = "0hd4c23352r5lnh23mx137wb4mkxcjdrl1dy8kgghszik5fprs3s"; + }; + + buildInputs = [ cmake ]; + + meta = with stdenv.lib; { + description = "The granddaddy of HTML tools, with support for modern standards"; + homepage = "http://www.html-tidy.org/"; + license = licenses.w3c; + maintainers = with maintainers; [ edwtjo ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e6f0b8f18b..df383e2b800 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -370,40 +370,43 @@ let fetchzip = import ../build-support/fetchzip { inherit lib fetchurl unzip; }; fetchFromGitHub = { owner, repo, rev, sha256, name ? "${repo}-${rev}-src" }: fetchzip { - inherit name; + inherit name sha256; url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; - inherit sha256; + meta.homepage = "https://github.com/${owner}/${repo}/"; }; fetchFromBitbucket = { owner, repo, rev, sha256, name ? "${repo}-${rev}-src" }: fetchzip { - inherit name; + inherit name sha256; url = "https://bitbucket.org/${owner}/${repo}/get/${rev}.tar.gz"; - inherit sha256; + meta.homepage = "https://bitbucket.org/${owner}/${repo}/"; }; # gitorious example fetchFromGitorious = { owner, repo, rev, sha256, name ? "${repo}-${rev}-src" }: fetchzip { - inherit name; + inherit name sha256; url = "https://gitorious.org/${owner}/${repo}/archive/${rev}.tar.gz"; - inherit sha256; + meta.homepage = "https://gitorious.org/${owner}/${repo}/"; }; # cgit example, snapshot support is optional in cgit fetchFromSavannah = { repo, rev, sha256, name ? "${repo}-${rev}-src" }: fetchzip { inherit name sha256; url = "http://git.savannah.gnu.org/cgit/${repo}.git/snapshot/${repo}-${rev}.tar.gz"; + meta.homepage = "http://git.savannah.gnu.org/cgit/${repo}.git/"; }; # gitlab example fetchFromGitLab = { owner, repo, rev, sha256, name ? "${repo}-${rev}-src" }: fetchzip { inherit name sha256; url = "https://gitlab.com/${owner}/${repo}/repository/archive.tar.gz?ref=${rev}"; + meta.homepage = "https://gitlab.com/${owner}/${repo}/"; }; # gitweb example, snapshot support is optional in gitweb fetchFromRepoOrCz = { repo, rev, sha256, name ? "${repo}-${rev}-src" }: fetchzip { inherit name sha256; url = "http://repo.or.cz/${repo}.git/snapshot/${rev}.tar.gz"; + meta.homepage = "http://repo.or.cz/${repo}.git/"; }; resolveMirrorURLs = {url}: fetchurl { @@ -748,6 +751,8 @@ let capstone = callPackage ../development/libraries/capstone { }; + catch = callPackage ../development/libraries/catch { }; + catdoc = callPackage ../tools/text/catdoc { }; cdemu-daemon = callPackage ../misc/emulators/cdemu/daemon.nix { }; @@ -1559,7 +1564,7 @@ let gnupg = gnupg20; - gnuplot = callPackage ../tools/graphics/gnuplot { qt = qt5; }; + gnuplot = callPackage ../tools/graphics/gnuplot { qt = qt4; }; gnuplot_qt = gnuplot.override { withQt = true; }; @@ -1761,6 +1766,8 @@ let icecast = callPackage ../servers/icecast { }; + darkice = callPackage ../tools/audio/darkice { }; + icoutils = callPackage ../tools/graphics/icoutils { }; idutils = callPackage ../tools/misc/idutils { }; @@ -1878,6 +1885,8 @@ let logstash-forwarder = callPackage ../tools/misc/logstash-forwarder { }; + lolcat = callPackage ../tools/misc/lolcat { }; + lsdvd = callPackage ../tools/cd-dvd/lsdvd {}; kippo = callPackage ../servers/kippo { }; @@ -3120,6 +3129,8 @@ let tftp_hpa = callPackage ../tools/networking/tftp-hpa {}; + tidy-html5 = callPackage ../tools/text/tidy-html5 { }; + tigervnc = callPackage ../tools/admin/tigervnc { fontDirectories = [ xorg.fontadobe75dpi xorg.fontmiscmisc xorg.fontcursormisc xorg.fontbhlucidatypewriter75dpi ]; @@ -3221,10 +3232,6 @@ let wavemon = callPackage ../tools/networking/wavemon { }; - w3cCSSValidator = callPackage ../tools/misc/w3c-css-validator { - tomcat = tomcat6; - }; - wdfs = callPackage ../tools/filesystems/wdfs { }; wdiff = callPackage ../tools/text/wdiff { }; @@ -3698,7 +3705,8 @@ let isl = isl_0_14; })); - gfortran = gfortran48; + gfortran = if !stdenv.isDarwin then gfortran48 + else callPackage ../development/compilers/gcc/gfortran-darwin.nix {}; gfortran48 = wrapCC (gcc48.cc.override { name = "gfortran"; @@ -4061,13 +4069,34 @@ let ocaml_version = (builtins.parseDrvName ocaml.name).version; in rec { inherit ocaml; + buildOcaml = callPackage ../build-support/ocaml { }; acgtk = callPackage ../applications/science/logic/acgtk { }; + alcotest = callPackage ../development/ocaml-modules/alcotest {}; + ansiterminal = callPackage ../development/ocaml-modules/ansiterminal { }; asn1-combinators = callPackage ../development/ocaml-modules/asn1-combinators { }; + async_extra = callPackage ../development/ocaml-modules/async_extra { }; + + async_find = callPackage ../development/ocaml-modules/async_find { }; + + async_kernel = callPackage ../development/ocaml-modules/async_kernel { }; + + async_shell = callPackage ../development/ocaml-modules/async_shell { }; + + async_ssl = callPackage ../development/ocaml-modules/async_ssl { }; + + async_unix = callPackage ../development/ocaml-modules/async_unix { }; + + async = callPackage ../development/ocaml-modules/async { }; + + atd = callPackage ../development/ocaml-modules/atd { }; + + atdgen = callPackage ../development/ocaml-modules/atdgen { }; + base64 = callPackage ../development/ocaml-modules/base64 { }; bolt = callPackage ../development/ocaml-modules/bolt { }; @@ -4119,8 +4148,14 @@ let }; camlimages = camlimages_4_1; + conduit = callPackage ../development/ocaml-modules/conduit { + lwt = ocaml_lwt; + }; + biniou = callPackage ../development/ocaml-modules/biniou { }; + bin_prot = callPackage ../development/ocaml-modules/bin_prot { }; + ocaml_cairo = callPackage ../development/ocaml-modules/ocaml-cairo { }; ocaml_cairo2 = callPackage ../development/ocaml-modules/ocaml-cairo2 { }; @@ -4129,6 +4164,10 @@ let cmdliner = callPackage ../development/ocaml-modules/cmdliner { }; + cohttp = callPackage ../development/ocaml-modules/cohttp { + lwt = ocaml_lwt; + }; + config-file = callPackage ../development/ocaml-modules/config-file { }; cpdf = callPackage ../development/ocaml-modules/cpdf { }; @@ -4139,11 +4178,14 @@ let cstruct = callPackage ../development/ocaml-modules/cstruct { lwt = ocaml_lwt; - sexplib = ocaml_sexplib; }; csv = callPackage ../development/ocaml-modules/csv { }; + custom_printf = callPackage ../development/ocaml-modules/custom_printf { }; + + ctypes = callPackage ../development/ocaml-modules/ctypes { }; + deriving = callPackage ../development/tools/ocaml/deriving { }; dolog = callPackage ../development/ocaml-modules/dolog { }; @@ -4154,9 +4196,7 @@ let eliom = callPackage ../development/ocaml-modules/eliom { }; - enumerate = callPackage ../development/ocaml-modules/enumerate { - type_conv = ocaml_typeconv; - }; + enumerate = callPackage ../development/ocaml-modules/enumerate { }; erm_xml = callPackage ../development/ocaml-modules/erm_xml { }; @@ -4164,7 +4204,6 @@ let ezjsonm = callPackage ../development/ocaml-modules/ezjsonm { lwt = ocaml_lwt; - sexplib = ocaml_sexplib; }; fieldslib = callPackage ../development/ocaml-modules/fieldslib { }; @@ -4177,8 +4216,12 @@ let functory = callPackage ../development/ocaml-modules/functory { }; + herelib = callPackage ../development/ocaml-modules/herelib { }; + io-page = callPackage ../development/ocaml-modules/io-page { }; + ipaddr = callPackage ../development/ocaml-modules/ipaddr { }; + javalib = callPackage ../development/ocaml-modules/javalib { extlib = ocaml_extlib_maximal; }; @@ -4197,6 +4240,11 @@ let hex = callPackage ../development/ocaml-modules/hex { }; + jingoo = callPackage ../development/ocaml-modules/jingoo { + batteries = ocaml_batteries; + pcre = ocaml_pcre; + }; + js_of_ocaml = callPackage ../development/tools/ocaml/js_of_ocaml { }; jsonm = callPackage ../development/ocaml-modules/jsonm { }; @@ -4243,6 +4291,14 @@ let ocaml_batteries = callPackage ../development/ocaml-modules/batteries { }; + comparelib = callPackage ../development/ocaml-modules/comparelib { }; + + core_extended = callPackage ../development/ocaml-modules/core_extended { }; + + core_kernel = callPackage ../development/ocaml-modules/core_kernel { }; + + core = callPackage ../development/ocaml-modules/core { }; + ocaml_cryptgps = callPackage ../development/ocaml-modules/cryptgps { }; ocaml_data_notation = callPackage ../development/ocaml-modules/odn { }; @@ -4257,8 +4313,6 @@ let ocamlify = callPackage ../development/tools/ocaml/ocamlify { }; - ocaml_ipaddr = callPackage ../development/ocaml-modules/ocaml-ipaddr { }; - ocaml_lwt = callPackage ../development/ocaml-modules/lwt { }; ocamlmod = callPackage ../development/tools/ocaml/ocamlmod { }; @@ -4306,6 +4360,8 @@ let ounit = callPackage ../development/ocaml-modules/ounit { }; + re2 = callPackage ../development/ocaml-modules/re2 { }; + tyxml = callPackage ../development/ocaml-modules/tyxml { }; ulex = callPackage ../development/ocaml-modules/ulex { }; @@ -4314,20 +4370,29 @@ let camlp5 = camlp5_transitional; }; - typeconv_108_08_00 = callPackage ../development/ocaml-modules/typeconv/108.08.00.nix { }; - ocaml_typeconv = - if lib.versionOlder "4.00" ocaml_version - then callPackage ../development/ocaml-modules/typeconv { } + textutils = callPackage ../development/ocaml-modules/textutils { }; + + type_conv_108_08_00 = callPackage ../development/ocaml-modules/type_conv/108.08.00.nix { }; + type_conv_109_60_01 = callPackage ../development/ocaml-modules/type_conv/109.60.01.nix { }; + type_conv_112_01_01 = callPackage ../development/ocaml-modules/type_conv/112.01.01.nix { }; + type_conv = + if lib.versionOlder "4.02" ocaml_version + then type_conv_112_01_01 + else if lib.versionOlder "4.00" ocaml_version + then type_conv_109_60_01 else if lib.versionOlder "3.12" ocaml_version - then typeconv_108_08_00 + then type_conv_108_08_00 else null; - sexplib_108_08_00 = callPackage ../development/ocaml-modules/sexplib/108.08.00.nix { - typeconv = typeconv_108_08_00; - }; - ocaml_sexplib = - if lib.versionOlder "4.00" ocaml_version - then callPackage ../development/ocaml-modules/sexplib { } + sexplib_108_08_00 = callPackage ../development/ocaml-modules/sexplib/108.08.00.nix { }; + sexplib_111_25_00 = callPackage ../development/ocaml-modules/sexplib/111.25.00.nix { }; + sexplib_112_24_01 = callPackage ../development/ocaml-modules/sexplib/112.24.01.nix { }; + + sexplib = + if lib.versionOlder "4.02" ocaml_version + then sexplib_112_24_01 + else if lib.versionOlder "4.00" ocaml_version + then sexplib_111_25_00 else if lib.versionOlder "3.12" ocaml_version then sexplib_108_08_00 else null; @@ -4339,6 +4404,14 @@ let ocurl = callPackage ../development/ocaml-modules/ocurl { }; + pa_ounit = callPackage ../development/ocaml-modules/pa_ounit { }; + + pa_bench = callPackage ../development/ocaml-modules/pa_bench { }; + + pa_test = callPackage ../development/ocaml-modules/pa_test { }; + + pipebang = callPackage ../development/ocaml-modules/pipebang { }; + pprint = callPackage ../development/ocaml-modules/pprint { }; pycaml = callPackage ../development/ocaml-modules/pycaml { }; @@ -4357,6 +4430,8 @@ let twt = callPackage ../development/ocaml-modules/twt { }; + typerep = callPackage ../development/ocaml-modules/typerep { }; + utop = callPackage ../development/tools/ocaml/utop { }; sawja = callPackage ../development/ocaml-modules/sawja { }; @@ -4365,13 +4440,13 @@ let uucp = callPackage ../development/ocaml-modules/uucp { }; uunf = callPackage ../development/ocaml-modules/uunf { }; - uri = callPackage ../development/ocaml-modules/uri { - sexplib = ocaml_sexplib; - }; + uri = callPackage ../development/ocaml-modules/uri { }; uuseg = callPackage ../development/ocaml-modules/uuseg { }; uutf = callPackage ../development/ocaml-modules/uutf { }; + variantslib = callPackage ../development/ocaml-modules/variantslib { }; + vg = callPackage ../development/ocaml-modules/vg { }; xmlm = callPackage ../development/ocaml-modules/xmlm { }; @@ -4497,7 +4572,7 @@ let teyjus = callPackage ../development/compilers/teyjus { omake = omake_rc1; }; - + thrust = callPackage ../development/tools/thrust { gconf = pkgs.gnome.GConf; }; @@ -4760,7 +4835,9 @@ let pure = callPackage ../development/interpreters/pure { llvm = llvm_35; }; - pure-gsl = callPackage ../development/pure-modules/pure-gsl { }; + purePackages = recurseIntoAttrs (import ./pure-packages.nix { + inherit callPackage; + }); python = python2; python2 = python27; @@ -4968,6 +5045,8 @@ let ### DEVELOPMENT / TOOLS + activator = callPackage ../development/tools/activator { }; + alloy = callPackage ../development/tools/alloy { }; augeas = callPackage ../tools/system/augeas { }; @@ -5281,6 +5360,8 @@ let inherit (perlPackages) LocaleGettext; }; + heroku = callPackage ../development/tools/heroku { }; + hyenae = callPackage ../tools/networking/hyenae { }; icmake = callPackage ../development/tools/build-managers/icmake { }; @@ -6402,8 +6483,6 @@ let lesstif = callPackage ../development/libraries/lesstif { }; - lesstif93 = callPackage ../development/libraries/lesstif-0.93 { }; - leveldb = callPackage ../development/libraries/leveldb { }; levmar = callPackage ../development/libraries/levmar { }; @@ -6663,7 +6742,9 @@ let libftdi1 = callPackage ../development/libraries/libftdi/1.x.nix { }; libgcrypt = callPackage ../development/libraries/libgcrypt { - libcap = if stdenv.isDarwin then null else pkgs.libcap; + # Breaks packages that expect to have elevated privileges + # Ex. Lightdm, cryptsetup + libcap = null; }; libgdiplus = callPackage ../development/libraries/libgdiplus { }; @@ -6942,6 +7023,8 @@ let libpfm = callPackage ../development/libraries/libpfm { }; + libpqxx = callPackage ../development/libraries/libpqxx { }; + libproxy = callPackage ../development/libraries/libproxy { stdenv = if stdenv.isDarwin then overrideCC stdenv gcc @@ -8802,15 +8885,20 @@ let postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { }; + prom2json = callPackage ../servers/monitoring/prometheus/prom2json { }; prometheus = callPackage ../servers/monitoring/prometheus { }; prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager { }; prometheus-cli = callPackage ../servers/monitoring/prometheus/cli { }; + prometheus-collectd-exporter = + callPackage ../servers/monitoring/prometheus/collectd_exporter { }; prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy_exporter { }; prometheus-mesos-exporter = callPackage ../servers/monitoring/prometheus/mesos_exporter { }; + prometheus-mysqld-exporter = + callPackage ../servers/monitoring/prometheus/mysqld_exporter { }; prometheus-node-exporter = callPackage ../servers/monitoring/prometheus/node_exporter { }; prometheus-pushgateway = @@ -9707,6 +9795,8 @@ let godep = callPackage ../development/tools/godep { }; + goimports = callPackage ../development/tools/goimports { }; + gogoclient = callPackage ../os-specific/linux/gogoclient { }; nss_ldap = callPackage ../os-specific/linux/nss_ldap { }; @@ -9803,7 +9893,7 @@ let smem = callPackage ../os-specific/linux/smem { }; - statifier = builderDefsPackage (import ../os-specific/linux/statifier) { }; + statifier = callPackage ../os-specific/linux/statifier { }; spl = callPackage ../os-specific/linux/spl { configFile = "user"; @@ -9993,6 +10083,8 @@ let wpa_supplicant_gui = callPackage ../os-specific/linux/wpa_supplicant/gui.nix { }; + xbomb = callPackage ../games/xbomb { }; + xf86_input_mtrack = callPackage ../os-specific/linux/xf86-input-mtrack { inherit (xorg) utilmacros xproto inputproto xorgserver; }; @@ -10424,6 +10516,8 @@ let bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee { }; + bitmeter = callPackage ../applications/audio/bitmeter { }; + blender = callPackage ../applications/misc/blender { python = python34; }; @@ -10438,6 +10532,8 @@ let bvi = callPackage ../applications/editors/bvi { }; + bviplus = callPackage ../applications/editors/bviplus { }; + calf = callPackage ../applications/audio/calf { inherit (gnome) libglade; }; @@ -10580,6 +10676,8 @@ let inherit (gnome) GConf libglade; }; + das_watchdog = callPackage ../tools/system/das_watchdog { }; + dbvisualizer = callPackage ../applications/misc/dbvisualizer {}; dd-agent = callPackage ../tools/networking/dd-agent { inherit (pythonPackages) tornado; }; @@ -10878,6 +10976,8 @@ let inherit (gnome3) epiphany; + eq10q = callPackage ../applications/audio/eq10q { }; + espeak = callPackage ../applications/audio/espeak { }; espeakedit = callPackage ../applications/audio/espeak/edit.nix { }; @@ -10920,6 +11020,8 @@ let focuswriter = callPackage ../applications/editors/focuswriter { }; + foo-yc20 = callPackage ../applications/audio/foo-yc20 { }; + fossil = callPackage ../applications/version-management/fossil { }; freewheeling = callPackage ../applications/audio/freewheeling { }; @@ -11243,10 +11345,14 @@ let helmholtz = callPackage ../applications/audio/pd-plugins/helmholtz { }; + heme = callPackage ../applications/editors/heme { }; + herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { }; hexchat = callPackage ../applications/networking/irc/hexchat { }; + hexcurse = callPackage ../applications/editors/hexcurse { }; + hexedit = callPackage ../applications/editors/hexedit { }; hipchat = callPackage ../applications/networking/instant-messengers/hipchat { }; @@ -11255,6 +11361,8 @@ let gtk = gtk3; }; + ht = callPackage ../applications/editors/ht { }; + htmldoc = callPackage ../applications/misc/htmldoc { fltk = fltk13; }; @@ -11682,13 +11790,15 @@ let # !!! should depend on MPlayer }; - mpv = callPackage ../applications/video/mpv { + mpv = callPackage ../applications/video/mpv rec { lua = lua5_1; lua5_sockets = lua5_1_sockets; bs2bSupport = config.mpv.bs2bSupport or true; youtubeSupport = config.mpv.youtubeSupport or true; cacaSupport = config.mpv.cacaSupport or true; vaapiSupport = config.mpv.vaapiSupport or false; + # YouTube needs network support and potentially openssl/tls + ffmpeg = if youtubeSupport then ffmpeg-full else ffmpeg; }; mrpeach = callPackage ../applications/audio/pd-plugins/mrpeach { }; @@ -12369,6 +12479,8 @@ let tesseract = callPackage ../applications/graphics/tesseract { }; + tetraproc = callPackage ../applications/audio/tetraproc { }; + thinkingRock = callPackage ../applications/misc/thinking-rock { }; thunderbird = callPackage ../applications/networking/mailreaders/thunderbird { @@ -12913,7 +13025,8 @@ let roxterm = callPackage ../applications/misc/roxterm { inherit (pythonPackages) lockfile; - inherit (gnome3) vte gsettings_desktop_schemas; + inherit (gnome3) gsettings_desktop_schemas; + vte = gnome3.vte_290; }; xtrace = callPackage ../tools/X11/xtrace { }; @@ -13666,8 +13779,8 @@ let guile = guile_1_8; }; - tetgen = callPackage ../applications/science/geometry/tetgen { }; - + tetgen = callPackage ../applications/science/geometry/tetgen { }; # AGPL3+ + tetgen_1_4 = callPackage ../applications/science/geometry/tetgen/1.4.nix { }; # MIT ### SCIENCE/BIOLOGY @@ -13675,10 +13788,6 @@ let motif = lesstif; }; - arb = callPackage ../applications/science/biology/arb { - lesstif = lesstif93; - }; - archimedes = callPackage ../applications/science/electronics/archimedes { }; emboss = callPackage ../applications/science/biology/emboss { }; @@ -13865,6 +13974,8 @@ let }; }; + gappa = callPackage ../applications/science/logic/gappa { }; + ginac = callPackage ../applications/science/math/ginac { }; hol = callPackage ../applications/science/logic/hol { }; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 1f3386aa9cb..d74d1840449 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -198,6 +198,19 @@ let self = _self // overrides; }; }; + autotetris = melpaBuild { + pname = "autotetris-mode"; + version = "20141114.846"; + src = fetchFromGitHub { + owner = "skeeto"; + repo = "autotetris-mode"; + rev = "7d348d33829bc89ddbd2b4d5cfe5073c3b0cbaaa"; + sha256 = "14pjsb026mgjf6l3dggy255knr7c1vfmgb6kgafmkzvr96aglcdc"; + }; + files = [ "autotetris-mode.el" ]; + meta = { license = unlicense; }; + }; + bind-key = melpaBuild { pname = "bind-key"; version = "20150317"; @@ -1201,6 +1214,22 @@ let self = _self // overrides; }; }; + web-mode = melpaBuild rec { + pname = "web-mode"; + version = "11.1.12"; + src = fetchFromGitHub { + owner = "fxbois"; + repo = pname; + rev = "67259f16bfaec5c006a53533b8feeba7771e1365"; + sha256 = "16zcnwm7wnbl1xbsx7rr5rr697ax141akfx2lknwirx18vqmkijj"; + }; + + meta = { + description = "Web template editing mode for emacs"; + license = gpl2; + }; + }; + weechat = melpaBuild rec { pname = "weechat.el"; version = "0.2.2"; diff --git a/pkgs/top-level/pure-packages.nix b/pkgs/top-level/pure-packages.nix new file mode 100644 index 00000000000..005e09cc003 --- /dev/null +++ b/pkgs/top-level/pure-packages.nix @@ -0,0 +1,33 @@ +{ callPackage }: + +rec { + audio = callPackage ../development/pure-modules/audio { }; + avahi = callPackage ../development/pure-modules/avahi { }; + csv = callPackage ../development/pure-modules/csv { }; + doc = callPackage ../development/pure-modules/doc { }; + fastcgi = callPackage ../development/pure-modules/fastcgi { }; + faust = callPackage ../development/pure-modules/faust { }; + ffi = callPackage ../development/pure-modules/ffi { }; + gen = callPackage ../development/pure-modules/gen { }; + gl = callPackage ../development/pure-modules/gl { }; + glpk = callPackage ../development/pure-modules/glpk { }; + gplot = callPackage ../development/pure-modules/gplot { }; + gsl = callPackage ../development/pure-modules/gsl { }; + gtk = callPackage ../development/pure-modules/gtk { pure-ffi = ffi; }; + liblo = callPackage ../development/pure-modules/liblo { }; + lilv = callPackage ../development/pure-modules/lilv { }; + lv2 = callPackage ../development/pure-modules/lv2 { }; + midi = callPackage ../development/pure-modules/midi { }; + mpfr = callPackage ../development/pure-modules/mpfr { }; + octave = callPackage ../development/pure-modules/octave { }; + odbc = callPackage ../development/pure-modules/odbc { }; + pandoc = callPackage ../development/pure-modules/pandoc { }; + rational = callPackage ../development/pure-modules/rational { }; + readline = callPackage ../development/pure-modules/readline { }; + sockets = callPackage ../development/pure-modules/sockets { }; + sql3 = callPackage ../development/pure-modules/sql3 { }; + stldict = callPackage ../development/pure-modules/stldict { }; + stllib = callPackage ../development/pure-modules/stllib { }; + tk = callPackage ../development/pure-modules/tk { }; + xml = callPackage ../development/pure-modules/xml { }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 76d6d9aefb7..3109b95d35b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -96,12 +96,12 @@ let discid = buildPythonPackage rec { name = "discid-1.1.0"; - meta = with stdenv.lib; { + meta = { description = "Python binding of libdiscid"; homepage = "https://python-discid.readthedocs.org/"; license = licenses.lgpl3Plus; platforms = platforms.linux; - maintainer = with maintainers; [ iyzsong ]; + maintainers = with maintainers; [ iyzsong ]; }; src = pkgs.fetchurl { @@ -209,12 +209,12 @@ let sed -i "s|/usr/share/fonts|/nonexisting-fonts-path|" aafigure/PILhelper.py ''; - meta = with stdenv.lib; { + meta = { description = "ASCII art to image converter"; homepage = https://launchpad.net/aafigure/; license = licenses.bsd2; platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; }; }; @@ -235,12 +235,12 @@ let # UnicodeEncodeError: 'ascii' codec can't encode character u'\u3042' in position 0: ordinal not in range(128) doCheck = false; - meta = with stdenv.lib; { + meta = { description = "Generate activity-diagram image from spec-text file (similar to Graphviz)"; homepage = http://blockdiag.com/; license = licenses.asl20; platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; }; }; @@ -276,7 +276,7 @@ let meta = { homepage = https://github.com/teythoon/afew; description = "An initial tagging script for notmuch mail"; - maintainers = [ stdenv.lib.maintainers.garbas ]; + maintainers = with maintainers; [ garbas ]; }; }; @@ -292,7 +292,7 @@ let meta = { homepage = https://github.com/bitprophet/alabaster; description = "a Sphinx theme"; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; }; }; @@ -311,7 +311,7 @@ let meta = { homepage = http://bitbucket.org/zzzeek/alembic; description = "A database migration tool for SQLAlchemy"; - license = stdenv.lib.licenses.mit; + license = licenses.mit; }; }; @@ -362,8 +362,8 @@ let ''; meta = { - maintainers = [ stdenv.lib.maintainers.iElectric ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ iElectric ]; + platforms = platforms.all; }; }; @@ -398,7 +398,7 @@ let meta = { homepage = https://github.com/pazz/alot; description = "Terminal MUA using notmuch mail"; - maintainers = [ stdenv.lib.maintainers.garbas ]; + maintainers = with maintainers; [ garbas ]; }; }; @@ -472,7 +472,7 @@ let meta = { description = "namespace control and lazy-import mechanism"; homepage = "http://bitbucket.org/hpk42/apipkg"; - license = stdenv.lib.licenses.mit; + license = licenses.mit; }; }; @@ -484,7 +484,7 @@ let md5 = "1d17b4c9694ab84794e228f28dc3275b"; }; - meta = with stdenv.lib; { + meta = { description = "A python module for determining appropriate platform-specific dirs"; homepage = http://github.com/ActiveState/appdirs; license = licenses.mit; @@ -570,14 +570,14 @@ let meta = { description = "Twitter API library"; license = "apache"; - maintainers = [ maintainers.thoughtpolice ]; + maintainers = with maintainers; [ thoughtpolice ]; }; }; async = buildPythonPackage rec { name = "async-0.6.1"; disabled = isPy3k; - meta.maintainers = [ stdenv.lib.maintainers.mornfall ]; + meta.maintainers = with maintainers; [ mornfall ]; buildInputs = with self; [ pkgs.zlib ]; doCheck = false; @@ -619,7 +619,7 @@ let meta = { homepage = http://code.google.com/p/argparse/; - license = stdenv.lib.licenses.asl20; + license = licenses.asl20; description = "argparse: Python command line parser"; @@ -656,7 +656,7 @@ let meta = { description = "A dict with attribute-style access"; homepage = https://github.com/bcj/AttrDict; - license = stdenv.lib.licenses.mit; + license = licenses.mit; }; }); @@ -671,7 +671,7 @@ let meta = { description = "Cross-platform audio decoding"; homepage = "https://github.com/sampsyo/audioread"; - license = stdenv.lib.licenses.mit; + license = licenses.mit; }; }; @@ -688,7 +688,7 @@ let meta = { description = "Utilities and Python modules for handling audio"; homepage = "http://audiotools.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; }; }; @@ -706,12 +706,12 @@ let # FAIL: test_recursive_should_not_crash_on_unicode_filename (test.test_autopep8.CommandLineTests) doCheck = false; - meta = with stdenv.lib; { + meta = { description = "A tool that automatically formats Python code to conform to the PEP 8 style guide"; homepage = https://pypi.python.org/pypi/autopep8/; license = licenses.mit; platforms = platforms.all; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; }; }); @@ -725,7 +725,7 @@ let md5 = "7f4893205e5ad69ac86f6b44efb7df72"; }; - meta = with stdenv.lib; { + meta = { description = "A serialization and RPC framework"; homepage = "https://pypi.python.org/pypi/avro/"; }; @@ -743,7 +743,7 @@ let doCheck = false; # No such file or directory: './run_tests.py - meta = with stdenv.lib; { + meta = { description = "A serialization and RPC framework"; homepage = "https://pypi.python.org/pypi/avro3k/"; }; @@ -761,11 +761,11 @@ let propagatedBuildInputs = with self; [ dateutil futures pyopenssl requests ]; - meta = with stdenv.lib; { + meta = { description = "Microsoft Azure SDK for Python"; homepage = "http://azure.microsoft.com/en-us/develop/python/"; license = licenses.asl20; - maintainers = [ maintainers.olcai ]; + maintainers = with maintainers; [ olcai ]; }; }; @@ -797,7 +797,7 @@ let meta = { describe = "Backport of Python 3.3's 'lzma' module for XZ/LZMA compressed files"; homepage = https://github.com/peterjc/backports.lzma; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; }; }; @@ -814,7 +814,7 @@ let meta = { homepage = http://pypi.python.org/pypi/babelfish; description = "A module to work with countries and languages"; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; }; }; @@ -827,12 +827,12 @@ let sha256 = "1kmrdr1c2ivpqgp2csln7vbanga3sh3nvaqmgbsg96z6fbg7f7w8"; }; - meta = with stdenv.lib; { + meta = { homepage = https://github.com/nicolargo/batinfo; description = "A simple Python lib to retrieve battery information"; license = licenses.lgpl3; platforms = platforms.all; - maintainers = [ maintainers.koral ]; + maintainers = with maintainers; [ koral ]; }; }; @@ -848,7 +848,7 @@ let meta = { homepage = https://github.com/botocore/bcdoc; - license = stdenv.lib.licenses.asl20; + license = licenses.asl20; description = "ReST document generation tools for botocore"; }; }; @@ -886,8 +886,8 @@ let meta = { homepage = http://crummy.com/software/BeautifulSoup/bs4/; description = "HTML and XML parser"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.iElectric ]; + license = licenses.mit; + maintainers = with maintainers; [ iElectric ]; }; }); @@ -914,11 +914,8 @@ let doCheck = false; meta = { - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ garbas iElectric ]; + platforms = platforms.all; }; }; @@ -969,11 +966,11 @@ let are incremental and low-impact. ''; homepage = https://github.com/g2p/bedup; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; - maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; + maintainers = with maintainers; [ bluescreen303 ]; }; }; @@ -1015,7 +1012,7 @@ let }; doCheck = false; buildInputs = with pkgs; [ liblapack blas ]; - meta = with stdenv.lib; { + meta = { homepage = "http://cvxopt.org/"; description = "Python Software for Convex Optimization"; maintainers = with maintainers; [ edwtjo ]; @@ -1053,7 +1050,7 @@ let md5 = "f49ca7766fe4a67e03a731e575614f87"; }; - meta = with stdenv.lib; { + meta = { description = "Platform-independent module for I/O completion events"; homepage = https://launchpad.net/python-iowait; }; @@ -1081,7 +1078,7 @@ let md5 = "50ce3f3fdb9196a00059a5ea7b3739fd"; }; - meta = with stdenv.lib; { + meta = { description = "rarfile - RAR archive reader for Python"; homepage = https://github.com/markokr/rarfile; }; @@ -1098,7 +1095,7 @@ let propagatedBuildInputs = with pythonPackages; [ nose ]; doCheck = false; - meta = with stdenv.lib; { + meta = { description = "A Python test framework that extends Python's built-in unittest module and Nose with features from TestNG"; homepage = https://github.com/rackspace/python-proboscis; license = licenses.asl20; @@ -1113,7 +1110,7 @@ let md5 = "5586fe8ece7af4e24f71ea740185127e"; }; - meta = with stdenv.lib; { + meta = { description = "Tap into The Echo Nest's Musical Brain for the best music search, information, recommendations and remix tools on the web"; homepage = https://github.com/echonest/pyechonest; }; @@ -1173,10 +1170,10 @@ let pythonPath = [ self.requests ]; - meta = with stdenv.lib; { + meta = { description = "Bitbucket command line interface"; homepage = "https://bitbucket.org/zhemao/bitbucket-cli"; - maintainers = [ maintainers.refnil ]; + maintainers = with maintainers; [ refnil ]; }; }; @@ -1192,12 +1189,12 @@ let # error: invalid command 'test' doCheck = false; - meta = with stdenv.lib; { + meta = { description = "Module for binary data manipulation"; homepage = https://code.google.com/p/python-bitstring/; license = licenses.mit; platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; }; }; @@ -1212,7 +1209,7 @@ let propagatedBuildInputs = with self; [ six html5lib ]; - meta = with stdenv.lib; { + meta = { description = "An easy, HTML5, whitelisting HTML sanitizer"; longDescription = '' Bleach is an HTML sanitizing library that escapes or strips markup and @@ -1242,7 +1239,7 @@ let md5 = "66e9688f2d287593a0e698cd8a5fbc57"; }; - meta = with stdenv.lib; { + meta = { homepage = http://pythonhosted.org/blinker/; description = "Fast, simple object-to-object and broadcast signaling"; license = licenses.mit; @@ -1267,12 +1264,12 @@ let # FAIL: test_auto_font_detection (blockdiag.tests.test_boot_params.TestBootParams) doCheck = false; - meta = with stdenv.lib; { + meta = { description = "Generate block-diagram image from spec-text file (similar to Graphviz)"; homepage = http://blockdiag.com/; license = licenses.asl20; platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; }; }; @@ -1290,9 +1287,7 @@ let meta = { description = "UNKNOWN"; homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.iElectric - ]; + maintainers = with maintainers; [ iElectric ]; }; }; @@ -1366,12 +1361,12 @@ let propagatedBuildInputs = with self; [ setuptools ]; - meta = with stdenv.lib; { + meta = { homepage = http://bottlepy.org; description = "A fast and simple micro-framework for small web-applications"; license = licenses.mit; platforms = platforms.all; - maintainers = [ maintainers.koral ]; + maintainers = with maintainers; [ koral ]; }; }; @@ -1389,7 +1384,7 @@ let propagatedBuildInputs = [ pkgs.swig pkgs.box2d ]; - meta = with stdenv.lib; { + meta = { homepage = https://code.google.com/p/pybox2d/; description = '' A 2D game physics library for Python under @@ -1397,7 +1392,7 @@ let ''; license = licenses.zlib; platforms = platforms.all; - maintainers = [ maintainers.sepi ]; + maintainers = with maintainers; [ sepi ]; }; }; @@ -1420,12 +1415,12 @@ let # for the moment jira>=0.22 and megaplan>=1.4 are missing for running the test suite. doCheck = false; - meta = with stdenv.lib; { + meta = { homepage = http://github.com/ralphbean/bugwarrior; description = "Sync github, bitbucket, bugzilla, and trac issues with taskwarrior"; license = licenses.gpl3Plus; platforms = platforms.all; - maintainers = [ maintainers.pierron ]; + maintainers = with maintainers; [ pierron ]; }; }; @@ -1467,12 +1462,12 @@ let export HOME=$(pwd)/check-phase ''; - meta = with stdenv.lib; { + meta = { homepage = https://fedorahosted.org/python-bugzilla/; description = "Bugzilla XMLRPC access module"; license = licenses.gpl2; platforms = platforms.all; - maintainers = [ maintainers.pierron ]; + maintainers = with maintainers; [ pierron ]; }; }; @@ -1497,7 +1492,7 @@ let homepage = "http://www.buildout.org"; description = "A software build and configuration system"; license = licenses.zpt21; - maintainers = [ stdenv.lib.maintainers.garbas ]; + maintainers = with maintainers; [ garbas ]; }; }; @@ -1515,7 +1510,7 @@ let homepage = "http://www.buildout.org"; description = "A software build and configuration system"; license = licenses.zpt21; - maintainers = [ stdenv.lib.maintainers.garbas ]; + maintainers = with maintainers; [ garbas ]; }; }; @@ -1539,7 +1534,7 @@ let homepage = "http://www.buildout.org"; description = "A software build and configuration system"; license = licenses.zpt21; - maintainers = [ stdenv.lib.maintainers.garbas ]; + maintainers = with maintainers; [ garbas ]; }; }; @@ -1568,7 +1563,7 @@ let bunch = buildPythonPackage (rec { name = "bunch-1.0.1"; - meta.maintainers = [ stdenv.lib.maintainers.mornfall ]; + meta.maintainers = with maintainers; [ mornfall ]; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/b/bunch/${name}.tar.gz"; @@ -1655,11 +1650,11 @@ let sha256 = "0s8vxzfz6s4m6fvxc7z25k9j35w0rh6jkw3wwcd1az1mssncn6qy"; }; - meta = with stdenv.lib; { + meta = { homepage = http://certifi.io/; description = "Python package for providing Mozilla's CA Bundle"; license = licenses.isc; - maintainers = [ maintainers.koral ]; + maintainers = with maintainers; [ koral ]; }; }; @@ -1727,7 +1722,7 @@ let sha256 = "a01fabb7593728c3d851e1cd9a3efbd18f72650a31a5aa8a74018640da3de8b3"; }; - meta = with stdenv.lib; { + meta = { description = "A very fast JSON encoder/decoder for Python"; homepage = "http://ag-projects.com/"; license = licenses.lgpl2; @@ -1748,11 +1743,11 @@ let # No local packages or download links found for requests doCheck = false; - meta = with stdenv.lib; { + meta = { homepage = https://github.com/ncrocfer/clf; description = "Command line tool to search snippets on Commandlinefu.com"; license = licenses.mit; - maintainers = [ maintainers.koral ]; + maintainers = with maintainers; [ koral ]; }; }; @@ -1764,7 +1759,7 @@ let sha256 = "1rfn8ml80rw3hkgpm1an5p3vdyhh7hzx4zynr8dhfl7bsw28r77p"; }; - meta = with stdenv.lib; { + meta = { homepage = http://click.pocoo.org/; description = "Create beautiful command line interfaces in Python"; longDescription = '' @@ -1824,7 +1819,7 @@ let # there are no tests doCheck = false; - meta = with stdenv.lib; { + meta = { description = "A code generator for executing Python snippets in source files"; homepage = http://nedbatchelder.com/code/cog; license = licenses.mit; @@ -1893,11 +1888,8 @@ let propagatedBuildInputs = with self; [ self.translationstring self.iso8601 ]; meta = { - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ garbas iElectric ]; + platforms = platforms.all; }; }; @@ -1917,7 +1909,7 @@ let meta = { maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; }; }; @@ -1961,7 +1953,7 @@ let description = "Config file reading, writing and validation"; homepage = http://pypi.python.org/pypi/configobj; license = licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.garbas ]; + maintainers = with maintainers; [ garbas ]; }; }); @@ -1984,7 +1976,7 @@ let meta = { description = "A Python library for building configuration shells"; homepage = "https://github.com/agrover/configshell-fb"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; }; }; @@ -1999,12 +1991,12 @@ let propagatedBuildInputs = with self; [ six ]; - meta = with stdenv.lib; { + meta = { description = "Powerful declarative parser (and builder) for binary data"; homepage = http://construct.readthedocs.org/; license = licenses.mit; platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; }; }; @@ -2054,7 +2046,7 @@ let meta = { description = "Python module for generating objects that compute the Cyclic Redundancy Check (CRC)"; homepage = http://crcmod.sourceforge.net/; - license = stdenv.lib.licenses.mit; + license = licenses.mit; }; }; @@ -2072,7 +2064,7 @@ let meta = { description = "An interpreter to help writing C extensions for Python 2"; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; }; }; @@ -2091,7 +2083,7 @@ let doCheck = false; meta = { - maintainers = [ stdenv.lib.maintainers.iElectric ]; + maintainers = with maintainers; [ iElectric ]; }; }; @@ -2125,7 +2117,7 @@ let sha256 = "0r5r7ygz9m6d2bklflbl84cqhjkc2q12xgis8268ygjh30g2q3wk"; }; - meta = with stdenv.lib; { + meta = { homepage = https://github.com/alex/pretend; license = licenses.bsd3; }; @@ -2142,7 +2134,7 @@ let md5 = "b52588ec61cd4c2d33e419677a5eac8c"; }; - meta = with stdenv.lib; { + meta = { description = "What is detox?"; homepage = http://bitbucket.org/hpk42/detox; }; @@ -2161,7 +2153,7 @@ let doCheck = false; meta = { - maintainers = [ stdenv.lib.maintainers.iElectric ]; + maintainers = with maintainers; [ iElectric ]; }; }; @@ -2176,7 +2168,7 @@ let buildInputs = with self; [ pycparser mock pytest py ] ++ optionals (!isPyPy) [ cffi ]; meta = { - maintainers = [ stdenv.lib.maintainers.iElectric ]; + maintainers = with maintainers; [ iElectric ]; }; }; @@ -2191,7 +2183,7 @@ let propagatedBuildInputs = with self; [ pkgs.libffi pycparser ]; meta = { - maintainers = [ stdenv.lib.maintainers.iElectric ]; + maintainers = with maintainers; [ iElectric ]; }; }; @@ -2210,12 +2202,12 @@ let # (upstream packaging issue) doCheck = false; - meta = with stdenv.lib; { + meta = { description = "Python library for reading and writing collada documents"; homepage = http://pycollada.github.io/; license = "BSD"; # they don't specify which BSD variant platforms = with platforms; linux ++ darwin; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; }; }; @@ -2231,7 +2223,7 @@ let doCheck = false; meta = { - maintainers = [ stdenv.lib.maintainers.iElectric ]; + maintainers = with maintainers; [ iElectric ]; }; }; @@ -2254,7 +2246,7 @@ let pkgs.config.pythonPackages.pytest.selenium or false self.selenium; - meta = with stdenv.lib; { + meta = { maintainers = with maintainers; [ iElectric lovek323 madjar ]; platforms = platforms.unix; }; @@ -2270,7 +2262,7 @@ let propagatedBuildInputs = with self ; [ pytest execnet ]; meta = { - license = stdenv.lib.licenses.mit; + license = licenses.mit; website = "https://pypi.python.org/pypi/pytest-cache/"; description = "pytest plugin with mechanisms for caching across test runs"; }; @@ -2286,7 +2278,7 @@ let propagatedBuildInputs = with self ; [ pytest pyflakes pytestcache ]; meta = { - license = stdenv.lib.licenses.mit; + license = licenses.mit; website = "https://pypi.python.org/pypi/pytest-flakes"; description = "pytest plugin to check source code with pyflakes"; }; @@ -2302,7 +2294,7 @@ let propagatedBuildInputs = with self ; [ pytest pytestcache pep8 ]; meta = { - license = stdenv.lib.licenses.mit; + license = licenses.mit; website = "https://pypi.python.org/pypi/pytest-pep8"; description = "pytest plugin to check PEP8 requirements"; }; @@ -2319,7 +2311,7 @@ let propagatedBuildInputs = with self ; [ pytest pytestflakes pytestpep8 tox ]; meta = { - license = stdenv.lib.licenses.asl20; + license = licenses.asl20; website = "https://pypi.python.org/pypi/pytest-quickcheck"; description = "pytest plugin to generate random data inspired by QuickCheck"; }; @@ -2340,7 +2332,7 @@ let homepage = https://github.com/schlamar/pytest-cov; - license = stdenv.lib.licenses.mit; + license = licenses.mit; }; }); @@ -2389,7 +2381,7 @@ let homepage = http://code.google.com/p/cssutils/; - license = stdenv.lib.licenses.lgpl3Plus; + license = licenses.lgpl3Plus; }; }); @@ -2538,11 +2530,8 @@ let ]; meta = { - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ garbas iElectric ]; + platforms = platforms.all; }; }; @@ -2568,11 +2557,8 @@ let ]; meta = { - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ garbas iElectric ]; + platforms = platforms.all; }; }; @@ -2588,8 +2574,8 @@ let propagatedBuildInputs = with self; [ deform ]; meta = { - maintainers = [ stdenv.lib.maintainers.iElectric ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ iElectric ]; + platforms = platforms.all; }; }; @@ -2612,9 +2598,9 @@ let meta = { description = "Encoder/decoder and lint/validator for JSON (JavaScript Object Notation)"; homepage = http://deron.meranda.us/python/demjson/; - license = stdenv.lib.licenses.lgpl3Plus; - maintainers = with stdenv.lib.maintainers; [ bjornfor ]; - platforms = stdenv.lib.platforms.all; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ bjornfor ]; + platforms = platforms.all; }; }; @@ -2833,12 +2819,12 @@ let # error: invalid command 'test' doCheck = false; - meta = with stdenv.lib; { + meta = { description = "Fast, simple packet creation / parsing, with definitions for the basic TCP/IP protocols"; homepage = https://code.google.com/p/dpkt/; license = licenses.bsd3; - maintainers = [ maintainers.bjornfor ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ bjornfor ]; + platforms = platforms.all; }; }; @@ -2860,7 +2846,7 @@ let buildInputs = with self; [ coverage tornado mock nose ]; - meta = with stdenv.lib; { + meta = { description = "A Python library for Dropbox's HTTP-based Core and Datastore APIs"; homepage = https://www.dropbox.com/developers/core/docs; license = licenses.mit; @@ -2879,7 +2865,7 @@ let propagatedBuildInputs = with self; [ urllib3 mock setuptools ]; - meta = with stdenv.lib; { + meta = { description = "A Python library for Dropbox's HTTP-based Core and Datastore APIs"; homepage = https://www.dropbox.com/developers/core/docs; license = licenses.mit; @@ -2904,7 +2890,7 @@ let homepage = https://github.com/elasticsearch/elasticsearch-py; - license = stdenv.lib.licenses.asl20; + license = licenses.asl20; }; }); @@ -2927,7 +2913,7 @@ let homepage = https://github.com/elasticsearch/elasticsearch-dsl-py; - license = stdenv.lib.licenses.asl20; + license = licenses.asl20; }; }); @@ -2948,12 +2934,12 @@ let doCheck = false; - meta = with stdenv.lib; { + meta = { description = "Provides bindings to the generic input event interface in Linux"; homepage = http://pythonhosted.org/evdev; license = licenses.bsd3; - maintainers = [ maintainers.goibhniu ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with maintainers; [ goibhniu ]; + platforms = platforms.linux; }; }; @@ -2969,7 +2955,7 @@ let propagatedBuildInputs = with self; [ greenlet ]; - meta = with stdenv.lib; { + meta = { description = "Eventlib bindings for python"; homepage = "http://ag-projects.com/"; license = licenses.lgpl2; @@ -2996,7 +2982,7 @@ let done ''; - meta = with stdenv.lib; { + meta = { description = "A Python module and command line program for processing ID3 tags"; homepage = http://eyed3.nicfit.net/; license = licenses.gpl2; @@ -3025,7 +3011,7 @@ let meta = { description = "rapid multi-Python deployment"; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; }; }; @@ -3054,7 +3040,7 @@ let sha256 = "09q5jna3j8di0gw5yjx0dvlndkrk2x9vvqzwyfsvg3nlp8h38js1"; }; buildInputs = with self; [ nose ]; - meta = with stdenv.lib; { + meta = { description = "A Python library for generating fake user data"; homepage = http://pypi.python.org/pypi/Faker; license = licenses.mit; @@ -3069,7 +3055,7 @@ let url = https://pypi.python.org/packages/source/f/fake-factory/fake-factory-0.2.tar.gz; sha256 = "0qdmk8p4anrj9mf95dh9v7bkhv1pz69hvhlw380kj4iz7b44b6zn"; }; - meta = with stdenv.lib; { + meta = { description = "A Python package that generates fake data for you"; homepage = https://pypi.python.org/pypi/fake-factory; license = licenses.mit; @@ -3093,7 +3079,7 @@ let fedora_cert = stdenv.mkDerivation (rec { name = "fedora-cert-0.5.9.2"; - meta.maintainers = [ stdenv.lib.maintainers.mornfall ]; + meta.maintainers = with maintainers; [ mornfall ]; src = pkgs.fetchurl { url = "https://fedorahosted.org/releases/f/e/fedora-packager/fedora-packager-0.5.9.2.tar.bz2"; @@ -3109,7 +3095,7 @@ let fedpkg = buildPythonPackage (rec { name = "fedpkg-1.14"; - meta.maintainers = [ stdenv.lib.maintainers.mornfall ]; + meta.maintainers = with maintainers; [ mornfall ]; src = pkgs.fetchurl { url = "https://fedorahosted.org/releases/f/e/fedpkg/fedpkg-1.14.tar.bz2"; @@ -3139,7 +3125,7 @@ let md5 = "3aba546bdad5d0826596910551ce37c0"; }; - meta = with stdenv.lib; { + meta = { description = "Recursive descent parsing library based on functional combinators"; homepage = https://code.google.com/p/funcparserlib/; license = licenses.mit; @@ -3157,14 +3143,14 @@ let md5 = "af2fc6a3d6cc5a02d0bf54d909785fcb"; }; - meta = with stdenv.lib; { + meta = { homepage = http://docs.python.org/3/library/functools.html; }; }; gcutil = buildPythonPackage rec { name = "gcutil-1.16.1"; - meta.maintainers = [ stdenv.lib.maintainers.phreedom ]; + meta.maintainers = with maintainers; [ phreedom ]; src = pkgs.fetchurl { url = https://dl.google.com/dl/cloudsdk/release/artifacts/gcutil-1.16.1.tar.gz; @@ -3203,7 +3189,7 @@ let ]; doCheck = false; - meta = with stdenv.lib; { + meta = { description = "An unofficial API for Google Play Music"; homepage = http://pypi.python.org/pypi/gmusicapi/; license = licenses.bsd3; @@ -3222,7 +3208,7 @@ let gitdb = buildPythonPackage rec { name = "gitdb-0.5.4"; - meta.maintainers = [ stdenv.lib.maintainers.mornfall ]; + meta.maintainers = with maintainers; [ mornfall ]; doCheck = false; src = pkgs.fetchurl { @@ -3235,7 +3221,7 @@ let GitPython = buildPythonPackage rec { name = "GitPython-0.3.2"; - meta.maintainers = [ stdenv.lib.maintainers.mornfall ]; + meta.maintainers = with maintainers; [ mornfall ]; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/G/GitPython/GitPython-0.3.2.RC1.tar.gz"; @@ -3256,7 +3242,7 @@ let sha256 = "0nnf7xkr780wivr5xnchfcrahlzy9bi2dxcs1w1bh1014jql0iha"; }; - meta = with stdenv.lib; { + meta = { description = "Brings Google services to the command line"; homepage = https://code.google.com/p/googlecl/; license = licenses.asl20; @@ -3299,11 +3285,11 @@ let ''; - meta = with stdenv.lib; { + meta = { 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 ]; + maintainers = with maintainers; [ ocharles ]; platforms = platforms.unix; }; }; @@ -3328,7 +3314,7 @@ let description = "A tool to make impress.js presentations from reStructuredText"; homepage = https://github.com/regebro/hovercraft; license = licenses.mit; - maintainers = [ maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -3340,7 +3326,7 @@ let sha256 = "06856q6x675ly542ig0plbqcyab6ksfzijlyf1hzhgg3sgwgrcyb"; }; - meta = with stdenv.lib; { + meta = { description = "helpers to pass trusted data to untrusted environments and back"; homepage = "https://pypi.python.org/pypi/itsdangerous/"; }; @@ -3359,8 +3345,8 @@ let meta = { description = "Apply JSON-Patches (RFC 6902)"; homepage = "https://github.com/stefankoegl/python-json-patch"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.all; + license = licenses.bsd3; + platforms = platforms.all; }; }; @@ -3377,8 +3363,8 @@ let meta = { description = "Identify specific nodes in a JSON document (RFC 6901)"; homepage = "https://github.com/stefankoegl/python-json-pointer"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.all; + license = licenses.bsd3; + platforms = platforms.all; }; }; @@ -3405,8 +3391,8 @@ let for plain-text data. ''; homepage = "https://github.com/dbohdan/jsonwatch"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.all; + license = licenses.mit; + platforms = platforms.all; }; }; @@ -3442,7 +3428,7 @@ let meta = { description = "A CLI client and Python API library for the MailChimp email platform"; homepage = "http://apidocs.mailchimp.com/api/2.0/"; - license = stdenv.lib.licenses.mit; + license = licenses.mit; }; }; @@ -3488,7 +3474,7 @@ let meta = { description = "Library for parsing MediaWiki articles and converting them to different output formats"; homepage = "http://pediapress.com/code/"; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; }; }; @@ -3505,7 +3491,7 @@ let meta = { description = "dependencies for mwlib markup"; homepage = "http://pediapress.com/code/"; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; }; }; @@ -3528,7 +3514,7 @@ let meta = { description = "generate pdfs from mediawiki markup"; homepage = "http://pediapress.com/code/"; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; }; }; @@ -3549,7 +3535,7 @@ let covCore ]; - meta = with stdenv.lib; { + meta = { description = "Natural sorting for python"; homepage = https://github.com/SethMMorton/natsort; license = licenses.mit; @@ -3581,7 +3567,7 @@ let meta = { description = "Python API and tools to manipulate OpenDocument files"; homepage = "https://joinup.ec.europa.eu/software/odfpy/home"; - license = stdenv.lib.licenses.asl20; + license = licenses.asl20; }; }; @@ -3598,7 +3584,7 @@ let description = "Pattern matching and various utilities for file systems paths"; homepage = http://github.com/gorakhargosh/pathtools; license = licenses.mit; - maintainers = [ maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -3618,7 +3604,7 @@ let # the tests do not pass doCheck = false; - meta = with stdenv.lib; { + meta = { description = "A Python-based build/distribution/deployment scripting tool"; homepage = http://github.com/paver/paver; matinainers = with maintainers; [ lovek323 ]; @@ -3637,7 +3623,7 @@ let buildInputs = with self; [ nose pybcrypt]; - meta = with stdenv.lib; { + meta = { description = "A password hashing library for Python"; homepage = https://code.google.com/p/passlib/; }; @@ -3653,11 +3639,8 @@ let }; meta = { - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ garbas iElectric ]; + platforms = platforms.all; }; }; @@ -3674,11 +3657,11 @@ let propagatedBuildInputs = with self; [ virtualenv virtualenv-clone ]; - meta = with stdenv.lib; { + meta = { description = "Tools to manage multiple virtualenvs written in pure python, a virtualenvwrapper rewrite"; license = licenses.mit; platforms = platforms.all; - maintainers = [ maintainers.berdario ]; + maintainers = with maintainers; [ berdario ]; }; }; @@ -3696,7 +3679,7 @@ let propagatedBuildInputs = deps; - meta = with stdenv.lib; { + meta = { description = "The simplest way to write one program that runs on both Python 2 and Python 3"; homepage = https://github.com/timothycrosley/pies; license = licenses.mit; @@ -3714,7 +3697,7 @@ let propagatedBuildInputs = with self; [ ipaddress ]; - meta = with stdenv.lib; { + meta = { description = "Defines override classes that should be included with pies only if running on Python2"; homepage = https://github.com/timothycrosley/pies; license = licenses.mit; @@ -3738,14 +3721,14 @@ let preBuild = "${python}/bin/${python.executable} setup.py build_ext" + " --include-dirs=${pkgs.poppler_qt4}/include/poppler/"; - meta = with stdenv.lib; { + meta = { description = "A Python binding to Poppler-Qt4"; longDescription = '' A Python binding to Poppler-Qt4 that aims for completeness and for being actively maintained. ''; license = licenses.lgpl21Plus; - maintainers = [ maintainers.sepi ]; + maintainers = with maintainers; [ sepi ]; platforms = platforms.all; }; }; @@ -3760,7 +3743,7 @@ let propagatedBuildInputs = with self; [ self.pygments self.urwid ]; - meta = with stdenv.lib; { + meta = { description = "A full-screen, console-based Python debugger"; license = licenses.mit; platforms = platforms.all; @@ -3801,11 +3784,8 @@ let ]; meta = { - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ garbas iElectric ]; + platforms = platforms.all; }; }; @@ -3821,8 +3801,8 @@ let propagatedBuildInputs = with self; [ beaker pyramid ]; meta = { - maintainers = [ stdenv.lib.maintainers.iElectric ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ iElectric ]; + platforms = platforms.all; }; }; @@ -3842,8 +3822,8 @@ let setuptools ]; - meta = with stdenv.lib; { - maintainers = [ maintainers.iElectric ]; + meta = { + maintainers = with maintainers; [ iElectric ]; }; }; @@ -3860,8 +3840,8 @@ let propagatedBuildInputs = with self; [ jinja2 pyramid ]; meta = { - maintainers = [ stdenv.lib.maintainers.iElectric ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ iElectric ]; + platforms = platforms.all; }; }; @@ -3903,11 +3883,8 @@ let propagatedBuildInputs = with self; [ pyramid ]; meta = { - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ garbas iElectric ]; + platforms = platforms.all; }; }; @@ -3920,17 +3897,10 @@ let md5 = "89a293488093d6c30036345fa46184d2"; }; - # tests are failing in version 0.7 but are fixed in trunk - doCheck = false; - propagatedBuildInputs = with self; [ transaction pyramid ]; meta = { - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - stdenv.lib.maintainers.matejc - ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ garbas iElectric matejc ]; + platforms = platforms.all; }; }; @@ -3946,7 +3916,7 @@ let propagatedBuildInputs = with self; [ pyramid ]; - meta = with stdenv.lib; { + meta = { description = "Authentication policy for Pyramid that proxies to a stack of other authentication policies"; homepage = https://github.com/mozilla-services/pyramid_multiauth; }; @@ -3992,8 +3962,8 @@ let policies. They can be viewed and edited by calendar and contact clients on mobile phones or computers. ''; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = [ stdenv.lib.maintainers.edwtjo ]; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ edwtjo ]; }; }; @@ -4010,7 +3980,7 @@ let doCheck = false; meta = { - maintainers = [ stdenv.lib.maintainers.iElectric ]; + maintainers = with maintainers; [ iElectric ]; }; }; @@ -4030,7 +4000,7 @@ let meta = { description = "Integer to Roman numerals converter"; homepage = "https://pypi.python.org/pypi/roman"; - license = stdenv.lib.licenses.psfl; + license = licenses.psfl; }; }; @@ -4046,7 +4016,7 @@ let buildInputs = with self; [ zope_interface zodb ]; meta = { - maintainers = [ stdenv.lib.maintainers.iElectric ]; + maintainers = with maintainers; [ iElectric ]; }; }; @@ -4062,7 +4032,7 @@ let buildInputs = with self; [ zope_interface zope_location zope_schema ]; meta = { - maintainers = [ stdenv.lib.maintainers.iElectric ]; + maintainers = with maintainers; [ iElectric ]; }; }; @@ -4078,7 +4048,7 @@ let buildInputs = with self; [ ]; meta = { - maintainers = [ stdenv.lib.maintainers.iElectric ]; + maintainers = with maintainers; [ iElectric ]; }; }; @@ -4090,7 +4060,7 @@ let }; propagatedBuildInputs = with self; [ requests2 ]; meta = { - maintainers = [ stdenv.lib.maintainers.garbas ]; + maintainers = with maintainers; [ garbas ]; }; }; @@ -4109,7 +4079,7 @@ let propagatedBuildInputs = with self; [ zodb zodburi ]; meta = { - maintainers = [ stdenv.lib.maintainers.iElectric ]; + maintainers = with maintainers; [ iElectric ]; }; }; @@ -4126,7 +4096,7 @@ let propagatedBuildInputs = with self; [ repoze_sendmail ]; meta = { - maintainers = [ stdenv.lib.maintainers.iElectric ]; + maintainers = with maintainers; [ iElectric ]; }; }; @@ -4142,12 +4112,12 @@ let sed "s|driver_files =.*|driver_files = ['${pkgs.rtl-sdr}/lib/librtlsdr.so']|" -i rtlsdr/librtlsdr.py ''; - meta = with stdenv.lib; { + meta = { description = "Python wrapper for librtlsdr (a driver for Realtek RTL2832U based SDR's)"; homepage = https://github.com/roger-/pyrtlsdr; license = licenses.gpl3; platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; }; }; @@ -4163,7 +4133,7 @@ let buildInputs = with self; [ transaction ]; meta = { - maintainers = [ stdenv.lib.maintainers.iElectric ]; + maintainers = with maintainers; [ iElectric ]; }; }; @@ -4179,7 +4149,7 @@ let buildInputs = with self; [ zodb mock ZEO ]; meta = { - maintainers = [ stdenv.lib.maintainers.iElectric ]; + maintainers = with maintainers; [ iElectric ]; }; }; @@ -4193,7 +4163,7 @@ let md5 = "494d8320549185097ba4a6b6b76017d6"; }; - meta = with stdenv.lib; { + meta = { homepage = https://pypi.python.org/pypi/ZEO; }; }; @@ -4244,8 +4214,8 @@ let ZEO ]; - meta = with stdenv.lib; { - maintainers = [ maintainers.iElectric ]; + meta = { + maintainers = with maintainers; [ iElectric ]; }; }; @@ -4263,7 +4233,7 @@ let description = "SVG path objects and parser"; homepage = https://github.com/regebro/svg.path; license = licenses.cc0; - maintainers = [ maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -4277,11 +4247,8 @@ let }; meta = { - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ garbas iElectric ]; + platforms = platforms.all; }; }; @@ -4298,8 +4265,8 @@ let propagatedBuildInputs = with self; [ zope_interface sphinx ]; meta = { - maintainers = [ stdenv.lib.maintainers.iElectric ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ iElectric ]; + platforms = platforms.all; }; }; @@ -4319,11 +4286,11 @@ let buildInputs = with self; [ pkgs.alsaLib pkgs.jack2 ]; - meta = with stdenv.lib; { + meta = { description = "A Python wrapper for the RtMidi C++ library written with Cython"; homepage = http://trac.chrisarndt.de/code/wiki/python-rtmidi; license = licenses.mit; - maintainers = [ maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -4365,7 +4332,7 @@ let description = "Python API and shell utilities to monitor file system events"; homepage = http://github.com/gorakhargosh/watchdog; license = licenses.asl20; - maintainers = [ maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -4393,11 +4360,8 @@ let buildInputs = with self; [ zope_testing ]; meta = { - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ garbas iElectric ]; + platforms = platforms.all; }; }; @@ -4412,7 +4376,7 @@ let propagatedBuildInputs = with pythonPackages; [ ]; doCheck = false; - meta = with stdenv.lib; { + meta = { description = "Validate dicts against a schema"; homepage = http://github.com/sunlightlabs/validictory; license = licenses.mit; @@ -4431,11 +4395,8 @@ let doCheck = false; meta = { - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ garbas iElectric ]; + platforms = platforms.all; }; }; @@ -4454,11 +4415,8 @@ let doCheck = false; meta = { - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ garbas iElectric ]; + platforms = platforms.all; }; }; @@ -4475,7 +4433,7 @@ let homepage = https://github.com/txels/ddt; - license = stdenv.lib.licenses.mit; + license = licenses.mit; }; }); @@ -4514,9 +4472,9 @@ let meta = { homepage = http://deluge-torrent.org; description = "Torrent client"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = [ stdenv.lib.maintainers.iElectric ]; - platforms = stdenv.lib.platforms.all; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ iElectric ]; + platforms = platforms.all; }; }; @@ -4534,8 +4492,8 @@ let meta = { homepage = http://freedesktop.org/wiki/Software/pyxdg; description = "Contains implementations of freedesktop.org standards"; - license = stdenv.lib.licenses.lgpl2; - maintainers = [ stdenv.lib.maintainers.iElectric ]; + license = licenses.lgpl2; + maintainers = with maintainers; [ iElectric ]; }; }; @@ -4550,8 +4508,8 @@ let meta = { homepage = https://github.com/erikrose/chardet; description = "Universal encoding detector"; - license = stdenv.lib.licenses.lgpl2; - maintainers = [ stdenv.lib.maintainers.iElectric ]; + license = licenses.lgpl2; + maintainers = with maintainers; [ iElectric ]; }; }; @@ -4751,10 +4709,10 @@ let # tests appear to be broken on 0.6.1 at least doCheck = ( version != "0.6.1" ); - meta = with stdenv.lib; { + meta = { description = "Class based template tags for Django"; homepage = https://github.com/ojii/django-classy-tags; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; }; }; @@ -4772,10 +4730,10 @@ let propagatedBuildInputs = with self; [ django_1_7 ] ++ (optionals (pythonOlder "2.7") [ importlib ordereddict ]); - meta = with stdenv.lib; { + meta = { description = "An extension to the Django web framework that provides comprehensive version control facilities"; homepage = https://github.com/etianen/django-reversion; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; }; }; @@ -4809,11 +4767,11 @@ let # Only test dependencies buildInputs = with self; [ pkgs.git gevent geventhttpclient mock fastimport ]; - meta = with stdenv.lib; { + meta = { description = "Simple Python implementation of the Git file formats and protocols"; homepage = http://samba.org/~jelmer/dulwich/; license = licenses.gpl2Plus; - maintainers = [ maintainers.koral ]; + maintainers = with maintainers; [ koral ]; }; }; @@ -4829,10 +4787,10 @@ let propagatedBuildInputs = with self; [ pkgs.mercurial dulwich ]; - meta = with stdenv.lib; { + meta = { description = "Push and pull from a Git server using Mercurial"; homepage = http://hg-git.github.com/; - maintainers = [ maintainers.koral ]; + maintainers = with maintainers; [ koral ]; }; }; @@ -4901,8 +4859,8 @@ let meta = { description = "ECDSA cryptographic signature library"; homepage = "https://github.com/warner/python-ecdsa"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.aszlig ]; + license = licenses.mit; + maintainers = with maintainers; [ aszlig ]; }; }; @@ -5009,10 +4967,10 @@ let sha256 = "0k8x7552ypx9rc14vbsvg2lc6z0r8pv9laah28pdwyynbq10825d"; }; - meta = with stdenv.lib; { + meta = { homepage = https://launchpad.net/python-fastimport; description = "VCS fastimport/fastexport parser"; - maintainers = [ maintainers.koral ]; + maintainers = with maintainers; [ koral ]; license = licenses.gpl2Plus; }; }; @@ -5050,8 +5008,8 @@ let meta = { homepage = http://code.google.com/p/feedparser/; description = "Universal feed parser"; - license = stdenv.lib.licenses.bsd2; - maintainers = [ stdenv.lib.maintainers.iElectric ]; + license = licenses.bsd2; + maintainers = with maintainers; [ iElectric ]; }; }); @@ -5091,7 +5049,7 @@ let meta = { homepage = http://www.fig.sh/; description = "Fast, isolated development environments using Docker"; - license = stdenv.lib.licenses.asl20; + license = licenses.asl20; }; }; @@ -5104,7 +5062,7 @@ let md5 = "12a1ad3a1ed6a9377e758c4fa7fee570"; }; - meta = with stdenv.lib; { + meta = { description = "A snapshot of django-filebrowser for the Mezzanine CMS"; longDescription = '' filebrowser_safe was created to provide a snapshot of the FileBrowser @@ -5142,7 +5100,7 @@ let description = "Code checking using pep8 and pyflakes"; homepage = http://pypi.python.org/pypi/flake8; license = licenses.mit; - maintainers = [ stdenv.lib.maintainers.garbas ]; + maintainers = with maintainers; [ garbas ]; }; }); @@ -5225,8 +5183,8 @@ let meta = { homepage = http://flexget.com/; description = "Multipurpose automation tool for content like torrents"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.iElectric ]; + license = licenses.mit; + maintainers = with maintainers; [ iElectric ]; }; }; @@ -5243,7 +5201,7 @@ let md5 = "5c8c681a0b1df94ecd6dc0b3a8b80892"; }; - meta = with stdenv.lib; { + meta = { description = "A snapshot of django-grappelli for the Mezzanine CMS"; longDescription = '' grappelli_safe was created to provide a snapshot of the Grappelli admin @@ -5278,8 +5236,8 @@ let meta = { homepage = https://github.com/ckreutzer/python-tvrage; description = "Client interface for tvrage.com's XML-based api feeds"; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.iElectric ]; + license = licenses.bsd3; + maintainers = with maintainers; [ iElectric ]; }; }); @@ -5305,8 +5263,8 @@ let meta = { homepage = https://github.com/Julian/jsonschema; description = "An implementation of JSON Schema validation for Python"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.iElectric ]; + license = licenses.mit; + maintainers = with maintainers; [ iElectric ]; }; }); @@ -5325,7 +5283,7 @@ let homepage = http://falconframework.org; - license = stdenv.lib.licenses.asl20; + license = licenses.asl20; }; }); @@ -5387,7 +5345,7 @@ let ''; # See http://foolscap.lothar.com/trac/browser/LICENSE. - license = stdenv.lib.licenses.mit; + license = licenses.mit; maintainers = [ ]; }; @@ -5401,7 +5359,7 @@ let sha256 = "144f4yn2nvnxh2vrnmiabpwx3s637np0d1j1w95zym790d66shir"; }; - meta = with stdenv.lib; { + meta = { description = "Filesystem abstraction"; homepage = http://pypi.python.org/pypi/fs; license = licenses.bsd3; @@ -5428,7 +5386,7 @@ let meta = { description = "Python bindings for FUSE"; - license = stdenv.lib.licenses.lgpl21; + license = licenses.lgpl21; }; }); @@ -5447,7 +5405,7 @@ let "find_library('fuse')" "'${pkgs.fuse}/lib/libfuse.so'" ''; - meta = with stdenv.lib; { + meta = { description = "Simple ctypes bindings for FUSE"; longDescription = '' Python module that provides a simple interface to FUSE and MacFUSE. @@ -5472,7 +5430,7 @@ let propagatedBuildInputs = with self; optionals isPy26 [ importlib argparse ]; doCheck = false; - meta = with stdenv.lib; { + meta = { description = "Clean single-source support for Python 3 and 2"; longDescription = '' python-future is the missing compatibility layer between Python 2 and @@ -5543,7 +5501,7 @@ let --replace "==" ">=" ''; - meta = with stdenv.lib; { + meta = { description = "Mount Google Drive as a local file system"; longDescription = '' GDriveFS is a FUSE wrapper for Google Drive developed. Design goals: @@ -5600,12 +5558,12 @@ let buildInputs = with self; [ pkgs.libev ]; propagatedBuildInputs = optionals (!isPyPy) [ self.greenlet ]; - meta = with stdenv.lib; { + meta = { description = "Coroutine-based networking library"; homepage = http://www.gevent.org/; license = licenses.mit; platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; }; }; @@ -5620,11 +5578,11 @@ let propagatedBuildInputs = with self; [ gevent certifi backports_ssl_match_hostname_3_4_0_2 ]; - meta = with stdenv.lib; { + meta = { homepage = http://github.com/gwik/geventhttpclient; description = "HTTP client library for gevent"; license = licenses.mit; - maintainers = [ maintainers.koral ]; + maintainers = with maintainers; [ koral ]; }; }; @@ -5695,7 +5653,7 @@ let propagatedBuildInputs = with self; [ gevent ]; - meta = with stdenv.lib; { + meta = { description = "gevent-cooperative child processes and IPC"; longDescription = '' Usage of Python's multiprocessing package in a gevent-powered @@ -5776,7 +5734,7 @@ let sed -i '/distribute/d' setup.py ''; - meta = with stdenv.lib; { + meta = { description = "Search your google contacts from the command-line or mutt"; homepage = https://pypi.python.org/pypi/goobook; license = licenses.gpl3; @@ -5797,7 +5755,7 @@ let propagatedBuildInputs = with self; [ httplib2 ]; - meta = with stdenv.lib; { + meta = { description = "The core Python library for accessing Google APIs"; homepage = "https://code.google.com/p/google-api-python-client/"; license = licenses.asl20; @@ -5826,7 +5784,7 @@ let doCheck = true; - meta = with stdenv.lib; { + meta = { description = "Google Application Utilities for Python"; homepage = http://code.google.com/p/google-apputils-python; }; @@ -5848,7 +5806,7 @@ let rm tests/test_leaks.py ''; - meta = with stdenv.lib; { + meta = { homepage = http://pypi.python.org/pypi/greenlet; description = "Module for lightweight in-process concurrent programming"; license = licenses.lgpl2; @@ -5886,7 +5844,7 @@ let ../development/python-modules/gyp/no-darwin-cflags.patch ]; - meta = with stdenv.lib; { + meta = { description = "A tool to generate native build files"; homepage = https://chromium.googlesource.com/external/gyp/+/master/README.md; license = licenses.bsd3; @@ -5912,7 +5870,7 @@ let meta = { homepage = http://code.google.com/p/gyp; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; description = "Generate Your Projects"; }; }); @@ -5936,7 +5894,7 @@ let meta = { homepage = http://pypi.python.org/pypi/guessit; - license = stdenv.lib.licenses.lgpl3; + license = licenses.lgpl3; description = "A library for guessing information from video files"; }; }; @@ -5983,7 +5941,7 @@ let buildInputs = with self; [ six pkgs.glibcLocales ]; - meta = with stdenv.lib; { + meta = { description = "Library collecting some useful snippets"; homepage = https://pypi.python.org/pypi/hcs_utils/1.3; license = licenses.isc; @@ -6009,8 +5967,8 @@ let meta = { homepage = "https://github.com/RedMoonStudios/hetzner"; description = "High-level Python API for accessing the Hetzner robot"; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.aszlig ]; + license = licenses.bsd3; + maintainers = with maintainers; [ aszlig ]; }; }; @@ -6032,7 +5990,7 @@ let meta = { description = "Simple HTML cleanup utilities"; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; }; }; @@ -6053,7 +6011,7 @@ let checkPhase = "nosetests"; - meta = with stdenv.lib; { + meta = { homepage = https://github.com/html5lib/html5lib-python; downloadPage = https://github.com/html5lib/html5lib-python/releases; description = "HTML parser based on WHAT-WG HTML5 specification"; @@ -6081,7 +6039,7 @@ let meta = { homepage = https://github.com/atl/py-http-signature; description = ""; - license = stdenv.lib.licenses.mit; + license = licenses.mit; }; }); @@ -6115,7 +6073,7 @@ let homepage = http://code.google.com/p/httplib2; description = "A comprehensive HTTP client library"; license = licenses.mit; - maintainers = [ stdenv.lib.maintainers.garbas ]; + maintainers = with maintainers; [ garbas ]; }; }; @@ -6129,7 +6087,7 @@ let md5 = "0c4112bab04b71979286387b033921b5"; }; - meta = with stdenv.lib; { + meta = { description = "A Python library for property based testing"; homepage = https://github.com/DRMacIver/hypothesis; license = licenses.mpl20; @@ -6182,11 +6140,11 @@ let buildInputs = with self; [ setuptools ]; propagatedBuildInputs = with self; [ dateutil pytz ]; - meta = with stdenv.lib; { + meta = { description = "A parser/generator of iCalendar files"; homepage = "http://icalendar.readthedocs.org/"; license = licenses.bsd2; - maintainers = [ maintainers.olcai ]; + maintainers = with maintainers; [ olcai ]; }; }; @@ -6279,7 +6237,7 @@ let md5 = "5d9ecf415cced476f7781cf5b9ef70c4"; }; - meta = with stdenv.lib; { + meta = { description = "Port of the 3.3+ ipaddress module to 2.6, 2.7, and 3.2"; homepage = https://github.com/phihag/ipaddress; license = licenses.psfl; @@ -6315,7 +6273,7 @@ let meta = { homepage = https://bitbucket.org/micktwomey/pyiso8601/; description = "Simple module to parse ISO 8601 dates"; - maintainers = [ stdenv.lib.maintainers.phreedom ]; + maintainers = with maintainers; [ phreedom ]; }; }; @@ -6331,7 +6289,7 @@ let propagatedBuildInputs = with self; [ natsort pies ]; - meta = with stdenv.lib; { + meta = { description = "A Python utility / library to sort Python imports"; homepage = https://github.com/timothycrosley/isort; license = licenses.mit; @@ -6350,7 +6308,7 @@ let homepage = https://github.com/davidhalter/jedi; description = "An autocompletion tool for Python that can be used for text editors"; license = licenses.lgpl3Plus; - maintainers = [ stdenv.lib.maintainers.garbas ]; + maintainers = with maintainers; [ garbas ]; }; }); @@ -6365,10 +6323,10 @@ let buildInputs = with self; [ pytest unicodecsv ]; - meta = with stdenv.lib; { + meta = { homepage = http://github.com/sunlightlabs/jellyfish; description = "Approximate and phonetic matching of strings"; - maintainers = [ maintainers.koral ]; + maintainers = with maintainers; [ koral ]; }; }; @@ -6393,7 +6351,7 @@ let an optional sandboxed environment. ''; platforms = platforms.all; - maintainers = [ maintainers.pierron ]; + maintainers = with maintainers; [ pierron ]; }; }; @@ -6430,7 +6388,7 @@ let parsedatetime ]; - meta = with stdenv.lib; { + meta = { homepage = http://maebert.github.io/jrnl/; description = "A simple command line journal application that stores your journal in a plain text file"; license = licenses.mit; @@ -6449,7 +6407,7 @@ let buildInputs = with self; [ fs gdata python_keyczar mock pyasn1 pycrypto pytest six ]; - meta = with stdenv.lib; { + meta = { description = "Store and access your passwords safely"; homepage = "https://pypi.python.org/pypi/keyring"; license = licenses.psfl; @@ -6479,7 +6437,7 @@ let # tests also appear to depend on anyjson, which has Py3k problems doCheck = (pythonAtLeast "2.7") && !isPy3k ; - meta = with stdenv.lib; { + meta = { description = "Messaging library for Python"; homepage = "http://github.com/celery/kombu"; license = licenses.bsd3; @@ -6502,7 +6460,7 @@ let propagatedBuildInputs = with self; [ configparser argparse ]; - meta = with stdenv.lib; { + meta = { description = "Yet Another Config Parser"; homepage = "https://github.com/mozilla-services/konfig"; license = licenses.mpl20; @@ -6513,7 +6471,7 @@ let name = "kitchen-1.1.1"; disabled = isPy3k; - meta.maintainers = [ stdenv.lib.maintainers.mornfall ]; + meta.maintainers = with maintainers; [ mornfall ]; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/k/kitchen/kitchen-1.1.1.tar.gz"; @@ -6598,11 +6556,11 @@ let doCheck = false; - meta = with stdenv.lib; { + meta = { description = "A modified version of Supybot, an IRC bot"; homepage = http://supybot.fr.cr; license = licenses.bsd3; - maintainers = [ maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; }; }); @@ -6618,11 +6576,11 @@ let propagatedBuildInputs = with self; [ requests2 ]; - meta = with stdenv.lib; { + meta = { homepage = "https://github.com/ghickman/linode"; description = "A thin python wrapper around Linode's API"; license = licenses.mit; - maintainers = [ maintainers.nslqqq ]; + maintainers = with maintainers; [ nslqqq ]; }; }; @@ -6636,12 +6594,12 @@ let buildInputs = [ pkgs.pkgconfig pkgs.fuse pkgs.attr ]; - meta = with stdenv.lib; { + meta = { description = "Python bindings for the low-level FUSE API"; homepage = https://code.google.com/p/python-llfuse/; license = licenses.lgpl2Plus; platforms = platforms.unix; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; }; }; @@ -6703,7 +6661,7 @@ let propagatedBuildInputs = with self; [ wxPython modules.readline ]; postInstall = "mv $out/bin/loxodo.py $out/bin/loxodo"; - meta = with stdenv.lib; { + meta = { description = "A Password Safe V3 compatible password vault"; homepage = http://www.christoph-sommer.de/loxodo/; license = licenses.gpl2Plus; @@ -6811,8 +6769,8 @@ let meta = { description = "Super-fast templating language"; homepage = http://www.makotemplates.org; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.iElectric ]; + license = licenses.mit; + maintainers = with maintainers; [ iElectric ]; }; }; @@ -6829,7 +6787,7 @@ let description = "Implements a XML/HTML/XHTML Markup safe string"; homepage = http://dev.pocoo.org; license = "BSD"; - maintainers = [ stdenv.lib.maintainers.iElectric ]; + maintainers = with maintainers; [ iElectric ]; }; }; @@ -6847,7 +6805,7 @@ let meta = { description = "A documentation builder"; homepage = http://pypi.python.org/pypi/manuel; - license = stdenv.lib.licenses.zpt20; + license = licenses.zpt20; }; }; @@ -6896,7 +6854,7 @@ let description = "McCabe checker, plugin for flake8"; homepage = "https://github.com/flintwork/mccabe"; license = licenses.mit; - maintainers = [ stdenv.lib.maintainers.garbas ]; + maintainers = with maintainers; [ garbas ]; }; }); @@ -6935,7 +6893,7 @@ let meta = { description = "An HTML/XML templating engine used by supervisor"; homepage = https://github.com/supervisor/meld3; - license = stdenv.lib.licenses.free; + license = licenses.free; }; }; @@ -7000,7 +6958,7 @@ let export LC_ALL="en_US.UTF-8" ''; - meta = with stdenv.lib; { + meta = { description = '' A content management platform built using the Django framework ''; @@ -7076,7 +7034,7 @@ let description = "Streaming command-line twitter client"; homepage = "http://www.rainbowstream.org/"; license = licenses.mit; - maintainers = [ maintainers.thoughtpolice ]; + maintainers = with maintainers; [ thoughtpolice ]; }; }; @@ -7144,7 +7102,7 @@ let homepage = http://moinmo.in/; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; }; }); @@ -7159,7 +7117,7 @@ let buildInputs = with self; [ six pathpy setuptools ]; propagatedBuildInputs = with self; [ decorator ]; - meta = with stdenv.lib; { + meta = { description = "Many more basic tools for python 2/3 extending itertools, functools, operator and collections"; homepage = https://bitbucket.org/userzimmermann/python-moretools; license = licenses.gpl3Plus; @@ -7216,7 +7174,7 @@ let sha256 = "1blgzwq4irzaf8abb4z0d2r48903n9zxf51fhnv3gv09bgxjqzxh"; }; - meta = with stdenv.lib; { + meta = { homepage = http://mpmath.googlecode.com; description = "A pure-Python library for multiprecision floating arithmetic"; license = licenses.bsd3; @@ -7311,7 +7269,7 @@ let homepage = http://bmc.github.com/munkres/; description = "Munkres algorithm for the Assignment Problem"; license = licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.iElectric ]; + maintainers = with maintainers; [ iElectric ]; }; }; @@ -7334,7 +7292,7 @@ let homepage = http://alastair/python-musicbrainz-ngs; description = "Python bindings for musicbrainz NGS webservice"; license = licenses.bsd2; - maintainers = [ stdenv.lib.maintainers.iElectric ]; + maintainers = with maintainers; [ iElectric ]; }; }; @@ -7351,8 +7309,8 @@ let meta = { homepage = https://github.com/aroig/mutag; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.DamienCassou ]; + license = licenses.gpl3; + maintainers = with maintainers; [ DamienCassou ]; }; }; @@ -7370,7 +7328,7 @@ let meta = { description = "Python multimedia tagging library"; homepage = http://code.google.com/p/mutagen; - license = stdenv.lib.licenses.lgpl2; + license = licenses.lgpl2; }; }); @@ -7390,7 +7348,7 @@ let meta = { description = "Utilities for use with console mail clients, like mutt"; homepage = http://www.blacktrash.org/hg/muttils; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; }; }); @@ -7456,11 +7414,8 @@ let }; meta = { - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with maintainers; [ garbas iElectric ]; + platforms = platforms.linux; }; }; @@ -7513,7 +7468,7 @@ let meta = { description = "A simple Python module for parsing human names into their individual components"; homepage = https://github.com/derek73/python-nameparser; - license = stdenv.lib.licenses.lgpl21Plus; + license = licenses.lgpl21Plus; }; }; @@ -7529,7 +7484,7 @@ let meta = { homepage = "https://python-nbxmpp.gajim.org/"; description = "Non-blocking Jabber/XMPP module"; - license = stdenv.lib.licenses.gpl3; + license = licenses.gpl3; }; }; @@ -7702,7 +7657,7 @@ let meta = { description = "Coverage 3.x support for Nose"; homepage = https://github.com/ask/nosecover3; - license = stdenv.lib.licenses.lgpl21; + license = licenses.lgpl21; }; }; @@ -7721,7 +7676,7 @@ let homepage = http://github.com/cmheisel/nose-xcover/; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; }; }); @@ -7793,7 +7748,7 @@ let meta = { description = "A Python wrapper around notmuch"; homepage = http://notmuchmail.org/; - maintainers = [ stdenv.lib.maintainers.garbas ]; + maintainers = with maintainers; [ garbas ]; }; }; @@ -7896,12 +7851,12 @@ let # tests fail doCheck = false; - meta = with stdenv.lib; { + meta = { description = "Generate network-diagram image from spec-text file (similar to Graphviz)"; homepage = http://blockdiag.com/; license = licenses.asl20; platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; }; }; @@ -7927,8 +7882,8 @@ let Livestreamer is CLI program that extracts streams from various services and pipes them into a video player of choice. ''; - license = stdenv.lib.licenses.bsd2; - maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; + license = licenses.bsd2; + maintainers = with maintainers; [ fuuzetsu ]; }; }; @@ -7944,7 +7899,7 @@ let homepage = http://code.google.com/p/oauth; description = "Library for OAuth version 1.0a"; license = licenses.mit; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; }; }); @@ -7968,8 +7923,8 @@ let homepage = "https://github.com/simplegeo/python-oauth2"; description = "library for OAuth version 1.0"; license = licenses.mit; - maintainers = [ stdenv.lib.maintainers.garbas ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with maintainers; [ garbas ]; + platforms = platforms.linux; }; }); @@ -7984,7 +7939,7 @@ let propagatedBuildInputs = with pythonPackages; [ httplib2 pyasn1 pyasn1-modules rsa ]; doCheck = false; - meta = with stdenv.lib; { + meta = { description = "A client library for OAuth 2.0"; homepage = http://github.com/google/oauth2client/; license = licenses.bsd2; @@ -8030,13 +7985,13 @@ let description = "a pluggable transport proxy"; homepage = https://www.torproject.org/projects/obfsproxy; repositories.git = https://git.torproject.org/pluggable-transports/obfsproxy.git; - maintainers = with stdenv.lib.maintainers; [ phreedom thoughtpolice ]; + maintainers = with maintainers; [ phreedom thoughtpolice ]; }; }); offtrac = buildPythonPackage rec { name = "offtrac-0.1.0"; - meta.maintainers = [ stdenv.lib.maintainers.mornfall ]; + meta.maintainers = with maintainers; [ mornfall ]; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/o/offtrac/${name}.tar.gz"; @@ -8155,9 +8110,9 @@ let meta = { homepage = "http://pandas.pydata.org/"; description = "Python Data Analysis Library"; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.bsd3; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.linux; }; }; @@ -8193,8 +8148,8 @@ let meta = { homepage = "https://github.com/paramiko/paramiko/"; description = "Native Python SSHv2 protocol library"; - license = stdenv.lib.licenses.lgpl21Plus; - maintainers = [ stdenv.lib.maintainers.aszlig ]; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ aszlig ]; longDescription = '' This is a library for making SSH2 connections (client or server). @@ -8240,7 +8195,7 @@ let meta = { description = "Load, configure, and compose WSGI applications and servers"; homepage = http://pythonpaste.org/deploy/; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; }; }; @@ -8260,7 +8215,7 @@ let meta = { description = "A pluggable command-line frontend, including commands to setup package file layouts"; homepage = http://pythonpaste.org/script/; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; }; }; @@ -8277,7 +8232,7 @@ let meta = { description = "Object-oriented filesystem paths"; homepage = "https://pathlib.readthedocs.org/"; - license = stdenv.lib.licenses.mit; + license = licenses.mit; }; }; @@ -8289,7 +8244,7 @@ let sha256 = "0n1kpbbm1dg5f484yzxr7gb3ak6vjp92j70nw3bgjzsj9fh26afq"; }; - meta = with stdenv.lib; { + meta = { description = "A module wrapper for os.path"; homepage = http://github.com/jaraco/path.py; license = licenses.mit; @@ -8364,7 +8319,7 @@ let homepage = http://getpelican.com/; description = "A tool to generate a static blog from reStructuredText or Markdown input files"; license = licenses.agpl3; - maintainers = with stdenv.lib.maintainers; [ offline prikhi ]; + maintainers = with maintainers; [ offline prikhi ]; }; }; @@ -8381,7 +8336,7 @@ let homepage = "http://pep8.readthedocs.org/"; description = "Python style guide checker"; license = licenses.mit; - maintainers = [ stdenv.lib.maintainers.garbas ]; + maintainers = with maintainers; [ garbas ]; }; }; @@ -8401,7 +8356,7 @@ let homepage = https://github.com/mooz/percol; description = "Adds flavor of interactive filtering to the traditional pipe concept of shell"; license = licenses.mit; - maintainers = with stdenv.lib.maintainers; [ koral ]; + maintainers = with maintainers; [ koral ]; }; }; @@ -8420,7 +8375,7 @@ let meta = { homepage = http://www.noah.org/wiki/Pexpect; description = "Automate interactive console applications such as ssh, ftp, etc"; - license = stdenv.lib.licenses.mit; + license = licenses.mit; longDescription = '' Pexpect is similar to the Don Libes "Expect" system, but Pexpect @@ -8452,20 +8407,17 @@ let propagatedBuildInputs = with self; [ pytz ]; meta = { - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with maintainers; [ garbas iElectric ]; + platforms = platforms.linux; }; }; pgcli = buildPythonPackage rec { name = "pgcli-${version}"; - version = "0.16.3"; + version = "0.17.0"; src = pkgs.fetchFromGitHub { - sha256 = "12zizpj3fqbf90kj43zylpaqi3hhlihfg9xpzqa0aysiqri0ydx2"; + sha256 = "0fnzhsir1m7a2rlh3iqinrz5i38ssfg9p7s60bkyy55614l146yg"; rev = "v${version}"; repo = "pgcli"; owner = "amjith"; @@ -8473,7 +8425,7 @@ let propagatedBuildInputs = with self; [ click jedi prompt_toolkit psycopg2 pygments sqlparse ]; - meta = with stdenv.lib; { + meta = { description = "Command-line interface for PostgreSQL"; longDescription = '' Rich command-line interface for PostgreSQL with auto-completion and @@ -8598,7 +8550,7 @@ let buildInputs = with self; [ pkgs.freetype pkgs.libjpeg pkgs.zlib pkgs.libtiff pkgs.libwebp pkgs.tcl ] - ++ optionals (isPy26 || isPy33 || isPyPy) [ pkgs.lcms2 ] + ++ optionals (isPy26 || isPy27 || isPy33 || isPyPy) [ pkgs.lcms2 ] ++ optionals (isPyPy) [ pkgs.tk pkgs.xlibs.libX11 ]; # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp. @@ -8632,7 +8584,7 @@ let license = "http://www.pythonware.com/products/pil/license.htm"; - maintainers = with stdenv.lib.maintainers; [ goibhniu prikhi ]; + maintainers = with maintainers; [ goibhniu prikhi ]; }; }; @@ -8717,7 +8669,7 @@ let install -m644 "powerline/bindings/tmux/powerline.conf" "$out/share/tmux/powerline.conf" ''; - meta = with stdenv.lib; { + meta = { homepage = https://github.com/powerline/powerline; description = "The ultimate statusline/prompt utility"; license = licenses.mit; @@ -8741,7 +8693,7 @@ let # can't find the tests module? doCheck = false; - meta = with stdenv.lib; { + meta = { description = "Python Reddit API wrapper"; homepage = http://praw.readthedocs.org/; license = licenses.gpl3; @@ -8771,17 +8723,17 @@ let prompt_toolkit = buildPythonPackage rec { name = "prompt_toolkit-${version}"; - version = "0.26"; + version = "0.37"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/prompt_toolkit/${name}.tar.gz"; - sha256 = "1rd9gy3bcwp08agw5hiqckhaxbsz1i1kgkhjqw6vwhjdfgdjiq9l"; + sha256 = "0nb87j4dgv16wf998ga8ia4fwd3p9wizrx3m7h0rwqcpn2x0l3v8"; }; buildInputs = with self; [ jedi ipython pygments ]; propagatedBuildInputs = with self; [ docopt six wcwidth ]; - meta = with stdenv.lib; { + meta = { description = "Python library for building powerful interactive command lines"; longDescription = '' prompt_toolkit could be a replacement for readline, but it can be @@ -8870,7 +8822,7 @@ let meta = { description = "PostgreSQL database adapter for the Python programming language"; - license = with stdenv.lib.licenses; [ gpl2 zpt20 ]; + license = with licenses; [ gpl2 zpt20 ]; }; }; @@ -8923,7 +8875,7 @@ let meta = { description = "Bindings for Chromaprint acoustic fingerprinting"; homepage = "https://github.com/sampsyo/pyacoustid"; - license = stdenv.lib.licenses.mit; + license = licenses.mit; }; }; @@ -8941,7 +8893,7 @@ let meta = { description = "Python Algorithmic Trading"; homepage = http://gbeced.github.io/pyalgotrade/; - license = stdenv.lib.licenses.asl20; + license = licenses.asl20; }; }; @@ -8958,7 +8910,7 @@ let description = "ASN.1 tools for Python"; homepage = http://pyasn1.sourceforge.net/; license = "mBSD"; - platforms = stdenv.lib.platforms.unix; # arbitrary choice + platforms = platforms.unix; # arbitrary choice }; }); @@ -8977,8 +8929,8 @@ let meta = { description = "A collection of ASN.1-based protocols modules"; homepage = https://pypi.python.org/pypi/pyasn1-modules; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; # same as pyasn1 + license = licenses.bsd3; + platforms = platforms.unix; # same as pyasn1 }; }; @@ -9004,7 +8956,7 @@ let meta = { description = "Python bindings for PortAudio"; homepage = "http://people.csail.mit.edu/hubert/pyaudio/"; - license = stdenv.lib.licenses.mit; + license = licenses.mit; }; }; @@ -9021,11 +8973,11 @@ let propagatedBuildInputs = with self; [ dateutil ]; - meta = with stdenv.lib; { + meta = { description = "Module for reading vCard and vCalendar files"; homepage = http://vobject.skyhouseconsulting.com/; license = licenses.asl20; - maintainers = [ maintainers.DamienCassou ]; + maintainers = with maintainers; [ DamienCassou ]; }; }; @@ -9042,11 +8994,11 @@ let propagatedBuildInputs = with self; [ sqlite3 vobject lxml requests urwid pyxdg ]; - meta = with stdenv.lib; { + meta = { description = "Command-line interface carddav client"; homepage = http://lostpackets.de/pycarddav; license = licenses.mit; - maintainers = [ maintainers.DamienCassou ]; + maintainers = with maintainers; [ DamienCassou ]; }; }; @@ -9060,7 +9012,7 @@ let sha256 = "02sdn2998jlrm35smn1530hix3kzwyc1jv49cjdcnvfvrqqi3rww"; }; - meta = with stdenv.lib; { + meta = { description = ''PicoSAT is a popular SAT solver written by Armin Biere in pure C. This package provides efficient Python bindings to picosat on the C level, i.e. when importing pycosat, the @@ -9095,8 +9047,8 @@ let meta = { homepage = https://pypi.python.org/pypi/pygit2; description = "A set of Python bindings to the libgit2 shared library"; - license = with stdenv.lib.licenses; gpl2; - platforms = with stdenv.lib.platforms; all; + license = with licenses; gpl2; + platforms = with platforms; all; }; }; @@ -9115,8 +9067,8 @@ let homepage = http://babel.edgewall.org; description = "A collection of tools for internationalizing Python applications"; license = "BSD"; - maintainers = [ stdenv.lib.maintainers.garbas ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with maintainers; [ garbas ]; + platforms = platforms.linux; }; }); @@ -9147,7 +9099,7 @@ let --prefix="$out" ''; - meta = with stdenv.lib; { + meta = { homepage = https://github.com/Groundworkstech/pybfd; description = "A Python interface to the GNU Binary File Descriptor (BFD) library"; license = licenses.gpl2; @@ -9179,7 +9131,7 @@ let meta = { description = "Interface for working with block devices"; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; }; }; @@ -9213,7 +9165,7 @@ let propagatedBuildInputs = with self; [ pygments markdown ]; - meta = with stdenv.lib; { + meta = { homepage = "http://pyblosxom.github.io"; description = "File-based blogging engine"; license = licenses.mit; @@ -9237,10 +9189,10 @@ let sed -i '3iimport setuptools' setup.py ''; - meta = with stdenv.lib; { + meta = { maintainers = with maintainers; [ cstrahan ]; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.all; + license = licenses.bsd2; + platforms = platforms.all; homepage = "http://jparyani.github.io/pycapnp/index.html"; }; }; @@ -9272,7 +9224,7 @@ let nosetests ''; - meta = with stdenv.lib; { + meta = { homepage = http://www.gnu.org/software/libcdio/; description = "Wrapper around libcdio (CD Input and Control library)"; maintainers = with maintainers; [ rycee ]; @@ -9302,10 +9254,10 @@ let description = "Python wrappers for the Crypto++ library"; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; }; }); @@ -9332,7 +9284,7 @@ let meta = { homepage = http://pycurl.sourceforge.net/; description = "Python wrapper for libcurl"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; }; }); @@ -9355,7 +9307,7 @@ let meta = { homepage = https://pypi.python.org/pypi/pycurl2; description = "A fork from original PycURL library that no maintained from 7.19.0"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; }; }); @@ -9395,7 +9347,7 @@ let # dictionaries needed for tests doCheck = false; - meta = with stdenv.lib; { + meta = { description = "pyenchant: Python bindings for the Enchant spellchecker"; homepage = https://pythonhosted.org/pyenchant/; license = licenses.lgpl21; @@ -9434,7 +9386,7 @@ let meta = { description = "FIGlet in pure Python"; license = licenses.gpl2Plus; - maintainers = [ maintainers.thoughtpolice ]; + maintainers = with maintainers; [ thoughtpolice ]; }; }; @@ -9454,7 +9406,7 @@ let homepage = https://launchpad.net/pyflakes; description = "A simple program which checks Python source files for errors"; license = licenses.mit; - maintainers = [ stdenv.lib.maintainers.garbas ]; + maintainers = with maintainers; [ garbas ]; }; }; @@ -9469,7 +9421,7 @@ let propagatedBuildInputs = with pythonPackages; [ ]; - meta = with stdenv.lib; { + meta = { description = "Pure Python GeoIP API"; homepage = https://github.com/appliedsec/pygeoip; license = licenses.lgpl3Plus; @@ -9494,8 +9446,8 @@ let meta = { homepage = "http://www.pyglet.org/"; description = "A cross-platform windowing and multimedia library"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.mesaPlatforms; + license = licenses.bsd3; + platforms = platforms.mesaPlatforms; }; }; @@ -9508,7 +9460,7 @@ let sha256 = "0lagrwifsgn0s8bzqahpr87p7gd38xja8f06akscinp6hj89283k"; }; - meta = with stdenv.lib; { + meta = { homepage = http://pygments.org/; description = "A generic syntax highlighter"; license = with licenses; [ bsd2 ]; @@ -9536,7 +9488,7 @@ let homepage = "https://launchpad.net/pygpgme"; description = "A Python wrapper for the GPGME library"; license = licenses.lgpl21; - maintainers = [ stdenv.lib.maintainers.garbas ]; + maintainers = with maintainers; [ garbas ]; }; }; @@ -9552,11 +9504,11 @@ let disabled = isPyPy || isPy3k; - meta = with stdenv.lib; { + meta = { description = "Media Meta Data retrieval framework"; homepage = http://sourceforge.net/projects/mmpython/; license = licenses.gpl2; - maintainers = [ maintainers.DamienCassou ]; + maintainers = with maintainers; [ DamienCassou ]; }; }; @@ -9595,11 +9547,11 @@ let runHook postInstall ''; - meta = with stdenv.lib; { + meta = { description = "Generic application framework, providing the foundation for other modules"; homepage = https://github.com/freevo/kaa-base; license = licenses.lgpl21; - maintainers = [ maintainers.DamienCassou ]; + maintainers = with maintainers; [ DamienCassou ]; }; }; @@ -9642,11 +9594,11 @@ let propagatedBuildInputs = with self; [ kaa-base ]; - meta = with stdenv.lib; { + meta = { description = "Python library for parsing media metadata, which can extract metadata (e.g., such as id3 tags) from a wide range of media files"; homepage = https://github.com/freevo/kaa-metadata; license = licenses.gpl2; - maintainers = [ maintainers.DamienCassou ]; + maintainers = with maintainers; [ DamienCassou ]; }; }; @@ -9684,7 +9636,7 @@ let propagatedBuildInputs = with self; [ pycrypto ecdsa ]; - meta = with stdenv.lib; { + meta = { description = "JSON Web Token implementation in Python"; longDescription = "A Python implementation of JSON Web Token draft 01"; homepage = https://github.com/progrium/pyjwt; @@ -9736,12 +9688,12 @@ let buildInputs = with self; [ pkgs.libiodbc ]; - meta = with stdenv.lib; { + meta = { description = "Python ODBC module to connect to almost any database"; homepage = https://code.google.com/p/pyodbc/; license = licenses.mit; platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; }; }; @@ -9827,8 +9779,8 @@ let meta = { homepage = "https://fedorahosted.org/pyparted/"; description = "Python interface for libparted"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2Plus; + platforms = platforms.linux; }; }; @@ -9846,7 +9798,7 @@ let }; meta = { description = "A python implementation of the Pluggable Transports for Circumvention specification for Tor"; - license = stdenv.lib.licenses.bsd2; + license = licenses.bsd2; }; }); @@ -9863,12 +9815,12 @@ let propagatedBuildInputs = with self; [ scipy numpy pyqt4 pyopengl ]; - meta = with stdenv.lib; { + meta = { description = "Scientific Graphics and GUI Library for Python"; homepage = http://www.pyqtgraph.org/; license = licenses.mit; platforms = platforms.unix; - maintainers = [ maintainers.koral ]; + maintainers = with maintainers; [ koral ]; }; }; @@ -9880,7 +9832,7 @@ let md5 = "46ee623eeeba5a7cc0d95cbfa7e18abd"; }; - meta = with stdenv.lib; { + meta = { description = "Snowball stemming algorithms, for information retrieval"; homepage = http://snowball.tartarus.org/; license = licenses.mit; @@ -9897,12 +9849,12 @@ let md5 = "59d4d3f4a8786776c9d7f9051b8f1a69"; }; - meta = with stdenv.lib; { + meta = { description = "Distributed object middleware for Python (IPC/RPC)"; homepage = http://pythonhosted.org/Pyro/; license = licenses.mit; platforms = platforms.unix; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; }; }); @@ -9917,8 +9869,8 @@ let meta = { homepage = http://www.dalkescientific.om/Python/PyRSS2Gen.html; description = "Library for generating RSS 2.0 feeds"; - license = stdenv.lib.licenses.bsd2; - maintainers = [ stdenv.lib.maintainers.iElectric ]; + license = licenses.bsd2; + maintainers = with maintainers; [ iElectric ]; }; }); @@ -9933,12 +9885,12 @@ let propagatedBuildInputs = with self; [ pyasn1 pycrypto ]; - meta = with stdenv.lib; { + meta = { homepage = http://pysnmp.sf.net; description = "A pure-Python SNMPv1/v2c/v3 library"; license = licenses.bsd2; platforms = platforms.all; - maintainers = [ maintainers.koral ]; + maintainers = with maintainers; [ koral ]; }; }; @@ -9956,13 +9908,13 @@ let meta = { description = "SOCKS module for Python"; license = licenses.bsd3; - maintainers = [ maintainers.thoughtpolice ]; + maintainers = with maintainers; [ thoughtpolice ]; }; }; python_fedora = buildPythonPackage (rec { name = "python-fedora-0.3.33"; - meta.maintainers = [ stdenv.lib.maintainers.mornfall ]; + meta.maintainers = with maintainers; [ mornfall ]; src = pkgs.fetchurl { url = "https://fedorahosted.org/releases/p/y/python-fedora/${name}.tar.gz"; @@ -9992,7 +9944,7 @@ let sha256 = "18mhiwqq6vp65ykmi8x3i5l3gvrvrrr8z2kv11z1rpixmyr7sw1p"; }; - meta = with stdenv.lib; { + meta = { description = "Toolkit for safe and simple cryptography"; homepage = https://pypi.python.org/pypi/python-keyczar; license = licenses.asl20; @@ -10023,8 +9975,8 @@ let meta = { homepage = "http://pyudev.readthedocs.org/"; description = "Pure Python libudev binding"; - license = stdenv.lib.licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.linux; + license = licenses.lgpl21Plus; + platforms = platforms.linux; }; }; @@ -10040,8 +9992,8 @@ let meta = { homepage = http://github.com/ericflo/pynzb; description = "Unified API for parsing NZB files"; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.iElectric ]; + license = licenses.bsd3; + maintainers = with maintainers; [ iElectric ]; }; }); @@ -10059,8 +10011,8 @@ let meta = { homepage = http://code.google.com/p/python-progressbar/; description = "Text progressbar library for python"; - license = stdenv.lib.licenses.lgpl3Plus; - maintainers = [ stdenv.lib.maintainers.iElectric ]; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ iElectric ]; }; }); @@ -10094,7 +10046,7 @@ let meta = { description = "A Python extension module for POSIX ACLs, it can be used to query, list, add, and remove ACLs from files and directories under operating systems that support them"; - license = stdenv.lib.licenses.lgpl21Plus; + license = licenses.lgpl21Plus; }; }); @@ -10121,11 +10073,11 @@ let doCheck = false; - meta = with stdenv.lib; { + meta = { description = "Emacs Lisp to Python interface"; homepage = http://pymacs.progiciels-bpi.ca; license = licenses.gpl2; - maintainers = [ maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -10142,7 +10094,7 @@ let meta = { description = "Pure-Python PDF toolkit"; homepage = "http://pybrary.net/pyPdf/"; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; }; }; @@ -10171,7 +10123,7 @@ let liberal BSD-style Open-Source license. ''; license = "BSD-style"; - platforms = stdenv.lib.platforms.mesaPlatforms; + platforms = platforms.mesaPlatforms; }; }; @@ -10255,7 +10207,7 @@ let meta = { description = "A Scss compiler for Python"; homepage = http://pyscss.readthedocs.org/en/latest/; - license = stdenv.lib.licenses.mit; + license = licenses.mit; }; }; @@ -10271,7 +10223,7 @@ let meta = { homepage = "http://pyserial.sourceforge.net/"; - license = stdenv.lib.licenses.psfl; + license = licenses.psfl; description = "Python serial port extension"; }; }; @@ -10452,7 +10404,7 @@ let homepage = http://allmydata.org/trac/pyutil; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; }; }); @@ -10474,7 +10426,7 @@ let meta = { homepage = "https://code.google.com/p/pywebkitgtk/"; description = "Python bindings for the WebKit GTK+ port"; - license = stdenv.lib.licenses.lgpl2Plus; + license = licenses.lgpl2Plus; }; }; @@ -10494,7 +10446,7 @@ let meta = { description = "A Python extension module which gives access to the extended attributes for filesystem objects available in some operating systems"; - license = stdenv.lib.licenses.lgpl21Plus; + license = licenses.lgpl21Plus; }; }); @@ -10531,7 +10483,7 @@ let meta = { description = "The next generation YAML parser and emitter for Python"; homepage = http://pyyaml.org; - license = stdenv.lib.licenses.free; # !? + license = licenses.free; # !? }; }); @@ -10650,7 +10602,7 @@ let }; meta = { homepage = https://github.com/pnpnpn/retry-decorator; - license = stdenv.lib.licenses.mit; + license = licenses.mit; }; }; @@ -10668,7 +10620,7 @@ let meta = { description = "job queue server"; homepage = "https://github.com/pediapress/qserve"; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; }; }; @@ -10781,12 +10733,12 @@ let propagatedBuildInputs = with self; [ docutils mock pygments ]; - meta = with stdenv.lib; { + meta = { description = "ReStructuredText viewer"; homepage = http://mg.pov.lt/restview/; license = licenses.gpl2; platforms = platforms.all; - maintainers = [ maintainers.koral ]; + maintainers = with maintainers; [ koral ]; }; }; @@ -10834,7 +10786,7 @@ let md5 = "9a267e9327feb3d021cae26002ba6e0e"; }; - meta = with stdenv.lib; { + meta = { description = "ISO 8601 date/time parser"; homepage = http://cheeseshop.python.org/pypi/isodate; }; @@ -10855,11 +10807,11 @@ let rm "$out/bin/"*.bat ''; - meta = with stdenv.lib; { + meta = { description = "Test data generator for Robot Framework"; homepage = https://github.com/mkorpela/RoboMachine; license = licenses.asl20; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; }; }; @@ -10876,12 +10828,12 @@ let # error: invalid command 'test' doCheck = false; - meta = with stdenv.lib; { + meta = { description = "Generic test automation framework"; homepage = http://robotframework.org/; license = licenses.asl20; platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; }; }; @@ -10900,7 +10852,7 @@ let propagatedBuildInputs = with self; [ robotframework selenium docutils decorator ]; - meta = with stdenv.lib; { + meta = { description = ""; homepage = http://robotframework.org/; license = licenses.asl20; @@ -10919,7 +10871,7 @@ let propagatedBuildInputs = with self; [ robotframework moretools pathpy six setuptools ]; - meta = with stdenv.lib; { + meta = { description = "Python Tools for Robot Framework and Test Libraries"; homepage = http://bitbucket.org/userzimmermann/robotframework-tools; license = licenses.gpl3; @@ -10943,7 +10895,7 @@ let buildInputs = with self; [ unittest2 ]; propagatedBuildInputs = with self; [ robotframework lxml ]; - meta = with stdenv.lib; { + meta = { description = "Python unittest test suite for Robot Framework"; homepage = http://github.com/collective/robotsuite/; license = licenses.gpl3; @@ -10973,12 +10925,12 @@ let # error: invalid command 'test' doCheck = false; - meta = with stdenv.lib; { + meta = { description = "Light-weight and intuitive editor for Robot Framework test case files"; homepage = https://code.google.com/p/robotframework-ride/; license = licenses.asl20; platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; }; }; @@ -10994,10 +10946,10 @@ let sha256 = "0rdlvp8h74qs49wz1hx6qy8mgp2ddwlfs7z13h9139ynq04a3z7z"; }; - meta = with stdenv.lib; { + meta = { description = "python refactoring library"; homepage = http://rope.sf.net; - maintainers = [ maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; license = licenses.gpl2; }; }; @@ -11013,10 +10965,10 @@ let propagatedBuildInputs = with self; [ ropemode ]; - meta = with stdenv.lib; { + meta = { description = "a plugin for performing python refactorings in emacs"; homepage = http://rope.sf.net/ropemacs.html; - maintainers = [ maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; license = licenses.gpl2; }; }; @@ -11032,10 +10984,10 @@ let propagatedBuildInputs = with self; [ rope ]; - meta = with stdenv.lib; { + meta = { description = "a plugin for performing python refactorings in emacs"; homepage = http://rope.sf.net; - maintainers = [ maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; license = licenses.gpl2; }; }; @@ -11060,7 +11012,7 @@ let rpkg = buildPythonPackage (rec { name = "rpkg-1.14"; - meta.maintainers = [ stdenv.lib.maintainers.mornfall ]; + meta.maintainers = with maintainers; [ mornfall ]; src = pkgs.fetchurl { url = "https://fedorahosted.org/releases/r/p/rpkg/rpkg-1.14.tar.gz"; @@ -11088,8 +11040,8 @@ let meta = { homepage = http://rpy.sourceforge.net/rpy2; description = "Python interface to R"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.joelmo ]; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ joelmo ]; }; }; @@ -11107,7 +11059,7 @@ let meta = { description = "Remote Python Call (RPyC), a transparent and symmetric RPC library"; homepage = http://rpyc.readthedocs.org; - license = stdenv.lib.licenses.mit; + license = licenses.mit; }; }; @@ -11123,7 +11075,7 @@ let meta = { homepage = http://stuvel.eu/rsa; - license = stdenv.lib.licenses.asl20; + license = licenses.asl20; description = "A pure-Python RSA implementation"; }; }; @@ -11137,7 +11089,7 @@ let md5 = "e36a453baddb97c19af6f79d5ba51f38"; }; - meta = with stdenv.lib; { + meta = { description = "Hierarchic visualization control for wxPython"; homepage = https://launchpad.net/squaremap; license = licenses.bsd3; @@ -11155,7 +11107,7 @@ let propagatedBuildInputs = [ self.squaremap self.wxPython28 ]; - meta = with stdenv.lib; { + meta = { description = "GUI Viewer for Python profiling runs"; homepage = http://www.vrplumber.com/programming/runsnakerun/; license = licenses.bsd3; @@ -11174,7 +11126,7 @@ let meta = { description = "A Python object API for managing the Linux LIO kernel target"; homepage = "https://github.com/agrover/rtslib-fb"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; }; }; @@ -11195,12 +11147,12 @@ let # ERROR: Failure: OSError ([Errno 2] No such file or directory: '/tmp/nix-build-python2.7-seqdiag-0.9.0.drv-0/seqdiag-0.9.0/src/seqdiag/tests/diagrams/') doCheck = false; - meta = with stdenv.lib; { + meta = { description = "Generate sequence-diagram image from spec-text file (similar to Graphviz)"; homepage = http://blockdiag.com/; license = licenses.asl20; platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; }; }; @@ -11217,12 +11169,12 @@ let propagatedBuildInputs = [ modules.readline ]; - meta = with stdenv.lib; { + meta = { description = "Powerful interactive network packet manipulation program"; homepage = http://www.secdev.org/projects/scapy/; license = licenses.gpl2; platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; }; }; @@ -11279,7 +11231,7 @@ let meta = { description = "A set of python modules for machine learning and data mining"; homepage = http://scikit-learn.org; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; }; }; @@ -11395,7 +11347,7 @@ let homepage = http://code.google.com/p/simplejson/; - license = stdenv.lib.licenses.mit; + license = licenses.mit; }; }); @@ -11410,11 +11362,11 @@ let sha256 = "1n8msk71lpl3kv086xr2sv68ppgz6228575xfnbszc6p1mwr64rg"; }; - meta = with stdenv.lib; { + meta = { description = "A Parser Generator for Python"; homepage = https://pypi.python.org/pypi/SimpleParse; platforms = platforms.all; - maintainers = [ maintainers.DamienCassou ]; + maintainers = with maintainers; [ DamienCassou ]; }; }; @@ -11428,11 +11380,11 @@ let propagatedBuildInputs = with self; [ jinja2 markdown pillow pilkit clint argh pytest ]; - meta = with stdenv.lib; { + meta = { description = "Yet another simple static gallery generator"; homepage = http://sigal.saimon.org/en/latest/index.html; license = licenses.mit; - maintainers = [ maintainers.iElectric ]; + maintainers = with maintainers; [ iElectric ]; }; }; @@ -11446,7 +11398,7 @@ let propagatedBuildInputs = with self; [ PyStemmer ]; - meta = with stdenv.lib; { + meta = { description = "16 stemmer algorithms (15 + Poerter English stemmer) generated from Snowball algorithms"; homepage = http://sigal.saimon.org/en/latest/index.html; license = licenses.bsd3; @@ -11465,10 +11417,10 @@ let buildInputs = with self; [ modules.sqlite3 ]; - meta = with stdenv.lib; { + meta = { description = "sqlite-backed dictionary"; homepage = "http://github.com/Yelp/sqlite3dbm"; - license = stdenv.lib.licenses.asl20; + license = licenses.asl20; }; }; @@ -11480,7 +11432,7 @@ let md5 = "040a451c8e63de3e61fc5b66efa7fca5"; }; - meta = with stdenv.lib; { + meta = { description = "Python library for parsing PGP packets"; homepage = https://github.com/toofishes/python-pgpdump; license = licenses.bsd3; @@ -11497,7 +11449,7 @@ let propagatedBuildInputs = with self; [ pydns lockfile ]; - meta = with stdenv.lib; { + meta = { description = "Statistical anti-spam filter, initially based on the work of Paul Graham"; homepage = http://spambayes.sourceforge.net/; }; @@ -11523,7 +11475,7 @@ let doCheck = false; # won't suceed for unknown reasons that look harmless, though - meta = with stdenv.lib; { + meta = { description = "Geometric objects, predicates, and operations"; homepage = "https://pypi.python.org/pypi/Shapely/"; }; @@ -11561,7 +11513,7 @@ let meta = { description = "parse english textual date descriptions"; homepage = "https://github.com/pediapress/timelib/"; - license = stdenv.lib.licenses.zlib; + license = licenses.zlib; }; }; @@ -11593,7 +11545,7 @@ let export LANG="en_US.UTF-8" ''; - meta = with stdenv.lib; { + meta = { description = "A Python library for symbolic mathematics"; homepage = http://www.sympy.org/; license = licenses.bsd3; @@ -11619,8 +11571,8 @@ let buildInputs = with self; [ pillow nose_progressive nose mock blessings ]; - meta = with stdenv.lib; { - maintainers = [ maintainers.iElectric ]; + meta = { + maintainers = with maintainers; [ iElectric ]; }; }; @@ -11638,8 +11590,8 @@ let buildInputs = with self; [ pillow nose_progressive nose mock blessings nose ]; - meta = with stdenv.lib; { - maintainers = [ maintainers.iElectric ]; + meta = { + maintainers = with maintainers; [ iElectric ]; }; }; @@ -11658,8 +11610,8 @@ let buildInputs = with self; [ pytest py mock pkgs.glibcLocales ]; - meta = with stdenv.lib; { - maintainers = [ maintainers.iElectric ]; + meta = { + maintainers = with maintainers; [ iElectric ]; }; }; @@ -11674,8 +11626,8 @@ let buildInputs = with self; [ pillow blessings nose ]; propagatedBuildInputs = with self; [ modules.curses ]; - meta = with stdenv.lib; { - maintainers = [ maintainers.iElectric ]; + meta = { + maintainers = with maintainers; [ iElectric ]; }; }; @@ -11692,8 +11644,8 @@ let buildInputs = with self; [ nose modules.curses ]; - meta = with stdenv.lib; { - maintainers = [ maintainers.iElectric ]; + meta = { + maintainers = with maintainers; [ iElectric ]; }; }; @@ -11850,7 +11802,7 @@ let meta = { homepage = http://code.google.com/p/socksipy-branch/; description = "This Python module allows you to create TCP connections through a SOCKS proxy without any special effort"; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; }; }; @@ -11868,7 +11820,7 @@ let meta = { homepage = http://sorl-thumbnail.readthedocs.org/en/latest/; description = "Thumbnails for Django"; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; }; }; @@ -11924,7 +11876,7 @@ let meta = { homepage = https://pypi.python.org/pypi/subprocess32; description = "Backport of the subprocess module from Python 3.2.5 for use on 2.x"; - maintainers = [ stdenv.lib.maintainers.garbas ]; + maintainers = with maintainers; [ garbas ]; }; }; @@ -11939,7 +11891,7 @@ let propagatedBuildInputs = with self; [ docutils jinja2 pygments sphinx_rtd_theme alabaster Babel snowballstemmer six ]; - meta = with stdenv.lib; { + meta = { description = "A tool that makes it easy to create intelligent and beautiful documentation for Python projects"; homepage = http://sphinx.pocoo.org/; license = licenses.bsd3; @@ -11961,7 +11913,7 @@ let touch requirements.txt ''; - meta = with stdenv.lib; { + meta = { description = "ReadTheDocs.org theme for Sphinx, 2013 version"; homepage = https://github.com/snide/sphinx_rtd_theme/; license = licenses.bsd3; @@ -12160,7 +12112,7 @@ let sha256 = "1w6shyh7n139cp636sym0frdyiwybw1m7gd2l4s3d7xbaccf6qg5"; }; - meta = with stdenv.lib; { + meta = { description = "Non-validating SQL parser for Python"; longDescription = '' Provides support for parsing, splitting and formatting SQL statements. @@ -12263,11 +12215,11 @@ let echo '${setup}' > $sourceRoot/setup.py ''; - meta = with stdenv.lib; { + meta = { description = "Tool for automatic download/upload subtitles for videofiles using fast hashing"; homepage = http://www.subdownloader.net; license = licenses.gpl3; - maintainers = [ maintainers.DamienCassou ]; + maintainers = with maintainers; [ DamienCassou ]; }; }; @@ -12358,7 +12310,7 @@ let meta = { description = "A command shell for managing the Linux LIO kernel target"; homepage = "https://github.com/agrover/targetcli-fb"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; }; }; @@ -12382,12 +12334,12 @@ let ''; - meta = with stdenv.lib; { + meta = { description = " GTK3 & python based GUI for Syncthing "; - maintainers = [ maintainers.DamienCassou ]; + maintainers = with maintainers; [ DamienCassou ]; platforms = pkgs.syncthing.meta.platforms; homepage = "https://github.com/syncthing/syncthing-gtk"; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; }; }; @@ -12436,7 +12388,7 @@ let meta = { homepage = http://taskcoach.org/; description = "Todo manager to keep track of personal tasks and todo lists"; - license = stdenv.lib.licenses.gpl3Plus; + license = licenses.gpl3Plus; }; }; @@ -12463,7 +12415,7 @@ let description = "Python bindings for your taskwarrior database"; license = licenses.gpl3Plus; platforms = platforms.all; - maintainers = [ maintainers.pierron ]; + maintainers = with maintainers; [ pierron ]; }; }; @@ -12572,7 +12524,7 @@ let md5 = "4fe37704f16ecf424b91e122defedd7e"; }; - meta = with stdenv.lib; { + meta = { description = "A module to generate a formatted text table, using ASCII characters"; homepage = http://foutaise.org/code/; license = licenses.lgpl2; @@ -12591,7 +12543,7 @@ let meta = { description = "A pure Python implementation of SSL and TLS"; homepage = https://pypi.python.org/pypi/tlslite; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; }; }; @@ -12609,7 +12561,7 @@ let meta = { description = "Quick Response code generation for Python"; home = "https://pypi.python.org/pypi/qrcode"; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; }; }; @@ -12625,7 +12577,7 @@ let meta = { description = "Python implementation of the v3 API for TheMovieDB.org, allowing access to movie and cast information"; homepage = http://pypi.python.org/pypi/tmdb3; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; }; }; @@ -12645,7 +12597,7 @@ let smmap = buildPythonPackage rec { name = "smmap-0.8.2"; disabled = isPy3k || isPyPy; # next release will have py3k/pypy support - meta.maintainers = [ stdenv.lib.maintainers.mornfall ]; + meta.maintainers = with maintainers; [ mornfall ]; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/s/smmap/${name}.tar.gz"; @@ -12691,7 +12643,7 @@ let meta = { description = "Transaction management"; homepage = http://pypi.python.org/pypi/transaction; - license = stdenv.lib.licenses.zpt20; + license = licenses.zpt20; }; }; @@ -12709,7 +12661,7 @@ let meta = { description = "Python implementation of the Transmission bittorent client RPC protocol"; homepage = http://pypi.python.org/pypi/transmissionrpc/; - license = stdenv.lib.licenses.mit; + license = licenses.mit; }; }; @@ -12729,7 +12681,7 @@ let meta = { description = "A tool which computes a dependency graph between active Python eggs"; homepage = http://thomas-lotze.de/en/software/eggdeps/; - license = stdenv.lib.licenses.zpt20; + license = licenses.zpt20; }; }; @@ -12752,8 +12704,8 @@ let homepage = https://github.com/alejandrogomez/turses; description = "A Twitter client for the console"; license = licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.garbas ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with maintainers; [ garbas ]; + platforms = platforms.linux; }; }); @@ -12770,8 +12722,8 @@ let homepage = "https://github.com/tweepy/tweepy"; description = "Twitter library for python"; license = licenses.mit; - maintainers = [ stdenv.lib.maintainers.garbas ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with maintainers; [ garbas ]; + platforms = platforms.linux; }; }); @@ -12793,7 +12745,7 @@ let description = "Twiggy is the first totally new design for a logger since log4j"; license = licenses.bsd3; platforms = platforms.all; - maintainers = [ maintainers.pierron ]; + maintainers = with maintainers; [ pierron ]; }; }; @@ -12811,7 +12763,7 @@ let meta = { description = "Twitter API library"; license = licenses.mit; - maintainers = [ maintainers.thoughtpolice ]; + maintainers = with maintainers; [ thoughtpolice ]; }; }; @@ -12901,10 +12853,10 @@ let #buildInputs = with self; [ unittest2 ]; doCheck = false; - meta = with stdenv.lib; { + meta = { description = "Drop-in replacement for Python2's stdlib csv module, with unicode support"; homepage = https://github.com/jdunck/python-unicodecsv; - maintainers = [ maintainers.koral ]; + maintainers = with maintainers; [ koral ]; }; }; @@ -12946,7 +12898,7 @@ let doCheck = false; - meta = with stdenv.lib; { + meta = { description = "A python module that will check for package updates"; homepage = https://github.com/bboe/update_checker; license = licenses.bsd2; @@ -12969,9 +12921,9 @@ let meta = { homepage = "urlgrabber.baseurl.org"; - license = stdenv.lib.licenses.lgpl2Plus; + license = licenses.lgpl2Plus; description = "Python module for downloading files"; - maintainers = [ stdenv.lib.maintainers.qknight ]; + maintainers = with maintainers; [ qknight ]; }; }; @@ -12992,7 +12944,7 @@ let homepage = http://excess.org/urwid; repositories.git = git://github.com/wardi/urwid.git; license = licenses.lgpl21; - maintainers = [ stdenv.lib.maintainers.garbas ]; + maintainers = with maintainers; [ garbas ]; }; }); @@ -13034,11 +12986,11 @@ let # XXX: Ran 0 tests in 0.003s - meta = with stdenv.lib; { + meta = { description = "a tool to create isolated Python environments"; homepage = http://www.virtualenv.org; license = licenses.mit; - maintainers = [ maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -13056,7 +13008,7 @@ let # needs tox to run the tests doCheck = false; - meta = with stdenv.lib; { + meta = { description = "Script to clone virtualenvs"; license = licenses.mit; platforms = platforms.all; @@ -13139,11 +13091,8 @@ let doCheck = false; meta = { - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ garbas iElectric ]; + platforms = platforms.all; }; }; @@ -13159,7 +13108,7 @@ let # error: invalid command 'test' doCheck = false; - meta = with stdenv.lib; { + meta = { description = "Library for working with color names/values defined by the HTML and CSS specifications"; homepage = https://bitbucket.org/ubernostrum/webcolors/overview/; license = licenses.bsd3; @@ -13181,7 +13130,7 @@ let meta = { description = "Ctypes-based simple MagickWand API binding for Python"; homepage = http://wand-py.org/; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; }; }; @@ -13198,7 +13147,7 @@ let # Checks fail due to missing tox.ini file: doCheck = false; - meta = with stdenv.lib; { + meta = { description = "Measures number of Terminal column cells of wide-character codes"; longDescription = '' This API is mainly for Terminal Emulator implementors -- any Python @@ -13226,7 +13175,7 @@ let meta = { description = "WSGI request and response object"; homepage = http://pythonpaste.org/webob/; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; }; }; @@ -13265,7 +13214,7 @@ let # XXX: skipping two tests fails in python2.6 doCheck = ! isPy26; - buildInputs = optionals isPy26 [ self.ordereddict unittest2 ]; + buildInputs = with self; optionals isPy26 [ ordereddict unittest2 ]; propagatedBuildInputs = with self; [ nose @@ -13283,7 +13232,7 @@ let meta = { description = "Helper to test WSGI applications"; homepage = http://webtest.readthedocs.org/en/latest/; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; }; }; @@ -13319,7 +13268,7 @@ let propagatedBuildInputs = with pythonPackages; [ feedparser pytz lxml praw pyenchant pygeoip backports_ssl_match_hostname_3_4_0_2 ]; - meta = with stdenv.lib; { + meta = { description = "A simple, lightweight, open source, easy-to-use IRC utility bot, written in Python"; homepage = http://willie.dftba.net/; license = licenses.efl20; @@ -13339,7 +13288,7 @@ let meta = { description = "Some (mainly XMPP-related) additions to twisted"; homepage = "http://wokkel.ik.nu/"; - license = stdenv.lib.licenses.mit; + license = licenses.mit; }; }); @@ -13355,11 +13304,8 @@ let propagatedBuildInputs = with self; [ six webob ]; meta = { - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ garbas iElectric ]; + platforms = platforms.all; }; }; @@ -13420,7 +13366,7 @@ let homepage = http://python-xlib.sourceforge.net/; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; }; }); @@ -13461,8 +13407,8 @@ let meta = { description = "Structured Configuration Library"; homepage = http://pypi.python.org/pypi/ZConfig; - license = stdenv.lib.licenses.zpt20; - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + license = licenses.zpt20; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -13479,8 +13425,8 @@ let meta = { description = "Inter-process locks"; homepage = http://www.python.org/pypi/zc.lockfile; - license = stdenv.lib.licenses.zpt20; - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + license = licenses.zpt20; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -13502,8 +13448,8 @@ let meta = { description = "A daemon process control library and tools for Unix-based systems"; homepage = http://pypi.python.org/pypi/zdaemon; - license = stdenv.lib.licenses.zpt20; - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + license = licenses.zpt20; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -13534,7 +13480,7 @@ let and Haskell API. ''; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; }; }); @@ -13553,8 +13499,8 @@ let meta = { description = "An object-oriented database for Python"; homepage = http://pypi.python.org/pypi/ZODB3; - license = stdenv.lib.licenses.zpt20; - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + license = licenses.zpt20; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -13580,8 +13526,8 @@ let meta = { description = "An object-oriented database for Python"; homepage = http://pypi.python.org/pypi/ZODB; - license = stdenv.lib.licenses.zpt20; - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + license = licenses.zpt20; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -13597,7 +13543,7 @@ let # fails.. doCheck = false; - meta = with stdenv.lib; { + meta = { homepage = http://pypi.python.org/pypi/zodbpickle; }; }; @@ -13615,7 +13561,7 @@ let md5 = "7f5df4cf8dd50fb0c584c0929a406c92"; }; - meta = with stdenv.lib; { + meta = { description = "scalable persistent components"; homepage = http://packages.python.org/BTrees; }; @@ -13632,7 +13578,7 @@ let md5 = "2942f1ca7764b1bef8d48fa0d9a236b7"; }; - meta = with stdenv.lib; { + meta = { description = "automatic persistence for Python objects"; homepage = http://www.zope.org/Products/ZODB; }; @@ -13648,7 +13594,7 @@ let propagatedBuildInputs = with self; [ pygtk pygobject pkgs.graphviz ]; - meta = with stdenv.lib; { + meta = { description = "xdot.py is an interactive viewer for graphs written in Graphviz's dot"; homepage = https://github.com/jrfonseca/xdot.py; license = licenses.lgpl3Plus; @@ -13666,7 +13612,7 @@ let buildInputs = with self; [ zope_interface ]; meta = { - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -13682,7 +13628,7 @@ let propagatedBuildInputs = with self; [ zope_interface ]; meta = { - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -13722,7 +13668,7 @@ let doCheck = false; meta = { - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -13738,7 +13684,7 @@ let propagatedBuildInputs = with self; [ zope_i18nmessageid zope_schema ]; meta = { - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -13761,7 +13707,7 @@ let ]; meta = { - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -13775,7 +13721,7 @@ let }; meta = { - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -13788,7 +13734,7 @@ let md5 = "62d639f75b31d2d864fe5982cb23959c"; }; meta = { - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -13805,8 +13751,8 @@ let meta = { description = "An event publishing system"; homepage = http://pypi.python.org/pypi/zope.event; - license = stdenv.lib.licenses.zpt20; - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + license = licenses.zpt20; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -13825,8 +13771,8 @@ let meta = { description = "Exception interfaces and implementations"; homepage = http://pypi.python.org/pypi/zope.exceptions; - license = stdenv.lib.licenses.zpt20; - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + license = licenses.zpt20; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -13842,7 +13788,7 @@ let propagatedBuildInputs = with self; [ zope_schema ]; meta = { - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -13858,7 +13804,7 @@ let propagatedBuildInputs = with self; [ pytz zope_component ]; meta = { - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -13872,7 +13818,7 @@ let }; meta = { - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -13888,7 +13834,7 @@ let propagatedBuildInputs = with self; [ zope_event zope_component ]; meta = { - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -13911,7 +13857,7 @@ let doCheck = false; meta = { - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -13927,7 +13873,7 @@ let propagatedBuildInputs = with self; [ zope_interface ]; meta = { - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -13945,7 +13891,7 @@ let ]; meta = { - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -13961,7 +13907,7 @@ let propagatedBuildInputs = with self; [ zope_location zope_event zope_interface zope_testing ] ++ optional isPy26 ordereddict; meta = { - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -13980,7 +13926,7 @@ let ]; meta = { - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -13996,7 +13942,7 @@ let propagatedBuildInputs = with self; [ zope_i18nmessageid zope_interface ]; meta = { - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -14015,11 +13961,8 @@ let propagatedBuildInputs = with self; [ sqlalchemy9 transaction ]; meta = { - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ garbas iElectric ]; + platforms = platforms.all; }; }; @@ -14040,8 +13983,8 @@ let meta = { description = "Zope testing helpers"; homepage = http://pypi.python.org/pypi/zope.testing; - license = stdenv.lib.licenses.zpt20; - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + license = licenses.zpt20; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -14062,8 +14005,8 @@ let meta = { description = "A flexible test runner with layer support"; homepage = http://pypi.python.org/pypi/zope.testrunner; - license = stdenv.lib.licenses.zpt20; - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + license = licenses.zpt20; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -14082,7 +14025,7 @@ let doCheck = false; meta = { - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -14100,8 +14043,8 @@ let meta = { description = "Zope.Interface"; homepage = http://zope.org/Products/ZopeInterface; - license = stdenv.lib.licenses.zpt20; - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + license = licenses.zpt20; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -14140,7 +14083,7 @@ let meta = { homepage = http://liw.fi/cliapp/; description = "Python framework for Unix command line programs"; - maintainers = [ stdenv.lib.maintainers.rickynils ]; + maintainers = with maintainers; [ rickynils ]; }; }; @@ -14195,7 +14138,7 @@ let meta = { description = "A Toolkit for the Tornado Web Framework"; homepage = http://github.com/multoncore/tornadokick; - license = stdenv.lib.licenses.asl20; + license = licenses.asl20; }; }; @@ -14222,11 +14165,11 @@ let sha256 = "eb754917e98e03cb9d528eb5f57a08c88fa7a8172f92325a9fe796b2daf14db0"; }; - meta = with stdenv.lib; { + meta = { homepage = https://github.com/scs3jb/screenkey; description = "A screencast tool to show your keys"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = [ maintainers.DamienCassou ]; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ DamienCassou ]; platforms = platforms.linux; }; }; @@ -14279,7 +14222,7 @@ let buildInputs = with self; [ mock unittest2 ]; propagatedBuildInputs = with self; [ requests ]; - meta = with stdenv.lib; { + meta = { description = "Python library for the BrowserID Protocol"; homepage = "https://github.com/mozilla/PyBrowserID"; license = licenses.mpl20; @@ -14315,7 +14258,7 @@ let meta = { maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; }; }; @@ -14330,11 +14273,8 @@ let propagatedBuildInputs = with self; [ pep8 ]; meta = { - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ garbas iElectric ]; + platforms = platforms.all; }; }; @@ -14356,7 +14296,7 @@ let meta = { homepage = http://liw.fi/tracing/; description = "Python debug logging helper"; - maintainers = [ stdenv.lib.maintainers.rickynils ]; + maintainers = with maintainers; [ rickynils ]; }; }; @@ -14369,11 +14309,8 @@ let }; meta = { - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ garbas iElectric ]; + platforms = platforms.all; }; }; @@ -14396,7 +14333,7 @@ let meta = { homepage = http://liw.fi/ttystatus/; description = "Progress and status updates on terminals for Python"; - maintainers = [ stdenv.lib.maintainers.rickynils ]; + maintainers = with maintainers; [ rickynils ]; }; }; @@ -14418,7 +14355,7 @@ let meta = { homepage = http://liw.fi/larch/; description = "Python B-tree library"; - maintainers = [ stdenv.lib.maintainers.rickynils ]; + maintainers = with maintainers; [ rickynils ]; }; }; @@ -14455,11 +14392,8 @@ let doCheck = false; meta = { - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ garbas iElectric ]; + platforms = platforms.all; }; }; @@ -14475,7 +14409,7 @@ let # error: invalid command 'test' doCheck = false; - meta = with stdenv.lib; { + meta = { homepage = http://graphite.wikidot.com/; description = "Fixed size round-robin style database"; maintainers = with maintainers; [ rickynils offline ]; @@ -14496,7 +14430,7 @@ let # error: invalid command 'test' doCheck = false; - meta = with stdenv.lib; { + meta = { homepage = http://graphite.wikidot.com/; description = "Backend data caching and persistence daemon for Graphite"; maintainers = with maintainers; [ rickynils offline ]; @@ -14534,7 +14468,7 @@ let homepage = http://pypi.python.org/pypi/Unidecode/; description = "ASCII transliterations of Unicode text"; license = licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.iElectric ]; + maintainers = with maintainers; [ iElectric ]; }; }; @@ -14554,11 +14488,11 @@ let sed -i -e "s|libname = .*|libname = \"$libusb\"|" usb/backend/libusb1.py ''; - meta = with stdenv.lib; { + meta = { description = "Python USB access module (wraps libusb 1.0)"; # can use other backends homepage = http://pyusb.sourceforge.net/; license = "BSD"; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; }; }; @@ -14578,7 +14512,7 @@ let description = "Python implementation of the USBTMC instrument control protocol"; homepage = http://alexforencich.com/wiki/en/python-usbtmc/start; license = licenses.mit; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; }; }; @@ -14597,7 +14531,7 @@ let meta = { homepage = https://launchpad.net/txamqp; description = "Library for communicating with AMQP peers and brokers using Twisted"; - maintainers = [ stdenv.lib.maintainers.rickynils ]; + maintainers = with maintainers; [ rickynils ]; }; }; @@ -14638,7 +14572,7 @@ let # error: invalid command 'test' doCheck = false; - meta = with stdenv.lib; { + meta = { homepage = http://graphite.wikidot.com/; description = "Enterprise scalable realtime graphing"; maintainers = with maintainers; [ rickynils offline ]; @@ -14726,7 +14660,7 @@ let meta = { description = "A simple alerting application for Graphite metrics"; homepage = https://github.com/seatgeek/graphite-pager; - maintainers = [ maintainers.offline ]; + maintainers = with maintainers; [ offline ]; license = licenses.bsd2; }; }; @@ -14761,7 +14695,7 @@ let # There are no tests doCheck = false; - meta = with stdenv.lib; { + meta = { homepage = http://pyspotify.mopidy.com; description = "A Python interface to Spotify’s online music streaming service"; license = licenses.unfree; @@ -14784,10 +14718,10 @@ let # There are no tests doCheck = false; - meta = with stdenv.lib; { + meta = { homepage = http://www.pykka.org; description = "A Python implementation of the actor model"; - maintainers = [ maintainers.rickynils ]; + maintainers = with maintainers; [ rickynils ]; }; }; @@ -14813,7 +14747,7 @@ let meta = { homepage = https://ws4py.readthedocs.org; description = "A WebSocket package for Python"; - maintainers = [ stdenv.lib.maintainers.rickynils ]; + maintainers = with maintainers; [ rickynils ]; }; }; @@ -14896,7 +14830,7 @@ let meta = { homepage = http://www.libvirt.org/; description = "libvirt Python bindings"; - license = pkgs.lib.licenses.lgpl2; + license = licenses.lgpl2; }; }; @@ -14914,8 +14848,8 @@ let meta = { homepage = https://github.com/asciimoo/searx; description = "A privacy-respecting, hackable metasearch engine"; - license = stdenv.lib.licenses.agpl3Plus; - maintainers = [ stdenv.lib.maintainers.matejc ]; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ matejc ]; }; }; @@ -14934,7 +14868,7 @@ let description = "Asynchronous HTTP requests"; homepage = https://github.com/kennethreitz/grequests; license = "bsd"; - maintainers = [ stdenv.lib.maintainers.matejc ]; + maintainers = with maintainers; [ matejc ]; }; }; @@ -14952,7 +14886,7 @@ let description = "Adds i18n/l10n support to Flask applications"; homepage = https://github.com/mitsuhiko/flask-babel; license = "bsd"; - maintainers = [ stdenv.lib.maintainers.matejc ]; + maintainers = with maintainers; [ matejc ]; }; }; @@ -14968,7 +14902,7 @@ let 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 ]; + maintainers = with maintainers; [ matejc ]; }; }; @@ -14995,7 +14929,7 @@ let meta = { description = "Cross-platform system power status information"; homepage = https://github.com/Kentzo/Power; - license = stdenv.lib.licenses.mit; + license = licenses.mit; }; }; @@ -15022,11 +14956,11 @@ let # tests require dbusmock doCheck = false; - meta = with stdenv.lib; { + meta = { description = "Removable disk automounter for udisks"; license = licenses.mit; homepage = https://github.com/coldfix/udiskie; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = with maintainers; [ AndersonTorres ]; }; }; @@ -15044,9 +14978,9 @@ let meta = { description = "Python bindings for EFL and Elementary"; homepage = http://enlightenment.org/; - maintainers = [ stdenv.lib.maintainers.matejc stdenv.lib.maintainers.tstrobel ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl3; + maintainers = with maintainers; [ matejc tstrobel ]; + platforms = platforms.linux; + license = licenses.gpl3; }; }; @@ -15060,9 +14994,9 @@ let meta = { description = "A topological sort algorithm"; homepage = https://pypi.python.org/pypi/toposort/1.1; - maintainers = [ stdenv.lib.maintainers.tstrobel ]; - platforms = stdenv.lib.platforms.linux; - #license = stdenv.lib.licenses.apache; + maintainers = with maintainers; [ tstrobel ]; + platforms = platforms.linux; + #license = licenses.apache; }; }; @@ -15084,7 +15018,7 @@ let homepage = https://github.com/ricardomv/snapper-gui; description = "Graphical frontend for snapper"; license = licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.tstrobel ]; + maintainers = with maintainers; [ tstrobel ]; }; }; @@ -15106,7 +15040,7 @@ let homepage = http://rednotebook.sourceforge.net/index.html; description = "A modern journal that includes a calendar navigation, customizable templates, export functionality and word clouds"; license = licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.tstrobel ]; + maintainers = with maintainers; [ tstrobel ]; }; }; @@ -15157,10 +15091,10 @@ let sha256 = "694e29aa67d03a6ab006f1854740b65f4f87e581afb33853f80e647ddb5f24e7"; }; - meta = with stdenv.lib; { + meta = { description = "Collection of fancy functional tools focused on practicality"; homepage = "http://funcy.readthedocs.org/"; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; }; }; @@ -15191,7 +15125,7 @@ let meta = { homepage = https://developers.google.com/storage/docs/gspythonlibrary; description = "Provides OAuth 2.0 credentials that can be used with Google Cloud Storage"; - license = stdenv.lib.licenses.asl20; + license = licenses.asl20; }; }; @@ -15202,7 +15136,7 @@ let homepage = https://developers.google.com/storage/docs/gsutil; description = "Google Cloud Storage Tool"; maintainers = [ "Russell O'Connor " ]; - license = stdenv.lib.licenses.asl20; + license = licenses.asl20; }; doCheck = false; @@ -15231,7 +15165,7 @@ let meta = { homepage = https://github.com/garbas/pypi2nix; description = ""; - maintainers = [ pkgs.stdenv.lib.maintainers.garbas ]; + maintainers = with maintainers; [ garbas ]; }; }; @@ -15250,8 +15184,8 @@ let meta = { homepage = https://github.com/kjellmf/svg2tikz; description = "An SVG to TikZ converter"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with pkgs.stdenv.lib.maintainers; [gal_bolle]; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ gal_bolle ]; }; }; @@ -15274,7 +15208,7 @@ let meta = { maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; }; }; @@ -15366,12 +15300,12 @@ let sed -i 's|^\([ ]*\)self.bin_path.*$|\1self.bin_path = "${pkgs.terminal-notifier}/bin/terminal-notifier"|' build/lib/pync/TerminalNotifier.py ''; - meta = with stdenv.lib; { + meta = { description = "Python Wrapper for Mac OS 10.8 Notification Center"; homepage = https://pypi.python.org/pypi/pync/1.4; license = licenses.mit; platforms = platforms.darwin; - maintainers = [ maintainers.lovek323 ]; + maintainers = with maintainers; [ lovek323 ]; }; }; @@ -15391,8 +15325,8 @@ let meta = { homepage = http://weboob.org; description = "Collection of applications and APIs to interact with websites without requiring the user to open a browser"; - license = stdenv.lib.licenses.agpl3; - maintainers = [ stdenv.lib.maintainers.DamienCassou ]; + license = licenses.agpl3; + maintainers = with maintainers; [ DamienCassou ]; }; }; @@ -15407,7 +15341,7 @@ let buildInputs = with self; [ nose ]; - meta = with stdenv.lib; { + meta = { description = "DataDiff"; homepage = http://sourceforge.net/projects/datadiff/; license = licenses.asl20; @@ -15423,7 +15357,7 @@ let md5 = "043e89644f8909d462fbbfa511c768df"; }; - meta = with stdenv.lib; { + meta = { description = "Termcolor"; homepage = http://pypi.python.org/pypi/termcolor; license = licenses.mit; @@ -15441,7 +15375,7 @@ let propagatedBuildInputs = with pythonPackages; [ ]; - meta = with stdenv.lib; { + meta = { homepage = https://github.com/Alir3z4/html2text/; }; }; @@ -15455,7 +15389,7 @@ let sha256 = "882650928776a7ca72e67054a9e0ac98f78645f279c0cfb5910db28f03f07c2e"; }; - meta = with stdenv.lib; { + meta = { description = "Library for creating high quality encapsulated Postscript, PDF, PNG, or SVG charts"; homepage = http://home.gna.org/pychart/; license = licenses.gpl2; @@ -15531,7 +15465,7 @@ let coastlines, lakes, rivers and political boundaries. See http://matplotlib.github.com/basemap/users/examples.html for examples of what it can do. ''; - licences = [ licenses.mit licenses.gpl2 ]; + license = with licenses; [ mit gpl2 ]; }; }; @@ -15545,7 +15479,7 @@ let propagatedBuildInputs = with self; [ ]; - meta = with stdenv.lib; { + meta = { description = "Summary"; homepage = https://github.com/quandyfactory/dicttoxml; }; @@ -15561,7 +15495,7 @@ let sha256 = "073zyx3caqa9zlzxa82k9k2nhhn8c5imqpgp5nwqnh0fgaj9pqn8"; }; propagatedBuildInputs = with self; []; - meta = with stdenv.lib; { + meta = { description = "A fast and complete Python implementation of Markdown"; homepage = https://github.com/trentm/python-markdown2; license = licenses.mit; @@ -15582,7 +15516,7 @@ let propagatedBuildInputs = with self; [ oauth2 ]; - meta = with stdenv.lib; { + meta = { description = "Evernote SDK for Python"; homepage = http://dev.evernote.com; license = licenses.asl20; @@ -15599,7 +15533,7 @@ let sha256 = "1yla6wg18x2a0l0lrvkp1v464hqhff98ck8pnv8d5j9kn3j6bxh8"; }; - meta = with stdenv.lib; { + meta = { description = "Python bindings for the Apache Thrift RPC system"; homepage = http://thrift.apache.org/; license = licenses.asl20; @@ -15633,7 +15567,7 @@ let evernote ]; - meta = with stdenv.lib; { + meta = { description = "Work with Evernote from command line"; homepage = http://www.geeknote.me; license = licenses.gpl1;