diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000000..d34a7831d65
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,3 @@
+language: python
+python: "3.4"
+script: ./maintainers/scripts/travis-nox-review-pr.sh
diff --git a/default.nix b/default.nix
index c1b9bfd39f9..e0df520721c 100644
--- a/default.nix
+++ b/default.nix
@@ -1,6 +1,6 @@
-if ! builtins ? nixVersion || builtins.compareVersions "1.6" builtins.nixVersion == 1 then
+if ! builtins ? nixVersion || builtins.compareVersions "1.7" builtins.nixVersion == 1 then
- abort "This version of Nixpkgs requires Nix >= 1.6, please upgrade!"
+ abort "This version of Nixpkgs requires Nix >= 1.7, please upgrade!"
else
diff --git a/doc/language-support.xml b/doc/language-support.xml
index f5e89df57fc..5e49121e695 100644
--- a/doc/language-support.xml
+++ b/doc/language-support.xml
@@ -233,6 +233,22 @@ twisted = buildPythonPackage {
+Ruby
+ For example, to package yajl-ruby package, use gem-nix:
+
+
+ $ nix-env -i gem-nix
+ $ gem-nix --no-user-install --nix-file=pkgs/development/interpreters/ruby/generated.nix yajl-ruby
+ $ nix-build -A rubyLibs.yajl-ruby
+
+
+
+
+Go
+ To extract dependency information from a Go package in automated way use go2nix.
+
+
+
Java
Ant-based Java packages are typically built from source as follows:
@@ -314,6 +330,90 @@ Runtime) instead of the OpenJRE.
+Lua
+
+
+ Lua packages are built by the buildLuaPackage function. This function is
+ implemented
+ in
+ pkgs/development/lua-modules/generic/default.nix
+ and works similarly to buildPerlPackage. (See
+ for details.)
+
+
+
+ Lua packages are defined
+ in pkgs/top-level/lua-packages.nix.
+ Most of them are simple. For example:
+
+
+fileSystem = buildLuaPackage {
+ name = "filesystem-1.6.2";
+ src = fetchurl {
+ url = "https://github.com/keplerproject/luafilesystem/archive/v1_6_2.tar.gz";
+ sha256 = "1n8qdwa20ypbrny99vhkmx8q04zd2jjycdb5196xdhgvqzk10abz";
+ };
+ meta = {
+ homepage = "https://github.com/keplerproject/luafilesystem";
+ hydraPlatforms = stdenv.lib.platforms.linux;
+ maintainers = with maintainers; [ flosse ];
+ };
+};
+
+
+
+
+ Though, more complicated package should be placed in a seperate file in
+ pkgs/development/lua-modules.
+
+
+ Lua packages accept additional parameter disabled, which defines
+ the condition of disabling package from luaPackages. For example, if package has
+ disabled assigned to lua.luaversion != "5.1",
+ it will not be included in any luaPackages except lua51Packages, making it
+ only be built for lua 5.1.
+
+
+
+
+Coq
+
+ Coq libraries should be installed in
+ $(out)/lib/coq/${coq.coq-version}/user-contrib/.
+ Such directories are automatically added to the
+ $COQPATH environment variable by the hook defined
+ in the Coq derivation.
+
+
+ Some libraries require OCaml and sometimes also Camlp5. The exact
+ versions that were used to build Coq are saved in the
+ coq.ocaml and coq.camlp5
+ attributes.
+
+
+ Here is a simple package example. It is a pure Coq library, thus it
+ only depends on Coq. Its makefile has been
+ generated using coq_makefile so we only have to
+ set the $COQLIB variable at install time.
+
+
+{stdenv, fetchurl, coq}:
+stdenv.mkDerivation {
+ src = fetchurl {
+ url = http://coq.inria.fr/pylons/contribs/files/Karatsuba/v8.4/Karatsuba.tar.gz;
+ sha256 = "0ymfpv4v49k4fm63nq6gcl1hbnnxrvjjp7yzc4973n49b853c5b1";
+ };
+
+ name = "coq-karatsuba";
+
+ buildInputs = [ coq ];
+
+ installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
+}
+
+
+
+
+
diff --git a/nixos/doc/manual/administration/store-corruption.xml b/nixos/doc/manual/administration/store-corruption.xml
new file mode 100644
index 00000000000..0160cb45358
--- /dev/null
+++ b/nixos/doc/manual/administration/store-corruption.xml
@@ -0,0 +1,37 @@
+
+
+Nix Store Corruption
+
+After a system crash, it’s possible for files in the Nix store
+to become corrupted. (For instance, the Ext4 file system has the
+tendency to replace un-synced files with zero bytes.) NixOS tries
+hard to prevent this from happening: it performs a
+sync before switching to a new configuration, and
+Nix’s database is fully transactional. If corruption still occurs,
+you may be able to fix it automatically.
+
+If the corruption is in a path in the closure of the NixOS
+system configuration, you can fix it by doing
+
+
+$ nixos-rebuild switch --repair
+
+
+This will cause Nix to check every path in the closure, and if its
+cryptographic hash differs from the hash recorded in Nix’s database,
+the path is rebuilt or redownloaded.
+
+You can also scan the entire Nix store for corrupt paths:
+
+
+$ nix-store --verify --check-contents --repair
+
+
+Any corrupt paths will be redownloaded if they’re available in a
+binary cache; otherwise, they cannot be repaired.
+
+
\ No newline at end of file
diff --git a/nixos/doc/manual/administration/troubleshooting.xml b/nixos/doc/manual/administration/troubleshooting.xml
new file mode 100644
index 00000000000..351fb188331
--- /dev/null
+++ b/nixos/doc/manual/administration/troubleshooting.xml
@@ -0,0 +1,18 @@
+
+
+Troubleshooting
+
+This chapter describes solutions to common problems you might
+encounter when you manage your NixOS system.
+
+
+
+
+
+
+
+
diff --git a/nixos/doc/manual/administration/user-sessions.xml b/nixos/doc/manual/administration/user-sessions.xml
new file mode 100644
index 00000000000..05e2c1a9b29
--- /dev/null
+++ b/nixos/doc/manual/administration/user-sessions.xml
@@ -0,0 +1,53 @@
+
+
+User Sessions
+
+Systemd keeps track of all users who are logged into the system
+(e.g. on a virtual console or remotely via SSH). The command
+loginctl allows querying and manipulating user
+sessions. For instance, to list all user sessions:
+
+
+$ loginctl
+ SESSION UID USER SEAT
+ c1 500 eelco seat0
+ c3 0 root seat0
+ c4 500 alice
+
+
+This shows that two users are logged in locally, while another is
+logged in remotely. (“Seats” are essentially the combinations of
+displays and input devices attached to the system; usually, there is
+only one seat.) To get information about a session:
+
+
+$ loginctl session-status c3
+c3 - root (0)
+ Since: Tue, 2013-01-08 01:17:56 CET; 4min 42s ago
+ Leader: 2536 (login)
+ Seat: seat0; vc3
+ TTY: /dev/tty3
+ Service: login; type tty; class user
+ State: online
+ CGroup: name=systemd:/user/root/c3
+ ├─ 2536 /nix/store/10mn4xip9n7y9bxqwnsx7xwx2v2g34xn-shadow-4.1.5.1/bin/login --
+ ├─10339 -bash
+ └─10355 w3m nixos.org
+
+
+This shows that the user is logged in on virtual console 3. It also
+lists the processes belonging to this session. Since systemd keeps
+track of this, you can terminate a session in a way that ensures that
+all the session’s processes are gone:
+
+
+$ loginctl terminate-session c3
+
+
+
+
+
\ No newline at end of file
diff --git a/nixos/doc/manual/configuration.xml b/nixos/doc/manual/configuration.xml
deleted file mode 100644
index 64372f3bbf1..00000000000
--- a/nixos/doc/manual/configuration.xml
+++ /dev/null
@@ -1,1563 +0,0 @@
-
-
-Configuring NixOS
-
-This chapter describes how to configure various aspects of a
-NixOS machine through the configuration file
-/etc/nixos/configuration.nix. As described in
-, changes to this file only take
-effect after you run nixos-rebuild.
-
-
-
-
-Configuration syntax
-
-The basics
-
-The NixOS configuration file
-/etc/nixos/configuration.nix is actually a
-Nix expression, which is the Nix package
-manager’s purely functional language for describing how to build
-packages and configurations. This means you have all the expressive
-power of that language at your disposal, including the ability to
-abstract over common patterns, which is very useful when managing
-complex systems. The syntax and semantics of the Nix language are
-fully described in the Nix
-manual, but here we give a short overview of the most important
-constructs useful in NixOS configuration files.
-
-The NixOS configuration file generally looks like this:
-
-
-{ config, pkgs, ... }:
-
-{ option definitions
-}
-
-
-The first line ({ config, pkgs, ... }:) denotes
-that this is actually a function that takes at least the two arguments
- config and pkgs. (These are
-explained later.) The function returns a set of
-option definitions ({ ... }). These definitions have the
-form name =
-value, where
-name is the name of an option and
-value is its value. For example,
-
-
-{ config, pkgs, ... }:
-
-{ services.httpd.enable = true;
- services.httpd.adminAddr = "alice@example.org";
- services.httpd.documentRoot = "/webroot";
-}
-
-
-defines a configuration with three option definitions that together
-enable the Apache HTTP Server with /webroot as
-the document root.
-
-Sets can be nested, and in fact dots in option names are
-shorthand for defining a set containing another set. For instance,
- defines a set named
-services that contains a set named
-httpd, which in turn contains an option definition
-named enable with value true.
-This means that the example above can also be written as:
-
-
-{ config, pkgs, ... }:
-
-{ services = {
- httpd = {
- enable = true;
- adminAddr = "alice@example.org";
- documentRoot = "/webroot";
- };
- };
-}
-
-
-which may be more convenient if you have lots of option definitions
-that share the same prefix (such as
-services.httpd).
-
-NixOS checks your option definitions for correctness. For
-instance, if you try to define an option that doesn’t exist (that is,
-doesn’t have a corresponding option declaration),
-nixos-rebuild will give an error like:
-
-The option `services.httpd.enabl' defined in `/etc/nixos/configuration.nix' does not exist.
-
-Likewise, values in option definitions must have a correct type. For
-instance, must be a Boolean
-(true or false). Trying to give
-it a value of another type, such as a string, will cause an error:
-
-The option value `services.httpd.enable' in `/etc/nixos/configuration.nix' is not a boolean.
-
-
-
-
-Options have various types of values. The most important are:
-
-
-
- Strings
-
- Strings are enclosed in double quotes, e.g.
-
-
-networking.hostName = "dexter";
-
-
- Special characters can be escaped by prefixing them with a
- backslash (e.g. \").
-
- Multi-line strings can be enclosed in double
- single quotes, e.g.
-
-
-networking.extraHosts =
- ''
- 127.0.0.2 other-localhost
- 10.0.0.1 server
- '';
-
-
- The main difference is that preceding whitespace is
- automatically stripped from each line, and that characters like
- " and \ are not special
- (making it more convenient for including things like shell
- code).
-
-
-
-
- Booleans
-
- These can be true or
- false, e.g.
-
-
-networking.firewall.enable = true;
-networking.firewall.allowPing = false;
-
-
-
-
-
-
- Integers
-
- For example,
-
-
-boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 60;
-
-
- (Note that here the attribute name
- net.ipv4.tcp_keepalive_time is enclosed in
- quotes to prevent it from being interpreted as a set named
- net containing a set named
- ipv4, and so on. This is because it’s not a
- NixOS option but the literal name of a Linux kernel
- setting.)
-
-
-
-
- Sets
-
- Sets were introduced above. They are name/value pairs
- enclosed in braces, as in the option definition
-
-
-fileSystems."/boot" =
- { device = "/dev/sda1";
- fsType = "ext4";
- options = "rw,data=ordered,relatime";
- };
-
-
-
-
-
-
- Lists
-
- The important thing to note about lists is that list
- elements are separated by whitespace, like this:
-
-
-boot.kernelModules = [ "fuse" "kvm-intel" "coretemp" ];
-
-
- List elements can be any other type, e.g. sets:
-
-
-swapDevices = [ { device = "/dev/disk/by-label/swap"; } ];
-
-
-
-
-
-
- Packages
-
- Usually, the packages you need are already part of the Nix
- Packages collection, which is a set that can be accessed through
- the function argument pkgs. Typical uses:
-
-
-environment.systemPackages =
- [ pkgs.thunderbird
- pkgs.emacs
- ];
-
-postgresql.package = pkgs.postgresql90;
-
-
- The latter option definition changes the default PostgreSQL
- package used by NixOS’s PostgreSQL service to 9.0. For more
- information on packages, including how to add new ones, see
- .
-
-
-
-
-
-
-
-
-
-
-Abstractions
-
-If you find yourself repeating yourself over and over, it’s time
-to abstract. Take, for instance, this Apache HTTP Server configuration:
-
-
-{
- services.httpd.virtualHosts =
- [ { hostName = "example.org";
- documentRoot = "/webroot";
- adminAddr = "alice@example.org";
- enableUserDir = true;
- }
- { hostName = "example.org";
- documentRoot = "/webroot";
- adminAddr = "alice@example.org";
- enableUserDir = true;
- enableSSL = true;
- sslServerCert = "/root/ssl-example-org.crt";
- sslServerKey = "/root/ssl-example-org.key";
- }
- ];
-}
-
-
-It defines two virtual hosts with nearly identical configuration; the
-only difference is that the second one has SSL enabled. To prevent
-this duplication, we can use a let:
-
-
-let
- exampleOrgCommon =
- { hostName = "example.org";
- documentRoot = "/webroot";
- adminAddr = "alice@example.org";
- enableUserDir = true;
- };
-in
-{
- services.httpd.virtualHosts =
- [ exampleOrgCommon
- (exampleOrgCommon // {
- enableSSL = true;
- sslServerCert = "/root/ssl-example-org.crt";
- sslServerKey = "/root/ssl-example-org.key";
- })
- ];
-}
-
-
-The let exampleOrgCommon =
-... defines a variable named
-exampleOrgCommon. The //
-operator merges two attribute sets, so the configuration of the second
-virtual host is the set exampleOrgCommon extended
-with the SSL options.
-
-You can write a let wherever an expression is
-allowed. Thus, you also could have written:
-
-
-{
- services.httpd.virtualHosts =
- let exampleOrgCommon = ...; in
- [ exampleOrgCommon
- (exampleOrgCommon // { ... })
- ];
-}
-
-
-but not { let exampleOrgCommon =
-...; in ...;
-} since attributes (as opposed to attribute values) are not
-expressions.
-
-Functions provide another method of
-abstraction. For instance, suppose that we want to generate lots of
-different virtual hosts, all with identical configuration except for
-the host name. This can be done as follows:
-
-
-{
- services.httpd.virtualHosts =
- let
- makeVirtualHost = name:
- { hostName = name;
- documentRoot = "/webroot";
- adminAddr = "alice@example.org";
- };
- in
- [ (makeVirtualHost "example.org")
- (makeVirtualHost "example.com")
- (makeVirtualHost "example.gov")
- (makeVirtualHost "example.nl")
- ];
-}
-
-
-Here, makeVirtualHost is a function that takes a
-single argument name and returns the configuration
-for a virtual host. That function is then called for several names to
-produce the list of virtual host configurations.
-
-We can further improve on this by using the function
-map, which applies another function to every
-element in a list:
-
-
-{
- services.httpd.virtualHosts =
- let
- makeVirtualHost = ...;
- in map makeVirtualHost
- [ "example.org" "example.com" "example.gov" "example.nl" ];
-}
-
-
-(The function map is called a
-higher-order function because it takes another
-function as an argument.)
-
-What if you need more than one argument, for instance, if we
-want to use a different documentRoot for each
-virtual host? Then we can make makeVirtualHost a
-function that takes a set as its argument, like this:
-
-
-{
- services.httpd.virtualHosts =
- let
- makeVirtualHost = { name, root }:
- { hostName = name;
- documentRoot = root;
- adminAddr = "alice@example.org";
- };
- in map makeVirtualHost
- [ { name = "example.org"; root = "/sites/example.org"; }
- { name = "example.com"; root = "/sites/example.com"; }
- { name = "example.gov"; root = "/sites/example.gov"; }
- { name = "example.nl"; root = "/sites/example.nl"; }
- ];
-}
-
-
-But in this case (where every root is a subdirectory of
-/sites named after the virtual host), it would
-have been shorter to define makeVirtualHost as
-
-makeVirtualHost = name:
- { hostName = name;
- documentRoot = "/sites/${name}";
- adminAddr = "alice@example.org";
- };
-
-
-Here, the construct
-${...} allows the result
-of an expression to be spliced into a string.
-
-
-
-
-Modularity
-
-The NixOS configuration mechanism is modular. If your
-configuration.nix becomes too big, you can split
-it into multiple files. Likewise, if you have multiple NixOS
-configurations (e.g. for different computers) with some commonality,
-you can move the common configuration into a shared file.
-
-Modules have exactly the same syntax as
-configuration.nix. In fact,
-configuration.nix is itself a module. You can
-use other modules by including them from
-configuration.nix, e.g.:
-
-
-{ config, pkgs, ... }:
-
-{ imports = [ ./vpn.nix ./kde.nix ];
- services.httpd.enable = true;
- environment.systemPackages = [ pkgs.emacs ];
- ...
-}
-
-
-Here, we include two modules from the same directory,
-vpn.nix and kde.nix. The
-latter might look like this:
-
-
-{ config, pkgs, ... }:
-
-{ services.xserver.enable = true;
- services.xserver.displayManager.kdm.enable = true;
- services.xserver.desktopManager.kde4.enable = true;
- environment.systemPackages = [ pkgs.kde4.kscreensaver ];
-}
-
-
-Note that both configuration.nix and
-kde.nix define the option
-. When multiple modules
-define an option, NixOS will try to merge the
-definitions. In the case of
-, that’s easy: the lists of
-packages can simply be concatenated. The value in
-configuration.nix is merged last, so for
-list-type options, it will appear at the end of the merged list. If
-you want it to appear first, you can use mkBefore:
-
-
-boot.kernelModules = mkBefore [ "kvm-intel" ];
-
-
-This causes the kvm-intel kernel module to be
-loaded before any other kernel modules.
-
-For other types of options, a merge may not be possible. For
-instance, if two modules define
-,
-nixos-rebuild will give an error:
-
-
-The unique option `services.httpd.adminAddr' is defined multiple times, in `/etc/nixos/httpd.nix' and `/etc/nixos/configuration.nix'.
-
-
-When that happens, it’s possible to force one definition take
-precedence over the others:
-
-
-services.httpd.adminAddr = pkgs.lib.mkForce "bob@example.org";
-
-
-
-
-When using multiple modules, you may need to access
-configuration values defined in other modules. This is what the
-config function argument is for: it contains the
-complete, merged system configuration. That is,
-config is the result of combining the
-configurations returned by every moduleIf you’re
-wondering how it’s possible that the (indirect)
-result of a function is passed as an
-input to that same function: that’s because Nix
-is a “lazy” language — it only computes values when they are needed.
-This works as long as no individual configuration value depends on
-itself.. For example, here is a module that adds
-some packages to only if
- is set to
-true somewhere else:
-
-
-{ config, pkgs, ... }:
-
-{ environment.systemPackages =
- if config.services.xserver.enable then
- [ pkgs.firefox
- pkgs.thunderbird
- ]
- else
- [ ];
-}
-
-
-
-
-With multiple modules, it may not be obvious what the final
-value of a configuration option is. The command
- allows you to find out:
-
-
-$ nixos-option services.xserver.enable
-true
-
-$ nixos-option boot.kernelModules
-[ "tun" "ipv6" "loop" ... ]
-
-
-Interactive exploration of the configuration is possible using
-nix-repl,
-a read-eval-print loop for Nix expressions. It’s not installed by
-default; run nix-env -i nix-repl to get it. A
-typical use:
-
-
-$ nix-repl '<nixos>'
-
-nix-repl> config.networking.hostName
-"mandark"
-
-nix-repl> map (x: x.hostName) config.services.httpd.virtualHosts
-[ "example.org" "example.gov" ]
-
-
-
-
-
-
-
-Syntax summary
-
-Below is a summary of the most important syntactic constructs in
-the Nix expression language. It’s not complete. In particular, there
-are many other built-in functions. See the Nix
-manual for the rest.
-
-
-
-
-
-
-
- Example
- Description
-
-
-
-
-
- Basic values
-
-
- "Hello world"
- A string
-
-
- "${pkgs.bash}/bin/sh"
- A string containing an expression (expands to "/nix/store/hash-bash-version/bin/sh")
-
-
- true, false
- Booleans
-
-
- 123
- An integer
-
-
- ./foo.png
- A path (relative to the containing Nix expression)
-
-
-
- Compound values
-
-
- { x = 1; y = 2; }
- An set with attributes names x and y
-
-
- { foo.bar = 1; }
- A nested set, equivalent to { foo = { bar = 1; }; }
-
-
- rec { x = "bla"; y = x + "bar"; }
- A recursive set, equivalent to { x = "foo"; y = "foobar"; }
-
-
- [ "foo" "bar" ]
- A list with two elements
-
-
-
- Operators
-
-
- "foo" + "bar"
- String concatenation
-
-
- 1 + 2
- Integer addition
-
-
- "foo" == "f" + "oo"
- Equality test (evaluates to true)
-
-
- "foo" != "bar"
- Inequality test (evaluates to true)
-
-
- !true
- Boolean negation
-
-
- { x = 1; y = 2; }.x
- Attribute selection (evaluates to 1)
-
-
- { x = 1; y = 2; }.z or 3
- Attribute selection with default (evaluates to 3)
-
-
- { x = 1; y = 2; } // { z = 3; }
- Merge two sets (attributes in the right-hand set taking precedence)
-
-
-
- Control structures
-
-
- if 1 + 1 == 2 then "yes!" else "no!"
- Conditional expression
-
-
- assert 1 + 1 == 2; "yes!"
- Assertion check (evaluates to "yes!")
-
-
- let x = "foo"; y = "bar"; in x + y
- Variable definition
-
-
- with pkgs.lib; head [ 1 2 3 ]
- Add all attributes from the given set to the scope
- (evaluates to 1)
-
-
-
- Functions (lambdas)
-
-
- x: x + 1
- A function that expects an integer and returns it increased by 1
-
-
- (x: x + 1) 100
- A function call (evaluates to 101)
-
-
- let inc = x: x + 1; in inc (inc (inc 100))
- A function bound to a variable and subsequently called by name (evaluates to 103)
-
-
- { x, y }: x + y
- A function that expects a set with required attributes
- x and y and concatenates
- them
-
-
- { x, y ? "bar" }: x + y
- A function that expects a set with required attribute
- x and optional y, using
- "bar" as default value for
- y
-
-
- { x, y, ... }: x + y
- A function that expects a set with required attributes
- x and y and ignores any
- other attributes
-
-
- { x, y } @ args: x + y
- A function that expects a set with required attributes
- x and y, and binds the
- whole set to args
-
-
-
- Built-in functions
-
-
- import ./foo.nix
- Load and return Nix expression in given file
-
-
- map (x: x + x) [ 1 2 3 ]
- Apply a function to every element of a list (evaluates to [ 2 4 6 ])
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Package management
-
-This section describes how to add additional packages to your
-system. NixOS has two distinct styles of package management:
-
-
-
- Declarative, where you declare
- what packages you want in your
- configuration.nix. Every time you run
- nixos-rebuild, NixOS will ensure that you get a
- consistent set of binaries corresponding to your
- specification.
-
- Ad hoc, where you install,
- upgrade and uninstall packages via the nix-env
- command. This style allows mixing packages from different Nixpkgs
- versions. It’s the only choice for non-root
- users.
-
-
-
-
-
-The next two sections describe these two styles.
-
-
-Declarative package management
-
-With declarative package management, you specify which packages
-you want on your system by setting the option
-. For instance, adding the
-following line to configuration.nix enables the
-Mozilla Thunderbird email application:
-
-
-environment.systemPackages = [ pkgs.thunderbird ];
-
-
-The effect of this specification is that the Thunderbird package from
-Nixpkgs will be built or downloaded as part of the system when you run
-nixos-rebuild switch.
-
-You can get a list of the available packages as follows:
-
-$ nix-env -qaP '*' --description
-nixos.pkgs.firefox firefox-23.0 Mozilla Firefox - the browser, reloaded
-...
-
-
-The first column in the output is the attribute
-name, such as
-nixos.pkgs.thunderbird. (The
-nixos prefix allows distinguishing between
-different channels that you might have.)
-
-To “uninstall” a package, simply remove it from
- and run
-nixos-rebuild switch.
-
-
-Customising packages
-
-Some packages in Nixpkgs have options to enable or disable
-optional functionality or change other aspects of the package. For
-instance, the Firefox wrapper package (which provides Firefox with a
-set of plugins such as the Adobe Flash player) has an option to enable
-the Google Talk plugin. It can be set in
-configuration.nix as follows:
-
-
-nixpkgs.config.firefox.enableGoogleTalkPlugin = true;
-
-
-
-Unfortunately, Nixpkgs currently lacks a way to query
-available configuration options.
-
-Apart from high-level options, it’s possible to tweak a package
-in almost arbitrary ways, such as changing or disabling dependencies
-of a package. For instance, the Emacs package in Nixpkgs by default
-has a dependency on GTK+ 2. If you want to build it against GTK+ 3,
-you can specify that as follows:
-
-
-environment.systemPackages = [ (pkgs.emacs.override { gtk = pkgs.gtk3; }) ];
-
-
-The function override performs the call to the Nix
-function that produces Emacs, with the original arguments amended by
-the set of arguments specified by you. So here the function argument
-gtk gets the value pkgs.gtk3,
-causing Emacs to depend on GTK+ 3. (The parentheses are necessary
-because in Nix, function application binds more weakly than list
-construction, so without them,
-environment.systemPackages would be a list with two
-elements.)
-
-Even greater customisation is possible using the function
-overrideDerivation. While the
-override mechanism above overrides the arguments of
-a package function, overrideDerivation allows
-changing the result of the function. This
-permits changing any aspect of the package, such as the source code.
-For instance, if you want to override the source code of Emacs, you
-can say:
-
-
-environment.systemPackages =
- [ (pkgs.lib.overrideDerivation pkgs.emacs (attrs: {
- name = "emacs-25.0-pre";
- src = /path/to/my/emacs/tree;
- }))
- ];
-
-
-Here, overrideDerivation takes the Nix derivation
-specified by pkgs.emacs and produces a new
-derivation in which the original’s name and
-src attribute have been replaced by the given
-values. The original attributes are accessible via
-attrs.
-
-The overrides shown above are not global. They do not affect
-the original package; other packages in Nixpkgs continue to depend on
-the original rather than the customised package. This means that if
-another package in your system depends on the original package, you
-end up with two instances of the package. If you want to have
-everything depend on your customised instance, you can apply a
-global override as follows:
-
-
-nixpkgs.config.packageOverrides = pkgs:
- { emacs = pkgs.emacs.override { gtk = pkgs.gtk3; };
- };
-
-
-The effect of this definition is essentially equivalent to modifying
-the emacs attribute in the Nixpkgs source tree.
-Any package in Nixpkgs that depends on emacs will
-be passed your customised instance. (However, the value
-pkgs.emacs in
-nixpkgs.config.packageOverrides refers to the
-original rather than overridden instance, to prevent an infinite
-recursion.)
-
-
-
-Adding custom packages
-
-It’s possible that a package you need is not available in NixOS.
-In that case, you can do two things. First, you can clone the Nixpkgs
-repository, add the package to your clone, and (optionally) submit a
-patch or pull request to have it accepted into the main Nixpkgs
-repository. This is described in detail in the Nixpkgs manual.
-In short, you clone Nixpkgs:
-
-
-$ git clone git://github.com/NixOS/nixpkgs.git
-$ cd nixpkgs
-
-
-Then you write and test the package as described in the Nixpkgs
-manual. Finally, you add it to
-environment.systemPackages, e.g.
-
-
-environment.systemPackages = [ pkgs.my-package ];
-
-
-and you run nixos-rebuild, specifying your own
-Nixpkgs tree:
-
-
-$ nixos-rebuild switch -I nixpkgs=/path/to/my/nixpkgs
-
-
-
-The second possibility is to add the package outside of the
-Nixpkgs tree. For instance, here is how you specify a build of the
-GNU Hello
-package directly in configuration.nix:
-
-
-environment.systemPackages =
- let
- my-hello = with pkgs; stdenv.mkDerivation rec {
- name = "hello-2.8";
- src = fetchurl {
- url = "mirror://gnu/hello/${name}.tar.gz";
- sha256 = "0wqd8sjmxfskrflaxywc7gqw7sfawrfvdxd9skxawzfgyy0pzdz6";
- };
- };
- in
- [ my-hello ];
-
-
-Of course, you can also move the definition of
-my-hello into a separate Nix expression, e.g.
-
-environment.systemPackages = [ (import ./my-hello.nix) ];
-
-where my-hello.nix contains:
-
-with import <nixpkgs> {}; # bring all of Nixpkgs into scope
-
-stdenv.mkDerivation rec {
- name = "hello-2.8";
- src = fetchurl {
- url = "mirror://gnu/hello/${name}.tar.gz";
- sha256 = "0wqd8sjmxfskrflaxywc7gqw7sfawrfvdxd9skxawzfgyy0pzdz6";
- };
-}
-
-
-This allows testing the package easily:
-
-$ nix-build my-hello.nix
-$ ./result/bin/hello
-Hello, world!
-
-
-
-
-
-
-
-
-
-Ad hoc package management
-
-With the command nix-env, you can install and
-uninstall packages from the command line. For instance, to install
-Mozilla Thunderbird:
-
-
-$ nix-env -iA nixos.pkgs.thunderbird
-
-If you invoke this as root, the package is installed in the Nix
-profile /nix/var/nix/profiles/default and visible
-to all users of the system; otherwise, the package ends up in
-/nix/var/nix/profiles/per-user/username/profile
-and is not visible to other users. The flag
-specifies the package by its attribute name; without it, the package
-is installed by matching against its package name
-(e.g. thunderbird). The latter is slower because
-it requires matching against all available Nix packages, and is
-ambiguous if there are multiple matching packages.
-
-Packages come from the NixOS channel. You typically upgrade a
-package by updating to the latest version of the NixOS channel:
-
-$ nix-channel --update nixos
-
-and then running nix-env -i again. Other packages
-in the profile are not affected; this is the
-crucial difference with the declarative style of package management,
-where running nixos-rebuild switch causes all
-packages to be updated to their current versions in the NixOS channel.
-You can however upgrade all packages for which there is a newer
-version by doing:
-
-$ nix-env -u '*'
-
-
-
-A package can be uninstalled using the
-flag:
-
-$ nix-env -e thunderbird
-
-
-
-Finally, you can roll back an undesirable
-nix-env action:
-
-$ nix-env --rollback
-
-
-
-nix-env has many more flags. For details,
-see the
-nix-env1
-manpage or the Nix manual.
-
-
-
-
-
-
-
-
-
-User management
-
-NixOS supports both declarative and imperative styles of user
-management. In the declarative style, users are specified in
-configuration.nix. For instance, the following
-states that a user account named alice shall exist:
-
-
-users.extraUsers.alice =
- { createHome = true;
- home = "/home/alice";
- description = "Alice Foobar";
- extraGroups = [ "wheel" "networkmanager" ];
- useDefaultShell = true;
- openssh.authorizedKeys.keys = [ "ssh-dss AAAAB3Nza... alice@foobar" ];
- };
-
-
-Note that alice is a member of the
-wheel and networkmanager groups,
-which allows her to use sudo to execute commands as
-root and to configure the network, respectively.
-Also note the SSH public key that allows remote logins with the
-corresponding private key. Users created in this way do not have a
-password by default, so they cannot log in via mechanisms that require
-a password. However, you can use the passwd program
-to set a password, which is retained across invocations of
-nixos-rebuild.
-
-If you set users.mutableUsers to false, then the contents of /etc/passwd
-and /etc/group will be congruent to your NixOS configuration. For instance,
-if you remove a user from users.extraUsers and run nixos-rebuild, the user
-account will cease to exist. Also, imperative commands for managing users
-and groups, such as useradd, are no longer available.
-
-A user ID (uid) is assigned automatically. You can also specify
-a uid manually by adding
-
-
- uid = 1000;
-
-
-to the user specification.
-
-Groups can be specified similarly. The following states that a
-group named students shall exist:
-
-
-users.extraGroups.students.gid = 1000;
-
-
-As with users, the group ID (gid) is optional and will be assigned
-automatically if it’s missing.
-
-Currently declarative user management is not perfect:
-nixos-rebuild does not know how to realise certain
-configuration changes. This includes removing a user or group, and
-removing group membership from a user.
-
-In the imperative style, users and groups are managed by
-commands such as useradd,
-groupmod and so on. For instance, to create a user
-account named alice:
-
-
-$ useradd -m alice
-
-The flag causes the creation of a home directory
-for the new user, which is generally what you want. The user does not
-have an initial password and therefore cannot log in. A password can
-be set using the passwd utility:
-
-
-$ passwd alice
-Enter new UNIX password: ***
-Retype new UNIX password: ***
-
-
-A user can be deleted using userdel:
-
-
-$ userdel -r alice
-
-The flag deletes the user’s home directory.
-Accounts can be modified using usermod. Unix
-groups can be managed using groupadd,
-groupmod and groupdel.
-
-
-
-
-
-
-File systems
-
-You can define file systems using the
- configuration option. For instance, the
-following definition causes NixOS to mount the Ext4 file system on
-device /dev/disk/by-label/data onto the mount
-point /data:
-
-
-fileSystems."/data" =
- { device = "/dev/disk/by-label/data";
- fsType = "ext4";
- };
-
-
-Mount points are created automatically if they don’t already exist.
-For , it’s best to use the topology-independent
-device aliases in /dev/disk/by-label and
-/dev/disk/by-uuid, as these don’t change if the
-topology changes (e.g. if a disk is moved to another IDE
-controller).
-
-You can usually omit the file system type
-(), since mount can usually
-detect the type and load the necessary kernel module automatically.
-However, if the file system is needed at early boot (in the initial
-ramdisk) and is not ext2, ext3
-or ext4, then it’s best to specify
- to ensure that the kernel module is
-available.
-
-LUKS-encrypted file systems
-
-NixOS supports file systems that are encrypted using
-LUKS (Linux Unified Key Setup). For example,
-here is how you create an encrypted Ext4 file system on the device
-/dev/sda2:
-
-
-$ cryptsetup luksFormat /dev/sda2
-
-WARNING!
-========
-This will overwrite data on /dev/sda2 irrevocably.
-
-Are you sure? (Type uppercase yes): YES
-Enter LUKS passphrase: ***
-Verify passphrase: ***
-
-$ cryptsetup luksOpen /dev/sda2 crypted
-Enter passphrase for /dev/sda2: ***
-
-$ mkfs.ext4 /dev/mapper/crypted
-
-
-To ensure that this file system is automatically mounted at boot time
-as /, add the following to
-configuration.nix:
-
-
-boot.initrd.luks.devices = [ { device = "/dev/sda2"; name = "crypted"; } ];
-fileSystems."/".device = "/dev/mapper/crypted";
-
-
-
-
-
-
-
-
-
-
-
-X Window System
-
-The X Window System (X11) provides the basis of NixOS’ graphical
-user interface. It can be enabled as follows:
-
-services.xserver.enable = true;
-
-The X server will automatically detect and use the appropriate video
-driver from a set of X.org drivers (such as vesa
-and intel). You can also specify a driver
-manually, e.g.
-
-services.xserver.videoDrivers = [ "r128" ];
-
-to enable X.org’s xf86-video-r128 driver.
-
-You also need to enable at least one desktop or window manager.
-Otherwise, you can only log into a plain undecorated
-xterm window. Thus you should pick one or more of
-the following lines:
-
-services.xserver.desktopManager.kde4.enable = true;
-services.xserver.desktopManager.xfce.enable = true;
-services.xserver.windowManager.xmonad.enable = true;
-services.xserver.windowManager.twm.enable = true;
-services.xserver.windowManager.icewm.enable = true;
-
-
-
-NixOS’s default display manager (the
-program that provides a graphical login prompt and manages the X
-server) is SLiM. You can select KDE’s kdm instead:
-
-services.xserver.displayManager.kdm.enable = true;
-
-
-
-The X server is started automatically at boot time. If you
-don’t want this to happen, you can set:
-
-services.xserver.autorun = false;
-
-The X server can then be started manually:
-
-$ systemctl start display-manager.service
-
-
-
-
-NVIDIA graphics cards
-
-NVIDIA provides a proprietary driver for its graphics cards that
-has better 3D performance than the X.org drivers. It is not enabled
-by default because it’s not free software. You can enable it as follows:
-
-services.xserver.videoDrivers = [ "nvidia" ];
-
-You may need to reboot after enabling this driver to prevent a clash
-with other kernel modules.
-
-On 64-bit systems, if you want full acceleration for 32-bit
-programs such as Wine, you should also set the following:
-
-services.xserver.driSupport32Bit = true;
-
-
-
-
-
-
-Touchpads
-
-Support for Synaptics touchpads (found in many laptops such as
-the Dell Latitude series) can be enabled as follows:
-
-services.xserver.synaptics.enable = true;
-
-The driver has many options (see ). For
-instance, the following enables two-finger scrolling:
-
-services.xserver.synaptics.twoFingerScroll = true;
-
-
-
-
-
-
-
-
-
-
-
-Networking
-
-NetworkManager
-
-To facilitate network configuration, some desktop environments
-use NetworkManager. You can enable NetworkManager by setting:
-
-
-services.networkmanager.enable = true;
-
-
-Some desktop managers (e.g., GNOME) enable NetworkManager
-automatically for you.
-
-All users that should have permission to change network settings
-must belong to the networkmanager
group.
-
-services.networkmanager
and
-services.wireless
can not be enabled at the same time:
-you can still connect to the wireless networks using
-NetworkManager.
-
-
-
-Secure shell access
-
-Secure shell (SSH) access to your machine can be enabled by
-setting:
-
-
-services.openssh.enable = true;
-
-
-By default, root logins using a password are disallowed. They can be
-disabled entirely by setting
-services.openssh.permitRootLogin to
-"no".
-
-You can declaratively specify authorised RSA/DSA public keys for
-a user as follows:
-
-
-
-users.extraUsers.alice.openssh.authorizedKeys.keys =
- [ "ssh-dss AAAAB3NzaC1kc3MAAACBAPIkGWVEt4..." ];
-
-
-
-
-
-
-
-IPv4 configuration
-
-By default, NixOS uses DHCP (specifically,
-dhcpcd) to automatically configure network
-interfaces. However, you can configure an interface manually as
-follows:
-
-
-networking.interfaces.eth0 = { ipAddress = "192.168.1.2"; prefixLength = 24; };
-
-
-(The network prefix can also be specified using the option
-subnetMask,
-e.g. "255.255.255.0", but this is deprecated.)
-Typically you’ll also want to set a default gateway and set of name
-servers:
-
-
-networking.defaultGateway = "192.168.1.1";
-networking.nameservers = [ "8.8.8.8" ];
-
-
-
-
-Statically configured interfaces are set up by the systemd
-service
-interface-name-cfg.service.
-The default gateway and name server configuration is performed by
-network-setup.service.
-
-The host name is set using :
-
-
-networking.hostName = "cartman";
-
-
-The default host name is nixos. Set it to the
-empty string ("") to allow the DHCP server to
-provide the host name.
-
-
-
-
-IPv6 configuration
-
-IPv6 is enabled by default. Stateless address autoconfiguration
-is used to automatically assign IPv6 addresses to all interfaces. You
-can disable IPv6 support globally by setting:
-
-
-networking.enableIPv6 = false;
-
-
-
-
-
-
-
-Firewall
-
-NixOS has a simple stateful firewall that blocks incoming
-connections and other unexpected packets. The firewall applies to
-both IPv4 and IPv6 traffic. It is enabled by default. It can be
-disabled as follows:
-
-
-networking.firewall.enable = false;
-
-
-If the firewall is enabled, you can open specific TCP ports to the
-outside world:
-
-
-networking.firewall.allowedTCPPorts = [ 80 443 ];
-
-
-Note that TCP port 22 (ssh) is opened automatically if the SSH daemon
-is enabled (). UDP
-ports can be opened through
-. Also of
-interest is
-
-
-networking.firewall.allowPing = true;
-
-
-to allow the machine to respond to ping requests. (ICMPv6 pings are
-always allowed.)
-
-
-
-
-Wireless networks
-
-For a desktop installation using NetworkManager (e.g., GNOME),
-you just have to make sure the user is in the
-networkmanager
group and you can skip the rest of this
-section on wireless networks.
-
-
-NixOS will start wpa_supplicant for you if you enable this setting:
-
-
-networking.wireless.enable = true;
-
-
-NixOS currently does not generate wpa_supplicant's
-configuration file, /etc/wpa_supplicant.conf. You should edit this file
-yourself to define wireless networks, WPA keys and so on (see
-wpa_supplicant.conf(5)).
-
-
-
-If you are using WPA2 the wpa_passphrase tool might be useful
-to generate the wpa_supplicant.conf.
-
-
-$ wpa_passphrase ESSID PSK > /etc/wpa_supplicant.conf
-
-After you have edited the wpa_supplicant.conf,
-you need to restart the wpa_supplicant service.
-
-
-$ systemctl restart wpa_supplicant.service
-
-
-
-
-
-
-Ad-hoc configuration
-
-You can use to specify
-shell commands to be run at the end of
-network-setup.service. This is useful for doing
-network configuration not covered by the existing NixOS modules. For
-instance, to statically configure an IPv6 address:
-
-
-networking.localCommands =
- ''
- ip -6 addr add 2001:610:685:1::1/64 dev eth0
- '';
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Linux kernel
-
-You can override the Linux kernel and associated packages using
-the option . For instance, this
-selects the Linux 3.10 kernel:
-
-boot.kernelPackages = pkgs.linuxPackages_3_10;
-
-Note that this not only replaces the kernel, but also packages that
-are specific to the kernel version, such as the NVIDIA video drivers.
-This ensures that driver packages are consistent with the
-kernel.
-
-The default Linux kernel configuration should be fine for most users. You can see the configuration of your current kernel with the following command:
-
-cat /proc/config.gz | gunzip
-
-If you want to change the kernel configuration, you can use the
- feature (see ). For instance, to enable
-support for the kernel debugger KGDB:
-
-
-nixpkgs.config.packageOverrides = pkgs:
- { linux_3_4 = pkgs.linux_3_4.override {
- extraConfig =
- ''
- KGDB y
- '';
- };
- };
-
-
-extraConfig takes a list of Linux kernel
-configuration options, one per line. The name of the option should
-not include the prefix CONFIG_. The option value
-is typically y, n or
-m (to build something as a kernel module).
-
-Kernel modules for hardware devices are generally loaded
-automatically by udev. You can force a module to
-be loaded via , e.g.
-
-boot.kernelModules = [ "fuse" "kvm-intel" "coretemp" ];
-
-If the module is required early during the boot (e.g. to mount the
-root file system), you can use
-:
-
-boot.initrd.extraKernelModules = [ "cifs" ];
-
-This causes the specified modules and their dependencies to be added
-to the initial ramdark.
-
-Kernel runtime parameters can be set through
-, e.g.
-
-boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 120;
-
-sets the kernel’s TCP keepalive time to 120 seconds. To see the
-available parameters, run sysctl -a.
-
-
-
-
-
-
-
-
diff --git a/nixos/doc/manual/configuration/abstractions.xml b/nixos/doc/manual/configuration/abstractions.xml
new file mode 100644
index 00000000000..cbd54bca62f
--- /dev/null
+++ b/nixos/doc/manual/configuration/abstractions.xml
@@ -0,0 +1,166 @@
+
+
+Abstractions
+
+If you find yourself repeating yourself over and over, it’s time
+to abstract. Take, for instance, this Apache HTTP Server configuration:
+
+
+{
+ services.httpd.virtualHosts =
+ [ { hostName = "example.org";
+ documentRoot = "/webroot";
+ adminAddr = "alice@example.org";
+ enableUserDir = true;
+ }
+ { hostName = "example.org";
+ documentRoot = "/webroot";
+ adminAddr = "alice@example.org";
+ enableUserDir = true;
+ enableSSL = true;
+ sslServerCert = "/root/ssl-example-org.crt";
+ sslServerKey = "/root/ssl-example-org.key";
+ }
+ ];
+}
+
+
+It defines two virtual hosts with nearly identical configuration; the
+only difference is that the second one has SSL enabled. To prevent
+this duplication, we can use a let:
+
+
+let
+ exampleOrgCommon =
+ { hostName = "example.org";
+ documentRoot = "/webroot";
+ adminAddr = "alice@example.org";
+ enableUserDir = true;
+ };
+in
+{
+ services.httpd.virtualHosts =
+ [ exampleOrgCommon
+ (exampleOrgCommon // {
+ enableSSL = true;
+ sslServerCert = "/root/ssl-example-org.crt";
+ sslServerKey = "/root/ssl-example-org.key";
+ })
+ ];
+}
+
+
+The let exampleOrgCommon =
+... defines a variable named
+exampleOrgCommon. The //
+operator merges two attribute sets, so the configuration of the second
+virtual host is the set exampleOrgCommon extended
+with the SSL options.
+
+You can write a let wherever an expression is
+allowed. Thus, you also could have written:
+
+
+{
+ services.httpd.virtualHosts =
+ let exampleOrgCommon = ...; in
+ [ exampleOrgCommon
+ (exampleOrgCommon // { ... })
+ ];
+}
+
+
+but not { let exampleOrgCommon =
+...; in ...;
+} since attributes (as opposed to attribute values) are not
+expressions.
+
+Functions provide another method of
+abstraction. For instance, suppose that we want to generate lots of
+different virtual hosts, all with identical configuration except for
+the host name. This can be done as follows:
+
+
+{
+ services.httpd.virtualHosts =
+ let
+ makeVirtualHost = name:
+ { hostName = name;
+ documentRoot = "/webroot";
+ adminAddr = "alice@example.org";
+ };
+ in
+ [ (makeVirtualHost "example.org")
+ (makeVirtualHost "example.com")
+ (makeVirtualHost "example.gov")
+ (makeVirtualHost "example.nl")
+ ];
+}
+
+
+Here, makeVirtualHost is a function that takes a
+single argument name and returns the configuration
+for a virtual host. That function is then called for several names to
+produce the list of virtual host configurations.
+
+We can further improve on this by using the function
+map, which applies another function to every
+element in a list:
+
+
+{
+ services.httpd.virtualHosts =
+ let
+ makeVirtualHost = ...;
+ in map makeVirtualHost
+ [ "example.org" "example.com" "example.gov" "example.nl" ];
+}
+
+
+(The function map is called a
+higher-order function because it takes another
+function as an argument.)
+
+What if you need more than one argument, for instance, if we
+want to use a different documentRoot for each
+virtual host? Then we can make makeVirtualHost a
+function that takes a set as its argument, like this:
+
+
+{
+ services.httpd.virtualHosts =
+ let
+ makeVirtualHost = { name, root }:
+ { hostName = name;
+ documentRoot = root;
+ adminAddr = "alice@example.org";
+ };
+ in map makeVirtualHost
+ [ { name = "example.org"; root = "/sites/example.org"; }
+ { name = "example.com"; root = "/sites/example.com"; }
+ { name = "example.gov"; root = "/sites/example.gov"; }
+ { name = "example.nl"; root = "/sites/example.nl"; }
+ ];
+}
+
+
+But in this case (where every root is a subdirectory of
+/sites named after the virtual host), it would
+have been shorter to define makeVirtualHost as
+
+makeVirtualHost = name:
+ { hostName = name;
+ documentRoot = "/sites/${name}";
+ adminAddr = "alice@example.org";
+ };
+
+
+Here, the construct
+${...} allows the result
+of an expression to be spliced into a string.
+
+
diff --git a/nixos/doc/manual/configuration/ad-hoc-network-config.xml b/nixos/doc/manual/configuration/ad-hoc-network-config.xml
new file mode 100644
index 00000000000..26a572ba1fb
--- /dev/null
+++ b/nixos/doc/manual/configuration/ad-hoc-network-config.xml
@@ -0,0 +1,24 @@
+
+
+Ad-Hoc Configuration
+
+You can use to specify
+shell commands to be run at the end of
+network-setup.service. This is useful for doing
+network configuration not covered by the existing NixOS modules. For
+instance, to statically configure an IPv6 address:
+
+
+networking.localCommands =
+ ''
+ ip -6 addr add 2001:610:685:1::1/64 dev eth0
+ '';
+
+
+
+
+
diff --git a/nixos/doc/manual/configuration/ad-hoc-packages.xml b/nixos/doc/manual/configuration/ad-hoc-packages.xml
new file mode 100644
index 00000000000..e237e20c4ff
--- /dev/null
+++ b/nixos/doc/manual/configuration/ad-hoc-packages.xml
@@ -0,0 +1,63 @@
+
+
+Ad-Hoc Package Management
+
+With the command nix-env, you can install and
+uninstall packages from the command line. For instance, to install
+Mozilla Thunderbird:
+
+
+$ nix-env -iA nixos.pkgs.thunderbird
+
+If you invoke this as root, the package is installed in the Nix
+profile /nix/var/nix/profiles/default and visible
+to all users of the system; otherwise, the package ends up in
+/nix/var/nix/profiles/per-user/username/profile
+and is not visible to other users. The flag
+specifies the package by its attribute name; without it, the package
+is installed by matching against its package name
+(e.g. thunderbird). The latter is slower because
+it requires matching against all available Nix packages, and is
+ambiguous if there are multiple matching packages.
+
+Packages come from the NixOS channel. You typically upgrade a
+package by updating to the latest version of the NixOS channel:
+
+$ nix-channel --update nixos
+
+and then running nix-env -i again. Other packages
+in the profile are not affected; this is the
+crucial difference with the declarative style of package management,
+where running nixos-rebuild switch causes all
+packages to be updated to their current versions in the NixOS channel.
+You can however upgrade all packages for which there is a newer
+version by doing:
+
+$ nix-env -u '*'
+
+
+
+A package can be uninstalled using the
+flag:
+
+$ nix-env -e thunderbird
+
+
+
+Finally, you can roll back an undesirable
+nix-env action:
+
+$ nix-env --rollback
+
+
+
+nix-env has many more flags. For details,
+see the
+nix-env1
+manpage or the Nix manual.
+
+
diff --git a/nixos/doc/manual/configuration/adding-custom-packages.xml b/nixos/doc/manual/configuration/adding-custom-packages.xml
new file mode 100644
index 00000000000..c1789fcbc04
--- /dev/null
+++ b/nixos/doc/manual/configuration/adding-custom-packages.xml
@@ -0,0 +1,84 @@
+
+
+Adding Custom Packages
+
+It’s possible that a package you need is not available in NixOS.
+In that case, you can do two things. First, you can clone the Nixpkgs
+repository, add the package to your clone, and (optionally) submit a
+patch or pull request to have it accepted into the main Nixpkgs
+repository. This is described in detail in the Nixpkgs manual.
+In short, you clone Nixpkgs:
+
+
+$ git clone git://github.com/NixOS/nixpkgs.git
+$ cd nixpkgs
+
+
+Then you write and test the package as described in the Nixpkgs
+manual. Finally, you add it to
+environment.systemPackages, e.g.
+
+
+environment.systemPackages = [ pkgs.my-package ];
+
+
+and you run nixos-rebuild, specifying your own
+Nixpkgs tree:
+
+
+$ nixos-rebuild switch -I nixpkgs=/path/to/my/nixpkgs
+
+
+
+The second possibility is to add the package outside of the
+Nixpkgs tree. For instance, here is how you specify a build of the
+GNU Hello
+package directly in configuration.nix:
+
+
+environment.systemPackages =
+ let
+ my-hello = with pkgs; stdenv.mkDerivation rec {
+ name = "hello-2.8";
+ src = fetchurl {
+ url = "mirror://gnu/hello/${name}.tar.gz";
+ sha256 = "0wqd8sjmxfskrflaxywc7gqw7sfawrfvdxd9skxawzfgyy0pzdz6";
+ };
+ };
+ in
+ [ my-hello ];
+
+
+Of course, you can also move the definition of
+my-hello into a separate Nix expression, e.g.
+
+environment.systemPackages = [ (import ./my-hello.nix) ];
+
+where my-hello.nix contains:
+
+with import <nixpkgs> {}; # bring all of Nixpkgs into scope
+
+stdenv.mkDerivation rec {
+ name = "hello-2.8";
+ src = fetchurl {
+ url = "mirror://gnu/hello/${name}.tar.gz";
+ sha256 = "0wqd8sjmxfskrflaxywc7gqw7sfawrfvdxd9skxawzfgyy0pzdz6";
+ };
+}
+
+
+This allows testing the package easily:
+
+$ nix-build my-hello.nix
+$ ./result/bin/hello
+Hello, world!
+
+
+
+
+
diff --git a/nixos/doc/manual/configuration/config-file.xml b/nixos/doc/manual/configuration/config-file.xml
new file mode 100644
index 00000000000..2a58ff25941
--- /dev/null
+++ b/nixos/doc/manual/configuration/config-file.xml
@@ -0,0 +1,213 @@
+
+
+NixOS Configuration File
+
+The NixOS configuration file generally looks like this:
+
+
+{ config, pkgs, ... }:
+
+{ option definitions
+}
+
+
+The first line ({ config, pkgs, ... }:) denotes
+that this is actually a function that takes at least the two arguments
+ config and pkgs. (These are
+explained later.) The function returns a set of
+option definitions ({ ... }). These definitions have the
+form name =
+value, where
+name is the name of an option and
+value is its value. For example,
+
+
+{ config, pkgs, ... }:
+
+{ services.httpd.enable = true;
+ services.httpd.adminAddr = "alice@example.org";
+ services.httpd.documentRoot = "/webroot";
+}
+
+
+defines a configuration with three option definitions that together
+enable the Apache HTTP Server with /webroot as
+the document root.
+
+Sets can be nested, and in fact dots in option names are
+shorthand for defining a set containing another set. For instance,
+ defines a set named
+services that contains a set named
+httpd, which in turn contains an option definition
+named enable with value true.
+This means that the example above can also be written as:
+
+
+{ config, pkgs, ... }:
+
+{ services = {
+ httpd = {
+ enable = true;
+ adminAddr = "alice@example.org";
+ documentRoot = "/webroot";
+ };
+ };
+}
+
+
+which may be more convenient if you have lots of option definitions
+that share the same prefix (such as
+services.httpd).
+
+NixOS checks your option definitions for correctness. For
+instance, if you try to define an option that doesn’t exist (that is,
+doesn’t have a corresponding option declaration),
+nixos-rebuild will give an error like:
+
+The option `services.httpd.enabl' defined in `/etc/nixos/configuration.nix' does not exist.
+
+Likewise, values in option definitions must have a correct type. For
+instance, must be a Boolean
+(true or false). Trying to give
+it a value of another type, such as a string, will cause an error:
+
+The option value `services.httpd.enable' in `/etc/nixos/configuration.nix' is not a boolean.
+
+
+
+
+Options have various types of values. The most important are:
+
+
+
+ Strings
+
+ Strings are enclosed in double quotes, e.g.
+
+
+networking.hostName = "dexter";
+
+
+ Special characters can be escaped by prefixing them with a
+ backslash (e.g. \").
+
+ Multi-line strings can be enclosed in double
+ single quotes, e.g.
+
+
+networking.extraHosts =
+ ''
+ 127.0.0.2 other-localhost
+ 10.0.0.1 server
+ '';
+
+
+ The main difference is that preceding whitespace is
+ automatically stripped from each line, and that characters like
+ " and \ are not special
+ (making it more convenient for including things like shell
+ code).
+
+
+
+
+ Booleans
+
+ These can be true or
+ false, e.g.
+
+
+networking.firewall.enable = true;
+networking.firewall.allowPing = false;
+
+
+
+
+
+
+ Integers
+
+ For example,
+
+
+boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 60;
+
+
+ (Note that here the attribute name
+ net.ipv4.tcp_keepalive_time is enclosed in
+ quotes to prevent it from being interpreted as a set named
+ net containing a set named
+ ipv4, and so on. This is because it’s not a
+ NixOS option but the literal name of a Linux kernel
+ setting.)
+
+
+
+
+ Sets
+
+ Sets were introduced above. They are name/value pairs
+ enclosed in braces, as in the option definition
+
+
+fileSystems."/boot" =
+ { device = "/dev/sda1";
+ fsType = "ext4";
+ options = "rw,data=ordered,relatime";
+ };
+
+
+
+
+
+
+ Lists
+
+ The important thing to note about lists is that list
+ elements are separated by whitespace, like this:
+
+
+boot.kernelModules = [ "fuse" "kvm-intel" "coretemp" ];
+
+
+ List elements can be any other type, e.g. sets:
+
+
+swapDevices = [ { device = "/dev/disk/by-label/swap"; } ];
+
+
+
+
+
+
+ Packages
+
+ Usually, the packages you need are already part of the Nix
+ Packages collection, which is a set that can be accessed through
+ the function argument pkgs. Typical uses:
+
+
+environment.systemPackages =
+ [ pkgs.thunderbird
+ pkgs.emacs
+ ];
+
+postgresql.package = pkgs.postgresql90;
+
+
+ The latter option definition changes the default PostgreSQL
+ package used by NixOS’s PostgreSQL service to 9.0. For more
+ information on packages, including how to add new ones, see
+ .
+
+
+
+
+
+
+
+
diff --git a/nixos/doc/manual/configuration/config-syntax.xml b/nixos/doc/manual/configuration/config-syntax.xml
new file mode 100644
index 00000000000..87847f8451e
--- /dev/null
+++ b/nixos/doc/manual/configuration/config-syntax.xml
@@ -0,0 +1,27 @@
+
+
+Configuration Syntax
+
+The NixOS configuration file
+/etc/nixos/configuration.nix is actually a
+Nix expression, which is the Nix package
+manager’s purely functional language for describing how to build
+packages and configurations. This means you have all the expressive
+power of that language at your disposal, including the ability to
+abstract over common patterns, which is very useful when managing
+complex systems. The syntax and semantics of the Nix language are
+fully described in the Nix
+manual, but here we give a short overview of the most important
+constructs useful in NixOS configuration files.
+
+
+
+
+
+
+
diff --git a/nixos/doc/manual/configuration/configuration.xml b/nixos/doc/manual/configuration/configuration.xml
new file mode 100644
index 00000000000..8fde0dc7e61
--- /dev/null
+++ b/nixos/doc/manual/configuration/configuration.xml
@@ -0,0 +1,32 @@
+
+
+Configuration
+
+
+
+This chapter describes how to configure various aspects of a
+NixOS machine through the configuration file
+/etc/nixos/configuration.nix. As described in
+, changes to this file only take
+effect after you run nixos-rebuild.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/nixos/doc/manual/configuration/customizing-packages.xml b/nixos/doc/manual/configuration/customizing-packages.xml
new file mode 100644
index 00000000000..6ee7a95dc6f
--- /dev/null
+++ b/nixos/doc/manual/configuration/customizing-packages.xml
@@ -0,0 +1,92 @@
+
+
+Customising Packages
+
+Some packages in Nixpkgs have options to enable or disable
+optional functionality or change other aspects of the package. For
+instance, the Firefox wrapper package (which provides Firefox with a
+set of plugins such as the Adobe Flash player) has an option to enable
+the Google Talk plugin. It can be set in
+configuration.nix as follows:
+
+
+nixpkgs.config.firefox.enableGoogleTalkPlugin = true;
+
+
+
+Unfortunately, Nixpkgs currently lacks a way to query
+available configuration options.
+
+Apart from high-level options, it’s possible to tweak a package
+in almost arbitrary ways, such as changing or disabling dependencies
+of a package. For instance, the Emacs package in Nixpkgs by default
+has a dependency on GTK+ 2. If you want to build it against GTK+ 3,
+you can specify that as follows:
+
+
+environment.systemPackages = [ (pkgs.emacs.override { gtk = pkgs.gtk3; }) ];
+
+
+The function override performs the call to the Nix
+function that produces Emacs, with the original arguments amended by
+the set of arguments specified by you. So here the function argument
+gtk gets the value pkgs.gtk3,
+causing Emacs to depend on GTK+ 3. (The parentheses are necessary
+because in Nix, function application binds more weakly than list
+construction, so without them,
+environment.systemPackages would be a list with two
+elements.)
+
+Even greater customisation is possible using the function
+overrideDerivation. While the
+override mechanism above overrides the arguments of
+a package function, overrideDerivation allows
+changing the result of the function. This
+permits changing any aspect of the package, such as the source code.
+For instance, if you want to override the source code of Emacs, you
+can say:
+
+
+environment.systemPackages =
+ [ (pkgs.lib.overrideDerivation pkgs.emacs (attrs: {
+ name = "emacs-25.0-pre";
+ src = /path/to/my/emacs/tree;
+ }))
+ ];
+
+
+Here, overrideDerivation takes the Nix derivation
+specified by pkgs.emacs and produces a new
+derivation in which the original’s name and
+src attribute have been replaced by the given
+values. The original attributes are accessible via
+attrs.
+
+The overrides shown above are not global. They do not affect
+the original package; other packages in Nixpkgs continue to depend on
+the original rather than the customised package. This means that if
+another package in your system depends on the original package, you
+end up with two instances of the package. If you want to have
+everything depend on your customised instance, you can apply a
+global override as follows:
+
+
+nixpkgs.config.packageOverrides = pkgs:
+ { emacs = pkgs.emacs.override { gtk = pkgs.gtk3; };
+ };
+
+
+The effect of this definition is essentially equivalent to modifying
+the emacs attribute in the Nixpkgs source tree.
+Any package in Nixpkgs that depends on emacs will
+be passed your customised instance. (However, the value
+pkgs.emacs in
+nixpkgs.config.packageOverrides refers to the
+original rather than overridden instance, to prevent an infinite
+recursion.)
+
+
diff --git a/nixos/doc/manual/configuration/declarative-packages.xml b/nixos/doc/manual/configuration/declarative-packages.xml
new file mode 100644
index 00000000000..6de38b452e2
--- /dev/null
+++ b/nixos/doc/manual/configuration/declarative-packages.xml
@@ -0,0 +1,43 @@
+
+
+Declarative Package Management
+
+With declarative package management, you specify which packages
+you want on your system by setting the option
+. For instance, adding the
+following line to configuration.nix enables the
+Mozilla Thunderbird email application:
+
+
+environment.systemPackages = [ pkgs.thunderbird ];
+
+
+The effect of this specification is that the Thunderbird package from
+Nixpkgs will be built or downloaded as part of the system when you run
+nixos-rebuild switch.
+
+You can get a list of the available packages as follows:
+
+$ nix-env -qaP '*' --description
+nixos.pkgs.firefox firefox-23.0 Mozilla Firefox - the browser, reloaded
+...
+
+
+The first column in the output is the attribute
+name, such as
+nixos.pkgs.thunderbird. (The
+nixos prefix allows distinguishing between
+different channels that you might have.)
+
+To “uninstall” a package, simply remove it from
+ and run
+nixos-rebuild switch.
+
+
+
+
+
diff --git a/nixos/doc/manual/configuration/file-systems.xml b/nixos/doc/manual/configuration/file-systems.xml
new file mode 100644
index 00000000000..d1b324af3f1
--- /dev/null
+++ b/nixos/doc/manual/configuration/file-systems.xml
@@ -0,0 +1,40 @@
+
+
+File Systems
+
+You can define file systems using the
+ configuration option. For instance, the
+following definition causes NixOS to mount the Ext4 file system on
+device /dev/disk/by-label/data onto the mount
+point /data:
+
+
+fileSystems."/data" =
+ { device = "/dev/disk/by-label/data";
+ fsType = "ext4";
+ };
+
+
+Mount points are created automatically if they don’t already exist.
+For , it’s best to use the topology-independent
+device aliases in /dev/disk/by-label and
+/dev/disk/by-uuid, as these don’t change if the
+topology changes (e.g. if a disk is moved to another IDE
+controller).
+
+You can usually omit the file system type
+(), since mount can usually
+detect the type and load the necessary kernel module automatically.
+However, if the file system is needed at early boot (in the initial
+ramdisk) and is not ext2, ext3
+or ext4, then it’s best to specify
+ to ensure that the kernel module is
+available.
+
+
+
+
diff --git a/nixos/doc/manual/configuration/firewall.xml b/nixos/doc/manual/configuration/firewall.xml
new file mode 100644
index 00000000000..87406c28c2f
--- /dev/null
+++ b/nixos/doc/manual/configuration/firewall.xml
@@ -0,0 +1,38 @@
+
+
+Firewall
+
+NixOS has a simple stateful firewall that blocks incoming
+connections and other unexpected packets. The firewall applies to
+both IPv4 and IPv6 traffic. It is enabled by default. It can be
+disabled as follows:
+
+
+networking.firewall.enable = false;
+
+
+If the firewall is enabled, you can open specific TCP ports to the
+outside world:
+
+
+networking.firewall.allowedTCPPorts = [ 80 443 ];
+
+
+Note that TCP port 22 (ssh) is opened automatically if the SSH daemon
+is enabled (). UDP
+ports can be opened through
+. Also of
+interest is
+
+
+networking.firewall.allowPing = true;
+
+
+to allow the machine to respond to ping requests. (ICMPv6 pings are
+always allowed.)
+
+
diff --git a/nixos/doc/manual/configuration/ipv4-config.xml b/nixos/doc/manual/configuration/ipv4-config.xml
new file mode 100644
index 00000000000..053501b1736
--- /dev/null
+++ b/nixos/doc/manual/configuration/ipv4-config.xml
@@ -0,0 +1,44 @@
+
+
+IPv4 Configuration
+
+By default, NixOS uses DHCP (specifically,
+dhcpcd) to automatically configure network
+interfaces. However, you can configure an interface manually as
+follows:
+
+
+networking.interfaces.eth0.ip4 = [ { address = "192.168.1.2"; prefixLength = 24; } ];
+
+
+Typically you’ll also want to set a default gateway and set of name
+servers:
+
+
+networking.defaultGateway = "192.168.1.1";
+networking.nameservers = [ "8.8.8.8" ];
+
+
+
+
+Statically configured interfaces are set up by the systemd
+service
+interface-name-cfg.service.
+The default gateway and name server configuration is performed by
+network-setup.service.
+
+The host name is set using :
+
+
+networking.hostName = "cartman";
+
+
+The default host name is nixos. Set it to the
+empty string ("") to allow the DHCP server to
+provide the host name.
+
+
diff --git a/nixos/doc/manual/configuration/ipv6-config.xml b/nixos/doc/manual/configuration/ipv6-config.xml
new file mode 100644
index 00000000000..592bf20e545
--- /dev/null
+++ b/nixos/doc/manual/configuration/ipv6-config.xml
@@ -0,0 +1,19 @@
+
+
+IPv6 Configuration
+
+IPv6 is enabled by default. Stateless address autoconfiguration
+is used to automatically assign IPv6 addresses to all interfaces. You
+can disable IPv6 support globally by setting:
+
+
+networking.enableIPv6 = false;
+
+
+
+
+
diff --git a/nixos/doc/manual/configuration/linux-kernel.xml b/nixos/doc/manual/configuration/linux-kernel.xml
new file mode 100644
index 00000000000..8fe2f5255df
--- /dev/null
+++ b/nixos/doc/manual/configuration/linux-kernel.xml
@@ -0,0 +1,69 @@
+
+
+Linux Kernel
+
+You can override the Linux kernel and associated packages using
+the option . For instance, this
+selects the Linux 3.10 kernel:
+
+boot.kernelPackages = pkgs.linuxPackages_3_10;
+
+Note that this not only replaces the kernel, but also packages that
+are specific to the kernel version, such as the NVIDIA video drivers.
+This ensures that driver packages are consistent with the
+kernel.
+
+The default Linux kernel configuration should be fine for most users. You can see the configuration of your current kernel with the following command:
+
+cat /proc/config.gz | gunzip
+
+If you want to change the kernel configuration, you can use the
+ feature (see ). For instance, to enable
+support for the kernel debugger KGDB:
+
+
+nixpkgs.config.packageOverrides = pkgs:
+ { linux_3_4 = pkgs.linux_3_4.override {
+ extraConfig =
+ ''
+ KGDB y
+ '';
+ };
+ };
+
+
+extraConfig takes a list of Linux kernel
+configuration options, one per line. The name of the option should
+not include the prefix CONFIG_. The option value
+is typically y, n or
+m (to build something as a kernel module).
+
+Kernel modules for hardware devices are generally loaded
+automatically by udev. You can force a module to
+be loaded via , e.g.
+
+boot.kernelModules = [ "fuse" "kvm-intel" "coretemp" ];
+
+If the module is required early during the boot (e.g. to mount the
+root file system), you can use
+:
+
+boot.initrd.extraKernelModules = [ "cifs" ];
+
+This causes the specified modules and their dependencies to be added
+to the initial ramdark.
+
+Kernel runtime parameters can be set through
+, e.g.
+
+boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 120;
+
+sets the kernel’s TCP keepalive time to 120 seconds. To see the
+available parameters, run sysctl -a.
+
+
diff --git a/nixos/doc/manual/configuration/luks-file-systems.xml b/nixos/doc/manual/configuration/luks-file-systems.xml
new file mode 100644
index 00000000000..45475dbcd44
--- /dev/null
+++ b/nixos/doc/manual/configuration/luks-file-systems.xml
@@ -0,0 +1,42 @@
+
+
+LUKS-Encrypted File Systems
+
+NixOS supports file systems that are encrypted using
+LUKS (Linux Unified Key Setup). For example,
+here is how you create an encrypted Ext4 file system on the device
+/dev/sda2:
+
+
+$ cryptsetup luksFormat /dev/sda2
+
+WARNING!
+========
+This will overwrite data on /dev/sda2 irrevocably.
+
+Are you sure? (Type uppercase yes): YES
+Enter LUKS passphrase: ***
+Verify passphrase: ***
+
+$ cryptsetup luksOpen /dev/sda2 crypted
+Enter passphrase for /dev/sda2: ***
+
+$ mkfs.ext4 /dev/mapper/crypted
+
+
+To ensure that this file system is automatically mounted at boot time
+as /, add the following to
+configuration.nix:
+
+
+boot.initrd.luks.devices = [ { device = "/dev/sda2"; name = "crypted"; } ];
+fileSystems."/".device = "/dev/mapper/crypted";
+
+
+
+
+
diff --git a/nixos/doc/manual/configuration/modularity.xml b/nixos/doc/manual/configuration/modularity.xml
new file mode 100644
index 00000000000..d95091bd162
--- /dev/null
+++ b/nixos/doc/manual/configuration/modularity.xml
@@ -0,0 +1,143 @@
+
+
+Modularity
+
+The NixOS configuration mechanism is modular. If your
+configuration.nix becomes too big, you can split
+it into multiple files. Likewise, if you have multiple NixOS
+configurations (e.g. for different computers) with some commonality,
+you can move the common configuration into a shared file.
+
+Modules have exactly the same syntax as
+configuration.nix. In fact,
+configuration.nix is itself a module. You can
+use other modules by including them from
+configuration.nix, e.g.:
+
+
+{ config, pkgs, ... }:
+
+{ imports = [ ./vpn.nix ./kde.nix ];
+ services.httpd.enable = true;
+ environment.systemPackages = [ pkgs.emacs ];
+ ...
+}
+
+
+Here, we include two modules from the same directory,
+vpn.nix and kde.nix. The
+latter might look like this:
+
+
+{ config, pkgs, ... }:
+
+{ services.xserver.enable = true;
+ services.xserver.displayManager.kdm.enable = true;
+ services.xserver.desktopManager.kde4.enable = true;
+ environment.systemPackages = [ pkgs.kde4.kscreensaver ];
+}
+
+
+Note that both configuration.nix and
+kde.nix define the option
+. When multiple modules
+define an option, NixOS will try to merge the
+definitions. In the case of
+, that’s easy: the lists of
+packages can simply be concatenated. The value in
+configuration.nix is merged last, so for
+list-type options, it will appear at the end of the merged list. If
+you want it to appear first, you can use mkBefore:
+
+
+boot.kernelModules = mkBefore [ "kvm-intel" ];
+
+
+This causes the kvm-intel kernel module to be
+loaded before any other kernel modules.
+
+For other types of options, a merge may not be possible. For
+instance, if two modules define
+,
+nixos-rebuild will give an error:
+
+
+The unique option `services.httpd.adminAddr' is defined multiple times, in `/etc/nixos/httpd.nix' and `/etc/nixos/configuration.nix'.
+
+
+When that happens, it’s possible to force one definition take
+precedence over the others:
+
+
+services.httpd.adminAddr = pkgs.lib.mkForce "bob@example.org";
+
+
+
+
+When using multiple modules, you may need to access
+configuration values defined in other modules. This is what the
+config function argument is for: it contains the
+complete, merged system configuration. That is,
+config is the result of combining the
+configurations returned by every moduleIf you’re
+wondering how it’s possible that the (indirect)
+result of a function is passed as an
+input to that same function: that’s because Nix
+is a “lazy” language — it only computes values when they are needed.
+This works as long as no individual configuration value depends on
+itself.. For example, here is a module that adds
+some packages to only if
+ is set to
+true somewhere else:
+
+
+{ config, pkgs, ... }:
+
+{ environment.systemPackages =
+ if config.services.xserver.enable then
+ [ pkgs.firefox
+ pkgs.thunderbird
+ ]
+ else
+ [ ];
+}
+
+
+
+
+With multiple modules, it may not be obvious what the final
+value of a configuration option is. The command
+ allows you to find out:
+
+
+$ nixos-option services.xserver.enable
+true
+
+$ nixos-option boot.kernelModules
+[ "tun" "ipv6" "loop" ... ]
+
+
+Interactive exploration of the configuration is possible using
+nix-repl,
+a read-eval-print loop for Nix expressions. It’s not installed by
+default; run nix-env -i nix-repl to get it. A
+typical use:
+
+
+$ nix-repl '<nixos>'
+
+nix-repl> config.networking.hostName
+"mandark"
+
+nix-repl> map (x: x.hostName) config.services.httpd.virtualHosts
+[ "example.org" "example.gov" ]
+
+
+
+
+
diff --git a/nixos/doc/manual/configuration/network-manager.xml b/nixos/doc/manual/configuration/network-manager.xml
new file mode 100644
index 00000000000..e65060021b4
--- /dev/null
+++ b/nixos/doc/manual/configuration/network-manager.xml
@@ -0,0 +1,27 @@
+
+
+NetworkManager
+
+To facilitate network configuration, some desktop environments
+use NetworkManager. You can enable NetworkManager by setting:
+
+
+services.networkmanager.enable = true;
+
+
+Some desktop managers (e.g., GNOME) enable NetworkManager
+automatically for you.
+
+All users that should have permission to change network settings
+must belong to the networkmanager
group.
+
+services.networkmanager
and
+services.wireless
can not be enabled at the same time:
+you can still connect to the wireless networks using
+NetworkManager.
+
+
diff --git a/nixos/doc/manual/configuration/networking.xml b/nixos/doc/manual/configuration/networking.xml
new file mode 100644
index 00000000000..5f08bc1f127
--- /dev/null
+++ b/nixos/doc/manual/configuration/networking.xml
@@ -0,0 +1,22 @@
+
+
+Networking
+
+This section describes how to configure networking components on
+your NixOS machine.
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/nixos/doc/manual/configuration/package-mgmt.xml b/nixos/doc/manual/configuration/package-mgmt.xml
new file mode 100644
index 00000000000..73c1722da02
--- /dev/null
+++ b/nixos/doc/manual/configuration/package-mgmt.xml
@@ -0,0 +1,34 @@
+
+
+Package Management
+
+This section describes how to add additional packages to your
+system. NixOS has two distinct styles of package management:
+
+
+
+ Declarative, where you declare
+ what packages you want in your
+ configuration.nix. Every time you run
+ nixos-rebuild, NixOS will ensure that you get a
+ consistent set of binaries corresponding to your
+ specification.
+
+ Ad hoc, where you install,
+ upgrade and uninstall packages via the nix-env
+ command. This style allows mixing packages from different Nixpkgs
+ versions. It’s the only choice for non-root
+ users.
+
+
+
+
+
+
+
+
+
diff --git a/nixos/doc/manual/configuration/ssh.xml b/nixos/doc/manual/configuration/ssh.xml
new file mode 100644
index 00000000000..7c928baaf89
--- /dev/null
+++ b/nixos/doc/manual/configuration/ssh.xml
@@ -0,0 +1,32 @@
+
+
+Secure Shell Access
+
+Secure shell (SSH) access to your machine can be enabled by
+setting:
+
+
+services.openssh.enable = true;
+
+
+By default, root logins using a password are disallowed. They can be
+disabled entirely by setting
+services.openssh.permitRootLogin to
+"no".
+
+You can declaratively specify authorised RSA/DSA public keys for
+a user as follows:
+
+
+
+users.extraUsers.alice.openssh.authorizedKeys.keys =
+ [ "ssh-dss AAAAB3NzaC1kc3MAAACBAPIkGWVEt4..." ];
+
+
+
+
+
diff --git a/nixos/doc/manual/configuration/summary.xml b/nixos/doc/manual/configuration/summary.xml
new file mode 100644
index 00000000000..9bb5e35e16b
--- /dev/null
+++ b/nixos/doc/manual/configuration/summary.xml
@@ -0,0 +1,191 @@
+
+
+Syntax Summary
+
+Below is a summary of the most important syntactic constructs in
+the Nix expression language. It’s not complete. In particular, there
+are many other built-in functions. See the Nix
+manual for the rest.
+
+
+
+
+
+
+
+ Example
+ Description
+
+
+
+
+
+ Basic values
+
+
+ "Hello world"
+ A string
+
+
+ "${pkgs.bash}/bin/sh"
+ A string containing an expression (expands to "/nix/store/hash-bash-version/bin/sh")
+
+
+ true, false
+ Booleans
+
+
+ 123
+ An integer
+
+
+ ./foo.png
+ A path (relative to the containing Nix expression)
+
+
+
+ Compound values
+
+
+ { x = 1; y = 2; }
+ An set with attributes names x and y
+
+
+ { foo.bar = 1; }
+ A nested set, equivalent to { foo = { bar = 1; }; }
+
+
+ rec { x = "bla"; y = x + "bar"; }
+ A recursive set, equivalent to { x = "foo"; y = "foobar"; }
+
+
+ [ "foo" "bar" ]
+ A list with two elements
+
+
+
+ Operators
+
+
+ "foo" + "bar"
+ String concatenation
+
+
+ 1 + 2
+ Integer addition
+
+
+ "foo" == "f" + "oo"
+ Equality test (evaluates to true)
+
+
+ "foo" != "bar"
+ Inequality test (evaluates to true)
+
+
+ !true
+ Boolean negation
+
+
+ { x = 1; y = 2; }.x
+ Attribute selection (evaluates to 1)
+
+
+ { x = 1; y = 2; }.z or 3
+ Attribute selection with default (evaluates to 3)
+
+
+ { x = 1; y = 2; } // { z = 3; }
+ Merge two sets (attributes in the right-hand set taking precedence)
+
+
+
+ Control structures
+
+
+ if 1 + 1 == 2 then "yes!" else "no!"
+ Conditional expression
+
+
+ assert 1 + 1 == 2; "yes!"
+ Assertion check (evaluates to "yes!")
+
+
+ let x = "foo"; y = "bar"; in x + y
+ Variable definition
+
+
+ with pkgs.lib; head [ 1 2 3 ]
+ Add all attributes from the given set to the scope
+ (evaluates to 1)
+
+
+
+ Functions (lambdas)
+
+
+ x: x + 1
+ A function that expects an integer and returns it increased by 1
+
+
+ (x: x + 1) 100
+ A function call (evaluates to 101)
+
+
+ let inc = x: x + 1; in inc (inc (inc 100))
+ A function bound to a variable and subsequently called by name (evaluates to 103)
+
+
+ { x, y }: x + y
+ A function that expects a set with required attributes
+ x and y and concatenates
+ them
+
+
+ { x, y ? "bar" }: x + y
+ A function that expects a set with required attribute
+ x and optional y, using
+ "bar" as default value for
+ y
+
+
+ { x, y, ... }: x + y
+ A function that expects a set with required attributes
+ x and y and ignores any
+ other attributes
+
+
+ { x, y } @ args: x + y
+ A function that expects a set with required attributes
+ x and y, and binds the
+ whole set to args
+
+
+
+ Built-in functions
+
+
+ import ./foo.nix
+ Load and return Nix expression in given file
+
+
+ map (x: x + x) [ 1 2 3 ]
+ Apply a function to every element of a list (evaluates to [ 2 4 6 ])
+
+
+
+
+
+
+
+
diff --git a/nixos/doc/manual/configuration/user-mgmt.xml b/nixos/doc/manual/configuration/user-mgmt.xml
new file mode 100644
index 00000000000..40362fbbb23
--- /dev/null
+++ b/nixos/doc/manual/configuration/user-mgmt.xml
@@ -0,0 +1,89 @@
+
+
+User Management
+
+NixOS supports both declarative and imperative styles of user
+management. In the declarative style, users are specified in
+configuration.nix. For instance, the following
+states that a user account named alice shall exist:
+
+
+users.extraUsers.alice =
+ { isNormalUser = true;
+ home = "/home/alice";
+ description = "Alice Foobar";
+ extraGroups = [ "wheel" "networkmanager" ];
+ openssh.authorizedKeys.keys = [ "ssh-dss AAAAB3Nza... alice@foobar" ];
+ };
+
+
+Note that alice is a member of the
+wheel and networkmanager groups,
+which allows her to use sudo to execute commands as
+root and to configure the network, respectively.
+Also note the SSH public key that allows remote logins with the
+corresponding private key. Users created in this way do not have a
+password by default, so they cannot log in via mechanisms that require
+a password. However, you can use the passwd program
+to set a password, which is retained across invocations of
+nixos-rebuild.
+
+If you set users.mutableUsers to false, then the contents of /etc/passwd
+and /etc/group will be congruent to your NixOS configuration. For instance,
+if you remove a user from users.extraUsers and run nixos-rebuild, the user
+account will cease to exist. Also, imperative commands for managing users
+and groups, such as useradd, are no longer available.
+
+A user ID (uid) is assigned automatically. You can also specify
+a uid manually by adding
+
+
+ uid = 1000;
+
+
+to the user specification.
+
+Groups can be specified similarly. The following states that a
+group named students shall exist:
+
+
+users.extraGroups.students.gid = 1000;
+
+
+As with users, the group ID (gid) is optional and will be assigned
+automatically if it’s missing.
+
+In the imperative style, users and groups are managed by
+commands such as useradd,
+groupmod and so on. For instance, to create a user
+account named alice:
+
+
+$ useradd -m alice
+
+The flag causes the creation of a home directory
+for the new user, which is generally what you want. The user does not
+have an initial password and therefore cannot log in. A password can
+be set using the passwd utility:
+
+
+$ passwd alice
+Enter new UNIX password: ***
+Retype new UNIX password: ***
+
+
+A user can be deleted using userdel:
+
+
+$ userdel -r alice
+
+The flag deletes the user’s home directory.
+Accounts can be modified using usermod. Unix
+groups can be managed using groupadd,
+groupmod and groupdel.
+
+
diff --git a/nixos/doc/manual/configuration/wireless.xml b/nixos/doc/manual/configuration/wireless.xml
new file mode 100644
index 00000000000..373a9168cc8
--- /dev/null
+++ b/nixos/doc/manual/configuration/wireless.xml
@@ -0,0 +1,41 @@
+
+
+Wireless Networks
+
+For a desktop installation using NetworkManager (e.g., GNOME),
+you just have to make sure the user is in the
+networkmanager
group and you can skip the rest of this
+section on wireless networks.
+
+
+NixOS will start wpa_supplicant for you if you enable this setting:
+
+
+networking.wireless.enable = true;
+
+
+NixOS currently does not generate wpa_supplicant's
+configuration file, /etc/wpa_supplicant.conf. You should edit this file
+yourself to define wireless networks, WPA keys and so on (see
+wpa_supplicant.conf(5)).
+
+
+
+If you are using WPA2 the wpa_passphrase tool might be useful
+to generate the wpa_supplicant.conf.
+
+
+$ wpa_passphrase ESSID PSK > /etc/wpa_supplicant.conf
+
+After you have edited the wpa_supplicant.conf,
+you need to restart the wpa_supplicant service.
+
+
+$ systemctl restart wpa_supplicant.service
+
+
+
diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml
new file mode 100644
index 00000000000..95e66f0c70c
--- /dev/null
+++ b/nixos/doc/manual/configuration/x-windows.xml
@@ -0,0 +1,113 @@
+
+
+X Window System
+
+The X Window System (X11) provides the basis of NixOS’ graphical
+user interface. It can be enabled as follows:
+
+services.xserver.enable = true;
+
+The X server will automatically detect and use the appropriate video
+driver from a set of X.org drivers (such as vesa
+and intel). You can also specify a driver
+manually, e.g.
+
+services.xserver.videoDrivers = [ "r128" ];
+
+to enable X.org’s xf86-video-r128 driver.
+
+You also need to enable at least one desktop or window manager.
+Otherwise, you can only log into a plain undecorated
+xterm window. Thus you should pick one or more of
+the following lines:
+
+services.xserver.desktopManager.kde4.enable = true;
+services.xserver.desktopManager.xfce.enable = true;
+services.xserver.windowManager.xmonad.enable = true;
+services.xserver.windowManager.twm.enable = true;
+services.xserver.windowManager.icewm.enable = true;
+
+
+
+NixOS’s default display manager (the
+program that provides a graphical login prompt and manages the X
+server) is SLiM. You can select KDE’s kdm instead:
+
+services.xserver.displayManager.kdm.enable = true;
+
+
+
+The X server is started automatically at boot time. If you
+don’t want this to happen, you can set:
+
+services.xserver.autorun = false;
+
+The X server can then be started manually:
+
+$ systemctl start display-manager.service
+
+
+
+
+NVIDIA Graphics Cards
+
+NVIDIA provides a proprietary driver for its graphics cards that
+has better 3D performance than the X.org drivers. It is not enabled
+by default because it’s not free software. You can enable it as follows:
+
+services.xserver.videoDrivers = [ "nvidia" ];
+
+You may need to reboot after enabling this driver to prevent a clash
+with other kernel modules.
+
+On 64-bit systems, if you want full acceleration for 32-bit
+programs such as Wine, you should also set the following:
+
+hardware.opengl.driSupport32Bit = true;
+
+
+
+
+
+AMD Graphics Cards
+
+AMD provides a proprietary driver for its graphics cards that
+has better 3D performance than the X.org drivers. It is not enabled
+by default because it’s not free software. You can enable it as follows:
+
+services.xserver.videoDrivers = [ "ati_unfree" ];
+
+You will need to reboot after enabling this driver to prevent a clash
+with other kernel modules.
+
+On 64-bit systems, if you want full acceleration for 32-bit
+programs such as Wine, you should also set the following:
+
+hardware.opengl.driSupport32Bit = true;
+
+
+
+
+
+Touchpads
+
+Support for Synaptics touchpads (found in many laptops such as
+the Dell Latitude series) can be enabled as follows:
+
+services.xserver.synaptics.enable = true;
+
+The driver has many options (see ). For
+instance, the following enables two-finger scrolling:
+
+services.xserver.synaptics.twoFingerScroll = true;
+
+
+
+
+
+
+
diff --git a/nixos/doc/manual/containers.xml b/nixos/doc/manual/containers.xml
deleted file mode 100644
index 2530d519521..00000000000
--- a/nixos/doc/manual/containers.xml
+++ /dev/null
@@ -1,242 +0,0 @@
-
-
-Containers
-
-NixOS allows you to easily run other NixOS instances as
-containers. Containers are a light-weight
-approach to virtualisation that runs software in the container at the
-same speed as in the host system. NixOS containers share the Nix store
-of the host, making container creation very efficient.
-
-Currently, NixOS containers are not perfectly isolated
-from the host system. This means that a user with root access to the
-container can do things that affect the host. So you should not give
-container root access to untrusted users.
-
-NixOS containers can be created in two ways: imperatively, using
-the command nixos-container, and declaratively, by
-specifying them in your configuration.nix. The
-declarative approach implies that containers get upgraded along with
-your host system when you run nixos-rebuild, which
-is often not what you want. By contrast, in the imperative approach,
-containers are configured and updated independently from the host
-system.
-
-
-Imperative container management
-
-We’ll cover imperative container management using
-nixos-container first. You create a container with
-identifier foo as follows:
-
-
-$ nixos-container create foo
-
-
-This creates the container’s root directory in
-/var/lib/containers/foo and a small configuration
-file in /etc/containers/foo.conf. It also builds
-the container’s initial system configuration and stores it in
-/nix/var/nix/profiles/per-container/foo/system. You
-can modify the initial configuration of the container on the command
-line. For instance, to create a container that has
-sshd running, with the given public key for
-root:
-
-
-$ nixos-container create foo --config 'services.openssh.enable = true; \
- users.extraUsers.root.openssh.authorizedKeys.keys = ["ssh-dss AAAAB3N…"];'
-
-
-
-
-Creating a container does not start it. To start the container,
-run:
-
-
-$ nixos-container start foo
-
-
-This command will return as soon as the container has booted and has
-reached multi-user.target. On the host, the
-container runs within a systemd unit called
-container@container-name.service.
-Thus, if something went wrong, you can get status info using
-systemctl:
-
-
-$ systemctl status container@foo
-
-
-
-
-If the container has started succesfully, you can log in as
-root using the root-login operation:
-
-
-$ nixos-container root-login foo
-[root@foo:~]#
-
-
-Note that only root on the host can do this (since there is no
-authentication). You can also get a regular login prompt using the
-login operation, which is available to all users on
-the host:
-
-
-$ nixos-container login foo
-foo login: alice
-Password: ***
-
-
-With nixos-container run, you can execute arbitrary
-commands in the container:
-
-
-$ nixos-container run foo -- uname -a
-Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux
-
-
-
-
-There are several ways to change the configuration of the
-container. First, on the host, you can edit
-/var/lib/container/name/etc/nixos/configuration.nix,
-and run
-
-
-$ nixos-container update foo
-
-
-This will build and activate the new configuration. You can also
-specify a new configuration on the command line:
-
-
-$ nixos-container update foo --config 'services.httpd.enable = true; \
- services.httpd.adminAddr = "foo@example.org";'
-
-$ curl http://$(nixos-container show-ip foo)/
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">…
-
-
-However, note that this will overwrite the container’s
-/etc/nixos/configuration.nix.
-
-Alternatively, you can change the configuration from within the
-container itself by running nixos-rebuild switch
-inside the container. Note that the container by default does not have
-a copy of the NixOS channel, so you should run nix-channel
---update first.
-
-Containers can be stopped and started using
-nixos-container stop and nixos-container
-start, respectively, or by using
-systemctl on the container’s service unit. To
-destroy a container, including its file system, do
-
-
-$ nixos-container destroy foo
-
-
-
-
-
-
-
-Declarative container specification
-
-You can also specify containers and their configuration in the
-host’s configuration.nix. For example, the
-following specifies that there shall be a container named
-database running PostgreSQL:
-
-
-containers.database =
- { config =
- { config, pkgs, ... }:
- { services.postgresql.enable = true;
- services.postgresql.package = pkgs.postgresql92;
- };
- };
-
-
-If you run nixos-rebuild switch, the container will
-be built and started. If the container was already running, it will be
-updated in place, without rebooting.
-
-By default, declarative containers share the network namespace
-of the host, meaning that they can listen on (privileged)
-ports. However, they cannot change the network configuration. You can
-give a container its own network as follows:
-
-
-containers.database =
- { privateNetwork = true;
- hostAddress = "192.168.100.10";
- localAddress = "192.168.100.11";
- };
-
-
-This gives the container a private virtual Ethernet interface with IP
-address 192.168.100.11, which is hooked up to a
-virtual Ethernet interface on the host with IP address
-192.168.100.10. (See the next section for details
-on container networking.)
-
-To disable the container, just remove it from
-configuration.nix and run nixos-rebuild
-switch. Note that this will not delete the root directory of
-the container in /var/lib/containers.
-
-
-
-
-Networking
-
-When you create a container using nixos-container
-create, it gets it own private IPv4 address in the range
-10.233.0.0/16. You can get the container’s IPv4
-address as follows:
-
-
-$ nixos-container show-ip foo
-10.233.4.2
-
-$ ping -c1 10.233.4.2
-64 bytes from 10.233.4.2: icmp_seq=1 ttl=64 time=0.106 ms
-
-
-
-
-Networking is implemented using a pair of virtual Ethernet
-devices. The network interface in the container is called
-eth0, while the matching interface in the host is
-called ve-container-name
-(e.g., ve-foo). The container has its own network
-namespace and the CAP_NET_ADMIN capability, so it
-can perform arbitrary network configuration such as setting up
-firewall rules, without affecting or having access to the host’s
-network.
-
-By default, containers cannot talk to the outside network. If
-you want that, you should set up Network Address Translation (NAT)
-rules on the host to rewrite container traffic to use your external
-IP address. This can be accomplished using the following configuration
-on the host:
-
-
-networking.nat.enable = true;
-networking.nat.internalInterfaces = ["ve-+"];
-networking.nat.externalInterface = "eth0";
-
-where eth0 should be replaced with the desired
-external interface. Note that ve-+ is a wildcard
-that matches all container interfaces.
-
-
-
-
-
-
diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix
index f5cc33919b8..68248081af6 100644
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@@ -6,12 +6,21 @@ with pkgs.lib;
let
# Remove invisible and internal options.
- options' = filter (opt: opt.visible && !opt.internal) (optionAttrSetToDocList options);
+ optionsList = filter (opt: opt.visible && !opt.internal) (optionAttrSetToDocList options);
+
+ # Replace functions by the string
+ substFunction = x:
+ if builtins.isAttrs x then mapAttrs (name: substFunction) x
+ else if builtins.isList x then map substFunction x
+ else if builtins.isFunction x then ""
+ else x;
# Clean up declaration sites to not refer to the NixOS source tree.
- options'' = flip map options' (opt: opt // {
+ optionsList' = flip map optionsList (opt: opt // {
declarations = map (fn: stripPrefix fn) opt.declarations;
- });
+ }
+ // optionalAttrs (opt ? example) { example = substFunction opt.example; }
+ // optionalAttrs (opt ? default) { default = substFunction opt.default; });
prefix = toString ../../..;
@@ -21,10 +30,35 @@ let
else
fn;
- optionsXML = builtins.toFile "options.xml" (builtins.unsafeDiscardStringContext (builtins.toXML options''));
+ # Convert the list of options into an XML file and a JSON file. The builtin
+ # unsafeDiscardStringContext is used to prevent the realisation of the store
+ # paths which are used in options definitions.
+ optionsXML = builtins.toFile "options.xml" (builtins.unsafeDiscardStringContext (builtins.toXML optionsList'));
+ optionsJSON = builtins.toFile "options.json" (builtins.unsafeDiscardStringContext (builtins.toJSON optionsList'));
+
+ # Tools-friendly version of the list of NixOS options.
+ options' = stdenv.mkDerivation {
+ name = "options";
+
+ buildCommand = ''
+ # Export list of options in different format.
+ dst=$out/share/doc/nixos
+ mkdir -p $dst
+
+ cp ${optionsJSON} $dst/options.json
+ cp ${optionsXML} $dst/options.xml
+
+ mkdir -p $out/nix-support
+ echo "file json $dst/options.json" >> $out/nix-support/hydra-build-products
+ echo "file xml $dst/options.xml" >> $out/nix-support/hydra-build-products
+ ''; # */
+
+ meta.description = "List of NixOS options in various formats.";
+ };
optionsDocBook = runCommand "options-db.xml" {} ''
- if grep /nixpkgs/nixos/modules ${optionsXML}; then
+ optionsXML=${options'}/share/doc/nixos/options.xml
+ if grep /nixpkgs/nixos/modules $optionsXML; then
echo "The manual appears to depend on the location of Nixpkgs, which is bad"
echo "since this prevents sharing via the NixOS channel. This is typically"
echo "caused by an option default that refers to a relative path (see above"
@@ -33,7 +67,7 @@ let
fi
${libxslt}/bin/xsltproc \
--stringparam revision '${revision}' \
- -o $out ${./options-to-docbook.xsl} ${optionsXML}
+ -o $out ${./options-to-docbook.xsl} $optionsXML
'';
sources = sourceFilesBySuffices ./. [".xml"];
@@ -41,12 +75,17 @@ let
copySources =
''
cp -prd $sources/* . # */
+ chmod -R u+w .
+ cp ${../../modules/services/databases/postgresql.xml} configuration/postgresql.xml
ln -s ${optionsDocBook} options-db.xml
echo "${version}" > version
'';
in rec {
+ # Tools-friendly version of the list of NixOS options.
+ options = options';
+
# Generate the NixOS manual.
manual = stdenv.mkDerivation {
name = "nixos-manual";
@@ -74,7 +113,7 @@ in rec {
--param toc.section.depth 3 \
--stringparam admon.style "" \
--stringparam callout.graphics.extension .gif \
- --param chunk.section.depth 1 \
+ --param chunk.section.depth 0 \
--param chunk.first.sections 1 \
--param use.id.as.filename 1 \
--stringparam generate.toc "book toc chapter toc appendix toc" \
@@ -88,7 +127,7 @@ in rec {
mkdir -p $out/nix-support
echo "nix-build out $out" >> $out/nix-support/hydra-build-products
- echo "doc manual $dst manual.html" >> $out/nix-support/hydra-build-products
+ echo "doc manual $dst" >> $out/nix-support/hydra-build-products
''; # */
meta.description = "The NixOS manual in HTML format";
diff --git a/nixos/doc/manual/development.xml b/nixos/doc/manual/development.xml
deleted file mode 100644
index 2f0c2a7aa8d..00000000000
--- a/nixos/doc/manual/development.xml
+++ /dev/null
@@ -1,1119 +0,0 @@
-
-
-Development
-
-This chapter describes how you can modify and extend
-NixOS.
-
-
-
-
-
-
-Getting the sources
-
-By default, NixOS’s nixos-rebuild command
-uses the NixOS and Nixpkgs sources provided by the
-nixos-unstable channel (kept in
-/nix/var/nix/profiles/per-user/root/channels/nixos).
-To modify NixOS, however, you should check out the latest sources from
-Git. This is done using the following command:
-
-
-$ nixos-checkout /my/sources
-
-
-or
-
-
-$ mkdir -p /my/sources
-$ cd /my/sources
-$ nix-env -i git
-$ git clone git://github.com/NixOS/nixpkgs.git
-
-
-This will check out the latest NixOS sources to
-/my/sources/nixpkgs/nixos
-and the Nixpkgs sources to
-/my/sources/nixpkgs.
-(The NixOS source tree lives in a subdirectory of the Nixpkgs
-repository.)
-
-It’s often inconvenient to develop directly on the master
-branch, since if somebody has just committed (say) a change to GCC,
-then the binary cache may not have caught up yet and you’ll have to
-rebuild everything from source. So you may want to create a local
-branch based on your current NixOS version:
-
-
-$ nixos-version
-14.04.273.ea1952b (Baboon)
-
-$ git checkout -b local ea1952b
-
-
-Or, to base your local branch on the latest version available in the
-NixOS channel:
-
-
-$ curl -sI http://nixos.org/channels/nixos-unstable/ | grep Location
-Location: http://releases.nixos.org/nixos/unstable/nixos-14.10pre43986.acaf4a6/
-
-$ git checkout -b local acaf4a6
-
-
-You can then use git rebase to sync your local
-branch with the upstream branch, and use git
-cherry-pick to copy commits from your local branch to the
-upstream branch.
-
-If you want to rebuild your system using your (modified)
-sources, you need to tell nixos-rebuild about them
-using the flag:
-
-
-$ nixos-rebuild switch -I nixpkgs=/my/sources/nixpkgs
-
-
-
-
-If you want nix-env to use the expressions in
-/my/sources, use nix-env -f
-/my/sources/nixpkgs, or change
-the default by adding a symlink in
-~/.nix-defexpr:
-
-
-$ ln -s /my/sources/nixpkgs ~/.nix-defexpr/nixpkgs
-
-
-You may want to delete the symlink
-~/.nix-defexpr/channels_root to prevent root’s
-NixOS channel from clashing with your own tree.
-
-
-
-
-
-
-
-
-
-
-Writing NixOS modules
-
-NixOS has a modular system for declarative configuration. This
-system combines multiple modules to produce the
-full system configuration. One of the modules that constitute the
-configuration is /etc/nixos/configuration.nix.
-Most of the others live in the nixos/modules
-subdirectory of the Nixpkgs tree.
-
-Each NixOS module is a file that handles one logical aspect of
-the configuration, such as a specific kind of hardware, a service, or
-network settings. A module configuration does not have to handle
-everything from scratch; it can use the functionality provided by
-other modules for its implementation. Thus a module can
-declare options that can be used by other
-modules, and conversely can define options
-provided by other modules in its own implementation. For example, the
-module pam.nix
-declares the option that allows
-other modules (e.g. sshd.nix)
-to define PAM services; and it defines the option
- (declared by etc.nix)
-to cause files to be created in
-/etc/pam.d.
-
-In , we saw the following structure
-of NixOS modules:
-
-
-{ config, pkgs, ... }:
-
-{ option definitions
-}
-
-
-This is actually an abbreviated form of module
-that only defines options, but does not declare any. The structure of
-full NixOS modules is shown in .
-
-Structure of NixOS modules
-
-{ config, pkgs, ... }:
-
-{
- imports =
- [ paths of other modules
- ];
-
- options = {
- option declarations
- };
-
- config = {
- option definitions
- };
-}
-
-
-The meaning of each part is as follows.
-
-
-
- This line makes the current Nix expression a function. The
- variable pkgs contains Nixpkgs, while
- config contains the full system configuration.
- This line can be omitted if there is no reference to
- pkgs and config inside the
- module.
-
-
-
- This list enumerates the paths to other NixOS modules that
- should be included in the evaluation of the system configuration.
- A default set of modules is defined in the file
- modules/module-list.nix. These don't need to
- be added in the import list.
-
-
-
- The attribute options is a nested set of
- option declarations (described below).
-
-
-
- The attribute config is a nested set of
- option definitions (also described
- below).
-
-
-
-
-
- shows a module that handles
-the regular update of the “locate” database, an index of all files in
-the file system. This module declares two options that can be defined
-by other modules (typically the user’s
-configuration.nix):
- (whether the database should
-be updated) and (when the
-update should be done). It implements its functionality by defining
-two options declared by other modules:
- (the set of all systemd services)
-and (the list of
-commands to be executed periodically by cron).
-
-NixOS module for the “locate” service
-
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let locatedb = "/var/cache/locatedb"; in
-
-{
- options = {
-
- services.locate = {
-
- enable = mkOption {
- type = types.bool;
- default = false;
- description = ''
- If enabled, NixOS will periodically update the database of
- files used by the locate command.
- '';
- };
-
- period = mkOption {
- type = types.str;
- default = "15 02 * * *";
- description = ''
- This option defines (in the format used by cron) when the
- locate database is updated. The default is to update at
- 02:15 at night every day.
- '';
- };
-
- };
-
- };
-
- config = {
-
- systemd.services.update-locatedb =
- { description = "Update Locate Database";
- path = [ pkgs.su ];
- script =
- ''
- mkdir -m 0755 -p $(dirname ${locatedb})
- exec updatedb --localuser=nobody --output=${locatedb} --prunepaths='/tmp /var/tmp /media /run'
- '';
- };
-
- services.cron.systemCronJobs = optional config.services.locate.enable
- "${config.services.locate.period} root ${config.systemd.package}/bin/systemctl start update-locatedb.service";
-
- };
-}
-
-
-Option declarations
-
-An option declaration specifies the name, type and description
-of a NixOS configuration option. It is illegal to define an option
-that hasn’t been declared in any module. A option declaration
-generally looks like this:
-
-
-options = {
- name = mkOption {
- type = type specification;
- default = default value;
- example = example value;
- description = "Description for use in the NixOS manual.";
- };
-};
-
-
-
-
-The function mkOption accepts the following arguments.
-
-
-
-
- type
-
- The type of the option (see below). It may be omitted,
- but that’s not advisable since it may lead to errors that are
- hard to diagnose.
-
-
-
-
- default
-
- The default value used if no value is defined by any
- module. A default is not required; in that case, if the option
- value is ever used, an error will be thrown.
-
-
-
-
- example
-
- An example value that will be shown in the NixOS manual.
-
-
-
-
- description
-
- A textual description of the option, in DocBook format,
- that will be included in the NixOS manual.
-
-
-
-
-
-
-
-Here is a non-exhaustive list of option types:
-
-
-
-
- types.bool
-
- A Boolean.
-
-
-
-
- types.int
-
- An integer.
-
-
-
-
- types.str
-
- A string.
-
-
-
-
- types.lines
-
- A string. If there are multiple definitions, they are
- concatenated, with newline characters in between.
-
-
-
-
- types.path
-
- A path, defined as anything that, when coerced to a
- string, starts with a slash. This includes derivations.
-
-
-
-
- types.listOf t
-
- A list of elements of type t
- (e.g., types.listOf types.str is a list of
- strings). Multiple definitions are concatenated together.
-
-
-
-
- types.attrsOf t
-
- A set of elements of type t
- (e.g., types.attrsOf types.int is a set of
- name/value pairs, the values being integers).
-
-
-
-
- types.nullOr t
-
- Either the value null or something of
- type t.
-
-
-
-
-
-You can also create new types using the function
-mkOptionType. See
-lib/types.nix in Nixpkgs for details.
-
-
-
-
-Option definitions
-
-Option definitions are generally straight-forward bindings of values to option names, like
-
-
-config = {
- services.httpd.enable = true;
-};
-
-
-However, sometimes you need to wrap an option definition or set of
-option definitions in a property to achieve
-certain effects:
-
-Delaying conditionals
-
-If a set of option definitions is conditional on the value of
-another option, you may need to use mkIf.
-Consider, for instance:
-
-
-config = if config.services.httpd.enable then {
- environment.systemPackages = [ ... ];
- ...
-} else {};
-
-
-This definition will cause Nix to fail with an “infinite recursion”
-error. Why? Because the value of
- depends on the value
-being constructed here. After all, you could also write the clearly
-circular and contradictory:
-
-config = if config.services.httpd.enable then {
- services.httpd.enable = false;
-} else {
- services.httpd.enable = true;
-};
-
-
-The solution is to write:
-
-
-config = mkIf config.services.httpd.enable {
- environment.systemPackages = [ ... ];
- ...
-};
-
-
-The special function mkIf causes the evaluation of
-the conditional to be “pushed down” into the individual definitions,
-as if you had written:
-
-
-config = {
- environment.systemPackages = if config.services.httpd.enable then [ ... ] else [];
- ...
-};
-
-
-
-
-
-
-Setting priorities
-
-A module can override the definitions of an option in other
-modules by setting a priority. All option
-definitions that do not have the lowest priority value are discarded.
-By default, option definitions have priority 1000. You can specify an
-explicit priority by using mkOverride, e.g.
-
-
-services.openssh.enable = mkOverride 10 false;
-
-
-This definition causes all other definitions with priorities above 10
-to be discarded. The function mkForce is
-equal to mkOverride 50.
-
-
-
-Merging configurations
-
-In conjunction with mkIf, it is sometimes
-useful for a module to return multiple sets of option definitions, to
-be merged together as if they were declared in separate modules. This
-can be done using mkMerge:
-
-
-config = mkMerge
- [ # Unconditional stuff.
- { environment.systemPackages = [ ... ];
- }
- # Conditional stuff.
- (mkIf config.services.bla.enable {
- environment.systemPackages = [ ... ];
- })
- ];
-
-
-
-
-
-
-
-
-
-Important options
-
-NixOS has many options, but some are of particular importance to
-module writers.
-
-
-
-
-
-
- This set defines files in /etc. A
- typical use is:
-
-environment.etc."os-release".text =
- ''
- NAME=NixOS
- ...
- '';
-
- which causes a file named /etc/os-release
- to be created with the given contents.
-
-
-
-
-
-
- A set of shell script fragments that must be executed
- whenever the configuration is activated (i.e., at boot time, or
- after running nixos-rebuild switch). For instance,
-
-system.activationScripts.media =
- ''
- mkdir -m 0755 -p /media
- '';
-
- causes the directory /media to be created.
- Activation scripts must be idempotent. They should not start
- background processes such as daemons; use
- for that.
-
-
-
-
-
-
- This is the set of systemd services. Example:
-
-systemd.services.dhcpcd =
- { description = "DHCP Client";
- wantedBy = [ "multi-user.target" ];
- after = [ "systemd-udev-settle.service" ];
- path = [ dhcpcd pkgs.nettools pkgs.openresolv ];
- serviceConfig =
- { Type = "forking";
- PIDFile = "/run/dhcpcd.pid";
- ExecStart = "${dhcpcd}/sbin/dhcpcd --config ${dhcpcdConf}";
- Restart = "always";
- };
- };
-
- which creates the systemd unit
- dhcpcd.service. The option
- determined which other units pull this
- one in; multi-user.target is the default
- target of the system, so dhcpcd.service will
- always be started. The option
- provides the main
- command for the service; it’s also possible to provide pre-start
- actions, stop scripts, and so on.
-
-
-
-
-
-
-
- If your service requires special UIDs or GIDs, you can
- define them with these options. See for details.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Building specific parts of NixOS
-
-With the command nix-build, you can build
-specific parts of your NixOS configuration. This is done as follows:
-
-
-$ cd /path/to/nixpkgs/nixos
-$ nix-build -A config.option
-
-where option is a NixOS option with type
-“derivation” (i.e. something that can be built). Attributes of
-interest include:
-
-
-
-
- system.build.toplevel
-
- The top-level option that builds the entire NixOS system.
- Everything else in your configuration is indirectly pulled in by
- this option. This is what nixos-rebuild
- builds and what /run/current-system points
- to afterwards.
-
- A shortcut to build this is:
-
-
-$ nix-build -A system
-
-
-
-
-
- system.build.manual.manual
- The NixOS manual.
-
-
-
- system.build.etc
- A tree of symlinks that form the static parts of
- /etc.
-
-
-
- system.build.initialRamdisk
- system.build.kernel
-
- The initial ramdisk and kernel of the system. This allows
- a quick way to test whether the kernel and the initial ramdisk
- boot correctly, by using QEMU’s and
- options:
-
-
-$ nix-build -A config.system.build.initialRamdisk -o initrd
-$ nix-build -A config.system.build.kernel -o kernel
-$ qemu-system-x86_64 -kernel ./kernel/bzImage -initrd ./initrd/initrd -hda /dev/null
-
-
-
-
-
-
-
- system.build.nixos-rebuild
- system.build.nixos-install
- system.build.nixos-generate-config
-
- These build the corresponding NixOS commands.
-
-
-
-
- systemd.units.unit-name.unit
-
- This builds the unit with the specified name. Note that
- since unit names contain dots
- (e.g. httpd.service), you need to put them
- between quotes, like this:
-
-
-$ nix-build -A 'config.systemd.units."httpd.service".unit'
-
-
- You can also test individual units, without rebuilding the whole
- system, by putting them in
- /run/systemd/system:
-
-
-$ cp $(nix-build -A 'config.systemd.units."httpd.service".unit')/httpd.service \
- /run/systemd/system/tmp-httpd.service
-$ systemctl daemon-reload
-$ systemctl start tmp-httpd.service
-
-
- Note that the unit must not have the same name as any unit in
- /etc/systemd/system since those take
- precedence over /run/systemd/system.
- That’s why the unit is installed as
- tmp-httpd.service here.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Building your own NixOS CD
-
-Building a NixOS CD is as easy as configuring your own computer. The
-idea is to use another module which will replace
-your configuration.nix to configure the system that
-would be installed on the CD.
-
-Default CD/DVD configurations are available
-inside nixos/modules/installer/cd-dvd. To build them
-you have to set NIXOS_CONFIG before
-running nix-build to build the ISO.
-
-
-$ nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd-dvd/installation-cd-minimal.nix
-
-
-
-Before burning your CD/DVD, you can check the content of the image by mounting anywhere like
-suggested by the following command:
-
-
-$ mount -o loop -t iso9660 ./result/iso/cd.iso /mnt/iso
-
-
-
-
-
-
-
-
-
-
-Testing the installer
-
-Building, burning, and booting from an installation CD is rather
-tedious, so here is a quick way to see if the installer works
-properly:
-
-
-$ nix-build -A config.system.build.nixos-install
-$ mount -t tmpfs none /mnt
-$ ./result/bin/nixos-install
-
-To start a login shell in the new NixOS installation in
-/mnt:
-
-
-$ ./result/bin/nixos-install --chroot
-
-
-
-
-
-
-
-
-
-
-
-
-NixOS tests
-
-When you add some feature to NixOS, you should write a test for
-it. NixOS tests are kept in the directory nixos/tests,
-and are executed (using Nix) by a testing framework that automatically
-starts one or more virtual machines containing the NixOS system(s)
-required for the test.
-
-Writing tests
-
-A NixOS test is a Nix expression that has the following structure:
-
-
-import ./make-test.nix {
-
- # Either the configuration of a single machine:
- machine =
- { config, pkgs, ... }:
- { configuration…
- };
-
- # Or a set of machines:
- nodes =
- { machine1 =
- { config, pkgs, ... }: { … };
- machine2 =
- { config, pkgs, ... }: { … };
- …
- };
-
- testScript =
- ''
- Perl code…
- '';
-}
-
-
-The attribute testScript is a bit of Perl code that
-executes the test (described below). During the test, it will start
-one or more virtual machines, the configuration of which is described
-by the attribute machine (if you need only one
-machine in your test) or by the attribute nodes (if
-you need multiple machines). For instance, login.nix
-only needs a single machine to test whether users can log in on the
-virtual console, whether device ownership is correctly maintained when
-switching between consoles, and so on. On the other hand, nfs.nix,
-which tests NFS client and server functionality in the Linux kernel
-(including whether locks are maintained across server crashes),
-requires three machines: a server and two clients.
-
-There are a few special NixOS configuration options for test
-VMs:
-
-
-
-
-
-
-
- The memory of the VM in
- megabytes.
-
-
-
-
- The virtual networks to which the VM is
- connected. See nat.nix
- for an example.
-
-
-
-
- By default, the Nix store in the VM is not
- writable. If you enable this option, a writable union file system
- is mounted on top of the Nix store to make it appear
- writable. This is necessary for tests that run Nix operations that
- modify the store.
-
-
-
-
-For more options, see the module qemu-vm.nix.
-
-The test script is a sequence of Perl statements that perform
-various actions, such as starting VMs, executing commands in the VMs,
-and so on. Each virtual machine is represented as an object stored in
-the variable $name,
-where name is the identifier of the machine
-(which is just machine if you didn’t specify
-multiple machines using the nodes attribute). For
-instance, the following starts the machine, waits until it has
-finished booting, then executes a command and checks that the output
-is more-or-less correct:
-
-
-$machine->start;
-$machine->waitForUnit("default.target");
-$machine->succeed("uname") =~ /Linux/;
-
-
-The first line is actually unnecessary; machines are implicitly
-started when you first execute an action on them (such as
-waitForUnit or succeed). If you
-have multiple machines, you can speed up the test by starting them in
-parallel:
-
-
-startAll;
-
-
-
-
-The following methods are available on machine objects:
-
-
-
-
- start
- Start the virtual machine. This method is
- asynchronous — it does not wait for the machine to finish
- booting.
-
-
-
- shutdown
- Shut down the machine, waiting for the VM to
- exit.
-
-
-
- crash
- Simulate a sudden power failure, by telling the VM
- to exit immediately.
-
-
-
- block
- Simulate unplugging the Ethernet cable that
- connects the machine to the other machines.
-
-
-
- unblock
- Undo the effect of
- block.
-
-
-
- screenshot
- Take a picture of the display of the virtual
- machine, in PNG format. The screenshot is linked from the HTML
- log.
-
-
-
- sendMonitorCommand
- Send a command to the QEMU monitor. This is rarely
- used, but allows doing stuff such as attaching virtual USB disks
- to a running machine.
-
-
-
- sendKeys
- Simulate pressing keys on the virtual keyboard,
- e.g., sendKeys("ctrl-alt-delete").
-
-
-
- sendChars
- Simulate typing a sequence of characters on the
- virtual keyboard, e.g., sendKeys("foobar\n")
- will type the string foobar followed by the
- Enter key.
-
-
-
- execute
- Execute a shell command, returning a list
- (status,
- stdout).
-
-
-
- succeed
- Execute a shell command, raising an exception if
- the exit status is not zero, otherwise returning the standard
- output.
-
-
-
- fail
- Like succeed, but raising
- an exception if the command returns a zero status.
-
-
-
- waitUntilSucceeds
- Repeat a shell command with 1-second intervals
- until it succeeds.
-
-
-
- waitUntilFails
- Repeat a shell command with 1-second intervals
- until it fails.
-
-
-
- waitForUnit
- Wait until the specified systemd unit has reached
- the “active” state.
-
-
-
- waitForFile
- Wait until the specified file
- exists.
-
-
-
- waitForOpenPort
- Wait until a process is listening on the given TCP
- port (on localhost, at least).
-
-
-
- waitForClosedPort
- Wait until nobody is listening on the given TCP
- port.
-
-
-
- waitForX
- Wait until the X11 server is accepting
- connections.
-
-
-
- waitForWindow
- Wait until an X11 window has appeared whose name
- matches the given regular expression, e.g.,
- waitForWindow(qr/Terminal/).
-
-
-
-
-
-
-
-
-
-Running tests
-
-You can run tests using nix-build. For
-example, to run the test login.nix,
-you just do:
-
-
-$ nix-build '<nixpkgs/nixos/tests/login.nix>'
-
-
-or, if you don’t want to rely on NIX_PATH:
-
-
-$ cd /my/nixpkgs/nixos/tests
-$ nix-build login.nix
-…
-running the VM test script
-machine: QEMU running (pid 8841)
-…
-6 out of 6 tests succeeded
-
-
-After building/downloading all required dependencies, this will
-perform a build that starts a QEMU/KVM virtual machine containing a
-NixOS system. The virtual machine mounts the Nix store of the host;
-this makes VM creation very fast, as no disk image needs to be
-created. Afterwards, you can view a pretty-printed log of the test:
-
-
-$ firefox result/log.html
-
-
-
-
-It is also possible to run the test environment interactively,
-allowing you to experiment with the VMs. For example:
-
-
-$ nix-build login.nix -A driver
-$ ./result/bin/nixos-run-vms
-
-
-The script nixos-run-vms starts the virtual
-machines defined by test. The root file system of the VMs is created
-on the fly and kept across VM restarts in
-./hostname.qcow2.
-
-Finally, the test itself can be run interactively. This is
-particularly useful when developing or debugging a test:
-
-
-$ nix-build tests/ -A nfs.driver
-$ ./result/bin/nixos-test-driver
-starting VDE switch for network 1
->
-
-
-You can then take any Perl statement, e.g.
-
-
-> startAll
-> $machine->succeed("touch /tmp/foo")
-
-
-The function testScript executes the entire test
-script and drops you back into the test driver command line upon its
-completion. This allows you to inspect the state of the VMs after the
-test (e.g. to debug the test script).
-
-
-
-
-
-
-
diff --git a/nixos/doc/manual/development/building-nixos.xml b/nixos/doc/manual/development/building-nixos.xml
new file mode 100644
index 00000000000..21c5bfe6a5b
--- /dev/null
+++ b/nixos/doc/manual/development/building-nixos.xml
@@ -0,0 +1,32 @@
+
+
+Building Your Own NixOS CD
+
+Building a NixOS CD is as easy as configuring your own computer. The
+idea is to use another module which will replace
+your configuration.nix to configure the system that
+would be installed on the CD.
+
+Default CD/DVD configurations are available
+inside nixos/modules/installer/cd-dvd. To build them
+you have to set NIXOS_CONFIG before
+running nix-build to build the ISO.
+
+
+$ nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd-dvd/installation-cd-minimal.nix
+
+
+
+Before burning your CD/DVD, you can check the content of the image by mounting anywhere like
+suggested by the following command:
+
+
+$ mount -o loop -t iso9660 ./result/iso/cd.iso /mnt/iso
+
+
+
+
\ No newline at end of file
diff --git a/nixos/doc/manual/development/building-parts.xml b/nixos/doc/manual/development/building-parts.xml
new file mode 100644
index 00000000000..cb8dee039c8
--- /dev/null
+++ b/nixos/doc/manual/development/building-parts.xml
@@ -0,0 +1,113 @@
+
+
+Building Specific Parts of NixOS
+
+With the command nix-build, you can build
+specific parts of your NixOS configuration. This is done as follows:
+
+
+$ cd /path/to/nixpkgs/nixos
+$ nix-build -A config.option
+
+where option is a NixOS option with type
+“derivation” (i.e. something that can be built). Attributes of
+interest include:
+
+
+
+
+ system.build.toplevel
+
+ The top-level option that builds the entire NixOS system.
+ Everything else in your configuration is indirectly pulled in by
+ this option. This is what nixos-rebuild
+ builds and what /run/current-system points
+ to afterwards.
+
+ A shortcut to build this is:
+
+
+$ nix-build -A system
+
+
+
+
+
+ system.build.manual.manual
+ The NixOS manual.
+
+
+
+ system.build.etc
+ A tree of symlinks that form the static parts of
+ /etc.
+
+
+
+ system.build.initialRamdisk
+ system.build.kernel
+
+ The initial ramdisk and kernel of the system. This allows
+ a quick way to test whether the kernel and the initial ramdisk
+ boot correctly, by using QEMU’s and
+ options:
+
+
+$ nix-build -A config.system.build.initialRamdisk -o initrd
+$ nix-build -A config.system.build.kernel -o kernel
+$ qemu-system-x86_64 -kernel ./kernel/bzImage -initrd ./initrd/initrd -hda /dev/null
+
+
+
+
+
+
+
+ system.build.nixos-rebuild
+ system.build.nixos-install
+ system.build.nixos-generate-config
+
+ These build the corresponding NixOS commands.
+
+
+
+
+ systemd.units.unit-name.unit
+
+ This builds the unit with the specified name. Note that
+ since unit names contain dots
+ (e.g. httpd.service), you need to put them
+ between quotes, like this:
+
+
+$ nix-build -A 'config.systemd.units."httpd.service".unit'
+
+
+ You can also test individual units, without rebuilding the whole
+ system, by putting them in
+ /run/systemd/system:
+
+
+$ cp $(nix-build -A 'config.systemd.units."httpd.service".unit')/httpd.service \
+ /run/systemd/system/tmp-httpd.service
+$ systemctl daemon-reload
+$ systemctl start tmp-httpd.service
+
+
+ Note that the unit must not have the same name as any unit in
+ /etc/systemd/system since those take
+ precedence over /run/systemd/system.
+ That’s why the unit is installed as
+ tmp-httpd.service here.
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/nixos/doc/manual/development/development.xml b/nixos/doc/manual/development/development.xml
new file mode 100644
index 00000000000..747159c4427
--- /dev/null
+++ b/nixos/doc/manual/development/development.xml
@@ -0,0 +1,20 @@
+
+
+Development
+
+
+This chapter describes how you can modify and extend
+NixOS.
+
+
+
+
+
+
+
+
+
diff --git a/nixos/doc/manual/development/nixos-tests.xml b/nixos/doc/manual/development/nixos-tests.xml
new file mode 100644
index 00000000000..a98da993330
--- /dev/null
+++ b/nixos/doc/manual/development/nixos-tests.xml
@@ -0,0 +1,19 @@
+
+
+NixOS Tests
+
+When you add some feature to NixOS, you should write a test for
+it. NixOS tests are kept in the directory nixos/tests,
+and are executed (using Nix) by a testing framework that automatically
+starts one or more virtual machines containing the NixOS system(s)
+required for the test.
+
+
+
+
+
\ No newline at end of file
diff --git a/nixos/doc/manual/development/option-declarations.xml b/nixos/doc/manual/development/option-declarations.xml
new file mode 100644
index 00000000000..6d93dc5c009
--- /dev/null
+++ b/nixos/doc/manual/development/option-declarations.xml
@@ -0,0 +1,141 @@
+
+
+Option Declarations
+
+An option declaration specifies the name, type and description
+of a NixOS configuration option. It is illegal to define an option
+that hasn’t been declared in any module. A option declaration
+generally looks like this:
+
+
+options = {
+ name = mkOption {
+ type = type specification;
+ default = default value;
+ example = example value;
+ description = "Description for use in the NixOS manual.";
+ };
+};
+
+
+
+
+The function mkOption accepts the following arguments.
+
+
+
+
+ type
+
+ The type of the option (see below). It may be omitted,
+ but that’s not advisable since it may lead to errors that are
+ hard to diagnose.
+
+
+
+
+ default
+
+ The default value used if no value is defined by any
+ module. A default is not required; in that case, if the option
+ value is ever used, an error will be thrown.
+
+
+
+
+ example
+
+ An example value that will be shown in the NixOS manual.
+
+
+
+
+ description
+
+ A textual description of the option, in DocBook format,
+ that will be included in the NixOS manual.
+
+
+
+
+
+
+
+Here is a non-exhaustive list of option types:
+
+
+
+
+ types.bool
+
+ A Boolean.
+
+
+
+
+ types.int
+
+ An integer.
+
+
+
+
+ types.str
+
+ A string.
+
+
+
+
+ types.lines
+
+ A string. If there are multiple definitions, they are
+ concatenated, with newline characters in between.
+
+
+
+
+ types.path
+
+ A path, defined as anything that, when coerced to a
+ string, starts with a slash. This includes derivations.
+
+
+
+
+ types.listOf t
+
+ A list of elements of type t
+ (e.g., types.listOf types.str is a list of
+ strings). Multiple definitions are concatenated together.
+
+
+
+
+ types.attrsOf t
+
+ A set of elements of type t
+ (e.g., types.attrsOf types.int is a set of
+ name/value pairs, the values being integers).
+
+
+
+
+ types.nullOr t
+
+ Either the value null or something of
+ type t.
+
+
+
+
+
+You can also create new types using the function
+mkOptionType. See
+lib/types.nix in Nixpkgs for details.
+
+
\ No newline at end of file
diff --git a/nixos/doc/manual/development/option-def.xml b/nixos/doc/manual/development/option-def.xml
new file mode 100644
index 00000000000..4e267ecfd1e
--- /dev/null
+++ b/nixos/doc/manual/development/option-def.xml
@@ -0,0 +1,112 @@
+
+
+Option Definitions
+
+Option definitions are generally straight-forward bindings of values to option names, like
+
+
+config = {
+ services.httpd.enable = true;
+};
+
+
+However, sometimes you need to wrap an option definition or set of
+option definitions in a property to achieve
+certain effects:
+
+Delaying Conditionals
+
+If a set of option definitions is conditional on the value of
+another option, you may need to use mkIf.
+Consider, for instance:
+
+
+config = if config.services.httpd.enable then {
+ environment.systemPackages = [ ... ];
+ ...
+} else {};
+
+
+This definition will cause Nix to fail with an “infinite recursion”
+error. Why? Because the value of
+ depends on the value
+being constructed here. After all, you could also write the clearly
+circular and contradictory:
+
+config = if config.services.httpd.enable then {
+ services.httpd.enable = false;
+} else {
+ services.httpd.enable = true;
+};
+
+
+The solution is to write:
+
+
+config = mkIf config.services.httpd.enable {
+ environment.systemPackages = [ ... ];
+ ...
+};
+
+
+The special function mkIf causes the evaluation of
+the conditional to be “pushed down” into the individual definitions,
+as if you had written:
+
+
+config = {
+ environment.systemPackages = if config.services.httpd.enable then [ ... ] else [];
+ ...
+};
+
+
+
+
+
+
+Setting Priorities
+
+A module can override the definitions of an option in other
+modules by setting a priority. All option
+definitions that do not have the lowest priority value are discarded.
+By default, option definitions have priority 1000. You can specify an
+explicit priority by using mkOverride, e.g.
+
+
+services.openssh.enable = mkOverride 10 false;
+
+
+This definition causes all other definitions with priorities above 10
+to be discarded. The function mkForce is
+equal to mkOverride 50.
+
+
+
+Merging Configurations
+
+In conjunction with mkIf, it is sometimes
+useful for a module to return multiple sets of option definitions, to
+be merged together as if they were declared in separate modules. This
+can be done using mkMerge:
+
+
+config = mkMerge
+ [ # Unconditional stuff.
+ { environment.systemPackages = [ ... ];
+ }
+ # Conditional stuff.
+ (mkIf config.services.bla.enable {
+ environment.systemPackages = [ ... ];
+ })
+ ];
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/nixos/doc/manual/development/running-nixos-tests.xml b/nixos/doc/manual/development/running-nixos-tests.xml
new file mode 100644
index 00000000000..d9be761eb01
--- /dev/null
+++ b/nixos/doc/manual/development/running-nixos-tests.xml
@@ -0,0 +1,77 @@
+
+
+Running Tests
+
+You can run tests using nix-build. For
+example, to run the test login.nix,
+you just do:
+
+
+$ nix-build '<nixpkgs/nixos/tests/login.nix>'
+
+
+or, if you don’t want to rely on NIX_PATH:
+
+
+$ cd /my/nixpkgs/nixos/tests
+$ nix-build login.nix
+…
+running the VM test script
+machine: QEMU running (pid 8841)
+…
+6 out of 6 tests succeeded
+
+
+After building/downloading all required dependencies, this will
+perform a build that starts a QEMU/KVM virtual machine containing a
+NixOS system. The virtual machine mounts the Nix store of the host;
+this makes VM creation very fast, as no disk image needs to be
+created. Afterwards, you can view a pretty-printed log of the test:
+
+
+$ firefox result/log.html
+
+
+
+
+It is also possible to run the test environment interactively,
+allowing you to experiment with the VMs. For example:
+
+
+$ nix-build login.nix -A driver
+$ ./result/bin/nixos-run-vms
+
+
+The script nixos-run-vms starts the virtual
+machines defined by test. The root file system of the VMs is created
+on the fly and kept across VM restarts in
+./hostname.qcow2.
+
+Finally, the test itself can be run interactively. This is
+particularly useful when developing or debugging a test:
+
+
+$ nix-build tests/ -A nfs.driver
+$ ./result/bin/nixos-test-driver
+starting VDE switch for network 1
+>
+
+
+You can then take any Perl statement, e.g.
+
+
+> startAll
+> $machine->succeed("touch /tmp/foo")
+
+
+The function testScript executes the entire test
+script and drops you back into the test driver command line upon its
+completion. This allows you to inspect the state of the VMs after the
+test (e.g. to debug the test script).
+
+
\ No newline at end of file
diff --git a/nixos/doc/manual/development/sources.xml b/nixos/doc/manual/development/sources.xml
new file mode 100644
index 00000000000..992a07af981
--- /dev/null
+++ b/nixos/doc/manual/development/sources.xml
@@ -0,0 +1,95 @@
+
+
+Getting the Sources
+
+By default, NixOS’s nixos-rebuild command
+uses the NixOS and Nixpkgs sources provided by the
+nixos-unstable channel (kept in
+/nix/var/nix/profiles/per-user/root/channels/nixos).
+To modify NixOS, however, you should check out the latest sources from
+Git. This is done using the following command:
+
+
+$ nixos-checkout /my/sources
+
+
+or
+
+
+$ mkdir -p /my/sources
+$ cd /my/sources
+$ nix-env -i git
+$ git clone git://github.com/NixOS/nixpkgs.git
+
+
+This will check out the latest NixOS sources to
+/my/sources/nixpkgs/nixos
+and the Nixpkgs sources to
+/my/sources/nixpkgs.
+(The NixOS source tree lives in a subdirectory of the Nixpkgs
+repository.)
+
+It’s often inconvenient to develop directly on the master
+branch, since if somebody has just committed (say) a change to GCC,
+then the binary cache may not have caught up yet and you’ll have to
+rebuild everything from source. So you may want to create a local
+branch based on your current NixOS version:
+
+
+$ nixos-version
+14.04.273.ea1952b (Baboon)
+
+$ git checkout -b local ea1952b
+
+
+Or, to base your local branch on the latest version available in the
+NixOS channel:
+
+
+$ curl -sI http://nixos.org/channels/nixos-unstable/ | grep Location
+Location: http://releases.nixos.org/nixos/unstable/nixos-14.10pre43986.acaf4a6/
+
+$ git checkout -b local acaf4a6
+
+
+You can then use git rebase to sync your local
+branch with the upstream branch, and use git
+cherry-pick to copy commits from your local branch to the
+upstream branch.
+
+If you want to rebuild your system using your (modified)
+sources, you need to tell nixos-rebuild about them
+using the flag:
+
+
+$ nixos-rebuild switch -I nixpkgs=/my/sources/nixpkgs
+
+
+
+
+If you want nix-env to use the expressions in
+/my/sources, use nix-env -f
+/my/sources/nixpkgs, or change
+the default by adding a symlink in
+~/.nix-defexpr:
+
+
+$ ln -s /my/sources/nixpkgs ~/.nix-defexpr/nixpkgs
+
+
+You may want to delete the symlink
+~/.nix-defexpr/channels_root to prevent root’s
+NixOS channel from clashing with your own tree.
+
+
+
+
\ No newline at end of file
diff --git a/nixos/doc/manual/development/testing-installer.xml b/nixos/doc/manual/development/testing-installer.xml
new file mode 100644
index 00000000000..87e40e32617
--- /dev/null
+++ b/nixos/doc/manual/development/testing-installer.xml
@@ -0,0 +1,27 @@
+
+
+Testing the Installer
+
+Building, burning, and booting from an installation CD is rather
+tedious, so here is a quick way to see if the installer works
+properly:
+
+
+$ nix-build -A config.system.build.nixos-install
+$ mount -t tmpfs none /mnt
+$ ./result/bin/nixos-install
+
+To start a login shell in the new NixOS installation in
+/mnt:
+
+
+$ ./result/bin/nixos-install --chroot
+
+
+
+
+
\ No newline at end of file
diff --git a/nixos/doc/manual/development/writing-modules.xml b/nixos/doc/manual/development/writing-modules.xml
new file mode 100644
index 00000000000..9cf29e5dc57
--- /dev/null
+++ b/nixos/doc/manual/development/writing-modules.xml
@@ -0,0 +1,175 @@
+
+
+Writing NixOS Modules
+
+NixOS has a modular system for declarative configuration. This
+system combines multiple modules to produce the
+full system configuration. One of the modules that constitute the
+configuration is /etc/nixos/configuration.nix.
+Most of the others live in the nixos/modules
+subdirectory of the Nixpkgs tree.
+
+Each NixOS module is a file that handles one logical aspect of
+the configuration, such as a specific kind of hardware, a service, or
+network settings. A module configuration does not have to handle
+everything from scratch; it can use the functionality provided by
+other modules for its implementation. Thus a module can
+declare options that can be used by other
+modules, and conversely can define options
+provided by other modules in its own implementation. For example, the
+module pam.nix
+declares the option that allows
+other modules (e.g. sshd.nix)
+to define PAM services; and it defines the option
+ (declared by etc.nix)
+to cause files to be created in
+/etc/pam.d.
+
+In , we saw the following structure
+of NixOS modules:
+
+
+{ config, pkgs, ... }:
+
+{ option definitions
+}
+
+
+This is actually an abbreviated form of module
+that only defines options, but does not declare any. The structure of
+full NixOS modules is shown in .
+
+Structure of NixOS Modules
+
+{ config, pkgs, ... }:
+
+{
+ imports =
+ [ paths of other modules
+ ];
+
+ options = {
+ option declarations
+ };
+
+ config = {
+ option definitions
+ };
+}
+
+
+The meaning of each part is as follows.
+
+
+
+ This line makes the current Nix expression a function. The
+ variable pkgs contains Nixpkgs, while
+ config contains the full system configuration.
+ This line can be omitted if there is no reference to
+ pkgs and config inside the
+ module.
+
+
+
+ This list enumerates the paths to other NixOS modules that
+ should be included in the evaluation of the system configuration.
+ A default set of modules is defined in the file
+ modules/module-list.nix. These don't need to
+ be added in the import list.
+
+
+
+ The attribute options is a nested set of
+ option declarations (described below).
+
+
+
+ The attribute config is a nested set of
+ option definitions (also described
+ below).
+
+
+
+
+
+ shows a module that handles
+the regular update of the “locate” database, an index of all files in
+the file system. This module declares two options that can be defined
+by other modules (typically the user’s
+configuration.nix):
+ (whether the database should
+be updated) and (when the
+update should be done). It implements its functionality by defining
+two options declared by other modules:
+ (the set of all systemd services)
+and (the list of
+commands to be executed periodically by cron).
+
+NixOS Module for the “locate” Service
+
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let locatedb = "/var/cache/locatedb"; in
+
+{
+ options = {
+
+ services.locate = {
+
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ If enabled, NixOS will periodically update the database of
+ files used by the locate command.
+ '';
+ };
+
+ period = mkOption {
+ type = types.str;
+ default = "15 02 * * *";
+ description = ''
+ This option defines (in the format used by cron) when the
+ locate database is updated. The default is to update at
+ 02:15 at night every day.
+ '';
+ };
+
+ };
+
+ };
+
+ config = {
+
+ systemd.services.update-locatedb =
+ { description = "Update Locate Database";
+ path = [ pkgs.su ];
+ script =
+ ''
+ mkdir -m 0755 -p $(dirname ${locatedb})
+ exec updatedb --localuser=nobody --output=${locatedb} --prunepaths='/tmp /var/tmp /media /run'
+ '';
+ };
+
+ services.cron.systemCronJobs = optional config.services.locate.enable
+ "${config.services.locate.period} root ${config.systemd.package}/bin/systemctl start update-locatedb.service";
+
+ };
+}
+
+
+
+
+
+
\ No newline at end of file
diff --git a/nixos/doc/manual/development/writing-nixos-tests.xml b/nixos/doc/manual/development/writing-nixos-tests.xml
new file mode 100644
index 00000000000..bbb655eed2a
--- /dev/null
+++ b/nixos/doc/manual/development/writing-nixos-tests.xml
@@ -0,0 +1,251 @@
+
+
+Writing Tests
+
+A NixOS test is a Nix expression that has the following structure:
+
+
+import ./make-test.nix {
+
+ # Either the configuration of a single machine:
+ machine =
+ { config, pkgs, ... }:
+ { configuration…
+ };
+
+ # Or a set of machines:
+ nodes =
+ { machine1 =
+ { config, pkgs, ... }: { … };
+ machine2 =
+ { config, pkgs, ... }: { … };
+ …
+ };
+
+ testScript =
+ ''
+ Perl code…
+ '';
+}
+
+
+The attribute testScript is a bit of Perl code that
+executes the test (described below). During the test, it will start
+one or more virtual machines, the configuration of which is described
+by the attribute machine (if you need only one
+machine in your test) or by the attribute nodes (if
+you need multiple machines). For instance, login.nix
+only needs a single machine to test whether users can log in on the
+virtual console, whether device ownership is correctly maintained when
+switching between consoles, and so on. On the other hand, nfs.nix,
+which tests NFS client and server functionality in the Linux kernel
+(including whether locks are maintained across server crashes),
+requires three machines: a server and two clients.
+
+There are a few special NixOS configuration options for test
+VMs:
+
+
+
+
+
+
+
+ The memory of the VM in
+ megabytes.
+
+
+
+
+ The virtual networks to which the VM is
+ connected. See nat.nix
+ for an example.
+
+
+
+
+ By default, the Nix store in the VM is not
+ writable. If you enable this option, a writable union file system
+ is mounted on top of the Nix store to make it appear
+ writable. This is necessary for tests that run Nix operations that
+ modify the store.
+
+
+
+
+For more options, see the module qemu-vm.nix.
+
+The test script is a sequence of Perl statements that perform
+various actions, such as starting VMs, executing commands in the VMs,
+and so on. Each virtual machine is represented as an object stored in
+the variable $name,
+where name is the identifier of the machine
+(which is just machine if you didn’t specify
+multiple machines using the nodes attribute). For
+instance, the following starts the machine, waits until it has
+finished booting, then executes a command and checks that the output
+is more-or-less correct:
+
+
+$machine->start;
+$machine->waitForUnit("default.target");
+$machine->succeed("uname") =~ /Linux/;
+
+
+The first line is actually unnecessary; machines are implicitly
+started when you first execute an action on them (such as
+waitForUnit or succeed). If you
+have multiple machines, you can speed up the test by starting them in
+parallel:
+
+
+startAll;
+
+
+
+
+The following methods are available on machine objects:
+
+
+
+
+ start
+ Start the virtual machine. This method is
+ asynchronous — it does not wait for the machine to finish
+ booting.
+
+
+
+ shutdown
+ Shut down the machine, waiting for the VM to
+ exit.
+
+
+
+ crash
+ Simulate a sudden power failure, by telling the VM
+ to exit immediately.
+
+
+
+ block
+ Simulate unplugging the Ethernet cable that
+ connects the machine to the other machines.
+
+
+
+ unblock
+ Undo the effect of
+ block.
+
+
+
+ screenshot
+ Take a picture of the display of the virtual
+ machine, in PNG format. The screenshot is linked from the HTML
+ log.
+
+
+
+ sendMonitorCommand
+ Send a command to the QEMU monitor. This is rarely
+ used, but allows doing stuff such as attaching virtual USB disks
+ to a running machine.
+
+
+
+ sendKeys
+ Simulate pressing keys on the virtual keyboard,
+ e.g., sendKeys("ctrl-alt-delete").
+
+
+
+ sendChars
+ Simulate typing a sequence of characters on the
+ virtual keyboard, e.g., sendKeys("foobar\n")
+ will type the string foobar followed by the
+ Enter key.
+
+
+
+ execute
+ Execute a shell command, returning a list
+ (status,
+ stdout).
+
+
+
+ succeed
+ Execute a shell command, raising an exception if
+ the exit status is not zero, otherwise returning the standard
+ output.
+
+
+
+ fail
+ Like succeed, but raising
+ an exception if the command returns a zero status.
+
+
+
+ waitUntilSucceeds
+ Repeat a shell command with 1-second intervals
+ until it succeeds.
+
+
+
+ waitUntilFails
+ Repeat a shell command with 1-second intervals
+ until it fails.
+
+
+
+ waitForUnit
+ Wait until the specified systemd unit has reached
+ the “active” state.
+
+
+
+ waitForFile
+ Wait until the specified file
+ exists.
+
+
+
+ waitForOpenPort
+ Wait until a process is listening on the given TCP
+ port (on localhost, at least).
+
+
+
+ waitForClosedPort
+ Wait until nobody is listening on the given TCP
+ port.
+
+
+
+ waitForX
+ Wait until the X11 server is accepting
+ connections.
+
+
+
+ waitForWindow
+ Wait until an X11 window has appeared whose name
+ matches the given regular expression, e.g.,
+ waitForWindow(qr/Terminal/).
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/nixos/doc/manual/installation.xml b/nixos/doc/manual/installation.xml
deleted file mode 100644
index 4cbfcc229fa..00000000000
--- a/nixos/doc/manual/installation.xml
+++ /dev/null
@@ -1,570 +0,0 @@
-
-
-Installing NixOS
-
-
-
-
-
-
-Obtaining NixOS
-
-NixOS ISO images can be downloaded from the NixOS
-homepage. These can be burned onto a CD. It is also possible
-to copy them onto a USB stick and install NixOS from there. For
-details, see the NixOS
-Wiki.
-
-As an alternative to installing NixOS yourself, you can get a
-running NixOS system through several other means:
-
-
-
- Using virtual appliances in Open Virtualization Format (OVF)
- that can be imported into VirtualBox. These are available from
- the NixOS
- homepage.
-
-
- Using AMIs for Amazon’s EC2. To find one for your region
- and instance type, please refer to the list
- of most recent AMIs.
-
-
- Using NixOps, the NixOS-based cloud deployment tool, which
- allows you to provision VirtualBox and EC2 NixOS instances from
- declarative specifications. Check out the NixOps
- homepage for details.
-
-
-
-
-
-
-
-
-
-
-
-
-Installation
-
-
-
- Boot from the CD.
-
- The CD contains a basic NixOS installation. (It
- also contains Memtest86+, useful if you want to test new hardware.)
- When it’s finished booting, it should have detected most of your
- hardware and brought up networking (check
- ifconfig). Networking is necessary for the
- installer, since it will download lots of stuff (such as source
- tarballs or Nixpkgs channel binaries). It’s best if you have a DHCP
- server on your network. Otherwise configure networking manually
- using ifconfig.
-
- The NixOS manual is available on virtual console 8
- (press Alt+F8 to access).
-
- Login as root and the empty
- password.
-
- If you downloaded the graphical ISO image, you can
- run start display-manager to start KDE.
-
- The NixOS installer doesn’t do any partitioning or
- formatting yet, so you need to that yourself. Use the following
- commands:
-
-
-
- For partitioning:
- fdisk.
-
- For initialising Ext4 partitions:
- mkfs.ext4. It is recommended that you assign a
- unique symbolic label to the file system using the option
- , since this
- makes the file system configuration independent from device
- changes. For example:
-
-
-$ mkfs.ext4 -L nixos /dev/sda1
-
-
-
- For creating swap partitions:
- mkswap. Again it’s recommended to assign a
- label to the swap partition: .
-
- For creating LVM volumes, the LVM commands, e.g.,
-
-
-$ pvcreate /dev/sda1 /dev/sdb1
-$ vgcreate MyVolGroup /dev/sda1 /dev/sdb1
-$ lvcreate --size 2G --name bigdisk MyVolGroup
-$ lvcreate --size 1G --name smalldisk MyVolGroup
-
-
-
- For creating software RAID devices, use
- mdadm.
-
-
-
-
-
- Mount the target file system on which NixOS should
- be installed on /mnt, e.g.
-
-
-$ mount /dev/disk/by-label/nixos /mnt
-
-
-
-
- If your machine has a limited amount of memory, you
- may want to activate swap devices now (swapon
- device). The installer (or
- rather, the build actions that it may spawn) may need quite a bit of
- RAM, depending on your configuration.
-
-
-
- You now need to create a file
- /mnt/etc/nixos/configuration.nix that
- specifies the intended configuration of the system. This is
- because NixOS has a declarative configuration
- model: you create or edit a description of the desired
- configuration of your system, and then NixOS takes care of making
- it happen. The syntax of the NixOS configuration file is
- described in , while a
- list of available configuration options appears in . A minimal example is shown in .
-
- The command nixos-generate-config can
- generate an initial configuration file for you:
-
-
-$ nixos-generate-config --root /mnt
-
- You should then edit
- /mnt/etc/nixos/configuration.nix to suit your
- needs:
-
-
-$ nano /mnt/etc/nixos/configuration.nix
-
-
- The vim text editor is also available.
-
- You must set the option
- to specify on which disk
- the GRUB boot loader is to be installed. Without it, NixOS cannot
- boot.
-
- Another critical option is ,
- specifying the file systems that need to be mounted by NixOS.
- However, you typically don’t need to set it yourself, because
- nixos-generate-config sets it automatically in
- /mnt/etc/nixos/hardware-configuration.nix
- from your currently mounted file systems. (The configuration file
- hardware-configuration.nix is included from
- configuration.nix and will be overwritten by
- future invocations of nixos-generate-config;
- thus, you generally should not modify it.)
-
- Depending on your hardware configuration or type of
- file system, you may need to set the option
- to include the kernel
- modules that are necessary for mounting the root file system,
- otherwise the installed system will not be able to boot. (If this
- happens, boot from the CD again, mount the target file system on
- /mnt, fix
- /mnt/etc/nixos/configuration.nix and rerun
- nixos-install.) In most cases,
- nixos-generate-config will figure out the
- required modules.
-
- Examples of real-world NixOS configuration files can be
- found at .
-
-
-
- Do the installation:
-
-
-$ nixos-install
-
- Cross fingers. If this fails due to a temporary problem (such as
- a network issue while downloading binaries from the NixOS binary
- cache), you can just re-run nixos-install.
- Otherwise, fix your configuration.nix and
- then re-run nixos-install.
-
- As the last step, nixos-install will ask
- you to set the password for the root user, e.g.
-
-
-setting root password...
-Enter new UNIX password: ***
-Retype new UNIX password: ***
-
-
-
-
-
-
- If everything went well:
-
-
-$ reboot
-
-
-
-
-
- You should now be able to boot into the installed NixOS.
- The GRUB boot menu shows a list of available
- configurations (initially just one). Every time you
- change the NixOS configuration (see ), a new item appears in the menu.
- This allows you to easily roll back to another configuration if
- something goes wrong.
-
- You should log in and change the root
- password with passwd.
-
- You’ll probably want to create some user accounts as well,
- which can be done with useradd:
-
-
-$ useradd -c 'Eelco Dolstra' -m eelco
-$ passwd eelco
-
-
-
- You may also want to install some software. For instance,
-
-
-$ nix-env -qa \*
-
- shows what packages are available, and
-
-
-$ nix-env -i w3m
-
- install the w3m browser.
-
-
-
-
-
-To summarise, shows a
-typical sequence of commands for installing NixOS on an empty hard
-drive (here /dev/sda). shows a corresponding configuration Nix expression.
-
-Commands for installing NixOS on /dev/sda
-
-$ fdisk /dev/sda # (or whatever device you want to install on)
-$ mkfs.ext4 -L nixos /dev/sda1
-$ mkswap -L swap /dev/sda2
-$ swapon /dev/sda2
-$ mount /dev/disk/by-label/nixos /mnt
-$ nixos-generate-config --root /mnt
-$ nano /mnt/etc/nixos/configuration.nix
-$ nixos-install
-$ reboot
-
-
-NixOS configuration
-
-{ config, pkgs, ... }:
-
-{
- imports =
- [ # Include the results of the hardware scan.
- ./hardware-configuration.nix
- ];
-
- boot.loader.grub.device = "/dev/sda";
-
- # Note: setting fileSystems is generally not
- # necessary, since nixos-generate-config figures them out
- # automatically in hardware-configuration.nix.
- #fileSystems."/".device = "/dev/disk/by-label/nixos";
-
- # Enable the OpenSSH server.
- services.sshd.enable = true;
-}
-
-
-
-
-UEFI Installation
-
-NixOS can also be installed on UEFI systems. The procedure
-is by and large the same as a BIOS installation, with the following
-changes:
-
-
-
- You should boot the live CD in UEFI mode (consult your
- specific hardware's documentation for instructions). You may find
- the rEFInd
- boot manager useful.
-
-
- Instead of fdisk, you should use
- gdisk to partition your disks. You will need to
- have a separate partition for /boot with
- partition code EF00, and it should be formatted as a
- vfat filesystem.
-
-
- You must set to
- true. nixos-generate-config
- should do this automatically for new configurations when booted in
- UEFI mode.
-
-
- After having mounted your installation partition to
- /mnt
, you must mount the boot
partition
- to /mnt/boot
.
-
-
- You may want to look at the options starting with
- and
- as well.
-
-
- To see console messages during early boot, add "fbcon"
- to your .
-
-
-
-
-
-
-
-
-Booting from a USB stick
-
-For systems without CD drive, the NixOS livecd can be booted from
-a usb stick. For non-UEFI installations,
-unetbootin
-will work. For UEFI installations, you should mount the ISO, copy its contents
-verbatim to your drive, then either:
-
-
-
- Change the label of the disk partition to the label of the ISO
- (visible with the blkid command), or
-
-
- Edit loader/entries/nixos-livecd.conf on the drive
- and change the root= field in the options
- line to point to your drive (see the documentation on root=
- in
- the kernel documentation for more details).
-
-
-
-
-
-
-
-
-
-
-
-
-Changing the configuration
-
-The file /etc/nixos/configuration.nix
-contains the current configuration of your machine. Whenever you’ve
-changed something to that file, you should do
-
-
-$ nixos-rebuild switch
-
-to build the new configuration, make it the default configuration for
-booting, and try to realise the configuration in the running system
-(e.g., by restarting system services).
-
-These commands must be executed as root, so you should
-either run them from a root shell or by prefixing them with
-sudo -i.
-
-You can also do
-
-
-$ nixos-rebuild test
-
-to build the configuration and switch the running system to it, but
-without making it the boot default. So if (say) the configuration
-locks up your machine, you can just reboot to get back to a working
-configuration.
-
-There is also
-
-
-$ nixos-rebuild boot
-
-to build the configuration and make it the boot default, but not
-switch to it now (so it will only take effect after the next
-reboot).
-
-You can make your configuration show up in a different submenu
-of the GRUB 2 boot screen by giving it a different profile
-name, e.g.
-
-
-$ nixos-rebuild switch -p test
-
-which causes the new configuration (and previous ones created using
--p test) to show up in the GRUB submenu “NixOS -
-Profile 'test'”. This can be useful to separate test configurations
-from “stable” configurations.
-
-Finally, you can do
-
-
-$ nixos-rebuild build
-
-to build the configuration but nothing more. This is useful to see
-whether everything compiles cleanly.
-
-If you have a machine that supports hardware virtualisation, you
-can also test the new configuration in a sandbox by building and
-running a QEMU virtual machine that contains the
-desired configuration. Just do
-
-
-$ nixos-rebuild build-vm
-$ ./result/bin/run-*-vm
-
-
-The VM does not have any data from your host system, so your existing
-user accounts and home directories will not be available. You can
-forward ports on the host to the guest. For instance, the following
-will forward host port 2222 to guest port 22 (SSH):
-
-
-$ QEMU_NET_OPTS="hostfwd=tcp::2222-:22" ./result/bin/run-*-vm
-
-
-allowing you to log in via SSH (assuming you have set the appropriate
-passwords or SSH authorized keys):
-
-
-$ ssh -p 2222 localhost
-
-
-
-
-
-
-
-
-
-
-
-Upgrading NixOS
-
-The best way to keep your NixOS installation up to date is to
-use one of the NixOS channels. A channel is a
-Nix mechanism for distributing Nix expressions and associated
-binaries. The NixOS channels are updated automatically from NixOS’s
-Git repository after certain tests have passed and all packages have
-been built. These channels are:
-
-
-
- Stable channels, such as nixos-14.04.
- These only get conservative bug fixes and package upgrades. For
- instance, a channel update may cause the Linux kernel on your
- system to be upgraded from 3.4.66 to 3.4.67 (a minor bug fix), but
- not from 3.4.x to
- 3.11.x (a major change that has the
- potential to break things). Stable channels are generally
- maintained until the next stable branch is created.
-
-
- The unstable channel, nixos-unstable.
- This corresponds to NixOS’s main development branch, and may thus
- see radical changes between channel updates. It’s not recommended
- for production systems.
-
-
-
-To see what channels are available, go to . (Note that the URIs of the
-various channels redirect to a directory that contains the channel’s
-latest version and includes ISO images and VirtualBox
-appliances.)
-
-When you first install NixOS, you’re automatically subscribed to
-the NixOS channel that corresponds to your installation source. For
-instance, if you installed from a 14.04 ISO, you will be subscribed to
-the nixos-14.04 channel. To see which NixOS
-channel you’re subscribed to, run the following as root:
-
-
-$ nix-channel --list | grep nixos
-nixos https://nixos.org/channels/nixos-unstable
-
-
-To switch to a different NixOS channel, do
-
-
-$ nix-channel --add http://nixos.org/channels/channel-name nixos
-
-
-(Be sure to include the nixos parameter at the
-end.) For instance, to use the NixOS 14.04 stable channel:
-
-
-$ nix-channel --add http://nixos.org/channels/nixos-14.04 nixos
-
-
-But it you want to live on the bleeding edge:
-
-
-$ nix-channel --add http://nixos.org/channels/nixos-unstable nixos
-
-
-
-
-You can then upgrade NixOS to the latest version in your chosen
-channel by running
-
-
-$ nixos-rebuild switch --upgrade
-
-
-which is equivalent to the more verbose nix-channel --update
-nixos; nixos-rebuild switch.
-
-It is generally safe to switch back and forth between
-channels. The only exception is that a newer NixOS may also have a
-newer Nix version, which may involve an upgrade of Nix’s database
-schema. This cannot be undone easily, so in that case you will not be
-able to go back to your original channel.
-
-
-
-
diff --git a/nixos/doc/manual/installation/changing-config.xml b/nixos/doc/manual/installation/changing-config.xml
new file mode 100644
index 00000000000..aa31742434e
--- /dev/null
+++ b/nixos/doc/manual/installation/changing-config.xml
@@ -0,0 +1,90 @@
+
+
+Changing the Configuration
+
+The file /etc/nixos/configuration.nix
+contains the current configuration of your machine. Whenever you’ve
+changed something to that file, you should do
+
+
+$ nixos-rebuild switch
+
+to build the new configuration, make it the default configuration for
+booting, and try to realise the configuration in the running system
+(e.g., by restarting system services).
+
+These commands must be executed as root, so you should
+either run them from a root shell or by prefixing them with
+sudo -i.
+
+You can also do
+
+
+$ nixos-rebuild test
+
+to build the configuration and switch the running system to it, but
+without making it the boot default. So if (say) the configuration
+locks up your machine, you can just reboot to get back to a working
+configuration.
+
+There is also
+
+
+$ nixos-rebuild boot
+
+to build the configuration and make it the boot default, but not
+switch to it now (so it will only take effect after the next
+reboot).
+
+You can make your configuration show up in a different submenu
+of the GRUB 2 boot screen by giving it a different profile
+name, e.g.
+
+
+$ nixos-rebuild switch -p test
+
+which causes the new configuration (and previous ones created using
+-p test) to show up in the GRUB submenu “NixOS -
+Profile 'test'”. This can be useful to separate test configurations
+from “stable” configurations.
+
+Finally, you can do
+
+
+$ nixos-rebuild build
+
+to build the configuration but nothing more. This is useful to see
+whether everything compiles cleanly.
+
+If you have a machine that supports hardware virtualisation, you
+can also test the new configuration in a sandbox by building and
+running a QEMU virtual machine that contains the
+desired configuration. Just do
+
+
+$ nixos-rebuild build-vm
+$ ./result/bin/run-*-vm
+
+
+The VM does not have any data from your host system, so your existing
+user accounts and home directories will not be available. You can
+forward ports on the host to the guest. For instance, the following
+will forward host port 2222 to guest port 22 (SSH):
+
+
+$ QEMU_NET_OPTS="hostfwd=tcp::2222-:22" ./result/bin/run-*-vm
+
+
+allowing you to log in via SSH (assuming you have set the appropriate
+passwords or SSH authorized keys):
+
+
+$ ssh -p 2222 localhost
+
+
+
+
+
diff --git a/nixos/doc/manual/installation/installation.xml b/nixos/doc/manual/installation/installation.xml
new file mode 100644
index 00000000000..ee61bedc418
--- /dev/null
+++ b/nixos/doc/manual/installation/installation.xml
@@ -0,0 +1,21 @@
+
+
+Installation
+
+
+
+This section describes how to obtain, install, and configure
+NixOS for first-time use.
+
+
+
+
+
+
+
+
+
diff --git a/nixos/doc/manual/installation/installing-uefi.xml b/nixos/doc/manual/installation/installing-uefi.xml
new file mode 100644
index 00000000000..dbd5606c4a5
--- /dev/null
+++ b/nixos/doc/manual/installation/installing-uefi.xml
@@ -0,0 +1,51 @@
+
+
+UEFI Installation
+
+NixOS can also be installed on UEFI systems. The procedure
+is by and large the same as a BIOS installation, with the following
+changes:
+
+
+
+ You should boot the live CD in UEFI mode (consult your
+ specific hardware's documentation for instructions). You may find
+ the rEFInd
+ boot manager useful.
+
+
+ Instead of fdisk, you should use
+ gdisk to partition your disks. You will need to
+ have a separate partition for /boot with
+ partition code EF00, and it should be formatted as a
+ vfat filesystem.
+
+
+ You must set to
+ true. nixos-generate-config
+ should do this automatically for new configurations when booted in
+ UEFI mode.
+
+
+ After having mounted your installation partition to
+ /mnt
, you must mount the boot
partition
+ to /mnt/boot
.
+
+
+ You may want to look at the options starting with
+ and
+ as well.
+
+
+ To see console messages during early boot, add "fbcon"
+ to your .
+
+
+
+
+
diff --git a/nixos/doc/manual/installation/installing-usb.xml b/nixos/doc/manual/installation/installing-usb.xml
new file mode 100644
index 00000000000..97e3d2eaa1c
--- /dev/null
+++ b/nixos/doc/manual/installation/installing-usb.xml
@@ -0,0 +1,30 @@
+
+
+Booting from a USB Drive
+
+For systems without CD drive, the NixOS livecd can be booted from
+a usb stick. For non-UEFI installations,
+unetbootin
+will work. For UEFI installations, you should mount the ISO, copy its contents
+verbatim to your drive, then either:
+
+
+
+ Change the label of the disk partition to the label of the ISO
+ (visible with the blkid command), or
+
+
+ Edit loader/entries/nixos-livecd.conf on the drive
+ and change the root= field in the options
+ line to point to your drive (see the documentation on root=
+ in
+ the kernel documentation for more details).
+
+
+
+
+
diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml
new file mode 100644
index 00000000000..b140c56fbee
--- /dev/null
+++ b/nixos/doc/manual/installation/installing.xml
@@ -0,0 +1,264 @@
+
+
+Installing NixOS
+
+
+
+ Boot from the CD.
+
+ The CD contains a basic NixOS installation. (It
+ also contains Memtest86+, useful if you want to test new hardware.)
+ When it’s finished booting, it should have detected most of your
+ hardware and brought up networking (check
+ ifconfig). Networking is necessary for the
+ installer, since it will download lots of stuff (such as source
+ tarballs or Nixpkgs channel binaries). It’s best if you have a DHCP
+ server on your network. Otherwise configure networking manually
+ using ifconfig.
+
+ The NixOS manual is available on virtual console 8
+ (press Alt+F8 to access).
+
+ Login as root and the empty
+ password.
+
+ If you downloaded the graphical ISO image, you can
+ run start display-manager to start KDE.
+
+ The NixOS installer doesn’t do any partitioning or
+ formatting yet, so you need to that yourself. Use the following
+ commands:
+
+
+
+ For partitioning:
+ fdisk.
+
+ For initialising Ext4 partitions:
+ mkfs.ext4. It is recommended that you assign a
+ unique symbolic label to the file system using the option
+ , since this
+ makes the file system configuration independent from device
+ changes. For example:
+
+
+$ mkfs.ext4 -L nixos /dev/sda1
+
+
+
+ For creating swap partitions:
+ mkswap. Again it’s recommended to assign a
+ label to the swap partition: .
+
+ For creating LVM volumes, the LVM commands, e.g.,
+
+
+$ pvcreate /dev/sda1 /dev/sdb1
+$ vgcreate MyVolGroup /dev/sda1 /dev/sdb1
+$ lvcreate --size 2G --name bigdisk MyVolGroup
+$ lvcreate --size 1G --name smalldisk MyVolGroup
+
+
+
+ For creating software RAID devices, use
+ mdadm.
+
+
+
+
+
+ Mount the target file system on which NixOS should
+ be installed on /mnt, e.g.
+
+
+$ mount /dev/disk/by-label/nixos /mnt
+
+
+
+
+ If your machine has a limited amount of memory, you
+ may want to activate swap devices now (swapon
+ device). The installer (or
+ rather, the build actions that it may spawn) may need quite a bit of
+ RAM, depending on your configuration.
+
+
+
+ You now need to create a file
+ /mnt/etc/nixos/configuration.nix that
+ specifies the intended configuration of the system. This is
+ because NixOS has a declarative configuration
+ model: you create or edit a description of the desired
+ configuration of your system, and then NixOS takes care of making
+ it happen. The syntax of the NixOS configuration file is
+ described in , while a
+ list of available configuration options appears in . A minimal example is shown in .
+
+ The command nixos-generate-config can
+ generate an initial configuration file for you:
+
+
+$ nixos-generate-config --root /mnt
+
+ You should then edit
+ /mnt/etc/nixos/configuration.nix to suit your
+ needs:
+
+
+$ nano /mnt/etc/nixos/configuration.nix
+
+
+ The vim text editor is also available.
+
+ You must set the option
+ to specify on which disk
+ the GRUB boot loader is to be installed. Without it, NixOS cannot
+ boot.
+
+ Another critical option is ,
+ specifying the file systems that need to be mounted by NixOS.
+ However, you typically don’t need to set it yourself, because
+ nixos-generate-config sets it automatically in
+ /mnt/etc/nixos/hardware-configuration.nix
+ from your currently mounted file systems. (The configuration file
+ hardware-configuration.nix is included from
+ configuration.nix and will be overwritten by
+ future invocations of nixos-generate-config;
+ thus, you generally should not modify it.)
+
+ Depending on your hardware configuration or type of
+ file system, you may need to set the option
+ to include the kernel
+ modules that are necessary for mounting the root file system,
+ otherwise the installed system will not be able to boot. (If this
+ happens, boot from the CD again, mount the target file system on
+ /mnt, fix
+ /mnt/etc/nixos/configuration.nix and rerun
+ nixos-install.) In most cases,
+ nixos-generate-config will figure out the
+ required modules.
+
+ Examples of real-world NixOS configuration files can be
+ found at .
+
+
+
+ Do the installation:
+
+
+$ nixos-install
+
+ Cross fingers. If this fails due to a temporary problem (such as
+ a network issue while downloading binaries from the NixOS binary
+ cache), you can just re-run nixos-install.
+ Otherwise, fix your configuration.nix and
+ then re-run nixos-install.
+
+ As the last step, nixos-install will ask
+ you to set the password for the root user, e.g.
+
+
+setting root password...
+Enter new UNIX password: ***
+Retype new UNIX password: ***
+
+
+
+
+
+
+ If everything went well:
+
+
+$ reboot
+
+
+
+
+
+ You should now be able to boot into the installed NixOS. The GRUB boot menu shows a list
+ of available configurations (initially just one). Every time
+ you change the NixOS configuration (seeChanging
+ Configuration ), a new item appears in the menu. This allows you to
+ easily roll back to another configuration if something goes wrong.
+
+ You should log in and change the root
+ password with passwd.
+
+ You’ll probably want to create some user accounts as well,
+ which can be done with useradd:
+
+
+$ useradd -c 'Eelco Dolstra' -m eelco
+$ passwd eelco
+
+
+
+ You may also want to install some software. For instance,
+
+
+$ nix-env -qa \*
+
+ shows what packages are available, and
+
+
+$ nix-env -i w3m
+
+ install the w3m browser.
+
+
+
+
+
+To summarise, shows a
+typical sequence of commands for installing NixOS on an empty hard
+drive (here /dev/sda). shows a corresponding configuration Nix expression.
+
+Commands for Installing NixOS on /dev/sda
+
+$ fdisk /dev/sda # (or whatever device you want to install on)
+$ mkfs.ext4 -L nixos /dev/sda1
+$ mkswap -L swap /dev/sda2
+$ swapon /dev/sda2
+$ mount /dev/disk/by-label/nixos /mnt
+$ nixos-generate-config --root /mnt
+$ nano /mnt/etc/nixos/configuration.nix
+$ nixos-install
+$ reboot
+
+
+NixOS Configuration
+
+{ config, pkgs, ... }:
+
+{
+ imports =
+ [ # Include the results of the hardware scan.
+ ./hardware-configuration.nix
+ ];
+
+ boot.loader.grub.device = "/dev/sda";
+
+ # Note: setting fileSystems is generally not
+ # necessary, since nixos-generate-config figures them out
+ # automatically in hardware-configuration.nix.
+ #fileSystems."/".device = "/dev/disk/by-label/nixos";
+
+ # Enable the OpenSSH server.
+ services.sshd.enable = true;
+}
+
+
+
+
+
+
diff --git a/nixos/doc/manual/installation/obtaining.xml b/nixos/doc/manual/installation/obtaining.xml
new file mode 100644
index 00000000000..ceeeb5c0ac0
--- /dev/null
+++ b/nixos/doc/manual/installation/obtaining.xml
@@ -0,0 +1,44 @@
+
+
+Obtaining NixOS
+
+NixOS ISO images can be downloaded from the NixOS
+homepage. These can be burned onto a CD. It is also possible
+to copy them onto a USB stick and install NixOS from there. For
+details, see the NixOS
+Wiki.
+
+As an alternative to installing NixOS yourself, you can get a
+running NixOS system through several other means:
+
+
+
+ Using virtual appliances in Open Virtualization Format (OVF)
+ that can be imported into VirtualBox. These are available from
+ the NixOS
+ homepage.
+
+
+ Using AMIs for Amazon’s EC2. To find one for your region
+ and instance type, please refer to the list
+ of most recent AMIs.
+
+
+ Using NixOps, the NixOS-based cloud deployment tool, which
+ allows you to provision VirtualBox and EC2 NixOS instances from
+ declarative specifications. Check out the NixOps
+ homepage for details.
+
+
+
+
+
+
diff --git a/nixos/doc/manual/installation/upgrading.xml b/nixos/doc/manual/installation/upgrading.xml
new file mode 100644
index 00000000000..ed71a7e23a3
--- /dev/null
+++ b/nixos/doc/manual/installation/upgrading.xml
@@ -0,0 +1,90 @@
+
+
+Upgrading NixOS
+
+The best way to keep your NixOS installation up to date is to
+use one of the NixOS channels. A channel is a
+Nix mechanism for distributing Nix expressions and associated
+binaries. The NixOS channels are updated automatically from NixOS’s
+Git repository after certain tests have passed and all packages have
+been built. These channels are:
+
+
+
+ Stable channels, such as nixos-14.04.
+ These only get conservative bug fixes and package upgrades. For
+ instance, a channel update may cause the Linux kernel on your
+ system to be upgraded from 3.4.66 to 3.4.67 (a minor bug fix), but
+ not from 3.4.x to
+ 3.11.x (a major change that has the
+ potential to break things). Stable channels are generally
+ maintained until the next stable branch is created.
+
+
+ The unstable channel, nixos-unstable.
+ This corresponds to NixOS’s main development branch, and may thus
+ see radical changes between channel updates. It’s not recommended
+ for production systems.
+
+
+
+To see what channels are available, go to . (Note that the URIs of the
+various channels redirect to a directory that contains the channel’s
+latest version and includes ISO images and VirtualBox
+appliances.)
+
+When you first install NixOS, you’re automatically subscribed to
+the NixOS channel that corresponds to your installation source. For
+instance, if you installed from a 14.04 ISO, you will be subscribed to
+the nixos-14.04 channel. To see which NixOS
+channel you’re subscribed to, run the following as root:
+
+
+$ nix-channel --list | grep nixos
+nixos https://nixos.org/channels/nixos-unstable
+
+
+To switch to a different NixOS channel, do
+
+
+$ nix-channel --add http://nixos.org/channels/channel-name nixos
+
+
+(Be sure to include the nixos parameter at the
+end.) For instance, to use the NixOS 14.04 stable channel:
+
+
+$ nix-channel --add http://nixos.org/channels/nixos-14.04 nixos
+
+
+But it you want to live on the bleeding edge:
+
+
+$ nix-channel --add http://nixos.org/channels/nixos-unstable nixos
+
+
+
+
+You can then upgrade NixOS to the latest version in your chosen
+channel by running
+
+
+$ nixos-rebuild switch --upgrade
+
+
+which is equivalent to the more verbose nix-channel --update
+nixos; nixos-rebuild switch.
+
+It is generally safe to switch back and forth between
+channels. The only exception is that a newer NixOS may also have a
+newer Nix version, which may involve an upgrade of Nix’s database
+schema. This cannot be undone easily, so in that case you will not be
+able to go back to your original channel.
+
+
diff --git a/nixos/doc/manual/man-nixos-option.xml b/nixos/doc/manual/man-nixos-option.xml
index 7952847d4db..2875336c67e 100644
--- a/nixos/doc/manual/man-nixos-option.xml
+++ b/nixos/doc/manual/man-nixos-option.xml
@@ -17,11 +17,6 @@
nixos-option
-
-
-
-
-
option.name
@@ -31,50 +26,13 @@
This command evaluates the configuration specified in
/etc/nixos/configuration.nix and returns the properties
-of the option name given as argument. By default, it returns the value of
-the option.
+of the option name given as argument.
When the option name is not an option, the command prints the list of
attributes contained in the attribute set.
-Options
-
-This command accepts the following options:
-
-
-
-
- ,
-
- Returns the value of the option. This is the default operation
- if no other options are defined.
-
-
-
-
- ,
-
- Return the default value, the example and the description of the
- option when available.
-
-
-
-
- ,
-
- Return the locations where the option is declared and where it
- is defined. This is extremely useful to find sources of errors in
- your configuration.
-
-
-
-
-
-
-
-
Environment
@@ -103,27 +61,21 @@ grub
initScript
$ nixos-option boot.loader.grub.enable
-true
+Value:
+true
-Prints option information:
+Default:
+true
-$ nixos-option -d networking.hostName
-Default: "nixos"
Description:
-The name of the machine. Leave it empty if you want to obtain
-it from a DHCP server (if using DHCP).
+Whether to enable the GNU GRUB boot loader.
-Find the locations which are declaring and defining an option:
-
-$ nixos-option -l hardware.firmware
Declared by:
- /mnt/data/nix-sources/nixos/modules/services/hardware/udev.nix
+ "/nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix"
Defined by:
- /path/to/nixpkgs/nixos/modules/system/boot/kernel.nix
- /path/to/nixpkgs/nixos/modules/hardware/network/rt73.nix
- /path/to/nixpkgs/nixos/modules/hardware/network/intel-3945abg.nix
- /path/to/nixpkgs/nixos/modules/hardware/network/intel-2200bg.nix
+ "/nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix"
+
diff --git a/nixos/doc/manual/manual.xml b/nixos/doc/manual/manual.xml
index f51a04cdf25..a3ad76209ac 100644
--- a/nixos/doc/manual/manual.xml
+++ b/nixos/doc/manual/manual.xml
@@ -1,15 +1,14 @@
-
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ version="5.0"
+ xml:id="NixOSManual">
+
-
NixOS Manual
Version
-
-
Preface
@@ -29,19 +28,14 @@
-
-
-
-
+
+
+
-
-
-
-
-
+
- Configuration options
+ Configuration Options
diff --git a/nixos/doc/manual/release-notes/release-notes.xml b/nixos/doc/manual/release-notes/release-notes.xml
new file mode 100644
index 00000000000..fb82d5adcef
--- /dev/null
+++ b/nixos/doc/manual/release-notes/release-notes.xml
@@ -0,0 +1,17 @@
+
+
+Release Notes
+
+
+This section lists the release notes for each stable version of NixOS.
+
+
+
+
+
+
+
diff --git a/nixos/doc/manual/release-notes/rl-1310.xml b/nixos/doc/manual/release-notes/rl-1310.xml
new file mode 100644
index 00000000000..234fb5a643f
--- /dev/null
+++ b/nixos/doc/manual/release-notes/rl-1310.xml
@@ -0,0 +1,11 @@
+
+
+Release 13.10 (“Aardvark”, 2013/10/31)
+
+This is the first stable release branch of NixOS.
+
+
\ No newline at end of file
diff --git a/nixos/doc/manual/release-notes.xml b/nixos/doc/manual/release-notes/rl-1404.xml
similarity index 83%
rename from nixos/doc/manual/release-notes.xml
rename to nixos/doc/manual/release-notes/rl-1404.xml
index 52e88bb4c86..74af1ed1274 100644
--- a/nixos/doc/manual/release-notes.xml
+++ b/nixos/doc/manual/release-notes/rl-1404.xml
@@ -1,34 +1,8 @@
-
-
-Release notes
-
-
-
-
-
-Release 14.10 (“Caterpillar”, 2014/10/??)
-
-When upgrading from a previous release, please be aware of the
-following incompatible changes:
-
-
-
- The host side of a container virtual Ethernet pair
- is now called ve-container-name
- rather than c-container-name.
-
-
-
-
-
-
-
-
-
-
-
+
Release 14.04 (“Baboon”, 2014/04/30)
@@ -183,16 +157,4 @@ networking.firewall.enable = false;
-
-
-
-
-
-
-Release 13.10 (“Aardvark”, 2013/10/31)
-
-This is the first stable release branch of NixOS.
-
-
-
-
+
\ No newline at end of file
diff --git a/nixos/doc/manual/release-notes/rl-1410.xml b/nixos/doc/manual/release-notes/rl-1410.xml
new file mode 100644
index 00000000000..09da15ce236
--- /dev/null
+++ b/nixos/doc/manual/release-notes/rl-1410.xml
@@ -0,0 +1,22 @@
+
+
+Release 14.10 (“Caterpillar”, 2014/10/??)
+
+When upgrading from a previous release, please be aware of the
+following incompatible changes:
+
+
+
+ The host side of a container virtual Ethernet pair
+ is now called ve-container-name
+ rather than c-container-name.
+
+
+
+
+
+
\ No newline at end of file
diff --git a/nixos/doc/manual/running.xml b/nixos/doc/manual/running.xml
deleted file mode 100644
index e1a358df2aa..00000000000
--- a/nixos/doc/manual/running.xml
+++ /dev/null
@@ -1,369 +0,0 @@
-
-
-Running NixOS
-
-This chapter describes various aspects of managing a running
-NixOS system, such as how to use the systemd
-service manager.
-
-
-
-
-Service management
-
-In NixOS, all system services are started and monitored using
-the systemd program. Systemd is the “init” process of the system
-(i.e. PID 1), the parent of all other processes. It manages a set of
-so-called “units”, which can be things like system services
-(programs), but also mount points, swap files, devices, targets
-(groups of units) and more. Units can have complex dependencies; for
-instance, one unit can require that another unit must be successfully
-started before the first unit can be started. When the system boots,
-it starts a unit named default.target; the
-dependencies of this unit cause all system services to be started,
-file systems to be mounted, swap files to be activated, and so
-on.
-
-The command systemctl is the main way to
-interact with systemd. Without any arguments, it
-shows the status of active units:
-
-
-$ systemctl
--.mount loaded active mounted /
-swapfile.swap loaded active active /swapfile
-sshd.service loaded active running SSH Daemon
-graphical.target loaded active active Graphical Interface
-...
-
-
-
-
-You can ask for detailed status information about a unit, for
-instance, the PostgreSQL database service:
-
-
-$ systemctl status postgresql.service
-postgresql.service - PostgreSQL Server
- Loaded: loaded (/nix/store/pn3q73mvh75gsrl8w7fdlfk3fq5qm5mw-unit/postgresql.service)
- Active: active (running) since Mon, 2013-01-07 15:55:57 CET; 9h ago
- Main PID: 2390 (postgres)
- CGroup: name=systemd:/system/postgresql.service
- ├─2390 postgres
- ├─2418 postgres: writer process
- ├─2419 postgres: wal writer process
- ├─2420 postgres: autovacuum launcher process
- ├─2421 postgres: stats collector process
- └─2498 postgres: zabbix zabbix [local] idle
-
-Jan 07 15:55:55 hagbard postgres[2394]: [1-1] LOG: database system was shut down at 2013-01-07 15:55:05 CET
-Jan 07 15:55:57 hagbard postgres[2390]: [1-1] LOG: database system is ready to accept connections
-Jan 07 15:55:57 hagbard postgres[2420]: [1-1] LOG: autovacuum launcher started
-Jan 07 15:55:57 hagbard systemd[1]: Started PostgreSQL Server.
-
-
-Note that this shows the status of the unit (active and running), all
-the processes belonging to the service, as well as the most recent log
-messages from the service.
-
-
-
-Units can be stopped, started or restarted:
-
-
-$ systemctl stop postgresql.service
-$ systemctl start postgresql.service
-$ systemctl restart postgresql.service
-
-
-These operations are synchronous: they wait until the service has
-finished starting or stopping (or has failed). Starting a unit will
-cause the dependencies of that unit to be started as well (if
-necessary).
-
-
-
-
-
-
-
-
-Rebooting and shutting down
-
-The system can be shut down (and automatically powered off) by
-doing:
-
-
-$ shutdown
-
-
-This is equivalent to running systemctl
-poweroff.
-
-To reboot the system, run
-
-
-$ reboot
-
-
-which is equivalent to systemctl reboot.
-Alternatively, you can quickly reboot the system using
-kexec, which bypasses the BIOS by directly loading
-the new kernel into memory:
-
-
-$ systemctl kexec
-
-
-
-
-The machine can be suspended to RAM (if supported) using
-systemctl suspend, and suspended to disk using
-systemctl hibernate.
-
-These commands can be run by any user who is logged in locally,
-i.e. on a virtual console or in X11; otherwise, the user is asked for
-authentication.
-
-
-
-
-
-
-User sessions
-
-Systemd keeps track of all users who are logged into the system
-(e.g. on a virtual console or remotely via SSH). The command
-loginctl allows querying and manipulating user
-sessions. For instance, to list all user sessions:
-
-
-$ loginctl
- SESSION UID USER SEAT
- c1 500 eelco seat0
- c3 0 root seat0
- c4 500 alice
-
-
-This shows that two users are logged in locally, while another is
-logged in remotely. (“Seats” are essentially the combinations of
-displays and input devices attached to the system; usually, there is
-only one seat.) To get information about a session:
-
-
-$ loginctl session-status c3
-c3 - root (0)
- Since: Tue, 2013-01-08 01:17:56 CET; 4min 42s ago
- Leader: 2536 (login)
- Seat: seat0; vc3
- TTY: /dev/tty3
- Service: login; type tty; class user
- State: online
- CGroup: name=systemd:/user/root/c3
- ├─ 2536 /nix/store/10mn4xip9n7y9bxqwnsx7xwx2v2g34xn-shadow-4.1.5.1/bin/login --
- ├─10339 -bash
- └─10355 w3m nixos.org
-
-
-This shows that the user is logged in on virtual console 3. It also
-lists the processes belonging to this session. Since systemd keeps
-track of this, you can terminate a session in a way that ensures that
-all the session’s processes are gone:
-
-
-$ loginctl terminate-session c3
-
-
-
-
-
-
-
-
-
-Control groups
-
-To keep track of the processes in a running system, systemd uses
-control groups (cgroups). A control group is a
-set of processes used to allocate resources such as CPU, memory or I/O
-bandwidth. There can be multiple control group hierarchies, allowing
-each kind of resource to be managed independently.
-
-The command systemd-cgls lists all control
-groups in the systemd hierarchy, which is what
-systemd uses to keep track of the processes belonging to each service
-or user session:
-
-
-$ systemd-cgls
-├─user
-│ └─eelco
-│ └─c1
-│ ├─ 2567 -:0
-│ ├─ 2682 kdeinit4: kdeinit4 Running...
-│ ├─ ...
-│ └─10851 sh -c less -R
-└─system
- ├─httpd.service
- │ ├─2444 httpd -f /nix/store/3pyacby5cpr55a03qwbnndizpciwq161-httpd.conf -DNO_DETACH
- │ └─...
- ├─dhcpcd.service
- │ └─2376 dhcpcd --config /nix/store/f8dif8dsi2yaa70n03xir8r653776ka6-dhcpcd.conf
- └─ ...
-
-
-Similarly, systemd-cgls cpu shows the cgroups in
-the CPU hierarchy, which allows per-cgroup CPU scheduling priorities.
-By default, every systemd service gets its own CPU cgroup, while all
-user sessions are in the top-level CPU cgroup. This ensures, for
-instance, that a thousand run-away processes in the
-httpd.service cgroup cannot starve the CPU for one
-process in the postgresql.service cgroup. (By
-contrast, it they were in the same cgroup, then the PostgreSQL process
-would get 1/1001 of the cgroup’s CPU time.) You can limit a service’s
-CPU share in configuration.nix:
-
-
-systemd.services.httpd.serviceConfig.CPUShares = 512;
-
-
-By default, every cgroup has 1024 CPU shares, so this will halve the
-CPU allocation of the httpd.service cgroup.
-
-There also is a memory hierarchy that
-controls memory allocation limits; by default, all processes are in
-the top-level cgroup, so any service or session can exhaust all
-available memory. Per-cgroup memory limits can be specified in
-configuration.nix; for instance, to limit
-httpd.service to 512 MiB of RAM (excluding swap)
-and 640 MiB of RAM (including swap):
-
-
-systemd.services.httpd.serviceConfig.MemoryLimit = "512M";
-systemd.services.httpd.serviceConfig.ControlGroupAttribute = [ "memory.memsw.limit_in_bytes 640M" ];
-
-
-
-
-The command systemd-cgtop shows a
-continuously updated list of all cgroups with their CPU and memory
-usage.
-
-
-
-
-
-
-Logging
-
-System-wide logging is provided by systemd’s
-journal, which subsumes traditional logging
-daemons such as syslogd and klogd. Log entries are kept in binary
-files in /var/log/journal/. The command
-journalctl allows you to see the contents of the
-journal. For example,
-
-
-$ journalctl -b
-
-
-shows all journal entries since the last reboot. (The output of
-journalctl is piped into less by
-default.) You can use various options and match operators to restrict
-output to messages of interest. For instance, to get all messages
-from PostgreSQL:
-
-
-$ journalctl -u postgresql.service
--- Logs begin at Mon, 2013-01-07 13:28:01 CET, end at Tue, 2013-01-08 01:09:57 CET. --
-...
-Jan 07 15:44:14 hagbard postgres[2681]: [2-1] LOG: database system is shut down
--- Reboot --
-Jan 07 15:45:10 hagbard postgres[2532]: [1-1] LOG: database system was shut down at 2013-01-07 15:44:14 CET
-Jan 07 15:45:13 hagbard postgres[2500]: [1-1] LOG: database system is ready to accept connections
-
-
-Or to get all messages since the last reboot that have at least a
-“critical” severity level:
-
-
-$ journalctl -b -p crit
-Dec 17 21:08:06 mandark sudo[3673]: pam_unix(sudo:auth): auth could not identify password for [alice]
-Dec 29 01:30:22 mandark kernel[6131]: [1053513.909444] CPU6: Core temperature above threshold, cpu clock throttled (total events = 1)
-
-
-
-
-The system journal is readable by root and by users in the
-wheel and systemd-journal
-groups. All users have a private journal that can be read using
-journalctl.
-
-
-
-
-
-
-Cleaning up the Nix store
-
-Nix has a purely functional model, meaning that packages are
-never upgraded in place. Instead new versions of packages end up in a
-different location in the Nix store (/nix/store).
-You should periodically run Nix’s garbage
-collector to remove old, unreferenced packages. This is
-easy:
-
-
-$ nix-collect-garbage
-
-
-Alternatively, you can use a systemd unit that does the same in the
-background:
-
-
-$ systemctl start nix-gc.service
-
-
-You can tell NixOS in configuration.nix to run
-this unit automatically at certain points in time, for instance, every
-night at 03:15:
-
-
-nix.gc.automatic = true;
-nix.gc.dates = "03:15";
-
-
-
-
-The commands above do not remove garbage collector roots, such
-as old system configurations. Thus they do not remove the ability to
-roll back to previous configurations. The following command deletes
-old roots, removing the ability to roll back to them:
-
-$ nix-collect-garbage -d
-
-You can also do this for specific profiles, e.g.
-
-$ nix-env -p /nix/var/nix/profiles/per-user/eelco/profile --delete-generations old
-
-Note that NixOS system configurations are stored in the profile
-/nix/var/nix/profiles/system.
-
-Another way to reclaim disk space (often as much as 40% of the
-size of the Nix store) is to run Nix’s store optimiser, which seeks
-out identical files in the store and replaces them with hard links to
-a single copy.
-
-$ nix-store --optimise
-
-Since this command needs to read the entire Nix store, it can take
-quite a while to finish.
-
-
-
-
-
diff --git a/nixos/doc/manual/troubleshooting.xml b/nixos/doc/manual/troubleshooting.xml
deleted file mode 100644
index c7d65112b64..00000000000
--- a/nixos/doc/manual/troubleshooting.xml
+++ /dev/null
@@ -1,199 +0,0 @@
-
-
-Troubleshooting
-
-
-
-
-Boot problems
-
-If NixOS fails to boot, there are a number of kernel command
-line parameters that may help you to identify or fix the issue. You
-can add these parameters in the GRUB boot menu by pressing “e” to
-modify the selected boot entry and editing the line starting with
-linux. The following are some useful kernel command
-line parameters that are recognised by the NixOS boot scripts or by
-systemd:
-
-
-
- boot.shell_on_fail
- Start a root shell if something goes wrong in
- stage 1 of the boot process (the initial ramdisk). This is
- disabled by default because there is no authentication for the
- root shell.
-
-
- boot.debug1
- Start an interactive shell in stage 1 before
- anything useful has been done. That is, no modules have been
- loaded and no file systems have been mounted, except for
- /proc and
- /sys.
-
-
- boot.trace
- Print every shell command executed by the stage 1
- and 2 boot scripts.
-
-
- single
- Boot into rescue mode (a.k.a. single user mode).
- This will cause systemd to start nothing but the unit
- rescue.target, which runs
- sulogin to prompt for the root password and
- start a root login shell. Exiting the shell causes the system to
- continue with the normal boot process.
-
-
- systemd.log_level=debug systemd.log_target=console
- Make systemd very verbose and send log messages to
- the console instead of the journal.
-
-
-
-
-For more parameters recognised by systemd, see
-systemd1.
-
-If no login prompts or X11 login screens appear (e.g. due to
-hanging dependencies), you can press Alt+ArrowUp. If you’re lucky,
-this will start rescue mode (described above). (Also note that since
-most units have a 90-second timeout before systemd gives up on them,
-the agetty login prompts should appear eventually
-unless something is very wrong.)
-
-
-
-
-
-
-Maintenance mode
-
-You can enter rescue mode by running:
-
-
-$ systemctl rescue
-
-This will eventually give you a single-user root shell. Systemd will
-stop (almost) all system services. To get out of maintenance mode,
-just exit from the rescue shell.
-
-
-
-
-
-
-Rolling back configuration changes
-
-After running nixos-rebuild to switch to a
-new configuration, you may find that the new configuration doesn’t
-work very well. In that case, there are several ways to return to a
-previous configuration.
-
-First, the GRUB boot manager allows you to boot into any
-previous configuration that hasn’t been garbage-collected. These
-configurations can be found under the GRUB submenu “NixOS - All
-configurations”. This is especially useful if the new configuration
-fails to boot. After the system has booted, you can make the selected
-configuration the default for subsequent boots:
-
-
-$ /run/current-system/bin/switch-to-configuration boot
-
-
-
-Second, you can switch to the previous configuration in a running
-system:
-
-
-$ nixos-rebuild switch --rollback
-
-This is equivalent to running:
-
-
-$ /nix/var/nix/profiles/system-N-link/bin/switch-to-configuration switch
-
-where N is the number of the NixOS system
-configuration. To get a list of the available configurations, do:
-
-
-$ ls -l /nix/var/nix/profiles/system-*-link
-...
-lrwxrwxrwx 1 root root 78 Aug 12 13:54 /nix/var/nix/profiles/system-268-link -> /nix/store/202b...-nixos-13.07pre4932_5a676e4-4be1055
-
-
-
-
-
-
-
-
-
-Nix store corruption
-
-After a system crash, it’s possible for files in the Nix store
-to become corrupted. (For instance, the Ext4 file system has the
-tendency to replace un-synced files with zero bytes.) NixOS tries
-hard to prevent this from happening: it performs a
-sync before switching to a new configuration, and
-Nix’s database is fully transactional. If corruption still occurs,
-you may be able to fix it automatically.
-
-If the corruption is in a path in the closure of the NixOS
-system configuration, you can fix it by doing
-
-
-$ nixos-rebuild switch --repair
-
-
-This will cause Nix to check every path in the closure, and if its
-cryptographic hash differs from the hash recorded in Nix’s database,
-the path is rebuilt or redownloaded.
-
-You can also scan the entire Nix store for corrupt paths:
-
-
-$ nix-store --verify --check-contents --repair
-
-
-Any corrupt paths will be redownloaded if they’re available in a
-binary cache; otherwise, they cannot be repaired.
-
-
-
-
-
-
-Nix network issues
-
-Nix uses a so-called binary cache to
-optimise building a package from source into downloading it as a
-pre-built binary. That is, whenever a command like
-nixos-rebuild needs a path in the Nix store, Nix
-will try to download that path from the Internet rather than build it
-from source. The default binary cache is
-http://cache.nixos.org/. If this cache is unreachable, Nix
-operations may take a long time due to HTTP connection timeouts. You
-can disable the use of the binary cache by adding , e.g.
-
-
-$ nixos-rebuild switch --option use-binary-caches false
-
-
-If you have an alternative binary cache at your disposal, you can use
-it instead:
-
-
-$ nixos-rebuild switch --option binary-caches http://my-cache.example.org/
-
-
-
-
-
-
-
-
diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix
index 498c0a37783..50b3b424166 100644
--- a/nixos/lib/build-vms.nix
+++ b/nixos/lib/build-vms.nix
@@ -48,10 +48,11 @@ rec {
let
interfacesNumbered = zipTwoLists config.virtualisation.vlans (range 1 255);
interfaces = flip map interfacesNumbered ({ first, second }:
- nameValuePair "eth${toString second}"
- { ipAddress = "192.168.${toString first}.${toString m.second}";
- subnetMask = "255.255.255.0";
- });
+ nameValuePair "eth${toString second}" { ip4 =
+ [ { address = "192.168.${toString first}.${toString m.second}";
+ prefixLength = 24;
+ } ];
+ });
in
{ key = "ip-address";
config =
@@ -60,7 +61,7 @@ rec {
networking.interfaces = listToAttrs interfaces;
networking.primaryIPAddress =
- optionalString (interfaces != []) (head interfaces).value.ipAddress;
+ optionalString (interfaces != []) (head (head interfaces).value.ip4).address;
# Put the IP addresses of all VMs in this machine's
# /etc/hosts file. If a machine has multiple
diff --git a/nixos/lib/make-system-tarball.nix b/nixos/lib/make-system-tarball.nix
index 8fed9a34882..3bd891fdbc2 100644
--- a/nixos/lib/make-system-tarball.nix
+++ b/nixos/lib/make-system-tarball.nix
@@ -15,6 +15,9 @@
# store path whose closure will be copied, and `symlink' is a
# symlink to `object' that will be added to the tarball.
storeContents ? []
+
+ # Extra tar arguments
+, extraArgs ? ""
}:
stdenv.mkDerivation {
@@ -22,7 +25,7 @@ stdenv.mkDerivation {
builder = ./make-system-tarball.sh;
buildInputs = [perl xz];
- inherit fileName pathsFromGraph;
+ inherit fileName pathsFromGraph extraArgs;
# !!! should use XML.
sources = map (x: x.source) contents;
diff --git a/nixos/lib/make-system-tarball.sh b/nixos/lib/make-system-tarball.sh
index 096d96ac1c8..2eb668115a6 100644
--- a/nixos/lib/make-system-tarball.sh
+++ b/nixos/lib/make-system-tarball.sh
@@ -50,7 +50,7 @@ done
mkdir -p $out/tarball
-tar cvJf $out/tarball/$fileName.tar.xz *
+tar cvJf $out/tarball/$fileName.tar.xz * $extraArgs
mkdir -p $out/nix-support
echo $system > $out/nix-support/system
diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm
index e2bd3393d87..85c2bfa88e1 100644
--- a/nixos/lib/test-driver/Machine.pm
+++ b/nixos/lib/test-driver/Machine.pm
@@ -482,7 +482,7 @@ sub screenshot {
my $name = basename($filename);
$self->nest("making screenshot ‘$name’", sub {
$self->sendMonitorCommand("screendump $tmp");
- system("convert $tmp ${filename}") == 0
+ system("pnmtopng $tmp > ${filename}") == 0
or die "cannot convert screenshot";
unlink $tmp;
}, { image => $name } );
diff --git a/nixos/lib/test-driver/log2html.xsl b/nixos/lib/test-driver/log2html.xsl
index ce8a9c6de2b..0485412b4c8 100644
--- a/nixos/lib/test-driver/log2html.xsl
+++ b/nixos/lib/test-driver/log2html.xsl
@@ -9,8 +9,8 @@
-
-
+
+
Log File
diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix
index 0e23fc5d187..73b55ed6c06 100644
--- a/nixos/lib/testing.nix
+++ b/nixos/lib/testing.nix
@@ -27,7 +27,7 @@ rec {
cp ${./test-driver/Logger.pm} $libDir/Logger.pm
wrapProgram $out/bin/nixos-test-driver \
- --prefix PATH : "${pkgs.qemu_kvm}/bin:${pkgs.vde2}/bin:${imagemagick}/bin:${coreutils}/bin" \
+ --prefix PATH : "${qemu_kvm}/bin:${vde2}/bin:${netpbm}/bin:${coreutils}/bin" \
--prefix PERL5LIB : "${lib.makePerlPath [ perlPackages.TermReadLineGnu perlPackages.XMLWriter perlPackages.IOTty ]}:$out/lib/perl5/site_perl"
'';
};
@@ -41,7 +41,7 @@ rec {
requiredSystemFeatures = [ "kvm" "nixos-test" ];
- buildInputs = [ pkgs.libxslt ];
+ buildInputs = [ libxslt ];
buildCommand =
''
@@ -53,6 +53,8 @@ rec {
xsltproc --output $out/log.html ${./test-driver/log2html.xsl} $out/log.xml
ln -s ${./test-driver/logfile.css} $out/logfile.css
ln -s ${./test-driver/treebits.js} $out/treebits.js
+ ln -s ${jquery}/js/jquery.min.js $out/
+ ln -s ${jquery-ui}/js/jquery-ui.min.js $out/
touch $out/nix-support/hydra-build-products
echo "report testlog $out log.html" >> $out/nix-support/hydra-build-products
@@ -151,7 +153,7 @@ rec {
startAll;
$client->waitForUnit("multi-user.target");
${preBuild}
- $client->succeed("env -i ${pkgs.bash}/bin/bash ${buildrunner} /tmp/xchg/saved-env >&2");
+ $client->succeed("env -i ${bash}/bin/bash ${buildrunner} /tmp/xchg/saved-env >&2");
${postBuild}
$client->succeed("sync"); # flush all data before pulling the plug
'';
diff --git a/nixos/lib/utils.nix b/nixos/lib/utils.nix
index 35c56e8c32b..7b8be2050c1 100644
--- a/nixos/lib/utils.nix
+++ b/nixos/lib/utils.nix
@@ -5,6 +5,7 @@ rec {
# Escape a path according to the systemd rules, e.g. /dev/xyzzy
# becomes dev-xyzzy. FIXME: slow.
escapeSystemdPath = s:
- replaceChars ["/" "-" " "] ["-" "\\x2d" "\\x20"] (substring 1 (stringLength s) s);
+ replaceChars ["/" "-" " "] ["-" "\\x2d" "\\x20"]
+ (if hasPrefix "/" s then substring 1 (stringLength s) s else s);
}
diff --git a/nixos/maintainers/scripts/azure/create-azure.sh b/nixos/maintainers/scripts/azure/create-azure.sh
new file mode 100755
index 00000000000..f87a88404f6
--- /dev/null
+++ b/nixos/maintainers/scripts/azure/create-azure.sh
@@ -0,0 +1,11 @@
+#! /bin/sh -e
+
+BUCKET_NAME=${BUCKET_NAME:-nixos}
+export NIX_PATH=nixpkgs=../../../..
+export NIXOS_CONFIG=$(dirname $(readlink -f $0))/../../../modules/virtualisation/azure-image.nix
+export TIMESTAMP=$(date +%Y%m%d%H%M)
+
+nix-build '' \
+ -A config.system.build.azureImage --argstr system x86_64-linux -o azure --option extra-binary-caches http://hydra.nixos.org -j 10
+
+azure vm image create nixos-test --location "West Europe" --md5-skip -v --os Linux azure/disk.vhd
diff --git a/nixos/maintainers/scripts/gce/create-gce.sh b/nixos/maintainers/scripts/gce/create-gce.sh
index 8bf36f33c7d..fc476fb6e40 100755
--- a/nixos/maintainers/scripts/gce/create-gce.sh
+++ b/nixos/maintainers/scripts/gce/create-gce.sh
@@ -1,5 +1,6 @@
#! /bin/sh -e
+BUCKET_NAME=${BUCKET_NAME:-nixos}
export NIX_PATH=nixpkgs=../../../..
export NIXOS_CONFIG=$(dirname $(readlink -f $0))/../../../modules/virtualisation/google-compute-image.nix
export TIMESTAMP=$(date +%Y%m%d%H%M)
@@ -8,7 +9,7 @@ nix-build '' \
-A config.system.build.googleComputeImage --argstr system x86_64-linux -o gce --option extra-binary-caches http://hydra.nixos.org -j 10
img=$(echo gce/*.tar.gz)
-if ! gsutil ls gs://nixos/$(basename $img); then
- gsutil cp $img gs://nixos/$(basename $img)
+if ! gsutil ls gs://${BUCKET_NAME}/$(basename $img); then
+ gsutil cp $img gs://${BUCKET_NAME}/$(basename $img)
fi
-gcutil addimage $(basename $img .raw.tar.gz | sed 's|\.|-|' | sed 's|_|-|') gs://nixos/$(basename $img)
+gcloud compute images create $(basename $img .raw.tar.gz | sed 's|\.|-|' | sed 's|_|-|') --source-uri gs://${BUCKET_NAME}/$(basename $img)
diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix
index cf70ca264d6..7516d7ddf1a 100644
--- a/nixos/modules/config/fonts/fontconfig.nix
+++ b/nixos/modules/config/fonts/fontconfig.nix
@@ -47,11 +47,6 @@ with lib;
'';
- # FIXME: This variable is no longer needed, but we'll keep it
- # around for a while for applications linked against old
- # fontconfig builds.
- environment.variables.FONTCONFIG_FILE = "/etc/fonts/fonts.conf";
-
environment.systemPackages = [ pkgs.fontconfig ];
};
diff --git a/nixos/modules/config/fonts/fonts.nix b/nixos/modules/config/fonts/fonts.nix
index 49b1e1d42a3..f6060a910a1 100644
--- a/nixos/modules/config/fonts/fonts.nix
+++ b/nixos/modules/config/fonts/fonts.nix
@@ -11,7 +11,7 @@ with lib;
# TODO: find another name for it.
fonts = mkOption {
type = types.listOf types.path;
- example = [ pkgs.dejavu_fonts ];
+ example = literalExample "[ pkgs.dejavu_fonts ]";
description = "List of primary font paths.";
apply = list: list ++
[ # - the user's current profile
diff --git a/nixos/modules/config/gtk-exe-env.nix b/nixos/modules/config/gtk-exe-env.nix
new file mode 100644
index 00000000000..b565072e3a7
--- /dev/null
+++ b/nixos/modules/config/gtk-exe-env.nix
@@ -0,0 +1,41 @@
+{ config, pkgs, lib, ... }:
+
+{
+ imports = [
+ ];
+
+ options = {
+ gtkPlugins = lib.mkOption {
+ type = lib.types.listOf lib.types.path;
+ default = [];
+ description = ''
+ Plugin packages for GTK+ such as input methods.
+ '';
+ };
+ };
+
+ config = {
+ environment.variables = if builtins.length config.gtkPlugins > 0
+ then
+ let
+ paths = [ pkgs.gtk2 pkgs.gtk3 ] ++ config.gtkPlugins;
+ env = pkgs.buildEnv {
+ name = "gtk-exe-env";
+
+ inherit paths;
+
+ postBuild = lib.concatStringsSep "\n"
+ (map (d: d.gtkExeEnvPostBuild or "") paths);
+
+ ignoreCollisions = true;
+ };
+ in {
+ GTK_EXE_PREFIX = builtins.toString env;
+ GTK_PATH = [
+ "${env}/lib/gtk-2.0"
+ "${env}/lib/gtk-3.0"
+ ];
+ }
+ else {};
+ };
+}
diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix
index fd1e55f673a..136a5bda745 100644
--- a/nixos/modules/config/networking.nix
+++ b/nixos/modules/config/networking.nix
@@ -7,6 +7,9 @@ with lib;
let
cfg = config.networking;
+ dnsmasqResolve = config.services.dnsmasq.enable &&
+ config.services.dnsmasq.resolveLocalQueries;
+ hasLocalResolver = config.services.bind.enable || dnsmasqResolve;
in
@@ -74,9 +77,12 @@ in
'' + optionalString cfg.dnsSingleRequest ''
# only send one DNS request at a time
resolv_conf_options='single-request'
- '' + optionalString config.services.bind.enable ''
+ '' + optionalString hasLocalResolver ''
# This hosts runs a full-blown DNS resolver.
name_servers='127.0.0.1'
+ '' + optionalString dnsmasqResolve ''
+ dnsmasq_conf=/etc/dnsmasq-conf.conf
+ dnsmasq_resolv=/etc/dnsmasq-resolv.conf
'';
};
diff --git a/nixos/modules/config/power-management.nix b/nixos/modules/config/power-management.nix
index 17f3ed00b9b..32a7987617a 100644
--- a/nixos/modules/config/power-management.nix
+++ b/nixos/modules/config/power-management.nix
@@ -35,7 +35,9 @@ in
powerUpCommands = mkOption {
type = types.lines;
default = "";
- example = "${pkgs.hdparm}/sbin/hdparm -B 255 /dev/sda";
+ example = literalExample ''
+ "''${pkgs.hdparm}/sbin/hdparm -B 255 /dev/sda"
+ '';
description =
''
Commands executed when the machine powers up. That is,
@@ -47,7 +49,9 @@ in
powerDownCommands = mkOption {
type = types.lines;
default = "";
- example = "${pkgs.hdparm}/sbin/hdparm -B 255 /dev/sda";
+ example = literalExample ''
+ "''${pkgs.hdparm}/sbin/hdparm -B 255 /dev/sda"
+ '';
description =
''
Commands executed when the machine powers down. That is,
diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix
index 96593885e5b..737f0abc52f 100644
--- a/nixos/modules/config/pulseaudio.nix
+++ b/nixos/modules/config/pulseaudio.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, pkgs_i686, ... }:
with pkgs;
with lib;
@@ -10,10 +10,16 @@ let
systemWide = cfg.enable && cfg.systemWide;
nonSystemWide = cfg.enable && !cfg.systemWide;
- uid = config.ids.uids.pulseaudio;
- gid = config.ids.gids.pulseaudio;
+ # Forces 32bit pulseaudio and alsaPlugins to be built/supported for apps
+ # using 32bit alsa on 64bit linux.
+ enable32BitAlsaPlugins = stdenv.isx86_64 && (pkgs_i686.alsaLib != null);
- stateDir = "/run/pulse";
+ ids = config.ids;
+
+ uid = ids.uids.pulseaudio;
+ gid = ids.gids.pulseaudio;
+
+ stateDir = "/var/run/pulse";
# Create pulse/client.conf even if PulseAudio is disabled so
# that we can disable the autospawn feature in programs that
@@ -26,21 +32,25 @@ let
# Write an /etc/asound.conf that causes all ALSA applications to
# be re-routed to the PulseAudio server through ALSA's Pulse
# plugin.
- alsaConf = writeText "asound.conf" ''
+ alsaConf = writeText "asound.conf" (''
pcm_type.pulse {
- lib ${alsaPlugins}/lib/alsa-lib/libasound_module_pcm_pulse.so
+ libs.native = ${pkgs.alsaPlugins}/lib/alsa-lib/libasound_module_pcm_pulse.so ;
+ ${lib.optionalString enable32BitAlsaPlugins
+ "libs.32Bit = ${pkgs_i686.alsaPlugins}/lib/alsa-lib/libasound_module_pcm_pulse.so ;"}
}
pcm.!default {
type pulse
hint.description "Default Audio Device (via PulseAudio)"
}
ctl_type.pulse {
- lib ${alsaPlugins}/lib/alsa-lib/libasound_module_ctl_pulse.so
+ libs.native = ${alsaPlugins}/lib/alsa-lib/libasound_module_ctl_pulse.so ;
+ ${lib.optionalString enable32BitAlsaPlugins
+ "libs.32Bit = ${pkgs_i686.alsaPlugins}/lib/alsa-lib/libasound_module_ctl_pulse.so ;"}
}
ctl.!default {
type pulse
}
- '';
+ '');
in {
@@ -69,8 +79,7 @@ in {
};
configFile = mkOption {
- type = types.uniq types.path;
- default = "${cfg.package}/etc/pulse/default.pa";
+ type = types.path;
description = ''
The path to the configuration the PulseAudio server
should use. By default, the "default.pa" configuration
@@ -81,7 +90,7 @@ in {
package = mkOption {
type = types.package;
default = pulseaudioFull;
- example = literalExample "pulseaudioFull";
+ example = literalExample "pkgs.pulseaudioFull";
description = ''
The PulseAudio derivation to use. This can be used to disable
features (such as JACK support, Bluetooth) that are enabled in the
@@ -110,10 +119,15 @@ in {
target = "pulse/client.conf";
source = clientConf;
};
+
+ hardware.pulseaudio.configFile = mkDefault "${cfg.package}/etc/pulse/default.pa";
}
(mkIf cfg.enable {
- environment.systemPackages = [ cfg.package ];
+ environment.systemPackages = [
+ cfg.package
+ (lib.optional enable32BitAlsaPlugins pkgs_i686.pulseaudio)
+ ];
environment.etc = singleton {
target = "asound.conf";
@@ -138,6 +152,8 @@ in {
group = "pulse";
extraGroups = [ "audio" ];
description = "PulseAudio system service user";
+ home = stateDir;
+ createHome = true;
};
users.extraGroups.pulse.gid = gid;
@@ -147,10 +163,6 @@ in {
wantedBy = [ "sound.target" ];
before = [ "sound.target" ];
environment.PULSE_RUNTIME_PATH = stateDir;
- preStart = ''
- mkdir -p --mode 755 ${stateDir}
- chown -R pulse:pulse ${stateDir}
- '';
serviceConfig = {
ExecStart = "${cfg.package}/bin/pulseaudio -D --log-level=${cfg.daemon.logLevel} --system --use-pid-file -n --file=${cfg.configFile}";
PIDFile = "${stateDir}/pid";
diff --git a/nixos/modules/config/qt-plugin-env.nix b/nixos/modules/config/qt-plugin-env.nix
new file mode 100644
index 00000000000..c5986560416
--- /dev/null
+++ b/nixos/modules/config/qt-plugin-env.nix
@@ -0,0 +1,37 @@
+{ config, pkgs, lib, ... }:
+
+{
+ imports = [
+ ];
+
+ options = {
+ qtPlugins = lib.mkOption {
+ type = lib.types.listOf lib.types.path;
+ default = [];
+ description = ''
+ Plugin packages for Qt such as input methods.
+ '';
+ };
+ };
+
+ config = {
+ environment.variables = if builtins.length config.qtPlugins > 0
+ then
+ let
+ paths = [ pkgs.qt48 ] ++ config.qtPlugins;
+ env = pkgs.buildEnv {
+ name = "qt-plugin-env";
+
+ inherit paths;
+
+ postBuild = lib.concatStringsSep "\n"
+ (map (d: d.qtPluginEnvPostBuild or "") paths);
+
+ ignoreCollisions = true;
+ };
+ in {
+ QT_PLUGIN_PATH = [ (builtins.toString env) ];
+ }
+ else {};
+ };
+}
diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix
index cc079cdc585..e5b342afcc4 100644
--- a/nixos/modules/config/shells-environment.nix
+++ b/nixos/modules/config/shells-environment.nix
@@ -9,6 +9,23 @@ let
cfg = config.environment;
+ exportedEnvVars =
+ let
+ absoluteVariables =
+ mapAttrs (n: toList) cfg.variables;
+
+ suffixedVariables =
+ flip mapAttrs cfg.profileRelativeEnvVars (envVar: listSuffixes:
+ concatMap (profile: map (suffix: "${profile}${suffix}") listSuffixes) cfg.profiles
+ );
+
+ allVariables =
+ zipAttrsWith (n: concatLists) [ absoluteVariables suffixedVariables ];
+
+ exportVariables =
+ mapAttrsToList (n: v: ''export ${n}="${concatStringsSep ":" v}"'') allVariables;
+ in
+ concatStringsSep "\n" exportVariables;
in
{
@@ -49,22 +66,15 @@ in
type = types.listOf types.string;
};
- environment.profileVariables = mkOption {
- default = (p: {});
+ environment.profileRelativeEnvVars = mkOption {
+ type = types.attrsOf (types.listOf types.str);
+ example = { PATH = [ "/bin" "/sbin" ]; MANPATH = [ "/man" "/share/man" ]; };
description = ''
- A function which given a profile path should give back
- a set of environment variables for that profile.
+ Attribute set of environment variable. Each attribute maps to a list
+ of relative paths. Each relative path is appended to the each profile
+ of to form the content of the
+ corresponding environment variable.
'';
- # !!! this should be of the following type:
- #type = types.functionTo (types.attrsOf (types.optionSet envVar));
- # and envVar should be changed to something more like environOpts.
- # Having unique `value' _or_ multiple `list' is much more useful
- # than just sticking everything together with ':' unconditionally.
- # Anyway, to have this type mentioned above
- # types.optionSet needs to be transformed into a type constructor
- # (it has a !!! mark on that in nixpkgs)
- # for now we hack all this to be
- type = types.functionTo (types.attrsOf (types.listOf types.string));
};
# !!! isn't there a better way?
@@ -122,7 +132,9 @@ in
environment.binsh = mkOption {
default = "${config.system.build.binsh}/bin/sh";
- example = "\${pkgs.dash}/bin/dash";
+ example = literalExample ''
+ "''${pkgs.dash}/bin/dash"
+ '';
type = types.path;
description = ''
The shell executable that is linked system-wide to
@@ -163,10 +175,7 @@ in
system.build.setEnvironment = pkgs.writeText "set-environment"
''
- ${concatStringsSep "\n" (
- (mapAttrsToList (n: v: ''export ${n}="${concatStringsSep ":" v}"'')
- # This line is a kind of a hack because of !!! note above
- (zipAttrsWith (const concatLists) ([ (mapAttrs (n: v: [ v ]) cfg.variables) ] ++ map cfg.profileVariables cfg.profiles))))}
+ ${exportedEnvVars}
${cfg.extraInit}
diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix
index 83c14e45685..f3e86bfd201 100644
--- a/nixos/modules/config/system-path.nix
+++ b/nixos/modules/config/system-path.nix
@@ -63,7 +63,7 @@ in
systemPackages = mkOption {
type = types.listOf types.path;
default = [];
- example = "[ pkgs.firefox pkgs.thunderbird ]";
+ example = literalExample "[ pkgs.firefox pkgs.thunderbird ]";
description = ''
The set of packages that appear in
/run/current-system/sw. These packages are
diff --git a/nixos/modules/config/update-users-groups.pl b/nixos/modules/config/update-users-groups.pl
new file mode 100644
index 00000000000..197b65e27c4
--- /dev/null
+++ b/nixos/modules/config/update-users-groups.pl
@@ -0,0 +1,239 @@
+use strict;
+use File::Path qw(make_path);
+use File::Slurp;
+use JSON;
+
+make_path("/var/lib/nixos", { mode => 0755 });
+
+
+# Functions for allocating free GIDs/UIDs. FIXME: respect ID ranges in
+# /etc/login.defs.
+sub allocId {
+ my ($used, $idMin, $idMax, $up, $getid) = @_;
+ my $id = $up ? $idMin : $idMax;
+ while ($id >= $idMin && $id <= $idMax) {
+ if (!$used->{$id} && !defined &$getid($id)) {
+ $used->{$id} = 1;
+ return $id;
+ }
+ $used->{$id} = 1;
+ if ($up) { $id++; } else { $id--; }
+ }
+ die "$0: out of free UIDs or GIDs\n";
+}
+
+my (%gidsUsed, %uidsUsed);
+
+sub allocGid {
+ return allocId(\%gidsUsed, 400, 499, 0, sub { my ($gid) = @_; getgrgid($gid) });
+}
+
+sub allocUid {
+ my ($isSystemUser) = @_;
+ my ($min, $max, $up) = $isSystemUser ? (400, 499, 0) : (1000, 29999, 1);
+ return allocId(\%uidsUsed, $min, $max, $up, sub { my ($uid) = @_; getpwuid($uid) });
+}
+
+
+# Read the declared users/groups.
+my $spec = decode_json(read_file($ARGV[0]));
+
+# Don't allocate UIDs/GIDs that are already in use.
+foreach my $g (@{$spec->{groups}}) {
+ $gidsUsed{$g->{gid}} = 1 if defined $g->{gid};
+}
+
+foreach my $u (@{$spec->{groups}}) {
+ $uidsUsed{$u->{u}} = 1 if defined $u->{uid};
+}
+
+# Read the current /etc/group.
+sub parseGroup {
+ chomp;
+ my @f = split(':', $_, -4);
+ my $gid = $f[2] eq "" ? undef : int($f[2]);
+ $gidsUsed{$gid} = 1 if defined $gid;
+ return ($f[0], { name => $f[0], password => $f[1], gid => $gid, members => $f[3] });
+}
+
+my %groupsCur = -f "/etc/group" ? map { parseGroup } read_file("/etc/group") : ();
+
+# Read the current /etc/passwd.
+sub parseUser {
+ chomp;
+ my @f = split(':', $_, -7);
+ my $uid = $f[2] eq "" ? undef : int($f[2]);
+ $uidsUsed{$uid} = 1 if defined $uid;
+ return ($f[0], { name => $f[0], fakePassword => $f[1], uid => $uid,
+ gid => $f[3], description => $f[4], home => $f[5], shell => $f[6] });
+}
+
+my %usersCur = -f "/etc/passwd" ? map { parseUser } read_file("/etc/passwd") : ();
+
+# Read the groups that were created declaratively (i.e. not by groups)
+# in the past. These must be removed if they are no longer in the
+# current spec.
+my $declGroupsFile = "/var/lib/nixos/declarative-groups";
+my %declGroups;
+$declGroups{$_} = 1 foreach split / /, -e $declGroupsFile ? read_file($declGroupsFile) : "";
+
+# Idem for the users.
+my $declUsersFile = "/var/lib/nixos/declarative-users";
+my %declUsers;
+$declUsers{$_} = 1 foreach split / /, -e $declUsersFile ? read_file($declUsersFile) : "";
+
+
+# Generate a new /etc/group containing the declared groups.
+my %groupsOut;
+foreach my $g (@{$spec->{groups}}) {
+ my $name = $g->{name};
+ my $existing = $groupsCur{$name};
+
+ my %members = map { ($_, 1) } @{$g->{members}};
+
+ if (defined $existing) {
+ $g->{gid} = $existing->{gid} if !defined $g->{gid};
+ if ($g->{gid} != $existing->{gid}) {
+ warn "warning: not applying GID change of group ‘$name’\n";
+ $g->{gid} = $existing->{gid};
+ }
+ $g->{password} = $existing->{password}; # do we want this?
+ if ($spec->{mutableUsers}) {
+ # Merge in non-declarative group members.
+ foreach my $uname (split /,/, $existing->{members} // "") {
+ $members{$uname} = 1 if !defined $declUsers{$uname};
+ }
+ }
+ } else {
+ $g->{gid} = allocGid if !defined $g->{gid};
+ $g->{password} = "x";
+ }
+
+ $g->{members} = join ",", sort(keys(%members));
+ $groupsOut{$name} = $g;
+}
+
+# Update the persistent list of declarative groups.
+write_file($declGroupsFile, join(" ", sort(keys %groupsOut)));
+
+# Merge in the existing /etc/group.
+foreach my $name (keys %groupsCur) {
+ my $g = $groupsCur{$name};
+ next if defined $groupsOut{$name};
+ if (!$spec->{mutableUsers} || defined $declGroups{$name}) {
+ print STDERR "removing group ‘$name’\n";
+ } else {
+ $groupsOut{$name} = $g;
+ }
+}
+
+
+# Rewrite /etc/group. FIXME: acquire lock.
+my @lines = map { join(":", $_->{name}, $_->{password}, $_->{gid}, $_->{members}) . "\n" }
+ (sort { $a->{gid} <=> $b->{gid} } values(%groupsOut));
+write_file("/etc/group.tmp", @lines);
+rename("/etc/group.tmp", "/etc/group") or die;
+system("nscd --invalidate group");
+
+# Generate a new /etc/passwd containing the declared users.
+my %usersOut;
+foreach my $u (@{$spec->{users}}) {
+ my $name = $u->{name};
+
+ # Resolve the gid of the user.
+ if ($u->{group} =~ /^[0-9]$/) {
+ $u->{gid} = $u->{group};
+ } elsif (defined $groupsOut{$u->{group}}) {
+ $u->{gid} = $groupsOut{$u->{group}}->{gid} // die;
+ } else {
+ warn "warning: user ‘$name’ has unknown group ‘$u->{group}’\n";
+ $u->{gid} = 65534;
+ }
+
+ my $existing = $usersCur{$name};
+ if (defined $existing) {
+ $u->{uid} = $existing->{uid} if !defined $u->{uid};
+ if ($u->{uid} != $existing->{uid}) {
+ warn "warning: not applying UID change of user ‘$name’\n";
+ $u->{uid} = $existing->{uid};
+ }
+ } else {
+ $u->{uid} = allocUid($u->{isSystemUser}) if !defined $u->{uid};
+
+ # Create a home directory.
+ if ($u->{createHome}) {
+ make_path($u->{home}, { mode => 0700 }) if ! -e $u->{home};
+ chown $u->{uid}, $u->{gid}, $u->{home};
+ }
+ }
+
+ if (defined $u->{passwordFile}) {
+ if (-e $u->{passwordFile}) {
+ $u->{hashedPassword} = read_file($u->{passwordFile});
+ chomp $u->{hashedPassword};
+ } else {
+ warn "warning: password file ‘$u->{passwordFile}’ does not exist\n";
+ }
+ }
+
+ $u->{fakePassword} = $existing->{fakePassword} // "x";
+ $usersOut{$name} = $u;
+}
+
+# Update the persistent list of declarative users.
+write_file($declUsersFile, join(" ", sort(keys %usersOut)));
+
+# Merge in the existing /etc/passwd.
+foreach my $name (keys %usersCur) {
+ my $u = $usersCur{$name};
+ next if defined $usersOut{$name};
+ if (!$spec->{mutableUsers} || defined $declUsers{$name}) {
+ print STDERR "removing user ‘$name’\n";
+ } else {
+ $usersOut{$name} = $u;
+ }
+}
+
+# Rewrite /etc/passwd. FIXME: acquire lock.
+@lines = map { join(":", $_->{name}, $_->{fakePassword}, $_->{uid}, $_->{gid}, $_->{description}, $_->{home}, $_->{shell}) . "\n" }
+ (sort { $a->{uid} <=> $b->{uid} } (values %usersOut));
+write_file("/etc/passwd.tmp", @lines);
+rename("/etc/passwd.tmp", "/etc/passwd") or die;
+system("nscd --invalidate passwd");
+
+
+# Rewrite /etc/shadow to add new accounts or remove dead ones.
+my @shadowNew;
+my %shadowSeen;
+
+foreach my $line (-f "/etc/shadow" ? read_file("/etc/shadow") : ()) {
+ chomp $line;
+ my ($name, $password, @rest) = split(':', $line, -9);
+ my $u = $usersOut{$name};;
+ next if !defined $u;
+ $password = $u->{hashedPassword} if defined $u->{hashedPassword} && !$spec->{mutableUsers}; # FIXME
+ push @shadowNew, join(":", $name, $password, @rest) . "\n";
+ $shadowSeen{$name} = 1;
+}
+
+foreach my $u (values %usersOut) {
+ next if defined $shadowSeen{$u->{name}};
+ my $password = "!";
+ $password = $u->{hashedPassword} if defined $u->{hashedPassword};
+ # FIXME: set correct value for sp_lstchg.
+ push @shadowNew, join(":", $u->{name}, $password, "1::::::") . "\n";
+}
+
+write_file("/etc/shadow.tmp", { perms => 0600 }, @shadowNew);
+rename("/etc/shadow.tmp", "/etc/shadow") or die;
+
+
+# Call chpasswd to apply password. FIXME: generate the hashes directly
+# and merge into the /etc/shadow updating above.
+foreach my $u (@{$spec->{users}}) {
+ if (defined $u->{password}) {
+ my $pid = open(PW, "| chpasswd") or die;
+ print PW "$u->{name}:$u->{password}\n";
+ close PW or die "unable to change password of user ‘$u->{name}’: $?\n";
+ }
+}
diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index 7783f13b14b..0d3273fe053 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -7,9 +7,6 @@ let
ids = config.ids;
cfg = config.users;
- nonUidUsers = filterAttrs (n: u: u.createUser && u.uid == null) cfg.extraUsers;
- nonGidGroups = filterAttrs (n: g: g.gid == null) cfg.extraGroups;
-
passwordDescription = ''
The options hashedPassword,
password and passwordFile
@@ -55,10 +52,8 @@ let
type = with types; nullOr int;
default = null;
description = ''
- The account UID. If the option
- is false, the UID cannot be null. Otherwise, the UID might be
- null, in which case a free UID is picked on activation (by the
- useradd command).
+ The account UID. If the UID is null, a free UID is picked on
+ activation.
'';
};
@@ -67,8 +62,7 @@ let
default = false;
description = ''
Indicates if the user is a system user or not. This option
- only has an effect if is
- true and is
+ only has an effect if is
, in which case it determines whether
the user's UID is allocated in the range for system users
(below 500) or in the range for normal users (starting at
@@ -76,6 +70,21 @@ let
'';
};
+ isNormalUser = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Indicates whether this is an account for a “real” user. This
+ automatically sets to
+ users, to
+ true, to
+ /home/username,
+ to true,
+ and to
+ false.
+ '';
+ };
+
group = mkOption {
type = types.str;
default = "nogroup";
@@ -100,6 +109,36 @@ let
description = "The path to the user's shell.";
};
+ subUidRanges = mkOption {
+ type = types.listOf types.optionSet;
+ default = [];
+ example = [
+ { startUid = 1000; count = 1; }
+ { startUid = 100001; count = 65534; }
+ ];
+ options = [ subordinateUidRange ];
+ description = ''
+ Subordinate user ids that user is allowed to use.
+ They are set into /etc/subuid and are used
+ by newuidmap for user namespaces.
+ '';
+ };
+
+ subGidRanges = mkOption {
+ type = types.listOf types.optionSet;
+ default = [];
+ example = [
+ { startGid = 100; count = 1; }
+ { startGid = 1001; count = 999; }
+ ];
+ options = [ subordinateGidRange ];
+ description = ''
+ Subordinate group ids that user is allowed to use.
+ They are set into /etc/subgid and are used
+ by newgidmap for user namespaces.
+ '';
+ };
+
createHome = mkOption {
type = types.bool;
default = false;
@@ -152,22 +191,20 @@ let
${passwordDescription}
'';
};
-
- createUser = mkOption {
- type = types.bool;
- default = true;
- description = ''
- Indicates if the user should be created automatically as a local user.
- Set this to false if the user for instance is an LDAP user. NixOS will
- then not modify any of the basic properties for the user account.
- '';
- };
};
- config = {
- name = mkDefault name;
- shell = mkIf config.useDefaultShell (mkDefault cfg.defaultUserShell);
- };
+ config = mkMerge
+ [ { name = mkDefault name;
+ shell = mkIf config.useDefaultShell (mkDefault cfg.defaultUserShell);
+ }
+ (mkIf config.isNormalUser {
+ group = mkDefault "users";
+ createHome = mkDefault true;
+ home = mkDefault "/home/${name}";
+ useDefaultShell = mkDefault true;
+ isSystemUser = mkDefault false;
+ })
+ ];
};
@@ -187,10 +224,8 @@ let
type = with types; nullOr int;
default = null;
description = ''
- The group GID. If the mutableUsers option
- is false, the GID cannot be null. Otherwise, the GID might be
- null, in which case a free GID is picked on activation (by the
- groupadd command).
+ The group GID. If the GID is null, a free GID is picked on
+ activation.
'';
};
@@ -211,83 +246,47 @@ let
};
- getGroup = gname:
- let
- groups = mapAttrsToList (n: g: g) (
- filterAttrs (n: g: g.name == gname) cfg.extraGroups
- );
- in
- if length groups == 1 then head groups
- else if groups == [] then throw "Group ${gname} not defined"
- else throw "Group ${gname} has multiple definitions";
+ subordinateUidRange = {
+ startUid = mkOption {
+ type = types.int;
+ description = ''
+ Start of the range of subordinate user ids that user is
+ allowed to use.
+ '';
+ };
+ count = mkOption {
+ type = types.int;
+ default = 1;
+ description = ''Count of subordinate user ids'';
+ };
+ };
- getUser = uname:
- let
- users = mapAttrsToList (n: u: u) (
- filterAttrs (n: u: u.name == uname) cfg.extraUsers
- );
- in
- if length users == 1 then head users
- else if users == [] then throw "User ${uname} not defined"
- else throw "User ${uname} has multiple definitions";
+ subordinateGidRange = {
+ startGid = mkOption {
+ type = types.int;
+ description = ''
+ Start of the range of subordinate group ids that user is
+ allowed to use.
+ '';
+ };
+ count = mkOption {
+ type = types.int;
+ default = 1;
+ description = ''Count of subordinate group ids'';
+ };
+ };
- mkGroupEntry = gname:
- let
- g = getGroup gname;
- users = mapAttrsToList (n: u: u.name) (
- filterAttrs (n: u: elem g.name u.extraGroups) cfg.extraUsers
- );
- in concatStringsSep ":" [
- g.name "x" (toString g.gid)
- (concatStringsSep "," (users ++ (filter (u: !(elem u users)) g.members)))
- ];
+ mkSubuidEntry = user: concatStrings (
+ map (range: "${user.name}:${toString range.startUid}:${toString range.count}\n")
+ user.subUidRanges);
- mkPasswdEntry = uname: let u = getUser uname; in
- concatStringsSep ":" [
- u.name "x" (toString u.uid)
- (toString (getGroup u.group).gid)
- u.description u.home u.shell
- ];
+ subuidFile = concatStrings (map mkSubuidEntry (attrValues cfg.extraUsers));
- sortOn = a: sort (as1: as2: lessThan (getAttr a as1) (getAttr a as2));
+ mkSubgidEntry = user: concatStrings (
+ map (range: "${user.name}:${toString range.startGid}:${toString range.count}\n")
+ user.subGidRanges);
- groupFile = pkgs.writeText "group" (
- concatStringsSep "\n" (map (g: mkGroupEntry g.name) (
- let f = g: g.gid != null; in
- sortOn "gid" (filter f (attrValues cfg.extraGroups))
- ))
- );
-
- passwdFile = pkgs.writeText "passwd" (
- concatStringsSep "\n" (map (u: mkPasswdEntry u.name) (
- let f = u: u.createUser && (u.uid != null); in
- sortOn "uid" (filter f (attrValues cfg.extraUsers))
- ))
- );
-
- # If mutableUsers is true, this script adds all users/groups defined in
- # users.extra{Users,Groups} to /etc/{passwd,group} iff there isn't any
- # existing user/group with the same name in those files.
- # If mutableUsers is false, the /etc/{passwd,group} files will simply be
- # replaced with the users/groups defined in the NixOS configuration.
- # The merging procedure could certainly be improved, and instead of just
- # keeping the lines as-is from /etc/{passwd,group} they could be combined
- # in some way with the generated content from the NixOS configuration.
- merger = src: pkgs.writeScript "merger" ''
- #!${pkgs.bash}/bin/bash
-
- PATH=${pkgs.gawk}/bin:${pkgs.gnugrep}/bin:$PATH
-
- ${if !cfg.mutableUsers
- then ''cp ${src} $1.tmp''
- else ''awk -F: '{ print "^"$1":.*" }' $1 | egrep -vf - ${src} | cat $1 - > $1.tmp''
- }
-
- # set mtime to +1, otherwise change might go unnoticed (vipw/vigr only looks at mtime)
- touch -m -t $(date -d @$(($(stat -c %Y $1)+1)) +%Y%m%d%H%M.%S) $1.tmp
-
- mv -f $1.tmp $1
- '';
+ subgidFile = concatStrings (map mkSubgidEntry (attrValues cfg.extraUsers));
idsAreUnique = set: idAttr: !(fold (name: args@{ dup, acc }:
let
@@ -302,6 +301,21 @@ let
uidsAreUnique = idsAreUnique (filterAttrs (n: u: u.uid != null) cfg.extraUsers) "uid";
gidsAreUnique = idsAreUnique (filterAttrs (n: g: g.gid != null) cfg.extraGroups) "gid";
+ spec = pkgs.writeText "users-groups.json" (builtins.toJSON {
+ inherit (cfg) mutableUsers;
+ users = mapAttrsToList (n: u:
+ { inherit (u)
+ name uid group description home shell createHome isSystemUser
+ password passwordFile hashedPassword;
+ }) cfg.extraUsers;
+ groups = mapAttrsToList (n: g:
+ { inherit (g) name gid;
+ members = g.members ++ (mapAttrsToList (n: u: u.name) (
+ filterAttrs (n: u: elem g.name u.extraGroups) cfg.extraUsers
+ ));
+ }) cfg.extraGroups;
+ });
+
in {
###### interface
@@ -438,81 +452,29 @@ in {
grsecurity.gid = ids.gids.grsecurity;
};
- system.activationScripts.users =
- let
- mkhomeUsers = filterAttrs (n: u: u.createHome) cfg.extraUsers;
- setpwUsers = filterAttrs (n: u: u.createUser) cfg.extraUsers;
- pwFile = u: if !(isNull u.hashedPassword)
- then pkgs.writeTextFile { name = "password-file"; text = u.hashedPassword; }
- else if !(isNull u.password)
- then pkgs.runCommand "password-file" { pw = u.password; } ''
- echo -n "$pw" | ${pkgs.mkpasswd}/bin/mkpasswd -s > $out
- '' else u.passwordFile;
- setpw = n: u: ''
- setpw=yes
- ${optionalString cfg.mutableUsers ''
- test "$(getent shadow '${u.name}' | cut -d: -f2)" != "x" && setpw=no
- ''}
- if [ "$setpw" == "yes" ]; then
- ${if !(isNull (pwFile u))
- then ''
- echo -n "${u.name}:" | cat - "${pwFile u}" | \
- ${pkgs.shadow}/sbin/chpasswd -e
- ''
- else "passwd -l '${u.name}' &>/dev/null"
- }
- fi
- '';
- mkhome = n: u: ''
- uid="$(id -u ${u.name})"
- gid="$(id -g ${u.name})"
- h="${u.home}"
- test -a "$h" || mkdir -p "$h" || true
- test "$(stat -c %u "$h")" = $uid || chown $uid "$h" || true
- test "$(stat -c %g "$h")" = $gid || chgrp $gid "$h" || true
- '';
- groupadd = n: g: ''
- if [ -z "$(getent group "${g.name}")" ]; then
- ${pkgs.shadow}/sbin/groupadd "${g.name}"
- fi
- '';
- useradd = n: u: ''
- if ! id "${u.name}" &>/dev/null; then
- ${pkgs.shadow}/sbin/useradd \
- -g "${u.group}" \
- -G "${concatStringsSep "," u.extraGroups}" \
- -s "${u.shell}" \
- -d "${u.home}" \
- ${optionalString u.isSystemUser "--system"} \
- "${u.name}"
- echo "${u.name}:x" | ${pkgs.shadow}/sbin/chpasswd -e
- fi
- '';
- in stringAfter [ "etc" ] ''
- touch /etc/group
- touch /etc/passwd
- VISUAL=${merger groupFile} ${pkgs.shadow}/sbin/vigr &>/dev/null
- VISUAL=${merger passwdFile} ${pkgs.shadow}/sbin/vipw &>/dev/null
- ${pkgs.shadow}/sbin/grpconv
- ${pkgs.shadow}/sbin/pwconv
- ${concatStrings (mapAttrsToList groupadd nonGidGroups)}
- ${concatStrings (mapAttrsToList useradd nonUidUsers)}
- ${concatStrings (mapAttrsToList mkhome mkhomeUsers)}
- ${concatStrings (mapAttrsToList setpw setpwUsers)}
+ system.activationScripts.users = stringAfter [ "etc" ]
+ ''
+ ${pkgs.perl}/bin/perl -w \
+ -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl \
+ -I${pkgs.perlPackages.JSON}/lib/perl5/site_perl \
+ ${./update-users-groups.pl} ${spec}
'';
# for backwards compatibility
system.activationScripts.groups = stringAfter [ "users" ] "";
+ environment.etc."subuid" = {
+ text = subuidFile;
+ mode = "0644";
+ };
+ environment.etc."subgid" = {
+ text = subgidFile;
+ mode = "0644";
+ };
+
assertions = [
{ assertion = !cfg.enforceIdUniqueness || (uidsAreUnique && gidsAreUnique);
- message = "uids and gids must be unique!";
- }
- { assertion = cfg.mutableUsers || (nonUidUsers == {});
- message = "When mutableUsers is false, no uid can be null: ${toString (attrNames nonUidUsers)}";
- }
- { assertion = cfg.mutableUsers || (nonGidGroups == {});
- message = "When mutableUsers is false, no gid can be null";
+ message = "UIDs and GIDs must be unique!";
}
];
diff --git a/nixos/modules/config/vpnc.nix b/nixos/modules/config/vpnc.nix
new file mode 100644
index 00000000000..68d755232eb
--- /dev/null
+++ b/nixos/modules/config/vpnc.nix
@@ -0,0 +1,41 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.networking.vpnc;
+ mkServiceDef = name: value:
+ {
+ name = "vpnc/${name}.conf";
+ value = { text = value; };
+ };
+
+in
+{
+ options = {
+ networking.vpnc = {
+ services = mkOption {
+ type = types.attrsOf types.str;
+ default = {};
+ example = {
+ test =
+ ''
+ IPSec gateway 192.168.1.1
+ IPSec ID someID
+ IPSec secret secretKey
+ Xauth username name
+ Xauth password pass
+ '';
+ };
+ description =
+ ''
+ The names of cisco VPNs and their associated definitions
+ '';
+ };
+ };
+ };
+
+ config.environment.etc = mapAttrs' mkServiceDef cfg.services;
+}
+
+
diff --git a/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix
index f894c830eb6..1777c200dd1 100644
--- a/nixos/modules/hardware/opengl.nix
+++ b/nixos/modules/hardware/opengl.nix
@@ -46,7 +46,8 @@ in
description = ''
On 64-bit systems, whether to support Direct Rendering for
32-bit applications (such as Wine). This is currently only
- supported for the nvidia driver and for
+ supported for the nvidia and
+ ati_unfree drivers, as well as
Mesa.
'';
};
@@ -104,22 +105,9 @@ in
environment.sessionVariables.LD_LIBRARY_PATH =
[ "/run/opengl-driver/lib" "/run/opengl-driver-32/lib" ];
- # FIXME: move this into card-specific modules.
- hardware.opengl.package = mkDefault
- (if elem "ati_unfree" videoDrivers then
- kernelPackages.ati_drivers_x11
- else
- makePackage pkgs);
-
+ hardware.opengl.package = mkDefault (makePackage pkgs);
hardware.opengl.package32 = mkDefault (makePackage pkgs_i686);
- boot.extraModulePackages =
- optional (elem "virtualbox" videoDrivers) kernelPackages.virtualboxGuestAdditions ++
- optional (elem "ati_unfree" videoDrivers) kernelPackages.ati_drivers_x11;
-
- environment.etc =
- optionalAttrs (elem "ati_unfree" videoDrivers) {
- "ati".source = "${kernelPackages.ati_drivers_x11}/etc/ati";
- };
+ boot.extraModulePackages = optional (elem "virtualbox" videoDrivers) kernelPackages.virtualboxGuestAdditions;
};
}
diff --git a/nixos/modules/hardware/video/ati.nix b/nixos/modules/hardware/video/ati.nix
new file mode 100644
index 00000000000..033e49d2233
--- /dev/null
+++ b/nixos/modules/hardware/video/ati.nix
@@ -0,0 +1,37 @@
+# This module provides the proprietary ATI X11 / OpenGL drivers.
+
+{ config, lib, pkgs, pkgs_i686, ... }:
+
+with lib;
+
+let
+
+ drivers = config.services.xserver.videoDrivers;
+
+ enabled = elem "ati_unfree" drivers;
+
+ ati_x11 = config.boot.kernelPackages.ati_drivers_x11;
+
+in
+
+{
+
+ config = mkIf enabled {
+
+ services.xserver.drivers = singleton
+ { name = "fglrx"; modules = [ ati_x11 ]; libPath = [ "${ati_x11}/lib" ]; };
+
+ hardware.opengl.package = ati_x11;
+ hardware.opengl.package32 = pkgs_i686.linuxPackages.ati_drivers_x11.override { libsOnly = true; kernel = null; };
+
+ environment.systemPackages = [ ati_x11 ];
+
+ boot.extraModulePackages = [ ati_x11 ];
+
+ boot.blacklistedKernelModules = [ "radeon" ];
+
+ environment.etc."ati".source = "${ati_x11}/etc/ati";
+
+ };
+
+}
diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
index d43fa220381..22f31c46080 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -11,7 +11,7 @@ let
# The Grub image.
grubImage = pkgs.runCommand "grub_eltorito" {}
''
- ${pkgs.grub2}/bin/grub-mkimage -O i386-pc -o tmp biosdisk iso9660 help linux linux16 chain png jpeg echo gfxmenu reboot
+ ${pkgs.grub2}/bin/grub-mkimage -p /boot/grub -O i386-pc -o tmp biosdisk iso9660 help linux linux16 chain png jpeg echo gfxmenu reboot
cat ${pkgs.grub2}/lib/grub/*/cdboot.img tmp > $out
''; # */
@@ -113,11 +113,12 @@ in
};
isoImage.contents = mkOption {
- example =
+ example = literalExample ''
[ { source = pkgs.memtest86 + "/memtest.bin";
target = "boot/memtest.bin";
}
- ];
+ ]
+ '';
description = ''
This option lists files to be copied to fixed locations in the
generated ISO image.
@@ -125,7 +126,7 @@ in
};
isoImage.storeContents = mkOption {
- example = [pkgs.stdenv];
+ example = literalExample "[ pkgs.stdenv ]";
description = ''
This option lists additional derivations to be included in the
Nix store in the generated ISO image.
diff --git a/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix b/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
index c2a11a1a8b3..7d3346e4ea1 100644
--- a/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
+++ b/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
@@ -79,7 +79,6 @@ in
pkgs.jfsrec
# Some compression/archiver tools.
- pkgs.unrar
pkgs.unzip
pkgs.zip
pkgs.xz
diff --git a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
index 2ed70c1daa9..4ce7582c166 100644
--- a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
+++ b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
@@ -70,7 +70,6 @@ in
pkgs.btrfsProgs
# Some compression/archiver tools.
- pkgs.unrar
pkgs.unzip
pkgs.zip
pkgs.xz
diff --git a/nixos/modules/installer/cd-dvd/system-tarball.nix b/nixos/modules/installer/cd-dvd/system-tarball.nix
index eaecbe1381f..c24fe97fba4 100644
--- a/nixos/modules/installer/cd-dvd/system-tarball.nix
+++ b/nixos/modules/installer/cd-dvd/system-tarball.nix
@@ -15,11 +15,12 @@ in
{
options = {
tarball.contents = mkOption {
- example =
+ example = literalExample ''
[ { source = pkgs.memtest86 + "/memtest.bin";
target = "boot/memtest.bin";
}
- ];
+ ]
+ '';
description = ''
This option lists files to be copied to fixed locations in the
generated ISO image.
@@ -27,7 +28,7 @@ in
};
tarball.storeContents = mkOption {
- example = [pkgs.stdenv];
+ example = literalExample "[ pkgs.stdenv ]";
description = ''
This option lists additional derivations to be included in the
Nix store in the generated ISO image.
diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index 66a8152a3a6..e8f100d6498 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -20,6 +20,13 @@ sub uniq {
return @res;
}
+sub runCommand {
+ my ($cmd) = @_;
+ open FILE, "$cmd 2>&1 |" or die "Failed to execute: $cmd\n";
+ my @ret = ;
+ close FILE;
+ return ($?, @ret);
+}
# Process the command line.
my $outDir = "/etc/nixos";
@@ -304,10 +311,13 @@ foreach my $fs (read_file("/proc/self/mountinfo")) {
# Maybe this is a bind-mount of a filesystem we saw earlier?
if (defined $fsByDev{$fields[2]}) {
- my $path = $fields[3]; $path = "" if $path eq "/";
- my $base = $fsByDev{$fields[2]};
- $base = "" if $base eq "/";
- $fileSystems .= < 0) {
+ die "Btrfs subvol name for $mountPoint listed multiple times in mount\n"
+ } elsif ($#ids == 0) {
+ my ($status, @path_info) = runCommand("btrfs subvol list $rootDir$mountPoint");
+ if ($status != 0) {
+ die "Failed to find $mountPoint subvolume id from btrfs\n";
+ }
+ my @paths = join("", @path_info) =~ m/ID $ids[0] [^\n]* path ([^\n]*)/;
+ if ($#paths > 0) {
+ die "Btrfs returned multiple paths for a single subvolume id, mountpoint $mountPoint\n";
+ } elsif ($#paths != 0) {
+ die "Btrfs did not return a path for the subvolume at $mountPoint\n";
+ }
+ push @extraOptions, "subvol=$paths[0]";
+ }
+ }
+
# Emit the filesystem.
$fileSystems .= <
# * install the boot loader
+# Ensure a consistent umask.
+umask 0022
+
# Re-exec ourselves in a private mount namespace so that our bind
# mounts get cleaned up automatically.
if [ "$(id -u)" = 0 ]; then
@@ -243,7 +246,7 @@ chroot $mountPoint /nix/var/nix/profiles/system/activate
# Ask the user to set a root password.
if [ -t 0 ] ; then
echo "setting root password..."
- chroot $mountPoint passwd
+ chroot $mountPoint /var/setuid-wrappers/passwd
fi
diff --git a/nixos/modules/installer/tools/nixos-option.sh b/nixos/modules/installer/tools/nixos-option.sh
index edc94d73208..96d09c3a605 100644
--- a/nixos/modules/installer/tools/nixos-option.sh
+++ b/nixos/modules/installer/tools/nixos-option.sh
@@ -11,9 +11,6 @@ usage () {
# Process Arguments #
#####################
-desc=false
-defs=false
-value=false
xml=false
verbose=false
@@ -24,14 +21,11 @@ for arg; do
if test -z "$argfun"; then
case $arg in
-*)
- longarg=""
sarg="$arg"
+ longarg=""
while test "$sarg" != "-"; do
case $sarg in
--*) longarg=$arg; sarg="--";;
- -d*) longarg="$longarg --description";;
- -v*) longarg="$longarg --value";;
- -l*) longarg="$longarg --lookup";;
-*) usage;;
esac
# remove the first letter option
@@ -42,9 +36,6 @@ for arg; do
esac
for larg in $longarg; do
case $larg in
- --description) desc=true;;
- --value) value=true;;
- --lookup) defs=true;;
--xml) xml=true;;
--verbose) verbose=true;;
--help) usage;;
@@ -67,16 +58,6 @@ for arg; do
fi
done
-if $xml; then
- value=true
- desc=true
- defs=true
-fi
-
-if ! $defs && ! $desc; then
- value=true
-fi
-
if $verbose; then
set -x
else
@@ -95,8 +76,7 @@ evalAttr(){
local prefix="$1"
local strict="$2"
local suffix="$3"
- echo "(import {}).$prefix${option:+.$option}${suffix:+.$suffix}" |
- evalNix ${strict:+--strict}
+ echo "(import {}).$prefix${option:+.$option}${suffix:+.$suffix}" | evalNix ${strict:+--strict}
}
evalOpt(){
@@ -189,35 +169,37 @@ EOF
fi
if test "$(evalOpt "_type" 2> /dev/null)" = '"option"'; then
- $value && evalCfg 1
+ echo "Value:"
+ evalCfg 1
- if $desc; then
- $value && echo;
+ echo
- if default=$(evalOpt "default" - 2> /dev/null); then
- echo "Default: $default"
- else
- echo "Default: "
- fi
- if example=$(evalOpt "example" - 2> /dev/null); then
- echo "Example: $example"
- fi
- echo "Description:"
- eval printf $(evalOpt "description")
+ echo "Default:"
+ if default=$(evalOpt "default" - 2> /dev/null); then
+ echo "$default"
+ else
+ echo ""
fi
-
- if $defs; then
- $desc || $value && echo;
-
- printPath () { echo " $1"; }
-
- echo "Declared by:"
- nixMap printPath "$(findSources "declarations")"
- echo ""
- echo "Defined by:"
- nixMap printPath "$(findSources "files")"
- echo ""
+ echo
+ if example=$(evalOpt "example" - 2> /dev/null); then
+ echo "Example:"
+ echo "$example"
+ echo
fi
+ echo "Description:"
+ echo
+ eval printf $(evalOpt "description")
+
+ echo $desc;
+
+ printPath () { echo " $1"; }
+
+ echo "Declared by:"
+ nixMap printPath "$(findSources "declarations")"
+ echo
+ echo "Defined by:"
+ nixMap printPath "$(findSources "files")"
+ echo
else
# echo 1>&2 "Warning: This value is not an option."
diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh
index 52b64c37578..5daa9ff9457 100644
--- a/nixos/modules/installer/tools/nixos-rebuild.sh
+++ b/nixos/modules/installer/tools/nixos-rebuild.sh
@@ -194,13 +194,13 @@ if [ -z "$rollback" ]; then
nix-env "${extraBuildFlags[@]}" -p "$profile" -f '' --set -A system
pathToConfig="$profile"
elif [ "$action" = test -o "$action" = build -o "$action" = dry-run ]; then
- nix-build '' -A system -K -k "${extraBuildFlags[@]}" > /dev/null
+ nix-build '' -A system -k "${extraBuildFlags[@]}" > /dev/null
pathToConfig=./result
elif [ "$action" = build-vm ]; then
- nix-build '' -A vm -K -k "${extraBuildFlags[@]}" > /dev/null
+ nix-build '' -A vm -k "${extraBuildFlags[@]}" > /dev/null
pathToConfig=./result
elif [ "$action" = build-vm-with-bootloader ]; then
- nix-build '' -A vmWithBootLoader -K -k "${extraBuildFlags[@]}" > /dev/null
+ nix-build '' -A vmWithBootLoader -k "${extraBuildFlags[@]}" > /dev/null
pathToConfig=./result
else
showSyntax
@@ -226,7 +226,7 @@ fi
# default and/or activate it now.
if [ "$action" = switch -o "$action" = boot -o "$action" = test ]; then
if ! $pathToConfig/bin/switch-to-configuration "$action"; then
- echo "warning: there were error switching to the new configuration" >&2
+ echo "warning: error(s) occured while switching to the new configuration" >&2
exit 1
fi
fi
diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix
index 39da2f1f0be..91a30695a7a 100644
--- a/nixos/modules/installer/tools/tools.nix
+++ b/nixos/modules/installer/tools/tools.nix
@@ -38,6 +38,7 @@ let
nixos-generate-config = makeProg {
name = "nixos-generate-config";
src = ./nixos-generate-config.pl;
+ path = [ pkgs.btrfsProgs ];
perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl";
};
diff --git a/nixos/modules/installer/virtualbox-demo.nix b/nixos/modules/installer/virtualbox-demo.nix
index f68f8dc40aa..49ec0899610 100644
--- a/nixos/modules/installer/virtualbox-demo.nix
+++ b/nixos/modules/installer/virtualbox-demo.nix
@@ -10,6 +10,9 @@ with lib;
../profiles/clone-config.nix
];
+ # FIXME: UUID detection is currently broken
+ boot.loader.grub.fsIdentifier = "provided";
+
# Allow mounting of shared folders.
users.extraUsers.demo.extraGroups = [ "vboxsf" ];
diff --git a/nixos/modules/misc/crashdump.nix b/nixos/modules/misc/crashdump.nix
index d68f38bae2f..773b5ac9da3 100644
--- a/nixos/modules/misc/crashdump.nix
+++ b/nixos/modules/misc/crashdump.nix
@@ -28,7 +28,7 @@ in
# We don't want to evaluate all of linuxPackages for the manual
# - some of it might not even evaluate correctly.
defaultText = "pkgs.linuxPackages";
- example = "pkgs.linuxPackages_2_6_25";
+ example = literalExample "pkgs.linuxPackages_2_6_25";
description = ''
This will override the boot.kernelPackages, and will add some
kernel configuration parameters for the crash dump to work.
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 99a33f68735..fa51f831481 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -82,7 +82,7 @@
statsd = 69;
transmission = 70;
postgres = 71;
- smbguest = 74;
+ smbguest = 74; # unused
varnish = 75;
datadog = 76;
lighttpd = 77;
@@ -147,6 +147,13 @@
riemann = 137;
riemanndash = 138;
radvd = 139;
+ zookeeper = 140;
+ dnsmasq = 141;
+ uhub = 142;
+ yandexdisk = 143;
+ collectd = 144;
+ consul = 145;
+ mailpile = 146;
# When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
@@ -215,7 +222,7 @@
postgres = 71;
vboxusers = 72;
vboxsf = 73;
- smbguest = 74;
+ smbguest = 74; # unused
varnish = 75;
datadog = 76;
lighttpd = 77;
@@ -266,6 +273,8 @@
mlmmj = 135;
riemann = 137;
riemanndash = 138;
+ uhub = 142;
+ mailpile = 146;
# When adding a gid, make sure it doesn't match an existing uid. And don't use gids above 399!
diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix
index 7de63c60649..f3ed2aaba09 100644
--- a/nixos/modules/misc/locate.nix
+++ b/nixos/modules/misc/locate.nix
@@ -41,7 +41,7 @@ in {
output = mkOption {
type = types.path;
- default = /var/cache/locatedb;
+ default = "/var/cache/locatedb";
description = ''
The database file to build.
'';
diff --git a/nixos/modules/misc/meta.nix b/nixos/modules/misc/meta.nix
new file mode 100644
index 00000000000..22622706f2c
--- /dev/null
+++ b/nixos/modules/misc/meta.nix
@@ -0,0 +1,63 @@
+{ config, lib, ... }:
+
+with lib;
+
+let
+ maintainer = mkOptionType {
+ name = "maintainer";
+ check = email: elem email (attrValues lib.maintainers);
+ merge = loc: defs: listToAttrs (singleton (nameValuePair (last defs).file (last defs).value));
+ };
+
+ listOfMaintainers = types.listOf maintainer // {
+ # Returns list of
+ # { "module-file" = [
+ # "maintainer1 "
+ # "maintainer2 " ];
+ # }
+ merge = loc: defs:
+ zipAttrs
+ (flatten (imap (n: def: imap (m: def':
+ maintainer.merge (loc ++ ["[${toString n}-${toString m}]"])
+ [{ inherit (def) file; value = def'; }]) def.value) defs));
+ };
+
+ docFile = types.path // {
+ # Returns tuples of
+ # { file = "module location"; value = ; }
+ merge = loc: defs: defs;
+ };
+in
+
+{
+ options = {
+ meta = {
+
+ maintainers = mkOption {
+ type = listOfMaintainers;
+ internal = true;
+ default = [];
+ example = [ lib.maintainers.all ];
+ description = ''
+ List of maintainers of each module. This option should be defined at
+ most once per module.
+ '';
+ };
+
+ doc = mkOption {
+ type = docFile;
+ internal = true;
+ example = "./meta.xml";
+ description = ''
+ Documentation prologe for the set of options of each module. This
+ option should be defined at most once per module.
+ '';
+ };
+
+ };
+ };
+
+ config = {
+ meta.maintainers = singleton lib.maintainers.pierron;
+ };
+}
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
old mode 100644
new mode 100755
index 59c69f060b9..3db44a4d8de
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -5,6 +5,7 @@
./config/fonts/fonts.nix
./config/fonts/ghostscript.nix
./config/gnu.nix
+ ./config/gtk-exe-env.nix
./config/i18n.nix
./config/krb5.nix
./config/ldap.nix
@@ -13,12 +14,14 @@
./config/nsswitch.nix
./config/power-management.nix
./config/pulseaudio.nix
+ ./config/qt-plugin-env.nix
./config/shells-environment.nix
./config/swap.nix
./config/sysctl.nix
./config/system-environment.nix
./config/system-path.nix
./config/timezone.nix
+ ./config/vpnc.nix
./config/unix-odbc-drivers.nix
./config/users-groups.nix
./config/zram.nix
@@ -35,6 +38,7 @@
./hardware/pcmcia.nix
./hardware/video/bumblebee.nix
./hardware/video/nvidia.nix
+ ./hardware/video/ati.nix
./installer/tools/nixos-checkout.nix
./installer/tools/tools.nix
./misc/assertions.nix
@@ -43,6 +47,7 @@
./misc/ids.nix
./misc/lib.nix
./misc/locate.nix
+ ./misc/meta.nix
./misc/nixpkgs.nix
./misc/passthru.nix
./misc/version.nix
@@ -59,8 +64,10 @@
./programs/shell.nix
./programs/ssh.nix
./programs/ssmtp.nix
+ ./programs/uim.nix
./programs/venus.nix
./programs/wvdial.nix
+ ./programs/freetds.nix
./programs/zsh/zsh.nix
./rename.nix
./security/apparmor.nix
@@ -79,7 +86,8 @@
./services/amqp/activemq/default.nix
./services/amqp/rabbitmq.nix
./services/audio/alsa.nix
- ./services/audio/fuppes.nix
+ # Disabled as fuppes it does no longer builds.
+ # ./services/audio/fuppes.nix
./services/audio/mpd.nix
./services/audio/mopidy.nix
./services/backup/almir.nix
@@ -89,6 +97,8 @@
./services/backup/rsnapshot.nix
./services/backup/sitecopy-backup.nix
./services/backup/tarsnap.nix
+ ./services/computing/torque/server.nix
+ ./services/computing/torque/mom.nix
./services/continuous-integration/jenkins/default.nix
./services/continuous-integration/jenkins/slave.nix
./services/databases/4store-endpoint.nix
@@ -133,6 +143,7 @@
./services/hardware/udev.nix
./services/hardware/udisks2.nix
./services/hardware/upower.nix
+ ./services/hardware/thermald.nix
./services/logging/klogd.nix
./services/logging/logcheck.nix
./services/logging/logrotate.nix
@@ -148,6 +159,7 @@
./services/mail/postfix.nix
./services/mail/spamassassin.nix
#./services/misc/autofs.nix
+ ./services/misc/cpuminer-cryptonight.nix
./services/misc/cgminer.nix
./services/misc/dictd.nix
./services/misc/disnix.nix
@@ -155,16 +167,22 @@
./services/misc/folding-at-home.nix
./services/misc/gitolite.nix
./services/misc/gpsd.nix
+ ./services/misc/mesos-master.nix
+ ./services/misc/mesos-slave.nix
./services/misc/nix-daemon.nix
./services/misc/nix-gc.nix
./services/misc/nixos-manual.nix
./services/misc/nix-ssh-serve.nix
+ ./services/misc/phd.nix
./services/misc/rippled.nix
./services/misc/rogue.nix
./services/misc/siproxd.nix
./services/misc/svnserve.nix
./services/misc/synergy.nix
+ ./services/misc/uhub.nix
+ ./services/misc/zookeeper.nix
./services/monitoring/apcupsd.nix
+ ./services/monitoring/collectd.nix
./services/monitoring/dd-agent.nix
./services/monitoring/graphite.nix
./services/monitoring/monit.nix
@@ -184,7 +202,10 @@
./services/network-filesystems/openafs-client/default.nix
./services/network-filesystems/rsyncd.nix
./services/network-filesystems/samba.nix
+ ./services/network-filesystems/diod.nix
+ ./services/network-filesystems/yandex-disk.nix
./services/networking/amuled.nix
+ ./services/networking/atftpd.nix
./services/networking/avahi-daemon.nix
./services/networking/bind.nix
./services/networking/bitlbee.nix
@@ -193,6 +214,7 @@
./services/networking/cjdns.nix
./services/networking/cntlm.nix
./services/networking/connman.nix
+ ./services/networking/consul.nix
./services/networking/ddclient.nix
./services/networking/dhcpcd.nix
./services/networking/dhcpd.nix
@@ -211,6 +233,7 @@
./services/networking/iodined.nix
./services/networking/ircd-hybrid/default.nix
./services/networking/kippo.nix
+ ./services/networking/mailpile.nix
./services/networking/minidlna.nix
./services/networking/murmur.nix
./services/networking/nat.nix
@@ -222,6 +245,7 @@
./services/networking/ntpd.nix
./services/networking/oidentd.nix
./services/networking/openfire.nix
+ ./services/networking/openntpd.nix
./services/networking/openvpn.nix
./services/networking/polipo.nix
./services/networking/prayer.nix
@@ -355,6 +379,7 @@
./virtualisation/docker.nix
./virtualisation/libvirtd.nix
#./virtualisation/nova.nix
+ ./virtualisation/openvswitch.nix
./virtualisation/virtualbox-guest.nix
#./virtualisation/xen-dom0.nix
]
diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix
index 6f9e3002f29..7a6f7657205 100644
--- a/nixos/modules/profiles/base.nix
+++ b/nixos/modules/profiles/base.nix
@@ -37,7 +37,6 @@
#pkgs.jfsrec # disabled because of Boost dependency
# Some compression/archiver tools.
- pkgs.unrar
pkgs.unzip
pkgs.zip
pkgs.dar # disk archiver
diff --git a/nixos/modules/profiles/demo.nix b/nixos/modules/profiles/demo.nix
index 605cc6aad1d..ef6fd77b5f8 100644
--- a/nixos/modules/profiles/demo.nix
+++ b/nixos/modules/profiles/demo.nix
@@ -4,12 +4,9 @@
imports = [ ./graphical.nix ];
users.extraUsers.demo =
- { description = "Demo user account";
- group = "users";
+ { isNormalUser = true;
+ description = "Demo user account";
extraGroups = [ "wheel" ];
- home = "/home/demo";
- createHome = true;
- useDefaultShell = true;
password = "demo";
uid = 1000;
};
diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix
index 80c3e83fe81..d79aff5dc55 100644
--- a/nixos/modules/programs/environment.nix
+++ b/nixos/modules/programs/environment.nix
@@ -37,26 +37,23 @@ in
"/run/current-system/sw"
];
- # !!! fix environment.profileVariables definition and then move
- # most of these elsewhere
- environment.profileVariables = (i:
- { PATH = [ "${i}/bin" "${i}/sbin" "${i}/lib/kde4/libexec" ];
- MANPATH = [ "${i}/man" "${i}/share/man" ];
- INFOPATH = [ "${i}/info" "${i}/share/info" ];
- PKG_CONFIG_PATH = [ "${i}/lib/pkgconfig" ];
- TERMINFO_DIRS = [ "${i}/share/terminfo" ];
- PERL5LIB = [ "${i}/lib/perl5/site_perl" ];
- ALSA_PLUGIN_DIRS = [ "${i}/lib/alsa-lib" ];
- GST_PLUGIN_SYSTEM_PATH = [ "${i}/lib/gstreamer-0.10" ];
- KDEDIRS = [ "${i}" ];
- STRIGI_PLUGIN_PATH = [ "${i}/lib/strigi/" ];
- QT_PLUGIN_PATH = [ "${i}/lib/qt4/plugins" "${i}/lib/kde4/plugins" ];
- QTWEBKIT_PLUGIN_PATH = [ "${i}/lib/mozilla/plugins/" ];
- GTK_PATH = [ "${i}/lib/gtk-2.0" ];
- XDG_CONFIG_DIRS = [ "${i}/etc/xdg" ];
- XDG_DATA_DIRS = [ "${i}/share" ];
- MOZ_PLUGIN_PATH = [ "${i}/lib/mozilla/plugins" ];
- });
+ # TODO: move most of these elsewhere
+ environment.profileRelativeEnvVars =
+ { PATH = [ "/bin" "/sbin" "/lib/kde4/libexec" ];
+ MANPATH = [ "/man" "/share/man" ];
+ INFOPATH = [ "/info" "/share/info" ];
+ PKG_CONFIG_PATH = [ "/lib/pkgconfig" ];
+ TERMINFO_DIRS = [ "/share/terminfo" ];
+ PERL5LIB = [ "/lib/perl5/site_perl" ];
+ KDEDIRS = [ "" ];
+ STRIGI_PLUGIN_PATH = [ "/lib/strigi/" ];
+ QT_PLUGIN_PATH = [ "/lib/qt4/plugins" "/lib/kde4/plugins" ];
+ QTWEBKIT_PLUGIN_PATH = [ "/lib/mozilla/plugins/" ];
+ GTK_PATH = [ "/lib/gtk-2.0" "/lib/gtk-3.0" ];
+ XDG_CONFIG_DIRS = [ "/etc/xdg" ];
+ XDG_DATA_DIRS = [ "/share" ];
+ MOZ_PLUGIN_PATH = [ "/lib/mozilla/plugins" ];
+ };
environment.extraInit =
''
diff --git a/nixos/modules/programs/freetds.nix b/nixos/modules/programs/freetds.nix
new file mode 100644
index 00000000000..398fd104363
--- /dev/null
+++ b/nixos/modules/programs/freetds.nix
@@ -0,0 +1,61 @@
+# Global configuration for freetds environment.
+
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+ cfg = config.environment.freetds;
+
+in
+{
+ ###### interface
+
+ options = {
+
+ environment.freetds = mkOption {
+ type = types.attrsOf types.str;
+ default = {};
+ example = {
+ MYDATABASE =
+ ''
+ host = 10.0.2.100
+ port = 1433
+ tds version = 7.2
+ '';
+ };
+ description =
+ ''
+ Configure freetds database entries. Each attribute denotes
+ a section within freetds.conf, and the value (a string) is the config
+ content for that section. When at least one entry is configured
+ the global environment variables FREETDSCONF, FREETDS and SYBASE
+ will be configured to allow the programs that use freetds to find the
+ library and config.
+ '';
+
+ };
+
+ };
+
+ ###### implementation
+
+ config = mkIf (length (attrNames cfg) > 0) {
+
+ environment.variables.FREETDSCONF = "/etc/freetds.conf";
+ environment.variables.FREETDS = "/etc/freetds.conf";
+ environment.variables.SYBASE = "${pkgs.freetds}";
+
+ environment.etc."freetds.conf" = { text =
+ (concatStrings (mapAttrsToList (name: value:
+ ''
+ [${name}]
+ ${value}
+ ''
+ ) cfg));
+ };
+
+ };
+
+}
diff --git a/nixos/modules/programs/shadow.nix b/nixos/modules/programs/shadow.nix
index 658b08b3d87..5c2ea07c554 100644
--- a/nixos/modules/programs/shadow.nix
+++ b/nixos/modules/programs/shadow.nix
@@ -83,7 +83,7 @@ in
security.pam.services =
{ chsh = { rootOK = true; };
chfn = { rootOK = true; };
- su = { rootOK = true; forwardXAuth = true; };
+ su = { rootOK = true; forwardXAuth = true; logFailures = true; };
passwd = {};
# Note: useradd, groupadd etc. aren't setuid root, so it
# doesn't really matter what the PAM config says as long as it
@@ -100,7 +100,9 @@ in
chgpasswd = { rootOK = true; };
};
- security.setuidPrograms = [ "passwd" "chfn" "su" "newgrp" ];
+ security.setuidPrograms = [ "passwd" "chfn" "su" "newgrp"
+ "newuidmap" "newgidmap" # new in shadow 4.2.x
+ ];
};
diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index fdb9dfd4b8c..ee9cb81a027 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -59,6 +59,13 @@ in
'';
};
+ package = mkOption {
+ default = pkgs.openssh;
+ description = ''
+ The package used for the openssh client and daemon.
+ '';
+ };
+
};
};
@@ -92,7 +99,7 @@ in
wantedBy = [ "default.target" ];
serviceConfig =
{ ExecStartPre = "${pkgs.coreutils}/bin/rm -f %t/ssh-agent";
- ExecStart = "${pkgs.openssh}/bin/ssh-agent -a %t/ssh-agent";
+ ExecStart = "${cfg.package}/bin/ssh-agent -a %t/ssh-agent";
StandardOutput = "null";
Type = "forking";
Restart = "on-failure";
diff --git a/nixos/modules/programs/uim.nix b/nixos/modules/programs/uim.nix
new file mode 100644
index 00000000000..fc25ba6f969
--- /dev/null
+++ b/nixos/modules/programs/uim.nix
@@ -0,0 +1,29 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+ cfg = config.uim;
+in
+{
+ options = {
+ uim = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ example = true;
+ description = "enable UIM input method";
+ };
+ };
+ };
+
+ config = mkIf cfg.enable {
+ environment.systemPackages = [ pkgs.uim ];
+ gtkPlugins = [ pkgs.uim ];
+ qtPlugins = [ pkgs.uim ];
+ environment.variables.GTK_IM_MODULE = "uim";
+ environment.variables.QT_IM_MODULE = "uim";
+ environment.variables.XMODIFIERS = "@im=uim";
+ services.xserver.displayManager.sessionCommands = "uim-xim &";
+ };
+}
diff --git a/nixos/modules/programs/virtualbox.nix b/nixos/modules/programs/virtualbox.nix
index e2dd76219eb..1a190573e94 100644
--- a/nixos/modules/programs/virtualbox.nix
+++ b/nixos/modules/programs/virtualbox.nix
@@ -15,7 +15,7 @@ let virtualbox = config.boot.kernelPackages.virtualbox; in
''
KERNEL=="vboxdrv", OWNER="root", GROUP="vboxusers", MODE="0660", TAG+="systemd"
KERNEL=="vboxdrvu", OWNER="root", GROUP="root", MODE="0666", TAG+="systemd"
- KERNEL=="vboxnetctl", OWNER="root", GROUP="root", MODE="0600", TAG+="systemd"
+ KERNEL=="vboxnetctl", OWNER="root", GROUP="vboxusers", MODE="0660", TAG+="systemd"
SUBSYSTEM=="usb_device", ACTION=="add", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
SUBSYSTEM=="usb_device", ACTION=="remove", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"
@@ -44,5 +44,5 @@ let virtualbox = config.boot.kernelPackages.virtualbox; in
'';
};
- networking.interfaces.vboxnet0 = { ipAddress = "192.168.56.1"; prefixLength = 24; };
+ networking.interfaces.vboxnet0.ip4 = [ { address = "192.168.56.1"; prefixLength = 24; } ];
}
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 0ee2caa28ea..019fbc721b1 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -129,5 +129,6 @@ in zipModules ([]
++ obsolete' [ "boot" "loader" "grub" "bootDevice" ]
++ obsolete' [ "boot" "initrd" "luks" "enable" ]
++ obsolete' [ "programs" "bash" "enable" ]
+++ obsolete' [ "services" "samba" "defaultShare" ]
)
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index b1b75a0068d..844a9da0eb4 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -126,12 +126,28 @@ let
description = "Whether to show the message of the day.";
};
+ makeHomeDir = mkOption {
+ default = false;
+ type = types.bool;
+ description = ''
+ Whether to try to create home directories for users
+ with $HOMEs pointing to nonexistent
+ locations on session login.
+ '';
+ };
+
updateWtmp = mkOption {
default = false;
type = types.bool;
description = "Whether to update /var/log/wtmp.";
};
+ logFailures = mkOption {
+ default = false;
+ type = types.bool;
+ description = "Whether to log authentication failures in /var/log/faillog.";
+ };
+
text = mkOption {
type = types.nullOr types.lines;
description = "Contents of the PAM service file.";
@@ -159,6 +175,8 @@ let
# Authentication management.
${optionalString cfg.rootOK
"auth sufficient pam_rootok.so"}
+ ${optionalString cfg.logFailures
+ "auth required pam_tally.so"}
${optionalString (config.security.pam.enableSSHAgentAuth && cfg.sshAgentAuth)
"auth sufficient ${pkgs.pam_ssh_agent_auth}/libexec/pam_ssh_agent_auth.so file=~/.ssh/authorized_keys:~/.ssh/authorized_keys2:/etc/ssh/authorized_keys.d/%u"}
${optionalString cfg.usbAuth
@@ -192,6 +210,8 @@ let
"session ${
if config.boot.isContainer then "optional" else "required"
} pam_loginuid.so"}
+ ${optionalString cfg.makeHomeDir
+ "session required ${pkgs.pam}/lib/security/pam_mkhomedir.so silent skel=/etc/skel umask=0022"}
${optionalString cfg.updateWtmp
"session required ${pkgs.pam}/lib/security/pam_lastlog.so silent"}
${optionalString config.users.ldap.enable
diff --git a/nixos/modules/security/setuid-wrappers.nix b/nixos/modules/security/setuid-wrappers.nix
index 373afffd3fb..2a289dc402c 100644
--- a/nixos/modules/security/setuid-wrappers.nix
+++ b/nixos/modules/security/setuid-wrappers.nix
@@ -76,8 +76,7 @@ in
config = {
- security.setuidPrograms =
- [ "fusermount" "wodim" "cdrdao" "growisofs" ];
+ security.setuidPrograms = [ "fusermount" ];
system.activationScripts.setuid =
let
diff --git a/nixos/modules/services/amqp/rabbitmq.nix b/nixos/modules/services/amqp/rabbitmq.nix
index a930098bfee..77487ec1ab9 100644
--- a/nixos/modules/services/amqp/rabbitmq.nix
+++ b/nixos/modules/services/amqp/rabbitmq.nix
@@ -89,6 +89,8 @@ in {
wantedBy = [ "multi-user.target" ];
after = [ "network-interfaces.target" ];
+ path = [ pkgs.rabbitmq_server ];
+
environment = {
RABBITMQ_MNESIA_BASE = "${cfg.dataDir}/mnesia";
RABBITMQ_NODE_IP_ADDRESS = cfg.listenAddress;
@@ -119,6 +121,8 @@ in {
mkdir -p /var/log/rabbitmq && chmod 0700 /var/log/rabbitmq
chown rabbitmq:rabbitmq /var/log/rabbitmq
'';
+
+ postStart = mkBefore "until rabbitmqctl status; do sleep 1; done";
};
};
diff --git a/nixos/modules/services/audio/mopidy.nix b/nixos/modules/services/audio/mopidy.nix
index 5b865cf4c1b..a7a7e8ae688 100644
--- a/nixos/modules/services/audio/mopidy.nix
+++ b/nixos/modules/services/audio/mopidy.nix
@@ -49,7 +49,7 @@ in {
extensionPackages = mkOption {
default = [];
type = types.listOf types.package;
- example = [ mopidy-spotify ];
+ example = literalExample "[ pkgs.mopidy-spotify ]";
description = ''
Mopidy extensions that should be loaded by the service.
'';
diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix
index 53542e34b14..e6b525c4b1b 100644
--- a/nixos/modules/services/audio/mpd.nix
+++ b/nixos/modules/services/audio/mpd.nix
@@ -16,52 +16,76 @@ let
sticker_file "${cfg.dataDir}/sticker.sql"
log_file "syslog"
user "mpd"
+ ${if cfg.network.host != "any" then
+ "bind_to_address ${cfg.network.host}" else ""}
+ ${if cfg.network.port != 6600 then
+ "port ${toString cfg.network.port}" else ""}
${cfg.extraConfig}
- '';
+ '';
in {
###### interface
- options = {
+ options = {
- services.mpd = {
+ services.mpd = {
enable = mkOption {
default = false;
description = ''
Whether to enable MPD, the music player daemon.
- '';
- };
+ '';
+ };
musicDirectory = mkOption {
default = "${cfg.dataDir}/music";
description = ''
Extra configuration added to the end of MPD's
configuration file, mpd.conf.
- '';
- };
+ '';
+ };
extraConfig = mkOption {
- default = "";
+ default = "";
description = ''
Extra directives added to to the end of MPD's configuration file,
mpd.conf. Basic configuration like file location and uid/gid
is added automatically to the beginning of the file.
- '';
- };
+ '';
+ };
dataDir = mkOption {
default = "/var/lib/mpd";
description = ''
The directory where MPD stores its state, tag cache,
playlists etc.
- '';
- };
+ '';
+ };
- };
+ network = {
- };
+ host = mkOption {
+ default = "any";
+ description = ''
+ This setting sets the address for the daemon to listen on. Careful attention
+ should be paid if this is assigned to anything other then the default, any.
+ This setting can deny access to control of the daemon.
+ '';
+ };
+
+ port = mkOption {
+ default = 6600;
+ description = ''
+ This setting is the TCP port that is desired for the daemon to get assigned
+ to.
+ '';
+ };
+
+ };
+ };
+
+ };
###### implementation
diff --git a/nixos/modules/services/backup/rsnapshot.nix b/nixos/modules/services/backup/rsnapshot.nix
index 48ad7582b7e..091b5cfd4d5 100644
--- a/nixos/modules/services/backup/rsnapshot.nix
+++ b/nixos/modules/services/backup/rsnapshot.nix
@@ -31,7 +31,7 @@ in
cronIntervals = mkOption {
default = {};
- example = { "hourly" = "0 * * * *"; "daily" = "50 21 * * *"; };
+ example = { hourly = "0 * * * *"; daily = "50 21 * * *"; };
type = types.attrsOf types.string;
description = ''
Periodicity at which intervals should be run by cron.
diff --git a/nixos/modules/services/computing/torque/mom.nix b/nixos/modules/services/computing/torque/mom.nix
new file mode 100644
index 00000000000..83772539a7a
--- /dev/null
+++ b/nixos/modules/services/computing/torque/mom.nix
@@ -0,0 +1,63 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+
+ cfg = config.services.torque.mom;
+ torque = pkgs.torque;
+
+ momConfig = pkgs.writeText "torque-mom-config" ''
+ $pbsserver ${cfg.serverNode}
+ $logevent 225
+ '';
+
+in
+{
+ options = {
+
+ services.torque.mom = {
+ enable = mkEnableOption "torque computing node";
+
+ serverNode = mkOption {
+ type = types.str;
+ description = "Hostname running pbs server.";
+ };
+
+ };
+
+ };
+
+ config = mkIf cfg.enable {
+ environment.systemPackages = [ pkgs.torque ];
+
+ systemd.services.torque-mom-init = {
+ path = with pkgs; [ torque utillinux procps inetutils ];
+
+ script = ''
+ pbs_mkdirs -v aux
+ pbs_mkdirs -v mom
+ hostname > /var/spool/torque/server_name
+ cp -v ${momConfig} /var/spool/torque/mom_priv/config
+ '';
+
+ serviceConfig.Type = "oneshot";
+ unitConfig.ConditionPathExists = "!/var/spool/torque";
+ };
+
+ systemd.services.torque-mom = {
+ path = [ torque ];
+
+ wantedBy = [ "multi-user.target" ];
+ requires = [ "torque-mom-init.service" ];
+ after = [ "torque-mom-init.service" "network.target" ];
+
+ serviceConfig = {
+ Type = "forking";
+ ExecStart = "${torque}/bin/pbs_mom";
+ PIDFile = "/var/spool/torque/mom_priv/mom.lock";
+ };
+ };
+
+ };
+}
diff --git a/nixos/modules/services/computing/torque/server.nix b/nixos/modules/services/computing/torque/server.nix
new file mode 100644
index 00000000000..655d1500497
--- /dev/null
+++ b/nixos/modules/services/computing/torque/server.nix
@@ -0,0 +1,96 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+ cfg = config.services.torque.server;
+ torque = pkgs.torque;
+in
+{
+ options = {
+
+ services.torque.server = {
+
+ enable = mkEnableOption "torque server";
+
+ };
+
+ };
+
+ config = mkIf cfg.enable {
+ environment.systemPackages = [ pkgs.torque ];
+
+ systemd.services.torque-server-init = {
+ path = with pkgs; [ torque utillinux procps inetutils ];
+
+ script = ''
+ tmpsetup=$(mktemp -t torque-XXXX)
+ cp -p ${torque}/bin/torque.setup $tmpsetup
+ sed -i $tmpsetup -e 's/pbs_server -t create/pbs_server -f -t create/'
+
+ pbs_mkdirs -v aux
+ pbs_mkdirs -v server
+ hostname > /var/spool/torque/server_name
+ cp -prv ${torque}/var/spool/torque/* /var/spool/torque/
+ $tmpsetup root
+
+ sleep 1
+ rm -f $tmpsetup
+ kill $(pgrep pbs_server) 2>/dev/null
+ kill $(pgrep trqauthd) 2>/dev/null
+ '';
+
+ serviceConfig = {
+ Type = "oneshot";
+ RemainAfterExit = true;
+ };
+
+ unitConfig = {
+ ConditionPathExists = "!/var/spool/torque";
+ };
+ };
+
+ systemd.services.trqauthd = {
+ path = [ torque ];
+
+ requires = [ "torque-server-init.service" ];
+ after = [ "torque-server-init.service" ];
+
+ serviceConfig = {
+ Type = "forking";
+ ExecStart = "${torque}/bin/trqauthd";
+ };
+ };
+
+ systemd.services.torque-server = {
+ path = [ torque ];
+
+ wantedBy = [ "multi-user.target" ];
+ wants = [ "torque-scheduler.service" "trqauthd.service" ];
+ before = [ "trqauthd.service" ];
+ requires = [ "torque-server-init.service" ];
+ after = [ "torque-server-init.service" "network.target" ];
+
+ serviceConfig = {
+ Type = "forking";
+ ExecStart = "${torque}/bin/pbs_server";
+ ExecStop = "${torque}/bin/qterm";
+ PIDFile = "/var/spool/torque/server_priv/server.lock";
+ };
+ };
+
+ systemd.services.torque-scheduler = {
+ path = [ torque ];
+
+ requires = [ "torque-server-init.service" ];
+ after = [ "torque-server-init.service" ];
+
+ serviceConfig = {
+ Type = "forking";
+ ExecStart = "${torque}/bin/pbs_sched";
+ PIDFile = "/var/spool/torque/sched_priv/sched.lock";
+ };
+ };
+
+ };
+}
diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix
index b01b5c3245a..29a81f066ab 100644
--- a/nixos/modules/services/continuous-integration/jenkins/default.nix
+++ b/nixos/modules/services/continuous-integration/jenkins/default.nix
@@ -15,7 +15,7 @@ in {
user = mkOption {
default = "jenkins";
- type = with types; string;
+ type = types.str;
description = ''
User the jenkins server should execute under.
'';
@@ -23,16 +23,25 @@ in {
group = mkOption {
default = "jenkins";
- type = with types; string;
+ type = types.str;
description = ''
If the default user "jenkins" is configured then this is the primary
group of that user.
'';
};
+ extraGroups = mkOption {
+ type = types.listOf types.str;
+ default = [ ];
+ example = [ "wheel" "dialout" ];
+ description = ''
+ List of extra groups that the "jenkins" user should be a part of.
+ '';
+ };
+
home = mkOption {
default = "/var/lib/jenkins";
- type = with types; string;
+ type = types.path;
description = ''
The path to use as JENKINS_HOME. If the default user "jenkins" is configured then
this is the home of the "jenkins" user.
@@ -57,12 +66,21 @@ in {
environment = mkOption {
default = { NIX_REMOTE = "daemon"; };
- type = with types; attrsOf string;
+ type = with types; attrsOf str;
description = ''
Additional environment variables to be passed to the jenkins process.
The environment will always include JENKINS_HOME.
'';
};
+
+ extraOptions = mkOption {
+ type = types.listOf types.str;
+ default = [ ];
+ example = [ "--debug=9" "--httpListenAddress=localhost" ];
+ description = ''
+ Additional command line arguments to pass to Jenkins.
+ '';
+ };
};
};
@@ -78,6 +96,7 @@ in {
createHome = true;
home = cfg.home;
group = cfg.group;
+ extraGroups = cfg.extraGroups;
useDefaultShell = true;
uid = config.ids.uids.jenkins;
};
@@ -94,7 +113,7 @@ in {
path = cfg.packages;
script = ''
- ${pkgs.jdk}/bin/java -jar ${pkgs.jenkins} --httpPort=${toString cfg.port}
+ ${pkgs.jdk}/bin/java -jar ${pkgs.jenkins} --httpPort=${toString cfg.port} ${concatStringsSep " " cfg.extraOptions}
'';
postStart = ''
diff --git a/nixos/modules/services/continuous-integration/jenkins/slave.nix b/nixos/modules/services/continuous-integration/jenkins/slave.nix
index 5836d92a4fc..a0216caf2b5 100644
--- a/nixos/modules/services/continuous-integration/jenkins/slave.nix
+++ b/nixos/modules/services/continuous-integration/jenkins/slave.nix
@@ -23,7 +23,7 @@ in {
user = mkOption {
default = "jenkins";
- type = with types; string;
+ type = types.str;
description = ''
User the jenkins slave agent should execute under.
'';
@@ -31,7 +31,7 @@ in {
group = mkOption {
default = "jenkins";
- type = with types; string;
+ type = types.str;
description = ''
If the default slave agent user "jenkins" is configured then this is
the primary group of that user.
@@ -40,7 +40,7 @@ in {
home = mkOption {
default = "/var/lib/jenkins";
- type = with types; string;
+ type = types.path;
description = ''
The path to use as JENKINS_HOME. If the default user "jenkins" is configured then
this is the home of the "jenkins" user.
diff --git a/nixos/modules/services/databases/influxdb.nix b/nixos/modules/services/databases/influxdb.nix
index 61fe96d5d64..b57ccebae16 100644
--- a/nixos/modules/services/databases/influxdb.nix
+++ b/nixos/modules/services/databases/influxdb.nix
@@ -224,6 +224,11 @@ in
mkdir -m 0770 -p ${cfg.dataDir}
if [ "$(id -u)" = 0 ]; then chown -R ${cfg.user}:${cfg.group} ${cfg.dataDir}; fi
'';
+ postStart = mkBefore ''
+ until ${pkgs.curl}/bin/curl -s -o /dev/null 'http://${cfg.bindAddress}:${toString cfg.apiPort}/'; do
+ sleep 1;
+ done
+ '';
};
users.extraUsers = optional (cfg.user == "influxdb") {
diff --git a/nixos/modules/services/databases/mongodb.nix b/nixos/modules/services/databases/mongodb.nix
index fe82ca430e1..02e44ad8870 100644
--- a/nixos/modules/services/databases/mongodb.nix
+++ b/nixos/modules/services/databases/mongodb.nix
@@ -15,9 +15,11 @@ let
bind_ip = ${cfg.bind_ip}
${optionalString cfg.quiet "quiet = true"}
dbpath = ${cfg.dbpath}
- logpath = ${cfg.logpath}
- logappend = ${b2s cfg.logappend}
+ syslog = true
+ fork = true
+ pidfilepath = ${cfg.pidFile}
${optionalString (cfg.replSetName != "") "replSet = ${cfg.replSetName}"}
+ ${cfg.extraConfig}
'';
in
@@ -65,14 +67,9 @@ in
description = "Location where MongoDB stores its files";
};
- logpath = mkOption {
- default = "/var/log/mongodb/mongod.log";
- description = "Location where MongoDB stores its logfile";
- };
-
- logappend = mkOption {
- default = true;
- description = "Append logfile instead over overwriting";
+ pidFile = mkOption {
+ default = "/var/run/mongodb.pid";
+ description = "Location of MongoDB pid file";
};
replSetName = mkOption {
@@ -82,6 +79,14 @@ in
Otherwise, leave empty to run as single node.
'';
};
+
+ extraConfig = mkOption {
+ default = "";
+ example = ''
+ nojournal = true
+ '';
+ description = "MongoDB extra configuration";
+ };
};
};
@@ -99,22 +104,6 @@ in
environment.systemPackages = [ mongodb ];
- systemd.services.mongodb_init =
- { description = "MongoDB server initialisation";
-
- wantedBy = [ "mongodb.service" ];
- before = [ "mongodb.service" ];
-
- serviceConfig.Type = "oneshot";
-
- script = ''
- if ! test -e ${cfg.dbpath}; then
- install -d -m0700 -o ${cfg.user} ${cfg.dbpath}
- install -d -m0755 -o ${cfg.user} `dirname ${cfg.logpath}`
- fi
- '';
- };
-
systemd.services.mongodb =
{ description = "MongoDB server";
@@ -124,7 +113,20 @@ in
serviceConfig = {
ExecStart = "${mongodb}/bin/mongod --quiet --config ${mongoCnf}";
User = cfg.user;
+ PIDFile = cfg.pidFile;
+ Type = "forking";
+ TimeoutStartSec=120; # intial creating of journal can take some time
+ PermissionsStartOnly = true;
};
+
+ preStart = ''
+ if ! test -e ${cfg.dbpath}; then
+ install -d -m0700 -o ${cfg.user} ${cfg.dbpath}
+ fi
+ if ! test -e ${cfg.pidFile}; then
+ install -D -o ${cfg.user} /dev/null ${cfg.pidFile}
+ fi
+ '';
};
};
diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index 01c55479b2b..de14c56f797 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -225,14 +225,14 @@ in
# Wait for PostgreSQL to be ready to accept connections.
postStart =
''
- while ! psql postgres -c "" 2> /dev/null; do
+ while ! psql --port=${toString cfg.port} postgres -c "" 2> /dev/null; do
if ! kill -0 "$MAINPID"; then exit 1; fi
sleep 0.1
done
if test -e "${cfg.dataDir}/.first_startup"; then
${optionalString (cfg.initialScript != null) ''
- cat "${cfg.initialScript}" | psql postgres
+ cat "${cfg.initialScript}" | psql --port=${toString cfg.port} postgres
''}
rm -f "${cfg.dataDir}/.first_startup"
fi
diff --git a/nixos/modules/services/databases/postgresql.xml b/nixos/modules/services/databases/postgresql.xml
new file mode 100644
index 00000000000..e98b431bd60
--- /dev/null
+++ b/nixos/modules/services/databases/postgresql.xml
@@ -0,0 +1,77 @@
+
+
+PostgreSQL
+
+
+
+
+Source: modules/services/databases/postgresql.nix
+
+Upstream documentation:
+
+
+
+PostgreSQL is an advanced, free relational database.
+
+Configuring
+
+To enable PostgreSQL, add the following to your
+configuration.nix:
+
+
+services.postgresql.enable = true;
+services.postgresql.package = pkgs.postgresql93;
+
+
+Note that you are required to specify the desired version of
+PostgreSQL (e.g. pkgs.postgresql93). Since
+upgrading your PostgreSQL version requires a database dump and reload
+(see below), NixOS cannot provide a default value for
+ such as the most recent
+release of PostgreSQL.
+
+
+
+By default, PostgreSQL stores its databases in
+/var/db/postgresql. You can override this using
+, e.g.
+
+
+services.postgresql.dataDir = "/data/postgresql";
+
+
+
+
+
+
+
+Upgrading
+
+FIXME: document dump/upgrade/load cycle.
+
+
+
+
+Options
+
+FIXME: auto-generated list of module options.
+
+
+
+
+
diff --git a/nixos/modules/services/hardware/pommed.nix b/nixos/modules/services/hardware/pommed.nix
index 04db46999b0..a24557b40ba 100644
--- a/nixos/modules/services/hardware/pommed.nix
+++ b/nixos/modules/services/hardware/pommed.nix
@@ -4,30 +4,34 @@ with lib;
{
- options.services.hardware.pommed = {
- enable = mkOption {
- default = false;
- description = ''
- Whether to use the pommed tool to handle Apple laptop keyboard hotkeys.
- '';
+ options = {
+
+ services.hardware.pommed = {
+
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to use the pommed tool to handle Apple laptop keyboard hotkeys.
+ '';
+ };
+
+ configFile = mkOption {
+ type = types.path;
+ description = ''
+ The path to the pommed.conf file.
+ '';
+ };
};
- configFile = mkOption {
- default = "${pkgs.pommed}/etc/pommed.conf";
- description = ''
- The contents of the pommed.conf file.
- '';
- };
};
config = mkIf config.services.hardware.pommed.enable {
environment.systemPackages = [ pkgs.polkit ];
- environment.etc = [
- { source = config.services.hardware.pommed.configFile;
- target = "pommed.conf";
- }
- ];
+ environment.etc."pommed.conf".source = config.services.hardware.pommed.configFile;
+
+ services.hardware.pommed.configFile = "${pkgs.pommed}/etc/pommed.conf";
services.dbus.packages = [ pkgs.pommed ];
diff --git a/nixos/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix
index 802dd454878..df81ac142dc 100644
--- a/nixos/modules/services/logging/logstash.nix
+++ b/nixos/modules/services/logging/logstash.nix
@@ -11,20 +11,25 @@ in
###### interface
options = {
+
services.logstash = {
+
enable = mkOption {
+ type = types.bool;
default = false;
- description = "Enable logstash";
+ description = "Enable logstash.";
};
enableWeb = mkOption {
+ type = types.bool;
default = false;
- description = "Enable logstash web interface";
+ description = "Enable the logstash web interface.";
};
inputConfig = mkOption {
+ type = types.lines;
default = ''stdin { type => "example" }'';
- description = "Logstash input configuration";
+ description = "Logstash input configuration.";
example = ''
# Read from journal
pipe {
@@ -35,8 +40,9 @@ in
};
filterConfig = mkOption {
+ type = types.lines;
default = ''noop {}'';
- description = "logstash filter configuration";
+ description = "logstash filter configuration.";
example = ''
if [type] == "syslog" {
# Keep only relevant systemd fields
@@ -52,13 +58,15 @@ in
};
outputConfig = mkOption {
+ type = types.lines;
default = ''stdout { debug => true debug_format => "json"}'';
- description = "Logstash output configuration";
+ description = "Logstash output configuration.";
example = ''
redis { host => "localhost" data_type => "list" key => "logstash" codec => json }
elasticsearch { embedded => true }
'';
};
+
};
};
diff --git a/nixos/modules/services/logging/syslog-ng.nix b/nixos/modules/services/logging/syslog-ng.nix
index 8b892a33bb7..4a16b19134a 100644
--- a/nixos/modules/services/logging/syslog-ng.nix
+++ b/nixos/modules/services/logging/syslog-ng.nix
@@ -18,7 +18,7 @@ let
syslogngOptions = [
"--foreground"
- "--module-path=${concatStringsSep ":" (["${pkgs.syslogng}/lib/syslog-ng"] ++ cfg.extraModulePaths)}"
+ "--module-path=${concatStringsSep ":" (["${cfg.package}/lib/syslog-ng"] ++ cfg.extraModulePaths)}"
"--cfgfile=${syslogngConfig}"
"--control=${ctrlSocket}"
"--persist-file=${persistFile}"
@@ -37,6 +37,13 @@ in {
Whether to enable the syslog-ng daemon.
'';
};
+ package = mkOption {
+ type = types.package;
+ default = pkgs.syslogng;
+ description = ''
+ The package providing syslog-ng binaries.
+ '';
+ };
serviceName = mkOption {
type = types.str;
default = "syslog-ng";
@@ -49,7 +56,9 @@ in {
extraModulePaths = mkOption {
type = types.listOf types.str;
default = [];
- example = [ "${pkgs.syslogng_incubator}/lib/syslog-ng" ];
+ example = literalExample ''
+ [ "''${pkgs.syslogng_incubator}/lib/syslog-ng" ]
+ '';
description = ''
A list of paths that should be included in syslog-ng's
--module-path option. They should usually
@@ -75,7 +84,7 @@ in {
Sockets = "syslog.socket";
StandardOutput = "null";
Restart = "on-failure";
- ExecStart = "${pkgs.syslogng}/sbin/syslog-ng ${concatStringsSep " " syslogngOptions}";
+ ExecStart = "${cfg.package}/sbin/syslog-ng ${concatStringsSep " " syslogngOptions}";
};
};
};
diff --git a/nixos/modules/services/misc/cpuminer-cryptonight.nix b/nixos/modules/services/misc/cpuminer-cryptonight.nix
new file mode 100644
index 00000000000..f31526f8d10
--- /dev/null
+++ b/nixos/modules/services/misc/cpuminer-cryptonight.nix
@@ -0,0 +1,66 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.cpuminer-cryptonight;
+
+ json = builtins.toJSON (
+ cfg // {
+ enable = null;
+ threads =
+ if cfg.threads == 0 then null else toString cfg.threads;
+ }
+ );
+
+ confFile = builtins.toFile "cpuminer.json" json;
+in
+{
+
+ options = {
+
+ services.cpuminer-cryptonight = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to enable the cpuminer cryptonight miner.
+ '';
+ };
+ url = mkOption {
+ type = types.string;
+ description = "URL of mining server";
+ };
+ user = mkOption {
+ type = types.string;
+ description = "Username for mining server";
+ };
+ pass = mkOption {
+ type = types.string;
+ default = "x";
+ description = "Password for mining server";
+ };
+ threads = mkOption {
+ type = types.int;
+ default = 0;
+ description = "Number of miner threads, defaults to available processors";
+ };
+ };
+
+ };
+
+ config = mkIf config.services.cpuminer-cryptonight.enable {
+
+ systemd.services.cpuminer-cryptonight = {
+ description = "Cryptonight cpuminer";
+ wantedBy = [ "multi-user.target" ];
+ after = [ "network.target" ];
+ serviceConfig = {
+ ExecStart = "${pkgs.cpuminer-multi}/bin/minerd --syslog --config=${confFile}";
+ User = "nobody";
+ };
+ };
+
+ };
+
+}
\ No newline at end of file
diff --git a/nixos/modules/services/misc/gitolite.nix b/nixos/modules/services/misc/gitolite.nix
index 84435f92c11..961af48e0f8 100644
--- a/nixos/modules/services/misc/gitolite.nix
+++ b/nixos/modules/services/misc/gitolite.nix
@@ -5,6 +5,7 @@ with lib;
let
cfg = config.services.gitolite;
pubkeyFile = pkgs.writeText "gitolite-admin.pub" cfg.adminPubkey;
+ hooks = lib.concatMapStrings (hook: "${hook} ") cfg.commonHooks;
in
{
options = {
@@ -30,6 +31,14 @@ in
once, upon the first initialization of the Gitolite user.
'';
};
+
+ commonHooks = mkOption {
+ type = types.listOf types.path;
+ default = [];
+ description = ''
+ A list of custom git hooks that get copied to ~/.gitolite/hooks/common.
+ '';
+ };
};
};
@@ -57,6 +66,10 @@ in
if [ ! -d repositories ]; then
gitolite setup -pk ${pubkeyFile}
fi
+ if [ -n "${hooks}" ]; then
+ cp ${hooks} .gitolite/hooks/common/
+ chmod +x .gitolite/hooks/common/*
+ fi
gitolite setup # Upgrade if needed
'';
};
diff --git a/nixos/modules/services/misc/mesos-master.nix b/nixos/modules/services/misc/mesos-master.nix
new file mode 100644
index 00000000000..bdf88d427c5
--- /dev/null
+++ b/nixos/modules/services/misc/mesos-master.nix
@@ -0,0 +1,103 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.mesos.master;
+
+in {
+
+ options.services.mesos = {
+
+ master = {
+ enable = mkOption {
+ description = "Whether to enable the Mesos Master.";
+ default = false;
+ type = types.uniq types.bool;
+ };
+
+ port = mkOption {
+ description = "Mesos Master port";
+ default = 5050;
+ type = types.int;
+ };
+
+ zk = mkOption {
+ description = ''
+ ZooKeeper URL (used for leader election amongst masters).
+ May be one of:
+ zk://host1:port1,host2:port2,.../mesos
+ zk://username:password@host1:port1,host2:port2,.../mesos
+ '';
+ type = types.str;
+ };
+
+ workDir = mkOption {
+ description = "The Mesos work directory.";
+ default = "/var/lib/mesos/master";
+ type = types.str;
+ };
+
+ extraCmdLineOptions = mkOption {
+ description = ''
+ Extra command line options for Mesos Master.
+
+ See https://mesos.apache.org/documentation/latest/configuration/
+ '';
+ default = [ "" ];
+ type = types.listOf types.string;
+ example = [ "--credentials=VALUE" ];
+ };
+
+ quorum = mkOption {
+ description = ''
+ The size of the quorum of replicas when using 'replicated_log' based
+ registry. It is imperative to set this value to be a majority of
+ masters i.e., quorum > (number of masters)/2.
+
+ If 0 will fall back to --registry=in_memory.
+ '';
+ default = 0;
+ type = types.int;
+ };
+
+ logLevel = mkOption {
+ description = ''
+ The logging level used. Possible values:
+ 'INFO', 'WARNING', 'ERROR'
+ '';
+ default = "INFO";
+ type = types.str;
+ };
+
+ };
+
+
+ };
+
+
+ config = mkIf cfg.enable {
+ systemd.services.mesos-master = {
+ description = "Mesos Master";
+ wantedBy = [ "multi-user.target" ];
+ after = [ "network-interfaces.target" ];
+ serviceConfig = {
+ ExecStart = ''
+ ${pkgs.mesos}/bin/mesos-master \
+ --port=${toString cfg.port} \
+ --zk=${cfg.zk} \
+ ${if cfg.quorum == 0 then "--registry=in_memory" else "--registry=replicated_log --quorum=${cfg.quorum}"} \
+ --work_dir=${cfg.workDir} \
+ --logging_level=${cfg.logLevel} \
+ ${toString cfg.extraCmdLineOptions}
+ '';
+ PermissionsStartOnly = true;
+ };
+ preStart = ''
+ mkdir -m 0700 -p ${cfg.workDir}
+ '';
+ };
+ };
+
+}
+
diff --git a/nixos/modules/services/misc/mesos-slave.nix b/nixos/modules/services/misc/mesos-slave.nix
new file mode 100644
index 00000000000..e9a89816716
--- /dev/null
+++ b/nixos/modules/services/misc/mesos-slave.nix
@@ -0,0 +1,93 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.mesos.slave;
+
+in {
+
+ options.services.mesos = {
+ slave = {
+ enable = mkOption {
+ description = "Whether to enable the Mesos Slave.";
+ default = false;
+ type = types.uniq types.bool;
+ };
+
+ port = mkOption {
+ description = "Mesos Slave port";
+ default = 5051;
+ type = types.int;
+ };
+
+ master = mkOption {
+ description = ''
+ May be one of:
+ zk://host1:port1,host2:port2,.../path
+ zk://username:password@host1:port1,host2:port2,.../path
+ '';
+ type = types.str;
+ };
+
+ withHadoop = mkOption {
+ description = "Add the HADOOP_HOME to the slave.";
+ default = false;
+ type = types.bool;
+ };
+
+ workDir = mkOption {
+ description = "The Mesos work directory.";
+ default = "/var/lib/mesos/slave";
+ type = types.str;
+ };
+
+ extraCmdLineOptions = mkOption {
+ description = ''
+ Extra command line options for Mesos Slave.
+
+ See https://mesos.apache.org/documentation/latest/configuration/
+ '';
+ default = [ "" ];
+ type = types.listOf types.string;
+ example = [ "--gc_delay=3days" ];
+ };
+
+ logLevel = mkOption {
+ description = ''
+ The logging level used. Possible values:
+ 'INFO', 'WARNING', 'ERROR'
+ '';
+ default = "INFO";
+ type = types.str;
+ };
+
+ };
+
+ };
+
+
+ config = mkIf cfg.enable {
+ systemd.services.mesos-slave = {
+ description = "Mesos Slave";
+ wantedBy = [ "multi-user.target" ];
+ after = [ "network-interfaces.target" ];
+ serviceConfig = {
+ ExecStart = ''
+ ${pkgs.mesos}/bin/mesos-slave \
+ --port=${toString cfg.port} \
+ --master=${cfg.master} \
+ ${optionalString cfg.withHadoop "--hadoop-home=${pkgs.hadoop}"} \
+ --work_dir=${cfg.workDir} \
+ --logging_level=${cfg.logLevel} \
+ ${toString cfg.extraCmdLineOptions}
+ '';
+ PermissionsStartOnly = true;
+ };
+ preStart = ''
+ mkdir -m 0700 -p ${cfg.workDir}
+ '';
+ };
+ };
+
+}
\ No newline at end of file
diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix
index 808c5dcbdc6..c0d7885280a 100644
--- a/nixos/modules/services/misc/nixos-manual.nix
+++ b/nixos/modules/services/misc/nixos-manual.nix
@@ -28,7 +28,7 @@ let
options = eval.options;
};
- entry = "${manual.manual}/share/doc/nixos/manual.html";
+ entry = "${manual.manual}/share/doc/nixos/index.html";
help = pkgs.writeScriptBin "nixos-help"
''
diff --git a/nixos/modules/services/misc/phd.nix b/nixos/modules/services/misc/phd.nix
new file mode 100644
index 00000000000..e605ce5de16
--- /dev/null
+++ b/nixos/modules/services/misc/phd.nix
@@ -0,0 +1,52 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+ cfg = config.services.phd;
+
+in
+
+{
+
+ ###### interface
+
+ options = {
+
+ services.phd = {
+
+ enable = mkOption {
+ default = false;
+ description = "
+ Enable daemons for phabricator.
+ ";
+ };
+
+ };
+
+ };
+
+ ###### implementation
+
+ config = mkIf cfg.enable {
+
+ systemd.services.phd = {
+ path = [ pkgs.phabricator pkgs.php pkgs.mercurial pkgs.git pkgs.subversion ];
+
+ after = [ "httpd.service" ];
+ wantedBy = [ "multi-user.target" ];
+
+ serviceConfig = {
+ ExecStart = "${pkgs.phabricator}/phabricator/bin/phd start";
+ ExecStop = "${pkgs.phabricator}/phabricator/bin/phd stop";
+ User = "wwwrun";
+ RestartSec = "30s";
+ Restart = "always";
+ StartLimitInterval = "1m";
+ };
+ };
+
+ };
+
+}
diff --git a/nixos/modules/services/misc/uhub.nix b/nixos/modules/services/misc/uhub.nix
new file mode 100644
index 00000000000..15071202b9c
--- /dev/null
+++ b/nixos/modules/services/misc/uhub.nix
@@ -0,0 +1,186 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+ cfg = config.services.uhub;
+
+ uhubPkg = pkgs.uhub.override { tlsSupport = cfg.enableTLS; };
+
+ pluginConfig = ""
+ + optionalString cfg.plugins.authSqlite.enable ''
+ plugin ${uhubPkg.mod_auth_sqlite}/mod_auth_sqlite.so "file=${cfg.plugins.authSqlite.file}"
+ ''
+ + optionalString cfg.plugins.logging.enable ''
+ plugin ${uhubPkg.mod_logging}/mod_logging.so ${if cfg.plugins.logging.syslog then "syslog=true" else "file=${cfg.plugins.logging.file}"}
+ ''
+ + optionalString cfg.plugins.welcome.enable ''
+ plugin ${uhubPkg.mod_welcome}/mod_welcome.so "motd=${pkgs.writeText "motd.txt" cfg.plugins.welcome.motd} rules=${pkgs.writeText "rules.txt" cfg.plugins.welcome.rules}"
+ ''
+ + optionalString cfg.plugins.history.enable ''
+ plugin ${uhubPkg.mod_chat_history}/mod_chat_history.so "history_max=${toString cfg.plugins.history.max} history_default=${toString cfg.plugins.history.default} history_connect=${toString cfg.plugins.history.connect}"
+ '';
+
+ uhubConfigFile = pkgs.writeText "uhub.conf" ''
+ file_acl=${pkgs.writeText "users.conf" cfg.aclConfig}
+ file_plugins=${pkgs.writeText "plugins.conf" pluginConfig}
+ server_bind_addr=${cfg.address}
+ server_port=${toString cfg.port}
+ ${lib.optionalString cfg.enableTLS "tls_enable=yes"}
+ ${cfg.hubConfig}
+ '';
+
+in
+
+{
+ options = {
+
+ services.uhub = {
+
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Whether to enable the uhub ADC hub.";
+ };
+
+ port = mkOption {
+ type = types.int;
+ default = 1511;
+ description = "TCP port to bind the hub to.";
+ };
+
+ address = mkOption {
+ type = types.string;
+ default = "any";
+ description = "Address to bind the hub to.";
+ };
+
+ enableTLS = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Whether to enable TLS support.";
+ };
+
+ hubConfig = mkOption {
+ type = types.lines;
+ default = "";
+ description = "Contents of uhub configuration file.";
+ };
+
+ aclConfig = mkOption {
+ type = types.lines;
+ default = "";
+ description = "Contents of user ACL configuration file.";
+ };
+
+ plugins = {
+
+ authSqlite = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Whether to enable the Sqlite authentication database plugin";
+ };
+ file = mkOption {
+ type = types.string;
+ example = "/var/db/uhub-users";
+ description = "Path to user database. Use the uhub-passwd utility to create the database and add/remove users.";
+ };
+ };
+
+ logging = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Whether to enable the logging plugin.";
+ };
+ file = mkOption {
+ type = types.string;
+ default = "";
+ description = "Path of log file.";
+ };
+ syslog = mkOption {
+ type = types.bool;
+ default = false;
+ description = "If true then the system log is used instead of writing to file.";
+ };
+ };
+
+ welcome = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Whether to enable the welcome plugin.";
+ };
+ motd = mkOption {
+ default = "";
+ type = types.lines;
+ description = ''
+ Welcome message displayed to clients after connecting
+ and with the !motd command.
+ '';
+ };
+ rules = mkOption {
+ default = "";
+ type = types.lines;
+ description = ''
+ Rules message, displayed to clients with the !rules command.
+ '';
+ };
+ };
+
+ history = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Whether to enable the history plugin.";
+ };
+ max = mkOption {
+ type = types.int;
+ default = 200;
+ description = "The maximum number of messages to keep in history";
+ };
+ default = mkOption {
+ type = types.int;
+ default = 10;
+ description = "When !history is provided without arguments, then this default number of messages are returned.";
+ };
+ connect = mkOption {
+ type = types.int;
+ default = 5;
+ description = "The number of chat history messages to send when users connect (0 = do not send any history).";
+ };
+ };
+
+ };
+ };
+
+ };
+
+ config = mkIf cfg.enable {
+
+ users = {
+ extraUsers = singleton {
+ name = "uhub";
+ uid = config.ids.uids.uhub;
+ };
+ extraGroups = singleton {
+ name = "uhub";
+ gid = config.ids.gids.uhub;
+ };
+ };
+
+ systemd.services.uhub = {
+ description = "high performance peer-to-peer hub for the ADC network";
+ after = [ "network.target" ];
+ wantedBy = [ "multi-user.target" ];
+ serviceConfig = {
+ Type = "notify";
+ ExecStart = "${uhubPkg}/bin/uhub -c ${uhubConfigFile} -u uhub -g uhub -L";
+ ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+ };
+ };
+ };
+
+}
\ No newline at end of file
diff --git a/nixos/modules/services/misc/zookeeper.nix b/nixos/modules/services/misc/zookeeper.nix
new file mode 100755
index 00000000000..47675b8876c
--- /dev/null
+++ b/nixos/modules/services/misc/zookeeper.nix
@@ -0,0 +1,145 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.zookeeper;
+
+ zookeeperConfig = ''
+ dataDir=${cfg.dataDir}
+ clientPort=${toString cfg.port}
+ autopurge.purgeInterval=${toString cfg.purgeInterval}
+ ${cfg.extraConf}
+ ${cfg.servers}
+ '';
+
+ configDir = pkgs.buildEnv {
+ name = "zookeeper-conf";
+ paths = [
+ (pkgs.writeTextDir "zoo.cfg" zookeeperConfig)
+ (pkgs.writeTextDir "log4j.properties" cfg.logging)
+ ];
+ };
+
+in {
+
+ options.services.zookeeper = {
+ enable = mkOption {
+ description = "Whether to enable Zookeeper.";
+ default = false;
+ type = types.uniq types.bool;
+ };
+
+ port = mkOption {
+ description = "Zookeeper Client port.";
+ default = 2181;
+ type = types.int;
+ };
+
+ id = mkOption {
+ description = "Zookeeper ID.";
+ default = 0;
+ type = types.int;
+ };
+
+ purgeInterval = mkOption {
+ description = ''
+ The time interval in hours for which the purge task has to be triggered. Set to a positive integer (1 and above) to enable the auto purging.
+ '';
+ default = 1;
+ type = types.int;
+ };
+
+ extraConf = mkOption {
+ description = "Extra configuration for Zookeeper.";
+ type = types.lines;
+ default = ''
+ initLimit=5
+ syncLimit=2
+ tickTime=2000
+ '';
+ };
+
+ servers = mkOption {
+ description = "All Zookeeper Servers.";
+ default = "";
+ type = types.lines;
+ example = ''
+ server.0=host0:2888:3888
+ server.1=host1:2888:3888
+ server.2=host2:2888:3888
+ '';
+ };
+
+ logging = mkOption {
+ description = "Zookeeper logging configuration.";
+ default = ''
+ zookeeper.root.logger=INFO, CONSOLE
+ log4j.rootLogger=INFO, CONSOLE
+ log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+ log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+ log4j.appender.CONSOLE.layout.ConversionPattern=[myid:%X{myid}] - %-5p [%t:%C{1}@%L] - %m%n
+ '';
+ type = types.lines;
+ };
+
+ dataDir = mkOption {
+ type = types.path;
+ default = "/var/lib/zookeeper";
+ description = ''
+ Data directory for Zookeeper
+ '';
+ };
+
+ extraCmdLineOptions = mkOption {
+ description = "Extra command line options for the Zookeeper launcher.";
+ default = [ "-Dcom.sun.management.jmxremote" "-Dcom.sun.management.jmxremote.local.only=true" ];
+ type = types.listOf types.string;
+ example = [ "-Djava.net.preferIPv4Stack=true" "-Dcom.sun.management.jmxremote" "-Dcom.sun.management.jmxremote.local.only=true" ];
+ };
+
+ preferIPv4 = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Add the -Djava.net.preferIPv4Stack=true flag to the Zookeeper server.
+ '';
+ };
+
+ };
+
+
+ config = mkIf cfg.enable {
+ systemd.services.zookeeper = {
+ description = "Zookeeper Daemon";
+ wantedBy = [ "multi-user.target" ];
+ after = [ "network-interfaces.target" ];
+ environment = { ZOOCFGDIR = configDir; };
+ serviceConfig = {
+ ExecStart = ''
+ ${pkgs.jre}/bin/java \
+ -cp "${pkgs.zookeeper}/lib/*:${pkgs.zookeeper}/${pkgs.zookeeper.name}.jar:${configDir}" \
+ ${toString cfg.extraCmdLineOptions} \
+ -Dzookeeper.datadir.autocreate=false \
+ ${optionalString cfg.preferIPv4 "-Djava.net.preferIPv4Stack=true"} \
+ org.apache.zookeeper.server.quorum.QuorumPeerMain \
+ ${configDir}/zoo.cfg
+ '';
+ User = "zookeeper";
+ PermissionsStartOnly = true;
+ };
+ preStart = ''
+ mkdir -m 0700 -p ${cfg.dataDir}
+ if [ "$(id -u)" = 0 ]; then chown zookeeper ${cfg.dataDir}; fi
+ echo "${toString cfg.id}" > ${cfg.dataDir}/myid
+ '';
+ };
+
+ users.extraUsers = singleton {
+ name = "zookeeper";
+ uid = config.ids.uids.zookeeper;
+ description = "Zookeeper daemon user";
+ home = cfg.dataDir;
+ };
+ };
+}
diff --git a/nixos/modules/services/monitoring/apcupsd.nix b/nixos/modules/services/monitoring/apcupsd.nix
index 6cc0c122ec6..ffa7be7dd30 100644
--- a/nixos/modules/services/monitoring/apcupsd.nix
+++ b/nixos/modules/services/monitoring/apcupsd.nix
@@ -161,6 +161,7 @@ in
# systemd kills it with SIGKILL.
TimeoutStopSec = 5;
};
+ unitConfig.Documentation = "man:apcupsd(8)";
};
# A special service to tell the UPS to power down/hibernate just before the
diff --git a/nixos/modules/services/monitoring/collectd.nix b/nixos/modules/services/monitoring/collectd.nix
new file mode 100644
index 00000000000..717c2c48168
--- /dev/null
+++ b/nixos/modules/services/monitoring/collectd.nix
@@ -0,0 +1,116 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+ cfg = config.services.collectd;
+
+ conf = pkgs.writeText "collectd.conf" ''
+ BaseDir "${cfg.dataDir}"
+ PIDFile "${cfg.pidFile}"
+ AutoLoadPlugin ${if cfg.autoLoadPlugin then "true" else "false"}
+ Hostname ${config.networking.hostName}
+
+ LoadPlugin syslog
+
+ LogLevel "info"
+ NotifyLevel "OKAY"
+
+
+ ${concatMapStrings (f: ''
+ Include "${f}"
+ '') cfg.include}
+
+ ${cfg.extraConfig}
+ '';
+
+in {
+ options.services.collectd = with types; {
+ enable = mkOption {
+ default = false;
+ description = ''
+ Whether to enable collectd agent.
+ '';
+ type = bool;
+ };
+
+ user = mkOption {
+ default = "collectd";
+ description = ''
+ User under which to run collectd.
+ '';
+ type = nullOr str;
+ };
+
+ dataDir = mkOption {
+ default = "/var/lib/collectd";
+ description = ''
+ Data directory for collectd agent.
+ '';
+ type = path;
+ };
+
+ pidFile = mkOption {
+ default = "/var/run/collectd.pid";
+ description = ''
+ Location of collectd pid file.
+ '';
+ type = path;
+ };
+
+ autoLoadPlugin = mkOption {
+ default = false;
+ description = ''
+ Enable plugin autoloading.
+ '';
+ type = bool;
+ };
+
+ include = mkOption {
+ default = [];
+ description = ''
+ Additional paths to load config from.
+ '';
+ type = listOf str;
+ };
+
+ extraConfig = mkOption {
+ default = "";
+ description = ''
+ Extra configuration for collectd.
+ '';
+ type = lines;
+ };
+
+ };
+
+ config = mkIf cfg.enable {
+ systemd.services.collectd = {
+ description = "Collectd Monitoring Agent";
+ after = [ "network.target" ];
+ wantedBy = [ "multi-user.target" ];
+
+ serviceConfig = {
+ ExecStart = "${pkgs.collectd}/sbin/collectd -C ${conf} -P ${cfg.pidFile}";
+ Type = "forking";
+ PIDFile = cfg.pidFile;
+ User = optional (cfg.user!="root") cfg.user;
+ PermissionsStartOnly = true;
+ };
+
+ preStart = ''
+ mkdir -m 0700 -p ${cfg.dataDir}
+ install -D /dev/null ${cfg.pidFile}
+ if [ "$(id -u)" = 0 ]; then
+ chown -R ${cfg.user} ${cfg.dataDir};
+ chown ${cfg.user} ${cfg.pidFile}
+ fi
+ '';
+ };
+
+ users.extraUsers = optional (cfg.user == "collectd") {
+ name = "collectd";
+ uid = config.ids.uids.collectd;
+ };
+ };
+}
diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix
index dbfe0ee182a..3d97c31b7a1 100644
--- a/nixos/modules/services/monitoring/graphite.nix
+++ b/nixos/modules/services/monitoring/graphite.nix
@@ -8,6 +8,22 @@ let
dataDir = cfg.dataDir;
+ graphiteApiConfig = pkgs.writeText "graphite-api.yaml" ''
+ time_zone: ${config.time.timeZone}
+ search_index: ${dataDir}/index
+ ${optionalString (cfg.api.finders != []) ''finders:''}
+ ${concatMapStringsSep "\n" (f: " - " + f.moduleName) cfg.api.finders}
+ ${optionalString (cfg.api.functions != []) ''functions:''}
+ ${concatMapStringsSep "\n" (f: " - " + f) cfg.api.functions}
+ ${cfg.api.extraConfig}
+ '';
+
+ seyrenConfig = {
+ SEYREN_URL = cfg.seyren.seyrenUrl;
+ MONGO_URL = cfg.seyren.mongoUrl;
+ GRAPHITE_URL = cfg.seyren.graphiteUrl;
+ } // cfg.seyren.extraConfig;
+
configDir = pkgs.buildEnv {
name = "graphite-config";
paths = lists.filter (el: el != null) [
@@ -65,6 +81,72 @@ in {
};
};
+ api = {
+ enable = mkOption {
+ description = "Whether to enable graphite api.";
+ default = false;
+ type = types.uniq types.bool;
+ };
+
+ finders = mkOption {
+ description = "List of finder plugins load.";
+ default = [];
+ example = [ pkgs.python27Packages.graphite_influxdb ];
+ type = types.listOf types.package;
+ };
+
+ functions = mkOption {
+ description = "List of functions to load.";
+ default = [
+ "graphite_api.functions.SeriesFunctions"
+ "graphite_api.functions.PieFunctions"
+ ];
+ type = types.listOf types.str;
+ };
+
+ host = mkOption {
+ description = "Graphite web service listen address.";
+ default = "127.0.0.1";
+ type = types.str;
+ };
+
+ port = mkOption {
+ description = "Graphite api service port.";
+ default = 8080;
+ type = types.int;
+ };
+
+ package = mkOption {
+ description = "Package to use for graphite api.";
+ default = pkgs.python27Packages.graphite_api;
+ type = types.package;
+ };
+
+ extraConfig = mkOption {
+ description = "Extra configuration for graphite api.";
+ default = ''
+ whisper:
+ directories:
+ - ${dataDir}/whisper
+ '';
+ example = literalExample ''
+ allowed_origins:
+ - dashboard.example.com
+ cheat_times: true
+ influxdb:
+ host: localhost
+ port: 8086
+ user: influxdb
+ pass: influxdb
+ db: metrics
+ cache:
+ CACHE_TYPE: 'filesystem'
+ CACHE_DIR: '/tmp/graphite-api-cache'
+ '';
+ type = types.str;
+ };
+ };
+
carbon = {
config = mkOption {
description = "Content of carbon configuration file.";
@@ -172,11 +254,65 @@ in {
'';
};
};
+
+ seyren = {
+ enable = mkOption {
+ description = "Whether to enable seyren service.";
+ default = false;
+ type = types.uniq types.bool;
+ };
+
+ port = mkOption {
+ description = "Seyren listening port.";
+ default = 8081;
+ type = types.int;
+ };
+
+ seyrenUrl = mkOption {
+ default = "http://localhost:${toString cfg.seyren.port}/";
+ description = "Host where seyren is accessible.";
+ type = types.str;
+ };
+
+ graphiteUrl = mkOption {
+ default = "http://${cfg.web.host}:${toString cfg.web.port}";
+ description = "Host where graphite service runs.";
+ type = types.str;
+ };
+
+ mongoUrl = mkOption {
+ default = "mongodb://${config.services.mongodb.bind_ip}:27017/seyren";
+ description = "Mongodb connection string.";
+ type = types.str;
+ };
+
+ extraConfig = mkOption {
+ default = {};
+ description = ''
+ Extra seyren configuration. See
+
+ '';
+ type = types.attrsOf types.str;
+ example = literalExample ''
+ {
+ GRAPHITE_USERNAME = "user";
+ GRAPHITE_PASSWORD = "pass";
+ }
+ '';
+ };
+ };
};
###### implementation
- config = mkIf (cfg.carbon.enableAggregator || cfg.carbon.enableCache || cfg.carbon.enableRelay || cfg.web.enable) {
+ config = mkIf (
+ cfg.carbon.enableAggregator ||
+ cfg.carbon.enableCache ||
+ cfg.carbon.enableRelay ||
+ cfg.web.enable ||
+ cfg.api.enable ||
+ cfg.seyren.enable
+ ) {
systemd.services.carbonCache = {
enable = cfg.carbon.enableCache;
description = "Graphite Data Storage Backend";
@@ -189,10 +325,6 @@ in {
Group = "graphite";
PermissionsStartOnly = true;
};
- restartTriggers = [
- pkgs.pythonPackages.carbon
- configDir
- ];
preStart = ''
mkdir -p ${cfg.dataDir}/whisper
chmod 0700 ${cfg.dataDir}/whisper
@@ -211,10 +343,6 @@ in {
User = "graphite";
Group = "graphite";
};
- restartTriggers = [
- pkgs.pythonPackages.carbon
- configDir
- ];
};
systemd.services.carbonRelay = {
@@ -228,10 +356,6 @@ in {
User = "graphite";
Group = "graphite";
};
- restartTriggers = [
- pkgs.pythonPackages.carbon
- configDir
- ];
};
systemd.services.graphiteWeb = {
@@ -243,7 +367,7 @@ in {
environment = {
PYTHONPATH = "${pkgs.python27Packages.graphite_web}/lib/python2.7/site-packages";
DJANGO_SETTINGS_MODULE = "graphite.settings";
- GRAPHITE_CONF_DIR = "/etc/graphite/";
+ GRAPHITE_CONF_DIR = configDir;
GRAPHITE_STORAGE_DIR = dataDir;
};
serviceConfig = {
@@ -271,11 +395,64 @@ in {
chown -R graphite:graphite ${cfg.dataDir}
fi
'';
- restartTriggers = [
- pkgs.python27Packages.graphite_web
- ];
};
+ systemd.services.graphiteApi = {
+ enable = cfg.api.enable;
+ description = "Graphite Api Interface";
+ wantedBy = [ "multi-user.target" ];
+ after = [ "network-interfaces.target" ];
+ environment = {
+ PYTHONPATH =
+ "${cfg.api.package}/lib/python2.7/site-packages:" +
+ concatMapStringsSep ":" (f: f + "/lib/python2.7/site-packages") cfg.api.finders;
+ GRAPHITE_API_CONFIG = graphiteApiConfig;
+ LD_LIBRARY_PATH = "${pkgs.cairo}/lib";
+ };
+ serviceConfig = {
+ ExecStart = ''
+ ${pkgs.python27Packages.waitress}/bin/waitress-serve \
+ --host=${cfg.api.host} --port=${toString cfg.api.port} \
+ graphite_api.app:app
+ '';
+ User = "graphite";
+ Group = "graphite";
+ PermissionsStartOnly = true;
+ };
+ preStart = ''
+ if ! test -e ${dataDir}/db-created; then
+ mkdir -p ${dataDir}/cache/
+ chmod 0700 ${dataDir}/cache/
+
+ touch ${dataDir}/db-created
+
+ chown -R graphite:graphite ${cfg.dataDir}
+ fi
+ '';
+ };
+
+ systemd.services.seyren = {
+ enable = cfg.seyren.enable;
+ description = "Graphite Alerting Dashboard";
+ wantedBy = [ "multi-user.target" ];
+ after = [ "network-interfaces.target" "mongodb.service" ];
+ environment = seyrenConfig;
+ serviceConfig = {
+ ExecStart = "${pkgs.seyren}/bin/seyren -httpPort ${toString cfg.seyren.port}";
+ WorkingDirectory = dataDir;
+ User = "graphite";
+ Group = "graphite";
+ };
+ preStart = ''
+ if ! test -e ${dataDir}/db-created; then
+ mkdir -p ${dataDir}
+ chown -R graphite:graphite ${dataDir}
+ fi
+ '';
+ };
+
+ services.mongodb.enable = mkDefault cfg.seyren.enable;
+
environment.systemPackages = [
pkgs.pythonPackages.carbon
pkgs.python27Packages.graphite_web
diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix
index 21840bc67e8..aab1c4b75ef 100644
--- a/nixos/modules/services/monitoring/munin.nix
+++ b/nixos/modules/services/monitoring/munin.nix
@@ -37,7 +37,7 @@ let
--set PATH "/run/current-system/sw/bin:/run/current-system/sw/sbin" \
--set MUNIN_LIBDIR "${pkgs.munin}/lib" \
--set MUNIN_PLUGSTATE "/var/run/munin"
-
+
# munin uses markers to tell munin-node-configure what a plugin can do
echo "#%# family=$family" >> $file
echo "#%# capabilities=$cap" >> $file
@@ -57,7 +57,7 @@ let
rundir /var/run/munin
${cronCfg.extraGlobalConfig}
-
+
${cronCfg.hosts}
'';
@@ -72,10 +72,10 @@ let
group root
host_name ${config.networking.hostName}
setsid 0
-
+
# wrapped plugins by makeWrapper being with dots
ignore_file ^\.
-
+
allow ^127\.0\.0\.1$
${nodeCfg.extraConfig}
@@ -97,7 +97,7 @@ in
See .
'';
};
-
+
extraConfig = mkOption {
default = "";
description = ''
@@ -118,7 +118,7 @@ in
Enable munin-cron. Takes care of all heavy lifting to collect data from
nodes and draws graphs to html. Runs munin-update, munin-limits,
munin-graphs and munin-html in that order.
-
+
HTML output is in /var/www/munin/, configure your
favourite webserver to serve static files.
'';
@@ -138,7 +138,7 @@ in
};
'';
};
-
+
extraGlobalConfig = mkOption {
default = "";
description = ''
@@ -160,7 +160,7 @@ in
'';
};
-
+
};
};
diff --git a/nixos/modules/services/monitoring/smartd.nix b/nixos/modules/services/monitoring/smartd.nix
index 250035fe447..803bd9e9a65 100644
--- a/nixos/modules/services/monitoring/smartd.nix
+++ b/nixos/modules/services/monitoring/smartd.nix
@@ -62,7 +62,7 @@ in
enable = mkOption {
default = false;
type = types.bool;
- example = "true";
+ example = true;
description = ''
Run smartd from the smartmontools package. Note that e-mail
notifications will not be enabled unless you configure the list of
diff --git a/nixos/modules/services/monitoring/statsd.nix b/nixos/modules/services/monitoring/statsd.nix
index 74f3deb4c29..942ce72f6a3 100644
--- a/nixos/modules/services/monitoring/statsd.nix
+++ b/nixos/modules/services/monitoring/statsd.nix
@@ -8,13 +8,20 @@ let
configFile = pkgs.writeText "statsd.conf" ''
{
- host: "${cfg.host}",
+ address: "${cfg.host}",
port: "${toString cfg.port}",
mgmt_address: "${cfg.mgmt_address}",
mgmt_port: "${toString cfg.mgmt_port}",
- backends: [${concatMapStrings (el: ''"./backends/${el}",'') cfg.backends}],
- graphiteHost: "${cfg.graphiteHost}",
- graphitePort: "${toString cfg.graphitePort}",
+ backends: [${concatMapStringsSep "," (el: if (nixType el) == "string" then ''"./backends/${el}"'' else ''"${head el.names}"'') cfg.backends}],
+ ${optionalString (cfg.graphiteHost!=null) ''graphiteHost: "${cfg.graphiteHost}",''}
+ ${optionalString (cfg.graphitePort!=null) ''graphitePort: "${toString cfg.graphitePort}",''}
+ console: {
+ prettyprint: false
+ },
+ log: {
+ backend: "syslog"
+ },
+ automaticConfigReload: false${optionalString (cfg.extraConfig != null) ","}
${cfg.extraConfig}
}
'';
@@ -60,24 +67,26 @@ in
backends = mkOption {
description = "List of backends statsd will use for data persistance";
default = ["graphite"];
+ example = ["graphite" pkgs.nodePackages."statsd-influxdb-backend"];
+ type = types.listOf (types.either types.str types.package);
};
graphiteHost = mkOption {
description = "Hostname or IP of Graphite server";
- default = config.services.graphite.web.host;
- type = types.str;
+ default = null;
+ type = types.nullOr types.str;
};
graphitePort = mkOption {
description = "Port of Graphite server (i.e. carbon-cache).";
- default = 2003;
- type = types.uniq types.int;
+ default = null;
+ type = types.nullOr types.int;
};
extraConfig = mkOption {
- default = "";
description = "Extra configuration options for statsd";
- type = types.str;
+ default = "";
+ type = types.nullOr types.str;
};
};
@@ -95,6 +104,9 @@ in
systemd.services.statsd = {
description = "Statsd Server";
wantedBy = [ "multi-user.target" ];
+ environment = {
+ NODE_PATH=concatMapStringsSep ":" (el: "${el}/lib/node_modules") (filter (el: (nixType el) != "string") cfg.backends);
+ };
serviceConfig = {
ExecStart = "${pkgs.nodePackages.statsd}/bin/statsd ${configFile}";
User = "statsd";
diff --git a/nixos/modules/services/network-filesystems/diod.nix b/nixos/modules/services/network-filesystems/diod.nix
new file mode 100644
index 00000000000..7de7acaa4a0
--- /dev/null
+++ b/nixos/modules/services/network-filesystems/diod.nix
@@ -0,0 +1,160 @@
+{ config, lib, pkgs, ... }:
+with lib;
+let
+ cfg = config.services.diod;
+
+ diodBool = b: if b then "1" else "0";
+
+ diodConfig = pkgs.writeText "diod.conf" ''
+ allsquash = ${diodBool cfg.allsquash}
+ auth_required = ${diodBool cfg.authRequired}
+ exportall = ${diodBool cfg.exportall}
+ exportopts = "${concatStringsSep "," cfg.exportopts}"
+ exports = { ${concatStringsSep ", " (map (s: ''"${s}"'' ) cfg.exports)} }
+ listen = { ${concatStringsSep ", " (map (s: ''"${s}"'' ) cfg.listen)} }
+ logdest = "${cfg.logdest}"
+ nwthreads = ${toString cfg.nwthreads}
+ squashuser = "${cfg.squashuser}"
+ statfs_passthru = ${diodBool cfg.statfsPassthru}
+ userdb = ${diodBool cfg.userdb}
+ ${cfg.extraConfig}
+ '';
+in
+{
+ options = {
+ services.diod = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Whether to enable the diod 9P file server.";
+ };
+
+ listen = mkOption {
+ type = types.listOf types.str;
+ default = [ "0.0.0.0:564" ];
+ description = ''
+ [ "IP:PORT" [,"IP:PORT",...] ]
+ List the interfaces and ports that diod should listen on.
+ '';
+ };
+
+ exports = mkOption {
+ type = types.listOf types.str;
+ default = [];
+ description = ''
+ List the file systems that clients will be allowed to mount. All paths should
+ be fully qualified. The exports table can include two types of element:
+ a string element (as above),
+ or an alternate table element form { path="/path", opts="ro" }.
+ In the alternate form, the (optional) opts attribute is a comma-separated list
+ of export options. The two table element forms can be mixed in the exports
+ table. Note that although diod will not traverse file system boundaries for a
+ given mount due to inode uniqueness constraints, subdirectories of a file
+ system can be separately exported.
+ '';
+ };
+
+ exportall = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Export all file systems listed in /proc/mounts. If new file systems are mounted
+ after diod has started, they will become immediately mountable. If there is a
+ duplicate entry for a file system in the exports list, any options listed in
+ the exports entry will apply.
+ '';
+ };
+
+ exportopts = mkOption {
+ type = types.listOf types.str;
+ default = [];
+ description = ''
+ Establish a default set of export options. These are overridden, not appended
+ to, by opts attributes in an "exports" entry.
+ '';
+ };
+
+ nwthreads = mkOption {
+ type = types.int;
+ default = 16;
+ description = ''
+ Sets the (fixed) number of worker threads created to handle 9P
+ requests for a unique aname.
+ '';
+ };
+
+ authRequired = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Allow clients to connect without authentication, i.e. without a valid MUNGE credential.
+ '';
+ };
+
+ userdb = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ This option disables password/group lookups. It allows any uid to attach and
+ assumes gid=uid, and supplementary groups contain only the primary gid.
+ '';
+ };
+
+ allsquash = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Remap all users to "nobody". The attaching user need not be present in the
+ password file.
+ '';
+ };
+
+ squashuser = mkOption {
+ type = types.str;
+ default = "nobody";
+ description = ''
+ Change the squash user. The squash user must be present in the password file.
+ '';
+ };
+
+ logdest = mkOption {
+ type = types.str;
+ default = "syslog:daemon:err";
+ description = ''
+ Set the destination for logging.
+ The value has the form of "syslog:facility:level" or "filename".
+ '';
+ };
+
+
+ statfsPassthru = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ This option configures statfs to return the host file system's type
+ rather than V9FS_MAGIC.
+ '';
+ };
+
+ extraConfig = mkOption {
+ type = types.lines;
+ default = "";
+ description = "Extra configuration options for diod.conf.";
+ };
+ };
+ };
+
+ config = mkIf config.services.diod.enable {
+ environment.systemPackages = [ pkgs.diod ];
+
+ systemd.services.diod = {
+ description = "diod 9P file server";
+ wantedBy = [ "multi-user.target" ];
+ after = [ "network.target" ];
+ serviceConfig = {
+ ExecStart = "${pkgs.diod}/sbin/diod -f -c ${diodConfig}";
+ Capabilities = "cap_net_bind_service+=ep";
+ };
+ };
+ };
+}
diff --git a/nixos/modules/services/network-filesystems/nfsd.nix b/nixos/modules/services/network-filesystems/nfsd.nix
index 2217fec3b0f..57d56cd7287 100644
--- a/nixos/modules/services/network-filesystems/nfsd.nix
+++ b/nixos/modules/services/network-filesystems/nfsd.nix
@@ -56,6 +56,14 @@ in
default = false;
description = "Whether to create the mount points in the exports file at startup time.";
};
+
+ mountdPort = mkOption {
+ default = null;
+ example = 4002;
+ description = ''
+ Use fixed port for rpc.mountd, usefull if server is behind firewall.
+ '';
+ };
};
};
@@ -138,7 +146,10 @@ in
restartTriggers = [ exports ];
serviceConfig.Type = "forking";
- serviceConfig.ExecStart = "@${pkgs.nfsUtils}/sbin/rpc.mountd rpc.mountd";
+ serviceConfig.ExecStart = ''
+ @${pkgs.nfsUtils}/sbin/rpc.mountd rpc.mountd \
+ ${if cfg.mountdPort != null then "-p ${toString cfg.mountdPort}" else ""}
+ '';
serviceConfig.Restart = "always";
};
diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix
index 4218b965cd9..fd1e83d9f3e 100644
--- a/nixos/modules/services/network-filesystems/samba.nix
+++ b/nixos/modules/services/network-filesystems/samba.nix
@@ -6,9 +6,6 @@ let
cfg = config.services.samba;
- user = "smbguest";
- group = "smbguest";
-
logDir = "/var/log/samba";
privateDir = "/var/samba/private";
@@ -16,12 +13,6 @@ let
setupScript =
''
- if ! test -d /home/smbd ; then
- mkdir -p /home/smbd
- chown ${user} /home/smbd
- chmod a+rwx /home/smbd
- fi
-
if ! test -d /var/samba ; then
mkdir -p /var/samba/locks /var/samba/cores/nmbd /var/samba/cores/smbd /var/samba/cores/winbindd
fi
@@ -37,21 +28,15 @@ let
'';
configFile = pkgs.writeText "smb.conf"
+ (if cfg.configText != null then cfg.configText else
''
[ global ]
log file = ${logDir}/log.%m
private dir = ${privateDir}
${optionalString cfg.syncPasswordsByPam "pam password change = true"}
- ${if cfg.defaultShare.enable then ''
- [default]
- path = /home/smbd
- read only = ${if cfg.defaultShare.writeable then "no" else "yes"}
- guest ok = ${if cfg.defaultShare.guest then "yes" else "no"}
- ''else ""}
-
${cfg.extraConfig}
- '';
+ '');
# This may include nss_ldap, needed for samba if it has to use ldap.
nssModulesPath = config.system.nssModules.path;
@@ -149,19 +134,13 @@ in
";
};
- defaultShare = {
- enable = mkOption {
- description = "Whether to share /home/smbd as 'default'.";
- default = false;
- };
- writeable = mkOption {
- description = "Whether to allow write access to default share.";
- default = false;
- };
- guest = mkOption {
- description = "Whether to allow guest access to default share.";
- default = true;
- };
+ configText = mkOption {
+ type = types.nullOr types.lines;
+ default = null;
+ description = "
+ Verbatim contents of smb.conf. If null (default), use the
+ autogenerated file from NixOS instead.
+ ";
};
securityType = mkOption {
@@ -199,14 +178,6 @@ in
(mkIf config.services.samba.enable {
- users.extraUsers.smbguest = {
- description = "Samba service user";
- group = group;
- uid = config.ids.uids.smbguest;
- };
-
- users.extraGroups.smbguest.gid = config.ids.uids.smbguest;
-
system.nssModules = optional cfg.nsswins samba;
systemd = {
@@ -224,7 +195,7 @@ in
"samba-setup" = {
description = "Samba Setup Task";
script = setupScript;
- unitConfig.RequiresMountsFor = "/home/smbd /var/samba /var/log/samba";
+ unitConfig.RequiresMountsFor = "/var/samba /var/log/samba";
};
};
};
diff --git a/nixos/modules/services/network-filesystems/yandex-disk.nix b/nixos/modules/services/network-filesystems/yandex-disk.nix
new file mode 100644
index 00000000000..982b6ca5ea7
--- /dev/null
+++ b/nixos/modules/services/network-filesystems/yandex-disk.nix
@@ -0,0 +1,104 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+
+ cfg = config.services.yandex-disk;
+
+ dir = "/var/lib/yandex-disk";
+
+ u = if cfg.user != null then cfg.user else "yandexdisk";
+
+in
+
+{
+
+ ###### interface
+
+ options = {
+
+ services.yandex-disk = {
+
+ enable = mkOption {
+ default = false;
+ description = "
+ Whether to enable Yandex-disk client. See https://disk.yandex.ru/
+ ";
+ };
+
+ username = mkOption {
+ default = "";
+ type = types.string;
+ description = ''
+ Your yandex.com login name.
+ '';
+ };
+
+ password = mkOption {
+ default = "";
+ type = types.string;
+ description = ''
+ Your yandex.com password. Warning: it will be world-readable in /nix/store.
+ '';
+ };
+
+ user = mkOption {
+ default = null;
+ description = ''
+ The user the yandex-disk daemon should run as.
+ '';
+ };
+
+ directory = mkOption {
+ default = "/home/Yandex.Disk";
+ description = "The directory to use for Yandex.Disk storage";
+ };
+
+ };
+
+ };
+
+
+ ###### implementation
+
+ config = mkIf cfg.enable {
+
+ users.extraUsers = mkIf (cfg.user == null) [ {
+ name = u;
+ uid = config.ids.uids.yandexdisk;
+ group = "nogroup";
+ home = dir;
+ } ];
+
+ systemd.services.yandex-disk = {
+ description = "Yandex-disk server";
+
+ after = [ "network.target" ];
+
+ wantedBy = [ "multi-user.target" ];
+
+ # FIXME: have to specify ${directory} here as well
+ unitConfig.RequiresMountsFor = dir;
+
+ script = ''
+ mkdir -p -m 700 ${dir}
+ chown ${u} ${dir}
+
+ if ! test -d "${cfg.directory}" ; then
+ mkdir -p -m 755 ${cfg.directory} ||
+ exit 1
+ fi
+
+ ${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${u} \
+ -c '${pkgs.yandex-disk}/bin/yandex-disk token -p ${cfg.password} ${cfg.username} ${dir}/token'
+
+ ${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${u} \
+ -c '${pkgs.yandex-disk}/bin/yandex-disk start --no-daemon -a ${dir}/token -d ${cfg.directory}'
+ '';
+
+ };
+ };
+
+}
+
diff --git a/nixos/modules/services/networking/atftpd.nix b/nixos/modules/services/networking/atftpd.nix
new file mode 100644
index 00000000000..47465ba948a
--- /dev/null
+++ b/nixos/modules/services/networking/atftpd.nix
@@ -0,0 +1,51 @@
+# NixOS module for atftpd TFTP server
+
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+
+ cfg = config.services.atftpd;
+
+in
+
+{
+
+ options = {
+
+ services.atftpd = {
+
+ enable = mkOption {
+ default = false;
+ type = types.uniq types.bool;
+ description = ''
+ Whenever to enable the atftpd TFTP server.
+ '';
+ };
+
+ root = mkOption {
+ default = "/var/empty";
+ type = types.uniq types.string;
+ description = ''
+ Document root directory for the atftpd.
+ '';
+ };
+
+ };
+
+ };
+
+ config = mkIf cfg.enable {
+
+ systemd.services.atftpd = {
+ description = "atftpd TFTP server";
+ after = [ "network.target" ];
+ wantedBy = [ "multi-user.target" ];
+ # runs as nobody
+ serviceConfig.ExecStart = "${pkgs.atftp}/sbin/atftpd --daemon --no-fork --bind-address 0.0.0.0 ${cfg.root}";
+ };
+
+ };
+
+}
diff --git a/nixos/modules/services/networking/btsync.nix b/nixos/modules/services/networking/btsync.nix
index 5d0e17c293e..7ddc9e1045e 100644
--- a/nixos/modules/services/networking/btsync.nix
+++ b/nixos/modules/services/networking/btsync.nix
@@ -57,7 +57,7 @@ let
''
{
"device_name": "${cfg.deviceName}",
- "storage_path": "/var/lib/btsync",
+ "storage_path": "/var/lib/btsync/",
"listening_port": ${toString cfg.listeningPort},
"use_gui": false,
diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix
index 9306ffd5a18..7192b8b7a0e 100644
--- a/nixos/modules/services/networking/cjdns.nix
+++ b/nixos/modules/services/networking/cjdns.nix
@@ -1,13 +1,3 @@
-# You may notice the commented out sections in this file,
-# it would be great to configure cjdns from nix, but cjdns
-# reads its configuration from stdin, including the private
-# key and admin password, all nested in a JSON structure.
-#
-# Until a good method of storing the keys outside the nix
-# store and mixing them back into a string is devised
-# (without too much shell hackery), a skeleton of the
-# configuration building lies commented out.
-
{ config, lib, pkgs, ... }:
with lib;
@@ -16,41 +6,35 @@ let
cfg = config.services.cjdns;
- /*
- # can't keep keys and passwords in the nix store,
- # but don't want to deal with this stdin quagmire.
+ # would be nice to merge 'cfg' with a //,
+ # but the json nesting is wacky.
+ cjdrouteConf = builtins.toJSON ( {
+ admin = {
+ bind = cfg.admin.bind;
+ password = "@CJDNS_ADMIN_PASSWORD@";
+ };
+ authorizedPasswords = map (p: { password = p; }) cfg.authorizedPasswords;
+ interfaces = {
+ ETHInterface = if (cfg.ETHInterface.bind != "") then [ cfg.ETHInterface ] else [ ];
+ UDPInterface = if (cfg.UDPInterface.bind != "") then [ cfg.UDPInterface ] else [ ];
+ };
- cjdrouteConf = '' {
- "admin": {"bind": "${cfg.admin.bind}", "password": "\${CJDNS_ADMIN}" },
- "privateKey": "\${CJDNS_KEY}",
+ privateKey = "@CJDNS_PRIVATE_KEY@";
- "interfaces": {
- ''
+ resetAfterInactivitySeconds = 100;
- + optionalString (cfg.interfaces.udp.bind.address != null) ''
- "UDPInterface": [ {
- "bind": "${cfg.interfaces.udp.bind.address}:"''
- ${if cfg.interfaces.upd.bind.port != null
- then ${toString cfg.interfaces.udp.bind.port}
- else ${RANDOM}
- fi)
- + '' } ]''
+ router = {
+ interface = { type = "TUNInterface"; };
+ ipTunnel = {
+ allowedConnections = [];
+ outgoingConnections = [];
+ };
+ };
- + (if cfg.interfaces.eth.bind != null then ''
- "ETHInterface": [ {
- "bind": "${cfg.interfaces.eth.bind}",
- "beacon": ${toString cfg.interfaces.eth.beacon}
- } ]
- '' fi )
- + ''
- },
- "router": { "interface": { "type": "TUNInterface" }, },
- "security": [ { "setuser": "nobody" } ]
- }
- '';
+ security = [ { exemptAngel = 1; setuser = "nobody"; } ];
+
+ });
- cjdrouteConfFile = pkgs.writeText "cjdroute.conf" cjdrouteConf
- */
in
{
@@ -62,146 +46,180 @@ in
type = types.bool;
default = false;
description = ''
- Enable this option to start a instance of the
- cjdns network encryption and and routing engine.
- Configuration will be read from confFile.
+ Whether to enable the cjdns network encryption
+ and routing engine. A file at /etc/cjdns.keys will
+ be created if it does not exist to contain a random
+ secret key that your IPv6 address will be derived from.
'';
};
- confFile = mkOption {
- default = "/etc/cjdroute.conf";
- description = ''
- Configuration file to pipe to cjdroute.
+ authorizedPasswords = mkOption {
+ type = types.listOf types.str;
+ default = [ ];
+ example = [
+ "snyrfgkqsc98qh1y4s5hbu0j57xw5s0"
+ "z9md3t4p45mfrjzdjurxn4wuj0d8swv"
+ "49275fut6tmzu354pq70sr5b95qq0vj"
+ ];
+ description = ''
+ Any remote cjdns nodes that offer these passwords on
+ connection will be allowed to route through this node.
'';
};
-
- /*
+
admin = {
bind = mkOption {
+ type = types.string;
default = "127.0.0.1:11234";
description = ''
Bind the administration port to this address and port.
'';
};
+ };
- passwordFile = mkOption {
- example = "/root/cjdns.adminPassword";
+ UDPInterface = {
+ bind = mkOption {
+ type = types.string;
+ default = "";
+ example = "192.168.1.32:43211";
+ description = ''
+ Address and port to bind UDP tunnels to.
+ '';
+ };
+ connectTo = mkOption {
+ type = types.attrsOf ( types.submodule (
+ { options, ... }:
+ { options = {
+ # TODO make host an option, and add it to networking.extraHosts
+ password = mkOption {
+ type = types.str;
+ description = "Authorized password to the opposite end of the tunnel.";
+ };
+ publicKey = mkOption {
+ type = types.str;
+ description = "Public key at the opposite end of the tunnel.";
+ };
+ };
+ }
+ ));
+ default = { };
+ example = {
+ "192.168.1.1:27313" = {
+ password = "5kG15EfpdcKNX3f2GSQ0H1HC7yIfxoCoImnO5FHM";
+ publicKey = "371zpkgs8ss387tmr81q04mp0hg1skb51hw34vk1cq644mjqhup0.k";
+ };
+ };
+ description = ''
+ Credentials for making UDP tunnels.
+ '';
+ };
+ };
+
+ ETHInterface = {
+ bind = mkOption {
+ default = "";
+ example = "eth0";
description = ''
- File containing a password to the administration port.
+ Bind to this device for native ethernet operation.
'';
- };
- };
-
- keyFile = mkOption {
- type = types.str;
- example = "/root/cjdns.key";
- description = ''
- Path to a file containing a cjdns private key on a single line.
- '';
- };
-
- passwordsFile = mkOption {
- type = types.str;
- default = null;
- example = "/root/cjdns.authorizedPasswords";
- description = ''
- A file containing a list of json dictionaries with passwords.
- For example:
- {"password": "s8xf5z7znl4jt05g922n3wpk75wkypk"},
- { "name": "nice guy",
- "password": "xhthk1mglz8tpjrbbvdlhyc092rhpx5"},
- {"password": "3qfxyhmrht7uwzq29pmhbdm9w4bnc8w"}
- '';
- };
-
- interfaces = {
- udp = {
- bind = {
- address = mkOption {
- default = "0.0.0.0";
- description = ''
- Address to bind UDP tunnels to; disable by setting to null;
- '';
- };
- port = mkOption {
- type = types.int;
- default = null;
- description = ''
- Port to bind UDP tunnels to.
- A port will be choosen at random if this is not set.
- This option is required to act as the server end of
- a tunnel.
- '';
- };
- };
- };
-
- eth = {
- bind = mkOption {
- default = null;
- example = "eth0";
- description = ''
- Bind to this device and operate with native wire format.
- '';
- };
-
- beacon = mkOption {
- default = 2;
- description = ''
- Auto-connect to other cjdns nodes on the same network.
- Options:
- 0 -- Disabled.
-
- 1 -- Accept beacons, this will cause cjdns to accept incoming
- beacon messages and try connecting to the sender.
-
- 2 -- Accept and send beacons, this will cause cjdns to broadcast
- messages on the local network which contain a randomly
- generated per-session password, other nodes which have this
- set to 1 or 2 will hear the beacon messages and connect
- automatically.
- '';
- };
-
- connectTo = mkOption {
- type = types.listOf types.str;
- default = [];
- description = ''
- Credentials for connecting look similar to UDP credientials
- except they begin with the mac address, for example:
- "01:02:03:04:05:06":{"password":"a","publicKey":"b"}
- '';
- };
};
+
+ beacon = mkOption {
+ type = types.int;
+ default = 2;
+ description = ''
+ Auto-connect to other cjdns nodes on the same network.
+ Options:
+ 0: Disabled.
+ 1: Accept beacons, this will cause cjdns to accept incoming
+ beacon messages and try connecting to the sender.
+ 2: Accept and send beacons, this will cause cjdns to broadcast
+ messages on the local network which contain a randomly
+ generated per-session password, other nodes which have this
+ set to 1 or 2 will hear the beacon messages and connect
+ automatically.
+ '';
+ };
+
+ connectTo = mkOption {
+ type = types.attrsOf ( types.submodule (
+ { options, ... }:
+ { options = {
+ password = mkOption {
+ type = types.str;
+ description = "Authorized password to the opposite end of the tunnel.";
+ };
+ publicKey = mkOption {
+ type = types.str;
+ description = "Public key at the opposite end of the tunnel.";
+ };
+ };
+ }
+ ));
+ default = { };
+ example = {
+ "01:02:03:04:05:06" = {
+ password = "5kG15EfpdcKNX3f2GSQ0H1HC7yIfxoCoImnO5FHM";
+ publicKey = "371zpkgs8ss387tmr81q04mp0hg1skb51hw34vk1cq644mjqhup0.k";
+ };
+ };
+ description = ''
+ Credentials for connecting look similar to UDP credientials
+ except they begin with the mac address.
+ '';
+ };
};
- */
+
};
+
};
config = mkIf config.services.cjdns.enable {
boot.kernelModules = [ "tun" ];
- /*
- networking.firewall.allowedUDPPorts = mkIf (cfg.udp.bind.port != null) [
- cfg.udp.bind.port
- ];
- */
+ # networking.firewall.allowedUDPPorts = ...
systemd.services.cjdns = {
description = "encrypted networking for everybody";
wantedBy = [ "multi-user.target" ];
- wants = [ "network.target" ];
- before = [ "network.target" ];
- path = [ pkgs.cjdns ];
+ after = [ "network-interfaces.target" ];
+
+ script = ''
+ source /etc/cjdns.keys
+ echo '${cjdrouteConf}' | sed \
+ -e "s/@CJDNS_ADMIN_PASSWORD@/$CJDNS_ADMIN_PASSWORD/g" \
+ -e "s/@CJDNS_PRIVATE_KEY@/$CJDNS_PRIVATE_KEY/g" \
+ | ${pkgs.cjdns}/bin/cjdroute
+ '';
serviceConfig = {
Type = "forking";
- ExecStart = ''
- ${pkgs.stdenv.shell} -c "${pkgs.cjdns}/sbin/cjdroute < ${cfg.confFile}"
- '';
Restart = "on-failure";
};
};
+
+ system.activationScripts.cjdns = ''
+ grep -q "CJDNS_PRIVATE_KEY=" /etc/cjdns.keys || \
+ echo "CJDNS_PRIVATE_KEY=$(${pkgs.cjdns}/bin/makekey)" \
+ >> /etc/cjdns.keys
+
+ grep -q "CJDNS_ADMIN_PASSWORD=" /etc/cjdns.keys || \
+ echo "CJDNS_ADMIN_PASSWORD=$(${pkgs.coreutils}/bin/head -c 96 /dev/urandom | ${pkgs.coreutils}/bin/tr -dc A-Za-z0-9)" \
+ >> /etc/cjdns.keys
+
+ chmod 600 /etc/cjdns.keys
+ '';
+
+ assertions = [
+ { assertion = ( cfg.ETHInterface.bind != "" || cfg.UDPInterface.bind != "" );
+ message = "Neither cjdns.ETHInterface.bind nor cjdns.UDPInterface.bind defined.";
+ }
+ { assertion = config.networking.enableIPv6;
+ message = "networking.enableIPv6 must be enabled for CJDNS to work";
+ }
+ ];
+
};
-}
+
+}
\ No newline at end of file
diff --git a/nixos/modules/services/networking/consul.nix b/nixos/modules/services/networking/consul.nix
new file mode 100644
index 00000000000..ebc83681408
--- /dev/null
+++ b/nixos/modules/services/networking/consul.nix
@@ -0,0 +1,166 @@
+{ config, lib, pkgs, utils, ... }:
+
+with lib;
+let
+
+ dataDir = "/var/lib/consul";
+ cfg = config.services.consul;
+
+ configOptions = {
+ data_dir = dataDir;
+ rejoin_after_leave = true;
+ }
+ // (if cfg.webUi then { ui_dir = "${pkgs.consul.ui}"; } else { })
+ // cfg.extraConfig;
+
+ configFiles = [ "/etc/consul.json" "/etc/consul-addrs.json" ]
+ ++ cfg.extraConfigFiles;
+
+ devices = attrValues (filterAttrs (_: i: i != null) cfg.interface);
+ systemdDevices = flip map devices
+ (i: "sys-subsystem-net-devices-${utils.escapeSystemdPath i}.device");
+in
+{
+ options = {
+
+ services.consul = {
+
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Enables the consul daemon.
+ '';
+ };
+
+ webUi = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Enables the web interface on the consul http port.
+ '';
+ };
+
+ interface = {
+
+ advertise = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ description = ''
+ The name of the interface to pull the advertise_addr from.
+ '';
+ };
+
+ bind = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ description = ''
+ The name of the interface to pull the bind_addr from.
+ '';
+ };
+
+ };
+
+ forceIpv4 = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether we should force the interfaces to only pull ipv4 addresses.
+ '';
+ };
+
+ dropPrivileges = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Whether the consul agent should be run as a non-root consul user.
+ '';
+ };
+
+ extraConfig = mkOption {
+ default = { };
+ description = ''
+ Extra configuration options which are serialized to json and added
+ to the config.json file.
+ '';
+ };
+
+ extraConfigFiles = mkOption {
+ default = [ ];
+ type = types.listOf types.str;
+ description = ''
+ Additional configuration files to pass to consul
+ NOTE: These will not trigger the service to be restarted when altered.
+ '';
+ };
+
+ };
+
+ };
+
+ config = mkIf cfg.enable {
+
+ users.extraUsers."consul" = {
+ description = "Consul agent daemon user";
+ uid = config.ids.uids.consul;
+ };
+
+ environment = {
+ etc."consul.json".text = builtins.toJSON configOptions;
+ systemPackages = with pkgs; [ consul ];
+ };
+
+ systemd.services.consul = {
+ wantedBy = [ "multi-user.target" ];
+ after = [ "network.target" ] ++ systemdDevices;
+ bindsTo = systemdDevices;
+ restartTriggers = [ config.environment.etc."consul.json".source ];
+
+ serviceConfig = {
+ ExecStart = "@${pkgs.consul}/bin/consul consul agent"
+ + concatMapStrings (n: " -config-file ${n}") configFiles;
+ ExecStop = "${pkgs.consul}/bin/consul leave";
+ ExecReload = "${pkgs.consul}/bin/consul reload";
+ PermissionsStartOnly = true;
+ User = if cfg.dropPrivileges then "consul" else null;
+ };
+
+ path = with pkgs; [ iproute gnugrep gawk ];
+ preStart = ''
+ mkdir -m 0700 -p ${dataDir}
+ chown -R consul ${dataDir}
+
+ # Determine interface addresses
+ getAddrOnce () {
+ ip addr show dev "$1" \
+ | grep 'inet${optionalString (cfg.forceIpv4) " "}.*scope global' \
+ | awk -F '[ /\t]*' '{print $3}' | head -n 1
+ }
+ getAddr () {
+ ADDR="$(getAddrOnce $1)"
+ LEFT=60 # Die after 1 minute
+ while [ -z "$ADDR" ]; do
+ sleep 1
+ LEFT=$(expr $LEFT - 1)
+ if [ "$LEFT" -eq "0" ]; then
+ echo "Address lookup timed out"
+ exit 1
+ fi
+ ADDR="$(getAddrOnce $1)"
+ done
+ echo "$ADDR"
+ }
+ echo "{" > /etc/consul-addrs.json
+ ''
+ + concatStrings (flip mapAttrsToList cfg.interface (name: i:
+ optionalString (i != null) ''
+ echo " \"${name}_addr\": \"$(getAddr "${i}")\"," >> /etc/consul-addrs.json
+ ''))
+ + ''
+ echo " \"\": \"\"" >> /etc/consul-addrs.json
+ echo "}" >> /etc/consul-addrs.json
+ '';
+ };
+
+ };
+}
diff --git a/nixos/modules/services/networking/copy-com.nix b/nixos/modules/services/networking/copy-com.nix
new file mode 100644
index 00000000000..36bd29109b8
--- /dev/null
+++ b/nixos/modules/services/networking/copy-com.nix
@@ -0,0 +1,53 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+ cfg = config.services.copy-com;
+
+in
+
+{
+ options = {
+
+ services.copy-com = {
+
+ enable = mkOption {
+ default = false;
+ description = "
+ Enable the copy.com client.
+
+ The first time copy.com is run, it needs to be configured. Before enabling run
+ copy_console manually.
+ ";
+ };
+
+ user = mkOption {
+ description = "The user for which copy should run.";
+ };
+
+ debug = mkOption {
+ default = false;
+ description = "Output more.";
+ };
+ };
+ };
+
+ config = mkIf cfg.enable {
+ environment.systemPackages = [ pkgs.postfix ];
+
+ systemd.services."copy-com-${cfg.user}" = {
+ description = "Copy.com Client";
+ after = [ "network.target" "local-fs.target" ];
+ wantedBy = [ "multi-user.target" ];
+ serviceConfig = {
+ ExecStart = "${pkgs.copy-com}/bin/copy_console ${if cfg.debug then "-consoleOutput -debugToConsole=dirwatch,path-watch,csm_path,csm -debug -console" else ""}";
+ User = "${cfg.user}";
+ };
+
+ };
+ };
+
+}
+
diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix
index 866707c3a91..15dbf80a987 100644
--- a/nixos/modules/services/networking/dhcpcd.nix
+++ b/nixos/modules/services/networking/dhcpcd.nix
@@ -6,10 +6,12 @@ let
dhcpcd = if !config.boot.isContainer then pkgs.dhcpcd else pkgs.dhcpcd.override { udev = null; };
+ cfg = config.networking.dhcpcd;
+
# Don't start dhcpcd on explicitly configured interfaces or on
# interfaces that are part of a bridge, bond or sit device.
ignoredInterfaces =
- map (i: i.name) (filter (i: i.ipAddress != null) (attrValues config.networking.interfaces))
+ map (i: i.name) (filter (i: i.ip4 != [ ] || i.ipAddress != null) (attrValues config.networking.interfaces))
++ mapAttrsToList (i: _: i) config.networking.sits
++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.bridges))
++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.bonds))
@@ -38,7 +40,10 @@ let
# (Xen) and virbr* and vnet* (libvirt).
denyinterfaces ${toString ignoredInterfaces} lo peth* vif* tap* tun* virbr* vnet* vboxnet* sit*
- ${config.networking.dhcpcd.extraConfig}
+ # Use the list of allowed interfaces if specified
+ ${optionalString (cfg.allowInterfaces != null) "allowinterfaces ${toString cfg.allowInterfaces}"}
+
+ ${cfg.extraConfig}
'';
# Hook for emitting ip-up/ip-down events.
@@ -59,7 +64,7 @@ let
# ${config.systemd.package}/bin/systemctl start ip-down.target
#fi
- ${config.networking.dhcpcd.runHook}
+ ${cfg.runHook}
'';
in
@@ -70,6 +75,18 @@ in
options = {
+ networking.dhcpcd.persistent = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whenever to leave interfaces configured on dhcpcd daemon
+ shutdown. Set to true if you have your root or store mounted
+ over the network or this machine accepts SSH connections
+ through DHCP interfaces and clients should be notified when
+ it shuts down.
+ '';
+ };
+
networking.dhcpcd.denyInterfaces = mkOption {
type = types.listOf types.str;
default = [];
@@ -81,6 +98,17 @@ in
'';
};
+ networking.dhcpcd.allowInterfaces = mkOption {
+ type = types.nullOr (types.listOf types.str);
+ default = null;
+ description = ''
+ Enable the DHCP client for any interface whose name matches
+ any of the shell glob patterns in this list. Any interface not
+ explicitly matched by this pattern will be denied. This pattern only
+ applies when non-null.
+ '';
+ };
+
networking.dhcpcd.extraConfig = mkOption {
type = types.lines;
default = "";
@@ -110,6 +138,9 @@ in
{ description = "DHCP Client";
wantedBy = [ "network.target" ];
+ # Work-around to deal with problems where the kernel would remove &
+ # re-create Wifi interfaces early during boot.
+ after = [ "network-interfaces.target" ];
# Stopping dhcpcd during a reconfiguration is undesirable
# because it brings down the network interfaces configured by
@@ -123,7 +154,7 @@ in
serviceConfig =
{ Type = "forking";
PIDFile = "/run/dhcpcd.pid";
- ExecStart = "@${dhcpcd}/sbin/dhcpcd dhcpcd --quiet --config ${dhcpcdConf}";
+ ExecStart = "@${dhcpcd}/sbin/dhcpcd dhcpcd --quiet ${optionalString cfg.persistent "--persistent"} --config ${dhcpcdConf}";
ExecReload = "${dhcpcd}/sbin/dhcpcd --rebind";
Restart = "always";
};
diff --git a/nixos/modules/services/networking/dnsmasq.nix b/nixos/modules/services/networking/dnsmasq.nix
index 8e38b9d017a..5c68dd89fb1 100644
--- a/nixos/modules/services/networking/dnsmasq.nix
+++ b/nixos/modules/services/networking/dnsmasq.nix
@@ -6,9 +6,14 @@ let
cfg = config.services.dnsmasq;
dnsmasq = pkgs.dnsmasq;
- serversParam = concatMapStrings (s: "-S ${s} ") cfg.servers;
-
dnsmasqConf = pkgs.writeText "dnsmasq.conf" ''
+ ${optionalString cfg.resolveLocalQueries ''
+ conf-file=/etc/dnsmasq-conf.conf
+ resolv-file=/etc/dnsmasq-resolv.conf
+ ''}
+ ${flip concatMapStrings cfg.servers (server: ''
+ server=${server}
+ '')}
${cfg.extraConfig}
'';
@@ -29,11 +34,19 @@ in
'';
};
+ resolveLocalQueries = mkOption {
+ default = true;
+ description = ''
+ Whether dnsmasq should resolve local queries (i.e. add 127.0.0.1 to
+ /etc/resolv.conf)
+ '';
+ };
+
servers = mkOption {
default = [];
example = [ "8.8.8.8" "8.8.4.4" ];
description = ''
- The parameter to dnsmasq -S.
+ The DNS servers which dnsmasq should query.
'';
};
@@ -55,16 +68,35 @@ in
config = mkIf config.services.dnsmasq.enable {
- jobs.dnsmasq =
- { description = "dnsmasq daemon";
+ networking.nameservers =
+ optional cfg.resolveLocalQueries "127.0.0.1";
- startOn = "ip-up";
+ services.dbus.packages = [ dnsmasq ];
- daemonType = "daemon";
-
- exec = "${dnsmasq}/bin/dnsmasq -R ${serversParam} -o -C ${dnsmasqConf}";
+ users.extraUsers = singleton
+ { name = "dnsmasq";
+ uid = config.ids.uids.dnsmasq;
+ description = "Dnsmasq daemon user";
+ home = "/var/empty";
};
+ systemd.services.dnsmasq = {
+ description = "dnsmasq daemon";
+ after = [ "network.target" ];
+ wantedBy = [ "multi-user.target" ];
+ path = [ dnsmasq ];
+ preStart = ''
+ touch /etc/dnsmasq-{conf,resolv}.conf
+ dnsmasq --test
+ '';
+ serviceConfig = {
+ Type = "dbus";
+ BusName = "uk.org.thekelleys.dnsmasq";
+ ExecStart = "${dnsmasq}/bin/dnsmasq -k --enable-dbus --user=dnsmasq -C ${dnsmasqConf}";
+ ExecReload = "${dnsmasq}/bin/kill -HUP $MAINPID";
+ };
+ };
+
};
}
diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix
index 42914bfe5d6..68aac3d30de 100644
--- a/nixos/modules/services/networking/firewall.nix
+++ b/nixos/modules/services/networking/firewall.nix
@@ -37,6 +37,180 @@ let
}
'';
+ writeShScript = name: text: let dir = pkgs.writeScriptBin name ''
+ #! ${pkgs.stdenv.shell} -e
+ ${text}
+ ''; in "${dir}/bin/${name}";
+
+ startScript = writeShScript "firewall-start" ''
+ ${helpers}
+
+ # Flush the old firewall rules. !!! Ideally, updating the
+ # firewall would be atomic. Apparently that's possible
+ # with iptables-restore.
+ ip46tables -D INPUT -j nixos-fw 2> /dev/null || true
+ for chain in nixos-fw nixos-fw-accept nixos-fw-log-refuse nixos-fw-refuse FW_REFUSE; do
+ ip46tables -F "$chain" 2> /dev/null || true
+ ip46tables -X "$chain" 2> /dev/null || true
+ done
+
+
+ # The "nixos-fw-accept" chain just accepts packets.
+ ip46tables -N nixos-fw-accept
+ ip46tables -A nixos-fw-accept -j ACCEPT
+
+
+ # The "nixos-fw-refuse" chain rejects or drops packets.
+ ip46tables -N nixos-fw-refuse
+
+ ${if cfg.rejectPackets then ''
+ # Send a reset for existing TCP connections that we've
+ # somehow forgotten about. Send ICMP "port unreachable"
+ # for everything else.
+ ip46tables -A nixos-fw-refuse -p tcp ! --syn -j REJECT --reject-with tcp-reset
+ ip46tables -A nixos-fw-refuse -j REJECT
+ '' else ''
+ ip46tables -A nixos-fw-refuse -j DROP
+ ''}
+
+
+ # The "nixos-fw-log-refuse" chain performs logging, then
+ # jumps to the "nixos-fw-refuse" chain.
+ ip46tables -N nixos-fw-log-refuse
+
+ ${optionalString cfg.logRefusedConnections ''
+ ip46tables -A nixos-fw-log-refuse -p tcp --syn -j LOG --log-level info --log-prefix "rejected connection: "
+ ''}
+ ${optionalString (cfg.logRefusedPackets && !cfg.logRefusedUnicastsOnly) ''
+ ip46tables -A nixos-fw-log-refuse -m pkttype --pkt-type broadcast \
+ -j LOG --log-level info --log-prefix "rejected broadcast: "
+ ip46tables -A nixos-fw-log-refuse -m pkttype --pkt-type multicast \
+ -j LOG --log-level info --log-prefix "rejected multicast: "
+ ''}
+ ip46tables -A nixos-fw-log-refuse -m pkttype ! --pkt-type unicast -j nixos-fw-refuse
+ ${optionalString cfg.logRefusedPackets ''
+ ip46tables -A nixos-fw-log-refuse \
+ -j LOG --log-level info --log-prefix "rejected packet: "
+ ''}
+ ip46tables -A nixos-fw-log-refuse -j nixos-fw-refuse
+
+
+ # The "nixos-fw" chain does the actual work.
+ ip46tables -N nixos-fw
+
+ # Perform a reverse-path test to refuse spoofers
+ # For now, we just drop, as the raw table doesn't have a log-refuse yet
+ ${optionalString (kernelHasRPFilter && cfg.checkReversePath) ''
+ if ! ip46tables -A PREROUTING -t raw -m rpfilter --invert -j DROP; then
+ echo "<2>failed to initialise rpfilter support" >&2
+ fi
+ ''}
+
+ # Accept all traffic on the trusted interfaces.
+ ${flip concatMapStrings cfg.trustedInterfaces (iface: ''
+ ip46tables -A nixos-fw -i ${iface} -j nixos-fw-accept
+ '')}
+
+ # Accept packets from established or related connections.
+ ip46tables -A nixos-fw -m conntrack --ctstate ESTABLISHED,RELATED -j nixos-fw-accept
+
+ # Accept connections to the allowed TCP ports.
+ ${concatMapStrings (port:
+ ''
+ ip46tables -A nixos-fw -p tcp --dport ${toString port} -j nixos-fw-accept
+ ''
+ ) cfg.allowedTCPPorts
+ }
+
+ # Accept connections to the allowed TCP port ranges.
+ ${concatMapStrings (rangeAttr:
+ let range = toString rangeAttr.from + ":" + toString rangeAttr.to; in
+ ''
+ ip46tables -A nixos-fw -p tcp --dport ${range} -j nixos-fw-accept
+ ''
+ ) cfg.allowedTCPPortRanges
+ }
+
+ # Accept packets on the allowed UDP ports.
+ ${concatMapStrings (port:
+ ''
+ ip46tables -A nixos-fw -p udp --dport ${toString port} -j nixos-fw-accept
+ ''
+ ) cfg.allowedUDPPorts
+ }
+
+ # Accept packets on the allowed UDP port ranges.
+ ${concatMapStrings (rangeAttr:
+ let range = toString rangeAttr.from + ":" + toString rangeAttr.to; in
+ ''
+ ip46tables -A nixos-fw -p udp --dport ${range} -j nixos-fw-accept
+ ''
+ ) cfg.allowedUDPPortRanges
+ }
+
+ # Accept IPv4 multicast. Not a big security risk since
+ # probably nobody is listening anyway.
+ #iptables -A nixos-fw -d 224.0.0.0/4 -j nixos-fw-accept
+
+ # Optionally respond to ICMPv4 pings.
+ ${optionalString cfg.allowPing ''
+ iptables -w -A nixos-fw -p icmp --icmp-type echo-request ${optionalString (cfg.pingLimit != null)
+ "-m limit ${cfg.pingLimit} "
+ }-j nixos-fw-accept
+ ''}
+
+ # Accept all ICMPv6 messages except redirects and node
+ # information queries (type 139). See RFC 4890, section
+ # 4.4.
+ ${optionalString config.networking.enableIPv6 ''
+ ip6tables -A nixos-fw -p icmpv6 --icmpv6-type redirect -j DROP
+ ip6tables -A nixos-fw -p icmpv6 --icmpv6-type 139 -j DROP
+ ip6tables -A nixos-fw -p icmpv6 -j nixos-fw-accept
+ ''}
+
+ ${cfg.extraCommands}
+
+ # Reject/drop everything else.
+ ip46tables -A nixos-fw -j nixos-fw-log-refuse
+
+
+ # Enable the firewall.
+ ip46tables -A INPUT -j nixos-fw
+ '';
+
+ stopScript = writeShScript "firewall-stop" ''
+ ${helpers}
+
+ # Clean up in case reload fails
+ ip46tables -D INPUT -j nixos-drop 2>/dev/null || true
+
+ # Clean up after added ruleset
+ ip46tables -D INPUT -j nixos-fw 2>/dev/null || true
+
+ ${cfg.extraStopCommands}
+ '';
+
+ reloadScript = writeShScript "firewall-reload" ''
+ ${helpers}
+
+ # Create a unique drop rule
+ ip46tables -D INPUT -j nixos-drop 2>/dev/null || true
+ ip46tables -F nixos-drop 2>/dev/null || true
+ ip46tables -X nixos-drop 2>/dev/null || true
+ ip46tables -N nixos-drop
+ ip46tables -A nixos-drop -j DROP
+
+ # Don't allow traffic to leak out until the script has completed
+ ip46tables -A INPUT -j nixos-drop
+ if ${startScript}; then
+ ip46tables -D INPUT -j nixos-drop 2>/dev/null || true
+ else
+ echo "Failed to reload firewall... Stopping"
+ ${stopScript}
+ exit 1
+ fi
+ '';
+
kernelPackages = config.boot.kernelPackages;
kernelHasRPFilter = kernelPackages.kernel.features.netfilterRPFilter or false;
@@ -240,6 +414,18 @@ in
'';
};
+ networking.firewall.extraStopCommands = mkOption {
+ type = types.lines;
+ default = "";
+ example = "iptables -P INPUT ACCEPT";
+ description =
+ ''
+ Additional shell commands executed as part of the firewall
+ shutdown script. These are executed just after the removal
+ of the nixos input rule, or if the service enters a failed state.
+ '';
+ };
+
};
@@ -264,166 +450,28 @@ in
message = "This kernel does not support disabling conntrack helpers"; }
];
- systemd.services.firewall =
- { description = "Firewall";
+ systemd.services.firewall = {
+ description = "Firewall";
+ wantedBy = [ "network.target" ];
+ after = [ "network-interfaces.target" "systemd-modules-load.service" ];
- wantedBy = [ "network.target" ];
- after = [ "network-interfaces.target" "systemd-modules-load.service" ];
+ path = [ pkgs.iptables ];
- path = [ pkgs.iptables ];
+ # FIXME: this module may also try to load kernel modules, but
+ # containers don't have CAP_SYS_MODULE. So the host system had
+ # better have all necessary modules already loaded.
+ unitConfig.ConditionCapability = "CAP_NET_ADMIN";
- # FIXME: this module may also try to load kernel modules, but
- # containers don't have CAP_SYS_MODULE. So the host system had
- # better have all necessary modules already loaded.
- unitConfig.ConditionCapability = "CAP_NET_ADMIN";
+ reloadIfChanged = true;
- serviceConfig.Type = "oneshot";
- serviceConfig.RemainAfterExit = true;
-
- script =
- ''
- ${helpers}
-
- # Flush the old firewall rules. !!! Ideally, updating the
- # firewall would be atomic. Apparently that's possible
- # with iptables-restore.
- ip46tables -D INPUT -j nixos-fw 2> /dev/null || true
- for chain in nixos-fw nixos-fw-accept nixos-fw-log-refuse nixos-fw-refuse FW_REFUSE; do
- ip46tables -F "$chain" 2> /dev/null || true
- ip46tables -X "$chain" 2> /dev/null || true
- done
-
-
- # The "nixos-fw-accept" chain just accepts packets.
- ip46tables -N nixos-fw-accept
- ip46tables -A nixos-fw-accept -j ACCEPT
-
-
- # The "nixos-fw-refuse" chain rejects or drops packets.
- ip46tables -N nixos-fw-refuse
-
- ${if cfg.rejectPackets then ''
- # Send a reset for existing TCP connections that we've
- # somehow forgotten about. Send ICMP "port unreachable"
- # for everything else.
- ip46tables -A nixos-fw-refuse -p tcp ! --syn -j REJECT --reject-with tcp-reset
- ip46tables -A nixos-fw-refuse -j REJECT
- '' else ''
- ip46tables -A nixos-fw-refuse -j DROP
- ''}
-
-
- # The "nixos-fw-log-refuse" chain performs logging, then
- # jumps to the "nixos-fw-refuse" chain.
- ip46tables -N nixos-fw-log-refuse
-
- ${optionalString cfg.logRefusedConnections ''
- ip46tables -A nixos-fw-log-refuse -p tcp --syn -j LOG --log-level info --log-prefix "rejected connection: "
- ''}
- ${optionalString (cfg.logRefusedPackets && !cfg.logRefusedUnicastsOnly) ''
- ip46tables -A nixos-fw-log-refuse -m pkttype --pkt-type broadcast \
- -j LOG --log-level info --log-prefix "rejected broadcast: "
- ip46tables -A nixos-fw-log-refuse -m pkttype --pkt-type multicast \
- -j LOG --log-level info --log-prefix "rejected multicast: "
- ''}
- ip46tables -A nixos-fw-log-refuse -m pkttype ! --pkt-type unicast -j nixos-fw-refuse
- ${optionalString cfg.logRefusedPackets ''
- ip46tables -A nixos-fw-log-refuse \
- -j LOG --log-level info --log-prefix "rejected packet: "
- ''}
- ip46tables -A nixos-fw-log-refuse -j nixos-fw-refuse
-
-
- # The "nixos-fw" chain does the actual work.
- ip46tables -N nixos-fw
-
- # Perform a reverse-path test to refuse spoofers
- # For now, we just drop, as the raw table doesn't have a log-refuse yet
- ${optionalString (kernelHasRPFilter && cfg.checkReversePath) ''
- if ! ip46tables -A PREROUTING -t raw -m rpfilter --invert -j DROP; then
- echo "<2>failed to initialise rpfilter support" >&2
- fi
- ''}
-
- # Accept all traffic on the trusted interfaces.
- ${flip concatMapStrings cfg.trustedInterfaces (iface: ''
- ip46tables -A nixos-fw -i ${iface} -j nixos-fw-accept
- '')}
-
- # Accept packets from established or related connections.
- ip46tables -A nixos-fw -m conntrack --ctstate ESTABLISHED,RELATED -j nixos-fw-accept
-
- # Accept connections to the allowed TCP ports.
- ${concatMapStrings (port:
- ''
- ip46tables -A nixos-fw -p tcp --dport ${toString port} -j nixos-fw-accept
- ''
- ) cfg.allowedTCPPorts
- }
-
- # Accept connections to the allowed TCP port ranges.
- ${concatMapStrings (rangeAttr:
- let range = toString rangeAttr.from + ":" + toString rangeAttr.to; in
- ''
- ip46tables -A nixos-fw -p tcp --dport ${range} -j nixos-fw-accept
- ''
- ) cfg.allowedTCPPortRanges
- }
-
- # Accept packets on the allowed UDP ports.
- ${concatMapStrings (port:
- ''
- ip46tables -A nixos-fw -p udp --dport ${toString port} -j nixos-fw-accept
- ''
- ) cfg.allowedUDPPorts
- }
-
- # Accept packets on the allowed UDP port ranges.
- ${concatMapStrings (rangeAttr:
- let range = toString rangeAttr.from + ":" + toString rangeAttr.to; in
- ''
- ip46tables -A nixos-fw -p udp --dport ${range} -j nixos-fw-accept
- ''
- ) cfg.allowedUDPPortRanges
- }
-
- # Accept IPv4 multicast. Not a big security risk since
- # probably nobody is listening anyway.
- #iptables -A nixos-fw -d 224.0.0.0/4 -j nixos-fw-accept
-
- # Optionally respond to ICMPv4 pings.
- ${optionalString cfg.allowPing ''
- iptables -w -A nixos-fw -p icmp --icmp-type echo-request ${optionalString (cfg.pingLimit != null)
- "-m limit ${cfg.pingLimit} "
- }-j nixos-fw-accept
- ''}
-
- # Accept all ICMPv6 messages except redirects and node
- # information queries (type 139). See RFC 4890, section
- # 4.4.
- ${optionalString config.networking.enableIPv6 ''
- ip6tables -A nixos-fw -p icmpv6 --icmpv6-type redirect -j DROP
- ip6tables -A nixos-fw -p icmpv6 --icmpv6-type 139 -j DROP
- ip6tables -A nixos-fw -p icmpv6 -j nixos-fw-accept
- ''}
-
- ${cfg.extraCommands}
-
- # Reject/drop everything else.
- ip46tables -A nixos-fw -j nixos-fw-log-refuse
-
-
- # Enable the firewall.
- ip46tables -A INPUT -j nixos-fw
- '';
-
- postStop =
- ''
- ${helpers}
- ip46tables -D INPUT -j nixos-fw || true
- #ip46tables -P INPUT ACCEPT
- '';
+ serviceConfig = {
+ Type = "oneshot";
+ RemainAfterExit = true;
+ ExecStart = "@${startScript} firewall-start";
+ ExecReload = "@${reloadScript} firewall-reload";
+ ExecStop = "@${stopScript} firewall-stop";
};
+ };
};
diff --git a/nixos/modules/services/networking/ircd-hybrid/default.nix b/nixos/modules/services/networking/ircd-hybrid/default.nix
index a3d5b71740f..2c397f94d23 100644
--- a/nixos/modules/services/networking/ircd-hybrid/default.nix
+++ b/nixos/modules/services/networking/ircd-hybrid/default.nix
@@ -66,7 +66,7 @@ in
rsaKey = mkOption {
default = null;
- example = /root/certificates/irc.key;
+ example = literalExample "/root/certificates/irc.key";
description = "
IRCD server RSA key.
";
@@ -74,7 +74,7 @@ in
certificate = mkOption {
default = null;
- example = /root/certificates/irc.pem;
+ example = literalExample "/root/certificates/irc.pem";
description = "
IRCD server SSL certificate. There are some limitations - read manual.
";
diff --git a/nixos/modules/services/networking/mailpile.nix b/nixos/modules/services/networking/mailpile.nix
new file mode 100644
index 00000000000..e164d41483c
--- /dev/null
+++ b/nixos/modules/services/networking/mailpile.nix
@@ -0,0 +1,76 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+ cfg = config.services.mailpile;
+
+ hostname = cfg.hostname;
+ port = cfg.port;
+
+in
+
+{
+
+ ###### interface
+
+ options = {
+
+ services.mailpile = {
+ enable = mkOption {
+ default = false;
+ description = "
+ Whether to enable Mailpile the mail client.
+ ";
+ };
+ hostname = mkOption {
+ default = "localhost";
+ description = "Listen to this hostname or ip.";
+ };
+ port = mkOption {
+ default = "33411";
+ description = "Listen on this port.";
+ };
+ };
+
+ };
+
+
+ ###### implementation
+
+ config = mkIf config.services.mailpile.enable {
+
+ users.extraUsers.mailpile =
+ { uid = config.ids.uids.mailpile;
+ description = "Mailpile user";
+ createHome = true;
+ home = "/var/lib/mailpile";
+ };
+
+ users.extraGroups.mailpile =
+ { gid = config.ids.gids.mailpile;
+ };
+
+ systemd.services.mailpile =
+ {
+ description = "Mailpile server.";
+ after = [ "network.target" ];
+ wantedBy = [ "multi-user.target" ];
+ serviceConfig = {
+ User = "mailpile";
+ ExecStart = "${pkgs.mailpile}/bin/mailpile --www ${hostname}:${port} --wait";
+ # mixed - first send SIGINT to main process,
+ # then after 2min send SIGKILL to whole group if neccessary
+ KillMode = "mixed";
+ KillSignal = "SIGINT"; # like Ctrl+C - safe mailpile shutdown
+ TimeoutSec = 120; # wait 2min untill SIGKILL
+ };
+ environment.MAILPILE_HOME = "/var/lib/mailpile/.local/share/Mailpile";
+ };
+
+ environment.systemPackages = [ pkgs.mailpile ];
+
+ };
+
+}
diff --git a/nixos/modules/services/networking/nat.nix b/nixos/modules/services/networking/nat.nix
index e8d9d00cc0a..bdb79ce2a90 100644
--- a/nixos/modules/services/networking/nat.nix
+++ b/nixos/modules/services/networking/nat.nix
@@ -12,6 +12,52 @@ let
dest = if cfg.externalIP == null then "-j MASQUERADE" else "-j SNAT --to-source ${cfg.externalIP}";
+ flushNat = ''
+ iptables -w -t nat -D PREROUTING -j nixos-nat-pre 2>/dev/null|| true
+ iptables -w -t nat -F nixos-nat-pre 2>/dev/null || true
+ iptables -w -t nat -X nixos-nat-pre 2>/dev/null || true
+ iptables -w -t nat -D POSTROUTING -j nixos-nat-post 2>/dev/null || true
+ iptables -w -t nat -F nixos-nat-post 2>/dev/null || true
+ iptables -w -t nat -X nixos-nat-post 2>/dev/null || true
+ '';
+
+ setupNat = ''
+ # Create subchain where we store rules
+ iptables -w -t nat -N nixos-nat-pre
+ iptables -w -t nat -N nixos-nat-post
+
+ # We can't match on incoming interface in POSTROUTING, so
+ # mark packets coming from the external interfaces.
+ ${concatMapStrings (iface: ''
+ iptables -w -t nat -A nixos-nat-pre \
+ -i '${iface}' -j MARK --set-mark 1
+ '') cfg.internalInterfaces}
+
+ # NAT the marked packets.
+ ${optionalString (cfg.internalInterfaces != []) ''
+ iptables -w -t nat -A nixos-nat-post -m mark --mark 1 \
+ -o ${cfg.externalInterface} ${dest}
+ ''}
+
+ # NAT packets coming from the internal IPs.
+ ${concatMapStrings (range: ''
+ iptables -w -t nat -A nixos-nat-post \
+ -s '${range}' -o ${cfg.externalInterface} ${dest}
+ '') cfg.internalIPs}
+
+ # NAT from external ports to internal ports.
+ ${concatMapStrings (fwd: ''
+ iptables -w -t nat -A nixos-nat-pre \
+ -i ${cfg.externalInterface} -p tcp \
+ --dport ${builtins.toString fwd.sourcePort} \
+ -j DNAT --to-destination ${fwd.destination}
+ '') cfg.forwardPorts}
+
+ # Append our chains to the nat tables
+ iptables -w -t nat -A PREROUTING -j nixos-nat-pre
+ iptables -w -t nat -A POSTROUTING -j nixos-nat-post
+ '';
+
in
{
@@ -75,6 +121,31 @@ in
'';
};
+ networking.nat.forwardPorts = mkOption {
+ type = types.listOf types.optionSet;
+ default = [];
+ example = [ { sourcePort = 8080; destination = "10.0.0.1:80"; } ];
+ options = {
+ sourcePort = mkOption {
+ type = types.int;
+ example = 8080;
+ description = "Source port of the external interface";
+ };
+
+ destination = mkOption {
+ type = types.str;
+ example = "10.0.0.1:80";
+ description = "Forward tcp connection to destination ip:port";
+ };
+ };
+
+ description =
+ ''
+ List of forwarded ports from the external interface to
+ internal destinations by using DNAT.
+ '';
+ };
+
};
@@ -84,49 +155,34 @@ in
environment.systemPackages = [ pkgs.iptables ];
- boot.kernelModules = [ "nf_nat_ftp" ];
-
- jobs.nat =
- { description = "Network Address Translation";
-
- startOn = "started network-interfaces";
-
- path = [ pkgs.iptables ];
-
- preStart =
- ''
- iptables -w -t nat -F PREROUTING
- iptables -w -t nat -F POSTROUTING
- iptables -w -t nat -X
-
- # We can't match on incoming interface in POSTROUTING, so
- # mark packets coming from the external interfaces.
- ${concatMapStrings (iface: ''
- iptables -w -t nat -A PREROUTING \
- -i '${iface}' -j MARK --set-mark 1
- '') cfg.internalInterfaces}
-
- # NAT the marked packets.
- ${optionalString (cfg.internalInterfaces != []) ''
- iptables -w -t nat -A POSTROUTING -m mark --mark 1 \
- -o ${cfg.externalInterface} ${dest}
- ''}
-
- # NAT packets coming from the internal IPs.
- ${concatMapStrings (range: ''
- iptables -w -t nat -A POSTROUTING \
- -s '${range}' -o ${cfg.externalInterface} ${dest}
- '') cfg.internalIPs}
-
- echo 1 > /proc/sys/net/ipv4/ip_forward
- '';
-
- postStop =
- ''
- iptables -w -t nat -F PREROUTING
- iptables -w -t nat -F POSTROUTING
- iptables -w -t nat -X
- '';
+ boot = {
+ kernelModules = [ "nf_nat_ftp" ];
+ kernel.sysctl = mkOverride 99 {
+ "net.ipv4.conf.all.forwarding" = true;
+ "net.ipv4.conf.default.forwarding" = true;
};
+ };
+
+ networking.firewall = mkIf config.networking.firewall.enable {
+ extraCommands = mkMerge [ (mkBefore flushNat) setupNat ];
+ extraStopCommands = flushNat;
+ };
+
+ systemd.services = mkIf (!config.networking.firewall.enable) { nat = {
+ description = "Network Address Translation";
+ wantedBy = [ "network.target" ];
+ after = [ "network-interfaces.target" "systemd-modules-load.service" ];
+ path = [ pkgs.iptables ];
+ unitConfig.ConditionCapability = "CAP_NET_ADMIN";
+
+ serviceConfig = {
+ Type = "oneshot";
+ RemainAfterExit = true;
+ };
+
+ script = flushNat + setupNat;
+
+ postStop = flushNat;
+ }; };
};
}
diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix
index db8cb122871..140b7ed2da3 100644
--- a/nixos/modules/services/networking/nsd.nix
+++ b/nixos/modules/services/networking/nsd.nix
@@ -10,16 +10,16 @@ let
pidFile = stateDir + "/var/nsd.pid";
zoneFiles = pkgs.stdenv.mkDerivation {
- preferLocalBuild = true;
- name = "nsd-env";
- buildCommand = concatStringsSep "\n"
- [ "mkdir -p $out"
- (concatStrings (mapAttrsToList (zoneName: zoneOptions: ''
- cat > "$out/${zoneName}" <<_EOF_
- ${zoneOptions.data}
- _EOF_
- '') zoneConfigs))
- ];
+ preferLocalBuild = true;
+ name = "nsd-env";
+ buildCommand = concatStringsSep "\n"
+ [ "mkdir -p $out"
+ (concatStrings (mapAttrsToList (zoneName: zoneOptions: ''
+ cat > "$out/${zoneName}" <<_EOF_
+ ${zoneOptions.data}
+ _EOF_
+ '') zoneConfigs))
+ ];
};
configFile = pkgs.writeText "nsd.conf" ''
@@ -33,7 +33,6 @@ let
# the list of dynamically added zones.
zonelistfile: "${stateDir}/var/zone.list"
database: "${stateDir}/var/nsd.db"
- logfile: "${stateDir}/var/nsd.log"
pidfile: "${pidFile}"
xfrdfile: "${stateDir}/var/xfrd.state"
xfrdir: "${stateDir}/tmp"
@@ -105,21 +104,20 @@ let
zoneConfigFile = name: zone: ''
- zone:
- name: "${name}"
- zonefile: "${stateDir}/zones/${name}"
- ${maybeString "outgoing-interface: " zone.outgoingInterface}
- ${forEach " rrl-whitelist: " zone.rrlWhitelist}
+ zone:
+ name: "${name}"
+ zonefile: "${stateDir}/zones/${name}"
+ ${maybeString "outgoing-interface: " zone.outgoingInterface}
+ ${forEach " rrl-whitelist: " zone.rrlWhitelist}
- ${forEach " allow-notify: " zone.allowNotify}
- ${forEach " request-xfr: " zone.requestXFR}
- allow-axfr-fallback: ${yesOrNo zone.allowAXFRFallback}
+ ${forEach " allow-notify: " zone.allowNotify}
+ ${forEach " request-xfr: " zone.requestXFR}
+ allow-axfr-fallback: ${yesOrNo zone.allowAXFRFallback}
- ${forEach " notify: " zone.notify}
- notify-retry: ${toString zone.notifyRetry}
- ${forEach " provide-xfr: " zone.provideXFR}
-
- '';
+ ${forEach " notify: " zone.notify}
+ notify-retry: ${toString zone.notifyRetry}
+ ${forEach " provide-xfr: " zone.provideXFR}
+ '';
zoneConfigs = zoneConfigs' {} "" { children = cfg.zones; };
@@ -130,8 +128,8 @@ let
# fork -> pattern
else zipAttrsWith (name: head) (
- mapAttrsToList (name: child: zoneConfigs' (parent // zone // { children = {}; }) name child)
- zone.children
+ mapAttrsToList (name: child: zoneConfigs' (parent // zone // { children = {}; }) name child)
+ zone.children
);
# fighting infinite recursion
@@ -145,138 +143,135 @@ let
childConfig = x: v: { options.children = { type = types.attrsOf x; visible = v; }; };
- zoneOptionsRaw = types.submodule (
- { options, ... }:
- { options = {
- children = mkOption {
- default = {};
- description = ''
- Children zones inherit all options of their parents. Attributes
- defined in a child will overwrite the ones of its parent. Only
- leaf zones will be actually served. This way it's possible to
- define maybe zones which share most attributes without
- duplicating everything. This mechanism replaces nsd's patterns
- in a save and functional way.
- '';
- };
-
- allowNotify = mkOption {
- type = types.listOf types.str;
- default = [ ];
- example = [ "192.0.2.0/24 NOKEY" "10.0.0.1-10.0.0.5 my_tsig_key_name"
- "10.0.3.4&255.255.0.0 BLOCKED"
- ];
- description = ''
- Listed primary servers are allowed to notify this secondary server.
-
-
- either a plain IPv4/IPv6 address or range. Valid patters for ranges:
- * 10.0.0.0/24 # via subnet size
- * 10.0.0.0&255.255.255.0 # via subnet mask
- * 10.0.0.1-10.0.0.254 # via range
-
- A optional port number could be added with a '@':
- * 2001:1234::1@1234
-
-
- * will use the specified TSIG key
- * NOKEY no TSIG signature is required
- * BLOCKED notifies from non-listed or blocked IPs will be ignored
- * ]]>
- '';
- };
-
- requestXFR = mkOption {
- type = types.listOf types.str;
- default = [];
- example = [];
- description = ''
- Format: [AXFR|UDP] <ip-address> <key-name | NOKEY>
- '';
- };
-
- allowAXFRFallback = mkOption {
- type = types.bool;
- default = true;
- description = ''
- If NSD as secondary server should be allowed to AXFR if the primary
- server does not allow IXFR.
- '';
- };
-
- notify = mkOption {
- type = types.listOf types.str;
- default = [];
- example = [ "10.0.0.1@3721 my_key" "::5 NOKEY" ];
- description = ''
- This primary server will notify all given secondary servers about
- zone changes.
-
-
- a plain IPv4/IPv6 address with on optional port number (ip@port)
-
-
- * sign notifies with the specified key
- * NOKEY don't sign notifies
- ]]>
- '';
- };
-
- notifyRetry = mkOption {
- type = types.int;
- default = 5;
- description = ''
- Specifies the number of retries for failed notifies. Set this along with notify.
- '';
- };
-
- provideXFR = mkOption {
- type = types.listOf types.str;
- default = [];
- example = [ "192.0.2.0/24 NOKEY" "192.0.2.0/24 my_tsig_key_name" ];
- description = ''
- Allow these IPs and TSIG to transfer zones, addr TSIG|NOKEY|BLOCKED
- address range 192.0.2.0/24, 1.2.3.4&255.255.0.0, 3.0.2.20-3.0.2.40
- '';
- };
-
- outgoingInterface = mkOption {
- type = types.nullOr types.str;
- default = null;
- example = "2000::1@1234";
- description = ''
- This address will be used for zone-transfere requests if configured
- as a secondary server or notifications in case of a primary server.
- Supply either a plain IPv4 or IPv6 address with an optional port
- number (ip@port).
- '';
- };
-
- rrlWhitelist = mkOption {
- type = types.listOf types.str;
- default = [];
- description = ''
- Whitelists the given rrl-types.
- The RRL classification types are: nxdomain, error, referral, any,
- rrsig, wildcard, nodata, dnskey, positive, all
- '';
- };
-
- data = mkOption {
- type = types.str;
- default = "";
- example = "";
- description = ''
- The actual zone data. This is the content of your zone file.
- Use imports or pkgs.lib.readFile if you don't want this data in your config file.
- '';
- };
-
+ zoneOptionsRaw = types.submodule {
+ options = {
+ children = mkOption {
+ default = {};
+ description = ''
+ Children zones inherit all options of their parents. Attributes
+ defined in a child will overwrite the ones of its parent. Only
+ leaf zones will be actually served. This way it's possible to
+ define maybe zones which share most attributes without
+ duplicating everything. This mechanism replaces nsd's patterns
+ in a save and functional way.
+ '';
};
- }
- );
+
+ allowNotify = mkOption {
+ type = types.listOf types.str;
+ default = [ ];
+ example = [ "192.0.2.0/24 NOKEY" "10.0.0.1-10.0.0.5 my_tsig_key_name"
+ "10.0.3.4&255.255.0.0 BLOCKED"
+ ];
+ description = ''
+ Listed primary servers are allowed to notify this secondary server.
+
+
+ either a plain IPv4/IPv6 address or range. Valid patters for ranges:
+ * 10.0.0.0/24 # via subnet size
+ * 10.0.0.0&255.255.255.0 # via subnet mask
+ * 10.0.0.1-10.0.0.254 # via range
+
+ A optional port number could be added with a '@':
+ * 2001:1234::1@1234
+
+
+ * will use the specified TSIG key
+ * NOKEY no TSIG signature is required
+ * BLOCKED notifies from non-listed or blocked IPs will be ignored
+ * ]]>
+ '';
+ };
+
+ requestXFR = mkOption {
+ type = types.listOf types.str;
+ default = [];
+ example = [];
+ description = ''
+ Format: [AXFR|UDP] <ip-address> <key-name | NOKEY>
+ '';
+ };
+
+ allowAXFRFallback = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ If NSD as secondary server should be allowed to AXFR if the primary
+ server does not allow IXFR.
+ '';
+ };
+
+ notify = mkOption {
+ type = types.listOf types.str;
+ default = [];
+ example = [ "10.0.0.1@3721 my_key" "::5 NOKEY" ];
+ description = ''
+ This primary server will notify all given secondary servers about
+ zone changes.
+
+
+ a plain IPv4/IPv6 address with on optional port number (ip@port)
+
+
+ * sign notifies with the specified key
+ * NOKEY don't sign notifies
+ ]]>
+ '';
+ };
+
+ notifyRetry = mkOption {
+ type = types.int;
+ default = 5;
+ description = ''
+ Specifies the number of retries for failed notifies. Set this along with notify.
+ '';
+ };
+
+ provideXFR = mkOption {
+ type = types.listOf types.str;
+ default = [];
+ example = [ "192.0.2.0/24 NOKEY" "192.0.2.0/24 my_tsig_key_name" ];
+ description = ''
+ Allow these IPs and TSIG to transfer zones, addr TSIG|NOKEY|BLOCKED
+ address range 192.0.2.0/24, 1.2.3.4&255.255.0.0, 3.0.2.20-3.0.2.40
+ '';
+ };
+
+ outgoingInterface = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ example = "2000::1@1234";
+ description = ''
+ This address will be used for zone-transfere requests if configured
+ as a secondary server or notifications in case of a primary server.
+ Supply either a plain IPv4 or IPv6 address with an optional port
+ number (ip@port).
+ '';
+ };
+
+ rrlWhitelist = mkOption {
+ type = types.listOf types.str;
+ default = [];
+ description = ''
+ Whitelists the given rrl-types.
+ The RRL classification types are: nxdomain, error, referral, any,
+ rrsig, wildcard, nodata, dnskey, positive, all
+ '';
+ };
+
+ data = mkOption {
+ type = types.str;
+ default = "";
+ example = "";
+ description = ''
+ The actual zone data. This is the content of your zone file.
+ Use imports or pkgs.lib.readFile if you don't want this data in your config file.
+ '';
+ };
+ };
+ };
in
{
@@ -456,191 +451,162 @@ in
};
- ratelimit = mkOption {
- type = types.submodule (
- { options, ... }:
- { options = {
-
- enable = mkOption {
- type = types.bool;
- default = false;
- description = ''
- Enable ratelimit capabilities.
- '';
- };
-
- size = mkOption {
- type = types.int;
- default = 1000000;
- description = ''
- Size of the hashtable. More buckets use more memory but lower
- the chance of hash hash collisions.
- '';
- };
-
- ratelimit = mkOption {
- type = types.int;
- default = 200;
- description = ''
- Max qps allowed from any query source.
- 0 means unlimited. With an verbosity of 2 blocked and
- unblocked subnets will be logged.
- '';
- };
-
- whitelistRatelimit = mkOption {
- type = types.int;
- default = 2000;
- description = ''
- Max qps allowed from whitelisted sources.
- 0 means unlimited. Set the rrl-whitelist option for specific
- queries to apply this limit instead of the default to them.
- '';
- };
-
- slip = mkOption {
- type = types.nullOr types.int;
- default = null;
- description = ''
- Number of packets that get discarded before replying a SLIP response.
- 0 disables SLIP responses. 1 will make every response a SLIP response.
- '';
- };
-
- ipv4PrefixLength = mkOption {
- type = types.nullOr types.int;
- default = null;
- description = ''
- IPv4 prefix length. Addresses are grouped by netblock.
- '';
- };
-
- ipv6PrefixLength = mkOption {
- type = types.nullOr types.int;
- default = null;
- description = ''
- IPv6 prefix length. Addresses are grouped by netblock.
- '';
- };
-
- };
- });
- default = {
+ ratelimit = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Enable ratelimit capabilities.
+ '';
+ };
+
+ size = mkOption {
+ type = types.int;
+ default = 1000000;
+ description = ''
+ Size of the hashtable. More buckets use more memory but lower
+ the chance of hash hash collisions.
+ '';
+ };
+
+ ratelimit = mkOption {
+ type = types.int;
+ default = 200;
+ description = ''
+ Max qps allowed from any query source.
+ 0 means unlimited. With an verbosity of 2 blocked and
+ unblocked subnets will be logged.
+ '';
+ };
+
+ whitelistRatelimit = mkOption {
+ type = types.int;
+ default = 2000;
+ description = ''
+ Max qps allowed from whitelisted sources.
+ 0 means unlimited. Set the rrl-whitelist option for specific
+ queries to apply this limit instead of the default to them.
+ '';
+ };
+
+ slip = mkOption {
+ type = types.nullOr types.int;
+ default = null;
+ description = ''
+ Number of packets that get discarded before replying a SLIP response.
+ 0 disables SLIP responses. 1 will make every response a SLIP response.
+ '';
+ };
+
+ ipv4PrefixLength = mkOption {
+ type = types.nullOr types.int;
+ default = null;
+ description = ''
+ IPv4 prefix length. Addresses are grouped by netblock.
+ '';
+ };
+
+ ipv6PrefixLength = mkOption {
+ type = types.nullOr types.int;
+ default = null;
+ description = ''
+ IPv6 prefix length. Addresses are grouped by netblock.
+ '';
};
- example = {};
- description = ''
- '';
};
- remoteControl = mkOption {
- type = types.submodule (
- { config, options, ... }:
- { options = {
-
- enable = mkOption {
- type = types.bool;
- default = false;
- description = ''
- Wheter to enable remote control via nsd-control(8).
- '';
- };
-
- interfaces = mkOption {
- type = types.listOf types.str;
- default = [ "127.0.0.1" "::1" ];
- description = ''
- Which interfaces NSD should bind to for remote control.
- '';
- };
-
- port = mkOption {
- type = types.int;
- default = 8952;
- description = ''
- Port number for remote control operations (uses TLS over TCP).
- '';
- };
-
- serverKeyFile = mkOption {
- type = types.path;
- default = "/etc/nsd/nsd_server.key";
- description = ''
- Path to the server private key, which is used by the server
- but not by nsd-control. This file is generated by nsd-control-setup.
- '';
- };
-
- serverCertFile = mkOption {
- type = types.path;
- default = "/etc/nsd/nsd_server.pem";
- description = ''
- Path to the server self signed certificate, which is used by the server
- but and by nsd-control. This file is generated by nsd-control-setup.
- '';
- };
-
- controlKeyFile = mkOption {
- type = types.path;
- default = "/etc/nsd/nsd_control.key";
- description = ''
- Path to the client private key, which is used by nsd-control
- but not by the server. This file is generated by nsd-control-setup.
- '';
- };
-
- controlCertFile = mkOption {
- type = types.path;
- default = "/etc/nsd/nsd_control.pem";
- description = ''
- Path to the client certificate signed with the server certificate.
- This file is used by nsd-control and generated by nsd-control-setup.
- '';
- };
-
- };
-
- });
- default = {
+ remoteControl = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Wheter to enable remote control via nsd-control(8).
+ '';
+ };
+
+ interfaces = mkOption {
+ type = types.listOf types.str;
+ default = [ "127.0.0.1" "::1" ];
+ description = ''
+ Which interfaces NSD should bind to for remote control.
+ '';
+ };
+
+ port = mkOption {
+ type = types.int;
+ default = 8952;
+ description = ''
+ Port number for remote control operations (uses TLS over TCP).
+ '';
+ };
+
+ serverKeyFile = mkOption {
+ type = types.path;
+ default = "/etc/nsd/nsd_server.key";
+ description = ''
+ Path to the server private key, which is used by the server
+ but not by nsd-control. This file is generated by nsd-control-setup.
+ '';
+ };
+
+ serverCertFile = mkOption {
+ type = types.path;
+ default = "/etc/nsd/nsd_server.pem";
+ description = ''
+ Path to the server self signed certificate, which is used by the server
+ but and by nsd-control. This file is generated by nsd-control-setup.
+ '';
+ };
+
+ controlKeyFile = mkOption {
+ type = types.path;
+ default = "/etc/nsd/nsd_control.key";
+ description = ''
+ Path to the client private key, which is used by nsd-control
+ but not by the server. This file is generated by nsd-control-setup.
+ '';
+ };
+
+ controlCertFile = mkOption {
+ type = types.path;
+ default = "/etc/nsd/nsd_control.pem";
+ description = ''
+ Path to the client certificate signed with the server certificate.
+ This file is used by nsd-control and generated by nsd-control-setup.
+ '';
};
- example = {};
- description = ''
- '';
};
keys = mkOption {
- type = types.attrsOf (types.submodule (
- { options, ... }:
- { options = {
-
- algorithm = mkOption {
- type = types.str;
- default = "hmac-sha256";
- description = ''
- Authentication algorithm for this key.
- '';
- };
-
- keyFile = mkOption {
- type = types.path;
- description = ''
- Path to the file which contains the actual base64 encoded
- key. The key will be copied into "${stateDir}/private" before
- NSD starts. The copied file is only accessibly by the NSD
- user.
- '';
- };
-
+ type = types.attrsOf (types.submodule {
+ options = {
+ algorithm = mkOption {
+ type = types.str;
+ default = "hmac-sha256";
+ description = ''
+ Authentication algorithm for this key.
+ '';
};
- }));
- default = {
- };
+
+ keyFile = mkOption {
+ type = types.path;
+ description = ''
+ Path to the file which contains the actual base64 encoded
+ key. The key will be copied into "${stateDir}/private" before
+ NSD starts. The copied file is only accessibly by the NSD
+ user.
+ '';
+ };
+ };
+ });
+ default = {};
example = {
- "tsig.example.org" = {
- algorithm = "hmac-md5";
- secret = "aaaaaabbbbbbccccccdddddd";
- };
+ "tsig.example.org" = {
+ algorithm = "hmac-md5";
+ secret = "aaaaaabbbbbbccccccdddddd";
+ };
};
description = ''
Define your TSIG keys here.
@@ -651,32 +617,32 @@ in
type = types.attrsOf zoneOptions;
default = {};
example = {
- "serverGroup1" = {
- provideXFR = [ "10.1.2.3 NOKEY" ];
- children = {
- "example.com." = {
- data = ''
- $ORIGIN example.com.
- $TTL 86400
- @ IN SOA a.ns.example.com. admin.example.com. (
- ...
- '';
- };
- "example.org." = {
- data = ''
- $ORIGIN example.org.
- $TTL 86400
- @ IN SOA a.ns.example.com. admin.example.com. (
- ...
- '';
- };
- };
+ "serverGroup1" = {
+ provideXFR = [ "10.1.2.3 NOKEY" ];
+ children = {
+ "example.com." = {
+ data = ''
+ $ORIGIN example.com.
+ $TTL 86400
+ @ IN SOA a.ns.example.com. admin.example.com. (
+ ...
+ '';
+ };
+ "example.org." = {
+ data = ''
+ $ORIGIN example.org.
+ $TTL 86400
+ @ IN SOA a.ns.example.com. admin.example.com. (
+ ...
+ '';
+ };
};
+ };
- "example.net." = {
- provideXFR = [ "10.3.2.1 NOKEY" ];
- data = ''...'';
- };
+ "example.net." = {
+ provideXFR = [ "10.3.2.1 NOKEY" ];
+ data = ''...'';
+ };
};
description = ''
Define your zones here. Zones can cascade other zones and therefore
@@ -695,23 +661,23 @@ in
# this is not working :(
nixpkgs.config.nsd = {
- ipv6 = cfg.ipv6;
- ratelimit = cfg.ratelimit.enable;
- rootServer = cfg.rootServer;
+ ipv6 = cfg.ipv6;
+ ratelimit = cfg.ratelimit.enable;
+ rootServer = cfg.rootServer;
};
users.extraGroups = singleton {
- name = username;
- gid = config.ids.gids.nsd;
+ name = username;
+ gid = config.ids.gids.nsd;
};
users.extraUsers = singleton {
- name = username;
- description = "NSD service user";
- home = stateDir;
- createHome = true;
- uid = config.ids.uids.nsd;
- group = username;
+ name = username;
+ description = "NSD service user";
+ home = stateDir;
+ createHome = true;
+ uid = config.ids.uids.nsd;
+ group = username;
};
systemd.services.nsd = {
@@ -720,10 +686,9 @@ in
after = [ "network.target" ];
serviceConfig = {
- Type = "forking";
PIDFile = pidFile;
Restart = "always";
- ExecStart = "${pkgs.nsd}/sbin/nsd -c ${configFile}";
+ ExecStart = "${pkgs.nsd}/sbin/nsd -d -c ${configFile}";
};
preStart = ''
diff --git a/nixos/modules/services/networking/openntpd.nix b/nixos/modules/services/networking/openntpd.nix
new file mode 100644
index 00000000000..bd8a7a04a2a
--- /dev/null
+++ b/nixos/modules/services/networking/openntpd.nix
@@ -0,0 +1,49 @@
+{ pkgs, lib, config, options, ... }:
+
+with lib;
+
+let
+ cfg = config.services.openntpd;
+
+ package = pkgs.openntpd.override {
+ privsepUser = "ntp";
+ privsepPath = "/var/empty";
+ };
+
+ cfgFile = pkgs.writeText "openntpd.conf" ''
+ ${concatStringsSep "\n" (map (s: "server ${s}") cfg.servers)}
+ '';
+in
+{
+ ###### interface
+
+ options.services.openntpd = {
+ enable = mkEnableOption "OpenNTP time synchronization server";
+
+ servers = mkOption {
+ default = config.services.ntp.servers;
+ type = types.listOf types.str;
+ inherit (options.services.ntp.servers) description;
+ };
+ };
+
+ ###### implementation
+
+ config = mkIf cfg.enable {
+ services.ntp.enable = mkForce false;
+
+ users.extraUsers = singleton {
+ name = "ntp";
+ uid = config.ids.uids.ntp;
+ description = "OpenNTP daemon user";
+ home = "/var/empty";
+ };
+
+ systemd.services.openntpd = {
+ description = "OpenNTP Server";
+ wantedBy = [ "ip-up.target" ];
+ partOf = [ "ip-up.target" ];
+ serviceConfig.ExecStart = "${package}/sbin/ntpd -d -f ${cfgFile}";
+ };
+ };
+}
diff --git a/nixos/modules/services/networking/privoxy.nix b/nixos/modules/services/networking/privoxy.nix
index 950112b2dab..94beb78ef5a 100644
--- a/nixos/modules/services/networking/privoxy.nix
+++ b/nixos/modules/services/networking/privoxy.nix
@@ -6,19 +6,18 @@ let
inherit (pkgs) privoxy;
- stateDir = "/var/spool/privoxy";
-
privoxyUser = "privoxy";
- privoxyFlags = "--no-daemon --user ${privoxyUser} ${privoxyCfg}";
+ cfg = config.services.privoxy;
- privoxyCfg = pkgs.writeText "privoxy.conf" ''
- listen-address ${config.services.privoxy.listenAddress}
- logdir ${config.services.privoxy.logDir}
- confdir ${privoxy}/etc
- filterfile default.filter
-
- ${config.services.privoxy.extraConfig}
+ confFile = pkgs.writeText "privoxy.conf" ''
+ user-manual ${privoxy}/share/doc/privoxy/user-manual
+ confdir ${privoxy}/etc/
+ listen-address ${cfg.listenAddress}
+ enable-edit-actions ${if (cfg.enableEditActions == true) then "1" else "0"}
+ ${concatMapStrings (f: "actionsfile ${f}\n") cfg.actionsFiles}
+ ${concatMapStrings (f: "filterfile ${f}\n") cfg.filterFiles}
+ ${cfg.extraConfig}
'';
in
@@ -32,27 +31,51 @@ in
services.privoxy = {
enable = mkOption {
+ type = types.bool;
default = false;
description = ''
- Whether to run the machine as a HTTP proxy server.
+ Whether to enable the Privoxy non-caching filtering proxy.
'';
};
listenAddress = mkOption {
+ type = types.str;
default = "127.0.0.1:8118";
description = ''
Address the proxy server is listening to.
'';
};
- logDir = mkOption {
- default = "/var/log/privoxy" ;
+ actionsFiles = mkOption {
+ type = types.listOf types.str;
+ example = [ "match-all.action" "default.action" "/etc/privoxy/user.action" ];
+ default = [ "match-all.action" "default.action" ];
description = ''
- Location for privoxy log files.
+ List of paths to Privoxy action files.
+ These paths may either be absolute or relative to the privoxy configuration directory.
+ '';
+ };
+
+ filterFiles = mkOption {
+ type = types.listOf types.str;
+ example = [ "default.filter" "/etc/privoxy/user.filter" ];
+ default = [ "default.filter" ];
+ description = ''
+ List of paths to Privoxy filter files.
+ These paths may either be absolute or relative to the privoxy configuration directory.
+ '';
+ };
+
+ enableEditActions = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether or not the web-based actions file editor may be used.
'';
};
extraConfig = mkOption {
+ type = types.lines;
default = "" ;
description = ''
Extra configuration. Contents will be added verbatim to the configuration file.
@@ -62,33 +85,22 @@ in
};
-
###### implementation
- config = mkIf config.services.privoxy.enable {
+ config = mkIf cfg.enable {
- environment.systemPackages = [ privoxy ];
-
users.extraUsers = singleton
{ name = privoxyUser;
uid = config.ids.uids.privoxy;
description = "Privoxy daemon user";
- home = stateDir;
};
- jobs.privoxy =
- { name = "privoxy";
-
- startOn = "startup";
-
- preStart =
- ''
- mkdir -m 0755 -p ${stateDir}
- chown ${privoxyUser} ${stateDir}
- '';
-
- exec = "${privoxy}/sbin/privoxy ${privoxyFlags}";
- };
+ systemd.services.privoxy = {
+ description = "Filtering web proxy";
+ after = [ "network.target" "nss-lookup.target" ];
+ wantedBy = [ "multi-user.target" ];
+ serviceConfig.ExecStart = "${privoxy}/sbin/privoxy --no-daemon --user ${privoxyUser} ${confFile}";
+ };
};
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index e4b29a0b909..fee1bace046 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -144,6 +144,36 @@ in
'';
};
+ listenAddresses = mkOption {
+ type = types.listOf types.optionSet;
+ default = [];
+ example = [ { addr = "192.168.3.1"; port = 22; } { addr = "0.0.0.0"; port = 64022; } ];
+ description = ''
+ List of addresses and ports to listen on (ListenAddress directive
+ in config). If port is not specified for address sshd will listen
+ on all ports specified by ports option.
+ NOTE: this will override default listening on all local addresses and port 22.
+ NOTE: setting this option won't automatically enable given ports
+ in firewall configuration.
+ '';
+ options = {
+ addr = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ description = ''
+ Host, IPv4 or IPv6 address to listen to.
+ '';
+ };
+ port = mkOption {
+ type = types.nullOr types.int;
+ default = null;
+ description = ''
+ Port to listen to.
+ '';
+ };
+ };
+ };
+
passwordAuthentication = mkOption {
type = types.bool;
default = true;
@@ -261,7 +291,7 @@ in
};
environment.etc = authKeysFiles ++ [
- { source = "${pkgs.openssh}/etc/ssh/moduli";
+ { source = "${cfgc.package}/etc/ssh/moduli";
target = "ssh/moduli";
}
{ source = knownHostsFile;
@@ -278,7 +308,7 @@ in
stopIfChanged = false;
- path = [ pkgs.openssh pkgs.gawk ];
+ path = [ cfgc.package pkgs.gawk ];
environment.LD_LIBRARY_PATH = nssModulesPath;
@@ -295,7 +325,7 @@ in
serviceConfig =
{ ExecStart =
- "${pkgs.openssh}/sbin/sshd " + (optionalString cfg.startWhenNeeded "-i ") +
+ "${cfgc.package}/sbin/sshd " + (optionalString cfg.startWhenNeeded "-i ") +
"-f ${pkgs.writeText "sshd_config" cfg.extraConfig}";
KillMode = "process";
} // (if cfg.startWhenNeeded then {
@@ -349,6 +379,10 @@ in
Port ${toString port}
'') cfg.ports}
+ ${concatMapStrings ({ port, addr }: ''
+ ListenAddress ${addr}${if port != null then ":" + toString port else ""}
+ '') cfg.listenAddresses}
+
${optionalString cfgc.setXAuthLocation ''
XAuthLocation ${pkgs.xorg.xauth}/bin/xauth
''}
@@ -360,7 +394,7 @@ in
''}
${optionalString cfg.allowSFTP ''
- Subsystem sftp ${pkgs.openssh}/libexec/sftp-server
+ Subsystem sftp ${cfgc.package}/libexec/sftp-server
''}
PermitRootLogin ${cfg.permitRootLogin}
@@ -383,6 +417,10 @@ in
assertion = (data.publicKey == null && data.publicKeyFile != null) ||
(data.publicKey != null && data.publicKeyFile == null);
message = "knownHost ${name} must contain either a publicKey or publicKeyFile";
+ })
+ ++ flip map cfg.listenAddresses ({ addr, port }: {
+ assertion = addr != null;
+ message = "addr must be specified in each listenAddresses entry";
});
};
diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix
index 415ff13bdda..73b10c1d561 100644
--- a/nixos/modules/services/networking/unbound.nix
+++ b/nixos/modules/services/networking/unbound.nix
@@ -6,8 +6,6 @@ let
cfg = config.services.unbound;
- username = "unbound";
-
stateDir = "/var/lib/unbound";
access = concatMapStrings (x: " access-control: ${x} allow\n") cfg.allowedAccess;
@@ -21,21 +19,13 @@ let
confFile = pkgs.writeText "unbound.conf" ''
server:
directory: "${stateDir}"
- username: ${username}
- # make sure unbound can access entropy from inside the chroot.
- # e.g. on linux the use these commands (on BSD, devfs(8) is used):
- # mount --bind -n /dev/random /etc/unbound/dev/random
- # and mount --bind -n /dev/log /etc/unbound/dev/log
+ username: unbound
chroot: "${stateDir}"
- # logfile: "${stateDir}/unbound.log" #uncomment to use logfile.
- pidfile: "${stateDir}/unbound.pid"
- verbosity: 1 # uncomment and increase to get more logging.
+ pidfile: ""
${interfaces}
${access}
-
- ${forward}
-
${cfg.extraConfig}
+ ${forward}
'';
in
@@ -82,7 +72,7 @@ in
environment.systemPackages = [ pkgs.unbound ];
users.extraUsers = singleton {
- name = username;
+ name = "unbound";
uid = config.ids.uids.unbound;
description = "unbound daemon user";
home = stateDir;
@@ -96,8 +86,18 @@ in
wants = [" nss-lookup.target" ];
wantedBy = [ "multi-user.target" ];
- path = [ pkgs.unbound ];
- serviceConfig.ExecStart = "${pkgs.unbound}/sbin/unbound -d -c ${confFile}";
+ preStart = ''
+ mkdir -m 0755 -p ${stateDir}/dev/
+ cp ${confFile} ${stateDir}/unbound.conf
+ chown unbound ${stateDir}
+ touch ${stateDir}/dev/random
+ ${pkgs.utillinux}/bin/mount --bind -n /dev/random ${stateDir}/dev/random
+ '';
+
+ serviceConfig = {
+ ExecStart = "${pkgs.unbound}/sbin/unbound -d -c ${stateDir}/unbound.conf";
+ ExecStopPost="${pkgs.utillinux}/bin/umount ${stateDir}/dev/random";
+ };
};
};
diff --git a/nixos/modules/services/networking/znc.nix b/nixos/modules/services/networking/znc.nix
index 4d53cd0750f..b39aea04521 100644
--- a/nixos/modules/services/networking/znc.nix
+++ b/nixos/modules/services/networking/znc.nix
@@ -25,85 +25,6 @@ let
paths = cfg.modulePackages;
};
- confOptions = { ... }: {
- options = {
- modules = mkOption {
- type = types.listOf types.string;
- default = [ "partyline" "webadmin" "adminlog" "log" ];
- example = [ "partyline" "webadmin" "adminlog" "log" ];
- description = ''
- A list of modules to include in the `znc.conf` file.
- '';
- };
-
- userModules = mkOption {
- type = types.listOf types.string;
- default = [ ];
- example = [ "fish" "push" ];
- description = ''
- A list of user modules to include in the `znc.conf` file.
- '';
- };
-
- userName = mkOption {
- default = defaultUserName;
- example = "johntron";
- type = types.string;
- description = ''
- The user name to use when generating the `znc.conf` file.
- This is the user name used by the user logging into the ZNC web admin.
- '';
- };
-
- nick = mkOption {
- default = "znc-user";
- example = "john";
- type = types.string;
- description = ''
- The IRC nick to use when generating the `znc.conf` file.
- '';
- };
-
- passBlock = mkOption {
- default = defaultPassBlock;
- example = "Must be the block generated by the `znc --makepass` command.";
- type = types.string;
- description = ''
- The pass block to use when generating the `znc.conf` file.
- This is the password used by the user logging into the ZNC web admin.
- This is the block generated by the `znc --makepass` command.
- !!! If not specified, please change this after starting the service. !!!
- '';
- };
-
- port = mkOption {
- default = 5000;
- example = 5000;
- type = types.int;
- description = ''
- Specifies the port on which to listen.
- '';
- };
-
- useSSL = mkOption {
- default = true;
- example = true;
- type = types.bool;
- description = ''
- Indicates whether the ZNC server should use SSL when listening on the specified port.
- '';
- };
-
- extraZncConf = mkOption {
- default = "";
- type = types.lines;
- description = ''
- Extra config to `znc.conf` file
- '';
- };
- };
- };
-
# Keep znc.conf in nix store, then symlink or copy into `dataDir`, depending on `mutable`.
mkZncConf = confOpts: ''
// Also check http://en.znc.in/wiki/Configuration
@@ -211,24 +132,97 @@ in
'';
};
- confOptions = mkOption {
- default = {};
- example = {
- modules = [ "log" ];
- userName = "john";
- nick = "johntron";
+ /* TODO: add to the documentation of the current module:
+
+ Values to use when creating a `znc.conf` file.
+
+ confOptions = {
+ modules = [ "log" ];
+ userName = "john";
+ nick = "johntron";
+ };
+ */
+ confOptions = {
+ modules = mkOption {
+ type = types.listOf types.string;
+ default = [ "partyline" "webadmin" "adminlog" "log" ];
+ example = [ "partyline" "webadmin" "adminlog" "log" ];
+ description = ''
+ A list of modules to include in the `znc.conf` file.
+ '';
+ };
+
+ userModules = mkOption {
+ type = types.listOf types.string;
+ default = [ ];
+ example = [ "fish" "push" ];
+ description = ''
+ A list of user modules to include in the `znc.conf` file.
+ '';
+ };
+
+ userName = mkOption {
+ default = defaultUserName;
+ example = "johntron";
+ type = types.string;
+ description = ''
+ The user name to use when generating the `znc.conf` file.
+ This is the user name used by the user logging into the ZNC web admin.
+ '';
+ };
+
+ nick = mkOption {
+ default = "znc-user";
+ example = "john";
+ type = types.string;
+ description = ''
+ The IRC nick to use when generating the `znc.conf` file.
+ '';
+ };
+
+ passBlock = mkOption {
+ default = defaultPassBlock;
+ example = "Must be the block generated by the `znc --makepass` command.";
+ type = types.string;
+ description = ''
+ The pass block to use when generating the `znc.conf` file.
+ This is the password used by the user logging into the ZNC web admin.
+ This is the block generated by the `znc --makepass` command.
+ !!! If not specified, please change this after starting the service. !!!
+ '';
+ };
+
+ port = mkOption {
+ default = 5000;
+ example = 5000;
+ type = types.int;
+ description = ''
+ Specifies the port on which to listen.
+ '';
+ };
+
+ useSSL = mkOption {
+ default = true;
+ example = true;
+ type = types.bool;
+ description = ''
+ Indicates whether the ZNC server should use SSL when listening on the specified port.
+ '';
+ };
+
+ extraZncConf = mkOption {
+ default = "";
+ type = types.lines;
+ description = ''
+ Extra config to `znc.conf` file
+ '';
};
- type = types.optionSet;
- description = ''
- Values to use when creating a `znc.conf` file.
- '';
- options = confOptions;
};
modulePackages = mkOption {
type = types.listOf types.package;
default = [ ];
- example = [ pkgs.zncModules.fish pkgs.zncModules.push ];
+ example = literalExample "[ pkgs.zncModules.fish pkgs.zncModules.push ]";
description = ''
A list of global znc module packages to add to znc.
'';
@@ -280,20 +274,16 @@ in
# If mutable, regenerate conf file every time.
${optionalString (!cfg.mutable) ''
- ${pkgs.coreutils}/echo "znc is set to be system-managed. Now deleting old znc.conf file to be regenerated."
- ${pkgs.coreutils}/rm -f ${cfg.dataDir}/configs/znc.conf
+ ${pkgs.coreutils}/bin/echo "znc is set to be system-managed. Now deleting old znc.conf file to be regenerated."
+ ${pkgs.coreutils}/bin/rm -f ${cfg.dataDir}/configs/znc.conf
''}
# Ensure essential files exist.
if [[ ! -f ${cfg.dataDir}/configs/znc.conf ]]; then
- ${pkgs.coreutils}/bin/echo "No znc.conf file found in ${cfg.dataDir}. Creating one now."
- ${if (!cfg.mutable)
- then "${pkgs.coreutils}/bin/ln --force -s ${zncConfFile} ${cfg.dataDir}/.znc/configs/znc.conf"
- else ''
- ${pkgs.coreutils}/bin/cp --no-clobber ${zncConfFile} ${cfg.dataDir}/configs/znc.conf
- ${pkgs.coreutils}/bin/chmod u+rw ${cfg.dataDir}/configs/znc.conf
- ${pkgs.coreutils}/bin/chown ${cfg.user} ${cfg.dataDir}/configs/znc.conf
- ''}
+ ${pkgs.coreutils}/bin/echo "No znc.conf file found in ${cfg.dataDir}. Creating one now."
+ ${pkgs.coreutils}/bin/cp --no-clobber ${zncConfFile} ${cfg.dataDir}/configs/znc.conf
+ ${pkgs.coreutils}/bin/chmod u+rw ${cfg.dataDir}/configs/znc.conf
+ ${pkgs.coreutils}/bin/chown ${cfg.user} ${cfg.dataDir}/configs/znc.conf
fi
if [[ ! -f ${cfg.dataDir}/znc.pem ]]; then
@@ -315,7 +305,6 @@ in
uid = config.ids.uids.znc;
home = cfg.dataDir;
createHome = true;
- createUser = true;
};
users.extraGroups = optional (cfg.user == defaultUser)
diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
index d229c610669..8a8085cad28 100644
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@@ -35,7 +35,7 @@ let
bindir = pkgs.buildEnv {
name = "cups-progs";
paths = cfg.drivers;
- pathsToLink = [ "/lib/cups" "/share/cups" "/bin" ];
+ pathsToLink = [ "/lib/cups" "/share/cups" "/bin" "/etc/cups" ];
postBuild = cfg.bindirCmds;
};
@@ -89,6 +89,20 @@ in
'';
};
+ clientConf = mkOption {
+ type = types.lines;
+ default = "";
+ example =
+ ''
+ ServerName server.example.com
+ Encryption Never
+ '';
+ description = ''
+ The contents of the client configuration.
+ (client.conf)
+ '';
+ };
+
drivers = mkOption {
type = types.listOf types.path;
example = literalExample "[ pkgs.splix ]";
@@ -124,6 +138,14 @@ in
environment.systemPackages = [ cups ];
+ environment.variables.CUPS_SERVERROOT = "/etc/cups";
+
+ environment.etc = [
+ { source = pkgs.writeText "client.conf" cfg.clientConf;
+ target = "cups/client.conf";
+ }
+ ];
+
services.dbus.packages = [ cups ];
# Cups uses libusb to talk to printers, and does not use the
diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix
index b74ef4370d7..12f163db463 100644
--- a/nixos/modules/services/search/elasticsearch.nix
+++ b/nixos/modules/services/search/elasticsearch.nix
@@ -135,6 +135,11 @@ in {
rm ${cfg.dataDir}/plugins || true
ln -s ${esPlugins}/plugins ${cfg.dataDir}/plugins
'';
+ postStart = mkBefore ''
+ until ${pkgs.curl}/bin/curl -s -o /dev/null ${cfg.host}:${toString cfg.port}; do
+ sleep 1
+ done
+ '';
};
environment.systemPackages = [ pkgs.elasticsearch ];
diff --git a/nixos/modules/services/security/clamav.nix b/nixos/modules/services/security/clamav.nix
index 057891a6047..a4d54301fc1 100644
--- a/nixos/modules/services/security/clamav.nix
+++ b/nixos/modules/services/security/clamav.nix
@@ -71,10 +71,10 @@ in
mkdir -m 0755 -p ${stateDir}
chown ${clamavUser}:${clamavGroup} ${stateDir}
'';
- exec = "${pkgs.clamav}/bin/freshclam --config-file=${pkgs.writeText "freshclam.conf" cfg.updater.config}";
+ exec = "${pkgs.clamav}/bin/freshclam --daemon --config-file=${pkgs.writeText "freshclam.conf" cfg.updater.config}";
};
};
};
-}
\ No newline at end of file
+}
diff --git a/nixos/modules/services/security/fail2ban.nix b/nixos/modules/services/security/fail2ban.nix
index 3758652ebdd..c40f41e07d4 100644
--- a/nixos/modules/services/security/fail2ban.nix
+++ b/nixos/modules/services/security/fail2ban.nix
@@ -40,7 +40,7 @@ in
socket = /run/fail2ban/fail2ban.sock
pidfile = /run/fail2ban/fail2ban.pid
'';
- type = types.string;
+ type = types.lines;
description =
''
The contents of Fail2ban's main configuration file. It's
@@ -64,7 +64,7 @@ in
maxretry = 5
'';
};
- type = types.attrsOf types.string;
+ type = types.attrsOf types.lines;
description =
''
The configuration of each Fail2ban “jail”. A jail
diff --git a/nixos/modules/services/ttys/agetty.nix b/nixos/modules/services/ttys/agetty.nix
index df21ebbd974..3958be33df2 100644
--- a/nixos/modules/services/ttys/agetty.nix
+++ b/nixos/modules/services/ttys/agetty.nix
@@ -66,6 +66,13 @@ with lib;
restartIfChanged = false;
};
+ systemd.services."console-getty" =
+ { serviceConfig.ExecStart = "@${pkgs.utillinux}/sbin/agetty agetty --noclear --login-program ${pkgs.shadow}/bin/login --keep-baud console 115200,38400,9600 $TERM";
+ serviceConfig.Restart = "always";
+ restartIfChanged = false;
+ enable = mkDefault config.boot.isContainer;
+ };
+
environment.etc = singleton
{ # Friendly greeting on the virtual consoles.
source = pkgs.writeText "issue" ''
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index b83cf276ed5..85458a2ab56 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -208,16 +208,12 @@ let
'';
- robotsTxt = pkgs.writeText "robots.txt" ''
- ${# If this is a vhost, the include the entries for the main server as well.
- if isMainServer then ""
- else concatMapStrings (svc: svc.robotsEntries) mainSubservices}
- ${concatMapStrings (svc: svc.robotsEntries) subservices}
- '';
-
- robotsConf = ''
- Alias /robots.txt ${robotsTxt}
- '';
+ robotsTxt =
+ concatStringsSep "\n" (filter (x: x != "") (
+ # If this is a vhost, the include the entries for the main server as well.
+ (if isMainServer then [] else [mainCfg.robotsEntries] ++ map (svc: svc.robotsEntries) mainSubservices)
+ ++ [cfg.robotsEntries]
+ ++ (map (svc: svc.robotsEntries) subservices)));
in ''
ServerName ${serverInfo.canonicalName}
@@ -245,7 +241,9 @@ let
CustomLog ${mainCfg.logDir}/access_log-${cfg.hostName} ${cfg.logFormat}
'' else ""}
- ${robotsConf}
+ ${optionalString (robotsTxt != "") ''
+ Alias /robots.txt ${pkgs.writeText "robots.txt" robotsTxt}
+ ''}
${if isMainServer || maybeDocumentRoot != null then documentRootConf else ""}
@@ -423,7 +421,7 @@ in
package = mkOption {
type = types.package;
default = pkgs.apacheHttpd.override { mpm = mainCfg.multiProcessingModule; };
- example = "pkgs.apacheHttpd_2_4";
+ example = literalExample "pkgs.apacheHttpd_2_4";
description = ''
Overridable attribute of the Apache HTTP Server package to use.
'';
diff --git a/nixos/modules/services/web-servers/apache-httpd/mediawiki-postgresql-fixes.patch b/nixos/modules/services/web-servers/apache-httpd/mediawiki-postgresql-fixes.patch
deleted file mode 100644
index c46d492dc7a..00000000000
--- a/nixos/modules/services/web-servers/apache-httpd/mediawiki-postgresql-fixes.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/includes/specials/SpecialActiveusers.php b/includes/specials/SpecialActiveusers.php
-index f739d3b..fdd8db3 100644
---- a/includes/specials/SpecialActiveusers.php
-+++ b/includes/specials/SpecialActiveusers.php
-@@ -112,7 +112,7 @@ class ActiveUsersPager extends UsersPager {
- return array(
- 'tables' => array( 'querycachetwo', 'user', 'recentchanges' ),
- 'fields' => array( 'user_name', 'user_id', 'recentedits' => 'COUNT(*)', 'qcc_title' ),
-- 'options' => array( 'GROUP BY' => array( 'qcc_title' ) ),
-+ 'options' => array( 'GROUP BY' => array( 'qcc_title', 'user_name', 'user_id' ) ),
- 'conds' => $conds
- );
- }
-@@ -349,7 +349,7 @@ class SpecialActiveUsers extends SpecialPage {
- __METHOD__,
- array(
- 'GROUP BY' => array( 'rc_user_text' ),
-- 'ORDER BY' => 'NULL' // avoid filesort
-+ 'ORDER BY' => 'lastedittime DESC'
- )
- );
- $names = array();
diff --git a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
index 76c64f8cb29..d7bdd81b7eb 100644
--- a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
@@ -72,15 +72,13 @@ let
# Unpack Mediawiki and put the config file in its root directory.
mediawikiRoot = pkgs.stdenv.mkDerivation rec {
- name= "mediawiki-1.23.1";
+ name= "mediawiki-1.23.3";
src = pkgs.fetchurl {
url = "http://download.wikimedia.org/mediawiki/1.23/${name}.tar.gz";
- sha256 = "07z5j8d988cdg4ml4n0vs9fwmj0p594ibbqdid16faxwqm52dkhl";
+ sha256 = "0l6798jwjwk2khfnm84mgc65ij53a8pnv30wdnn15ys4ivia4bpf";
};
- patches = [ ./mediawiki-postgresql-fixes.patch ];
-
skins = config.skins;
buildPhase =
@@ -133,7 +131,7 @@ in
RewriteEngine On
RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-f
RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-d
- ${concatMapStringsSep "\n" (u: "RewriteCond %{REQUEST_URI} !^${u.urlPath}") serverInfo.serverConfig.servedDirs}
+ ${concatMapStringsSep "\n" (u: "RewriteCond %{REQUEST_URI} !^${u.urlPath}") serverInfo.vhostConfig.servedDirs}
RewriteRule ${if config.enableUploads
then "!^/images"
else "^.*\$"
diff --git a/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix b/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix
index b8e86334539..76f55a63e32 100644
--- a/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix
@@ -142,9 +142,19 @@ with lib;
type = types.str;
default = "common";
example = "combined";
- description = "
+ description = ''
Log format for Apache's log files. Possible values are: combined, common, referer, agent.
- ";
+ '';
+ };
+
+ robotsEntries = mkOption {
+ type = types.lines;
+ default = "";
+ example = "Disallow: /foo/";
+ description = ''
+ Specification of pages to be ignored by web crawlers. See for details.
+ '';
};
}
diff --git a/nixos/modules/services/web-servers/apache-httpd/phabricator.nix b/nixos/modules/services/web-servers/apache-httpd/phabricator.nix
index c7a9bdf68c5..e4e3aac8d41 100644
--- a/nixos/modules/services/web-servers/apache-httpd/phabricator.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/phabricator.nix
@@ -1,35 +1,30 @@
{ config, lib, pkgs, ... }:
+
+with lib;
+
let
- phabricatorRoot = pkgs.stdenv.mkDerivation rec {
- version = "2014-05-12";
- name = "phabricator-${version}";
- srcLibphutil = pkgs.fetchgit {
- url = git://github.com/facebook/libphutil.git;
- rev = "2f3b5a1cf6ea464a0250d4b1c653a795a90d2716";
- sha256 = "9598cec400984dc149162f1e648814a54ea0cd34fcd529973dc83f5486fdd9fd";
- };
- srcArcanist = pkgs.fetchgit {
- url = git://github.com/facebook/arcanist.git;
- rev = "54c377448db8dbc40f0ca86d43c837d30e493485";
- sha256 = "086db3c0d1154fbad23e7c6def31fd913384ee20247b329515838b669c3028e0";
- };
- srcPhabricator = pkgs.fetchgit {
- url = git://github.com/facebook/phabricator.git;
- rev = "1644ef185ecf1e9fca3eb6b16351ef46b19d110f";
- sha256 = "e1135e4ba76d53f48aad4161563035414ed7e878f39a8a34a875a01b41b2a084";
- };
-
- buildCommand = ''
- mkdir -p $out
- cp -R ${srcLibphutil} $out/libphutil
- cp -R ${srcArcanist} $out/arcanist
- cp -R ${srcPhabricator} $out/phabricator
- '';
- };
+ phabricatorRoot = pkgs.phabricator;
in {
+
enablePHP = true;
extraApacheModules = [ "mod_rewrite" ];
DocumentRoot = "${phabricatorRoot}/phabricator/webroot";
+
+ options = {
+ git = mkOption {
+ default = true;
+ description = "Enable git repositories.";
+ };
+ mercurial = mkOption {
+ default = true;
+ description = "Enable mercurial repositories.";
+ };
+ subversion = mkOption {
+ default = true;
+ description = "Enable subversion repositories.";
+ };
+ };
+
extraConfig = ''
DocumentRoot ${phabricatorRoot}/phabricator/webroot
@@ -38,4 +33,18 @@ in {
RewriteRule ^/favicon.ico - [L,QSA]
RewriteRule ^(.*)$ /index.php?__path__=$1 [B,L,QSA]
'';
+
+ extraServerPath = [
+ "${pkgs.which}"
+ "${pkgs.diffutils}"
+ ] ++
+ (if config.mercurial then ["${pkgs.mercurial}"] else []) ++
+ (if config.subversion then ["${pkgs.subversion}"] else []) ++
+ (if config.git then ["${pkgs.git}"] else []);
+
+ startupScript = pkgs.writeScript "activatePhabricator" ''
+ mkdir -p /var/repo
+ chown wwwrun /var/repo
+ '';
+
}
diff --git a/nixos/modules/services/web-servers/lighttpd/cgit.nix b/nixos/modules/services/web-servers/lighttpd/cgit.nix
index d4663781fd8..34b2fa600ad 100644
--- a/nixos/modules/services/web-servers/lighttpd/cgit.nix
+++ b/nixos/modules/services/web-servers/lighttpd/cgit.nix
@@ -44,6 +44,9 @@ in
# make the cgitrc manpage available
environment.systemPackages = [ pkgs.cgit ];
+ # declare module dependencies
+ services.lighttpd.enableModules = [ "mod_cgi" "mod_alias" "mod_setenv" ];
+
services.lighttpd.extraConfig = ''
$HTTP["url"] =~ "^/cgit" {
cgi.assign = (
diff --git a/nixos/modules/services/web-servers/lighttpd/default.nix b/nixos/modules/services/web-servers/lighttpd/default.nix
index fc9487ab485..06f310eeb93 100644
--- a/nixos/modules/services/web-servers/lighttpd/default.nix
+++ b/nixos/modules/services/web-servers/lighttpd/default.nix
@@ -8,12 +8,54 @@ let
cfg = config.services.lighttpd;
- needModRedirect = cfg.gitweb.enable;
- needModAlias = cfg.cgit.enable || cfg.gitweb.enable;
- needModSetenv = cfg.cgit.enable || cfg.gitweb.enable;
- needModCgi = cfg.cgit.enable || cfg.gitweb.enable;
- needModStatus = cfg.mod_status;
- needModUserdir = cfg.mod_userdir;
+ # List of known lighttpd modules, ordered by how the lighttpd documentation
+ # recommends them being imported:
+ # http://redmine.lighttpd.net/projects/1/wiki/Server_modulesDetails
+ #
+ # Some modules are always imported and should not appear in the config:
+ # disallowedModules = [ "mod_indexfile" "mod_dirlisting" "mod_staticfile" ];
+ #
+ # Get full module list: "ls -1 $lighttpd/lib/*.so"
+ allKnownModules = [
+ "mod_rewrite"
+ "mod_redirect"
+ "mod_alias"
+ "mod_access"
+ "mod_auth"
+ "mod_status"
+ "mod_simple_vhost"
+ "mod_evhost"
+ "mod_userdir"
+ "mod_secdownload"
+ "mod_fastcgi"
+ "mod_proxy"
+ "mod_cgi"
+ "mod_ssi"
+ "mod_compress"
+ "mod_usertrack"
+ "mod_expire"
+ "mod_rrdtool"
+ "mod_accesslog"
+ # Remaining list of modules, order assumed to be unimportant.
+ "mod_cml"
+ "mod_dirlisting"
+ "mod_evasive"
+ "mod_extforward"
+ "mod_flv_streaming"
+ "mod_magnet"
+ "mod_mysql_vhost"
+ "mod_rewrite"
+ "mod_scgi"
+ "mod_setenv"
+ "mod_trigger_b4_dl"
+ "mod_webdav"
+ ];
+
+ maybeModuleString = moduleName:
+ if elem moduleName cfg.enableModules then ''"${moduleName}"'' else "";
+
+ modulesIncludeString = concatStringsSep ",\n"
+ (filter (x: x != "") (map maybeModuleString allKnownModules));
configFile = if cfg.configText != "" then
pkgs.writeText "lighttpd.conf" ''
@@ -38,13 +80,7 @@ let
# been loaded already. So if two services were to put the same module in
# server.modules += (), that would break the lighttpd configuration.
server.modules = (
- ${optionalString needModRedirect ''"mod_redirect",''}
- ${optionalString needModAlias ''"mod_alias",''}
- ${optionalString needModSetenv ''"mod_setenv",''}
- ${optionalString needModCgi ''"mod_cgi",''}
- ${optionalString needModStatus ''"mod_status",''}
- ${optionalString needModUserdir ''"mod_userdir",''}
- "mod_accesslog"
+ ${modulesIncludeString}
)
# Logging (logs end up in systemd journal)
@@ -117,6 +153,19 @@ in
'';
};
+ enableModules = mkOption {
+ type = types.listOf types.str;
+ default = [ ];
+ example = [ "mod_cgi" "mod_status" ];
+ description = ''
+ List of lighttpd modules to enable. Sub-services take care of
+ enabling modules as needed, so this option is mainly for when you
+ want to add custom stuff to
+ that depends on a
+ certain module.
+ '';
+ };
+
mod_status = mkOption {
default = false;
type = types.uniq types.bool;
@@ -152,6 +201,26 @@ in
config = mkIf cfg.enable {
+ assertions = [
+ { assertion = all (x: elem x allKnownModules) cfg.enableModules;
+ message = ''
+ One (or more) modules in services.lighttpd.enableModules are
+ unrecognized.
+
+ Known modules: ${toString allKnownModules}
+
+ services.lighttpd.enableModules: ${toString cfg.enableModules}
+ '';
+ }
+ ];
+
+ services.lighttpd.enableModules = mkMerge
+ [ (mkIf cfg.mod_status [ "mod_status" ])
+ (mkIf cfg.mod_userdir [ "mod_userdir" ])
+ # always load mod_accesslog so that we can log to the journal
+ [ "mod_accesslog" ]
+ ];
+
systemd.services.lighttpd = {
description = "Lighttpd Web Server";
after = [ "network.target" ];
diff --git a/nixos/modules/services/web-servers/lighttpd/gitweb.nix b/nixos/modules/services/web-servers/lighttpd/gitweb.nix
index c407a1d8977..ef7072ecba3 100644
--- a/nixos/modules/services/web-servers/lighttpd/gitweb.nix
+++ b/nixos/modules/services/web-servers/lighttpd/gitweb.nix
@@ -44,6 +44,9 @@ in
config = mkIf cfg.enable {
+ # declare module dependencies
+ services.lighttpd.enableModules = [ "mod_cgi" "mod_redirect" "mod_alias" "mod_setenv" ];
+
services.lighttpd.extraConfig = ''
$HTTP["url"] =~ "^/gitweb" {
cgi.assign = (
diff --git a/nixos/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix
index c2f464014ae..99460a48835 100644
--- a/nixos/modules/services/web-servers/tomcat.nix
+++ b/nixos/modules/services/web-servers/tomcat.nix
@@ -5,7 +5,7 @@ with lib;
let
cfg = config.services.tomcat;
- tomcat = pkgs.tomcat6;
+ tomcat = cfg.package;
in
{
@@ -21,6 +21,15 @@ in
description = "Whether to enable Apache Tomcat";
};
+ package = mkOption {
+ type = types.package;
+ default = pkgs.tomcat7;
+ example = lib.literalExample "pkgs.tomcat8";
+ description = ''
+ Which tomcat package to use.
+ '';
+ };
+
baseDir = mkOption {
default = "/var/tomcat";
description = "Location where Tomcat stores configuration files, webapplications and logfiles";
diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix
index c62beca60d8..43e04a3076c 100644
--- a/nixos/modules/services/x11/desktop-managers/default.nix
+++ b/nixos/modules/services/x11/desktop-managers/default.nix
@@ -18,8 +18,8 @@ in
# determines the default: later modules (if enabled) are preferred.
# E.g., if KDE is enabled, it supersedes xterm.
imports = [
- ./none.nix ./xterm.nix ./xfce.nix ./kde4.nix
- ./e17.nix ./e18.nix ./gnome3.nix ./xbmc.nix
+ ./none.nix ./xterm.nix ./xfce.nix ./kde4.nix ./kde4_next.nix
+ ./e17.nix ./e18.nix ./e19.nix ./gnome3.nix ./xbmc.nix
];
options = {
diff --git a/nixos/modules/services/x11/desktop-managers/e19.nix b/nixos/modules/services/x11/desktop-managers/e19.nix
new file mode 100644
index 00000000000..dd9becb0f6c
--- /dev/null
+++ b/nixos/modules/services/x11/desktop-managers/e19.nix
@@ -0,0 +1,94 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+
+ xcfg = config.services.xserver;
+ cfg = xcfg.desktopManager.e19;
+ e19_enlightenment = pkgs.e19.enlightenment.override { set_freqset_setuid = true; };
+
+in
+
+{
+ options = {
+
+ services.xserver.desktopManager.e19.enable = mkOption {
+ default = false;
+ example = true;
+ description = "Enable the E19 desktop environment.";
+ };
+
+ };
+
+ config = mkIf (xcfg.enable && cfg.enable) {
+
+ environment.systemPackages = [
+ pkgs.e19.efl pkgs.e19.evas pkgs.e19.emotion pkgs.e19.elementary e19_enlightenment
+ pkgs.e19.terminology pkgs.e19.econnman
+ pkgs.xorg.xauth # used by kdesu
+ pkgs.gtk # To get GTK+'s themes.
+ pkgs.tango-icon-theme
+ pkgs.shared_mime_info
+ pkgs.gnome.gnomeicontheme
+ pkgs.xorg.xcursorthemes
+ ];
+
+ environment.pathsToLink = [ "/etc/enlightenment" "/etc/xdg" "/share/enlightenment" "/share/elementary" "/share/applications" "/share/locale" "/share/icons" "/share/themes" "/share/mime" "/share/desktop-directories" ];
+
+ services.xserver.desktopManager.session = [
+ { name = "E19";
+ start = ''
+ # Set GTK_DATA_PREFIX so that GTK+ can find the themes
+ export GTK_DATA_PREFIX=${config.system.path}
+ # find theme engines
+ export GTK_PATH=${config.system.path}/lib/gtk-3.0:${config.system.path}/lib/gtk-2.0
+ export XDG_MENU_PREFIX=enlightenment
+
+ # make available for D-BUS user services
+ #export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}:${config.system.path}/share:${pkgs.e19.efl}/share
+
+ # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/
+ ${pkgs.xdg-user-dirs}/bin/xdg-user-dirs-update
+
+ ${e19_enlightenment}/bin/enlightenment_start
+ waitPID=$!
+ '';
+ }];
+
+ security.setuidPrograms = [ "e19_freqset" ];
+
+ environment.etc = singleton
+ { source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
+ target = "X11/xkb";
+ };
+
+ fonts.fonts = [ pkgs.dejavu_fonts pkgs.ubuntu_font_family ];
+
+ services.udisks2.enable = true;
+ services.upower.enable = config.powerManagement.enable;
+
+ #services.dbus.packages = [ pkgs.efl ]; # dbus-1 folder is not in /etc but in /share, so needs fixing first
+
+ systemd.user.services.efreet =
+ { enable = true;
+ description = "org.enlightenment.Efreet";
+ serviceConfig =
+ { ExecStart = "${pkgs.e19.efl}/bin/efreetd";
+ StandardOutput = "null";
+ };
+ };
+
+ systemd.user.services.ethumb =
+ { enable = true;
+ description = "org.enlightenment.Ethumb";
+ serviceConfig =
+ { ExecStart = "${pkgs.e19.efl}/bin/ethumbd";
+ StandardOutput = "null";
+ };
+ };
+
+
+ };
+
+}
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 06bcb6dbb8b..5f46e2f1ef8 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -37,7 +37,7 @@ in {
services.xserver.desktopManager.gnome3.sessionPath = mkOption {
default = [];
- example = "[ pkgs.gnome3.gpaste ]";
+ example = literalExample "[ pkgs.gnome3.gpaste ]";
description = "Additional list of packages to be added to the session search path.
Useful for gnome shell extensions or gsettings-conditionated autostart.";
apply = list: list ++ [ gnome3.gnome_shell ];
@@ -51,7 +51,7 @@ in {
environment.gnome3.excludePackages = mkOption {
default = [];
- example = "[ pkgs.gnome3.totem ]";
+ example = literalExample "[ pkgs.gnome3.totem ]";
type = types.listOf types.package;
description = "Which packages gnome should exclude from the default environment";
};
@@ -77,7 +77,7 @@ in {
services.gnome3.tracker.enable = mkDefault true;
hardware.pulseaudio.enable = mkDefault true;
services.telepathy.enable = mkDefault true;
- networking.networkmanager.enable = true;
+ networking.networkmanager.enable = mkDefault true;
services.upower.enable = config.powerManagement.enable;
services.upower.package = gnome3.upower;
diff --git a/nixos/modules/services/x11/desktop-managers/kde4.nix b/nixos/modules/services/x11/desktop-managers/kde4.nix
index f74dd7e0444..669ddbd904f 100644
--- a/nixos/modules/services/x11/desktop-managers/kde4.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde4.nix
@@ -65,7 +65,7 @@ in
environment.kdePackages = mkOption {
default = [];
- example = "[ pkgs.kde4.kdesdk ]";
+ example = literalExample "[ pkgs.kde4.kdesdk ]";
type = types.listOf types.package;
description = "This option is obsolete. Please use instead.";
};
diff --git a/nixos/modules/services/x11/desktop-managers/kde4_next.nix b/nixos/modules/services/x11/desktop-managers/kde4_next.nix
new file mode 100644
index 00000000000..568094358ba
--- /dev/null
+++ b/nixos/modules/services/x11/desktop-managers/kde4_next.nix
@@ -0,0 +1,163 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+ xcfg = config.services.xserver;
+ cfg = xcfg.desktopManager.kde4_next;
+ xorg = pkgs.xorg;
+ kde = pkgs.kde4_next;
+
+ # Disable Nepomuk and Strigi by default. As of KDE 4.7, they don't
+ # really work very well (e.g. searching files often fails to find
+ # files), segfault sometimes and consume significant resources.
+ # They can be re-enabled in the KDE System Settings under "Desktop
+ # Search".
+ nepomukConfig = pkgs.writeTextFile
+ { name = "nepomuk-config";
+ destination = "/share/config/nepomukserverrc";
+ text =
+ ''
+ [Basic Settings]
+ Start Nepomuk=false
+
+ [Service-nepomukstrigiservice]
+ autostart=false
+ '';
+ };
+
+ phononBackends = {
+ gstreamer = [
+ pkgs.phonon_backend_gstreamer
+ pkgs.gst_all.gstPluginsBase
+ pkgs.gst_all.gstPluginsGood
+ pkgs.gst_all.gstPluginsUgly
+ pkgs.gst_all.gstPluginsBad
+ pkgs.gst_all.gstFfmpeg # for mp3 playback
+ pkgs.gst_all.gstreamer # needed?
+ ];
+
+ vlc = [pkgs.phonon_backend_vlc];
+ };
+
+ phononBackendPackages = flip concatMap cfg.phononBackends
+ (name: attrByPath [name] (throw "unknown phonon backend `${name}'") phononBackends);
+
+in
+
+{
+ options = {
+
+ services.xserver.desktopManager.kde4_next = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Enable the KDE 4 desktop environment.";
+ };
+
+ phononBackends = mkOption {
+ type = types.listOf types.str;
+ default = ["gstreamer"];
+ example = ["gstreamer" "vlc"];
+ description = "Which phonon multimedia backend kde should use";
+ };
+ };
+
+ };
+
+
+ config = mkIf (xcfg.enable && cfg.enable) {
+
+ # If KDE 4 is enabled, make it the default desktop manager (unless
+ # overridden by the user's configuration).
+ # !!! doesn't work yet ("Multiple definitions. Only one is allowed
+ # for this option.")
+ # services.xserver.desktopManager.default = mkOverride 900 "kde4";
+
+ services.xserver.desktopManager.session = singleton
+ { name = "kde4_next";
+ bgSupport = true;
+ start =
+ ''
+ # The KDE icon cache is supposed to update itself
+ # automatically, but it uses the timestamp on the icon
+ # theme directory as a trigger. Since in Nix the
+ # timestamp is always the same, this doesn't work. So as
+ # a workaround, nuke the icon cache on login. This isn't
+ # perfect, since it may require logging out after
+ # installing new applications to update the cache.
+ # See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html
+ rm -fv $HOME/.kde/cache-*/icon-cache.kcache
+
+ # Qt writes a weird ‘libraryPath’ line to
+ # ~/.config/Trolltech.conf that causes the KDE plugin
+ # paths of previous KDE invocations to be searched.
+ # Obviously using mismatching KDE libraries is potentially
+ # disastrous, so here we nuke references to the Nix store
+ # in Trolltech.conf. A better solution would be to stop
+ # Qt from doing this wackiness in the first place.
+ if [ -e $HOME/.config/Trolltech.conf ]; then
+ sed -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf
+ fi
+
+ # Start KDE.
+ exec ${kde.kdebase_workspace}/bin/startkde
+ '';
+ };
+
+ security.setuidOwners = singleton
+ { program = "kcheckpass";
+ source = "${kde.kdebase_workspace}/lib/kde4/libexec/kcheckpass";
+ owner = "root";
+ group = "root";
+ setuid = true;
+ };
+
+ environment.systemPackages =
+ [ kde.kdelibs
+
+ kde.kde_baseapps # Splitted kdebase
+ kde.kde_workspace
+ kde.kde_runtime
+ kde.konsole
+ kde.kate
+
+ kde.kde_wallpapers # contains kdm's default background
+ kde.oxygen_icons
+ pkgs.virtuoso # to enable Nepomuk to find Virtuoso
+
+ # Starts KDE's Polkit authentication agent.
+ kde.polkit_kde_agent
+
+ # Miscellaneous runtime dependencies.
+ kde.qt4 # needed for qdbus
+ pkgs.shared_mime_info
+ xorg.xmessage # so that startkde can show error messages
+ xorg.xset # used by startkde, non-essential
+ xorg.xauth # used by kdesu
+ pkgs.shared_desktop_ontologies # used by nepomuk
+ pkgs.strigi # used by nepomuk
+ pkgs.mysql # used by akonadi
+ ]
+ ++ lib.optional config.hardware.pulseaudio.enable kde.kmix # Perhaps this should always be enabled
+ ++ lib.optional config.hardware.bluetooth.enable kde.bluedevil
+ ++ lib.optional config.networking.networkmanager.enable kde.networkmanagement
+ ++ [ nepomukConfig ] ++ phononBackendPackages;
+
+ environment.pathsToLink = [ "/share" ];
+
+ environment.etc = singleton
+ { source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
+ target = "X11/xkb";
+ };
+
+ # Enable helpful DBus services.
+ services.udisks2.enable = true;
+ services.upower.enable = config.powerManagement.enable;
+
+ security.pam.services.kde = { allowNullPassword = true; };
+
+ };
+
+}
diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix
index a72eea76239..a31f66176cc 100644
--- a/nixos/modules/services/x11/desktop-managers/xfce.nix
+++ b/nixos/modules/services/x11/desktop-managers/xfce.nix
@@ -34,10 +34,6 @@ in
# Set GTK_DATA_PREFIX so that GTK+ can find the Xfce themes.
export GTK_DATA_PREFIX=${config.system.path}
- # Necessary to get xfce4-mixer to find GST's ALSA plugin.
- # Ugly.
- export GST_PLUGIN_PATH=${config.system.path}/lib
-
exec ${pkgs.stdenv.shell} ${pkgs.xfce.xinitrc}
'';
};
diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index 3bf18bd58c8..004ea6ef49a 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -169,7 +169,6 @@ in
xserverBin = mkOption {
type = types.path;
- default = "${xorg.xorgserver}/bin/X";
description = "Path to the X server used by display managers.";
};
@@ -251,14 +250,16 @@ in
execCmd = mkOption {
type = types.str;
- example = "${pkgs.slim}/bin/slim";
+ example = literalExample ''
+ "''${pkgs.slim}/bin/slim"
+ '';
description = "Command to start the display manager.";
};
environment = mkOption {
type = types.attrsOf types.unspecified;
default = {};
- example = { SLIM_CFGFILE = /etc/slim.conf; };
+ example = { SLIM_CFGFILE = "/etc/slim.conf"; };
description = "Additional environment variables needed by the display manager.";
};
@@ -278,4 +279,10 @@ in
};
+ config = {
+
+ services.xserver.displayManager.xserverBin = "${xorg.xorgserver}/bin/X";
+
+ };
+
}
diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index f8ce06738fe..98e3fd6d6a5 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -28,11 +28,10 @@ let
buildCommand = ''
mkdir -p $out/gtk-3.0/
- # This wrapper ensures that we actually get fonts
+ # This wrapper ensures that we actually get ?? (fonts should be OK now)
makeWrapper ${pkgs.lightdm_gtk_greeter}/sbin/lightdm-gtk-greeter \
$out/greeter \
--set XDG_DATA_DIRS ${pkgs.gnome2.gnome_icon_theme}/share \
- --set FONTCONFIG_FILE /etc/fonts/fonts.conf \
--set XDG_CONFIG_HOME $out/
# We need this to ensure that it actually tries to find icons from gnome-icon-theme
diff --git a/nixos/modules/services/x11/display-managers/slim.nix b/nixos/modules/services/x11/display-managers/slim.nix
index 9ee4e0dc7cb..c7fbfa85e33 100644
--- a/nixos/modules/services/x11/display-managers/slim.nix
+++ b/nixos/modules/services/x11/display-managers/slim.nix
@@ -19,6 +19,7 @@ let
reboot_cmd ${config.systemd.package}/sbin/shutdown -r now
${optionalString (cfg.defaultUser != null) ("default_user " + cfg.defaultUser)}
${optionalString cfg.autoLogin "auto_login yes"}
+ ${cfg.extraConfig}
'';
# Unpack the SLiM theme, or use the default.
@@ -89,6 +90,15 @@ in
'';
};
+ extraConfig = mkOption {
+ type = types.lines;
+ default = "";
+ description = ''
+ Extra configuration options for SLiM login manager. Do not
+ add options that can be configured directly.
+ '';
+ };
+
};
};
diff --git a/nixos/modules/services/x11/window-managers/afterstep.nix b/nixos/modules/services/x11/window-managers/afterstep.nix
new file mode 100644
index 00000000000..395dabb86b5
--- /dev/null
+++ b/nixos/modules/services/x11/window-managers/afterstep.nix
@@ -0,0 +1,28 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.xserver.windowManager.afterstep;
+in
+{
+ ###### interface
+ options = {
+ services.xserver.windowManager.afterstep.enable = mkOption {
+ default = false;
+ description = "Enable the Afterstep window manager.";
+ };
+ };
+
+ ###### implementation
+ config = mkIf cfg.enable {
+ services.xserver.windowManager.session = singleton {
+ name = "afterstep";
+ start = ''
+ ${pkgs.afterstep}/bin/afterstep &
+ waitPID=$!
+ '';
+ };
+ environment.systemPackages = [ pkgs.afterstep ];
+ };
+}
diff --git a/nixos/modules/services/x11/window-managers/ratpoison.nix b/nixos/modules/services/x11/window-managers/ratpoison.nix
new file mode 100644
index 00000000000..c203c35cd1b
--- /dev/null
+++ b/nixos/modules/services/x11/window-managers/ratpoison.nix
@@ -0,0 +1,28 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.xserver.windowManager.ratpoison;
+in
+{
+ ###### interface
+ options = {
+ services.xserver.windowManager.ratpoison.enable = mkOption {
+ default = false;
+ description = "Enable the Ratpoison window manager.";
+ };
+ };
+
+ ###### implementation
+ config = mkIf cfg.enable {
+ services.xserver.windowManager.session = singleton {
+ name = "ratpoison";
+ start = ''
+ ${pkgs.ratpoison}/bin/ratpoison &
+ waitPID=$!
+ '';
+ };
+ environment.systemPackages = [ pkgs.ratpoison ];
+ };
+}
diff --git a/nixos/modules/services/x11/window-managers/windowmaker.nix b/nixos/modules/services/x11/window-managers/windowmaker.nix
new file mode 100644
index 00000000000..27cedb7da0c
--- /dev/null
+++ b/nixos/modules/services/x11/window-managers/windowmaker.nix
@@ -0,0 +1,28 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.xserver.windowManager.windowmaker;
+in
+{
+ ###### interface
+ options = {
+ services.xserver.windowManager.windowmaker.enable = mkOption {
+ default = false;
+ description = "Enable the Windowmaker window manager.";
+ };
+ };
+
+ ###### implementation
+ config = mkIf cfg.enable {
+ services.xserver.windowManager.session = singleton {
+ name = "windowmaker";
+ start = ''
+ ${pkgs.windowmaker}/bin/wmaker &
+ waitPID=$!
+ '';
+ };
+ environment.systemPackages = [ pkgs.windowmaker ];
+ };
+}
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 5f3e8003b45..f911d3c81f9 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -13,7 +13,6 @@ let
# Map video driver names to driver packages. FIXME: move into card-specific modules.
knownVideoDrivers = {
- ati_unfree = { modules = [ kernelPackages.ati_drivers_x11 ]; driverName = "fglrx"; };
nouveau = { modules = [ pkgs.xf86_video_nouveau ]; };
unichrome = { modules = [ pkgs.xorgVideoUnichrome ]; };
virtualbox = { modules = [ kernelPackages.virtualboxGuestAdditions ]; driverName = "vboxvideo"; };
@@ -151,7 +150,7 @@ in
modules = mkOption {
type = types.listOf types.path;
default = [];
- example = [ pkgs.xf86_input_wacom ];
+ example = literalExample "[ pkgs.xf86_input_wacom ]";
description = "Packages to be added to the module search path of the X server.";
};
@@ -201,7 +200,7 @@ in
vaapiDrivers = mkOption {
type = types.listOf types.path;
default = [ ];
- example = "[ pkgs.vaapiIntel pkgs.vaapiVdpau ]";
+ example = literalExample "[ pkgs.vaapiIntel pkgs.vaapiVdpau ]";
description = ''
Packages providing libva acceleration drivers.
'';
@@ -400,8 +399,8 @@ in
services.xserver.drivers = flip concatMap cfg.videoDrivers (name:
let driver =
attrByPath [name]
- (if (hasAttr ("xf86video" + name) xorg)
- then { modules = [(getAttr ("xf86video" + name) xorg) ]; }
+ (if xorg ? ${"xf86video" + name}
+ then { modules = [xorg.${"xf86video" + name}]; }
else null)
knownVideoDrivers;
in optional (driver != null) ({ inherit name; driverName = name; } // driver));
@@ -444,8 +443,7 @@ in
pkgs.xterm
pkgs.xdg_utils
]
- ++ optional (elem "virtualbox" cfg.videoDrivers) xorg.xrefresh
- ++ optional (elem "ati_unfree" cfg.videoDrivers) kernelPackages.ati_drivers_x11;
+ ++ optional (elem "virtualbox" cfg.videoDrivers) xorg.xrefresh;
environment.pathsToLink =
[ "/etc/xdg" "/share/xdg" "/share/applications" "/share/icons" "/share/pixmaps" ];
@@ -460,13 +458,11 @@ in
restartIfChanged = false;
environment =
- { FONTCONFIG_FILE = "/etc/fonts/fonts.conf"; # !!! cleanup
+ {
XKB_BINDIR = "${xorg.xkbcomp}/bin"; # Needed for the Xkb extension.
XORG_DRI_DRIVER_PATH = "/run/opengl-driver/lib/dri"; # !!! Depends on the driver selected at runtime.
LD_LIBRARY_PATH = concatStringsSep ":" (
[ "${xorg.libX11}/lib" "${xorg.libXext}/lib" ]
- ++ optionals (elem "ati_unfree" cfg.videoDrivers)
- [ "${kernelPackages.ati_drivers_x11}/lib" "${kernelPackages.ati_drivers_x11}/X11R6/lib64/modules/linux" ]
++ concatLists (catAttrs "libPath" cfg.drivers));
} // cfg.displayManager.job.environment;
diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index 0cc060db8f9..3ea00e40c3b 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -6,7 +6,8 @@ let
cfg = config.boot.loader.grub;
- realGrub = if cfg.version == 1 then pkgs.grub else pkgs.grub2;
+ realGrub = if cfg.version == 1 then pkgs.grub
+ else pkgs.grub2.override { zfsSupport = cfg.zfsSupport; };
grub =
# Don't include GRUB if we're only generating a GRUB menu (e.g.,
@@ -25,11 +26,12 @@ let
inherit (cfg)
version extraConfig extraPerEntryConfig extraEntries
extraEntriesBeforeNixOS extraPrepareConfig configurationLimit copyKernels timeout
- default devices explicitBootRoot;
+ default devices fsIdentifier;
path = (makeSearchPath "bin" [
- pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.findutils pkgs.diffutils
+ pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.findutils pkgs.diffutils pkgs.btrfsProgs
+ pkgs.utillinux
]) + ":" + (makeSearchPath "sbin" [
- pkgs.mdadm
+ pkgs.mdadm pkgs.utillinux
]);
});
@@ -209,12 +211,35 @@ in
'';
};
- explicitBootRoot = mkOption {
- default = "";
- type = types.str;
+ fsIdentifier = mkOption {
+ default = "uuid";
+ type = types.addCheck types.str
+ (type: type == "uuid" || type == "label" || type == "provided");
description = ''
- The relative path of /boot within the parent volume. Leave empty
- if /boot is not a btrfs subvolume.
+ Determines how grub will identify devices when generating the
+ configuration file. A value of uuid / label signifies that grub
+ will always resolve the uuid or label of the device before using
+ it in the configuration. A value of provided means that grub will
+ use the device name as show in df or
+ mount. Note, zfs zpools / datasets are ignored
+ and will always be mounted using their labels.
+ '';
+ };
+
+ zfsSupport = mkOption {
+ default = false;
+ type = types.bool;
+ description = ''
+ Whether grub should be build against libzfs.
+ '';
+ };
+
+ enableCryptodisk = mkOption {
+ default = false;
+ type = types.bool;
+ description = ''
+ Enable support for encrypted partitions. Grub should automatically
+ unlock the correct encrypted partition and look for filesystems.
'';
};
@@ -244,7 +269,8 @@ in
if cfg.devices == [] then
throw "You must set the option ‘boot.loader.grub.device’ to make the system bootable."
else
- "PERL5LIB=${makePerlPath [ pkgs.perlPackages.XMLLibXML pkgs.perlPackages.XMLSAX ]} " +
+ "PERL5LIB=${makePerlPath (with pkgs.perlPackages; [ FileSlurp XMLLibXML XMLSAX ])} " +
+ (if cfg.enableCryptodisk then "GRUB_ENABLE_CRYPTODISK=y " else "") +
"${pkgs.perl}/bin/perl ${./install-grub.pl} ${grubConfig}";
system.build.grub = grub;
@@ -260,6 +286,13 @@ 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}";
+ });
+
})
];
diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index c3aa8518b8b..981b60c004c 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -1,10 +1,12 @@
use strict;
use warnings;
+use Class::Struct;
use XML::LibXML;
use File::Basename;
use File::Path;
use File::stat;
use File::Copy;
+use File::Slurp;
use POSIX;
use Cwd;
@@ -27,6 +29,14 @@ sub writeFile {
close FILE or die;
}
+sub runCommand {
+ my ($cmd) = @_;
+ open FILE, "$cmd 2>/dev/null |" or die "Failed to execute: $cmd\n";
+ my @ret = ;
+ close FILE;
+ return ($?, @ret);
+}
+
my $grub = get("grub");
my $grubVersion = int(get("version"));
my $extraConfig = get("extraConfig");
@@ -39,7 +49,7 @@ my $configurationLimit = int(get("configurationLimit"));
my $copyKernels = get("copyKernels") eq "true";
my $timeout = int(get("timeout"));
my $defaultEntry = int(get("default"));
-my $explicitBootRoot = get("explicitBootRoot");
+my $fsIdentifier = get("fsIdentifier");
$ENV{'PATH'} = get("path");
die "unsupported GRUB version\n" if $grubVersion != 1 && $grubVersion != 2;
@@ -48,24 +58,151 @@ print STDERR "updating GRUB $grubVersion menu...\n";
mkpath("/boot/grub", 0, 0700);
-
# Discover whether /boot is on the same filesystem as / and
# /nix/store. If not, then all kernels and initrds must be copied to
-# /boot, and all paths in the GRUB config file must be relative to the
-# root of the /boot filesystem. `$bootRoot' is the path to be
-# prepended to paths under /boot.
-my $bootRoot = "/boot";
-if (stat("/")->dev != stat("/boot")->dev) {
- $bootRoot = "";
- $copyKernels = 1;
-} elsif (stat("/boot")->dev != stat("/nix/store")->dev) {
+# /boot.
+if (stat("/boot")->dev != stat("/nix/store")->dev) {
$copyKernels = 1;
}
-if ($explicitBootRoot ne "") {
- $bootRoot = $explicitBootRoot;
+# Discover information about the location of /boot
+struct(Fs => {
+ device => '$',
+ type => '$',
+ mount => '$',
+});
+sub PathInMount {
+ my ($path, $mount) = @_;
+ my @splitMount = split /\//, $mount;
+ my @splitPath = split /\//, $path;
+ if ($#splitPath < $#splitMount) {
+ return 0;
+ }
+ for (my $i = 0; $i <= $#splitMount; $i++) {
+ if ($splitMount[$i] ne $splitPath[$i]) {
+ return 0;
+ }
+ }
+ return 1;
}
+sub GetFs {
+ my ($dir) = @_;
+ my $bestFs = Fs->new(device => "", type => "", mount => "");
+ foreach my $fs (read_file("/proc/self/mountinfo")) {
+ chomp $fs;
+ my @fields = split / /, $fs;
+ my $mountPoint = $fields[4];
+ next unless -d $mountPoint;
+ my @mountOptions = split /,/, $fields[5];
+ # Skip the optional fields.
+ my $n = 6; $n++ while $fields[$n] ne "-"; $n++;
+ my $fsType = $fields[$n];
+ my $device = $fields[$n + 1];
+ my @superOptions = split /,/, $fields[$n + 2];
+
+ # Skip the read-only bind-mount on /nix/store.
+ next if $mountPoint eq "/nix/store" && (grep { $_ eq "rw" } @superOptions) && (grep { $_ eq "ro" } @mountOptions);
+
+ # Ensure this matches the intended directory
+ next unless PathInMount($dir, $mountPoint);
+
+ # Is it better than our current match?
+ if (length($mountPoint) > length($bestFs->mount)) {
+ $bestFs = Fs->new(device => $device, type => $fsType, mount => $mountPoint);
+ }
+ }
+ return $bestFs;
+}
+struct (Grub => {
+ path => '$',
+ search => '$',
+});
+my $driveid = 1;
+sub GrubFs {
+ my ($dir) = @_;
+ my $fs = GetFs($dir);
+ my $path = "/" . substr($dir, length($fs->mount));
+ my $search = "";
+
+ if ($grubVersion > 1) {
+ # ZFS is completely separate logic as zpools are always identified by a label
+ # or custom UUID
+ if ($fs->type eq 'zfs') {
+ my $sid = index($fs->device, '/');
+
+ if ($sid < 0) {
+ $search = '--label ' . $fs->device;
+ $path = '/@' . $path;
+ } else {
+ $search = '--label ' . substr($fs->device, 0, $sid);
+ $path = '/' . substr($fs->device, $sid) . '/@' . $path;
+ }
+ } else {
+ my %types = ('uuid' => '--fs-uuid', 'label' => '--label');
+
+ if ($fsIdentifier eq 'provided') {
+ # If the provided dev is identifying the partition using a label or uuid,
+ # we should get the label / uuid and do a proper search
+ my @matches = $fs->device =~ m/\/dev\/disk\/by-(label|uuid)\/(.*)/;
+ if ($#matches > 1) {
+ die "Too many matched devices"
+ } elsif ($#matches == 1) {
+ $search = "$types{$matches[0]} $matches[1]"
+ }
+ } else {
+ # Determine the identifying type
+ $search = $types{$fsIdentifier} . ' ';
+
+ # Based on the type pull in the identifier from the system
+ my ($status, @devInfo) = runCommand("blkid -o export @{[$fs->device]}");
+ if ($status != 0) {
+ die "Failed to get blkid info for @{[$fs->mount]} on @{[$fs->device]}";
+ }
+ my @matches = join("", @devInfo) =~ m/@{[uc $fsIdentifier]}=([^\n]*)/;
+ if ($#matches != 0) {
+ die "Couldn't find a $types{$fsIdentifier} for @{[$fs->device]}\n"
+ }
+ $search .= $matches[0];
+ }
+
+ # BTRFS is a special case in that we need to fix the referrenced path based on subvolumes
+ if ($fs->type eq 'btrfs') {
+ my ($status, @id_info) = runCommand("btrfs subvol show @{[$fs->mount]}");
+ if ($status != 0) {
+ die "Failed to retrieve subvolume info for @{[$fs->mount]}\n";
+ }
+ my @ids = join("", @id_info) =~ m/Object ID:[ \t\n]*([^ \t\n]*)/;
+ if ($#ids > 0) {
+ die "Btrfs subvol name for @{[$fs->device]} listed multiple times in mount\n"
+ } elsif ($#ids == 0) {
+ my ($status, @path_info) = runCommand("btrfs subvol list @{[$fs->mount]}");
+ if ($status != 0) {
+ die "Failed to find @{[$fs->mount]} subvolume id from btrfs\n";
+ }
+ my @paths = join("", @path_info) =~ m/ID $ids[0] [^\n]* path ([^\n]*)/;
+ if ($#paths > 0) {
+ die "Btrfs returned multiple paths for a single subvolume id, mountpoint @{[$fs->mount]}\n";
+ } elsif ($#paths != 0) {
+ die "Btrfs did not return a path for the subvolume at @{[$fs->mount]}\n";
+ }
+ $path = "/$paths[0]$path";
+ }
+ }
+ }
+ if (not $search eq "") {
+ $search = "search --set=drive$driveid " . $search;
+ $path = "(\$drive$driveid)$path";
+ $driveid += 1;
+ }
+ }
+ return Grub->new(path => $path, search => $search);
+}
+my $grubBoot = GrubFs("/boot");
+my $grubStore;
+if ($copyKernels == 0) {
+ $grubStore = GrubFs("/nix/store");
+}
# Generate the header.
my $conf .= "# Automatically generated. DO NOT EDIT THIS FILE!\n";
@@ -77,12 +214,17 @@ if ($grubVersion == 1) {
";
if ($splashImage) {
copy $splashImage, "/boot/background.xpm.gz" or die "cannot copy $splashImage to /boot\n";
- $conf .= "splashimage $bootRoot/background.xpm.gz\n";
+ $conf .= "splashimage " . $grubBoot->path . "/background.xpm.gz\n";
}
}
else {
+ if ($copyKernels == 0) {
+ $conf .= "
+ " . $grubStore->search;
+ }
$conf .= "
+ " . $grubBoot->search . "
if [ -s \$prefix/grubenv ]; then
load_env
fi
@@ -103,7 +245,7 @@ else {
set timeout=$timeout
fi
- if loadfont $bootRoot/grub/fonts/unicode.pf2; then
+ if loadfont " . $grubBoot->path . "/grub/fonts/unicode.pf2; then
set gfxmode=640x480
insmod gfxterm
insmod vbe
@@ -117,7 +259,7 @@ else {
copy $splashImage, "/boot/background.png" or die "cannot copy $splashImage to /boot\n";
$conf .= "
insmod png
- if background_image $bootRoot/background.png; then
+ if background_image " . $grubBoot->path . "/background.png; then
set color_normal=white/black
set color_highlight=black/white
else
@@ -139,7 +281,7 @@ mkpath("/boot/kernels", 0, 0755) if $copyKernels;
sub copyToKernelsDir {
my ($path) = @_;
- return $path unless $copyKernels;
+ 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";
@@ -152,7 +294,7 @@ sub copyToKernelsDir {
rename $tmp, $dst or die "cannot rename $tmp to $dst\n";
}
$copied{$dst} = 1;
- return "$bootRoot/kernels/$name";
+ return $grubBoot->path . "/kernels/$name";
}
sub addEntry {
@@ -179,6 +321,10 @@ sub addEntry {
$conf .= " " . ($xen ? "module" : "initrd") . " $initrd\n\n";
} else {
$conf .= "menuentry \"$name\" {\n";
+ $conf .= $grubBoot->search . "\n";
+ if ($copyKernels == 0) {
+ $conf .= $grubStore->search . "\n";
+ }
$conf .= " $extraPerEntryConfig\n" if $extraPerEntryConfig;
$conf .= " multiboot $xen $xenParams\n" if $xen;
$conf .= " " . ($xen ? "module" : "linux") . " $kernel $kernelParams\n";
@@ -196,7 +342,7 @@ addEntry("NixOS - Default", $defaultConfig);
$conf .= "$extraEntries\n" unless $extraEntriesBeforeNixOS;
# extraEntries could refer to @bootRoot@, which we have to substitute
-$conf =~ s/\@bootRoot\@/$bootRoot/g;
+$conf =~ s/\@bootRoot\@/$grubBoot->path/g;
# Emit submenus for all system profiles.
sub addProfile {
diff --git a/nixos/modules/system/boot/loader/gummiboot/gummiboot.nix b/nixos/modules/system/boot/loader/gummiboot/gummiboot.nix
index e7a481e90a7..003f72b37f9 100644
--- a/nixos/modules/system/boot/loader/gummiboot/gummiboot.nix
+++ b/nixos/modules/system/boot/loader/gummiboot/gummiboot.nix
@@ -16,7 +16,7 @@ let
nix = config.nix.package;
- inherit (cfg) timeout;
+ timeout = if cfg.timeout != null then cfg.timeout else "";
inherit (efi) efiSysMountPoint canTouchEfiVariables;
};
diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index c923cc49c44..70ff1d588a3 100644
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@@ -342,40 +342,39 @@ in
description = "Path where the ramfs used to update the LUKS key will be mounted in stage-1";
};
- storage = mkOption {
- type = types.optionSet;
- description = "Options related to the storing the salt";
+ /* TODO: Add to the documentation of the current module:
- options = {
- device = mkOption {
- default = /dev/sda1;
- type = types.path;
- description = ''
- An unencrypted device that will temporarily be mounted in stage-1.
- Must contain the current salt to create the challenge for this LUKS device.
- '';
- };
+ Options related to the storing the salt.
+ */
+ storage = {
+ device = mkOption {
+ default = "/dev/sda1";
+ type = types.path;
+ description = ''
+ An unencrypted device that will temporarily be mounted in stage-1.
+ Must contain the current salt to create the challenge for this LUKS device.
+ '';
+ };
- fsType = mkOption {
- default = "vfat";
- type = types.string;
- description = "The filesystem of the unencrypted device";
- };
+ fsType = mkOption {
+ default = "vfat";
+ type = types.string;
+ description = "The filesystem of the unencrypted device";
+ };
- mountPoint = mkOption {
- default = "/crypt-storage";
- type = types.string;
- description = "Path where the unencrypted device will be mounted in stage-1";
- };
+ mountPoint = mkOption {
+ default = "/crypt-storage";
+ type = types.string;
+ description = "Path where the unencrypted device will be mounted in stage-1";
+ };
- path = mkOption {
- default = "/crypt-storage/default";
- type = types.string;
- description = ''
- Absolute path of the salt on the unencrypted device with
- that device's root directory as "/".
- '';
- };
+ path = mkOption {
+ default = "/crypt-storage/default";
+ type = types.string;
+ description = ''
+ Absolute path of the salt on the unencrypted device with
+ that device's root directory as "/".
+ '';
};
};
};
diff --git a/nixos/modules/system/boot/modprobe.nix b/nixos/modules/system/boot/modprobe.nix
index 652eb046f50..eaf8cf1ecd6 100644
--- a/nixos/modules/system/boot/modprobe.nix
+++ b/nixos/modules/system/boot/modprobe.nix
@@ -77,6 +77,11 @@ with lib;
'')}
${config.boot.extraModprobeConfig}
'';
+ environment.etc."modprobe.d/usb-load-ehci-first.conf".text =
+ ''
+ softdep uhci_hcd pre: ehci_hcd
+ softdep ohci_hcd pre: ehci_hcd
+ '';
environment.systemPackages = [ config.system.sbin.modprobe pkgs.kmod ];
diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh
index 73fc6ce543c..f14f105ef23 100644
--- a/nixos/modules/system/boot/stage-1-init.sh
+++ b/nixos/modules/system/boot/stage-1-init.sh
@@ -168,9 +168,24 @@ if test -e /sys/power/tuxonice/resume; then
fi
fi
-if test -n "@resumeDevice@" -a -e /sys/power/resume -a -e /sys/power/disk; then
- echo "@resumeDevice@" > /sys/power/resume 2> /dev/null || echo "failed to resume..."
- echo shutdown > /sys/power/disk
+if test -e /sys/power/resume -a -e /sys/power/disk; then
+ if test -n "@resumeDevice@"; then
+ resumeDev="@resumeDevice@"
+ else
+ for sd in @resumeDevices@; do
+ # Try to detect resume device. According to Ubuntu bug:
+ # https://bugs.launchpad.net/ubuntu/+source/pm-utils/+bug/923326/comments/1
+ # When there are multiple swap devices, we can't know where will hibernate
+ # image reside. We can check all of them for swsuspend blkid.
+ if [ "$(udevadm info -q property "$sd" | sed -n 's/^ID_FS_TYPE=//p')" = "swsuspend" ]; then
+ resumeDev="$sd"
+ break
+ fi
+ done
+ fi
+ if test -n "$resumeDev"; then
+ echo "$resumeDev" > /sys/power/resume 2> /dev/null || echo "failed to resume..."
+ fi
fi
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index 426da778f43..1ec11e70e84 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -50,7 +50,7 @@ let
cp -pvd ${pkgs.busybox}/bin/* ${pkgs.busybox}/sbin/* $out/bin/
# Copy some utillinux stuff.
- cp -vf ${pkgs.utillinux}/sbin/blkid $out/bin
+ cp -vf --remove-destination ${pkgs.utillinux}/sbin/blkid $out/bin
cp -pdv ${pkgs.utillinux}/lib/libblkid*.so.* $out/lib
cp -pdv ${pkgs.utillinux}/lib/libuuid*.so.* $out/lib
@@ -181,6 +181,9 @@ let
inherit (config.boot.initrd) checkJournalingFS
preLVMCommands postDeviceCommands postMountCommands kernelModules;
+ resumeDevices = map (sd: if sd ? device then sd.device else "/dev/disk/by-label/${sd.label}")
+ (filter (sd: sd ? label || hasPrefix "/dev/" sd.device) config.swapDevices);
+
fsInfo =
let f = fs: [ fs.mountPoint (if fs.device != null then fs.device else "/dev/disk/by-label/${fs.label}") fs.fsType fs.options ];
in pkgs.writeText "initrd-fsinfo" (concatStringsSep "\n" (concatMap f fileSystems));
@@ -220,13 +223,14 @@ in
options = {
boot.resumeDevice = mkOption {
- type = types.nullOr types.str;
- default = null;
- example = "8:2";
+ type = types.str;
+ default = "";
+ example = "/dev/sda3";
description = ''
- Device for manual resume attempt during boot, specified using
- the device's major and minor number as
- major:minor.
+ Device for manual resume attempt during boot. This should be used primarily
+ if you want to resume from file. Specify here the device where the file
+ resides. You should also use boot.kernelParams to specify
+ resume_offset.
'';
};
diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix
index a6183c47eb1..07f3cb9e952 100644
--- a/nixos/modules/system/boot/systemd-unit-options.nix
+++ b/nixos/modules/system/boot/systemd-unit-options.nix
@@ -6,8 +6,8 @@ let
checkService = v:
let assertValueOneOf = name: values: attr:
- let val = getAttr name attr;
- in optional ( hasAttr name attr && !elem val values) "Systemd service field `${name}' cannot have value `${val}'.";
+ let val = attr.${name};
+ in optional (attr ? ${name} && !elem val values) "Systemd service field `${name}' cannot have value `${val}'.";
checkType = assertValueOneOf "Type" ["simple" "forking" "oneshot" "dbus" "notify" "idle"];
checkRestart = assertValueOneOf "Restart" ["no" "on-success" "on-failure" "on-abort" "always"];
errors = concatMap (c: c v) [checkType checkRestart];
@@ -230,6 +230,15 @@ in rec {
'';
};
+ reload = mkOption {
+ type = types.lines;
+ default = "";
+ description = ''
+ Shell commands executed when the service's main process
+ is reloaded.
+ '';
+ };
+
preStop = mkOption {
type = types.lines;
default = "";
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index e353e9246b0..d0fe69c15dd 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -245,6 +245,12 @@ let
${config.postStart}
'';
})
+ (mkIf (config.reload != "")
+ { serviceConfig.ExecReload = makeJobScript "${name}-reload" ''
+ #! ${pkgs.stdenv.shell} -e
+ ${config.reload}
+ '';
+ })
(mkIf (config.preStop != "")
{ serviceConfig.ExecStop = makeJobScript "${name}-pre-stop" ''
#! ${pkgs.stdenv.shell} -e
@@ -315,7 +321,7 @@ let
[Service]
${let env = cfg.globalEnvironment // def.environment;
in concatMapStrings (n:
- let s = "Environment=\"${n}=${getAttr n env}\"\n";
+ let s = "Environment=\"${n}=${env.${n}}\"\n";
in if stringLength s >= 2048 then throw "The value of the environment variable ‘${n}’ in systemd service ‘${name}.service’ is too long." else s) (attrNames env)}
${if def.reloadIfChanged then ''
X-ReloadIfChanged=true
diff --git a/nixos/modules/tasks/cpu-freq.nix b/nixos/modules/tasks/cpu-freq.nix
index a8c63c13428..70bbee8474e 100644
--- a/nixos/modules/tasks/cpu-freq.nix
+++ b/nixos/modules/tasks/cpu-freq.nix
@@ -30,9 +30,7 @@ in
config = mkIf (!config.boot.isContainer && config.powerManagement.cpuFreqGovernor != null) {
- boot.kernelModules = [ "acpi-cpufreq" "speedstep-lib" "pcc-cpufreq"
- "cpufreq_${cfg.cpuFreqGovernor}"
- ];
+ boot.kernelModules = [ "cpufreq_${cfg.cpuFreqGovernor}" ];
environment.systemPackages = [ cpupower ];
diff --git a/nixos/modules/tasks/filesystems/nfs.nix b/nixos/modules/tasks/filesystems/nfs.nix
index e8c3d8ab56d..16752ce7e1b 100644
--- a/nixos/modules/tasks/filesystems/nfs.nix
+++ b/nixos/modules/tasks/filesystems/nfs.nix
@@ -24,9 +24,33 @@ let
Method = nsswitch
'';
+ cfg = config.services.nfs;
+
in
{
+ ###### interface
+
+ options = {
+
+ services.nfs = {
+ statdPort = mkOption {
+ default = null;
+ example = 4000;
+ description = ''
+ Use fixed port for rpc.statd, usefull if NFS server is behind firewall.
+ '';
+ };
+ lockdPort = mkOption {
+ default = null;
+ example = 4001;
+ description = ''
+ Use fixed port for NFS lock manager kernel module (lockd/nlockmgr),
+ usefull if NFS server is behind firewall.
+ '';
+ };
+ };
+ };
###### implementation
@@ -36,6 +60,10 @@ in
system.fsPackages = [ pkgs.nfsUtils ];
+ boot.extraModprobeConfig = mkIf (cfg.lockdPort != null) ''
+ options lockd nlm_udpport=${toString cfg.lockdPort} nlm_tcpport=${toString cfg.lockdPort}
+ '';
+
boot.kernelModules = [ "sunrpc" ];
boot.initrd.kernelModules = mkIf inInitrd [ "nfs" ];
@@ -60,7 +88,10 @@ in
'';
serviceConfig.Type = "forking";
- serviceConfig.ExecStart = "@${pkgs.nfsUtils}/sbin/rpc.statd rpc.statd --no-notify";
+ serviceConfig.ExecStart = ''
+ @${pkgs.nfsUtils}/sbin/rpc.statd rpc.statd --no-notify \
+ ${if cfg.statdPort != null then "-p ${toString statdPort}" else ""}
+ '';
serviceConfig.Restart = "always";
};
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index d7deb44c407..1c4bbc16b49 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -133,7 +133,7 @@ in
};
boot.initrd = mkIf inInitrd {
- kernelModules = [ "spl" "zfs" ] ;
+ kernelModules = [ "spl" "zfs" ];
extraUtilsCommands =
''
cp -v ${zfsPkg}/sbin/zfs $out/bin
@@ -148,6 +148,10 @@ in
'';
};
+ boot.loader.grub = mkIf inInitrd {
+ zfsSupport = true;
+ };
+
systemd.services."zpool-import" = {
description = "Import zpools";
after = [ "systemd-udev-settle.service" ];
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 7dabe70f00c..6f6000cf339 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -1,6 +1,7 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, utils, ... }:
with lib;
+with utils;
let
@@ -10,6 +11,30 @@ let
hasSits = cfg.sits != { };
hasBonds = cfg.bonds != { };
+ # We must escape interfaces due to the systemd interpretation
+ subsystemDevice = interface:
+ "sys-subsystem-net-devices-${escapeSystemdPath interface}.device";
+
+ addrOpts = v:
+ assert v == 4 || v == 6;
+ {
+ address = mkOption {
+ type = types.str;
+ description = ''
+ IPv${toString v} address of the interface. Leave empty to configure the
+ interface using DHCP.
+ '';
+ };
+
+ prefixLength = mkOption {
+ type = types.addCheck types.int (n: n >= 0 && n <= (if v == 4 then 32 else 128));
+ description = ''
+ Subnet mask of the interface, specified as the number of
+ bits in the prefix (${if v == 4 then "24" else "64"}).
+ '';
+ };
+ };
+
interfaceOpts = { name, ... }: {
options = {
@@ -20,10 +45,36 @@ let
description = "Name of the interface.";
};
+ ip4 = mkOption {
+ default = [ ];
+ example = [
+ { address = "10.0.0.1"; prefixLength = 16; }
+ { address = "192.168.1.1"; prefixLength = 24; }
+ ];
+ type = types.listOf types.optionSet;
+ options = addrOpts 4;
+ description = ''
+ List of IPv4 addresses that will be statically assigned to the interface.
+ '';
+ };
+
+ ip6 = mkOption {
+ default = [ ];
+ example = [
+ { address = "fdfd:b3f0:482::1"; prefixLength = 48; }
+ { address = "2001:1470:fffd:2098::e006"; prefixLength = 64; }
+ ];
+ type = types.listOf types.optionSet;
+ options = addrOpts 6;
+ description = ''
+ List of IPv6 addresses that will be statically assigned to the interface.
+ '';
+ };
+
ipAddress = mkOption {
default = null;
example = "10.0.0.1";
- type = types.nullOr (types.str);
+ type = types.nullOr types.str;
description = ''
IP address of the interface. Leave empty to configure the
interface using DHCP.
@@ -41,27 +92,23 @@ let
};
subnetMask = mkOption {
- default = "";
- example = "255.255.255.0";
- type = types.str;
+ default = null;
description = ''
- Subnet mask of the interface, specified as a bitmask.
- This is deprecated; use
- instead.
+ Defunct, supply the prefix length instead.
'';
};
ipv6Address = mkOption {
default = null;
example = "2001:1470:fffd:2098::e006";
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
description = ''
IPv6 address of the interface. Leave empty to configure the
interface using NDP.
'';
};
- ipv6prefixLength = mkOption {
+ ipv6PrefixLength = mkOption {
default = 64;
example = 64;
type = types.int;
@@ -96,8 +143,6 @@ let
Whether this interface is virtual and should be created by tunctl.
This is mainly useful for creating bridges between a host a virtual
network such as VPN or a virtual machine.
-
- Defaults to tap device, unless interface contains "tun" in its name.
'';
};
@@ -109,6 +154,15 @@ let
'';
};
+ virtualType = mkOption {
+ default = null;
+ type = types.nullOr (types.addCheck types.str (v: v == "tun" || v == "tap"));
+ description = ''
+ The explicit type of interface to create. Accepts tun or tap strings.
+ Also accepts null to implicitly detect the type of device.
+ '';
+ };
+
proxyARP = mkOption {
default = false;
type = types.bool;
@@ -224,10 +278,10 @@ in
networking.interfaces = mkOption {
default = {};
example =
- { eth0 = {
- ipAddress = "131.211.84.78";
- subnetMask = "255.255.255.128";
- };
+ { eth0.ip4 = [ {
+ address = "131.211.84.78";
+ prefixLength = 25;
+ } ];
};
description = ''
The configuration for each network interface. If
@@ -291,10 +345,20 @@ in
interfaces = mkOption {
example = [ "enp4s0f0" "enp4s0f1" "wlan0" ];
- type = types.listOf types.string;
+ type = types.listOf types.str;
description = "The interfaces to bond together";
};
+ lacp_rate = mkOption {
+ default = null;
+ example = "fast";
+ type = types.nullOr types.str;
+ description = ''
+ Option specifying the rate in which we'll ask our link partner
+ to transmit LACPDU packets in 802.3ad mode.
+ '';
+ };
+
miimon = mkOption {
default = null;
example = 100;
@@ -310,7 +374,7 @@ in
mode = mkOption {
default = null;
example = "active-backup";
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
description = ''
The mode which the bond will be running. The default mode for
the bonding driver is balance-rr, optimizing for throughput.
@@ -319,6 +383,16 @@ in
'';
};
+ xmit_hash_policy = mkOption {
+ default = null;
+ example = "layer2+3";
+ type = types.nullOr types.str;
+ description = ''
+ Selects the transmit hash policy to use for slave selection in
+ balance-xor, 802.3ad, and tlb modes.
+ '';
+ };
+
};
};
@@ -438,6 +512,12 @@ in
config = {
+ assertions =
+ flip map interfaces (i: {
+ assertion = i.subnetMask == null;
+ message = "The networking.interfaces.${i.name}.subnetMask option is defunct. Use prefixLength instead.";
+ });
+
boot.kernelModules = [ ]
++ optional cfg.enableIPv6 "ipv6"
++ optional hasVirtuals "tun"
@@ -534,16 +614,22 @@ in
# network device, so it only gets started after the interface
# has appeared, and it's stopped when the interface
# disappears.
- configureInterface = i: nameValuePair "${i.name}-cfg"
- (let mask =
- if i.prefixLength != null then toString i.prefixLength else
- if i.subnetMask != "" then i.subnetMask else "32";
- staticIPv6 = cfg.enableIPv6 && i.ipv6Address != null;
+ configureInterface = i:
+ let
+ ips = i.ip4 ++ optionals cfg.enableIPv6 i.ip6
+ ++ optional (i.ipAddress != null) {
+ address = i.ipAddress;
+ prefixLength = i.prefixLength;
+ } ++ optional (cfg.enableIPv6 && i.ipv6Address != null) {
+ address = i.ipv6Address;
+ prefixLength = i.ipv6PrefixLength;
+ };
in
+ nameValuePair "${i.name}-cfg"
{ description = "Configuration of ${i.name}";
wantedBy = [ "network-interfaces.target" ];
- bindsTo = [ "sys-subsystem-net-devices-${i.name}.device" ];
- after = [ "sys-subsystem-net-devices-${i.name}.device" ];
+ bindsTo = [ (subsystemDevice i.name) ];
+ after = [ (subsystemDevice i.name) ];
serviceConfig.Type = "oneshot";
serviceConfig.RemainAfterExit = true;
path = [ pkgs.iproute pkgs.gawk ];
@@ -562,36 +648,32 @@ in
echo "setting MTU to ${toString i.mtu}..."
ip link set "${i.name}" mtu "${toString i.mtu}"
''
- + optionalString (i.ipAddress != null)
+
+ # Ip Setup
+ +
''
- cur=$(ip -4 -o a show dev "${i.name}" | awk '{print $4}')
- # Only do a flush/add if it's necessary. This is
+ curIps=$(ip -o a show dev "${i.name}" | awk '{print $4}')
+ # Only do an add if it's necessary. This is
# useful when the Nix store is accessed via this
# interface (e.g. in a QEMU VM test).
- if [ "$cur" != "${i.ipAddress}/${mask}" ]; then
- echo "configuring interface..."
- ip -4 addr flush dev "${i.name}"
- ip -4 addr add "${i.ipAddress}/${mask}" dev "${i.name}"
- restart_network_setup=true
- else
- echo "skipping configuring interface"
+ ''
+ + flip concatMapStrings (ips) (ip:
+ let
+ address = "${ip.address}/${toString ip.prefixLength}";
+ in
+ ''
+ echo "checking ip ${address}..."
+ if ! echo "$curIps" | grep "${address}" >/dev/null 2>&1; then
+ if out=$(ip addr add "${address}" dev "${i.name}" 2>&1); then
+ echo "added ip ${address}..."
+ restart_network_setup=true
+ elif ! echo "$out" | grep "File exists" >/dev/null 2>&1; then
+ echo "failed to add ${address}"
+ exit 1
+ fi
fi
- ''
- + optionalString (staticIPv6)
- ''
- # Only do a flush/add if it's necessary. This is
- # useful when the Nix store is accessed via this
- # interface (e.g. in a QEMU VM test).
- if ! ip -6 -o a show dev "${i.name}" | grep "${i.ipv6Address}/${toString i.ipv6prefixLength}"; then
- echo "configuring interface..."
- ip -6 addr flush dev "${i.name}"
- ip -6 addr add "${i.ipv6Address}/${toString i.ipv6prefixLength}" dev "${i.name}"
- restart_network_setup=true
- else
- echo "skipping configuring interface"
- fi
- ''
- + optionalString (i.ipAddress != null || staticIPv6)
+ '')
+ + optionalString (ips != [ ])
''
if [ restart_network_setup = true ]; then
# Ensure that the default gateway remains set.
@@ -608,28 +690,47 @@ in
''
echo 1 > /proc/sys/net/ipv6/conf/${i.name}/proxy_ndp
'';
- });
+ preStop =
+ ''
+ echo "releasing configured ip's..."
+ ''
+ + flip concatMapStrings (ips) (ip:
+ let
+ address = "${ip.address}/${toString ip.prefixLength}";
+ in
+ ''
+ echo -n "Deleting ${address}..."
+ ip addr del "${address}" dev "${i.name}" >/dev/null 2>&1 || echo -n " Failed"
+ echo ""
+ '');
+ };
- createTunDevice = i: nameValuePair "${i.name}"
+ createTunDevice = i: nameValuePair "${i.name}-netdev"
{ description = "Virtual Network Interface ${i.name}";
requires = [ "dev-net-tun.device" ];
after = [ "dev-net-tun.device" ];
- wantedBy = [ "network.target" ];
- requiredBy = [ "sys-subsystem-net-devices-${i.name}.device" ];
- serviceConfig =
- { Type = "oneshot";
- RemainAfterExit = true;
- ExecStart = "${pkgs.tunctl}/bin/tunctl -t '${i.name}' -u '${i.virtualOwner}'";
- ExecStop = "${pkgs.tunctl}/bin/tunctl -d '${i.name}'";
- };
+ wantedBy = [ "network.target" (subsystemDevice i.name) ];
+ path = [ pkgs.iproute ];
+ serviceConfig = {
+ Type = "oneshot";
+ RemainAfterExit = true;
+ };
+ script = ''
+ ip tuntap add dev "${i.name}" \
+ ${optionalString (i.virtualType != null) "mode ${i.virtualType}"} \
+ user "${i.virtualOwner}"
+ '';
+ postStop = ''
+ ip link del ${i.name}
+ '';
};
- createBridgeDevice = n: v:
- let
- deps = map (i: "sys-subsystem-net-devices-${i}.device") v.interfaces;
+ createBridgeDevice = n: v: nameValuePair "${n}-netdev"
+ (let
+ deps = map subsystemDevice v.interfaces;
in
{ description = "Bridge Interface ${n}";
- wantedBy = [ "network.target" "sys-subsystem-net-devices-${n}.device" ];
+ wantedBy = [ "network.target" (subsystemDevice n) ];
bindsTo = deps;
after = deps;
serviceConfig.Type = "oneshot";
@@ -662,14 +763,14 @@ in
ip link set "${n}" down
brctl delbr "${n}"
'';
- };
+ });
- createBondDevice = n: v:
- let
- deps = map (i: "sys-subsystem-net-devices-${i}.device") v.interfaces;
+ createBondDevice = n: v: nameValuePair "${n}-netdev"
+ (let
+ deps = map subsystemDevice v.interfaces;
in
{ description = "Bond Interface ${n}";
- wantedBy = [ "network.target" "sys-subsystem-net-devices-${n}.device" ];
+ wantedBy = [ "network.target" (subsystemDevice n) ];
bindsTo = deps;
after = deps;
serviceConfig.Type = "oneshot";
@@ -677,9 +778,11 @@ in
path = [ pkgs.ifenslave pkgs.iproute ];
script = ''
# Remove Dead Interfaces
- ip link show "${n}" >/dev/null 2>&1 && ip link delete "${n}"
+ ip link set "${n}" down >/dev/null 2>&1 || true
+ ifenslave -d "${n}" >/dev/null 2>&1 || true
+ ip link del "${n}" >/dev/null 2>&1 || true
- ip link add "${n}" type bond
+ ip link add name "${n}" type bond
# !!! There must be a better way to wait for the interface
while [ ! -d /sys/class/net/${n} ]; do sleep 0.1; done;
@@ -689,26 +792,30 @@ in
"echo ${toString v.miimon} > /sys/class/net/${n}/bonding/miimon"}
${optionalString (v.mode != null)
"echo \"${v.mode}\" > /sys/class/net/${n}/bonding/mode"}
+ ${optionalString (v.lacp_rate != null)
+ "echo \"${v.lacp_rate}\" > /sys/class/net/${n}/bonding/lacp_rate"}
+ ${optionalString (v.xmit_hash_policy != null)
+ "echo \"${v.xmit_hash_policy}\" > /sys/class/net/${n}/bonding/xmit_hash_policy"}
- # Bring up the bridge and enslave the specified interfaces
+ # Bring up the bond and enslave the specified interfaces
ip link set "${n}" up
${flip concatMapStrings v.interfaces (i: ''
ifenslave "${n}" "${i}"
'')}
'';
postStop = ''
- ip link set "${n}" down
- ifenslave -d "${n}"
- ip link delete "${n}"
+ ip link set "${n}" down >dev/null 2>&1 || true
+ ifenslave -d "${n}" >/dev/null 2>&1 || true
+ ip link del "${n}" >/dev/null 2>&1 || true
'';
- };
+ });
- createSitDevice = n: v:
- let
- deps = optional (v.dev != null) "sys-subsystem-net-devices-${v.dev}.device";
+ createSitDevice = n: v: nameValuePair "${n}-netdev"
+ (let
+ deps = optional (v.dev != null) (subsystemDevice v.dev);
in
{ description = "6-to-4 Tunnel Interface ${n}";
- wantedBy = [ "network.target" "sys-subsystem-net-devices-${n}.device" ];
+ wantedBy = [ "network.target" (subsystemDevice n) ];
bindsTo = deps;
after = deps;
serviceConfig.Type = "oneshot";
@@ -717,7 +824,7 @@ in
script = ''
# Remove Dead Interfaces
ip link show "${n}" >/dev/null 2>&1 && ip link delete "${n}"
- ip link add "${n}" type sit \
+ ip link add name "${n}" type sit \
${optionalString (v.remote != null) "remote \"${v.remote}\""} \
${optionalString (v.local != null) "local \"${v.local}\""} \
${optionalString (v.ttl != null) "ttl ${toString v.ttl}"} \
@@ -727,14 +834,14 @@ in
postStop = ''
ip link delete "${n}"
'';
- };
+ });
- createVlanDevice = n: v:
- let
- deps = [ "sys-subsystem-net-devices-${v.interface}.device" ];
+ createVlanDevice = n: v: nameValuePair "${n}-netdev"
+ (let
+ deps = [ (subsystemDevice v.interface) ];
in
{ description = "Vlan Interface ${n}";
- wantedBy = [ "network.target" "sys-subsystem-net-devices-${n}.device" ];
+ wantedBy = [ "network.target" (subsystemDevice n) ];
bindsTo = deps;
after = deps;
serviceConfig.Type = "oneshot";
@@ -743,21 +850,21 @@ in
script = ''
# Remove Dead Interfaces
ip link show "${n}" >/dev/null 2>&1 && ip link delete "${n}"
- ip link add link "${v.interface}" "${n}" type vlan id "${toString v.id}"
+ ip link add link "${v.interface}" name "${n}" type vlan id "${toString v.id}"
ip link set "${n}" up
'';
postStop = ''
ip link delete "${n}"
'';
- };
+ });
in listToAttrs (
map configureInterface interfaces ++
map createTunDevice (filter (i: i.virtual) interfaces))
- // mapAttrs createBridgeDevice cfg.bridges
- // mapAttrs createBondDevice cfg.bonds
- // mapAttrs createSitDevice cfg.sits
- // mapAttrs createVlanDevice cfg.vlans
+ // mapAttrs' createBridgeDevice cfg.bridges
+ // mapAttrs' createBondDevice cfg.bonds
+ // mapAttrs' createSitDevice cfg.sits
+ // mapAttrs' createVlanDevice cfg.vlans
// { "network-setup" = networkSetup; };
# Set the host and domain names in the activation script. Don't
diff --git a/nixos/modules/tasks/trackpoint.nix b/nixos/modules/tasks/trackpoint.nix
index d1c6f8ac156..5d1bb631b54 100644
--- a/nixos/modules/tasks/trackpoint.nix
+++ b/nixos/modules/tasks/trackpoint.nix
@@ -36,6 +36,14 @@ with lib;
configures 97.
'';
};
+
+ emulateWheel = mkOption {
+ default = false;
+ type = types.bool;
+ description = ''
+ Enable scrolling while holding the middle mouse button.
+ '';
+ };
};
@@ -44,17 +52,33 @@ with lib;
###### implementation
- config = mkIf config.hardware.trackpoint.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}"
- '';
-
- system.activationScripts.trackpoint =
+ config = mkMerge [
+ (mkIf config.hardware.trackpoint.enable {
+ services.udev.extraRules =
''
- ${config.systemd.package}/bin/udevadm trigger --attr-match=name="TPPS/2 IBM TrackPoint"
+ 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}"
'';
- };
+ system.activationScripts.trackpoint =
+ ''
+ ${config.systemd.package}/bin/udevadm trigger --attr-match=name="TPPS/2 IBM TrackPoint"
+ '';
+ })
+
+ (mkIf config.hardware.trackpoint.emulateWheel {
+ services.xserver.config =
+ ''
+ Section "InputClass"
+ Identifier "Trackpoint Wheel Emulation"
+ MatchProduct "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
+ '';
+ })
+ ];
}
diff --git a/nixos/modules/virtualisation/azure-config.nix b/nixos/modules/virtualisation/azure-config.nix
new file mode 100644
index 00000000000..5c9f18ef52a
--- /dev/null
+++ b/nixos/modules/virtualisation/azure-config.nix
@@ -0,0 +1,5 @@
+{ config, pkgs, modulesPath, ... }:
+
+{
+ imports = [ "${modulesPath}/virtualisation/azure-image.nix" ];
+}
diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixos/modules/virtualisation/azure-image.nix
new file mode 100644
index 00000000000..ec7e8888c03
--- /dev/null
+++ b/nixos/modules/virtualisation/azure-image.nix
@@ -0,0 +1,125 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+let
+ diskSize = "4096";
+in
+{
+ imports = [ ../profiles/headless.nix ];
+
+ system.build.azureImage =
+ pkgs.vmTools.runInLinuxVM (
+ pkgs.runCommand "azure-image"
+ { preVM =
+ ''
+ mkdir $out
+ diskImage=$out/$diskImageBase
+
+ cyl=$(((${diskSize}*1024*1024)/(512*63*255)))
+ size=$(($cyl*255*63*512))
+ roundedsize=$((($size/(1024*1024)+1)*(1024*1024)))
+ ${pkgs.vmTools.qemu}/bin/qemu-img create -f raw $diskImage $roundedsize
+ mv closure xchg/
+ '';
+
+ postVM =
+ ''
+ mkdir -p $out
+ ${pkgs.vmTools.qemu}/bin/qemu-img convert -f raw -O vpc $diskImage $out/disk.vhd
+ rm $diskImage
+ '';
+ diskImageBase = "nixos-${config.system.nixosVersion}-${pkgs.stdenv.system}.raw";
+ buildInputs = [ pkgs.utillinux pkgs.perl ];
+ exportReferencesGraph =
+ [ "closure" config.system.build.toplevel ];
+ }
+ ''
+ # Create partition table
+ ${pkgs.parted}/sbin/parted /dev/vda mklabel msdos
+ ${pkgs.parted}/sbin/parted /dev/vda mkpart primary ext4 1 ${diskSize}M
+ ${pkgs.parted}/sbin/parted /dev/vda print
+ . /sys/class/block/vda1/uevent
+ mknod /dev/vda1 b $MAJOR $MINOR
+
+ # Create an empty filesystem and mount it.
+ ${pkgs.e2fsprogs}/sbin/mkfs.ext4 -L nixos /dev/vda1
+ ${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda1
+
+ mkdir /mnt
+ mount /dev/vda1 /mnt
+
+ # The initrd expects these directories to exist.
+ mkdir /mnt/dev /mnt/proc /mnt/sys
+
+ mount --bind /proc /mnt/proc
+ mount --bind /dev /mnt/dev
+ mount --bind /sys /mnt/sys
+
+ # Copy all paths in the closure to the filesystem.
+ storePaths=$(perl ${pkgs.pathsFromGraph} /tmp/xchg/closure)
+
+ mkdir -p /mnt/nix/store
+ echo "copying everything (will take a while)..."
+ cp -prd $storePaths /mnt/nix/store/
+
+ # 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
+
+ # Create the system profile to allow nixos-rebuild to work.
+ chroot /mnt ${config.nix.package}/bin/nix-env \
+ -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 /mnt/boot/grub
+ cp ${./azure-config.nix} /mnt/etc/nixos/configuration.nix
+
+ # Generate the GRUB menu.
+ ln -s vda /dev/sda
+ chroot /mnt ${config.system.build.toplevel}/bin/switch-to-configuration boot
+
+ umount /mnt/proc /mnt/dev /mnt/sys
+ umount /mnt
+ ''
+ );
+
+ fileSystems."/".device = "/dev/disk/by-label/nixos";
+
+ # Azure metadata is available as a CD-ROM drive.
+ fileSystems."/metadata".device = "/dev/sr0";
+
+ boot.kernelParams = [ "console=ttyS0" "earlyprintk=ttyS0" "rootdelay=300" "panic=1" "boot.panic_on_fail" ];
+ boot.initrd.kernelModules = [ "hv_vmbus" "hv_netvsc" "hv_utils" "hv_storvsc" ];
+
+ # Generate a GRUB menu.
+ boot.loader.grub.device = "/dev/sda";
+ boot.loader.grub.version = 2;
+ boot.loader.grub.timeout = 0;
+
+ # Don't put old configurations in the GRUB menu. The user has no
+ # way to select them anyway.
+ boot.loader.grub.configurationLimit = 0;
+
+ # Allow root logins only using the SSH key that the user specified
+ # at instance creation time.
+ services.openssh.enable = true;
+ services.openssh.permitRootLogin = "without-password";
+
+ # Force getting the hostname from Azure
+ networking.hostName = mkDefault "";
+
+ # Always include cryptsetup so that NixOps can use it.
+ environment.systemPackages = [ pkgs.cryptsetup ];
+
+ networking.usePredictableInterfaceNames = false;
+
+ users.extraUsers.root.openssh.authorizedKeys.keys = [ (builtins.readFile ) ];
+}
diff --git a/nixos/modules/virtualisation/container-config.nix b/nixos/modules/virtualisation/container-config.nix
index 84e3aa28352..a7e8953827a 100644
--- a/nixos/modules/virtualisation/container-config.nix
+++ b/nixos/modules/virtualisation/container-config.nix
@@ -18,77 +18,6 @@ with lib;
# Shut up warnings about not having a boot loader.
system.build.installBootLoader = "${pkgs.coreutils}/bin/true";
- # Provide a root login prompt on /var/lib/root-login.socket that
- # doesn't ask for a password. This socket can only be used by root
- # on the host.
- systemd.sockets.root-login =
- { description = "Root Login Socket";
- wantedBy = [ "sockets.target" ];
- socketConfig =
- { ListenStream = "/var/lib/root-login.socket";
- SocketMode = "0600";
- Accept = true;
- };
- };
-
- systemd.services."root-login@" =
- { description = "Root Login %i";
- environment.TERM = "linux";
- serviceConfig =
- { Type = "simple";
- StandardInput = "socket";
- ExecStart = "${pkgs.socat}/bin/socat -t0 - \"exec:${pkgs.shadow}/bin/login -f root,pty,setsid,setpgid,stderr,ctty\"";
- TimeoutStopSec = 1; # FIXME
- };
- restartIfChanged = false;
- };
-
- # Provide a daemon on /var/lib/run-command.socket that reads a
- # command from stdin and executes it.
- systemd.sockets.run-command =
- { description = "Run Command Socket";
- wantedBy = [ "sockets.target" ];
- socketConfig =
- { ListenStream = "/var/lib/run-command.socket";
- SocketMode = "0600"; # only root can connect
- Accept = true;
- };
- };
-
- systemd.services."run-command@" =
- { description = "Run Command %i";
- environment.TERM = "linux";
- serviceConfig =
- { Type = "simple";
- StandardInput = "socket";
- TimeoutStopSec = 1; # FIXME
- };
- script =
- ''
- #! ${pkgs.stdenv.shell} -e
- source /etc/bashrc
- read c
- eval "command=($c)"
- exec "''${command[@]}"
- '';
- restartIfChanged = false;
- };
-
- systemd.services.container-startup-done =
- { description = "Container Startup Notification";
- wantedBy = [ "multi-user.target" ];
- after = [ "multi-user.target" ];
- script =
- ''
- if [ -p /var/lib/startup-done ]; then
- echo done > /var/lib/startup-done
- fi
- '';
- serviceConfig.Type = "oneshot";
- serviceConfig.RemainAfterExit = true;
- restartIfChanged = false;
- };
-
systemd.services.systemd-remount-fs.enable = false;
};
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 292b96e6eb2..35e37257838 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -10,7 +10,7 @@ let
isExecutable = true;
src = ./nixos-container.pl;
perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl";
- inherit (pkgs) socat;
+ inherit (pkgs) utillinux;
};
# The container's init script, a small wrapper around the regular
@@ -174,6 +174,11 @@ in
# Clean up existing machined registration and interfaces.
machinectl terminate "$INSTANCE" 2> /dev/null || true
+ if [ "$PRIVATE_NETWORK" = 1 ]; then
+ ip link del dev "ve-$INSTANCE" 2> /dev/null || true
+ fi
+
+
if [ "$PRIVATE_NETWORK" = 1 ]; then
ip link del dev "ve-$INSTANCE" 2> /dev/null || true
fi
@@ -254,9 +259,8 @@ in
ExecReload = pkgs.writeScript "reload-container"
''
#! ${pkgs.stdenv.shell} -e
- SYSTEM_PATH=/nix/var/nix/profiles/system
- echo $SYSTEM_PATH/bin/switch-to-configuration test | \
- ${pkgs.socat}/bin/socat unix:$root/var/lib/run-command.socket -
+ ${nixos-container}/bin/nixos-container run "$INSTANCE" -- \
+ bash --login -c "/nix/var/nix/profiles/system/bin/switch-to-configuration test"
'';
SyslogIdentifier = "container %i";
diff --git a/nixos/modules/virtualisation/docker-image.nix b/nixos/modules/virtualisation/docker-image.nix
new file mode 100644
index 00000000000..13b861dc988
--- /dev/null
+++ b/nixos/modules/virtualisation/docker-image.nix
@@ -0,0 +1,67 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ pkgs2storeContents = l : map (x: { object = x; symlink = "none"; }) l;
+
+in {
+ # Create the tarball
+ system.build.dockerImage = import ../../lib/make-system-tarball.nix {
+ inherit (pkgs) stdenv perl xz pathsFromGraph;
+
+ contents = [];
+ extraArgs = "--owner=0";
+ storeContents = [
+ { object = config.system.build.toplevel + "/init";
+ symlink = "/bin/init";
+ }
+ ] ++ (pkgs2storeContents [ pkgs.stdenv ]);
+ };
+
+ boot.postBootCommands =
+ ''
+ # After booting, register the contents of the Nix store in the Nix
+ # database.
+ if [ -f /nix-path-registration ]; then
+ ${config.nix.package}/bin/nix-store --load-db < /nix-path-registration &&
+ rm /nix-path-registration
+ fi
+
+ # nixos-rebuild also requires a "system" profile and an
+ # /etc/NIXOS tag.
+ touch /etc/NIXOS
+ ${config.nix.package}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system
+
+ # Set virtualisation to docker
+ echo "docker" > /run/systemd/container
+ '';
+
+
+ # docker image config
+ require = [
+ ../installer/cd-dvd/channel.nix
+ ../profiles/minimal.nix
+ ../profiles/clone-config.nix
+ ];
+
+ boot.isContainer = true;
+
+ # Iptables do not work in docker
+ networking.firewall.enable = false;
+
+ services.openssh.enable = true;
+
+ # Socket activated ssh presents problem in docker
+ services.openssh.startWhenNeeded = false;
+
+ # Allow the user to login as root without password
+ security.initialRootPassword = "";
+
+ # Some more help text.
+ services.mingetty.helpLine =
+ ''
+
+ Log in as "root" with an empty password.
+ '';
+}
diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix
index a0aa6135326..1ce066cdc73 100644
--- a/nixos/modules/virtualisation/docker.nix
+++ b/nixos/modules/virtualisation/docker.nix
@@ -59,6 +59,7 @@ in
config = mkIf cfg.enable (mkMerge [
{ environment.systemPackages = [ pkgs.docker ];
+ users.extraGroups.docker.gid = config.ids.gids.docker;
}
(mkIf cfg.socketActivation {
diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix
index d7d700d8841..2d03f0544b6 100644
--- a/nixos/modules/virtualisation/libvirtd.nix
+++ b/nixos/modules/virtualisation/libvirtd.nix
@@ -7,6 +7,7 @@ with lib;
let
cfg = config.virtualisation.libvirtd;
+ vswitch = config.virtualisation.vswitch;
configFile = pkgs.writeText "libvirtd.conf" ''
unix_sock_group = "libvirtd"
unix_sock_rw_perms = "0770"
@@ -56,6 +57,20 @@ in
'';
};
+ virtualisation.libvirtd.onShutdown =
+ mkOption {
+ type = types.enum ["shutdown" "suspend" ];
+ default = "suspend";
+ description =
+ ''
+ When shutting down / restarting the host what method should
+ be used to gracefully halt the guests. Setting to "shutdown"
+ will cause an ACPI shutdown of each guest. "suspend" will
+ attempt to save the state of the guests ready to restore on boot.
+ '';
+ };
+
+
};
@@ -73,12 +88,17 @@ in
{ description = "Libvirt Virtual Machine Management Daemon";
wantedBy = [ "multi-user.target" ];
- after = [ "systemd-udev-settle.service" ];
+ after = [ "systemd-udev-settle.service" ]
+ ++ optional vswitch.enable "vswitchd.service";
- path =
- [ pkgs.bridge_utils pkgs.dmidecode pkgs.dnsmasq
+ path = [
+ pkgs.bridge_utils
+ pkgs.dmidecode
+ pkgs.dnsmasq
pkgs.ebtables
- ] ++ optional cfg.enableKVM pkgs.qemu_kvm;
+ ]
+ ++ optional cfg.enableKVM pkgs.qemu_kvm
+ ++ optional vswitch.enable vswitch.package;
preStart =
''
@@ -109,12 +129,12 @@ in
# config file. But this path can unfortunately be garbage collected
# while still being used by the virtual machine. So update the
# emulator path on each startup to something valid (re-scan $PATH).
- for file in /etc/libvirt/qemu/*.xml; do
+ for file in /etc/libvirt/qemu/*.xml /etc/libvirt/lxc/*.xml; do
test -f "$file" || continue
# get (old) emulator path from config file
emulator=$(grep "^[[:space:]]*" "$file" | sed 's,^[[:space:]]*\(.*\).*,\1,')
# get a (definitely) working emulator path by re-scanning $PATH
- new_emulator=$(command -v $(basename "$emulator"))
+ new_emulator=$(PATH=${pkgs.libvirt}/libexec:$PATH command -v $(basename "$emulator"))
# write back
sed -i "s,^[[:space:]]*.*, $new_emulator ," "$file"
done
@@ -152,7 +172,12 @@ in
${pkgs.libvirt}/etc/rc.d/init.d/libvirt-guests start || true
'';
- postStop = "${pkgs.libvirt}/etc/rc.d/init.d/libvirt-guests stop";
+ postStop =
+ ''
+ export PATH=${pkgs.gettext}/bin:$PATH
+ export ON_SHUTDOWN=${cfg.onShutdown}
+ ${pkgs.libvirt}/etc/rc.d/init.d/libvirt-guests stop
+ '';
serviceConfig.Type = "oneshot";
serviceConfig.RemainAfterExit = true;
diff --git a/nixos/modules/virtualisation/nixos-container.pl b/nixos/modules/virtualisation/nixos-container.pl
index bf6f16fc6c7..9ae5331786c 100644
--- a/nixos/modules/virtualisation/nixos-container.pl
+++ b/nixos/modules/virtualisation/nixos-container.pl
@@ -7,7 +7,7 @@ use File::Slurp;
use Fcntl ':flock';
use Getopt::Long qw(:config gnu_getopt);
-my $socat = '@socat@/bin/socat';
+my $nsenter = "@utillinux@/bin/nsenter";
# Ensure a consistent umask.
umask 0022;
@@ -25,7 +25,6 @@ Usage: nixos-container list
nixos-container login
nixos-container root-login
nixos-container run -- args...
- nixos-container set-root-password
nixos-container show-ip
nixos-container show-host-key
EOF
@@ -186,15 +185,48 @@ sub stopContainer {
or die "$0: failed to stop container\n";
}
+# Return the PID of the init process of the container.
+sub getLeader {
+ my $s = `machinectl show "$containerName" -p Leader`;
+ chomp $s;
+ $s =~ /^Leader=(\d+)$/ or die "unable to get container's main PID\n";
+ return int($1);
+}
+
+# Run a command in the container.
+sub runInContainer {
+ my @args = @_;
+ my $leader = getLeader;
+ exec($nsenter, "-t", $leader, "-m", "-u", "-i", "-n", "-p", "--", @args);
+ die "cannot run ‘nsenter’: $!\n";
+}
+
+# Remove a directory while recursively unmounting all mounted filesystems within
+# that directory and unmounting/removing that directory afterwards as well.
+#
+# NOTE: If the specified path is a mountpoint, its contents will be removed,
+# only mountpoints underneath that path will be unmounted properly.
+sub safeRemoveTree {
+ my ($path) = @_;
+ system("find", $path, "-mindepth", "1", "-xdev",
+ "(", "-type", "d", "-exec", "mountpoint", "-q", "{}", ";", ")",
+ "-exec", "umount", "-fR", "{}", "+");
+ system("rm", "--one-file-system", "-rf", $path);
+ if (-e $path) {
+ system("umount", "-fR", $path);
+ system("rm", "--one-file-system", "-rf", $path);
+ }
+}
+
if ($action eq "destroy") {
die "$0: cannot destroy declarative container (remove it from your configuration.nix instead)\n"
unless POSIX::access($confFile, &POSIX::W_OK);
stopContainer if isContainerRunning;
- rmtree($profileDir) if -e $profileDir;
- rmtree($gcRootsDir) if -e $gcRootsDir;
- rmtree($root) if -e $root;
+ safeRemoveTree($profileDir) if -e $profileDir;
+ safeRemoveTree($gcRootsDir) if -e $gcRootsDir;
+ safeRemoveTree($root) if -e $root;
unlink($confFile) or die;
}
@@ -235,28 +267,14 @@ elsif ($action eq "login") {
}
elsif ($action eq "root-login") {
- exec($socat, "unix:$root/var/lib/root-login.socket", "-,echo=0,raw");
+ runInContainer("su", "root", "-l");
}
elsif ($action eq "run") {
shift @ARGV; shift @ARGV;
- my $pid = open(SOCAT, "|-", $socat, "-t0", "-", "unix:$root/var/lib/run-command.socket") or die "$0: cannot start $socat: $!\n";
- print SOCAT join(' ', map { "'$_'" } @ARGV), "\n";
- flush SOCAT;
- waitpid($pid, 0);
- close(SOCAT);
-}
-
-elsif ($action eq "set-root-password") {
- # FIXME: don't get password from the command line.
- my $password = $ARGV[2] or die "$0: no password given\n";
- my $pid = open(SOCAT, "|-", $socat, "-t0", "-", "unix:$root/var/lib/run-command.socket") or die "$0: cannot start $socat: $!\n";
- print SOCAT "passwd\n";
- print SOCAT "$password\n";
- print SOCAT "$password\n";
- flush SOCAT;
- waitpid($pid, 0);
- close(SOCAT);
+ # Escape command.
+ my $s = join(' ', map { s/'/'\\''/g; "'$_'" } @ARGV);
+ runInContainer("su", "root", "-l", "-c", "exec " . $s);
}
elsif ($action eq "show-ip") {
diff --git a/nixos/modules/virtualisation/openvswitch.nix b/nixos/modules/virtualisation/openvswitch.nix
new file mode 100644
index 00000000000..c1579d94657
--- /dev/null
+++ b/nixos/modules/virtualisation/openvswitch.nix
@@ -0,0 +1,117 @@
+# Systemd services for openvswitch
+
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.virtualisation.vswitch;
+
+in
+
+{
+
+ options = {
+
+ virtualisation.vswitch.enable = mkOption {
+ type = types.bool;
+ default = false;
+ description =
+ ''
+ Enable Open vSwitch. A configuration
+ daemon (ovs-server) will be started.
+ '';
+ };
+
+
+ virtualisation.vswitch.package = mkOption {
+ type = types.package;
+ default = pkgs.openvswitch;
+ description =
+ ''
+ Open vSwitch package to use.
+ '';
+ };
+
+ };
+
+ config = mkIf cfg.enable (let
+
+ # Where the communication sockets live
+ runDir = "/var/run/openvswitch";
+
+ # 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
+ db = pkgs.stdenv.mkDerivation {
+ name = "vswitch.db";
+ unpackPhase = "true";
+ buildPhase = "true";
+ buildInputs = with pkgs; [
+ cfg.package
+ ];
+ installPhase =
+ ''
+ ensureDir $out/
+ '';
+ };
+
+ in {
+
+ environment.systemPackages = [ cfg.package ];
+
+ boot.kernelModules = [ "tun" "openvswitch" ];
+
+ boot.extraModulePackages = [ cfg.package ];
+
+ systemd.services.ovsdb = {
+ description = "Open_vSwitch Database Server";
+ wantedBy = [ "multi-user.target" ];
+ after = [ "systemd-udev-settle.service" ];
+ wants = [ "vswitchd.service" ];
+ path = [ cfg.package ];
+ restartTriggers = [ db cfg.package ];
+ # Create the config database
+ preStart =
+ ''
+ mkdir -p ${runDir}
+ mkdir -p /var/db/openvswitch
+ chmod +w /var/db/openvswitch
+ if [[ ! -e /var/db/openvswitch/conf.db ]]; then
+ ${cfg.package}/bin/ovsdb-tool create \
+ "/var/db/openvswitch/conf.db" \
+ "${cfg.package}/share/openvswitch/vswitch.ovsschema"
+ 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 =
+ ''
+ ${cfg.package}/bin/ovs-vsctl --timeout 3 --retry --no-wait init
+ '';
+
+ };
+
+ systemd.services.vswitchd = {
+ description = "Open_vSwitch Daemon";
+ bindsTo = [ "ovsdb.service" ];
+ after = [ "ovsdb.service" ];
+ path = [ cfg.package ];
+ serviceConfig.ExecStart = ''${cfg.package}/bin/ovs-vswitchd'';
+ };
+
+ });
+
+}
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 58386ce5cf5..33f48d65d43 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -278,7 +278,7 @@ in
boot.initrd.extraUtilsCommands =
''
# We need mke2fs in the initrd.
- cp -f ${pkgs.e2fsprogs}/sbin/mke2fs $out/bin
+ cp -vf --remove-destination ${pkgs.e2fsprogs}/sbin/mke2fs $out/bin
'';
boot.initrd.postDeviceCommands =
diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index dae3b9210a8..ca7ca2afb65 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -1,3 +1,7 @@
+# This jobset defines the main NixOS channels (such as nixos-unstable
+# and nixos-14.04). The channel is updated every time the ‘tested’ job
+# succeeds, and all other jobs have finished (they may fail).
+
{ nixpkgs ? { outPath = ./..; revCount = 56789; shortRev = "gfedcba"; }
, stableBranch ? false
, supportedSystems ? [ "x86_64-linux" "i686-linux" ]
@@ -18,7 +22,7 @@ let
in rec {
nixos = removeMaintainers (import ./release.nix {
- inherit stableBranch;
+ inherit stableBranch supportedSystems;
nixpkgs = nixpkgsSrc;
});
@@ -30,12 +34,13 @@ in rec {
tested = pkgs.releaseTools.aggregate {
name = "nixos-${nixos.channel.version}";
meta = {
- description = "Release-critical builds for the NixOS unstable channel";
- maintainers = [ pkgs.lib.maintainers.eelco pkgs.lib.maintainers.shlevy ];
+ description = "Release-critical builds for the NixOS channel";
+ maintainers = [ pkgs.lib.maintainers.eelco ];
};
constituents =
- let all = x: [ x.x86_64-linux x.i686-linux ]; in
+ let all = x: map (system: x.${system}) supportedSystems; in
[ nixos.channel
+ (all nixos.dummy)
(all nixos.manual)
(all nixos.iso_minimal)
@@ -52,11 +57,17 @@ in rec {
(all nixos.tests.installer.lvm)
(all nixos.tests.installer.separateBoot)
(all nixos.tests.installer.simple)
+ (all nixos.tests.installer.simpleLabels)
+ (all nixos.tests.installer.simpleProvided)
+ (all nixos.tests.installer.btrfsSimple)
+ (all nixos.tests.installer.btrfsSubvols)
+ (all nixos.tests.installer.btrfsSubvolDefault)
(all nixos.tests.ipv6)
(all nixos.tests.kde4)
(all nixos.tests.login)
(all nixos.tests.misc)
- (all nixos.tests.nat)
+ (all nixos.tests.nat.firewall)
+ (all nixos.tests.nat.standalone)
(all nixos.tests.nfs3)
(all nixos.tests.openssh)
(all nixos.tests.printing)
diff --git a/nixos/release.nix b/nixos/release.nix
index 0620b46d46a..7337ad7e3f4 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -11,7 +11,9 @@ let
forAllSystems = pkgs.lib.genAttrs supportedSystems;
- callTest = fn: args: forAllSystems (system: import fn ({ inherit system; } // args));
+ scrubDrv = drv: let res = { inherit (drv) drvPath outPath type name system meta; outputName = "out"; out = res; }; in res;
+
+ callTest = fn: args: forAllSystems (system: scrubDrv (import fn ({ inherit system; } // args)));
pkgs = import nixpkgs { system = "x86_64-linux"; };
@@ -40,7 +42,7 @@ let
in
# Declare the ISO as a build product so that it shows up in Hydra.
- runCommand "nixos-iso-${config.system.nixosVersion}"
+ scrubDrv (runCommand "nixos-iso-${config.system.nixosVersion}"
{ meta = {
description = "NixOS installation CD (${description}) - ISO image for ${system}";
maintainers = map (x: lib.getAttr x lib.maintainers) maintainers;
@@ -51,7 +53,7 @@ let
''
mkdir -p $out/nix-support
echo "file iso" $iso/iso/*.iso* >> $out/nix-support/hydra-build-products
- ''; # */
+ ''); # */
makeSystemTarball =
@@ -78,14 +80,17 @@ let
};
- makeClosure = module: forAllSystems (system: (import ./lib/eval-config.nix {
+ makeClosure = module: buildFromConfig module (config: config.system.build.toplevel);
+
+
+ buildFromConfig = module: sel: forAllSystems (system: scrubDrv (sel (import ./lib/eval-config.nix {
inherit system;
- modules = [ module ] ++ lib.singleton
+ modules = [ module versionModule ] ++ lib.singleton
({ config, lib, ... }:
{ fileSystems."/".device = lib.mkDefault "/dev/sda1";
boot.loader.grub.device = lib.mkDefault "/dev/sda";
});
- }).config.system.build.toplevel);
+ }).config));
in rec {
@@ -122,9 +127,9 @@ in rec {
};
- manual = forAllSystems (system: (builtins.getAttr system iso_minimal).config.system.build.manual.manual);
- manualPDF = iso_minimal.x86_64-linux.config.system.build.manual.manualPDF;
- manpages = forAllSystems (system: (builtins.getAttr system iso_minimal).config.system.build.manual.manpages);
+ manual = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manual);
+ manualPDF = (buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manualPDF)).x86_64-linux;
+ manpages = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manpages);
iso_minimal = forAllSystems (system: makeIso {
@@ -147,12 +152,6 @@ in rec {
inherit system;
});
- iso_graphical_new_kernel = forAllSystems (system: makeIso {
- module = ./modules/installer/cd-dvd/installation-cd-graphical-new-kernel.nix;
- type = "graphical-new-kernel";
- inherit system;
- });
-
# A bootable VirtualBox virtual appliance as an OVA file (i.e. packaged OVF).
ova = forAllSystems (system:
@@ -171,7 +170,7 @@ in rec {
in
# Declare the OVA as a build product so that it shows up in Hydra.
- runCommand "nixos-ova-${config.system.nixosVersion}-${system}"
+ scrubDrv (runCommand "nixos-ova-${config.system.nixosVersion}-${system}"
{ meta = {
description = "NixOS VirtualBox appliance (${system})";
maintainers = lib.maintainers.eelco;
@@ -182,11 +181,21 @@ in rec {
mkdir -p $out/nix-support
fn=$(echo $ova/*.ova)
echo "file ova $fn" >> $out/nix-support/hydra-build-products
- '' # */
+ '') # */
);
+ # Ensure that all packages used by the minimal NixOS config end up in the channel.
+ dummy = forAllSystems (system: pkgs.runCommand "dummy"
+ { propagatedBuildInputs = (import lib/eval-config.nix {
+ inherit system;
+ modules = lib.singleton ({ config, pkgs, ... }: { });
+ }).config.environment.systemPackages;
+ }
+ "mkdir $out; fixupPhase");
+
+
# Provide a tarball that can be unpacked into an SD card, and easily
# boot that system from uboot (like for the sheevaplug).
# The pc variant helps preparing the expression for the system tarball
@@ -222,26 +231,33 @@ in rec {
tests.firefox = callTest tests/firefox.nix {};
tests.firewall = callTest tests/firewall.nix {};
tests.gnome3 = callTest tests/gnome3.nix {};
- tests.installer.efi = forAllSystems (system: (import tests/installer.nix { inherit system; }).efi.test);
- tests.installer.grub1 = forAllSystems (system: (import tests/installer.nix { inherit system; }).grub1.test);
- tests.installer.lvm = forAllSystems (system: (import tests/installer.nix { inherit system; }).lvm.test);
- tests.installer.rebuildCD = forAllSystems (system: (import tests/installer.nix { inherit system; }).rebuildCD.test);
- tests.installer.separateBoot = forAllSystems (system: (import tests/installer.nix { inherit system; }).separateBoot.test);
- tests.installer.simple = forAllSystems (system: (import tests/installer.nix { inherit system; }).simple.test);
+ tests.installer.efi = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).efi.test);
+ tests.installer.grub1 = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).grub1.test);
+ tests.installer.lvm = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).lvm.test);
+ tests.installer.rebuildCD = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).rebuildCD.test);
+ tests.installer.separateBoot = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).separateBoot.test);
+ tests.installer.simple = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).simple.test);
+ tests.installer.simpleLabels = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).simpleLabels.test);
+ tests.installer.simpleProvided = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).simpleProvided.test);
+ tests.installer.btrfsSimple = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).btrfsSimple.test);
+ tests.installer.btrfsSubvols = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).btrfsSubvols.test);
+ tests.installer.btrfsSubvolDefault = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).btrfsSubvolDefault.test);
tests.influxdb = callTest tests/influxdb.nix {};
tests.ipv6 = callTest tests/ipv6.nix {};
tests.jenkins = callTest tests/jenkins.nix {};
tests.kde4 = callTest tests/kde4.nix {};
tests.latestKernel.login = callTest tests/login.nix { latestKernel = true; };
tests.login = callTest tests/login.nix {};
- tests.logstash = callTest tests/logstash.nix {};
+ #tests.logstash = callTest tests/logstash.nix {};
tests.misc = callTest tests/misc.nix {};
tests.mumble = callTest tests/mumble.nix {};
tests.munin = callTest tests/munin.nix {};
tests.mysql = callTest tests/mysql.nix {};
tests.mysqlReplication = callTest tests/mysql-replication.nix {};
- tests.nat = callTest tests/nat.nix {};
+ tests.nat.firewall = callTest tests/nat.nix { withFirewall = true; };
+ tests.nat.standalone = callTest tests/nat.nix { withFirewall = false; };
tests.nfs3 = callTest tests/nfs.nix { version = 3; };
+ tests.nsd = callTest tests/nsd.nix {};
tests.openssh = callTest tests/openssh.nix {};
tests.printing = callTest tests/printing.nix {};
tests.proxy = callTest tests/proxy.nix {};
diff --git a/nixos/tests/bittorrent.nix b/nixos/tests/bittorrent.nix
index 002e012f65f..c4a00ee507b 100644
--- a/nixos/tests/bittorrent.nix
+++ b/nixos/tests/bittorrent.nix
@@ -16,7 +16,7 @@ let
miniupnpdConf = nodes: pkgs.writeText "miniupnpd.conf"
''
ext_ifname=eth1
- listening_ip=${nodes.router.config.networking.interfaces.eth2.ipAddress}/24
+ listening_ip=${(pkgs.lib.head nodes.router.config.networking.interfaces.eth2.ip4).address}/24
allow 1024-65535 192.168.2.0/24 1024-65535
'';
@@ -28,7 +28,7 @@ in
nodes =
{ tracker =
{ config, pkgs, ... }:
- { environment.systemPackages = [ pkgs.transmission pkgs.bittorrent ];
+ { environment.systemPackages = [ pkgs.transmission ];
# We need Apache on the tracker to serve the torrents.
services.httpd.enable = true;
@@ -53,7 +53,7 @@ in
{ environment.systemPackages = [ pkgs.transmission ];
virtualisation.vlans = [ 2 ];
networking.defaultGateway =
- nodes.router.config.networking.interfaces.eth2.ipAddress;
+ (pkgs.lib.head nodes.router.config.networking.interfaces.eth2.ip4).address;
networking.firewall.enable = false;
};
@@ -81,7 +81,7 @@ in
# Create the torrent.
$tracker->succeed("mkdir /tmp/data");
$tracker->succeed("cp ${file} /tmp/data/test.tar.bz2");
- $tracker->succeed("transmission-create /tmp/data/test.tar.bz2 -t http://${nodes.tracker.config.networking.interfaces.eth1.ipAddress}:6969/announce -o /tmp/test.torrent");
+ $tracker->succeed("transmission-create /tmp/data/test.tar.bz2 -t http://${(pkgs.lib.head nodes.tracker.config.networking.interfaces.eth1.ip4).address}:6969/announce -o /tmp/test.torrent");
$tracker->succeed("chmod 644 /tmp/test.torrent");
# Start the tracker. !!! use a less crappy tracker
diff --git a/nixos/tests/common/user-account.nix b/nixos/tests/common/user-account.nix
index 0239a3c4d08..aa3a0b82bcd 100644
--- a/nixos/tests/common/user-account.nix
+++ b/nixos/tests/common/user-account.nix
@@ -1,11 +1,9 @@
{ pkgs, ... }:
{ users.extraUsers = pkgs.lib.singleton
- { name = "alice";
+ { isNormalUser = true;
+ name = "alice";
description = "Alice Foobar";
- home = "/home/alice";
- createHome = true;
- useDefaultShell = true;
password = "foobar";
uid = 1000;
};
diff --git a/nixos/tests/containers.nix b/nixos/tests/containers.nix
index a582e23fda0..331324139a1 100644
--- a/nixos/tests/containers.nix
+++ b/nixos/tests/containers.nix
@@ -56,23 +56,52 @@ import ./make-test.nix {
die if $id1 eq $id2;
+ # Put the root of $id2 into a bind mount.
+ $machine->succeed(
+ "mv /var/lib/containers/$id2 /id2-bindmount",
+ "mount --bind /id2-bindmount /var/lib/containers/$id1"
+ );
+
my $ip1 = $machine->succeed("nixos-container show-ip $id1");
chomp $ip1;
my $ip2 = $machine->succeed("nixos-container show-ip $id2");
chomp $ip2;
die if $ip1 eq $ip2;
+ # Create a directory and a file we can later check if it still exists
+ # after destruction of the container.
+ $machine->succeed(
+ "mkdir /nested-bindmount",
+ "echo important data > /nested-bindmount/dummy",
+ );
+
+ # Create a directory with a dummy file and bind-mount it into both
+ # containers.
+ foreach ($id1, $id2) {
+ my $importantPath = "/var/lib/containers/$_/very/important/data";
+ $machine->succeed(
+ "mkdir -p $importantPath",
+ "mount --bind /nested-bindmount $importantPath"
+ );
+ }
+
# Start one of them.
$machine->succeed("nixos-container start $id1");
# Execute commands via the root shell.
$machine->succeed("nixos-container run $id1 -- uname") =~ /Linux/ or die;
- $machine->succeed("nixos-container set-root-password $id1 foobar");
# Destroy the containers.
$machine->succeed("nixos-container destroy $id1");
$machine->succeed("nixos-container destroy $id2");
+ $machine->succeed(
+ # Check whether destruction of any container has killed important data
+ "grep -qF 'important data' /nested-bindmount/dummy",
+ # Ensure that the container path is gone
+ "test ! -e /var/lib/containers/$id1"
+ );
+
# Destroying a declarative container should fail.
$machine->fail("nixos-container destroy webserver");
'';
diff --git a/nixos/tests/gnome3.nix b/nixos/tests/gnome3.nix
index 44668f57fc1..df30283e315 100644
--- a/nixos/tests/gnome3.nix
+++ b/nixos/tests/gnome3.nix
@@ -23,7 +23,7 @@ import ./make-test.nix {
$machine->succeed("su - alice -c 'DISPLAY=:0.0 gnome-terminal &'");
$machine->waitForWindow(qr/Terminal/);
- $machine->sleep(10);
+ $machine->sleep(20);
$machine->screenshot("screen");
'';
diff --git a/nixos/tests/gnome3_12.nix b/nixos/tests/gnome3_12.nix
index 439674b69d5..723d1bc4522 100644
--- a/nixos/tests/gnome3_12.nix
+++ b/nixos/tests/gnome3_12.nix
@@ -24,7 +24,7 @@ import ./make-test.nix {
$machine->succeed("su - alice -c 'DISPLAY=:0.0 gnome-terminal &'");
$machine->waitForWindow(qr/Terminal/);
- $machine->sleep(10);
+ $machine->sleep(20);
$machine->screenshot("screen");
'';
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 621afffbfc1..138a81ad807 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -6,13 +6,13 @@ with pkgs.lib;
let
- # Build the ISO. This is the regular installation CD but with test
- # instrumentation.
+ # Build the ISO. This is the regular minimal installation CD but
+ # with test instrumentation.
iso =
(import ../lib/eval-config.nix {
inherit system;
modules =
- [ ../modules/installer/cd-dvd/installation-cd-graphical.nix
+ [ ../modules/installer/cd-dvd/installation-cd-minimal.nix
../modules/testing/test-instrumentation.nix
{ key = "serial";
boot.loader.grub.timeout = mkOverride 0 0;
@@ -35,13 +35,15 @@ let
# The configuration to install.
- makeConfig = { testChannel, useEFI, grubVersion, grubDevice }: pkgs.writeText "configuration.nix"
- ''
+ makeConfig = { testChannel, useEFI, grubVersion, grubDevice, grubIdentifier
+ , readOnly ? true, forceGrubReinstallCount ? 0 }:
+ pkgs.writeText "configuration.nix" ''
{ config, pkgs, modulesPath, ... }:
{ imports =
[ ./hardware-configuration.nix
+
];
${if useEFI then ''
@@ -54,8 +56,13 @@ let
''}
boot.loader.grub.device = "${grubDevice}";
boot.loader.grub.extraConfig = "serial; terminal_output.serial";
+ boot.loader.grub.fsIdentifier = "${grubIdentifier}";
''}
+ boot.loader.grub.configurationLimit = 100 + ${toString forceGrubReinstallCount};
+
+ ${optionalString (!readOnly) "nix.readOnlyStore = false;"}
+
environment.systemPackages = [ ${optionalString testChannel "pkgs.rlwrap"} ];
}
'';
@@ -93,7 +100,7 @@ let
# disk, and then reboot from the hard disk. It's parameterized with
# a test script fragment `createPartitions', which must create
# partitions and filesystems.
- testScriptFun = { createPartitions, testChannel, useEFI, grubVersion, grubDevice }:
+ testScriptFun = { createPartitions, testChannel, useEFI, grubVersion, grubDevice, grubIdentifier }:
let
# FIXME: OVMF doesn't boot from virtio http://www.mail-archive.com/edk2-devel@lists.sourceforge.net/msg01501.html
iface = if useEFI || grubVersion == 1 then "scsi" else "virtio";
@@ -161,7 +168,7 @@ let
$machine->succeed("cat /mnt/etc/nixos/hardware-configuration.nix >&2");
$machine->copyFileFromHost(
- "${ makeConfig { inherit testChannel useEFI grubVersion grubDevice; } }",
+ "${ makeConfig { inherit testChannel useEFI grubVersion grubDevice grubIdentifier; } }",
"/mnt/etc/nixos/configuration.nix");
# Perform the installation.
@@ -197,16 +204,30 @@ let
$machine->succeed("type -tP ls | tee /dev/stderr") =~ /.nix-profile/
or die "nix-env failed";
+ # We need to a writable nix-store on next boot
+ $machine->copyFileFromHost(
+ "${ makeConfig { inherit testChannel useEFI grubVersion grubDevice grubIdentifier; readOnly = false; forceGrubReinstallCount = 1; } }",
+ "/etc/nixos/configuration.nix");
+
# Check whether nixos-rebuild works.
$machine->succeed("nixos-rebuild switch >&2");
# Test nixos-option.
$machine->succeed("nixos-option boot.initrd.kernelModules | grep virtio_console");
- $machine->succeed("nixos-option -d boot.initrd.kernelModules | grep 'List of modules'");
- $machine->succeed("nixos-option -l boot.initrd.kernelModules | grep qemu-guest.nix");
+ $machine->succeed("nixos-option boot.initrd.kernelModules | grep 'List of modules'");
+ $machine->succeed("nixos-option boot.initrd.kernelModules | grep qemu-guest.nix");
$machine->shutdown;
+ # Check whether a writable store build works
+ $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}" });
+ $machine->waitForUnit("multi-user.target");
+ $machine->copyFileFromHost(
+ "${ makeConfig { inherit testChannel useEFI grubVersion grubDevice grubIdentifier; readOnly = false; forceGrubReinstallCount = 2; } }",
+ "/etc/nixos/configuration.nix");
+ $machine->succeed("nixos-rebuild boot >&2");
+ $machine->shutdown;
+
# And just to be sure, check that the machine still boots after
# "nixos-rebuild switch".
$machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}" });
@@ -216,13 +237,13 @@ let
makeInstallerTest = name:
- { createPartitions, testChannel ? false, useEFI ? false, grubVersion ? 2, grubDevice ? "/dev/vda" }:
+ { createPartitions, testChannel ? false, useEFI ? false, grubVersion ? 2, grubDevice ? "/dev/vda", grubIdentifier ? "uuid" }:
makeTest {
inherit iso;
name = "installer-" + name;
nodes = if testChannel then { inherit webserver; } else { };
testScript = testScriptFun {
- inherit createPartitions testChannel useEFI grubVersion grubDevice;
+ inherit createPartitions testChannel useEFI grubVersion grubDevice grubIdentifier;
};
};
@@ -394,4 +415,103 @@ in {
$machine->shutdown;
'';
};
+
+ # Test using labels to identify volumes in grub
+ simpleLabels = makeInstallerTest "simpleLabels" {
+ createPartitions = ''
+ $machine->succeed(
+ "sgdisk -Z /dev/vda",
+ "sgdisk -n 1:0:+1M -n 2:0:+1G -N 3 -t 1:ef02 -t 2:8200 -t 3:8300 -c 3:root /dev/vda",
+ "mkswap /dev/vda2 -L swap",
+ "swapon -L swap",
+ "mkfs.ext4 -L root /dev/vda3",
+ "mount LABEL=root /mnt",
+ );
+ '';
+ grubIdentifier = "label";
+ };
+
+ # Test using the provided disk name within grub
+ # TODO: Fix udev so the symlinks are unneeded in /dev/disks
+ simpleProvided = makeInstallerTest "simpleProvided" {
+ createPartitions = ''
+ my $UUID = "\$(blkid -s UUID -o value /dev/vda2)";
+ $machine->succeed(
+ "sgdisk -Z /dev/vda",
+ "sgdisk -n 1:0:+1M -n 2:0:+100M -n 3:0:+1G -N 4 -t 1:ef02 -t 2:8300 -t 3:8200 -t 4:8300 -c 2:boot -c 4:root /dev/vda",
+ "mkswap /dev/vda3 -L swap",
+ "swapon -L swap",
+ "mkfs.ext4 -L boot /dev/vda2",
+ "mkfs.ext4 -L root /dev/vda4",
+ );
+ $machine->execute("ln -s ../../vda2 /dev/disk/by-uuid/$UUID");
+ $machine->execute("ln -s ../../vda4 /dev/disk/by-label/root");
+ $machine->succeed(
+ "mount /dev/disk/by-label/root /mnt",
+ "mkdir /mnt/boot",
+ "mount /dev/disk/by-uuid/$UUID /mnt/boot"
+ );
+ '';
+ grubIdentifier = "provided";
+ };
+
+ # Simple btrfs grub testing
+ btrfsSimple = makeInstallerTest "btrfsSimple" {
+ createPartitions = ''
+ $machine->succeed(
+ "sgdisk -Z /dev/vda",
+ "sgdisk -n 1:0:+1M -n 2:0:+1G -N 3 -t 1:ef02 -t 2:8200 -t 3:8300 -c 3:root /dev/vda",
+ "mkswap /dev/vda2 -L swap",
+ "swapon -L swap",
+ "mkfs.btrfs -L root /dev/vda3",
+ "mount LABEL=root /mnt",
+ );
+ '';
+ };
+
+ # Test to see if we can detect /boot and /nix on subvolumes
+ btrfsSubvols = makeInstallerTest "btrfsSubvols" {
+ createPartitions = ''
+ $machine->succeed(
+ "sgdisk -Z /dev/vda",
+ "sgdisk -n 1:0:+1M -n 2:0:+1G -N 3 -t 1:ef02 -t 2:8200 -t 3:8300 -c 3:root /dev/vda",
+ "mkswap /dev/vda2 -L swap",
+ "swapon -L swap",
+ "mkfs.btrfs -L root /dev/vda3",
+ "btrfs device scan",
+ "mount LABEL=root /mnt",
+ "btrfs subvol create /mnt/boot",
+ "btrfs subvol create /mnt/nixos",
+ "btrfs subvol create /mnt/nixos/default",
+ "umount /mnt",
+ "mount -o defaults,subvol=nixos/default LABEL=root /mnt",
+ "mkdir /mnt/boot",
+ "mount -o defaults,subvol=boot LABEL=root /mnt/boot",
+ );
+ '';
+ };
+
+ # Test to see if we can detect default and aux subvolumes correctly
+ btrfsSubvolDefault = makeInstallerTest "btrfsSubvolDefault" {
+ createPartitions = ''
+ $machine->succeed(
+ "sgdisk -Z /dev/vda",
+ "sgdisk -n 1:0:+1M -n 2:0:+1G -N 3 -t 1:ef02 -t 2:8200 -t 3:8300 -c 3:root /dev/vda",
+ "mkswap /dev/vda2 -L swap",
+ "swapon -L swap",
+ "mkfs.btrfs -L root /dev/vda3",
+ "btrfs device scan",
+ "mount LABEL=root /mnt",
+ "btrfs subvol create /mnt/badpath",
+ "btrfs subvol create /mnt/badpath/boot",
+ "btrfs subvol create /mnt/nixos",
+ "btrfs subvol set-default \$(btrfs subvol list /mnt | grep 'nixos' | awk '{print \$2}') /mnt",
+ "umount /mnt",
+ "mount -o defaults LABEL=root /mnt",
+ "mkdir -p /mnt/badpath/boot", # Help ensure the detection mechanism is actually looking up subvolumes
+ "mkdir /mnt/boot",
+ "mount -o defaults,subvol=badpath/boot LABEL=root /mnt/boot",
+ );
+ '';
+ };
}
diff --git a/nixos/tests/jenkins.nix b/nixos/tests/jenkins.nix
index 28027c294bc..3f4a197ebcc 100644
--- a/nixos/tests/jenkins.nix
+++ b/nixos/tests/jenkins.nix
@@ -16,6 +16,8 @@ import ./make-test.nix {
services.jenkinsSlave.enable = true;
users.extraUsers.jenkins.extraGroups = [ "users" ];
+
+ systemd.services.jenkins.serviceConfig.TimeoutStartSec = "3min";
};
slave =
diff --git a/nixos/tests/kde4.nix b/nixos/tests/kde4.nix
index 90c37397821..fcc5101feb3 100644
--- a/nixos/tests/kde4.nix
+++ b/nixos/tests/kde4.nix
@@ -32,7 +32,7 @@ import ./make-test.nix ({ pkgs, ... }: {
pkgs.kde4.kdegraphics
pkgs.kde4.kdeutils
pkgs.kde4.kdegames
- pkgs.kde4.kdeedu
+ #pkgs.kde4.kdeedu
pkgs.kde4.kdeaccessibility
pkgs.kde4.kdeadmin
pkgs.kde4.kdenetwork
diff --git a/nixos/tests/munin.nix b/nixos/tests/munin.nix
index 31676c10df1..1e51453df83 100644
--- a/nixos/tests/munin.nix
+++ b/nixos/tests/munin.nix
@@ -18,6 +18,7 @@ import ./make-test.nix {
'';
};
};
+ systemd.services.munin-node.serviceConfig.TimeoutStartSec = "3min";
};
};
diff --git a/nixos/tests/nat.nix b/nixos/tests/nat.nix
index 5fdcc0e97ca..c4d2614f785 100644
--- a/nixos/tests/nat.nix
+++ b/nixos/tests/nat.nix
@@ -3,77 +3,81 @@
# client on the inside network, a server on the outside network, and a
# router connected to both that performs Network Address Translation
# for the client.
+import ./make-test.nix ({ withFirewall, ... }:
+ let
+ unit = if withFirewall then "firewall" else "nat";
+ in
+ {
+ name = "nat${if withFirewall then "WithFirewall" else "Standalone"}";
-import ./make-test.nix {
- name = "nat";
+ nodes =
+ { client =
+ { config, pkgs, nodes, ... }:
+ { virtualisation.vlans = [ 1 ];
+ networking.firewall.allowPing = true;
+ networking.defaultGateway =
+ (pkgs.lib.head nodes.router.config.networking.interfaces.eth2.ip4).address;
+ };
- nodes =
- { client =
- { config, pkgs, nodes, ... }:
- { virtualisation.vlans = [ 1 ];
- networking.firewall.allowPing = true;
- networking.defaultGateway =
- nodes.router.config.networking.interfaces.eth2.ipAddress;
- };
+ router =
+ { config, pkgs, ... }:
+ { virtualisation.vlans = [ 2 1 ];
+ networking.firewall.enable = withFirewall;
+ networking.firewall.allowPing = true;
+ networking.nat.enable = true;
+ networking.nat.internalIPs = [ "192.168.1.0/24" ];
+ networking.nat.externalInterface = "eth1";
+ };
- router =
- { config, pkgs, ... }:
- { virtualisation.vlans = [ 2 1 ];
- networking.firewall.allowPing = true;
- networking.nat.enable = true;
- networking.nat.internalIPs = [ "192.168.1.0/24" ];
- networking.nat.externalInterface = "eth1";
- };
+ server =
+ { config, pkgs, ... }:
+ { virtualisation.vlans = [ 2 ];
+ networking.firewall.enable = false;
+ services.httpd.enable = true;
+ services.httpd.adminAddr = "foo@example.org";
+ services.vsftpd.enable = true;
+ services.vsftpd.anonymousUser = true;
+ };
+ };
- server =
- { config, pkgs, ... }:
- { virtualisation.vlans = [ 2 ];
- networking.firewall.enable = false;
- services.httpd.enable = true;
- services.httpd.adminAddr = "foo@example.org";
- services.vsftpd.enable = true;
- services.vsftpd.anonymousUser = true;
- };
- };
+ testScript =
+ { nodes, ... }:
+ ''
+ startAll;
- testScript =
- { nodes, ... }:
- ''
- startAll;
+ # The router should have access to the server.
+ $server->waitForUnit("network.target");
+ $server->waitForUnit("httpd");
+ $router->waitForUnit("network.target");
+ $router->succeed("curl --fail http://server/ >&2");
- # The router should have access to the server.
- $server->waitForUnit("network.target");
- $server->waitForUnit("httpd");
- $router->waitForUnit("network.target");
- $router->succeed("curl --fail http://server/ >&2");
+ # The client should be also able to connect via the NAT router.
+ $router->waitForUnit("${unit}");
+ $client->waitForUnit("network.target");
+ $client->succeed("curl --fail http://server/ >&2");
+ $client->succeed("ping -c 1 server >&2");
- # The client should be also able to connect via the NAT router.
- $router->waitForUnit("nat");
- $client->waitForUnit("network.target");
- $client->succeed("curl --fail http://server/ >&2");
- $client->succeed("ping -c 1 server >&2");
+ # Test whether passive FTP works.
+ $server->waitForUnit("vsftpd");
+ $server->succeed("echo Hello World > /home/ftp/foo.txt");
+ $client->succeed("curl -v ftp://server/foo.txt >&2");
- # Test whether passive FTP works.
- $server->waitForUnit("vsftpd");
- $server->succeed("echo Hello World > /home/ftp/foo.txt");
- $client->succeed("curl -v ftp://server/foo.txt >&2");
+ # Test whether active FTP works.
+ $client->succeed("curl -v -P - ftp://server/foo.txt >&2");
- # Test whether active FTP works.
- $client->succeed("curl -v -P - ftp://server/foo.txt >&2");
+ # Test ICMP.
+ $client->succeed("ping -c 1 router >&2");
+ $router->succeed("ping -c 1 client >&2");
- # Test ICMP.
- $client->succeed("ping -c 1 router >&2");
- $router->succeed("ping -c 1 client >&2");
+ # If we turn off NAT, the client shouldn't be able to reach the server.
+ $router->succeed("iptables -t nat -D PREROUTING -j nixos-nat-pre");
+ $router->succeed("iptables -t nat -D POSTROUTING -j nixos-nat-post");
+ $client->fail("curl --fail --connect-timeout 5 http://server/ >&2");
+ $client->fail("ping -c 1 server >&2");
- # If we turn off NAT, the client shouldn't be able to reach the server.
- $router->stopJob("nat");
- $client->fail("curl --fail --connect-timeout 5 http://server/ >&2");
- $client->fail("ping -c 1 server >&2");
-
- # And make sure that restarting the NAT job works.
- $router->succeed("systemctl start nat");
- $client->succeed("curl --fail http://server/ >&2");
- $client->succeed("ping -c 1 server >&2");
- '';
-
-}
+ # And make sure that reloading the NAT job works.
+ $router->succeed("systemctl restart ${unit}");
+ $client->succeed("curl --fail http://server/ >&2");
+ $client->succeed("ping -c 1 server >&2");
+ '';
+ })
diff --git a/nixos/tests/nsd.nix b/nixos/tests/nsd.nix
new file mode 100644
index 00000000000..c2331931cdd
--- /dev/null
+++ b/nixos/tests/nsd.nix
@@ -0,0 +1,83 @@
+let
+ common = { pkgs, ... }: {
+ networking.firewall.enable = false;
+ networking.useDHCP = false;
+ # for a host utility with IPv6 support
+ environment.systemPackages = [ pkgs.bind ];
+ };
+in import ./make-test.nix {
+ name = "nsd";
+
+ nodes = {
+ clientv4 = { lib, nodes, ... }: {
+ imports = [ common ];
+ networking.nameservers = lib.mkForce [
+ nodes.server.config.networking.interfaces.eth1.ipAddress
+ ];
+ networking.interfaces.eth1.ipAddress = "192.168.0.2";
+ networking.interfaces.eth1.prefixLength = 24;
+ };
+
+ clientv6 = { lib, nodes, ... }: {
+ imports = [ common ];
+ networking.nameservers = lib.mkForce [
+ nodes.server.config.networking.interfaces.eth1.ipv6Address
+ ];
+ networking.interfaces.eth1.ipv6Address = "dead:beef::2";
+ };
+
+ server = { lib, ... }: {
+ imports = [ common ];
+ networking.interfaces.eth1.ipAddress = "192.168.0.1";
+ networking.interfaces.eth1.prefixLength = 24;
+ networking.interfaces.eth1.ipv6Address = "dead:beef::1";
+ services.nsd.enable = true;
+ services.nsd.interfaces = lib.mkForce [];
+ services.nsd.zones."example.com.".data = ''
+ @ SOA ns.example.com noc.example.com 666 7200 3600 1209600 3600
+ ipv4 A 1.2.3.4
+ ipv6 AAAA abcd::eeff
+ deleg NS ns.example.com
+ ns A 192.168.0.1
+ ns AAAA dead:beef::1
+ '';
+ services.nsd.zones."deleg.example.com.".data = ''
+ @ SOA ns.example.com noc.example.com 666 7200 3600 1209600 3600
+ @ A 9.8.7.6
+ @ AAAA fedc::bbaa
+ '';
+ };
+ };
+
+ testScript = ''
+ startAll;
+
+ $clientv4->waitForUnit("network.target");
+ $clientv6->waitForUnit("network.target");
+ $server->waitForUnit("nsd.service");
+
+ sub assertHost {
+ my ($type, $rr, $query, $expected) = @_;
+ my $self = $type eq 4 ? $clientv4 : $clientv6;
+ my $out = $self->succeed("host -$type -t $rr $query");
+ $self->log("output: $out");
+ chomp $out;
+ die "DNS IPv$type query on $query gave '$out' instead of '$expected'"
+ if ($out !~ $expected);
+ }
+
+ foreach (4, 6) {
+ subtest "ipv$_", sub {
+ assertHost($_, "a", "example.com", qr/has no [^ ]+ record/);
+ assertHost($_, "aaaa", "example.com", qr/has no [^ ]+ record/);
+
+ assertHost($_, "soa", "example.com", qr/SOA.*?noc\.example\.com/);
+ assertHost($_, "a", "ipv4.example.com", qr/address 1.2.3.4$/);
+ assertHost($_, "aaaa", "ipv6.example.com", qr/address abcd::eeff$/);
+
+ assertHost($_, "a", "deleg.example.com", qr/address 9.8.7.6$/);
+ assertHost($_, "aaaa", "deleg.example.com", qr/address fedc::bbaa$/);
+ };
+ }
+ '';
+}
diff --git a/nixos/tests/phabricator.nix b/nixos/tests/phabricator.nix
index 53038474c91..0fe31f66502 100644
--- a/nixos/tests/phabricator.nix
+++ b/nixos/tests/phabricator.nix
@@ -32,9 +32,16 @@ import ./make-test.nix ({ pkgs, ... }: {
}];
};
+ phd = {
+ enable = true;
+ };
+
mysql = {
enable = true;
package = pkgs.mysql;
+ extraOptions = ''
+ sql_mode=STRICT_ALL_TABLES
+ '';
};
};
diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix
index 409a831727b..49b02f46e9b 100644
--- a/pkgs/applications/audio/audacious/default.nix
+++ b/pkgs/applications/audio/audacious/default.nix
@@ -1,28 +1,29 @@
{ stdenv, fetchurl, pkgconfig, glib, gtk3, libmowgli, libmcs
, gettext, dbus_glib, libxml2, libmad, xlibs, alsaLib, libogg
, libvorbis, libcdio, libcddb, flac, ffmpeg, makeWrapper
+, mpg123, neon, faad2
}:
let
- version = "3.4.3";
+ version = "3.5.1";
in
stdenv.mkDerivation {
name = "audacious-${version}";
src = fetchurl {
url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2";
- sha256 = "04lzwdr1lx6ghbfxzygvnbmdl420w6rm453ds5lyb0hlvzs58d0q";
+ sha256 = "01wmlvpp540gdjw759wif3byh98h3b3q6f5wawzp0b0ivqd0wf6z";
};
pluginsSrc = fetchurl {
url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2";
- sha256 = "00r88q9fs9a0gicdmk2svcans7igcqgacrw303a5bn44is7pmrmy";
+ sha256 = "09lyvi15hbn3pvb2izyz2bm4021917mhcdrwxrn3q3sjvx337np6";
};
buildInputs =
[ gettext pkgconfig glib gtk3 libmowgli libmcs libxml2 dbus_glib
libmad xlibs.libXcomposite libogg libvorbis flac alsaLib libcdio
- libcddb ffmpeg makeWrapper
+ libcddb ffmpeg makeWrapper mpg123 neon faad2
];
# Here we build bouth audacious and audacious-plugins in one
diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix
index 015d887a584..88931520c42 100644
--- a/pkgs/applications/audio/cantata/default.nix
+++ b/pkgs/applications/audio/cantata/default.nix
@@ -39,7 +39,7 @@ assert withOnlineServices -> withTaglib;
assert withReplaygain -> withTaglib;
let
- version = "1.4.0";
+ version = "1.4.1";
pname = "cantata";
fstat = x: fn: "-DENABLE_" + fn + "=" + (if x then "ON" else "OFF");
fstats = x: map (fstat x);
@@ -50,8 +50,8 @@ stdenv.mkDerivation rec {
src = fetchurl {
inherit name;
- url = "https://drive.google.com/uc?export=download&id=0Bzghs6gQWi60WDI1WjRtUDJ4QlU";
- sha256 = "63a03872ec9a2b212c497d4b10e255d5654f96370734e86420bf711354048e01";
+ url = "https://drive.google.com/uc?export=download&id=0Bzghs6gQWi60eXhuZ1Z3bGM2bjQ";
+ sha256 = "b0d5a1798efd275d72dffb87bc0f016fc865dbd1384b7c9af039cebdffe0cca3";
};
buildInputs =
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional (withTaglib && !withKDE4 && withDevices) udisks2;
unpackPhase = "tar -xvf $src";
- sourceRoot = "cantata-1.4.0";
+ sourceRoot = "${name}";
# Qt4 is implicit when KDE is switched off.
cmakeFlags = stdenv.lib.flatten [
diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix
new file mode 100644
index 00000000000..ca8ce453e63
--- /dev/null
+++ b/pkgs/applications/audio/deadbeef/default.nix
@@ -0,0 +1,98 @@
+{ stdenv, fetchurl, intltool, pkgconfig
+# deadbeef can use either gtk2 or gtk3
+, gtk2Support ? true, gtk2 ? null
+, gtk3Support ? false, gtk3 ? null, gsettings_desktop_schemas ? null, makeWrapper ? null
+# input plugins
+, vorbisSupport ? true, libvorbis ? null
+, mp123Support ? true, libmad ? null
+, flacSupport ? true, flac ? null
+, wavSupport ? true, libsndfile ? null
+, cdaSupport ? true, libcdio ? null, libcddb ? null
+, aacSupport ? true, faad2 ? null
+, wavpackSupport ? false, wavpack ? null
+, ffmpegSupport ? false, ffmpeg ? null
+# misc plugins
+, zipSupport ? true, libzip ? null
+, artworkSupport ? true, imlib2 ? null
+, hotkeysSupport ? true, libX11 ? null
+, osdSupport ? true, dbus ? null
+# output plugins
+, alsaSupport ? true, alsaLib ? null
+, pulseSupport ? true, pulseaudio ? null
+# effect plugins
+, resamplerSupport ? true, libsamplerate ? null
+, overloadSupport ? true, zlib ? null
+# transports
+, remoteSupport ? true, curl ? null
+}:
+
+assert gtk2Support || gtk3Support;
+assert gtk2Support -> gtk2 != null;
+assert gtk3Support -> gtk3 != null && gsettings_desktop_schemas != null && makeWrapper != null;
+assert vorbisSupport -> libvorbis != null;
+assert mp123Support -> libmad != null;
+assert flacSupport -> flac != null;
+assert wavSupport -> libsndfile != null;
+assert cdaSupport -> (libcdio != null && libcddb != null);
+assert aacSupport -> faad2 != null;
+assert zipSupport -> libzip != null;
+assert ffmpegSupport -> ffmpeg != null;
+assert artworkSupport -> imlib2 != null;
+assert hotkeysSupport -> libX11 != null;
+assert osdSupport -> dbus != null;
+assert alsaSupport -> alsaLib != null;
+assert pulseSupport -> pulseaudio != null;
+assert resamplerSupport -> libsamplerate != null;
+assert overloadSupport -> zlib != null;
+assert wavpackSupport -> wavpack != null;
+assert remoteSupport -> curl != null;
+
+stdenv.mkDerivation rec {
+ name = "deadbeef-0.6.2";
+
+ src = fetchurl {
+ url = "http://garr.dl.sourceforge.net/project/deadbeef/${name}.tar.bz2";
+ sha256 = "06jfsqyakpvq0xhah7dlyvdzh5ym3hhb4yfczczw11ijd1kbjcrl";
+ };
+
+ buildInputs = with stdenv.lib;
+ optional gtk2Support gtk2
+ ++ optionals gtk3Support [gtk3 gsettings_desktop_schemas]
+ ++ optional vorbisSupport libvorbis
+ ++ optional mp123Support libmad
+ ++ optional flacSupport flac
+ ++ optional wavSupport libsndfile
+ ++ optionals cdaSupport [libcdio libcddb]
+ ++ optional aacSupport faad2
+ ++ optional zipSupport libzip
+ ++ optional ffmpegSupport ffmpeg
+ ++ optional artworkSupport imlib2
+ ++ optional hotkeysSupport libX11
+ ++ optional osdSupport dbus
+ ++ optional alsaSupport alsaLib
+ ++ optional pulseSupport pulseaudio
+ ++ optional resamplerSupport libsamplerate
+ ++ optional overloadSupport zlib
+ ++ optional wavpackSupport wavpack
+ ++ optional remoteSupport curl
+ ;
+
+ nativeBuildInputs = with stdenv.lib; [ intltool pkgconfig ]
+ ++ optional gtk3Support makeWrapper;
+
+ enableParallelBuilding = true;
+
+ postInstall = if !gtk3Support then "" else ''
+ wrapProgram "$out/bin/deadbeef" \
+ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Ultimate Music Player for GNU/Linux";
+ homepage = http://deadbeef.sourceforge.net/;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.abbradar ];
+ repositories.git = https://github.com/Alexey-Yakovenko/deadbeef;
+ };
+}
diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix
index 775cf5ca606..a5dd037c774 100644
--- a/pkgs/applications/audio/drumkv1/default.nix
+++ b/pkgs/applications/audio/drumkv1/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "drumkv1-${version}";
- version = "0.5.0";
+ version = "0.5.1";
src = fetchurl {
url = "mirror://sourceforge/drumkv1/${name}.tar.gz";
- sha256 = "16bjkp22hfpmzj5di98dddzslavgvhw5z7pgjzmjqz9dxvbqwq1k";
+ sha256 = "1cih4f22922ndk8yrcf955fvzkd8mh7qz1xcdyn3xybs7ackgarq";
};
buildInputs = [ jack2 libsndfile lv2 qt4 ];
diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix
index c421dcc60cb..3ba7b5903f9 100644
--- a/pkgs/applications/audio/easytag/default.nix
+++ b/pkgs/applications/audio/easytag/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk, glib, libid3tag, id3lib, taglib
-, libvorbis, libogg, flac
+, libvorbis, libogg, flac, itstool, libxml2
}:
stdenv.mkDerivation rec {
name = "easytag-${version}";
- version = "2.1.8";
+ version = "2.2.4";
src = fetchurl {
- url = "mirror://gnome/sources/easytag/2.1/${name}.tar.xz";
- sha256 = "1ab5iv0a83cdf07qzi81ydfk5apay06nxags9m07msqalz4pabqs";
+ url = "mirror://gnome/sources/easytag/2.2/${name}.tar.xz";
+ sha256 = "14f0s0l28fwxnc37aw1imal2xcg9ykq35mx2j9gaqzz02ymjk0s5";
};
preConfigure = ''
@@ -22,11 +22,13 @@ stdenv.mkDerivation rec {
buildInputs = [
pkgconfig intltool gtk glib libid3tag id3lib taglib libvorbis libogg flac
+ itstool libxml2
];
meta = {
description = "View and edit tags for various audio files";
homepage = "http://projects.gnome.org/easytag/";
license = stdenv.lib.licenses.gpl2Plus;
+ maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
};
}
diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/applications/audio/flac/default.nix
index fe4b43539d4..cb3ec1da97c 100644
--- a/pkgs/applications/audio/flac/default.nix
+++ b/pkgs/applications/audio/flac/default.nix
@@ -16,6 +16,6 @@ stdenv.mkDerivation rec {
homepage = http://xiph.org/flac/;
description = "Library and tools for encoding and decoding the FLAC lossless audio file format";
platforms = platforms.all;
- maintainers = maintainers.mornfall;
+ maintainers = [ maintainers.mornfall ];
};
}
diff --git a/pkgs/applications/audio/fldigi/default.nix b/pkgs/applications/audio/fldigi/default.nix
index e78095a9c5d..e0250055ccd 100644
--- a/pkgs/applications/audio/fldigi/default.nix
+++ b/pkgs/applications/audio/fldigi/default.nix
@@ -2,13 +2,13 @@
libsamplerate, pulseaudio, libXinerama, gettext, pkgconfig, alsaLib }:
stdenv.mkDerivation rec {
- version = "3.21.82";
+ version = "3.21.83";
pname = "fldigi";
name = "${pname}-${version}";
src = fetchurl {
url = "http://www.w1hkj.com/downloads/${pname}/${name}.tar.gz";
- sha256 = "1q2fc1zm9kfsjir4g6fh95vmjdq984iyxfcs6q4gjqy1znhqcyqs";
+ sha256 = "1fyg6dc6xnxb620rrhws60wj10lsgbwsmnhz8vc6ncspx8mx7019";
};
buildInputs = [ libXinerama gettext hamlib fltk13 libjpeg libpng portaudio
diff --git a/pkgs/applications/audio/freewheeling/am_path_sdl.patch b/pkgs/applications/audio/freewheeling/am_path_sdl.patch
new file mode 100644
index 00000000000..2bc3b4f45ac
--- /dev/null
+++ b/pkgs/applications/audio/freewheeling/am_path_sdl.patch
@@ -0,0 +1,40 @@
+--- code-r100/configure.ac 2014-09-25 23:44:41.059174904 +0200
++++ code-r100.new/configure.ac 2014-09-26 01:37:18.507017390 +0200
+@@ -44,6 +44,8 @@
+ [AC_MSG_ERROR(CONFIG: You need libxml2-dev installed.
+ http://www.xmlsoft.org/)])
+
++PKG_CHECK_MODULES([libxml], [libxml-2.0])
++
+ AC_CHECK_LIB([m], [sqrt], , [AC_MSG_ERROR(CORE: You need libm installed)])
+ AC_CHECK_LIB([pthread], [pthread_self], , [AC_MSG_ERROR(CORE: You need libpthread installed)])
+
+@@ -79,12 +81,12 @@
+ echo "--- Enabling USB LCD display --";
+ fi
+
+-#SDL_VERSION=1.2.4
+-#AM_PATH_SDL($SDL_VERSION,
+-# :,
+-# AC_MSG_ERROR([VIDEO: *** SDL version $SDL_VERSION not found!
+-# http://www.libsdl.org/])
+-#)
++SDL_VERSION=1.2.4
++AM_PATH_SDL($SDL_VERSION,
++ :,
++ AC_MSG_ERROR([VIDEO: *** SDL version $SDL_VERSION not found!
++ http://www.libsdl.org/])
++)
+
+ AC_CHECK_LIB([vorbis], [main], ,
+ [AC_MSG_ERROR(AUDIO: You need libvorbis-dev installed.
+@@ -95,6 +97,9 @@
+ AC_CHECK_LIB([vorbisenc], [main], ,
+ [AC_MSG_ERROR(AUDIO: You need libvorbis-dev installed.
+ http://www.xiph.org/ogg/vorbis/)])
++AC_CHECK_LIB([ogg], [main], ,
++ [AC_MSG_ERROR(AUDIO: You need libogg-dev installed.
++ http://www.xiph.org/ogg/)])
+
+ AC_CHECK_LIB([sndfile], [main], ,
+ [AC_MSG_ERROR(AUDIO: you need libsndfile installed.
diff --git a/pkgs/applications/audio/freewheeling/default.nix b/pkgs/applications/audio/freewheeling/default.nix
new file mode 100644
index 00000000000..a3f356e75c4
--- /dev/null
+++ b/pkgs/applications/audio/freewheeling/default.nix
@@ -0,0 +1,44 @@
+{ stdenv, fetchsvn, pkgconfig, autoconf, automake, gnutls, freetype
+, SDL, SDL_gfx, SDL_ttf, liblo, libxml2, alsaLib, jack2, libvorbis
+, libsndfile, libogg
+}:
+
+stdenv.mkDerivation {
+ name = "freewheeling-100";
+
+ src = fetchsvn {
+ url = svn://svn.code.sf.net/p/freewheeling/code;
+ rev = 100;
+ sha256 = "1m6z7p93xyha25qma9bazpzbp04pqdv5h3yrv6851775xsyvzksv";
+ };
+
+ buildInputs = [
+ pkgconfig autoconf automake gnutls freetype SDL SDL_gfx SDL_ttf
+ liblo libxml2 jack2 alsaLib libvorbis libsndfile libogg
+ ];
+
+ preConfigure = "autoreconf -vfi";
+
+ patches = [ ./am_path_sdl.patch ./xml.patch ];
+
+ meta = {
+ description = "A live looping instrument with JACK and MIDI support";
+ longDescription = ''
+ Freewheeling allows us to build repetitive grooves
+ by sampling and directing loops from within spirited improvisation.
+
+ It works because, down to the core, it's built around
+ improv. We leave mice and menus, and dive into our own process
+ of making sound.
+
+ Freewheeling runs under Mac OS X and Linux, and is open source
+ software, released under the GNU GPL license.
+ '' ;
+
+ version = "r100";
+ homepage = "http://freewheeling.sourceforge.net";
+ license = stdenv.lib.licenses.gpl2;
+ maintainers = [ stdenv.lib.maintainers.sepi ];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/applications/audio/freewheeling/xml.patch b/pkgs/applications/audio/freewheeling/xml.patch
new file mode 100644
index 00000000000..fd9d4fb39fe
--- /dev/null
+++ b/pkgs/applications/audio/freewheeling/xml.patch
@@ -0,0 +1,13 @@
+--- code-r100/src/Makefile.am 2014-09-25 23:44:41.043174832 +0200
++++ code-r100.new/src/Makefile.am 2014-09-26 01:21:03.750015888 +0200
+@@ -24,7 +24,8 @@
+
+ fweelindir = $(datadir)/fweelin
+
+-FWEELIN_CFLAGS = -I. -g -Wall -Wno-write-strings -Wno-non-virtual-dtor -D_REENTRANT -DPTHREADS -DNDEBUG -DVERSION=\"$(VERSION)\" -DFWEELIN_DATADIR=\"$(fweelindir)\" -DADDON_DIR=\"/usr/local/lib/jack\" -I/usr/include/freetype2 -I/usr/include/libxml2 -funroll-loops -finline-functions -fomit-frame-pointer -ffast-math -fexpensive-optimizations -fstrict-aliasing -falign-loops=2 -falign-jumps=2 -falign-functions=2 -O9
++XML_CFLAGS = `xml2-config --cflags`
++FWEELIN_CFLAGS = -I. -g -Wall -Wno-write-strings -Wno-non-virtual-dtor -D_REENTRANT -DPTHREADS -DNDEBUG -DVERSION=\"$(VERSION)\" -DFWEELIN_DATADIR=\"$(fweelindir)\" -DADDON_DIR=\"/usr/local/lib/jack\" -I/usr/include/freetype2 $(XML_CFLAGS) -funroll-loops -finline-functions -fomit-frame-pointer -ffast-math -fexpensive-optimizations -fstrict-aliasing -falign-loops=2 -falign-jumps=2 -falign-functions=2 -O9
+
+ AM_CFLAGS = $(CFLAGS) $(FWEELIN_CFLAGS)
+-AM_CXXFLAGS = $(CFLAGS) $(CXXFLAGS) $(FWEELIN_CFLAGS)
++AM_CXXFLAGS = $(CFLAGS) $(CXXFLAGS) $(FWEELIN_CFLAGS) ${libxml2_CFLAGS}
diff --git a/pkgs/applications/audio/google-musicmanager/default.nix b/pkgs/applications/audio/google-musicmanager/default.nix
index 8cff94c25d9..107dcdce05c 100644
--- a/pkgs/applications/audio/google-musicmanager/default.nix
+++ b/pkgs/applications/audio/google-musicmanager/default.nix
@@ -4,8 +4,8 @@
assert stdenv.system == "x86_64-linux" || stdenv.system == "1686-linux";
stdenv.mkDerivation rec {
- debversion = "beta_1.0.84.1107-r0";
- version = "1.0.84.1107-beta-r0"; # friendly to nix-env version sorting algo
+ debversion = "beta_1.0.55.7425-r0";
+ version = "beta_1.0.55.7425-r0"; # friendly to nix-env version sorting algo
product = "google-musicmanager";
name = "${product}-${version}";
@@ -16,12 +16,12 @@ stdenv.mkDerivation rec {
src = if stdenv.system == "x86_64-linux"
then fetchurl {
- url = "http://dl.google.com/linux/musicmanager/deb/pool/main/g/${product}-beta/${product}-${debversion}_amd64.deb";
- sha256 = "0irlrspw508b1s9i5d1mddpp2x9w1ny3svf27gxf8pmwbiyd1cyi";
+ url = "http://dl.google.com/linux/musicmanager/deb/pool/main/g/google-musicmanager-beta/google-musicmanager-${version}_amd64.deb";
+ sha256 = "0efdce3970e2cf83eb7d8f6021f987a1517a41823784ada8e51f1649f8a49342";
}
else fetchurl {
- url = "http://dl.google.com/linux/musicmanager/deb/pool/main/g/${product}-beta/${product}-${debversion}_i386.deb";
- sha256 = "13pfsjvaygap6axrlbfhyk1h8377xmwi47x4af6j57qq6z7329rg";
+ url = "http://dl.google.com/linux/musicmanager/deb/pool/main/g/google-musicmanager-beta/google-musicmanager-${version}_i386.deb";
+ sha256 = "4cc8822ab90af97195c2edfa74cc8b4a736e763cc3382f741aa1de0f72ac211e";
};
unpackPhase = ''
diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix
index 19b61ebc76d..de5ef055125 100644
--- a/pkgs/applications/audio/gpodder/default.nix
+++ b/pkgs/applications/audio/gpodder/default.nix
@@ -1,5 +1,6 @@
{ pkgs, stdenv, fetchurl, python, buildPythonPackage, pythonPackages, mygpoclient, intltool,
- ipodSupport ? true, libgpod, gpodderHome ? "", gpodderDownloadDir ? "" }:
+ ipodSupport ? true, libgpod, gpodderHome ? "", gpodderDownloadDir ? "",
+ gnome3, hicolor_icon_theme }:
with pkgs.lib;
@@ -7,14 +8,18 @@ let
inherit (pythonPackages) coverage feedparser minimock sqlite3 dbus pygtk eyeD3;
in buildPythonPackage rec {
- name = "gpodder-3.7.0";
+ name = "gpodder-3.8.0";
src = fetchurl {
url = "http://gpodder.org/src/${name}.tar.gz";
- sha256 = "fa90ef4bdd3fd9eef95404f7f43f70912ae3ab4f8d24078484a2f3e11b14dc47";
+ sha256 = "0731f08f4270c81872b841b55200ae80feb4502706397d0085079471fb9a8fe4";
};
- buildInputs = [ coverage feedparser minimock sqlite3 mygpoclient intltool ];
+ buildInputs = [
+ coverage feedparser minimock sqlite3 mygpoclient intltool
+ gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic
+ hicolor_icon_theme
+ ];
propagatedBuildInputs = [ feedparser dbus mygpoclient sqlite3 pygtk eyeD3 ]
++ stdenv.lib.optional ipodSupport libgpod;
@@ -26,7 +31,30 @@ in buildPythonPackage rec {
preFixup = ''
wrapProgram $out/bin/gpodder \
${optionalString (gpodderHome != "") "--set GPODDER_HOME ${gpodderHome}"} \
- ${optionalString (gpodderDownloadDir != "") "--set GPODDER_DOWNLOAD_DIR ${gpodderDownloadDir}"}
+ ${optionalString (gpodderDownloadDir != "") "--set GPODDER_DOWNLOAD_DIR ${gpodderDownloadDir}"} \
+ --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+ '';
+
+ # The `wrapPythonPrograms` script in the postFixup phase breaks gpodder. The
+ # easiest way to fix this is to call wrapPythonPrograms and then to clean up
+ # the wrapped file.
+ postFixup = ''
+ wrapPythonPrograms
+
+ if test -e $out/nix-support/propagated-build-inputs; then
+ ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages
+ fi
+
+ createBuildInputsPth build-inputs "$buildInputStrings"
+ for inputsfile in propagated-build-inputs propagated-native-build-inputs; do
+ if test -e $out/nix-support/$inputsfile; then
+ createBuildInputsPth $inputsfile "$(cat $out/nix-support/$inputsfile)"
+ fi
+ done
+
+ sed -i "$out/bin/..gpodder-wrapped-wrapped" -e '{
+ /import sys; sys.argv/d
+ }'
'';
installPhase = "DESTDIR=/ PREFIX=$out make install";
diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix
index 777c0ddb2e3..3a125ef665d 100644
--- a/pkgs/applications/audio/guitarix/default.nix
+++ b/pkgs/applications/audio/guitarix/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, fetchurl, avahi, boost, fftw, gettext, glib, glibmm, gtk
-, gtkmm, intltool, jack2, ladspaH, librdf, libsndfile, lv2
-, pkgconfig, python }:
+{ stdenv, fetchurl, avahi, boost, eigen, fftw, gettext, glib, glibmm, gtk
+, gtkmm, intltool, jack2, ladspaH, librdf, libsndfile, lilv, lv2
+, pkgconfig, python, serd, sord, sratom }:
stdenv.mkDerivation rec {
name = "guitarix-${version}";
- version = "0.28.3";
+ version = "0.30.0";
src = fetchurl {
url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.bz2";
- sha256 = "0ks5avylyicqfj9l1wf4gj62i8m6is2jmp0h11h5l2wbg3xiwxjd";
+ sha256 = "0fbapd1pcixzlqxgzb2s2q1c64g9z9lf4hz3vy73z55cnpk72vdx";
};
buildInputs = [
- avahi boost fftw gettext glib glibmm gtk gtkmm intltool jack2
- ladspaH librdf libsndfile lv2 pkgconfig python
+ avahi boost boost.lib eigen fftw gettext glib glibmm gtk gtkmm intltool
+ jack2 ladspaH librdf libsndfile lilv lv2 pkgconfig python serd sord sratom
];
configurePhase = "python waf configure --prefix=$out";
diff --git a/pkgs/applications/audio/hydrogen/default.nix b/pkgs/applications/audio/hydrogen/default.nix
index 10f15f5882c..72e546246d5 100644
--- a/pkgs/applications/audio/hydrogen/default.nix
+++ b/pkgs/applications/audio/hydrogen/default.nix
@@ -1,35 +1,19 @@
-{ stdenv, fetchurl, alsaLib, boost, glib, jack2, ladspaPlugins
-, libarchive, liblrdf , libsndfile, pkgconfig, qt4, scons, subversion }:
+{ stdenv, fetchurl, alsaLib, boost, cmake, glib, jack2, libarchive
+, liblrdf, libsndfile, pkgconfig, qt4 }:
stdenv.mkDerivation rec {
- version = "0.9.5.1";
+ version = "0.9.6";
name = "hydrogen-${version}";
src = fetchurl {
- url = "mirror://sourceforge/hydrogen/hydrogen-${version}.tar.gz";
- sha256 = "1fvyp6gfzcqcc90dmaqbm11p272zczz5pfz1z4lj33nfr7z0bqgb";
+ url = "https://github.com/hydrogen-music/hydrogen/archive/${version}.tar.gz";
+ sha256 = "1z7j8aq158mp41iv78j0w6fyx98y1y51z592b4x5hkvicabgck5w";
};
buildInputs = [
- alsaLib boost glib jack2 ladspaPlugins libarchive liblrdf
- libsndfile pkgconfig qt4 scons subversion
+ alsaLib boost cmake glib jack2 libarchive liblrdf libsndfile pkgconfig qt4
];
- patches = [ ./scons-env.patch ];
-
- postPatch = ''
- sed -e 's#/usr/lib/ladspa#${ladspaPlugins}/lib/ladspa#' -i libs/hydrogen/src/preferences.cpp
- sed '/\/usr/d' -i libs/hydrogen/src/preferences.cpp
- sed "s#pkg_ver.rstrip().split('.')#pkg_ver.rstrip().split('.')[:3]#" -i Sconstruct
- '';
-
- # why doesn't scons find librdf?
- buildPhase = ''
- scons prefix=$out libarchive=1 lrdf=0 install
- '';
-
- installPhase = ":";
-
meta = with stdenv.lib; {
description = "Advanced drum machine";
homepage = http://www.hydrogen-music.org;
diff --git a/pkgs/applications/audio/hydrogen/scons-env.patch b/pkgs/applications/audio/hydrogen/scons-env.patch
deleted file mode 100644
index ebc17f67872..00000000000
--- a/pkgs/applications/audio/hydrogen/scons-env.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- hydrogen-0.9.5/Sconstruct 2011-03-15 13:22:35.000000000 +0100
-+++ hydrogen-0.9.5/Sconstruct 2011-04-17 16:06:54.000000000 +0200
-@@ -178,7 +178,7 @@
-
- includes.append( "libs/hydrogen/include" )
-
-- env = Environment( options = opts )
-+ env = Environment( options = opts, ENV = os.environ )
-
-
- #location of qt4.py
-@@ -298,7 +298,6 @@
-
- for N in glob.glob('./data/i18n/hydrogen.*'):
- env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data/i18n', source=N))
-- env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data', source="./data/img"))
-
- #add every img in ./data/img to the install list.
- os.path.walk("./data/img/",install_images,env)
-@@ -379,7 +379,7 @@
-
- includes, a , b = get_platform_flags( opts )
-
--env = Environment(options = opts, CPPPATH = includes)
-+env = Environment(options = opts, ENV = os.environ)
-
-
- Help(opts.GenerateHelpText(env))
diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix
index ac46ff6140c..f6c0d9e9945 100644
--- a/pkgs/applications/audio/ingen/default.nix
+++ b/pkgs/applications/audio/ingen/default.nix
@@ -4,16 +4,16 @@
stdenv.mkDerivation rec {
name = "ingen-svn-${rev}";
- rev = "5317";
+ rev = "5464";
src = fetchsvn {
url = "http://svn.drobilla.net/lad/trunk/ingen";
rev = rev;
- sha256 = "0zm3wbv9qsingjyr95nwin3khmnf3wq3fz2xa6p420dpcy6qnl4x";
+ sha256 = "1p5rsxwanpj3kj5yai7zqbharj2ldvn78x3p739vkgpr3dinp506";
};
buildInputs = [
- boost ganv glibmm gtk gtkmm jack2 lilv lv2 pkgconfig python
+ boost boost.lib ganv glibmm gtk gtkmm jack2 lilv lv2 pkgconfig python
raul serd sord sratom suil
];
diff --git a/pkgs/applications/audio/jalv/default.nix b/pkgs/applications/audio/jalv/default.nix
index 70ef5bdec5c..bf01fe1a935 100644
--- a/pkgs/applications/audio/jalv/default.nix
+++ b/pkgs/applications/audio/jalv/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "jalv-${version}";
- version = "1.4.4";
+ version = "1.4.6";
src = fetchurl {
url = "http://download.drobilla.net/${name}.tar.bz2";
- sha256 = "1iql1r52rmf87q6jkxhcxa3lpq7idzzg55ma91wphywyvh29q7lf";
+ sha256 = "1f1hcq74n3ziw8bk97mn5a1vgw028dxikv3fchaxd430pbbhqgl9";
};
buildInputs = [
diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix
new file mode 100644
index 00000000000..6a46681c12f
--- /dev/null
+++ b/pkgs/applications/audio/kid3/default.nix
@@ -0,0 +1,74 @@
+{ stdenv, fetchurl
+, pkgconfig, cmake, perl, ffmpeg
+, docbook_xml_dtd_45, docbook_xsl, libxslt
+, phonon, automoc4, chromaprint, id3lib
+, taglib, mp4v2, flac, libogg, libvorbis
+, qt, zlib, readline
+, makeWrapper
+}:
+
+stdenv.mkDerivation rec {
+
+ name = "kid3-${version}";
+ version = "3.1.1";
+
+ src = fetchurl {
+ url = "http://downloads.sourceforge.net/project/kid3/kid3/${version}/${name}.tar.gz";
+ sha256 = "0mr617k712zpd99rgsy313jrb6jcjn1malj4lirzqhp7307wsf34";
+ };
+
+ buildInputs = with stdenv.lib;
+ [ pkgconfig cmake perl ffmpeg docbook_xml_dtd_45 docbook_xsl libxslt
+ phonon automoc4 chromaprint id3lib taglib mp4v2 flac libogg libvorbis
+ qt zlib readline makeWrapper ];
+
+ cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DWITH_APPS=Qt;CLI" ];
+ NIX_LDFLAGS = "-lm -lpthread";
+
+ preConfigure = ''
+ export DOCBOOKDIR="${docbook_xsl}/xml/xsl/docbook/"
+ '';
+
+ postInstall = ''
+ wrapProgram $out/bin/kid3-qt --prefix QT_PLUGIN_PATH : $out/lib/qt4/plugins
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A simple and powerful audio tag editor";
+ longDescription = ''
+ If you want to easily tag multiple MP3, Ogg/Vorbis, FLAC, MPC,
+ MP4/AAC, MP2, Opus, Speex, TrueAudio, WavPack, WMA, WAV and AIFF
+ files (e.g. full albums) without typing the same information
+ again and again and have control over both ID3v1 and ID3v2 tags,
+ then Kid3 is the program you are looking for.
+
+ With Kid3 you can:
+ - Edit ID3v1.1 tags;
+ - Edit all ID3v2.3 and ID3v2.4 frames;
+ - Convert between ID3v1.1, ID3v2.3 and ID3v2.4 tags
+ - Edit tags in MP3, Ogg/Vorbis, FLAC, MPC, MP4/AAC, MP2, Opus,
+ Speex, TrueAudio, WavPack, WMA, WAV, AIFF files and tracker
+ modules (MOD, S3M, IT, XM);
+ - Edit tags of multiple files, e.g. the artist, album, year and
+ genre of all files of an album typically have the same values
+ and can be set together;
+ - Generate tags from filenames;
+ - Generate tags from the contents of tag fields;
+ - Generate filenames from tags;
+ - Rename and create directories from tags;
+ - Generate playlist files;
+ - Automatically convert upper and lower case and replace strings;
+ - Import from gnudb.org, TrackType.org, MusicBrainz, Discogs,
+ Amazon and other sources of album data;
+ - Export tags as CSV, HTML, playlists, Kover XML and in other
+ formats;
+ - Edit synchronized lyrics and event timing codes, import and
+ export LRC files
+ '';
+ homepage = http://kid3.sourceforge.net/;
+ license = licenses.lgpl2Plus;
+ maintainers = [ maintainers.AndersonTorres ];
+ };
+}
+
+# TODO: Qt5 support
diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix
index dd0649811bb..ee47d607c2b 100644
--- a/pkgs/applications/audio/lmms/default.nix
+++ b/pkgs/applications/audio/lmms/default.nix
@@ -1,24 +1,22 @@
-{ stdenv, fetchurl, SDL, alsaLib, cmake, fftwSinglePrec, jack2, libogg
-, libsamplerate, libsndfile, pkgconfig, pulseaudio, qt4, freetype
+{ stdenv, fetchurl, SDL, alsaLib, cmake, fftwSinglePrec, fluidsynth
+, fltk13, jack2, libvorbis , libsamplerate, libsndfile, pkgconfig
+, pulseaudio, qt4, freetype
}:
stdenv.mkDerivation rec {
name = "lmms-${version}";
- version = "0.4.15";
+ version = "1.0.3";
src = fetchurl {
- url = "mirror://sourceforge/lmms/${name}.tar.bz2";
- sha256 = "02q2gbsqwk3hf9kvzz58a5bxmlb4cfr2mzy41wdvbxxdm2pcl101";
+ url = "https://github.com/LMMS/lmms/archive/v${version}.tar.gz";
+ sha256 = "191mfld3gspnxlgwcszp9kls58kdwrplj0rfw4zqsz90zdbsjnx3";
};
buildInputs = [
- SDL alsaLib cmake fftwSinglePrec jack2 libogg libsamplerate
- libsndfile pkgconfig pulseaudio qt4
+ SDL alsaLib cmake fftwSinglePrec fltk13 fluidsynth jack2
+ libsamplerate libsndfile libvorbis pkgconfig pulseaudio qt4
];
- # work around broken build system of 0.4.*
- NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2";
-
enableParallelBuilding = true;
meta = with stdenv.lib; {
diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix
index 5c6a1d6ac54..9fbf05a2feb 100644
--- a/pkgs/applications/audio/moc/default.nix
+++ b/pkgs/applications/audio/moc/default.nix
@@ -5,23 +5,23 @@
stdenv.mkDerivation rec {
name = "moc-${version}";
- version = "2.5.0-beta2";
+ version = "2.5.0";
src = fetchurl {
- url = "http://ftp.daper.net/pub/soft/moc/unstable/moc-${version}.tar.bz2";
- sha256 = "486d50584c3fb0067b8c03af54e44351633a7740b18dc3b7358322051467034c";
+ url = "http://ftp.daper.net/pub/soft/moc/stable/moc-${version}.tar.bz2";
+ sha256 = "14b0g9jn12jzxsf292g64dc6frlxv99kaagsasmc8xmg80iab7nj";
};
- configurePhase = "./configure prefix=$out";
-
buildInputs = [
ncurses pkgconfig alsaLib flac libmad speex ffmpeg libvorbis
mpc libsndfile jack2 db libmodplug timidity libid3tag libtool
];
- meta = {
+ meta = with stdenv.lib; {
description = "An ncurses console audio player designed to be powerful and easy to use";
homepage = http://moc.daper.net/;
- license = stdenv.lib.licenses.gpl2;
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ pSub ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/audio/monkeys-audio/default.nix b/pkgs/applications/audio/monkeys-audio/default.nix
index 08aa7e017b2..d1c6ed6379a 100644
--- a/pkgs/applications/audio/monkeys-audio/default.nix
+++ b/pkgs/applications/audio/monkeys-audio/default.nix
@@ -14,6 +14,6 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
platforms = platforms.linux;
- maintainers = maintainers.mornfall;
+ maintainers = [ maintainers.mornfall ];
};
}
diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix
index bbdd1f05fde..a0a3af0e958 100644
--- a/pkgs/applications/audio/mopidy/default.nix
+++ b/pkgs/applications/audio/mopidy/default.nix
@@ -5,11 +5,11 @@
pythonPackages.buildPythonPackage rec {
name = "mopidy-${version}";
- version = "0.19.3";
+ version = "0.19.4";
src = fetchurl {
url = "https://github.com/mopidy/mopidy/archive/v${version}.tar.gz";
- sha256 = "0rjq69vqak1d6fhvih259wmwp50xgr6x0x5nd0hl6hlkbbysc8dp";
+ sha256 = "13dyn9pgq0jns6915diizviqyn64yfysb08k77xsmxrr4bhm1156";
};
propagatedBuildInputs = with pythonPackages; [
diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix
index 54ae5476efd..9224e21185b 100755
--- a/pkgs/applications/audio/mpc/default.nix
+++ b/pkgs/applications/audio/mpc/default.nix
@@ -1,16 +1,16 @@
{ stdenv, fetchurl, mpd_clientlib }:
stdenv.mkDerivation rec {
- version = "0.25";
+ version = "0.26";
name = "mpc-${version}";
src = fetchurl {
url = "http://www.musicpd.org/download/mpc/0/${name}.tar.xz";
- sha256 = "095gmik5vrnab5a1g92qiznn48w7499fr0gldp3s6xd26kvs9kvh";
+ sha256 = "0hp2qv6w2v902dhrmck5hg32s1ai6xiv9n61a3n6prfcfdqmywr0";
};
-
- buildInputs = [ mpd_clientlib ];
-
+
+ buildInputs = [ mpd_clientlib ];
+
preConfigure =
''
export LIBMPDCLIENT_LIBS=${mpd_clientlib}/lib/libmpdclient.so.${mpd_clientlib.majorVersion}.0.${mpd_clientlib.minorVersion}
diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix
new file mode 100644
index 00000000000..a0bb8789658
--- /dev/null
+++ b/pkgs/applications/audio/musescore/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, makeWrapper, cmake, qt4, pkgconfig, alsaLib, portaudio, jack2, libsndfile}:
+
+stdenv.mkDerivation rec {
+ name = "musescore-1.3";
+
+ src = fetchurl {
+ url = "http://ftp.osuosl.org/pub/musescore/releases/MuseScore-1.3/mscore-1.3.tar.bz2";
+ sha256 = "a0b60cc892ac0266c58fc6392be72c0a21c3aa7fd0b6e4f1dddad1c8b36be683";
+ };
+
+ buildInputs = [ makeWrapper cmake qt4 pkgconfig alsaLib portaudio jack2 libsndfile ];
+
+ configurePhase = ''
+ cd mscore;
+ mkdir build;
+ cd build;
+ cmake -DCMAKE_INSTALL_PREFIX=$out -DQT_PLUGINS_DIR=$out/lib/qt4/plugins -DCMAKE_BUILD_TYPE=Release ..'';
+
+ preBuild = ''make lrelease;'';
+
+ postInstall = ''
+ wrapProgram $out/bin/mscore --prefix QT_PLUGIN_PATH : $out/lib/qt4/plugins
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Qt-based score editor";
+ homepage = http://musescore.org/;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ maintainers = [ stdenv.lib.maintainers.vandenoever ];
+ repositories.git = https://github.com/musescore/MuseScore;
+ };
+}
diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix
index 94fa50a8883..b5f84f536d0 100755
--- a/pkgs/applications/audio/ncmpc/default.nix
+++ b/pkgs/applications/audio/ncmpc/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, glib, ncurses, mpd_clientlib, libintlOrEmpty }:
stdenv.mkDerivation rec {
- version = "0.23";
+ version = "0.24";
name = "ncmpc-${version}";
src = fetchurl {
url = "http://www.musicpd.org/download/ncmpc/0/ncmpc-${version}.tar.xz";
- sha256 = "d7b30cefaf5c74a5d8ab18ab8275e0102ae12e8ee6d6f8144f8e4cc9a97b5de4";
+ sha256 = "1sf3nirs3mcx0r5i7acm9bsvzqzlh730m0yjg6jcyj8ln6r7cvqf";
};
buildInputs = [ pkgconfig glib ncurses mpd_clientlib ]
@@ -14,6 +14,11 @@ stdenv.mkDerivation rec {
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
+ configureFlags = [
+ "--enable-colors"
+ "--enable-lyrics-screen"
+ ];
+
meta = with stdenv.lib; {
description = "Curses-based interface for MPD (music player daemon)";
homepage = http://www.musicpd.org/clients/ncmpc/;
diff --git a/pkgs/applications/audio/opus-tools/default.nix b/pkgs/applications/audio/opus-tools/default.nix
index 791763ced36..fb32674d3b4 100644
--- a/pkgs/applications/audio/opus-tools/default.nix
+++ b/pkgs/applications/audio/opus-tools/default.nix
@@ -1,10 +1,10 @@
{stdenv, fetchurl, libogg, libao, pkgconfig, libopus, flac}:
stdenv.mkDerivation rec {
- name = "opus-tools-0.1.8";
+ name = "opus-tools-0.1.9";
src = fetchurl {
url = "http://downloads.xiph.org/releases/opus/${name}.tar.gz";
- sha256 = "1xm2lhdz92n9zmk496lyagisyzja46kx8q340vay9i51krbqiqg4";
+ sha256 = "0fk4nknvl111k89j5yckmyrh6b2wvgyhrqfncp7rig3zikbkv1xi";
};
buildInputs = [ libogg libao pkgconfig libopus flac ];
@@ -12,6 +12,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Tools to work with opus encoded audio streams";
homepage = http://www.opus-codec.org/;
- license = "BSD";
+ license = stdenv.lib.licenses.bsd2;
+ maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
};
}
diff --git a/pkgs/applications/audio/opusfile/default.nix b/pkgs/applications/audio/opusfile/default.nix
index 50df35b974f..314ecc95c3f 100644
--- a/pkgs/applications/audio/opusfile/default.nix
+++ b/pkgs/applications/audio/opusfile/default.nix
@@ -1,10 +1,10 @@
{stdenv, fetchurl, pkgconfig, openssl, libogg, libopus}:
stdenv.mkDerivation rec {
- name = "opusfile-0.4";
+ name = "opusfile-0.6";
src = fetchurl {
url = "http://downloads.xiph.org/releases/opus/${name}.tar.gz";
- sha256 = "0h4iwyqgid0cibqwzckz3r94qfp09099nk1cx5nz6i3cf08yldlq";
+ sha256 = "19iys2kld75k0210b807i4illrdmj3cmmnrgxlc9y4vf6mxp2a14";
};
buildInputs = [ pkgconfig openssl libogg libopus ];
@@ -12,6 +12,7 @@ stdenv.mkDerivation rec {
meta = {
description = "High-level API for decoding and seeking in .opus files";
homepage = http://www.opus-codec.org/;
- license = "BSD";
+ license = stdenv.lib.licenses.bsd3;
+ maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
};
}
diff --git a/pkgs/applications/audio/pamixer/default.nix b/pkgs/applications/audio/pamixer/default.nix
index d273c238177..769af20c0ed 100644
--- a/pkgs/applications/audio/pamixer/default.nix
+++ b/pkgs/applications/audio/pamixer/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "03r0sbfj85wp6yxa87pjg69ivmk0mxxa2nykr8gf2c607igmb034";
};
- buildInputs = [ pulseaudio boost ];
+ buildInputs = [ pulseaudio boost boost.lib ];
installPhase = ''
mkdir -p $out/bin
diff --git a/pkgs/applications/audio/paprefs/default.nix b/pkgs/applications/audio/paprefs/default.nix
new file mode 100644
index 00000000000..f05c4068a60
--- /dev/null
+++ b/pkgs/applications/audio/paprefs/default.nix
@@ -0,0 +1,33 @@
+{ fetchurl, stdenv, pkgconfig, pulseaudio, gtkmm, libglademm
+, dbus_glib, gconfmm, intltool }:
+
+stdenv.mkDerivation rec {
+ name = "paprefs-0.9.10";
+
+ src = fetchurl {
+ url = "http://freedesktop.org/software/pulseaudio/paprefs/${name}.tar.xz";
+ sha256 = "1c5b3sb881szavly220q31g7rvpn94wr7ywlk00hqb9zaikml716";
+ };
+
+ buildInputs = [ pulseaudio gtkmm libglademm dbus_glib gconfmm ];
+
+ nativeBuildInputs = [ pkgconfig intltool ];
+
+ configureFlags = [ "--disable-lynx" ];
+
+ meta = with stdenv.lib; {
+ description = "PulseAudio Preferences";
+
+ longDescription = ''
+ PulseAudio Preferences (paprefs) is a simple GTK based configuration
+ dialog for the PulseAudio sound server.
+ '';
+
+ homepage = http://freedesktop.org/software/pulseaudio/paprefs/ ;
+
+ license = licenses.gpl2Plus;
+
+ maintainers = [ maintainers.abbradar ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix
index ca08624e98f..538e1cdf9d0 100644
--- a/pkgs/applications/audio/pavucontrol/default.nix
+++ b/pkgs/applications/audio/pavucontrol/default.nix
@@ -1,5 +1,5 @@
-{ fetchurl, stdenv, pkgconfig, pulseaudio, gtkmm3
-, libcanberra_gtk3, intltool, gettext }:
+{ fetchurl, stdenv, pkgconfig, intltool, pulseaudio, gtkmm3
+, libcanberra_gtk3 }:
stdenv.mkDerivation rec {
name = "pavucontrol-2.0";
@@ -9,12 +9,13 @@ stdenv.mkDerivation rec {
sha256 = "02s775m1531sshwlbvfddk3pz8zjmwkv1sgzggn386ja3gc9vwi2";
};
- buildInputs = [ pkgconfig pulseaudio gtkmm3 libcanberra_gtk3
- intltool gettext ];
+ buildInputs = [ pulseaudio gtkmm3 libcanberra_gtk3 ];
- configureFlags = "--disable-lynx";
+ nativeBuildInputs = [ pkgconfig intltool ];
- meta = {
+ configureFlags = [ "--disable-lynx" ];
+
+ meta = with stdenv.lib; {
description = "PulseAudio Volume Control";
longDescription = ''
@@ -27,7 +28,7 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.gpl2Plus;
- maintainers = [ ];
- platforms = stdenv.lib.platforms.gnu; # arbitrary choice
+ maintainers = [ maintainers.abbradar ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/audio/petrifoo/default.nix b/pkgs/applications/audio/petrifoo/default.nix
index 152ee442761..197a0aa1bbe 100644
--- a/pkgs/applications/audio/petrifoo/default.nix
+++ b/pkgs/applications/audio/petrifoo/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchgit, alsaLib, cmake, gtk, jack2, libgnomecanvas
+{ stdenv, fetchurl, alsaLib, cmake, gtk, jack2, libgnomecanvas
, libpthreadstubs, libsamplerate, libsndfile, libtool, libxml2
, pkgconfig }:
stdenv.mkDerivation rec {
- name = "petri-foo";
+ name = "petri-foo-${version}";
+ version = "0.1.87";
- src = fetchgit {
- url = https://github.com/licnep/Petri-Foo.git;
- rev = "eef3b6efebe842d2fa18ed32b881fea4562b84e0";
- sha256 = "a20c3f1a633500a65c099c528c7dc2405daa60738b64d881bb8f2036ae59913c";
+ src = fetchurl {
+ url = "mirror://sourceforge/petri-foo/${name}.tar.bz2";
+ sha256 = "0b25iicgn8c42487fdw32ycfrll1pm2zjgy5djvgw6mfcaa4gizh";
};
buildInputs =
@@ -16,8 +16,6 @@ stdenv.mkDerivation rec {
libsamplerate libsndfile libtool libxml2 pkgconfig
];
- dontUseCmakeBuildDir=true;
-
meta = with stdenv.lib; {
description = "MIDI controllable audio sampler";
longDescription = "a fork of Specimen";
diff --git a/pkgs/applications/audio/pianobar/default.nix b/pkgs/applications/audio/pianobar/default.nix
index a9f4b02fa08..a91f25126c1 100644
--- a/pkgs/applications/audio/pianobar/default.nix
+++ b/pkgs/applications/audio/pianobar/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
description = "A console front-end for Pandora.com";
homepage = "http://6xq.net/projects/pianobar/";
platforms = stdenv.lib.platforms.linux;
- license = stdenv.lib.licenses.unfree;
+ license = stdenv.lib.licenses.mit; # expat version
};
}
diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix
index 07753216d3c..235a81a6a32 100644
--- a/pkgs/applications/audio/picard/default.nix
+++ b/pkgs/applications/audio/picard/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pythonPackages, gettext, pyqt4
-, pkgconfig, libdiscid, libofa, ffmpeg, acoustidFingerprinter
+, pkgconfig, libdiscid, libofa, ffmpeg, chromaprint
}:
pythonPackages.buildPythonPackage rec {
@@ -9,14 +9,16 @@ pythonPackages.buildPythonPackage rec {
src = fetchurl {
url = "http://ftp.musicbrainz.org/pub/musicbrainz/picard/${name}.tar.gz";
- md5 = "d1086687b7f7b0d359a731b1a25e7b66";
+ sha256 = "0sbsf8hzxhxcnnjqvsd6mc23lmk7w33nln0f3w72f89mjgs6pxm6";
};
postPatch = let
- fpr = "${acoustidFingerprinter}/bin/acoustid-fingerprinter";
+ discid = "${libdiscid}/lib/libdiscid.so.0";
+ fpr = "${chromaprint}/bin/fpcalc";
in ''
- sed -ri -e 's|(TextOption.*"acoustid_fpcalc"[^"]*")[^"]*|\1${fpr}|' \
- picard/ui/options/fingerprinting.py
+ substituteInPlace picard/disc.py --replace libdiscid.so.0 ${discid}
+ substituteInPlace picard/const.py \
+ --replace "FPCALC_NAMES = [" "FPCALC_NAMES = ['${fpr}',"
'';
buildInputs = [
@@ -46,9 +48,11 @@ pythonPackages.buildPythonPackage rec {
doCheck = false;
- meta = {
+ meta = with stdenv.lib; {
homepage = "http://musicbrainz.org/doc/MusicBrainz_Picard";
description = "The official MusicBrainz tagger";
- license = stdenv.lib.licenses.gpl2;
+ maintainers = with maintainers; [ emery ];
+ license = licenses.gpl2;
+ platforms = platforms.all;
};
}
diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix
index 4177dbeeb0c..561a72bb38b 100644
--- a/pkgs/applications/audio/qtractor/default.nix
+++ b/pkgs/applications/audio/qtractor/default.nix
@@ -3,12 +3,12 @@
, libtool, libvorbis, pkgconfig, qt4, rubberband, stdenv }:
stdenv.mkDerivation rec {
- version = "0.6.2";
+ version = "0.6.3";
name = "qtractor-${version}";
src = fetchurl {
url = "mirror://sourceforge/qtractor/${name}.tar.gz";
- sha256 = "08cr4lgm8bkkmsvfljszcqij3i52n989s7ncrbrn17n61rmgf8yw";
+ sha256 = "1lsmd83vhgfzb3bf02hi6xp5ryh08lz4h21agy7wm3acjqc6gsc2";
};
buildInputs =
diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix
index 0cbdfa6973d..c89f23f8a28 100644
--- a/pkgs/applications/audio/samplv1/default.nix
+++ b/pkgs/applications/audio/samplv1/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "samplv1-${version}";
- version = "0.5.0";
+ version = "0.5.1";
src = fetchurl {
url = "mirror://sourceforge/samplv1/${name}.tar.gz";
- sha256 = "02mm5y1yzklvs5bpxl86y3dqcg7migfybmin8llk91pws6rl9b41";
+ sha256 = "155qq7gxyqn7sh8bbyhjk40lxl157lb2h539j4gqgv5jphz8g6wy";
};
buildInputs = [ jack2 libsndfile lv2 qt4 ];
diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix
index 52cd2ad35ce..1b878deb316 100644
--- a/pkgs/applications/audio/snd/default.nix
+++ b/pkgs/applications/audio/snd/default.nix
@@ -4,17 +4,11 @@
}:
stdenv.mkDerivation rec {
- name = "snd-14.3";
-
- meta = {
- description = "Sound editor";
- homepage = http://ccrma.stanford.edu/software/snd;
- platforms = stdenv.lib.platforms.linux;
- };
+ name = "snd-15.0";
src = fetchurl {
url = "mirror://sourceforge/snd/${name}.tar.gz";
- sha256 = "04shk34pza507kvm40dc6sdz5jz533z4q2h7m9hgqvw1r3f57ms6";
+ sha256 = "1s1mswgxhvi0wjw0qscwh2jajihvgz86xffgbwl7qjkymqbh8gyj";
};
nativeBuildInputs = [ pkgconfig ];
@@ -23,4 +17,14 @@ stdenv.mkDerivation rec {
gtk2 alsaLib
fftw gsl
];
+
+ meta = {
+ description = "Sound editor";
+ homepage = http://ccrma.stanford.edu/software/snd;
+ platforms = stdenv.lib.platforms.linux;
+ license = stdenv.lib.licenses.free;
+ maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ };
+
+
}
diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix
index c6c464b9ad7..fd9d5e69f48 100644
--- a/pkgs/applications/audio/synthv1/default.nix
+++ b/pkgs/applications/audio/synthv1/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "synthv1-${version}";
- version = "0.5.0";
+ version = "0.5.1";
src = fetchurl {
url = "mirror://sourceforge/synthv1/${name}.tar.gz";
- sha256 = "011kjccrdwb62rpck5gb8h4kvvm8rk6n77lj78ykxz4pxip5hf14";
+ sha256 = "16wcxrcjwp0qp2xgahhzvcs2k31sr6c9jsxyhivj4famj7a39pfw";
};
buildInputs = [ qt4 jack2 lv2 ];
diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix
index 67edc7f521d..bc28108b7cb 100644
--- a/pkgs/applications/audio/yoshimi/default.nix
+++ b/pkgs/applications/audio/yoshimi/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, alsaLib, boost, cairo, cmake, fftwSinglePrec, fltk
-, jack2, libsndfile, mesa, minixml, pkgconfig, zlib
+, jack2, libsndfile, mesa, minixml, pkgconfig, zlib, xorg
}:
assert stdenv ? glibc;
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
};
buildInputs = [
- alsaLib boost cairo fftwSinglePrec fltk jack2 libsndfile mesa
- minixml zlib
+ alsaLib boost boost.lib cairo fftwSinglePrec fltk jack2 libsndfile mesa
+ minixml zlib xorg.libpthreadstubs
];
nativeBuildInputs = [ cmake pkgconfig ];
diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix
index a5aa7d5c8d9..3a89b406742 100644
--- a/pkgs/applications/audio/zynaddsubfx/default.nix
+++ b/pkgs/applications/audio/zynaddsubfx/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchurl, alsaLib, cmake, jack2, fftw, fltk13, minixml
-, pkgconfig, zlib
+{ stdenv, fetchurl, alsaLib, cmake, jack2, fftw, fltk13, libjpeg
+, minixml, pkgconfig, zlib
}:
stdenv.mkDerivation rec {
name = "zynaddsubfx-${version}";
- version = "2.4.3";
+ version = "2.4.4";
src = fetchurl {
- url = "mirror://sourceforge/zynaddsubfx/ZynAddSubFX-${version}.tar.bz2";
- sha256 = "0kgmwyh4rhyqdfrdzhbzjjk2hzggkp9c4aac6sy3xv6cc1b5jjxq";
+ url = "mirror://sourceforge/zynaddsubfx/zynaddsubfx-${version}.tar.xz";
+ sha256 = "15byz08p5maf3v8l1zz11xan6s0qcfasjf1b81xc8rffh13x5f53";
};
- buildInputs = [ alsaLib jack2 fftw fltk13 minixml zlib ];
+ buildInputs = [ alsaLib jack2 fftw fltk13 libjpeg minixml zlib ];
nativeBuildInputs = [ cmake pkgconfig ];
meta = with stdenv.lib; {
diff --git a/pkgs/applications/display-managers/slim/themes.nix b/pkgs/applications/display-managers/slim/themes.nix
new file mode 100644
index 00000000000..6bcacf8baf4
--- /dev/null
+++ b/pkgs/applications/display-managers/slim/themes.nix
@@ -0,0 +1,183 @@
+{ stdenv, fetchurl, slim }:
+
+# Inspired on aspell buildDict expression
+
+let
+ buildTheme =
+ {fullName, src, version ? "testing"}:
+
+ stdenv. mkDerivation rec {
+ name = "${fullName}-${version}";
+
+ inherit src;
+
+ buildInputs = [ slim ];
+
+ dontBuild = true;
+
+ installPhase = ''
+ install -dm755 $out/share/slim/themes/${name}
+ install -m644 * $out/share/slim/themes/${name}
+ '';
+
+ meta = {
+ description = "Slim theme for ${fullName}";
+ platforms = stdenv.lib.platforms.linux;
+ };
+ };
+
+in {
+
+ archlinuxSimple = buildTheme {
+ fullName = "archlinux-simple";
+ src = fetchurl {
+ url = "mirror://sourceforge/slim.berlios/slim-archlinux-simple.tar.gz";
+ sha256 = "7d60d6782fa86302646fe67253467c04692d247f89bdbe87178f690f32b270db";
+ };
+ };
+
+ capernoited = buildTheme {
+ fullName = "capernoited";
+ src = fetchurl {
+ url = "mirror://sourceforge/slim.berlios/slim-capernoited.tar.gz";
+ sha256 = "fb9163c6a2656d60f088dc4f2173aa7556a6794495122acfa7d3be7182f16b41";
+ };
+ };
+
+ debianMoreblue = buildTheme {
+ fullName = "debian-moreblue";
+ src = fetchurl {
+ url = "mirror://sourceforge/slim.berlios/slim-debian-moreblue.tar.bz2";
+ sha256 = "5b76929827d4a4d604ddca4f42668cca3309b6f7bd659901021c6f49d6d2c481";
+ };
+ };
+
+ fingerprint = buildTheme {
+ fullName = "fingerprint";
+ src = fetchurl {
+ url = "mirror://sourceforge/slim.berlios/slim-fingerprint.tar.gz";
+ sha256 = "48b703f84ce7b814cda0824f65cafebf695cd71a14166b481bb44616097d3144";
+ };
+ };
+
+ flat = buildTheme {
+ fullName = "flat";
+ src = fetchurl {
+ url = "mirror://sourceforge/slim.berlios/slim-flat.tar.gz";
+ sha256 = "0092d531540f9da8ef07ad173e527c4ef9c088d04962d142be3c11f0c5c0c5e9";
+ };
+ };
+
+ flower2 = buildTheme {
+ fullName = "flower2";
+ src = fetchurl {
+ url = "mirror://sourceforge/slim.berlios/slim-flower2.tar.gz";
+ sha256 = "840faf6459ffd6c2c363160c85cb98000717f9a425102976336f5d8f68ed95ee";
+ };
+ };
+
+ gentooSimple = buildTheme {
+ fullName = "gentoo-simple";
+ src = fetchurl {
+ url = "mirror://sourceforge/slim.berlios/slim-gentoo-simple.tar.bz2";
+ sha256 = "27c8614cc930ca200acf81f1192febc102501744939d5cbe997141e37c96d8c2";
+ };
+ };
+
+ lake = buildTheme {
+ fullName = "lake";
+ src = fetchurl {
+ url = "mirror://sourceforge/slim.berlios/slim-lake.tar.gz";
+ sha256 = "f7d662e37068a6c64cbf910adf3c192f1b50724baa427a8c9487cb9f7ed95851";
+ };
+ };
+
+ lunar = buildTheme {
+ fullName = "lunar-0.4";
+ version = "";
+ src = fetchurl {
+ url = "mirror://sourceforge/slim.berlios/slim-lunar-0.4.tar.bz2";
+ sha256 = "1543eb45e4d664377e0dd4f7f954aba005823034ba9692624398b3d58be87d76";
+ };
+ };
+
+ mindlock = buildTheme {
+ fullName = "mindlock";
+ src = fetchurl {
+ url = "mirror://sourceforge/slim.berlios/slim-mindlock.tar.gz";
+ sha256 = "99a6e6acd55bf55ece18a3f644299517b71c1adc49efd87ce2d7e654fb67033c";
+ };
+ };
+
+ parallelDimensions = buildTheme {
+ fullName = "parallel-dimensions";
+ src = fetchurl {
+ url = "mirror://sourceforge/slim.berlios/slim-parallel-dimensions.tar.gz";
+ sha256 = "2b17c3e6d3967a6a0744e20e6e05c9d3938f4ef04c62d49ddbd416bc4743046f";
+ };
+ };
+
+ previous = buildTheme {
+ fullName = "previous";
+ src = fetchurl {
+ url = "mirror://sourceforge/slim.berlios/slim-previous.tar.gz";
+ sha256 = "1f2a69f8fc0dc8ed8eb86a4c1d1087ba7be486973fb81efab52a63c661d726f8";
+ };
+ };
+
+ rainbow = buildTheme {
+ fullName = "rainbow";
+ src = fetchurl {
+ url = "mirror://sourceforge/slim.berlios/slim-rainbow.tar.gz";
+ sha256 = "d83e3afdb05be50cff7da037bb31208b2c152539d1a009740b13857f5f910072";
+ };
+ };
+
+ rear-window = buildTheme {
+ fullName = "rear-window";
+ src = fetchurl {
+ url = "mirror://sourceforge/slim.berlios/slim-rear-window.tar.gz";
+ sha256 = "0b123706ccb67e94f626c183530ec5732b209bab155bc661d6a3f5cd5ee39511";
+ };
+ };
+
+ scotlandRoad = buildTheme {
+ fullName = "scotland-road";
+ src = fetchurl {
+ url = "mirror://sourceforge/slim.berlios/slim-scotland-road.tar.gz";
+ sha256 = "fd60a434496ed39b968ffa1e5457b36cd12f64a4e2ecedffc675f97ca3f3bba1";
+ };
+ };
+
+ subway = buildTheme {
+ fullName = "subway";
+ src = fetchurl {
+ url = "mirror://sourceforge/slim.berlios/slim-subway.tar.gz";
+ sha256 = "0205568e3e157973b113a83b26d8829ce9962a85ef7eb8a33d3ae2f3f9292253";
+ };
+ };
+
+ wave = buildTheme {
+ fullName = "wave";
+ src = fetchurl {
+ url = "mirror://sourceforge/slim.berlios/slim-wave.tar.gz";
+ sha256 = "be75676da5bf8670daa48379bb9cc1be0b9a5faa09adbea967dfd7125320b959";
+ };
+ };
+
+ zenwalk = buildTheme {
+ fullName = "zenwalk";
+ src = fetchurl {
+ url = "mirror://sourceforge/slim.berlios/slim-zenwalk.tar.gz";
+ sha256 = "f0f41d17ea505b0aa96a036e978fabaf673a51d3f81a919cb0d43364d4bc7a57";
+ };
+ };
+
+ nixosSlim = buildTheme {
+ fullName = "nixos-slim";
+ src = fetchurl {
+ url = "https://github.com/jagajaga/nixos-slim-theme/archive/1.1.tar.gz";
+ sha256 = "0cawq38l8rcgd35vpdx3i1wbs3wrkcrng1c9qch0l4qncw505hv6";
+ };
+ };
+}
diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index 51844f64179..7197e4b95d9 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, buildEnv, makeDesktopItem, makeWrapper, zlib, glib, alsaLib
, dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf
-, cairo, cups, expat, libgpgerror, nspr, gconf, nss, xlibs
+, cairo, cups, expat, libgpgerror, nspr, gconf, nss, xlibs, libcap
}:
let
@@ -10,52 +10,35 @@ let
stdenv.gcc.gcc zlib glib dbus gtk atk pango freetype libgnome_keyring3
fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss
xlibs.libXrender xlibs.libX11 xlibs.libXext xlibs.libXdamage xlibs.libXtst
- xlibs.libXcomposite xlibs.libXi xlibs.libXfixes
+ xlibs.libXcomposite xlibs.libXi xlibs.libXfixes xlibs.libXrandr
+ xlibs.libXcursor libcap
];
};
in stdenv.mkDerivation rec {
name = "atom-${version}";
- version = "0.99.0";
+ version = "0.129.0";
src = fetchurl {
- url = https://github.com/hotice/webupd8/raw/master/atom-linux64-0.99.0~git20140525.tar.xz;
- sha256 = "55c2415c96e1182ae1517751cbea1db64e9962683b384cfe5e182aec10aebecd";
- name = "${name}.tar.xz";
- };
-
- iconsrc = fetchurl {
- url = https://raw.githubusercontent.com/atom/atom/master/resources/atom.png;
- sha256 = "66dc0b432eed7bcd738b7c1b194e539178a83d427c78f103041981f2b840e030";
- };
-
- desktopItem = makeDesktopItem {
- name = "atom";
- exec = "atom";
- icon = iconsrc;
- comment = "A hackable text editor for the 21st Century";
- desktopName = "Atom";
- genericName = "Text editor";
- categories = "Development;TextEditor";
+ url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
+ sha256 = "0a78cb7e74b75b5c1cdbdfdea3f56ecab9479e407575b1e3cfb10c0d3265e7a4";
+ name = "${name}.deb";
};
buildInputs = [ atomEnv makeWrapper ];
- phases = [ "installPhase" ];
+ phases = [ "installPhase" "fixupPhase" ];
installPhase = ''
- mkdir -p $out/share/atom
- mkdir -p $out/bin
- tar -C $out/share/atom -xvf $src
+ mkdir -p $out
+ ar p $src data.tar.gz | tar -C $out -xz ./usr
+ mv $out/usr/* $out/
+ rm -r $out/usr/
patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
$out/share/atom/atom
patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
$out/share/atom/resources/app/apm/node_modules/atom-package-manager/bin/node
- makeWrapper $out/share/atom/atom $out/bin/atom \
+ wrapProgram $out/bin/atom \
--prefix "LD_LIBRARY_PATH" : "${atomEnv}/lib:${atomEnv}/lib64"
-
- # Create a desktop item.
- mkdir -p "$out/share/applications"
- cp "${desktopItem}"/share/applications/* "$out/share/applications/"
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index b32981ccb94..6073dc42c69 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -191,6 +191,23 @@ in {
sha256 = "0d6jlj7hwz8blx6csrlyi2h2prql0wckbh7ihwjmgclwpcpj84g6";
};
};
+
+ eclipse_cpp_44 = buildEclipse {
+ name = "eclipse-cpp-4.4";
+ description = "Eclipse IDE for C/C++ Developers";
+ src =
+ if stdenv.system == "x86_64-linux" then
+ fetchurl {
+ url = http://www.mirrorservice.org/sites/download.eclipse.org/eclipseMirror/technology/epp/downloads/release/luna/R/eclipse-cpp-luna-R-linux-gtk-x86_64.tar.gz;
+ md5 = "b0a6ee33e8108a7ff4682ab911271b04";
+ }
+ else
+ fetchurl {
+ url = http://www.mirrorservice.org/sites/download.eclipse.org/eclipseMirror/technology/epp/downloads/release/luna/R/eclipse-cpp-luna-R-linux-gtk.tar.gz;
+ md5 = "5000f93cecf6ef9af112f0df6e8c87f3";
+ };
+ };
+
eclipse_sdk_421 = buildEclipse {
name = "eclipse-sdk-4.2.1";
diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix
index 0c764fcf8f8..bccd7754efb 100644
--- a/pkgs/applications/editors/ed/default.nix
+++ b/pkgs/applications/editors/ed/default.nix
@@ -1,11 +1,14 @@
{ fetchurl, stdenv }:
stdenv.mkDerivation rec {
- name = "ed-1.9";
+ name = "ed-1.10";
src = fetchurl {
- url = "mirror://gnu/ed/${name}.tar.gz";
- sha256 = "122syihsx2hwzj75mkf5a9ssiky2xby748kp4cc00wzhmp7p5cym";
+ # gnu only provides *.lz tarball, which is unfriendly for stdenv bootstrapping
+ #url = "mirror://gnu/ed/${name}.tar.gz";
+ url = "http://pkgs.fedoraproject.org/repo/extras/ed/${name}.tar.bz2"
+ + "/38204d4c690a17a989e802ba01b45e98/${name}.tar.bz2";
+ sha256 = "16qvshl8470f3znjfrrci3lzllqkzc6disk5kygzsg9hh4f6wysq";
};
/* FIXME: Tests currently fail on Darwin:
diff --git a/pkgs/applications/editors/emacs-modes/cask/default.nix b/pkgs/applications/editors/emacs-modes/cask/default.nix
new file mode 100644
index 00000000000..90c32f0e2bc
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/cask/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchgit, emacs, python }:
+
+stdenv.mkDerivation rec {
+ name = "cask-0.7.2";
+
+ src = fetchgit {
+ url = "https://github.com/cask/cask.git";
+ rev = "8d667e1ce3f3aa817a7b996f02058b2441f83958";
+ sha256 = "08brrdyz7zsw134zwf4dyj6bj2glflszssfq8vya3mh01s38mfri";
+ };
+
+ buildInputs = [ emacs python ];
+
+ # byte-compiling emacs files automatically triggers cask's bootstrap
+ # mechanism, what we don't want.
+ dontBuild = true;
+
+ installPhase = ''
+ install -d "$out/share/emacs/site-lisp"
+ install cask*.el* "$out/share/emacs/site-lisp"
+
+ install -d "$out/bin"
+ install bin/cask "$out/bin"
+
+ # In order to work with cask's hard coded file paths (during bootstrap),
+ # we have to create these links.
+ ln -s "$out/share/emacs/site-lisp/"* "$out"
+
+ # This file disables cask's self-updating function.
+ touch "$out/.no-upgrade"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Project management tool for Emacs";
+ longDescription =
+ ''
+ Cask is a project management tool for Emacs that helps automate the
+ package development cycle; development, dependencies, testing,
+ building, packaging and more. Cask can also be used to manage
+ dependencies for your local Emacs configuration.
+ '';
+ homepage = "https://github.com/cask/cask";
+ license = licenses.gpl3Plus;
+ platforms = platforms.all;
+ maintainers = [ maintainers.jgeerds ];
+ };
+}
diff --git a/pkgs/applications/editors/emacs-modes/dash/default.nix b/pkgs/applications/editors/emacs-modes/dash/default.nix
new file mode 100644
index 00000000000..aacc33c9b51
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/dash/default.nix
@@ -0,0 +1,23 @@
+{stdenv, fetchurl, emacs}:
+
+let version = "1.5.0";
+
+in stdenv.mkDerivation {
+ name = "emacs-dash-${version}";
+
+ src = fetchurl {
+ url = "https://github.com/magnars/dash.el/archive/${version}.tar.gz";
+ sha256 = "0c6jknzy306vn22vqlabxkwxfnllrd33spymi74fkirbxaxvp8kp";
+ };
+
+ buildInputs = [ emacs ];
+
+ buildPhase = ''
+ emacs -L . --batch -f batch-byte-compile *.el
+ '';
+
+ installPhase = ''
+ install -d $out/share/emacs/site-lisp
+ install *.el *.elc $out/share/emacs/site-lisp
+ '';
+}
diff --git a/pkgs/applications/editors/emacs-modes/ensime/default.nix b/pkgs/applications/editors/emacs-modes/ensime/default.nix
new file mode 100644
index 00000000000..d776103a662
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/ensime/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, emacs, unzip, autoComplete, dash, s, scalaMode2, sbtMode }:
+
+stdenv.mkDerivation {
+ name = "emacs-ensime-2014-09-04";
+
+ src = fetchurl {
+ url = "https://github.com/ensime/ensime-emacs/archive/d3820a3f362975f6e14b817988ec07bfef2b4dad.zip";
+ sha256 = "0gwr0r92z2hh2x8g0hpxaar2vvfk1b91cp6v04gaasw0fvl5i7g5";
+ };
+
+ buildInputs = [ emacs unzip ];
+ propagatedUserEnvPkgs = [ autoComplete dash s scalaMode2 sbtMode ];
+
+ buildPhase = ''
+ emacs -L . -L ${autoComplete}/share/emacs/site-lisp --batch -f batch-byte-compile *.el
+ '';
+
+ installPhase = ''
+ install -d $out/share/emacs/site-lisp
+ install *.el *.elc $out/share/emacs/site-lisp
+ '';
+}
diff --git a/pkgs/applications/editors/emacs-modes/org/default.nix b/pkgs/applications/editors/emacs-modes/org/default.nix
index d5a7b0ded8a..293554a62b2 100644
--- a/pkgs/applications/editors/emacs-modes/org/default.nix
+++ b/pkgs/applications/editors/emacs-modes/org/default.nix
@@ -2,11 +2,11 @@
, texLiveAggregationFun }:
stdenv.mkDerivation rec {
- name = "org-8.2.7c";
+ name = "org-8.2.8";
src = fetchurl {
url = "http://orgmode.org/${name}.tar.gz";
- sha256 = "0qqf58xqw1kkgjxm9z40s6h7xd209rx3933klla22lryv3yclc1k";
+ sha256 = "0f63w6d1yjiv46ac7d9rqn2wks6sxmldrqmijd9j25qvsc8dcsd8";
};
buildInputs = [ emacs ];
diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/4.3pre.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/4.3pre.nix
index 3a492dc0c7f..32a036805ed 100644
--- a/pkgs/applications/editors/emacs-modes/proofgeneral/4.3pre.nix
+++ b/pkgs/applications/editors/emacs-modes/proofgeneral/4.3pre.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, emacs, texinfo, texLive, perl, which, automake }:
+{ stdenv, fetchurl, emacs, texinfo, texLive, perl, which, automake, enableDoc ? false }:
stdenv.mkDerivation (rec {
name = "ProofGeneral-4.3pre131011";
@@ -10,7 +10,7 @@ stdenv.mkDerivation (rec {
sourceRoot = name;
- buildInputs = [ emacs texinfo texLive perl which ];
+ buildInputs = [ emacs texinfo perl which ] ++ stdenv.lib.optional enableDoc texLive;
prePatch =
'' sed -i "Makefile" \
@@ -25,15 +25,20 @@ stdenv.mkDerivation (rec {
sed -i '96d' doc/ProofGeneral.texi
'';
+ patches = [ ./pg.patch ];
+
preBuild = ''
make clean;
'';
installPhase =
+ if enableDoc
+ then
# Copy `texinfo.tex' in the right place so that `texi2pdf' works.
'' cp -v "${automake}/share/"automake-*/texinfo.tex doc
make install install-doc
- '';
+ ''
+ else "make install";
meta = {
description = "Proof General, an Emacs front-end for proof assistants";
diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/pg.patch b/pkgs/applications/editors/emacs-modes/proofgeneral/pg.patch
new file mode 100644
index 00000000000..c733911118d
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/proofgeneral/pg.patch
@@ -0,0 +1,16 @@
+diff -r c7d8bfff4c0a bin/proofgeneral
+--- a/bin/proofgeneral Sat Sep 27 02:25:15 2014 +0100
++++ b/bin/proofgeneral Sat Sep 27 02:28:16 2014 +0100
+@@ -73,11 +73,7 @@
+
+ # Try to find Proof General directory
+ if [ -z "$PGHOME" ] || [ ! -d "$PGHOME" ]; then
+- # default relative to this script, otherwise PGHOMEDEFAULT
+- MYDIR="`readlink --canonicalize "$0" | sed -ne 's,/bin/proofgeneral$,,p'`"
+- if [ -d "$MYDIR" ]; then
+- PGHOME="$MYDIR"
+- elif [ -d "$PGHOMEDEFAULT" ]; then
++ if [ -d "$PGHOMEDEFAULT" ]; then
+ PGHOME="$PGHOMEDEFAULT"
+ else
+ echo "Cannot find the Proof General lisp files: Set PGHOME or use --pghome."
diff --git a/pkgs/applications/editors/emacs-modes/rainbow-delimiters/default.nix b/pkgs/applications/editors/emacs-modes/rainbow-delimiters/default.nix
new file mode 100644
index 00000000000..62b3a0af1fb
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/rainbow-delimiters/default.nix
@@ -0,0 +1,23 @@
+{stdenv, fetchurl, emacs}:
+
+let version = "1.3.12";
+
+in stdenv.mkDerivation {
+ name = "emacs-rainbow-delimiters-${version}";
+
+ src = fetchurl {
+ url = "https://github.com/jlr/rainbow-delimiters/archive/${version}.tar.gz";
+ sha256 = "0l65rqmnrc02q1b406kxc29w5cfpmrmq0glv493pjzhzc5m3r63z";
+ };
+
+ buildInputs = [ emacs ];
+
+ buildPhase = ''
+ emacs -L . --batch -f batch-byte-compile *.el
+ '';
+
+ installPhase = ''
+ install -d $out/share/emacs/site-lisp
+ install *.el *.elc $out/share/emacs/site-lisp
+ '';
+}
diff --git a/pkgs/applications/editors/emacs-modes/s/default.nix b/pkgs/applications/editors/emacs-modes/s/default.nix
new file mode 100644
index 00000000000..b818348939e
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/s/default.nix
@@ -0,0 +1,23 @@
+{stdenv, fetchurl, emacs}:
+
+let version = "1.9.0";
+
+in stdenv.mkDerivation {
+ name = "emacs-s-${version}";
+
+ src = fetchurl {
+ url = "https://github.com/magnars/s.el/archive/${version}.tar.gz";
+ sha256 = "1gah2k577gvnmxlpw7zrz0jr571vghzhdv2hbgchlgah07czd091";
+ };
+
+ buildInputs = [ emacs ];
+
+ buildPhase = ''
+ emacs -L . --batch -f batch-byte-compile *.el
+ '';
+
+ installPhase = ''
+ install -d $out/share/emacs/site-lisp
+ install *.el *.elc $out/share/emacs/site-lisp
+ '';
+}
diff --git a/pkgs/applications/editors/emacs-modes/scala-mode/v2.nix b/pkgs/applications/editors/emacs-modes/scala-mode/v2.nix
index 13d3f4b00d1..75861b0a988 100644
--- a/pkgs/applications/editors/emacs-modes/scala-mode/v2.nix
+++ b/pkgs/applications/editors/emacs-modes/scala-mode/v2.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation {
- name = "scala-mode2-2014-06-05";
+ name = "scala-mode2-2014-07-01";
src = fetchurl {
- url = "https://github.com/hvesalai/scala-mode2/archive/af2dc30226c890ff7d49d727450f8006b90781df.zip";
- sha256 = "1jj08li9lfg5291jzj170wa3cmyf3g2a0j80cy5307l0mdawp9vx";
+ url = "https://github.com/hvesalai/scala-mode2/archive/c154f1623f4696d26e1c88d19170e67bf6825837.zip";
+ sha256 = "0fyxdpwz55n4c87v4ijqlbv6w1rybg5qrgsc40f6bs6sd747scy5";
};
buildInputs = [ unzip emacs ];
diff --git a/pkgs/applications/editors/emacs-modes/structured-haskell-mode/default.nix b/pkgs/applications/editors/emacs-modes/structured-haskell-mode/default.nix
index a9c2478d451..b8838fac980 100644
--- a/pkgs/applications/editors/emacs-modes/structured-haskell-mode/default.nix
+++ b/pkgs/applications/editors/emacs-modes/structured-haskell-mode/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "structured-haskell-mode";
- version = "1.0.3";
- sha256 = "0axmw8bj51q8v0wd4jp6giw9dnv0mp7kp8yd16s4nm4hcqgrh5h2";
+ version = "1.0.4";
+ sha256 = "1402wx27py7292ad7whsb13ywv71k36501jpfrn2p0v7knzknj8z";
isLibrary = false;
isExecutable = true;
buildDepends = [ haskellSrcExts haskellMode ];
diff --git a/pkgs/applications/editors/emacs-modes/tuareg/default.nix b/pkgs/applications/editors/emacs-modes/tuareg/default.nix
index 3fd592f3dba..ce25f5ab05d 100644
--- a/pkgs/applications/editors/emacs-modes/tuareg/default.nix
+++ b/pkgs/applications/editors/emacs-modes/tuareg/default.nix
@@ -3,13 +3,13 @@
# this package installs the emacs-mode which
# resides in the ocaml compiler sources.
-let version = "2.0.6";
+let version = "2.0.8";
in stdenv.mkDerivation {
name = "tuareg-mode-${version}";
src = fetchurl {
- url = https://forge.ocamlcore.org/frs/download.php/882/tuareg-2.0.6.tar.gz;
- sha256 = "ea79ac24623b82ab8047345f8504abca557a537e639d16ce1ac3e5b27f5b1189";
+ url = https://forge.ocamlcore.org/frs/download.php/882/tuareg-2.0.8.tar.bz2;
+ sha256 = "128ibdzv5rf33b71d7b3gr9plmfamc28aprl8y0ap0ivc8jaqyga";
};
buildInputs = [ emacs ];
diff --git a/pkgs/applications/editors/flpsed/default.nix b/pkgs/applications/editors/flpsed/default.nix
index d9f62216fac..640b06d2807 100644
--- a/pkgs/applications/editors/flpsed/default.nix
+++ b/pkgs/applications/editors/flpsed/default.nix
@@ -1,11 +1,11 @@
{stdenv, fetchurl, fltk13, ghostscript}:
stdenv.mkDerivation {
- name = "flpsed-0.7.1";
+ name = "flpsed-0.7.2";
src = fetchurl {
- url = "http://www.ecademix.com/JohannesHofmann/flpsed-0.7.1.tar.gz";
- sha256 = "16i3mjc1cdx2wiwfhnv3z2ywmjma9785vwl3l31izx9l51w7ngj3";
+ url = "http://www.ecademix.com/JohannesHofmann/flpsed-0.7.2.tar.gz";
+ sha256 = "1132nlganr6x4f4lzcp9l0xihg2ky1l7xk8vq7r2l2qxs97vbif8";
};
buildInputs = [ fltk13 ghostscript ];
@@ -15,5 +15,6 @@ stdenv.mkDerivation {
homepage = "http://http://flpsed.org/flpsed.html";
license = stdenv.lib.licenses.gpl3;
platforms = stdenv.lib.platforms.mesaPlatforms;
+ maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
};
}
diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix
index d7ed048cdaa..8d4002c9ef8 100644
--- a/pkgs/applications/editors/geany/default.nix
+++ b/pkgs/applications/editors/geany/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, gtk2, which, pkgconfig, intltool }:
+{ stdenv, fetchurl, gtk2, which, pkgconfig, intltool, file }:
let
- version = "1.23.1";
+ version = "1.24.1";
in
stdenv.mkDerivation rec {
@@ -9,15 +9,17 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://download.geany.org/${name}.tar.bz2";
- sha256 = "1bcgjxywggsljs9kq22kr9xpzrq5xr7pb9d1b71rwryqb5pb25c8";
+ sha256 = "0cwci8876dpgcn60dfvjlciqr8x68iv86psjj148grhzn3chbdbz";
};
- buildInputs = [ gtk2 which pkgconfig intltool ];
+ buildInputs = [ gtk2 which pkgconfig intltool file ];
doCheck = true;
enableParallelBuilding = true;
+ patchPhase = "patchShebangs .";
+
# This file should normally require a gtk-update-icon-cache -q /usr/share/icons/hicolor command
# It have no reasons to exist in a redistribuable package
postInstall = "rm $out/share/icons/hicolor/icon-theme.cache";
diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index caa9523af6f..f67f23e9e09 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -1,83 +1,168 @@
{ stdenv, fetchurl, makeDesktopItem, makeWrapper, patchelf, p7zip, jdk
-, coreutils, gnugrep, which, git
+, coreutils, gnugrep, which, git, python, unzip
}:
assert stdenv.isLinux;
let
- buildIdea =
- { name, version, build, src, description, longDescription, license }:
+ mkIdeaProduct =
+ { name, product, version, build, src, meta }:
- stdenv.mkDerivation rec {
- inherit name build src;
- ideaItem = makeDesktopItem {
- name = "IDEA";
- exec = "idea";
- comment = "Integrated Development Environment";
- desktopName = "IntelliJ IDEA";
- genericName = "Integrated Development Environment";
+ let loName = stdenv.lib.toLower product;
+ hiName = stdenv.lib.toUpper product; in
+
+ with stdenv; lib.makeOverridable mkDerivation rec {
+ inherit name build src meta;
+ desktopItem = makeDesktopItem {
+ name = loName;
+ exec = loName;
+ comment = meta.longDescription;
+ desktopName = product;
+ genericName = meta.description;
categories = "Application;Development;";
+ icon = loName;
};
- buildInputs = [ makeWrapper patchelf p7zip ];
+ buildInputs = [ makeWrapper patchelf p7zip unzip ];
- buildCommand = ''
- tar xvzf $src
- mkdir -p $out
- cp -a idea-$build $out
+ patchPhase = ''
+
+ get_file_size() {
+ local fname="$1"
+ echo $(ls -l $fname | cut -d ' ' -f5)
+ }
+
+ munge_size_hack() {
+ local fname="$1"
+ local size="$2"
+ strip $fname
+ truncate --size=$size $fname
+ }
interpreter=$(echo ${stdenv.glibc}/lib/ld-linux*.so.2)
+ snappyPath="lib/snappy-java-1.0.5"
- 7z x $out/idea-$build/lib/snappy-java-1.0.5.jar
- rm $out/idea-$build/lib/snappy-java-1.0.5.jar
- if [ "${stdenv.system}" == "x86_64-linux" ];then
- patchelf --set-interpreter $interpreter $out/idea-$build/bin/fsnotifier64
- patchelf --set-rpath ${stdenv.gcc.gcc}/lib64/ org/xerial/snappy/native/Linux/amd64/libsnappyjava.so
+ 7z x -o"$snappyPath" "$snappyPath.jar"
+ if [ "${stdenv.system}" == "x86_64-linux" ]; then
+ target_size=$(get_file_size bin/fsnotifier64)
+ patchelf --set-interpreter "$interpreter" bin/fsnotifier64
+ patchelf --set-rpath ${stdenv.gcc.gcc}/lib64/ "$snappyPath/org/xerial/snappy/native/Linux/amd64/libsnappyjava.so"
+ munge_size_hack bin/fsnotifier64 $target_size
else
- patchelf --set-interpreter $interpreter $out/idea-$build/bin/fsnotifier
- patchelf --set-rpath ${stdenv.gcc.gcc}/lib/ org/xerial/snappy/native/Linux/i386/libsnappyjava.so
+ target_size=$(get_file_size bin/fsnotifier)
+ patchelf --set-interpreter "$interpreter" bin/fsnotifier
+ patchelf --set-rpath ${stdenv.gcc.gcc}/lib/ "$snappyPath/org/xerial/snappy/native/Linux/i386/libsnappyjava.so"
+ munge_size_hack bin/fsnotifier $target_size
fi
- 7z a -tzip $out/idea-$build/lib/snappy-java-1.0.5.jar .
-
- mkdir -p $out/bin
-
- jdk=${jdk}/lib/openjdk
-
- makeWrapper $out/idea-$build/bin/idea.sh $out/bin/idea \
- --prefix PATH : ${jdk}/bin:${coreutils}/bin:${gnugrep}/bin:${which}/bin:${git}/bin \
- --prefix LD_RUN_PATH : ${stdenv.gcc.gcc}/lib/ \
- --prefix JDK_HOME : $jdk \
- --prefix IDEA_JDK : $jdk
-
- mkdir -p $out/share/applications
- cp "${ideaItem}/share/applications/"* $out/share/applications
- patchShebangs $out
+ 7z a -tzip "$snappyPath.jar" ./"$snappyPath"/*
+ rm -vr "$snappyPath"
+ '';
+
+ installPhase = ''
+ mkdir -vp "$out/bin" "$out/$name" "$out/share/pixmaps"
+ cp -va . "$out/$name"
+ ln -s "$out/$name/bin/${loName}.png" "$out/share/pixmaps/"
+
+ [ -d ${jdk}/lib/openjdk ] \
+ && jdk=${jdk}/lib/openjdk \
+ || jdk=${jdk}
+
+ makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${loName}" \
+ --prefix PATH : "${jdk}/bin:${coreutils}/bin:${gnugrep}/bin:${which}/bin:${git}/bin" \
+ --prefix LD_RUN_PATH : "${stdenv.gcc.gcc}/lib/" \
+ --prefix JDK_HOME : "$jdk" \
+ --prefix ${hiName}_JDK : "$jdk"
+
+ cp -a "${desktopItem}"/* "$out"
'';
- meta = {
- homepage = http://www.jetbrains.com/idea/;
- inherit description;
- inherit longDescription;
- inherit license;
- maintainers = [ stdenv.lib.maintainers.edwtjo ];
- platforms = stdenv.lib.platforms.linux;
- };
};
-in {
+ buildAndroidStudio = { name, version, build, src, license, description }:
+ (mkIdeaProduct rec {
+ inherit name version build src;
+ product = "Studio";
+ meta = with stdenv.lib; {
+ homepage = https://developer.android.com/sdk/installing/studio.html;
+ inherit description license;
+ longDescription = ''
+ Android development environment based on IntelliJ
+ IDEA providing new features and improvements over
+ Eclipse ADT and will be the official Android IDE
+ once it's ready.
+ '';
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ edwtjo ];
+ };
+ });
+
+ buildPycharm = { name, version, build, src, license, description }:
+ (mkIdeaProduct rec {
+ inherit name version build src;
+ product = "PyCharm";
+ meta = with stdenv.lib; {
+ homepage = "https://www.jetbrains.com/pycharm/";
+ inherit description license;
+ longDescription = ''
+ Python IDE with complete set of tools for productive
+ development with Python programming language. In addition, the
+ IDE provides high-class capabilities for professional Web
+ development with Django framework and Google App Engine. It
+ has powerful coding assistance, navigation, a lot of
+ refactoring features, tight integration with various Version
+ Control Systems, Unit testing, powerful all-singing
+ all-dancing Debugger and entire customization. PyCharm is
+ developer driven IDE. It was developed with the aim of
+ providing you almost everything you need for your comfortable
+ and productive development!
+ '';
+ maintainers = with maintainers; [ jgeerds ];
+ platforms = platforms.linux;
+ };
+ }).override {
+ propagatedUserEnvPkgs = [ python ];
+ };
+
+ buildIdea = { name, version, build, src, license, description }:
+ (mkIdeaProduct rec {
+ inherit name version build src;
+ product = "IDEA";
+ meta = with stdenv.lib; {
+ homepage = "https://www.jetbrains.com/idea/";
+ inherit description license;
+ longDescription = ''
+ IDE for Java SE, Groovy & Scala development Powerful
+ environment for building Google Android apps Integration
+ with JUnit, TestNG, popular SCMs, Ant & Maven.
+ '';
+ maintainers = with maintainers; [ edwtjo ];
+ platforms = platforms.linux;
+ };
+ });
+
+in
+
+{
+
+ android-studio = buildAndroidStudio rec {
+ name = "android-studio-${version}";
+ version = "0.8.10";
+ build = "135.1428667";
+ description = "Android development environment based on IntelliJ IDEA";
+ license = stdenv.lib.licenses.asl20;
+ src = fetchurl {
+ url = "https://dl.google.com/dl/android/studio/ide-zips/${version}" +
+ "/android-studio-ide-${build}-linux.zip";
+ sha256 = "5736a92ffda24233026ff45a47f1b4f9567ba40347cfa0c9f351112e729b5401";
+ };
+ };
idea-community = buildIdea rec {
name = "idea-community-${version}";
version = "13.1.4b";
build = "IC-135.1230";
description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
- longDescription = ''
- Lightweight IDE for Java SE, Groovy & Scala development
- Powerful environment for building Google Android apps
- Integration with JUnit, TestNG, popular SCMs, Ant & Maven
- Free, open-source, Apache 2 licensed.
- '';
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "http://download-ln.jetbrains.com/idea/ideaIC-${version}.tar.gz";
@@ -90,12 +175,6 @@ in {
version = "13.1.4b";
build = "IU-135.1230";
description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
- longDescription = ''
- Full-featured IDE for JVM-based and polyglot development
- Java EE, Spring/Hibernate and other technologies support
- Deployment and debugging with most application servers
- Duplicate code search, dependency structure matrix, etc.
- '';
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "http://download-ln.jetbrains.com/idea/ideaIU-${version}.tar.gz";
@@ -103,4 +182,52 @@ in {
};
};
-}
+ pycharm-community-313 = buildPycharm rec {
+ name = "pycharm-community-${version}";
+ version = "3.1.3";
+ build = "133.1347";
+ description = "PyCharm 3.1 Community Edition";
+ license = stdenv.lib.licenses.asl20;
+ src = fetchurl {
+ url = "http://download.jetbrains.com/python/${name}.tar.gz";
+ sha256 = "f671ee4c99207c179f168b5b98fa23afe90a94c3a3914367b95a46b0c2881b23";
+ };
+ };
+
+ pycharm-community-341 = buildPycharm rec {
+ name = "pycharm-community-${version}";
+ version = "3.4.1";
+ build = "135.1057";
+ description = "PyCharm 3.4 Community Edition";
+ license = stdenv.lib.licenses.asl20;
+ src = fetchurl {
+ url = "http://download.jetbrains.com/python/${name}.tar.gz";
+ sha256 = "96427b1e842e7c09141ec4d3ede627c5ca7d821c0d6c98169b56a34f9035ef64";
+ };
+ };
+
+ pycharm-professional-313 = buildPycharm rec {
+ name = "pycharm-professional-${version}";
+ version = "3.1.3";
+ build = "133.1347";
+ description = "PyCharm 3.1 Professional Edition";
+ license = stdenv.lib.licenses.unfree;
+ src = fetchurl {
+ url = "http://download.jetbrains.com/python/${name}.tar.gz";
+ sha256 = "e0c2db8f18cb825a95de6ddc4b0b9f93c5643bf34cca9f1b3c2fa37fd7c14f11";
+ };
+ };
+
+ pycharm-professional-341 = buildPycharm rec {
+ name = "pycharm-professional-${version}";
+ version = "3.4.1";
+ build = "135.1057";
+ description = "PyCharm 3.4 Professional Edition";
+ license = stdenv.lib.licenses.unfree;
+ src = fetchurl {
+ url = "http://download.jetbrains.com/python/${name}.tar.gz";
+ sha256 = "e4f85f3248e8985ac9f8c326543f979b47ba1d7ac6b128a2cf2b3eb8ec545d2b";
+ };
+ };
+
+}
\ No newline at end of file
diff --git a/pkgs/applications/editors/idea/pycharm.nix b/pkgs/applications/editors/idea/pycharm.nix
deleted file mode 100644
index 6a2064549bb..00000000000
--- a/pkgs/applications/editors/idea/pycharm.nix
+++ /dev/null
@@ -1,115 +0,0 @@
-{ stdenv, fetchurl, makeDesktopItem, makeWrapper, patchelf, p7zip, jdk
-, coreutils, gnugrep, which, git, python
-}:
-
-let
-
- buildPycharm =
- { name, version, build, src, description, license }:
-
- stdenv.mkDerivation rec {
- inherit name build src;
- desktopItem = makeDesktopItem {
- name = "pycharm";
- exec = "pycharm";
- comment = "Powerful Python and Django IDE";
- desktopName = "PyCharm";
- genericName = "Powerful Python and Django IDE";
- categories = "Application;Development;";
- icon = "pycharm";
- };
-
- buildInputs = [ makeWrapper patchelf p7zip ];
-
- propagatedUserEnvPkgs = [ python ];
-
- patchPhase = ''
- interpreter="$(echo ${stdenv.glibc}/lib/ld-linux*.so.2)"
- snappyPath="lib/snappy-java-1.0.5"
-
- 7z x -o"$snappyPath" "$snappyPath.jar"
- if [ "${stdenv.system}" == "x86_64-linux" ]; then
- patchelf --set-interpreter "$interpreter" bin/fsnotifier64
- patchelf --set-rpath ${stdenv.gcc.gcc}/lib64/ "$snappyPath/org/xerial/snappy/native/Linux/amd64/libsnappyjava.so"
- else
- patchelf --set-interpreter "$interpreter" bin/fsnotifier
- patchelf --set-rpath ${stdenv.gcc.gcc}/lib/ "$snappyPath/org/xerial/snappy/native/Linux/i386/libsnappyjava.so"
- fi
- 7z a -tzip "$snappyPath.jar" ./"$snappyPath"/*
- rm -vr "$snappyPath"
- '';
-
- installPhase = ''
- mkdir -vp "$out/bin" "$out/$name" "$out/share/pixmaps"
- cp -va . "$out/$name"
- ln -s "$out/$name/bin/pycharm.png" "$out/share/pixmaps/"
-
- jdk="${jdk}/lib/openjdk"
- makeWrapper "$out/$name/bin/pycharm.sh" "$out/bin/pycharm" \
- --prefix PATH : "${jdk}/bin:${coreutils}/bin:${gnugrep}/bin:${which}/bin:${git}/bin" \
- --prefix LD_RUN_PATH : "${stdenv.gcc.gcc}/lib/" \
- --prefix JDK_HOME : "$jdk" \
- --prefix PYCHARM_JDK : "$jdk"
-
- cp -a "${desktopItem}"/* "$out"
- '';
-
- meta = with stdenv.lib; {
- homepage = "https://www.jetbrains.com/pycharm/";
- inherit description;
- inherit license;
- maintainers = [ maintainers.jgeerds ];
- platforms = platforms.linux;
- };
- };
-
-in {
-
- pycharm-community-313 = buildPycharm rec {
- name = "pycharm-community-${version}";
- version = "3.1.3";
- build = "133.1347";
- description = "PyCharm 3.1 Community Edition";
- license = stdenv.lib.licenses.asl20;
- src = fetchurl {
- url = "http://download.jetbrains.com/python/${name}.tar.gz";
- sha256 = "f671ee4c99207c179f168b5b98fa23afe90a94c3a3914367b95a46b0c2881b23";
- };
- };
-
- pycharm-community-341 = buildPycharm rec {
- name = "pycharm-community-${version}";
- version = "3.4.1";
- build = "135.1057";
- description = "PyCharm 3.4 Community Edition";
- license = stdenv.lib.licenses.asl20;
- src = fetchurl {
- url = "http://download.jetbrains.com/python/${name}.tar.gz";
- sha256 = "96427b1e842e7c09141ec4d3ede627c5ca7d821c0d6c98169b56a34f9035ef64";
- };
- };
-
- pycharm-professional-313 = buildPycharm rec {
- name = "pycharm-professional-${version}";
- version = "3.1.3";
- build = "133.1347";
- description = "PyCharm 3.1 Professional Edition";
- license = stdenv.lib.licenses.unfree;
- src = fetchurl {
- url = "http://download.jetbrains.com/python/${name}.tar.gz";
- sha256 = "e0c2db8f18cb825a95de6ddc4b0b9f93c5643bf34cca9f1b3c2fa37fd7c14f11";
- };
- };
-
- pycharm-professional-341 = buildPycharm rec {
- name = "pycharm-professional-${version}";
- version = "3.4.1";
- build = "135.1057";
- description = "PyCharm 3.4 Professional Edition";
- license = stdenv.lib.licenses.unfree;
- src = fetchurl {
- url = "http://download.jetbrains.com/python/${name}.tar.gz";
- sha256 = "e4f85f3248e8985ac9f8c326543f979b47ba1d7ac6b128a2cf2b3eb8ec545d2b";
- };
- };
-}
diff --git a/pkgs/applications/editors/kdevelop/default.nix b/pkgs/applications/editors/kdevelop/default.nix
index b815b052347..945a6210e78 100644
--- a/pkgs/applications/editors/kdevelop/default.nix
+++ b/pkgs/applications/editors/kdevelop/default.nix
@@ -3,12 +3,12 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
- version = "4.6.0";
+ version = "4.7.0";
pname = "kdevelop";
src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
- sha256 = "1ee9e7b8c46f575dd29d920cfd6284130f2e738a2e1f52dfd97b075fab2e4c73";
+ sha256 = "68de8f412e8ab6107766f00623e54c458d02825e3a70f5ea9969688f8c77c120";
};
buildInputs = [ kdevplatform kdebase_workspace okteta qjson ];
diff --git a/pkgs/applications/editors/scite/default.nix b/pkgs/applications/editors/scite/default.nix
index 234ee1f065e..b2ac66c1e08 100644
--- a/pkgs/applications/editors/scite/default.nix
+++ b/pkgs/applications/editors/scite/default.nix
@@ -30,6 +30,6 @@ in stdenv.mkDerivation {
description = "SCIntilla based Text Editor";
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.linux;
- maintainers = stdenv.lib.maintainers.rszibele;
+ maintainers = [ stdenv.lib.maintainers.rszibele ];
};
}
diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix
index 3ef557cef4b..87310efc875 100644
--- a/pkgs/applications/editors/sublime3/default.nix
+++ b/pkgs/applications/editors/sublime3/default.nix
@@ -3,7 +3,7 @@
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
let
- build = "3059";
+ build = "3065";
libPath = stdenv.lib.makeLibraryPath [glib xlibs.libX11 gtk cairo pango];
in let
# package with just the binaries
@@ -13,15 +13,15 @@ in let
src =
if stdenv.system == "i686-linux" then
fetchurl {
- name = "sublimetext-3.0.59.tar.bz2";
+ name = "sublimetext-3.0.65.tar.bz2";
url = "http://c758482.r82.cf2.rackcdn.com/sublime_text_3_build_${build}_x32.tar.bz2";
- sha256 = "5ee7b42b5db057108e97b86fd408124fc3f7b56662b2851f59d91f8f0c288088";
+ sha256 = "e25f84fe0d0c02ce71274d334fd42ce6313adcd4ec1d588b165d25f5e93ad78d";
}
else
fetchurl {
- name = "sublimetext-3.0.59.tar.bz2";
+ name = "sublimetext-3.0.65.tar.bz2";
url = "http://c758482.r82.cf2.rackcdn.com/sublime_text_3_build_${build}_x64.tar.bz2";
- sha256 = "da3039687664d33a734cea0151b2291ece9c7f35e5b73df5b2b5eac28a20b972";
+ sha256 = "fe548e6d86d72cd7e90eee9d5396b590ae6e8f8b0dfc661d86c814214e60faea";
};
dontStrip = true;
@@ -56,7 +56,7 @@ in stdenv.mkDerivation {
meta = {
description = "Sophisticated text editor for code, markup and prose";
- maintainers = stdenv.lib.maintainers.wmertens;
+ maintainers = [ stdenv.lib.maintainers.wmertens ];
license = stdenv.lib.licenses.unfree;
};
}
diff --git a/pkgs/applications/editors/vanubi/default.nix b/pkgs/applications/editors/vanubi/default.nix
new file mode 100644
index 00000000000..692a728b12e
--- /dev/null
+++ b/pkgs/applications/editors/vanubi/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, pkgconfig, vala, which, autoconf, automake
+, libtool, glib, gtk3, gnome3, libwnck3, asciidoc, python3Packages }:
+
+stdenv.mkDerivation rec {
+ name = "vanubi-${version}";
+ version = "0.0.14";
+
+ src = fetchurl {
+ url = "https://github.com/vanubi/vanubi/archive/v${version}.tar.gz";
+ sha256 = "0cd45zm54j6xz1a31qllg2w7l77sncv7mrpfx9bjzdiqpmzsdypl";
+ };
+
+ buildInputs = [ pkgconfig vala which autoconf automake
+ libtool glib gtk3 libwnck3 asciidoc
+ gnome3.gtksourceview gnome3.vte python3Packages.pygments ];
+
+ configureScript = "./autogen.sh";
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ homepage = http://vanubi.github.io/vanubi;
+ description = "Programming editor for GTK+ inspired by Emacs";
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.lethalman ];
+ };
+}
diff --git a/pkgs/applications/editors/wxhexeditor/default.nix b/pkgs/applications/editors/wxhexeditor/default.nix
new file mode 100644
index 00000000000..de423987c02
--- /dev/null
+++ b/pkgs/applications/editors/wxhexeditor/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, wxGTK, autoconf, automake, libtool, python, gettext, bash }:
+
+stdenv.mkDerivation rec {
+ name = "wxHexEditor-${version}";
+ version = "v0.22";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/wxhexeditor/${name}-src.tar.bz2";
+ sha256 = "15ir038g4lyw1q5bsay974hvj0nkg2yd9kccwxz808cd45fp411w";
+ };
+
+ buildInputs = [ wxGTK autoconf automake libtool python gettext ];
+
+ patchPhase = ''
+ substituteInPlace Makefile --replace "/usr/local" "$out"
+ substituteInPlace Makefile --replace "mhash; ./configure" "mhash; ./configure --prefix=$out"
+ substituteInPlace udis86/autogen.sh --replace "/bin/bash" "${bash}/bin/bash"
+ '';
+
+ buildPhase = ''
+ make OPTFLAGS="-fopenmp"
+
+ '';
+
+ meta = {
+ description = "Hex Editor / Disk Editor for Huge Files or Devices";
+ longDescription = ''
+ This is not an ordinary hex editor, but could work as low level disk editor too.
+ If you have problems with your HDD or partition, you can recover your data from HDD or
+ from partition via editing sectors in raw hex.
+ You can edit your partition tables or you could recover files from File System by hand
+ with help of wxHexEditor.
+ Or you might want to analyze your big binary files, partitions, devices... If you need
+ a good reverse engineer tool like a good hex editor, you welcome.
+ wxHexEditor could edit HDD/SDD disk devices or partitions in raw up to exabyte sizes.
+ '';
+ homepage = "http://www.wxhexeditor.org/";
+ license = stdenv.lib.licenses.gpl2;
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/applications/editors/zed/default.nix b/pkgs/applications/editors/zed/default.nix
index 585a3a58d5f..4673029ed00 100644
--- a/pkgs/applications/editors/zed/default.nix
+++ b/pkgs/applications/editors/zed/default.nix
@@ -1,19 +1,9 @@
-{ stdenv, buildEnv, fetchgit, xlibs, glib, gtk2, atk, pango, gdk_pixbuf,
- cairo, freetype, fontconfig, nss, nspr, gnome, alsaLib, expat, dbus, udev,
- makeWrapper, writeScript, fetchurl, zip, pkgs, node_webkit }:
+{ stdenv, buildEnv, fetchgit, makeWrapper, writeScript, fetchurl, zip, pkgs
+, node_webkit }:
let
name = "zed-${version}";
- version = "0.12";
-
- rpath_env = buildEnv {
- name = "rpath_env";
- paths = [ xlibs.libX11 xlibs.libXrender glib xlibs.libXtst gtk2 atk pango
- gdk_pixbuf cairo freetype fontconfig xlibs.libXi xlibs.libXcomposite
- nss nspr gnome.GConf xlibs.libXext xlibs.libXfixes alsaLib
- xlibs.libXdamage expat dbus stdenv.gcc ];
- pathsToLink = [ "/lib" "/lib64" ];
- };
+ version = "0.13";
# When upgrading node.nix / node packages:
# fetch package.json from Zed's repository
@@ -29,8 +19,10 @@ let
node_env = buildEnv {
name = "node_env";
- paths = [ nodePackages.tar nodePackages.request ];
+ paths = [ nodePackages."body-parser" nodePackages.express
+ nodePackages.request nodePackages.tar nodePackages.ws ];
pathsToLink = [ "/lib" ];
+ ignoreCollisions = true;
};
zed = stdenv.mkDerivation rec {
@@ -39,7 +31,7 @@ let
src = fetchgit {
url = "git://github.com/zedapp/zed";
rev = "refs/tags/v${version}";
- sha256 = "1l1adj4p916km626vxg1lv0bapzay4z5nq005pxsbjbcycrhds59";
+ sha256 = "023nq4y6dgh57xpsgawdn2zqvfyhjz1p00ldnsfsjajyy4nn6yb1";
};
buildInputs = [ makeWrapper zip ];
@@ -62,14 +54,7 @@ let
'';
postFixup = ''
- patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" $out/zed/zed-bin
- patchelf --set-rpath "${rpath_env}/lib:${rpath_env}/lib64" $out/zed/zed-bin
-
- mkdir -p $out/lib
- ln -s ${udev}/lib/libudev.so.1 $out/lib/libudev.so.0
-
wrapProgram $out/zed/zed-bin \
- --prefix LD_LIBRARY_PATH : $out/lib \
--prefix NODE_PATH : ${node_env}/lib/node_modules
'';
};
diff --git a/pkgs/applications/editors/zed/node.nix b/pkgs/applications/editors/zed/node.nix
index b4a7cec4269..f2c08fde0cd 100644
--- a/pkgs/applications/editors/zed/node.nix
+++ b/pkgs/applications/editors/zed/node.nix
@@ -1,6 +1,27 @@
{ self, fetchurl, fetchgit ? null, lib }:
{
+ by-spec."accepts"."~1.1.0" =
+ self.by-version."accepts"."1.1.0";
+ by-version."accepts"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+ name = "node-accepts-1.1.0";
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/accepts/-/accepts-1.1.0.tgz";
+ name = "accepts-1.1.0.tgz";
+ sha1 = "43ba6d946374c80f91823eaec6bb43dc4955500b";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."accepts" or []);
+ deps = [
+ self.by-version."mime-types"."2.0.1"
+ self.by-version."negotiator"."0.4.7"
+ ];
+ peerDependencies = [
+ ];
+ passthru.names = [ "accepts" ];
+ };
by-spec."asn1"."0.1.11" =
self.by-version."asn1"."0.1.11";
by-version."asn1"."0.1.11" = lib.makeOverridable self.buildNodePackage {
@@ -97,6 +118,34 @@
];
passthru.names = [ "block-stream" ];
};
+ by-spec."body-parser"."^1.6.3" =
+ self.by-version."body-parser"."1.8.1";
+ by-version."body-parser"."1.8.1" = lib.makeOverridable self.buildNodePackage {
+ name = "node-body-parser-1.8.1";
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/body-parser/-/body-parser-1.8.1.tgz";
+ name = "body-parser-1.8.1.tgz";
+ sha1 = "f9f96d221c435c95d18aeaad2bcdea1371902aad";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."body-parser" or []);
+ deps = [
+ self.by-version."bytes"."1.0.0"
+ self.by-version."depd"."0.4.4"
+ self.by-version."iconv-lite"."0.4.4"
+ self.by-version."media-typer"."0.3.0"
+ self.by-version."on-finished"."2.1.0"
+ self.by-version."qs"."2.2.3"
+ self.by-version."raw-body"."1.3.0"
+ self.by-version."type-is"."1.5.1"
+ ];
+ peerDependencies = [
+ ];
+ passthru.names = [ "body-parser" ];
+ };
+ "body-parser" = self.by-version."body-parser"."1.8.1";
by-spec."boom"."0.4.x" =
self.by-version."boom"."0.4.2";
by-version."boom"."0.4.2" = lib.makeOverridable self.buildNodePackage {
@@ -117,6 +166,46 @@
];
passthru.names = [ "boom" ];
};
+ by-spec."buffer-crc32"."0.2.3" =
+ self.by-version."buffer-crc32"."0.2.3";
+ by-version."buffer-crc32"."0.2.3" = lib.makeOverridable self.buildNodePackage {
+ name = "node-buffer-crc32-0.2.3";
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.3.tgz";
+ name = "buffer-crc32-0.2.3.tgz";
+ sha1 = "bb54519e95d107cbd2400e76d0cab1467336d921";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."buffer-crc32" or []);
+ deps = [
+ ];
+ peerDependencies = [
+ ];
+ passthru.names = [ "buffer-crc32" ];
+ };
+ by-spec."bytes"."1" =
+ self.by-version."bytes"."1.0.0";
+ by-version."bytes"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+ name = "node-bytes-1.0.0";
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz";
+ name = "bytes-1.0.0.tgz";
+ sha1 = "3569ede8ba34315fab99c3e92cb04c7220de1fa8";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."bytes" or []);
+ deps = [
+ ];
+ peerDependencies = [
+ ];
+ passthru.names = [ "bytes" ];
+ };
+ by-spec."bytes"."1.0.0" =
+ self.by-version."bytes"."1.0.0";
by-spec."combined-stream"."~0.0.4" =
self.by-version."combined-stream"."0.0.5";
by-version."combined-stream"."0.0.5" = lib.makeOverridable self.buildNodePackage {
@@ -137,6 +226,63 @@
];
passthru.names = [ "combined-stream" ];
};
+ by-spec."commander"."~2.1.0" =
+ self.by-version."commander"."2.1.0";
+ by-version."commander"."2.1.0" = lib.makeOverridable self.buildNodePackage {
+ name = "node-commander-2.1.0";
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/commander/-/commander-2.1.0.tgz";
+ name = "commander-2.1.0.tgz";
+ sha1 = "d121bbae860d9992a3d517ba96f56588e47c6781";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."commander" or []);
+ deps = [
+ ];
+ peerDependencies = [
+ ];
+ passthru.names = [ "commander" ];
+ };
+ by-spec."cookie"."0.1.2" =
+ self.by-version."cookie"."0.1.2";
+ by-version."cookie"."0.1.2" = lib.makeOverridable self.buildNodePackage {
+ name = "node-cookie-0.1.2";
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz";
+ name = "cookie-0.1.2.tgz";
+ sha1 = "72fec3d24e48a3432073d90c12642005061004b1";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."cookie" or []);
+ deps = [
+ ];
+ peerDependencies = [
+ ];
+ passthru.names = [ "cookie" ];
+ };
+ by-spec."cookie-signature"."1.0.5" =
+ self.by-version."cookie-signature"."1.0.5";
+ by-version."cookie-signature"."1.0.5" = lib.makeOverridable self.buildNodePackage {
+ name = "node-cookie-signature-1.0.5";
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.5.tgz";
+ name = "cookie-signature-1.0.5.tgz";
+ sha1 = "a122e3f1503eca0f5355795b0711bb2368d450f9";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."cookie-signature" or []);
+ deps = [
+ ];
+ peerDependencies = [
+ ];
+ passthru.names = [ "cookie-signature" ];
+ };
by-spec."cryptiles"."0.2.x" =
self.by-version."cryptiles"."0.2.2";
by-version."cryptiles"."0.2.2" = lib.makeOverridable self.buildNodePackage {
@@ -176,6 +322,26 @@
];
passthru.names = [ "ctype" ];
};
+ by-spec."debug"."~2.0.0" =
+ self.by-version."debug"."2.0.0";
+ by-version."debug"."2.0.0" = lib.makeOverridable self.buildNodePackage {
+ name = "node-debug-2.0.0";
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/debug/-/debug-2.0.0.tgz";
+ name = "debug-2.0.0.tgz";
+ sha1 = "89bd9df6732b51256bc6705342bba02ed12131ef";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."debug" or []);
+ deps = [
+ self.by-version."ms"."0.6.2"
+ ];
+ peerDependencies = [
+ ];
+ passthru.names = [ "debug" ];
+ };
by-spec."delayed-stream"."0.0.5" =
self.by-version."delayed-stream"."0.0.5";
by-version."delayed-stream"."0.0.5" = lib.makeOverridable self.buildNodePackage {
@@ -195,6 +361,167 @@
];
passthru.names = [ "delayed-stream" ];
};
+ by-spec."depd"."0.4.4" =
+ self.by-version."depd"."0.4.4";
+ by-version."depd"."0.4.4" = lib.makeOverridable self.buildNodePackage {
+ name = "node-depd-0.4.4";
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/depd/-/depd-0.4.4.tgz";
+ name = "depd-0.4.4.tgz";
+ sha1 = "07091fae75f97828d89b4a02a2d4778f0e7c0662";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."depd" or []);
+ deps = [
+ ];
+ peerDependencies = [
+ ];
+ passthru.names = [ "depd" ];
+ };
+ by-spec."destroy"."1.0.3" =
+ self.by-version."destroy"."1.0.3";
+ by-version."destroy"."1.0.3" = lib.makeOverridable self.buildNodePackage {
+ name = "node-destroy-1.0.3";
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz";
+ name = "destroy-1.0.3.tgz";
+ sha1 = "b433b4724e71fd8551d9885174851c5fc377e2c9";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."destroy" or []);
+ deps = [
+ ];
+ peerDependencies = [
+ ];
+ passthru.names = [ "destroy" ];
+ };
+ by-spec."ee-first"."1.0.5" =
+ self.by-version."ee-first"."1.0.5";
+ by-version."ee-first"."1.0.5" = lib.makeOverridable self.buildNodePackage {
+ name = "node-ee-first-1.0.5";
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/ee-first/-/ee-first-1.0.5.tgz";
+ name = "ee-first-1.0.5.tgz";
+ sha1 = "8c9b212898d8cd9f1a9436650ce7be202c9e9ff0";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."ee-first" or []);
+ deps = [
+ ];
+ peerDependencies = [
+ ];
+ passthru.names = [ "ee-first" ];
+ };
+ by-spec."escape-html"."1.0.1" =
+ self.by-version."escape-html"."1.0.1";
+ by-version."escape-html"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+ name = "node-escape-html-1.0.1";
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz";
+ name = "escape-html-1.0.1.tgz";
+ sha1 = "181a286ead397a39a92857cfb1d43052e356bff0";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."escape-html" or []);
+ deps = [
+ ];
+ peerDependencies = [
+ ];
+ passthru.names = [ "escape-html" ];
+ };
+ by-spec."etag"."~1.3.0" =
+ self.by-version."etag"."1.3.0";
+ by-version."etag"."1.3.0" = lib.makeOverridable self.buildNodePackage {
+ name = "node-etag-1.3.0";
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/etag/-/etag-1.3.0.tgz";
+ name = "etag-1.3.0.tgz";
+ sha1 = "c837debfbfe0baf7eb8e2f0bbb3d1d9cc3229697";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."etag" or []);
+ deps = [
+ self.by-version."buffer-crc32"."0.2.3"
+ ];
+ peerDependencies = [
+ ];
+ passthru.names = [ "etag" ];
+ };
+ by-spec."express"."^4.8.3" =
+ self.by-version."express"."4.9.0";
+ by-version."express"."4.9.0" = lib.makeOverridable self.buildNodePackage {
+ name = "node-express-4.9.0";
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/express/-/express-4.9.0.tgz";
+ name = "express-4.9.0.tgz";
+ sha1 = "9b2ea4ebce57c7ac710604c74f6c303ab344a7f3";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."express" or []);
+ deps = [
+ self.by-version."accepts"."1.1.0"
+ self.by-version."buffer-crc32"."0.2.3"
+ self.by-version."cookie-signature"."1.0.5"
+ self.by-version."debug"."2.0.0"
+ self.by-version."depd"."0.4.4"
+ self.by-version."escape-html"."1.0.1"
+ self.by-version."etag"."1.3.0"
+ self.by-version."finalhandler"."0.2.0"
+ self.by-version."fresh"."0.2.4"
+ self.by-version."media-typer"."0.3.0"
+ self.by-version."methods"."1.1.0"
+ self.by-version."on-finished"."2.1.0"
+ self.by-version."parseurl"."1.3.0"
+ self.by-version."path-to-regexp"."0.1.3"
+ self.by-version."proxy-addr"."1.0.1"
+ self.by-version."qs"."2.2.3"
+ self.by-version."range-parser"."1.0.2"
+ self.by-version."send"."0.9.1"
+ self.by-version."serve-static"."1.6.1"
+ self.by-version."type-is"."1.5.1"
+ self.by-version."vary"."1.0.0"
+ self.by-version."cookie"."0.1.2"
+ self.by-version."merge-descriptors"."0.0.2"
+ self.by-version."utils-merge"."1.0.0"
+ ];
+ peerDependencies = [
+ ];
+ passthru.names = [ "express" ];
+ };
+ "express" = self.by-version."express"."4.9.0";
+ by-spec."finalhandler"."0.2.0" =
+ self.by-version."finalhandler"."0.2.0";
+ by-version."finalhandler"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+ name = "node-finalhandler-0.2.0";
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz";
+ name = "finalhandler-0.2.0.tgz";
+ sha1 = "794082424b17f6a4b2a0eda39f9db6948ee4be8d";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."finalhandler" or []);
+ deps = [
+ self.by-version."debug"."2.0.0"
+ self.by-version."escape-html"."1.0.1"
+ ];
+ peerDependencies = [
+ ];
+ passthru.names = [ "finalhandler" ];
+ };
by-spec."forever-agent"."~0.5.0" =
self.by-version."forever-agent"."0.5.2";
by-version."forever-agent"."0.5.2" = lib.makeOverridable self.buildNodePackage {
@@ -236,15 +563,34 @@
];
passthru.names = [ "form-data" ];
};
- by-spec."fstream"."~0.1.28" =
- self.by-version."fstream"."0.1.29";
- by-version."fstream"."0.1.29" = lib.makeOverridable self.buildNodePackage {
- name = "node-fstream-0.1.29";
+ by-spec."fresh"."0.2.4" =
+ self.by-version."fresh"."0.2.4";
+ by-version."fresh"."0.2.4" = lib.makeOverridable self.buildNodePackage {
+ name = "node-fresh-0.2.4";
src = [
(fetchurl {
- url = "http://registry.npmjs.org/fstream/-/fstream-0.1.29.tgz";
- name = "fstream-0.1.29.tgz";
- sha1 = "34d04023ebc91a9df47bd31ab97e4704b4db413f";
+ url = "http://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz";
+ name = "fresh-0.2.4.tgz";
+ sha1 = "3582499206c9723714190edd74b4604feb4a614c";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."fresh" or []);
+ deps = [
+ ];
+ peerDependencies = [
+ ];
+ passthru.names = [ "fresh" ];
+ };
+ by-spec."fstream"."~0.1.28" =
+ self.by-version."fstream"."0.1.31";
+ by-version."fstream"."0.1.31" = lib.makeOverridable self.buildNodePackage {
+ name = "node-fstream-0.1.31";
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz";
+ name = "fstream-0.1.31.tgz";
+ sha1 = "7337f058fbbbbefa8c9f561a28cab0849202c988";
})
];
buildInputs =
@@ -252,7 +598,7 @@
deps = [
self.by-version."graceful-fs"."3.0.2"
self.by-version."inherits"."2.0.1"
- self.by-version."mkdirp"."0.3.5"
+ self.by-version."mkdirp"."0.5.0"
self.by-version."rimraf"."2.2.8"
];
peerDependencies = [
@@ -342,6 +688,25 @@
];
passthru.names = [ "http-signature" ];
};
+ by-spec."iconv-lite"."0.4.4" =
+ self.by-version."iconv-lite"."0.4.4";
+ by-version."iconv-lite"."0.4.4" = lib.makeOverridable self.buildNodePackage {
+ name = "node-iconv-lite-0.4.4";
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.4.tgz";
+ name = "iconv-lite-0.4.4.tgz";
+ sha1 = "e95f2e41db0735fc21652f7827a5ee32e63c83a8";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."iconv-lite" or []);
+ deps = [
+ ];
+ peerDependencies = [
+ ];
+ passthru.names = [ "iconv-lite" ];
+ };
by-spec."inherits"."2" =
self.by-version."inherits"."2.0.1";
by-version."inherits"."2.0.1" = lib.makeOverridable self.buildNodePackage {
@@ -363,6 +728,25 @@
};
by-spec."inherits"."~2.0.0" =
self.by-version."inherits"."2.0.1";
+ by-spec."ipaddr.js"."0.1.2" =
+ self.by-version."ipaddr.js"."0.1.2";
+ by-version."ipaddr.js"."0.1.2" = lib.makeOverridable self.buildNodePackage {
+ name = "node-ipaddr.js-0.1.2";
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.2.tgz";
+ name = "ipaddr.js-0.1.2.tgz";
+ sha1 = "6a1fd3d854f5002965c34d7bbcd9b4a8d4b0467e";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."ipaddr.js" or []);
+ deps = [
+ ];
+ peerDependencies = [
+ ];
+ passthru.names = [ "ipaddr.js" ];
+ };
by-spec."json-stringify-safe"."~5.0.0" =
self.by-version."json-stringify-safe"."5.0.0";
by-version."json-stringify-safe"."5.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -382,7 +766,64 @@
];
passthru.names = [ "json-stringify-safe" ];
};
- by-spec."mime"."~1.2.11" =
+ by-spec."media-typer"."0.3.0" =
+ self.by-version."media-typer"."0.3.0";
+ by-version."media-typer"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+ name = "node-media-typer-0.3.0";
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz";
+ name = "media-typer-0.3.0.tgz";
+ sha1 = "8710d7af0aa626f8fffa1ce00168545263255748";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."media-typer" or []);
+ deps = [
+ ];
+ peerDependencies = [
+ ];
+ passthru.names = [ "media-typer" ];
+ };
+ by-spec."merge-descriptors"."0.0.2" =
+ self.by-version."merge-descriptors"."0.0.2";
+ by-version."merge-descriptors"."0.0.2" = lib.makeOverridable self.buildNodePackage {
+ name = "node-merge-descriptors-0.0.2";
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/merge-descriptors/-/merge-descriptors-0.0.2.tgz";
+ name = "merge-descriptors-0.0.2.tgz";
+ sha1 = "c36a52a781437513c57275f39dd9d317514ac8c7";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."merge-descriptors" or []);
+ deps = [
+ ];
+ peerDependencies = [
+ ];
+ passthru.names = [ "merge-descriptors" ];
+ };
+ by-spec."methods"."1.1.0" =
+ self.by-version."methods"."1.1.0";
+ by-version."methods"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+ name = "node-methods-1.1.0";
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/methods/-/methods-1.1.0.tgz";
+ name = "methods-1.1.0.tgz";
+ sha1 = "5dca4ee12df52ff3b056145986a8f01cbc86436f";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."methods" or []);
+ deps = [
+ ];
+ peerDependencies = [
+ ];
+ passthru.names = [ "methods" ];
+ };
+ by-spec."mime"."1.2.11" =
self.by-version."mime"."1.2.11";
by-version."mime"."1.2.11" = lib.makeOverridable self.buildNodePackage {
name = "node-mime-1.2.11";
@@ -401,27 +842,147 @@
];
passthru.names = [ "mime" ];
};
+ by-spec."mime"."~1.2.11" =
+ self.by-version."mime"."1.2.11";
by-spec."mime"."~1.2.9" =
self.by-version."mime"."1.2.11";
- by-spec."mkdirp"."0.3" =
- self.by-version."mkdirp"."0.3.5";
- by-version."mkdirp"."0.3.5" = lib.makeOverridable self.buildNodePackage {
- name = "node-mkdirp-0.3.5";
+ by-spec."mime-db"."~1.0.1" =
+ self.by-version."mime-db"."1.0.1";
+ by-version."mime-db"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+ name = "node-mime-db-1.0.1";
src = [
(fetchurl {
- url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz";
- name = "mkdirp-0.3.5.tgz";
- sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7";
+ url = "http://registry.npmjs.org/mime-db/-/mime-db-1.0.1.tgz";
+ name = "mime-db-1.0.1.tgz";
+ sha1 = "35d99b0965967253bb30633a7d07a8de9975a952";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."mime-db" or []);
+ deps = [
+ ];
+ peerDependencies = [
+ ];
+ passthru.names = [ "mime-db" ];
+ };
+ by-spec."mime-types"."~2.0.0" =
+ self.by-version."mime-types"."2.0.1";
+ by-version."mime-types"."2.0.1" = lib.makeOverridable self.buildNodePackage {
+ name = "node-mime-types-2.0.1";
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.1.tgz";
+ name = "mime-types-2.0.1.tgz";
+ sha1 = "7f5b4712592e7dd46ca733fd1c5f5d71356de615";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."mime-types" or []);
+ deps = [
+ self.by-version."mime-db"."1.0.1"
+ ];
+ peerDependencies = [
+ ];
+ passthru.names = [ "mime-types" ];
+ };
+ by-spec."mime-types"."~2.0.1" =
+ self.by-version."mime-types"."2.0.1";
+ by-spec."minimist"."0.0.8" =
+ self.by-version."minimist"."0.0.8";
+ by-version."minimist"."0.0.8" = lib.makeOverridable self.buildNodePackage {
+ name = "node-minimist-0.0.8";
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
+ name = "minimist-0.0.8.tgz";
+ sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."minimist" or []);
+ deps = [
+ ];
+ peerDependencies = [
+ ];
+ passthru.names = [ "minimist" ];
+ };
+ by-spec."mkdirp"."0.5" =
+ self.by-version."mkdirp"."0.5.0";
+ by-version."mkdirp"."0.5.0" = lib.makeOverridable self.buildNodePackage {
+ name = "mkdirp-0.5.0";
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz";
+ name = "mkdirp-0.5.0.tgz";
+ sha1 = "1d73076a6df986cd9344e15e71fcc05a4c9abf12";
})
];
buildInputs =
(self.nativeDeps."mkdirp" or []);
deps = [
+ self.by-version."minimist"."0.0.8"
];
peerDependencies = [
];
passthru.names = [ "mkdirp" ];
};
+ by-spec."ms"."0.6.2" =
+ self.by-version."ms"."0.6.2";
+ by-version."ms"."0.6.2" = lib.makeOverridable self.buildNodePackage {
+ name = "node-ms-0.6.2";
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/ms/-/ms-0.6.2.tgz";
+ name = "ms-0.6.2.tgz";
+ sha1 = "d89c2124c6fdc1353d65a8b77bf1aac4b193708c";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."ms" or []);
+ deps = [
+ ];
+ peerDependencies = [
+ ];
+ passthru.names = [ "ms" ];
+ };
+ by-spec."nan"."~1.0.0" =
+ self.by-version."nan"."1.0.0";
+ by-version."nan"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+ name = "node-nan-1.0.0";
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/nan/-/nan-1.0.0.tgz";
+ name = "nan-1.0.0.tgz";
+ sha1 = "ae24f8850818d662fcab5acf7f3b95bfaa2ccf38";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."nan" or []);
+ deps = [
+ ];
+ peerDependencies = [
+ ];
+ passthru.names = [ "nan" ];
+ };
+ by-spec."negotiator"."0.4.7" =
+ self.by-version."negotiator"."0.4.7";
+ by-version."negotiator"."0.4.7" = lib.makeOverridable self.buildNodePackage {
+ name = "node-negotiator-0.4.7";
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/negotiator/-/negotiator-0.4.7.tgz";
+ name = "negotiator-0.4.7.tgz";
+ sha1 = "a4160f7177ec806738631d0d3052325da42abdc8";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."negotiator" or []);
+ deps = [
+ ];
+ peerDependencies = [
+ ];
+ passthru.names = [ "negotiator" ];
+ };
by-spec."node-uuid"."~1.4.0" =
self.by-version."node-uuid"."1.4.1";
by-version."node-uuid"."1.4.1" = lib.makeOverridable self.buildNodePackage {
@@ -460,15 +1021,114 @@
];
passthru.names = [ "oauth-sign" ];
};
- by-spec."punycode".">=0.2.0" =
- self.by-version."punycode"."1.3.0";
- by-version."punycode"."1.3.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-punycode-1.3.0";
+ by-spec."on-finished"."2.1.0" =
+ self.by-version."on-finished"."2.1.0";
+ by-version."on-finished"."2.1.0" = lib.makeOverridable self.buildNodePackage {
+ name = "node-on-finished-2.1.0";
src = [
(fetchurl {
- url = "http://registry.npmjs.org/punycode/-/punycode-1.3.0.tgz";
- name = "punycode-1.3.0.tgz";
- sha1 = "7f5009ef539b9444be5c7a19abd2c3ca49e1731c";
+ url = "http://registry.npmjs.org/on-finished/-/on-finished-2.1.0.tgz";
+ name = "on-finished-2.1.0.tgz";
+ sha1 = "0c539f09291e8ffadde0c8a25850fb2cedc7022d";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."on-finished" or []);
+ deps = [
+ self.by-version."ee-first"."1.0.5"
+ ];
+ peerDependencies = [
+ ];
+ passthru.names = [ "on-finished" ];
+ };
+ by-spec."on-finished"."~2.1.0" =
+ self.by-version."on-finished"."2.1.0";
+ by-spec."options".">=0.0.5" =
+ self.by-version."options"."0.0.5";
+ by-version."options"."0.0.5" = lib.makeOverridable self.buildNodePackage {
+ name = "node-options-0.0.5";
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/options/-/options-0.0.5.tgz";
+ name = "options-0.0.5.tgz";
+ sha1 = "9a3806378f316536d79038038ba90ccb724816c3";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."options" or []);
+ deps = [
+ ];
+ peerDependencies = [
+ ];
+ passthru.names = [ "options" ];
+ };
+ by-spec."parseurl"."~1.3.0" =
+ self.by-version."parseurl"."1.3.0";
+ by-version."parseurl"."1.3.0" = lib.makeOverridable self.buildNodePackage {
+ name = "node-parseurl-1.3.0";
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz";
+ name = "parseurl-1.3.0.tgz";
+ sha1 = "b58046db4223e145afa76009e61bac87cc2281b3";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."parseurl" or []);
+ deps = [
+ ];
+ peerDependencies = [
+ ];
+ passthru.names = [ "parseurl" ];
+ };
+ by-spec."path-to-regexp"."0.1.3" =
+ self.by-version."path-to-regexp"."0.1.3";
+ by-version."path-to-regexp"."0.1.3" = lib.makeOverridable self.buildNodePackage {
+ name = "node-path-to-regexp-0.1.3";
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.3.tgz";
+ name = "path-to-regexp-0.1.3.tgz";
+ sha1 = "21b9ab82274279de25b156ea08fd12ca51b8aecb";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."path-to-regexp" or []);
+ deps = [
+ ];
+ peerDependencies = [
+ ];
+ passthru.names = [ "path-to-regexp" ];
+ };
+ by-spec."proxy-addr"."1.0.1" =
+ self.by-version."proxy-addr"."1.0.1";
+ by-version."proxy-addr"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+ name = "node-proxy-addr-1.0.1";
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.1.tgz";
+ name = "proxy-addr-1.0.1.tgz";
+ sha1 = "c7c566d5eb4e3fad67eeb9c77c5558ccc39b88a8";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."proxy-addr" or []);
+ deps = [
+ self.by-version."ipaddr.js"."0.1.2"
+ ];
+ peerDependencies = [
+ ];
+ passthru.names = [ "proxy-addr" ];
+ };
+ by-spec."punycode".">=0.2.0" =
+ self.by-version."punycode"."1.3.1";
+ by-version."punycode"."1.3.1" = lib.makeOverridable self.buildNodePackage {
+ name = "node-punycode-1.3.1";
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/punycode/-/punycode-1.3.1.tgz";
+ name = "punycode-1.3.1.tgz";
+ sha1 = "710afe5123c20a1530b712e3e682b9118fe8058e";
})
];
buildInputs =
@@ -479,6 +1139,25 @@
];
passthru.names = [ "punycode" ];
};
+ by-spec."qs"."2.2.3" =
+ self.by-version."qs"."2.2.3";
+ by-version."qs"."2.2.3" = lib.makeOverridable self.buildNodePackage {
+ name = "node-qs-2.2.3";
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/qs/-/qs-2.2.3.tgz";
+ name = "qs-2.2.3.tgz";
+ sha1 = "6139c1f47960eff5655e56aab0ef9f6dd16d4eeb";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."qs" or []);
+ deps = [
+ ];
+ peerDependencies = [
+ ];
+ passthru.names = [ "qs" ];
+ };
by-spec."qs"."~0.6.0" =
self.by-version."qs"."0.6.6";
by-version."qs"."0.6.6" = lib.makeOverridable self.buildNodePackage {
@@ -498,6 +1177,48 @@
];
passthru.names = [ "qs" ];
};
+ by-spec."range-parser"."~1.0.0" =
+ self.by-version."range-parser"."1.0.2";
+ by-version."range-parser"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+ name = "node-range-parser-1.0.2";
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz";
+ name = "range-parser-1.0.2.tgz";
+ sha1 = "06a12a42e5131ba8e457cd892044867f2344e549";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."range-parser" or []);
+ deps = [
+ ];
+ peerDependencies = [
+ ];
+ passthru.names = [ "range-parser" ];
+ };
+ by-spec."range-parser"."~1.0.2" =
+ self.by-version."range-parser"."1.0.2";
+ by-spec."raw-body"."1.3.0" =
+ self.by-version."raw-body"."1.3.0";
+ by-version."raw-body"."1.3.0" = lib.makeOverridable self.buildNodePackage {
+ name = "node-raw-body-1.3.0";
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/raw-body/-/raw-body-1.3.0.tgz";
+ name = "raw-body-1.3.0.tgz";
+ sha1 = "978230a156a5548f42eef14de22d0f4f610083d1";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."raw-body" or []);
+ deps = [
+ self.by-version."bytes"."1.0.0"
+ self.by-version."iconv-lite"."0.4.4"
+ ];
+ peerDependencies = [
+ ];
+ passthru.names = [ "raw-body" ];
+ };
by-spec."request"."~2.34.0" =
self.by-version."request"."2.34.0";
by-version."request"."2.34.0" = lib.makeOverridable self.buildNodePackage {
@@ -549,6 +1270,58 @@
];
passthru.names = [ "rimraf" ];
};
+ by-spec."send"."0.9.1" =
+ self.by-version."send"."0.9.1";
+ by-version."send"."0.9.1" = lib.makeOverridable self.buildNodePackage {
+ name = "node-send-0.9.1";
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/send/-/send-0.9.1.tgz";
+ name = "send-0.9.1.tgz";
+ sha1 = "d93689f7c9ce36bd32f8ee572bb60bda032edc23";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."send" or []);
+ deps = [
+ self.by-version."debug"."2.0.0"
+ self.by-version."depd"."0.4.4"
+ self.by-version."destroy"."1.0.3"
+ self.by-version."escape-html"."1.0.1"
+ self.by-version."etag"."1.3.0"
+ self.by-version."fresh"."0.2.4"
+ self.by-version."mime"."1.2.11"
+ self.by-version."ms"."0.6.2"
+ self.by-version."on-finished"."2.1.0"
+ self.by-version."range-parser"."1.0.2"
+ ];
+ peerDependencies = [
+ ];
+ passthru.names = [ "send" ];
+ };
+ by-spec."serve-static"."~1.6.1" =
+ self.by-version."serve-static"."1.6.1";
+ by-version."serve-static"."1.6.1" = lib.makeOverridable self.buildNodePackage {
+ name = "node-serve-static-1.6.1";
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/serve-static/-/serve-static-1.6.1.tgz";
+ name = "serve-static-1.6.1.tgz";
+ sha1 = "2f257563afbe931d28cee4aa3dfeddc975a87193";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."serve-static" or []);
+ deps = [
+ self.by-version."escape-html"."1.0.1"
+ self.by-version."parseurl"."1.3.0"
+ self.by-version."send"."0.9.1"
+ self.by-version."utils-merge"."1.0.0"
+ ];
+ peerDependencies = [
+ ];
+ passthru.names = [ "serve-static" ];
+ };
by-spec."sntp"."0.2.x" =
self.by-version."sntp"."0.2.4";
by-version."sntp"."0.2.4" = lib.makeOverridable self.buildNodePackage {
@@ -584,7 +1357,7 @@
(self.nativeDeps."tar" or []);
deps = [
self.by-version."block-stream"."0.0.7"
- self.by-version."fstream"."0.1.29"
+ self.by-version."fstream"."0.1.31"
self.by-version."inherits"."2.0.1"
];
peerDependencies = [
@@ -592,6 +1365,25 @@
passthru.names = [ "tar" ];
};
"tar" = self.by-version."tar"."0.1.20";
+ by-spec."tinycolor"."0.x" =
+ self.by-version."tinycolor"."0.0.1";
+ by-version."tinycolor"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+ name = "node-tinycolor-0.0.1";
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz";
+ name = "tinycolor-0.0.1.tgz";
+ sha1 = "320b5a52d83abb5978d81a3e887d4aefb15a6164";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."tinycolor" or []);
+ deps = [
+ ];
+ peerDependencies = [
+ ];
+ passthru.names = [ "tinycolor" ];
+ };
by-spec."tough-cookie".">=0.12.0" =
self.by-version."tough-cookie"."0.12.1";
by-version."tough-cookie"."0.12.1" = lib.makeOverridable self.buildNodePackage {
@@ -606,7 +1398,7 @@
buildInputs =
(self.nativeDeps."tough-cookie" or []);
deps = [
- self.by-version."punycode"."1.3.0"
+ self.by-version."punycode"."1.3.1"
];
peerDependencies = [
];
@@ -631,4 +1423,87 @@
];
passthru.names = [ "tunnel-agent" ];
};
+ by-spec."type-is"."~1.5.1" =
+ self.by-version."type-is"."1.5.1";
+ by-version."type-is"."1.5.1" = lib.makeOverridable self.buildNodePackage {
+ name = "node-type-is-1.5.1";
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/type-is/-/type-is-1.5.1.tgz";
+ name = "type-is-1.5.1.tgz";
+ sha1 = "5c1e62d874f79199fb16b34d16972dba376ccbed";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."type-is" or []);
+ deps = [
+ self.by-version."media-typer"."0.3.0"
+ self.by-version."mime-types"."2.0.1"
+ ];
+ peerDependencies = [
+ ];
+ passthru.names = [ "type-is" ];
+ };
+ by-spec."utils-merge"."1.0.0" =
+ self.by-version."utils-merge"."1.0.0";
+ by-version."utils-merge"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+ name = "node-utils-merge-1.0.0";
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz";
+ name = "utils-merge-1.0.0.tgz";
+ sha1 = "0294fb922bb9375153541c4f7096231f287c8af8";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."utils-merge" or []);
+ deps = [
+ ];
+ peerDependencies = [
+ ];
+ passthru.names = [ "utils-merge" ];
+ };
+ by-spec."vary"."~1.0.0" =
+ self.by-version."vary"."1.0.0";
+ by-version."vary"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+ name = "node-vary-1.0.0";
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/vary/-/vary-1.0.0.tgz";
+ name = "vary-1.0.0.tgz";
+ sha1 = "c5e76cec20d3820d8f2a96e7bee38731c34da1e7";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."vary" or []);
+ deps = [
+ ];
+ peerDependencies = [
+ ];
+ passthru.names = [ "vary" ];
+ };
+ by-spec."ws"."~0.4.32" =
+ self.by-version."ws"."0.4.32";
+ by-version."ws"."0.4.32" = lib.makeOverridable self.buildNodePackage {
+ name = "ws-0.4.32";
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/ws/-/ws-0.4.32.tgz";
+ name = "ws-0.4.32.tgz";
+ sha1 = "787a6154414f3c99ed83c5772153b20feb0cec32";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."ws" or []);
+ deps = [
+ self.by-version."commander"."2.1.0"
+ self.by-version."nan"."1.0.0"
+ self.by-version."tinycolor"."0.0.1"
+ self.by-version."options"."0.0.5"
+ ];
+ peerDependencies = [
+ ];
+ passthru.names = [ "ws" ];
+ };
+ "ws" = self.by-version."ws"."0.4.32";
}
diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix
index 32d30cd4745..48839246600 100644
--- a/pkgs/applications/editors/zile/default.nix
+++ b/pkgs/applications/editors/zile/default.nix
@@ -1,14 +1,14 @@
-{ fetchurl, stdenv, ncurses, boehmgc, perl, help2man }:
+{ fetchurl, stdenv, pkgconfig, ncurses, boehmgc, perl, help2man }:
stdenv.mkDerivation rec {
- name = "zile-2.4.9";
+ name = "zile-2.4.11";
src = fetchurl {
url = "mirror://gnu/zile/${name}.tar.gz";
- sha256 = "0j801c28ypm924rw3lqyb6khxyslg6ycrv16wmmwcam0mk3mj6f7";
+ sha256 = "1k593y1xzvlj52q0gyhcx2lllws4sg84b8r9pcginjb1vjypplhz";
};
- buildInputs = [ ncurses boehmgc ];
+ buildInputs = [ pkgconfig ncurses boehmgc ];
nativeBuildInputs = [ help2man perl ];
# `help2man' wants to run Zile, which fails when cross-compiling.
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
# XXX: Work around cross-compilation-unfriendly `gl_FUNC_FSTATAT' macro.
preConfigure = "export gl_cv_func_fstatat_zero_flag=yes";
- meta = {
+ meta = with stdenv.lib; {
description = "Lightweight Emacs clone";
longDescription = ''
@@ -45,8 +45,10 @@ stdenv.mkDerivation rec {
homepage = http://www.gnu.org/software/zile/;
- license = stdenv.lib.licenses.gpl3Plus;
+ license = licenses.gpl3Plus;
- maintainers = [ ];
+ maintainers = with maintainers; [ pSub ];
+
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/misc/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix
similarity index 100%
rename from pkgs/applications/misc/qgis/default.nix
rename to pkgs/applications/gis/qgis/default.nix
diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix
new file mode 100644
index 00000000000..a990e19dbc3
--- /dev/null
+++ b/pkgs/applications/gis/saga/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, gdal, wxGTK30, proj, libiodbc, lzma, jasper,
+ libharu, opencv, vigra, postgresql }:
+
+stdenv.mkDerivation rec {
+ name = "saga-2.1.2";
+
+ buildInputs = [ gdal wxGTK30 proj libharu opencv vigra postgresql libiodbc lzma jasper ];
+
+ enableParallelBuilding = true;
+
+ src = fetchurl {
+ url = "http://sourceforge.net/projects/saga-gis/files/SAGA%20-%202.1/SAGA%202.1.2/saga_2.1.2.tar.gz";
+ sha256 = "51885446f717191210c4b13f0c35a1c5194c9d696d4f9b8f594bc1014809b2f5";
+ };
+
+ meta = {
+ description = "SAGA - System for Automated Geoscientific Analyses";
+ homepage = http://www.saga-gis.org;
+ license = stdenv.lib.licenses.gpl2Plus;
+ maintainers = [ stdenv.lib.maintainers.michelk ];
+ platforms = with stdenv.lib.platforms; linux;
+ broken = true;
+ };
+}
diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix
index a7665177046..0235f892b8d 100644
--- a/pkgs/applications/graphics/freecad/default.nix
+++ b/pkgs/applications/graphics/freecad/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost
- zlib python swig gfortran soqt libf2c makeWrapper matplotlib
+ boost.lib zlib python swig gfortran soqt libf2c makeWrapper matplotlib
pycollada pyside pysideShiboken
];
diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix
index de906e3d844..e914186ac81 100644
--- a/pkgs/applications/graphics/geeqie/default.nix
+++ b/pkgs/applications/graphics/geeqie/default.nix
@@ -1,26 +1,23 @@
-{ stdenv, fetchurl, pkgconfig, gtk, libpng, exiv2, lcms
-, intltool, gettext, libchamplain_0_6, fbida }:
+{ stdenv, fetchgit, pkgconfig, autoconf, automake, gtk, libpng, exiv2, lcms
+, intltool, gettext, libchamplain, fbida }:
stdenv.mkDerivation rec {
- name = "geeqie-1.1";
+ name = "geeqie-${version}";
+ version = "1.2";
- src = fetchurl {
- url = "mirror://sourceforge/geeqie/${name}.tar.gz";
- sha256 = "1kzy39z9505xkayyx7rjj2wda76xy3ch1s5z35zn8yli54ffhi2m";
+ src = fetchgit {
+ url = "git://gitorious.org/geeqie/geeqie.git";
+ rev = "refs/tags/v${version}";
+ sha256 = "1h9w0jrcqcp5jjgmks5pvpppnfxhcd1s3vqlyb3qyil2wfk8n8wp";
};
- preConfigure =
- # XXX: Trick to have Geeqie use the version we have.
- '' sed -i "configure" \
- -e 's/champlain-0.4/champlain-0.6/g ;
- s/champlain-gtk-0.4/champlain-gtk-0.6/g'
- '';
+ preConfigure = "./autogen.sh";
configureFlags = [ "--enable-gps" ];
buildInputs =
- [ pkgconfig gtk libpng exiv2 lcms intltool gettext
- libchamplain_0_6
+ [ pkgconfig autoconf automake gtk libpng exiv2 lcms intltool gettext
+ libchamplain
];
postInstall =
@@ -31,7 +28,7 @@ stdenv.mkDerivation rec {
-e '1 a export PATH=${exiv2}/bin:${fbida}/bin:$PATH'
'';
- meta = {
+ meta = with stdenv.lib; {
description = "Lightweight GTK+ based image viewer";
longDescription =
@@ -45,11 +42,11 @@ stdenv.mkDerivation rec {
initially based on GQview.
'';
- license = stdenv.lib.licenses.gpl2Plus;
+ license = licenses.gpl2Plus;
homepage = http://geeqie.sourceforge.net;
- maintainers = [ ];
- platforms = stdenv.lib.platforms.gnu;
+ maintainers = with maintainers; [ pSub ];
+ platforms = platforms.gnu;
};
}
diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix
index aca4d822c82..bd155c59c6b 100644
--- a/pkgs/applications/graphics/gimp/2.8.nix
+++ b/pkgs/applications/graphics/gimp/2.8.nix
@@ -4,11 +4,11 @@
, python, pygtk, libart_lgpl, libexif, gettext, xlibs, wrapPython }:
stdenv.mkDerivation rec {
- name = "gimp-2.8.10";
+ name = "gimp-2.8.14";
src = fetchurl {
url = "http://download.gimp.org/pub/gimp/v2.8/${name}.tar.bz2";
- sha256 = "1rha8yx0pplfjziqczjrxxp16vsvpmb5ziq3c218s4w9z4cqpzg7";
+ sha256 = "d82a958641c9c752d68e35f65840925c08e314cea90222ad845892a40e05b22d";
};
buildInputs =
diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix
index 35f3bed866d..f204114a581 100644
--- a/pkgs/applications/graphics/k3d/default.nix
+++ b/pkgs/applications/graphics/k3d/default.nix
@@ -1,38 +1,33 @@
-{stdenv, fetchurl
+{ stdenv, fetchurl, unzip, ftgl, glew, asciidoc
, cmake, mesa, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype
, libpng, boost, doxygen, cairomm, pkgconfig, imagemagick, libjpeg, libtiff
-, gettext, intltool, perl, gtkmm, glibmm, gtkglext
-}:
+, gettext, intltool, perl, gtkmm, glibmm, gtkglext, pangox_compat, libXmu }:
stdenv.mkDerivation rec {
- version = "0.8.0.2";
+ version = "0.8.0.3";
name = "k3d-${version}";
src = fetchurl {
- url = "mirror://sourceforge/k3d/k3d-source-0.8.0.2.tar.bz2";
- sha256 = "01fd2qb0zddif3wz1a2wdmwyzn81cf73678qp2gjs8iikmdz6w7x";
+ url = "https://github.com/K-3D/k3d/archive/${name}.zip";
+ sha256 = "09ywwvlk8hh1357pnal96kc40ma4jq7776hqk0609rgz13s6babp";
};
-
- patches = [
- # debian package source
- ./disable_mutable_in_boost_gil.patch
- ./k3d_gtkmm224.patch
- # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-gfx/k3d/files/k3d-0.7.11.0-libpng14.patch
- ./k3d-0.7.11.0-libpng14.patch
- ];
+
+ cmakeFlags = "-DK3D_BUILD_DOCS=false -DK3D_BUILD_GUIDE=false";
preConfigure = ''
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/build/lib"
- export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fpermissive -I$(echo ${gtkglext}/include/gtkglext-*) -I$(echo ${gtkglext}/lib/gtkglext-*/include)"
+ export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${gtkglext}/include/gtkglext-*) -I$(echo ${gtkglext}/lib/gtkglext-*/include)"
'';
buildInputs = [
cmake mesa zlib python expat libxml2 libsigcxx libuuid freetype libpng
- boost doxygen cairomm pkgconfig imagemagick libjpeg libtiff gettext
- intltool perl
- gtkmm glibmm gtkglext
+ boost boost doxygen cairomm pkgconfig imagemagick libjpeg libtiff
+ gettext intltool perl unzip ftgl glew asciidoc
+ gtkmm glibmm gtkglext pangox_compat libXmu
];
- doCheck = false;
+ #doCheck = false;
+
+ enableParallelBuilding = true;
meta = {
description = "A 3D editor with support for procedural editing";
diff --git a/pkgs/applications/graphics/k3d/disable_mutable_in_boost_gil.patch b/pkgs/applications/graphics/k3d/disable_mutable_in_boost_gil.patch
deleted file mode 100644
index 1774328c618..00000000000
--- a/pkgs/applications/graphics/k3d/disable_mutable_in_boost_gil.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/k3dsdk/gil/boost/gil/extension/dynamic_image/apply_operation_base.hpp
-+++ b/k3dsdk/gil/boost/gil/extension/dynamic_image/apply_operation_base.hpp
-@@ -114,7 +114,7 @@
- template
- struct reduce_bind1 {
- const T2& _t2;
-- mutable Op& _op;
-+ Op& _op;
-
- typedef typename Op::result_type result_type;
-
-@@ -127,7 +127,7 @@
- struct reduce_bind2 {
- const Bits1& _bits1;
- std::size_t _index1;
-- mutable Op& _op;
-+ Op& _op;
-
- typedef typename Op::result_type result_type;
-
diff --git a/pkgs/applications/graphics/k3d/k3d-0.7.11.0-libpng14.patch b/pkgs/applications/graphics/k3d/k3d-0.7.11.0-libpng14.patch
deleted file mode 100644
index b54168227b4..00000000000
--- a/pkgs/applications/graphics/k3d/k3d-0.7.11.0-libpng14.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -ur k3d-source-0.7.11.0.orig/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp k3d-source-0.7.11.0/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp
---- k3d-source-0.7.11.0.orig/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp 2009-03-19 22:28:53.000000000 +0200
-+++ k3d-source-0.7.11.0/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp 2010-05-12 12:21:50.000000000 +0300
-@@ -148,12 +148,12 @@
- // allocate/initialize the image information data
- _info_ptr = png_create_info_struct(_png_ptr);
- if (_info_ptr == NULL) {
-- png_destroy_read_struct(&_png_ptr,png_infopp_NULL,png_infopp_NULL);
-+ png_destroy_read_struct(&_png_ptr,NULL,NULL);
- io_error("png_get_file_size: fail to call png_create_info_struct()");
- }
- if (setjmp(png_jmpbuf(_png_ptr))) {
- //free all of the memory associated with the png_ptr and info_ptr
-- png_destroy_read_struct(&_png_ptr, &_info_ptr, png_infopp_NULL);
-+ png_destroy_read_struct(&_png_ptr, &_info_ptr, NULL);
- io_error("png_get_file_size: fail to call setjmp()");
- }
- png_init_io(_png_ptr, get());
-@@ -165,7 +165,7 @@
- png_reader(const char* filename) : file_mgr(filename, "rb") { init(); }
-
- ~png_reader() {
-- png_destroy_read_struct(&_png_ptr,&_info_ptr,png_infopp_NULL);
-+ png_destroy_read_struct(&_png_ptr,&_info_ptr,NULL);
- }
- point2 get_dimensions() {
- return point2(png_get_image_width(_png_ptr,_info_ptr),
-@@ -177,7 +177,7 @@
- int bit_depth, color_type, interlace_type;
- png_get_IHDR(_png_ptr, _info_ptr,
- &width, &height,&bit_depth,&color_type,&interlace_type,
-- int_p_NULL, int_p_NULL);
-+ (int *) NULL, (int *) NULL);
- io_error_if(((png_uint_32)view.width()!=width || (png_uint_32)view.height()!= height),
- "png_read_view: input view size does not match PNG file size");
-
-@@ -219,7 +219,7 @@
- int bit_depth, color_type, interlace_type;
- png_get_IHDR(_png_ptr, _info_ptr,
- &width, &height,&bit_depth,&color_type,&interlace_type,
-- int_p_NULL, int_p_NULL);
-+ (int *) NULL, (int *) NULL);
- io_error_if(((png_uint_32)view.width()!=width || (png_uint_32)view.height()!= height),
- "png_reader_color_convert::apply(): input view size does not match PNG file size");
- switch (color_type) {
-@@ -308,7 +308,7 @@
- io_error_if(!_png_ptr,"png_write_initialize: fail to call png_create_write_struct()");
- _info_ptr = png_create_info_struct(_png_ptr);
- if (!_info_ptr) {
-- png_destroy_write_struct(&_png_ptr,png_infopp_NULL);
-+ png_destroy_write_struct(&_png_ptr,NULL);
- io_error("png_write_initialize: fail to call png_create_info_struct()");
- }
- if (setjmp(png_jmpbuf(_png_ptr))) {
diff --git a/pkgs/applications/graphics/k3d/k3d_gtkmm224.patch b/pkgs/applications/graphics/k3d/k3d_gtkmm224.patch
deleted file mode 100644
index 2484994531f..00000000000
--- a/pkgs/applications/graphics/k3d/k3d_gtkmm224.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/k3dsdk/ngui/main_document_window.cpp
-+++ b/k3dsdk/ngui/main_document_window.cpp
-@@ -1371,7 +1371,7 @@
- Gtk::HBox import_box(false, 5);
- Gtk::Label import_label(_("Choose import plugin:"));
-
-- Gtk::ComboBox import_combo(model);
-+ Gtk::ComboBox import_combo((Glib::RefPtr &) model);
- import_combo.pack_start(columns.icon, false);
- import_combo.pack_start(columns.label);
- import_combo.set_active(0);
-@@ -1461,7 +1461,7 @@
- Gtk::HBox export_box(false, 5);
- Gtk::Label export_label(_("Choose export plugin:"));
-
-- Gtk::ComboBox export_combo(model);
-+ Gtk::ComboBox export_combo((Glib::RefPtr &) model);
- export_combo.pack_start(columns.icon, false);
- export_combo.pack_start(columns.label);
- export_combo.set_active(0);
---- a/k3dsdk/ngui/render.cpp
-+++ b/k3dsdk/ngui/render.cpp
-@@ -169,7 +169,7 @@
- row[columns.separator] = false;
- }
-
-- Gtk::ComboBox combo(model);
-+ Gtk::ComboBox combo((Glib::RefPtr &) model);
-
- combo.pack_start(columns.icon, false);
-
-@@ -295,7 +295,7 @@
- row[columns.separator] = false;
- }
-
-- Gtk::ComboBox combo(model);
-+ Gtk::ComboBox combo((Glib::RefPtr &) model);
-
- combo.pack_start(columns.icon, false);
-
diff --git a/pkgs/applications/graphics/kgraphviewer/default.nix b/pkgs/applications/graphics/kgraphviewer/default.nix
new file mode 100644
index 00000000000..21caf8f8002
--- /dev/null
+++ b/pkgs/applications/graphics/kgraphviewer/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, kdelibs, automoc4, boost, pkgconfig, graphviz, gettext }:
+
+stdenv.mkDerivation rec {
+ name = "kgraphviewer-${version}";
+ version = "2.1.90";
+
+ src = fetchurl {
+ url = "mirror://kde/unstable/kgraphviewer/${version}/src/${name}.tar.xz";
+ sha256 = "13zhjs57xavzrj4nrlqs35n35ihvzij7hgbszf5fhlp2a4d4rrqs";
+ };
+
+ buildInputs = [ kdelibs automoc4 boost pkgconfig graphviz gettext ];
+
+ meta = with stdenv.lib; {
+ description = "A Graphviz dot graph viewer for KDE";
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.lethalman ];
+ };
+}
+
diff --git a/pkgs/applications/graphics/luminance-hdr/default.nix b/pkgs/applications/graphics/luminance-hdr/default.nix
index 7558b0aef4b..7f2d3e24589 100644
--- a/pkgs/applications/graphics/luminance-hdr/default.nix
+++ b/pkgs/applications/graphics/luminance-hdr/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
- buildInputs = [ qt5 boost exiv2 fftwFloat gsl ilmbase lcms2 libraw libtiff openexr ];
+ buildInputs = [ qt5 boost boost.lib exiv2 fftwFloat gsl ilmbase lcms2 libraw libtiff openexr ];
nativeBuildInputs = [ cmake pkgconfig ];
diff --git a/pkgs/applications/graphics/mcomix/default.nix b/pkgs/applications/graphics/mcomix/default.nix
index cc1fe8c3a22..53c564beec7 100644
--- a/pkgs/applications/graphics/mcomix/default.nix
+++ b/pkgs/applications/graphics/mcomix/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
namePrefix = "";
- name = "mcomix-0.98";
+ name = "mcomix-1.00";
src = fetchurl {
url = "mirror://sourceforge/mcomix/${name}.tar.bz2";
- sha256 = "93805b6c8540bd673ac4a6ef6e952f00f8fc10e59a63c7e163324a64db2a6b03";
+ sha256 = "1phcdx1agacdadz8bvbibdbps1apz8idi668zmkky5cpl84k2ifq";
};
doCheck = false;
@@ -28,7 +28,7 @@ buildPythonPackage rec {
'';
homepage = http://mcomix.sourceforge.net/;
-
license = stdenv.lib.licenses.gpl2;
+ maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
};
}
diff --git a/pkgs/applications/graphics/ocrad/default.nix b/pkgs/applications/graphics/ocrad/default.nix
index 201b59ad5e1..ad8735a6dff 100644
--- a/pkgs/applications/graphics/ocrad/default.nix
+++ b/pkgs/applications/graphics/ocrad/default.nix
@@ -1,16 +1,18 @@
-{ fetchurl, stdenv }:
+{ fetchurl, stdenv, lzip, texinfo }:
stdenv.mkDerivation rec {
- name = "ocrad-0.21";
+ name = "ocrad-0.23";
src = fetchurl {
- url = "mirror://gnu/ocrad/${name}.tar.gz";
- sha256 = "1k58ha70r0cqahssx67hfgyzia9ymf691yay06n7nrkbklii3isf";
+ url = "mirror://gnu/ocrad/${name}.tar.lz";
+ sha256 = "0vx0v4sz8ivgcp04zggdq9cv9sb5zxnn7j1nm15cds0zq1wr9g7m";
};
+ buildInputs = [ lzip texinfo ];
+
doCheck = true;
- meta = {
+ meta = with stdenv.lib; {
description = "Optical character recognition (OCR) program & library";
longDescription =
@@ -26,9 +28,9 @@ stdenv.mkDerivation rec {
backend to other programs.
'';
- license = stdenv.lib.licenses.gpl3Plus;
+ license = licenses.gpl3Plus;
- maintainers = [ ];
- platforms = stdenv.lib.platforms.gnu; # arbitrary choice
+ maintainers = with maintainers; [ pSub ];
+ platforms = platforms.gnu; # arbitrary choice
};
}
diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix
index d0a1fb38e0c..f6d7c25b196 100644
--- a/pkgs/applications/graphics/openimageio/default.nix
+++ b/pkgs/applications/graphics/openimageio/default.nix
@@ -4,15 +4,16 @@
stdenv.mkDerivation rec {
name = "oiio-${version}";
- version = "1.4";
+ version = "1.4.13";
src = fetchurl {
- url = "https://github.com/OpenImageIO/oiio/archive/RB-${version}.zip";
- sha256 = "0ldj3hwpz363l1zyzf6c62wc5d2cpbiszlpjvv5w6rrsx2ddbbn1";
+ url = "https://github.com/OpenImageIO/oiio/archive/Release-${version}.zip";
+ sha256 = "1idscm2qqdjgv362l7xk9v162axji7hqh7xdnd3i0wcxwjpgygca";
};
buildInputs = [
- boost cmake ilmbase libjpeg libpng libtiff opencolorio openexr unzip
+ boost boost.lib cmake ilmbase libjpeg libpng libtiff opencolorio openexr
+ unzip
];
cmakeFlags = [
diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix
index d831df5d7b6..67611d2f67c 100644
--- a/pkgs/applications/graphics/openscad/default.nix
+++ b/pkgs/applications/graphics/openscad/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
};
buildInputs = [
- qt4 bison flex eigen boost mesa glew opencsg cgal mpfr gmp glib pkgconfig
+ qt4 bison flex eigen boost boost.lib mesa glew opencsg cgal mpfr gmp glib
+ pkgconfig
];
configurePhase = ''
diff --git a/pkgs/applications/graphics/panotools/default.nix b/pkgs/applications/graphics/panotools/default.nix
index 8e5204ac638..9ca90d2f5df 100644
--- a/pkgs/applications/graphics/panotools/default.nix
+++ b/pkgs/applications/graphics/panotools/default.nix
@@ -1,11 +1,11 @@
{ fetchurl, stdenv, libjpeg, libpng, libtiff, perl }:
stdenv.mkDerivation rec {
- name = "libpano13-2.9.18";
+ name = "libpano13-2.9.19";
src = fetchurl {
url = "mirror://sourceforge/panotools/${name}.tar.gz";
- sha256 = "0wm1r9waa47n482yrl3hnphicdahr581rahgbklk0d2wy51lwpfy";
+ sha256 = "1a4m3plmfcrrplqs9zfzhc5apibn10m5sajpizm1sd3q74w5fwq3";
};
buildInputs = [ perl libjpeg libpng libtiff ];
diff --git a/pkgs/applications/graphics/photivo/default.nix b/pkgs/applications/graphics/photivo/default.nix
index 156966ac46c..12816ba96af 100644
--- a/pkgs/applications/graphics/photivo/default.nix
+++ b/pkgs/applications/graphics/photivo/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
platforms = platforms.linux;
- maintainers = maintainers.mornfall;
+ maintainers = [ maintainers.mornfall ];
};
}
diff --git a/pkgs/applications/graphics/processing/default.nix b/pkgs/applications/graphics/processing/default.nix
new file mode 100644
index 00000000000..ecce0e260bb
--- /dev/null
+++ b/pkgs/applications/graphics/processing/default.nix
@@ -0,0 +1,39 @@
+{ fetchurl, stdenv, ant, jre, makeWrapper, libXxf86vm, which }:
+
+stdenv.mkDerivation rec {
+ name = "processing-${version}";
+ version = "2.2.1";
+
+ src = fetchurl {
+ url = "https://github.com/processing/processing/archive/processing-0227-${version}.tar.gz";
+ sha256 = "1r8q5y0h4gpqap5jwkspc0li6566hzx5chr7hwrdn8mxlzsm50xk";
+ };
+
+ # Stop it trying to download its own version of java
+ patches = [ ./use-nixpkgs-jre.patch ];
+
+ buildInputs = [ ant jre makeWrapper libXxf86vm which ];
+
+ buildPhase = "cd build && ant build";
+
+ installPhase = ''
+ mkdir -p $out/${name}
+ mkdir -p $out/bin
+ cp -r linux/work/* $out/${name}/
+ makeWrapper $out/${name}/processing $out/bin/processing \
+ --prefix PATH : "${jre}/bin:${which}/bin" \
+ --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib
+ makeWrapper $out/${name}/processing-java $out/bin/processing-java \
+ --prefix PATH : "${jre}/bin:${which}/bin" \
+ --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib
+ ln -s ${jre} $out/${name}/java
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A language and IDE for electronic arts";
+ homepage = http://processing.org;
+ license = licenses.gpl2Plus;
+ maintainers = [ maintainers.goibhniu ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/graphics/processing/use-nixpkgs-jre.patch b/pkgs/applications/graphics/processing/use-nixpkgs-jre.patch
new file mode 100644
index 00000000000..8f6a5e2018e
--- /dev/null
+++ b/pkgs/applications/graphics/processing/use-nixpkgs-jre.patch
@@ -0,0 +1,88 @@
+From d1fb63255ff028ecc9cc66d5a6b21b24031b4b4a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?=
+Date: Tue, 26 Aug 2014 00:07:58 +0200
+Subject: [PATCH] patch
+
+---
+ build/build.xml | 42 +++++++++++++++++++++---------------------
+ 1 file changed, 21 insertions(+), 21 deletions(-)
+
+diff --git a/build/build.xml b/build/build.xml
+index 4d0f0b2..c3f5c09 100755
+--- a/build/build.xml
++++ b/build/build.xml
+@@ -640,10 +640,11 @@
+ value="jre-tools-6u37-linux${sun.arch.data.model}.tgz" />
+ -->
+
++
+
+-
++
+
+
+-
+-
+-
++
++
++
+
+
+-
+-
+-
+-
+-
+-
+-
++
++
++
++
++
++
+
+
+-
+-
+-
+-
+-
+-
+-
+-
+-
++
++
++
++
++
++
++
++
++
+
+
+
+--
+2.1.0
+
diff --git a/pkgs/applications/graphics/rapcad/default.nix b/pkgs/applications/graphics/rapcad/default.nix
index 2ff82412409..b314bdaf6ba 100644
--- a/pkgs/applications/graphics/rapcad/default.nix
+++ b/pkgs/applications/graphics/rapcad/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "37c7107dc4fcf8942a4ad35377c4e42e6aedfa35296e5fcf8d84882ae35087c7";
};
- buildInputs = [qt4 cgal boost gmp mpfr flex bison dxflib];
+ buildInputs = [qt4 cgal boost boost.lib gmp mpfr flex bison dxflib];
configurePhase = ''
qmake;
diff --git a/pkgs/applications/graphics/solvespace/default.nix b/pkgs/applications/graphics/solvespace/default.nix
new file mode 100644
index 00000000000..95230291fe9
--- /dev/null
+++ b/pkgs/applications/graphics/solvespace/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchgit,autoconf, automake, gcc, fltk13
+, libjpeg, libpng, libtool, mesa, pkgconfig }:
+
+stdenv.mkDerivation {
+ name = "solvespace-2.0";
+ src = fetchgit {
+ url = "https://gitorious.org/solvespace/solvespace.git";
+ sha256 = "0sakxkmj2f0k27f67wy1xz2skpnwzg15yqrf7av97pgc5s8xb3da";
+ rev = "e587d0e";
+ };
+
+ # e587d0e fails with undefined reference errors if make is called
+ # twice. Ugly workaround: Build while installing.
+ dontBuild = true;
+ enableParallelBuilding = false;
+
+ buildInputs = [
+ autoconf
+ automake
+ gcc
+ fltk13
+ libjpeg
+ libpng
+ libtool
+ mesa
+ pkgconfig
+ stdenv
+ ];
+
+ preConfigure = ''
+ aclocal
+ libtoolize
+
+ autoreconf -i
+ automake --add-missing
+ '';
+
+ meta = {
+ description = "A parametric 3d CAD program.";
+ license = stdenv.lib.licenses.gpl3;
+ maintainers = with stdenv.lib.maintainers; [ the-kenny ];
+ platforms = stdenv.lib.platforms.linux;
+ homepage = http://solvespace.com;
+ };
+}
diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix
index ba7a916e3fe..59ca7b7374d 100644
--- a/pkgs/applications/graphics/synfigstudio/default.nix
+++ b/pkgs/applications/graphics/synfigstudio/default.nix
@@ -26,11 +26,11 @@ let
patches = [ ./synfig-cstring.patch ];
buildInputs = [
- ETL boost cairo gettext glibmm libsigcxx libtool libxmlxx pango
+ ETL boost boost.lib cairo gettext glibmm libsigcxx libtool libxmlxx pango
pkgconfig
];
- configureFlags = [ "--with-boost-libdir=${boost}/lib" ];
+ configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" ];
};
in
stdenv.mkDerivation rec {
diff --git a/pkgs/applications/graphics/xournal/default.nix b/pkgs/applications/graphics/xournal/default.nix
index 1f1c26c1152..162a6748c06 100644
--- a/pkgs/applications/graphics/xournal/default.nix
+++ b/pkgs/applications/graphics/xournal/default.nix
@@ -4,11 +4,11 @@
, pango, libX11, xproto, zlib, poppler, poppler_data
, autoconf, automake, libtool, pkgconfig}:
stdenv.mkDerivation rec {
- version = "0.4.5";
+ version = "0.4.8";
name = "xournal-" + version;
src = fetchurl {
url = "mirror://sourceforge/xournal/${name}.tar.gz";
- sha256 = "1lamfzhby06w2pg56lpv1symdixcwmg6wvi7g6br6la4ak5w5mx7";
+ sha256 = "0c7gjcqhygiyp0ypaipdaxgkbivg6q45vhsj8v5jsi9nh6iqff13";
};
buildInputs = [
@@ -19,14 +19,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoconf automake libtool pkgconfig ];
- # Build with poppler-0.18.x
- patchFlags = "-p0";
-
- patches = [ (fetchurl {
- url = "https://api.opensuse.org/public/source/X11:Utilities/xournal/xournal-poppler-0.18.patch?rev=eca1c0b24f5bc78111147ab8f4688455";
- sha256 = "1q565kqb4bklncriq4dlhp1prhidv88wmxr9k3laykiia0qjmfyj";
- })];
-
NIX_LDFLAGS="-lX11 -lz";
meta = {
diff --git a/pkgs/applications/misc/arbtt/default.nix b/pkgs/applications/misc/arbtt/default.nix
index 27f6c122374..cd3df455c38 100644
--- a/pkgs/applications/misc/arbtt/default.nix
+++ b/pkgs/applications/misc/arbtt/default.nix
@@ -8,8 +8,8 @@
cabal.mkDerivation (self: {
pname = "arbtt";
- version = "0.8.1.2";
- sha256 = "074vb84vkygxamvq7xnwlpgbch6qkbhyzbakc343230p1ryxf62q";
+ version = "0.8.1.4";
+ sha256 = "15ydb425nvqfzajx09q713wy5xa7awbzfjlsidk17vf7qbhfjn7z";
isLibrary = false;
isExecutable = true;
buildDepends = [
diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix
index 0663937c479..1f86a4164f6 100644
--- a/pkgs/applications/misc/audio/sox/default.nix
+++ b/pkgs/applications/misc/audio/sox/default.nix
@@ -4,6 +4,8 @@
, enableLame ? false, lame ? null
, enableLibmad ? true, libmad ? null
, enableLibogg ? true, libogg ? null, libvorbis ? null
+, enableFLAC ? true, flac ? null
+, enablePNG ? true, libpng ? null
}:
with stdenv.lib;
@@ -21,7 +23,9 @@ stdenv.mkDerivation rec {
optional enableLibao libao ++
optional enableLame lame ++
optional enableLibmad libmad ++
- optionals enableLibogg [ libogg libvorbis ];
+ optionals enableLibogg [ libogg libvorbis ] ++
+ optional enableFLAC flac ++
+ optional enablePNG libpng;
meta = {
description = "Sample Rate Converter for audio";
diff --git a/pkgs/applications/misc/batti/default.nix b/pkgs/applications/misc/batti/default.nix
new file mode 100644
index 00000000000..9bf481189e3
--- /dev/null
+++ b/pkgs/applications/misc/batti/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchurl
+, pkgconfig, gettext, python
+, gtk, pygtk, dbus_python
+, gdk_pixbuf, upower
+, makeWrapper }:
+
+stdenv.mkDerivation rec {
+
+ name = "batti-${version}";
+ version = "0.3.8";
+
+ src = fetchurl {
+ url = "https://batti-gtk.googlecode.com/files/${name}.tar.gz";
+ sha256 = "072d92gpsiiin631589nj77i2w1425p6db0qxyml7myscfy9jgx6";
+ };
+
+ buildInputs = with stdenv.lib;
+ [ pkgconfig gettext python gtk pygtk dbus_python gdk_pixbuf upower makeWrapper ];
+
+ configurePhase = "true";
+
+ buildPhase = ''
+ python setup.py build
+ '';
+
+ installPhase = ''
+ python setup.py install --prefix $out
+ wrapProgram "$out/bin/batti" \
+ --set PYTHONPATH "$PYTHONPATH:$(toPythonPath $out)" \
+ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+ --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+ '';
+
+
+ meta = with stdenv.lib; {
+ description = "An {UPower,GTK}-based battery monitor for the system tray";
+ longDescription = ''
+ Batti is a simple battery monitor for the system tray. Batti
+ uses UPower, and if that is missing DeviceKit.Power, for it's
+ power information.
+ '';
+ homepage = http://batti-gtk.googlecode.com/;
+ license = licenses.lgpl2Plus;
+ maintainers = [ maintainers.AndersonTorres ];
+ platforms = platforms.linux;
+ };
+}
+
+# TODO: fix the "icon not found" problems...
diff --git a/pkgs/applications/misc/bitcoin/altcoins.nix b/pkgs/applications/misc/bitcoin/altcoins.nix
new file mode 100644
index 00000000000..2643094e2f1
--- /dev/null
+++ b/pkgs/applications/misc/bitcoin/altcoins.nix
@@ -0,0 +1,83 @@
+{ fetchurl, stdenv, pkgconfig
+, openssl, db48, boost, zlib, miniupnpc, qt4, qrencode, glib, protobuf
+, utillinux, autogen, autoconf, autobuild, automake, db }:
+
+with stdenv.lib;
+
+let
+ buildAltcoin = makeOverridable ({walletName, gui ? true, ...}@a:
+ stdenv.mkDerivation ({
+ name = "${walletName}${toString (optional (!gui) "d")}-${a.version}";
+ buildInputs = [ openssl db48 boost zlib miniupnpc ]
+ ++ optionals gui [ qt4 qrencode ] ++ a.extraBuildInputs or [];
+
+ configurePhase = optional gui "qmake";
+
+ preBuild = optional (!gui) "cd src";
+ makefile = optional (!gui) "makefile.unix";
+
+ installPhase = if gui then ''
+ install -D "${walletName}-qt" "$out/bin/${walletName}-qt"
+ '' else ''
+ install -D "${walletName}d" "$out/bin/${walletName}d"
+ '';
+
+ passthru.walletName = walletName;
+
+ meta = {
+ platforms = platforms.unix;
+ license = license.mit;
+ maintainers = [ maintainers.offline ];
+ };
+ } // a)
+ );
+
+in rec {
+ inherit buildAltcoin;
+
+ litecoin = buildAltcoin rec {
+ walletName = "litecoin";
+ version = "0.8.5.3-rc3";
+
+ src = fetchurl {
+ url = "https://github.com/litecoin-project/litecoin/archive/v${version}.tar.gz";
+ sha256 = "1z4a7bm3z9kd7n0s38kln31z8shsd32d5d5v3br5p0jlnr5g3lk7";
+ };
+
+ meta = {
+ description = "Litecoin is a lite version of Bitcoin using scrypt as a proof-of-work algorithm.";
+ longDescription= ''
+ Litecoin is a peer-to-peer Internet currency that enables instant payments
+ to anyone in the world. It is based on the Bitcoin protocol but differs
+ from Bitcoin in that it can be efficiently mined with consumer-grade hardware.
+ Litecoin provides faster transaction confirmations (2.5 minutes on average)
+ and uses a memory-hard, scrypt-based mining proof-of-work algorithm to target
+ the regular computers and GPUs most people already have.
+ The Litecoin network is scheduled to produce 84 million currency units.
+ '';
+ homepage = https://litecoin.org/;
+ };
+ };
+ litecoind = litecoin.override { gui = false; };
+
+ namecoin = buildAltcoin rec {
+ walletName = "namecoin";
+ version = "0.3.51.00";
+ gui = false;
+
+ src = fetchurl {
+ url = "https://github.com/namecoin/namecoin/archive/nc${version}.tar.gz";
+ sha256 = "0r6zjzichfjzhvpdy501gwy9h3zvlla3kbgb38z1pzaa0ld9siyx";
+ };
+
+ patches = [ ./namecoin_dynamic.patch ];
+
+ extraBuildInputs = [ glib ];
+
+ meta = {
+ description = "Namecoin is a decentralized key/value registration and transfer system based on Bitcoin technology.";
+ homepage = http://namecoin.info;
+ };
+ };
+
+}
diff --git a/pkgs/applications/misc/bitcoin/default.nix b/pkgs/applications/misc/bitcoin/default.nix
index d7c1fbc487b..2b68c58b12d 100644
--- a/pkgs/applications/misc/bitcoin/default.nix
+++ b/pkgs/applications/misc/bitcoin/default.nix
@@ -1,19 +1,21 @@
{ fetchurl, stdenv, openssl, db48, boost, zlib, miniupnpc, qt4, utillinux
-, pkgconfig, protobuf, qrencode }:
+, pkgconfig, protobuf, qrencode, gui ? true }:
+
+with stdenv.lib;
stdenv.mkDerivation rec {
version = "0.9.2.1";
- name = "bitcoin-${version}";
+ name = "bitcoin${toString (optional (!gui) "d")}-${version}";
src = fetchurl {
- url = "https://bitcoin.org/bin/${version}/${name}-linux.tar.gz";
+ url = "https://bitcoin.org/bin/${version}/bitcoin-${version}-linux.tar.gz";
sha256 = "0060f7d38b98113ab912d4c184000291d7f026eaf77ca5830deec15059678f54";
};
# hexdump from utillinux is required for tests
buildInputs = [
- openssl db48 boost zlib miniupnpc qt4 utillinux pkgconfig protobuf qrencode
- ];
+ openssl db48 boost zlib miniupnpc utillinux pkgconfig protobuf
+ ] ++ optionals gui [ qt4 qrencode ];
unpackPhase = ''
mkdir tmp-extract && (cd tmp-extract && tar xf $src)
@@ -34,6 +36,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ passthru.walletName = "bitcoin";
+
meta = {
description = "Peer-to-peer electronic cash system";
longDescription= ''
@@ -43,7 +47,7 @@ stdenv.mkDerivation rec {
with each other, with the help of a P2P network to check for double-spending.
'';
homepage = "http://www.bitcoin.org/";
- maintainers = [ stdenv.lib.maintainers.roconnor ];
- license = stdenv.lib.licenses.mit;
+ maintainers = [ maintainers.roconnor ];
+ license = licenses.mit;
};
}
diff --git a/pkgs/applications/misc/bitcoin/dogecoin.nix b/pkgs/applications/misc/bitcoin/dogecoin.nix
new file mode 100644
index 00000000000..7ace3c161c7
--- /dev/null
+++ b/pkgs/applications/misc/bitcoin/dogecoin.nix
@@ -0,0 +1,71 @@
+{ fetchurl, stdenv, pkgconfig
+, openssl, boost, zlib, miniupnpc, qt4, qrencode, glib, protobuf
+, utillinux, autogen, autoconf, autobuild, automake, db }:
+
+with stdenv.lib;
+
+let
+
+ mkAutotoolCoin =
+ { name, version, withGui, src, meta }:
+
+ stdenv.mkDerivation {
+ inherit src meta;
+
+ name = name + (toString (optional (!withGui) "d")) + "-" + version;
+
+ buildInputs = [ autogen autoconf automake pkgconfig openssl
+ boost zlib miniupnpc db utillinux protobuf ]
+ ++ optionals withGui [ qt4 qrencode ];
+
+ patchPhase = ''
+ sed -i \
+ -e 's,BDB_CPPFLAGS=$,BDB_CPPFLAGS="-I${db}/include",g' \
+ -e 's,BDB_LIBS=$,BDB_LIBS="-L${db}/lib",g' \
+ -e 's,bdbdirlist=$,bdbdirlist="${db}/include",g' \
+ src/m4/dogecoin_find_bdb51.m4
+ '';
+
+ configurePhase = ''
+ ./autogen.sh \
+ && ./configure --prefix=$out \
+ --with-incompatible-bdb \
+ --with-boost-libdir=${boost}/lib \
+ ${ if withGui then "--with-gui" else "" }
+ '';
+
+ installPhase = ''
+ install -D "src/dogecoin-cli" "$out/bin/dogecoin-cli"
+ install -D "src/dogecoind" "$out/bin/dogecoind"
+ ${ if withGui then "install -D src/qt/dogecoin-qt $out/bin/dogecoin-qt" else "" }
+ '';
+
+ };
+
+ mkDogeCoin = { withGui }:
+
+ mkAutotoolCoin rec {
+ name = "dogecoin";
+ version = "1.8.0";
+ inherit withGui;
+
+ src = fetchurl {
+ url = "https://github.com/dogecoin/dogecoin/archive/v${version}.tar.gz";
+ sha256 = "8a33958c04213cd621aa3c86910477813af22512f03b47c98995d20d31f3f935";
+ };
+
+ meta = {
+ description = "Wow, such coin, much shiba, very rich";
+ longDescription = "wow";
+ homepage = http://www.dogecoin.com/;
+ license = licenses.mit;
+ maintainers = with maintainers; [ edwtjo offline ];
+ };
+ };
+
+in {
+
+ dogecoin = mkDogeCoin { withGui = true; };
+ dogecoind = mkDogeCoin { withGui = false; };
+
+}
diff --git a/pkgs/applications/misc/bitcoin/namecoin_dynamic.patch b/pkgs/applications/misc/bitcoin/namecoin_dynamic.patch
new file mode 100644
index 00000000000..ef4184ede73
--- /dev/null
+++ b/pkgs/applications/misc/bitcoin/namecoin_dynamic.patch
@@ -0,0 +1,11 @@
+diff -u -r a/src/makefile.unix b/src/makefile.unix
+--- a/src/makefile.unix 2014-01-22 22:07:59.801601964 -0800
++++ b/src/makefile.unix 2014-01-22 22:08:07.980332839 -0800
+@@ -12,7 +12,6 @@
+
+ # for boost 1.37, add -mt to the boost libraries
+ LIBS= \
+- -Wl,-Bstatic \
+ -l boost_system \
+ -l boost_filesystem \
+ -l boost_program_options \
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index 24a3fcd4cea..808ef8d593d 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -9,15 +9,15 @@
with lib;
stdenv.mkDerivation rec {
- name = "blender-2.71";
+ name = "blender-2.72";
src = fetchurl {
url = "http://download.blender.org/source/${name}.tar.gz";
- sha256 = "12aqdrpl86xjk2xdwj2nbfcmdzyv61n443gw6j2japffm1kmlz8x";
+ sha256 = "0wydh5bs1pxnx3ya65lfy3val1s8wz027a5kb4va6wg3aqnwlvlv";
};
buildInputs =
- [ SDL boost cmake ffmpeg gettext glew ilmbase libXi
+ [ SDL boost boost.lib cmake ffmpeg gettext glew ilmbase libXi
libjpeg libpng libsamplerate libsndfile libtiff mesa openal
opencolorio openexr openimageio /* openjpeg */ python zlib fftw
]
@@ -30,8 +30,7 @@ stdenv.mkDerivation rec {
'';
cmakeFlags =
- [ "-DOPENEXR_INC=${openexr}/include/OpenEXR"
- "-DWITH_OPENCOLLADA=OFF"
+ [ "-DWITH_OPENCOLLADA=OFF"
"-DWITH_MOD_OCEANSIM=ON"
"-DWITH_CODEC_FFMPEG=ON"
"-DWITH_CODEC_SNDFILE=ON"
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 190b57e1070..a9f4071caae 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,11 +5,11 @@
}:
stdenv.mkDerivation rec {
- name = "calibre-2.0.0";
+ name = "calibre-2.5.0";
src = fetchurl {
url = "mirror://sourceforge/calibre/${name}.tar.xz";
- sha256 = "1fpn8icfyag2ybj2ywd81sva56ycsin56gyap5m9j5crx63p4c91";
+ sha256 = "0zl2rpwn5xdgwm4ffb5pizk3247wfghl8ilz0i80hyp36zzxgl8p";
};
inherit python;
diff --git a/pkgs/applications/misc/camlistore/default.nix b/pkgs/applications/misc/camlistore/default.nix
index 9adac335c0c..a39a46222f1 100644
--- a/pkgs/applications/misc/camlistore/default.nix
+++ b/pkgs/applications/misc/camlistore/default.nix
@@ -1,12 +1,12 @@
{ stdenv, lib, go, fetchurl }:
stdenv.mkDerivation rec {
- version = "0.7";
+ version = "0.8";
name = "camlistore-${version}";
src = fetchurl {
- url = "https://github.com/bradfitz/camlistore/archive/0.7.tar.gz";
- sha256 = "0lc35x2b9llrnma0m5czivly0c3l4lh3ldw9hwn83lkh8n0bzn11";
+ url = "https://github.com/bradfitz/camlistore/archive/${version}.tar.gz";
+ sha256 = "03y5zs4i9lx93apqqqfgmbxamk06z3w1q763qp0lvb15mq45gdv1";
};
buildInputs = [ go ];
diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix
index 937025c0840..c290cdfb690 100644
--- a/pkgs/applications/misc/cura/default.nix
+++ b/pkgs/applications/misc/cura/default.nix
@@ -1,15 +1,14 @@
-{ stdenv, python27Packages, curaengine, makeDesktopItem, fetchgit }:
+{ stdenv, python27Packages, curaengine, makeDesktopItem, fetchurl }:
let
- py = python27Packages;
+ py = python27Packages;
+ version = "14.07";
in
stdenv.mkDerivation rec {
- name = "cura";
+ name = "cura-${version}";
- src = fetchgit {
- url = "https://github.com/daid/Cura";
- rev = "58414695269d60ca9b165e8cbc3424933ed79403";
- sha256 = "1nxrrz8sjjx9i9cyvz15vay6yarnywp3vlk7qzr65sw88lzxgq23";
- fetchSubmodules = false;
+ src = fetchurl {
+ url = "https://github.com/daid/Cura/archive/${version}.tar.gz";
+ sha256 = "1jfgkb2qh1syakcssk66yhnfjm9p9qcx48v34bbza9nryrdlmxdb";
};
desktopItem = makeDesktopItem {
@@ -22,7 +21,7 @@ stdenv.mkDerivation rec {
categories = "GNOME;GTK;Utility;";
};
- python_deps = [ py.pyopengl py.pyserial py.numpy py.wxPython30 py.power py.setuptools ];
+ python_deps = with py; [ pyopengl pyserial numpy wxPython30 power setuptools ];
pythonPath = python_deps;
@@ -67,5 +66,6 @@ stdenv.mkDerivation rec {
homepage = https://github.com/daid/Cura;
license = licenses.agpl3;
platforms = platforms.linux;
+ maintainers = with stdenv.lib.maintainers; [ the-kenny ];
};
}
diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix
index 256d337f679..bb818e9236c 100644
--- a/pkgs/applications/misc/curaengine/default.nix
+++ b/pkgs/applications/misc/curaengine/default.nix
@@ -1,22 +1,25 @@
-{ stdenv, fetchgit }:
+{ stdenv, fetchurl }:
+let
+ version = "14.03";
+in
stdenv.mkDerivation {
- name = "curaengine";
+ name = "curaengine-${version}";
- src = fetchgit {
- url = "https://github.com/Ultimaker/CuraEngine";
- rev = "62667ff2e7479b55d75e3d1dc9136242adf4a6a0";
- sha256 = "0c68xmnq4c49vzg2cyqb375kc72rcnghj21wp3919w8sfwil00vr";
- };
+ src = fetchurl {
+ url = "https://github.com/Ultimaker/CuraEngine/archive/${version}.tar.gz";
+ sha256 = "0f37jk6w3zd9x29c1rydqmfdzybx9nbmwdi3y3nzynq1vq7zmxcc";
+ };
- installPhase = ''
- mkdir -p $out/bin
- cp CuraEngine $out/bin/
- '';
+ installPhase = ''
+ mkdir -p $out/bin
+ cp CuraEngine $out/bin/
+ '';
- meta = with stdenv.lib; {
- description = "Engine for processing 3D models into 3D printing instructions";
- homepage = https://github.com/Ultimaker/CuraEngine;
- license = licenses.agpl3;
- platforms = platforms.linux;
- };
+ meta = with stdenv.lib; {
+ description = "Engine for processing 3D models into 3D printing instructions";
+ homepage = https://github.com/Ultimaker/CuraEngine;
+ license = licenses.agpl3;
+ platforms = platforms.linux;
+ maintainers = with stdenv.lib.maintainers; [ the-kenny ];
+ };
}
diff --git a/pkgs/applications/misc/evilvte/default.nix b/pkgs/applications/misc/evilvte/default.nix
new file mode 100644
index 00000000000..5921cc308b5
--- /dev/null
+++ b/pkgs/applications/misc/evilvte/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchgit, makeWrapper, pkgconfig,
+ gnome, glib, pango, cairo, gdk_pixbuf, atk, freetype, xlibs,
+ configH
+}:
+
+stdenv.mkDerivation rec {
+ name = "evilvte-${version}";
+ version = "0.5.2-20140827";
+
+ src = fetchgit {
+ url = https://github.com/caleb-/evilvte.git;
+ rev = "8dfa41e26bc640dd8d8c7317ff7d04e3c01ded8a";
+ sha256 = "70f1d4234d077121e2223a735d749d1b53f0b84393507b635b8a37c3716e94d3";
+ };
+
+ buildInputs = [
+ gnome.vte glib pango gnome.gtk cairo gdk_pixbuf atk freetype xlibs.libX11
+ xlibs.xproto xlibs.kbproto xlibs.libXext xlibs.xextproto makeWrapper pkgconfig
+ ];
+
+ buildPhase = ''
+ cat >src/config.h < $out/bin/nb << EOF
+ #!${bash}/bin/bash
+ $out/nb "\$@"
+ EOF
+ chmod 755 $out/bin/nb
+ '';
+
+ meta = {
+ description = "Small weblog engine written in Bash for the command line";
+ homepage = http://nanoblogger.sourceforge.net/;
+ license = stdenv.lib.licenses.gpl2;
+ };
+}
diff --git a/pkgs/applications/misc/notify-osd/default.nix b/pkgs/applications/misc/notify-osd/default.nix
new file mode 100644
index 00000000000..dfeae77d343
--- /dev/null
+++ b/pkgs/applications/misc/notify-osd/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, pkgconfig, glib, libwnck3, libnotify, dbus_glib, makeWrapper, gnome3 }:
+
+stdenv.mkDerivation rec {
+ name = "notify-osd-${version}";
+ version = "0.9.34";
+
+ src = fetchurl {
+ url = "https://launchpad.net/notify-osd/precise/${version}/+download/notify-osd-${version}.tar.gz";
+ sha256 = "0g5a7a680b05x27apz0y1ldl5csxpp152wqi42s107jymbp0s20j";
+ };
+
+ buildInputs = [
+ pkgconfig glib libwnck3 libnotify dbus_glib makeWrapper
+ gnome3.gsettings_desktop_schemas
+ ];
+
+ configureFlags = "--libexecdir=$(out)/bin";
+
+ preFixup = ''
+ wrapProgram "$out/bin/notify-osd" \
+ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Daemon that displays passive pop-up notifications";
+ homepage = https://launchpad.net/notify-osd;
+ license = licenses.gpl3;
+ maintainers = [ maintainers.bodil ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/misc/openbox-menu/default.nix b/pkgs/applications/misc/openbox-menu/default.nix
new file mode 100644
index 00000000000..6055997b28e
--- /dev/null
+++ b/pkgs/applications/misc/openbox-menu/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, glib, gtk, menu-cache }:
+
+stdenv.mkDerivation rec {
+ name = "openbox-menu-0.5.1";
+
+ src = fetchurl {
+ url = "https://bitbucket.org/fabriceT/openbox-menu/downloads/${name}.tar.bz2";
+ sha256 = "11v3nlhqcnks5vms1a7rrvwvj8swc9axgjkp7z0r97lijsg6d3rj";
+ };
+
+ buildInputs = [ pkgconfig glib gtk menu-cache ];
+
+ patches = [ ./with-svg.patch ];
+
+ installPhase = "make install prefix=$out";
+
+ meta = {
+ description = "Dynamic XDG menu generator for Openbox";
+ homepage = "http://mimasgpc.free.fr/openbox-menu.html";
+ license = stdenv.lib.licenses.gpl3;
+ maintainers = [ stdenv.lib.maintainers.romildo ];
+ platforms = stdenv.lib.platforms.unix;
+ };
+}
diff --git a/pkgs/applications/misc/openbox-menu/with-svg.patch b/pkgs/applications/misc/openbox-menu/with-svg.patch
new file mode 100644
index 00000000000..dd6710f5cfc
--- /dev/null
+++ b/pkgs/applications/misc/openbox-menu/with-svg.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.old 2013-12-11 06:39:44.397358610 +0100
++++ b/Makefile 2013-12-11 06:39:51.082275037 +0100
+@@ -7,7 +7,7 @@
+ CFLAGS+=-DWITH_ICONS
+ # Uncomment this line if Openbox can display SVG icons
+ # Check SVG support with '$ ldd /usr/bin/openbox | grep svg', librsvg must appear..
+-# CFLAGS+=-DWITH_SVG
++CFLAGS+=-DWITH_SVG
+
+ prefix= /usr/local
+ DESTDIR ?= $(prefix)
diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/pkgs/applications/misc/pcmanfm/default.nix
index f7180097961..d7577987a17 100644
--- a/pkgs/applications/misc/pcmanfm/default.nix
+++ b/pkgs/applications/misc/pcmanfm/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchurl, glib, gtk, intltool, libfm, libX11, pango, pkgconfig }:
stdenv.mkDerivation {
- name = "pcmanfm-1.2.0";
+ name = "pcmanfm-1.2.2";
src = fetchurl {
- url = "mirror://sourceforge/pcmanfm/pcmanfm-1.2.0.tar.xz";
- sha256 = "1cmskj7dpjgrrn89z7cc1h1nsmd6qq3bakf207ldrhrxxv3fxl2j";
+ url = "mirror://sourceforge/pcmanfm/pcmanfm-1.2.2.tar.xz";
+ sha256 = "00wmbqrbcrxk1mcdkgdl8ddf3gp28rm5mamqdq72sfr0q2d0287n";
};
buildInputs = [ glib gtk intltool libfm libX11 pango pkgconfig ];
diff --git a/pkgs/applications/misc/pinfo/default.nix b/pkgs/applications/misc/pinfo/default.nix
index d8dba39ccb5..658ff410d37 100644
--- a/pkgs/applications/misc/pinfo/default.nix
+++ b/pkgs/applications/misc/pinfo/default.nix
@@ -1,12 +1,23 @@
-{stdenv, fetchurl, ncurses, readline}:
+{ stdenv, fetchurl, autoreconfHook, gettext, texinfo, ncurses, readline }:
stdenv.mkDerivation {
- name = "pinfo-0.6.9";
- src = fetchurl {
- url = https://alioth.debian.org/frs/download.php/1498/pinfo-0.6.9.tar.bz2;
- sha256 = "1rbsz1y7nyz6ax9xfkw5wk6pnrhvwz2xcm0wnfnk4sb2wwq760q3";
- };
- buildInputs = [ncurses readline];
+ name = "pinfo-0.6.10";
- configureFlags = "--with-curses=${ncurses} --with-readline=${readline}";
+ src = fetchurl {
+ # homepage needed you to login to download the tarball
+ url = "http://pkgs.fedoraproject.org/repo/pkgs/pinfo/pinfo-0.6.10.tar.bz2"
+ + "/fe3d3da50371b1773dfe29bf870dbc5b/pinfo-0.6.10.tar.bz2";
+ sha256 = "0p8wyrpz9npjcbx6c973jspm4c3xz4zxx939nngbq49xqah8088j";
+ };
+
+ buildInputs = [ autoreconfHook gettext texinfo ncurses readline ];
+
+ configureFlags = [ "--with-curses=${ncurses}" "--with-readline=${readline}" ];
+
+ meta = with stdenv.lib; {
+ description = "A viewer for info files";
+ homepage = https://alioth.debian.org/projects/pinfo/;
+ license = licenses.gpl2Plus;
+ };
}
+
diff --git a/pkgs/applications/misc/pstree/default.nix b/pkgs/applications/misc/pstree/default.nix
index d4ffe2a4afd..ec96ed76ce4 100644
--- a/pkgs/applications/misc/pstree/default.nix
+++ b/pkgs/applications/misc/pstree/default.nix
@@ -16,6 +16,6 @@ stdenv.mkDerivation rec {
meta = {
description = "Show the set of running processes as a tree";
license = "GPL";
- maintainers = stdenv.lib.maintainers.mornfall;
+ maintainers = [ stdenv.lib.maintainers.mornfall ];
};
}
diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix
index abf55aa22b9..8ee006c5d7f 100644
--- a/pkgs/applications/misc/redshift/default.nix
+++ b/pkgs/applications/misc/redshift/default.nix
@@ -38,8 +38,8 @@ stdenv.mkDerivation rec {
temperature to allow your eyes to slowly adapt.
'';
license = stdenv.lib.licenses.gpl3Plus;
- homepage = "http://jonls.dk/redshift";
+ homepage = http://jonls.dk/redshift;
platforms = platforms.linux;
- maintainers = maintainers.mornfall;
+ maintainers = [ maintainers.mornfall ];
};
}
diff --git a/pkgs/applications/misc/roxterm/default.nix b/pkgs/applications/misc/roxterm/default.nix
new file mode 100644
index 00000000000..a8338b80c9e
--- /dev/null
+++ b/pkgs/applications/misc/roxterm/default.nix
@@ -0,0 +1,62 @@
+{ stdenv, fetchurl, docbook_xsl, dbus_libs, dbus_glib, expat, gettext
+, gsettings_desktop_schemas, gdk_pixbuf, gtk2, gtk3, hicolor_icon_theme
+, imagemagick, itstool, librsvg, libtool, libxslt, lockfile, makeWrapper
+, pkgconfig, pythonFull, pythonPackages, vte }:
+
+# TODO: Still getting following warning.
+# WARNING **: Error retrieving accessibility bus address: org.freedesktop.DBus.Error.ServiceUnknown: The name org.a11y.Bus was not provided by any .service files
+# Seems related to this:
+# https://forums.gentoo.org/viewtopic-t-947210-start-0.html
+
+let version = "2.9.4";
+in stdenv.mkDerivation rec {
+ name = "roxterm-${version}";
+
+ src = fetchurl {
+ url = "http://downloads.sourceforge.net/roxterm/${name}.tar.bz2";
+ sha256 = "0djfiwfmnqqp6930kswzr2rss0mh40vglcdybwpxrijcw4n8j21x";
+ };
+
+ buildInputs =
+ [ docbook_xsl expat imagemagick itstool librsvg libtool libxslt
+ makeWrapper pkgconfig pythonFull pythonPackages.lockfile ];
+
+ propagatedBuildInputs =
+ [ dbus_libs dbus_glib gdk_pixbuf gettext gsettings_desktop_schemas gtk2 gtk3 hicolor_icon_theme vte ];
+
+ NIX_CFLAGS_COMPILE = [ "-I${dbus_glib}/include/dbus-1.0"
+ "-I${dbus_libs}/include/dbus-1.0"
+ "-I${dbus_libs}/lib/dbus-1.0/include" ];
+
+ # Fix up python path so the lockfile library is on it.
+ PYTHONPATH = stdenv.lib.makeSearchPath "lib/${pythonFull.python.libPrefix}/site-packages" [
+ pythonPackages.curses pythonPackages.lockfile
+ ];
+
+ buildPhase = ''
+ # Fix up the LD_LIBRARY_PATH so that expat is on it
+ export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${expat}/lib"
+
+ python mscript.py configure --prefix="$out"
+ python mscript.py build
+ '';
+
+ installPhase = ''
+ python mscript.py install
+
+ wrapProgram "$out/bin/roxterm" \
+ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
+ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = http://roxterm.sourceforge.net/;
+ license = licenses.gpl3;
+ description = "Tabbed, VTE-based terminal emulator";
+ longDescription = ''
+ Tabbed, VTE-based terminal emulator. Similar to gnome-terminal without the dependencies on Gnome.
+ '';
+ maintainers = with maintainers; [ cdepillabout ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix
index 7392123673a..b0334dcd7ce 100644
--- a/pkgs/applications/misc/rxvt_unicode/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode/default.nix
@@ -47,6 +47,6 @@ stdenv.mkDerivation (rec {
meta = {
description = "A clone of the well-known terminal emulator rxvt";
homepage = "http://software.schmorp.de/pkg/rxvt-unicode.html";
- maintainers = stdenv.lib.maintainers.mornfall;
+ maintainers = [ stdenv.lib.maintainers.mornfall ];
};
})
diff --git a/pkgs/applications/misc/spacefm/default.nix b/pkgs/applications/misc/spacefm/default.nix
index 7dbe723d9eb..6f1ced9097e 100644
--- a/pkgs/applications/misc/spacefm/default.nix
+++ b/pkgs/applications/misc/spacefm/default.nix
@@ -3,14 +3,14 @@
}:
let
- version = "0.9.4";
+ version = "0.9.2";
in stdenv.mkDerivation rec {
name = "spacefm-${version}";
src = fetchurl {
url = "https://github.com/IgnorantGuru/spacefm/blob/pkg/${version}/${name}.tar.xz?raw=true";
- sha256 = "0marwa031jk24q8hy90dr7yw6rv5hn1shar404zpb1k57v4nr23m";
+ sha256 = "3767137d74aa78597ffb42a6121784e91a4276efcd5d718b3793b9790f82268c";
};
buildInputs = [ gtk3 udev desktop_file_utils shared_mime_info intltool pkgconfig makeWrapper ];
diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix
index ab7a8240ebf..17b5c92406b 100644
--- a/pkgs/applications/misc/sweethome3d/default.nix
+++ b/pkgs/applications/misc/sweethome3d/default.nix
@@ -50,14 +50,14 @@ let
in rec {
application = mkSweetHome3D rec {
- version = "4.3.1";
+ version = "4.4";
module = "SweetHome3D";
name = stdenv.lib.toLower module + "-application-" + version;
description = "Design and visualize your future home";
license = stdenv.lib.licenses.gpl2Plus;
src = fetchcvs {
cvsRoot = ":pserver:anonymous@sweethome3d.cvs.sourceforge.net:/cvsroot/sweethome3d";
- sha256 = "0jn3xamghz8rsmzvpd57cvz32yk8mni8dyx15xizjcki0450bp3f";
+ sha256 = "1ziqq8wm6la7bsqya6gc8cc2vz02phl88msqjgqqfl2jf8bz9afv";
module = module;
tag = "V_" + d2u version;
};
diff --git a/pkgs/applications/misc/sweethome3d/editors.nix b/pkgs/applications/misc/sweethome3d/editors.nix
index 9eca1df59f5..b48b95cda5b 100644
--- a/pkgs/applications/misc/sweethome3d/editors.nix
+++ b/pkgs/applications/misc/sweethome3d/editors.nix
@@ -60,28 +60,28 @@ let
in rec {
textures-editor = mkEditorProject rec {
- version = "1.3";
+ version = "1.4";
module = "TexturesLibraryEditor";
name = sweetName module version;
description = "Easily create SH3T files and edit the properties of the texture images it contain";
license = stdenv.lib.licenses.gpl2Plus;
src = fetchcvs {
cvsRoot = ":pserver:anonymous@sweethome3d.cvs.sourceforge.net:/cvsroot/sweethome3d";
- sha256 = "1caf1hmf87bj5dr7w2swnlbvkb3q1jdjr1zgjn1k07d0fxh0ikbx";
+ sha256 = "1j1ygb32dca48hng5bsna9f84vyin5qc3ds44xi39057izmw8499";
module = module;
tag = "V_" + d2u version;
};
};
furniture-editor = mkEditorProject rec {
- version = "1.13";
+ version = "1.14";
module = "FurnitureLibraryEditor";
name = sweetName module version;
description = "Quickly create SH3F files and edit the properties of the 3D models it contain";
license = stdenv.lib.licenses.gpl2;
src = fetchcvs {
cvsRoot = ":pserver:anonymous@sweethome3d.cvs.sourceforge.net:/cvsroot/sweethome3d";
- sha256 = "1nll5589rc0g71zd86cwmzl4p2icynykj106schmxric9v17jbv5";
+ sha256 = "0rdcd8vjbcv9jdms2xr3y7ykm2a9bkmwj4y7ybk9zcldayqsgn6z";
module = module;
tag = "V_" + d2u version;
};
diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix
index 8d914c26221..df4c0ea97eb 100644
--- a/pkgs/applications/misc/synergy/default.nix
+++ b/pkgs/applications/misc/synergy/default.nix
@@ -6,11 +6,11 @@ assert stdenv.isLinux -> cryptopp != null;
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "synergy-1.5.0";
+ name = "synergy-1.5.1";
src = fetchurl {
- url = "http://synergy-project.org/files/packages/synergy-1.5.0-r2278-Source.tar.gz";
- sha256 = "097hk9v01lwzs7ly6ynadxmjh7ad68l5si7w4qmjn6z7l8b61gv6";
+ url = "http://synergy-project.org/files/packages/${name}-r2398-Source.tar.gz";
+ sha256 = "19q8ck15f0jgpbzlm34dzp046wf3iiwa21s1qfyj5sj7xjxwa367";
};
patches = optional stdenv.isLinux ./cryptopp.patch;
diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix
new file mode 100644
index 00000000000..96ca38f581f
--- /dev/null
+++ b/pkgs/applications/misc/termite/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchgit, pkgconfig, vte, gtk, ncurses }:
+
+stdenv.mkDerivation rec {
+ name = "termite-${version}";
+ version = "v7";
+
+ src = fetchgit {
+ url = "https://github.com/thestinger/termite";
+ rev = "f0ff025c1bb6a1e3fd83072f00c2dc42a0701f46";
+ sha256 = "057yzlqvp84fkmhn4bz9071glj4rh4187xhg48cdppf2w6phcbxp";
+ };
+
+ makeFlags = "VERSION=${version}";
+
+ buildInputs = [pkgconfig vte gtk ncurses];
+
+ installFlags = "PREFIX=$(out)";
+
+ meta = {
+ description = "A simple VTE-based terminal";
+ license = stdenv.lib.licenses.lgpl2Plus;
+ homepage = https://github.com/thestinger/termite/;
+ maintainers = with stdenv.lib.maintainers; [koral];
+ platforms = stdenv.lib.platforms.all;
+ };
+}
diff --git a/pkgs/applications/misc/tilda/default.nix b/pkgs/applications/misc/tilda/default.nix
new file mode 100644
index 00000000000..7edd86c7409
--- /dev/null
+++ b/pkgs/applications/misc/tilda/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, pkgconfig
+, autoreconfHook, gettext, expat
+, confuse, vte, gtk
+, makeWrapper }:
+
+stdenv.mkDerivation rec {
+
+ name = "tilda-${version}";
+ version = "1.1.13";
+
+ src = fetchurl {
+ url = "https://github.com/lanoxx/tilda/archive/${name}.tar.gz";
+ sha256 = "1b9rnyrdvqmw2xjv899a4k6hvr9w482c4xvlpfnckckxdyp2852d";
+ };
+
+ buildInputs = [ pkgconfig autoreconfHook gettext confuse vte gtk makeWrapper ];
+
+ LD_LIBRARY_PATH = "${expat}/lib"; # ugly hack for xgettext to work during build
+
+ postInstall = ''
+ wrapProgram "$out/bin/tilda" \
+ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A Gtk based drop down terminal for Linux and Unix";
+ homepage = https://github.com/lanoxx/tilda/;
+ license = licenses.gpl3;
+ maintainers = [ maintainers.AndersonTorres ];
+ platforms = platforms.linux;
+ };
+}
+
diff --git a/pkgs/applications/misc/twmn/default.nix b/pkgs/applications/misc/twmn/default.nix
index 65c2ccb5ff0..e144d12f762 100644
--- a/pkgs/applications/misc/twmn/default.nix
+++ b/pkgs/applications/misc/twmn/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1jd2y0ydcpjdmjbx77lw35710sqfwbgyrnpv66mi3gwvrbyiwpf3";
};
- buildInputs = [ qt4 pkgconfig boost ];
+ buildInputs = [ qt4 pkgconfig boost boost.lib ];
propagatedBuildInputs = [ dbus ];
configurePhase = "qmake";
diff --git a/pkgs/applications/misc/vym/default.nix b/pkgs/applications/misc/vym/default.nix
index c23be51c3e8..b1cfbd5d9ac 100644
--- a/pkgs/applications/misc/vym/default.nix
+++ b/pkgs/applications/misc/vym/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
qmake PREFIX="$out"
'';
- meta = {
+ meta = with stdenv.lib; {
description = "A mind-mapping software";
longDescription = ''
VYM (View Your Mind) is a tool to generate and manipulate maps which show your thoughts.
@@ -28,8 +28,8 @@ stdenv.mkDerivation rec {
vym offers much more features to work with such maps.
'';
homepage = http://www.insilmaril.de/vym/;
- license = stdenv.lib.licenses.gpl2;
- maintainer = stdenv.lib.maintainers.AndersonTorres;
- platforms = stdenv.lib.platforms.linux;
+ license = licenses.gpl2;
+ maintainers = [ maintainers.AndersonTorres ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix
index 0bc2170340c..09edb086c9f 100644
--- a/pkgs/applications/misc/xca/default.nix
+++ b/pkgs/applications/misc/xca/default.nix
@@ -28,5 +28,6 @@ stdenv.mkDerivation rec {
homepage = http://xca.sourceforge.net/;
platforms = platforms.all;
license = licenses.bsd3;
+ broken = true;
};
}
diff --git a/pkgs/applications/misc/xfe/default.nix b/pkgs/applications/misc/xfe/default.nix
index e216b19fab5..5055ac50089 100644
--- a/pkgs/applications/misc/xfe/default.nix
+++ b/pkgs/applications/misc/xfe/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, fox, pkgconfig, gettext, x11, gcc, intltool, file, libpng }:
stdenv.mkDerivation rec {
- name = "xfe-1.34";
+ name = "xfe-1.37";
src = fetchurl {
url = "mirror://sourceforge/xfe/${name}.tar.gz";
- sha256 = "0y6gi8vdvw1prz7dv7wadf7v8gl6g75jrlrl5jnsb71l1431ncay";
+ sha256 = "1g9a0bpny2m7ixgxpqjh0wvh2x6d0lpj6682zn5dfqwan4j2xfsd";
};
buildInputs = [ fox pkgconfig gettext x11 gcc intltool file libpng ];
diff --git a/pkgs/applications/misc/xiphos/default.nix b/pkgs/applications/misc/xiphos/default.nix
new file mode 100644
index 00000000000..d2739dbec50
--- /dev/null
+++ b/pkgs/applications/misc/xiphos/default.nix
@@ -0,0 +1,60 @@
+{stdenv, fetchurl, pkgconfig
+, python
+, intltool
+, docbook2x, docbook_xml_dtd_412, libxslt
+, sword, clucene_core
+, gnome_doc_utils
+, libgsf, gconf
+, gtkhtml, libgtkhtml, libglade, scrollkeeper
+, webkitgtk
+, dbus_glib, enchant, isocodes, libuuid
+}:
+
+stdenv.mkDerivation rec {
+ name = "xiphos-${version}";
+ version = "3.2.2";
+
+ src = fetchurl {
+ url = "http://downloads.sourceforge.net/project/gnomesword/Xiphos/${version}/${name}.tar.gz";
+ sha256 = "1imd3v8knb5y3kddlfzp67p927zpfy0adjri89n7vcnipb9fy9i3";
+ };
+
+ buildInputs = [ pkgconfig python intltool docbook2x docbook_xml_dtd_412 libxslt
+ sword clucene_core gnome_doc_utils libgsf gconf gtkhtml libgtkhtml
+ libglade scrollkeeper webkitgtk dbus_glib enchant isocodes libuuid ];
+
+ prePatch = ''
+ patchShebangs .;
+ '';
+
+ preConfigure = ''
+ export CLUCENE_HOME=${clucene_core};
+ export SWORD_HOME=${sword};
+ '';
+
+ configurePhase = ''
+ python waf configure --prefix=$out
+ '';
+
+ buildPhase = ''
+ python waf build
+ '';
+
+ installPhase = ''
+ python waf install
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A GTK Bible study tool";
+ longDescription = ''
+ Xiphos (formerly known as GnomeSword) is a Bible study tool
+ written for Linux, UNIX, and Windows using GTK, offering a rich
+ and featureful environment for reading, study, and research using
+ modules from The SWORD Project and elsewhere.
+ '';
+ homepage = http://www.xiphos.org/;
+ license = licenses.gpl2Plus;
+ maintainers = [ maintainers.AndersonTorres ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/networking/bittorrentsync/default.nix b/pkgs/applications/networking/bittorrentsync/default.nix
index 989ceb235b0..f45908b2387 100644
--- a/pkgs/applications/networking/bittorrentsync/default.nix
+++ b/pkgs/applications/networking/bittorrentsync/default.nix
@@ -5,15 +5,15 @@ let
else if stdenv.system == "i686-linux" then "i386"
else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
- sha256 = if stdenv.system == "x86_64-linux" then "1xba0wv45w4kg84i5sywkfk44vj9wxkr7f1vga2mpz86j8vq25iy"
- else if stdenv.system == "i686-linux" then "10ml1wclix9236zcb4mh60hdm9vvfaarlb62z7fdrwk6ikqbm7fk"
+ sha256 = if stdenv.system == "x86_64-linux" then "115xsbi5z8ll0z07vx4rzzsgr6qba43f3z3nzx33pva5dpdr3ci9"
+ else if stdenv.system == "i686-linux" then "110k6cq6l3nr1gak2ri6i1kwis78r3zc1ilbipgcccdczf9fnx7p"
else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.libc ];
in
stdenv.mkDerivation rec {
name = "btsync-${version}";
- version = "1.3.94";
+ version = "1.4.82";
src = fetchurl {
url = "http://syncapp.bittorrent.com/${version}/btsync_${arch}-${version}.tar.gz";
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index b9011c0236f..2676104db3e 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -10,7 +10,7 @@
, python, pythonPackages, perl, pkgconfig
, nspr, udev, krb5
, utillinux, alsaLib
-, gcc, bison, gperf
+, bison, gperf
, glib, gtk, dbus_glib
, libXScrnSaver, libXcursor, libXtst, mesa
, protobuf, speechd, libXdamage
@@ -27,6 +27,7 @@
, proprietaryCodecs ? true
, cupsSupport ? false
, pulseSupport ? false, pulseaudio ? null
+, hiDPISupport ? false
, source
, plugins
@@ -145,6 +146,8 @@ let
'';
gypFlags = mkGypFlags (gypFlagsUseSystemLibs // {
+ linux_use_bundled_binutils = false;
+ linux_use_bundled_gold = false;
linux_use_gold_binary = false;
linux_use_gold_flags = false;
proprietary_codecs = false;
@@ -160,9 +163,7 @@ let
linux_sandbox_chrome_path="${libExecPath}/${packageName}";
werror = "";
clang = false;
-
- # FIXME: In version 37, omnibox.mojom.js doesn't seem to be generated.
- use_mojo = versionOlder source.version "37.0.0.0";
+ enable_hidpi = hiDPISupport;
# Google API keys, see:
# http://www.chromium.org/developers/how-tos/api-keys
@@ -192,22 +193,12 @@ let
'';
buildPhase = let
- CC = "${gcc}/bin/gcc";
- CXX = "${gcc}/bin/g++";
- buildCommand = target: let
- # XXX: Only needed for version 36 and older!
- targetSuffix = optionalString
- (versionOlder source.version "37.0.0.0" && target == "mksnapshot")
- (if stdenv.is64bit then ".x64" else ".ia32");
- in ''
- CC="${CC}" CC_host="${CC}" \
- CXX="${CXX}" CXX_host="${CXX}" \
- LINK_host="${CXX}" \
- "${ninja}/bin/ninja" -C "${buildPath}" \
- -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES \
- "${target}${targetSuffix}"
+ buildCommand = target: ''
+ "${ninja}/bin/ninja" -C "${buildPath}" \
+ -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES \
+ "${target}"
'' + optionalString (target == "mksnapshot" || target == "chrome") ''
- paxmark m "${buildPath}/${target}${targetSuffix}"
+ paxmark m "${buildPath}/${target}"
'';
targets = extraAttrs.buildTargets or [];
commands = map buildCommand targets;
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 4dfdca882bc..14881d11601 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -10,8 +10,10 @@
, proprietaryCodecs ? true
, enablePepperFlash ? false
, enablePepperPDF ? false
+, enableWideVine ? false
, cupsSupport ? false
, pulseSupport ? false
+, hiDPISupport ? false
}:
let
@@ -27,14 +29,14 @@ let
mkChromiumDerivation = callPackage ./common.nix {
inherit enableSELinux enableNaCl useOpenSSL gnomeSupport
gnomeKeyringSupport proprietaryCodecs cupsSupport
- pulseSupport;
+ pulseSupport hiDPISupport;
};
browser = callPackage ./browser.nix { };
sandbox = callPackage ./sandbox.nix { };
plugins = callPackage ./plugins.nix {
- inherit enablePepperFlash enablePepperPDF;
+ inherit enablePepperFlash enablePepperPDF enableWideVine;
};
};
@@ -59,7 +61,7 @@ let
};
in stdenv.mkDerivation {
- name = "chromium-${channel}-${chromium.browser.version}";
+ name = "chromium${if channel != "stable" then "-" + channel else ""}-${chromium.browser.version}";
buildInputs = [ makeWrapper ];
@@ -74,6 +76,7 @@ in stdenv.mkDerivation {
--set CHROMIUM_SANDBOX_BINARY_PATH "${sandboxBinary}" \
--add-flags "${chromium.plugins.flagsEnabled}"
+ ln -s "$out/bin/chromium" "$out/bin/chromium-browser"
ln -s "${chromium.browser}/share/icons" "$out/share/icons"
cp -v "${desktopItem}/share/applications/"* "$out/share/applications"
'';
diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index e0c45f91075..5bd41158632 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -1,6 +1,7 @@
{ stdenv
, enablePepperFlash ? false
, enablePepperPDF ? false
+, enableWideVine ? false
, source
}:
@@ -14,8 +15,8 @@ let
# XXX: Only temporary and has to be version-specific
src = source.plugins;
- phases = [ "unpackPhase" "patchPhase" "checkPhase" "installPhase" ];
- outputs = [ "pdf" "flash" ];
+ phases = [ "unpackPhase" "patchPhase" "installPhase" "checkPhase" ];
+ outputs = [ "pdf" "flash" "widevine" ];
unpackCmd = let
chan = if source.channel == "dev" then "chrome-unstable"
@@ -25,7 +26,9 @@ let
mkdir -p plugins
ar p "$src" data.tar.lzma | tar xJ -C plugins --strip-components=4 \
./opt/google/${chan}/PepperFlash \
- ./opt/google/${chan}/libpdf.so
+ ./opt/google/${chan}/libpdf.so \
+ ./opt/google/${chan}/libwidevinecdm.so \
+ ./opt/google/${chan}/libwidevinecdmadapter.so
'';
doCheck = true;
@@ -37,10 +40,14 @@ let
rpaths = [ stdenv.gcc.gcc ];
mkrpath = p: "${makeSearchPath "lib64" p}:${makeSearchPath "lib" p}";
in ''
- for sofile in PepperFlash/libpepflashplayer.so libpdf.so; do
+ for sofile in PepperFlash/libpepflashplayer.so libpdf.so \
+ libwidevinecdm.so libwidevinecdmadapter.so; do
chmod +x "$sofile"
patchelf --set-rpath "${mkrpath rpaths}" "$sofile"
done
+
+ patchelf --set-rpath "$widevine/lib:${mkrpath rpaths}" \
+ libwidevinecdmadapter.so
'';
installPhase = let
@@ -51,6 +58,12 @@ let
"application/x-google-chrome-print-preview-pdf"
];
pdfInfo = "#${pdfName}#${pdfDescription};${pdfMimeTypes}";
+
+ wvName = "Widevine Content Decryption Module";
+ wvDescription = "Playback of encrypted HTML audio/video content";
+ wvMimeTypes = "application/x-ppapi-widevine-cdm";
+ wvModule = "$widevine/lib/libwidevinecdmadapter.so";
+ wvInfo = "#${wvName}#${wvDescription}:${wvMimeTypes}";
in ''
install -vD libpdf.so "$pdf/lib/libpdf.so"
mkdir -p "$pdf/nix-support"
@@ -67,11 +80,20 @@ let
echo "--ppapi-flash-path='$flash/lib/libpepflashplayer.so'" \
"--ppapi-flash-version=$flashVersion" \
> "$flash/nix-support/chromium-flags"
+
+ install -vD libwidevinecdm.so \
+ "$widevine/lib/libwidevinecdm.so"
+ install -vD libwidevinecdmadapter.so \
+ "$widevine/lib/libwidevinecdmadapter.so"
+ mkdir -p "$widevine/nix-support"
+ echo "--register-pepper-plugins='${wvModule}${wvInfo}'" \
+ > "$widevine/nix-support/chromium-flags"
'';
passthru.flagsEnabled = let
enabledPlugins = optional enablePepperFlash plugins.flash
- ++ optional enablePepperPDF plugins.pdf;
+ ++ optional enablePepperPDF plugins.pdf
+ ++ optional enableWideVine plugins.widevine;
getFlags = plugin: "$(< ${plugin}/nix-support/chromium-flags)";
in concatStringsSep " " (map getFlags enabledPlugins);
};
diff --git a/pkgs/applications/networking/browsers/chromium/source/default.nix b/pkgs/applications/networking/browsers/chromium/source/default.nix
index d7ccc412fa4..5494b370817 100644
--- a/pkgs/applications/networking/browsers/chromium/source/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/default.nix
@@ -22,7 +22,9 @@ stdenv.mkDerivation {
prePatch = "patchShebangs .";
- patches = singleton ./sandbox_userns_36.patch;
+ patches = let
+ onPre39 = optional (versionOlder version "39.0.0.0");
+ in [ ./sandbox_userns_36.patch ] ++ onPre39 ./missing_alg_import.patch;
postPatch = ''
sed -i -r \
diff --git a/pkgs/applications/networking/browsers/chromium/source/missing_alg_import.patch b/pkgs/applications/networking/browsers/chromium/source/missing_alg_import.patch
new file mode 100644
index 00000000000..243e3fe7049
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/source/missing_alg_import.patch
@@ -0,0 +1,11 @@
+diff -Naur chromium-37.0.2062.94.old/media/cast/logging/encoding_event_subscriber.cc chromium-37.0.2062.94/media/cast/logging/encoding_event_subscriber.cc
+--- chromium-37.0.2062.94.old/media/cast/logging/encoding_event_subscriber.cc 2014-08-29 02:05:15.149140733 -0700
++++ chromium-37.0.2062.94/media/cast/logging/encoding_event_subscriber.cc 2014-08-29 02:06:00.182853590 -0700
+@@ -4,6 +4,7 @@
+
+ #include "media/cast/logging/encoding_event_subscriber.h"
+
++#include
+ #include
+ #include
+
diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix
index 4a610827913..e85369f763b 100644
--- a/pkgs/applications/networking/browsers/chromium/source/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix
@@ -1,21 +1,21 @@
# This file is autogenerated from update.sh in the parent directory.
{
dev = {
- version = "38.0.2107.3";
- sha256 = "0zb1mj3xgvvs5ijix4b52vj9dlymqkipn8srfzvhwl7g4hx5ss3v";
- sha256bin32 = "12lvvmg3bqacb0qw72bwlxm2m57s39mz2810agngdgzv0hd835cv";
- sha256bin64 = "1vw36s8nlvdsl8pjbh4gny00kvcizn1i2lznzqzysicz2rz7ncrh";
+ version = "39.0.2171.7";
+ sha256 = "1wxi601zsi10jw7ypa4i0a2g5hd3hqrb5pqkkry1pgbdimw69sb8";
+ sha256bin32 = "11isyislr5mbbhwk625b347xyyp1x3xgws844sjbbcx83gf0ij7y";
+ sha256bin64 = "16b0yzlm8j7kx8pc6fhzwiizl7zrzxmfal40q45848715jyln8hf";
};
beta = {
- version = "37.0.2062.58";
- sha256 = "0jck4s6nrizj9wmifsjviin9ifnviihs21fi05wzljyfnbgc4byl";
- sha256bin32 = "1cm1r8bqy66gvdhbrgn9pdc11i72dca96ab5j3m3349p6728jbgk";
- sha256bin64 = "0cpb189pn5jiplldkgy8lfbcwvfik66kjjf6y2i708xa5ggfpwfi";
+ version = "38.0.2125.101";
+ sha256 = "12hrl7i0xrjdwz8yaap5jhc6bzn29pk6dcz96743n6j7mcckac6k";
+ sha256bin32 = "178nffl5pgqajg7vxxisycl79vnyv1iqqz04riywgj88mw7mjwpg";
+ sha256bin64 = "0akwvnl987w8wli4h4k2x8xnpkzk9n8hn9wbp1lw87ch08sr7zfm";
};
stable = {
- version = "36.0.1985.125";
- sha256 = "08shkm89qzzdlrjg0rg5qiszbk6ziginsicyxqyk353y76jx10hp";
- sha256bin32 = "1ahazz56k127xncgl1lzwsmydbh0vcxq0hzrb9cm9zzdkzqjzg03";
- sha256bin64 = "0qx5316cd8l9g8w389aqi5m3csmr5s8hs7sivlk02mbs0jzi8ppc";
+ version = "37.0.2062.120";
+ sha256 = "1yvf1hzza5cdsa67dg302ifcwb759r8sf2z21p9q9wyanrc3f1xk";
+ sha256bin32 = "07zwf5yn3ig8x9ysjdpm7w1fh4rcyxzfsnqvxmabc0bkrv2r1hg7";
+ sha256bin64 = "02qc5qq5v9k55c5bxmndjh1xl6j1qaxk7k4r8mm0k5nxxyqih1p2";
};
}
diff --git a/pkgs/applications/networking/browsers/dillo/default.nix b/pkgs/applications/networking/browsers/dillo/default.nix
index 0cf23f38b0f..c6c86263888 100644
--- a/pkgs/applications/networking/browsers/dillo/default.nix
+++ b/pkgs/applications/networking/browsers/dillo/default.nix
@@ -3,8 +3,7 @@
, openssl
, libjpeg, libpng
, perl
-, libXcursor, libXi, libXinerama
-}:
+, libXcursor, libXi, libXinerama }:
stdenv.mkDerivation rec {
version = "3.0.4";
@@ -22,10 +21,13 @@ stdenv.mkDerivation rec {
configureFlags = "--enable-ssl";
- meta = {
+ meta = with stdenv.lib; {
homepage = http://www.dillo.org/;
description = "A fast graphical web browser with a small footprint";
- maintainers = [ stdenv.lib.maintainers.AndersonTorres ];
- platforms = stdenv.lib.platforms.linux;
+ longDescription = ''
+ Dillo is a small, fast web browser, tailored for older machines.
+ '';
+ maintainers = [ maintainers.AndersonTorres ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/networking/browsers/dwb/default.nix b/pkgs/applications/networking/browsers/dwb/default.nix
index ecb57d6fe6c..73f8be7d93d 100644
--- a/pkgs/applications/networking/browsers/dwb/default.nix
+++ b/pkgs/applications/networking/browsers/dwb/default.nix
@@ -2,12 +2,12 @@
m4, glib_networking, gsettings_desktop_schemas, dconf }:
stdenv.mkDerivation {
- name = "dwb-2014-07-03";
+ name = "dwb-2014-09-20";
src = fetchgit {
url = "https://bitbucket.org/portix/dwb.git";
- rev = "6224470489eb5ba92987e01396269f8b7cd78ada";
- sha256 = "04p9frsnh1qz067cw36anvr41an789fba839svdjrdva0f2751g8";
+ rev = "6a0e483533021157fa83ce7533c1b25c71254f00";
+ sha256 = "0l8ryz4aqcw6ax6w7y22yl9bh8fs3gxnlppbas1jq7q7hjk1qs31";
};
buildInputs = [ pkgconfig makeWrapper gsettings_desktop_schemas libsoup webkitgtk2 gtk2 gnutls json_c m4 ];
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 56ba95c661f..ecf8dbc0fc6 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -1,4 +1,4 @@
-# This file is generated from generate_nix.rb
+# This file is generated from generate_nix.rb. DO NOT EDIT.
# Execute the following command in a temporary directory to update the file.
#
# ruby generate_nix.rb > default.nix
@@ -40,186 +40,188 @@
assert stdenv.isLinux;
let
- version = "31.0";
+ version = "32.0.3";
sources = [
- { locale = "ach"; arch = "linux-i686"; sha256 = "8372c1227b75486e297fd914bac530a45b22b789e627638e010d4c25337f350f"; }
- { locale = "ach"; arch = "linux-x86_64"; sha256 = "e01412aa570a462a3bb1ba851cd7133014b3299c0ad349c15534edc35c6d6397"; }
- { locale = "af"; arch = "linux-i686"; sha256 = "e75bd2d41de60483ed1eadcf03d9cd57146210ff9fdfe04e984404ce4bca29f7"; }
- { locale = "af"; arch = "linux-x86_64"; sha256 = "32697271215a0e63b7d0b25398d27772da5d53e88d020df24f170ebc341e5394"; }
- { locale = "an"; arch = "linux-i686"; sha256 = "3a590702183a86283e4de415eefdeed6f95f1e5d48c64456c4d6db8f84dcfb68"; }
- { locale = "an"; arch = "linux-x86_64"; sha256 = "98d35a6a2f0875a9723ed9511f3bea65f58da3196db3f75aaf7420d45bde33ad"; }
- { locale = "ar"; arch = "linux-i686"; sha256 = "e632f104442b725cf8e0e25c9a924b166289e1fab601a70aee0a81394632423c"; }
- { locale = "ar"; arch = "linux-x86_64"; sha256 = "603a054ceb36645881f52042e556572252e898bfa78cec04811e65f27b9db026"; }
- { locale = "as"; arch = "linux-i686"; sha256 = "05e64b9113f450bfbfa1b99c9580dbb2442af35d6cc20dec0c7af379dd5d37db"; }
- { locale = "as"; arch = "linux-x86_64"; sha256 = "85b57a101afd0c4aae040bb1f3523ddda3079d46ac8abe9cad826939fd274353"; }
- { locale = "ast"; arch = "linux-i686"; sha256 = "5df5eb0db623b42d9a2c9be58807ec66f43a26dd1365d44202d4b0db50d6a6f0"; }
- { locale = "ast"; arch = "linux-x86_64"; sha256 = "6faac3f3637bd68d6c20c73dd84c554afdaa136c4e142c26eb8142b7ab00895f"; }
- { locale = "be"; arch = "linux-i686"; sha256 = "4a87051df26ddb3fd2cf7c2beabc2d403cbc4d2f2e7e0802fb11566722171b57"; }
- { locale = "be"; arch = "linux-x86_64"; sha256 = "8194b851ed7f9559b78f63711df598ed094783eb2cc288fbd1e880d53118dde5"; }
- { locale = "bg"; arch = "linux-i686"; sha256 = "f6f903529d3276d1aa55968d4978fe5977d45076db0ee99d87199d59a9441ad5"; }
- { locale = "bg"; arch = "linux-x86_64"; sha256 = "bce34ee8ec314db0f7abfeddf491d15642dcedea125dc9bb7d7dda3915054940"; }
- { locale = "bn-BD"; arch = "linux-i686"; sha256 = "9bd0e37ddf9a222263ca90308245e2078f45d754d8a2b0bc1e4dea13a5e7b581"; }
- { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "debb3a9983e4219b6632cdfd09d04ab95314ba4e0bd7ff36fd89f0a748d25cdd"; }
- { locale = "bn-IN"; arch = "linux-i686"; sha256 = "ea2c9d29f4a3dfe8e0f146979c47ccba835b81cb1f1ed6e95124a837918590fa"; }
- { locale = "bn-IN"; arch = "linux-x86_64"; sha256 = "b2bf8e36ac1ca1afeae463bf95a289db7cf2d2fa303083ab405497cca2993b57"; }
- { locale = "br"; arch = "linux-i686"; sha256 = "b4b9d2828e5387a65d0f63b2149400626cd47fc81b97b912eda11b3fe31d4604"; }
- { locale = "br"; arch = "linux-x86_64"; sha256 = "c3af78f1215ffc1e9b6c193ba87d17e2f08e1a24856ee68aabf95b3ee7804ea9"; }
- { locale = "bs"; arch = "linux-i686"; sha256 = "7930f10d5d43e4504b9f347bcb2a2ef451be4418cee86c199b3e98c38587a20d"; }
- { locale = "bs"; arch = "linux-x86_64"; sha256 = "ee31279d2acf7286c9a59c99e68fdd1692b96247585230df20ea2bea5ee30ba2"; }
- { locale = "ca"; arch = "linux-i686"; sha256 = "f22f7964180ad27a122e56f070c6a2a0e3b044fe15ec5046b04db03877a3b7c7"; }
- { locale = "ca"; arch = "linux-x86_64"; sha256 = "84e8675f9613d1a8a49a760ee46d4625b88092cfc542e6b750384d0d5a0a465f"; }
- { locale = "cs"; arch = "linux-i686"; sha256 = "bed550a83c763a8147ef862cca7ca36106bfc5b34ea81f008c94886b86a3dde2"; }
- { locale = "cs"; arch = "linux-x86_64"; sha256 = "8bf76f388c6286a1b91cf460325b98c2dd08842031288617d9141b1368b5f62c"; }
- { locale = "csb"; arch = "linux-i686"; sha256 = "2420bf49ff3429b3f186b17555b8b3250d44579b5ff7ce616914af646b5996be"; }
- { locale = "csb"; arch = "linux-x86_64"; sha256 = "a0ee304a61b12ec1dd3caf5d876acbd9d2ad4443f9b96e73ecc1de8a1e16206f"; }
- { locale = "cy"; arch = "linux-i686"; sha256 = "603a66c237e95534d2dbd004e7fd77b69d5b99b73cba797c7825aaca6d849c61"; }
- { locale = "cy"; arch = "linux-x86_64"; sha256 = "69f68c024d6e9999b5a846d12c5a61ca63d962f6bd21737769d1fe5519916dad"; }
- { locale = "da"; arch = "linux-i686"; sha256 = "da8ed391e8ae9729cf2af35700aff3f6900af208fee9eab6a6bd0fcb303abd09"; }
- { locale = "da"; arch = "linux-x86_64"; sha256 = "7e3cc63eb61289e1006f683581345caaffe3ae39f7a636ff4f451b1e77a8ffb6"; }
- { locale = "de"; arch = "linux-i686"; sha256 = "f191e74047cdddd43fa72242b1dce15a28160f62b4b8eae08ad117f4b27d6e0f"; }
- { locale = "de"; arch = "linux-x86_64"; sha256 = "a81165d446cab525645ca2b18ef28cf253c6ee6267086d692a3904c79f7e5be0"; }
- { locale = "el"; arch = "linux-i686"; sha256 = "eb0757aafd2a1c4bb9abeab01a3960d3ac21b92879f8dc7d24f485a43d305957"; }
- { locale = "el"; arch = "linux-x86_64"; sha256 = "900f64bad286393f6d96f0ff00c6e78ae6cce998046cf506e2b3ec7a7b8e76c0"; }
- { locale = "en-GB"; arch = "linux-i686"; sha256 = "99284b229b7bfcc44cce3ebeee523e49bd5d9c7d860345ad3e242af4f9848683"; }
- { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "9a4e003441556422375d4bede21da27a03d31b5ec452ff467abcfffdfe363f4a"; }
- { locale = "en-US"; arch = "linux-i686"; sha256 = "13b4297db52ef851b38f292eba2b2136e4c2f1453e004012fe8b1fbcf000abce"; }
- { locale = "en-US"; arch = "linux-x86_64"; sha256 = "ce87f081c4867b9968a2695341001854aa6c1f4f19073d13f54f333cfed236fc"; }
- { locale = "en-ZA"; arch = "linux-i686"; sha256 = "849584baf4c6dd330bf9c798e3e8923004a3a381642d4f684b5de3fb5b4fd895"; }
- { locale = "en-ZA"; arch = "linux-x86_64"; sha256 = "635d0cb43a2b5f7f0401f961fd88fc0d6735223ad421ec0ef92a4ee16b29727f"; }
- { locale = "eo"; arch = "linux-i686"; sha256 = "91da9571212dc82f5d7140e4de073189018f7f895a3b263a4f8840401b4b10bb"; }
- { locale = "eo"; arch = "linux-x86_64"; sha256 = "77f39ab0168efe9070ecd881dbd2884fe5f35eeea17a63ad8d957398f6eef40d"; }
- { locale = "es-AR"; arch = "linux-i686"; sha256 = "f4ec6f07e67195981c12b5cbc3a6289a6e9d29539014c034039bd498a40f9301"; }
- { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "3f24135fd1a6fd2207bf1d80fc79cb34536b109e195e43a3a13eba0b68548c0e"; }
- { locale = "es-CL"; arch = "linux-i686"; sha256 = "de3672a512473cc6edc48bb775bc9a405d0c9effccdb0cd46af5ce2593d67613"; }
- { locale = "es-CL"; arch = "linux-x86_64"; sha256 = "770134c2bd8bc9f2e629e355b8e3b0949f67dd2ecd1b3a1d513bff364e53b734"; }
- { locale = "es-ES"; arch = "linux-i686"; sha256 = "4eeb5854427cde599468b90af70ae3e04eb9aff5132659f6e1ddb2f859f0be74"; }
- { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "eb91e2e9b80cab85e6ab75e78a9b206a18bb647ffb247c0d5ed324ee219dccd9"; }
- { locale = "es-MX"; arch = "linux-i686"; sha256 = "0aa0c85a51a50adb9eca5e5a1eda0ca11ddc15ad12b2d930ebe769f10d535433"; }
- { locale = "es-MX"; arch = "linux-x86_64"; sha256 = "3f340072c80c95283b17e797bf4fdbde9d1de55b5f10f1c9e8193f8426c6157d"; }
- { locale = "et"; arch = "linux-i686"; sha256 = "4719961e58e755ea2d9b94ff7439e1f9e858b0dacbd8631f98fadebca36c72a1"; }
- { locale = "et"; arch = "linux-x86_64"; sha256 = "70aa1a76414c50b00fc85be87a07b936c7f60d83037f13716862e8491ec8d609"; }
- { locale = "eu"; arch = "linux-i686"; sha256 = "ea450d11b0cd3b4381797bf6ca48d74fb18d661864eccb365bc2d51b872b101a"; }
- { locale = "eu"; arch = "linux-x86_64"; sha256 = "d543e7fdd4c27875d30a1d527219e257296c6010e80dc0d5529722aa82cc666f"; }
- { locale = "fa"; arch = "linux-i686"; sha256 = "4b8aaf0d27f10474c6ec4eeec1418ffb08338475c5433199ac2db79aab5273b2"; }
- { locale = "fa"; arch = "linux-x86_64"; sha256 = "df10d71c7a762696ee682ca705052b15031dc7e84aa396f67fa26463e3dcd353"; }
- { locale = "ff"; arch = "linux-i686"; sha256 = "acdfec7656b48e5502692c408cd8c7543add80181130bdd2e0ec66ac44219a06"; }
- { locale = "ff"; arch = "linux-x86_64"; sha256 = "a9a0041cba2f80b09a2f22da6f1e9bfdfc1cbf0f5c324a427a1758174901fc27"; }
- { locale = "fi"; arch = "linux-i686"; sha256 = "304e90020134af5564d5c90c5d9fee6264aa871e82419408f5b0e9d97f8f8ff1"; }
- { locale = "fi"; arch = "linux-x86_64"; sha256 = "bfb86547ea4e0a5650a152070a7651a7f63b0df366fa4aed7f890033332e64a5"; }
- { locale = "fr"; arch = "linux-i686"; sha256 = "1ccef0f95df1571b9e378d97122303982f93251bd3ed70d0af93babc3459bad2"; }
- { locale = "fr"; arch = "linux-x86_64"; sha256 = "93ffcc3bbba8b7e0941fe674f6a67ed378e75b37c3e52debbef2434ea75f2b09"; }
- { locale = "fy-NL"; arch = "linux-i686"; sha256 = "20ae7baa888fdcb467388313fa51104f8ba77ca31b2bcd731e2d65a46ff75c3f"; }
- { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "33a028be0c63dc892efc93bd03375c8c4f9be38acb96a2bc516300c204086b3d"; }
- { locale = "ga-IE"; arch = "linux-i686"; sha256 = "ddf134c692d321744bd787b7833ccc9b06ef130865c8f8ee816d35ff55c344a7"; }
- { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "e76e18b18a7468ee6a550e837abf04b79833ae084210f723d0781f2b81e3077e"; }
- { locale = "gd"; arch = "linux-i686"; sha256 = "3c361e322be79ffaec9a382aacf3b9cc90f03fa664e35e283cd8572e66d3b8b0"; }
- { locale = "gd"; arch = "linux-x86_64"; sha256 = "5e95305321ff373d9cc6eee522dbd5ee948e6c298f2fb38d655965ec1de448e0"; }
- { locale = "gl"; arch = "linux-i686"; sha256 = "99b9dbf38f50f5385072d72d14684e980aead6125c4c91cfa8e69bd5c7f1aa0e"; }
- { locale = "gl"; arch = "linux-x86_64"; sha256 = "372bf1395f96be3b41d05630267354f7a6c0706e90f5e21320ab5ebd5d411d41"; }
- { locale = "gu-IN"; arch = "linux-i686"; sha256 = "0b8429553052c8e23d3aaf1210d53b51fac2250d1d526311a22757ebd85ca54f"; }
- { locale = "gu-IN"; arch = "linux-x86_64"; sha256 = "da6a7d7292965a0c1eaf58564d9bf85192719831208e8762d06c7082ee9824d7"; }
- { locale = "he"; arch = "linux-i686"; sha256 = "78ac97da0515eb5a94455dcbf4cbd9a8d1ddbf03d4b8d29bad7b9e8fdbf5ef12"; }
- { locale = "he"; arch = "linux-x86_64"; sha256 = "c0d853c639cfa7b14ce10ee50776f3aebf0c84807bb59d9ec6e0e20554ae8ed2"; }
- { locale = "hi-IN"; arch = "linux-i686"; sha256 = "82376fe3005c56d2e895e1ffa0e9233f3885700117a73d1c49d67d742e324752"; }
- { locale = "hi-IN"; arch = "linux-x86_64"; sha256 = "0ed6234fa9c5d449437d133c83f572ceca3dd82df6cbee8573c9f137c50bcf9c"; }
- { locale = "hr"; arch = "linux-i686"; sha256 = "10ff3539c27dc49763fe322e9540878d421bdf590d9a307fecc6c158472889c3"; }
- { locale = "hr"; arch = "linux-x86_64"; sha256 = "f97d7e3b290b0fc6a9116198da7fc7eb32895da74a3ad572d29577e14ab12f20"; }
- { locale = "hsb"; arch = "linux-i686"; sha256 = "bba1a949823e70d1b5f4a0bec27437b6fc11638fa67b2ca286a833a0d44f5ef8"; }
- { locale = "hsb"; arch = "linux-x86_64"; sha256 = "5efaf3ec7f7b5d94df17d2fe0d5877a35442d33ccbf141fcf30e11351f9b4000"; }
- { locale = "hu"; arch = "linux-i686"; sha256 = "88a86463f2a47e38886cd2e8b470702623c772086b71d55e61de80e1c1be4fb3"; }
- { locale = "hu"; arch = "linux-x86_64"; sha256 = "967ff3bb62c8dbc93a25f75bec73803428b3fe5024841d3e2d97e444c1d27304"; }
- { locale = "hy-AM"; arch = "linux-i686"; sha256 = "4bac63a8b8fea36c3dab794dff933972f9adff7f91a7d3957d4edc3c60534016"; }
- { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "9c26a2438462429f96b2d8bb8c4566b1b1f7d03200ed68aaca4eb6602342c33c"; }
- { locale = "id"; arch = "linux-i686"; sha256 = "e36cd7195d5cd21afd97f31a5108af5999ade8a97f92db3e00067f3cfc31cd72"; }
- { locale = "id"; arch = "linux-x86_64"; sha256 = "191e47625a6764670bfbab673989e5b2e6ad45ad1c3a0544a129afe8cb963171"; }
- { locale = "is"; arch = "linux-i686"; sha256 = "c839d21d4e16b05bd9aa995ff2124b6b8418ca1405a8f3bfc70fb65b5710488b"; }
- { locale = "is"; arch = "linux-x86_64"; sha256 = "16d8df9867e6a13a2be7408f459e2c67d449a47105cf9709e4a743abed8229a9"; }
- { locale = "it"; arch = "linux-i686"; sha256 = "7f9c3909cda97d9a40f2630af4f11e6dd8e29f45ab949348123c4334f6aee8fe"; }
- { locale = "it"; arch = "linux-x86_64"; sha256 = "52f95491dbf4ee9a1f2ee552feb8a30b8196b6747064e45d5a98d0fecfa11f67"; }
- { locale = "ja"; arch = "linux-i686"; sha256 = "6586fd1d792feea4e98442736f06eab15d7de526667db6a3ce7de1afac9fdaec"; }
- { locale = "ja"; arch = "linux-x86_64"; sha256 = "0ef883bdf3d415a5795bd613af05b16a406b3af3415ac1c1ebc646dd76f76467"; }
- { locale = "kk"; arch = "linux-i686"; sha256 = "39167c7ee9f0e9b62308fcaba0f061bda0eaac9d3bb707c6556f71085c7ddd54"; }
- { locale = "kk"; arch = "linux-x86_64"; sha256 = "ec2c9ae1f5daba1e3b0c8a4f24737b0968bc818748b682418f02983e25302703"; }
- { locale = "km"; arch = "linux-i686"; sha256 = "797747aa402ad42b6addd04d69995b0ea5c628da71f2cce15c8e612d15461189"; }
- { locale = "km"; arch = "linux-x86_64"; sha256 = "fd75e5fbba75dd8a6cdafdb1c4983bfd4336f300df559518d3fff0e6e7e482d6"; }
- { locale = "kn"; arch = "linux-i686"; sha256 = "fada07e5679bcf174078e0c596cd121301f72c307401922e5772c6fa79eeedbe"; }
- { locale = "kn"; arch = "linux-x86_64"; sha256 = "d9cbb3dc02e3db54ea691dc09c882fcd65fd99bb1d0250e29e3d0a37df72179b"; }
- { locale = "ko"; arch = "linux-i686"; sha256 = "22bd8b1dec10117579a267d5bb9b10f460c27c9419305aa1cc4456b09fcd7df5"; }
- { locale = "ko"; arch = "linux-x86_64"; sha256 = "0e9da5e79ebb149a62606e002202b70908d329a26c213df35480962fb05a9f7c"; }
- { locale = "ku"; arch = "linux-i686"; sha256 = "e5f55ab5112ca3a137c4df37460304ff7e33471e3e95e2709ace1cb32ef88084"; }
- { locale = "ku"; arch = "linux-x86_64"; sha256 = "224385ae3a9da1fbbbc0d309eba0de6f64e29da4de29299cb1c778cb5a57c968"; }
- { locale = "lij"; arch = "linux-i686"; sha256 = "e39f5edc61e25f490dcae7ea4fdc91033f5e868cbcaf848180c40bd920455f17"; }
- { locale = "lij"; arch = "linux-x86_64"; sha256 = "f6e9725f368ce4df3be078a1ad268a29cfeba01e5606de85fbe2e375b3a5e263"; }
- { locale = "lt"; arch = "linux-i686"; sha256 = "46b2c694c60540ded3d3f6cb504bc5b7a709cc0940ff6b3223f05d7b8e1f7309"; }
- { locale = "lt"; arch = "linux-x86_64"; sha256 = "51d10f5c63e377b0f9e46d7ee12ea8552b8df57d6e8d9334555b7fbab617c8a4"; }
- { locale = "lv"; arch = "linux-i686"; sha256 = "8e224c3efcca9864255332b7f7c089c0c04b0eb2dfe60cd04d7dd6a61d807852"; }
- { locale = "lv"; arch = "linux-x86_64"; sha256 = "e53090be92e7557be5d38aed25ac0a2fb1006d15bb38d61141473f4b38c6e26c"; }
- { locale = "mai"; arch = "linux-i686"; sha256 = "479795f542d17476bb721d3e7c7fef565617528016085976a63b9e5864b4dd31"; }
- { locale = "mai"; arch = "linux-x86_64"; sha256 = "8daa2882e27a19894ded43885e868dd7203f506cb1bd25ede1d36328fffbbe0d"; }
- { locale = "mk"; arch = "linux-i686"; sha256 = "78f6fa53d5fda46fbe54b9978acaa75faaf094d2d3b8e464539609253da07c52"; }
- { locale = "mk"; arch = "linux-x86_64"; sha256 = "47a147a93dc7d1e683a57f0d7ddd7fbe3d944145932e0773be8dab6a7a0b4b01"; }
- { locale = "ml"; arch = "linux-i686"; sha256 = "6ac6a36596db8bf675df76abc629fc99ff019455f8c08842668a08cb40b67e9a"; }
- { locale = "ml"; arch = "linux-x86_64"; sha256 = "c4d4bed760c429c5db1d5c42682127794f81e20182aed0fc37f4c9aaf7bc582c"; }
- { locale = "mr"; arch = "linux-i686"; sha256 = "a2fc483f2aca2cbb7bdff42e4b27b711fdf27f46bee707d1c6d664c391c95def"; }
- { locale = "mr"; arch = "linux-x86_64"; sha256 = "5209926b3130b8b75d933287872af62ac752fc9e3fc170b540a2f0bc49d97bdf"; }
- { locale = "ms"; arch = "linux-i686"; sha256 = "926944ef9a3807b3379bba4b2fff05d8c2776cc4e3239b0b2bd2e5424151e6ee"; }
- { locale = "ms"; arch = "linux-x86_64"; sha256 = "20cf8557fa41119febc99bbc6de10ea7e97d3c1abc2245241db862ca8a735db1"; }
- { locale = "nb-NO"; arch = "linux-i686"; sha256 = "5a2778d9e93ae4371ad29737904aaecacf494855b45e5e79cfe773410f6600f6"; }
- { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "8cfe4c778ee258dcd511990fd71eefcda46ab73c4448705e3815c5c371ee6ea1"; }
- { locale = "nl"; arch = "linux-i686"; sha256 = "350efbbaeb3ef9eee16a398ce482c2a3790f5b85dda6177857d7448de03af9e1"; }
- { locale = "nl"; arch = "linux-x86_64"; sha256 = "6d1310f7e2ebe5fc846f966bfa930a2bf3cd0877260de40b01496cb860630c37"; }
- { locale = "nn-NO"; arch = "linux-i686"; sha256 = "6447690e509ec0d1306bbfa484df82e62dd5909603b43440443c28bf2f489f24"; }
- { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "6e71ad4fe85b02f8745e6b3b39a6f69f13fff45fd555704747d1f59fcf64447a"; }
- { locale = "or"; arch = "linux-i686"; sha256 = "71866d15af41df9d98716544d25d8fc2069a9a8f92cdd8180731e3b3fb3c3492"; }
- { locale = "or"; arch = "linux-x86_64"; sha256 = "22ace7c20948526f1011e16581c870a919c4d8002bd0c3210ae8f702d1f8a03f"; }
- { locale = "pa-IN"; arch = "linux-i686"; sha256 = "12eabc66d39bd767c129c1a1777a6a13812efa0bc3df430dd7940908f53094ec"; }
- { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "54501bca85e231e9fab0aa894a6e566966fdbd172fc45888d97eb828e248d105"; }
- { locale = "pl"; arch = "linux-i686"; sha256 = "e16acf44c5ab2ee708ba0f74301106a5fc0c36cd65ebd302043af09803f30138"; }
- { locale = "pl"; arch = "linux-x86_64"; sha256 = "a1532684d5d0e9e2091a5d42202dc6b49ee8c21df14600f0772e1f0f53f6d638"; }
- { locale = "pt-BR"; arch = "linux-i686"; sha256 = "9827bfda689b01e795d4ddf7ab1169e25cc1728175af74e8a08fa3e8ef40e40c"; }
- { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "bfe02180011d564fe8deff4d3f3f8e3a6bfde05469738b5b2f8849a2ee485ba8"; }
- { locale = "pt-PT"; arch = "linux-i686"; sha256 = "83fcda599d09946da8a968d903fa12b93502a23337f019d3217cc80f81607fe7"; }
- { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "533050be56e6dbf06a5631a5b7a7db2da4f5514f224cb787600671c79c020379"; }
- { locale = "rm"; arch = "linux-i686"; sha256 = "62906af16b8e179be3015f6be9cf4b9481fcc506044c053373f9bc2e315729fa"; }
- { locale = "rm"; arch = "linux-x86_64"; sha256 = "f968ed9ba8ed43d0d52b02db23b2badf6e6a2544d105f23d6b09b80a07a28ee3"; }
- { locale = "ro"; arch = "linux-i686"; sha256 = "503fc4cf0de24ff5b1658d09264f8bb3b131c678f61c554ddf1006633ff2d336"; }
- { locale = "ro"; arch = "linux-x86_64"; sha256 = "514625ffbf4af4519a7671896f2f2797a1b17057dea356f7c17fa52a17736358"; }
- { locale = "ru"; arch = "linux-i686"; sha256 = "01521832ab38fd46751578691b82c0283d9c7a68459ab7225328afa285699b01"; }
- { locale = "ru"; arch = "linux-x86_64"; sha256 = "16b780ed767ff0537ec4619453d8cd3ebdcf124704d03d1741b5501007078dee"; }
- { locale = "si"; arch = "linux-i686"; sha256 = "35ee6cded95ea13c8c480a46ffc9398f50d172aff2030611d6713b04ddc1c54d"; }
- { locale = "si"; arch = "linux-x86_64"; sha256 = "c4ad9cec257bacffbcf3b4c84c63ec52e1ce830754b5be0b622a44ab223919ad"; }
- { locale = "sk"; arch = "linux-i686"; sha256 = "53a6bc5aebe5edf4bad34e163a54a3bed30a7c74ff883463caf057793ac3f58e"; }
- { locale = "sk"; arch = "linux-x86_64"; sha256 = "5110806bb3f02317b542bb79ce34c6bffeef68982807a5e53614958fb9adc779"; }
- { locale = "sl"; arch = "linux-i686"; sha256 = "3a58652b394fc2ffe1abcc1e89596f3e9357a2455cda8a0c76a44ff20331ada2"; }
- { locale = "sl"; arch = "linux-x86_64"; sha256 = "fb733f327080e5b4e2ae079a5cdbdb645fde1c9388368c13fcc6af4d3d91da7a"; }
- { locale = "son"; arch = "linux-i686"; sha256 = "56a262e4411404e94747312858ae1e7ca99ea48171361f03cdc660f8b0da0da2"; }
- { locale = "son"; arch = "linux-x86_64"; sha256 = "db77a5cab885f96efcbaae8e9f284ad30ab78aae1a405a5f1c2ac7d4d2e43498"; }
- { locale = "sq"; arch = "linux-i686"; sha256 = "fde7c85f09997ab3f7918072a9577f8d70947c5fafcc70782d684759146941bd"; }
- { locale = "sq"; arch = "linux-x86_64"; sha256 = "9865054be5d0a3913e4fa16aafdacd345607955b1d733d978033a2825d926c32"; }
- { locale = "sr"; arch = "linux-i686"; sha256 = "87f9f7d46a211b9205df5258f551b7c42264fdb81c70f836a37b3d5a821c4c03"; }
- { locale = "sr"; arch = "linux-x86_64"; sha256 = "ed03914c382efdec2f218e87e8efdd2b761e16ad0cc2a646b02050f27503161b"; }
- { locale = "sv-SE"; arch = "linux-i686"; sha256 = "1e28e39ac45177607a2ff3c71d3317b8b777679bc9e8dad2236991f05c6823ca"; }
- { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "81c2fdc5ec9f338b1dc3cd5d2e8dd62cf106c4cf759826be8eb7f3f3f550c49e"; }
- { locale = "ta"; arch = "linux-i686"; sha256 = "8e27ba1c8079745a93bebf6f7e4dbfa9ffc32b91d6dfa12975497466f3ec1550"; }
- { locale = "ta"; arch = "linux-x86_64"; sha256 = "c244aeff11608d6f1a8513045ab53d4909af02915761b15ff34ddbbc9995dcbe"; }
- { locale = "te"; arch = "linux-i686"; sha256 = "32e404eeeebeb521d909cc64fe1ba3c0b40130f7a4b4ae742a48ba61e8b668d4"; }
- { locale = "te"; arch = "linux-x86_64"; sha256 = "83b5cefddc6308050c24d9fb30818fa1fb3c1d4ba9a2de9d8fc99878b01855b4"; }
- { locale = "th"; arch = "linux-i686"; sha256 = "009cb39521635c1c89717b3d526a59c05e7ab82082ec31f0fd482800f01d3e8b"; }
- { locale = "th"; arch = "linux-x86_64"; sha256 = "1fe31902ef44e7049e9efa4774098c00d3ecad0a4c4f585716cb4bec158e3b88"; }
- { locale = "tr"; arch = "linux-i686"; sha256 = "e54ee04479b9891420af6fc1d639da121b677660a5bf1dfd8565792c9e1cdbdf"; }
- { locale = "tr"; arch = "linux-x86_64"; sha256 = "bdfae1142a7714a0be9bd24b02582a9ab9913c17d130cf0b2928deb657f8bebc"; }
- { locale = "uk"; arch = "linux-i686"; sha256 = "b2d6b518e86c3bae1068f7a6d7cdc975f3b0f99e514c5d3d18dbe5e62d15dbce"; }
- { locale = "uk"; arch = "linux-x86_64"; sha256 = "71bd0518b69c911dbb21297cd676ed66231a3b7bc59090a9f6a85d6882263277"; }
- { locale = "vi"; arch = "linux-i686"; sha256 = "390fb219da7169d69a7aca1df883750d56bf34f0f7b6b49781d6f3c6b8962962"; }
- { locale = "vi"; arch = "linux-x86_64"; sha256 = "1c5af9f646ced5533223bca6dd36f364c0ca9d3f02ba93797aa8b091144cf7e2"; }
- { locale = "xh"; arch = "linux-i686"; sha256 = "5d0d04c7c84ffc51b11f99205ae767954b78d98c3a2d18bfcceca1cb292fcd9a"; }
- { locale = "xh"; arch = "linux-x86_64"; sha256 = "5fafe2b375ee0935da52ec9037c4f515d1be5cf783548215d289a300e06bb9de"; }
- { locale = "zh-CN"; arch = "linux-i686"; sha256 = "1361b7cfc08d4d000107a244ec2a163ab27616b1d1db13917f34acc4d4167d34"; }
- { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "66aa04a7b5240df285afd37608c816b7c09cb365c6d0cd5aa4dbe8a7be61d824"; }
- { locale = "zh-TW"; arch = "linux-i686"; sha256 = "c0e3d9b584ba10e2a67a904253b2d93ab3546465e69619f932b566ad6b04a003"; }
- { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "6a24f9f3631bc0bcc15de6a124c0f7dbcee6d0099e2f0b0622a18e54c04620a9"; }
- { locale = "zu"; arch = "linux-i686"; sha256 = "7fa59f6ee26d48f992015b0bb667a0c230cea854eafa67d7c4e51d38e1a267d3"; }
- { locale = "zu"; arch = "linux-x86_64"; sha256 = "4af969f1e0d0703e83d903fc2a30739ae2ab42cc3a24219be8bfd152490970c5"; }
+ { locale = "ach"; arch = "linux-i686"; sha256 = "fd22fab9da5ba843876e0daf7db5069e3898a8bd548f8b324169914c88c02a10"; }
+ { locale = "ach"; arch = "linux-x86_64"; sha256 = "221028e98d8cb1cb330da4d2707c7cf98d2ae0066081f0b505d6cc4fa8fd4b30"; }
+ { locale = "af"; arch = "linux-i686"; sha256 = "37c93da084d25bd47c6aaf5389846ba4ac1e68a8989c03890b69142a46a2dddc"; }
+ { locale = "af"; arch = "linux-x86_64"; sha256 = "91dc95820faca47b031a8685a12e67d2f0b7f2cc9be5ff40f316bcf4c4110eee"; }
+ { locale = "an"; arch = "linux-i686"; sha256 = "c1251a6eb097cfc2bfa1fb137bcfcfbea333d457d57de3dce40ca60b96b07a53"; }
+ { locale = "an"; arch = "linux-x86_64"; sha256 = "fe010c04615c743f0500f9066bfab2e53d799074cbbd17c458b072ee741547f6"; }
+ { locale = "ar"; arch = "linux-i686"; sha256 = "e3482b3f6629c3addba28f86496c6608823b0a462ebca259bc9acc9ccadd07f3"; }
+ { locale = "ar"; arch = "linux-x86_64"; sha256 = "d2ba7625730d461d5f870ad4151991071ed36f141c65872d2e9493108d495603"; }
+ { locale = "as"; arch = "linux-i686"; sha256 = "7f44156bd7087d5ddb46f8ecbcf2d7468b32cca7ed7ac88989e604b9853d603b"; }
+ { locale = "as"; arch = "linux-x86_64"; sha256 = "a189cb96dedc9943362eaa70e851c64e0115c6c526d9d38a38ce2d79d80dea56"; }
+ { locale = "ast"; arch = "linux-i686"; sha256 = "5d62d0d12f4cd678567b470a1b6d94ea5889a5c6530a5d3d0b4d07c04bae1f18"; }
+ { locale = "ast"; arch = "linux-x86_64"; sha256 = "2e6f1caf2432ae2e6b6b3125449f7dcca1e2a3658ce267a0320aa449934260d8"; }
+ { locale = "be"; arch = "linux-i686"; sha256 = "d41d7abad29170d7d5df953bf9f3f22c56df8e85ddb4ba657cc0cbf357cdef0f"; }
+ { locale = "be"; arch = "linux-x86_64"; sha256 = "c899602dcf3ca72c657cc30ea54f986f44943ea9583da1dd6d48ebfe4489b7be"; }
+ { locale = "bg"; arch = "linux-i686"; sha256 = "e4ed4c432b3f399a2f7aa93ae62ae1ffadd8e4758c44f359a0faa401c014a3da"; }
+ { locale = "bg"; arch = "linux-x86_64"; sha256 = "138dc4afa256ca1a6f50ea250df5a032c69020f629e2b91843947e73f8e665c9"; }
+ { locale = "bn-BD"; arch = "linux-i686"; sha256 = "30f450b36b71431f87e016c09ab0e26f8ed72ee7a0cede0689be13d8b61a882c"; }
+ { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "ad320fef3271f5c6955404847552d11800ca8e8d7821cda53eb3311b6014281f"; }
+ { locale = "bn-IN"; arch = "linux-i686"; sha256 = "1e4b1b3d06cbda0aacb1d971b9a70f5648f05e9ad225de87739baef602b3d58f"; }
+ { locale = "bn-IN"; arch = "linux-x86_64"; sha256 = "51264d05eb58cec598a726b8e29e583355431c429a6f9eeddc16360ad0ef0dd5"; }
+ { locale = "br"; arch = "linux-i686"; sha256 = "e0e661d835297bb895ee3d2887fb4321b9c3c5af73edf5d36d365b254b0dc731"; }
+ { locale = "br"; arch = "linux-x86_64"; sha256 = "94c8e2b56ec784f3e2912a36bece9866c20e419069591517477b67156ad65f47"; }
+ { locale = "bs"; arch = "linux-i686"; sha256 = "ea2950b6c81b6cb108b518320c0e53406c972b6d46944fec39f92c10722be7ca"; }
+ { locale = "bs"; arch = "linux-x86_64"; sha256 = "4ceba96a76ec7631dc524d3e3b56c5994967b7ef227f38d3e3aa435c131f561a"; }
+ { locale = "ca"; arch = "linux-i686"; sha256 = "eb68c1f8e99ab00ddb9861ece4f1d17ca07c7e77fd4c2d4f4ff233f6f0018ba4"; }
+ { locale = "ca"; arch = "linux-x86_64"; sha256 = "17fe82eeeeb6c385010980984b04a8e71d3770a0d36d83e26786a5884aed7c05"; }
+ { locale = "cs"; arch = "linux-i686"; sha256 = "69e2a0769284464a95db122fa97f1dfb268b02b754fe6a4842683fd4c94d9a13"; }
+ { locale = "cs"; arch = "linux-x86_64"; sha256 = "bebaef3126c14b4d23c024176170aabb090463cae1a1b72b6b498ab3720bb9cf"; }
+ { locale = "csb"; arch = "linux-i686"; sha256 = "9ac7be93d0c3a72460ee3fea75621008bee5b2e85b78796f02eded8239562d81"; }
+ { locale = "csb"; arch = "linux-x86_64"; sha256 = "1af41e62a6c9ee47dad2d031fd7dcc0ff8b773ac7a912e6888f068e533972dd4"; }
+ { locale = "cy"; arch = "linux-i686"; sha256 = "339ff34b6b6d79db48b83ec9cc34fcb853652795e648c82845bbccf910b4286f"; }
+ { locale = "cy"; arch = "linux-x86_64"; sha256 = "686e466692bda17671d2ebf3683d03671c8d063c6a6008f3b27455656a584c95"; }
+ { locale = "da"; arch = "linux-i686"; sha256 = "67f0ee2e479c49853929cfb1b7fefe95d25d563d67f88f1560b21abf60cd67d6"; }
+ { locale = "da"; arch = "linux-x86_64"; sha256 = "d9f7cbbaa576e501edc9c03df922f708562ef1d3f84eefe010b8138b23399e40"; }
+ { locale = "de"; arch = "linux-i686"; sha256 = "a294f585d7f8247ecffd6c71beff75ea07f1ffb1af17830aa54904b6e9c4a71c"; }
+ { locale = "de"; arch = "linux-x86_64"; sha256 = "6dd118ebe633c66ebc7ef0bf71dcc4d5c2ce42552a4b981b74442e184fa8f3a9"; }
+ { locale = "dsb"; arch = "linux-i686"; sha256 = "7b989e4a804e366b7dc4fcd500968851e0978b2cd0f9da95e6f6504b9ccff7de"; }
+ { locale = "dsb"; arch = "linux-x86_64"; sha256 = "aa41149f4f2bc6020980920bdf85d57157ad3cee7dd7be0fa3328ecbb11007bf"; }
+ { locale = "el"; arch = "linux-i686"; sha256 = "f1b5bc91e4e34d6f17f3e4ed65fc3ab71e066b41df3ec0ff8c1156a4a51d7fb9"; }
+ { locale = "el"; arch = "linux-x86_64"; sha256 = "fb602fcc45c21c26aa7d15924182d9158064d43c14c44c62786427eaf51d4b1f"; }
+ { locale = "en-GB"; arch = "linux-i686"; sha256 = "ad269f2192a1d635b8b930aa58a0303a544221e53b38aa8c464c81d807e28477"; }
+ { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "31ac6558c5a1deb512e937a52ca48d2183881de53685ca0dfaa63dc4495e0a73"; }
+ { locale = "en-US"; arch = "linux-i686"; sha256 = "265ae5df1a5f2edeae8d08bdcde45df0920f6fb0ad70385371d06ff890017982"; }
+ { locale = "en-US"; arch = "linux-x86_64"; sha256 = "1a917f88835d8796c52a52ed5c14a9ea71e595de8515ced1ca1356995f529bd6"; }
+ { locale = "en-ZA"; arch = "linux-i686"; sha256 = "e345f37777a2d7fc763c24c7fb4fe3c6a99c2310066ad405c375b8af069eca84"; }
+ { locale = "en-ZA"; arch = "linux-x86_64"; sha256 = "d86bf38fb667938852531f081caefe10baba79dc35ff737fa468744911f6968b"; }
+ { locale = "eo"; arch = "linux-i686"; sha256 = "7b4069d26d4abfdd9878192fc7c5a54686687c401425205bce064d9720ae6f7c"; }
+ { locale = "eo"; arch = "linux-x86_64"; sha256 = "b1a1b3b8c0c72856e5bb6058dd0ea2dabf2d9dee084f0355a248bee253838b29"; }
+ { locale = "es-AR"; arch = "linux-i686"; sha256 = "5ef56bebe60802f449bcbd1e53ae6726c5109c559a8a9707269de2a31481764a"; }
+ { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "65f909b7f1e67cfcebbc8cab1377b967095b5a7f9650c7fa861544bbc874b59f"; }
+ { locale = "es-CL"; arch = "linux-i686"; sha256 = "0b7499173c0f44ccc4cecb49e1801bb596d7a027c5ee39678252530672785906"; }
+ { locale = "es-CL"; arch = "linux-x86_64"; sha256 = "69573ffa581de80f21c0201083febcc7de5549d9e567f02227f7d4567c1a97f8"; }
+ { locale = "es-ES"; arch = "linux-i686"; sha256 = "640bc3111816383cb69e59039289737ca5d16ec2f5238b694348e9df1db794a0"; }
+ { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "fca7e225eac47f200c3cd01ee617a1fc6bbd728eddba30bb4583eb486155ab47"; }
+ { locale = "es-MX"; arch = "linux-i686"; sha256 = "32342a144805a3c4e6bab5de0411116862d0b8276befa6f8689eca5d9da01860"; }
+ { locale = "es-MX"; arch = "linux-x86_64"; sha256 = "cc189b4d4abdd9e90fd0dbfcc5b683e2a717f1f41a7930d9c0b6c405de97a9b3"; }
+ { locale = "et"; arch = "linux-i686"; sha256 = "b203934a8292393d84f389ca3a13d25e0c9602a10faf60804b435cf45f2fd691"; }
+ { locale = "et"; arch = "linux-x86_64"; sha256 = "4384025c813efa759c2dd62ed735d662f26d1037e95e892050987d4b2f602a45"; }
+ { locale = "eu"; arch = "linux-i686"; sha256 = "179fb3acef15d262a9d2f7347a32f1d99bbcd5048c5cab5b69aaccb35afe82f2"; }
+ { locale = "eu"; arch = "linux-x86_64"; sha256 = "cec3a33bc9950f97f14fc6493158e095e7a1660e4d104c2ff23ce655813d28cc"; }
+ { locale = "fa"; arch = "linux-i686"; sha256 = "7ce8f6af63ad6d683e5e70e9b077c2452a7c0c040bad83efceab860e3d41d288"; }
+ { locale = "fa"; arch = "linux-x86_64"; sha256 = "14f7b3f7c7eff44db26c3b55ae85b8625354f1962315fd40e3df4199b067d303"; }
+ { locale = "ff"; arch = "linux-i686"; sha256 = "f4c9eb89160a5d4bf815715860fc4bc6bc7954e544182e60b204a031f83be5e0"; }
+ { locale = "ff"; arch = "linux-x86_64"; sha256 = "b774f005bb5dee44eb0974834b42441b47a68f733ef22446b2547aef898b0c02"; }
+ { locale = "fi"; arch = "linux-i686"; sha256 = "873cf1d866f5db419549a9c39fad9524599a737d80c6568d7a5c9c3739d36cd4"; }
+ { locale = "fi"; arch = "linux-x86_64"; sha256 = "29f179920b198403f983b11bbd3f1b2d2cb83c65f5f8edcff63dd891d50c413a"; }
+ { locale = "fr"; arch = "linux-i686"; sha256 = "ade608f8965144177d656d33ff4fa2f8fbd8f54861fca68ac74abab9ca085ad5"; }
+ { locale = "fr"; arch = "linux-x86_64"; sha256 = "9bfade44971633bca8b12d6e2e05de6d20ec55e368d78da49e44a0131e9d94bb"; }
+ { locale = "fy-NL"; arch = "linux-i686"; sha256 = "6124308765f3456ac066dc734d245c455168d66ed59a8a65edc1b59ff1130169"; }
+ { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "9a60afeb858c1e48e21e112f772bc2efd3ef2891b51d0241384658905b140709"; }
+ { locale = "ga-IE"; arch = "linux-i686"; sha256 = "2de086f287e86d29579896e8fdd9a4d43ba5ed49b5042e4b5c71ff6380d21467"; }
+ { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "4f2cb11d743ac7d6fb5bc319c940729aa81d9ac97545cf5c6096fcd0d2e7de69"; }
+ { locale = "gd"; arch = "linux-i686"; sha256 = "c18e5614d73f79df017b1cdedb6949e907ffcdc4152ddfbd56f79242a742f13a"; }
+ { locale = "gd"; arch = "linux-x86_64"; sha256 = "4b64e007698b2433ead4b14b87c06fd1682ebe7e90ee881d310a8cdab2cd4d13"; }
+ { locale = "gl"; arch = "linux-i686"; sha256 = "b319a40c4fa9c81533f431e95ad8f33d365aa799d3dccde5188beb3442c8422d"; }
+ { locale = "gl"; arch = "linux-x86_64"; sha256 = "04a9103e56982e4529c361647ccef527cfbbbb4e88a96a708c0665ee04accd44"; }
+ { locale = "gu-IN"; arch = "linux-i686"; sha256 = "a15bd410f9bdfde48438db95c44d91472f5567bd41c529b13a7b4d057f97a6b3"; }
+ { locale = "gu-IN"; arch = "linux-x86_64"; sha256 = "8046ecbabf700872e4e8cf5d1a1d3df53f984a00415e49cb1d21bd507533f4c9"; }
+ { locale = "he"; arch = "linux-i686"; sha256 = "8369eeb403ef55e61263eafb61e8265f130d5fe4dc277b5e68f6efb65edf6702"; }
+ { locale = "he"; arch = "linux-x86_64"; sha256 = "a602a9944685ce688a002ea87178e1231170b78ba6ee911a3c7effa41768ecb1"; }
+ { locale = "hi-IN"; arch = "linux-i686"; sha256 = "6eb2e8fa05bf7470f1be9756a5e529e5949f3e0796a0c663ee44c7264846fd3b"; }
+ { locale = "hi-IN"; arch = "linux-x86_64"; sha256 = "7e39439801361ab9051941323987364678ef9b1fc8e765bfad2d39d836b7bf85"; }
+ { locale = "hr"; arch = "linux-i686"; sha256 = "84cabd389757c61cea75ffc642a4b52e544e841a124066701eb071d2d88c15ed"; }
+ { locale = "hr"; arch = "linux-x86_64"; sha256 = "0bc123e9a5190d155727971c2bed078a5e6b857daa22f2f4bcee4aee76e07bbc"; }
+ { locale = "hsb"; arch = "linux-i686"; sha256 = "7a5d5a4a7a936defd6c3ea3b04550e39398428f90722d521490b700133964f82"; }
+ { locale = "hsb"; arch = "linux-x86_64"; sha256 = "545ec5865ce941ca3bc635032cd65215111d56b3f0d68814efdd8ecacaab1d1d"; }
+ { locale = "hu"; arch = "linux-i686"; sha256 = "b540eadbfa2bf5232049e30167ccf16249786f612ec152c14999e660eceb6497"; }
+ { locale = "hu"; arch = "linux-x86_64"; sha256 = "4f64d672481bfe88f40fcf944d98fafceae18372c1e2373bba8172877d7555b8"; }
+ { locale = "hy-AM"; arch = "linux-i686"; sha256 = "f5ace133a64745ecf564996ebd6be55ce3ee0ee5be2ed8fe6c66414833d1e479"; }
+ { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "e949bffb9180b0ccdc6794b99b3897f9f30dbea84d9d218cd68477634eb58b25"; }
+ { locale = "id"; arch = "linux-i686"; sha256 = "73f2d64106a3404f6edcc66ab59091ffedb0fcd0c7f475becebebdfc4df41e1c"; }
+ { locale = "id"; arch = "linux-x86_64"; sha256 = "20d9193d9fc95a3e040220373c216913ca0099989d665b516b1e5de1cd7bf05b"; }
+ { locale = "is"; arch = "linux-i686"; sha256 = "d6bdeb739b5db8c8a25239963bf2f0d096b76f5914f8f4f4a4843e611beaad9f"; }
+ { locale = "is"; arch = "linux-x86_64"; sha256 = "300ccec13085aee1b011dd0058c279a31981b3e91280440672e09c71c4dd0eda"; }
+ { locale = "it"; arch = "linux-i686"; sha256 = "1e02459ec7e62ca3038018e6c88f410e53b0d7b3d1b6cb94d74ad0218a54a948"; }
+ { locale = "it"; arch = "linux-x86_64"; sha256 = "ba8e8a9ab5f391a5560b7bfd41dd853c6b52c2ff59ce8424f96236263985029d"; }
+ { locale = "ja"; arch = "linux-i686"; sha256 = "681589c9748b0c7f78ba5c4afa0f254af6f92a0c0cfb504df6b29f94a917f8bb"; }
+ { locale = "ja"; arch = "linux-x86_64"; sha256 = "7c6447f4dd823e1517ce12ad0b295b53a22d3a0855e1660fac9563a91f6999c2"; }
+ { locale = "kk"; arch = "linux-i686"; sha256 = "0303c9b812115d3ada0d8fdfcf8e77143f4239440935bfaad5340d33a3270b8b"; }
+ { locale = "kk"; arch = "linux-x86_64"; sha256 = "168b2ae2ac9168ae674d8649840fd7cc93d95325c7c0d60d7251239b776e5886"; }
+ { locale = "km"; arch = "linux-i686"; sha256 = "04ba6e90f883e52809e51202356e4abda62ae40bb0ed225965ec8eeca333457d"; }
+ { locale = "km"; arch = "linux-x86_64"; sha256 = "4903ca63d1ffdafbb7ae36eb7221992101a8a013928e25a820aac51022cdbade"; }
+ { locale = "kn"; arch = "linux-i686"; sha256 = "2fc54219aa69f963c86e47fc2cafd78bfad2bbd2a11d2fb947786eaa30cfe255"; }
+ { locale = "kn"; arch = "linux-x86_64"; sha256 = "8fd8e3de5ba9bf2f408da21bdedc1d2baf269fb33251d38fc84ec8b9c2fc86a8"; }
+ { locale = "ko"; arch = "linux-i686"; sha256 = "eba2c630a59006bad5ff822409c18008e46a327e2903d88461dc88a54f573baa"; }
+ { locale = "ko"; arch = "linux-x86_64"; sha256 = "baaafa60c8101ea2dfab30149e7ac6b953a63fb7c835e6aa1488349ce8a98384"; }
+ { locale = "ku"; arch = "linux-i686"; sha256 = "b1333ed8afb9cd20b0e24d25e5747f466050acf1fc4ae2924df1bb345ce49f90"; }
+ { locale = "ku"; arch = "linux-x86_64"; sha256 = "dd87578c93884388871680ef66f1d37e78f78939e7182a7d3a41fd8287afcdb8"; }
+ { locale = "lij"; arch = "linux-i686"; sha256 = "6bdab68412b7d08da2023da4346eeac231bbda2de36d7225b7f7bdd23a36dbd6"; }
+ { locale = "lij"; arch = "linux-x86_64"; sha256 = "d31d69421e74bf089e74f70e5c595284a8b60ce153c7c3ffd83e808adb1bf371"; }
+ { locale = "lt"; arch = "linux-i686"; sha256 = "4e15475eed19edf5080695da8c9dc94d3bc28e064a30065a1adeb6ea11adcce9"; }
+ { locale = "lt"; arch = "linux-x86_64"; sha256 = "f5b94a979a1863d068e4f35f71476677febe23de0de2dd803f44e57d2a196c55"; }
+ { locale = "lv"; arch = "linux-i686"; sha256 = "177f771d821f7501d906fea0bec54d6064e36ce74dc5e17596cdbc460b7c0115"; }
+ { locale = "lv"; arch = "linux-x86_64"; sha256 = "a958f13c3be77bdd1ea10edb5a453f54aaf6b2b7d00981762ea946abb2aa0a7c"; }
+ { locale = "mai"; arch = "linux-i686"; sha256 = "32ee3fdb74c2023952071679cfc271ef548b0ba278619f0d2c2f19596c1b5fa1"; }
+ { locale = "mai"; arch = "linux-x86_64"; sha256 = "c4bb89d5c9b16a4814a628ee31f8628cf287864db44d55ba11321d8203a1fd1c"; }
+ { locale = "mk"; arch = "linux-i686"; sha256 = "b7ef5bee8ed38ba31ee2e2c1ab010e3a385b97096fff0120bb279e82b6220464"; }
+ { locale = "mk"; arch = "linux-x86_64"; sha256 = "edf82adb52759c0d60f4bbf23ba1e0b2f7bb47475c80621a508e8a46c6221d06"; }
+ { locale = "ml"; arch = "linux-i686"; sha256 = "265e68ed9ca02987ca9bc165b4fb69217e4e7aaf73d7ceb83eb0a3d472a3cbed"; }
+ { locale = "ml"; arch = "linux-x86_64"; sha256 = "948eae17ae44b03c01124243f2246abe98fa6fdd17e9f174a8b1387f87994ff4"; }
+ { locale = "mr"; arch = "linux-i686"; sha256 = "d3941188b754ec8219b0682eb8c3b531debbeccc0a5738a6304bb18075e473a6"; }
+ { locale = "mr"; arch = "linux-x86_64"; sha256 = "b40f07132f883a703caefc275ad4a3a6d65f0e5535067595ddd9e7ff604ca315"; }
+ { locale = "ms"; arch = "linux-i686"; sha256 = "217ae6fba0bb782e84bfc7d7658971c72a8922c4b8ae32abcacd8548c3b865ea"; }
+ { locale = "ms"; arch = "linux-x86_64"; sha256 = "74d4a6123c40d92db7690e518d6943c916ee5a8ad266c94bdb8edc0e31f7e744"; }
+ { locale = "nb-NO"; arch = "linux-i686"; sha256 = "cc66fba1d389994b079962e78a7aeb2e4df8c3eea785ada286983a12329c2699"; }
+ { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "20161c2e0fdfdc65625d31d6ec1fbbdf2b88281e44b9dcbc9c4e5a07bf03d105"; }
+ { locale = "nl"; arch = "linux-i686"; sha256 = "a8b86126c00e2fefe05a3783e03c7f3f6ca9575180b3b275b1dbb85c68cb126a"; }
+ { locale = "nl"; arch = "linux-x86_64"; sha256 = "61fea91996c56b7279dc88714567b3e63f69d1b56a2922ea9886b74a69045d53"; }
+ { locale = "nn-NO"; arch = "linux-i686"; sha256 = "594e4c7393b6692bcbff4a732cb22687207cdbbfeb1d66bd10d7784fa60b1fd1"; }
+ { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "ae78c76d203532c34023f06a6c7a3f26e864a1b95aca358b7c680e275b250c8a"; }
+ { locale = "or"; arch = "linux-i686"; sha256 = "b26642112413d3c53c6275a8b2bbaf162f4bdbaf9002ad4479b807e3447b2abe"; }
+ { locale = "or"; arch = "linux-x86_64"; sha256 = "d212b39c68a7cf8619c946ff7e94c2081ba2a9fca3ed599870167477a887fe87"; }
+ { locale = "pa-IN"; arch = "linux-i686"; sha256 = "e28e4bec4e4f9d151bdc1e1ffbd42266052fbd81a479c70196a614f825e42f9f"; }
+ { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "4874f5407d8040a5e447d5a22a8d9e433a6bda273bc813654d95e0b9abb02af5"; }
+ { locale = "pl"; arch = "linux-i686"; sha256 = "f738a7209e3da17fbc2c955148ef1e0ec08878acf374b9bff2ae6cb0b3b50138"; }
+ { locale = "pl"; arch = "linux-x86_64"; sha256 = "b78325bc9ab80c176ba266cc6c46933f78ba69e0da44e6526e7b433336534d11"; }
+ { locale = "pt-BR"; arch = "linux-i686"; sha256 = "dc1564eeb496b1b8584338879d26cfbe4e2191eef204c80ee6a2f9c2d4722426"; }
+ { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "48c8bb9a52ae80c74f6fe379b28cf072d8275158326e752c776c27409578fcfe"; }
+ { locale = "pt-PT"; arch = "linux-i686"; sha256 = "0e74d57776d68d3d35e26b5fabdb66016a00d8bf22c6ec458ffea2e2e233227d"; }
+ { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "61d5fbc72f928e59cdf93ef08684e4d598b154638bf88cdace7d274874efa040"; }
+ { locale = "rm"; arch = "linux-i686"; sha256 = "1baa7d0d61394c3108ff7d91798fa917e63a1a0943785f94697619cbb684148a"; }
+ { locale = "rm"; arch = "linux-x86_64"; sha256 = "5cec6c5c013997f1ebade4d139d055b1df3fb5ed75dd41e335535dbfc6bc9359"; }
+ { locale = "ro"; arch = "linux-i686"; sha256 = "78e4f327a928aed2342d845c9e8e4458eca8f77898aa2a7dd5f7ca55fc61a62b"; }
+ { locale = "ro"; arch = "linux-x86_64"; sha256 = "320c3dbd605c650b378ed8e93e8b2518039c8efab27471012a498dbc51d1cac3"; }
+ { locale = "ru"; arch = "linux-i686"; sha256 = "3fc9d98a86e63717dfeaa58ece0dbbb1a0523801c56c056ff74a60491a27fcb9"; }
+ { locale = "ru"; arch = "linux-x86_64"; sha256 = "1d95e946fbb109380ad2e2fd5986f12211241113e218ae7ecb43e009b7aa5a37"; }
+ { locale = "si"; arch = "linux-i686"; sha256 = "12d8e83cc703c00da6054bd32bdf39993b588cbb5374880a3961d5ab476b6d29"; }
+ { locale = "si"; arch = "linux-x86_64"; sha256 = "4ce710ccda7b56a46a8fea2f42c499aa2296377a0979f76f19563caa85f4517e"; }
+ { locale = "sk"; arch = "linux-i686"; sha256 = "86b726c25de378d53a8220681468fec88a7d525288b02eb9b700b12f87739ffc"; }
+ { locale = "sk"; arch = "linux-x86_64"; sha256 = "bf8f6bb1b5fd7c82ca14f1802e7914e10b981c04d3ca89df983fe07d7df5b88c"; }
+ { locale = "sl"; arch = "linux-i686"; sha256 = "39aaca3b7a559346aa418fd4abb1f2a44dc71901050a212178e3cbc7b870e6b1"; }
+ { locale = "sl"; arch = "linux-x86_64"; sha256 = "85f5f097c7b9a07bbcb97caa9c8e5cfd16d3636ae17b41ec32e91d1238134db9"; }
+ { locale = "son"; arch = "linux-i686"; sha256 = "2b5a33079e835afdf0246f8b4dec1db92fcc861636a75333c75f6d5d40c14201"; }
+ { locale = "son"; arch = "linux-x86_64"; sha256 = "4d91324e9b7f88db822216440d5420b0c8b0898bdf77699a6b0fde1ab4db2f0c"; }
+ { locale = "sq"; arch = "linux-i686"; sha256 = "e3e0194f5e72904b056be4b3e941c015d5af0d9f1a349fa39492a6cefaf5236d"; }
+ { locale = "sq"; arch = "linux-x86_64"; sha256 = "45767fa6b57fb21399d4850fa88a3435e3fe0bb679de56fc1c28767eca235ba5"; }
+ { locale = "sr"; arch = "linux-i686"; sha256 = "0f7addd1581d8552b874651bc8dde5b2fe4d4b814c694272674fb5f7732000be"; }
+ { locale = "sr"; arch = "linux-x86_64"; sha256 = "7b68d38004216c86e3eb648fa78b06da88a703d68343f723f8e9d577d4c1224c"; }
+ { locale = "sv-SE"; arch = "linux-i686"; sha256 = "5f76d137052ff04da12e80f08a34a09c6ccd92d9ddf2f6efcf193940a948f86c"; }
+ { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "1aac59a70ac58bfe1926e87a850d7a5a2783332cfd49d9df1ad1fd3e276a9a29"; }
+ { locale = "ta"; arch = "linux-i686"; sha256 = "2716d50134514693b5d6edafc7c127c708b9973c39d42823987061547e4c18be"; }
+ { locale = "ta"; arch = "linux-x86_64"; sha256 = "9c9310ad313227cab38d8cd9ff6c4d9c15037bd39777a7fbd4b23ca71a1ac48e"; }
+ { locale = "te"; arch = "linux-i686"; sha256 = "ac7d78ab767b13810ef7f313c2ba92067756082667db0e256e916f1f0be8c9fa"; }
+ { locale = "te"; arch = "linux-x86_64"; sha256 = "cd6fc0d115fb67272f205a3595c82107dc8b20ce0696a2de8da6f82a7ae07112"; }
+ { locale = "th"; arch = "linux-i686"; sha256 = "2d17b346aa296b79e880b83185d3608de4369de62e2e0ce2cfb8d2f3dd6ee97f"; }
+ { locale = "th"; arch = "linux-x86_64"; sha256 = "331f2c59b2659c65c6899455e9ce55cd54b8debf4d17a60a8d6e76e2198080b6"; }
+ { locale = "tr"; arch = "linux-i686"; sha256 = "491550857b3b2b3643f1798a9e871492177cdddfd17366057d147e1fbe1ca40e"; }
+ { locale = "tr"; arch = "linux-x86_64"; sha256 = "aa8677def660eb8a3d258e7e7da05972e84be96807c8c7912f15bde05d749af7"; }
+ { locale = "uk"; arch = "linux-i686"; sha256 = "9ebb7a0997353bc84b5d48ffae1631d30a70ecc3ed21010fc8499513e3404651"; }
+ { locale = "uk"; arch = "linux-x86_64"; sha256 = "d686139d6622d6867cb9af95ec0c5e79866974d12468722d40c0ede104897034"; }
+ { locale = "vi"; arch = "linux-i686"; sha256 = "e56c74b2f6752667f9448c081114065aa0d1c63979cc4bbbf1965a7acc62133e"; }
+ { locale = "vi"; arch = "linux-x86_64"; sha256 = "41c79d4bcca7c28d02108129de1c8c93f5666bbaf651faef1eb9b424d4e8cb5d"; }
+ { locale = "xh"; arch = "linux-i686"; sha256 = "89f30d4950fec07c9f1df426c1e5e9f72ab15efa5db93d243418909369d69f03"; }
+ { locale = "xh"; arch = "linux-x86_64"; sha256 = "f97ea6169a6bdd4e48a0aee72ca709ebc1e2032a406d3dde6d8a6719b8429ee7"; }
+ { locale = "zh-CN"; arch = "linux-i686"; sha256 = "9ad1e75c6ca5f38bb565e747cec2901ad567efd69efa56328b912e37239f5b9e"; }
+ { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "400baea252b6f92051e7b054bdb4a4827571036ff7def10cbd841cfe2eaea60a"; }
+ { locale = "zh-TW"; arch = "linux-i686"; sha256 = "2e7bc62dd7c6c41c5feaf8cf9131bbbb0f0a3403870e57066a98147275b120fd"; }
+ { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "f2d620e5f4e8baac689557dc34ce582aaf36bcf4253c4f7cb00db52e1e1db98e"; }
+ { locale = "zu"; arch = "linux-i686"; sha256 = "c9915d4f1b637934ba22dbb81aa2f711417fd5600c6efe25781f11bbd0c707cc"; }
+ { locale = "zu"; arch = "linux-x86_64"; sha256 = "8fa84e20fb1e21947a8f727bb881d8249bf384944ee9693314cb39715547da5d"; }
];
arch = if stdenv.system == "i686-linux"
diff --git a/pkgs/applications/networking/browsers/firefox-bin/generate_nix.rb b/pkgs/applications/networking/browsers/firefox-bin/generate_nix.rb
index a768b1f8dff..7936741cb3e 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/generate_nix.rb
+++ b/pkgs/applications/networking/browsers/firefox-bin/generate_nix.rb
@@ -44,7 +44,7 @@ end
puts(<<"EOH")
-# This file is generated from generate_nix.rb
+# This file is generated from generate_nix.rb. DO NOT EDIT.
# Execute the following command in a temporary directory to update the file.
#
# ruby generate_nix.rb > default.nix
@@ -83,6 +83,8 @@ puts(<<"EOH")
, systemd
}:
+assert stdenv.isLinux;
+
let
version = "#{real_version}";
sources = [
diff --git a/pkgs/applications/networking/browsers/firefox/30.nix b/pkgs/applications/networking/browsers/firefox/30.nix
deleted file mode 100644
index 1e2c3e2cfb1..00000000000
--- a/pkgs/applications/networking/browsers/firefox/30.nix
+++ /dev/null
@@ -1,211 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
-, libjpeg, libpng, zlib, dbus, dbus_glib, bzip2, xlibs
-, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
-, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
-, hunspell, libevent, libstartup_notification, libvpx
-, cairo, gstreamer, gst_plugins_base, icu
-, debugBuild ? false
-, # If you want the resulting program to call itself "Firefox" instead
- # of "Shiretoko" or whatever, enable this option. However, those
- # binaries may not be distributed without permission from the
- # Mozilla Foundation, see
- # http://www.mozilla.org/foundation/trademarks/.
- enableOfficialBranding ? false
-}:
-
-assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
-
-rec {
-
- firefoxVersion = "30.0";
-
- xulVersion = "30.0"; # this attribute is used by other packages
-
-
- src = fetchurl {
- url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
- sha1 = "bll9hxf31gvg9db6gxgmq25qsjif3p11";
- };
-
- commonConfigureFlags =
- [ "--with-system-jpeg"
- "--with-system-zlib"
- "--with-system-bz2"
- "--with-system-nspr"
- "--with-system-nss"
- "--with-system-libevent"
- "--with-system-libvpx"
- "--with-system-png"
- # "--with-system-icu" # causes ‘ar: invalid option -- 'L'’ in Firefox 28.0
- "--enable-system-ffi"
- "--enable-system-hunspell"
- "--enable-system-pixman"
- "--enable-system-sqlite"
- "--enable-system-cairo"
- "--enable-gstreamer"
- "--enable-startup-notification"
- # "--enable-content-sandbox" # available since 26.0, but not much info available
- # "--enable-content-sandbox-reporter" # keeping disabled for now
- "--disable-crashreporter"
- "--disable-tests"
- "--disable-necko-wifi" # maybe we want to enable this at some point
- "--disable-installer"
- "--disable-updater"
- "--disable-pulseaudio"
- ] ++ (if debugBuild then [ "--enable-debug" "--enable-profiling"]
- else [ "--disable-debug" "--enable-release"
- "--enable-optimize" "--enable-strip" ]);
-
-
- xulrunner = stdenv.mkDerivation rec {
- name = "xulrunner-${xulVersion}";
-
- inherit src;
-
- buildInputs =
- [ pkgconfig libpng gtk perl zip libIDL libjpeg zlib bzip2
- python dbus dbus_glib pango freetype fontconfig xlibs.libXi
- xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
- alsaLib nspr nss libnotify xlibs.pixman yasm mesa
- xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite
- xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper
- hunspell libevent libstartup_notification libvpx cairo
- gstreamer gst_plugins_base icu
- ];
-
- configureFlags =
- [ "--enable-application=xulrunner"
- "--disable-javaxpcom"
- ] ++ commonConfigureFlags;
-
- #enableParallelBuilding = true; # cf. https://github.com/NixOS/nixpkgs/pull/1699#issuecomment-35196282
-
- preConfigure =
- ''
- export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}"
-
- mkdir ../objdir
- cd ../objdir
- configureScript=../mozilla-release/configure
- ''; # */
-
- #installFlags = "SKIP_GRE_REGISTRATION=1";
-
- preInstall = ''
- # The following is needed for startup cache creation on grsecurity kernels
- paxmark m ../objdir/dist/bin/xpcshell
- '';
-
- postInstall = ''
- # Fix run-mozilla.sh search
- libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*)
- echo libDir: $libDir
- test -n "$libDir"
- cd $out/bin
- rm xulrunner
-
- for i in $out/lib/$libDir/*; do
- file $i;
- if file $i | grep executable &>/dev/null; then
- echo -e '#! /bin/sh\nexec "'"$i"'" "$@"' > "$out/bin/$(basename "$i")";
- chmod a+x "$out/bin/$(basename "$i")";
- fi;
- done
- for i in $out/lib/$libDir/*.so; do
- patchelf --set-rpath "$(patchelf --print-rpath "$i"):$out/lib/$libDir" $i || true
- done
-
- # For grsecurity kernels
- paxmark m $out/lib/$libDir/{plugin-container,xulrunner}
-
- for i in $out/lib/$libDir/{plugin-container,xulrunner,xulrunner-stub}; do
- wrapProgram $i --prefix LD_LIBRARY_PATH ':' "$out/lib/$libDir"
- done
-
- rm -f $out/bin/run-mozilla.sh
- ''; # */
-
- meta = {
- description = "Mozilla Firefox XUL runner";
- homepage = http://www.mozilla.com/en-US/firefox/;
- };
-
- passthru = { inherit gtk; version = xulVersion; };
- };
-
-
- firefox = stdenv.mkDerivation rec {
- name = "firefox-${firefoxVersion}";
-
- inherit src;
-
- enableParallelBuilding = true;
-
- buildInputs =
- [ pkgconfig libpng gtk perl zip libIDL libjpeg zlib bzip2 python
- dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify
- xlibs.pixman yasm mesa sqlite file unzip pysqlite
- hunspell libevent libstartup_notification libvpx cairo
- gstreamer gst_plugins_base icu
- ];
-
- patches = [
- ./disable-reporter.patch # fixes "search box not working when built on xulrunner"
- ./xpidl.patch
- ];
-
- propagatedBuildInputs = [xulrunner];
-
- configureFlags =
- [ "--enable-application=browser"
- "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"
- "--enable-chrome-format=jar"
- ]
- ++ commonConfigureFlags
- ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
-
- makeFlags = [
- "SYSTEM_LIBXUL=1"
- ];
-
- # Because preConfigure runs configure from a subdirectory.
- configureScript = "../configure";
-
- preConfigure =
- ''
- # Hack to work around make's idea of -lbz2 dependency
- find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${
- stdenv.lib.concatStringsSep ":"
- (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc]))
- }' ';'
-
- # Building directly in the main source directory is not allowed.
- mkdir obj_dir
- cd obj_dir
- '';
-
- postInstall =
- ''
- ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner
- cd "$out/lib/"firefox-*
- rm firefox
- echo -e '#!${stdenv.shell}\nexec ${xulrunner}/bin/xulrunner "'"$PWD"'/application.ini" "$@"' > firefox
- chmod a+x firefox
-
- # Put chrome.manifest etc. in the right place.
- mv browser/* .
- rmdir browser
- ''; # */
-
- meta = {
- description = "Mozilla Firefox - the browser, reloaded";
- homepage = http://www.mozilla.com/en-US/firefox/;
- maintainers = with stdenv.lib.maintainers; [ eelco wizeman ];
- };
-
- passthru = {
- inherit gtk xulrunner nspr;
- isFirefox3Like = true;
- };
- };
-}
diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index e23a6d94ec1..6d4a8078dc8 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -15,14 +15,14 @@
assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
-let version = "31.0"; in
+let version = "32.0.3"; in
stdenv.mkDerivation rec {
name = "firefox-${version}";
src = fetchurl {
url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2";
- sha1 = "a6c3e25ee3aeb7da42db2aaeb50a385d63532beb";
+ sha1 = "1f831147365478e353212714038e812ca3e9fe42";
};
buildInputs =
@@ -66,7 +66,8 @@ stdenv.mkDerivation rec {
]
++ (if debugBuild then [ "--enable-debug" "--enable-profiling"]
else [ "--disable-debug" "--enable-release"
- "--enable-optimize" "--enable-strip" ])
+ "--enable-optimize${lib.optionalString (stdenv.system == "i686-linux") "=-O1"}"
+ "--enable-strip" ])
++ lib.optional enableOfficialBranding "--enable-official-branding";
enableParallelBuilding = true;
@@ -87,7 +88,7 @@ stdenv.mkDerivation rec {
postInstall =
''
# For grsecurity kernels
- paxmark m $out/lib/*/{plugin-container,xulrunner}
+ paxmark m $out/lib/${name}/{firefox,firefox-bin,plugin-container}
# Remove SDK cruft. FIXME: move to a separate output?
rm -rf $out/share/idl $out/include $out/lib/firefox-devel-*
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
index d39dfe3582e..32baa0b6a86 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
@@ -36,7 +36,7 @@
let
# -> http://get.adobe.com/flashplayer/
- version = "11.2.202.394";
+ version = "11.2.202.406";
src =
if stdenv.system == "x86_64-linux" then
@@ -47,18 +47,20 @@ let
else rec {
inherit version;
url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz";
- sha256 = "1w82kmda91xdsrqpkrbcbrzswnbfszy0x9hvf9wf2h14isimdknx";
+ sha256 = "05akcw89kz0cnhan6wp72banz2asmvqfhb2cw1krn66qgd7bl0x0";
}
else if stdenv.system == "i686-linux" then
- if debug then {
+ if debug then
+ throw "flash debugging version is outdated and probably broken" /* {
# The debug version also contains a player
version = "11.1";
url = http://fpdownload.macromedia.com/pub/flashplayer/updaters/11/flashplayer_11_plugin_debug.i386.tar.gz;
sha256 = "1z3649lv9sh7jnwl8d90a293nkaswagj2ynhsr4xmwiy7c0jz2lk";
- } else rec {
+ }*/
+ else rec {
inherit version;
url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz";
- sha256 = "0c8wp4qn6k224krihxb08g7727wlklk9bl4h7nqp3cpp85x9hg97";
+ sha256 = "10f3842vi80kszj42f4c8sw7plrmvsin5k860cqvlzgdhndz8i4b";
}
else throw "Flash Player is not supported on this platform";
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
index afe0600d6f7..029df7e46de 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
@@ -13,6 +13,7 @@ let
[ mesa
xorg.libXt
xorg.libX11
+ xorg.libXrender
cairo
libpng
gtk
@@ -47,20 +48,20 @@ stdenv.mkDerivation rec {
name = "google-talk-plugin-${version}";
# You can get the upstream version and SHA-1 hash from the following URLs:
- # http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-amd64/Packages
- # http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-i386/Packages
- version = "5.1.5.0";
+ # curl -s http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-amd64/Packages | grep -E 'Version|SHA1'
+ # curl -s http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-i386/Packages | grep -E 'Version|SHA1'
+ version = "5.4.2.0";
src =
if stdenv.system == "x86_64-linux" then
fetchurl {
url = "${baseURL}/google-talkplugin_${version}-1_amd64.deb";
- sha1 = "fc830f4c7f5816f4578ec73e6d4aef059ad4a0b1";
+ sha1 = "d75fad757750b4830c4e401ade92b4993e2a4ab2";
}
else if stdenv.system == "i686-linux" then
fetchurl {
url = "${baseURL}/google-talkplugin_${version}-1_i386.deb";
- sha1 = "9b7043c3585b3479ba11aabb7b8af755a61df963";
+ sha1 = "410872377b0bdac06b580c5e1755a3a3c712144b";
}
else throw "Google Talk does not support your platform.";
@@ -72,22 +73,18 @@ stdenv.mkDerivation rec {
''
plugins=$out/lib/mozilla/plugins
mkdir -p $plugins
- cp opt/google/talkplugin/libnp*.so $plugins
+ cp opt/google/talkplugin/*.so $plugins
- patchelf --set-rpath "${makeLibraryPath [ stdenv.gcc.gcc xorg.libX11 ]}:${stdenv.gcc.gcc}/lib64" \
- $plugins/libnpgoogletalk.so
+ for i in libnpgoogletalk.so libppgoogletalk.so libppo1d.so; do
+ patchelf --set-rpath "${makeLibraryPath [ stdenv.gcc.gcc xorg.libX11 ]}:${stdenv.gcc.gcc}/lib64" $plugins/$i
+ done
- patchelf --set-rpath "$out/libexec/google/talkplugin/lib:${rpathPlugin}:${stdenv.gcc.gcc}/lib64" \
- $plugins/libnpgtpo3dautoplugin.so
+ for i in libgoogletalkremoting.so libnpo1d.so; do
+ patchelf --set-rpath "$out/libexec/google/talkplugin/lib:${rpathPlugin}:${stdenv.gcc.gcc}/lib64" $plugins/$i
+ done
mkdir -p $out/libexec/google/talkplugin
- cp -prd opt/google/talkplugin/{GoogleTalkPlugin,locale,windowpicker.glade} $out/libexec/google/talkplugin/
-
- mkdir -p $out/libexec/google/talkplugin/lib
- cp opt/google/talkplugin/lib/libCg* $out/libexec/google/talkplugin/lib/
-
- patchelf --set-rpath "$out/libexec/google/talkplugin/lib" \
- $out/libexec/google/talkplugin/lib/libCgGL.so
+ cp -prd opt/google/talkplugin/{data,GoogleTalkPlugin,locale,remoting24x24.png,windowpicker.glade} $out/libexec/google/talkplugin/
patchelf \
--set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix
new file mode 100644
index 00000000000..10b2ffaff5b
--- /dev/null
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix
@@ -0,0 +1,44 @@
+{ stdenv, fetchurl, dpkg, zlib }:
+
+assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux";
+
+stdenv.mkDerivation {
+ name = "TREZOR-bridge-1.0.5";
+
+ passthru = {
+ mozillaPlugin = "/lib/mozilla/plugins";
+ };
+
+ src =
+ if stdenv.system == "x86_64-linux" then
+ fetchurl {
+ url = https://mytrezor.com/data/plugin/1.0.5/browser-plugin-trezor_1.0.5_amd64.deb;
+ sha256 = "0097h4v88yca4aayzprrh4pk03xvvj7ncz2mi83chm81gsr2v67z";
+ }
+ else
+ fetchurl {
+ url = https://mytrezor.com/data/plugin/1.0.5/browser-plugin-trezor_1.0.5_i386.deb;
+ sha256 = "0xzbq78s3ivg00f0bj6gyjgf47pvjx2l4mm05jjmdar60bf1xr1n";
+ };
+
+ phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
+
+ dontStrip = true;
+ dontPatchELF = true;
+
+ unpackPhase = "${dpkg}/bin/dpkg-deb -x $src .";
+
+ installPhase = ''
+ mkdir -p $out/etc/udev/rules.d/ $out/lib/mozilla/plugins
+ cp ./lib/udev/rules.d/51-trezor-udev.rules $out/etc/udev/rules.d/
+ cp ./usr/lib/mozilla/plugins/npBitcoinTrezorPlugin.so $out/lib/mozilla/plugins
+ '';
+
+ meta = with stdenv.lib;
+ { description = "Plugin for browser to TREZOR device communication";
+ homepage = https://mytrezor.com;
+ license = licenses.unfree;
+ maintainers = with maintainers; [ emery ];
+ };
+
+}
\ No newline at end of file
diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix
index 201a6b947c1..e1bcbf92367 100644
--- a/pkgs/applications/networking/browsers/opera/default.nix
+++ b/pkgs/applications/networking/browsers/opera/default.nix
@@ -82,5 +82,6 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://www.opera.com;
description = "Web browser";
+ license = "unfree";
};
}
diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix
index 5f046f7b732..bf14e7e5341 100644
--- a/pkgs/applications/networking/browsers/w3m/default.nix
+++ b/pkgs/applications/networking/browsers/w3m/default.nix
@@ -42,6 +42,6 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = http://w3m.sourceforge.net/;
description = "A text-mode web browser";
- maintainers = maintainers.mornfall;
+ maintainers = [ maintainers.mornfall ];
};
}
diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix
index 4329308ba04..fe93a072b2c 100644
--- a/pkgs/applications/networking/cluster/mesos/default.nix
+++ b/pkgs/applications/networking/cluster/mesos/default.nix
@@ -18,7 +18,7 @@ in stdenv.mkDerivation {
buildInputs = [
makeWrapper autoconf automake libtool curl sasl jdk maven
- python wrapPython boto distutils-cfg
+ python wrapPython boto distutils-cfg setuptools
];
propagatedBuildInputs = [
diff --git a/pkgs/applications/networking/copy-com/default.nix b/pkgs/applications/networking/copy-com/default.nix
new file mode 100644
index 00000000000..0b0fc359a6b
--- /dev/null
+++ b/pkgs/applications/networking/copy-com/default.nix
@@ -0,0 +1,58 @@
+{ stdenv, coreutils, fetchurl, patchelf, gcc }:
+
+let
+ arch = if stdenv.system == "x86_64-linux" then "x86_64"
+ else if stdenv.system == "i686-linux" then "x86"
+ else if stdenv.system == "armv6-linux" then "armv6h"
+ else throw "Copy.com client for: ${stdenv.system} not supported!";
+
+ interpreter = if stdenv.system == "x86_64-linux" then "ld-linux-x86-64.so.2"
+ else if stdenv.system == "i686-linux" then "ld-linux.so.2"
+ else if stdenv.system == "armv6-linux" then "ld-linux.so.2"
+ else throw "Copy.com client for: ${stdenv.system} not supported!";
+
+ appdir = "opt/copy";
+
+in stdenv.mkDerivation {
+
+ name = "copy-com-1.47.0410";
+
+ src = fetchurl {
+ # Note: copy.com doesn't version this file. Annoying.
+ url = "https://copy.com/install/linux/Copy.tgz";
+ sha256 = "a48c69f6798f888617cfeef5359829e619057ae0e6edf3940b4ea6c81131012a";
+ };
+
+ buildInputs = [ coreutils patchelf ];
+
+ phases = "unpackPhase installPhase";
+
+ installPhase = ''
+ mkdir -p $out/opt
+ cp -r ${arch} "$out/${appdir}"
+ ensureDir "$out/bin"
+ ln -s "$out/${appdir}/CopyConsole" "$out/bin/copy_console"
+ ln -s "$out/${appdir}/CopyAgent" "$out/bin/copy_agent"
+ ln -s "$out/${appdir}/CopyCmd" "$out/bin/copy_cmd"
+ patchelf --set-interpreter ${stdenv.glibc}/lib/${interpreter} \
+ "$out/${appdir}/CopyConsole"
+
+ RPATH=${gcc.gcc}/lib:$out/${appdir}
+ echo "updating rpaths to: $RPATH"
+ find "$out/${appdir}" -type f -a -perm +0100 \
+ -print -exec patchelf --force-rpath --set-rpath "$RPATH" {} \;
+
+
+
+ '';
+
+ meta = {
+ homepage = http://copy.com;
+ description = "Copy.com Client";
+ # Closed Source unfortunately.
+ license = stdenv.lib.licenses.unfree;
+ maintainers = with stdenv.lib.maintainers; [ nathan-gs ];
+ # NOTE: Copy.com itself only works on linux, so this is ok.
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/applications/networking/davmail/default.nix b/pkgs/applications/networking/davmail/default.nix
index 3639f50c439..f4f1e94438d 100644
--- a/pkgs/applications/networking/davmail/default.nix
+++ b/pkgs/applications/networking/davmail/default.nix
@@ -1,10 +1,10 @@
{ fetchurl, stdenv, jre, glib, libXtst, gtk, makeWrapper }:
stdenv.mkDerivation rec {
- name = "davmail-4.5.0";
+ name = "davmail-4.5.1";
src = fetchurl {
- url = "http://downloads.sourceforge.net/project/davmail/davmail/4.5.0/davmail-linux-x86_64-4.5.0-2292.tgz";
- sha256 = "0ixg26s8535b4xf4i8jr0v3acwvaslmi2dvcxg2nmzkicvh6rfd4";
+ url = "mirror://sourceforge/davmail/davmail-linux-x86_64-4.5.1-2303.tgz";
+ sha256 = "0y9dwxlfrfm6yf010fad1p5vsyz2ddci6vhz4sa1js2fq4rvyx7a";
};
buildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index 9ddcc5629b1..82a340591f2 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -25,9 +25,9 @@ let
else if stdenv.system == "i686-linux" then "ld-linux.so.2"
else throw "Dropbox client for: ${stdenv.system} not supported!";
- version = "2.10.28";
- sha256 = if stdenv.system == "x86_64-linux" then "0jrg9xy03yc7npjhng9wiyzidbq7s5n8g4fwynnm1yqfd69r3yac"
- else if stdenv.system == "i686-linux" then "17vbikhdp5l2s8cnqmk8dln4dfzvrvgqls7av3ngf71bx3bj0fij"
+ version = "2.10.30";
+ sha256 = if stdenv.system == "x86_64-linux" then "1gdch4fka5f671zwl329j6b60igki1rzxw9ggxcywcg1h4rlvw7r"
+ else if stdenv.system == "i686-linux" then "1a4pswpy945iqzvi8kcs1r0sydb04h28v5zv0hdyra0c548wsm2g"
else throw "Dropbox client for: ${stdenv.system} not supported!";
# relative location where the dropbox libraries are stored
@@ -88,5 +88,6 @@ in stdenv.mkDerivation {
meta = {
homepage = "http://www.dropbox.com";
description = "Online stored folders (daemon version)";
+ maintainers = with stdenv.lib.maintainers; [ ttuegel ];
};
}
diff --git a/pkgs/applications/networking/ids/bro/default.nix b/pkgs/applications/networking/ids/bro/default.nix
index d60d39ac028..a37f831deed 100644
--- a/pkgs/applications/networking/ids/bro/default.nix
+++ b/pkgs/applications/networking/ids/bro/default.nix
@@ -1,22 +1,21 @@
{stdenv, fetchurl, cmake, flex, bison, openssl, libpcap, perl, zlib, file, curl, geoip, gperftools }:
stdenv.mkDerivation rec {
- name = "bro-2.1";
+ name = "bro-2.3.1";
src = fetchurl {
url = "http://www.bro.org/downloads/release/${name}.tar.gz";
- sha256 = "1q2mm7rbgjcn01na2wm5fdfdm9pggzgljxj0n127s93fip3vg0qd";
+ sha256 = "0008wq20xa3z95ccjspxgx7asvny28r7qlj254zdnbax6cgd4cpz";
};
buildInputs = [ cmake flex bison openssl libpcap perl zlib file curl geoip gperftools ];
- USER="something";
-
enableParallelBuilding = true;
- meta = {
+ meta = with stdenv.lib; {
description = "Powerful network analysis framework that is much different from the typical IDS you may know";
homepage = http://www.bro.org/;
- license = "BSD";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ pSub ];
};
}
diff --git a/pkgs/applications/networking/ids/daq/default.nix b/pkgs/applications/networking/ids/daq/default.nix
index 36571809a37..3e7a80f137d 100644
--- a/pkgs/applications/networking/ids/daq/default.nix
+++ b/pkgs/applications/networking/ids/daq/default.nix
@@ -1,12 +1,12 @@
{stdenv, fetchurl, flex, bison, libpcap}:
stdenv.mkDerivation rec {
- name = "daq-2.0.0";
+ name = "daq-2.0.2";
src = fetchurl {
name = "${name}.tar.gz";
- url = http://www.snort.org/downloads/2311;
- sha256 = "0f0w5jfmx0n2sms4f2mfg984a27r7qh927vkd7fclvx9cbiwibzv";
+ url = "http://www.snort.org/downloads/snort/${name}.tar.gz";
+ sha256 = "1a39qbm9nc05yr8llawl7mz0ny1fci4acj9c2k1h4klrqikiwpfn";
};
buildInputs = [ flex bison libpcap ];
@@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Data AcQuisition library (DAQ), for packet I/O";
homepage = http://www.snort.org;
+ maintainers = with stdenv.lib.maintainers; [ aycanirican ];
license = stdenv.lib.licenses.gpl2;
};
}
diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix
index 580591c18ad..5b740cec935 100644
--- a/pkgs/applications/networking/ids/snort/default.nix
+++ b/pkgs/applications/networking/ids/snort/default.nix
@@ -1,12 +1,12 @@
{stdenv, fetchurl, libpcap, pcre, libdnet, daq, zlib, flex, bison}:
stdenv.mkDerivation rec {
- name = "snort-2.9.4.6";
+ name = "snort-2.9.6.2";
src = fetchurl {
name = "${name}.tar.gz";
- url = http://www.snort.org/downloads/2320;
- sha256 = "1g5kn36l67a5m95h2shqwqbbjb6rgl3sf1bciakal2l4n6857ang";
+ url = "http://www.snort.org/downloads/snort/${name}.tar.gz";
+ sha256 = "0xsxbd5h701ncnhn9sf7zkmzravlqhn1182whinphfjjw72py7cf";
};
buildInputs = [ libpcap pcre libdnet daq zlib flex bison ];
@@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Network intrusion prevention and detection system (IDS/IPS)";
homepage = http://www.snort.org;
+ maintainers = with stdenv.lib.maintainers; [ aycanirican ];
license = stdenv.lib.licenses.gpl2;
};
}
diff --git a/pkgs/applications/ike/default.nix b/pkgs/applications/networking/ike/default.nix
similarity index 100%
rename from pkgs/applications/ike/default.nix
rename to pkgs/applications/networking/ike/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
index cf10c1e6fe2..22e9143953e 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
@@ -1,19 +1,23 @@
{ fetchurl, stdenv, gnutls, glib, pkgconfig, check, libotr }:
+with stdenv.lib;
stdenv.mkDerivation rec {
- name = "bitlbee-3.2";
+ name = "bitlbee-3.2.2";
src = fetchurl {
url = "mirror://bitlbee/src/${name}.tar.gz";
- sha256 = "1b43828e906f5450993353f2ebecc6c038f0261c4dc3f1722ebafa6ea3e62030";
+ sha256 = "13jmcxxgli82wb2n4hs091159xk8rgh7nb02f478lgpjh6996f5s";
};
buildInputs = [ gnutls glib pkgconfig libotr ]
- ++ stdenv.lib.optional doCheck check;
+ ++ optional doCheck check;
- configureFlags = [ "--otr=1" ];
+ configureFlags = [
+ "--gcov=1"
+ "--otr=1"
+ "--ssl=gnutls"
+ ];
- preCheck = "mkdir tests/.depend";
doCheck = true;
meta = {
@@ -31,9 +35,9 @@ stdenv.mkDerivation rec {
'';
homepage = http://www.bitlbee.org/;
- license = stdenv.lib.licenses.gpl2Plus;
+ license = licenses.gpl2Plus;
- maintainers = [ stdenv.lib.maintainers.ludo ];
- platforms = stdenv.lib.platforms.gnu; # arbitrary choice
+ maintainers = with maintainers; [ ludo wkennington ];
+ platforms = platforms.gnu; # arbitrary choice
};
}
diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix
index e46956f3cca..41bd4ca4513 100644
--- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cyrus_sasl, gettext, openldap, ptlib, opal, libXv, rarian, intltool
+{ stdenv, glib, fetchurl, cyrus_sasl, gettext, openldap, ptlib, opal, libXv, rarian, intltool
, perl, perlXMLParser, evolution_data_server, gnome_doc_utils, avahi, autoreconfHook
, libsigcxx, gtk, dbus_glib, libnotify, libXext, xextproto, gnome3, boost, libsecret
, pkgconfig, libxml2, videoproto, unixODBC, db, nspr, nss, zlib, hicolor_icon_theme
@@ -15,10 +15,11 @@ stdenv.mkDerivation rec {
buildInputs = [ cyrus_sasl gettext openldap ptlib opal libXv rarian intltool
perl perlXMLParser evolution_data_server gnome_doc_utils avahi
libsigcxx gtk dbus_glib libnotify libXext xextproto sqlite
- gnome3.libsoup
- hicolor_icon_theme gnome3.gnome_icon_theme boost autoreconfHook
- pkgconfig libxml2 videoproto unixODBC db nspr nss zlib libsecret
- libXrandr randrproto which libxslt libtasn1 gmp nettle makeWrapper ];
+ gnome3.libsoup glib gnome3.gnome_icon_theme_symbolic
+ hicolor_icon_theme gnome3.gnome_icon_theme boost boost.lib
+ autoreconfHook pkgconfig libxml2 videoproto unixODBC db nspr
+ nss zlib libsecret libXrandr randrproto which libxslt libtasn1
+ gmp nettle makeWrapper ];
preAutoreconf = ''
substituteInPlace configure.ac --replace AM_GCONF_SOURCE_2 ""
@@ -27,7 +28,7 @@ stdenv.mkDerivation rec {
configureFlags = [
"--with-ldap-dir=${openldap}"
"--with-libsasl2-dir=${cyrus_sasl}"
- "--with-boost-libdir=${boost}/lib"
+ "--with-boost-libdir=${boost.lib}/lib"
"--disable-gconf"
];
@@ -37,7 +38,7 @@ stdenv.mkDerivation rec {
postInstall = ''
wrapProgram "$out"/bin/ekiga \
- --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
+ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix
index cf4c2e22ad6..22e8a97466b 100644
--- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix
+++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, libtool, xlibs, freetype, fontconfig, openssl, glib
, mesa, gstreamer, gst_plugins_base, dbus, alsaLib, zlib, libuuid
, libxml2, libxslt, sqlite, libogg, libvorbis, xz, libcanberra
-, makeWrapper, libredirect, xkeyboard_config }:
+, makeWrapper, libredirect, xkeyboard_config, xcbutilkeysyms }:
let
- version = "2.2.1107";
+ version = "2.2.1163";
rpath = stdenv.lib.makeSearchPath "lib" [
stdenv.glibc
@@ -40,18 +40,19 @@ let
libvorbis
xz
libcanberra
+ xcbutilkeysyms
] + ":${stdenv.gcc.gcc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}";
src =
if stdenv.system == "x86_64-linux" then
fetchurl {
url = "http://downloads.hipchat.com/linux/arch/x86_64/hipchat-${version}-x86_64.pkg.tar.xz";
- sha256 = "0lf780pxbh40m2i48cki072lrm75924cz3zgkmaxddmar3y13bwa";
+ sha256 = "0yafin8qfnv9kj61z9vxza42r7fv8b9j04qs50masbly0jg5xsg8";
}
else if stdenv.system == "i686-linux" then
fetchurl {
url = "http://downloads.hipchat.com/linux/arch/i686/hipchat-${version}-i686.pkg.tar.xz";
- sha256 = "1k33670rpigdpy9jcacryc1i05ykp5yffcplmbm5q29ng54cn0zv";
+ sha256 = "1a0yvrnp41s53wpqv2jxsb3gd4vb49nfh89m6nwbw4qd85i5lfsp";
}
else
throw "HipChat is not supported on ${stdenv.system}";
diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/applications/networking/instant-messengers/mcabber/default.nix
index cae0213c6be..362bf0de977 100644
--- a/pkgs/applications/networking/instant-messengers/mcabber/default.nix
+++ b/pkgs/applications/networking/instant-messengers/mcabber/default.nix
@@ -1,19 +1,22 @@
{stdenv, fetchurl, openssl, ncurses, pkgconfig, glib, loudmouth}:
-stdenv.mkDerivation {
-
- name = "mcabber-0.10.1";
+stdenv.mkDerivation rec {
+ name = "mcabber-${version}";
+ version = "0.10.3";
src = fetchurl {
- url = "http://mcabber.com/files/mcabber-0.10.1.tar.bz2";
+ url = "http://mcabber.com/files/mcabber-${version}.tar.bz2";
sha256 = "1248cgci1v2ypb90wfhyipwdyp1wskn3gzh78af5ai1a4w5rrjq0";
};
- meta = { homepage = "http://mcabber.com/";
- description = "Small Jabber console client";
- };
-
buildInputs = [openssl ncurses pkgconfig glib loudmouth];
configureFlags = "--with-openssl=${openssl}";
+
+ meta = with stdenv.lib; {
+ homepage = http://mcabber.com/;
+ description = "Small Jabber console client";
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ pSub ];
+ };
}
diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix
new file mode 100644
index 00000000000..438b6f35145
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, pkgconfig, libtoxcore, qt5, openal, opencv }:
+
+
+stdenv.mkDerivation rec {
+ name = "qtox-dev-20140918";
+
+ src = fetchFromGitHub {
+ owner = "tux3";
+ repo = "qTox";
+ rev = "f06ec65bca";
+ sha256 = "0r7qc444bgsxawyya5nw3xk1c50b90307lcwazs8mn35h4snr97m";
+ };
+
+ buildInputs = [ pkgconfig libtoxcore qt5 openal opencv ];
+
+ configurePhase = "qmake";
+
+ installPhase = ''
+ ensureDir $out/bin
+ cp qtox $out/bin
+ '';
+
+ meta = with stdenv.lib; {
+ description = "QT Tox client";
+ license = licenses.gpl3;
+ maintainers = with stdenv.lib.maintainers; [ viric ];
+ platforms = stdenv.lib.platforms.all;
+ };
+}
diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
index d7dc755e9ab..3870533aa89 100644
--- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
+++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
@@ -1,5 +1,7 @@
-{ stdenv, fetchurl, zlib, glib, libpng, freetype, xorg, fontconfig, alsaLib, makeWrapper, xlibs
-, qt5, pulseaudio ? null, qt4, xkeyboard_config, libredirect }:
+{ stdenv, fetchurl, makeWrapper, zlib, glib, libpng, freetype, xorg
+, fontconfig, xlibs, qt5, xkeyboard_config, alsaLib, pulseaudio ? null
+, libredirect, quazip
+}:
let
@@ -9,8 +11,8 @@ let
deps =
[ zlib glib libpng freetype xorg.libSM xorg.libICE xorg.libXrender
- xorg.libXrandr xorg.libXfixes xorg.libXcursor xorg.libXinerama xlibs.libxcb
- fontconfig xorg.libXext xorg.libX11 alsaLib qt5 pulseaudio
+ xorg.libXrandr xorg.libXfixes xorg.libXcursor xorg.libXinerama
+ xlibs.libxcb fontconfig xorg.libXext xorg.libX11 alsaLib qt5 pulseaudio
];
in
@@ -53,7 +55,7 @@ stdenv.mkDerivation rec {
installPhase =
''
# Delete unecessary libraries - these are provided by nixos.
- rm libQt*.so.*
+ rm *.so.*
rm qt.conf
# Install files.
@@ -65,7 +67,7 @@ stdenv.mkDerivation rec {
ln -s $out/lib/teamspeak/ts3client $out/bin/ts3client
wrapProgram $out/bin/ts3client \
- --set LD_PRELOAD "${libredirect}/lib/libredirect.so:$out/lib/teamspeak/libquazip.so.1" \
+ --set LD_PRELOAD "${libredirect}/lib/libredirect.so:${quazip}/lib/libquazip.so" \
--set QT_PLUGIN_PATH "$out/lib/teamspeak/platforms" \
--set NIX_REDIRECTS /usr/share/X11/xkb=${xkeyboard_config}/share/X11/xkb
'';
diff --git a/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix b/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix
index b0302ba8e0b..812f00829e2 100644
--- a/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix
@@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
buildInputs = [ libconfig lua5_2 openssl readline zlib ];
+ NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; # CPPFunction
+
installPhase = ''
mkdir -p $out/bin
cp ./telegram $out/bin/telegram-wo-key
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/kde/0.5.3.nix b/pkgs/applications/networking/instant-messengers/telepathy/kde/0.5.3.nix
deleted file mode 100644
index eb0543aa5b0..00000000000
--- a/pkgs/applications/networking/instant-messengers/telepathy/kde/0.5.3.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-[
-{name="ktp-accounts-kcm";key="accounts_kcm";sha256="0nmjwbm7ycy5awwlx359889am7qbvs64gk0bd1800a9jl2lhvw56";}
-{name="ktp-approver";key="approver";sha256="0n0a2abbz7xvzp3p4l6khgbhbjylppvskcyma440fmfv3j3jdc12";}
-{name="ktp-auth-handler";key="auth_handler";sha256="11vfim3ck60cy22x84bz6cw0267kf884qa00nbm033kpwjbx4zr6";}
-{name="ktp-call-ui";key="call_ui";sha256="0gmppn4f5a9yd3pnzga3sdwz37c7qpmx586914r64jbkii196xg4";}
-{name="ktp-common-internals";key="common_internals";sha256="1lkmaym8bv5ijy7sksbihr63qify9b9vrhrikck6q23n8sk112n9";}
-{name="ktp-contact-applet";key="contact_applet";sha256="0gsf1m276mhvysy30qqw1h7ssdipyyjh43jbf2lx4bb934by9wby";}
-{name="ktp-contact-list";key="contact_list";sha256="19nlzs650lwmzr30lrviv0qw1xd061pdrk17cm512ldvzibc70ab";}
-{name="ktp-contact-runner";key="contact_runner";sha256="0x3zkk11x9npx30w330s8n49ybqlyhgcndvqizg4sbj1lfbrmhn1";}
-{name="ktp-filetransfer-handler";key="filetransfer_handler";sha256="0w90hsypzgakqx96xkf0wk2qqns6v5ji814gvc3rf9ajcwh0d024";}
-{name="ktp-kded-integration-module";key="kded_integration_module";sha256="0sz0d1yfj35q5r1gc4m6v2c8r0cik2vzvkqfx9pqy8g97d7q1nmj";}
-{name="ktp-presence-applet";key="presence_applet";sha256="081jas1vzh6nwj3w60bw3w95gpdbi74pdi9rdxv0wvra5w76s4i6";}
-{name="ktp-send-file";key="send_file";sha256="19nlm4sfa0m0y856nzs3hrncbznc35zwbsxavssd9wrbb8p9cns6";}
-{name="ktp-text-ui";key="text_ui";sha256="0g8114adqyvzsdm8ldhidf2gyxkv0bnky71zg70gmhkdmzcfssyn";}
-{name="telepathy-logger-qt";key="telepathy_logger_qt";sha256="17bfkbxc7gfcspmjd5w6vn9a75f36qinj7illqafb7k0jqqz2nq6";}
-]
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/kde/0.8.80.nix b/pkgs/applications/networking/instant-messengers/telepathy/kde/0.8.80.nix
new file mode 100644
index 00000000000..6beebef1c72
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/telepathy/kde/0.8.80.nix
@@ -0,0 +1,14 @@
+[
+{name="ktp-accounts-kcm";key="accounts_kcm";sha256="08b873k455jbs9vd5nsb222pr1kb7gjx3qky769654j696rad5bc";}
+{name="ktp-approver";key="approver";sha256="07qsjxvcjr9i0v7g7cdx3rky1fa8aany5fyfav488kq6nc13fjb1";}
+{name="ktp-auth-handler";key="auth_handler";sha256="00gq5gq7imv7rv8xivl2s1n0k39llpmd5z46rvhai76z7hp8sj4l";}
+{name="ktp-call-ui";key="call_ui";sha256="1dwsq2ixci95byfg1ayy6g2zv0dbc0273r9wb395f220dgqpz7b4";}
+{name="ktp-common-internals";key="common_internals";sha256="049hh045p6nccyrjvagfw183vfa857xdl96q2w1vrj6frimniz9q";}
+{name="ktp-contact-list";key="contact_list";sha256="0xydyyla48y7q8pf84i12l7fx13p0gi8k4jl7nl7jxjsflzidscp";}
+{name="ktp-contact-runner";key="contact_runner";sha256="1bfb772cyzrbwjkglr3bvawp44dcqr59kkgvb6irgha8w7adic3b";}
+{name="ktp-desktop-applets";key="desktop_applets";sha256="150mpk7vq2w47vz2yffhj676k84fn3h8g77xklmyqm1y3f21dx01";}
+{name="ktp-filetransfer-handler";key="filetransfer_handler";sha256="07jgfydhr5hh7z0wkrz6k4gh3li9nmyxhjvxcxsayxrc7gnhazja";}
+{name="ktp-kded-integration-module";key="kded_integration_module";sha256="0axjqsk1h9c71hxpcy8ls7jsb0dsmsm75wdgwx71xrdb9hpqwn9f";}
+{name="ktp-send-file";key="send_file";sha256="0wiqrwhrmccx3ic0aaqlq539jcznkgsrwyn9hdizwsc8f33rxmri";}
+{name="ktp-text-ui";key="text_ui";sha256="0ch6sqvj9hpx3823c1wmziqy6g9v97sj1hihbaf8z8wyb84f0wbl";}
+]
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix
index d41db2e4498..564952480f2 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, fetchgit, telepathy_qt, kdelibs, kde_workspace, gettext, dbus_libs
-, pkgconfigUpstream , qt_gstreamer, telepathy_glib, telepathy_logger, qjson, flex, bison }:
+{ stdenv, fetchurl, fetchgit, telepathy_qt, kdelibs, kde_workspace, gettext, dbus_libs, farstream
+, pkgconfigUpstream , qt_gstreamer1, telepathy_glib, telepathy_logger, qjson, flex, bison, qca2 }:
let
pkgconfig = pkgconfigUpstream;
- version = "0.5.3";
+ version = "0.8.80";
manifest = import (./. + "/${version}.nix");
overrides = {
@@ -13,11 +13,12 @@ let
};
extraBuildInputs = {
- auth_handler = [ qjson ];
- call_ui = [ qt_gstreamer telepathy_glib ];
+ auth_handler = [ qjson qca2 ];
+ call_ui = [ qt_gstreamer1 telepathy_glib farstream ];
contact_applet = [ kde_workspace ];
- telepathy_logger_qt = [ telepathy_logger qt_gstreamer ];
- text_ui = [ ktp.telepathy_logger_qt qt_gstreamer telepathy_logger ];
+ telepathy_logger_qt = [ telepathy_logger qt_gstreamer1 ];
+ text_ui = [ qt_gstreamer1 telepathy_logger qjson ];
+ common_internals = [ telepathy_qt ];
};
extraNativeBuildInputs = {
diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix
index f7d1a010ed8..39de30e5dce 100644
--- a/pkgs/applications/networking/instant-messengers/toxic/default.nix
+++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix
@@ -2,21 +2,23 @@
, libtoxcore, openal, libvpx, freealut, libconfig, pkgconfig }:
let
- version = "0.4.7";
+ version = "0.5.1";
in stdenv.mkDerivation rec {
name = "toxic-${version}";
src = fetchurl {
url = "https://github.com/Tox/toxic/archive/v${version}.tar.gz";
- sha256 = "0rcrcqzvicz7787fa4b7f68qnwq6wqbyrm8ii850f1w7vnxq9dkq";
+ sha256 = "0zzfgwm17a4xcy9l0ll2pksp45mz6f4s3isdrgjpw1xibv9xnzcm";
};
- makeFlags = [ "-Cbuild" "VERSION=${version}" ];
+ makeFlags = [ "-Cbuild" "VERSION=${version}" "PREFIX=$(out)" ];
installFlags = [ "PREFIX=$(out)" ];
buildInputs = [
- autoconf libtool automake libtoxcore libsodium ncurses openal libvpx
- freealut libconfig pkgconfig
+ autoconf libtool automake libtoxcore libsodium ncurses
+ libconfig pkgconfig
+ ] ++ stdenv.lib.optionals (!stdenv.isArm) [
+ openal libvpx freealut
];
meta = {
diff --git a/pkgs/applications/networking/instant-messengers/twinkle/default.nix b/pkgs/applications/networking/instant-messengers/twinkle/default.nix
index 2e6b904c134..961ab997384 100644
--- a/pkgs/applications/networking/instant-messengers/twinkle/default.nix
+++ b/pkgs/applications/networking/instant-messengers/twinkle/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
configureFlags = "--with-extra-includes=${libjpeg}/include";
buildInputs =
- [ pkgconfig autoreconfHook commoncpp2 openssl boost libsndfile
+ [ pkgconfig autoreconfHook commoncpp2 openssl boost boost.lib libsndfile
libxml2 libjpeg readline qt3 perl file
# optional ? :
alsaLib speex
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_LINK = "-Wl,--as-needed -lboost_regex -lasound -lzrtpcpp -lspeex -lspeexdsp";
- enableParallelBuilding = true;
+ #enableParallelBuilding = true; # fatal error: messageform.h: No such file or directory
meta = with stdenv.lib; {
homepage = http://www.twinklephone.com/;
diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix
index b49d5f40a86..99753f6ceeb 100644
--- a/pkgs/applications/networking/instant-messengers/utox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/utox/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
- name = "utox-dev";
+ name = "utox-dev-20140921";
src = fetchFromGitHub {
owner = "notsecure";
repo = "uTox";
- rev = "a840b459210694fdf02671567bf33845a11d4c83";
- sha256 = "0jr0xajkv5vkq8gxspnq09k4bzc98fr3hflnz8a3lrwajyhrnpvp";
+ rev = "c0afc95cf3";
+ sha256 = "0a6i0c9crj6b27alm8q0fcfj8q425khg5305sp57r7pj505l4d1f";
};
buildInputs = [ pkgconfig libtoxcore dbus libvpx libX11 openal freetype
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
doCheck = false;
- makeFlags = "DESTDIR=$(out)";
+ makeFlags = "PREFIX=$(out)";
meta = with stdenv.lib; {
description = "Lightweight Tox client";
diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index 245619fddf0..5b9b3c54f92 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -3,12 +3,12 @@
, pythonPackages, cacert, cmake, makeWrapper }:
stdenv.mkDerivation rec {
- version = "1.0";
+ version = "1.0.1";
name = "weechat-${version}";
src = fetchurl {
url = "http://weechat.org/files/src/${name}.tar.gz";
- sha256 = "1z17wyrl5fp697qp44srpmzk79w37f5hm1r0krffbmga6sbzdj3x";
+ sha256 = "0ly6lih7nvhacjs642v7n9z0x3lbgipiza00n632vrpi2zfvclrz";
};
buildInputs =
diff --git a/pkgs/applications/networking/linssid/default.nix b/pkgs/applications/networking/linssid/default.nix
new file mode 100644
index 00000000000..00ff1110c32
--- /dev/null
+++ b/pkgs/applications/networking/linssid/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, qt5, pkgconfig, boost, wirelesstools, iw }:
+
+stdenv.mkDerivation rec {
+ name = "linssid-${version}";
+ version = "2.7";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/project/linssid/LinSSID_${version}/linssid_${version}.orig.tar.gz";
+ sha256 = "13d35rlcjncd8lx3khkgn9x8is2xjd5fp6ns5xsn3w6l4xj9b4gl";
+ };
+
+ buildInputs = [ qt5 pkgconfig boost boost.lib ];
+
+ postPatch = ''
+ sed -e "s|/usr/include/|/nonexistent/|g" -i linssid-app/*.pro
+ sed -e 's|^LIBS .*= .*libboost_regex.a|LIBS += -lboost_regex|' \
+ -e "s|/usr|$out|g" \
+ -i linssid-app/linssid-app.pro linssid-app/linssid.desktop
+ sed -e "s|\.\./\.\./\.\./\.\./usr|$out|g" -i linssid-app/*.ui
+
+ sed -e "s|iwlist|${wirelesstools}/sbin/iwlist|g" -i linssid-app/Getter.cpp
+ sed -e "s|iw dev|${iw}/sbin/iw dev|g" -i linssid-app/MainForm.cpp
+ '';
+
+ configurePhase = "qmake linssid.pro";
+
+ meta = with stdenv.lib; {
+ description = "Graphical wireless scanning for Linux";
+ homepage = http://sourceforge.net/projects/linssid/;
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.bjornfor ];
+ };
+}
diff --git a/pkgs/applications/networking/mailreaders/imapfilter.nix b/pkgs/applications/networking/mailreaders/imapfilter.nix
index 821de027d28..d42b71b2312 100644
--- a/pkgs/applications/networking/mailreaders/imapfilter.nix
+++ b/pkgs/applications/networking/mailreaders/imapfilter.nix
@@ -1,15 +1,21 @@
{ stdenv, fetchurl, openssl, lua, pcre }:
stdenv.mkDerivation rec {
- name = "imapfilter-2.5.4";
-
+ name = "imapfilter-2.5.6";
+
src = fetchurl {
- url = "https://github.com/lefcha/imapfilter/archive/v2.5.4.tar.gz";
- sha256 = "e5a9ee0e57e16d02ff2cbb37b67202a514121d2eb7fc63863174644ca8248769";
+ url = "https://github.com/lefcha/imapfilter/archive/v2.5.6.tar.gz";
+ sha256 = "0c94xdcnkk33d2filzkbraymfzm09np78486kqzqwidnnfllsk86";
};
makeFlagsArray = "PREFIX=$(out)";
-
propagatedBuildInputs = [ openssl pcre lua ];
-}
+ meta = {
+ homepage = "https://github.com/lefcha/imapfilter";
+ description = "Mail filtering utility";
+ license = stdenv.lib.licenses.mit;
+ platforms = stdenv.lib.platforms.unix;
+ maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ };
+}
diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix
index 1e68d2e90b8..4ab85026ded 100644
--- a/pkgs/applications/networking/mailreaders/mailpile/default.nix
+++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix
@@ -1,16 +1,28 @@
-{ stdenv, fetchgit, buildPythonPackage, pythonPackages }:
+{ stdenv, fetchgit, pythonPackages, gnupg1orig, makeWrapper, openssl }:
-buildPythonPackage rec {
- name = "mailpile-dev";
+pythonPackages.buildPythonPackage rec {
+ name = "mailpile-${version}";
+ version = "0.4.0";
src = fetchgit {
- url = "https://github.com/pagekite/Mailpile.git";
- rev = "6e19c1942541dbdefb5155db5f2583bf3ed22aeb";
- sha256 = "04idlbjkasigq3vslcv33kg21rjyklm2yl8pyrf5h94lzabbl1fs";
+ url = "git://github.com/pagekite/Mailpile";
+ rev = "af3e2554dcef892cc44e044ce61e1693f09228c0";
+ sha256 = "0p8j5w5281rjl0nigsw7glfp7inz13p6iqlr9g3m3vh72i9pvl7h";
};
+
+ patchPhase = ''
+ substituteInPlace setup.py --replace "data_files.append((dir" "data_files.append(('lib/${pythonPackages.python.libPrefix}/site-packages/' + dir"
+ '';
propagatedBuildInputs = with pythonPackages; [
- pillow jinja2 spambayes pythonPackages."lxml-2.3.6" python.modules.readline or null];
+ makeWrapper pillow jinja2 spambayes pythonPackages.lxml
+ python.modules.readline pgpdump gnupg1orig
+ ];
+
+ postInstall = ''
+ wrapProgram $out/bin/mailpile \
+ --prefix PATH ":" "${gnupg1orig}/bin:${openssl}/bin"
+ '';
meta = with stdenv.lib; {
description = "A modern, fast web-mail client with user-friendly encryption and privacy features";
@@ -19,4 +31,4 @@ buildPythonPackage rec {
platforms = platforms.linux;
maintainers = [ maintainers.iElectric ];
};
-}
+}
\ No newline at end of file
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
index 6add41edf7c..d180ea290ad 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
@@ -1,4 +1,4 @@
-# This file is generated from generate_nix.rb
+# This file is generated from generate_nix.rb. DO NOT EDIT.
# Execute the following command in a temporary directory to update the file.
#
# ruby generate_nix.rb > default.nix
@@ -40,118 +40,118 @@
assert stdenv.isLinux;
let
- version = "31.0";
+ version = "31.1.2";
sources = [
- { locale = "nn-NO"; arch = "linux-i686"; sha256 = "a1e9954236de1d0581342fbb894b721528bc51a208d3bbedd4d8defbcc1cb50f"; }
- { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "0fe9c22ad8cf575813ae8e476d985a3b951174df5beda67fd98e261f831252aa"; }
- { locale = "lt"; arch = "linux-i686"; sha256 = "35fb5c44bc3ed25beec4f6172c44f75426579f27bd2302361870615bb1f62194"; }
- { locale = "lt"; arch = "linux-x86_64"; sha256 = "3b04ffd5e1640c0138e5dab63a1059bd0342fff9f44547c6b34fbe6da810f911"; }
- { locale = "ta-LK"; arch = "linux-i686"; sha256 = "2e8a1b96820216fda11c234d80a74d7326b49d7ac3f595f646aa10dccde61940"; }
- { locale = "ta-LK"; arch = "linux-x86_64"; sha256 = "006f25951b4ac90b8d8d32491d260900dfcfb24c10cd4a10dbadf3840b4bcd4e"; }
- { locale = "bn-BD"; arch = "linux-i686"; sha256 = "839e95de15a4e0287cfe36d70e07d1d40a1708016f615244a84553794ac76b4c"; }
- { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "592a353df70c368c3c9855ead6d3b68433e7ebaaf42169108b9e74a83517230b"; }
- { locale = "de"; arch = "linux-i686"; sha256 = "890bc1ee046ebf67079bd39ecb761a78fbf8cee8f72b32958ad18a0c3184b23b"; }
- { locale = "de"; arch = "linux-x86_64"; sha256 = "7b52dfc2cea5bedae2ccfe11b0ec2d66edb81b76c2272c60f4bb247970384c9f"; }
- { locale = "rm"; arch = "linux-i686"; sha256 = "6ab1e46650ff296719e498a1b9e5dad5c2f32e6be9d6fec12d1ab917a5f76872"; }
- { locale = "rm"; arch = "linux-x86_64"; sha256 = "fdb170e3f546de759ef8a8aa85f6c3bf5152e121739cc27797c3065f4f85c183"; }
- { locale = "nl"; arch = "linux-i686"; sha256 = "208be79ce95d45f4f69d8bf53d4e2f457410653a81117b4bd4d42bf14a1485dc"; }
- { locale = "nl"; arch = "linux-x86_64"; sha256 = "2e562f9f59457d484ccfb1beb0129e2ca3ba4e5cbf5c955a65480836dc2e6567"; }
- { locale = "sv-SE"; arch = "linux-i686"; sha256 = "07c7836bac31fa835c244dbe5eff19bad5dc5a9339cb8a94bd07d88f8590c867"; }
- { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "7124de1e3cff7a5c17506f8e175aab1aaf96d4c9fd57824d6c0af110f47b1fbc"; }
- { locale = "fy-NL"; arch = "linux-i686"; sha256 = "5d4e7f1f82b53161e84abf45f4a7210f0304399efed2df621c2e24cd5f1e1db0"; }
- { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "814798f7dd066228ae73ce6bfdf430db4f0c4e905ce8a6670c73f894865dbf4e"; }
- { locale = "si"; arch = "linux-i686"; sha256 = "35727d874cdeca69e18cedc109b6c3540c8dbb7450b2158cb1209cf00272cc38"; }
- { locale = "si"; arch = "linux-x86_64"; sha256 = "0aa2232adc0e06c0a841a11155c2cd8f317b2f12b0e02c239ebe6150ad3bc278"; }
- { locale = "vi"; arch = "linux-i686"; sha256 = "b45871e531b18a35f60240dc0417e5a9f08f8c9e3ea762a36e938425505df8b0"; }
- { locale = "vi"; arch = "linux-x86_64"; sha256 = "a32dd96a41ed33a81c240c60c3538db45c1c4357ceaf37c8482a378a526c5454"; }
- { locale = "br"; arch = "linux-i686"; sha256 = "3162753876da622895175afb60cd89be1ee343a10a45f9ac3feb3b306e161838"; }
- { locale = "br"; arch = "linux-x86_64"; sha256 = "7c8d26a07d239f18f94f14696036974317ac1186072ba4482c315d02dcb97e5f"; }
- { locale = "da"; arch = "linux-i686"; sha256 = "8cfaf98f3702b418bfd7692373b9f6e99a4b06e47a75a2df602e98d8f6acf761"; }
- { locale = "da"; arch = "linux-x86_64"; sha256 = "6bd9ab36402f3391abc2e96f8786e16407736cf04d524e562736ac47279e2a26"; }
- { locale = "fi"; arch = "linux-i686"; sha256 = "0a3e7c130197d4abcbf4d37eef51a946c11cf72707686f8c7a0caa9cc21e75c8"; }
- { locale = "fi"; arch = "linux-x86_64"; sha256 = "8d4003960a8a7a496662b59834118c8712443761b867e5f54f3bf4a683715d22"; }
- { locale = "he"; arch = "linux-i686"; sha256 = "5db77f9d117071feeddb5eadf74ea6332ccf9abaa441ba4d7b0a5f0f3781452d"; }
- { locale = "he"; arch = "linux-x86_64"; sha256 = "46995a9f269f0385fc9ac9d31ee65d84e79ac81bd61892adaeb1afff991bcc82"; }
- { locale = "zh-CN"; arch = "linux-i686"; sha256 = "73071beb9caa24aaac8eec9cfb01f7e333dc6ac438ab36e7f5afa7d850dbeb8e"; }
- { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "a17cc26a51bbcff44837d74bdb35ba0ae10def6f4b536c4a67e9169221bd0afb"; }
- { locale = "gl"; arch = "linux-i686"; sha256 = "4782b1f56c1f5fb1f802385d693a96b5013503e97e4d73e43fb90c3331aec839"; }
- { locale = "gl"; arch = "linux-x86_64"; sha256 = "dbba59d0c697e6dc05bc2b554eed2c6040642cb1246a4119cd7c37b0451c6d4e"; }
- { locale = "sl"; arch = "linux-i686"; sha256 = "b37a5eaf187d1c026990f55a3e993594a49bb689f1643d2f944c7f3c7cfd6819"; }
- { locale = "sl"; arch = "linux-x86_64"; sha256 = "629132c5cc5f937fb504542662bb8aa7570eee1ae648087dbfb0c6dedadfa53c"; }
- { locale = "cs"; arch = "linux-i686"; sha256 = "89e818736957569f91f7f329118b09a27b072c6d7c89f601eb02cd1d870c4088"; }
- { locale = "cs"; arch = "linux-x86_64"; sha256 = "6a3a358227972a0eb60b1b531f322ebb2e604805bfb50b55d88cb8447b443105"; }
- { locale = "ca"; arch = "linux-i686"; sha256 = "794b1e0be4bd6f8facebe3aa44f66a139a660d4fe75891f463adb5d7da7b32cb"; }
- { locale = "ca"; arch = "linux-x86_64"; sha256 = "81b51a607844b229d026d9acec4ea1739c365a890857871260b6eca92a176e04"; }
- { locale = "ar"; arch = "linux-i686"; sha256 = "924c5c47c76fc09f5a46176ef1a6e3466d783b8a4c08a5e660a03e0e84459116"; }
- { locale = "ar"; arch = "linux-x86_64"; sha256 = "c46c2285a6f1c825e52ea6cd7dda31d6f67be15668ecf71883c55c9fa21a3fd5"; }
- { locale = "tr"; arch = "linux-i686"; sha256 = "58a53bf3ad217b36beb9795f34349cfa3f10b7a39044f024c547be31b033ee28"; }
- { locale = "tr"; arch = "linux-x86_64"; sha256 = "21d1f89810a284818c0a73e8abd5b51a9ea58b7db2b9bf6dd5e0119f4bfc13a3"; }
- { locale = "ru"; arch = "linux-i686"; sha256 = "67cb3d38230d24c2a7615468ae2465e6f768904e3735ce31833dcba7b98023c5"; }
- { locale = "ru"; arch = "linux-x86_64"; sha256 = "9e6b5351e96b9b2c57ce04fddaf9656adf84bc2a961a8ca614cec2f830d4e2a7"; }
- { locale = "uk"; arch = "linux-i686"; sha256 = "80d0a09d93362f7eff9c7a20025080207a14c43e56b132c3962dd1d795d2a85c"; }
- { locale = "uk"; arch = "linux-x86_64"; sha256 = "07d92405612e1000bc0b401481e94548877511ce224f19b23aa4fa192f21d489"; }
- { locale = "fr"; arch = "linux-i686"; sha256 = "0d70e52c8dc5bf6f13c8ea2a5762cb94534ec54548c792ae181febc3d23c01cb"; }
- { locale = "fr"; arch = "linux-x86_64"; sha256 = "2962de1886753b81684360ffbf97afa4d4371662a6f467ebc369e225d335745d"; }
- { locale = "hr"; arch = "linux-i686"; sha256 = "6eacb202078be4de4a86c3fc957dbf482e32ab28805d719aa5d0d7f4fd832f48"; }
- { locale = "hr"; arch = "linux-x86_64"; sha256 = "83ed10b7d9d74a28f9982a9d11840522f214ccb53ed599f9fce6ae26bd9d2298"; }
- { locale = "el"; arch = "linux-i686"; sha256 = "227140594d1e12f2edf4e942327a8c64ab922796f7bda324eead8a299a6082ab"; }
- { locale = "el"; arch = "linux-x86_64"; sha256 = "bc219c6795389fbdf20c4a84a61c350f376374285eff9aaedbc4893fdcbbdc24"; }
- { locale = "et"; arch = "linux-i686"; sha256 = "4ac7de0edc1d2b084f38058f8c55e8c2fad0782a1f7f7ac69af5c6f28e2a71f9"; }
- { locale = "et"; arch = "linux-x86_64"; sha256 = "cf026ebca03f6eb59b81073f754b9989f2023bb61d8dfaacbb28da3372abf43b"; }
- { locale = "it"; arch = "linux-i686"; sha256 = "001f67664b02736aa757fa99ec00c8df023ead8f94113d1040092057031c4557"; }
- { locale = "it"; arch = "linux-x86_64"; sha256 = "39fdd81738e0cea77c0f860f0e5253416daa6bd13f1e9feab4c6a52c6dd981f9"; }
- { locale = "ja"; arch = "linux-i686"; sha256 = "0a5a830078e0774e81154f07055613d4b6dd6875be4ac976ac70883cfa0ed9cc"; }
- { locale = "ja"; arch = "linux-x86_64"; sha256 = "a33890be6ac154862b7b80f864990b3bbad2db8adbf1d26bf2cd61b175db673e"; }
- { locale = "bg"; arch = "linux-i686"; sha256 = "6f837f1c640c46dd99c4ab691ec6964e40b6d931830d4da604d4329c6d1ecde2"; }
- { locale = "bg"; arch = "linux-x86_64"; sha256 = "a37294fbf0b358e5b9619aa36a20f92fc637a6b0697b8d607b958d256ce81225"; }
- { locale = "nb-NO"; arch = "linux-i686"; sha256 = "2bbb5800b9a6d03545ca3dfc8f99f9f30c11e474ea360481f1f7e9610b0a87b0"; }
- { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "e2a68f359f48a19437605b581bf9a8cf911feabfb2b15ec3724c60d1cbfe15ec"; }
- { locale = "es-ES"; arch = "linux-i686"; sha256 = "976fbb88b1c75dc402b9eea76aef4d8a0886ee76bcf65d798a6ae8234b2b297a"; }
- { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "190679f7638b3697b236d971014f0da938aa2d664afb93e7f4d1c0fb51bfb46e"; }
- { locale = "ro"; arch = "linux-i686"; sha256 = "530b19e48b0e49047746b2f5dd486cfb19930b1064478c465ce2acb21eac66ba"; }
- { locale = "ro"; arch = "linux-x86_64"; sha256 = "0fe30abe10b4c97aef9ee40550205e0f269c5cfe76c08a36c8cf886a5af78558"; }
- { locale = "en-GB"; arch = "linux-i686"; sha256 = "3f2d2784e3aa75cbd3ca0579d660b50b31e488253e52fedbfefc7c5448803967"; }
- { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "83e64293ed8d1ecf509e2617a71fed9583e4d4c3de3ae5b50175ad8c0f8322ae"; }
- { locale = "gd"; arch = "linux-i686"; sha256 = "aa282b17eeeb185734f33d2ed9f287958d8a48ed82653d197426e3e3091ecba3"; }
- { locale = "gd"; arch = "linux-x86_64"; sha256 = "c17db84f0cfd5525e4b8a08e300cabbbcd2bc45f59eb886e180eef0f8c4e45ef"; }
- { locale = "be"; arch = "linux-i686"; sha256 = "909ae64789280db1a07b3b57dfa1a5d337fecd3bd59bacd3bab2eb72dbecb04f"; }
- { locale = "be"; arch = "linux-x86_64"; sha256 = "9021a15bda3d4947e1ed6ee6666a252e3541b020d8d7eb58e854e426719f8d6d"; }
- { locale = "pl"; arch = "linux-i686"; sha256 = "a3536d7e8bb429d562e7731fea8675dc9d442ca8e59cc72eb1b404da12d1d53a"; }
- { locale = "pl"; arch = "linux-x86_64"; sha256 = "99cb049415e4837e615e1946409d1fd62966ae8eb843d89dfb61a6675b5b363f"; }
- { locale = "pa-IN"; arch = "linux-i686"; sha256 = "06a17ca2ee8f44098252f24dae17589f32c80bd35e127a093c18161751a581fc"; }
- { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "b8537b39f3e1242e3ed705ff919b01eb89ac72cf7c15ef0c44d258069c8ea317"; }
- { locale = "ko"; arch = "linux-i686"; sha256 = "f2f1e9babb37f79121034f9b8cbc90fbf9f0fa1c152a7f0d7162aff6f6e33f1a"; }
- { locale = "ko"; arch = "linux-x86_64"; sha256 = "60bc6bd468c820066e00f8108e0912df57a941b4150c06797a7958ec684c4969"; }
- { locale = "sq"; arch = "linux-i686"; sha256 = "a88591a1850b56c68dd75b4ecff79a32d46dcb42f788d66bb46d45cd0f0d5672"; }
- { locale = "sq"; arch = "linux-x86_64"; sha256 = "2bb7656dde363f3c3d3c8c8b4dbdb306f7e618491c917bc7c1b6e6f41d30fbf0"; }
- { locale = "id"; arch = "linux-i686"; sha256 = "b396c752f7652e5ee31d6bec4bfb70b2d86438d966051f91e4d7a77ce5a924dc"; }
- { locale = "id"; arch = "linux-x86_64"; sha256 = "1f0595e6953b0b6aa09577f180897760f8f85ba15e00e6ae3b12105c705cdac4"; }
- { locale = "sk"; arch = "linux-i686"; sha256 = "4d3a4d283705889759dcb321e4b700896b132634005590e546bf6744e6187260"; }
- { locale = "sk"; arch = "linux-x86_64"; sha256 = "456252e7bb5f29ef3c76afb2df0f406fcf93ef1c6df56d0f209bb85e91c8acce"; }
- { locale = "en-US"; arch = "linux-i686"; sha256 = "ee93df33057576bd55bc80b71aeec7c6f487028f0fe52f679614811be5c71bae"; }
- { locale = "en-US"; arch = "linux-x86_64"; sha256 = "7f7189250d76f970bfc1879b2ac6fe2d42bdcf3a652614fa4e080dcc636bbd4c"; }
- { locale = "sr"; arch = "linux-i686"; sha256 = "cb389bd9712def87c06ffab3fc50b8fa58c773c6725fd0e0befec3e2ac957ef5"; }
- { locale = "sr"; arch = "linux-x86_64"; sha256 = "8f9bf916357e7385dec5de9e4d58f6dfbe3c7fc6d2b66298304c3630189833e6"; }
- { locale = "zh-TW"; arch = "linux-i686"; sha256 = "f89251f74b85c22a9f7b97b844a118e498698e205f733f1fb0d7a98787f973ee"; }
- { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "019a15e1e83b6810de6a4d64deb3eba1a9c2a0c6f1c382582e356445e40d5bda"; }
- { locale = "es-AR"; arch = "linux-i686"; sha256 = "ae1d03ddf4b424edc59e08c65a9fb20107311289e4faf8f06f14bc471b00d35f"; }
- { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "a19dce910ba5be35c0fd51be50bd96be3b3db84587f749ed9a108a14a3b732b7"; }
- { locale = "ast"; arch = "linux-i686"; sha256 = "8cb4cb6a99955209026224a4cbbcab7b37b0b9fc38147eeaa439631be7750c08"; }
- { locale = "ast"; arch = "linux-x86_64"; sha256 = "4520a3ae24cc7056eb87d48280999c2c3da6aa76b9182c291512dc80363efb27"; }
- { locale = "ga-IE"; arch = "linux-i686"; sha256 = "8803a9477f6ac963bdacfd82f6e6b8aabb217fa6c39b311645e461f38cda3757"; }
- { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "c8eae521293986be6d626302d91abbb88a12855565fd41c3614f7a5d7534f0cd"; }
- { locale = "pt-BR"; arch = "linux-i686"; sha256 = "9ea7f173533757c99a9c2dfdceab5cc58e583f929a2e7db95184823a00319a0a"; }
- { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "6b9775f8142273d118870887da2728da4732609395897513739df7b352a4989c"; }
- { locale = "is"; arch = "linux-i686"; sha256 = "bcaeea579405f015fcdb78e16cfd92e4c0895614c5966a1a7049a4fe310b1c46"; }
- { locale = "is"; arch = "linux-x86_64"; sha256 = "7de3a89ece968819fcd7f438aaa2f5762f9d936b20fb3c364467ac123b24182e"; }
- { locale = "eu"; arch = "linux-i686"; sha256 = "af7f04ef648264f56dcb62e7e473586f3c5b13d3ecd2918278962f335dda7966"; }
- { locale = "eu"; arch = "linux-x86_64"; sha256 = "8477854792552b471e4eb11f71c79b14544cf438e795feae3082c0f3a31e0c8a"; }
- { locale = "hu"; arch = "linux-i686"; sha256 = "21db7e27557670796db9282174e7da04afe3a0c89b31e042f7bbd3992e4e08be"; }
- { locale = "hu"; arch = "linux-x86_64"; sha256 = "8f05b160d346b45308ba0c7dbe531bce043f22abffd2a4d1200628669a3b4aa0"; }
- { locale = "hy-AM"; arch = "linux-i686"; sha256 = "5e77c23bdb52dba7b663b574520972e2b78588e5143922c1e1837c0e0bd71a86"; }
- { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "35e663dad586cce929baa1ec501b149ff586df15a687eb41a8cc619c542a625c"; }
- { locale = "pt-PT"; arch = "linux-i686"; sha256 = "211322939ab3b4bfc3e6f0548356c9479db5deb687e1e2232f527462017dcd2d"; }
- { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "0d50802a6fd7d9256591076c267759d39af91f680025b03ec6925e21c20494e4"; }
+ { locale = "id"; arch = "linux-i686"; sha256 = "210f0037279ec373d5d189a8724962fec3237900c343ca93d2421ca93a35f201"; }
+ { locale = "id"; arch = "linux-x86_64"; sha256 = "7436275f73a1292567cc587bd41439ecb724fac5e092f0b0f2af932bf39805f7"; }
+ { locale = "he"; arch = "linux-i686"; sha256 = "14b878d70f96e60e3a73134c3cbb35cc6d468446b588510ae5f2e8934d8fbb3b"; }
+ { locale = "he"; arch = "linux-x86_64"; sha256 = "6edabe4a5bf81274cb117bdf7ec7d0b89f3759b9f31e1b9e03c0c603cda2e91f"; }
+ { locale = "el"; arch = "linux-i686"; sha256 = "9f65b45570f83d41b856f99b3077e6e112fa65b3762eb51277269fdbf07cfdb2"; }
+ { locale = "el"; arch = "linux-x86_64"; sha256 = "6a500164772c004d851f13d77a7a9b84428b5c372fdba6f0936c1ddd398d9087"; }
+ { locale = "tr"; arch = "linux-i686"; sha256 = "fb5f9ab606101cfebe86f64f64b9e46ecd73a704c1a2a993e4b4d68129d84484"; }
+ { locale = "tr"; arch = "linux-x86_64"; sha256 = "54517217aa8cf4d715dd2c7d5cf7c4b96bd5f0add2dda9d9d9412ea10b4210a4"; }
+ { locale = "ast"; arch = "linux-i686"; sha256 = "2ff66a151f4003b5dc0432b43e1038e0c69645c58fc5d6015cab3e493a8ed9a7"; }
+ { locale = "ast"; arch = "linux-x86_64"; sha256 = "e34c892ff3fe761c2707036c5ea3453fe411dca2ad2e474ead7ef0c209558e06"; }
+ { locale = "nl"; arch = "linux-i686"; sha256 = "46154b1fab58e9040e4e67b01ae2c5865b644ccf8f2239c396725bf063eae640"; }
+ { locale = "nl"; arch = "linux-x86_64"; sha256 = "271f169763271582698b8ec23d9ca463b41a7d2b373b56d9c170179e15f0fc34"; }
+ { locale = "bn-BD"; arch = "linux-i686"; sha256 = "2b3f2e9933bcda04abc5785b77630cedcba2d85a73a9d535d895ed7910c97d54"; }
+ { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "e4878b6ec24d75cba9e991f6b852ec280992b205bca0e82a2aecfd9a607cdbb4"; }
+ { locale = "eu"; arch = "linux-i686"; sha256 = "b2ff2e8b6c9b7ee81d0965380d15e080c204ffac35b687ca29ca41b51804b491"; }
+ { locale = "eu"; arch = "linux-x86_64"; sha256 = "7afd4c4618f4e7758875ae58295e340289eb994723d3eea13c388751878e0b4e"; }
+ { locale = "fr"; arch = "linux-i686"; sha256 = "41f07408eaec108a28f03917820329c801a386ad3628ebdeb7abd852e579ae72"; }
+ { locale = "fr"; arch = "linux-x86_64"; sha256 = "ea667afbfeba6901a56cc44751d6bf202ef978ce7e39719e56c1fe31a622922b"; }
+ { locale = "br"; arch = "linux-i686"; sha256 = "cea91b552b14e4a417d288d93b4db10b787a1a15316ed7de0b3016be359ddcc5"; }
+ { locale = "br"; arch = "linux-x86_64"; sha256 = "8d72d7cca4885f527a8e8d2b8e2950d0ea0e5d1a840bcde38c08a77e3b6a69a7"; }
+ { locale = "pa-IN"; arch = "linux-i686"; sha256 = "92a28502463e92e6bb9cf7854358c13757222433f9931703a2df4d1ef93bdcbb"; }
+ { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "6b61650491252bb441a13b2fa550d9bdd76e6f23a0e5da641fde4372637c451c"; }
+ { locale = "gd"; arch = "linux-i686"; sha256 = "4d35dfe5c9d66ea8f81fa0e5957152296f9af31968b8ed4975563c480abf2da8"; }
+ { locale = "gd"; arch = "linux-x86_64"; sha256 = "3647b5345ac4fa5cc6cd301fefbe538d2442110f93cccb5e8eca4227bcbcd661"; }
+ { locale = "bg"; arch = "linux-i686"; sha256 = "b06afea38900f268b95787c257d960de8c0174f582e51434aa97a9535fac43a4"; }
+ { locale = "bg"; arch = "linux-x86_64"; sha256 = "c4ae2aebdd91543cf3c64ea25931327f6e8d2113b59d0b2fbb19561b4f935134"; }
+ { locale = "sv-SE"; arch = "linux-i686"; sha256 = "854d4c53fd22c5c1f4635ed41e7dadc6f0603439380e3d3f15ea7a5db5721941"; }
+ { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "64842c6606e2102434ed0b33bcb53d0cdef08e4b55e67e85b3c1244a7dab32d5"; }
+ { locale = "ja"; arch = "linux-i686"; sha256 = "6632eec0a8bf14a77590fae44113d417589634a97cd0b57ef4ede7623cd5b632"; }
+ { locale = "ja"; arch = "linux-x86_64"; sha256 = "727c25136106eca05d4c0bbddbe01672decc4a9f55b3246290c1c6e41cbef946"; }
+ { locale = "pt-BR"; arch = "linux-i686"; sha256 = "986ae49f92e2bab52cc3a4da4f9ca9bce34c01e96126d4fd9fe41d39d16a8ee3"; }
+ { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "c208dc5adb8bbe39535ec28836425d66d557d4ebb111aca9c0d025750ad0d3c4"; }
+ { locale = "is"; arch = "linux-i686"; sha256 = "ee8b101070f820849ec2bde48b76e102cf750bbcee106f47238259bb3cb791bb"; }
+ { locale = "is"; arch = "linux-x86_64"; sha256 = "19471d5e13856f85fc395b825fb297f88805bba5d1d6c2999c49c4947cc6ed43"; }
+ { locale = "es-AR"; arch = "linux-i686"; sha256 = "b21ec0c7e2ee24b971828ae02419f06e3d9447c5e30b1c8257a1d8e1b5ac383e"; }
+ { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "6f8eda76fe19bd590e4f8e23e491edc93b870b72064814eb0d6352c99513397f"; }
+ { locale = "nn-NO"; arch = "linux-i686"; sha256 = "217a6b195255c841ff42f181aa4fa54bd76a91de61662098d96c4fb9e7d6b79a"; }
+ { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "f11ce6f7ef22cb99674668bfcd0f3614a4a9e162f9608fa1290ae26c6c199560"; }
+ { locale = "sr"; arch = "linux-i686"; sha256 = "85f32820095ee3b50716731b2b369378cf530fd1f3ef3522a5cd55e00fb4ce5e"; }
+ { locale = "sr"; arch = "linux-x86_64"; sha256 = "d67b98991de46de52f84627ccb7f2888551343eef94a5d7562e587fcd8d968ec"; }
+ { locale = "si"; arch = "linux-i686"; sha256 = "14914642dc540c6a0fa0df5816eb35b39b822dac4da58a79d9cfe1c3bf7ed1c0"; }
+ { locale = "si"; arch = "linux-x86_64"; sha256 = "c0421803b2be6704151177c0d13557a9d828e3b3333cd214734e2ed4aafce105"; }
+ { locale = "ro"; arch = "linux-i686"; sha256 = "9226cd799114fcec9c1b53b403708e62ca9f151d43bb53167b822cd3ca779171"; }
+ { locale = "ro"; arch = "linux-x86_64"; sha256 = "05e13ad7c9a53a123c3a50e858285f730a4a5ec95e93074cfda990f4466a1c4f"; }
+ { locale = "it"; arch = "linux-i686"; sha256 = "ed9b4f3bfd457d00792795584bf17bebf4b42967c111cf4f778aa7e88b437407"; }
+ { locale = "it"; arch = "linux-x86_64"; sha256 = "301dbc22a9af014aeb6f151ac1f6ff67ef667dabe31c5e487681f682bf8d567b"; }
+ { locale = "pl"; arch = "linux-i686"; sha256 = "9894e91593b3d825d2572af8c520c8be5dd791a267bb056180dc4415d55f4dc1"; }
+ { locale = "pl"; arch = "linux-x86_64"; sha256 = "0531f815bc4325f150465c753ffe849577931e47eb9528df3b58e666155856f0"; }
+ { locale = "sk"; arch = "linux-i686"; sha256 = "4633afa9f32f6aa1bc91c1ca2e6d1b5622192c9a82fd4c591e0f6a3095ab0baf"; }
+ { locale = "sk"; arch = "linux-x86_64"; sha256 = "2121bd74ce76a0ec1734e3171c8da8ac4d935c99f6c16344639ff7e60de9a860"; }
+ { locale = "vi"; arch = "linux-i686"; sha256 = "d10a856d94c790281500cf1c41683255a858eecc43afaa74819ef2d3559216e9"; }
+ { locale = "vi"; arch = "linux-x86_64"; sha256 = "964343e1ee3209dea0a90dcb1f5371cb0f949b68e059aa23fe80d53747a4699c"; }
+ { locale = "rm"; arch = "linux-i686"; sha256 = "f28ce0029dc5fb3212bd020065c2d453d36db53c98df1806f0e4192ef3d8c5da"; }
+ { locale = "rm"; arch = "linux-x86_64"; sha256 = "fb532732406c8338bfb947e20ee6a95ff1bb18b1d6eadcd7525153393894bdf9"; }
+ { locale = "ar"; arch = "linux-i686"; sha256 = "5e05b156179978920c4c7ed995ef018ddaa6332c5fe1898d94314412d11567b0"; }
+ { locale = "ar"; arch = "linux-x86_64"; sha256 = "acba5a042588731e8b1af0dcc7e075577551969d7c1081c23df6feae7f4d107d"; }
+ { locale = "es-ES"; arch = "linux-i686"; sha256 = "92c6f00a0e014617b5fb53167c821f17f550e8307fcd4af831cde04891f00b40"; }
+ { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "191c531621e961b25bf8f16c2aad2ac57357d3456f84fc5efb4f7b7e9becc202"; }
+ { locale = "fi"; arch = "linux-i686"; sha256 = "2f061035a0b6b07bb81d9f84f1bad9a7fd50b0546417fc047102e684683241c5"; }
+ { locale = "fi"; arch = "linux-x86_64"; sha256 = "ee7b57cfbc15104568e12d0cc81a14118c7b0f2708963fbe2ba8ca7a2ce30a0b"; }
+ { locale = "hu"; arch = "linux-i686"; sha256 = "a493b0d327f608a815654a74b22f0ab3237b139998b8720c197468fc624754b6"; }
+ { locale = "hu"; arch = "linux-x86_64"; sha256 = "2b9e87e794e6ac423fd7e6c5500b8a63dc2f8a6a4bdf39de2bbfa5c06a2a8f67"; }
+ { locale = "zh-CN"; arch = "linux-i686"; sha256 = "d272ea7a87f15a649c8d6089b6a5eac91ca732b760163e36ee6634ac2a186313"; }
+ { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "2b71cab0bfd437a6c79125cbe0ccb82bc1fe257c6aa24b0b63c1a8456334e6e0"; }
+ { locale = "uk"; arch = "linux-i686"; sha256 = "56a04b6a6a27d9eea98bb5539c927870a3a43aaace14d31faf54dd56b8ef128b"; }
+ { locale = "uk"; arch = "linux-x86_64"; sha256 = "99e33539eff6a48d944f47fc86a98e07ab4395e90e509c050403e70820b11db4"; }
+ { locale = "ko"; arch = "linux-i686"; sha256 = "4c7a67b83db3c15cb8385ec057eff849e59841d2c6e82f6839f76c747c09fd02"; }
+ { locale = "ko"; arch = "linux-x86_64"; sha256 = "5e54ad0316c905a2fc137365e34ba24391ec3a12c638f1947d8048b9747b2a21"; }
+ { locale = "cs"; arch = "linux-i686"; sha256 = "735d14680ba5108d9d422fda161d0cd1cf31ffb2d29d66b33671c58504436290"; }
+ { locale = "cs"; arch = "linux-x86_64"; sha256 = "031b6f8a2f9a14689e91d887754221a972d4c9aa02807209126aa0d26be18b04"; }
+ { locale = "be"; arch = "linux-i686"; sha256 = "604db8cb078699262bf01f81a97bb745bda26efdb7e81bdae66ae5fe9f546c48"; }
+ { locale = "be"; arch = "linux-x86_64"; sha256 = "62a3ed654691720ff2cb2402efb450dcbe395baecd6c20dcba3d45455bfb68d1"; }
+ { locale = "ru"; arch = "linux-i686"; sha256 = "81b2a2eab496824d109faf49b6df93adc9dce838058f3f70c9e9c99ad251baf3"; }
+ { locale = "ru"; arch = "linux-x86_64"; sha256 = "6cdf95dd941475554630709d89fb802e8744bae7645ad9164dc2e8af701d195e"; }
+ { locale = "ta-LK"; arch = "linux-i686"; sha256 = "422f2173eae85a95611ba14a9945aac7b44076764b7c67d2c4198b3e6fe2fad7"; }
+ { locale = "ta-LK"; arch = "linux-x86_64"; sha256 = "d3d3dfc439bcb26cdb8d8f1ef0a9a24e804a6928aa6ac4f9ea2c0994c3e6e2c4"; }
+ { locale = "zh-TW"; arch = "linux-i686"; sha256 = "6d0e3db5748fa2bce8ebc3b51098241ba80971afea629836a37e4f84feeb0c85"; }
+ { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "4dd79725f91c163cd5a2073d52f3f599c2e0e95281e8235df0a20c9f8717fa07"; }
+ { locale = "de"; arch = "linux-i686"; sha256 = "7b1fb8c036729ee18507e0c3529cbaf93e8776801fba9bd8c93fa7b56dcf460e"; }
+ { locale = "de"; arch = "linux-x86_64"; sha256 = "926b0ad5e817af337b2f2f7416f98e935b5a6b90171816207275413c04dffb2c"; }
+ { locale = "nb-NO"; arch = "linux-i686"; sha256 = "a0c9e3abe9f3835166237a9ee12dffdc1e3255b59a47e3ed0f19ecf5a6f41ba8"; }
+ { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "173c030e3bba69c1634587a4032e4d0b49f37e0a94ba75c4deda7f23d25b21cc"; }
+ { locale = "fy-NL"; arch = "linux-i686"; sha256 = "25f3ca3328c99421db81e4d88b8fe51e913b01430e0db412699b11fef0c81240"; }
+ { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "df9f7737dddd56fb233d029c83c46a18470f992bc2b0222b54e1c4c36bde135b"; }
+ { locale = "sq"; arch = "linux-i686"; sha256 = "181bbb3808b28a5dc170db90db69a99137ce5d49c559c59c4a185b1ee48bea3d"; }
+ { locale = "sq"; arch = "linux-x86_64"; sha256 = "8b06fb2d2e4027aaa3ca5032823b203f5e2628c7673dd956103636916cf28a32"; }
+ { locale = "ga-IE"; arch = "linux-i686"; sha256 = "e7679ef7d467aeaa796af37e62a48fb08e60299cdeb6cea07fcbd8253cda7288"; }
+ { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "83a4b3a22de8be841be0967cda71dcc05958dddb690b7f90d80f1f6235555a49"; }
+ { locale = "da"; arch = "linux-i686"; sha256 = "b7db83686a2e9bf5e501ae32b608189af09eca9f4996b975960fcab3a97a10d2"; }
+ { locale = "da"; arch = "linux-x86_64"; sha256 = "aa081115593e5225f5fb47a9ba5bcd983da1c9e088f1a9f5cea3710afda75cd9"; }
+ { locale = "hr"; arch = "linux-i686"; sha256 = "99698f7259b1c3fa21600c43aa2a946376547a852e04f5a20478282bdbbb99d8"; }
+ { locale = "hr"; arch = "linux-x86_64"; sha256 = "bb2958eea731689b4fa48e98604233ef03b4de89107d801f72b12843cbc6fc70"; }
+ { locale = "ca"; arch = "linux-i686"; sha256 = "988e95cda1b412663bcbf1c1b552ad24b889fdfc30e7228bc47ac7f14aa43b31"; }
+ { locale = "ca"; arch = "linux-x86_64"; sha256 = "ac1f417ddc5b62f674f86f25a248d1434d996453892b4825ffb38852436d2df5"; }
+ { locale = "en-US"; arch = "linux-i686"; sha256 = "9209fa7bdada6245717dbfaf517d68cef04719812504bc0c988def6adc7baab5"; }
+ { locale = "en-US"; arch = "linux-x86_64"; sha256 = "6e2f046dae0a6fa80de190b95667340abcb0ddaddf1ecee813099a89142c56e1"; }
+ { locale = "pt-PT"; arch = "linux-i686"; sha256 = "f4acc2f18f55d7578555ac0b189aeb834adb6c3911ee665790fe4799774c8fe4"; }
+ { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "2dc24f408fc801df266f2b890109c2e7d4a0d47bc2db7f541d371037ffad8ff8"; }
+ { locale = "gl"; arch = "linux-i686"; sha256 = "b9e89373d2d1b0123095cd45867014f87bc2696093127448e7b7b9cf72d294e6"; }
+ { locale = "gl"; arch = "linux-x86_64"; sha256 = "191f8f5327e8a7607497b990dce09e6219c444cbe9261fdbf709cdd07d6cd57f"; }
+ { locale = "lt"; arch = "linux-i686"; sha256 = "80cb0818fce6c8130c9344d3259a7bbc1722c1e7896853d365ad06cc4ccddd82"; }
+ { locale = "lt"; arch = "linux-x86_64"; sha256 = "347027a7c82330f5bc1989a19afb6dde415c260ad4de6c312bd1bda30d4f7651"; }
+ { locale = "en-GB"; arch = "linux-i686"; sha256 = "94f2742fd3a88826eab8712e77a503fb340437ed0a2c1657b64f13b8522c0ad6"; }
+ { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "8319f02f751d0683e5d015d32da3e12c94cb8a8fd27f8cdf5cd583e6e594bdfd"; }
+ { locale = "sl"; arch = "linux-i686"; sha256 = "076ed4c9c2ed99769e278ed0965ca5da7efd00bc9fb225e36cffb712b7cedca5"; }
+ { locale = "sl"; arch = "linux-x86_64"; sha256 = "e37bf18f4e32f050ac97b1a20cfa44832d4438524e2ef9c4ca82e7ed8c1307cb"; }
+ { locale = "et"; arch = "linux-i686"; sha256 = "afc9aef58f08bf8f4b300308a5a4e527ba93e1bae024983063efd82e96c36703"; }
+ { locale = "et"; arch = "linux-x86_64"; sha256 = "d46257893e5e1f17757f0b53c9201b12bc4e5b27bde1eecb007a858f61c49fab"; }
+ { locale = "hy-AM"; arch = "linux-i686"; sha256 = "8a1cbc00e4e6cffb3a225d9334e9c2372050203a0cba3b31c6537e02404efedb"; }
+ { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "ae17a6fb60f27bb95a11501a061c7ab9deb0a6ba89b17e6cf01394e18710a831"; }
];
arch = if stdenv.system == "i686-linux"
@@ -264,6 +264,7 @@ stdenv.mkDerivation {
fullName = "unfree";
url = http://www.mozilla.org/en-US/foundation/trademarks/policy/;
};
+ maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/generate_nix.rb b/pkgs/applications/networking/mailreaders/thunderbird-bin/generate_nix.rb
index e19425c8e17..fe2ed59389e 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/generate_nix.rb
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/generate_nix.rb
@@ -41,7 +41,7 @@ end
puts(<<"EOH")
-# This file is generated from generate_nix.rb
+# This file is generated from generate_nix.rb. DO NOT EDIT.
# Execute the following command in a temporary directory to update the file.
#
# ruby generate_nix.rb > default.nix
@@ -80,6 +80,8 @@ puts(<<"EOH")
, pango
}:
+assert stdenv.isLinux;
+
let
version = "#{real_version}";
sources = [
@@ -204,6 +206,7 @@ stdenv.mkDerivation {
fullName = "unfree";
url = http://www.mozilla.org/en-US/foundation/trademarks/policy/;
};
+ maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index c0c11ff1f1c..fa48a8a0a2f 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -13,7 +13,7 @@
enableOfficialBranding ? false
}:
-let version = "31.0"; in
+let version = "31.1.2"; in
let verName = "${version}"; in
stdenv.mkDerivation rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "ftp://ftp.mozilla.org/pub/thunderbird/releases/${verName}/source/thunderbird-${verName}.source.tar.bz2";
- sha1 = "0fe6666fddd4db82ec2e389f30c5ea11d4f72be5";
+ sha1 = "a3983e7d29bd70e8117ca26f5b9873c68675caa9";
};
buildInputs = # from firefox30Pkgs.xulrunner, but without gstreamer and libvpx
diff --git a/pkgs/applications/networking/mumble/murmur.nix b/pkgs/applications/networking/mumble/murmur.nix
index 17254aa2fdd..1c06392f60b 100644
--- a/pkgs/applications/networking/mumble/murmur.nix
+++ b/pkgs/applications/networking/mumble/murmur.nix
@@ -12,11 +12,11 @@ let
in
stdenv.mkDerivation rec {
name = "murmur-" + version;
- version = "1.2.6";
+ version = "1.2.8";
src = fetchurl {
url = "mirror://sourceforge/mumble/mumble-${version}.tar.gz";
- sha256 = "1zxnbwbd81p7lvscghlpkad8kynh9gbf1nhc092sp64pp37xwv47";
+ sha256 = "0ng1xd7i0951kqnd9visf84y2dcwia79a1brjwfvr1wnykgw6bsc";
};
patchPhase = optional iceSupport ''
diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix
index e38d5188dc2..fbf8955765a 100644
--- a/pkgs/applications/networking/newsreaders/liferea/default.nix
+++ b/pkgs/applications/networking/newsreaders/liferea/default.nix
@@ -6,14 +6,14 @@
}:
let pname = "liferea";
- version = "1.10.10";
+ version = "1.10.11";
in
stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2";
- sha256 = "0y01lhw0fn5m0j9ykz8x7i0wchjqbxp33cvvprsfxfwzz4x31jm4";
+ sha256 = "0mf5mpdj60j8if4qi5656l4pzhgwzhshf31yp0h53l1j442v109a";
};
buildInputs = with gst_all_1; [
@@ -33,7 +33,6 @@ stdenv.mkDerivation rec {
for f in "$out"/bin/*; do
wrapProgram "$f" \
--prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pygobject3})" \
- --prefix LD_LIBRARY_PATH : "${gnome3.libgnome_keyring}/lib" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
--prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules:${glib_networking}/lib/gio/modules" \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_icon_theme}/share:${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
diff --git a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
index e4ca6d423cd..ba71e1985b4 100644
--- a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
+++ b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "3d9170645450f9cb0a605278b8646fec2110b9637910d86fd27cf245cbe24eaf";
};
- buildInputs = [ cmake pkgconfig qt4 boost bzip2 libX11 pcre libidn lua5 miniupnpc aspell gettext ];
+ buildInputs = [ cmake pkgconfig qt4 boost boost.lib bzip2 libX11 pcre libidn lua5 miniupnpc aspell gettext ];
cmakeFlags = ''
-DUSE_ASPELL=ON
diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix
index 0ba160c8a91..ccf129881f5 100644
--- a/pkgs/applications/networking/p2p/qbittorrent/default.nix
+++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix
@@ -2,11 +2,11 @@
, pkgconfig }:
stdenv.mkDerivation rec {
- name = "qbittorrent-3.1.3";
+ name = "qbittorrent-3.1.10";
src = fetchurl {
url = "mirror://sourceforge/qbittorrent/${name}.tar.xz";
- sha256 = "16m3l8qjcj63brzrdn82cbijvz8fcxfgpibi4g5g6sbissjkwsww";
+ sha256 = "0xhqli191r5v9b5x6wj1wsjlj6svf6ldgzl7jza39q3ipr5c2pg6";
};
buildInputs = [ qt4 which dbus_libs boost libtorrentRasterbar
@@ -15,11 +15,14 @@ stdenv.mkDerivation rec {
configureFlags = "--with-libboost-inc=${boost}/include "
+ "--with-libboost-lib=${boost}/lib";
- enableParallelBuilding = true;
+ # https://github.com/qbittorrent/qBittorrent/issues/1992
+ #enableParallelBuilding = true;
- meta = {
+ meta = with stdenv.lib; {
description = "Free Software alternative to µtorrent";
homepage = http://www.qbittorrent.org/;
- maintainers = with stdenv.lib.maintainers; [ viric ];
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ viric ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/networking/remote/rdesktop/default.nix b/pkgs/applications/networking/remote/rdesktop/default.nix
index 09c20618d66..7d2b7990d3f 100644
--- a/pkgs/applications/networking/remote/rdesktop/default.nix
+++ b/pkgs/applications/networking/remote/rdesktop/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation (rec {
pname = "rdesktop";
- version = "1.8.1";
+ version = "1.8.2";
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${name}.tar.gz";
- sha256 = "0il248cdsxvwjsl4bswf27ld9r1a7d48jf6bycr86kf3i55q7k3n";
+ sha256 = "0y0s0qjfsflp4drcn75ykx6as7mn13092bcvlp2ibhilkpa27gzv";
};
buildInputs = [openssl libX11];
@@ -20,5 +20,8 @@ stdenv.mkDerivation (rec {
meta = {
description = "Open source client for Windows Terminal Services";
+ homepage = http://www.rdesktop.org/;
+ platforms = stdenv.lib.platforms.linux;
+ license = stdenv.lib.licenses.gpl2;
};
})
diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index 272bae14a12..68d7becdd3c 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -1,30 +1,41 @@
{ stdenv, fetchurl, pkgconfig, perl, flex, bison, libpcap, libnl, c-ares
-, gnutls, libgcrypt, geoip, heimdal, lua5, gtk, makeDesktopItem, python
-, libcap
+, gnutls, libgcrypt, geoip, heimdal, lua5, makeDesktopItem, python, libcap, glib
+, withGtk ? false, gtk ? null
+, withQt ? false, qt4 ? null
}:
-let version = "1.11.2"; in
+assert withGtk -> !withQt && gtk != null;
+assert withQt -> !withGtk && qt4 != null;
+
+with stdenv.lib;
+
+let
+ version = "1.12.1";
+ variant = if withGtk then "gtk" else if withQt then "qt" else "cli";
+in
stdenv.mkDerivation {
- name = "wireshark-${version}";
+ name = "wireshark-${variant}-${version}";
src = fetchurl {
- url = "mirror://sourceforge/wireshark/wireshark-${version}.tar.bz2";
- sha256 = "077hjnmqn44s8dx3pc38bxps5liicjnhzrnf6ky2x60m2cp7ngr3";
+ url = "http://www.wireshark.org/download/src/wireshark-${version}.tar.bz2";
+ sha256 = "0jsqpr4s5smadvlm881l8fkhhw384ak3apkq4wxr05gc2va6pcl2";
};
buildInputs = [
bison flex perl pkgconfig libpcap lua5 heimdal libgcrypt gnutls
- geoip libnl c-ares gtk python libcap
- ];
+ geoip libnl c-ares python libcap glib
+ ] ++ optional withQt qt4
+ ++ optional withGtk gtk;
patches = [ ./wireshark-lookup-dumpcap-in-path.patch ];
- preConfigure = ''
- sed -re 's/g_memmove/memmove/' -i $(grep -rl g_memmove .)
- '';
-
- configureFlags = "--disable-usr-local --disable-silent-rules --with-gtk2 --without-gtk3 --without-qt --with-ssl";
+ configureFlags = "--disable-usr-local --disable-silent-rules --with-ssl"
+ + (if withGtk then
+ " --with-gtk2 --without-gtk3 --without-qt"
+ else if withQt then
+ " --without-gtk2 --without-gtk3 --with-qt"
+ else " --disable-wireshark");
desktopItem = makeDesktopItem {
name = "Wireshark";
@@ -36,18 +47,20 @@ stdenv.mkDerivation {
categories = "Network;System";
};
- postInstall = ''
+ postInstall = optionalString (withQt || withGtk) ''
mkdir -p "$out"/share/applications/
mkdir -p "$out"/share/icons/
cp "$desktopItem/share/applications/"* "$out/share/applications/"
cp image/wsicon.svg "$out"/share/icons/wireshark.svg
+ '' + optionalString withQt ''
+ mv "$out/bin/wireshark-qt" "$out/bin/wireshark"
'';
enableParallelBuilding = true;
meta = {
homepage = http://www.wireshark.org/;
- description = "a powerful network protocol analyzer";
+ description = "Powerful network protocol analyzer";
license = stdenv.lib.licenses.gpl2;
longDescription = ''
diff --git a/pkgs/applications/networking/sync/backintime/common.nix b/pkgs/applications/networking/sync/backintime/common.nix
new file mode 100644
index 00000000000..fa722747e5f
--- /dev/null
+++ b/pkgs/applications/networking/sync/backintime/common.nix
@@ -0,0 +1,46 @@
+{stdenv, fetchurl, makeWrapper, gettext, python2, python2Packages }:
+
+stdenv.mkDerivation rec {
+ version = "1.0.36";
+
+ name = "backintime-common-${version}";
+
+ src = fetchurl {
+ url = "https://launchpad.net/backintime/1.0/${version}/+download/backintime-${version}.tar.gz";
+ md5 = "28630bc7bd5f663ba8fcfb9ca6a742d8";
+ };
+
+ # because upstream tarball has no top-level directory.
+ # https://bugs.launchpad.net/backintime/+bug/1359076
+ sourceRoot = ".";
+
+ buildInputs = [ makeWrapper gettext python2 python2Packages.dbus ];
+
+ installFlags = [ "DEST=$(out)" ];
+
+ preConfigure = "cd common";
+
+ dontAddPrefix = true;
+
+ preFixup =
+ ''
+ substituteInPlace "$out/bin/backintime" \
+ --replace "=\"/usr/share" "=\"$prefix/share"
+ wrapProgram "$out/bin/backintime" \
+ --prefix PYTHONPATH : "$PYTHONPATH" \
+ --prefix PATH : "$prefix/bin:$PATH"
+ '';
+
+ meta = {
+ homepage = https://launchpad.net/backintime;
+ description = "Simple backup tool for Linux";
+ license = stdenv.lib.licenses.gpl2;
+ maintainers = [ stdenv.lib.maintainers.DamienCassou ];
+ platforms = stdenv.lib.platforms.all;
+ longDescription = ''
+ Back In Time is a simple backup tool (on top of rsync) for Linux
+ inspired from “flyback project” and “TimeVault”. The backup is
+ done by taking snapshots of a specified set of directories.
+ '';
+ };
+}
\ No newline at end of file
diff --git a/pkgs/applications/networking/sync/backintime/gnome.nix b/pkgs/applications/networking/sync/backintime/gnome.nix
new file mode 100644
index 00000000000..56d0f6c5481
--- /dev/null
+++ b/pkgs/applications/networking/sync/backintime/gnome.nix
@@ -0,0 +1,37 @@
+{stdenv, fetchurl, makeWrapper, gettext, python2, python2Packages, gnome2, pkgconfig, pygobject, glib, libtool, backintime-common }:
+
+stdenv.mkDerivation rec {
+ inherit (backintime-common) version src sourceRoot installFlags meta;
+
+ name = "backintime-gnome-${version}";
+
+ buildInputs = [ makeWrapper gettext python2 python2Packages.dbus backintime-common python2Packages.pygtk python2Packages.notify gnome2.gnome_python ];
+
+ preConfigure = "cd gnome";
+ configureFlags = [ "--no-check" ];
+
+ preFixup =
+ ''
+ # Make sure all Python files refer to $prefix/share/backintime
+ # instead of config.get_app_path() which returns the path of the
+ # 'common' module, not the path of the 'gnome' module.
+ filelist=$(mktemp)
+ find "$out/share/backintime/gnome" -name "*.py" -print0 > $filelist
+ while IFS="" read -r -d "" file <&9; do
+ substituteInPlace "$file" \
+ --replace "glade_file = os.path.join(config.get_app_path()," \
+ "glade_file = os.path.join('$prefix/share/backintime'," \
+ --replace "glade_file = os.path.join(self.config.get_app_path()," \
+ "glade_file = os.path.join('$prefix/share/backintime',"
+ done 9< "$filelist"
+ rm "$filelist"
+
+ substituteInPlace "$out/bin/backintime-gnome" \
+ --replace "=\"/usr/share" "=\"$prefix/share"
+
+ wrapProgram "$out/bin/backintime-gnome" \
+ --prefix PYTHONPATH : "${gnome2.gnome_python}/lib/python2.7/site-packages/gtk-2.0:${backintime-common}/share/backintime/common:$PYTHONPATH" \
+ --prefix PATH : "${backintime-common}/bin:$PATH"
+ '';
+
+}
diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix
index 00a00530df4..8d32c1e5d86 100644
--- a/pkgs/applications/networking/sync/rsync/default.nix
+++ b/pkgs/applications/networking/sync/rsync/default.nix
@@ -7,37 +7,33 @@ assert enableACLs -> acl != null;
stdenv.mkDerivation rec {
name = "rsync-${version}";
- version = "3.1.0";
+ version = "3.1.1";
mainSrc = fetchurl {
+ # signed with key 0048 C8B0 26D4 C96F 0E58 9C2F 6C85 9FB1 4B96 A8C5
url = "http://rsync.samba.org/ftp/rsync/src/rsync-${version}.tar.gz";
- sha256 = "0kirw8wglqvwi1v8bwxp373g03xg857h59j5k3mmgff9gzvj7jl1";
+ sha256 = "0896iah6w72q5izpxgkai75bn40dqkqifi2ivcxjzr2zrx7kdr3x";
};
patchesSrc = fetchurl {
+ # signed with key 0048 C8B0 26D4 C96F 0E58 9C2F 6C85 9FB1 4B96 A8C5
url = "http://rsync.samba.org/ftp/rsync/rsync-patches-${version}.tar.gz";
- sha256 = "0sl8aadpjblvbb05vgais40z90yzhr09rwz0cykjdiv452gli75p";
+ sha256 = "0iij996xbyn20yr4w3kv3rw3cx4jwkg2k85x6w5hb5xlgsis8zjl";
};
srcs = [mainSrc] ++ stdenv.lib.optional enableCopyDevicesPatch patchesSrc;
- patches = [(fetchurl {
- url = "https://git.samba.org/?p=rsync.git;a=commitdiff_plain;h=0dedfbce2c1b851684ba658861fe9d620636c56a";
- sha256 = "0j1pqmwsqc5mh815x28izi4baki2y2r5q8k7ma1sgs4xsgjc4rk8";
- name = "CVE-2014-2855.patch";
- })]
- ++ stdenv.lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff";
+ patches = stdenv.lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff";
buildInputs = stdenv.lib.optional enableACLs acl;
nativeBuildInputs = [perl];
configureFlags = "--with-nobody-group=nogroup";
- meta = {
- homepage = http://samba.anu.edu.au/rsync/;
+ meta = with stdenv.lib; {
+ homepage = http://rsync.samba.org/;
description = "A fast incremental file transfer utility";
- license = stdenv.lib.licenses.gpl3Plus;
-
- platforms = stdenv.lib.platforms.unix;
- maintainers = [ stdenv.lib.maintainers.simons stdenv.lib.maintainers.emery ];
+ license = licenses.gpl3Plus;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ simons emery ];
};
}
diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix
index d9b3627507e..43b8f1f0115 100644
--- a/pkgs/applications/office/abiword/default.nix
+++ b/pkgs/applications/office/abiword/default.nix
@@ -1,30 +1,22 @@
-{ stdenv, fetchurl, pkgconfig, gtk, libglade, libgnomecanvas, fribidi
-, libpng, popt, libgsf, enchant, wv, librsvg, bzip2, libjpeg
+{ stdenv, fetchurl, pkgconfig, gtk3, libglade, libgnomecanvas, fribidi
+, libpng, popt, libgsf, enchant, wv, librsvg, bzip2, libjpeg, perl
+, boost, libxslt
}:
-stdenv.mkDerivation {
- name = "abiword-2.8.6";
+stdenv.mkDerivation rec {
+ name = "abiword-${version}";
+ version = "3.0.0";
src = fetchurl {
- url = http://www.abisource.org/downloads/abiword/2.8.6/source/abiword-2.8.6.tar.gz;
- sha256 = "059sd2apxdmcacc4pll880i7vm18h0kyjsq299m1mz3c7ak8k46r";
+ url = "http://www.abisource.org/downloads/abiword/${version}/source/${name}.tar.gz";
+ sha256 = "00dc3w48k2z3l1hh5b0jhzfrskqxic4lp6g7w19v6kpz02632zni";
};
- prePatch = ''
- sed -i -e '/#include /d' src/af/util/xp/ut_go_file.h
- sed -i -e 's|#include |#include |' \
- goffice-bits/goffice/app/goffice-app.h
- sed -i -e 's/ptr->jmpbuf/jmpbuf(png_ptr)/' src/af/util/xp/ut_png.cpp
- sed -i -e 's/\(m_pPNG\)->\(jmpbuf\)/png_\2(\1)/' \
- src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp
- sed -i -e 's/--no-undefined //' src/Makefile*
- '';
-
enableParallelBuilding = true;
buildInputs =
- [ pkgconfig gtk libglade librsvg bzip2 libgnomecanvas fribidi libpng popt
- libgsf enchant wv libjpeg
+ [ pkgconfig gtk3 libglade librsvg bzip2 libgnomecanvas fribidi libpng popt
+ libgsf enchant wv libjpeg perl boost libxslt
];
meta = with stdenv.lib; {
@@ -32,5 +24,6 @@ stdenv.mkDerivation {
homepage = http://www.abisource.com/;
license = licenses.gpl3;
platforms = platforms.linux;
+ maintainers = with maintainers; [ pSub ];
};
}
diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix
index 8d6de404f98..3f3bedb546d 100644
--- a/pkgs/applications/office/gnucash/default.nix
+++ b/pkgs/applications/office/gnucash/default.nix
@@ -47,6 +47,8 @@ stdenv.mkDerivation rec {
--set GCONF_CONFIG_SOURCE 'xml::~/.gconf' \
--prefix PATH ":" "$out/bin:${perl}/bin:${gconf}/bin"
done
+
+ rm $out/share/icons/hicolor/icon-theme.cache
'';
# The following settings fix failures in the test suite. It's not required otherwise.
diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix
index 007e093378d..0fbd2e39812 100644
--- a/pkgs/applications/office/homebank/default.nix
+++ b/pkgs/applications/office/homebank/default.nix
@@ -2,7 +2,7 @@
let
download_root = "http://homebank.free.fr/public/";
- name = "homebank-4.5.5";
+ name = "homebank-4.6.3";
lastrelease = download_root + name + ".tar.gz";
oldrelease = download_root + "old/" + name + ".tar.gz";
in
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
src = fetchurl {
urls = [ lastrelease oldrelease ];
- sha256 = "05k4497qsb6fzr662h9yxz1amsavd287wh0sabrpr9jdbh3jcfkg";
+ sha256 = "0j39788xz9m7ic277phffznbl35c1dm1g7dgq83va9nni6vipqzn";
};
buildInputs = [ pkgconfig gtk libofx intltool ];
diff --git a/pkgs/applications/office/ledger/3.0.nix b/pkgs/applications/office/ledger/3.0.nix
index 21f77ea1ea4..22f15f65217 100644
--- a/pkgs/applications/office/ledger/3.0.nix
+++ b/pkgs/applications/office/ledger/3.0.nix
@@ -2,19 +2,19 @@
, texinfo, gnused }:
let
- rev = "a0c5addbbd";
+ rev = "5961384";
in
stdenv.mkDerivation {
- name = "ledger-3.0.2.${rev}";
+ name = "ledger-3.0.4.${rev}";
src = fetchgit {
url = "git://github.com/ledger/ledger.git";
inherit rev;
- sha256 = "1yr4i8gpby67j4vl7xk109dwb14z8a424nwgva8rbms8115w4ps5";
+ sha256 = "0fmmhr3as4v2kb6h64k1fq979080cqhd75jvxfg7axk2mylb6b3q";
};
- buildInputs = [ cmake boost gmp mpfr libedit python texinfo gnused ];
+ buildInputs = [ cmake boost boost.lib gmp mpfr libedit python texinfo gnused ];
enableParallelBuilding = true;
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 63d4db20af3..e7583c437c8 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -24,8 +24,8 @@ let
langsSpaces = stdenv.lib.concatStringsSep " " langs;
major = "4";
minor = "3";
- patch = "0";
- tweak = "4";
+ patch = "1";
+ tweak = "2";
subdir = "${major}.${minor}.${patch}";
version = "${subdir}${if tweak == "" then "" else "."}${tweak}";
@@ -42,7 +42,7 @@ let
configureFlags = "--with-boost=${boost}";
- buildInputs = [ boost mdds pkgconfig ];
+ buildInputs = [ boost boost.lib mdds pkgconfig ];
};
fetchThirdParty = {name, md5, brief, subDir ? ""}: fetchurl {
@@ -62,7 +62,7 @@ let
(import ./libreoffice-srcs.nix));
configureFlags = "--with-boost=${boost}";
- buildInputs = [ boost mdds pkgconfig zlib libixion ];
+ buildInputs = [ boost boost.lib mdds pkgconfig zlib libixion ];
};
fetchSrc = {name, sha256}: fetchurl {
@@ -79,14 +79,14 @@ let
translations = fetchSrc {
name = "translations";
- sha256 = "1l445284mih0c7d6v3ps1piy5pbjvisyrjjvlrqizvwxqm7bxpr1";
+ sha256 = "0vj1fpr99cb124hag0hijpp3pfbbi0gak56qiikxbwbq7mab6p9h";
};
# TODO: dictionaries
help = fetchSrc {
name = "help";
- sha256 = "0avsc11d4nmycsxvadr0xcd8z9506sjcc89hgmliqlmhmw48ax7y";
+ sha256 = "1q0vzfla764zjz6xcx6r4nc8rikwb3pr2jsraj28hhwr5b26gdfz";
};
};
@@ -96,7 +96,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
- sha256 = "1r605nwjdq20qd96chqic1bjkw7y36wmpg2lzzvv5sz6gw12rzi8";
+ sha256 = "0s1j5y1gfyf3r53bbqnzirx17p49i8ah07737nrzik0ggps3lgd5";
};
# Openoffice will open libcups dynamically, so we link it directly
@@ -198,7 +198,7 @@ stdenv.mkDerivation rec {
"--with-system-headers"
"--with-system-openssl"
"--with-system-openldap"
- "--with-boost-libdir=${boost}/lib"
+ "--with-boost-libdir=${boost.lib}/lib"
"--without-system-libwps" # TODO
"--without-doxygen"
@@ -236,7 +236,7 @@ stdenv.mkDerivation rec {
'';
buildInputs = with xorg;
- [ ant ArchiveZip autoconf automake bison boost cairo clucene_core
+ [ ant ArchiveZip autoconf automake bison boost boost.lib cairo clucene_core
CompressZlib cppunit cups curl db dbus_glib expat file flex fontconfig
freetype GConf getopt gnome_vfs gperf gst_plugins_base gstreamer gtk
hunspell icu jdk kde4.kdelibs lcms libcdr libexttextcat unixODBC libjpeg
diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
index 4e7dacfe0a9..6110a54feb5 100644
--- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
+++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
@@ -184,6 +184,11 @@
md5 = "1e9ddfe25ac9577da709d7b2ea36f939";
brief = false;
}
+{
+ name = "source-sans-pro-2.010R-ro-1.065R-it.tar.gz";
+ md5 = "edc4d741888bc0d38e32dbaa17149596";
+ brief = false;
+}
{
name = "libfreehand-0.1.0.tar.bz2";
md5 = "5f029fef73e42a2c2ae4524a7513f97d";
@@ -326,8 +331,8 @@
}
{
name = "libgltf-0.0.0.tar.bz2";
- md5 = "3d9ea1f2828c46f8ba94b88a87b3326d";
- brief = false;
+ md5 = "ca5436e916bfe70694adfe2607782786";
+ brief = true;
subDir = "libgltf/";
}
{
diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix
index 4026031de08..fb7a41d6246 100644
--- a/pkgs/applications/office/scribus/default.nix
+++ b/pkgs/applications/office/scribus/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, freetype, lcms, libtiff, libxml2
, libart_lgpl, qt4, python, cups, fontconfig, libjpeg
-, zlib, libpng, xorg, cairo, podofo, aspell, boostHeaders, cmake }:
+, zlib, libpng, xorg, cairo, podofo, aspell, boost, cmake }:
stdenv.mkDerivation rec {
name = "scribus-1.4.3";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
[ pkgconfig cmake freetype lcms libtiff libxml2 libart_lgpl qt4
python cups fontconfig
libjpeg zlib libpng podofo aspell cairo
- boostHeaders # for internal 2geom library
+ boost # for internal 2geom library
libXaw libXext libX11 libXtst libXi libXinerama
libpthreadstubs libXau libXdmcp
];
diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix
new file mode 100644
index 00000000000..658f460793f
--- /dev/null
+++ b/pkgs/applications/office/zim/default.nix
@@ -0,0 +1,103 @@
+{ stdenv, lib, fetchurl, buildPythonPackage, pythonPackages, pygtk, pygobject, python }:
+
+#
+# TODO: Declare configuration options for the following optional dependencies:
+# - File stores: hg, git, bzr
+# - Included plugins depenencies: dot, ditaa, dia, any other?
+# - pyxdg: Need to make it work first (see setupPyInstallFlags).
+#
+
+buildPythonPackage rec {
+ name = "zim-${version}";
+ version = "0.60";
+ namePrefix = "";
+
+ src = fetchurl {
+ url = "http://zim-wiki.org/downloads/zim-0.61.tar.gz";
+ sha256 = "0jncxkf83bwra3022jbvjfwhk5w8az0jlwr8nsvm7wa1zfrajhsq";
+ };
+
+ propagatedBuildInputs = [ pythonPackages.sqlite3 pygtk /*pythonPackages.pyxdg*/ pygobject ];
+
+ preBuild = ''
+ mkdir -p /tmp/home
+ export HOME="/tmp/home"
+ '';
+
+ setupPyInstallFlags = ["--skip-xdg-cmd"];
+
+ #
+ # Exactly identical to buildPythonPackage's version but for the
+ # `--old-and-unmanagable`, which I removed. This was removed because
+ # this is a setuptools specific flag and as zim is overriding
+ # the install step, setuptools could not perform its monkey
+ # patching trick for the command. Alternate solutions were to
+ #
+ # - Remove the custom install step (tested as working but
+ # also remove the possibility of performing the xdg-cmd
+ # stuff).
+ # - Explicitly replace distutils import(s) by their setuptools
+ # equivalent (untested).
+ #
+ # Both solutions were judged unsatisfactory as altering the code
+ # would be required.
+ #
+ # Note that a improved solution would be to expose the use of
+ # the `--old-and-unmanagable` flag as an option of passed to the
+ # buildPythonPackage function.
+ #
+ # Also note that I stripped all comments.
+ #
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p "$out/lib/${python.libPrefix}/site-packages"
+
+ export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH"
+
+ ${python}/bin/${python.executable} setup.py install \
+ --install-lib=$out/lib/${python.libPrefix}/site-packages \
+ --prefix="$out" ${lib.concatStringsSep " " setupPyInstallFlags}
+
+ eapth="$out/lib/${python.libPrefix}"/site-packages/easy-install.pth
+ if [ -e "$eapth" ]; then
+ # move colliding easy_install.pth to specifically named one
+ mv "$eapth" $(dirname "$eapth")/${name}.pth
+ fi
+
+ rm -f "$out/lib/${python.libPrefix}"/site-packages/site.py*
+
+ runHook postInstall
+ '';
+
+ # FIXME: this is quick and dirty hack, because zim expects the
+ # path to the executable in argv[0] therefore the wrapper is
+ # modified accordingly.
+ postFixup = ''
+ wrapPythonPrograms
+
+ sed -i "s#sys\.argv\[0\] = 'zim'#sys.argv[0] = '$out/bin/zim'#g" \
+ $out/bin/.zim-wrapped
+
+ if test -e $out/nix-support/propagated-build-inputs; then
+ ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages
+ fi
+
+ createBuildInputsPth build-inputs "$buildInputStrings"
+ for inputsfile in propagated-build-inputs propagated-native-build-inputs; do
+ if test -e $out/nix-support/$inputsfile; then
+ createBuildInputsPth $inputsfile "$(cat $out/nix-support/$inputsfile)"
+ fi
+ done
+ '';
+
+ # Testing fails.
+ doCheck = false;
+
+ meta = {
+ description = "A desktop wiki";
+ homepage = http://zim-wiki.org;
+ license = stdenv.lib.licenses.gpl2Plus;
+ };
+}
+
diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix
index 0a5ef909904..00fda8bf1c4 100644
--- a/pkgs/applications/office/zotero/default.nix
+++ b/pkgs/applications/office/zotero/default.nix
@@ -3,7 +3,7 @@
assert (stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux");
let
- version = "4.0.21.2";
+ version = "4.0.22";
arch = if stdenv.system == "x86_64-linux"
then "linux-x86_64"
else "linux-i686";
@@ -14,8 +14,8 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://download.zotero.org/standalone/${version}/Zotero-${version}_${arch}.tar.bz2";
sha256 = if stdenv.system == "x86_64-linux"
- then "1df101j2qwdp001m8x3ihbzz2j23x43804k8ww749y09d1ydb4dx"
- else "1bcrpl6gdxlygd5ppyrhw42q24kjcakma3qv6mpzgp91phkf6g30";
+ then "0dq4x1cc0lnhs7g6w85qjdlb7sajr13mr2zcf4yvrciwhwy3r1i1"
+ else "0s4j2karaq85fwnd1niz8hzx5k71cqs493g38pg337i3iwxad9hg";
};
# Strip the bundled xulrunner
diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix
index c761f619642..2b00b640d73 100644
--- a/pkgs/applications/science/electronics/gtkwave/default.nix
+++ b/pkgs/applications/science/electronics/gtkwave/default.nix
@@ -1,10 +1,10 @@
{stdenv, fetchurl, gtk, gperf, pkgconfig, bzip2, tcl, tk, judy, xz}:
stdenv.mkDerivation rec {
- name = "gtkwave-3.3.53";
+ name = "gtkwave-3.3.62";
src = fetchurl {
url = "mirror://sourceforge/gtkwave/${name}.tar.gz";
- sha256 = "1jmrk2p2azjca250h2bi4c8v0cp1gqd3c027dx18sxy3cgw1fsp1";
+ sha256 = "1ykc5j11rkfcinsl9cza9k93jwvcj04xxz0i446lwby4svcbaa9i";
};
buildInputs = [ gtk gperf pkgconfig bzip2 tcl tk judy xz ];
diff --git a/pkgs/applications/science/electronics/pulseview/default.nix b/pkgs/applications/science/electronics/pulseview/default.nix
index 07724d93254..f9369efe96e 100644
--- a/pkgs/applications/science/electronics/pulseview/default.nix
+++ b/pkgs/applications/science/electronics/pulseview/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1pf1dgwd9j586nqmni6gqf3qxrsmawcmi9wzqfzqkjci18xd7dgy";
};
- buildInputs = [ pkgconfig cmake glib qt4 boost libsigrok
+ buildInputs = [ pkgconfig cmake glib qt4 boost boost.lib libsigrok
libsigrokdecode libserialport libzip udev libusb1 libftdi
];
diff --git a/pkgs/applications/science/logic/coq/8.3.nix b/pkgs/applications/science/logic/coq/8.3.nix
index f23622de8a0..8664b822cca 100644
--- a/pkgs/applications/science/logic/coq/8.3.nix
+++ b/pkgs/applications/science/logic/coq/8.3.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation {
cp ide/*.cmi ide/ide.*a $out/lib/coq/ide/
'' else "";
- meta = {
+ meta = with stdenv.lib; {
description = "Coq proof assistant";
longDescription = ''
Coq is a formal proof management system. It provides a formal language
@@ -63,7 +63,7 @@ stdenv.mkDerivation {
machine-checked proofs.
'';
homepage = "http://coq.inria.fr";
- license = "LGPL";
- maintainers = [ stdenv.lib.maintainers.roconnor ];
+ license = licenses.lgpl21;
+ maintainers = with maintainers; [ roconnor vbgl ];
};
}
diff --git a/pkgs/applications/science/logic/coq/HEAD.nix b/pkgs/applications/science/logic/coq/HEAD.nix
index 8e6fde6bc24..4081465fbd2 100644
--- a/pkgs/applications/science/logic/coq/HEAD.nix
+++ b/pkgs/applications/science/logic/coq/HEAD.nix
@@ -1,36 +1,49 @@
# - coqide compilation can be disabled by setting lablgtk to null;
-{stdenv, fetchgit, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null}:
+{stdenv, fetchgit, writeText, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null}:
let
- version = "8.5pre-8bc01590";
+ version = "8.5pre-01feb42";
+ coq-version = "8.5";
buildIde = lablgtk != null;
ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
- idePath = if buildIde then ''
- CAML_LD_LIBRARY_PATH=${lablgtk}/lib/ocaml/3.12.1/site-lib/stublibs
- '' else "";
in
stdenv.mkDerivation {
name = "coq-${version}";
+ inherit coq-version;
+ inherit ocaml camlp5;
+
src = fetchgit {
url = git://scm.gforge.inria.fr/coq/coq.git;
- rev = "8bc0159095cb0230a50c55a1611c8b77134a6060";
- sha256 = "1cp4hbk9jw78y03vwz099yvixax161h60hsbyvwiwz2z5czjxzcv";
+ rev = "01feb4206d26b41bfaab9bd45a7b2fc4db569baf";
+ sha256 = "e6d44ebc3019b2650c6e320218b264f5bde68bf6f222b356d41b0a38918e839f";
};
buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ];
+ patches = [ ./no-codesign.patch ];
+
postPatch = ''
UNAME=$(type -tp uname)
RM=$(type -tp rm)
substituteInPlace configure --replace "/bin/uname" "$UNAME"
substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM"
+ substituteInPlace Makefile.build --replace "ifeq (\$(ARCH),Darwin)" "ifeq (\$(ARCH),Darwinx)"
+ '';
+
+ setupHook = writeText "setupHook.sh" ''
+ addCoqPath () {
+ if test -d "''$1/lib/coq/${coq-version}/user-contrib"; then
+ export COQPATH="''${COQPATH}''${COQPATH:+:}''$1/lib/coq/${coq-version}/user-contrib/"
+ fi
+ }
+
+ envHooks=(''${envHooks[@]} addCoqPath)
'';
preConfigure = ''
- buildFlagsArray=(${idePath})
configureFlagsArray=(
-opt
${ideFlags}
@@ -41,7 +54,7 @@ stdenv.mkDerivation {
buildFlags = "revision coq coqide";
- meta = {
+ meta = with stdenv.lib; {
description = "Coq proof assistant";
longDescription = ''
Coq is a formal proof management system. It provides a formal language
@@ -50,8 +63,8 @@ stdenv.mkDerivation {
machine-checked proofs.
'';
homepage = "http://coq.inria.fr";
- license = "LGPL";
- maintainers = with stdenv.lib.maintainers; [ roconnor thoughtpolice ];
- platforms = stdenv.lib.platforms.unix;
+ license = licenses.lgpl21;
+ maintainers = with maintainers; [ roconnor thoughtpolice vbgl ];
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index da77a4c5a9a..f0f62bfb353 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -1,19 +1,20 @@
# - coqide compilation can be disabled by setting lablgtk to null;
-{stdenv, fetchurl, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null}:
+{stdenv, fetchurl, pkgconfig, writeText, ocaml, findlib, camlp5, ncurses, lablgtk ? null}:
-let
+let
version = "8.4pl4";
+ coq-version = "8.4";
buildIde = lablgtk != null;
ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
- idePath = if buildIde then ''
- CAML_LD_LIBRARY_PATH=${lablgtk}/lib/ocaml/3.12.1/site-lib/stublibs
- '' else "";
in
stdenv.mkDerivation {
name = "coq-${version}";
+ inherit coq-version;
+ inherit ocaml camlp5;
+
src = fetchurl {
url = "http://coq.inria.fr/distrib/V${version}/files/coq-${version}.tar.gz";
sha256 = "00bzf4kfbd0g279jrr8ynzvb9wqcly3wi577bkrxivhrg2msxhq6";
@@ -31,7 +32,6 @@ stdenv.mkDerivation {
'';
preConfigure = ''
- buildFlagsArray=(${idePath})
configureFlagsArray=(
-opt
-camldir ${ocaml}/bin
@@ -44,7 +44,17 @@ stdenv.mkDerivation {
buildFlags = "revision coq coqide";
- meta = {
+ setupHook = writeText "setupHook.sh" ''
+ addCoqPath () {
+ if test -d "''$1/lib/coq/${coq-version}/user-contrib"; then
+ export COQPATH="''${COQPATH}''${COQPATH:+:}''$1/lib/coq/${coq-version}/user-contrib/"
+ fi
+ }
+
+ envHooks=(''${envHooks[@]} addCoqPath)
+ '';
+
+ meta = with stdenv.lib; {
description = "Formal proof management system";
longDescription = ''
Coq is a formal proof management system. It provides a formal language
@@ -53,8 +63,8 @@ stdenv.mkDerivation {
machine-checked proofs.
'';
homepage = "http://coq.inria.fr";
- license = "LGPL";
- maintainers = with stdenv.lib.maintainers; [ roconnor thoughtpolice ];
- platforms = stdenv.lib.platforms.unix;
+ license = licenses.lgpl21;
+ maintainers = with maintainers; [ roconnor thoughtpolice vbgl ];
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/science/logic/coq/no-codesign.patch b/pkgs/applications/science/logic/coq/no-codesign.patch
new file mode 100644
index 00000000000..0f917fbf56d
--- /dev/null
+++ b/pkgs/applications/science/logic/coq/no-codesign.patch
@@ -0,0 +1,19 @@
+diff --git a/Makefile.build b/Makefile.build
+index 2963a3d..876479c 100644
+--- a/Makefile.build
++++ b/Makefile.build
+@@ -101,13 +101,8 @@ BYTEFLAGS=$(CAMLDEBUG) $(USERFLAGS)
+ OPTFLAGS=$(CAMLDEBUGOPT) $(CAMLTIMEPROF) $(USERFLAGS)
+ DEPFLAGS= $(LOCALINCLUDES) -I ide -I ide/utils
+
+-ifeq ($(ARCH),Darwin)
+-LINKMETADATA=-ccopt "-sectcreate __TEXT __info_plist config/Info-$(notdir $@).plist"
+-CODESIGN=codesign -s -
+-else
+ LINKMETADATA=
+ CODESIGN=true
+-endif
+
+ define bestocaml
+ $(if $(OPT),\
+
diff --git a/pkgs/applications/science/logic/hol_light/Makefile.patch b/pkgs/applications/science/logic/hol_light/Makefile.patch
new file mode 100644
index 00000000000..ae521004f33
--- /dev/null
+++ b/pkgs/applications/science/logic/hol_light/Makefile.patch
@@ -0,0 +1,13 @@
+Index: Makefile
+===================================================================
+--- /Makefile (révision 199)
++++ /Makefile (copie de travail)
+@@ -59,7 +59,7 @@
+ then cp pa_j_3.1x_6.02.1.ml pa_j.ml; \
+ else if test ${CAMLP5_VERSION} = "6.02.2" -o ${CAMLP5_VERSION} = "6.02.3" -o ${CAMLP5_VERSION} = "6.03" -o ${CAMLP5_VERSION} = "6.04" -o ${CAMLP5_VERSION} = "6.05" -o ${CAMLP5_VERSION} = "6.06" ; \
+ then cp pa_j_3.1x_6.02.2.ml pa_j.ml; \
+- else if test ${CAMLP5_VERSION} = "6.06" -o ${CAMLP5_VERSION} = "6.07" -o ${CAMLP5_VERSION} = "6.08" -o ${CAMLP5_VERSION} = "6.09" -o ${CAMLP5_VERSION} = "6.10" -o ${CAMLP5_VERSION} = "6.11" ; \
++ else if test ${CAMLP5_VERSION} = "6.06" -o ${CAMLP5_VERSION} = "6.07" -o ${CAMLP5_VERSION} = "6.08" -o ${CAMLP5_VERSION} = "6.09" -o ${CAMLP5_VERSION} = "6.10" -o ${CAMLP5_VERSION} = "6.11" -o ${CAMLP5_VERSION} = "6.12" ; \
+ then cp pa_j_3.1x_6.11.ml pa_j.ml; \
+ else cp pa_j_3.1x_${CAMLP5_BINARY_VERSION}.xx.ml pa_j.ml; \
+ fi \
diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix
index 3e6440ea977..9b8f25cab77 100644
--- a/pkgs/applications/science/logic/hol_light/default.nix
+++ b/pkgs/applications/science/logic/hol_light/default.nix
@@ -7,18 +7,21 @@ let
exec ${ocaml}/bin/ocaml -I \`${camlp5}/bin/camlp5 -where\` -init make.ml
'';
in
+
stdenv.mkDerivation rec {
name = "hol_light-${version}";
- version = "189";
+ version = "199";
src = fetchsvn {
url = http://hol-light.googlecode.com/svn/trunk;
rev = version;
- sha256 = "1v10l64rs7da2kag3wlb651i09pn83icy9n5z84j8h1iwlxzajdh";
+ sha256 = "0308nw91iww18wvl30g5ygf6lhw329jh1vqi9hsh30inhb3dx3jw";
};
buildInputs = [ ocaml findlib camlp5 ];
+ patches = [ ./Makefile.patch ];
+
installPhase = ''
mkdir -p "$out/lib/hol_light" "$out/bin"
cp -a . $out/lib/hol_light
@@ -26,11 +29,11 @@ stdenv.mkDerivation rec {
chmod a+x "$out/bin/hol_light"
'';
- meta = {
+ meta = with stdenv.lib; {
description = "Interactive theorem prover based on Higher-Order Logic";
homepage = http://www.cl.cam.ac.uk/~jrh13/hol-light/;
- license = stdenv.lib.licenses.bsd2;
- platforms = stdenv.lib.platforms.unix;
- maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+ license = licenses.bsd2;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ thoughtpolice z77z vbgl ];
};
}
diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix
index a7c1420cb54..88bbe820e2f 100644
--- a/pkgs/applications/science/logic/isabelle/default.nix
+++ b/pkgs/applications/science/logic/isabelle/default.nix
@@ -1,26 +1,30 @@
-{ stdenv, fetchurl, perl, nettools, polyml, proofgeneral }:
+{ stdenv, fetchurl, perl, nettools, java, polyml, proofgeneral }:
# nettools needed for hostname
let
- dirname = "Isabelle2013";
+ dirname = "Isabelle2014";
theories = ["HOL" "FOL" "ZF"];
in
stdenv.mkDerivation {
- name = "isabelle-2013";
+ name = "isabelle-2014";
inherit dirname theories;
- src = fetchurl {
- url = http://isabelle.in.tum.de/dist/Isabelle2013_linux.tar.gz;
- sha256 = "0l17s41hwzma0q2glpxrzic8i6mqd9b7awlpwhz0jkli7fj6ny7b";
- };
+ src = if stdenv.isDarwin
+ then fetchurl {
+ url = http://isabelle.in.tum.de/dist/Isabelle2014_macos.tar.gz;
+ sha256 = "1aa3vz2nnkkyd4mlsqbs69jqfxlll5h0k5fj9m1j9wqiddqwvwcf";
+ }
+ else fetchurl {
+ url = http://isabelle.in.tum.de/dist/Isabelle2014_linux.tar.gz;
+ sha256 = "0z81pwwllavka4r57fx6yi9kbpbb9xbanp8dsjix49qpyj2a72jy";
+ };
- buildInputs = [ perl polyml nettools ];
+ buildInputs = [ perl polyml ]
+ ++ stdenv.lib.optionals (!stdenv.isDarwin) [ nettools java ];
sourceRoot = dirname;
- patches = [ ./settings.patch ];
-
postPatch = ''
ENV=$(type -p env)
patchShebangs "."
@@ -28,22 +32,25 @@ stdenv.mkDerivation {
--replace /usr/bin/env $ENV
substituteInPlace lib/Tools/install \
--replace /usr/bin/env $ENV
- substituteInPlace src/Pure/IsaMakefile \
- --replace /bin/bash /bin/sh
substituteInPlace etc/settings \
--subst-var-by ML_HOME "${polyml}/bin" \
--subst-var-by PROOFGENERAL_HOME "${proofgeneral}/share/emacs/site-lisp/ProofGeneral"
+ substituteInPlace contrib/jdk/etc/settings \
+ --replace ISABELLE_JDK_HOME= '#ISABELLE_JDK_HOME='
+ substituteInPlace contrib/polyml-5.5.2-1/etc/settings \
+ --replace 'ML_HOME="$POLYML_HOME/$ML_PLATFORM"' \
+ "ML_HOME=\"${polyml}/bin\""
'';
buildPhase = ''
- ./build $theories
+ ISABELLE_JDK_HOME=${java} ./bin/isabelle build -s $theories
'';
installPhase = ''
mkdir -p $out/bin
mv $TMP/$dirname $out
cd $out/$dirname
- bin/isabelle install -p $out/bin
+ bin/isabelle install $out/bin
'';
meta = {
@@ -56,5 +63,6 @@ stdenv.mkDerivation {
'';
homepage = http://isabelle.in.tum.de/;
license = "LGPL";
+ maintainers = [ stdenv.lib.maintainers.jwiegley ];
};
}
diff --git a/pkgs/applications/science/logic/ott/default.nix b/pkgs/applications/science/logic/ott/default.nix
new file mode 100644
index 00000000000..afe827f3ad9
--- /dev/null
+++ b/pkgs/applications/science/logic/ott/default.nix
@@ -0,0 +1,43 @@
+# - coqide compilation can be disabled by setting lablgtk to null;
+
+{stdenv, fetchurl, pkgconfig, ocaml, camlp5}:
+
+stdenv.mkDerivation rec {
+ name = "ott-${version}";
+ version = "0.25";
+
+ src = fetchurl {
+ url = "http://www.cl.cam.ac.uk/~pes20/ott/ott_distro_${version}.tar.gz";
+ sha256 = "0i8ad1yrz9nrrgpi8db4z0aii5s0sy35mmzdfw5nq183mvbx8qqd";
+ };
+
+ buildInputs = [ pkgconfig ocaml camlp5 ];
+
+ installPhase = ''
+ mkdir -p $out/bin
+ cp src/ott.opt $out/bin
+ ln -s $out/bin/ott.opt $out/bin/ott
+
+ mkdir -p $out/share/emacs/site-lisp
+ cp emacs/ottmode.el $out/share/emacs/site-lisp
+ '';
+
+ meta = {
+ description = "Ott: tool for the working semanticist";
+ longDescription = ''
+ Ott is a tool for writing definitions of programming languages and
+ calculi. It takes as input a definition of a language syntax and
+ semantics, in a concise and readable ASCII notation that is close to
+ what one would write in informal mathematics. It generates LaTeX to
+ build a typeset version of the definition, and Coq, HOL, and Isabelle
+ versions of the definition. Additionally, it can be run as a filter,
+ taking a LaTeX/Coq/Isabelle/HOL source file with embedded (symbolic)
+ terms of the defined language, parsing them and replacing them by
+ target-system terms.
+ '';
+ homepage = http://www.cl.cam.ac.uk/~pes20/ott;
+ license = "BSD3";
+ maintainers = with stdenv.lib.maintainers; [ jwiegley ];
+ platforms = stdenv.lib.platforms.unix;
+ };
+}
diff --git a/pkgs/applications/science/logic/ssreflect/default.nix b/pkgs/applications/science/logic/ssreflect/default.nix
deleted file mode 100644
index a784e5fe1b6..00000000000
--- a/pkgs/applications/science/logic/ssreflect/default.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-# TODO:
-# - coq needs to be invoked with the explicit path to the ssreflect theory
-# e.g. coqide -R ~/.nix-profile/lib/coq/user-contrib/ ''
-
-{stdenv, fetchurl, ocaml, camlp5, coq, makeWrapper}:
-
-let
- pname = "ssreflect";
- version = "1.5";
- name = "${pname}-${version}";
- webpage = http://www.msr-inria.inria.fr/Projects/math-components;
-in
-
-stdenv.mkDerivation {
- inherit name;
-
- src = fetchurl {
- url = "http://ssr.msr-inria.inria.fr/FTP/${name}.tar.gz";
- sha256 = "0hm1ha7sxqfqhc7iwhx6zdz3nki4rj5nfd3ab24hmz8v7mlpinds";
- };
-
- buildInputs = [ ocaml camlp5 coq makeWrapper ];
-
- patches = [ ./static.patch ];
-
- installPhase = ''
- COQLIB=$out/lib/coq/ make -f Makefile.coq install -e
- mkdir -p $out/bin
- cp bin/* $out/bin
- for i in $out/bin/*; do
- wrapProgram "$i" \
- --add-flags "-R" \
- --add-flags "$out/lib/coq/user-contrib/Ssreflect" \
- --add-flags "Ssreflect"
- done
- makeWrapper "${coq}/bin/coqide" "$out/bin/ssrcoqide" --add-flags "-coqtop" --add-flags "$out/bin/ssrcoq"
- '';
-
- meta = {
- description = "Small Scale Reflection extension for Coq";
- longDescription = ''
- Small Scale Reflection (ssreflect) is an extension of the Coq Theorem
- Prover which enable a formal proof methodology based on the pervasive
- use of computation with symbolic representation
- '';
- homepage = webpage;
- license = "CeCILL B FREE SOFTWARE LICENSE or CeCILL FREE SOFTWARE LICENSE";
- maintainers = [ stdenv.lib.maintainers.roconnor ];
- };
-}
diff --git a/pkgs/applications/science/logic/ssreflect/static.patch b/pkgs/applications/science/logic/ssreflect/static.patch
deleted file mode 100644
index 2211d880258..00000000000
--- a/pkgs/applications/science/logic/ssreflect/static.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- ssreflect1.4-coq8.4/Make (revision 3823)
-+++ ssreflect1.4-coq8.4/Make (working copy)
-@@ -1,10 +1,10 @@
--### Uncomment for static linking
--##
--#-custom "$(COQBIN)coqmktop -coqlib `$(COQBIN)coqtop -where` -opt -o bin/ssrcoq src/ssrmatching.cmx src/ssreflect.cmx" "src/ssrmatching.cmx src/ssreflect.cmx" bin/ssrcoq
--#-custom "$(COQBIN)coqmktop -coqlib `$(COQBIN)coqtop -where` -o bin/ssrcoq.byte src/ssrmatching.cmo src/ssreflect.cmo" "src/ssrmatching.cmo src/ssreflect.cmo" bin/ssrcoq.byte
--#-custom "$(SSRCOQ) $(COQFLAGS) -compile $*" "%.v $(SSRCOQ)" "%.vo"
--#SSRCOQ = bin/ssrcoq
--##
-+## Uncomment for static linking
-+#
-+-custom "$(COQBIN)coqmktop -coqlib `$(COQBIN)coqtop -where` -opt -o bin/ssrcoq src/ssrmatching.cmx src/ssreflect.cmx" "src/ssrmatching.cmx src/ssreflect.cmx" bin/ssrcoq
-+-custom "$(COQBIN)coqmktop -coqlib `$(COQBIN)coqtop -where` -o bin/ssrcoq.byte src/ssrmatching.cmo src/ssreflect.cmo" "src/ssrmatching.cmo src/ssreflect.cmo" bin/ssrcoq.byte
-+-custom "$(SSRCOQ) $(COQFLAGS) -compile $*" "%.v $(SSRCOQ)" "%.vo"
-+SSRCOQ = bin/ssrcoq
-+#
-
- ## What follows should be left untouched by the final user of ssreflect
- -R theories Ssreflect
-
diff --git a/pkgs/applications/science/logic/stp/default.nix b/pkgs/applications/science/logic/stp/default.nix
index cfe96bc6983..109d9fe3d4b 100644
--- a/pkgs/applications/science/logic/stp/default.nix
+++ b/pkgs/applications/science/logic/stp/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
rev = "3aa11620a823d617fc033d26aedae91853d18635";
sha256 = "832520787f57f63cf47364d080f30ad10d6d6e00f166790c19b125be3d6dd45c";
};
- buildInputs = [ cmake boost bison flex perl zlib ];
+ buildInputs = [ cmake boost boost.lib bison flex perl zlib ];
cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
patchPhase = ''
sed -e 's,^export(PACKAGE.*,,' -i CMakeLists.txt
diff --git a/pkgs/applications/science/logic/tptp/default.nix b/pkgs/applications/science/logic/tptp/default.nix
index ef00b135c27..d4c62858753 100644
--- a/pkgs/applications/science/logic/tptp/default.nix
+++ b/pkgs/applications/science/logic/tptp/default.nix
@@ -11,14 +11,14 @@ let
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
baseName="TPTP";
- version="6.0.0";
+ version="6.1.0";
name="${baseName}-${version}";
urls=
[
"http://www.cs.miami.edu/~tptp/TPTP/Distribution/TPTP-v${version}.tgz"
"http://www.cs.miami.edu/~tptp/TPTP/Archive/TPTP-v${version}/TPTP-v${version}.tgz"
];
- hash="0jnjkqdz937c7mkxvh9wc3byw5h1k19jss058fbzdxxc2hkwq1af";
+ hash="054p0kx9qh619ixslxpb4qcwvcqr4kan154b3a87b546b78k7kv4";
};
in
rec {
diff --git a/pkgs/applications/science/math/fricas/default.nix b/pkgs/applications/science/math/fricas/default.nix
index 6e187843404..98012934f38 100644
--- a/pkgs/applications/science/math/fricas/default.nix
+++ b/pkgs/applications/science/math/fricas/default.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.linux;
- maintainers = stdenv.lib.maintainers.sprock;
+ maintainers = [ stdenv.lib.maintainers.sprock ];
};
}
diff --git a/pkgs/applications/science/math/mathematica/9.nix b/pkgs/applications/science/math/mathematica/9.nix
new file mode 100644
index 00000000000..d4d352c95bb
--- /dev/null
+++ b/pkgs/applications/science/math/mathematica/9.nix
@@ -0,0 +1,124 @@
+{ stdenv
+, coreutils
+, patchelf
+, requireFile
+, alsaLib
+, fontconfig
+, freetype
+, gcc
+, glib
+, libpng
+, ncurses
+, opencv
+, openssl
+, unixODBC
+, xlibs
+, zlib
+}:
+
+let
+ platform =
+ if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" then
+ "Linux"
+ else
+ throw "Mathematica requires i686-linux or x86_64 linux";
+in
+stdenv.mkDerivation rec {
+
+ name = "mathematica-9.0.0";
+
+ src = requireFile rec {
+ name = "Mathematica_9.0.0_LINUX.sh";
+ message = ''
+ This nix expression requires that Mathematica_9.0.0_LINUX.sh is
+ already part of the store. Find the file on your Mathematica CD
+ and add it to the nix store with nix-store --add-fixed sha256 .
+ '';
+ sha256 = "106zfaplhwcfdl9rdgs25x83xra9zcny94gb22wncbfxvrsk3a4q";
+ };
+
+ buildInputs = [
+ coreutils
+ patchelf
+ alsaLib
+ coreutils
+ fontconfig
+ freetype
+ gcc.gcc
+ gcc.libc
+ glib
+ ncurses
+ opencv
+ openssl
+ unixODBC
+ ] ++ (with xlibs; [
+ libX11
+ libXext
+ libXtst
+ libXi
+ libXmu
+ libXrender
+ libxcb
+ ]);
+
+ ldpath = stdenv.lib.makeLibraryPath buildInputs
+ + stdenv.lib.optionalString (stdenv.system == "x86_64-linux")
+ (":" + stdenv.lib.makeSearchPath "lib64" buildInputs);
+
+ phases = "unpackPhase installPhase fixupPhase";
+
+ unpackPhase = ''
+ echo "=== Extracting makeself archive ==="
+ # find offset from file
+ offset=$(${stdenv.shell} -c "$(grep -axm1 -e 'offset=.*' $src); echo \$offset" $src)
+ dd if="$src" ibs=$offset skip=1 | tar -xf -
+ cd Unix
+ '';
+
+ installPhase = ''
+ cd Installer
+ # don't restrict PATH, that has already been done
+ sed -i -e 's/^PATH=/# PATH=/' MathInstaller
+
+ echo "=== Running MathInstaller ==="
+ ./MathInstaller -auto -createdir=y -execdir=$out/bin -targetdir=$out/libexec/Mathematica -platforms=${platform} -silent
+ '';
+
+ preFixup = ''
+ echo "=== PatchElfing away ==="
+ find $out/libexec/Mathematica/SystemFiles -type f -perm +100 | while read f; do
+ type=$(readelf -h "$f" 2>/dev/null | grep 'Type:' | sed -e 's/ *Type: *\([A-Z]*\) (.*/\1/')
+ if [ -z "$type" ]; then
+ :
+ elif [ "$type" == "EXEC" ]; then
+ echo "patching $f executable <<"
+ patchelf \
+ --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
+ --set-rpath "${ldpath}" \
+ "$f"
+ patchelf --shrink-rpath "$f"
+ elif [ "$type" == "DYN" ]; then
+ echo "patching $f library <<"
+ patchelf \
+ --set-rpath "$(patchelf --print-rpath "$f"):${ldpath}" \
+ "$f" \
+ && patchelf --shrink-rpath "$f" \
+ || echo unable to patch ... ignoring 1>&2
+ else
+ echo "not patching $f <<: unknown elf type"
+ fi
+ done
+ '';
+
+ # all binaries are already stripped
+ dontStrip = true;
+
+ # we did this in prefixup already
+ dontPatchELF = true;
+
+ meta = {
+ description = "Wolfram Mathematica computational software system";
+ homepage = "http://www.wolfram.com/mathematica/";
+ license = stdenv.lib.licenses.unfree;
+ };
+}
diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix
index d4d352c95bb..2f11144bad4 100644
--- a/pkgs/applications/science/math/mathematica/default.nix
+++ b/pkgs/applications/science/math/mathematica/default.nix
@@ -14,6 +14,8 @@
, unixODBC
, xlibs
, zlib
+, libxml2
+, libuuid
}:
let
@@ -24,17 +26,18 @@ let
throw "Mathematica requires i686-linux or x86_64 linux";
in
stdenv.mkDerivation rec {
+ version = "10.0.1";
- name = "mathematica-9.0.0";
+ name = "mathematica-${version}";
src = requireFile rec {
- name = "Mathematica_9.0.0_LINUX.sh";
+ name = "Mathematica_${version}_LINUX.sh";
message = ''
- This nix expression requires that Mathematica_9.0.0_LINUX.sh is
+ This nix expression requires that ${name} is
already part of the store. Find the file on your Mathematica CD
and add it to the nix store with nix-store --add-fixed sha256 .
'';
- sha256 = "106zfaplhwcfdl9rdgs25x83xra9zcny94gb22wncbfxvrsk3a4q";
+ sha256 = "1514qy5kbyislv8j7ryw8021k26y0z6dndliwy8hfi7w7kgb3ynq";
};
buildInputs = [
@@ -51,6 +54,8 @@ stdenv.mkDerivation rec {
opencv
openssl
unixODBC
+ libxml2
+ libuuid
] ++ (with xlibs; [
libX11
libXext
@@ -59,6 +64,11 @@ stdenv.mkDerivation rec {
libXmu
libXrender
libxcb
+ libXcursor
+ libXfixes
+ libXrandr
+ libICE
+ libSM
]);
ldpath = stdenv.lib.makeLibraryPath buildInputs
@@ -92,11 +102,13 @@ stdenv.mkDerivation rec {
:
elif [ "$type" == "EXEC" ]; then
echo "patching $f executable <<"
- patchelf \
- --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
- --set-rpath "${ldpath}" \
- "$f"
patchelf --shrink-rpath "$f"
+ patchelf \
+ --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
+ --set-rpath "$(patchelf --print-rpath "$f"):${ldpath}" \
+ "$f" \
+ && patchelf --shrink-rpath "$f" \
+ || echo unable to patch ... ignoring 1>&2
elif [ "$type" == "DYN" ]; then
echo "patching $f library <<"
patchelf \
diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix
index 576a28b054f..2bd1aa893c5 100644
--- a/pkgs/applications/science/math/pari/default.nix
+++ b/pkgs/applications/science/math/pari/default.nix
@@ -1,11 +1,12 @@
{ stdenv, fetchurl, gmp, readline }:
stdenv.mkDerivation rec {
- name = "pari-2.5.5";
+ version = "2.7.2";
+ name = "pari-${version}";
src = fetchurl {
url = "http://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz";
- sha256 = "058nw1fhggy7idii4f124ami521lv3izvngs9idfz964aks8cvvn";
+ sha256 = "1b0hzyhafpxhmiljyhnsh6c27ydsvb2599fshwq2fjfm96awjxmc";
};
buildInputs = [gmp readline];
@@ -21,5 +22,9 @@ stdenv.mkDerivation rec {
license = "GPLv2+";
maintainers = with stdenv.lib.maintainers; [ertes raskin];
platforms = stdenv.lib.platforms.linux;
+
+ inherit version;
+ downloadPage = "http://pari.math.u-bordeaux.fr/download.html";
+ updateWalker = true;
};
}
diff --git a/pkgs/applications/science/math/pcalc/default.nix b/pkgs/applications/science/math/pcalc/default.nix
new file mode 100644
index 00000000000..8e68e455ef1
--- /dev/null
+++ b/pkgs/applications/science/math/pcalc/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchgit, bison2, flex }:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+ name = "pcalc-${version}";
+ version = "20120812";
+
+ src = fetchgit {
+ url = git://git.code.sf.net/p/pcalc/code;
+ rev = "db5c5d587d4d24ff6b23405a92eeaad4c0f99618";
+ sha256 = "1bzmiz9rrss3xk0vzszbisjkph73zwgc0riqn9zdd2h1iv6dgq92";
+ };
+
+ makeFlags = [ "DESTDIR= BINDIR=$(out)/bin" ];
+ buildInputs = [ bison2 flex ];
+
+ meta = {
+ homepage = http://pcalc.sourceforge.net/;
+ description = "Programmer's calculator";
+ license = licenses.gpl2;
+ maintainers = with stdenv.lib.maintainers; [ ftrvxmtrx ];
+ platforms = stdenv.lib.platforms.linux;
+ inherit version;
+ };
+}
diff --git a/pkgs/applications/science/math/sloane/default.nix b/pkgs/applications/science/math/sloane/default.nix
index b3bde7874ca..644ec3be569 100644
--- a/pkgs/applications/science/math/sloane/default.nix
+++ b/pkgs/applications/science/math/sloane/default.nix
@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "sloane";
- version = "1.9.1";
- sha256 = "0scnvir7il8ldy3g846xmrdkk2rxnlsiyqak0jvcarf2qi251x5i";
+ version = "1.9.3";
+ sha256 = "0xl3dmi6czwfbi17742hqxf3d6sl9dci08qszrkdmasnvivakg78";
isLibrary = false;
isExecutable = true;
buildDepends = [
@@ -23,6 +23,6 @@ cabal.mkDerivation (self: {
description = "A command line interface to Sloane's On-Line Encyclopedia of Integer Sequences";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
- maintainers = [ self.stdenv.lib.maintainers.akc ];
+ maintainers = with self.stdenv.lib.maintainers; [ akc ];
};
})
diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix
index 7020de0bca8..0898b458593 100644
--- a/pkgs/applications/science/misc/boinc/default.nix
+++ b/pkgs/applications/science/misc/boinc/default.nix
@@ -3,12 +3,12 @@ mesa, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK, xcbutil,
sqlite, gtk, patchelf, libXScrnSaver, libnotify, libX11, libxcb }:
stdenv.mkDerivation rec {
- name = "boinc-7.2.42";
+ name = "boinc-7.4.14";
src = fetchgit {
url = "git://boinc.berkeley.edu/boinc-v2.git";
- rev = "dd0d630882547c123ca0f8fda7a62e058d60f6a9";
- sha256 = "1zifpi3mjgaj68fba6kammp3x7z8n2x164zz6fj91xfiapnan56j";
+ rev = "fb31ab18f94f3b5141bea03e8537d76c606cd276";
+ sha256 = "1465zl8l87fm1ps5f2may6mcc3pp40mpd6wphpxnwwk1lmv48x96";
};
buildInputs = [ libtool automake autoconf m4 pkgconfig curl mesa libXmu libXi
diff --git a/pkgs/applications/science/misc/golly/default.nix b/pkgs/applications/science/misc/golly/default.nix
index 9d198cd5c7f..a29d37cc41a 100644
--- a/pkgs/applications/science/misc/golly/default.nix
+++ b/pkgs/applications/science/misc/golly/default.nix
@@ -1,41 +1,33 @@
-x@{builderDefsPackage,
- wxGTK, perl, python, zlib
- , ...}:
-builderDefsPackage
-(a :
+{stdenv, fetchurl, wxGTK, perl, python, zlib}:
let
- s = import ./src-for-default.nix;
- helperArgNames = ["builderDefsPackage"] ++
- [];
- buildInputs = map (n: builtins.getAttr n x)
- (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-in
-rec {
- src = a.fetchUrlFromSrcInfo s;
-
- inherit (s) name;
- inherit buildInputs;
-
- /* doConfigure should be removed if not needed */
- phaseNames = ["setVars" "doConfigure" "doMakeInstall"];
- setVars = a.noDepEntry ''
- export NIX_LDFLAGS="$NIX_LDFLAGS -lperl -L$(echo "${perl}"/lib/perl5/5*/*/CORE)"
- pythonLib="$(echo "${python}"/lib/libpython*.so)"
- pythonLib="''${pythonLib##*/lib}"
- pythonLib="''${pythonLib%%.so}"
- export NIX_LDFLAGS="$NIX_LDFLAGS -l$pythonLib"
- echo "Flags: $NIX_LDFLAGS"
- '';
-
- meta = {
- description = "Cellular automata simulation program";
- maintainers = with a.lib.maintainers;
- [
- raskin
- ];
- platforms = with a.lib.platforms;
- linux;
- license = with a.lib.licenses;
- gpl2;
+ s = # Generated upstream information
+ rec {
+ baseName="golly";
+ version="2.6";
+ name="${baseName}-${version}";
+ hash="1n1k3yf23ymlwq4k6p4v2g04qd29pg2rabr4l7m9bj2b2j1zkqhz";
+ url="mirror://sourceforge/project/golly/golly/golly-2.6/golly-2.6-src.tar.gz";
+ sha256="1n1k3yf23ymlwq4k6p4v2g04qd29pg2rabr4l7m9bj2b2j1zkqhz";
};
-}) x
+ buildInputs = [
+ wxGTK perl python zlib
+ ];
+in
+stdenv.mkDerivation {
+ inherit (s) name version;
+ inherit buildInputs;
+ src = fetchurl {
+ inherit (s) url sha256;
+ };
+ preConfigure = ''
+ cd gui-wx/configure
+ '';
+ meta = {
+ inherit (s) version;
+ description = "Cellular automata simulation program";
+ license = stdenv.lib.licenses.gpl2;
+ maintainers = [stdenv.lib.maintainers.raskin];
+ platforms = stdenv.lib.platforms.linux;
+ downloadPage = "http://sourceforge.net/projects/golly/files/golly";
+ };
+}
diff --git a/pkgs/applications/science/misc/golly/default.upstream b/pkgs/applications/science/misc/golly/default.upstream
new file mode 100644
index 00000000000..57881e5de35
--- /dev/null
+++ b/pkgs/applications/science/misc/golly/default.upstream
@@ -0,0 +1,4 @@
+url http://sourceforge.net/projects/golly/files/golly/
+version_link '[-][0-9.]+/$'
+SF_version_tarball
+SF_redirect
diff --git a/pkgs/applications/science/misc/golly/src-for-default.nix b/pkgs/applications/science/misc/golly/src-for-default.nix
deleted file mode 100644
index 50d3d41a8ba..00000000000
--- a/pkgs/applications/science/misc/golly/src-for-default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-rec {
- version="2.4";
- name="golly-2.4";
- hash="06vajm019q4q4wfy6pc1669fbjqdb4jaxcc419bk0vzky40anl9w";
- url="mirror://sourceforge/golly/golly-2.4-src.tar.gz";
- advertisedUrl="http://downloads.sourceforge.net/project/golly/golly/golly-2.4/golly-2.4-src.tar.gz";
-
-
-}
diff --git a/pkgs/applications/science/misc/golly/src-info-for-default.nix b/pkgs/applications/science/misc/golly/src-info-for-default.nix
deleted file mode 100644
index a83b929f018..00000000000
--- a/pkgs/applications/science/misc/golly/src-info-for-default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- downloadPage = "http://sourceforge.net/projects/golly/files/golly";
- method="fetchSFdirs";
- fileSuffix="-src.tar.gz";
-}
diff --git a/pkgs/applications/version-management/diffuse/default.nix b/pkgs/applications/version-management/diffuse/default.nix
index 92cdddd8dcb..2bd4b584724 100644
--- a/pkgs/applications/version-management/diffuse/default.nix
+++ b/pkgs/applications/version-management/diffuse/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, python, pygtk, makeWrapper }:
stdenv.mkDerivation rec {
- version = "0.4.7";
+ version = "0.4.8";
name = "diffuse-${version}";
src = fetchurl {
url = "mirror://sourceforge/project/diffuse/diffuse/${version}/${name}.tar.bz2";
- sha256 = "1b1riy9wix2gby78v9i30ijycjhkcyqsllggjakbkx26sb5nmxdh";
+ sha256 = "0ayz8bywmk1z3zicb0a7hbxliqpc7xym60s0mawzqllkpadvgly1";
};
buildInputs = [ python pygtk makeWrapper ];
diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
index fb7232794c5..383114f1c3c 100644
--- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
name = "cgit-${version}";
- version = "0.10.1";
+ version = "0.10.2";
src = fetchurl {
url = "http://git.zx2c4.com/cgit/snapshot/${name}.tar.xz";
- sha256 = "0bci1p9spf79wirc4lk36cndcx2b9wj0fq1l58rlp6r563is77l3";
+ sha256 = "13ac4rqmxc87ymh78ff8kbw1s252nbid71l0ircmj9kmh9jqwncl";
};
# cgit is tightly coupled with git and needs a git source tree to build.
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index fd548296220..4cabe3a4e2a 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -98,4 +98,5 @@ rec {
git-remote-hg = callPackage ./git-remote-hg { };
+ gitRemoteGcrypt = callPackage ./git-remote-gcrypt { };
}
diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
index 62132271ec9..cbbdb6b7075 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
@@ -7,18 +7,18 @@
, hamlet, hinotify, hS3, hslogger, httpClient, httpConduit
, httpTypes, IfElse, json, lsof, MissingH, monadControl, mtl
, network, networkInfo, networkMulticast, networkProtocolXmpp
-, openssh, optparseApplicative, pathPieces, perl, QuickCheck
-, random, regexTdfa, rsync, SafeSemaphore, securemem, SHA
-, shakespeare, stm, tasty, tastyHunit, tastyQuickcheck, tastyRerun
-, text, time, transformers, unixCompat, utf8String, uuid, wai
-, waiExtra, warp, warpTls, which, xmlTypes, yesod, yesodCore
-, yesodDefault, yesodForm, yesodStatic
+, networkUri, openssh, optparseApplicative, pathPieces, perl
+, QuickCheck, random, regexTdfa, rsync, SafeSemaphore, securemem
+, SHA, shakespeare, stm, tasty, tastyHunit, tastyQuickcheck
+, tastyRerun, text, time, transformers, unixCompat, utf8String
+, uuid, wai, waiExtra, warp, warpTls, which, xmlTypes, yesod
+, yesodCore, yesodDefault, yesodForm, yesodStatic
}:
cabal.mkDerivation (self: {
pname = "git-annex";
- version = "5.20140817";
- sha256 = "0cly19rd250qiikzszgad2r5xz570kr00vcb8ij6icbm53pw3hxc";
+ version = "5.20140927";
+ sha256 = "02zmg8pcrdavfna2xy51n6chn6i5g0b8p20rba1vj29rlfj3cask";
isLibrary = false;
isExecutable = true;
buildDepends = [
@@ -27,18 +27,15 @@ cabal.mkDerivation (self: {
dlist dns editDistance exceptions fdoNotify feed filepath gnutls
hamlet hinotify hS3 hslogger httpClient httpConduit httpTypes
IfElse json MissingH monadControl mtl network networkInfo
- networkMulticast networkProtocolXmpp optparseApplicative pathPieces
- QuickCheck random regexTdfa SafeSemaphore securemem SHA shakespeare
- stm tasty tastyHunit tastyQuickcheck tastyRerun text time
- transformers unixCompat utf8String uuid wai waiExtra warp warpTls
- xmlTypes yesod yesodCore yesodDefault yesodForm yesodStatic
+ networkMulticast networkProtocolXmpp networkUri optparseApplicative
+ pathPieces QuickCheck random regexTdfa SafeSemaphore securemem SHA
+ shakespeare stm tasty tastyHunit tastyQuickcheck tastyRerun text
+ time transformers unixCompat utf8String uuid wai waiExtra warp
+ warpTls xmlTypes yesod yesodCore yesodDefault yesodForm yesodStatic
];
buildTools = [ bup curl git gnupg1 lsof openssh perl rsync which ];
configureFlags = "-fAssistant -fProduction";
- preConfigure = ''
- export HOME="$NIX_BUILD_TOP/tmp"
- mkdir "$HOME"
- '';
+ preConfigure = "export HOME=$TEMPDIR";
installPhase = "./Setup install";
checkPhase = ''
cp dist/build/git-annex/git-annex git-annex
diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix
new file mode 100644
index 00000000000..0f4e143324c
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchgit, docutils }:
+
+stdenv.mkDerivation {
+ name = "git-remote-gcrypt-20140715";
+
+ # Use joeyh's branch that works better with git-annex
+ src = fetchgit {
+ url = "https://github.com/joeyh/git-remote-gcrypt.git";
+ rev = "5dcc77f507d497fe4023e94a47b6a7a1f1146bce";
+ sha256 = "d509efde143cfec4898872b5bb423d52d5d1c940b6a1e21b8444c904bdb250c2";
+ };
+
+ # Required for rst2man.py
+ buildInputs = [ docutils ];
+
+ # The install.sh script expects rst2man, but here it's named rst2man.py
+ patchPhase = ''
+ sed -i 's/rst2man/rst2man.py/g' install.sh
+ '';
+
+ installPhase = ''
+ prefix="$out" ./install.sh
+ '';
+
+ meta = {
+ homepage = "https://github.com/joeyh/git-remote-gcrypt";
+ description = "GNU Privacy Guard-encrypted git remote";
+ license = stdenv.lib.licenses.gpl3;
+ maintainers = with stdenv.lib.maintainers; [ ellis ];
+ };
+}
diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 877c65afccf..b21cd35b701 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -10,7 +10,7 @@
let
- version = "2.1.0";
+ version = "2.1.2";
svn = subversionClient.override { perlBindings = true; };
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
- sha256 = "19q1as2bjh4yifmgw6cciwfw0dswxppaf5iq8h8934i33bf15mwd";
+ sha256 = "12x1qycc0rii6fqpiizp9v9ysdmj6lpi9imqqbrkdx6cifbwh9vv";
};
patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ./cert-path.patch ];
diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix
index 28484322d35..8d578c2b466 100644
--- a/pkgs/applications/version-management/git-and-tools/hub/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "hub-${version}";
- version = "1.12.0";
+ version = "1.12.2";
src = fetchurl {
url = "https://github.com/github/hub/archive/v${version}.tar.gz";
- sha256 = "1lbl4dl7483q320qw4jm6mqq4dbbk3xncypxgg86zcdigxvw6igv";
+ sha256 = "112yfv9xklsmwv859kypv7hz0a6dj5hkrmjp7z1h40nrljc9mi79";
};
buildInputs = [ rake makeWrapper ];
@@ -23,5 +23,6 @@ stdenv.mkDerivation rec {
description = "A GitHub specific wrapper for git";
homepage = "http://defunkt.io/hub/";
license = stdenv.lib.licenses.mit;
+ maintainers = with stdenv.lib.maintainers; [ the-kenny ];
};
}
diff --git a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
index b0cfcaeb110..f30a47a78b9 100644
--- a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, ruby, makeWrapper, git }:
let
- version = "2.2.5";
+ version = "2.3.2";
in
stdenv.mkDerivation {
name = "svn2git-${version}";
src = fetchurl {
url = "https://github.com/nirvdrum/svn2git/archive/v${version}.tar.gz";
- sha256 = "1afmrr80357pg3kawyghhc55z1pszaq8fyrrjmxa6nr9dcrqjwwh";
+ sha256 = "1484mpcabqf9kr6xdpdgb1npkqav1bcah3w5lxj2djjx4bjf2g3y";
};
buildInputs = [ ruby makeWrapper ];
diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix
index 239fa87d32c..7e93893e7b1 100644
--- a/pkgs/applications/version-management/git-and-tools/tig/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix
@@ -3,11 +3,12 @@
}:
stdenv.mkDerivation rec {
- name = "tig-2.0.2";
+ name = "tig-2.0.3";
src = fetchurl {
url = "http://jonas.nitro.dk/tig/releases/${name}.tar.gz";
- sha256 = "0gi7iqiij37b0d3izxymxaw5ns2mv1y7qfic0fhl7xj4s2rz075r";
+ sha256 = "1i4nizachq0ncq0d8c87ly50zk51vgzb5a8amqscywdp1kc0zb7s";
+
};
buildInputs = [ ncurses asciidoc xmlto docbook_xsl readline ];
diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix
index 13c55476774..74eee477847 100644
--- a/pkgs/applications/version-management/gource/default.nix
+++ b/pkgs/applications/version-management/gource/default.nix
@@ -3,18 +3,20 @@
}:
stdenv.mkDerivation rec {
- name = "gource-0.40";
+ version = "0.42";
+ name = "gource-${version}";
src = fetchurl {
- url = "http://gource.googlecode.com/files/${name}.tar.gz";
- sha256 = "04nirh07xjslqsph557as4s50nlf91bi6v2l7vmbifmkdf90m2cw";
+ url = "https://github.com/acaudwell/Gource/releases/download/${name}/${name}.tar.gz";
+ sha256 = "08ab57z44y8b5wxg1193j6hiy50njbpi6dwafjh6nb0apcq8ziz5";
};
buildInputs = [
- glew SDL ftgl pkgconfig libpng libjpeg pcre SDL_image mesa boost glm
+ glew SDL ftgl pkgconfig libpng libjpeg pcre SDL_image mesa
+ boost boost.lib glm
];
- configureFlags = "--with-boost-libdir=${boost}/lib";
+ configureFlags = "--with-boost-libdir=${boost.lib}/lib";
NIX_CFLAGS_COMPILE = "-fpermissive"; # fix build with newer gcc versions
diff --git a/pkgs/applications/version-management/guitone/default.nix b/pkgs/applications/version-management/guitone/default.nix
index a396765e918..135e7c7e1ef 100644
--- a/pkgs/applications/version-management/guitone/default.nix
+++ b/pkgs/applications/version-management/guitone/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchmtn, qt4 }:
+{ stdenv, fetchurl, fetchmtn, qt4, pkgconfig, graphviz }:
let version = "1.0-mtn-head"; in
stdenv.mkDerivation rec {
@@ -11,12 +11,12 @@ stdenv.mkDerivation rec {
src = fetchmtn {
dbs = ["mtn://code.monotone.ca/guitone"];
- selector = "2777cdef424c65df93fa1ff181f02ee30d4901ab";
- sha256 = "918d36a83060b84efa0ee0fe0fd058f1c871c91156d91366e2e979c886ff4271";
+ selector = "3a728afdbd3943b1d86c2a249b1e2ede7bf64c27";
+ sha256 = "01vs8m00phs5pl75mjkpdarynfpkqrg0qf4rsn95czi3q6nxiaq5";
branch = "net.venge.monotone.guitone";
};
- buildInputs = [ qt4 ];
+ buildInputs = [ qt4 pkgconfig graphviz ];
prefixKey="PREFIX=";
configureScript = "qmake guitone.pro";
diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix
index 951ea29a7fc..145496cb49c 100644
--- a/pkgs/applications/version-management/meld/default.nix
+++ b/pkgs/applications/version-management/meld/default.nix
@@ -28,6 +28,6 @@ stdenv.mkDerivation {
description = "Visual diff and merge tool";
homepage = http://meld.sourceforge.net;
license = stdenv.lib.licenses.gpl2Plus;
- platforms = platforms.linux;
+ platforms = platforms.linux ++ stdenv.lib.platforms.darwin;
};
}
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index 8237a5517c7..7b309233ca9 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -2,7 +2,7 @@
, guiSupport ? false, tk ? null, curses }:
let
- version = "3.1";
+ version = "3.1.1";
name = "mercurial-${version}";
in
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://mercurial.selenic.com/release/${name}.tar.gz";
- sha256 = "1r6hdxka867lpsq2jq3vz662m3ywflg4yylayc9g0s9gmiww5pgi";
+ sha256 = "1ncqagvxcqa41ginmf0kpx2z6b2r2zrq7bdkza3nfba682c2is67";
};
inherit python; # pass it so that the same version can be used in hg2git
diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix
new file mode 100644
index 00000000000..d729159316d
--- /dev/null
+++ b/pkgs/applications/version-management/smartgithg/default.nix
@@ -0,0 +1,64 @@
+{ stdenv, fetchurl, lib, makeWrapper
+, jre
+, gtk, glib
+, libXtst
+, git, mercurial, subversion
+, which
+}:
+
+let
+ the_version = "6_0_6";
+
+in
+
+stdenv.mkDerivation rec {
+ name = "smartgithg-${the_version}";
+
+ src = fetchurl {
+ url = "http://www.syntevo.com/download/smartgithg/" +
+ "smartgithg-generic-${the_version}.tar.gz";
+ sha256 = "13e41560138ef18395fbe0bf56d4d29e8614eee004d51d7dd03381080d8426e6";
+ };
+
+ buildInputs = [
+ makeWrapper
+ jre
+ ];
+
+ buildCommand = let
+ pkg_path = "$out/${name}";
+ bin_path = "$out/bin";
+ runtime_paths = lib.makeSearchPath "bin" [
+ jre
+ git mercurial subversion
+ which
+ ];
+ runtime_lib_paths = lib.makeLibraryPath [
+ gtk glib
+ libXtst
+ ];
+ in ''
+ tar xvzf $src
+ mkdir -pv $out
+ # unpacking should have produced a dir named ${name}
+ cp -a ${name} $out
+ mkdir -pv ${bin_path}
+ [ -d ${jre}/lib/openjdk ] \
+ && jre=${jre}/lib/openjdk \
+ || jre=${jre}
+ makeWrapper ${pkg_path}/bin/smartgithg.sh ${bin_path}/smartgithg \
+ --prefix PATH : ${runtime_paths} \
+ --prefix LD_LIBRARY_PATH : ${runtime_lib_paths} \
+ --prefix JRE_HOME : ${jre} \
+ --prefix JAVA_HOME : ${jre} \
+ --prefix SMARTGITHG_JAVA_HOME : ${jre}
+ patchShebangs $out
+ '';
+
+ meta = with stdenv.lib; {
+ description = "GUI for Git, Mercurial, Subversion";
+ homepage = http://www.syntevo.com/smartgithg/;
+ license = licenses.unfree;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index 7526bb5f043..283ea759153 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -17,13 +17,13 @@ assert javahlBindings -> jdk != null && perl != null;
stdenv.mkDerivation rec {
- version = "1.8.9";
+ version = "1.8.10";
name = "subversion-${version}";
src = fetchurl {
url = "mirror://apache/subversion/${name}.tar.bz2";
- sha1 = "424ee12708f39a126efd905886666083dcc4eeaf";
+ sha256 = "1k3xskg2kjfp3zipl46lqx4fq4lhqnswd79qxp1kfhwplz401j8w";
};
buildInputs = [ zlib apr aprutil sqlite ]
diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix
index c06aa0a036c..b42e781704a 100644
--- a/pkgs/applications/video/aegisub/default.nix
+++ b/pkgs/applications/video/aegisub/default.nix
@@ -10,8 +10,7 @@
, openalSupport ? false, openal ? null
, alsaSupport ? true, alsaLib ? null
, pulseaudioSupport ? true, pulseaudio ? null
-, portaudioSupport ? false, portaudio ? null
-}:
+, portaudioSupport ? false, portaudio ? null }:
assert spellChecking -> (hunspell != null);
assert automationSupport -> (lua != null);
@@ -22,17 +21,15 @@ assert portaudioSupport -> (portaudio != null);
stdenv.mkDerivation rec {
name = "aegisub-${version}";
- version = "3.2.0";
+ version = "3.2.1";
src = fetchurl {
url = "http://ftp.aegisub.org/pub/releases/${name}.tar.xz";
- sha256 = "0nciw5p1aq94qwz5j4vbc06fywdjhazgh4qs6qr9iqj3n94gvrfr";
+ sha256 = "1p7qdnxyyyrlpvxdrrp15b5967d7bzpjl3vdy0q66g4aabr2h6ln";
};
- nativeBuildInputs = [ intltool ];
-
buildInputs = with stdenv.lib;
- [ libX11 gettext wxGTK libiconv fontconfig freetype mesa libass fftw ffms ffmpeg pkgconfig zlib icu boost ]
+ [ intltool libX11 gettext wxGTK libiconv fontconfig freetype mesa libass fftw ffms ffmpeg pkgconfig zlib icu boost boost.lib ]
++ optional spellChecking hunspell
++ optional automationSupport lua
++ optional openalSupport openal
@@ -43,7 +40,7 @@ stdenv.mkDerivation rec {
NIX_LDFLAGS = "-liconv -lavutil -lavformat -lavcodec -lswscale -lz -lm -lGL";
- configureFlags = "--with-boost-libdir=${boost}/lib/";
+ configureFlags = "--with-boost-libdir=${boost.lib}/lib/";
postInstall = "ln -s $out/bin/aegisub-* $out/bin/aegisub";
@@ -62,6 +59,5 @@ stdenv.mkDerivation rec {
# - so the resulting program will be GPL
maintainers = [ maintainers.AndersonTorres ];
platforms = platforms.linux;
-
};
}
diff --git a/pkgs/applications/video/cmplayer/default.nix b/pkgs/applications/video/cmplayer/default.nix
new file mode 100644
index 00000000000..3fa38646d9d
--- /dev/null
+++ b/pkgs/applications/video/cmplayer/default.nix
@@ -0,0 +1,83 @@
+{ stdenv, fetchurl, fetchpatch, pkgconfig, python2, perl
+, libX11, libxcb, qt5, mesa
+, ffmpeg
+, libchardet
+, mpg123
+, libass
+, libdvdread
+, libdvdnav
+, icu
+, libquvi
+, alsaLib
+, libvdpau, libva
+, libbluray
+, jackSupport ? false, jack ? null
+, portaudioSupport ? false, portaudio ? null
+, pulseSupport ? true, pulseaudio ? null
+, cddaSupport ? false, libcdda ? null
+}:
+
+assert jackSupport -> jack != null;
+assert portaudioSupport -> portaudio != null;
+assert pulseSupport -> pulseaudio != null;
+assert cddaSupport -> libcdda != null;
+
+stdenv.mkDerivation rec {
+ name = "cmplayer-${version}";
+ version = "0.8.16";
+
+ src = fetchurl {
+ url = "https://github.com/xylosper/cmplayer/releases/download/v${version}/${name}-source.tar.gz";
+ sha256 = "1yppp0jbq3mwa7vq4sjmm2lsqnfcv4n7cjap50gc2bavq7qynr85";
+ };
+
+ patches = [ ./fix-gcc48.patch ];
+
+ buildInputs = with stdenv.lib;
+ [ libX11 libxcb qt5 mesa
+ ffmpeg
+ libchardet
+ mpg123
+ libass
+ libdvdread
+ libdvdnav
+ icu
+ libquvi
+ alsaLib
+ libvdpau
+ libva
+ libbluray
+ ]
+ ++ optional jackSupport jack
+ ++ optional portaudioSupport portaudio
+ ++ optional pulseSupport pulseaudio
+ ++ optional cddaSupport libcdda
+ ;
+
+ preConfigure = ''
+ patchShebangs ./configure
+ patchShebangs src/mpv/waf
+ '';
+
+ configureFlags = with stdenv.lib;
+ [ "--qmake=qmake" ]
+ ++ optional jackSupport "--enable-jack"
+ ++ optional portaudioSupport "--enable-portaudio"
+ ++ optional pulseSupport "--enable-pulseaudio"
+ ++ optional cddaSupport "--enable-cdda"
+ ;
+
+ preBuild = "patchShebangs ./build-mpv";
+
+ nativeBuildInputs = [ pkgconfig python2 perl ];
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ description = "Powerful and easy-to-use multimedia player";
+ homepage = http://cmplayer.github.io;
+ license = licenses.gpl2Plus;
+ maintainers = [ maintainers.abbradar ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/video/cmplayer/fix-gcc48.patch b/pkgs/applications/video/cmplayer/fix-gcc48.patch
new file mode 100644
index 00000000000..134acf89569
--- /dev/null
+++ b/pkgs/applications/video/cmplayer/fix-gcc48.patch
@@ -0,0 +1,22 @@
+From f6de1c7537dc3a0b4c9d69a63653c9bb4af26948 Mon Sep 17 00:00:00 2001
+From: xylosper
+Date: Wed, 2 Jul 2014 11:57:05 +0900
+Subject: [PATCH] add a space between user defined literal operator
+
+---
+ src/cmplayer/stdafx.hpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/cmplayer/stdafx.hpp b/src/cmplayer/stdafx.hpp
+index 5f7d49c..c724f08 100644
+--- a/src/cmplayer/stdafx.hpp
++++ b/src/cmplayer/stdafx.hpp
+@@ -52,7 +52,7 @@ SIA operator "" _q(const char16_t *str, size_t len) -> QString
+ SIA operator "" _a(const char *str, size_t len) -> QLatin1String
+ { return QLatin1String(str, len); }
+
+-SIA operator ""_b(const char *str, size_t len) -> QByteArray
++SIA operator "" _b(const char *str, size_t len) -> QByteArray
+ { return QByteArray::fromRawData(str, len); }
+
+ SIA operator "" _8(const char *str, size_t len) -> QString
diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix
index 515e2591461..879fa08ea38 100644
--- a/pkgs/applications/video/gnash/default.nix
+++ b/pkgs/applications/video/gnash/default.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gettext x11 SDL SDL_mixer gstreamer gst_plugins_base gst_plugins_good
gst_ffmpeg speex libtool
- libogg libxml2 libjpeg mesa libpng libungif boost freetype agg
+ libogg libxml2 libjpeg mesa libpng libungif boost boost.lib freetype agg
dbus curl pkgconfig glib gtk gtkglext pangox_compat
xulrunner
makeWrapper
diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix
index ed64448c13a..567821ba361 100644
--- a/pkgs/applications/video/mkvtoolnix/default.nix
+++ b/pkgs/applications/video/mkvtoolnix/default.nix
@@ -15,14 +15,18 @@
}:
stdenv.mkDerivation rec {
- name = "mkvtoolnix-6.5.0";
+ version = "7.2.0";
+ name = "mkvtoolnix-${version}";
src = fetchurl {
url = "http://www.bunkus.org/videotools/mkvtoolnix/sources/${name}.tar.xz";
- sha256 = "0a3h878bsjbpb2r7b528xzyqzl8r82yhrniry9bnhmw7rcl53bd8";
+ sha256 = "1bpmd37y2v4icv9iqjv3p4kr62jbdng2ar8vpiij3bdgwrjc6gv1";
};
- buildInputs = [ libmatroska flac libvorbis file boost xdg_utils expat wxGTK zlib ruby gettext pkgconfig curl ];
+ buildInputs = [
+ libmatroska flac libvorbis file boost xdg_utils
+ expat wxGTK zlib ruby gettext pkgconfig curl
+ ];
configureFlags = "--with-boost-libdir=${boost}/lib";
buildPhase = ''
@@ -36,5 +40,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Cross-platform tools for Matroska";
homepage = http://www.bunkus.org/videotools/mkvtoolnix/;
+ license = stdenv.lib.licenses.gpl2;
+ maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
};
}
diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix
index 07bcb26569e..dec3a5fc28d 100644
--- a/pkgs/applications/video/mplayer/default.nix
+++ b/pkgs/applications/video/mplayer/default.nix
@@ -21,6 +21,7 @@
, bs2bSupport ? false, libbs2b ? null
# For screenshots
, libpngSupport ? true, libpng ? null
+, libjpegSupport ? true, libjpeg ? null
, useUnfreeCodecs ? false
}:
@@ -46,6 +47,7 @@ assert jackaudioSupport -> jack2 != null;
assert pulseSupport -> pulseaudio != null;
assert bs2bSupport -> libbs2b != null;
assert libpngSupport -> libpng != null;
+assert libjpegSupport -> libjpeg != null;
let
@@ -121,6 +123,7 @@ stdenv.mkDerivation rec {
++ optional vdpauSupport libvdpau
++ optional speexSupport speex
++ optional libpngSupport libpng
+ ++ optional libjpegSupport libjpeg
++ optional bs2bSupport libbs2b
;
diff --git a/pkgs/applications/video/mplayer2/default.nix b/pkgs/applications/video/mplayer2/default.nix
index d8ada6372b1..5827e22ea5e 100644
--- a/pkgs/applications/video/mplayer2/default.nix
+++ b/pkgs/applications/video/mplayer2/default.nix
@@ -15,6 +15,7 @@
, bs2bSupport ? false, libbs2b ? null
# For screenshots
, libpngSupport ? true, libpng ? null
+, libjpegSupport ? true, libjpeg ? null
, useUnfreeCodecs ? false
}:
@@ -32,6 +33,7 @@ assert jackaudioSupport -> jack2 != null;
assert pulseSupport -> pulseaudio != null;
assert bs2bSupport -> libbs2b != null;
assert libpngSupport -> libpng != null;
+assert libjpegSupport -> libjpeg != null;
let
@@ -96,6 +98,7 @@ stdenv.mkDerivation rec {
++ optional speexSupport speex
++ optional bs2bSupport libbs2b
++ optional libpngSupport libpng
+ ++ optional libjpegSupport libjpeg
;
nativeBuildInputs = [ yasm python3 ];
@@ -110,8 +113,8 @@ stdenv.mkDerivation rec {
${optionalString (stdenv.isi686 || stdenv.isx86_64) "--enable-runtime-cpudetection"}
${optionalString dvdnavSupport "--extra-ldflags=-ldvdread"}
${if xvSupport then "--enable-xv" else "--disable-xv"}
- ${if x11Support then "--enable-x11 --enable-gl --extra-cflags=-I{libx11}/include"
- else "--disable-x11 --disable-gl"}
+ ${if x11Support then "--enable-x11 --enable-gl --extra-cflags=-I${libX11}/include"
+ else "--disable-x11 --disable-gl"}
--disable-xvid
--disable-ossaudio
'';
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 4eec9afdbf3..c58ac268b67 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, fetchgit, freetype, pkgconfig, freefont_ttf, ffmpeg, libass
, lua, perl, libpthreadstubs
, lua5_sockets
-, python3, docutils, which
+, python3, docutils, which, lib
, x11Support ? true, libX11 ? null, libXext ? null, mesa ? null, libXxf86vm ? null
, xineramaSupport ? true, libXinerama ? null
, xvSupport ? true, libXv ? null
@@ -20,8 +20,9 @@
# For screenshots
, libpngSupport ? true, libpng ? null
# for Youtube support
-, quviSupport? false, libquvi ? null
-, cacaSupport? false, libcaca ? null
+, quviSupport ? false, libquvi ? null
+, cacaSupport ? false, libcaca ? null
+, vaapiSupport ? false, libva ? null
}:
assert x11Support -> (libX11 != null && libXext != null && mesa != null && libXxf86vm != null);
@@ -49,23 +50,23 @@ assert cacaSupport -> libcaca != null;
let
waf = fetchurl {
- url = https://waf.googlecode.com/files/waf-1.7.15;
- sha256 = "e5ae7028f9b2d8ce1acb9fe1092e8010a90ba764d3ac065ea4e846743290b1d6";
+ url = http://ftp.waf.io/pub/release/waf-1.7.16;
+ sha256 = "b64dc26c882572415fd450b745006107965f3fe17b357e3eb43d6676c9635a61";
};
in
stdenv.mkDerivation rec {
name = "mpv-${version}";
- version = "0.4.1";
+ version = "0.5.4";
src = fetchurl {
url = "https://github.com/mpv-player/mpv/archive/v${version}.tar.gz";
- sha256 = "0wqjyzw3kk854zj263k7jyykzfaz1g27z50aqrd26hylg8k135cn";
+ sha256 = "1n992nvylnh27jc6425daasq0nsxjfc1mxhhlhvlwzxm724x94xp";
};
buildInputs = with stdenv.lib;
- [ waf freetype pkgconfig ffmpeg libass docutils which libpthreadstubs lua5_sockets ]
+ [ waf python3 lua perl freetype pkgconfig ffmpeg libass docutils which libpthreadstubs lua5_sockets ]
++ optionals x11Support [ libX11 libXext mesa libXxf86vm ]
++ optional alsaSupport alsaLib
++ optional xvSupport libXv
@@ -84,11 +85,9 @@ stdenv.mkDerivation rec {
++ optional quviSupport libquvi
++ optional sdl2Support SDL2
++ optional cacaSupport libcaca
+ ++ optional vaapiSupport libva
;
- nativeBuildInputs = [ python3 lua perl ];
-
-
# There are almost no need of "configure flags", but some libraries
# weren't detected; see the TODO comments below
@@ -97,7 +96,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
configurePhase = ''
- python3 ${waf} configure --prefix=$out
+ python3 ${waf} configure --prefix=$out ${lib.optionalString vaapiSupport "--enable-vaapi"}
patchShebangs TOOLS
'';
@@ -112,21 +111,21 @@ stdenv.mkDerivation rec {
ln -s ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mpv/subfont.ttf
'';
- meta = {
+ meta = with stdenv.lib;{
description = "A movie player that supports many video formats (MPlayer and mplayer2 fork)";
longDescription = ''
- mpv is a free and open-source general-purpose video player, based on the MPlayer and mplayer2 projects, with great improvements above both.
+ mpv is a free and open-source general-purpose video player,
+ based on the MPlayer and mplayer2 projects, with great
+ improvements above both.
'';
- homepage = "http://mpv.io";
- license = stdenv.lib.licenses.gpl2Plus;
- maintainers = [ stdenv.lib.maintainers.AndersonTorres ];
- platforms = stdenv.lib.platforms.linux;
+ homepage = http://mpv.io;
+ license = licenses.gpl2Plus;
+ maintainers = [ maintainers.AndersonTorres ];
+ platforms = platforms.linux;
};
}
-# Heavily based on mplayer2 expression
-
# TODO: Wayland support
-# TODO: investigate libquvi support
+# TODO: investigate libquvi problems (related to Youtube support)
# TODO: investigate caca support
# TODO: investigate lua5_sockets bug
diff --git a/pkgs/applications/video/omxplayer/default.nix b/pkgs/applications/video/omxplayer/default.nix
index 3add2646ad9..449190cfaa1 100644
--- a/pkgs/applications/video/omxplayer/default.nix
+++ b/pkgs/applications/video/omxplayer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, raspberrypifw, pcre, boostHeaders, freetype, zlib }:
+{ stdenv, fetchurl, raspberrypifw, pcre, boost, freetype, zlib }:
let
ffmpeg = stdenv.mkDerivation rec {
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
mkdir -p $out/bin
cp omxplayer.bin $out/bin
'';
- buildInputs = [ raspberrypifw ffmpeg pcre boostHeaders freetype zlib ];
+ buildInputs = [ raspberrypifw ffmpeg pcre boost freetype zlib ];
meta = {
homepage = https://github.com/huceke/omxplayer;
diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix
index 51baa32f61e..79fd26204a9 100644
--- a/pkgs/applications/video/shotcut/default.nix
+++ b/pkgs/applications/video/shotcut/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "shotcut-${version}";
- version = "14.08";
+ version = "14.09";
src = fetchurl {
url = "https://github.com/mltframework/shotcut/archive/v${version}.tar.gz";
- sha256 = "0klcvpgp2l6xcdjy1gg7a5s8mx0mm347zdf26q6kk685pldlvkyj";
+ sha256 = "1504ds3ppqmpg84nb2gb74qndqysjwn3xw7n8xv19kd1pppnr10f";
};
buildInputs = [ SDL frei0r gettext makeWrapper mlt pkgconfig qt5 ];
diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix
index 4c58262a5f1..eaa903d3698 100644
--- a/pkgs/applications/video/simplescreenrecorder/default.nix
+++ b/pkgs/applications/video/simplescreenrecorder/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "simplescreenrecorder-${version}";
- version = "0.3.0";
+ version = "0.3.1";
src = fetchurl {
url = "https://github.com/MaartenBaert/ssr/archive/${version}.tar.gz";
- sha256 = "0caal8jq47d56ld57cdf2lr1ji350v09j5chgvgxv2pbqmqga4p5";
+ sha256 = "00ra4isl4yf5l6q1cp97ss46jck1iayv1d23iz4885yzxknvhhjn";
};
buildInputs = [
diff --git a/pkgs/applications/video/subtitleeditor/default.nix b/pkgs/applications/video/subtitleeditor/default.nix
index c1c11357ca0..7c42aebf2bc 100644
--- a/pkgs/applications/video/subtitleeditor/default.nix
+++ b/pkgs/applications/video/subtitleeditor/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
'';
homepage = http://home.gna.org/subtitleeditor;
license = stdenv.lib.licenses.gpl3;
- maintainers = stdenv.lib.maintainers.plcplc;
+ maintainers = [ stdenv.lib.maintainers.plcplc ];
platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/applications/video/wxcam/default.nix b/pkgs/applications/video/wxcam/default.nix
new file mode 100644
index 00000000000..561ab151682
--- /dev/null
+++ b/pkgs/applications/video/wxcam/default.nix
@@ -0,0 +1,51 @@
+{ stdenv, fetchurl
+, pkgconfig
+, intltool
+, libX11, libXv, libSM
+, gtk, libglade
+, wxGTK
+, perlXMLParser
+, xvidcore
+, mjpegtools
+, alsaLib
+, libv4l
+, cimg }:
+
+stdenv.mkDerivation rec {
+
+ name = "wxcam-${version}";
+ version = "1.1";
+
+ src = fetchurl {
+ url = "http://downloads.sourceforge.net/project/wxcam/wxcam/${version}/${name}.tar.gz";
+ sha256 = "1765bvc65fpzn9ycnnj5hais9xkx9v0sm6a878d35x54bpanr859";
+ };
+
+ buildInputs = with stdenv.lib;
+ [ pkgconfig intltool libX11 libXv libSM gtk libglade wxGTK perlXMLParser xvidcore mjpegtools alsaLib libv4l cimg ];
+
+ NIX_CFLAGS_COMPILE="-I ${cimg}/include/cimg";
+
+ postUnpack = ''
+ sed -ie 's|/usr/share/|'"$out/share/"'|g' $sourceRoot/Makefile.in
+ '';
+
+ installPhase = ''
+ make install prefix="$out" wxcamdocdir="$out/share/doc/wxcam"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "An open-source, wxGTK-based webcam app for Linux";
+ longDescription = ''
+ wxCam is a webcam application for linux. It supports video recording
+ (avi uncompressed and Xvid formats), snapshot taking, and some special
+ commands for philips webcams, so you can also use it for astronomy purposes.
+ It supports both video4linux 1 and 2 drivers,
+ so it should work on a very large number of devices.
+ '';
+ homepage = http://wxcam.sourceforge.net/;
+ license = licenses.gpl3Plus;
+ maintainers = [ maintainers.AndersonTorres ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/video/xbmc/default.nix b/pkgs/applications/video/xbmc/default.nix
index 875ed48c102..404659208cf 100644
--- a/pkgs/applications/video/xbmc/default.nix
+++ b/pkgs/applications/video/xbmc/default.nix
@@ -90,6 +90,7 @@ stdenv.mkDerivation rec {
--prefix PATH ":" "${xdpyinfo}/bin" \
--prefix LD_LIBRARY_PATH ":" "${curl}/lib" \
--prefix LD_LIBRARY_PATH ":" "${systemd}/lib" \
+ --prefix LD_LIBRARY_PATH ":" "${libmad}/lib" \
--prefix LD_LIBRARY_PATH ":" "${libvdpau}/lib"
done
'';
@@ -98,7 +99,7 @@ stdenv.mkDerivation rec {
homepage = http://xbmc.org/;
description = "Media center";
license = "GPLv2";
- platforms = stdenv.lib.platforms.linux;
+ platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.iElectric ];
};
}
diff --git a/pkgs/applications/video/xbmc/plugins.nix b/pkgs/applications/video/xbmc/plugins.nix
new file mode 100644
index 00000000000..d34fba9ade7
--- /dev/null
+++ b/pkgs/applications/video/xbmc/plugins.nix
@@ -0,0 +1,84 @@
+{ stdenv, fetchFromGitHub, xbmc }:
+
+let
+
+ pluginDir = "/lib/xbmc/plugin";
+
+ mkXBMCPlugin = { plugin, namespace, version, src, meta, ... }:
+ stdenv.lib.makeOverridable stdenv.mkDerivation rec {
+ inherit src meta;
+ name = "xbmc-plugin-${plugin}-${version}";
+ passthru = {
+ xbmcPlugin = pluginDir;
+ namespace = namespace;
+ };
+ dontStrip = true;
+ installPhase = ''
+ d=$out${pluginDir}/${namespace}
+ mkdir -p $d
+ cp -R $src/* $d
+ '';
+ };
+
+in
+{
+
+ advanced-launcher = mkXBMCPlugin rec {
+
+ plugin = "advanced-launcher";
+ namespace = "plugin.program.advanced.launcher";
+ version = "2.5.7";
+
+ src = fetchFromGitHub {
+ owner = "Angelscry";
+ repo = namespace;
+ rev = "f6f7980dc66d041e1635bb012d79aa8b3a8790ba";
+ sha256 = "0wk41lpd6fw504q5x1h76hc99vw4jg4vq44bh7m21ism85ds0r47";
+ };
+
+ meta = with stdenv.lib; {
+ homepage = "http://forum.xbmc.org/showthread.php?tid=85724";
+ description = "A program launcher for XBMC";
+ longDescription = ''
+ Advanced Launcher allows you to start any Linux, Windows and
+ OS X external applications (with command line support or not)
+ directly from the XBMC GUI. Advanced Launcher also give you
+ the possibility to edit, download (from Internet resources)
+ and manage all the meta-data (informations and images) related
+ to these applications.
+ '';
+ platforms = platforms.all;
+ maintainers = with maintainers; [ edwtjo ];
+ };
+
+ };
+
+ svtplay = mkXBMCPlugin rec {
+
+ plugin = "svtplay";
+ namespace = "plugin.video.svtplay";
+ version = "4.0.6";
+
+ src = fetchFromGitHub {
+ owner = "nilzen";
+ repo = "xbmc-" + plugin;
+ rev = "4f27254edbd6dc48350152832833c5b164ca58de";
+ sha256 = "11r8vljpx9fxwdx20cvkb5szlaypfrn6c235jwcg61s4hmjy4kl8";
+ };
+
+ meta = with stdenv.lib; {
+ homepage = "http://forum.xbmc.org/showthread.php?tid=67110";
+ description = "Watch content from SVT Play";
+ longDescription = ''
+ With this addon you can stream content from SVT Play
+ (svtplay.se). The plugin fetches the video URL from the SVT
+ Play website and feeds it to the XBMC video player. HLS (m3u8)
+ is the preferred video format by the plugin.
+ '';
+ platforms = platforms.all;
+ maintainers = with maintainers; [ edwtjo ];
+ };
+
+ };
+
+}
\ No newline at end of file
diff --git a/pkgs/applications/video/xbmc/wrapper.nix b/pkgs/applications/video/xbmc/wrapper.nix
new file mode 100644
index 00000000000..b1017c7098c
--- /dev/null
+++ b/pkgs/applications/video/xbmc/wrapper.nix
@@ -0,0 +1,46 @@
+{ stdenv, lib, makeWrapper, xbmc, plugins }:
+
+let
+
+ p = builtins.parseDrvName xbmc.name;
+
+in
+
+stdenv.mkDerivation {
+
+ name = "xbmc-" + p.version;
+ version = p.version;
+
+ buildInputs = [ makeWrapper ];
+
+ buildCommand = ''
+ mkdir -p $out/share/xbmc/addons/packages
+ ${stdenv.lib.concatMapStrings
+ (plugin: "ln -s ${plugin.out
+ + plugin.xbmcPlugin
+ + "/" + plugin.namespace
+ } $out/share/xbmc/addons/.;") plugins}
+ $(for plugin in ${xbmc}/share/xbmc/addons/*
+ do
+ $(ln -s $plugin/ $out/share/xbmc/addons/.)
+ done)
+ $(for share in ${xbmc}/share/xbmc/*
+ do
+ $(ln -s $share $out/share/xbmc/.)
+ done)
+ makeWrapper ${xbmc}/bin/xbmc $out/bin/xbmc \
+ --prefix XBMC_HOME : $out/share/xbmc;
+ '';
+
+ preferLocalBuilds = true;
+
+ meta = with xbmc.meta; {
+ inherit license homepage;
+ description = description
+ + " (with plugins: "
+ + lib.concatStrings (lib.intersperse ", " (map (x: ""+x.name) plugins))
+ + ")";
+
+ };
+
+}
\ No newline at end of file
diff --git a/pkgs/applications/video/xvidcap/default.nix b/pkgs/applications/video/xvidcap/default.nix
index 83b5c778f86..ade840dc021 100644
--- a/pkgs/applications/video/xvidcap/default.nix
+++ b/pkgs/applications/video/xvidcap/default.nix
@@ -1,5 +1,6 @@
{ stdenv, fetchurl, perl, perlXMLParser, pkgconfig, gtk
-, scrollkeeper, libglade, libXmu, libX11, libXext, gettext, lame, libXfixes, libXdamage}:
+, scrollkeeper, libglade, libXmu, libX11, libXext, gettext
+, lame, libXfixes, libXdamage }:
stdenv.mkDerivation {
name = "xvidcap-1.1.7";
@@ -10,14 +11,18 @@ stdenv.mkDerivation {
};
patches = [ ./xlib.patch ];
- buildInputs = [perl perlXMLParser pkgconfig gtk scrollkeeper libglade libXmu gettext lame libXdamage libXfixes libXext libX11];
+ buildInputs = [
+ perl perlXMLParser pkgconfig gtk scrollkeeper
+ libglade libXmu gettext lame libXdamage libXfixes libXext libX11
+ ];
# !!! don't know why this is necessary
NIX_LDFLAGS = "-lXext -lX11 -lz -lgcc_s";
- meta = {
+ meta = with stdenv.lib; {
description = "screencast video catpuring tool";
homepage = http://xvidcap.sourceforge.net/;
license = stdenv.lib.licenses.gpl2;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/virtualization/8086tiny/default.nix b/pkgs/applications/virtualization/8086tiny/default.nix
index a16f052f622..15d98dc9be5 100644
--- a/pkgs/applications/virtualization/8086tiny/default.nix
+++ b/pkgs/applications/virtualization/8086tiny/default.nix
@@ -1,7 +1,6 @@
{ stdenv, fetchurl
, localBios ? true, nasm ? null
-, sdlSupport ? true, SDL ? null
-}:
+, sdlSupport ? true, SDL ? null }:
assert sdlSupport -> (SDL != null);
diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix
index 74ce7bdfcaa..a3e7a5b2994 100644
--- a/pkgs/applications/virtualization/bochs/default.nix
+++ b/pkgs/applications/virtualization/bochs/default.nix
@@ -1,15 +1,17 @@
-{ stdenv, fetchurl
-, pkgconfig, gtk
-, libX11 , mesa
+{ stdenv, fetchurl, config
+, pkgconfig, libtool
+, gtk, mesa, readline, libX11, libXpm
+, docbook_xml_dtd_45, docbook_xsl
, sdlSupport ? true, SDL ? null
-, termSupport ? true , ncurses ? null, readline ? null
-, wxSupport ? false, wxGTK ? null
+, termSupport ? true , ncurses ? null
+, wxSupport ? false, wxGTK ? null # Warning! Broken
+# Optional, undocumented dependencies
, wgetSupport ? false, wget ? null
, curlSupport ? false, curl ? null
}:
assert sdlSupport -> (SDL != null);
-assert termSupport -> (ncurses != null&& readline != null);
+assert termSupport -> (ncurses != null);
assert wxSupport -> (gtk != null && wxGTK != null);
assert wgetSupport -> (wget != null);
assert curlSupport -> (curl != null);
@@ -24,43 +26,141 @@ stdenv.mkDerivation rec {
sha256 = "0nlrl218x93vz97n46aw2szsalx97r020mn43fjsif100v7zix6f";
};
+ # The huge list of configurable options
+ # Blatantly based on ffmpeg expressions
+
+ termSupport = config.bochs.termSupport or true;
+ sdlSupport = config.bochs.sdlSupport or true;
+ wxSupport = config.bochs.wxSupport or false;
+ largefile = config.bochs.largefile or true;
+ idleHack = config.bochs.idleHack or true;
+ plugins = config.bochs.plugins or false; # Warning! Broken
+ a20Pin = config.bochs.a20Pin or true;
+ emulate64Bits = config.bochs.emulate64Bits or false;
+ smp = config.bochs.smp or false;
+ largeRamfile = config.bochs.largeRamfile or true;
+ repeatSpeedups = config.bochs.repeatSpeedups or false;
+ handlersChaining = config.bochs.handlersChaining or false;
+ traceLinking = config.bochs.traceLinking or false;
+ configurableMSRegs = config.bochs.configurableMSRegs or false;
+ showIPS = config.bochs.showIPS or true;
+ debugger = config.bochs.debugger or false;
+ disasm = config.bochs.disasm or false;
+ debuggerGui = config.bochs.debuggerGui or false;
+ gdbStub = config.bochs.gdbStub or false;
+ IODebug = config.Bochs.IODebug or false;
+ fpu = config.bochs.fpu or true;
+ svm = config.bochs.svm or false;
+ avx = config.bochs.avx or false;
+ evex = config.bochs.evex or false;
+ x86Debugger = config.bochs.x86Debugger or false;
+ pci = config.bochs.pci or true;
+ uhci = config.bochs.uhci or false;
+ ohci = config.bochs.ohci or false;
+ ne2k = config.bochs.ne2k or true;
+ pNIC = config.bochs.pNIC or true;
+ e1000 = config.bochs.e1000 or true;
+ clgd54xx = config.bochs.clgd54xx or true;
+ voodoo = config.bochs.voodoo or true;
+ cdrom = config.bochs.cdrom or true;
+ sb16 = config.bochs.sb16 or true;
+ es1370 = config.bochs.es1370 or true;
+ gameport = config.bochs.gameport or true;
+ busMouse = config.bochs.busMouse or false;
+
buildInputs = with stdenv.lib;
- [ pkgconfig gtk libX11 mesa ]
+ [ pkgconfig libtool gtk mesa readline libX11 libXpm docbook_xml_dtd_45 docbook_xsl ]
+ ++ optionals termSupport [ ncurses ]
++ optionals sdlSupport [ SDL ]
- ++ optionals termSupport [ readline ncurses ]
++ optionals wxSupport [ wxGTK ]
++ optionals wgetSupport [ wget ]
++ optionals curlSupport [ curl ];
- configureFlags = ''
- --with-x11
- --with-term=${if termSupport then "yes" else "no"}
- --with-sdl=${if sdlSupport then "yes" else "no"}
- --with-svga=no
- --with-wx=${if wxSupport then "yes" else "no"}
- --enable-readline
- --enable-plugins=no
- --enable-disasm
- --enable-debugger
- --enable-ne2000
- --enable-e1000
- --enable-sb16
- --enable-voodoo
- --enable-usb
- --enable-pnic
-'';
+ configureFlags = [
+ "--with-x=yes"
+ "--with-x11=yes"
- NIX_CFLAGS_COMPILE="-I${gtk}/include/gtk-2.0/";
+ "--with-rfb=no"
+ "--with-vncsrv=no"
+ "--with-svga=no" # it doesn't compile on NixOS
+ "--with-wx=no"
+
+ # These will always be "yes" on NixOS
+ "--enable-ltdl-install=yes"
+ "--enable-readline=yes"
+ "--enable-all-optimizations=yes"
+ "--enable-logging=yes"
+ "--enable-xpm=yes"
+
+ # ... whereas these, always "no"!
+ "--enable-cpp=no"
+ "--enable-instrumentation=no"
+
+ "--enable-docbook=no" # Broken - it requires docbook2html
+
+ # Dangerous options - they are marked as "incomplete/experimental" on Bochs documentation
+ "--enable-3dnow=no"
+ "--enable-usb-xhci=no"
+ "--enable-monitor-mwait=no"
+ "--enable-raw-serial=no" ]
+ # Boolean flags
+ ++ stdenv.lib.optional termSupport "--with-term"
+ ++ stdenv.lib.optional sdlSupport "--with-sdl"
+ ++ stdenv.lib.optional wxSupport "--with-wx"
+ ++ stdenv.lib.optional largefile "--enable-largefile"
+ ++ stdenv.lib.optional idleHack "--enable-idle-hack"
+ ++ stdenv.lib.optional plugins "--enable-plugins"
+ ++ stdenv.lib.optional a20Pin "--enable-a20-pin"
+ ++ stdenv.lib.optional emulate64Bits "--enable-x86-64"
+ ++ stdenv.lib.optional smp "--enable-smp"
+ ++ stdenv.lib.optional largeRamfile "--enable-large-ramfile"
+ ++ stdenv.lib.optional repeatSpeedups "--enable-repeat-speedups"
+ ++ stdenv.lib.optional handlersChaining "--enable-handlers-chaining"
+ ++ stdenv.lib.optional traceLinking "--enable-trace-linking"
+ ++ stdenv.lib.optional configurableMSRegs "--enable-configurable-msrs"
+ ++ stdenv.lib.optional showIPS "--enable-show-ips"
+ ++ stdenv.lib.optional debugger "--enable-debugger"
+ ++ stdenv.lib.optional disasm "--enable-disasm"
+ ++ stdenv.lib.optional debuggerGui "--enable-debugger-gui"
+ ++ stdenv.lib.optional gdbStub "--enable-gdb-stub"
+ ++ stdenv.lib.optional IODebug "--enable-iodebug"
+ ++ stdenv.lib.optional fpu "--enable-fpu"
+ ++ stdenv.lib.optional svm "--enable-svm"
+ ++ stdenv.lib.optional avx "--enable-avx"
+ ++ stdenv.lib.optional evex "--enable-evex"
+ ++ stdenv.lib.optional x86Debugger "--enable-x86-debugger"
+ ++ stdenv.lib.optional pci "--enable-pci"
+ ++ stdenv.lib.optional uhci "--enable-usb"
+ ++ stdenv.lib.optional ohci "--enable-usb-ohci"
+ ++ stdenv.lib.optional ne2k "--enable-ne2000"
+ ++ stdenv.lib.optional pNIC "--enable-pnic"
+ ++ stdenv.lib.optional e1000 "--enable-e1000"
+ ++ stdenv.lib.optional clgd54xx "--enable-clgd54xx"
+ ++ stdenv.lib.optional voodoo "--enable-voodoo"
+ ++ stdenv.lib.optional cdrom "--enable-cdrom"
+ ++ stdenv.lib.optional sb16 "--enable-sb16"
+ ++ stdenv.lib.optional es1370 "--enable-es1370"
+ ++ stdenv.lib.optional busMouse "--enable-busmouse"
+ ;
+
+ NIX_CFLAGS_COMPILE="-I${gtk}/include/gtk-2.0/ -I${libtool}/include/";
+ NIX_LDFLAGS="-L${libtool}/lib";
- meta = {
+ meta = with stdenv.lib; {
description = "An open-source IA-32 (x86) PC emulator";
longDescription = ''
- Bochs is an open-source (LGPL), highly portable IA-32 PC emulator, written in C++, that runs on most popular platforms. It includes emulation of the Intel x86 CPU, common I/O devices, and a custom BIOS.
+ Bochs is an open-source (LGPL), highly portable IA-32 PC emulator,
+ written in C++, that runs on most popular platforms. It includes
+ emulation of the Intel x86 CPU, common I/O devices, and a custom
+ BIOS.
'';
homepage = http://bochs.sourceforge.net/;
- license = stdenv.lib.licenses.lgpl2Plus;
- maintainers = [ stdenv.lib.maintainers.AndersonTorres ];
- platforms = stdenv.lib.platforms.linux;
+ license = licenses.lgpl2Plus;
+ maintainers = [ maintainers.AndersonTorres ];
+ platforms = platforms.linux;
};
}
+
# TODO: study config.bochs.* implementation (like config.ffmpeg.* options)
+# TODO: investigate the wxWidgets problem (maybe upstream devteam didn't update wxGTK GUI)
+# TODO: investigate svga support - the Bochs sources explicitly cite /usr/include/svga.h
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index f4d329221ff..dafc093bf05 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, makeWrapper, go, lxc, sqlite, iproute, bridge_utils, devicemapper,
-btrfsProgs, iptables, bash, e2fsprogs}:
+btrfsProgs, iptables, bash, e2fsprogs, xz}:
stdenv.mkDerivation rec {
name = "docker-${version}";
@@ -22,9 +22,9 @@ stdenv.mkDerivation rec {
'';
installPhase = ''
- install -Dm755 ./bundles/${version}/dynbinary/docker-${version} $out/bin/docker
- install -Dm755 ./bundles/${version}/dynbinary/dockerinit-${version} $out/bin/dockerinit
- wrapProgram $out/bin/docker --prefix PATH : "${iproute}/sbin:sbin:${lxc}/bin:${iptables}/sbin:${e2fsprogs}/sbin"
+ install -Dm755 ./bundles/${version}/dynbinary/docker-${version} $out/libexec/docker/docker
+ install -Dm755 ./bundles/${version}/dynbinary/dockerinit-${version} $out/libexec/docker/dockerinit
+ makeWrapper $out/libexec/docker/docker $out/bin/docker --prefix PATH : "${iproute}/sbin:sbin:${lxc}/bin:${iptables}/sbin:${e2fsprogs}/sbin:${xz}/bin"
# systemd
install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service
diff --git a/pkgs/applications/virtualization/nova/default.nix b/pkgs/applications/virtualization/nova/default.nix
index c1ef20b7aa0..0023cf44f33 100644
--- a/pkgs/applications/virtualization/nova/default.nix
+++ b/pkgs/applications/virtualization/nova/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
pythonPath = with pythonPackages;
[ setuptools eventlet greenlet gflags netaddr sqlalchemy carrot routes
- paste_deploy m2crypto ipy boto_1_9 twisted sqlalchemy_migrate
+ paste_deploy m2crypto ipy twisted sqlalchemy_migrate
distutils_extra simplejson readline glance cheetah lockfile httplib2
# !!! should libvirt be a build-time dependency? Note that
# libxml2Python is a dependency of libvirt.py.
diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix
index 9df6967704a..182d89e5f22 100644
--- a/pkgs/applications/virtualization/virt-manager/default.nix
+++ b/pkgs/applications/virtualization/virt-manager/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
propagatedBuildInputs =
[ eventlet greenlet gflags netaddr sqlalchemy carrot routes
- paste_deploy m2crypto ipy boto_1_9 twisted sqlalchemy_migrate
+ paste_deploy m2crypto ipy twisted sqlalchemy_migrate
distutils_extra simplejson readline glance cheetah lockfile httplib2
urlgrabber virtinst pyGtkGlade pythonDBus gnome_python pygobject3
libvirt libxml2Python ipaddr vte
@@ -34,6 +34,7 @@ buildPythonPackage rec {
avahi
glib
gobjectIntrospection
+ gsettings_desktop_schemas
];
configurePhase = ''
@@ -51,8 +52,7 @@ buildPythonPackage rec {
--prefix GI_TYPELIB_PATH : $GI_TYPELIB_PATH \
--prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" \
--prefix GSETTINGS_SCHEMA_DIR : $out/share/glib-2.0/schemas \
- --prefix LD_LIBRARY_PATH : ${gtk3}/lib/:${libvirt-glib}/lib/:${vte}/lib:${gtkvnc}/lib${optionalString spiceSupport ":${spice_gtk}/lib"} \
- --prefix XDG_DATA_DIRS : "$out/share:${gsettings_desktop_schemas}/share:${gtk3}/share:$GSETTINGS_SCHEMAS_PATH:\$XDG_DATA_DIRS"
+ --prefix XDG_DATA_DIRS : "$out/share:${gtk3}/share:$GSETTINGS_SCHEMAS_PATH:\$XDG_DATA_DIRS"
done
${glib}/bin/glib-compile-schemas "$out"/share/glib-2.0/schemas
diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix
index a5d7c775412..1da4a521da7 100644
--- a/pkgs/applications/virtualization/virt-viewer/default.nix
+++ b/pkgs/applications/virtualization/virt-viewer/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
meta = {
description = "A viewer for remote virtual machines";
- maintainers = maintainers.raskin;
+ maintainers = [ maintainers.raskin ];
platforms = platforms.linux;
license = licenses.gpl2;
};
diff --git a/pkgs/applications/virtualization/virtinst/default.nix b/pkgs/applications/virtualization/virtinst/default.nix
index 8e2da5c3b76..6441bb88423 100644
--- a/pkgs/applications/virtualization/virtinst/default.nix
+++ b/pkgs/applications/virtualization/virtinst/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pythonPackages, intltool, libvirt, libxml2Python, curl }:
+{ stdenv, fetchurl, pythonPackages, intltool, libxml2Python, curl }:
with stdenv.lib;
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
pythonPath = with pythonPackages;
[ setuptools eventlet greenlet gflags netaddr sqlalchemy carrot routes
- paste_deploy m2crypto ipy boto_1_9 twisted sqlalchemy_migrate
+ paste_deploy m2crypto ipy twisted sqlalchemy_migrate
distutils_extra simplejson readline glance cheetah lockfile httplib2
# !!! should libvirt be a build-time dependency? Note that
# libxml2Python is a dependency of libvirt.py.
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 682e7159ac8..309cfe1f35a 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -11,7 +11,7 @@ with stdenv.lib;
let
- version = "4.3.12"; # changes ./guest-additions as well
+ version = "4.3.16"; # changes ./guest-additions as well
forEachModule = action: ''
for mod in \
@@ -31,13 +31,13 @@ let
'';
# See https://github.com/NixOS/nixpkgs/issues/672 for details
- extpackRevision = "93733";
+ extpackRevision = "95972";
extensionPack = requireFile rec {
name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}.vbox-extpack";
# IMPORTANT: Hash must be base16 encoded because it's used as an input to
# VBoxExtPackHelperApp!
# Tip: see http://dlc.sun.com.edgesuite.net/virtualbox/4.3.10/SHA256SUMS
- sha256 = "f931ce41b2cc9500dc43aba004630cf7bb7050ba737eae38827e91062f072d1f";
+ sha256 = "93b01ac2c575388ea6ae994450907c24e30a788c271ae9ff18512a06f28d9abd";
message = ''
In order to use the extension pack, you need to comply with the VirtualBox Personal Use
and Evaluation License (PUEL) by downloading the related binaries from:
@@ -56,7 +56,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
- sha256 = "db84ddf47d1ecd316ec46417595f0252e3ec2f67e35e1e17320aba87b7c2934f";
+ sha256 = "99c32e646dbc93cbf4cc0b62ca6c1d24113a295fd758dc15724c14908dd6dcb3";
};
buildInputs =
@@ -76,6 +76,7 @@ in stdenv.mkDerivation {
ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2
ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2
find . -type f | xargs sed 's/depmod -a/true/' -i
+ sed -e 's@"libasound.so.2"@"${alsaLib}/lib/libasound.so.2"@g' -i src/VBox/Main/xml/Settings.cpp src/VBox/Devices/Audio/alsa_stubs.c
export USER=nix
set +x
'';
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index f168c0d5725..9552e7264c5 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
- sha256 = "c76dd5ec86f61ad72263ab6d2405723b06badfc2fae57f83ffa5de96f553400d";
+ sha256 = "d58f678613bd37f5f94bcf324708af63572fc8582833a2558574090231fd080f";
};
KERN_DIR = "${kernel.dev}/lib/modules/*/build";
diff --git a/pkgs/applications/virtualization/xen/default.nix b/pkgs/applications/virtualization/xen/default.nix
index 55ef8390148..8d236c52a0b 100644
--- a/pkgs/applications/virtualization/xen/default.nix
+++ b/pkgs/applications/virtualization/xen/default.nix
@@ -136,6 +136,6 @@ stdenv.mkDerivation {
description = "Xen hypervisor and management tools for Dom0";
platforms = [ "i686-linux" "x86_64-linux" ];
maintainers = [ stdenv.lib.maintainers.eelco ];
- broken = true;
+ broken = true; # bump to at least 4.1.6.1 to fix security issues
};
}
diff --git a/pkgs/applications/window-managers/afterstep/default.nix b/pkgs/applications/window-managers/afterstep/default.nix
new file mode 100644
index 00000000000..962942905db
--- /dev/null
+++ b/pkgs/applications/window-managers/afterstep/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchurl, pkgconfig
+, libjpeg, libtiff, libpng, freetype
+, fltk, gtk
+, libX11, libXext, libICE
+, dbus, dbus_libs
+}:
+
+stdenv.mkDerivation rec {
+
+ name = "afterstep-${version}";
+ version = "2.2.12";
+ sourceName = "AfterStep-${version}";
+
+ src = fetchurl {
+ urls = [ "ftp://ftp.afterstep.org/stable/${sourceName}.tar.bz2" ];
+ sha256 = "1j7vkx1ig4kzwffdxnkqv3kld9qi3sam4w2nhq18waqjsi8xl5gz";
+ };
+
+ buildInputs = [ pkgconfig libjpeg libtiff libpng freetype fltk gtk libX11 libXext libICE dbus dbus_libs ];
+
+ # A strange type of bug: dbus is not immediately found by pkgconfig
+ preConfigure = ''
+ export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config dbus-1 --cflags)"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A NEXTStep-inspired window manager";
+ longDescription = ''
+ AfterStep is a window manager for the Unix X Window
+ System. Originally based on the look and feel of the NeXTStep
+ interface, it provides end users with a consistent, clean, and
+ elegant desktop. The goal of AfterStep development is to provide
+ for flexibility of desktop configuration, improving aestetics,
+ and efficient use of system resources.
+ '';
+ homepage = http://www.afterstep.org/;
+ license = licenses.gpl2;
+ maintainers = [ maintainers.AndersonTorres ];
+ platforms = platforms.linux;
+ };
+
+}
diff --git a/pkgs/applications/window-managers/bar/default.nix b/pkgs/applications/window-managers/bar/default.nix
index bee774d10da..46a19b90b8b 100644
--- a/pkgs/applications/window-managers/bar/default.nix
+++ b/pkgs/applications/window-managers/bar/default.nix
@@ -17,8 +17,8 @@ in
meta = {
description = "A lightweight xcb based bar";
- homepage = "https://github.com/LemonBoy/bar";
- maintainers = stdenv.lib.maintainers.meisternu;
+ homepage = https://github.com/LemonBoy/bar;
+ maintainers = [ stdenv.lib.maintainers.meisternu ];
license = "Custom";
platforms = stdenv.lib.platforms.linux;
};
diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/applications/window-managers/bspwm/default.nix
index 24789f37ba7..0b36d922df4 100644
--- a/pkgs/applications/window-managers/bspwm/default.nix
+++ b/pkgs/applications/window-managers/bspwm/default.nix
@@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
meta = {
description = "A tiling window manager based on binary space partitioning";
- homepage = "http://github.com/baskerville/bspwm";
- maintainers = stdenv.lib.maintainers.meisternu;
+ homepage = http://github.com/baskerville/bspwm;
+ maintainers = [ stdenv.lib.maintainers.meisternu ];
license = "BSD";
platforms = stdenv.lib.platforms.linux;
};
diff --git a/pkgs/applications/window-managers/fluxbox/default.nix b/pkgs/applications/window-managers/fluxbox/default.nix
index af6545b6151..b46864b9c2e 100644
--- a/pkgs/applications/window-managers/fluxbox/default.nix
+++ b/pkgs/applications/window-managers/fluxbox/default.nix
@@ -2,8 +2,7 @@
, freetype, fribidi
, libXext, libXft, libXpm, libXrandr, libXrender, xextproto
, libXinerama
-, imlib2
-}:
+, imlib2 }:
stdenv.mkDerivation rec {
@@ -17,17 +16,19 @@ stdenv.mkDerivation rec {
sha256 = "164dd7bf59791d09a1e729a4fcd5e7347a1004ba675629860a5cf1a271c32983";
};
- meta = {
+ meta = with stdenv.lib; {
description = "Full-featured, light-resource X window manager";
longDescription = ''
- Fluxbox is a X window manager based on Blackbox 0.61.1 window manager sources.
- It is very light on resources and easy to handle but yet full of features to make an easy,
- and extremely fast, desktop experience. It is written in C++ and licensed under MIT license.
+ Fluxbox is a X window manager based on Blackbox 0.61.1 window
+ manager sources. It is very light on resources and easy to
+ handle but yet full of features to make an easy, and extremely
+ fast, desktop experience. It is written in C++ and licensed
+ under MIT license.
'';
homepage = http://fluxbox.org/;
- license = stdenv.lib.licenses.mit;
- maintainers = [ stdenv.lib.maintainers.AndersonTorres ];
- platforms = stdenv.lib.platforms.linux;
+ license = licenses.mit;
+ maintainers = [ maintainers.AndersonTorres ];
+ platforms = platforms.linux;
};
}
# Many thanks Jack Ryan from Nix-dev mailing list!
diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix
index 3b1c3b4ad37..f3d88c55c58 100644
--- a/pkgs/applications/window-managers/icewm/default.nix
+++ b/pkgs/applications/window-managers/icewm/default.nix
@@ -2,7 +2,7 @@
, fontconfig, xlibs, automake, pkgconfig, gdk_pixbuf }:
stdenv.mkDerivation rec {
- name = "icewm-1.3.7";
+ name = "icewm-1.3.8";
buildInputs =
[ gettext libjpeg libtiff libungif libpng
@@ -13,11 +13,9 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://sourceforge/icewm/${name}.tar.gz";
- sha256 = "0yw813d8amrl0n1fvdiyznxah92wcylj9kj1qhjc6h73d827h6na";
+ sha256 = "066d1mw0vm9ygxnyxksfi6k4vzclvnlkvj04pj3kbcmv1fg8sn0p";
};
- patches = [ ./deprecated.patch ];
-
NIX_LDFLAGS = "-lfontconfig";
# The fuloong2f is not supported by 1.3.6 still
diff --git a/pkgs/applications/window-managers/icewm/deprecated.patch b/pkgs/applications/window-managers/icewm/deprecated.patch
deleted file mode 100644
index 7d22dfe719b..00000000000
--- a/pkgs/applications/window-managers/icewm/deprecated.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/x11-wm/icewm/files/icewm-1.2.37-libX11-1.5.0-deprecated.patch?revision=1.1
-
-Description: Don't use "deprecated" as identifier, will FTBFS if another
- library defines functions as deprecated.
-Author: Andreas Moog
-Bug: https://sourceforge.net/tracker/?func=detail&aid=3494034&group_id=31&atid=100031
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/935179
-Forwarded: Yes
-
---- icewm-1.3.7.orig/src/base.h
-+++ icewm-1.3.7/src/base.h
-@@ -2,9 +2,9 @@
- #define __BASE_H
-
- #if ( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3
--#define deprecated __attribute__((deprecated))
-+#define ICEWM_deprecated __attribute__((deprecated))
- #else
--#define deprecated
-+#define ICEWM_deprecated
- #endif
-
- /*** Atomar Data Types ********************************************************/
diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix
index 73c5e5df81a..f019ba9751b 100644
--- a/pkgs/applications/window-managers/jwm/default.nix
+++ b/pkgs/applications/window-managers/jwm/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
name = "jwm-2.2.2";
src = fetchurl {
- url = "http://www.joewing.net/programs/jwm/releases/${name}.tar.xz";
+ url = "http://www.joewing.net/projects/jwm/releases/${name}.tar.xz";
sha256 = "0nhyy78c6imk85d47bakk460x0cfhkyghqq82zghmb00dhwiryln";
};
diff --git a/pkgs/applications/window-managers/openbox/default.nix b/pkgs/applications/window-managers/openbox/default.nix
index fad5b8010ea..2756525b2b0 100644
--- a/pkgs/applications/window-managers/openbox/default.nix
+++ b/pkgs/applications/window-managers/openbox/default.nix
@@ -17,8 +17,16 @@ stdenv.mkDerivation rec {
sha256 = "0cxgb334zj6aszwiki9g10i56sm18i7w1kw52vdnwgzq27pv93qj";
};
+ setlayoutSrc = fetchurl {
+ url = "http://openbox.org/dist/tools/setlayout.c";
+ sha256 = "1ci9lq4qqhl31yz1jwwjiawah0f7x0vx44ap8baw7r6rdi00pyiv";
+ };
+
+ postBuild = "gcc -O2 -o setlayout $(pkg-config --cflags --libs x11) $setlayoutSrc";
+
# Openbox needs XDG_DATA_DIRS set or it can't find its default theme
postInstall = ''
+ cp -a setlayout "$out"/bin
wrapProgram "$out/bin/openbox" --prefix XDG_DATA_DIRS : "$out/share"
wrapProgram "$out/bin/openbox-session" --prefix XDG_DATA_DIRS : "$out/share"
wrapProgram "$out/bin/openbox-gnome-session" --prefix XDG_DATA_DIRS : "$out/share"
diff --git a/pkgs/applications/window-managers/ratpoison/default.nix b/pkgs/applications/window-managers/ratpoison/default.nix
index 0eb28464e59..e550f9fdd83 100644
--- a/pkgs/applications/window-managers/ratpoison/default.nix
+++ b/pkgs/applications/window-managers/ratpoison/default.nix
@@ -1,32 +1,26 @@
-{ stdenv, fetchurl, libX11, inputproto, libXt, libXpm, libXft, fontconfig, freetype
-, libXtst, xextproto, readline, libXi, pkgconfig, perl, autoconf, automake }:
+{ stdenv, fetchurl, pkgconfig, perl, autoconf, automake
+, libX11, inputproto, libXt, libXpm, libXft, libXtst, xextproto, libXi
+, fontconfig, freetype, readline
+}:
stdenv.mkDerivation rec {
- name = "ratpoison-1.4.6";
+ name = "ratpoison-${version}";
+ version = "1.4.8";
src = fetchurl {
- url = "mirror://savannah/ratpoison/${name}.tar.gz";
- sha256 = "1y1b38bng0naxfy50asshzg5xr1b2rn88mcgbds42y72d7y9d0za";
+ url = "mirror://savannah/ratpoison/${name}.tar.xz";
+ sha256 = "1w502z55vv7zs45l80nsllqh9fvfwjfdfi11xy1qikhzdmirains";
};
buildInputs =
- [ libX11 inputproto libXt libXpm libXft fontconfig freetype libXtst
- xextproto readline libXi pkgconfig perl autoconf automake
- ];
+ [ pkgconfig perl autoconf automake
+ libX11 inputproto libXt libXpm libXft libXtst xextproto libXi
+ fontconfig freetype readline ];
- NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2"; # urgh
-
- preConfigure = "autoreconf -vf"; # needed because of the patch above
-
- postInstall = ''
- mkdir -p $out/share/emacs/site-lisp
- mv "$out/share/ratpoison/"*.el $out/share/emacs/site-lisp/
- '';
-
- meta = {
+ meta = with stdenv.lib; {
homepage = "http://www.nongnu.org/ratpoison/";
description = "Simple mouse-free tiling window manager";
- license = stdenv.lib.licenses.gpl2Plus;
+ license = licenses.gpl2Plus;
longDescription = ''
Ratpoison is a simple window manager with no fat library
@@ -43,7 +37,7 @@ stdenv.mkDerivation rec {
cripples Emacs and other quality pieces of software.
'';
- hydraPlatforms = stdenv.lib.platforms.linux;
- maintainers = [ ];
+ platforms = platforms.linux;
+ maintainers = [ maintainers.AndersonTorres ];
};
}
diff --git a/pkgs/applications/window-managers/trayer/default.nix b/pkgs/applications/window-managers/trayer/default.nix
index 43a1d2b8e79..b7f1d9adad1 100644
--- a/pkgs/applications/window-managers/trayer/default.nix
+++ b/pkgs/applications/window-managers/trayer/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
license = licenses.mit;
description = "A lightweight GTK2-based systray for UNIX desktop";
platforms = platforms.linux;
- maintainer = with maintainers; [ pSub ];
+ maintainers = with maintainers; [ pSub ];
};
}
diff --git a/pkgs/applications/window-managers/windowmaker/default.nix b/pkgs/applications/window-managers/windowmaker/default.nix
index bbb6c038825..85663ff3bf5 100644
--- a/pkgs/applications/window-managers/windowmaker/default.nix
+++ b/pkgs/applications/window-managers/windowmaker/default.nix
@@ -2,19 +2,28 @@
stdenv.mkDerivation rec {
name = "windowmaker-${version}";
- version = "0.95.5";
+ version = "0.95.6";
+ srcName = "WindowMaker-${version}";
src = fetchurl {
- url = "http://windowmaker.org/pub/source/release/"
- + "WindowMaker-${version}.tar.gz";
- sha256 = "1l3hmx4jzf6vp0zclqx9gsqrlwh4rvqm1g1zr5ha0cp0zmsg89ab";
+ url = "http://windowmaker.org/pub/source/release/${srcName}.tar.gz";
+ sha256 = "1i3dw1yagsa3rs9x2na2ynqlgmbahayws0kz4vl00fla6550nns3";
};
buildInputs = [ pkgconfig libX11 libXft libXmu ];
- meta = {
- homepage = "http://windowmaker.org/";
+ meta = with stdenv.lib; {
+ homepage = http://windowmaker.org/;
description = "NeXTSTEP-like window manager";
- license = stdenv.lib.licenses.gpl2Plus;
+ longDescription = ''
+ Window Maker is an X11 window manager originally designed to
+ provide integration support for the GNUstep Desktop
+ Environment. In every way possible, it reproduces the elegant look
+ and feel of the NEXTSTEP user interface. It is fast, feature rich,
+ easy to configure, and easy to use. It is also free software, with
+ contributions being made by programmers from around the world.
+ '';
+ license = licenses.gpl2Plus;
+ maintainers = [ maintainers.AndersonTorres ];
};
}
diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix
new file mode 100644
index 00000000000..f8130b423a2
--- /dev/null
+++ b/pkgs/build-support/agda/default.nix
@@ -0,0 +1,95 @@
+# Builder for Agda packages. Mostly inspired by the cabal builder.
+#
+# Contact: stdenv.lib.maintainers.fuuzetsu
+
+{ stdenv, Agda, glibcLocales
+, writeScriptBin
+, extension ? (self: super: {})
+}:
+
+let
+ optionalString = stdenv.lib.optionalString;
+ filter = stdenv.lib.filter;
+ concatMapStringsSep = stdenv.lib.strings.concatMapStringsSep;
+ concatMapStrings = stdenv.lib.strings.concatMapStrings;
+ unwords = stdenv.lib.strings.concatStringsSep " ";
+ mapInside = xs: unwords (map (x: x + "/*") xs);
+in
+{ mkDerivation = args:
+ let
+ postprocess = x: x // {
+ sourceDirectories = filter (y: !(y == null)) x.sourceDirectories;
+ propagatedBuildInputs = filter (y : ! (y == null)) x.propagatedBuildInputs;
+ propagatedUserEnvPkgs = filter (y : ! (y == null)) x.propagatedUserEnvPkgs;
+ extraBuildFlags = filter (y : ! (y == null)) x.extraBuildFlags;
+ everythingFile = if x.everythingFile == "" then "Everything.agda" else x.everythingFile;
+ };
+
+ defaults = self : {
+ # There is no Hackage for Agda so we require src.
+ inherit (self) src name;
+
+ buildInputs = [ Agda ] ++ self.buildDepends;
+ buildDepends = [];
+ # Not much choice here ;)
+ LANG = "en_US.UTF-8";
+ LOCALE_ARCHIVE = optionalString stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive";
+
+ everythingFile = "Everything.agda";
+
+ propagatedBuildInputs = self.buildDepends ++ self.buildTools;
+ propagatedUserEnvPkgs = self.buildDepends;
+
+ # Immediate source directories under which modules can be found.
+ sourceDirectories = [ ];
+
+ # This is used if we have a top-level element that only serves
+ # as the container for the source and we only care about its
+ # contents. The directories put here will have their
+ # *contents* copied over as opposed to sourceDirectories which
+ # would make a direct copy of the whole thing.
+ topSourceDirectories = [ "src" ];
+
+ buildTools = [];
+
+ # Extra stuff to pass to the Agda binary.
+ extraBuildFlags = [ "-i ." ];
+ buildFlags = let r = map (x: "-i " + x + "/share/agda") self.buildDepends;
+ d = map (x : "-i " + x) (self.sourceDirectories ++ self.topSourceDirectories);
+ in unwords (r ++ d ++ self.extraBuildFlags);
+
+ # We expose this as a mere convenience for any tools.
+ AGDA_PACKAGE_PATH = concatMapStrings (x: x + ":") self.buildDepends;
+
+ # Makes a wrapper available to the user. Very useful in
+ # nix-shell where all dependencies are -i'd.
+ agdaWrapper = writeScriptBin "agda" ''
+ ${Agda}/bin/agda ${self.buildFlags} "$@"
+ '';
+
+ # configurePhase is idempotent
+ configurePhase = ''
+ eval "$preConfigure"
+ export AGDA_PACKAGE_PATH=${self.AGDA_PACKAGE_PATH};
+ export PATH="${self.agdaWrapper}/bin:$PATH"
+ eval "$postConfigure"
+ '';
+
+ buildPhase = ''
+ eval "$preBuild"
+ ${Agda}/bin/agda ${self.buildFlags} ${self.everythingFile}
+ eval "$postBuild"
+ '';
+
+ installPhase = ''
+ eval "$preInstall"
+ mkdir -p $out/share/agda
+ cp -pR ${unwords self.sourceDirectories} ${mapInside self.topSourceDirectories} $out/share/agda
+ eval "$postInstall"
+ '';
+ };
+ in stdenv.mkDerivation
+ (postprocess (let super = defaults self // args self;
+ self = super // extension self super;
+ in self));
+}
\ No newline at end of file
diff --git a/pkgs/build-support/build-fhs-chrootenv/default.nix b/pkgs/build-support/build-fhs-chrootenv/default.nix
index e807a04628a..89dd2faf3ba 100644
--- a/pkgs/build-support/build-fhs-chrootenv/default.nix
+++ b/pkgs/build-support/build-fhs-chrootenv/default.nix
@@ -1,16 +1,77 @@
-{stdenv, glibc, glibcLocales, gcc, coreutils, diffutils, findutils, gnused, gnugrep, gnutar, gzip, bzip2,
-bashInteractive, xz, shadow, gawk, less, buildEnv}:
-{name, pkgs ? [], profile ? ""}:
+{ buildEnv, nixpkgs, nixpkgs_i686, system
+, stdenv, glibc, glibc_multi, glibcLocales
+, bashInteractive, coreutils, less, shadow, su
+, gawk, gcc, gcc_multi, diffutils, findutils, gnused, gnugrep
+, gnutar, gzip, bzip2, xz
+} :
+{ name, pkgs ? [], profile ? ""
+, targetPkgs ? null, multiPkgs ? null
+, extraBuildCommands ? "", extraBuildCommandsMulti ? ""
+}:
+
+assert pkgs != [] -> targetPkgs == null && multiPkgs == null;
+assert targetPkgs != null -> multiPkgs != null;
+assert multiPkgs != null -> targetPkgs != null;
+assert targetPkgs != null -> pkgs == [];
+
+
+# HOWTO:
+# If pkgs is defined buildFHSChrootEnv will run in legacy mode. This means
+# it will build all pkgs contained in pkgs and basePkgs and then just merge
+# all of their contents together via buildEnv.
+#
+# The new way is to define both targetPkgs and multiPkgs. These two are
+# functions which get a pkgs environment supplied and should then return a list
+# of packages based this environment.
+# For example: targetPkgs = pkgs: [ pkgs.nmap ];
+#
+# All packages (most likeley programs) placed in targetPkgs will only be
+# installed once--matching the hosts architecture (64bit on x86_64 and 32bit on
+# x86). These packages will populate the chroot directory tree.
+#
+# Packages (most likeley libraries) defined in multiPkgs will be installed once
+# on x86 systems and twice on x86_64 systems.
+# On x86 they will just be merge with the packages defined in targetPkgs.
+# On x86_64 they will be added to targetPkgs and in addition their 32bit
+# versions will also be installed. The final directory should look as follows:
+# /lib will include 32bit libraries from multiPkgs
+# /lib32 will link to /lib
+# /lib64 will include 64bit libraries from multiPkgs and targetPkgs
+# /x86 will contain a complete 32bit environment composed by multiPkgs
let
- basePkgs = [
- glibc glibcLocales gcc coreutils diffutils findutils gnused gnugrep gnutar
- gzip bzip2 bashInteractive xz shadow gawk less
- ];
+ is64Bit = system == "x86_64-linux";
+ # enable multi builds on x86_64 hosts if pakgs_target/multi are defined
+ isMultiBuild = is64Bit && targetPkgs != null;
+ isTargetBuild = !isMultiBuild;
+
+ # list of packages (usually programs) which will only be installed for the
+ # hosts architecture
+ targetPaths = if targetPkgs == null
+ then pkgs
+ else targetPkgs nixpkgs ++ multiPkgs nixpkgs;
+
+ # list of pckages which should be build for both x86 and x86_64 on x86_64
+ # systems
+ multiPaths = if isMultiBuild
+ then multiPkgs nixpkgs_i686
+ else [];
+
+ # base packages of the chroot
+ # these match the hosts architecture, gcc/glibc_multi will be choosen
+ # on multi builds
+ choosenGcc = if isMultiBuild then gcc_multi else gcc;
+ basePkgs =
+ [ (if isMultiBuild then glibc_multi else glibc)
+ choosenGcc
+ bashInteractive coreutils less shadow su
+ gawk diffutils findutils gnused gnugrep
+ gnutar gzip bzip2 xz
+ ];
# Compose a global profile for the chroot environment
- profilePkg = stdenv.mkDerivation {
- name = "${name}-chrootenv-profile";
+ profilePkg = nixpkgs.stdenv.mkDerivation {
+ name = "${name}-chrootenv-profile";
buildCommand = ''
mkdir -p $out/etc
cat >> $out/etc/profile << "EOF"
@@ -20,67 +81,139 @@ let
'';
};
- paths = basePkgs ++ [ profilePkg ] ++ pkgs;
-
# Composes a /usr like directory structure
- staticUsrProfile = buildEnv {
- name = "system-profile";
- inherit paths;
+ staticUsrProfileTarget = buildEnv {
+ name = "system-profile-target";
+ paths = basePkgs ++ [ profilePkg ] ++ targetPaths;
};
-
+
+ staticUsrProfileMulti = buildEnv {
+ name = "system-profile-multi";
+ paths = multiPaths;
+ };
+
# References to shell scripts that set up or tear down the environment
- initSh = ./init.sh.in;
- mountSh = ./mount.sh.in;
- loadSh = ./load.sh.in;
- umountSh = ./umount.sh.in;
+ initSh = ./init.sh.in;
+ mountSh = ./mount.sh.in;
+ loadSh = ./load.sh.in;
+ umountSh = ./umount.sh.in;
destroySh = ./destroy.sh.in;
-in
-stdenv.mkDerivation {
- name = "${name}-chrootenv";
- buildCommand = ''
- mkdir -p $out/sw
- cd $out/sw
-
- for i in ${staticUsrProfile}/{etc,bin,lib{,32,64},sbin,var}
- do
+
+ linkProfile = profile: ''
+ for i in ${profile}/{etc,bin,sbin,share,var}; do
if [ -x "$i" ]
then
ln -s "$i"
fi
done
-
- ln -s ${staticUsrProfile} usr
-
+ '';
+
+ # the target profile is the actual profile that will be used for the chroot
+ setupTargetProfile = ''
+ ${linkProfile staticUsrProfileTarget}
+ ${setupLibDirs}
+
+ mkdir -m0755 usr
+ cd usr
+ ${linkProfile staticUsrProfileTarget}
+ ${setupLibDirs}
cd ..
-
+ '';
+
+ # this will happen on x86_64 host:
+ # /x86 -> links to the whole profile defined by multiPaths
+ # /lib, /lib32 -> links to 32bit binaries
+ # /lib64 -> links to 64bit binaries
+ # /usr/lib* -> same as above
+ setupMultiProfile = if isTargetBuild then "" else ''
+ mkdir -m0755 x86
+ cd x86
+ ${linkProfile staticUsrProfileMulti}
+ cd ..
+ '';
+
+ setupLibDirs = if isTargetBuild then setupLibDirs_target
+ else setupLibDirs_multi;
+
+ # setup library paths only for the targeted architecture
+ setupLibDirs_target = ''
+ mkdir -m0755 lib
+
+ # copy content of targetPaths
+ cp -rsf ${staticUsrProfileTarget}/lib/* lib/
+ '';
+
+ # setup /lib, /lib32 and /lib64
+ setupLibDirs_multi = ''
+ mkdir -m0755 lib
+ mkdir -m0755 lib64
+ ln -s lib lib32
+
+ # copy glibc stuff
+ cp -rsf ${staticUsrProfileTarget}/lib/32/* lib/
+
+ # copy content of multiPaths (32bit libs)
+ cp -rsf ${staticUsrProfileMulti}/lib/* lib/
+
+ # copy content of targetPaths (64bit libs)
+ cp -rsf ${staticUsrProfileTarget}/lib/* lib64/
+
+ # most 64bit only libs put their stuff into /lib
+ # some pkgs (like gcc_multi) put 32bit libs into and /lib 64bit libs into /lib64
+ # by overwriting these we will hopefully catch all these cases
+ # in the end /lib should only contain 32bit and /lib64 only 64bit libs
+ cp -rsf ${staticUsrProfileTarget}/lib64/* lib64/
+
+ # copy gcc libs (and may overwrite exitsting wrongly placed libs)
+ cp -rsf ${choosenGcc.gcc}/lib/* lib/
+ cp -rsf ${choosenGcc.gcc}/lib64/* lib64/
+ '';
+
+in stdenv.mkDerivation {
+ name = "${name}-chrootenv";
+ buildCommand = ''
+ mkdir -p "$out/sw"
+ cd "$out/sw"
+ ${setupTargetProfile}
+ ${setupMultiProfile}
+ cd ..
+
mkdir -p bin
cd bin
-
+
sed -e "s|@chrootEnv@|$out|g" \
-e "s|@name@|${name}|g" \
-e "s|@shell@|${stdenv.shell}|g" \
${initSh} > init-${name}-chrootenv
chmod +x init-${name}-chrootenv
-
+
sed -e "s|@shell@|${stdenv.shell}|g" \
-e "s|@name@|${name}|g" \
${mountSh} > mount-${name}-chrootenv
chmod +x mount-${name}-chrootenv
-
+
sed -e "s|@shell@|${stdenv.shell}|g" \
-e "s|@name@|${name}|g" \
${loadSh} > load-${name}-chrootenv
chmod +x load-${name}-chrootenv
-
+
sed -e "s|@shell@|${stdenv.shell}|g" \
-e "s|@name@|${name}|g" \
${umountSh} > umount-${name}-chrootenv
chmod +x umount-${name}-chrootenv
-
+
sed -e "s|@chrootEnv@|$out|g" \
-e "s|@shell@|${stdenv.shell}|g" \
-e "s|@name@|${name}|g" \
${destroySh} > destroy-${name}-chrootenv
chmod +x destroy-${name}-chrootenv
+
+ cd ..
+
+ cd "$out/sw"
+ ${extraBuildCommands}
+ cd "$out/sw"
+ ${if isMultiBuild then extraBuildCommandsMulti else ""}
+ cd ..
'';
}
diff --git a/pkgs/build-support/build-fhs-chrootenv/destroy.sh.in b/pkgs/build-support/build-fhs-chrootenv/destroy.sh.in
index 30b51cb5068..8ddf350913e 100644
--- a/pkgs/build-support/build-fhs-chrootenv/destroy.sh.in
+++ b/pkgs/build-support/build-fhs-chrootenv/destroy.sh.in
@@ -3,7 +3,7 @@
chrootenvDest=/run/chrootenv/@name@
# Remove bind mount points
-rmdir $chrootenvDest/{dev,nix/store,nix,proc,sys,host-etc,home,var,run}
+rmdir $chrootenvDest/{dev,nix/store,nix,proc,sys,host-etc,home,var,run,tmp}
# Remove symlinks to the software that should be part of the chroot system profile
for i in @chrootEnv@/sw/*
@@ -15,7 +15,8 @@ do
done
# Remove the remaining folders
-rm -Rf $chrootenvDest/{etc,root,tmp}
+rm -Rf $chrootenvDest/{etc,root}
+rm -Rf /tmp/chrootenv-@name@
# Remove the chroot environment folder
rmdir $chrootenvDest
diff --git a/pkgs/build-support/build-fhs-chrootenv/init.sh.in b/pkgs/build-support/build-fhs-chrootenv/init.sh.in
index 5b0ab94bc4e..079ec09d60f 100644
--- a/pkgs/build-support/build-fhs-chrootenv/init.sh.in
+++ b/pkgs/build-support/build-fhs-chrootenv/init.sh.in
@@ -45,4 +45,5 @@ ln -s ../../../host-etc/static/fonts/conf.d/00-nixos.conf $chrootenvDest/etc/fon
mkdir $chrootenvDest/root
# Create tmp folder
-mkdir -m1777 $chrootenvDest/tmp
+mkdir -m1777 $chrootenvDest/tmp
+mkdir -m1777 -p /tmp/chrootenv-@name@
diff --git a/pkgs/build-support/build-fhs-chrootenv/mount.sh.in b/pkgs/build-support/build-fhs-chrootenv/mount.sh.in
index 225d9dbc4f7..c64f9356283 100644
--- a/pkgs/build-support/build-fhs-chrootenv/mount.sh.in
+++ b/pkgs/build-support/build-fhs-chrootenv/mount.sh.in
@@ -21,3 +21,6 @@ mount --rbind /run $chrootenvDest/run
# Bind mount the host system's /etc
mount --bind /etc $chrootenvDest/host-etc
+
+# Bind mount /tmp
+mount --bind /tmp/chrootenv-@name@ /run/chrootenv/steam/tmp
diff --git a/pkgs/build-support/build-fhs-chrootenv/umount.sh.in b/pkgs/build-support/build-fhs-chrootenv/umount.sh.in
index 5089141c0aa..b8222a4121a 100644
--- a/pkgs/build-support/build-fhs-chrootenv/umount.sh.in
+++ b/pkgs/build-support/build-fhs-chrootenv/umount.sh.in
@@ -3,4 +3,4 @@
chrootenvDest=/run/chrootenv/@name@
# Unmount all (r)bind mounts
-umount -l $chrootenvDest/{dev/pts,dev/shm,dev,nix/store,proc,sys,host-etc,home,var,run}
+umount -l $chrootenvDest/{dev/pts,dev/shm,dev,nix/store,proc,sys,host-etc,home,var,tmp,run}
diff --git a/pkgs/build-support/fetchadc/builder.sh b/pkgs/build-support/fetchadc/builder.sh
new file mode 100644
index 00000000000..ceeaa9213d6
--- /dev/null
+++ b/pkgs/build-support/fetchadc/builder.sh
@@ -0,0 +1,7 @@
+source $stdenv/setup
+
+loginpage=`curl --insecure -s -L -b cookies.txt "$url"`
+
+[[ $loginpage =~ form[^\>]+action=\"([^\"]+)\" ]] && loginurl=${BASH_REMATCH[1]}
+
+curl --insecure -s --output "$out" -L -b cookies.txt --data "appleId=${adc_user}&accountPassword=${adc_pass}" "https://idmsa.apple.com/IDMSWebAuth/${loginurl}"
diff --git a/pkgs/build-support/fetchadc/default.nix b/pkgs/build-support/fetchadc/default.nix
new file mode 100644
index 00000000000..ac7a442de31
--- /dev/null
+++ b/pkgs/build-support/fetchadc/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, curl, adc_user, adc_pass }:
+
+let
+ impureEnvVars = [
+ # We borrow these environment variables from the caller to allow
+ # easy proxy configuration. This is impure, but a fixed-output
+ # derivation like fetchurl is allowed to do so since its result is
+ # by definition pure.
+ "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy"
+ ];
+in
+
+{ # Path to fetch.
+ path
+
+ # Hash of the downloaded file
+, sha256
+
+, # Additional curl options needed for the download to succeed.
+ curlOpts ? ""
+
+, # Name of the file. If empty, use the basename of `path'.
+ name ? ""
+}:
+
+stdenv.mkDerivation {
+ url = "https://developer.apple.com/downloads/download.action?path=${path}";
+
+ name = if name != "" then name else baseNameOf path;
+ builder = ./builder.sh;
+
+ buildInputs = [ curl ];
+
+ meta = {
+ # Password-guarded files from ADC are certainly unfree, as far as we're concerned!
+ license = stdenv.lib.licenses.unfree;
+ };
+
+ outputHashAlgo = "sha256";
+ outputHash = sha256;
+ outputHashMode = "flat";
+
+ inherit curlOpts adc_user adc_pass;
+
+ preferLocalBuild = true;
+}
diff --git a/pkgs/build-support/fetchbzr/nix-prefetch-bzr b/pkgs/build-support/fetchbzr/nix-prefetch-bzr
index 346c2b05cbd..8143fca7025 100755
--- a/pkgs/build-support/fetchbzr/nix-prefetch-bzr
+++ b/pkgs/build-support/fetchbzr/nix-prefetch-bzr
@@ -43,7 +43,7 @@ fi
# If we don't know the hash or a path with that hash doesn't exist,
# download the file and add it to the store.
if test -z "$finalPath"; then
- tmpPath="$(mktemp --tmpdir -d bzr-checkout-tmp-XXXXXXXX)"
+ tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/bzr-checkout-tmp-XXXXXXXX")"
trap "rm -rf \"$tmpPath\"" EXIT
tmpFile="$tmpPath/$dstFile"
diff --git a/pkgs/build-support/fetchcvs/nix-prefetch-cvs b/pkgs/build-support/fetchcvs/nix-prefetch-cvs
index 29e0d29b52e..f9ed8ffa066 100755
--- a/pkgs/build-support/fetchcvs/nix-prefetch-cvs
+++ b/pkgs/build-support/fetchcvs/nix-prefetch-cvs
@@ -20,7 +20,7 @@ fi
mkTempDir() {
- tmpPath=$(mktemp -d -t nix-prefetch-cvs-XXXXXXXX)
+ tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/nix-prefetch-cvs-XXXXXXXX")"
trap removeTempDir EXIT SIGINT SIGQUIT
}
diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix
index a17daf9a2c5..c52a26b7165 100644
--- a/pkgs/build-support/fetchgit/default.nix
+++ b/pkgs/build-support/fetchgit/default.nix
@@ -1,5 +1,7 @@
{stdenv, git, cacert}:
-{url, rev ? "HEAD", md5 ? "", sha256 ? "", leaveDotGit ? false, fetchSubmodules ? true}:
+{url, rev ? "HEAD", md5 ? "", sha256 ? "", leaveDotGit ? false, fetchSubmodules ? true
+, name ? "git-export"
+}:
/* NOTE:
fetchgit has one problem: git fetch only works for refs.
@@ -26,7 +28,7 @@
assert md5 != "" || sha256 != "";
stdenv.mkDerivation {
- name = "git-export";
+ inherit name;
builder = ./builder.sh;
fetcher = ./nix-prefetch-git;
buildInputs = [git];
diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git
index 0d2536e225c..4f9dd2ac272 100755
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@@ -256,7 +256,7 @@ else
# download the file and add it to the store.
if test -z "$finalPath"; then
- tmpPath="$(mktemp --tmpdir -d git-checkout-tmp-XXXXXXXX)"
+ tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/git-checkout-tmp-XXXXXXXX")"
trap "rm -rf \"$tmpPath\"" EXIT
tmpFile="$tmpPath/git-export"
diff --git a/pkgs/build-support/fetchhg/nix-prefetch-hg b/pkgs/build-support/fetchhg/nix-prefetch-hg
index 7d4c0c8d741..a8916176f8a 100755
--- a/pkgs/build-support/fetchhg/nix-prefetch-hg
+++ b/pkgs/build-support/fetchhg/nix-prefetch-hg
@@ -35,7 +35,7 @@ fi
# download the file and add it to the store.
if test -z "$finalPath"; then
- tmpPath="$(mktemp --tmpdir -d hg-checkout-tmp-XXXXXXXX)"
+ tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/hg-checkout-tmp-XXXXXXXX")"
trap "rm -rf \"$tmpPath\"" EXIT
tmpArchive="$tmpPath/hg-archive"
diff --git a/pkgs/build-support/fetchsvn/nix-prefetch-svn b/pkgs/build-support/fetchsvn/nix-prefetch-svn
index 74de0a14c80..03b9eb9a03d 100755
--- a/pkgs/build-support/fetchsvn/nix-prefetch-svn
+++ b/pkgs/build-support/fetchsvn/nix-prefetch-svn
@@ -41,7 +41,7 @@ fi
# If we don't know the hash or a path with that hash doesn't exist,
# download the file and add it to the store.
if test -z "$finalPath"; then
- tmpPath="$(mktemp --tmpdir -d svn-checkout-tmp-XXXXXXXX)"
+ tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/svn-checkout-tmp-XXXXXXXX")"
trap "rm -rf \"$tmpPath\"" EXIT
tmpFile="$tmpPath/$dstFile"
diff --git a/pkgs/build-support/fetchurl/builder.sh b/pkgs/build-support/fetchurl/builder.sh
index 0c6e16551b4..66792229585 100644
--- a/pkgs/build-support/fetchurl/builder.sh
+++ b/pkgs/build-support/fetchurl/builder.sh
@@ -25,10 +25,20 @@ tryDownload() {
local url="$1"
echo
header "trying $url"
+ local curlexit=18;
+
success=
- if $curl --fail "$url" --output "$downloadedFile"; then
- success=1
- fi
+
+ # if we get error code 18, resume partial download
+ while [ $curlexit -eq 18 ]; do
+ # keep this inside an if statement, since on failure it doesn't abort the script
+ if $curl -C - --fail "$url" --output "$downloadedFile"; then
+ success=1
+ break
+ else
+ curlexit=$?;
+ fi
+ done
stopNest
}
diff --git a/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh b/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh
index c53fd44207d..2ad7783a442 100644
--- a/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh
+++ b/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh
@@ -77,7 +77,6 @@ if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE"; then
n=$((n + 1))
done
params=("${rest[@]}")
- NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE --sysroot=/var/empty"
fi
diff --git a/pkgs/build-support/grsecurity/default.nix b/pkgs/build-support/grsecurity/default.nix
index e66b348d082..bd6ac84a0f8 100644
--- a/pkgs/build-support/grsecurity/default.nix
+++ b/pkgs/build-support/grsecurity/default.nix
@@ -32,7 +32,7 @@ let
grKernel = if cfg.stable
then mkKernel pkgs.linux_3_14 stable-patch
- else mkKernel pkgs.linux_3_15 test-patch;
+ else mkKernel pkgs.linux_3_16 test-patch;
## -- grsecurity configuration ---------------------------------------------
diff --git a/pkgs/build-support/replace-dependency.nix b/pkgs/build-support/replace-dependency.nix
index 098637b4f9b..ed65b9dad1d 100644
--- a/pkgs/build-support/replace-dependency.nix
+++ b/pkgs/build-support/replace-dependency.nix
@@ -49,8 +49,13 @@ let
referencesOf = drv: getAttr (discard (toString drv)) references;
- dependsOnOld = drv: elem oldStorepath (referencesOf drv) ||
- any dependsOnOld (referencesOf drv);
+ dependsOnOldMemo = listToAttrs (map
+ (drv: { name = discard (toString drv);
+ value = elem oldStorepath (referencesOf drv) ||
+ any dependsOnOld (referencesOf drv);
+ }) (builtins.attrNames references));
+
+ dependsOnOld = drv: getAttr (discard (toString drv)) dependsOnOldMemo;
drvName = drv:
discard (substring 33 (stringLength (builtins.baseNameOf drv)) (builtins.baseNameOf drv));
@@ -65,15 +70,12 @@ let
rewrittenDeps = listToAttrs [ {name = discard (toString oldDependency); value = newDependency;} ];
- rewrittenDerivations = drv:
- if dependsOnOld drv
- then listToAttrs [ {
- name = discard (toString drv);
+ rewriteMemo = listToAttrs (map
+ (drv: { name = discard (toString drv);
+ value = rewriteHashes (builtins.storePath drv)
+ (filterAttrs (n: v: builtins.elem (builtins.storePath (discard (toString n))) (referencesOf drv)) rewriteMemo);
+ })
+ (filter dependsOnOld (builtins.attrNames references))) // rewrittenDeps;
- value = rewriteHashes drv (rewrittenDeps // (fold (drv: acc:
- (rewrittenDerivations drv) // acc
- ) {} (referencesOf drv)));
- } ]
- else {};
in assert (stringLength (drvName (toString oldDependency)) == stringLength (drvName (toString newDependency)));
-getAttr (discard (toString drv)) (rewrittenDerivations drv)
+getAttr (discard (toString drv)) rewriteMemo
diff --git a/pkgs/build-support/upstream-updater/update-walker-service-specific.sh b/pkgs/build-support/upstream-updater/update-walker-service-specific.sh
index 28c28f69587..b66001073f2 100644
--- a/pkgs/build-support/upstream-updater/update-walker-service-specific.sh
+++ b/pkgs/build-support/upstream-updater/update-walker-service-specific.sh
@@ -8,6 +8,10 @@ SF_version_dir () {
version_link 'http://sourceforge.net/.+/'"$1"'[0-9.]+/$'
}
+SF_version_tarball () {
+ version_link '[.]tar[.].*/download$'
+}
+
GH_latest () {
prefetch_command_rel ../fetchgit/nix-prefetch-git
revision "$("$(dirname "$0")/urls-from-page.sh" "$CURRENT_URL/commits" | grep /commit/ | head -n 1 | xargs basename )"
diff --git a/pkgs/build-support/upstream-updater/update-walker.sh b/pkgs/build-support/upstream-updater/update-walker.sh
index e11eb722e0e..e60499b60f2 100755
--- a/pkgs/build-support/upstream-updater/update-walker.sh
+++ b/pkgs/build-support/upstream-updater/update-walker.sh
@@ -280,6 +280,12 @@ do_overwrite_just_version () {
set_var_value sha256 $CURRENT_HASH
}
+minimize_overwrite() {
+ do_overwrite(){
+ do_overwrite_just_version
+ }
+}
+
process_config () {
CONFIG_DIR="$(directory_of "$1")"
CONFIG_NAME="$(basename "$1")"
@@ -297,9 +303,7 @@ process_config () {
exit 1;
}
[ -z "$(retrieve_meta fullRegenerate)" ] && eval "
- do_overwrite(){
- do_overwrite_just_version
- }
+ minimize_overwrite
"
fi
ensure_attribute_name
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 7a35577c69a..72cc7f68b09 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -1,5 +1,5 @@
{ pkgs
-, kernel ? pkgs.linux_3_10
+, kernel ? pkgs.linux
, img ? "bzImage"
, rootModules ?
[ "virtio_pci" "virtio_blk" "virtio_balloon" "ext4" "unix" "9p" "9pnet_virtio" "rtc_cmos" ]
diff --git a/pkgs/build-support/vm/rpm/rpm-closure.pl b/pkgs/build-support/vm/rpm/rpm-closure.pl
index 94da0a20adc..411c351f1e4 100644
--- a/pkgs/build-support/vm/rpm/rpm-closure.pl
+++ b/pkgs/build-support/vm/rpm/rpm-closure.pl
@@ -91,7 +91,7 @@ for (my $i = 0; $i < scalar(@packagesFiles); $i++) {
my %provides;
foreach my $pkgName (keys %pkgs) {
- print STDERR "looking at $pkgName\n";
+ #print STDERR "looking at $pkgName\n";
my $pkg = $pkgs{$pkgName};
#print STDERR keys %{$pkg->{format}}, "\n";
diff --git a/pkgs/build-support/vm/windows/cygwin-iso/default.nix b/pkgs/build-support/vm/windows/cygwin-iso/default.nix
index d9801428a88..b560a850a30 100644
--- a/pkgs/build-support/vm/windows/cygwin-iso/default.nix
+++ b/pkgs/build-support/vm/windows/cygwin-iso/default.nix
@@ -40,7 +40,7 @@ let
};
in map gen expr;
-in import {
+in import ../../../../../nixos/lib/make-iso9660-image.nix {
inherit stdenv perl cdrkit pathsFromGraph;
contents = [
{ source = "${cygwinCross}/bin/setup.exe";
diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix
index 2eefa31691e..2ec66152f7d 100644
--- a/pkgs/data/documentation/man-pages/default.nix
+++ b/pkgs/data/documentation/man-pages/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "man-pages-3.71";
+ name = "man-pages-3.73";
src = fetchurl {
url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz";
- sha256 = "981038ecffcf6db490c0bc4359f489c318654068a6ba5aa086962ac41b0d2894";
+ sha256 = "01qcafrq9z55kh5q97fir13l9cg2a1ls7ijkgzj99kgc6vkc90h5";
};
preBuild =
diff --git a/pkgs/data/documentation/pthread-man-pages/default.nix b/pkgs/data/documentation/pthread-man-pages/default.nix
index 4cd5a5b8297..cbd3234b2d4 100644
--- a/pkgs/data/documentation/pthread-man-pages/default.nix
+++ b/pkgs/data/documentation/pthread-man-pages/default.nix
@@ -43,6 +43,6 @@ in
meta = {
description = "POSIX threads (pthreads) manual pages from LinuxThreads";
homepage = http://www.gnu.org/software/libc/;
- maintainers = stdenv.lib.maintainers.mornfall;
+ maintainers = [ stdenv.lib.maintainers.mornfall ];
};
}
diff --git a/pkgs/data/fonts/arkpandora/default.nix b/pkgs/data/fonts/arkpandora/default.nix
index 7394dce551b..189c066b13e 100644
--- a/pkgs/data/fonts/arkpandora/default.nix
+++ b/pkgs/data/fonts/arkpandora/default.nix
@@ -4,6 +4,7 @@ rec {
src = fetchurl {
urls = [
"ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/ttf-arkpandora-${version}.tgz"
+ "http://distcache.FreeBSD.org/ports-distfiles/ttf-arkpandora-${version}.tgz"
"http://www.users.bigpond.net.au/gavindi/ttf-arkpandora-${version}.tgz"
];
sha256 = "16mfxwlgn6vs3xn00hha5dnmz6bhjiflq138y4zcq3yhk0y9bz51";
diff --git a/pkgs/data/fonts/baekmuk-ttf/default.nix b/pkgs/data/fonts/baekmuk-ttf/default.nix
new file mode 100644
index 00000000000..acd16478fcf
--- /dev/null
+++ b/pkgs/data/fonts/baekmuk-ttf/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ name = "baekmuk-ttf-2.2";
+
+ src = fetchurl {
+ url = "http://kldp.net/frs/download.php/1429/${name}.tar.gz";
+ sha256 = "08ab7dffb55d5887cc942ce370f5e33b756a55fbb4eaf0b90f244070e8d51882";
+ };
+
+ dontBuild = true;
+
+ installPhase = let
+ fonts_dir = "$out/share/fonts";
+ doc_dir = "$out/share/doc/${name}";
+ in ''
+ mkdir -pv ${fonts_dir}
+ mkdir -pv ${doc_dir}
+ cp ttf/*.ttf ${fonts_dir}
+ cp COPYRIGHT* ${doc_dir}
+ '';
+
+ meta = {
+ description = "Korean font";
+ homepage = "http://kldp.net/projects/baekmuk/";
+ license = "BSD-like";
+ };
+}
+
diff --git a/pkgs/data/fonts/cantarell-fonts/default.nix b/pkgs/data/fonts/cantarell-fonts/default.nix
index 5c9903c9971..f6b62623c4a 100644
--- a/pkgs/data/fonts/cantarell-fonts/default.nix
+++ b/pkgs/data/fonts/cantarell-fonts/default.nix
@@ -1,15 +1,17 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation {
- name = "cantarell-fonts-0.0.15";
+ name = "cantarell-fonts-0.0.16";
src = fetchurl {
- url = mirror://gnome/sources/cantarell-fonts/0.0/cantarell-fonts-0.0.15.tar.xz;
- sha256 = "0zmwzzfjrlpkdjb475ann11m53a2idm76ydd2rw1hjmdr74dq72j";
+ url = mirror://gnome/sources/cantarell-fonts/0.0/cantarell-fonts-0.0.16.tar.xz;
+ sha256 = "071g2l89gdjgqhapw9dbm1ch6hnzydhf7b38pi86fm91adaqggqm";
};
meta = {
- maintainers = [ stdenv.lib.maintainers.urkud ];
+ description = "Default typeface used in the user interface of GNOME since version 3.0";
platforms = stdenv.lib.platforms.all;
+ license = stdenv.lib.licenses.ofl;
+ maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
};
}
diff --git a/pkgs/data/fonts/cm-unicode/default.nix b/pkgs/data/fonts/cm-unicode/default.nix
index b8f7f7c6d3e..d8f6f7f8351 100644
--- a/pkgs/data/fonts/cm-unicode/default.nix
+++ b/pkgs/data/fonts/cm-unicode/default.nix
@@ -9,17 +9,16 @@ let
buildInputs = map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
- version="0.6.3a";
+ version = "0.7.0";
baseName="cm-unicode";
name="${baseName}-${version}";
- url="ftp://canopus.iacp.dvo.ru/pub/Font/cm_unicode/${name}-otf.tar.gz";
- hash="1018gmvh7wl7sm6f3fqd917syd1yy0gz3pxmrc9lkxckcr7wz0zp";
+ url="mirror://sourceforge/${baseName}/${baseName}/${version}/${name}-otf.tar.xz";
};
in
rec {
src = a.fetchurl {
url = sourceInfo.url;
- sha256 = sourceInfo.hash;
+ sha256 = "0a0w9qm9g8qz2xh3lr61bj1ymqslqsvk4w2ybc3v2qa89nz7x2jl";
};
inherit (sourceInfo) name version;
@@ -34,11 +33,8 @@ rec {
];
platforms = with a.lib.platforms;
all;
- };
- passthru = {
- updateInfo = {
- downloadPage = "http://canopus.iacp.dvo.ru/~panov/cm-unicode/download.html";
- };
+ downloadPage = "http://sourceforge.net/projects/cm-unicode/files/cm-unicode/";
+ inherit version;
};
}) x
diff --git a/pkgs/data/fonts/cm-unicode/default.upstream b/pkgs/data/fonts/cm-unicode/default.upstream
new file mode 100644
index 00000000000..bc24cd919b2
--- /dev/null
+++ b/pkgs/data/fonts/cm-unicode/default.upstream
@@ -0,0 +1,7 @@
+attribute_name cm_unicode
+url http://sourceforge.net/projects/cm-unicode/files/cm-unicode/
+SF_version_dir
+version_link '[-]otf[.]tar[.][a-z0-9]+/download$'
+SF_redirect
+ensure_hash
+do_overwrite() { do_overwrite_just_version; }
diff --git a/pkgs/data/fonts/comic-neue/default.nix b/pkgs/data/fonts/comic-neue/default.nix
new file mode 100644
index 00000000000..91608d17db4
--- /dev/null
+++ b/pkgs/data/fonts/comic-neue/default.nix
@@ -0,0 +1,33 @@
+{stdenv, fetchurl, unzip}:
+
+stdenv.mkDerivation rec {
+ name = "comic-neue-1.1";
+
+ src = fetchurl {
+ url = "http://comicneue.com/comic-neue-1.1.zip";
+ sha256 = "f9442fc42252db62ea788bd0247ae0e74571678d1dbd3e3edc229389050d6923";
+ };
+
+ buildInputs = [unzip];
+ phases = [ "unpackPhase" "installPhase" ];
+ sourceRoot = name;
+
+ installPhase = ''
+ mkdir -p $out/share/fonts/truetype
+ cp -v *.ttf $out/share/fonts/truetype
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = http://comicneue.com/;
+ description = "A casual type face: Make your lemonade stand look like a fortune 500 company";
+ longDescription = ''
+ It is inspired by Comic Sans but more regular. The font was
+ designed by Craig Rozynski. It is available in two variants:
+ Comic Neue and Comic Neue Angular. The former having round and
+ the latter angular terminals. Both variants come in Light,
+ Regular, and Bold weights with Oblique variants.
+ '';
+ license = licenses.cc0;
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/data/fonts/proggyfonts/default.nix b/pkgs/data/fonts/proggyfonts/default.nix
new file mode 100644
index 00000000000..1c41a92bf96
--- /dev/null
+++ b/pkgs/data/fonts/proggyfonts/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, mkfontdir, mkfontscale }:
+
+# adapted from https://aur.archlinux.org/packages/proggyfonts/
+
+stdenv.mkDerivation rec {
+ name = "proggyfonts-0.1";
+
+ src = fetchurl {
+ url = "http://kaictl.net/software/${name}.tar.gz";
+ sha256 = "1plcm1sjpa3hdqhhin48fq6zmz3ndm4md72916hd8ff0w6596q0n";
+ };
+
+ buildInputs = [ mkfontdir mkfontscale ];
+
+ installPhase =
+ ''
+ mkdir -p $out/share/doc/$name $out/share/fonts/misc $out/share/fonts/truetype
+
+ cp Licence.txt $out/share/doc/$name/LICENSE
+
+ for f in *.pcf; do
+ gzip -c "$f" > $out/share/fonts/misc/"$f".gz
+ done
+ cp *.bdf $out/share/fonts/misc
+ cp *.ttf $out/share/fonts/truetype
+
+ for f in misc truetype; do
+ cd $out/share/fonts/$f
+ mkfontscale
+ mkfontdir
+ done
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = http://upperbounds.net;
+ description = "A set of fixed-width screen fonts that are designed for code listings";
+ license = licenses.mit;
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/data/fonts/stix-otf/default.nix b/pkgs/data/fonts/stix-otf/default.nix
new file mode 100644
index 00000000000..f32d865c95c
--- /dev/null
+++ b/pkgs/data/fonts/stix-otf/default.nix
@@ -0,0 +1,30 @@
+{stdenv, fetchurl, unzip}:
+
+stdenv.mkDerivation rec {
+ name = "stix-otf-${version}";
+ version = "1.1.1";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/stixfonts/STIXv${version}-word.zip";
+ sha256 = "1q35wbqn3nh78pdban9z37lh090c6p49q3d00zzxm0axxz66xy4q";
+ };
+
+ buildInputs = [unzip];
+
+ phases = ["unpackPhase" "installPhase"];
+
+ sourceRoot = "Fonts/STIX-Word";
+
+ installPhase = ''
+ mkdir -p $out/share/fonts/opentype
+ cp *.otf $out/share/fonts/opentype
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = http://www.stixfonts.org/;
+ description = "Fonts for Scientific and Technical Information eXchange";
+ license = licenses.ofl;
+ platforms = platforms.all;
+ maintainers = [maintainers.rycee];
+ };
+}
diff --git a/pkgs/data/fonts/symbola/default.nix b/pkgs/data/fonts/symbola/default.nix
index 993a4c4f46d..70375a22bae 100644
--- a/pkgs/data/fonts/symbola/default.nix
+++ b/pkgs/data/fonts/symbola/default.nix
@@ -1,40 +1,39 @@
-{stdenv, fetchurl}:
+{stdenv, fetchurl, unzip }:
stdenv.mkDerivation rec {
- name = "symbola-7.12";
+ name = "symbola-7.17";
- ttf = fetchurl {
- url = "http://users.teilar.gr/~g1951d/Symbola.ttf";
- sha256 = "7acc058bd4e56cc986b2a46420520f59be402c3565c202b5dcebca7f3bfd8b5a";
+ src = fetchurl {
+ url = "http://users.teilar.gr/~g1951d/Symbola.zip";
+ sha256 = "19q5wcqk1rz8ps7jvvx1rai6x8ais79z71sm8d36hvsk2vr135al";
};
docs_pdf = fetchurl {
url = "http://users.teilar.gr/~g1951d/Symbola.pdf";
- sha256 = "11bb082ba5c2780a6f94a9bcddf4f314a54e2650bb63ce3081d1dc867c5e6843";
- };
- docs_docx = fetchurl {
- url = "http://users.teilar.gr/~g1951d/Symbola.docx";
- sha256 = "4f0ab494e1e5a7aac147aa7bb8b8bdba7278aee2da942a35f995feb9051515b9";
+ sha256 = "11h2202p1p4np4nv5m8k41wk7431p2m35sjpmbi1ygizakkbla3p";
};
+ buildInputs = [ unzip ];
+
phases = [ "installPhase" ];
installPhase = ''
+ unzip ${src}
mkdir -p $out/share/fonts/truetype
- cp -v "$ttf" $out/share/fonts/truetype/"${ttf.name}"
+ cp -v Symbola.ttf $out/share/fonts/truetype/
+ cp -v Symbola_hint.ttf $out/share/fonts/truetype/
mkdir -p "$out/doc/${name}"
+ cp -v Symbola.docx "$out/doc/${name}/"
+ cp -v Symbola.htm "$out/doc/${name}/"
cp -v "$docs_pdf" "$out/doc/${name}/${docs_pdf.name}"
- cp -v "$docs_docx" "$out/doc/${name}/${docs_docx.name}"
'';
meta = {
- description = "Basic Latin, Greek, Cyrillic and many Symbol blocks of Unicode...";
-
+ description = "Basic Latin, Greek, Cyrillic and many Symbol blocks of Unicode";
# In lieu of a licence:
# Fonts in this site are offered free for any use;
# they may be installed, embedded, opened, edited, modified, regenerated, posted, packaged and redistributed.
- license = "Unicode Fonts for Ancient Scripts";
-
+ license = stdenv.lib.licenses.free;
homepage = http://users.teilar.gr/~g1951d/;
};
}
diff --git a/pkgs/data/fonts/wqy-microhei/default.nix b/pkgs/data/fonts/wqy-microhei/default.nix
index 065bb4bc828..c0665b2f0cc 100644
--- a/pkgs/data/fonts/wqy-microhei/default.nix
+++ b/pkgs/data/fonts/wqy-microhei/default.nix
@@ -12,9 +12,9 @@ stdenv.mkDerivation rec {
meta = {
description = "A (mainly) Chinese Unicode font";
- homepage = "http://wenq.org";
+ homepage = http://wenq.org;
license = stdenv.lib.licenses.asl20;
- maintainers = stdenv.lib.maintainers.pkmx;
+ maintainers = [ stdenv.lib.maintainers.pkmx ];
platforms = stdenv.lib.platforms.all;
};
}
diff --git a/pkgs/data/fonts/wqy-zenhei/default.nix b/pkgs/data/fonts/wqy-zenhei/default.nix
index d42665c69cc..92f043c7fc0 100644
--- a/pkgs/data/fonts/wqy-zenhei/default.nix
+++ b/pkgs/data/fonts/wqy-zenhei/default.nix
@@ -19,9 +19,9 @@ stdenv.mkDerivation rec {
meta = {
description = "A (mainly) Chinese Unicode font";
- homepage = "http://wenq.org";
+ homepage = http://wenq.org;
license = stdenv.lib.licenses.gpl2; # with font embedding exceptions
- maintainers = stdenv.lib.maintainers.pkmx;
+ maintainers = [ stdenv.lib.maintainers.pkmx ];
platforms = stdenv.lib.platforms.all;
};
}
diff --git a/pkgs/data/misc/miscfiles/default.nix b/pkgs/data/misc/miscfiles/default.nix
index db4d13b890f..a40856e5910 100644
--- a/pkgs/data/misc/miscfiles/default.nix
+++ b/pkgs/data/misc/miscfiles/default.nix
@@ -1,16 +1,17 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
- name = "miscfiles-1.4.2";
+ name = "miscfiles-1.5";
src = fetchurl {
url = "mirror://gnu/miscfiles/${name}.tar.gz";
- sha256 = "1rh10y63asyrqyp5mlmxy7y4kdp6svk2inws3y7mfx8lsrhcm6dn";
+ sha256 = "005588vfrwx8ghsdv9p7zczj9lbc9a3r4m5aphcaqv8gif4siaka";
};
- meta = {
+ meta = with stdenv.lib; {
homepage = http://www.gnu.org/software/miscfiles/;
- license = stdenv.lib.licenses.gpl2Plus;
+ license = licenses.gpl2Plus;
description = "Collection of files not of crucial importance for sysadmins";
+ maintainers = with maintainers; [ pSub ];
};
}
diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix
index 134a6f5307e..57f5b24a6f8 100644
--- a/pkgs/data/misc/shared-mime-info/default.nix
+++ b/pkgs/data/misc/shared-mime-info/default.nix
@@ -2,11 +2,11 @@
, libxml2, glib}:
stdenv.mkDerivation rec {
- name = "shared-mime-info-1.2";
+ name = "shared-mime-info-1.3";
src = fetchurl {
url = "http://freedesktop.org/~hadess/${name}.tar.xz";
- sha256 = "0y5vi0vr6rbhvfzcfg57cfskn362bpvcpca9cy598nmr87i6lld5";
+ sha256 = "0fijrc8j2kw6bvdx7fmlfafbcwxvinhr8l44b46b3v59gj69rm2g";
};
buildInputs = [
diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix
index 90111cb52e1..6a4427bea40 100644
--- a/pkgs/data/misc/tzdata/default.nix
+++ b/pkgs/data/misc/tzdata/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl }:
-let version = "2014e"; in
+let version = "2014g"; in
stdenv.mkDerivation rec {
name = "tzdata-${version}";
@@ -8,11 +8,11 @@ stdenv.mkDerivation rec {
srcs =
[ (fetchurl {
url = "http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz";
- sha256 = "1ic63ykplnrvh9704j6l089rais0nxw1lcf1dbc3iy2ij2kl7qh8";
+ sha256 = "0w52hafnf82vy678rm8p39ckymcj6shv5376zwzzbxw2m6vxaism";
})
(fetchurl {
url = "http://www.iana.org/time-zones/repository/releases/tzcode${version}.tar.gz";
- sha256 = "074c98vmdgysgkksaqwkn1gbrlnzk8l28zs8lhif44a9mckc9ss3";
+ sha256 = "0ymg0cscpbfj9jpnx4g9apmfrixq6z8dch99h6a77k2pmnj5ymfz";
})
];
diff --git a/pkgs/desktops/e19/default.nix b/pkgs/desktops/e19/default.nix
new file mode 100644
index 00000000000..5740337a11a
--- /dev/null
+++ b/pkgs/desktops/e19/default.nix
@@ -0,0 +1,26 @@
+{ callPackage, pkgs }:
+let
+ openjpeg_1 = with pkgs; lib.overrideDerivation openjpeg (oldAttrs: {
+ name = "openjpeg-1.5.1";
+ src = fetchurl {
+ url = "http://openjpeg.googlecode.com/files/openjpeg-1.5.1.tar.gz";
+ sha1 = "1b0b74d1af4c297fd82806a9325bb544caf9bb8b";
+ };
+ #passthru = { incDir = "openjpeg-1.5.1"; };
+ });
+in
+rec {
+ #### CORE EFL
+ efl = callPackage ./efl.nix { openjpeg=openjpeg_1; };
+ evas = callPackage ./evas.nix { };
+ emotion = callPackage ./emotion.nix { };
+ elementary = callPackage ./elementary.nix { };
+
+ #### WINDOW MANAGER
+ enlightenment = callPackage ./enlightenment.nix { };
+
+ #### APPLICATIONS
+ econnman = callPackage ./econnman.nix { };
+ terminology = callPackage ./terminology.nix { };
+
+}
diff --git a/pkgs/desktops/e19/econnman.nix b/pkgs/desktops/e19/econnman.nix
new file mode 100644
index 00000000000..1e42895b4e2
--- /dev/null
+++ b/pkgs/desktops/e19/econnman.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, pkgconfig, e19, python27, python27Packages, dbus, makeWrapper }:
+stdenv.mkDerivation rec {
+ name = "econnman-${version}";
+ version = "1.1";
+ src = fetchurl {
+ url = "http://download.enlightenment.org/rel/apps/econnman/${name}.tar.gz";
+ sha256 = "057pwwavlvrrq26bncqnfrf449zzaim0zq717xv86av4n940gwv0";
+ };
+
+ buildInputs = [ makeWrapper pkgconfig e19.efl python27 dbus ];
+ propagatedBuildInputs = [ python27Packages.pythonefl_1_11 python27Packages.dbus e19.elementary ];
+ postInstall = ''
+ wrapProgram $out/bin/econnman-bin --prefix PYTHONPATH : ${python27Packages.dbus}/lib/python2.7/site-packages:${python27Packages.pythonefl_1_11}/lib/python2.7/site-packages
+ '';
+
+ meta = {
+ description = "Econnman is a user interface for the connman network connection manager";
+ homepage = http://enlightenment.org/;
+ maintainers = [ stdenv.lib.maintainers.matejc ];
+ platforms = stdenv.lib.platforms.linux;
+ license = stdenv.lib.licenses.lgpl3;
+ };
+}
diff --git a/pkgs/desktops/e19/efl-setup-hook.sh b/pkgs/desktops/e19/efl-setup-hook.sh
new file mode 100755
index 00000000000..d98f24b4c04
--- /dev/null
+++ b/pkgs/desktops/e19/efl-setup-hook.sh
@@ -0,0 +1,8 @@
+addDbusIncludePath () {
+ if test -d "$1/include/dbus-1.0"
+ then
+ export NIX_CFLAGS_COMPILE="${NIX_CFLAGS_COMPILE} -I$1/include/dbus-1.0 -I $1/lib/dbus-1.0/include"
+ fi
+}
+
+envHooks=(${envHooks[@]} addDbusIncludePath)
diff --git a/pkgs/desktops/e19/efl.nix b/pkgs/desktops/e19/efl.nix
new file mode 100644
index 00000000000..2252bc91991
--- /dev/null
+++ b/pkgs/desktops/e19/efl.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, pulseaudio, libsndfile, xlibs, wayland, libdrm, libxkbcommon, udev, utillinuxCurses, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, lua5_2, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, libraw, libspectre, xineLib, vlc, libwebp, curl }:
+
+
+stdenv.mkDerivation rec {
+ name = "efl-${version}";
+ version = "1.11.2";
+ src = fetchurl {
+ url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.gz";
+ sha256 = "123jrcifd7i0r9zh8qllqiz3d378fyy7fzkanyki9wbxlz91rk7k";
+ };
+
+ buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-libav pulseaudio libsndfile xlibs.libXcursor xlibs.printproto xlibs.libX11 libdrm udev utillinuxCurses luajit ];
+
+ propagatedBuildInputs = [ wayland libxkbcommon python27Packages.dbus dbus libjpeg xlibs.libXcomposite xlibs.libXdamage xlibs.libXinerama xlibs.libXp xlibs.libXtst xlibs.libXi xlibs.libXext bullet xlibs.libXScrnSaver ] ++ [ xlibs.libXrender xlibs.libXfixes xlibs.libXrandr xlibs.libxkbfile xlibs.libxcb xlibs.xcbutilkeysyms openjpeg doxygen expat lua5_2 harfbuzz jbig2dec librsvg dbus_libs alsaLib poppler libraw libspectre xineLib vlc libwebp curl ];
+
+ configureFlags = [ "--with-tests=none" "--enable-sdl" "--enable-drm" "--with-opengl=full" "--enable-image-loader-jp2k" "--enable-xinput22" "--enable-multisense" "--enable-systemd" "--enable-image-loader-webp" "--enable-harfbuzz" "--enable-wayland" "--enable-xine" "--enable-fb" "--disable-tslib" "--with-systemdunitdir=$out/systemd/user" ];
+
+ NIX_CFLAGS_COMPILE = [ "-I${xlibs.libXtst}" "-I${dbus_libs}/include/dbus-1.0" "-I${dbus_libs}/lib/dbus-1.0/include" ];
+
+ preConfigure = ''
+ export PKG_CONFIG_PATH="${gst_all_1.gst-plugins-base}/lib/pkgconfig/gstreamer-video-0.10.pc:$PKG_CONFIG_PATH"
+ '';
+
+ setupHook = ./efl-setup-hook.sh;
+
+ meta = {
+ description = "Enlightenment Core libraries";
+ homepage = http://enlightenment.org/;
+ maintainers = [ stdenv.lib.maintainers.matejc ];
+ platforms = stdenv.lib.platforms.linux;
+ license = stdenv.lib.licenses.lgpl3;
+ };
+}
diff --git a/pkgs/desktops/e19/elementary.nix b/pkgs/desktops/e19/elementary.nix
new file mode 100644
index 00000000000..db335a15620
--- /dev/null
+++ b/pkgs/desktops/e19/elementary.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pkgconfig, e19, libcap, gdbm }:
+stdenv.mkDerivation rec {
+ name = "elementary-${version}";
+ version = "1.11.2";
+ src = fetchurl {
+ url = "http://download.enlightenment.org/rel/libs/elementary/${name}.tar.gz";
+ sha256 = "041hwp81qyq4wsw483g2jh52gcanqg046f91pmd0vzgwcgxyixqq";
+ };
+ buildInputs = [ pkgconfig e19.efl gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ];
+ preConfigure = ''
+ export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/ethumb-1 $NIX_CFLAGS_COMPILE"
+ '';
+ meta = {
+ description = "Widget set/toolkit";
+ homepage = http://enlightenment.org/;
+ maintainers = [ stdenv.lib.maintainers.matejc ];
+ platforms = stdenv.lib.platforms.linux;
+ license = stdenv.lib.licenses.lgpl2;
+ };
+}
diff --git a/pkgs/desktops/e19/emotion.nix b/pkgs/desktops/e19/emotion.nix
new file mode 100644
index 00000000000..781d884fe3b
--- /dev/null
+++ b/pkgs/desktops/e19/emotion.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pkgconfig, e19, vlc }:
+stdenv.mkDerivation rec {
+ name = "emotion_generic_players-${version}";
+ version = "1.11.0";
+ src = fetchurl {
+ url = "http://download.enlightenment.org/rel/libs/emotion_generic_players/${name}.tar.gz";
+ sha256 = "0x6aigsqnfn9vcaj1rj6055s0vh811svzhwz5zghksg4lqipjbjx";
+ };
+ buildInputs = [ pkgconfig e19.efl vlc ];
+ preConfigure = ''
+ export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/eo-1 $NIX_CFLAGS_COMPILE"
+ '';
+ meta = {
+ description = "Extra video decoders";
+ homepage = http://enlightenment.org/;
+ maintainers = [ stdenv.lib.maintainers.matejc ];
+ platforms = stdenv.lib.platforms.linux;
+ license = stdenv.lib.licenses.bsd2;
+ };
+}
diff --git a/pkgs/desktops/e19/enlightenment.nix b/pkgs/desktops/e19/enlightenment.nix
new file mode 100644
index 00000000000..95c5abdfa58
--- /dev/null
+++ b/pkgs/desktops/e19/enlightenment.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, pkgconfig, e19, xlibs, libffi, pam, alsaLib, luajit, bzip2, libpthreadstubs, gdbm, libcap, set_freqset_setuid ? false }:
+
+
+
+stdenv.mkDerivation rec {
+ name = "enlightenment-${version}";
+ version = "0.19.0";
+ src = fetchurl {
+ url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz";
+ sha256 = "0d9s8gwma32hj8h000k1bzibr3zj8qajcf14va3w81k87gkilxfp";
+ };
+ buildInputs = [ pkgconfig e19.efl e19.elementary xlibs.libXdmcp xlibs.libxcb xlibs.xcbutilkeysyms xlibs.libXrandr libffi pam alsaLib luajit bzip2 libpthreadstubs gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ];
+ preConfigure = ''
+ export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/eo-1 -I${e19.efl}/include/ecore-imf-1 -I${e19.efl}/include/ethumb-client-1 -I${e19.efl}/include/ethumb-1 $NIX_CFLAGS_COMPILE"
+ export USER_SESSION_DIR=$prefix/lib/systemd/user
+ '';
+
+ # this is a hack and without this cpufreq module is not working:
+ # when set_freqset_setuid is true and "e19_freqset" is set in setuidPrograms (this is taken care of in e19 NixOS module),
+ # then this postInstall does the folowing:
+ # 1. moves the "freqset" binary to "e19_freqset",
+ # 2. linkes "e19_freqset" to enlightenment/bin so that,
+ # 3. setuidPrograms detects it and makes appropriate stuff to /var/setuid-wrappers/e19_freqset,
+ # 4. and finaly, linkes /var/setuid-wrappers/e19_freqset to original destination where enlightenment wants it
+ postInstall = if set_freqset_setuid then ''
+ export CPUFREQ_DIRPATH=`readlink -f $out/lib/enlightenment/modules/cpufreq/linux-gnu-*`;
+ mv $CPUFREQ_DIRPATH/freqset $CPUFREQ_DIRPATH/e19_freqset
+ ln -sv $CPUFREQ_DIRPATH/e19_freqset $out/bin/e19_freqset
+ ln -sv /var/setuid-wrappers/e19_freqset $CPUFREQ_DIRPATH/freqset
+ '' else "";
+ meta = {
+ description = "The Compositing Window Manager and Desktop Shell";
+ homepage = http://enlightenment.org/;
+ maintainers = [ stdenv.lib.maintainers.matejc ];
+ platforms = stdenv.lib.platforms.linux;
+ license = stdenv.lib.licenses.bsd2;
+ };
+}
diff --git a/pkgs/desktops/e19/evas.nix b/pkgs/desktops/e19/evas.nix
new file mode 100644
index 00000000000..98b035f94e4
--- /dev/null
+++ b/pkgs/desktops/e19/evas.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl, pkgconfig, e19, zlib, libspectre, gstreamer, gst_plugins_base, gst_ffmpeg, gst_plugins_good, poppler, librsvg, libraw }:
+stdenv.mkDerivation rec {
+ name = "evas_generic_loaders-${version}";
+ version = "1.11.2";
+ src = fetchurl {
+ url = "http://download.enlightenment.org/rel/libs/evas_generic_loaders/${name}.tar.gz";
+ sha256 = "03p6v7l2fxvldiymqk16pqnbm9llygp6i19qhn3rmrqy1hkjkry6";
+ };
+ buildInputs = [ pkgconfig e19.efl zlib libspectre gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good poppler librsvg libraw ];
+ meta = {
+ description = "Extra image decoders";
+ homepage = http://enlightenment.org/;
+ maintainers = [ stdenv.lib.maintainers.matejc ];
+ platforms = stdenv.lib.platforms.linux;
+ license = stdenv.lib.licenses.gpl2;
+ };
+}
diff --git a/pkgs/desktops/e19/terminology.nix b/pkgs/desktops/e19/terminology.nix
new file mode 100644
index 00000000000..97bf07b298d
--- /dev/null
+++ b/pkgs/desktops/e19/terminology.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, pkgconfig, e19 }:
+stdenv.mkDerivation rec {
+ name = "terminology-${version}";
+ version = "0.6.1";
+ src = fetchurl {
+ url = "http://download.enlightenment.org/rel/apps/terminology/${name}.tar.gz";
+ sha256 = "1wi9njyfs95y4nb9jd30032qqka5cg7k0wacck8s1yqxwg5ng38x";
+ };
+ buildInputs = [ pkgconfig e19.efl e19.elementary ];
+ preConfigure = ''
+ export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/eo-1 $NIX_CFLAGS_COMPILE"
+ export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/ecore-con-1 $NIX_CFLAGS_COMPILE"
+ export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/eldbus-1 $NIX_CFLAGS_COMPILE"
+ export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/ethumb-1 $NIX_CFLAGS_COMPILE"
+ '';
+ meta = {
+ description = "The best terminal emulator written with the EFL";
+ homepage = http://enlightenment.org/;
+ maintainers = [ stdenv.lib.maintainers.matejc ];
+ platforms = stdenv.lib.platforms.linux;
+ license = stdenv.lib.licenses.bsd2;
+ };
+}
diff --git a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix
index ed794715ff8..41ca17bd5e4 100644
--- a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix
+++ b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python, pkgconfig, libgnome, GConf, pygobject, pygtk, glib, gtk, pythonDBus}:
+{ stdenv, fetchurl, python, pkgconfig, libgnome, GConf, pygobject, pygtk, glib, gtk, pythonDBus, gnome_vfs}:
with stdenv.lib;
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
cp bonobo/*.{py,defs} $out/share/pygtk/2.0/defs/
'';
- buildInputs = [ python pkgconfig pygobject pygtk glib gtk GConf libgnome pythonDBus ];
+ buildInputs = [ python pkgconfig pygobject pygtk glib gtk GConf libgnome pythonDBus gnome_vfs ];
doCheck = false;
diff --git a/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix b/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix
index 97dcbf4e004..3da878dde74 100644
--- a/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libxslt, docbook_xml_dtd_42, automake}:
+{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libxslt, docbook_xml_dtd_42, automake, gettext}:
stdenv.mkDerivation {
name = "scrollkeeper-0.3.14";
@@ -13,6 +13,6 @@ stdenv.mkDerivation {
cp ${automake}/share/automake*/config.{sub,guess} .
";
- buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt];
+ buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt gettext];
configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat";
}
diff --git a/pkgs/desktops/gnome-3/3.10/apps/gedit/default.nix b/pkgs/desktops/gnome-3/3.10/apps/gedit/default.nix
index 84a77e5a024..6b9a69c738d 100644
--- a/pkgs/desktops/gnome-3/3.10/apps/gedit/default.nix
+++ b/pkgs/desktops/gnome-3/3.10/apps/gedit/default.nix
@@ -25,7 +25,6 @@ stdenv.mkDerivation rec {
wrapProgram "$out/bin/gedit" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
- --prefix LD_LIBRARY_PATH : "${gnome3.libpeas}/lib:${gnome3.gtksourceview}/lib" \
--prefix XDG_DATA_DIRS : "${gnome3.gtksourceview}/share:${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
'';
diff --git a/pkgs/desktops/gnome-3/3.10/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/3.10/apps/gnome-documents/default.nix
index b393bb43931..a8c84d6a769 100644
--- a/pkgs/desktops/gnome-3/3.10/apps/gnome-documents/default.nix
+++ b/pkgs/desktops/gnome-3/3.10/apps/gnome-documents/default.nix
@@ -28,17 +28,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- preFixup =
- let
- libPath = stdenv.lib.makeLibraryPath
- [ evince gtk3 gnome3.tracker gnome3.gnome_online_accounts ];
- in
- ''
+ preFixup = ''
substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib}/bin/gapplication"
wrapProgram "$out/bin/gnome-documents" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
- --prefix LD_LIBRARY_PATH ":" "${libPath}" \
--prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
--run "if [ -z \"\$XDG_CACHE_DIR\" ]; then XDG_CACHE_DIR=\$HOME/.cache; fi; if [ -w \"\$XDG_CACHE_DIR/..\" ]; then mkdir -p \"\$XDG_CACHE_DIR/gnome-documents\"; fi"
rm $out/share/icons/hicolor/icon-theme.cache
diff --git a/pkgs/desktops/gnome-3/3.10/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/3.10/apps/gnome-music/default.nix
index b8d2bbc79ef..31d521e8c30 100644
--- a/pkgs/desktops/gnome-3/3.10/apps/gnome-music/default.nix
+++ b/pkgs/desktops/gnome-3/3.10/apps/gnome-music/default.nix
@@ -24,19 +24,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- preFixup =
- let
- libPath = stdenv.lib.makeLibraryPath
- [ glib gtk3 libnotify tracker gnome3.grilo cairo
- gst_all_1.gstreamer gst_all_1.gst-plugins-base
- gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad ];
- in
- ''
+ preFixup = ''
wrapProgram "$out/bin/gnome-music" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
- --prefix LD_LIBRARY_PATH : "${libPath}" \
--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
--prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \
--prefix PYTHONPATH : "$PYTHONPATH"
diff --git a/pkgs/desktops/gnome-3/3.10/default.nix b/pkgs/desktops/gnome-3/3.10/default.nix
index 89e16490df9..e1783be3b7f 100644
--- a/pkgs/desktops/gnome-3/3.10/default.nix
+++ b/pkgs/desktops/gnome-3/3.10/default.nix
@@ -132,7 +132,7 @@ rec {
totem-pl-parser = callPackage ./core/totem-pl-parser { };
- tracker = callPackage ./core/tracker { };
+ tracker = callPackage ./core/tracker { giflib = pkgs.giflib_5_0; };
vte = callPackage ./core/vte { };
diff --git a/pkgs/desktops/gnome-3/3.10/misc/gitg/default.nix b/pkgs/desktops/gnome-3/3.10/misc/gitg/default.nix
index 7ca35a8255f..401d5cf2f36 100644
--- a/pkgs/desktops/gnome-3/3.10/misc/gitg/default.nix
+++ b/pkgs/desktops/gnome-3/3.10/misc/gitg/default.nix
@@ -6,11 +6,11 @@
# use packaged gnome3.gnome_icon_theme_symbolic
stdenv.mkDerivation rec {
- name = "gitg-0.3.2";
+ name = "gitg-3.13.91";
src = fetchurl {
- url = "mirror://gnome/sources/gitg/0.3/${name}.tar.xz";
- sha256 = "03vc59d1r3326piqdph6qjqnc40chm1lpg52lpf8466ddjs0x8vp";
+ url = "mirror://gnome/sources/gitg/3.13/${name}.tar.xz";
+ sha256 = "1c2016grvgg5f3l5xkracz85rblsc1a4brzr6vgn6kh2h494rv37";
};
preCheck = ''
diff --git a/pkgs/desktops/gnome-3/3.10/misc/libgit2-glib/default.nix b/pkgs/desktops/gnome-3/3.10/misc/libgit2-glib/default.nix
index 17c3b4fa0a8..82e2b585509 100644
--- a/pkgs/desktops/gnome-3/3.10/misc/libgit2-glib/default.nix
+++ b/pkgs/desktops/gnome-3/3.10/misc/libgit2-glib/default.nix
@@ -1,18 +1,20 @@
-{ stdenv, fetchurl, gnome3, libtool, pkgconfig
+{ stdenv, fetchurl, gnome3, libtool, pkgconfig, vala
, gtk_doc, gobjectIntrospection, libgit2, glib }:
stdenv.mkDerivation rec {
name = "libgit2-glib-${version}";
- version = "0.0.10";
+ version = "0.0.20";
src = fetchurl {
url = "https://github.com/GNOME/libgit2-glib/archive/v${version}.tar.gz";
- sha256 = "0zn3k85jw6yks8s5ca8dyh9mwh4if1lni9gz9bd5lqlpa803ixxs";
+ sha256 = "1s2hj0ji73ishniqvr6mx90l1ji5jjwwrwhp91i87fxk0d3sry5x";
};
+
+ cmakeFlags = "-DTHREADSAFE=ON";
configureScript = "sh ./autogen.sh";
- buildInputs = [ gnome3.gnome_common libtool pkgconfig
+ buildInputs = [ gnome3.gnome_common libtool pkgconfig vala
gtk_doc gobjectIntrospection libgit2 glib ];
meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix
index f9fbbbe56c6..b60363b024c 100644
--- a/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix
@@ -1,22 +1,22 @@
{ stdenv, intltool, fetchurl, libxml2, webkitgtk, highlight
, pkgconfig, gtk3, glib, hicolor_icon_theme, libnotify, gtkspell3
, makeWrapper, itstool, shared_mime_info, libical, db, gcr
-, gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu
+, gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu, libtool
, libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit }:
stdenv.mkDerivation rec {
- name = "evolution-3.12.2";
+ name = "evolution-3.12.5";
src = fetchurl {
url = "mirror://gnome/sources/evolution/3.12/${name}.tar.xz";
- sha256 = "60742334aaf1e3b9f044c2003c44a37be5905b166e24580e9e6e6c5ae1b9f948";
+ sha256 = "08y1qiydbbk4fq8rrql9sgbwsny8bwz6f7m5kbbj5zjqvf1baksj";
};
doCheck = true;
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
- buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2
+ buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 libtool
gdk_pixbuf gnome3.gnome_icon_theme librsvg db icu
gnome3.evolution_data_server libsecret libical gcr
webkitgtk shared_mime_info gnome3.gnome_desktop gtkspell3
diff --git a/pkgs/desktops/gnome-3/3.12/apps/gedit/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gedit/default.nix
index 0909a4239db..c65a28c3446 100644
--- a/pkgs/desktops/gnome-3/3.12/apps/gedit/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/apps/gedit/default.nix
@@ -4,11 +4,11 @@
, gnome3, librsvg, gdk_pixbuf, file }:
stdenv.mkDerivation rec {
- name = "gedit-3.12.1";
+ name = "gedit-3.12.2";
src = fetchurl {
url = "mirror://gnome/sources/gedit/3.12/${name}.tar.xz";
- sha256 = "8e3edc62102934a8be708b0fdf27b86368fa9ede885628283bf8e91b26bbb67f";
+ sha256 = "0lxnswqa0ysr57cqh062wp41sd76p6q7y3mnkl7rligd5c8hnikm";
};
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix
index d784544a183..c5f9bdb2774 100644
--- a/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix
@@ -4,11 +4,11 @@
, makeWrapper, itstool, gnome3, librsvg, gst_all_1 }:
stdenv.mkDerivation rec {
- name = "gnome-music-3.12.2";
+ name = "gnome-music-3.12.2.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-music/3.12/${name}.tar.xz";
- sha256 = "ec4807018166aabed0263cb3ffce672e1fc1a3e959f48a5ad48b8eb08ddb451a";
+ sha256 = "1vwzjv5001pg37qc0sh4ph3srqwg3vgibbdlqpim9w2k70l9j34z";
};
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
diff --git a/pkgs/desktops/gnome-3/3.12/apps/pomodoro/default.nix b/pkgs/desktops/gnome-3/3.12/apps/pomodoro/default.nix
new file mode 100644
index 00000000000..75c82607a02
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/apps/pomodoro/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, fetchurl, which, automake113x, intltool, pkgconfig, libtool, makeWrapper,
+ dbus_glib, libcanberra, gst_all_1, upower, vala, gnome3_12, gtk3, gst_plugins_base,
+ glib, gobjectIntrospection, hicolor_icon_theme
+}:
+
+stdenv.mkDerivation rec {
+ name = "gnome-shell-pomodoro-0.10.2-11-gd5f5b69";
+
+ src = fetchurl {
+ url =
+ "https://codeload.github.com/codito/gnome-shell-pomodoro/" +
+ "legacy.tar.gz/gnome-3.12";
+ sha256 =
+ "6c86203f56f69a52675c2df21e580a785f8894a2a9cdf4322d44743603504d10";
+ name = "${name}.tar.gz";
+ };
+
+ configureScript = ''./autogen.sh'';
+
+ buildInputs = [
+ which automake113x intltool glib gobjectIntrospection pkgconfig libtool
+ makeWrapper dbus_glib libcanberra upower vala gst_all_1.gstreamer
+ gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
+ gnome3_12.gsettings_desktop_schemas gnome3_12.gnome_desktop
+ gnome3_12.gnome_common gnome3_12.gnome_shell hicolor_icon_theme gtk3
+ ];
+
+ preBuild = ''
+ sed -i \
+ -e 's|/usr\(/share/gir-1.0/UPowerGlib\)|${upower}\1|' \
+ -e 's|/usr\(/share/gir-1.0/GnomeDesktop\)|${gnome3_12.gnome_desktop}\1|' \
+ vapi/Makefile
+ '';
+
+ preFixup = ''
+ wrapProgram $out/bin/gnome-pomodoro \
+ --prefix XDG_DATA_DIRS : \
+ "$out/share:$GSETTINGS_SCHEMAS_PATH:$XDG_DATA_DIRS"
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/codito/gnome-shell-pomodoro;
+ description =
+ "Personal information management application that provides integrated " +
+ "mail, calendaring and address book functionality";
+ maintainers = with maintainers; [ DamienCassou ];
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ };
+}
\ No newline at end of file
diff --git a/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix b/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix
index 7fb341948be..c6ac93b1074 100644
--- a/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix
@@ -11,11 +11,11 @@
# TODO: enable more features
stdenv.mkDerivation rec {
- name = "empathy-3.12.2";
+ name = "empathy-3.12.5";
src = fetchurl {
url = "mirror://gnome/sources/empathy/3.12/${name}.tar.xz";
- sha256 = "414d0c6b1a30b1afbf35ad04b0b9ff3ada3e06fab797a50a7147cdfe0905e7cd";
+ sha256 = "0rhgpiv75aafmdh6r7d4ci59lnxqmmwg9hvsa5b3mk7j2d2pma86";
};
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard
diff --git a/pkgs/desktops/gnome-3/3.12/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/3.12/core/evolution-data-server/default.nix
index b8711f7e563..2cb1fbe90d4 100644
--- a/pkgs/desktops/gnome-3/3.12/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/evolution-data-server/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
- name = "evolution-data-server-3.12.2";
+ name = "evolution-data-server-3.12.5";
src = fetchurl {
url = "mirror://gnome/sources/evolution-data-server/3.12/${name}.tar.xz";
- sha256 = "91c95e17a8c1cd1086dafcd99a40bdf8f5993770f251f8b0a10e5395e3f5a3b6";
+ sha256 = "d3a2f832f823cb2a41467926dcaec984a15b2cb51ef89cf41267e337ca750811";
};
buildInputs = with gnome3;
@@ -28,6 +28,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
platforms = platforms.linux;
+ maintainers = [ maintainers.lethalman ];
};
}
diff --git a/pkgs/desktops/gnome-3/3.12/core/folks/default.nix b/pkgs/desktops/gnome-3/3.12/core/folks/default.nix
index 47b958002a3..7e3af8405a4 100644
--- a/pkgs/desktops/gnome-3/3.12/core/folks/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/folks/default.nix
@@ -5,11 +5,11 @@
# TODO: enable more folks backends
stdenv.mkDerivation rec {
- name = "folks-0.9.6";
+ name = "folks-0.9.8";
src = fetchurl {
url = "mirror://gnome/sources/folks/0.9/${name}.tar.xz";
- sha256 = "a67e055b5a2724a34a80946e2940c4c0ad708cb1f4e0a09407c6b69a5e40267f";
+ sha256 = "09cbs3ihcswpi1wg8xbjmkqjbhnxa1idy1fbzmz0gah7l5mxmlfj";
};
propagatedBuildInputs = [ glib gnome3.libgee sqlite ];
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-calculator/default.nix
index 666032f56a7..19d0c9c10e8 100644
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-calculator/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-calculator/default.nix
@@ -3,11 +3,11 @@
, itstool, gnome3, librsvg, gdk_pixbuf }:
stdenv.mkDerivation rec {
- name = "gnome-calculator-3.12.1";
+ name = "gnome-calculator-3.12.3";
src = fetchurl {
url = "mirror://gnome/sources/gnome-calculator/3.12/${name}.tar.xz";
- sha256 = "15a75bbe19f6d2280d864f0504f6fc5b1f148fea9738b5548b64b7b8c0c64740";
+ sha256 = "0bn3agh3g22iradfpzkc19a2b33b1mbf0ciy1hf2sijrczi24410";
};
NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix
index dbb19f77d21..6f6816efa5b 100644
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix
@@ -35,7 +35,6 @@ stdenv.mkDerivation rec {
wrapProgram "$out/bin/gnome-shell" \
--prefix PATH : "${unzip}/bin" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
- --prefix LD_LIBRARY_PATH : "${accountsservice}/lib:${ibus}/lib:${gdm}/lib" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix XDG_DATA_DIRS : "${gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-user-docs/default.nix
index 7377c839d1c..2a237b15c21 100644
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-user-docs/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-user-docs/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, file, gnome3, itstool, libxml2, intltool }:
stdenv.mkDerivation rec {
- name = "gnome-user-docs-3.12.1";
+ name = "gnome-user-docs-3.12.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-user-docs/3.12/${name}.tar.xz";
- sha256 = "bfd084d72c688d6efb0c34bb572a704cc2ce093c97a33390eaffb5e42158d418";
+ sha256 = "1cj45lpa74vkbxyila3d6pn5m1gh51nljp9fjirxmzwi1h6wg7jd";
};
buildInputs = [ pkgconfig gnome3.yelp itstool libxml2 intltool ];
diff --git a/pkgs/desktops/gnome-3/3.12/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/3.12/core/grilo-plugins/default.nix
index a8a1c244767..9076d5c5839 100644
--- a/pkgs/desktops/gnome-3/3.12/core/grilo-plugins/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/grilo-plugins/default.nix
@@ -3,11 +3,11 @@
, gmime, json_glib, avahi, tracker, itstool }:
stdenv.mkDerivation rec {
- name = "grilo-plugins-0.2.12";
+ name = "grilo-plugins-0.2.13";
src = fetchurl {
url = "mirror://gnome/sources/grilo-plugins/0.2/${name}.tar.xz";
- sha256 = "15bed8a633c81b251920ab677d455433e641388f605277ca88e549cc89012b48";
+ sha256 = "008jwm5ydl0k25p3d2fkcail40fj9y3qknihxb5fg941p8qlhm55";
};
installFlags = [ "GRL_PLUGINS_DIR=$(out)/lib/grilo-0.2" ];
diff --git a/pkgs/desktops/gnome-3/3.12/core/grilo/default.nix b/pkgs/desktops/gnome-3/3.12/core/grilo/default.nix
index 6f1bfbbcfe9..9c0e3f9a0bc 100644
--- a/pkgs/desktops/gnome-3/3.12/core/grilo/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/grilo/default.nix
@@ -2,11 +2,11 @@
, libxml2, gnome3, gobjectIntrospection, libsoup }:
stdenv.mkDerivation rec {
- name = "grilo-0.2.10";
+ name = "grilo-0.2.11";
src = fetchurl {
url = "mirror://gnome/sources/grilo/0.2/${name}.tar.xz";
- sha256 = "559a2470fe541b0090bcfdfac7a33e92dba967727bbab6d0eca70e5636a77b25";
+ sha256 = "8a52c37521de80d6caf08a519a708489b9e2b097c2758a0acaab6fbd26d30ea6";
};
configureFlags = [ "--enable-grl-pls" "--enable-grl-net" ];
diff --git a/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix
index 4564b0d21e1..8a89425a696 100644
--- a/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "gtksourceview-${version}";
- version = "3.12.2";
+ version = "3.12.3";
src = fetchurl {
url = "mirror://gnome/sources/gtksourceview/3.12/gtksourceview-${version}.tar.xz";
- sha256 = "62a31eee00f633d7959efb7eec44049ebd0345d670265853dcd21c057f3f30ad";
+ sha256 = "1xzmw9n9zbkaasl8xi7s5h49wiv5dq4qf8hr2pzjkack3ai5j6gk";
};
buildInputs = [ pkgconfig atk cairo glib gtk3 pango
diff --git a/pkgs/desktops/gnome-3/3.12/core/totem/default.nix b/pkgs/desktops/gnome-3/3.12/core/totem/default.nix
index 3589299df3e..49094751983 100644
--- a/pkgs/desktops/gnome-3/3.12/core/totem/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/totem/default.nix
@@ -5,11 +5,11 @@
, gnome3, librsvg, gdk_pixbuf, file }:
stdenv.mkDerivation rec {
- name = "totem-3.12.1";
+ name = "totem-3.12.2";
src = fetchurl {
url = "mirror://gnome/sources/totem/3.12/${name}.tar.xz";
- sha256 = "dd168cdd4051d01131d47c24fa45bfd08b6ccf45900ac4b64bae47f6f47a35e3";
+ sha256 = "1law033wxbs8v3l2fk0p1v8lf9m45dm997yhq0cmqgw10jxxiybn";
};
doCheck = true;
@@ -39,8 +39,6 @@ stdenv.mkDerivation rec {
rm $out/share/icons/hicolor/icon-theme.cache
'';
- patches = [ ./fix_files_loss.patch ];
-
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Videos;
description = "Movie player for the GNOME desktop based on GStreamer";
diff --git a/pkgs/desktops/gnome-3/3.12/core/totem/fix_files_loss.patch b/pkgs/desktops/gnome-3/3.12/core/totem/fix_files_loss.patch
deleted file mode 100644
index b85ad1efd00..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/totem/fix_files_loss.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 524c9e39a0ca6f2d1699e6e6d9ba3db1ea80d9f9 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera
-Date: Thu, 15 May 2014 19:28:35 +0200
-Subject: main: Fix potential data loss when removing multiple files
-
-We were using a list of GtkTreePaths and deleting the items one-by-one
-when the user clicked the "Delete" button. But after the first deletion,
-the tree model would have changed, and instead of pointing to the 2nd
-item we wanted to delete, the GtkTreePath would have pointed to another
-item, usually not one that we wanted to delete.
-
-We now use GtkTreeRowReferences, which will always point to the same
-row, as long as it exists.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=729778
-
-diff --git a/src/totem-grilo.c b/src/totem-grilo.c
-index 2133d77..0cff0d6 100644
---- a/src/totem-grilo.c
-+++ b/src/totem-grilo.c
-@@ -2074,7 +2074,8 @@ static void
- delete_foreach (gpointer data,
- gpointer user_data)
- {
-- GtkTreePath *path = data;
-+ GtkTreeRowReference *ref = data;
-+ GtkTreePath *path;
- GtkTreeModel *view_model = user_data;
- GtkTreeIter iter;
- GrlSource *source;
-@@ -2085,8 +2086,11 @@ delete_foreach (gpointer data,
- GtkTreeModel *model;
- GtkTreeIter real_model_iter;
-
-- if (!gtk_tree_model_get_iter (view_model, &iter, path))
-+ path = gtk_tree_row_reference_get_path (ref);
-+ if (!path || !gtk_tree_model_get_iter (view_model, &iter, path)) {
-+ g_warning ("An item that was scheduled for removal isn't available any more");
- return;
-+ }
-
- gtk_tree_model_get (view_model, &iter,
- MODEL_RESULTS_CONTENT, &media,
-@@ -2151,14 +2155,23 @@ delete_cb (TotemSelectionToolbar *bar,
- TotemGrilo *self)
- {
- GtkTreeModel *model;
-- GList *list;
-+ GList *list, *l;
-
- g_signal_handlers_block_by_func (self->priv->browser, "view-selection-changed", self);
-
- model = gd_main_view_get_model (GD_MAIN_VIEW (self->priv->browser));
- list = gd_main_view_get_selection (GD_MAIN_VIEW (self->priv->browser));
-+
-+ /* GList of GtkTreePaths to a GList of GtkTreeRowReferences */
-+ for (l = list; l != NULL; l = l->next) {
-+ GtkTreeRowReference *ref;
-+
-+ ref = gtk_tree_row_reference_new (model, l->data);
-+ gtk_tree_path_free (l->data);
-+ l->data = ref;
-+ }
- g_list_foreach (list, delete_foreach, model);
-- g_list_free_full (list, (GDestroyNotify) gtk_tree_path_free);
-+ g_list_free_full (list, (GDestroyNotify) gtk_tree_row_reference_free);
-
- g_signal_handlers_unblock_by_func (self->priv->browser, "view-selection-changed", self);
-
---
-cgit v0.10.1
-
diff --git a/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix b/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix
index 79155fe9b56..cf84f511416 100644
--- a/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix
@@ -8,11 +8,11 @@
, libpng, libexif, libgsf, libuuid, bzip2 }:
stdenv.mkDerivation rec {
- name = "tracker-1.0.1";
+ name = "tracker-1.0.3";
src = fetchurl {
url = "mirror://gnome/sources/tracker/1.0/${name}.tar.xz";
- sha256 = "76e7918e62526a8209f9c9226f82abe592a6332826ac7c12e6e405063181e889";
+ sha256 = "11pqcldgh07mjn38dlbj6ry5qkfbpf79ln5sqx7q86hhqzh3712h";
};
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
diff --git a/pkgs/desktops/gnome-3/3.12/core/vte/default.nix b/pkgs/desktops/gnome-3/3.12/core/vte/default.nix
index 41597e47fa5..f63ae98c486 100644
--- a/pkgs/desktops/gnome-3/3.12/core/vte/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/vte/default.nix
@@ -1,18 +1,20 @@
-{ stdenv, fetchurl, intltool, pkgconfig, gnome3, ncurses, gobjectIntrospection }:
+{ stdenv, fetchurl, intltool, pkgconfig, gnome3, ncurses, gobjectIntrospection, vala, libxml2
+, selectTextPatch ? false }:
stdenv.mkDerivation rec {
-
versionMajor = "0.36";
- versionMinor = "2";
+ versionMinor = "3";
moduleName = "vte";
name = "${moduleName}-${versionMajor}.${versionMinor}";
src = fetchurl {
url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
- sha256 = "f45eed3aed823068c7563345ea947be0e6ddb3dacd74646e6d7d26a921e04345";
+ sha256 = "54e5b07be3c0f7b158302f54ee79d4de1cb002f4259b6642b79b1e0e314a959c";
};
+ patches = with stdenv.lib; optional selectTextPatch ./expose_select_text.patch;
+
buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib gnome3.gtk3 ncurses ];
configureFlags = [ "--enable-introspection" ];
diff --git a/pkgs/desktops/gnome-3/3.12/core/vte/expose_select_text.patch b/pkgs/desktops/gnome-3/3.12/core/vte/expose_select_text.patch
new file mode 100644
index 00000000000..80a2a445ec0
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/vte/expose_select_text.patch
@@ -0,0 +1,214 @@
+diff -aur vte-0.32.2-old/src/vte.c vte-0.32.2/src/vte.c
+--- vte-0.32.2-old/src/vte.c 2012-07-13 21:09:04.003969877 -0400
++++ vte-0.32.2/src/vte.c 2012-08-30 04:30:04.285924831 -0400
+@@ -129,7 +129,6 @@
+ gpointer data,
+ GArray *attributes,
+ gboolean include_trailing_spaces);
+-static void _vte_terminal_disconnect_pty_read(VteTerminal *terminal);
+ static void _vte_terminal_disconnect_pty_write(VteTerminal *terminal);
+ static void vte_terminal_stop_processing (VteTerminal *terminal);
+
+@@ -3508,8 +3507,8 @@
+ _vte_debug_print (VTE_DEBUG_IO, "removed poll of vte_terminal_io_read\n");
+ terminal->pvt->pty_input_source = 0;
+ }
+-static void
+-_vte_terminal_connect_pty_read(VteTerminal *terminal)
++void
++vte_terminal_connect_pty_read(VteTerminal *terminal)
+ {
+ if (terminal->pvt->pty_channel == NULL) {
+ return;
+@@ -3560,8 +3559,8 @@
+ }
+ }
+
+-static void
+-_vte_terminal_disconnect_pty_read(VteTerminal *terminal)
++void
++vte_terminal_disconnect_pty_read(VteTerminal *terminal)
+ {
+ if (terminal->pvt->pty_input_source != 0) {
+ _vte_debug_print (VTE_DEBUG_IO, "disconnecting poll of vte_terminal_io_read\n");
+@@ -3708,8 +3707,8 @@
+ return NULL;
+ }
+
+-static char *
+-_vte_terminal_get_user_shell_with_fallback (void)
++char *
++vte_terminal_get_user_shell_with_fallback (void)
+ {
+ char *command;
+ const gchar *env;
+@@ -3744,7 +3743,7 @@
+ char **argv2;
+ char *shell = NULL;
+
+- argv2 = __vte_pty_get_argv(command ? command : (shell = _vte_terminal_get_user_shell_with_fallback ()),
++ argv2 = __vte_pty_get_argv(command ? command : (shell = vte_terminal_get_user_shell_with_fallback ()),
+ argv,
+ flags);
+ g_free(shell);
+@@ -6545,6 +6544,28 @@
+ }
+ }
+
++/**
++ * vte_terminal_set_cursor_position:
++ * @terminal: a #VteTerminal
++ * @column: the new cursor column
++ * @row: the new cursor row
++ *
++ * Set the location of the cursor.
++ */
++void
++vte_terminal_set_cursor_position(VteTerminal *terminal,
++ long column, long row)
++{
++ g_return_if_fail(VTE_IS_TERMINAL(terminal));
++
++ _vte_invalidate_cursor_once(terminal, FALSE);
++ terminal->pvt->screen->cursor_current.col = column;
++ terminal->pvt->screen->cursor_current.row = row;
++ _vte_invalidate_cursor_once(terminal, FALSE);
++ _vte_check_cursor_blink(terminal);
++ vte_terminal_queue_cursor_moved(terminal);
++}
++
+ static GtkClipboard *
+ vte_terminal_clipboard_get(VteTerminal *terminal, GdkAtom board)
+ {
+@@ -6676,7 +6697,7 @@
+ terminal->pvt->selection_start.row);
+
+ /* Temporarily stop caring about input from the child. */
+- _vte_terminal_disconnect_pty_read(terminal);
++ vte_terminal_disconnect_pty_read(terminal);
+ }
+
+ static gboolean
+@@ -6693,7 +6714,7 @@
+ terminal->pvt->selecting = FALSE;
+
+ /* Reconnect to input from the child if we paused it. */
+- _vte_terminal_connect_pty_read(terminal);
++ vte_terminal_connect_pty_read(terminal);
+
+ return TRUE;
+ }
+@@ -8994,7 +9015,7 @@
+ #endif
+ kill(terminal->pvt->pty_pid, SIGHUP);
+ }
+- _vte_terminal_disconnect_pty_read(terminal);
++ vte_terminal_disconnect_pty_read(terminal);
+ _vte_terminal_disconnect_pty_write(terminal);
+ if (terminal->pvt->pty_channel != NULL) {
+ g_io_channel_unref (terminal->pvt->pty_channel);
+@@ -14384,7 +14405,7 @@
+ g_object_freeze_notify(object);
+
+ if (pvt->pty != NULL) {
+- _vte_terminal_disconnect_pty_read(terminal);
++ vte_terminal_disconnect_pty_read(terminal);
+ _vte_terminal_disconnect_pty_write(terminal);
+
+ if (terminal->pvt->pty_channel != NULL) {
+@@ -14440,7 +14461,7 @@
+ _vte_terminal_setup_utf8 (terminal);
+
+ /* Open channels to listen for input on. */
+- _vte_terminal_connect_pty_read (terminal);
++ vte_terminal_connect_pty_read (terminal);
+
+ g_object_notify(object, "pty");
+ g_object_notify(object, "pty-object");
+@@ -14567,6 +14588,50 @@
+ }
+ }
+
++/**
++ * vte_terminal_get_selection_block_mode:
++ * @terminal: a #VteTerminal
++ *
++ * Checks whether or not block selection is enabled.
++ *
++ * Returns: %TRUE if block selection is enabled, %FALSE if not
++ */
++gboolean
++vte_terminal_get_selection_block_mode(VteTerminal *terminal) {
++ g_return_val_if_fail(VTE_IS_TERMINAL(terminal), FALSE);
++ return terminal->pvt->selection_block_mode;
++}
++
++/**
++ * vte_terminal_set_selection_block_mode:
++ * @terminal: a #VteTerminal
++ * @block_mode: whether block selection is enabled
++ *
++ * Sets whether or not block selection is enabled.
++ */
++void
++vte_terminal_set_selection_block_mode(VteTerminal *terminal, gboolean block_mode) {
++ g_return_if_fail(VTE_IS_TERMINAL(terminal));
++ terminal->pvt->selection_block_mode = block_mode;
++}
++
++/**
++ * vte_terminal_select_text:
++ * @terminal: a #VteTerminal
++ * @start_col: the starting column for the selection
++ * @start_row: the starting row for the selection
++ * @end_col: the end column for the selection
++ * @end_row: the end row for the selection
++ *
++ * Sets the current selection region.
++ */
++void
++vte_terminal_select_text(VteTerminal *terminal,
++ long start_col, long start_row,
++ long end_col, long end_row) {
++ _vte_terminal_select_text(terminal, start_col, start_row, end_col, end_row, 0, 0);
++}
++
+ void
+ _vte_terminal_select_text(VteTerminal *terminal,
+ long start_col, long start_row,
+diff -aur vte-0.32.2-old/src/vte.h vte-0.32.2/src/vte.h
+--- vte-0.32.2-old/src/vte.h 2012-07-13 21:09:04.003969877 -0400
++++ vte-0.32.2/src/vte.h 2012-08-30 04:30:09.695999432 -0400
+@@ -296,6 +296,15 @@
+ /* simple manipulation of selection */
+ void vte_terminal_select_all(VteTerminal *terminal);
+ void vte_terminal_select_none(VteTerminal *terminal);
++gboolean vte_terminal_get_selection_block_mode(VteTerminal *terminal);
++void vte_terminal_set_selection_block_mode(VteTerminal *terminal, gboolean block_mode);
++void vte_terminal_select_text(VteTerminal *terminal,
++ long start_col, long start_row,
++ long end_col, long end_row);
++
++/* pause and unpause output */
++void vte_terminal_disconnect_pty_read(VteTerminal *vte);
++void vte_terminal_connect_pty_read(VteTerminal *vte);
+
+ /* Set the terminal's size. */
+ void vte_terminal_set_size(VteTerminal *terminal,
+@@ -435,6 +444,8 @@
+ GArray *attributes);
+ void vte_terminal_get_cursor_position(VteTerminal *terminal,
+ glong *column, glong *row);
++void vte_terminal_set_cursor_position(VteTerminal *terminal,
++ long column, long row);
+ /* Display string matching: clear all matching expressions. */
+ void vte_terminal_match_clear_all(VteTerminal *terminal);
+
+@@ -484,6 +495,7 @@
+ VtePty *vte_terminal_get_pty_object(VteTerminal *terminal);
+
+ char *vte_get_user_shell (void);
++char *vte_terminal_get_user_shell_with_fallback(void);
+
+ /* Accessors for bindings. */
+ #if !GTK_CHECK_VERSION (2, 91, 2)
diff --git a/pkgs/desktops/gnome-3/3.12/default.nix b/pkgs/desktops/gnome-3/3.12/default.nix
index 586c66e8494..a46f49cbb5a 100644
--- a/pkgs/desktops/gnome-3/3.12/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/default.nix
@@ -164,10 +164,12 @@ rec {
totem-pl-parser = callPackage ./core/totem-pl-parser { };
- tracker = callPackage ./core/tracker { };
+ tracker = callPackage ./core/tracker { giflib = pkgs.giflib_5_0; };
vte = callPackage ./core/vte { };
+ vte-select-text = callPackage ./core/vte { selectTextPatch = true; };
+
vino = callPackage ./core/vino { };
yelp = callPackage ./core/yelp { };
@@ -211,6 +213,8 @@ rec {
seahorse = callPackage ./apps/seahorse { };
+ pomodoro = callPackage ./apps/pomodoro { };
+
#### Dev http://ftp.gnome.org/pub/GNOME/devtools/
anjuta = callPackage ./devtools/anjuta { };
@@ -232,7 +236,7 @@ rec {
libgit2-glib = callPackage ./misc/libgit2-glib { };
libmediaart = callPackage ./misc/libmediaart { };
-
+
gexiv2 = callPackage ./misc/gexiv2 { };
gnome-tweak-tool = callPackage ./misc/gnome-tweak-tool { };
@@ -240,4 +244,5 @@ rec {
gpaste = callPackage ./misc/gpaste { };
gtkhtml = callPackage ./misc/gtkhtml { };
+
}
diff --git a/pkgs/desktops/gnome-3/3.12/misc/geary/default.nix b/pkgs/desktops/gnome-3/3.12/misc/geary/default.nix
index 1eb6c0e3ed2..768e8bdb36e 100644
--- a/pkgs/desktops/gnome-3/3.12/misc/geary/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/misc/geary/default.nix
@@ -5,11 +5,11 @@
, gnome3, librsvg, gnome_doc_utils, webkitgtk }:
stdenv.mkDerivation rec {
- name = "geary-0.6.0";
+ name = "geary-0.6.2";
src = fetchurl {
url = "mirror://gnome/sources/geary/0.6/${name}.tar.xz";
- sha256 = "44ad1dc2c81c50006c751f8e72aa817f07002188da4c29e158060524a1962715";
+ sha256 = "0ap40mpj89sx82kcxlhl9gipq34ks2b70yhiv9s8zc5wg0nm7rpg";
};
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
diff --git a/pkgs/desktops/gnome-3/3.12/misc/gitg/default.nix b/pkgs/desktops/gnome-3/3.12/misc/gitg/default.nix
index 7ca35a8255f..401d5cf2f36 100644
--- a/pkgs/desktops/gnome-3/3.12/misc/gitg/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/misc/gitg/default.nix
@@ -6,11 +6,11 @@
# use packaged gnome3.gnome_icon_theme_symbolic
stdenv.mkDerivation rec {
- name = "gitg-0.3.2";
+ name = "gitg-3.13.91";
src = fetchurl {
- url = "mirror://gnome/sources/gitg/0.3/${name}.tar.xz";
- sha256 = "03vc59d1r3326piqdph6qjqnc40chm1lpg52lpf8466ddjs0x8vp";
+ url = "mirror://gnome/sources/gitg/3.13/${name}.tar.xz";
+ sha256 = "1c2016grvgg5f3l5xkracz85rblsc1a4brzr6vgn6kh2h494rv37";
};
preCheck = ''
diff --git a/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/default.nix
index 2eccb9a32cf..26e9144349f 100644
--- a/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/default.nix
@@ -4,11 +4,11 @@
, gnome3, librsvg, gdk_pixbuf, file, libnotify }:
stdenv.mkDerivation rec {
- name = "gnome-tweak-tool-3.10.1";
+ name = "gnome-tweak-tool-3.12.0";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-tweak-tool/3.10/${name}.tar.xz";
- sha256 = "fb5af9022c0521a925ef9f295e4080212b1b45427cd5f5f3a901667590afa7ec";
+ url = "mirror://gnome/sources/gnome-tweak-tool/3.12/${name}.tar.xz";
+ sha256 = "f8811d638797ef62500770a8dccc5bc689a427c8396a0dff8cbeddffdebf0e29";
};
doCheck = true;
@@ -30,7 +30,6 @@ stdenv.mkDerivation rec {
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
- --prefix LD_LIBRARY_PATH ":" "${libsoup}/lib:${gnome3.gnome_desktop}/lib:${libnotify}/lib:${gtk3}/lib:${atk}/lib" \
--prefix PYTHONPATH : "$PYTHONPATH:$(toPythonPath $out)"
'';
diff --git a/pkgs/desktops/gnome-3/3.12/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/3.12/misc/gpaste/default.nix
index 56a5f18544f..48a08601407 100644
--- a/pkgs/desktops/gnome-3/3.12/misc/gpaste/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/misc/gpaste/default.nix
@@ -2,12 +2,12 @@
, pango, gtk3, gnome3, dbus, clutter, appdata-tools, makeWrapper }:
stdenv.mkDerivation rec {
- version = "3.12.2";
+ version = "3.12.3";
name = "gpaste-${version}";
src = fetchurl {
url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz";
- sha256 = "665c1d228c02148a8a1a5675d352cd4397a02c0c9992af2e9f0258dcc6b812ec";
+ sha256 = "03f48kaidgbnyi4c7qgkwvnxs5rz7nk9m3iqfpsbhc512c8qnc1f";
};
buildInputs = [ intltool autoreconfHook pkgconfig vala glib
@@ -30,8 +30,7 @@ stdenv.mkDerivation rec {
for i in $out/libexec/gpaste/*; do
wrapProgram $i \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
- --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
- --prefix LD_LIBRARY_PATH : "${libPath}"
+ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH"
done
'';
diff --git a/pkgs/desktops/gnome-3/3.12/misc/libgit2-glib/default.nix b/pkgs/desktops/gnome-3/3.12/misc/libgit2-glib/default.nix
index 17c3b4fa0a8..94776c90cf9 100644
--- a/pkgs/desktops/gnome-3/3.12/misc/libgit2-glib/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/misc/libgit2-glib/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, fetchurl, gnome3, libtool, pkgconfig
+{ stdenv, fetchurl, gnome3, libtool, pkgconfig, vala
, gtk_doc, gobjectIntrospection, libgit2, glib }:
stdenv.mkDerivation rec {
name = "libgit2-glib-${version}";
- version = "0.0.10";
+ version = "0.0.20";
src = fetchurl {
url = "https://github.com/GNOME/libgit2-glib/archive/v${version}.tar.gz";
- sha256 = "0zn3k85jw6yks8s5ca8dyh9mwh4if1lni9gz9bd5lqlpa803ixxs";
+ sha256 = "1s2hj0ji73ishniqvr6mx90l1ji5jjwwrwhp91i87fxk0d3sry5x";
};
configureScript = "sh ./autogen.sh";
- buildInputs = [ gnome3.gnome_common libtool pkgconfig
+ buildInputs = [ gnome3.gnome_common libtool pkgconfig vala
gtk_doc gobjectIntrospection libgit2 glib ];
meta = with stdenv.lib; {
diff --git a/pkgs/desktops/kde-4.12/files/kdelibs-cve-2014-5033.patch b/pkgs/desktops/kde-4.12/files/kdelibs-cve-2014-5033.patch
new file mode 100644
index 00000000000..c85eccd6beb
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/files/kdelibs-cve-2014-5033.patch
@@ -0,0 +1,36 @@
+--- a/kdecore/auth/backends/polkit-1/Polkit1Backend.cpp
++++ b/kdecore/auth/backends/polkit-1/Polkit1Backend.cpp
+@@ -144,7 +144,7 @@
+
+ Action::AuthStatus Polkit1Backend::actionStatus(const QString &action)
+ {
+- PolkitQt1::UnixProcessSubject subject(QCoreApplication::applicationPid());
++ PolkitQt1::SystemBusNameSubject subject(QString::fromUtf8(callerID()));
+ PolkitQt1::Authority::Result r = PolkitQt1::Authority::instance()->checkAuthorizationSync(action, subject,
+ PolkitQt1::Authority::None);
+ switch (r) {
+@@ -160,21 +160,12 @@
+
+ QByteArray Polkit1Backend::callerID() const
+ {
+- QByteArray a;
+- QDataStream s(&a, QIODevice::WriteOnly);
+- s << QCoreApplication::applicationPid();
+-
+- return a;
++ return QDBusConnection::systemBus().baseService().toUtf8();
+ }
+
+ bool Polkit1Backend::isCallerAuthorized(const QString &action, QByteArray callerID)
+ {
+- QDataStream s(&callerID, QIODevice::ReadOnly);
+- qint64 pid;
+-
+- s >> pid;
+-
+- PolkitQt1::UnixProcessSubject subject(pid);
++ PolkitQt1::SystemBusNameSubject subject(QString::fromUtf8(callerID));
+ PolkitQt1::Authority *authority = PolkitQt1::Authority::instance();
+
+ PolkitResultEventLoop e;
+
diff --git a/pkgs/desktops/kde-4.12/kde-workspace.nix b/pkgs/desktops/kde-4.12/kde-workspace.nix
index 537beaac6ae..38e28225d94 100644
--- a/pkgs/desktops/kde-4.12/kde-workspace.nix
+++ b/pkgs/desktops/kde-4.12/kde-workspace.nix
@@ -20,7 +20,7 @@ kde {
xorg.libxkbfile xorg.libXcomposite xorg.libXtst
xorg.libXdamage
- python boost qjson lm_sensors gpsd libraw1394 pciutils udev
+ python boost boost.lib qjson lm_sensors gpsd libraw1394 pciutils udev
akonadi pam libusb1 libqalculate kdepimlibs prison
kactivities
];
diff --git a/pkgs/desktops/kde-4.12/kdebindings/pykde4.nix b/pkgs/desktops/kde-4.12/kdebindings/pykde4.nix
index 64e196452e3..b298cdbc816 100644
--- a/pkgs/desktops/kde-4.12/kdebindings/pykde4.nix
+++ b/pkgs/desktops/kde-4.12/kdebindings/pykde4.nix
@@ -9,7 +9,7 @@ kde {
buildInputs = [
python kdepimlibs shared_desktop_ontologies
- boost polkit_qt_1
+ boost boost.lib polkit_qt_1
];
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/desktops/kde-4.12/kdeedu/kig.nix b/pkgs/desktops/kde-4.12/kdeedu/kig.nix
index 37906c32bcb..fb442e2ef62 100644
--- a/pkgs/desktops/kde-4.12/kdeedu/kig.nix
+++ b/pkgs/desktops/kde-4.12/kdeedu/kig.nix
@@ -1,6 +1,6 @@
{ kde, kdelibs, boost, python}:
kde {
- buildInputs = [ kdelibs boost python ];
+ buildInputs = [ kdelibs boost boost.lib python ];
cmakeFlags = "-DKIG_ENABLE_PYTHON_SCRIPTING=1";
meta = {
diff --git a/pkgs/desktops/kde-4.12/kdeedu/rocs.nix b/pkgs/desktops/kde-4.12/kdeedu/rocs.nix
index ce30d11fda3..135598ded90 100644
--- a/pkgs/desktops/kde-4.12/kdeedu/rocs.nix
+++ b/pkgs/desktops/kde-4.12/kdeedu/rocs.nix
@@ -1,7 +1,9 @@
{ kde, kdelibs, boost, grantlee }:
-
+let
+ boostpkg = boost.override { enableExceptions = true; };
+in
kde {
- buildInputs = [ kdelibs (boost.override { enableExceptions = true; }) grantlee ];
+ buildInputs = [ kdelibs boostpkg boostpkg.lib grantlee ];
NIX_CFLAGS_COMPILE = "-fexceptions";
diff --git a/pkgs/desktops/kde-4.12/kdelibs/kdelibs.nix b/pkgs/desktops/kde-4.12/kdelibs/kdelibs.nix
index 396adf9ba75..5db693e6ea0 100644
--- a/pkgs/desktops/kde-4.12/kdelibs/kdelibs.nix
+++ b/pkgs/desktops/kde-4.12/kdelibs/kdelibs.nix
@@ -28,7 +28,10 @@ kde {
# There are a few hardcoded paths.
# Split plugins from libs?
- patches = [ ../files/polkit-install.patch ];
+ patches = [
+ ../files/polkit-install.patch
+ ../files/kdelibs-cve-2014-5033.patch # Security patch, remove when updating to 4.14.0 or more
+ ];
cmakeFlags = [
"-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook"
diff --git a/pkgs/desktops/kde-4.12/kdenetwork/kdenetwork-strigi-analyzers.nix b/pkgs/desktops/kde-4.12/kdenetwork/kdenetwork-strigi-analyzers.nix
index e838d84fc5e..9a76863c8e0 100644
--- a/pkgs/desktops/kde-4.12/kdenetwork/kdenetwork-strigi-analyzers.nix
+++ b/pkgs/desktops/kde-4.12/kdenetwork/kdenetwork-strigi-analyzers.nix
@@ -1,7 +1,7 @@
{ kde, kdelibs, boost }:
kde {
- buildInputs = [ kdelibs boost ];
+ buildInputs = [ kdelibs boost boost.lib ];
meta = {
description = "Strigi analyzers for various network protocols";
diff --git a/pkgs/desktops/kde-4.12/kdenetwork/kget.nix b/pkgs/desktops/kde-4.12/kdenetwork/kget.nix
index f986da2de21..d7527ca6a60 100644
--- a/pkgs/desktops/kde-4.12/kdenetwork/kget.nix
+++ b/pkgs/desktops/kde-4.12/kdenetwork/kget.nix
@@ -8,7 +8,7 @@ kde {
buildInputs =
[ kdelibs libktorrent nepomuk_core nepomuk_widgets sqlite qca2
- libmms kde_baseapps kde_workspace boost ];
+ libmms kde_baseapps kde_workspace boost boost.lib ];
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/desktops/kde-4.12/kdenetwork/kopete.nix b/pkgs/desktops/kde-4.12/kdenetwork/kopete.nix
index 7d8aec21ce6..e8eab764419 100644
--- a/pkgs/desktops/kde-4.12/kdenetwork/kopete.nix
+++ b/pkgs/desktops/kde-4.12/kdenetwork/kopete.nix
@@ -10,7 +10,7 @@ kde {
buildInputs = [
kdelibs qca2 mediastreamer libgadu jsoncpp
kdepimlibs qimageblitz sqlite jasper libotr libmsn giflib
- libidn libxslt boost
+ libidn libxslt boost boost.lib
ortp srtp libv4l
];
diff --git a/pkgs/desktops/kde-4.12/kdepim-runtime.nix b/pkgs/desktops/kde-4.12/kdepim-runtime.nix
index d92e2254820..484d3e1933a 100644
--- a/pkgs/desktops/kde-4.12/kdepim-runtime.nix
+++ b/pkgs/desktops/kde-4.12/kdepim-runtime.nix
@@ -5,7 +5,7 @@ kde {
# TODO: libkgapi(2), LibKFbAPI,libkolab, libkolabxml
buildInputs = [
- kdepimlibs akonadi boost shared_desktop_ontologies
+ kdepimlibs akonadi boost boost.lib shared_desktop_ontologies
libxslt
];
diff --git a/pkgs/desktops/kde-4.12/kdepim.nix b/pkgs/desktops/kde-4.12/kdepim.nix
index 4f364648d23..0f5d868837e 100644
--- a/pkgs/desktops/kde-4.12/kdepim.nix
+++ b/pkgs/desktops/kde-4.12/kdepim.nix
@@ -8,9 +8,9 @@ kde {
# TODO: LinkGrammar
buildInputs =
- [ kdepimlibs boost shared_desktop_ontologies akonadi nepomuk_widgets
- libxslt cyrus_sasl gpgme libassuan grantlee prison kactivities
- libXScrnSaver qjson
+ [ kdepimlibs boost boost.lib shared_desktop_ontologies akonadi
+ nepomuk_widgets libxslt cyrus_sasl gpgme libassuan grantlee prison
+ kactivities libXScrnSaver qjson
];
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/desktops/kde-4.12/kdepimlibs.nix b/pkgs/desktops/kde-4.12/kdepimlibs.nix
index ca0af9400b1..90d2717b880 100644
--- a/pkgs/desktops/kde-4.12/kdepimlibs.nix
+++ b/pkgs/desktops/kde-4.12/kdepimlibs.nix
@@ -6,7 +6,7 @@ kde {
nativeBuildInputs = [ pkgconfig ];
buildInputs =
- [ boost gpgme libical libxslt qjson prison
+ [ boost boost.lib gpgme libical libxslt qjson prison
openldap cyrus_sasl akonadi shared_desktop_ontologies
];
diff --git a/pkgs/desktops/kde-4.12/kdeplasma-addons.nix b/pkgs/desktops/kde-4.12/kdeplasma-addons.nix
index 550099830d9..afc925c79aa 100644
--- a/pkgs/desktops/kde-4.12/kdeplasma-addons.nix
+++ b/pkgs/desktops/kde-4.12/kdeplasma-addons.nix
@@ -9,8 +9,8 @@ kde {
KDEDIRS=marble;
- buildInputs = [ kdelibs boost kde_workspace kdepimlibs attica qjson qoauth
- eigen qca2 libXtst qimageblitz libqalculate
+ buildInputs = [ kdelibs boost boost.lib kde_workspace kdepimlibs attica qjson
+ qoauth eigen qca2 libXtst qimageblitz libqalculate
shared_desktop_ontologies marble libkexiv2 libdbusmenu_qt
];
diff --git a/pkgs/desktops/kde-4.12/kdesdk/umbrello.nix b/pkgs/desktops/kde-4.12/kdesdk/umbrello.nix
index e83a2d9a901..2dbccdef945 100644
--- a/pkgs/desktops/kde-4.12/kdesdk/umbrello.nix
+++ b/pkgs/desktops/kde-4.12/kdesdk/umbrello.nix
@@ -1,7 +1,7 @@
{ kde, kdelibs, libxml2, libxslt, boost }:
kde {
- buildInputs = [ kdelibs libxml2 libxslt boost ];
+ buildInputs = [ kdelibs libxml2 libxslt boost boost.lib ];
meta = {
description = "Umbrello UML modeller";
diff --git a/pkgs/desktops/kde-4.12/kdeutils/kgpg.nix b/pkgs/desktops/kde-4.12/kdeutils/kgpg.nix
index 3ff1a286ae5..11b62f499a4 100644
--- a/pkgs/desktops/kde-4.12/kdeutils/kgpg.nix
+++ b/pkgs/desktops/kde-4.12/kdeutils/kgpg.nix
@@ -2,7 +2,7 @@
kde {
- buildInputs = [ kdelibs kdepimlibs boost ];
+ buildInputs = [ kdelibs kdepimlibs boost boost.lib ];
meta = {
description = "Simple KDE GUI for GPG";
diff --git a/pkgs/desktops/kde-4.12/kdewebdev/klinkstatus.nix b/pkgs/desktops/kde-4.12/kdewebdev/klinkstatus.nix
index 918512e2b2d..36630ef8fc6 100644
--- a/pkgs/desktops/kde-4.12/kdewebdev/klinkstatus.nix
+++ b/pkgs/desktops/kde-4.12/kdewebdev/klinkstatus.nix
@@ -4,7 +4,7 @@ kde {
# todo: ruby19 is not found by the build system. not linking against ruby18 due to it being too old
- buildInputs = [ kdelibs kdepimlibs htmlTidy boost ];
+ buildInputs = [ kdelibs kdepimlibs htmlTidy boost boost.lib ];
meta = {
description = "A KDE link checker";
diff --git a/pkgs/desktops/kde-4.12/support/akonadi/default.nix b/pkgs/desktops/kde-4.12/support/akonadi/default.nix
index d51996e3bc1..824fd3e6616 100644
--- a/pkgs/desktops/kde-4.12/support/akonadi/default.nix
+++ b/pkgs/desktops/kde-4.12/support/akonadi/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "0k96i8xq3xkm5rrxrj3zqgppcmqbzcpc918xnx0p54jkkm85gchc";
};
- buildInputs = [ qt4 soprano libxslt boost sqlite ];
+ buildInputs = [ qt4 soprano libxslt boost boost.lib sqlite ];
nativeBuildInputs = [ cmake automoc4 shared_mime_info ];
diff --git a/pkgs/desktops/kde-4.14/applications/kate.nix b/pkgs/desktops/kde-4.14/applications/kate.nix
new file mode 100644
index 00000000000..e7a6476dd6d
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/applications/kate.nix
@@ -0,0 +1,11 @@
+{ stdenv, kde, kdelibs, kactivities, qjson, pyqt4, sip, python, pykde4}:
+
+kde {
+
+ buildInputs = [ kdelibs kactivities qjson pyqt4 sip python pykde4 ];
+
+ meta = {
+ description = "Kate, the KDE Advanced Text Editor, as well as KWrite";
+ license = stdenv.lib.licenses.gpl2;
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/applications/konsole.nix b/pkgs/desktops/kde-4.14/applications/konsole.nix
new file mode 100644
index 00000000000..bd4e9e58cd0
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/applications/konsole.nix
@@ -0,0 +1,11 @@
+{ stdenv, kde, kdelibs, kde_baseapps }:
+
+kde {
+
+ buildInputs = [ kdelibs kde_baseapps ];
+
+ meta = {
+ description = "Konsole, the KDE terminal emulator";
+ license = stdenv.lib.licenses.gpl2;
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/default.nix b/pkgs/desktops/kde-4.14/default.nix
new file mode 100644
index 00000000000..2a20bde568b
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/default.nix
@@ -0,0 +1,44 @@
+{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.14.1" }:
+
+let
+ branch = "4.14";
+
+ # Need callPackageOrig to avoid infinite cycle
+ kde = callPackageOrig ./kde-package {
+ inherit release branch ignoreList extraSubpkgs callPackage;
+ };
+
+ # The list of igored individual modules
+ ignoreList = {
+ # Doesn't work yet
+ kdeutils = [ "ksecrets" ];
+ # kdeadmin/strigi-analyzer has no real code
+ kdeadmin = [ "strigi-analyzer" ];
+ # Most of kdebindings do not compile due to a bug in the buildsystem
+ kdebindings = [ "kimono" "korundum" "kross-interpreters" "perlkde" "qyoto" ];
+ };
+
+ # Extra subpackages in the manifest format
+ extraSubpkgs = {};
+
+in
+
+kde.modules // kde.individual //
+{
+ inherit (kde) manifest modules individual splittedModuleList;
+
+ akonadi = callPackage ./support/akonadi { };
+
+ qt4 = qt48;
+
+ kdebase_workspace = kde.modules.kde_workspace;
+
+ inherit release;
+
+ full = stdenv.lib.attrValues kde.modules;
+
+ l10n = callPackage ./l10n {
+ inherit release branch;
+ inherit (kde.manifest) stable;
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/files/kde-wallpapers-buildsystem.patch b/pkgs/desktops/kde-4.14/files/kde-wallpapers-buildsystem.patch
new file mode 100644
index 00000000000..378cdb64694
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/files/kde-wallpapers-buildsystem.patch
@@ -0,0 +1,17 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3d3e247..f78db67 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,5 +1,10 @@
+-find_package(KDE4 REQUIRED)
+-include(KDE4Defaults)
++project(kde-wallpapers NONE)
++if( WALLPAPER_INSTALL_DIR )
++ message(STATUS "Installing wallpapers to user-supplied directory ${WALLPAPER_INSTALL_DIR}")
++else()
++ find_package(KDE4 REQUIRED)
++ include(KDE4Defaults)
++endif()
+
+ install(DIRECTORY Air DESTINATION ${WALLPAPER_INSTALL_DIR} PATTERN .svn EXCLUDE)
+
diff --git a/pkgs/desktops/kde-4.14/files/kdelibs-cve-2014-5033.patch b/pkgs/desktops/kde-4.14/files/kdelibs-cve-2014-5033.patch
new file mode 100644
index 00000000000..c85eccd6beb
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/files/kdelibs-cve-2014-5033.patch
@@ -0,0 +1,36 @@
+--- a/kdecore/auth/backends/polkit-1/Polkit1Backend.cpp
++++ b/kdecore/auth/backends/polkit-1/Polkit1Backend.cpp
+@@ -144,7 +144,7 @@
+
+ Action::AuthStatus Polkit1Backend::actionStatus(const QString &action)
+ {
+- PolkitQt1::UnixProcessSubject subject(QCoreApplication::applicationPid());
++ PolkitQt1::SystemBusNameSubject subject(QString::fromUtf8(callerID()));
+ PolkitQt1::Authority::Result r = PolkitQt1::Authority::instance()->checkAuthorizationSync(action, subject,
+ PolkitQt1::Authority::None);
+ switch (r) {
+@@ -160,21 +160,12 @@
+
+ QByteArray Polkit1Backend::callerID() const
+ {
+- QByteArray a;
+- QDataStream s(&a, QIODevice::WriteOnly);
+- s << QCoreApplication::applicationPid();
+-
+- return a;
++ return QDBusConnection::systemBus().baseService().toUtf8();
+ }
+
+ bool Polkit1Backend::isCallerAuthorized(const QString &action, QByteArray callerID)
+ {
+- QDataStream s(&callerID, QIODevice::ReadOnly);
+- qint64 pid;
+-
+- s >> pid;
+-
+- PolkitQt1::UnixProcessSubject subject(pid);
++ PolkitQt1::SystemBusNameSubject subject(QString::fromUtf8(callerID));
+ PolkitQt1::Authority *authority = PolkitQt1::Authority::instance();
+
+ PolkitResultEventLoop e;
+
diff --git a/pkgs/desktops/kde-4.14/files/polkit-install.patch b/pkgs/desktops/kde-4.14/files/polkit-install.patch
new file mode 100644
index 00000000000..d2ecac663ec
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/files/polkit-install.patch
@@ -0,0 +1,12 @@
+diff -ru -x '*~' kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake
+--- kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake 2011-05-20 22:24:54.000000000 +0200
++++ kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake 2011-07-12 14:03:00.000000000 +0200
+@@ -139,7 +139,7 @@
+ ${CMAKE_INSTALL_PREFIX} _KDE4_AUTH_POLICY_FILES_INSTALL_DIR
+ ${POLKITQT-1_POLICY_FILES_INSTALL_DIR})
+
+- set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR ${_KDE4_AUTH_POLICY_FILES_INSTALL_DIR} CACHE STRING
++ set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions" CACHE STRING
+ "Where policy files generated by KAuth will be installed" FORCE)
+ elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "FAKE")
+ set (KAUTH_COMPILING_FAKE_BACKEND TRUE)
diff --git a/pkgs/desktops/kde-4.14/kactivities.nix b/pkgs/desktops/kde-4.14/kactivities.nix
new file mode 100644
index 00000000000..9a08b58e1ea
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kactivities.nix
@@ -0,0 +1,15 @@
+{ fetchurl, kde, kdelibs, nepomuk_core }:
+
+kde {
+
+ src = fetchurl {
+ url = "mirror://kde/stable/4.13.3/src/kactivities-4.13.3.tar.xz";
+ sha256 = "12l9brpq8mr9hqqmnlz9xfsfr8ry6283b32nfqfx0p3f7w19vjy7";
+ };
+
+ propagatedBuildInputs = [ kdelibs nepomuk_core ];
+
+ meta = {
+ description = "KDE activities library and daemon";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kde-base-artwork.nix b/pkgs/desktops/kde-4.14/kde-base-artwork.nix
new file mode 100644
index 00000000000..3f416cebddc
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kde-base-artwork.nix
@@ -0,0 +1,14 @@
+{ kde, kdelibs }:
+
+kde {
+ outputHashAlgo = "sha256";
+ outputHashMode = "recursive";
+ outputHash = "0mrd3w7rhsj0v92c8rh9zjxyifq7wyvwszksf2gyn53dzd06blk8";
+
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "KDE Base artwork";
+ license = "GPL";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kde-baseapps/kde-baseapps.nix b/pkgs/desktops/kde-4.14/kde-baseapps/kde-baseapps.nix
new file mode 100644
index 00000000000..a65f33e13de
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kde-baseapps/kde-baseapps.nix
@@ -0,0 +1,11 @@
+{ stdenv, kde, kdelibs, htmlTidy, kactivities
+, nepomuk_core, nepomuk_widgets, libXt }:
+
+kde {
+ buildInputs = [ kdelibs nepomuk_core nepomuk_widgets htmlTidy kactivities libXt ];
+
+ meta = {
+ description = "Base KDE applications, including the Dolphin file manager and Konqueror web browser";
+ license = stdenv.lib.licenses.gpl2;
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kde-package/4.14.1.nix b/pkgs/desktops/kde-4.14/kde-package/4.14.1.nix
new file mode 100644
index 00000000000..477e116e5e0
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kde-package/4.14.1.nix
@@ -0,0 +1,627 @@
+{stable=true;
+hashes=builtins.listToAttrs[
+ {name="amor";value="143fhmgbmy7nlhhlbgh4s9ripqiidlx9bfrcrhamhgl11jjdr0mc";}
+ {name="analitza";value="18w35j4pag0s075d6yykkqg9cwfgx88zv0qgzas58qhzd3kjcijf";}
+ {name="ark";value="17imd7pfzjd1vfr69499fg51hmymzspax8l64gskmygdwbx7shh8";}
+ {name="artikulate";value="1gqvwz5amwssgjkldzg9gnixi88i5vdmk3s1bq94i0z3p0y3h88a";}
+ {name="audiocd-kio";value="02aq2qs01kz79jdi0sqr6hs7y1z8f4lf9mpv687pfv4g82fg2jh7";}
+ {name="baloo";value="0nvq2j81y75zf0f2p08av8iw7dc84826fsa93l14334ci245lar7";}
+ {name="baloo-widgets";value="11ma80nsb6x1wfh83k4g5aafwqsz6j9c4xmnbcc8bm57wssd8jxc";}
+ {name="blinken";value="11mmm12465bfikpzl486pznprj2rgcnxvpr4mniqfdjcijsfwdwd";}
+ {name="bomber";value="1lkn2nasyynf4kyrard39mckgfq558255ry07r3z7cvn9m8hc08y";}
+ {name="bovo";value="0sfb24ksh8gg6b7269skmxs72kkgd9cbgz0xs1hvd5y8w9cmz3yl";}
+ {name="cantor";value="07i5p439b15wl106h7fq2c016cd6jpdi18rz5m9sylaaj87a5d26";}
+ {name="cervisia";value="0sspkafcbma2vig9r5dl1z70p95nm2y3rfzssng7i6kam6fr4yqd";}
+ {name="dolphin-plugins";value="0a4pvxz1s44lszy8mqvw8rzilmq3vrjb30y08j0gp7id1xc3lpn0";}
+ {name="dragon";value="0dnfhmpifcabc9y5w393pg7rw2425kqslh88ljkz4bh6yw767ihd";}
+ {name="ffmpegthumbs";value="1dmwwx96pp5vnrxk3f4vr08qwjny7ydmkdvzj1hmgsid1s283i6v";}
+ {name="filelight";value="03gr0ldpkbf2q3nx1w07mhgmilrn8mx0wy81140gd1wjwilk5d7x";}
+ {name="granatier";value="0dph80h7jj9d0wh67bp9m98i0imrq6dxv11rqylnfzsf70lp2xzs";}
+ {name="gwenview";value="0mybmdvblf05kif5aa1wc2g1sv30bnkd30kwn0f7s0xiq3kckf38";}
+ {name="jovie";value="1sgm1v93868sgjdjpfjn3kv7kjpg92lajm91qy1m49w2isg60f4v";}
+ {name="juk";value="1gqdidzq1bqbjkhf40abpfj2b0fkk4bpi8kb6crk3zfjhsfa7rbq";}
+ {name="kaccessible";value="002dwar3c965783si4y1q7qpv56s8mqddqz6mbx1qhmzy88br5q1";}
+ {name="kactivities";value="12l9brpq8mr9hqqmnlz9xfsfr8ry6283b32nfqfx0p3f7w19vjy7";}
+ {name="kajongg";value="07cpw5k03rg8f54g3a1vx6z5ihfid561yza8qihsmzyjay4v2hya";}
+ {name="kalgebra";value="132awnbgcr66xfb99mgqcnh7viyrvr7vdqxm9wwgmpa14n7lk56q";}
+ {name="kalzium";value="03rz0gl5pihs7xnw7i415bla8ck2afqzrb717xsf1lb7ihrsky8d";}
+ {name="kamera";value="0593gai9ysd6pb5qir5wikj9szj7dj35iy435rikfpc8gwfpnsaj";}
+ {name="kanagram";value="1s1pq7ldjgarwbf2m49r5pi6w88c1yn38b5d023qhrgjbw2kfbpy";}
+ {name="kapman";value="1lcm7miqrjjg469h5765gaqrcxzhm5279nps4v2x4vkng3s2pj1a";}
+ {name="kapptemplate";value="0h0gcc00l0mq5lmac2656xnadz8sp14vbzjq2zsxr5y0m3nmcfg4";}
+ {name="kate";value="0izgfkd15755g4g0hll0q9nbn21w0a0p0qa5mlxrhxdsik3f580q";}
+ {name="katomic";value="0f53q39vsk23r8ldikk24f083n52747jrkgd1hvama9amga74hlm";}
+ {name="kblackbox";value="0wndkaqmfj5c2s64sw8jhjrr6y7mrkmjgmnnadpw8gmkhkml6qzi";}
+ {name="kblocks";value="0rl2sf1jz3zh790vijazmg88wy1hj7r2pgmql6x2ccbd6pp8j9qw";}
+ {name="kbounce";value="1mq2xmx3886pgjyb91fk501kwyw6k49zm5qijyi7bw735dfcvqry";}
+ {name="kbreakout";value="1ba7n2392gxdsz4ijws01pv1w4djirqjbdqidqaknr2rrknfchk3";}
+ {name="kbruch";value="044p4q5668ng0gbbykmcb7xivx8djijp133ch8vy2gbg38xi81lj";}
+ {name="kcachegrind";value="12h7s1a5hz9l015qcjzm7w5xzk7v6h66qm7sfww49m6h0w1g41v8";}
+ {name="kcalc";value="02gkap5phz59h4sflz44f4az3xww97g6bsl8nin3x0skll0nxnlr";}
+ {name="kcharselect";value="0df30c854blqfzkarlpfxhls04gpi8d3sy9p9b1landaaqbbln9w";}
+ {name="kcolorchooser";value="1hxlizxk8ljxn9jgn7wn42i1h5zksdgvhiak7sgz1ci5x68622zw";}
+ {name="kcron";value="0g9yi9xg215n89rmqmkwnd55mv85m9nq6irmxvcmwy0x1cci23rp";}
+ {name="kdeartwork";value="18f36p9zfz6jgswnc7k45g6ahqd6glqxzp35q6pndk0bp448dg08";}
+ {name="kde-baseapps";value="0jclvwiwbkcd6l0k39v3hxn0pcj8lfn6g4rynq55ca4h3wwkwmdq";}
+ {name="kde-base-artwork";value="09gfxr4md2yl9c8alghpxn0hxlz931b7d000zv8hg4nvw00qrnaj";}
+ {name="kde-dev-scripts";value="12an5jhin26kdvk6kyc477dv00vfvwbg250402vmzx8ngs4crlg8";}
+ {name="kde-dev-utils";value="17ag4vl3lyvsg7m0chs83wvm67i4k49xhlkw4kvj4xryzbnf11m1";}
+ {name="kdegraphics-mobipocket";value="15nrzgh49zs73ja21ihd7pi6nzxm4c3zh4s7jjidz369qbafyj4x";}
+ {name="kdegraphics-strigi-analyzer";value="0wr8rq0mmp7jbj8y5zn2wccna7mv3myspvwlrpkplga0f3mxbnm7";}
+ {name="kdegraphics-thumbnailers";value="0iw0pslmqdrj94j26lj8sgvx6a8yy3pf6daxc5q4l580l5djq1k2";}
+ {name="kdelibs";value="0904qa0a8i1nhqcya9r3k6i5b1zyvm18g6a8w0abxm9fd089ps9p";}
+ {name="kdenetwork-filesharing";value="015rqw7gxapxnh0wxivyii36fg0n0spzsqv1x4qssj8ld8imvagv";}
+ {name="kdenetwork-strigi-analyzers";value="09m3zr8acwxy912lpdlk9p1daris2yh6fzfj3m76j822223knh83";}
+ {name="kdepim";value="0f9m59q30w9bdhjlhv3z72b9zrqnrjggafnsq26py8d58hg2lxms";}
+ {name="kdepimlibs";value="05ki1iacaraiwbabyiwzlr83f6askn4qf440cbsah8dyfm27srgb";}
+ {name="kdepim-runtime";value="0kc86l2qbb24w3389yrwwh4ww4yvnnj9wygmzm7cm51hbfjvd12p";}
+ {name="kdeplasma-addons";value="1nlnvj7k205cpkqkrbm0qpcfgc7rpb47xzv3r1z5iil9hz7d5jx6";}
+ {name="kde-runtime";value="1b6ag633jh519f1ncmmdy8j3ri6k7niblqsjmgk56xv4a9iy4cmg";}
+ {name="kdesdk-kioslaves";value="0brykgby8mh5laym4iwq7nz8q9slb79kc89jjlh4ci5n496h06v5";}
+ {name="kdesdk-strigi-analyzers";value="1gpp4pi59cd81kw6d1z26q02vifl0pz7rbk7ipvxmy8n873q42pn";}
+ {name="kdesdk-thumbnailers";value="0l662gzmm8gx6dcpw23lqnyfv0pdn7dfqqnxnwsnfycw9vd493g9";}
+ {name="kde-wallpapers";value="1ai36ii25m0yl8g42nidbimf3chsc8gh4rixyl8iqhf50wsghw94";}
+ {name="kdewebdev";value="1z87fffcnj1b2dimr05p702pcra80f1p1hcz45rf903cxgy6y1bf";}
+ {name="kde-workspace";value="0bwlz92q8fgdp5n0kc15l7f3642nqr3yrpyykf8zq15pq4daxn09";}
+ {name="kdf";value="04j3w1h6h2nb6566pb1yifjy2m25mi6dk4mvjxl680mwlqaaj3rz";}
+ {name="kdiamond";value="1lzx3alcczxx9xb7bvzarypfw6dcgcb6wngxmli2ppb1ghl4pnds";}
+ {name="kfilemetadata";value="1r4zdx32qsjzszym0riw65nn5rrcjm57a0yawik96fzxrrvrvzkc";}
+ {name="kfloppy";value="01lar9p26g4b2a6cz83jy9l6bd943jsysv18hr9lyxwm98747axa";}
+ {name="kfourinline";value="0193nc2g3mcm6m3s732dg6ha5kh6mgdkih0pf0zay9ahfhkrpziw";}
+ {name="kgamma";value="1fj9xnj3i8i18m5y2jhmclw337akyb8nmajksgwnd573s040zh84";}
+ {name="kgeography";value="1j1d62lfziz403qhwc41frx737sl25kz060crz60ix3sam7arvkl";}
+ {name="kget";value="1ndgd960iyvgshmikplr2fqq13zijc6g8rbavqpcs4az8bp2h6zy";}
+ {name="kgoldrunner";value="05346q4366qrm3idh3dbgi1ddajplbncrwn28vlhxbqkqb8qp51y";}
+ {name="kgpg";value="1nwrpdczf4wmmwasa5wiggs7cjc8ivr005q77vzj5094ajq457dy";}
+ {name="khangman";value="1jf10ixqwrn9f9wbhpppw6j3jpcp9ss4g4gairrklmr7v5cp59lr";}
+ {name="kig";value="07f85rab71kb6fn0zdqx068im3a63l2irqci9dha8cfh805jyl8y";}
+ {name="kigo";value="0vk2wq9z6xi86plx84agrl2j07jx98y1i9dsvimyvrxah32ykdka";}
+ {name="killbots";value="15azd5391247h2qn4shv0c4cz5hmr77xcbld2va5357xrbhzirx9";}
+ {name="kimono";value="0z4g580nn62zsf6rmxcg4z13n9vd9n24s1fzhc4d5kk6niszbjap";}
+ {name="kiriki";value="0mh7v16haiqkkfiapq8qivmbhyyczsq5sm8kzpddh40814p3sy9w";}
+ {name="kiten";value="12s7h19ybpm48gha23jkh86a2p71yqb3h93bs4mnkfgidjssvd43";}
+ {name="kjumpingcube";value="01wffw1s5crv11s3hg54ipwp09i8kgp7wjw038c83jgrvcw52ql5";}
+ {name="klettres";value="13bayjpny80d4avm77vmhm5f8ma4ckwiz63sximz8hyr6rg5i7fc";}
+ {name="klickety";value="0cmzzy2nf3zpmpyfsmrmfcklppib7qmg0pbxsm03y7az0qrz03bm";}
+ {name="klines";value="0k4xi6p4ikp0sb54jbb4rzdbhlwyhf4r117pgmmvb3n2aq6w4n9f";}
+ {name="kmag";value="1c3z1r0qk69pprivak6lgb4mk491pd17hqb9474fv645nk9jh48h";}
+ {name="kmahjongg";value="0lfnjzshcm7d91cq6x6s5l2n4p5q6ya4d7c3r94ad2fqpy3425c1";}
+ {name="kmines";value="1fxb8cwy9wfsijgf36ji4v1c2yaqbnxbppa4c4pld9fi9vnds0w7";}
+ {name="kmix";value="084prv50nsh7j1db2dd3i4gkfj6wh430azlq60a4j4667ih483l9";}
+ {name="kmousetool";value="1gr1nvxnapmmw5p9hk35g76rlxs3f5l7wbsfmczlzlxwszfg05lc";}
+ {name="kmouth";value="0f8s6ikrx069cp8pd3405g2s4czvk0vpv6d48jgvkbxnxfasli1c";}
+ {name="kmplot";value="1si0dl1m4zabmnrnmih0g5dxfwsws3p626j0kgvrqnd5hlwl6ar6";}
+ {name="knavalbattle";value="1llrj7d79s2k66qp9cx6zbjs5f69xnvc8gr0yi2jdbycaiq9q9lj";}
+ {name="knetwalk";value="13gy2pqqfysh69pmx4mcq9nx6qcxmzp08sqvf2b6c6v7f90ic2kx";}
+ {name="kolf";value="0808js28c4y1wllzs62sw4j02hzspijvl6n7i6vbhim47blvn3yq";}
+ {name="kollision";value="1mn9agdzw15gkyb27pqg80anbk4a6iv6r1mvn8m2hksfqwv8c1mf";}
+ {name="kolourpaint";value="0nj4a8sjyip0nmq3xkba00qigmg9z6bfck5gfb53sm5z6mdrdvd6";}
+ {name="kompare";value="13123ylhm1r5kkc5q9dzc3n03nxa89vfy1nrffa501awhyhb6qvl";}
+ {name="konquest";value="1m06chqvanlqklymdrl78hyqi9wzlkmnzbq3sg920jzqjvac8yq1";}
+ {name="konsole";value="1j5z5ma7mljis1s6rfpcli02vbnmrdhs8zr1gm2rgpyii9k3xykn";}
+ {name="kopete";value="1s87ln4qjdx4k1313r87glzmazah85siv0nddzndvz50330gnqrv";}
+ {name="korundum";value="1a7nwi8lk1n3r5m7qsfkzb4dgj37ff7i5il3i6fabmkmbwmikm82";}
+ {name="kpat";value="1lb5arhhx4zz6zrcag2kmsa7hrmjl3zd7jaklkcbd86bm57xmzry";}
+ {name="kppp";value="16p6gfr2lyhcmyldzclj8md4sr31rmmxp0m3afnhi4bwvd76d4sc";}
+ {name="kqtquickcharts";value="0sx7jahhaz2v0sp9qix4xxinxry2k50hnxfrf9hd5877s4ngdi3h";}
+ {name="krdc";value="1jyyrj4g854ki39p0k056mmca21d5yiqa25sa2wxb3v7g128lvl8";}
+ {name="kremotecontrol";value="0f5hfdlwfqqygc6vd6lgchh0bdh0z9crikkv7pjah43x5h0sys14";}
+ {name="kreversi";value="1cl8dbrgsv60zhxfqry0wd4gn4lyas9xb8yy5m3f71dkcb4xmhrz";}
+ {name="krfb";value="1yzp00kyww6wrdbhy8idxbpn8nr597h116rzxa57xalq7cj4px5m";}
+ {name="kross-interpreters";value="01a6w2iqx3k32fdwnlz2z8h7p1isf9sf2i261gaixf510drz3mqs";}
+ {name="kruler";value="0sbxvaxvixyka4qy2h17i8bgblxppp76j6b9jgsgqq8w20ppj0yd";}
+ {name="ksaneplugin";value="134cccd2v7xygg18xlggsk942hlcmpilmpaljksh2w6dzjig8ag9";}
+ {name="kscd";value="1r7ffan61ps9h3awbwyr4kn2ismk8l8dnb0rdyjmp2rsmrci3xmy";}
+ {name="kshisen";value="0b4zny2nxhx45k540mjpqzfpa9xnfnyk1hgs3xziihg5iij1vdnf";}
+ {name="ksirk";value="0xladrvxvj8mfagl9531842bffixbk2z7ymwp178xlrz3c4b07xs";}
+ {name="ksnakeduel";value="1q901qphmb09642whn3ad0viv9lgvls2rggc5xnxxjccchz98ggh";}
+ {name="ksnapshot";value="168ya0d15966j9kkgxqpp67kfhmsw7xj875dr8cfqbcmgf6ghjdm";}
+ {name="kspaceduel";value="0fidkh52vwbjbabrjvbcvr144vcgig0nz12g5f5fzfbl04336x12";}
+ {name="ksquares";value="1w91mp1a22gzq546w87767aq02gl2jl9mrsv83hv327q0i4r55ng";}
+ {name="kstars";value="0z7045cpb8fwkrmlcgjz2606zhcl4irs0lafgwv3hdg3g6k5xj0n";}
+ {name="ksudoku";value="1vdqd7nxm9q0xmj90ix1k6j1cn7zc2imfkz13xjlkjgrbb7nn4dr";}
+ {name="ksystemlog";value="1rh3c54jpd1s6ggcshx0p2q2gsv6flh04qqjnk9bnkw374ad6an7";}
+ {name="kteatime";value="0akd8kr2pj8j4abvwf7cs9vk5mswj4mfki3vxk1kmyaanrxb6wrq";}
+ {name="ktimer";value="1hnmw4rw7mzc7arlqn1wiap9l00x97bp1z03ls7v133wga6hy56f";}
+ {name="ktouch";value="0z83pdh027h7nl15g6qqc7y4v8nlm07g0c4a2cl0j86r53vv4jrp";}
+ {name="ktuberling";value="05hngh9pgsl4q3qnv2vqw1lggn2glc4c2b3jxgkccagp5igqj2nb";}
+ {name="kturtle";value="1f3j3w6lgdkcn8p6zy29b42bm0k93a864njf827j1ri2vrjifdag";}
+ {name="ktux";value="0j15i5f7x6jq7xrrx675f6h92qjzb89xcwmv43snd87sj0yaymgs";}
+ {name="kubrick";value="1np1d913fhanfva26cfy4wabf0h69qs824kdmawr89f24689xpjl";}
+ {name="kuser";value="12xw1qhilh88xfaky5iv44hybwmzf0f4fkp5ahgskysx2whvk7dh";}
+ {name="kwalletmanager";value="0h71nm5mpp2rvv5xs0a7153583zdwzc1i9vv9xkwwmq84qwar06w";}
+ {name="kwordquiz";value="0w2a1df2ipynarfxjr27jk896jhq8hsbkxhf3rzpflzs902afrfn";}
+ {name="libkcddb";value="153cgh9mxfqfdxdg5glphs3fvyhd89cmdzpvwpn29gdfshbpc9np";}
+ {name="libkcompactdisc";value="1y4f3b4yx8giyz83nan0nl75l3k1fyfw1fnbma6ch1901yxbliqq";}
+ {name="libkdcraw";value="03lgy6h9fy8j72ryfrsxpsbnb7l5i1n8wihfw117y2m5h23x6va2";}
+ {name="libkdeedu";value="06w2pfj0whcl8pz89cck2y0bkn7r54n93l95vnqvj7v0zq704imd";}
+ {name="libkdegames";value="0yx77i8yanv2fjmc0gcz3fzywkmpzq7jrc1g1frcwc9qcbd652sb";}
+ {name="libkexiv2";value="0fibx70n5c11absj97c20p1d7crhfx5wc1p7h77dyjv76zxb0rjk";}
+ {name="libkipi";value="09vihz0sm32acbh2xqmg4r0c48m40xsf6fcvfcjy4w08dvxb26jd";}
+ {name="libkmahjongg";value="09q0vvznag2dk03vwzlaip3qvjgwi8kk0ypvpwbga48vi9wy5qih";}
+ {name="libkomparediff2";value="1ihdpcsmkvnhs0i4xwx4ardy54gk5fcbh4byam3h9x8156d1gi60";}
+ {name="libksane";value="0dvprckc0d8vc8rcj7ib22ycsib1g8bi9m6i24961ccgbn3mhbha";}
+ {name="lokalize";value="1ad6vqvaa1ijcc9vjq46986z8q8bm5kjcaxdjzrq956m5kgx96wm";}
+ {name="lskat";value="00iva59g8rgrzp9w273cja1z2kbnxpb8gdm2a29qnld862l586x8";}
+ {name="marble";value="1gk75xl6kdqxh9kyfiialp937jhb203ycnza6x5sdnky8n7dchzs";}
+ {name="mplayerthumbs";value="1lg51si9iy4kn91s1cpa7irpk7iind1lfc4nb0a3s3dw685jf3z4";}
+ {name="nepomuk-core";value="1krwfrkrk0dj08wqfbx8lfdxriff9w5pqhjaccvmdj3bmlik542f";}
+ {name="nepomuk-widgets";value="1k1zxbpplal5fw2lziv8rr850nl5a6y1vwng96f8zqqgda6nnbqz";}
+ {name="okteta";value="0h7jb7zhpdw1sbdl2mqajnnvn11hisxp0p33km4qxh1jxdn44apc";}
+ {name="okular";value="13lva2rasrh1za65wr5zjn1mwx6nzd9n1ci3i940px8qfgqjbysx";}
+ {name="oxygen-icons";value="15daai2vx5ccll1mdxf77pc0i52365m9a6j2jy956sybwpzmfkmx";}
+ {name="pairs";value="002hsh5vp1grc8gdhgj93bmrmnzf4mnaax6zs5j7f0jsv60czh9m";}
+ {name="palapeli";value="0qrcfg1p3ipa84l0kp8mxg9h4098jmaz3n0fakc8fkvfdgg70x5c";}
+ {name="parley";value="1z0yz7x53w23rq22pn0z3hiwzgajqmq6v9bishqgm5r7layqj0v5";}
+ {name="perlkde";value="07p1g8mv5xw3qys4h2jrh72kvf6yyl7yz5rnk4bg04rl4dg7n3j2";}
+ {name="perlqt";value="1fk2g1xam8gf6n1mpix7kkw2jm6p3d57jbph2vfc5gszdddlb0z1";}
+ {name="picmi";value="1n6h9rzfqr2pvmz172bk04bmc1mm9b1rvakqdyqdf4j6b7inlnqh";}
+ {name="poxml";value="0y9x29fd0fzxcb9lpsy6sd4kcwwjp0d6yi4qgklqxb2xw5d519rc";}
+ {name="print-manager";value="0k2lmdcw72ifbq2mbalnq78sq5brl3wkny8lxl5ia9q2wq6c5nbl";}
+ {name="pykde4";value="1lknacs02gk0lh96jgj1hjyphnw04yljpxamhhvz9l0nn82dh5ip";}
+ {name="qtruby";value="0nlldf06z0rhmdgmrd6wambywn6xfd2ini6zliakspk7s8c851nd";}
+ {name="qyoto";value="0wh5zf057bkxr7rs7k2psjh74j10ri943qfk8hv07jw25652xpzb";}
+ {name="rocs";value="1i3s0kjrc6qqn9v219s8m10w2fyp1cdvra736pv0ld9gg5a71fc8";}
+ {name="smokegen";value="0lzkfp09rfkcxn5k18x789wwbiq94hypsiwyxg3fd5ybkx725j55";}
+ {name="smokekde";value="1admv2k41i6xh4s0n8yydmpqjkwank6f8mpaapa9a8dnj918ydll";}
+ {name="smokeqt";value="1fnnma8sls8rf958cwlfars26gaxk68plx3fzv979rwwb1n7h3jg";}
+ {name="step";value="11prsrpf0nvrrb0n9gz7w2shyq60v3hv3av6ggaxy5i7qq2jkcmw";}
+ {name="superkaramba";value="1p7ks4cyx66dmfxwrdzd890h3sa9bqm5rh2x6i1b81v5g3dg09s7";}
+ {name="svgpart";value="0gwc68hzw29lfj1kmikqpmsyignlcghvv86amlmylnvrypkjypk7";}
+ {name="sweeper";value="1dxqspva4rql2r92y0y16m3f0jf3anvb26x36bxk71ad5fpph9yl";}
+ {name="umbrello";value="1l9zq8sk46nd8nyk48vy4rdlbx7s8l5pif0n1y38ymbppc157lqi";}
+ {name="zeroconf-ioslave";value="0ds85m35p34cv2bv2mkvdvmygvykssssbr736g02jbiasivmclk5";}
+];
+versions=builtins.listToAttrs[
+ {name="amor";value="4.14.1";}
+ {name="analitza";value="4.14.1";}
+ {name="ark";value="4.14.1";}
+ {name="artikulate";value="4.14.1";}
+ {name="audiocd-kio";value="4.14.1";}
+ {name="baloo";value="4.14.1";}
+ {name="baloo-widgets";value="4.14.1";}
+ {name="blinken";value="4.14.1";}
+ {name="bomber";value="4.14.1";}
+ {name="bovo";value="4.14.1";}
+ {name="cantor";value="4.14.1";}
+ {name="cervisia";value="4.14.1";}
+ {name="dolphin-plugins";value="4.14.1";}
+ {name="dragon";value="4.14.1";}
+ {name="ffmpegthumbs";value="4.14.1";}
+ {name="filelight";value="4.14.1";}
+ {name="granatier";value="4.14.1";}
+ {name="gwenview";value="4.14.1";}
+ {name="jovie";value="4.14.1";}
+ {name="juk";value="4.14.1";}
+ {name="kaccessible";value="4.14.1";}
+ {name="kactivities";value="4.13.3";}
+ {name="kajongg";value="4.14.1";}
+ {name="kalgebra";value="4.14.1";}
+ {name="kalzium";value="4.14.1";}
+ {name="kamera";value="4.14.1";}
+ {name="kanagram";value="4.14.1";}
+ {name="kapman";value="4.14.1";}
+ {name="kapptemplate";value="4.14.1";}
+ {name="kate";value="4.14.1";}
+ {name="katomic";value="4.14.1";}
+ {name="kblackbox";value="4.14.1";}
+ {name="kblocks";value="4.14.1";}
+ {name="kbounce";value="4.14.1";}
+ {name="kbreakout";value="4.14.1";}
+ {name="kbruch";value="4.14.1";}
+ {name="kcachegrind";value="4.14.1";}
+ {name="kcalc";value="4.14.1";}
+ {name="kcharselect";value="4.14.1";}
+ {name="kcolorchooser";value="4.14.1";}
+ {name="kcron";value="4.14.1";}
+ {name="kdeartwork";value="4.14.1";}
+ {name="kde-baseapps";value="4.14.1";}
+ {name="kde-base-artwork";value="4.14.1";}
+ {name="kde-dev-scripts";value="4.14.1";}
+ {name="kde-dev-utils";value="4.14.1";}
+ {name="kdegraphics-mobipocket";value="4.14.1";}
+ {name="kdegraphics-strigi-analyzer";value="4.14.1";}
+ {name="kdegraphics-thumbnailers";value="4.14.1";}
+ {name="kdelibs";value="4.14.1";}
+ {name="kdenetwork-filesharing";value="4.14.1";}
+ {name="kdenetwork-strigi-analyzers";value="4.14.1";}
+ {name="kdepim";value="4.14.1";}
+ {name="kdepimlibs";value="4.14.1";}
+ {name="kdepim-runtime";value="4.14.1";}
+ {name="kdeplasma-addons";value="4.14.1";}
+ {name="kde-runtime";value="4.14.1";}
+ {name="kdesdk-kioslaves";value="4.14.1";}
+ {name="kdesdk-strigi-analyzers";value="4.14.1";}
+ {name="kdesdk-thumbnailers";value="4.14.1";}
+ {name="kde-wallpapers";value="4.14.1";}
+ {name="kdewebdev";value="4.14.1";}
+ {name="kde-workspace";value="4.11.12";}
+ {name="kdf";value="4.14.1";}
+ {name="kdiamond";value="4.14.1";}
+ {name="kfilemetadata";value="4.14.1";}
+ {name="kfloppy";value="4.14.1";}
+ {name="kfourinline";value="4.14.1";}
+ {name="kgamma";value="4.14.1";}
+ {name="kgeography";value="4.14.1";}
+ {name="kget";value="4.14.1";}
+ {name="kgoldrunner";value="4.14.1";}
+ {name="kgpg";value="4.14.1";}
+ {name="khangman";value="4.14.1";}
+ {name="kig";value="4.14.1";}
+ {name="kigo";value="4.14.1";}
+ {name="killbots";value="4.14.1";}
+ {name="kimono";value="4.14.1";}
+ {name="kiriki";value="4.14.1";}
+ {name="kiten";value="4.14.1";}
+ {name="kjumpingcube";value="4.14.1";}
+ {name="klettres";value="4.14.1";}
+ {name="klickety";value="4.14.1";}
+ {name="klines";value="4.14.1";}
+ {name="kmag";value="4.14.1";}
+ {name="kmahjongg";value="4.14.1";}
+ {name="kmines";value="4.14.1";}
+ {name="kmix";value="4.14.1";}
+ {name="kmousetool";value="4.14.1";}
+ {name="kmouth";value="4.14.1";}
+ {name="kmplot";value="4.14.1";}
+ {name="knavalbattle";value="4.14.1";}
+ {name="knetwalk";value="4.14.1";}
+ {name="kolf";value="4.14.1";}
+ {name="kollision";value="4.14.1";}
+ {name="kolourpaint";value="4.14.1";}
+ {name="kompare";value="4.14.1";}
+ {name="konquest";value="4.14.1";}
+ {name="konsole";value="4.14.1";}
+ {name="kopete";value="4.14.1";}
+ {name="korundum";value="4.14.1";}
+ {name="kpat";value="4.14.1";}
+ {name="kppp";value="4.14.1";}
+ {name="kqtquickcharts";value="4.14.1";}
+ {name="krdc";value="4.14.1";}
+ {name="kremotecontrol";value="4.14.1";}
+ {name="kreversi";value="4.14.1";}
+ {name="krfb";value="4.14.1";}
+ {name="kross-interpreters";value="4.14.1";}
+ {name="kruler";value="4.14.1";}
+ {name="ksaneplugin";value="4.14.1";}
+ {name="kscd";value="4.14.1";}
+ {name="kshisen";value="4.14.1";}
+ {name="ksirk";value="4.14.1";}
+ {name="ksnakeduel";value="4.14.1";}
+ {name="ksnapshot";value="4.14.1";}
+ {name="kspaceduel";value="4.14.1";}
+ {name="ksquares";value="4.14.1";}
+ {name="kstars";value="4.14.1";}
+ {name="ksudoku";value="4.14.1";}
+ {name="ksystemlog";value="4.14.1";}
+ {name="kteatime";value="4.14.1";}
+ {name="ktimer";value="4.14.1";}
+ {name="ktouch";value="4.14.1";}
+ {name="ktuberling";value="4.14.1";}
+ {name="kturtle";value="4.14.1";}
+ {name="ktux";value="4.14.1";}
+ {name="kubrick";value="4.14.1";}
+ {name="kuser";value="4.14.1";}
+ {name="kwalletmanager";value="4.14.1";}
+ {name="kwordquiz";value="4.14.1";}
+ {name="libkcddb";value="4.14.1";}
+ {name="libkcompactdisc";value="4.14.1";}
+ {name="libkdcraw";value="4.14.1";}
+ {name="libkdeedu";value="4.14.1";}
+ {name="libkdegames";value="4.14.1";}
+ {name="libkexiv2";value="4.14.1";}
+ {name="libkipi";value="4.14.1";}
+ {name="libkmahjongg";value="4.14.1";}
+ {name="libkomparediff2";value="4.14.1";}
+ {name="libksane";value="4.14.1";}
+ {name="lokalize";value="4.14.1";}
+ {name="lskat";value="4.14.1";}
+ {name="marble";value="4.14.1";}
+ {name="mplayerthumbs";value="4.14.1";}
+ {name="nepomuk-core";value="4.14.1";}
+ {name="nepomuk-widgets";value="4.14.1";}
+ {name="okteta";value="4.14.1";}
+ {name="okular";value="4.14.1";}
+ {name="oxygen-icons";value="4.14.1";}
+ {name="pairs";value="4.14.1";}
+ {name="palapeli";value="4.14.1";}
+ {name="parley";value="4.14.1";}
+ {name="perlkde";value="4.14.1";}
+ {name="perlqt";value="4.14.1";}
+ {name="picmi";value="4.14.1";}
+ {name="poxml";value="4.14.1";}
+ {name="print-manager";value="4.14.1";}
+ {name="pykde4";value="4.14.1";}
+ {name="qtruby";value="4.14.1";}
+ {name="qyoto";value="4.14.1";}
+ {name="rocs";value="4.14.1";}
+ {name="smokegen";value="4.14.1";}
+ {name="smokekde";value="4.14.1";}
+ {name="smokeqt";value="4.14.1";}
+ {name="step";value="4.14.1";}
+ {name="superkaramba";value="4.14.1";}
+ {name="svgpart";value="4.14.1";}
+ {name="sweeper";value="4.14.1";}
+ {name="umbrello";value="4.14.1";}
+ {name="zeroconf-ioslave";value="4.14.1";}
+];
+modules=[
+{
+ module="kdemultimedia";
+ split=true;
+ pkgs=[
+ { name="audiocd-kio"; sane="audiocd_kio"; }
+ { name="dragon"; }
+ { name="ffmpegthumbs"; }
+ { name="juk"; }
+ { name="kmix"; }
+ { name="kscd"; }
+ { name="libkcddb"; }
+ { name="libkcompactdisc"; }
+ { name="mplayerthumbs"; }
+ ];
+}
+{
+ module="kdegraphics";
+ split=true;
+ pkgs=[
+ { name="gwenview"; }
+ { name="kamera"; }
+ { name="kcolorchooser"; }
+ { name="kdegraphics-mobipocket"; sane="kdegraphics_mobipocket"; }
+ { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; }
+ { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; }
+ { name="kgamma"; }
+ { name="kolourpaint"; }
+ { name="kruler"; }
+ { name="ksaneplugin"; }
+ { name="ksnapshot"; }
+ { name="libkdcraw"; }
+ { name="libkexiv2"; }
+ { name="libkipi"; }
+ { name="libksane"; }
+ { name="okular"; }
+ { name="svgpart"; }
+ ];
+}
+{
+ module="kdelibs";
+ split=true;
+ pkgs=[
+ { name="kdelibs"; }
+ { name="baloo"; }
+ { name="baloo-widgets"; sane="baloo_widgets"; }
+ { name="kfilemetadata"; }
+ { name="nepomuk-core"; sane="nepomuk_core"; }
+ { name="nepomuk-widgets"; sane="nepomuk_widgets"; }
+ ];
+}
+{
+ module="kdenetwork";
+ split=true;
+ pkgs=[
+ { name="kdenetwork-filesharing"; sane="kdenetwork_filesharing"; }
+ { name="kdenetwork-strigi-analyzers"; sane="kdenetwork_strigi_analyzers"; }
+ { name="kget"; }
+ { name="kopete"; }
+ { name="kppp"; }
+ { name="krdc"; }
+ { name="krfb"; }
+ { name="zeroconf-ioslave"; sane="zeroconf_ioslave"; }
+ ];
+}
+{
+ module="kdeutils";
+ split=true;
+ pkgs=[
+ { name="ark"; }
+ { name="filelight"; }
+ { name="kcalc"; }
+ { name="kcharselect"; }
+ { name="kdf"; }
+ { name="kfloppy"; }
+ { name="kgpg"; }
+ { name="kremotecontrol"; }
+ { name="ktimer"; }
+ { name="kwalletmanager"; }
+ { name="print-manager"; sane="print_manager"; }
+ { name="superkaramba"; }
+ { name="sweeper"; }
+ ];
+}
+{
+ module="applications";
+ split=true;
+ pkgs=[
+ { name="kate"; }
+ { name="konsole"; }
+ ];
+}
+{
+ module="kdetoys";
+ split=true;
+ pkgs=[
+ { name="amor"; }
+ { name="kteatime"; }
+ { name="ktux"; }
+ ];
+}
+{
+ module="kdesdk";
+ split=true;
+ pkgs=[
+ { name="cervisia"; }
+ { name="dolphin-plugins"; sane="dolphin_plugins"; }
+ { name="kapptemplate"; }
+ { name="kcachegrind"; }
+ { name="kde-dev-scripts"; sane="kde_dev_scripts"; }
+ { name="kde-dev-utils"; sane="kde_dev_utils"; }
+ { name="kdesdk-kioslaves"; sane="kdesdk_kioslaves"; }
+ { name="kdesdk-strigi-analyzers"; sane="kdesdk_strigi_analyzers"; }
+ { name="kdesdk-thumbnailers"; sane="kdesdk_thumbnailers"; }
+ { name="kompare"; }
+ { name="libkomparediff2"; }
+ { name="lokalize"; }
+ { name="okteta"; }
+ { name="poxml"; }
+ { name="umbrello"; }
+ ];
+}
+{
+ module="kdegames";
+ split=true;
+ pkgs=[
+ { name="bomber"; }
+ { name="bovo"; }
+ { name="granatier"; }
+ { name="kajongg"; }
+ { name="kapman"; }
+ { name="katomic"; }
+ { name="kblackbox"; }
+ { name="kblocks"; }
+ { name="kbounce"; }
+ { name="kbreakout"; }
+ { name="kdiamond"; }
+ { name="kfourinline"; }
+ { name="kgoldrunner"; }
+ { name="kigo"; }
+ { name="killbots"; }
+ { name="kiriki"; }
+ { name="kjumpingcube"; }
+ { name="klickety"; }
+ { name="klines"; }
+ { name="kmahjongg"; }
+ { name="kmines"; }
+ { name="knavalbattle"; }
+ { name="knetwalk"; }
+ { name="kolf"; }
+ { name="kollision"; }
+ { name="konquest"; }
+ { name="kpat"; }
+ { name="kreversi"; }
+ { name="kshisen"; }
+ { name="ksirk"; }
+ { name="ksnakeduel"; }
+ { name="kspaceduel"; }
+ { name="ksquares"; }
+ { name="ksudoku"; }
+ { name="ktuberling"; }
+ { name="kubrick"; }
+ { name="libkdegames"; }
+ { name="libkmahjongg"; }
+ { name="lskat"; }
+ { name="palapeli"; }
+ { name="picmi"; }
+ ];
+}
+{
+ module="kdeedu";
+ split=true;
+ pkgs=[
+ { name="analitza"; }
+ { name="artikulate"; }
+ { name="blinken"; }
+ { name="cantor"; }
+ { name="kalgebra"; }
+ { name="kalzium"; }
+ { name="kanagram"; }
+ { name="kbruch"; }
+ { name="kgeography"; }
+ { name="khangman"; }
+ { name="kig"; }
+ { name="kiten"; }
+ { name="klettres"; }
+ { name="kmplot"; }
+ { name="kqtquickcharts"; }
+ { name="kstars"; }
+ { name="ktouch"; }
+ { name="kturtle"; }
+ { name="kwordquiz"; }
+ { name="libkdeedu"; }
+ { name="marble"; }
+ { name="pairs"; }
+ { name="parley"; }
+ { name="rocs"; }
+ { name="step"; }
+ ];
+}
+{
+ module="kdeadmin";
+ split=true;
+ pkgs=[
+ { name="kcron"; }
+ { name="ksystemlog"; }
+ { name="kuser"; }
+ ];
+}
+{
+ module="kdebindings";
+ split=true;
+ pkgs=[
+ { name="kimono"; }
+ { name="korundum"; }
+ { name="kross-interpreters"; sane="kross_interpreters"; }
+ { name="perlkde"; }
+ { name="perlqt"; }
+ { name="pykde4"; }
+ { name="qtruby"; }
+ { name="qyoto"; }
+ { name="smokegen"; }
+ { name="smokekde"; }
+ { name="smokeqt"; }
+ ];
+}
+{
+ module="kdeaccessibility";
+ split=true;
+ pkgs=[
+ { name="jovie"; }
+ { name="kaccessible"; }
+ { name="kmag"; }
+ { name="kmousetool"; }
+ { name="kmouth"; }
+ ];
+}
+{
+ module="kde-baseapps";
+sane="kde_baseapps"; split=true;
+ pkgs=[
+ { name="kde-baseapps"; sane="kde_baseapps"; }
+ ];
+}
+{ module="kactivities"; split=false;}
+{ module="kdeartwork"; split=false;
+ pkgs=[
+ { name="ColorSchemes"; }
+ { name="IconThemes"; }
+ { name="emoticons"; }
+ { name="kscreensaver"; }
+ { name="kwin-styles"; sane="kwin_styles";}
+ { name="styles"; }
+ { name="wallpapers"; }
+ { name="HighResolutionWallpapers"; }
+ { name="WeatherWallpapers"; }
+ { name="desktopthemes"; }
+ ];
+
+}
+{ module="kde-base-artwork"; sane="kde_base_artwork"; split=false;}
+{ module="kdepim"; split=false;}
+{ module="kdepimlibs"; split=false;}
+{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;}
+{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;}
+{ module="kde-runtime"; sane="kde_runtime"; split=false;}
+{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;}
+{ module="kdewebdev"; split=false;
+ pkgs=[
+ { name="klinkstatus"; }
+ { name="kfilereplace"; }
+ { name="kimagemapeditor"; }
+ { name="kommander"; }
+ ];
+
+}
+{ module="kde-workspace"; sane="kde_workspace"; split=false;}
+{ module="oxygen-icons"; sane="oxygen_icons"; split=false;}
+];
+}
diff --git a/pkgs/desktops/kde-4.14/kde-package/default.nix b/pkgs/desktops/kde-4.14/kde-package/default.nix
new file mode 100644
index 00000000000..c78dfbd8a36
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kde-package/default.nix
@@ -0,0 +1,131 @@
+{ callPackage, runCommand, stdenv, fetchurl, qt4, cmake, automoc4
+, release, branch, ignoreList, extraSubpkgs
+}:
+
+let
+ inherit (stdenv.lib) filter fold;
+ inherit (builtins) getAttr hasAttr remoteAttrs listToAttrs tail head;
+in
+rec {
+ manifest = import (./. + "/${release}.nix");
+
+ # src attribute for $name tarball
+ kdesrc = name: version: fetchurl {
+ url = "mirror://kde/" + (if manifest.stable then "" else "un")
+ + "stable/${release}/src/${name}-${version}.tar.xz";
+ sha256 = getAttr name manifest.hashes;
+ };
+
+ # Default meta attribute
+ defMeta = {
+ homepage = http://www.kde.org;
+ inherit branch;
+ platforms = stdenv.lib.platforms.linux;
+ inherit (qt4.meta) maintainers;
+ };
+
+ # KDE package built from the whole tarball
+ # This function is used both for monolithic modules and modules which are
+ # released as individual tarballs
+ kdeMonoPkg = name:
+ let n_ = name; v_ = getAttr name manifest.versions; in
+ a@{meta, name ? n_, version ? v_, ...}:
+ stdenv.mkDerivation ({
+ name = "${name}-${version}";
+ src = kdesrc name version;
+ meta = defMeta // meta;
+ enableParallelBuilding = true;
+ } // (removeAttrs a [ "meta" "name" ]));
+
+ # kdeMonoPkg wrapper for modules splitted upstream compatible with combinePkgs
+ # API.
+ kdeSplittedPkg = module: {name, sane ? name}: kdeMonoPkg name;
+
+ # Build subdirectory ${subdir} of tarball ${module}-${release}.tar.xz
+ kdeSubdirPkg = module:
+ {name, subdir ? name, sane ? name}:
+ let name_ = name; version_ = getAttr module manifest.versions; in
+ a@{cmakeFlags ? [], name ? name_, version ? version_, meta ? {}, ...}:
+ stdenv.mkDerivation ({
+ name = "${name}-${release}";
+ src = kdesrc module version;
+ cmakeFlags =
+ [ "-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE"
+ "-DBUILD_doc=TRUE"
+ "-DBUILD_${subdir}=TRUE"
+ ] ++ cmakeFlags;
+ meta = defMeta // meta;
+ enableParallelBuilding = module.enableParallelBuilding or true;
+ } // (removeAttrs a [ "meta" "name" "cmakeFlags" ]));
+
+ # A KDE monolithic module
+ kdeMonoModule = name: path: callPackage path { kde = kdeMonoPkg name; };
+
+ # Combine packages in one module.
+ # Arguments:
+ # * pkgFun --- a function of the following signature:
+ # module: manifest_attrs: manual_attrs: derivation;
+ # * module --- name of the module
+ # * pkgs --- list of packages in manifest format
+ combinePkgs = pkgFun: module: pkgs:
+ let
+ f = p@{name, ...}:
+ callPackage (./.. + "/${module}/${name}.nix") { kde = pkgFun module p; };
+ list = map f pkgs;
+ attrs = listToAttrs (map
+ ({name, sane ? name, ...}@p: { name = sane; value = f p; })
+ pkgs);
+ in
+ runCommand "${module}-${release}"
+ ({passthru = attrs // {
+ propagatedUserEnvPackages = list;
+ projects = attrs;
+ };})
+ ''
+ mkdir -pv $out/nix-support
+ echo "${toString list}" | tee $out/nix-support/propagated-user-env-packages
+ '';
+
+ # Given manifest module data, return the module
+ kdeModule = { module, sane ? module, split, pkgs ? [] }:
+ let
+ pkgs_ = filterPkgs module pkgs;
+ in
+ # Module is splitted by upstream
+ if split then combinePkgs kdeSplittedPkg module pkgs_
+ # Monolithic module
+ else if pkgs == [] then kdeMonoModule module (./.. + "/${module}.nix")
+ # Module is splitted by us
+ else combinePkgs kdeSubdirPkg module pkgs_;
+
+ # The same, as nameValuePair with sane name
+ kdeModuleNV = a@{ module, sane ? module, ... }:
+ { name = sane; value = kdeModule a; };
+
+ filterPkgs = module: (p:
+ removeNames (stdenv.lib.attrByPath [module] [] ignoreList) p
+ ++ (stdenv.lib.attrByPath [module] [] extraSubpkgs));
+
+ # Remove attrsets with x.name in subst. Optimized for empty subst.
+ removeNames = subst: big:
+ fold (s: out: filter (x: x.name != s) out) big subst;
+
+ modules = listToAttrs (map kdeModuleNV manifest.modules);
+
+ splittedModuleList =
+ let
+ splitted = filter (a: a ? pkgs) manifest.modules;
+ names = map ({module, sane ? module, ...}: sane) splitted;
+ in
+ map (m: m.projects) (stdenv.lib.attrVals names modules);
+
+ individual =
+ stdenv.lib.zipAttrsWith
+ (
+ name: list:
+ if tail list == []
+ then head list
+ else abort "Multiple modules define ${name}"
+ )
+ splittedModuleList;
+}
diff --git a/pkgs/desktops/kde-4.14/kde-package/kde-manifest.sh b/pkgs/desktops/kde-4.14/kde-package/kde-manifest.sh
new file mode 100755
index 00000000000..1da7bc810c3
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kde-package/kde-manifest.sh
@@ -0,0 +1,173 @@
+#! /bin/sh
+
+# Usage: download kde release to $dir, then run
+# $0 $dir
+
+dir="$1"
+
+
+if [[ -z $(type -p xsltproc) ]]; then
+ echo "Please provide libxslt" >&2
+ exit 1
+fi
+
+release=$(ls "${dir}"/kdelibs-*.tar.xz | \
+ sed -e 's/.*kdelibs-//' -e 's/\.tar\.xz//')
+
+# Detect release number & whether it is a stable release
+if [[ $? -ne 0 || -z $release ]]; then
+ echo "'${dir}' is not a directory (or kdelibs...tar.xz doesn't exist)!" >&2
+ exit 1
+fi
+
+if [[ ${release##*.} -gt 50 ]]; then
+ stable="false"
+else
+ stable="true"
+fi
+
+echo "Detected release ${release}" >&2
+
+declare -A hash
+declare -A version
+declare -A modules
+declare -a packages
+declare -a top_level
+
+if [[ ! -f ${dir}/kde_projects.xml ]]; then
+ if ! curl -o "${dir}/kde_projects.xml" -J http://projects.kde.org/kde_projects.xml; then
+ echo "Could not download http://projects.kde.org/kde_projects.xml to ${dir}/kde_projects.xml" >&2
+ exit 1
+ fi
+fi
+# xsltproc output declares -A module
+eval `xsltproc kde-submodules.xslt ${dir}/kde_projects.xml`
+
+module[kde-baseapps]=kde-baseapps
+unset module[kactivities]
+
+print_sane() {
+ echo "Called print_sane $1" >&2
+ sane="${1//[^a-z0-9_]/_}"
+ if [[ "$sane" != "$1" ]]; then
+ echo "Sane version is $sane" >&2
+ echo -n "sane=\"$sane\";"
+ fi
+}
+
+for i in `cd "${dir}"; ls *.tar.xz`; do
+ package=${i%.tar.xz}
+ v=${package##*-}
+ package=${i%-*}
+ packages+=( "$package" )
+ echo -n "${package}.. " >&2
+ hash[$package]=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}")
+ echo -n ${hash[$package]} >&2
+
+ version[$package]=$v
+
+ if [ -n "${module[$package]}" ]; then
+ m="${module[$package]}"
+ echo " (${m})" >&2
+ modules[$m]=1
+ else
+ top_level+=( "$package" )
+ echo " (top-level)" >&2
+ fi
+ nix-store --add-fixed sha256 "${dir}/${i}" >&2
+done
+
+
+print_pkg_hash() {
+ echo " {name=\"${1}\";value=\"${hash[$1]}\";}"
+}
+
+print_pkg_version() {
+ echo " {name=\"${1}\";value=\"${version[$1]}\";}"
+}
+
+print_hashes(){
+ echo "hashes=builtins.listToAttrs["
+ for p in "${packages[@]}"; do print_pkg_hash "$p"; done
+ echo "];"
+}
+
+print_versions(){
+ echo "versions=builtins.listToAttrs["
+ for p in "${packages[@]}"; do print_pkg_version "$p"; done
+ echo "];"
+}
+
+print_split_module(){
+ echo -n "$1:" >&2
+ echo -e "{\n module=\"$1\";"
+ print_sane "$1"
+ echo " split=true;"
+ echo " pkgs=["
+ for p in "${packages[@]}"; do
+ if [[ "${module[$p]}" == "$1" ]]; then
+ echo -n " { name=\"$p\"; "
+ print_sane "$p"
+ echo " }"
+ echo -n " $p" >&2
+ fi
+ done
+ echo " ];"
+ echo "}"
+ echo >&2
+}
+
+print_mono_module(){
+ echo -en "{ module=\"$1\"; "
+ print_sane "$1"
+ echo -n "$1 ... " >&2
+ pkg=$(cd "$dir"; echo "$1"-*.tar.xz)
+ pkg="${pkg%.tar.xz}"
+ echo -n " split=false;"
+ cml="$pkg/CMakeLists.txt"
+ tar -xf "${dir}/$pkg.tar.xz" "$cml"
+ if grep '^[^#]*add_subdirectory' $cml >/dev/null; then
+ if grep '^[^#]*add_subdirectory' $cml | grep -v macro_optional_add_subdirectory >/dev/null; then
+ echo " is monolithic (has unconditionally added subdirs)" >&2
+ else
+ subdirs=( `grep '^[^#]*add_subdirectory' $cml |
+ sed -e 's/[^#]*add_subdirectory *( *\(.*\) *)/\1/' |
+ grep -v '\(doc\|cmake\)'` )
+ echo " seems splittable, subdirs: ${subdirs[*]}" >&2
+ echo -e "\n pkgs=["
+ for s in "${subdirs[@]}"; do
+ echo -en " {"
+ echo -n " name=\"${s//\//-}\"; "
+ print_sane "$s"
+ if [[ $s != "${s//\//-}" ]]; then
+ echo -n "subdir=\"$s\"; "
+ fi
+ echo "}"
+ done
+ echo -e " ];\n"
+ fi
+ else
+ echo " is monolithic (has no subdirs)" >&2
+ fi
+ rm $cml
+ rmdir "$pkg"
+ echo "}"
+}
+
+print_modules(){
+ echo "modules=["
+ echo "Printing modules splitted by upstream" >&2
+ for m in "${!modules[@]}"; do print_split_module "$m"; done
+ echo >&2
+ echo "Printing modules not splitted by upstream (${top_level[*]})" >&2
+ for m in "${top_level[@]}"; do print_mono_module "$m"; done
+ echo "];"
+}
+
+echo "Writing ${release}.nix" >&2
+exec > "${release}.nix"
+echo "{stable=${stable};"
+print_hashes
+print_versions
+print_modules
+echo "}"
diff --git a/pkgs/desktops/kde-4.14/kde-package/kde-submodules.xslt b/pkgs/desktops/kde-4.14/kde-package/kde-submodules.xslt
new file mode 100644
index 00000000000..952a05a9d27
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kde-package/kde-submodules.xslt
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+ declare -A module
+
+
+
+ module["
+
+ "]="
+
+ "
+
+
+
+
+
diff --git a/pkgs/desktops/kde-4.14/kde-runtime.nix b/pkgs/desktops/kde-4.14/kde-runtime.nix
new file mode 100644
index 00000000000..1c9706f4f4b
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kde-runtime.nix
@@ -0,0 +1,24 @@
+{ kde, kdelibs, bzip2, libssh, exiv2, attica, qca2
+, libcanberra, virtuoso, samba, libjpeg, ntrack, pkgconfig, xz, pulseaudio
+, networkmanager, kactivities, kdepimlibs, openexr, ilmbase, gpgme
+}:
+
+kde {
+ buildInputs = [
+ kdelibs attica xz bzip2 libssh libjpeg exiv2 ntrack
+ qca2 samba libcanberra pulseaudio gpgme
+ networkmanager kactivities kdepimlibs openexr
+#todo: add openslp
+#todo: gpgme can't be found because cmake module is provided by kdepimlibs which are found too late
+ ];
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
+
+ passthru.propagatedUserEnvPackages = [ virtuoso ];
+
+ meta = {
+ license = "LGPL";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kde-wallpapers.nix b/pkgs/desktops/kde-4.14/kde-wallpapers.nix
new file mode 100644
index 00000000000..875eb6769c0
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kde-wallpapers.nix
@@ -0,0 +1,17 @@
+{ kde, cmake }:
+
+kde {
+ nativeBuildInputs = [ cmake ];
+
+ patches = [ ./files/kde-wallpapers-buildsystem.patch ];
+
+ cmakeFlags = "-DWALLPAPER_INSTALL_DIR=share/wallpapers";
+
+ outputHashAlgo = "sha256";
+ outputHashMode = "recursive";
+ outputHash = "1mzj7jk0ag7yas2wm2x60z3ymv64g9jrjsz3nwlr719b4bhmgwjj";
+
+ meta = {
+ description = "Wallpapers for KDE";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kde-workspace.nix b/pkgs/desktops/kde-4.14/kde-workspace.nix
new file mode 100644
index 00000000000..4231a1d7c0b
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kde-workspace.nix
@@ -0,0 +1,38 @@
+{ stdenv, kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, lm_sensors
+, pciutils, libraw1394, libusb1, python, libqalculate, akonadi
+, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison
+, libjpeg, pkgconfig, kactivities, qjson, udev, fetchurl
+}:
+
+kde {
+#todo: wayland, xmms, libusb isn't found
+ buildInputs =
+ [ kdelibs qimageblitz libdbusmenu_qt xorg.libxcb xorg.xcbutilimage libjpeg
+ xorg.xcbutilrenderutil xorg.xcbutilkeysyms xorg.libpthreadstubs xorg.libXdmcp
+ xorg.libxkbfile xorg.libXcomposite xorg.libXtst
+ xorg.libXdamage
+
+ python boost qjson lm_sensors gpsd libraw1394 pciutils udev
+ akonadi pam libusb1 libqalculate kdepimlibs prison
+ kactivities
+ ];
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ preConfigure =
+ ''
+ # Fix incorrect path to kde4-config.
+ substituteInPlace startkde.cmake --replace '$bindir/kde4-config' ${kdelibs}/bin/kde4-config
+
+ # Fix the path to the keyboard configuration files.
+ substituteInPlace kcontrol/keyboard/xkb_rules.cpp \
+ --replace /usr/share/X11 ${xkeyboard_config}/etc/X11
+ '';
+
+ enableParallelBuilding = false; # frequent problems on Hydra
+
+ meta = {
+ description = "KDE workspace components such as Plasma, Kwin and System Settings";
+ license = stdenv.lib.licenses.gpl2;
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeaccessibility/jovie.nix b/pkgs/desktops/kde-4.14/kdeaccessibility/jovie.nix
new file mode 100644
index 00000000000..d38c80c4c36
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeaccessibility/jovie.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, speechd }:
+
+kde {
+ buildInputs = [ kdelibs speechd ];
+
+ meta = {
+ description = "Text-to-speech synthesis daemon";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeaccessibility/kaccessible.nix b/pkgs/desktops/kde-4.14/kdeaccessibility/kaccessible.nix
new file mode 100644
index 00000000000..98fae7c983f
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeaccessibility/kaccessible.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, speechd }:
+
+kde {
+ buildInputs = [ kdelibs speechd ];
+
+ meta = {
+ description = "Bridge that provides accessibility services to applications";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeaccessibility/kmag.nix b/pkgs/desktops/kde-4.14/kdeaccessibility/kmag.nix
new file mode 100644
index 00000000000..606c61cddb6
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeaccessibility/kmag.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs }:
+
+kde {
+#todo: package qaccessibilityclient
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "Screen magnifier for KDE";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeaccessibility/kmousetool.nix b/pkgs/desktops/kde-4.14/kdeaccessibility/kmousetool.nix
new file mode 100644
index 00000000000..8e0caa76ed9
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeaccessibility/kmousetool.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, libXtst, libXt }:
+
+kde {
+ buildInputs = [ kdelibs libXtst libXt ];
+
+ meta = {
+ description = "A program that clicks the mouse for you";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeaccessibility/kmouth.nix b/pkgs/desktops/kde-4.14/kdeaccessibility/kmouth.nix
new file mode 100644
index 00000000000..4159501967c
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeaccessibility/kmouth.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "A type-and-say front end for speech synthesizers";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeadmin/kcron.nix b/pkgs/desktops/kde-4.14/kdeadmin/kcron.nix
new file mode 100644
index 00000000000..f585461af38
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeadmin/kcron.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "Configure and schedule tasks";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeadmin/ksystemlog.nix b/pkgs/desktops/kde-4.14/kdeadmin/ksystemlog.nix
new file mode 100644
index 00000000000..88757a6b91c
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeadmin/ksystemlog.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "System log viewer tool";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeadmin/kuser.nix b/pkgs/desktops/kde-4.14/kdeadmin/kuser.nix
new file mode 100644
index 00000000000..6118cf558bb
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeadmin/kuser.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, kdepimlibs }:
+
+kde {
+ buildInputs = [ kdelibs kdepimlibs ];
+
+ meta = {
+ description = "User management tool";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeartwork/ColorSchemes.nix b/pkgs/desktops/kde-4.14/kdeartwork/ColorSchemes.nix
new file mode 100644
index 00000000000..acccf66976f
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeartwork/ColorSchemes.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs }:
+
+kde {
+ name = "kde-color-schemes";
+
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "Additional KDE color schemes";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeartwork/FindXscreensaver.cmake b/pkgs/desktops/kde-4.14/kdeartwork/FindXscreensaver.cmake
new file mode 100644
index 00000000000..499ed75268e
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeartwork/FindXscreensaver.cmake
@@ -0,0 +1,73 @@
+#Macro to find xscreensaver directory
+
+# Copyright (c) 2006, Laurent Montel,
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+if (NOT XSCREENSAVER_FOUND)
+ FIND_PATH(XSCREENSAVER_DIR deco
+ HINTS
+ ${KDE4_INCLUDE_DIR}
+ PATHS
+ /usr
+ /usr/local
+ /opt/local
+ /usr/X11R6
+ /opt/kde
+ /opt/kde3
+ /usr/kde
+ /usr/local/kde
+ /usr/local/xscreensaver
+ /usr/openwin/lib/xscreensaver
+ /etc
+ PATH_SUFFIXES
+ lib${LIB_SUFFIX}/xscreensaver
+ lib${LIB_SUFFIX}/misc/xscreensaver
+ lib/xscreensaver
+ lib64/xscreensaver
+ lib/misc/xscreensaver
+ libexec/xscreensaver
+ bin/xscreensaver-hacks
+ hacks)
+ message(STATUS "XSCREENSAVER_DIR <${XSCREENSAVER_DIR}>")
+
+ FIND_PATH(XSCREENSAVER_CONFIG_DIR deco.xml
+ PATHS
+ ${KDE4_INCLUDE_DIR}
+ /usr/
+ /usr/local/
+ /opt/local/
+ /usr/X11R6/
+ /opt/kde/
+ /opt/kde3/
+ /usr/kde/
+ /usr/local/kde/
+ /usr/openwin/lib/xscreensaver/
+ /etc/
+ PATH_SUFFIXES xscreensaver xscreensaver/config share/xscreensaver/config
+ )
+ MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>")
+
+endif(NOT XSCREENSAVER_FOUND)
+
+#MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>")
+#MESSAGE(STATUS "XSCREENSAVER_DIR :<${XSCREENSAVER_DIR}>")
+
+# Need to fix hack
+if(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR)
+ set(XSCREENSAVER_FOUND TRUE)
+endif(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR)
+
+if (XSCREENSAVER_FOUND)
+ if (NOT Xscreensaver_FIND_QUIETLY)
+ message(STATUS "Found XSCREENSAVER_CONFIG_DIR <${XSCREENSAVER_CONFIG_DIR}>")
+ endif (NOT Xscreensaver_FIND_QUIETLY)
+else (XSCREENSAVER_FOUND)
+ if (Xscreensaver_FIND_REQUIRED)
+ message(FATAL_ERROR "XScreenSaver not found")
+ endif (Xscreensaver_FIND_REQUIRED)
+endif (XSCREENSAVER_FOUND)
+
+
+MARK_AS_ADVANCED(XSCREENSAVER_DIR XSCREENSAVER_CONFIG_DIR)
diff --git a/pkgs/desktops/kde-4.14/kdeartwork/HighResolutionWallpapers.nix b/pkgs/desktops/kde-4.14/kdeartwork/HighResolutionWallpapers.nix
new file mode 100644
index 00000000000..edffca1562e
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeartwork/HighResolutionWallpapers.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs }:
+
+kde rec {
+ name = "kde-wallpapers-high-resolution";
+
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "KDE wallpapers in high resolution";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeartwork/IconThemes.nix b/pkgs/desktops/kde-4.14/kdeartwork/IconThemes.nix
new file mode 100644
index 00000000000..43071e8bd14
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeartwork/IconThemes.nix
@@ -0,0 +1,13 @@
+{ kde, kdelibs }:
+
+kde {
+ name = "kdeartwork-icon-themes";
+
+ # Sources contain primary and kdeclassic as well but they're not installed
+
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "KDE nuvola and mono icon themes";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeartwork/WeatherWallpapers.nix b/pkgs/desktops/kde-4.14/kdeartwork/WeatherWallpapers.nix
new file mode 100644
index 00000000000..947e5e17ab0
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeartwork/WeatherWallpapers.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs }:
+
+kde rec {
+ name = "kde-weather-wallpapers";
+
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "Additional KDE wallpapers (weather)";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeartwork/desktopthemes.nix b/pkgs/desktops/kde-4.14/kdeartwork/desktopthemes.nix
new file mode 100644
index 00000000000..93dd361af73
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeartwork/desktopthemes.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs }:
+
+kde {
+ name = "kde-desktop-themes";
+
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "Additional KDE desktop themes";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeartwork/emoticons.nix b/pkgs/desktops/kde-4.14/kdeartwork/emoticons.nix
new file mode 100644
index 00000000000..5ef9f78a719
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeartwork/emoticons.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs }:
+
+kde {
+ name = "kde-emotion-icons";
+
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "Additional KDE emotion icons (smiles)";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeartwork/kscreensaver.nix b/pkgs/desktops/kde-4.14/kdeartwork/kscreensaver.nix
new file mode 100644
index 00000000000..84cb008056e
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeartwork/kscreensaver.nix
@@ -0,0 +1,15 @@
+{ kde, kdelibs, xscreensaver, kde_workspace, eigen, libkexiv2, libXt, pkgconfig }:
+
+kde {
+ buildInputs = [ kdelibs xscreensaver kde_workspace eigen libkexiv2 libXt ];
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ prePatch = "cp -v ${./FindXscreensaver.cmake} cmake/modules/FindXscreensaver.cmake";
+
+ cmakeFlags = [ "-DBUILD_asciiquarium:BOOL=ON" ];
+
+ meta = {
+ description = "KDE screensavers";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeartwork/kwin-styles.nix b/pkgs/desktops/kde-4.14/kdeartwork/kwin-styles.nix
new file mode 100644
index 00000000000..b5d769b216d
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeartwork/kwin-styles.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, kde_workspace }:
+
+kde {
+ buildInputs = [ kdelibs kde_workspace ];
+
+ meta = {
+ description = "Styles for KWin";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeartwork/styles.nix b/pkgs/desktops/kde-4.14/kdeartwork/styles.nix
new file mode 100644
index 00000000000..6a1306c3710
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeartwork/styles.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs }:
+
+kde rec {
+ name = "kde-style-phase";
+
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "Phase, a widget style for KDE";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeartwork/wallpapers.nix b/pkgs/desktops/kde-4.14/kdeartwork/wallpapers.nix
new file mode 100644
index 00000000000..7c9846fbf9e
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeartwork/wallpapers.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs }:
+
+kde rec {
+ name = "kdeartwork-wallpapers";
+
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "Additional KDE wallpapers";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdebindings/perlqt.nix b/pkgs/desktops/kde-4.14/kdebindings/perlqt.nix
new file mode 100644
index 00000000000..48eed141ce6
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdebindings/perlqt.nix
@@ -0,0 +1,14 @@
+{ kde, cmake, smokeqt, perl }:
+
+kde {
+
+ # TODO: qscintilla2, qwt5
+
+ buildInputs = [ smokeqt perl ];
+
+ nativeBuildInputs = [ cmake ];
+
+ meta = {
+ description = "Perl bindings for Qt library";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdebindings/pykde4.nix b/pkgs/desktops/kde-4.14/kdebindings/pykde4.nix
new file mode 100644
index 00000000000..64e196452e3
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdebindings/pykde4.nix
@@ -0,0 +1,32 @@
+{ kde, kdelibs, python, sip, pyqt4, kdepimlibs, shared_desktop_ontologies,
+ polkit_qt_1, boost, lndir, pkgconfig }:
+
+let pydir = "lib/python${python.majorVersion}"; in
+
+kde {
+
+ # todo: polkit isn't found by the build system
+
+ buildInputs = [
+ python kdepimlibs shared_desktop_ontologies
+ boost polkit_qt_1
+ ];
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ propagatedBuildInputs = [ pyqt4 sip ];
+
+ preConfigure =
+ ''
+ # Symlink PyQt into PyKDE. This is necessary because PyQt looks
+ # in its PyQt4/uic/widget-plugins directory for plugins, and KDE
+ # needs to install a plugin.
+ mkdir -pv $out/${pydir}
+ ${lndir}/bin/lndir ${pyqt4}/${pydir} $out/${pydir}
+ cmakeFlagsArray=( "-DSIP_DEFAULT_SIP_DIR=$prefix/share/sip" )
+ '';
+
+ meta = {
+ description = "Python bindings for KDE";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdebindings/qtruby-install-prefix.patch b/pkgs/desktops/kde-4.14/kdebindings/qtruby-install-prefix.patch
new file mode 100644
index 00000000000..bd95a0d8bd3
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdebindings/qtruby-install-prefix.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 33078b4..30aec0e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -31,8 +31,8 @@ if (NOT COMPILE_RUBY)
+ return()
+ endif (NOT COMPILE_RUBY)
+
+-SET(CUSTOM_RUBY_SITE_ARCH_DIR ${RUBY_SITEARCH_DIR} CACHE DIR "custom installation directory for ruby binary extension" )
+-SET(CUSTOM_RUBY_SITE_LIB_DIR ${RUBY_SITELIB_DIR} CACHE DIR "custom installation directory for ruby extension" )
++string(REPLACE "${RUBY_ROOT_DIR}" "${CMAKE_INSTALL_PREFIX}" CUSTOM_RUBY_SITE_ARCH_DIR ${RUBY_SITEARCH_DIR})
++string(REPLACE "${RUBY_ROOT_DIR}" "${CMAKE_INSTALL_PREFIX}" CUSTOM_RUBY_SITE_LIB_DIR ${RUBY_SITELIB_DIR})
+
+ # compute an overall version number which can be compared at once
+ MATH(EXPR RUBY_VERSION_NUMBER "${RUBY_VERSION_MAJOR}*10000 + ${RUBY_VERSION_MINOR}*100 + ${RUBY_VERSION_PATCH}")
diff --git a/pkgs/desktops/kde-4.14/kdebindings/qtruby.nix b/pkgs/desktops/kde-4.14/kdebindings/qtruby.nix
new file mode 100644
index 00000000000..03e9dc9a007
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdebindings/qtruby.nix
@@ -0,0 +1,20 @@
+{ kde, cmake, smokeqt, ruby }:
+
+kde {
+
+ # TODO: scintilla2, qwt5
+
+ buildInputs = [ smokeqt ruby ];
+
+ nativeBuildInputs = [ cmake ];
+
+ # The patch is not ready for upstream submmission.
+ # I should add an option() instead.
+ patches = [ ./qtruby-install-prefix.patch ];
+
+ cmakeFlags="-DRUBY_ROOT_DIR=${ruby}";
+
+ meta = {
+ description = "Ruby bindings for Qt library";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdebindings/smokegen-CMakeLists.txt-nix.patch b/pkgs/desktops/kde-4.14/kdebindings/smokegen-CMakeLists.txt-nix.patch
new file mode 100644
index 00000000000..f0811d335a7
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdebindings/smokegen-CMakeLists.txt-nix.patch
@@ -0,0 +1,13 @@
+--- smokegen-4.10.5.orig/CMakeLists.txt 2013-06-28 17:14:50.000000000 +0000
++++ smokegen-4.10.5/CMakeLists.txt 2013-07-31 19:15:17.000000000 +0000
+@@ -36,6 +36,10 @@
+ set (CMAKE_SKIP_BUILD_RPATH FALSE)
+ set (CMAKE_SKIP_RPATH FALSE)
+
++# add the automatically determined parts of the RPATH
++# which point to directories outside the build tree to the install RPATH
++SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
++
+ configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in config.h @ONLY )
+
+ add_executable(smokegen ${generator_SRC})
\ No newline at end of file
diff --git a/pkgs/desktops/kde-4.14/kdebindings/smokegen-nix.patch b/pkgs/desktops/kde-4.14/kdebindings/smokegen-nix.patch
new file mode 100644
index 00000000000..53257e836e0
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdebindings/smokegen-nix.patch
@@ -0,0 +1,13 @@
+diff -urN smokegen-4.10.5.orig/cmake/SmokeConfig.cmake.in smokegen-4.10.5/cmake/SmokeConfig.cmake.in
+--- smokegen-4.10.5.orig/cmake/SmokeConfig.cmake.in 2013-06-28 17:14:50.000000000 +0000
++++ smokegen-4.10.5/cmake/SmokeConfig.cmake.in 2013-07-30 21:26:33.000000000 +0000
+@@ -80,8 +80,7 @@
+ set(SMOKE_API_BIN "@SMOKE_API_BIN@")
+
+ find_library(SMOKE_BASE_LIBRARY smokebase
+- PATHS "@SMOKE_LIBRARY_PREFIX@"
+- NO_DEFAULT_PATH)
++ PATHS "@SMOKE_LIBRARY_PREFIX@")
+
+ if (NOT SMOKE_BASE_LIBRARY)
+ if (Smoke_FIND_REQUIRED)
diff --git a/pkgs/desktops/kde-4.14/kdebindings/smokegen.nix b/pkgs/desktops/kde-4.14/kdebindings/smokegen.nix
new file mode 100644
index 00000000000..5708d0f96eb
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdebindings/smokegen.nix
@@ -0,0 +1,13 @@
+{ stdenv, kde, qt4, cmake }:
+
+kde {
+ buildInputs = [ qt4 ];
+ nativeBuildInputs = [ cmake ];
+
+ patches = [ ./smokegen-nix.patch ./smokegen-CMakeLists.txt-nix.patch ];
+
+ meta = {
+ description = "C++ parser used to generate language bindings for Qt/KDE";
+ license = stdenv.lib.licenses.gpl2;
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdebindings/smokekde.nix b/pkgs/desktops/kde-4.14/kdebindings/smokekde.nix
new file mode 100644
index 00000000000..4474c1d9731
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdebindings/smokekde.nix
@@ -0,0 +1,19 @@
+{ kde, cmake, smokeqt, kdelibs, akonadi, kdepimlibs, okular
+, shared_desktop_ontologies, attica, pkgconfig }:
+
+kde {
+
+ # TODO: attica, akonadi and kdepimlibs are disabled due to smokegen crash
+ # okular is disabled because the code generated is broken
+ buildInputs = [
+ smokeqt kdelibs shared_desktop_ontologies
+ ];
+
+ nativeBuildInputs = [ cmake pkgconfig ];
+
+ LD_LIBRARY_PATH = "${smokeqt}/lib/";
+
+ meta = {
+ description = "SMOKE bindings for kdelibs";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdebindings/smokeqt.nix b/pkgs/desktops/kde-4.14/kdebindings/smokeqt.nix
new file mode 100644
index 00000000000..494bc85e646
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdebindings/smokeqt.nix
@@ -0,0 +1,15 @@
+{ stdenv, kde, qt4, cmake, phonon, qimageblitz, smokegen }:
+
+kde {
+
+# TODO: Qwt5, QScintilla2
+
+ propagatedBuildInputs = [ qt4 phonon qimageblitz ];
+ nativeBuildInputs = [ cmake ];
+ propagatedNativeBuildInputs = [ smokegen ];
+
+ meta = {
+ description = "C++ parser used to generate language bindings for Qt/KDE";
+ license = stdenv.lib.licenses.gpl2;
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/analitza.nix b/pkgs/desktops/kde-4.14/kdeedu/analitza.nix
new file mode 100644
index 00000000000..74c3a1ebb20
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeedu/analitza.nix
@@ -0,0 +1,8 @@
+{ kde, kdelibs, readline }:
+kde {
+ buildInputs = [ kdelibs readline ];
+
+ meta = {
+ description = "Library part of KAlgebra";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/artikulate.nix b/pkgs/desktops/kde-4.14/kdeedu/artikulate.nix
new file mode 100644
index 00000000000..b1828766f22
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeedu/artikulate.nix
@@ -0,0 +1,8 @@
+{ kde, kdelibs, qt_gstreamer1 }:
+kde {
+ buildInputs = [ kdelibs qt_gstreamer1 ];
+
+ meta = {
+ description = "Artikulate is a pronunciation learning program for KDE.";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/blinken.nix b/pkgs/desktops/kde-4.14/kdeedu/blinken.nix
new file mode 100644
index 00000000000..cdf9728833c
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeedu/blinken.nix
@@ -0,0 +1,8 @@
+{ kde, kdelibs }:
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "Memory Enhancement Game";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/cantor.nix b/pkgs/desktops/kde-4.14/kdeedu/cantor.nix
new file mode 100644
index 00000000000..a8cd2e44957
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeedu/cantor.nix
@@ -0,0 +1,13 @@
+{ kde, kdelibs, libspectre, analitza, R, pkgconfig, libqalculate, python }:
+kde {
+
+# TODO: R is not found
+
+ buildInputs = [ kdelibs libspectre analitza R libqalculate python ];
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ meta = {
+ description = "KDE Frontend to Mathematical Software";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/kalgebra.nix b/pkgs/desktops/kde-4.14/kdeedu/kalgebra.nix
new file mode 100644
index 00000000000..3675c3a225f
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeedu/kalgebra.nix
@@ -0,0 +1,8 @@
+{ kde, kdelibs, libkdeedu, analitza }:
+kde {
+ buildInputs = [ kdelibs libkdeedu analitza ];
+
+ meta = {
+ description = "2D and 3D Graph Calculator";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/kalzium.nix b/pkgs/desktops/kde-4.14/kdeedu/kalzium.nix
new file mode 100644
index 00000000000..8338eee5511
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeedu/kalzium.nix
@@ -0,0 +1,13 @@
+{ kde, kdelibs, facile, ocaml, eigen2, eigen, openbabel, avogadro, pkgconfig }:
+kde {
+
+# TODO: chemical mime data
+
+ buildInputs = [ kdelibs facile ocaml eigen2 eigen openbabel avogadro ];
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ meta = {
+ description = "Periodic Table of Elements";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/kanagram.nix b/pkgs/desktops/kde-4.14/kdeedu/kanagram.nix
new file mode 100644
index 00000000000..8759c96d78c
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeedu/kanagram.nix
@@ -0,0 +1,8 @@
+{ kde, kdelibs, libkdeedu }:
+kde {
+ buildInputs = [ kdelibs libkdeedu ];
+
+ meta = {
+ description = "Letter Order Game";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/kbruch.nix b/pkgs/desktops/kde-4.14/kdeedu/kbruch.nix
new file mode 100644
index 00000000000..dc50f1e85a3
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeedu/kbruch.nix
@@ -0,0 +1,8 @@
+{ kde, kdelibs }:
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "Practice Fractions";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/kgeography.nix b/pkgs/desktops/kde-4.14/kdeedu/kgeography.nix
new file mode 100644
index 00000000000..bd8d27c8d6e
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeedu/kgeography.nix
@@ -0,0 +1,8 @@
+{ kde, kdelibs }:
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "Geography Trainer";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/khangman.nix b/pkgs/desktops/kde-4.14/kdeedu/khangman.nix
new file mode 100644
index 00000000000..997b50e906a
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeedu/khangman.nix
@@ -0,0 +1,8 @@
+{ kde, kdelibs, libkdeedu }:
+kde {
+ buildInputs = [ kdelibs libkdeedu ];
+
+ meta = {
+ description = "KDE hangman game";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/kig.nix b/pkgs/desktops/kde-4.14/kdeedu/kig.nix
new file mode 100644
index 00000000000..37906c32bcb
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeedu/kig.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, boost, python}:
+kde {
+ buildInputs = [ kdelibs boost python ];
+
+ cmakeFlags = "-DKIG_ENABLE_PYTHON_SCRIPTING=1";
+ meta = {
+ description = "KDE Interactive Geometry";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/kiten.nix b/pkgs/desktops/kde-4.14/kdeedu/kiten.nix
new file mode 100644
index 00000000000..939b7a9f77a
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeedu/kiten.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "Japanese Reference/Study Tool";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/klettres.nix b/pkgs/desktops/kde-4.14/kdeedu/klettres.nix
new file mode 100644
index 00000000000..7a0fa83078e
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeedu/klettres.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "A KDE alphabet tutorial";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/kmplot.nix b/pkgs/desktops/kde-4.14/kdeedu/kmplot.nix
new file mode 100644
index 00000000000..fc7b0578c27
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeedu/kmplot.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "A KDE mathematical function plotter";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/kqtquickcharts.nix b/pkgs/desktops/kde-4.14/kdeedu/kqtquickcharts.nix
new file mode 100644
index 00000000000..3e243b8c403
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeedu/kqtquickcharts.nix
@@ -0,0 +1,8 @@
+{ kde, kdelibs }:
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "Qt Quick 1 plugin for beautiful and interactive charts";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/kstars.nix b/pkgs/desktops/kde-4.14/kdeedu/kstars.nix
new file mode 100644
index 00000000000..a5e9bee180e
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeedu/kstars.nix
@@ -0,0 +1,14 @@
+{ kde, kdelibs, eigen, xplanet, indilib_0_9_9, pkgconfig, qjson }:
+
+kde {
+
+# TODO: wcslib, astrometry
+
+ buildInputs = [ kdelibs eigen xplanet indilib_0_9_9 qjson ];
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ meta = {
+ description = "A KDE graphical desktop planetarium";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/ktouch.nix b/pkgs/desktops/kde-4.14/kdeedu/ktouch.nix
new file mode 100644
index 00000000000..9e606adde33
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeedu/ktouch.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, libxkbfile }:
+
+kde {
+ buildInputs = [ kdelibs libxkbfile ];
+
+ meta = {
+ description = "Touch Typing Tutor";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/kturtle.nix b/pkgs/desktops/kde-4.14/kdeedu/kturtle.nix
new file mode 100644
index 00000000000..1e1922b1410
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeedu/kturtle.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "Educational Programming Environment";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/kwordquiz.nix b/pkgs/desktops/kde-4.14/kdeedu/kwordquiz.nix
new file mode 100644
index 00000000000..1b33ba2e469
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeedu/kwordquiz.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, libkdeedu }:
+
+kde {
+ buildInputs = [ kdelibs libkdeedu ];
+
+ meta = {
+ description = "Flash Card Trainer";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/libkdeedu.nix b/pkgs/desktops/kde-4.14/kdeedu/libkdeedu.nix
new file mode 100644
index 00000000000..def6c85fefe
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeedu/libkdeedu.nix
@@ -0,0 +1,8 @@
+{ kde, kdelibs }:
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "Libraries used by KDE Education applications";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/marble.nix b/pkgs/desktops/kde-4.14/kdeedu/marble.nix
new file mode 100644
index 00000000000..2dc07d14a0d
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeedu/marble.nix
@@ -0,0 +1,12 @@
+{ kde, kdelibs, gpsd }:
+
+kde {
+
+# TODO: package QextSerialPort, libshp(shapelib), QtMobility, QtLocation, libwlocate, quazip
+
+ buildInputs = [ kdelibs gpsd ];
+
+ meta = {
+ description = "Marble Virtual Globe";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/pairs.nix b/pkgs/desktops/kde-4.14/kdeedu/pairs.nix
new file mode 100644
index 00000000000..36c4aba9604
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeedu/pairs.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "A memory and pairs game";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/parley.nix b/pkgs/desktops/kde-4.14/kdeedu/parley.nix
new file mode 100644
index 00000000000..f9f86dde150
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeedu/parley.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, libkdeedu, attica }:
+
+kde {
+ buildInputs = [ kdelibs libkdeedu attica ];
+
+ meta = {
+ description = "Vocabulary Trainer";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/rocs.nix b/pkgs/desktops/kde-4.14/kdeedu/rocs.nix
new file mode 100644
index 00000000000..ce30d11fda3
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeedu/rocs.nix
@@ -0,0 +1,14 @@
+{ kde, kdelibs, boost, grantlee }:
+
+kde {
+ buildInputs = [ kdelibs (boost.override { enableExceptions = true; }) grantlee ];
+
+ NIX_CFLAGS_COMPILE = "-fexceptions";
+
+ meta = {
+ description = "A KDE graph theory viewer";
+ kde = {
+ name = "rocs";
+ };
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/step.nix b/pkgs/desktops/kde-4.14/kdeedu/step.nix
new file mode 100644
index 00000000000..95e991e8481
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeedu/step.nix
@@ -0,0 +1,12 @@
+{ kde, kdelibs, gsl, libqalculate, eigen2, pkgconfig }:
+
+kde {
+
+ buildInputs = [ kdelibs gsl libqalculate eigen2 ];
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ meta = {
+ description = "A KDE interactive physical simulator";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegames/bomber.nix b/pkgs/desktops/kde-4.14/kdegames/bomber.nix
new file mode 100644
index 00000000000..026227910f2
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegames/bomber.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a single player arcade game. The player is invading various cities in a plane that is decreasing in height";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegames/bovo.nix b/pkgs/desktops/kde-4.14/kdegames/bovo.nix
new file mode 100644
index 00000000000..b0e7d99c589
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegames/bovo.nix
@@ -0,0 +1,8 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a Gomoku (from Japanese 五目並べ - lit. \"five points\") like game for two players, where the opponents alternate in placing their respective pictogram on the game board";
+ };
+
+}
diff --git a/pkgs/desktops/kde-4.14/kdegames/granatier.nix b/pkgs/desktops/kde-4.14/kdegames/granatier.nix
new file mode 100644
index 00000000000..9f1ab005309
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegames/granatier.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a clone of the classic Bomberman game, inspired by the work of the Clanbomber clone";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegames/kajongg.nix b/pkgs/desktops/kde-4.14/kdegames/kajongg.nix
new file mode 100644
index 00000000000..9a6f5e83695
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegames/kajongg.nix
@@ -0,0 +1,13 @@
+{ kde, kdelibs, libkdegames, pythonPackages, sqlite, pykde4 }:
+kde rec {
+
+ buildInputs = [ kdelibs libkdegames pythonPackages.python pythonPackages.wrapPython sqlite ] ++ pythonPath;
+
+ pythonPath = [ pythonPackages.twisted pykde4 ];
+
+ postInstall = "wrapPythonPrograms";
+
+ meta = {
+ description = "an ancient Chinese board game for 4 players";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegames/kapman.nix b/pkgs/desktops/kde-4.14/kdegames/kapman.nix
new file mode 100644
index 00000000000..f10e099da3c
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegames/kapman.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a clone of the well known game Pac-Man";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegames/katomic.nix b/pkgs/desktops/kde-4.14/kdegames/katomic.nix
new file mode 100644
index 00000000000..a9936c04f0e
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegames/katomic.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a fun and educational puzzle game built around molecular geometry";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegames/kblackbox.nix b/pkgs/desktops/kde-4.14/kdegames/kblackbox.nix
new file mode 100644
index 00000000000..27eeff2f65b
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegames/kblackbox.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a game of hide and seek played on an grid of boxes, where the player shoots rays into the grid to deduce the positions of hidden objects";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegames/kblocks.nix b/pkgs/desktops/kde-4.14/kdegames/kblocks.nix
new file mode 100644
index 00000000000..98cf068de09
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegames/kblocks.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a classic single player falling blocks puzzle game";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegames/kbounce.nix b/pkgs/desktops/kde-4.14/kdegames/kbounce.nix
new file mode 100644
index 00000000000..77fa0db6352
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegames/kbounce.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a single player arcade game with the elements of puzzle";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegames/kbreakout.nix b/pkgs/desktops/kde-4.14/kdegames/kbreakout.nix
new file mode 100644
index 00000000000..3a484d919bb
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegames/kbreakout.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a Breakout-like game. Its object is to destroy as many bricks as possible without losing the ball";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegames/kdiamond.nix b/pkgs/desktops/kde-4.14/kdegames/kdiamond.nix
new file mode 100644
index 00000000000..06dfcee5ac3
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegames/kdiamond.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a single player puzzle game. The object of the game is to build lines of three similar diamonds";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegames/kfourinline.nix b/pkgs/desktops/kde-4.14/kdegames/kfourinline.nix
new file mode 100644
index 00000000000..11b8838e708
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegames/kfourinline.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a board game for two players based on the Connect-Four game";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegames/kgoldrunner.nix b/pkgs/desktops/kde-4.14/kdegames/kgoldrunner.nix
new file mode 100644
index 00000000000..6217c47a806
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegames/kgoldrunner.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "an action game where the hero runs through a maze, climbs stairs, dig holes and dodges enemies in order to collect all the gold nuggets and escape to the next level";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegames/kigo.nix b/pkgs/desktops/kde-4.14/kdegames/kigo.nix
new file mode 100644
index 00000000000..32eee67cc1e
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegames/kigo.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "an open-source implementation of the popular Go game";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegames/killbots.nix b/pkgs/desktops/kde-4.14/kdegames/killbots.nix
new file mode 100644
index 00000000000..d9c1472495e
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegames/killbots.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a simple game of evading killer robots";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegames/kiriki.nix b/pkgs/desktops/kde-4.14/kdegames/kiriki.nix
new file mode 100644
index 00000000000..72f7ab67501
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegames/kiriki.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "an addictive and fun dice game, designed to be played by as many as six players";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegames/kjumpingcube.nix b/pkgs/desktops/kde-4.14/kdegames/kjumpingcube.nix
new file mode 100644
index 00000000000..a6d22cff51c
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegames/kjumpingcube.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a simple dice driven tactical game";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegames/klickety.nix b/pkgs/desktops/kde-4.14/kdegames/klickety.nix
new file mode 100644
index 00000000000..b592bc40641
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegames/klickety.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a puzzle game where the player removes groups of colored marbles to clear the board";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegames/klines.nix b/pkgs/desktops/kde-4.14/kdegames/klines.nix
new file mode 100644
index 00000000000..90952fe91c0
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegames/klines.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a simple but highly addictive one player game. The player has to move the colored balls around the game board, gathering them into the lines of the same color by five";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegames/kmahjongg.nix b/pkgs/desktops/kde-4.14/kdegames/kmahjongg.nix
new file mode 100644
index 00000000000..946b531ff12
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegames/kmahjongg.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames, libkmahjongg }:
+kde {
+ buildInputs = [ kdelibs libkdegames libkmahjongg ];
+ meta = {
+ description = "the tiles are scrambled and staked on top of each other to resemble a certain shape. The player is then expected to remove all the tiles off the game board by locating each tile's matching pair";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegames/kmines.nix b/pkgs/desktops/kde-4.14/kdegames/kmines.nix
new file mode 100644
index 00000000000..538454e9598
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegames/kmines.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a classic Minesweeper game";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegames/knavalbattle.nix b/pkgs/desktops/kde-4.14/kdegames/knavalbattle.nix
new file mode 100644
index 00000000000..42ffd2fcb4d
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegames/knavalbattle.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a Battle Ship game";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegames/knetwalk.nix b/pkgs/desktops/kde-4.14/kdegames/knetwalk.nix
new file mode 100644
index 00000000000..a16e578ce84
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegames/knetwalk.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a small game where you have to build up a computer network by rotating the wires to connect the terminals to the server";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegames/kolf.nix b/pkgs/desktops/kde-4.14/kdegames/kolf.nix
new file mode 100644
index 00000000000..78815ee5799
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegames/kolf.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a miniature golf game";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegames/kollision.nix b/pkgs/desktops/kde-4.14/kdegames/kollision.nix
new file mode 100644
index 00000000000..3147c7305ea
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegames/kollision.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a simple ball dodging game";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegames/konquest.nix b/pkgs/desktops/kde-4.14/kdegames/konquest.nix
new file mode 100644
index 00000000000..53ddd64928c
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegames/konquest.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "the KDE version of Gnu-Lactic Konquest";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegames/kpat.nix b/pkgs/desktops/kde-4.14/kdegames/kpat.nix
new file mode 100644
index 00000000000..f8d9bad36dc
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegames/kpat.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a relaxing card sorting game";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegames/kreversi.nix b/pkgs/desktops/kde-4.14/kdegames/kreversi.nix
new file mode 100644
index 00000000000..2aed981428e
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegames/kreversi.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a simple one player strategy game played against the computer. If a player's piece is captured by an opposing player, that piece is turned over to reveal the color of that player";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegames/kshisen.nix b/pkgs/desktops/kde-4.14/kdegames/kshisen.nix
new file mode 100644
index 00000000000..9c888034038
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegames/kshisen.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames, libkmahjongg }:
+kde {
+ buildInputs = [ kdelibs libkdegames libkmahjongg ];
+ meta = {
+ description = "a solitaire-like game played using the standard set of Mahjong tiles";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegames/ksirk.nix b/pkgs/desktops/kde-4.14/kdegames/ksirk.nix
new file mode 100644
index 00000000000..767eb67971a
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegames/ksirk.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames, qca2 }:
+kde {
+ buildInputs = [ kdelibs libkdegames qca2 ];
+ meta = {
+ description = "a computerized version of the well known strategic board game Risk";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegames/ksnakeduel.nix b/pkgs/desktops/kde-4.14/kdegames/ksnakeduel.nix
new file mode 100644
index 00000000000..ccf1fb551e9
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegames/ksnakeduel.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a simple Tron-Clone";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegames/kspaceduel.nix b/pkgs/desktops/kde-4.14/kdegames/kspaceduel.nix
new file mode 100644
index 00000000000..5285f7916ca
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegames/kspaceduel.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "each of two possible players control a satellite spaceship orbiting the sun. As the game progresses players have to eliminate the opponent's spacecraft with bullets or mines";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegames/ksquares.nix b/pkgs/desktops/kde-4.14/kdegames/ksquares.nix
new file mode 100644
index 00000000000..a17be2da632
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegames/ksquares.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a game modeled after the well known pen and paper based game of Dots and Boxes";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegames/ksudoku.nix b/pkgs/desktops/kde-4.14/kdegames/ksudoku.nix
new file mode 100644
index 00000000000..ea4e13a5e4f
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegames/ksudoku.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a logic-based symbol placement puzzle";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegames/ktuberling.nix b/pkgs/desktops/kde-4.14/kdegames/ktuberling.nix
new file mode 100644
index 00000000000..1a6ba9d653c
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegames/ktuberling.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a simple constructor game suitable for children and adults alike";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegames/kubrick.nix b/pkgs/desktops/kde-4.14/kdegames/kubrick.nix
new file mode 100644
index 00000000000..9bdc6879db4
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegames/kubrick.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a game based on the Rubik's Cube™ puzzle";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegames/libkdegames.nix b/pkgs/desktops/kde-4.14/kdegames/libkdegames.nix
new file mode 100644
index 00000000000..3819dcdc9ae
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegames/libkdegames.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, openal, libsndfile }:
+kde {
+ buildInputs = [ kdelibs openal libsndfile ];
+ meta = {
+ description = "KDE games library";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegames/libkmahjongg.nix b/pkgs/desktops/kde-4.14/kdegames/libkmahjongg.nix
new file mode 100644
index 00000000000..383b347dc33
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegames/libkmahjongg.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a library for KMahjongg game";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegames/lskat.nix b/pkgs/desktops/kde-4.14/kdegames/lskat.nix
new file mode 100644
index 00000000000..2a5050cd667
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegames/lskat.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a fun and engaging card game for two players, where the second player is either live opponent, or a built in artificial intelligence";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegames/palapeli.nix b/pkgs/desktops/kde-4.14/kdegames/palapeli.nix
new file mode 100644
index 00000000000..010dbd5d623
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegames/palapeli.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+
+# TODO: package qvoronoi
+
+ buildInputs = [ kdelibs libkdegames ];
+
+ meta = {
+ description = "a single-player jigsaw puzzle game";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegames/picmi.nix b/pkgs/desktops/kde-4.14/kdegames/picmi.nix
new file mode 100644
index 00000000000..165d7422f95
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegames/picmi.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a single player logic-based puzzle game";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegraphics/gwenview.nix b/pkgs/desktops/kde-4.14/kdegraphics/gwenview.nix
new file mode 100644
index 00000000000..66a7c79a42b
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegraphics/gwenview.nix
@@ -0,0 +1,16 @@
+{ stdenv, kde, kdelibs, exiv2, kde_baseapps, libkipi, nepomuk_core
+, libjpeg, pkgconfig, kactivities, lcms2, baloo, kfilemetadata, libkdcraw }:
+
+kde {
+
+ buildInputs =
+ [ kdelibs exiv2 nepomuk_core kactivities kde_baseapps libkipi libjpeg lcms2
+ baloo kfilemetadata libkdcraw ];
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ meta = {
+ description = "Gwenview, the KDE image viewer";
+ license = stdenv.lib.licenses.gpl2;
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegraphics/kamera.nix b/pkgs/desktops/kde-4.14/kdegraphics/kamera.nix
new file mode 100644
index 00000000000..d9aa11c54af
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegraphics/kamera.nix
@@ -0,0 +1,10 @@
+{ stdenv, kde, kdelibs, libgphoto2 }:
+
+kde {
+ buildInputs = [ kdelibs libgphoto2 ];
+
+ meta = {
+ description = "KDE camera interface library";
+ license = stdenv.lib.licenses.gpl2;
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegraphics/kcolorchooser.nix b/pkgs/desktops/kde-4.14/kdegraphics/kcolorchooser.nix
new file mode 100644
index 00000000000..e06c1b5d307
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegraphics/kcolorchooser.nix
@@ -0,0 +1,10 @@
+{ stdenv, kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "A small utility to select a color";
+ license = stdenv.lib.licenses.gpl2;
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegraphics/kdegraphics-mobipocket.nix b/pkgs/desktops/kde-4.14/kdegraphics/kdegraphics-mobipocket.nix
new file mode 100644
index 00000000000..e834762feb5
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegraphics/kdegraphics-mobipocket.nix
@@ -0,0 +1,10 @@
+{ stdenv, kde, kdelibs, okular }:
+
+kde {
+ buildInputs = [ kdelibs okular ];
+
+ meta = {
+ description = "A collection of plugins to handle mobipocket files";
+ license = stdenv.lib.licenses.gpl2;
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegraphics/kdegraphics-strigi-analyzer.nix b/pkgs/desktops/kde-4.14/kdegraphics/kdegraphics-strigi-analyzer.nix
new file mode 100644
index 00000000000..d9d35808ac5
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegraphics/kdegraphics-strigi-analyzer.nix
@@ -0,0 +1,10 @@
+{ stdenv, kde, kdelibs, libtiff }:
+
+kde {
+ buildInputs = [ kdelibs libtiff ];
+
+ meta = {
+ description = "Strigi analyzers for various graphics file formats";
+ license = stdenv.lib.licenses.gpl2;
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegraphics/kdegraphics-thumbnailers.nix b/pkgs/desktops/kde-4.14/kdegraphics/kdegraphics-thumbnailers.nix
new file mode 100644
index 00000000000..d6207689512
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegraphics/kdegraphics-thumbnailers.nix
@@ -0,0 +1,13 @@
+{ stdenv, kde, kdelibs, libkexiv2, libkdcraw, pkgconfig }:
+
+kde {
+
+ buildInputs = [ kdelibs libkexiv2 libkdcraw ];
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ meta = {
+ description = "Thumbnailers for various graphics file formats";
+ license = stdenv.lib.licenses.gpl2;
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegraphics/kgamma.nix b/pkgs/desktops/kde-4.14/kdegraphics/kgamma.nix
new file mode 100644
index 00000000000..016312c199e
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegraphics/kgamma.nix
@@ -0,0 +1,10 @@
+{ stdenv, kde, kdelibs, libXxf86vm }:
+
+kde {
+ buildInputs = [ kdelibs libXxf86vm ];
+
+ meta = {
+ description = "KDE monitor calibration tool";
+ license = stdenv.lib.licenses.gpl2;
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegraphics/kolourpaint.nix b/pkgs/desktops/kde-4.14/kdegraphics/kolourpaint.nix
new file mode 100644
index 00000000000..ecf34e5ae9e
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegraphics/kolourpaint.nix
@@ -0,0 +1,10 @@
+{ stdenv, kde, kdelibs, qimageblitz }:
+
+kde {
+ buildInputs = [ kdelibs qimageblitz ];
+
+ meta = {
+ description = "KDE paint program";
+ license = stdenv.lib.licenses.gpl2;
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegraphics/kruler.nix b/pkgs/desktops/kde-4.14/kdegraphics/kruler.nix
new file mode 100644
index 00000000000..209331d9e83
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegraphics/kruler.nix
@@ -0,0 +1,10 @@
+{ stdenv, kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "KDE screen ruler";
+ license = stdenv.lib.licenses.gpl2;
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegraphics/ksaneplugin.nix b/pkgs/desktops/kde-4.14/kdegraphics/ksaneplugin.nix
new file mode 100644
index 00000000000..f541c4bdb4d
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegraphics/ksaneplugin.nix
@@ -0,0 +1,10 @@
+{ stdenv, kde, kdelibs, libksane }:
+
+kde {
+ buildInputs = [ kdelibs libksane ];
+
+ meta = {
+ description = "A KScan plugin that implements the scanning through libksane";
+ license = stdenv.lib.licenses.gpl2;
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegraphics/ksnapshot.nix b/pkgs/desktops/kde-4.14/kdegraphics/ksnapshot.nix
new file mode 100644
index 00000000000..a9897d270bb
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegraphics/ksnapshot.nix
@@ -0,0 +1,10 @@
+{ stdenv, kde, kdelibs, libkipi }:
+
+kde {
+ buildInputs = [ kdelibs libkipi ];
+
+ meta = {
+ description = "KDE screenshot utility";
+ license = stdenv.lib.licenses.gpl2;
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegraphics/libkdcraw.nix b/pkgs/desktops/kde-4.14/kdegraphics/libkdcraw.nix
new file mode 100644
index 00000000000..1d5c6e2fcb4
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegraphics/libkdcraw.nix
@@ -0,0 +1,13 @@
+{ stdenv, kde, kdelibs, pkgconfig, libraw, lcms2 }:
+
+kde {
+
+ buildInputs = [ kdelibs libraw lcms2 ];
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ meta = {
+ description = "Library for decoding RAW images";
+ license = stdenv.lib.licenses.gpl2;
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegraphics/libkexiv2.nix b/pkgs/desktops/kde-4.14/kdegraphics/libkexiv2.nix
new file mode 100644
index 00000000000..46ec45fad01
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegraphics/libkexiv2.nix
@@ -0,0 +1,10 @@
+{ stdenv, kde, kdelibs, exiv2 }:
+
+kde {
+ buildInputs = [ kdelibs exiv2 ];
+
+ meta = {
+ description = "Exiv2 support library";
+ license = stdenv.lib.licenses.gpl2;
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegraphics/libkipi.nix b/pkgs/desktops/kde-4.14/kdegraphics/libkipi.nix
new file mode 100644
index 00000000000..65e6c52bd44
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegraphics/libkipi.nix
@@ -0,0 +1,10 @@
+{ stdenv, kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "Interface library to kipi-plugins";
+ license = stdenv.lib.licenses.gpl2;
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegraphics/libksane.nix b/pkgs/desktops/kde-4.14/kdegraphics/libksane.nix
new file mode 100644
index 00000000000..6c3543eef37
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegraphics/libksane.nix
@@ -0,0 +1,10 @@
+{ stdenv, kde, kdelibs, saneBackends }:
+
+kde {
+ buildInputs = [ kdelibs saneBackends ];
+
+ meta = {
+ description = "An image scanning library that provides a QWidget that contains all the logic needed to interface a sacanner";
+ license = stdenv.lib.licenses.gpl2;
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegraphics/okular.nix b/pkgs/desktops/kde-4.14/kdegraphics/okular.nix
new file mode 100644
index 00000000000..092833388a7
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegraphics/okular.nix
@@ -0,0 +1,17 @@
+{ stdenv, chmlib, djvulibre, ebook_tools, kde, kdelibs, libspectre, popplerQt4, qca2
+, qimageblitz, libtiff, kactivities, pkgconfig, libkexiv2 }:
+
+kde {
+
+# TODO: package activeapp, qmobipocket
+
+ buildInputs = [ kdelibs chmlib djvulibre ebook_tools libspectre popplerQt4
+ qca2 qimageblitz libtiff kactivities libkexiv2 ];
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ meta = {
+ description = "Okular, the KDE document viewer";
+ license = stdenv.lib.licenses.gpl2;
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdegraphics/svgpart.nix b/pkgs/desktops/kde-4.14/kdegraphics/svgpart.nix
new file mode 100644
index 00000000000..2fc0e373dbd
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdegraphics/svgpart.nix
@@ -0,0 +1,10 @@
+{ stdenv, kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "SVG KPart";
+ license = stdenv.lib.licenses.gpl2;
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdelibs/baloo-widgets.nix b/pkgs/desktops/kde-4.14/kdelibs/baloo-widgets.nix
new file mode 100644
index 00000000000..46567b5e2a7
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdelibs/baloo-widgets.nix
@@ -0,0 +1,11 @@
+{ stdenv, kde, kdelibs, baloo, kfilemetadata, pkgconfig }:
+
+kde {
+ buildInputs = [ kdelibs baloo kfilemetadata ];
+ nativeBuildInputs = [ pkgconfig ];
+
+ meta = {
+ description = "Baloo Widgets";
+ license = stdenv.lib.licenses.gpl2;
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdelibs/baloo.nix b/pkgs/desktops/kde-4.14/kdelibs/baloo.nix
new file mode 100644
index 00000000000..0976639e803
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdelibs/baloo.nix
@@ -0,0 +1,18 @@
+{ stdenv, kde, kdelibs, pkgconfig, doxygen, kdepimlibs, xapian, qjson, akonadi, kfilemetadata
+}:
+
+kde {
+
+# TODO: qmobipocket
+
+ buildInputs = [
+ kdelibs kdepimlibs xapian qjson akonadi kfilemetadata
+ ];
+
+ nativeBuildInputs = [ pkgconfig doxygen ];
+
+ meta = {
+ description = "Baloo";
+ license = stdenv.lib.licenses.gpl2;
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdelibs/kdelibs.nix b/pkgs/desktops/kde-4.14/kdelibs/kdelibs.nix
new file mode 100644
index 00000000000..4207dfd5654
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdelibs/kdelibs.nix
@@ -0,0 +1,48 @@
+{ kde, gcc, cmake, perl
+, qt4, bzip2, fam, shared_mime_info, giflib, jasper, strigi
+, openexr, avahi, kerberos, shared_desktop_ontologies, libXScrnSaver
+, automoc4, soprano, qca2, attica, enchant, libdbusmenu_qt, grantlee
+, docbook_xml_dtd_42, docbook_xsl, polkit_qt_1, acl, attr, libXtst
+, udev, herqq, phonon, libjpeg, xz, ilmbase, libxslt
+, pkgconfig
+}:
+
+kde {
+
+# TODO: media-player-info
+
+ buildInputs =
+ [ pkgconfig attica avahi bzip2 enchant fam giflib grantlee herqq
+ libdbusmenu_qt libXScrnSaver polkit_qt_1 qca2 acl jasper libxslt
+ shared_desktop_ontologies xz udev libjpeg kerberos openexr
+ libXtst attr
+ ];
+
+ NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
+
+ propagatedBuildInputs = [ qt4 soprano phonon strigi ];
+
+ propagatedNativeBuildInputs = [ automoc4 cmake perl shared_mime_info ];
+
+ # TODO: make sonnet plugins (dictionaries) really work.
+ # There are a few hardcoded paths.
+ # Split plugins from libs?
+
+ patches = [
+ ../files/polkit-install.patch
+ ];
+
+ cmakeFlags = [
+ "-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook"
+ "-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook"
+ "-DHUPNP_ENABLED=ON"
+ "-DWITH_SOLID_UDISKS2=ON"
+ ];
+
+ passthru.wantsUdisks2 = true;
+
+ meta = {
+ description = "KDE libraries";
+ license = "LGPL";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdelibs/kfilemetadata.nix b/pkgs/desktops/kde-4.14/kdelibs/kfilemetadata.nix
new file mode 100644
index 00000000000..48f535549ce
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdelibs/kfilemetadata.nix
@@ -0,0 +1,14 @@
+{ stdenv, kde, kdelibs, pkgconfig, doxygen, popplerQt4, taglib, exiv2, ffmpeg }:
+
+kde {
+ buildInputs = [
+ kdelibs popplerQt4 taglib exiv2 ffmpeg
+ ];
+
+ nativeBuildInputs = [ pkgconfig doxygen ];
+
+ meta = {
+ description = "KFileMetaData";
+ license = stdenv.lib.licenses.gpl2;
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdelibs/nepomuk-core.nix b/pkgs/desktops/kde-4.14/kdelibs/nepomuk-core.nix
new file mode 100644
index 00000000000..d90e1455ce9
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdelibs/nepomuk-core.nix
@@ -0,0 +1,20 @@
+{ stdenv, kde, kdelibs, soprano, shared_desktop_ontologies, exiv2, ffmpeg, taglib, popplerQt4
+, pkgconfig, doxygen, ebook_tools
+}:
+
+kde {
+
+# TODO: qmobipocket
+
+ buildInputs = [
+ kdelibs soprano shared_desktop_ontologies taglib exiv2 ffmpeg
+ popplerQt4 ebook_tools
+ ];
+
+ nativeBuildInputs = [ pkgconfig doxygen ];
+
+ meta = {
+ description = "NEPOMUK core";
+ license = stdenv.lib.licenses.gpl2;
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdelibs/nepomuk-widgets.nix b/pkgs/desktops/kde-4.14/kdelibs/nepomuk-widgets.nix
new file mode 100644
index 00000000000..b0fc5ad8900
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdelibs/nepomuk-widgets.nix
@@ -0,0 +1,11 @@
+{ stdenv, kde, kdelibs, nepomuk_core }:
+
+kde {
+
+ buildInputs = [ kdelibs nepomuk_core ];
+
+ meta = {
+ description = "NEPOMUK Widgets";
+ license = stdenv.lib.licenses.gpl2;
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/audiocd-kio.nix b/pkgs/desktops/kde-4.14/kdemultimedia/audiocd-kio.nix
new file mode 100644
index 00000000000..4c56e7529dd
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdemultimedia/audiocd-kio.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkcompactdisc, cdparanoia, libkcddb, libvorbis, flac, lame }:
+kde {
+ buildInputs = [ kdelibs libkcompactdisc cdparanoia libkcddb libvorbis flac lame ];
+ meta = {
+ description = "transparent audio CD access for applications using the KDE Platform";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/dragon.nix b/pkgs/desktops/kde-4.14/kdemultimedia/dragon.nix
new file mode 100644
index 00000000000..006300742ec
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdemultimedia/dragon.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs }:
+kde {
+ buildInputs = [ kdelibs ];
+ meta = {
+ description = "a multimedia player with the focus on simplicity";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/ffmpegthumbs.nix b/pkgs/desktops/kde-4.14/kdemultimedia/ffmpegthumbs.nix
new file mode 100644
index 00000000000..45f6c9abcb6
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdemultimedia/ffmpegthumbs.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, ffmpeg }:
+kde {
+ buildInputs = [ kdelibs ffmpeg ];
+ meta = {
+ description = "a video thumbnail generator for KDE file managers like Dolphin and Konqueror";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/juk.nix b/pkgs/desktops/kde-4.14/kdemultimedia/juk.nix
new file mode 100644
index 00000000000..5d7b1db224e
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdemultimedia/juk.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs, taglib, libtunepimp }:
+kde {
+
+# TODO: opusfile
+
+ buildInputs = [ kdelibs taglib libtunepimp ];
+ meta = {
+ description = "an audio jukebox application";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/kmix.nix b/pkgs/desktops/kde-4.14/kdemultimedia/kmix.nix
new file mode 100644
index 00000000000..1dd8108166f
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdemultimedia/kmix.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libcanberra, pulseaudio }:
+kde {
+ buildInputs = [ kdelibs libcanberra pulseaudio ];
+ meta = {
+ description = "sound mixer, an application to allow you to change the volume of your sound card";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/kscd.nix b/pkgs/desktops/kde-4.14/kdemultimedia/kscd.nix
new file mode 100644
index 00000000000..e99ae53935b
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdemultimedia/kscd.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libmusicbrainz }:
+kde {
+ buildInputs = [ kdelibs libmusicbrainz ];
+ meta = {
+ description = "KDE CD player";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/libkcddb.nix b/pkgs/desktops/kde-4.14/kdemultimedia/libkcddb.nix
new file mode 100644
index 00000000000..720b01d1861
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdemultimedia/libkcddb.nix
@@ -0,0 +1,8 @@
+{ kde, kdelibs }:
+kde {
+#todo: libmusicbrainz5
+ buildInputs = [ kdelibs ];
+ meta = {
+ description = "a library used to retrieve audio CD meta data from the internet";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/libkcompactdisc.nix b/pkgs/desktops/kde-4.14/kdemultimedia/libkcompactdisc.nix
new file mode 100644
index 00000000000..6ed08af89f3
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdemultimedia/libkcompactdisc.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs }:
+kde {
+ buildInputs = [ kdelibs ];
+ meta = {
+ description = "KDE library for playing & ripping CDs";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/mplayerthumbs.nix b/pkgs/desktops/kde-4.14/kdemultimedia/mplayerthumbs.nix
new file mode 100644
index 00000000000..c88ebcc2a5a
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdemultimedia/mplayerthumbs.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs }:
+kde {
+ buildInputs = [ kdelibs ];
+ meta = {
+ description = "a video thumbnail generator for KDE";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdenetwork/kdenetwork-filesharing.nix b/pkgs/desktops/kde-4.14/kdenetwork/kdenetwork-filesharing.nix
new file mode 100644
index 00000000000..0330511a258
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdenetwork/kdenetwork-filesharing.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "KDE properties dialog plugin to share a directory with the local network";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdenetwork/kdenetwork-strigi-analyzers.nix b/pkgs/desktops/kde-4.14/kdenetwork/kdenetwork-strigi-analyzers.nix
new file mode 100644
index 00000000000..e838d84fc5e
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdenetwork/kdenetwork-strigi-analyzers.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, boost }:
+
+kde {
+ buildInputs = [ kdelibs boost ];
+
+ meta = {
+ description = "Strigi analyzers for various network protocols";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdenetwork/kget.nix b/pkgs/desktops/kde-4.14/kdenetwork/kget.nix
new file mode 100644
index 00000000000..f986da2de21
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdenetwork/kget.nix
@@ -0,0 +1,20 @@
+{ kde, kdelibs, libktorrent, kde_workspace, sqlite, boost
+, kde_baseapps, libmms, qca2, nepomuk_core, nepomuk_widgets
+, pkgconfig }:
+
+kde {
+
+# TODO: QGpgME
+
+ buildInputs =
+ [ kdelibs libktorrent nepomuk_core nepomuk_widgets sqlite qca2
+ libmms kde_baseapps kde_workspace boost ];
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ KDEDIRS = libktorrent;
+
+ meta = {
+ description = "KDE download manager";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdenetwork/kopete.nix b/pkgs/desktops/kde-4.14/kdenetwork/kopete.nix
new file mode 100644
index 00000000000..7d8aec21ce6
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdenetwork/kopete.nix
@@ -0,0 +1,26 @@
+{ kde, kdelibs, libmsn, libotr, kdepimlibs, qimageblitz, libktorrent,
+ jasper, libidn, mediastreamer, pkgconfig, libxslt, giflib,
+ libgadu, boost, qca2, sqlite, jsoncpp,
+ ortp, srtp, libv4l }:
+
+kde {
+
+# TODO: libmeanwhile, xmms, jsoncpp(not found), kleopatra(from kdepim but doesn't install headers?),
+
+ buildInputs = [
+ kdelibs qca2 mediastreamer libgadu jsoncpp
+ kdepimlibs qimageblitz sqlite jasper libotr libmsn giflib
+ libidn libxslt boost
+ ortp srtp libv4l
+ ];
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ KDEDIRS = libktorrent;
+
+ cmakeFlags = [ "-DBUILD_skypebuttons=TRUE" ];
+
+ meta = {
+ description = "A KDE multi-protocol IM client";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdenetwork/kppp.nix b/pkgs/desktops/kde-4.14/kdenetwork/kppp.nix
new file mode 100644
index 00000000000..4c6bd65769f
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdenetwork/kppp.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "PPP(Dial-Up) client tool";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdenetwork/krdc.nix b/pkgs/desktops/kde-4.14/kdenetwork/krdc.nix
new file mode 100644
index 00000000000..80557e827fe
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdenetwork/krdc.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, libvncserver, freerdp, telepathy_qt }:
+
+kde {
+ buildInputs = [ kdelibs libvncserver freerdp telepathy_qt ];
+
+ meta = {
+ description = "KDE remote desktop client";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdenetwork/krfb.nix b/pkgs/desktops/kde-4.14/kdenetwork/krfb.nix
new file mode 100644
index 00000000000..cb4857965a3
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdenetwork/krfb.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, libvncserver, libXdamage, libXtst, libjpeg, telepathy_qt }:
+
+kde {
+ buildInputs = [ kdelibs libvncserver libXdamage libXtst libjpeg telepathy_qt ];
+
+ meta = {
+ description = "KDE desktop sharing";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdenetwork/zeroconf-ioslave.nix b/pkgs/desktops/kde-4.14/kdenetwork/zeroconf-ioslave.nix
new file mode 100644
index 00000000000..f65960cc337
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdenetwork/zeroconf-ioslave.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "KDE tool that monitors the network for DNS-SD services";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdepim-runtime.nix b/pkgs/desktops/kde-4.14/kdepim-runtime.nix
new file mode 100644
index 00000000000..d92e2254820
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdepim-runtime.nix
@@ -0,0 +1,16 @@
+{ kde, libxslt, boost, kdepimlibs, akonadi, shared_desktop_ontologies }:
+
+kde {
+
+# TODO: libkgapi(2), LibKFbAPI,libkolab, libkolabxml
+
+ buildInputs = [
+ kdepimlibs akonadi boost shared_desktop_ontologies
+ libxslt
+ ];
+
+ meta = {
+ description = "KDE PIM runtime";
+ license = "GPL";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdepim.nix b/pkgs/desktops/kde-4.14/kdepim.nix
new file mode 100644
index 00000000000..9f266e596a6
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdepim.nix
@@ -0,0 +1,28 @@
+{ kde, boost, gpgme, libassuan, libxslt, kdepimlibs, kdepim_runtime
+, akonadi, shared_desktop_ontologies, cyrus_sasl, grantlee, prison
+, nepomuk_widgets, kactivities, libXScrnSaver, qjson, baloo
+, pkgconfig }:
+
+kde {
+
+# TODO: LinkGrammar
+
+ buildInputs =
+ [ kdepimlibs boost shared_desktop_ontologies akonadi nepomuk_widgets
+ libxslt cyrus_sasl gpgme libassuan grantlee prison kactivities
+ libXScrnSaver qjson baloo
+ ];
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ passthru.propagatedUserEnvPackages = [ akonadi kdepimlibs kdepim_runtime ];
+
+ meta = {
+ description = "KDE PIM tools";
+ longDescription = ''
+ Contains various personal information management tools for KDE, such as an organizer.
+ '';
+ license = "GPL";
+ homepage = http://pim.kde.org;
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdepimlibs.nix b/pkgs/desktops/kde-4.14/kdepimlibs.nix
new file mode 100644
index 00000000000..8301e9f4b18
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdepimlibs.nix
@@ -0,0 +1,19 @@
+{ kde, pkgconfig, boost, cyrus_sasl, gpgme, libical, openldap, prison
+, kdelibs, akonadi, libxslt, nepomuk_core
+, shared_desktop_ontologies, qjson }:
+
+kde {
+ nativeBuildInputs = [ pkgconfig ];
+
+ buildInputs =
+ [ gpgme libical libxslt qjson prison
+ openldap cyrus_sasl akonadi shared_desktop_ontologies
+ ];
+
+ propagatedBuildInputs = [ kdelibs nepomuk_core boost ];
+
+ meta = {
+ description = "KDE PIM libraries";
+ license = "LGPL";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeplasma-addons.nix b/pkgs/desktops/kde-4.14/kdeplasma-addons.nix
new file mode 100644
index 00000000000..2b1f1628cf1
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeplasma-addons.nix
@@ -0,0 +1,23 @@
+{ kde, kdelibs, marble, shared_desktop_ontologies, pkgconfig
+, boost, eigen2, kde_workspace, attica, qca2, qimageblitz
+, kdepimlibs, libkexiv2, libqalculate, libXtst, libdbusmenu_qt
+, qjson, qoauth }:
+
+kde {
+
+# TODO: qwt, scim, ibus
+
+ KDEDIRS=marble;
+
+ buildInputs = [ kdelibs boost kde_workspace kdepimlibs attica qjson qoauth
+ eigen2 qca2 libXtst qimageblitz libqalculate
+ shared_desktop_ontologies marble libkexiv2 libdbusmenu_qt
+ ];
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ meta = {
+ description = "KDE Plasma Addons";
+ license = "GPL";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdesdk/cervisia.nix b/pkgs/desktops/kde-4.14/kdesdk/cervisia.nix
new file mode 100644
index 00000000000..1dabe46cd42
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdesdk/cervisia.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "A KDE CVS frontend";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdesdk/dolphin-plugins.nix b/pkgs/desktops/kde-4.14/kdesdk/dolphin-plugins.nix
new file mode 100644
index 00000000000..ad8132a850e
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdesdk/dolphin-plugins.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs, kde_baseapps }:
+
+kde {
+
+ # Needs kdebase for libkonq
+ buildInputs = [ kdelibs kde_baseapps ];
+
+ meta = {
+ description = "Svn, mercurial, git and bazaar plugins for dolphin";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdesdk/kapptemplate.nix b/pkgs/desktops/kde-4.14/kdesdk/kapptemplate.nix
new file mode 100644
index 00000000000..391536248dd
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdesdk/kapptemplate.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "A KDE 4 project template generator";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdesdk/kcachegrind.nix b/pkgs/desktops/kde-4.14/kdesdk/kcachegrind.nix
new file mode 100644
index 00000000000..65d410cca48
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdesdk/kcachegrind.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "KDE Frontend for Callgrind/Cachegrind";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdesdk/kde-dev-scripts.nix b/pkgs/desktops/kde-4.14/kdesdk/kde-dev-scripts.nix
new file mode 100644
index 00000000000..df81145e5d6
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdesdk/kde-dev-scripts.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "Various scripts to ease KDE development";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdesdk/kde-dev-utils.nix b/pkgs/desktops/kde-4.14/kdesdk/kde-dev-utils.nix
new file mode 100644
index 00000000000..215c0a3c613
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdesdk/kde-dev-utils.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs, gcc, libtool }:
+
+kde {
+ buildInputs = [ kdelibs libtool ];
+
+ preConfigure = "export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:${gcc}:${gcc.gcc}";
+
+ meta = {
+ description = "various KDE development utilities";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdesdk/kdesdk-kioslaves.nix b/pkgs/desktops/kde-4.14/kdesdk/kdesdk-kioslaves.nix
new file mode 100644
index 00000000000..98bbce35a97
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdesdk/kdesdk-kioslaves.nix
@@ -0,0 +1,12 @@
+{ kde, kdelibs, subversionClient, apr, aprutil,perl }:
+
+kde {
+
+ buildInputs = [ kdelibs subversionClient apr aprutil perl ];
+
+ cmakeFlags = [ "-DBUILD_perldoc=ON" ];
+
+ meta = {
+ description = "Subversion and perldoc kioslaves";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdesdk/kdesdk-strigi-analyzers.nix b/pkgs/desktops/kde-4.14/kdesdk/kdesdk-strigi-analyzers.nix
new file mode 100644
index 00000000000..4d579b88ba8
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdesdk/kdesdk-strigi-analyzers.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "Strigi analyzers for diff, po and ts";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdesdk/kdesdk-thumbnailers.nix b/pkgs/desktops/kde-4.14/kdesdk/kdesdk-thumbnailers.nix
new file mode 100644
index 00000000000..d707fe9038f
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdesdk/kdesdk-thumbnailers.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs, gettext }:
+
+kde {
+
+ buildInputs = [ kdelibs gettext ];
+
+ meta = {
+ description = "PO file format thumbnailer";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdesdk/kompare.nix b/pkgs/desktops/kde-4.14/kdesdk/kompare.nix
new file mode 100644
index 00000000000..644c7c48dc9
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdesdk/kompare.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, libkomparediff2 }:
+
+kde {
+ buildInputs = [ kdelibs libkomparediff2 ];
+
+ meta = {
+ description = "A program to view the differences between files and optionally generate a diff";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdesdk/libkomparediff2.nix b/pkgs/desktops/kde-4.14/kdesdk/libkomparediff2.nix
new file mode 100644
index 00000000000..5933682c70a
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdesdk/libkomparediff2.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "A library to compare files and strings";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdesdk/lokalize.nix b/pkgs/desktops/kde-4.14/kdesdk/lokalize.nix
new file mode 100644
index 00000000000..1565426eb1f
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdesdk/lokalize.nix
@@ -0,0 +1,13 @@
+{ kde, kdelibs, hunspell }:
+
+kde {
+ buildInputs = [ kdelibs hunspell ];
+
+ meta = {
+ description = "KDE 4 Computer-aided translation system";
+ longDescription = ''
+ Computer-aided translation system.
+ Do not translate what had already been translated.
+ '';
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdesdk/okteta.nix b/pkgs/desktops/kde-4.14/kdesdk/okteta.nix
new file mode 100644
index 00000000000..058636596ad
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdesdk/okteta.nix
@@ -0,0 +1,13 @@
+{ kde, kdelibs, qca2 }:
+
+kde {
+ buildInputs = [ kdelibs qca2 ];
+
+# TODO: Look what does -DBUILD_mobile add
+
+ enableParallelBuilding = false;
+
+ meta = {
+ description = "KDE byte editor";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdesdk/poxml.nix b/pkgs/desktops/kde-4.14/kdesdk/poxml.nix
new file mode 100644
index 00000000000..6e46c3e3ab4
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdesdk/poxml.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, antlr, gettext }:
+
+kde {
+ buildInputs = [ kdelibs antlr gettext ];
+
+ meta = {
+ description = "Po<->xml tools";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdesdk/umbrello.nix b/pkgs/desktops/kde-4.14/kdesdk/umbrello.nix
new file mode 100644
index 00000000000..e83a2d9a901
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdesdk/umbrello.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, libxml2, libxslt, boost }:
+
+kde {
+ buildInputs = [ kdelibs libxml2 libxslt boost ];
+
+ meta = {
+ description = "Umbrello UML modeller";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdetoys/amor.nix b/pkgs/desktops/kde-4.14/kdetoys/amor.nix
new file mode 100644
index 00000000000..936d63d544a
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdetoys/amor.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "KDE creature for your desktop";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdetoys/kteatime.nix b/pkgs/desktops/kde-4.14/kdetoys/kteatime.nix
new file mode 100644
index 00000000000..dacf54def4b
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdetoys/kteatime.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "KDE utility for making a fine cup of tea";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdetoys/ktux.nix b/pkgs/desktops/kde-4.14/kdetoys/ktux.nix
new file mode 100644
index 00000000000..108f9be7c72
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdetoys/ktux.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, kde_workspace }:
+
+kde {
+ buildInputs = [ kdelibs kde_workspace ];
+
+ meta = {
+ description = "Tux Screen Saver";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeutils/ark.nix b/pkgs/desktops/kde-4.14/kdeutils/ark.nix
new file mode 100644
index 00000000000..99844b909fd
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeutils/ark.nix
@@ -0,0 +1,17 @@
+{ makeWrapper, kde, kdelibs, libarchive, bzip2, kde_baseapps, lzma, qjson
+, unzip }:
+
+kde {
+ buildInputs = [
+ makeWrapper kdelibs kde_baseapps libarchive bzip2 lzma qjson
+ ];
+
+ postInstall = ''
+ wrapProgram $out/bin/ark \
+ --prefix PATH ":" "${unzip}/bin"
+ '';
+
+ meta = {
+ description = "KDE Archiving Tool";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeutils/filelight.nix b/pkgs/desktops/kde-4.14/kdeutils/filelight.nix
new file mode 100644
index 00000000000..25ecabed27c
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeutils/filelight.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "Tool to visualise file and directory sizes";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeutils/kcalc.nix b/pkgs/desktops/kde-4.14/kdeutils/kcalc.nix
new file mode 100644
index 00000000000..08b202e8f0e
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeutils/kcalc.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, gmp }:
+
+kde {
+ buildInputs = [ kdelibs gmp ];
+
+ meta = {
+ description = "KDE Calculator";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeutils/kcharselect.nix b/pkgs/desktops/kde-4.14/kdeutils/kcharselect.nix
new file mode 100644
index 00000000000..d4c9c06f483
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeutils/kcharselect.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "KDE character selection utility";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeutils/kdf.nix b/pkgs/desktops/kde-4.14/kdeutils/kdf.nix
new file mode 100644
index 00000000000..3f9da58d0a6
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeutils/kdf.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "KDE free disk space utility";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeutils/kfloppy.nix b/pkgs/desktops/kde-4.14/kdeutils/kfloppy.nix
new file mode 100644
index 00000000000..2434a4fa671
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeutils/kfloppy.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "Floppy disk formatting utility";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeutils/kgpg.nix b/pkgs/desktops/kde-4.14/kdeutils/kgpg.nix
new file mode 100644
index 00000000000..b3f95356d13
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeutils/kgpg.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs, kdepimlibs, boost, gpgme }:
+
+kde {
+
+ buildInputs = [ kdelibs kdepimlibs boost gpgme ];
+
+ meta = {
+ description = "Simple KDE GUI for GPG";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeutils/kremotecontrol.nix b/pkgs/desktops/kde-4.14/kdeutils/kremotecontrol.nix
new file mode 100644
index 00000000000..70311a789f9
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeutils/kremotecontrol.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, libXtst }:
+
+kde {
+ buildInputs = [ kdelibs libXtst ];
+
+ meta = {
+ description = "KDE remote control";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeutils/ktimer.nix b/pkgs/desktops/kde-4.14/kdeutils/ktimer.nix
new file mode 100644
index 00000000000..5700977349e
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeutils/ktimer.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "KDE Timer";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeutils/kwalletmanager.nix b/pkgs/desktops/kde-4.14/kdeutils/kwalletmanager.nix
new file mode 100644
index 00000000000..9ec0e6c0396
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeutils/kwalletmanager.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "KDE Wallet (password storage) management tool";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeutils/print-manager.nix b/pkgs/desktops/kde-4.14/kdeutils/print-manager.nix
new file mode 100644
index 00000000000..ae72becd1e4
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeutils/print-manager.nix
@@ -0,0 +1,27 @@
+{ kde, kdelibs
+, pythonPackages, cups, pyqt4, pykde4, pycups, system_config_printer }:
+
+let s_c_p = system_config_printer.override { withGUI = false; }; in
+
+kde rec {
+ buildInputs = [ kdelibs pythonPackages.python pythonPackages.wrapPython
+ ] ++ pythonPath;
+
+ pythonPath = [ cups pyqt4 pykde4 pycups s_c_p ];
+
+ passthru.propagatedUserEnvPackages = [ s_c_p ];
+
+ postInstall =
+ ''
+ wrapPythonPrograms
+
+ # "system-config-printer" supplies some D-Bus policy that we need.
+ mkdir -p $out/nix-support
+ echo ${s_c_p} > $out/nix-support/propagated-user-env-packages
+ '';
+
+ meta = {
+ description = "KDE printer manager";
+ longDescription = "Applet to view current print jobs and configure new printers";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeutils/superkaramba.nix b/pkgs/desktops/kde-4.14/kdeutils/superkaramba.nix
new file mode 100644
index 00000000000..cbe7a285606
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeutils/superkaramba.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs, qimageblitz, python }:
+
+kde {
+ buildInputs = [ kdelibs qimageblitz python ];
+
+ cmakeFlags = [ "-DBUILD_icons=TRUE" "-DBUILD_plasma=TRUE" ];
+
+ meta = {
+ description = "A KDE Eye-candy Application";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdeutils/sweeper.nix b/pkgs/desktops/kde-4.14/kdeutils/sweeper.nix
new file mode 100644
index 00000000000..78d56c7df30
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeutils/sweeper.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "Helps clean unwanted traces the user leaves on the system";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdewebdev/kfilereplace.nix b/pkgs/desktops/kde-4.14/kdewebdev/kfilereplace.nix
new file mode 100644
index 00000000000..55e37809e07
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdewebdev/kfilereplace.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "Batch search and replace tool";
+ homepage = http://www.kdewebdev.org;
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdewebdev/kimagemapeditor.nix b/pkgs/desktops/kde-4.14/kdewebdev/kimagemapeditor.nix
new file mode 100644
index 00000000000..6d22f72461f
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdewebdev/kimagemapeditor.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "An HTML imagemap editor";
+ homepage = http://www.nongnu.org/kimagemap/;
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdewebdev/klinkstatus.nix b/pkgs/desktops/kde-4.14/kdewebdev/klinkstatus.nix
new file mode 100644
index 00000000000..918512e2b2d
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdewebdev/klinkstatus.nix
@@ -0,0 +1,13 @@
+{ kde, kdelibs, libxml2, libxslt, kdepimlibs, htmlTidy, boost }:
+
+kde {
+
+# todo: ruby19 is not found by the build system. not linking against ruby18 due to it being too old
+
+ buildInputs = [ kdelibs kdepimlibs htmlTidy boost ];
+
+ meta = {
+ description = "A KDE link checker";
+ homepage = http://klinkstatus.kdewebdev.org;
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/kdewebdev/kommander.nix b/pkgs/desktops/kde-4.14/kdewebdev/kommander.nix
new file mode 100644
index 00000000000..d5f4337f714
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdewebdev/kommander.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "A graphical editor of scripted dialogs";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/l10n/default.nix b/pkgs/desktops/kde-4.14/l10n/default.nix
new file mode 100644
index 00000000000..fa6406043b1
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/l10n/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchurl, kdelibs, gettext, release, branch, stable }:
+
+let
+
+ inherit (stdenv.lib) attrByPath singleton;
+
+ kdeL10nDerivation =
+ { lang, saneName, sha256 }:
+
+ stdenv.mkDerivation rec {
+ name = "kde-l10n-${saneName}-${release}";
+
+ src = fetchurl {
+ url = "mirror://kde/${if stable then "" else "un"}stable/${release}/src/kde-l10n/kde-l10n-${lang}-${release}.tar.xz";
+ name = "${name}.tar.xz";
+ inherit sha256;
+ };
+
+ buildInputs = [ gettext kdelibs ];
+
+ cmakeFlags = "-Wno-dev";
+
+ meta = {
+ description = "KDE translation for ${lang}";
+ inherit branch;
+ license = "GPL";
+ platforms = stdenv.lib.platforms.linux;
+ inherit (kdelibs.meta) maintainers homepage;
+ };
+ };
+
+ kdeL10nRelease =
+ builtins.listToAttrs (
+ map ({lang, saneName, sha256}:
+ {
+ name = saneName;
+ value = kdeL10nDerivation { inherit lang saneName sha256; };
+ }
+ ) (import (./manifest + "-${release}.nix"))
+ );
+
+in
+{
+ inherit kdeL10nDerivation;
+ recurseForDerivations = true;
+} // kdeL10nRelease
diff --git a/pkgs/desktops/kde-4.14/l10n/l10n-manifest.sh b/pkgs/desktops/kde-4.14/l10n/l10n-manifest.sh
new file mode 100755
index 00000000000..ec159a1e204
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/l10n/l10n-manifest.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+# Usage: download kde-l10n to $dir, then run
+# $0 $dir
+
+dir=$1
+
+if [[ ! -d "${dir}" ]]; then
+ echo "${dir} is not a directory (or doesn't exist)!" >&2
+ exit 1
+fi
+
+release=$(ls "${dir}"/kde-l10n-en_GB-*.tar.xz | \
+ sed -e 's/.*en_GB-//' -e 's/\.tar\.xz//')
+
+echo "Detected release ${release}" >&2
+
+exec > "manifest-${release}.nix"
+echo "["
+for i in `cd "${dir}"; ls kde-l10n-*-${release}.tar.xz`; do
+ lang=${i%-${release}.tar.xz}
+ lang=${lang#kde-l10n-}
+ echo -n "${lang}.. " >&2
+ hash=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}")
+ echo "{"
+ echo " lang = \"${lang}\";"
+ echo " saneName = \"$(echo $lang | sed s^@^_^g)\";"
+ echo " sha256 = \"${hash}\";"
+ echo "}"
+ echo $hash >&2
+done
+echo "]"
diff --git a/pkgs/desktops/kde-4.14/l10n/manifest-4.14.1.nix b/pkgs/desktops/kde-4.14/l10n/manifest-4.14.1.nix
new file mode 100644
index 00000000000..922bf46adcf
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/l10n/manifest-4.14.1.nix
@@ -0,0 +1,267 @@
+[
+{
+ lang = "ar";
+ saneName = "ar";
+ sha256 = "1hprszswsrmlbbbi6yian9v55yg78ca0y18ass0wvqpa0wk1yjhl";
+}
+{
+ lang = "bg";
+ saneName = "bg";
+ sha256 = "0vbxv671h88sq3mjsz8cs8y4cqf38xsqar517mwvzkav17jdgsin";
+}
+{
+ lang = "bs";
+ saneName = "bs";
+ sha256 = "1s6jqrldp28a2c7y74f6kwp6wy01d9n667p3wnfjbs2x4r7q5yag";
+}
+{
+ lang = "ca";
+ saneName = "ca";
+ sha256 = "1aqs3jr5w7kwzkdw7a00b6yslzphrwvaib8w37fz21ppijsyhb55";
+}
+{
+ lang = "ca@valencia";
+ saneName = "ca_valencia";
+ sha256 = "0ns7jqv9yil38m5ymy0q6ghmv0807wqjjp68z2z2c3n50ky4a9nn";
+}
+{
+ lang = "cs";
+ saneName = "cs";
+ sha256 = "0bs92lxdffyqd4yrzar0xwa43j1zb6hj4z0kw99aj2gwdn6kripr";
+}
+{
+ lang = "da";
+ saneName = "da";
+ sha256 = "129g2zb7di4w51dcykpbm4ilr23f0a00f62yw96583lnm7cmnxyh";
+}
+{
+ lang = "de";
+ saneName = "de";
+ sha256 = "0vahrfrrnqxj3mhm13wavykrrs4r7r3yff9v19n8b6j2v1frcj21";
+}
+{
+ lang = "el";
+ saneName = "el";
+ sha256 = "1rbclbbcgylxnfkf7j9k1vm1b40lhgl5lghbqz488i2pkkm0sxdi";
+}
+{
+ lang = "en_GB";
+ saneName = "en_GB";
+ sha256 = "060zw53mdh872agsp3qszqb2a04kfrzr6mfnbh3fa3kqdkdk9czq";
+}
+{
+ lang = "es";
+ saneName = "es";
+ sha256 = "117gvv3280fy9ir8964xvpjc89nd1igp6g43s7gbg7w7dq3ssm9n";
+}
+{
+ lang = "et";
+ saneName = "et";
+ sha256 = "15z7zqdh8i7rq5wdzbri73ifdd8nxac4izs1lgyj73nhbj5wfqkf";
+}
+{
+ lang = "eu";
+ saneName = "eu";
+ sha256 = "1386aj4gfh6014kb746vwq7dh8bbps9q55x1narhp85v430mqbb5";
+}
+{
+ lang = "fa";
+ saneName = "fa";
+ sha256 = "0izpc6k2ly2s70wzd2zawl6051fxds27arkq6z9cbrn535697790";
+}
+{
+ lang = "fi";
+ saneName = "fi";
+ sha256 = "0k6grdvik887gmhr1f2la6xpj0c7hfqk4x2p9akb7v62byl1f85h";
+}
+{
+ lang = "fr";
+ saneName = "fr";
+ sha256 = "1cqbxk82lc6k7f3y2aj5nflm9l4nqgzg7rs45xw5sbjrcbkkifhy";
+}
+{
+ lang = "ga";
+ saneName = "ga";
+ sha256 = "1cyhsr7yvbpkllkzc4lc57r03x53xyxsk973dy3gw3nhj90b3wj3";
+}
+{
+ lang = "gl";
+ saneName = "gl";
+ sha256 = "0ywnk0rn983i2pbyj7iqxvkl1z3szh3l1ikj0mwrbk63y5xdrxkw";
+}
+{
+ lang = "he";
+ saneName = "he";
+ sha256 = "1125cajwik5n6mdqx3m0wiaj3aw828sk9gi4yff8ki8710p7yff5";
+}
+{
+ lang = "hi";
+ saneName = "hi";
+ sha256 = "12v5m86pi35q9dyd9iph16iqlr8hz12q49h0fpqq8rn6m6l7q2cb";
+}
+{
+ lang = "hr";
+ saneName = "hr";
+ sha256 = "0dyjp6j1xhmfkmvvqql6d6viqg7c6qqjbi709fq2d41jmrk9b6mp";
+}
+{
+ lang = "hu";
+ saneName = "hu";
+ sha256 = "004pq9sw834ksj988w8sf4plfqzbbzkwyvgjv3fsb96a3dq86w76";
+}
+{
+ lang = "ia";
+ saneName = "ia";
+ sha256 = "00y28i5f0q6vzdwbdjb2mvc3yb4sdswqhn5ajr2pig5wrd95l4mf";
+}
+{
+ lang = "id";
+ saneName = "id";
+ sha256 = "1z5hpyd3s3j78403ffyp6bw82n2qncqx3nw3bgc8ivsmls99zm1i";
+}
+{
+ lang = "is";
+ saneName = "is";
+ sha256 = "19kswci8x4q5cz0qcy0bba5ix3a9jjzmdpn3idsd42p2hn95dzjg";
+}
+{
+ lang = "it";
+ saneName = "it";
+ sha256 = "1shx1nmq0if35qlw97bq0kmbdjqzkzy61m0pdmlwg85i6z3fv9x0";
+}
+{
+ lang = "ja";
+ saneName = "ja";
+ sha256 = "1y5g9bgg7c5f9nmcci0h2zi8bmk8xphwd0vkzjh6mqdhx4mckawh";
+}
+{
+ lang = "kk";
+ saneName = "kk";
+ sha256 = "0318wnd31q2gsizhcsp2rgdzsd64vvrmm42rihin01325nx58nzi";
+}
+{
+ lang = "km";
+ saneName = "km";
+ sha256 = "1jjprhshr6ll4v1fin7bv00wgv243hg3an9b6f6jk75q146bdv8v";
+}
+{
+ lang = "ko";
+ saneName = "ko";
+ sha256 = "06r0yh1yqvay6swbyr3qpyx67z1sdf0f71bj02y3zalp53q33n2x";
+}
+{
+ lang = "lt";
+ saneName = "lt";
+ sha256 = "09slsn1frwpf9agwyp8chwlb9mzfaqpd9h21dnbpahz3yxzcr4zk";
+}
+{
+ lang = "lv";
+ saneName = "lv";
+ sha256 = "10zrn03iir9z4fhpf6kqczn04808axgpxaa60qijdpr7h0wa3nkx";
+}
+{
+ lang = "mr";
+ saneName = "mr";
+ sha256 = "1g8r6zx9mpyzahi5nmciwjcpc4llylj35yarwypghp53pbmqy1qz";
+}
+{
+ lang = "nb";
+ saneName = "nb";
+ sha256 = "0lkbm0yfn32yfmbrfp9ip98gydcpg553fv9f2lwn0xh369qsqi8w";
+}
+{
+ lang = "nds";
+ saneName = "nds";
+ sha256 = "0lgs7qw2k2w2sxdhs5mkp3ifswc09q17l37q6y8qc7sk6bpsxgam";
+}
+{
+ lang = "nl";
+ saneName = "nl";
+ sha256 = "143piqk6sdqs440qzws251i4h08gqm908g244frjkaswmd44a67s";
+}
+{
+ lang = "nn";
+ saneName = "nn";
+ sha256 = "1j391h00alzl2bsfa5nxrkh9z3j4jjf1wlg54mjnaxm2n9r13f7a";
+}
+{
+ lang = "pa";
+ saneName = "pa";
+ sha256 = "0c9805q6b3pswc33wr4lwfnm1knqm7i984dsdx50w66b2fh3jldh";
+}
+{
+ lang = "pl";
+ saneName = "pl";
+ sha256 = "1w7jihagpw8n6ljm965mqx8shjywh4zanybb2kc94cwyx5dpg6ia";
+}
+{
+ lang = "pt";
+ saneName = "pt";
+ sha256 = "0yh203s8v5r3yf1c98lwyk220ppwbndn879c4z71r88jww9g2xaw";
+}
+{
+ lang = "pt_BR";
+ saneName = "pt_BR";
+ sha256 = "1r3krrpwvwdpailmdn7ilaamcjhahg6kpq8lmgqx85aybaqwllqa";
+}
+{
+ lang = "ro";
+ saneName = "ro";
+ sha256 = "1nnzmzj90jh97nbrjbdyyfc9vlgsra622y63mg3dps4vzmv7sfji";
+}
+{
+ lang = "ru";
+ saneName = "ru";
+ sha256 = "0l3pzvpjzsw8fs1wwx0vzl3r46sz3lcgjzjjwxnxjwjjvrlnsr8g";
+}
+{
+ lang = "sk";
+ saneName = "sk";
+ sha256 = "13r77k8q6idn2wxwhp46vry3jynyg4i3dcamamw55w3qgb3bd2ri";
+}
+{
+ lang = "sl";
+ saneName = "sl";
+ sha256 = "1mx54f4m75zg0rdbq6gz65xl0bf6w63ij0d3ziq5fj7fpz4jnlqb";
+}
+{
+ lang = "sr";
+ saneName = "sr";
+ sha256 = "1grl665j40vq39y0kchfxx2wz13wbr88h7paz6fgc3kskwwj9i4z";
+}
+{
+ lang = "sv";
+ saneName = "sv";
+ sha256 = "0gf84fyg3hzipf3ja6wnn8h82v2vaaqpgs6k7k72p484b7a34881";
+}
+{
+ lang = "tr";
+ saneName = "tr";
+ sha256 = "0r3afsnkv478byc3wnpg7jv1ik0malks5l204kdxanczlcy64x97";
+}
+{
+ lang = "ug";
+ saneName = "ug";
+ sha256 = "0kpm91m0rnk3xij2ba1dbr6063034fcg7kvpyl1qbzr2hvr453sa";
+}
+{
+ lang = "uk";
+ saneName = "uk";
+ sha256 = "0hrvz8wm2p05ch41w26pbk19jcgsxw27n94axmyp3lb8vlhmf7xm";
+}
+{
+ lang = "wa";
+ saneName = "wa";
+ sha256 = "0rhxpbas2dcf2sn88adi4ymm206gmd1arv32k3mnvh3gm60ik2s6";
+}
+{
+ lang = "zh_CN";
+ saneName = "zh_CN";
+ sha256 = "1sjzbh0577gcmq29qd9p077szybylhhz4krji7x2cbbkimx6insv";
+}
+{
+ lang = "zh_TW";
+ saneName = "zh_TW";
+ sha256 = "0zlz7y1xpngvs3d2mhkvl5p7bfyb5nzshf73ljghghljniv412ky";
+}
+]
diff --git a/pkgs/desktops/kde-4.14/oxygen-icons.nix b/pkgs/desktops/kde-4.14/oxygen-icons.nix
new file mode 100644
index 00000000000..270707f8492
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/oxygen-icons.nix
@@ -0,0 +1,15 @@
+{ kde, cmake }:
+
+kde {
+ outputHashAlgo = "sha256";
+ outputHashMode = "recursive";
+ outputHash = "156ghknzdrlf48602lcap5vpp691cyba0igdbw53wfqfpaqkap28";
+
+ nativeBuildInputs = [ cmake ];
+
+ meta = {
+ description = "KDE Oxygen theme icons";
+ longDescription = "Icons for KDE's default theme";
+ license = "GPL";
+ };
+}
diff --git a/pkgs/desktops/kde-4.14/support/akonadi/default.nix b/pkgs/desktops/kde-4.14/support/akonadi/default.nix
new file mode 100644
index 00000000000..5238744cc7b
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/support/akonadi/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, automoc4, soprano, sqlite, pkgconfig }:
+
+stdenv.mkDerivation rec {
+ name = "akonadi-1.13.0";
+
+ src = fetchurl {
+ url = "mirror://kde/stable/akonadi/src/${name}.tar.bz2";
+ sha256 = "8c7f690002ea22c139f3a64394aef2e816e00ca47fd971af7d54a66087356dd2";
+ };
+
+ buildInputs = [ qt4 soprano libxslt boost sqlite ];
+
+ nativeBuildInputs = [ cmake automoc4 shared_mime_info pkgconfig ];
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ description = "KDE PIM Storage Service";
+ license = "LGPL";
+ homepage = http://pim.kde.org/akonadi;
+ maintainers = [ maintainers.sander maintainers.urkud maintainers.phreedom ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/xfce/applications/xfce4-mixer.nix b/pkgs/desktops/xfce/applications/xfce4-mixer.nix
index 2b0f729c0a3..f486373ee17 100644
--- a/pkgs/desktops/xfce/applications/xfce4-mixer.nix
+++ b/pkgs/desktops/xfce/applications/xfce4-mixer.nix
@@ -1,5 +1,7 @@
-{ stdenv, fetchurl, pkgconfig, intltool, glib, gstreamer, gst_plugins_base, gtk
-, libxfce4util, libxfce4ui, xfce4panel, xfconf, libunique?null }:
+{ stdenv, fetchurl, pkgconfig, intltool, makeWrapper
+, glib, gstreamer, gst_plugins_base, gtk
+, libxfce4util, libxfce4ui, xfce4panel, xfconf, libunique ? null
+}:
let
# The usual Gstreamer plugins package has a zillion dependencies
@@ -23,13 +25,13 @@ stdenv.mkDerivation rec {
buildInputs =
[ pkgconfig intltool glib gstreamer gst_plugins_minimal gtk
- libxfce4util libxfce4ui xfce4panel xfconf libunique
+ libxfce4util libxfce4ui xfce4panel xfconf libunique makeWrapper
];
postInstall =
''
- mkdir -p $out/nix-support
- echo ${gst_plugins_minimal} > $out/nix-support/propagated-user-env-packages
+ wrapProgram "$out/bin/xfce4-mixer" \
+ --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"
'';
meta = {
diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index 2d449b3fe30..ae6b1a88a14 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -60,6 +60,7 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od
xfce4_cpufreq_plugin = callPackage ./panel-plugins/xfce4-cpufreq-plugin.nix { };
xfce4_xkb_plugin = callPackage ./panel-plugins/xfce4-xkb-plugin.nix { };
xfce4_datetime_plugin = callPackage ./panel-plugins/xfce4-datetime-plugin.nix { };
+ xfce4_battery_plugin = callPackage ./panel-plugins/xfce4-battery-plugin.nix { };
}; # xfce_self
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix
new file mode 100644
index 00000000000..dd93c851c7b
--- /dev/null
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}:
+
+stdenv.mkDerivation rec {
+ p_name = "xfce4-battery-plugin";
+ ver_maj = "1.0";
+ ver_min = "0";
+
+ src = fetchurl {
+ url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2";
+ sha256 = "07qji9gh7ail06kwf1lniph5fdccvrsjwsxwnlbw0cmrws0bb2y2";
+ };
+ name = "${p_name}-${ver_maj}.${ver_min}";
+
+ buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ];
+ preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
+
+ meta = {
+ homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
+ description = "Battery plugin for Xfce panel";
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/development/arduino/ino/default.nix b/pkgs/development/arduino/ino/default.nix
index 3e74c143c61..484de02f05d 100644
--- a/pkgs/development/arduino/ino/default.nix
+++ b/pkgs/development/arduino/ino/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
# TODO: add avrgcclibc, it must be rebuild with C++ support
propagatedBuildInputs =
[ arduino_core avrdude minicom pythonPackages.configobj
- pythonPackages.jinja2 pythonPackages.pyserial ];
+ pythonPackages.jinja2 pythonPackages.pyserial pythonPackages.six ];
patchPhase = ''
echo "Patching Arduino distribution path"
diff --git a/pkgs/development/compilers/agda/default.nix b/pkgs/development/compilers/agda/default.nix
index 6705419add9..3a44baa489a 100644
--- a/pkgs/development/compilers/agda/default.nix
+++ b/pkgs/development/compilers/agda/default.nix
@@ -1,15 +1,16 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-{ cabal, alex, binary, boxes, dataHash, deepseq, emacs, equivalence
-, filepath, geniplate, happy, hashable, hashtables, haskeline
-, haskellSrcExts, mtl, parallel, QuickCheck, STMonadTrans, strict
-, text, time, transformers, unorderedContainers, xhtml, zlib
+{ cabal, alex, binary, boxes, cpphs, dataHash, deepseq, emacs
+, equivalence, filepath, geniplate, happy, hashable, hashtables
+, haskeline, haskellSrcExts, mtl, parallel, QuickCheck
+, STMonadTrans, strict, text, time, transformers
+, unorderedContainers, xhtml, zlib
}:
cabal.mkDerivation (self: {
pname = "Agda";
- version = "2.4.0.2";
- sha256 = "13c4ipscnlnbv94k93yajrp32mwzikqa8rhc95h8pmqzhjgwyh8b";
+ version = "2.4.2";
+ sha256 = "0pgwx79y02a08xn5f6lghw7fsc6wilab5q2gdm9r51yi9gm32aw5";
isLibrary = true;
isExecutable = true;
buildDepends = [
@@ -18,7 +19,8 @@ cabal.mkDerivation (self: {
QuickCheck STMonadTrans strict text time transformers
unorderedContainers xhtml zlib
];
- buildTools = [ alex emacs happy ];
+ buildTools = [ alex cpphs emacs happy ];
+ noHaddock = true;
postInstall = ''
$out/bin/agda -c --no-main $(find $out/share -name Primitive.agda)
$out/bin/agda-mode compile
@@ -26,7 +28,7 @@ cabal.mkDerivation (self: {
meta = {
homepage = "http://wiki.portal.chalmers.se/agda/";
description = "A dependently typed functional programming language and proof assistant";
- license = "unknown";
+ license = self.stdenv.lib.licenses.mit;
platforms = self.ghc.meta.platforms;
};
})
diff --git a/pkgs/development/compilers/agda/stdlib.nix b/pkgs/development/compilers/agda/stdlib.nix
index 913ae5cd90f..7305fbb5397 100644
--- a/pkgs/development/compilers/agda/stdlib.nix
+++ b/pkgs/development/compilers/agda/stdlib.nix
@@ -1,31 +1,26 @@
-{ cabal, fetchurl, filemanip, Agda }:
+{ stdenv, agda, fetchurl, ghc, filemanip }:
-cabal.mkDerivation (self: rec {
- pname = "Agda-stdlib";
- version = "0.8";
+agda.mkDerivation (self: rec {
+ name = "Agda-stdlib";
+ version = "0.8.1";
src = fetchurl {
url = "https://github.com/agda/agda-stdlib/archive/v${version}.tar.gz";
- sha256 = "03gdcy2gar46qlmd6w91y05cm1x304ig6bda90ryww9qn05kif78";
+ sha256 = "0ij4rg4lk0pq01ing285gbmnn23dcf2rhihdcs8bbdpjg52vl4gf";
};
- buildDepends = [ filemanip Agda ];
-
- preConfigure = "cd ffi";
-
- postInstall = ''
- mkdir -p $out/share
- cd ..
- ${self.ghc.ghc}/bin/runhaskell GenerateEverything
- ${Agda}/bin/agda -i . -i src Everything.agda
- cp -pR src $out/share/agda
+ buildInputs = [ filemanip ghc ];
+ preConfigure = ''
+ runhaskell GenerateEverything.hs
'';
- meta = {
+ topSourceDirectories = [ "src" ];
+
+ meta = with stdenv.lib; {
homepage = "http://wiki.portal.chalmers.se/agda/pmwiki.php?n=Libraries.StandardLibrary";
description = "A standard library for use with the Agda compiler.";
- license = "unknown";
- platforms = self.ghc.meta.platforms;
- maintainers = [ self.stdenv.lib.maintainers.jwiegley ];
+ license = stdenv.lib.licenses.mit;
+ platforms = stdenv.lib.platforms.unix;
+ maintainers = with maintainers; [ jwiegley ];
};
-})
\ No newline at end of file
+})
diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix
index 8c71138ab78..07a4ceefd4d 100644
--- a/pkgs/development/compilers/ats2/default.nix
+++ b/pkgs/development/compilers/ats2/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "ats2-${version}";
- version = "0.1.0";
+ version = "0.1.3";
src = fetchurl {
url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz";
- sha256 = "0i7b9v7xki9j2jjjpydz0gl33af94b4jjmk75b9w20bs003v8vd4";
+ sha256 = "157k703zsdf0gr7mwz08rdldfgwfsm5ipg36xcc8092fcjs5ryqp";
};
buildInputs = [ gmp ];
diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix
index 0d8d8e3d6d7..bdf850df8cb 100644
--- a/pkgs/development/compilers/compcert/default.nix
+++ b/pkgs/development/compilers/compcert/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "compcert-${version}";
- version = "2.3pl2";
+ version = "2.4";
src = fetchurl {
url = "http://compcert.inria.fr/release/${name}.tgz";
- sha256 = "1cq4my646ll1mszs5mbzwk4vp8l8qnsc96fpcv2pl35aw5i6jqm8";
+ sha256 = "1qrb1cplx3v5wxn1c46kx67v1j52yznvjm2hkrsdybphhki2pyia";
};
buildInputs = [ coq ocaml ocamlPackages.menhir ];
@@ -15,13 +15,12 @@ stdenv.mkDerivation rec {
configurePhase = "./configure -prefix $out -toolprefix ${gcc}/bin/ " +
(if stdenv.isDarwin then "ia32-macosx" else "ia32-linux");
- meta = {
+ meta = with stdenv.lib; {
description = "Formally verified C compiler";
homepage = "http://compcert.inria.fr";
- license = stdenv.lib.licenses.inria;
- platforms = stdenv.lib.platforms.linux ++
- stdenv.lib.platforms.darwin;
- maintainers = [ stdenv.lib.maintainers.thoughtpolice
- stdenv.lib.maintainers.jwiegley ];
+ license = licenses.inria;
+ platforms = platforms.linux ++
+ platforms.darwin;
+ maintainers = with maintainers; [ thoughtpolice jwiegley vbgl ];
};
}
diff --git a/pkgs/development/compilers/emscripten-fastcomp/default.nix b/pkgs/development/compilers/emscripten-fastcomp/default.nix
new file mode 100644
index 00000000000..3eb9aef528c
--- /dev/null
+++ b/pkgs/development/compilers/emscripten-fastcomp/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchgit, python }:
+
+let
+ tag = "1.21.0";
+in
+
+stdenv.mkDerivation rec {
+ name = "emscripten-fastcomp-${tag}";
+
+ srcFC = fetchgit {
+ url = git://github.com/kripken/emscripten-fastcomp;
+ rev = "refs/tags/${tag}";
+ sha256 = "0mcxzg2cfg0s1vfm3bh1ar4xsddb6xkv1dsdbgnpx38lbj1mvfs1";
+ };
+
+ srcFL = fetchgit {
+ url = git://github.com/kripken/emscripten-fastcomp-clang;
+ rev = "refs/tags/${tag}";
+ sha256 = "0s2jcn36d236cfpryjpgaazjp3cg83d0h78g6kk1j6vdppv3vgnp";
+ };
+
+ buildInputs = [ python ];
+ buildCommand = ''
+ cp -as ${srcFC} $TMPDIR/src
+ chmod +w $TMPDIR/src/tools
+ cp -as ${srcFL} $TMPDIR/src/tools/clang
+
+ chmod +w $TMPDIR/src
+ mkdir $TMPDIR/src/build
+ cd $TMPDIR/src/build
+
+ ../configure --enable-optimized --disable-assertions --enable-targets=host,js
+ make
+ cp -a Release/bin $out
+ '';
+ meta = with stdenv.lib; {
+ homepage = https://github.com/kripken/emscripten-fastcomp;
+ description = "emscripten llvm";
+ maintainers = with maintainers; [ bosu ];
+ license = "University of Illinois/NCSA Open Source License";
+ };
+}
diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix
new file mode 100644
index 00000000000..43f256b58b0
--- /dev/null
+++ b/pkgs/development/compilers/emscripten/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchgit, emscriptenfastcomp, python, nodejs, closurecompiler, jre }:
+
+let
+ tag = "1.21.0";
+in
+
+stdenv.mkDerivation rec {
+ name = "emscripten-${tag}";
+
+ src = fetchgit {
+ url = git://github.com/kripken/emscripten;
+ rev = "refs/tags/${tag}";
+ sha256 = "0y17ab4nhd3521b50sv2i2667w0rlcnmlkpkgw5j3fsh8awxgf32";
+ };
+
+ buildCommand = ''
+ mkdir $out
+ cp -a $src $out/bin
+ chmod -R +w $out/bin
+ grep -rl '^#!/usr.*python' $out/bin | xargs sed -i -s 's@^#!/usr.*python.*@#!${python}/bin/python@'
+ sed -i -e "s,EM_CONFIG = '~/.emscripten',EM_CONFIG = '$out/config'," $out/bin/tools/shared.py
+ sed -i -e 's,^.*did not see a source tree above the LLVM.*$, return True,' $out/bin/tools/shared.py
+ sed -i -e 's,def check_sanity(force=False):,def check_sanity(force=False):\n return,' $out/bin/tools/shared.py
+
+ echo "EMSCRIPTEN_ROOT = '$out/bin'" > $out/config
+ echo "LLVM_ROOT = '${emscriptenfastcomp}'" >> $out/config
+ echo "PYTHON = '${python}/bin/python'" >> $out/config
+ echo "NODE_JS = '${nodejs}/bin/node'" >> $out/config
+ echo "JS_ENGINES = [NODE_JS]" >> $out/config
+ echo "COMPILER_ENGINE = NODE_JS" >> $out/config
+ echo "CLOSURE_COMPILER = '${closurecompiler}/bin/closure-compiler'" >> $out/config
+ echo "JAVA = '${jre}/bin/java'" >> $out/config
+ '';
+ meta = with stdenv.lib; {
+ homepage = https://github.com/kripken/emscripten;
+ description = "An LLVM-to-JavaScript Compiler";
+ maintainers = with maintainers; [ bosu ];
+ license = with licenses; ncsa;
+ };
+}
diff --git a/pkgs/development/compilers/fpc/2.4.0.nix b/pkgs/development/compilers/fpc/2.4.0.nix
deleted file mode 100644
index 30081c9d805..00000000000
--- a/pkgs/development/compilers/fpc/2.4.0.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ stdenv, fetchurl, gawk }:
-
-let startFPC = import ./binary.nix { inherit stdenv fetchurl; }; in
-
-stdenv.mkDerivation rec {
- version = "2.4.0";
- name = "fpc-${version}";
-
- src = fetchurl {
- url = "http://downloads.sourceforge.net/sourceforge/freepascal/fpcbuild-${version}.tar.gz";
- sha256 = "1m2g2bafjixbwl5b9lna5h7r56y1rcayfnbp8kyjfd1c1ymbxaxk";
- };
-
- buildInputs = [ startFPC gawk ];
-
- preConfigure =
- if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" then ''
- sed -e "s@'/lib/ld-linux[^']*'@'''@" -i fpcsrc/compiler/systems/t_linux.pas
- sed -e "s@'/lib64/ld-linux[^']*'@'''@" -i fpcsrc/compiler/systems/t_linux.pas
- '' else "";
-
- makeFlags = "NOGDB=1";
-
- installFlags = "INSTALL_PREFIX=\${out}";
-
- postInstall = ''
- for i in $out/lib/fpc/*/ppc*; do
- ln -fs $i $out/bin/$(basename $i)
- done
- mkdir -p $out/lib/fpc/etc/
- $out/lib/fpc/*/samplecfg $out/lib/fpc/${version} $out/lib/fpc/etc/
- '';
-
- meta = {
- description = "Free Pascal Compiler from a source distribution";
- maintainers = [stdenv.lib.maintainers.raskin];
- platforms = stdenv.lib.platforms.linux;
- };
-}
diff --git a/pkgs/development/compilers/fpc/binary-builder.sh b/pkgs/development/compilers/fpc/binary-builder.sh
index 8be36dec73e..4308c1ed211 100755
--- a/pkgs/development/compilers/fpc/binary-builder.sh
+++ b/pkgs/development/compilers/fpc/binary-builder.sh
@@ -1,6 +1,7 @@
source $stdenv/setup
tar xf $src
+cd */
tarballdir=$(pwd)
for i in *.tar; do tar xvf $i; done
echo "Deploying binaries.."
diff --git a/pkgs/development/compilers/fpc/binary.nix b/pkgs/development/compilers/fpc/binary.nix
index 88f0ab91067..57e670750db 100644
--- a/pkgs/development/compilers/fpc/binary.nix
+++ b/pkgs/development/compilers/fpc/binary.nix
@@ -1,18 +1,18 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation {
- name = "fpc-2.4.0-binary";
+ name = "fpc-2.6.0-binary";
src =
if stdenv.system == "i686-linux" then
fetchurl {
- url = "ftp://ftp.chg.ru/pub/lang/pascal/fpc/dist/2.4.0/i386-linux/fpc-2.4.0.i386-linux.tar";
- sha256 = "1zas9kp0b36zxqvb9i4idh2l0nb6qpmgah038l77w6las7ghh0dv";
+ url = "http://sourceforge.net/projects/freepascal/files/Linux/2.6.0/fpc-2.6.0.i386-linux.tar";
+ sha256 = "08yklvrfxvk59bxsd4rh1i6s3cjn0q06dzjs94h9fbq3n1qd5zdf";
}
else if stdenv.system == "x86_64-linux" then
fetchurl {
- url = "ftp://ftp.chg.ru/pub/lang/pascal/fpc/dist/2.4.0/x86_64-linux/fpc-2.4.0.x86_64-linux.tar";
- sha256 = "111d11g5ra55hjywx64ldwwflpimsy8zryvap68v0309nyd23f0z";
+ url = "http://sourceforge.net/projects/freepascal/files/Linux/2.6.0/fpc-2.6.0.x86_64-linux.tar";
+ sha256 = "0k9vi75k39y735fng4jc2vppdywp82j4qhzn7x4r6qjkad64d8lx";
}
else throw "Not supported on ${stdenv.system}.";
diff --git a/pkgs/development/compilers/fpc/default.nix b/pkgs/development/compilers/fpc/default.nix
index 6be976783bc..b34b5e8a446 100644
--- a/pkgs/development/compilers/fpc/default.nix
+++ b/pkgs/development/compilers/fpc/default.nix
@@ -3,12 +3,12 @@
let startFPC = import ./binary.nix { inherit stdenv fetchurl; }; in
stdenv.mkDerivation rec {
- version = "2.6.0";
+ version = "2.6.4";
name = "fpc-${version}";
src = fetchurl {
url = "mirror://sourceforge/freepascal/fpcbuild-${version}.tar.gz";
- sha256 = "1vxy2y8pm0ribhpdhqlwwz696ncnz4rk2dafbn1mjgipm97qb26p";
+ sha256 = "1akdlp4n9ai1gnn4yq236i5rx03rs5sjfgk60myb7nb9lk7kp74d";
};
buildInputs = [ startFPC gawk ];
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
sed -e "s@'/lib64/ld-linux[^']*'@'''@" -i fpcsrc/compiler/systems/t_linux.pas
'' else "";
- makeFlags = "NOGDB=1";
+ makeFlags = "NOGDB=1 FPC=${startFPC}/bin/fpc";
installFlags = "INSTALL_PREFIX=\${out}";
@@ -31,9 +31,14 @@ stdenv.mkDerivation rec {
$out/lib/fpc/*/samplecfg $out/lib/fpc/${version} $out/lib/fpc/etc/
'';
+ passthru = {
+ bootstrap = startFPC;
+ };
+
meta = {
description = "Free Pascal Compiler from a source distribution";
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
+ inherit version;
};
}
diff --git a/pkgs/development/compilers/fpc/default.upstream b/pkgs/development/compilers/fpc/default.upstream
new file mode 100644
index 00000000000..7c11fb4761e
--- /dev/null
+++ b/pkgs/development/compilers/fpc/default.upstream
@@ -0,0 +1,6 @@
+url http://sourceforge.net/projects/freepascal/files/Source/
+SF_version_dir
+version_link 'fpcbuild-[0-9.]+[.]tar[.]gz/download$'
+SF_redirect
+version '.*-([0-9.]+)[.]tar[.]gz' '\1'
+do_overwrite () { do_overwrite_just_version; }
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 2fb8f9d73b5..7166d325b31 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -13,7 +13,7 @@
, perl ? null # optional, for texi2pod (then pod2man); required for Java
, gmp, mpfr, mpc, gettext, which
, libelf # optional, for link-time optimizations (LTO)
-, ppl ? null, cloog ? null, isl ? null # optional, for the Graphite optimization framework.
+, cloog ? null, isl ? null # optional, for the Graphite optimization framework.
, zlib ? null, boehmgc ? null
, zip ? null, unzip ? null, pkgconfig ? null, gtk ? null, libart_lgpl ? null
, libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null
@@ -59,14 +59,12 @@ let version = "4.8.3";
# Whether building a cross-compiler for GNU/Hurd.
crossGNU = cross != null && cross.config == "i586-pc-gnu";
- /* gccinstall.info says that "parallel make is currently not supported since
- collisions in profile collecting may occur".
- */
- enableParallelBuilding = !profiledCompiler;
+ enableParallelBuilding = true;
patches = []
++ optional enableParallelBuilding ./parallel-bconfig.patch
++ optional (cross != null) ./libstdc++-target.patch
+ ++ optional noSysDirs ./no-sys-dirs.patch
# The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its
# target libraries and tools.
++ optional langAda ./gnat-cflags.patch
@@ -84,8 +82,8 @@ let version = "4.8.3";
# Antlr (optional) allows the Java `gjdoc' tool to be built. We want a
# binary distribution here to allow the whole chain to be bootstrapped.
javaAntlr = fetchurl {
- url = http://www.antlr.org/download/antlr-3.1.3.jar;
- sha256 = "1f41j0y4kjydl71lqlvr73yagrs2jsg1fjymzjz66mjy7al5lh09";
+ url = http://www.antlr.org/download/antlr-4.4-complete.jar;
+ sha256 = "02lda2imivsvsis8rnzmbrbp8rh1kb8vmq4i67pqhkwz7lf8y6dz";
};
xlibs = [
@@ -278,7 +276,6 @@ stdenv.mkDerivation ({
++ (optional javaAwtGtk pkgconfig);
buildInputs = [ gmp mpfr mpc libelf ]
- ++ (optional (ppl != null) ppl)
++ (optional (cloog != null) cloog)
++ (optional (isl != null) isl)
++ (optional (zlib != null) zlib)
@@ -295,15 +292,7 @@ stdenv.mkDerivation ({
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isSunOS "-lm -ldl";
- preConfigure = ''
- configureFlagsArray=(
- ${stdenv.lib.optionalString (ppl != null && ppl ? dontDisableStatic && ppl.dontDisableStatic)
- "'--with-host-libstdcxx=-lstdc++ -lgcc_s'"}
- ${stdenv.lib.optionalString (ppl != null && stdenv.isSunOS)
- "\"--with-host-libstdcxx=-Wl,-rpath,\$prefix/lib/amd64 -lstdc++\"
- \"--with-boot-ldflags=-L../prev-x86_64-pc-solaris2.11/libstdc++-v3/src/.libs\""}
- );
- '' + stdenv.lib.optionalString (stdenv.isSunOS && stdenv.is64bit) ''
+ preConfigure = stdenv.lib.optionalString (stdenv.isSunOS && stdenv.is64bit) ''
export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g`
export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET"
export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"
@@ -331,7 +320,6 @@ stdenv.mkDerivation ({
${if enableMultilib then "--disable-libquadmath" else "--disable-multilib"}
${if enableShared then "" else "--disable-shared"}
${if enablePlugin then "--enable-plugin" else "--disable-plugin"}
- ${if ppl != null then "--with-ppl=${ppl} --disable-ppl-version-check" else ""}
${optionalString (isl != null) "--with-isl=${isl}"}
${optionalString (cloog != null) "--with-cloog=${cloog} --disable-cloog-version-check --enable-cloog-backend=isl"}
${if langJava then
@@ -414,7 +402,6 @@ stdenv.mkDerivation ({
configureFlags = ''
${if enableMultilib then "" else "--disable-multilib"}
${if enableShared then "" else "--disable-shared"}
- ${if ppl != null then "--with-ppl=${ppl.crossDrv}" else ""}
${if cloog != null then "--with-cloog=${cloog.crossDrv} --enable-cloog-backend=isl" else ""}
${if langJava then "--with-ecj-jar=${javaEcj.crossDrv}" else ""}
${if javaAwtGtk then "--enable-java-awt=gtk" else ""}
@@ -523,7 +510,6 @@ stdenv.mkDerivation ({
maintainers = with stdenv.lib.maintainers; [ ludo viric shlevy simons ];
- # Volunteers needed for the {Cyg,Dar}win ports of *PPL.
# gnatboot is not available out of linux platforms, so we disable the darwin build
# for the gnat (ada compiler).
platforms =
diff --git a/pkgs/development/compilers/gcc/4.8/no-sys-dirs.patch b/pkgs/development/compilers/gcc/4.8/no-sys-dirs.patch
new file mode 100644
index 00000000000..36df51904ac
--- /dev/null
+++ b/pkgs/development/compilers/gcc/4.8/no-sys-dirs.patch
@@ -0,0 +1,28 @@
+diff -ru -x '*~' gcc-4.8.3-orig/gcc/cppdefault.c gcc-4.8.3/gcc/cppdefault.c
+--- gcc-4.8.3-orig/gcc/cppdefault.c 2013-01-10 21:38:27.000000000 +0100
++++ gcc-4.8.3/gcc/cppdefault.c 2014-08-18 16:20:32.893944536 +0200
+@@ -35,6 +35,8 @@
+ # undef CROSS_INCLUDE_DIR
+ #endif
+
++#undef LOCAL_INCLUDE_DIR
++
+ const struct default_include cpp_include_defaults[]
+ #ifdef INCLUDE_DEFAULTS
+ = INCLUDE_DEFAULTS;
+diff -ru -x '*~' gcc-4.8.3-orig/gcc/gcc.c gcc-4.8.3/gcc/gcc.c
+--- gcc-4.8.3-orig/gcc/gcc.c 2014-03-23 12:30:57.000000000 +0100
++++ gcc-4.8.3/gcc/gcc.c 2014-08-18 13:19:32.689201690 +0200
+@@ -1162,10 +1162,10 @@
+ /* Default prefixes to attach to command names. */
+
+ #ifndef STANDARD_STARTFILE_PREFIX_1
+-#define STANDARD_STARTFILE_PREFIX_1 "/lib/"
++#define STANDARD_STARTFILE_PREFIX_1 ""
+ #endif
+ #ifndef STANDARD_STARTFILE_PREFIX_2
+-#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/"
++#define STANDARD_STARTFILE_PREFIX_2 ""
+ #endif
+
+ #ifdef CROSS_DIRECTORY_STRUCTURE /* Don't use these prefixes for a cross compiler. */
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index 8b185d00bcc..d38040a48b3 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -11,7 +11,7 @@
, perl ? null # optional, for texi2pod (then pod2man); required for Java
, gmp, mpfr, mpc, gettext, which
, libelf # optional, for link-time optimizations (LTO)
-, ppl ? null, cloog ? null, isl ? null # optional, for the Graphite optimization framework.
+, cloog ? null, isl ? null # optional, for the Graphite optimization framework.
, zlib ? null, boehmgc ? null
, zip ? null, unzip ? null, pkgconfig ? null, gtk ? null, libart_lgpl ? null
, libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null
@@ -57,10 +57,7 @@ let version = "4.9.1";
# Whether building a cross-compiler for GNU/Hurd.
crossGNU = cross != null && cross.config == "i586-pc-gnu";
- /* gccinstall.info says that "parallel make is currently not supported since
- collisions in profile collecting may occur".
- */
- enableParallelBuilding = !profiledCompiler;
+ enableParallelBuilding = true;
patches = [ ]
++ optional enableParallelBuilding ./parallel-bconfig.patch
@@ -276,7 +273,6 @@ stdenv.mkDerivation ({
++ (optional javaAwtGtk pkgconfig);
buildInputs = [ gmp mpfr mpc libelf ]
- ++ (optional (ppl != null) ppl)
++ (optional (cloog != null) cloog)
++ (optional (isl != null) isl)
++ (optional (zlib != null) zlib)
@@ -294,13 +290,6 @@ stdenv.mkDerivation ({
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isSunOS "-lm -ldl";
preConfigure = ''
- configureFlagsArray=(
- ${stdenv.lib.optionalString (ppl != null && ppl ? dontDisableStatic && ppl.dontDisableStatic)
- "'--with-host-libstdcxx=-lstdc++ -lgcc_s'"}
- ${stdenv.lib.optionalString (ppl != null && stdenv.isSunOS)
- "\"--with-host-libstdcxx=-Wl,-rpath,\$prefix/lib/amd64 -lstdc++\"
- \"--with-boot-ldflags=-L../prev-x86_64-pc-solaris2.11/libstdc++-v3/src/.libs\""}
- );
${stdenv.lib.optionalString (stdenv.isSunOS && stdenv.is64bit)
''
export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g`
@@ -322,7 +311,6 @@ stdenv.mkDerivation ({
${if enableMultilib then "--disable-libquadmath" else "--disable-multilib"}
${if enableShared then "" else "--disable-shared"}
${if enablePlugin then "--enable-plugin" else "--disable-plugin"}
- ${if ppl != null then "--with-ppl=${ppl} --disable-ppl-version-check" else ""}
${optionalString (isl != null) "--with-isl=${isl}"}
${optionalString (cloog != null) "--with-cloog=${cloog} --disable-cloog-version-check --enable-cloog-backend=isl"}
${if langJava then
@@ -403,7 +391,6 @@ stdenv.mkDerivation ({
configureFlags = ''
${if enableMultilib then "" else "--disable-multilib"}
${if enableShared then "" else "--disable-shared"}
- ${if ppl != null then "--with-ppl=${ppl.crossDrv}" else ""}
${if cloog != null then "--with-cloog=${cloog.crossDrv} --enable-cloog-backend=isl" else ""}
${if langJava then "--with-ecj-jar=${javaEcj.crossDrv}" else ""}
${if javaAwtGtk then "--enable-java-awt=gtk" else ""}
@@ -510,7 +497,6 @@ stdenv.mkDerivation ({
maintainers = with stdenv.lib.maintainers; [ ludo viric shlevy simons ];
- # Volunteers needed for the {Cyg,Dar}win ports of *PPL.
# gnatboot is not available out of linux platforms, so we disable the darwin build
# for the gnat (ada compiler).
platforms =
diff --git a/pkgs/development/compilers/gcl/default.nix b/pkgs/development/compilers/gcl/default.nix
index 73492fc65b7..e9c69261fbc 100644
--- a/pkgs/development/compilers/gcl/default.nix
+++ b/pkgs/development/compilers/gcl/default.nix
@@ -17,11 +17,11 @@ assert a.stdenv.gcc.libc != null ;
rec {
src = a.fetchurl {
- sha256 = "1vsicv81ml7d92c87bckgkpvcshi6hzdnj44k0j6zs5mj8pzp8br";
- url="http://gnu.spinellicreations.com/gcl/gcl-2.6.10.tar.gz";
+ sha256 = "177vz8z74mky5nrq6qlfvnzvb1prw8jmlv4cwfx8w7k3k818y1a4";
+ url="http://gnu.spinellicreations.com/gcl/gcl-2.6.11.tar.gz";
};
- name = "gcl-2.6.10";
+ name = "gcl-2.6.11";
inherit buildInputs;
configureFlags = [
"--enable-ansi"
diff --git a/pkgs/development/compilers/gforth/default.nix b/pkgs/development/compilers/gforth/default.nix
new file mode 100644
index 00000000000..d710f672995
--- /dev/null
+++ b/pkgs/development/compilers/gforth/default.nix
@@ -0,0 +1,10 @@
+{ stdenv, fetchurl, m4 }:
+
+stdenv.mkDerivation rec {
+ name = "gforth-0.7.3";
+ src = fetchurl {
+ url = "http://ftp.gnu.org/gnu/gforth/gforth-0.7.3.tar.gz";
+ sha256 = "1c1bahc9ypmca8rv2dijiqbangm1d9av286904yw48ph7ciz4qig";
+ };
+ buildInputs = [ m4 ];
+}
\ No newline at end of file
diff --git a/pkgs/development/compilers/go/1.1.nix b/pkgs/development/compilers/go/1.1.nix
index dfb545bb368..e54d12ef9c5 100644
--- a/pkgs/development/compilers/go/1.1.nix
+++ b/pkgs/development/compilers/go/1.1.nix
@@ -51,6 +51,8 @@ stdenv.mkDerivation {
sed -i 's,/bin/pwd,'"`type -P pwd`", src/pkg/os/os_test.go
# Disable the hostname test
sed -i '/TestHostname/areturn' src/pkg/os/os_test.go
+ # ParseInLocation fails the test
+ sed -i '/TestParseInSydney/areturn' src/pkg/time/time_test.go
'' + stdenv.lib.optionalString removeGodocExternals ''
sed -i -e '/googleapi/d' -e '/javascript">$/,+6d' lib/godoc/godoc.html
'';
diff --git a/pkgs/development/compilers/go/1.2.nix b/pkgs/development/compilers/go/1.2.nix
index b519b96415b..8567337be0b 100644
--- a/pkgs/development/compilers/go/1.2.nix
+++ b/pkgs/development/compilers/go/1.2.nix
@@ -50,6 +50,8 @@ stdenv.mkDerivation {
sed -i 's,/bin/pwd,'"`type -P pwd`", src/pkg/os/os_test.go
# Disable the hostname test
sed -i '/TestHostname/areturn' src/pkg/os/os_test.go
+ # ParseInLocation fails the test
+ sed -i '/TestParseInSydney/areturn' src/pkg/time/time_test.go
'';
patches = [ ./cacert-1.2.patch ];
diff --git a/pkgs/development/compilers/go/1.3.nix b/pkgs/development/compilers/go/1.3.nix
index 1dcdd89b5bf..ca117baca78 100644
--- a/pkgs/development/compilers/go/1.3.nix
+++ b/pkgs/development/compilers/go/1.3.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc }:
+{ stdenv, lib, fetchurl, fetchhg, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc, perl }:
assert stdenv.gcc.gcc != null;
@@ -6,17 +6,26 @@ let
loader386 = "${glibc}/lib/ld-linux.so.2";
loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2";
loaderArm = "${glibc}/lib/ld-linux.so.3";
+ srcs = {
+ golang = fetchurl {
+ url = https://storage.googleapis.com/golang/go1.3.2.src.tar.gz;
+ sha256 = "1yq6xygc5lhn3b9d4sbddlf8dzi3wihyzjwyc8rhiwrb3hj8hx1y";
+ };
+ tools = fetchhg {
+ url = https://code.google.com/p/go.tools/;
+ rev = "e1c276c4e679";
+ sha256 = "0x62njflwkd99i2ixbksg6mjppl1wfg86f0g3swn350l1h0xzp76";
+ };
+ };
in
stdenv.mkDerivation {
- name = "go-1.3.1";
+ name = "go-1.3.2";
- src = fetchurl {
- url = https://storage.googleapis.com/golang/go1.3.1.src.tar.gz;
- sha256 = "fdfa148cc12f1e4ea45a5565261bf43d8a2e7d1fad4a16aed592d606223b93a8";
- };
+ src = srcs.golang;
- buildInputs = [ bison bash makeWrapper ] ++ lib.optionals stdenv.isLinux [ glibc ] ;
+ # perl is used for testing go vet
+ buildInputs = [ bison bash makeWrapper perl ] ++ lib.optionals stdenv.isLinux [ glibc ] ;
# I'm not sure what go wants from its 'src', but the go installation manual
# describes an installation keeping the src.
@@ -24,6 +33,10 @@ stdenv.mkDerivation {
mkdir -p $out/share
cd $out/share
'';
+ postUnpack = ''
+ mkdir -p $out/share/go/src/pkg/code.google.com/p/
+ cp -rv --no-preserve=mode,ownership ${srcs.tools} $out/share/go/src/pkg/code.google.com/p/go.tools
+ '';
prePatch = ''
# Ensure that the source directory is named go
@@ -46,6 +59,8 @@ stdenv.mkDerivation {
# Disable the hostname test
sed -i '/TestHostname/areturn' src/pkg/os/os_test.go
sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/pkg/net/lookup_unix.go
+ # ParseInLocation fails the test
+ sed -i '/TestParseInSydney/areturn' src/pkg/time/format_test.go
'' + lib.optionalString stdenv.isLinux ''
sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/pkg/time/zoneinfo_unix.go
sed -i 's,/lib/ld-linux.so.3,${loaderArm},' src/cmd/5l/asm.c
@@ -81,6 +96,12 @@ stdenv.mkDerivation {
./all.bash
cd -
+ # Build extra tooling
+ # TODO: Fix godoc tests
+ TOOL_ROOT=code.google.com/p/go.tools/cmd
+ go install -v $TOOL_ROOT/cover $TOOL_ROOT/vet $TOOL_ROOT/godoc
+ go test -v $TOOL_ROOT/cover $TOOL_ROOT/vet # $TOOL_ROOT/godoc
+
# Copy the emacs configuration for Go files.
mkdir -p "$out/share/emacs/site-lisp"
cp ./misc/emacs/* $out/share/emacs/site-lisp/
diff --git a/pkgs/development/compilers/gwydion-dylan/binary-builder.sh b/pkgs/development/compilers/gwydion-dylan/binary-builder.sh
deleted file mode 100644
index a0e71c02ab9..00000000000
--- a/pkgs/development/compilers/gwydion-dylan/binary-builder.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-source $stdenv/setup
-
-set -e
-
-mkdir -p $out
-cd $out
-tar zxvf $src
-mv ./usr/local/* .
-rm -rf ./usr
diff --git a/pkgs/development/compilers/gwydion-dylan/binary.nix b/pkgs/development/compilers/gwydion-dylan/binary.nix
deleted file mode 100644
index 0ac942d14b8..00000000000
--- a/pkgs/development/compilers/gwydion-dylan/binary.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
- name = "binary-gwydion-dylan-2.4.0";
- builder = ./binary-builder.sh;
- src = fetchurl {
- url = http://www.gwydiondylan.org/downloads/binaries/linux/x86/tar/gwydion-dylan-2.4.0-x86-linux.tar.gz;
- md5 = "52643ad51a455d21fd4d5bf82d98914c";
- };
-}
diff --git a/pkgs/development/compilers/gwydion-dylan/builder.sh b/pkgs/development/compilers/gwydion-dylan/builder.sh
deleted file mode 100644
index ea2e5424399..00000000000
--- a/pkgs/development/compilers/gwydion-dylan/builder.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-source $stdenv/setup
-
-export DYLANDIR=$dylan
-export DYLANPATH=$dylan/lib/dylan/2.4.0/x86-linux-gcc
-configureFlags="--with-existing-runtime=$dylan/lib/dylan/2.4.0/x86-linux-gcc"
-export LD_LIBRARY_PATH="$dylan/lib/dylan/2.4.0/x86-linux-gcc:$LD_LIBRARY_PATH:$boehmgc/lib"
-
-genericBuild
diff --git a/pkgs/development/compilers/gwydion-dylan/default.nix b/pkgs/development/compilers/gwydion-dylan/default.nix
deleted file mode 100644
index 7c00e65d7cc..00000000000
--- a/pkgs/development/compilers/gwydion-dylan/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{stdenv, fetchurl, dylan, boehmgc, perl, flex, yacc, readline}:
-
-stdenv.mkDerivation {
- name = "gwydion-dylan-2.4.0";
- builder = ./builder.sh;
- src = fetchurl {
- url = http://www.gwydiondylan.org/downloads/src/tar/gwydion-dylan-2.4.0.tar.gz;
- md5 = "7ed180bf4ef11e8e8da3bd78b45477a8";
- };
-
- inherit boehmgc dylan perl;
- buildInputs = [boehmgc dylan perl flex yacc readline];
-}
diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix
index d2f24390318..1873b58e802 100644
--- a/pkgs/development/compilers/hhvm/default.nix
+++ b/pkgs/development/compilers/hhvm/default.nix
@@ -17,9 +17,9 @@ stdenv.mkDerivation rec {
};
buildInputs =
- [ cmake pkgconfig boost libunwind mariadb libmemcached pcre libevent gd curl
- libxml2 icu flex bison openssl zlib php expat libcap oniguruma
- libdwarf libmcrypt tbb gperftools bzip2 openldap readline
+ [ cmake pkgconfig boost boost.lib libunwind mariadb libmemcached pcre
+ libevent gd curl libxml2 icu flex bison openssl zlib php expat libcap
+ oniguruma libdwarf libmcrypt tbb gperftools bzip2 openldap readline
libelf uwimap binutils cyrus_sasl pam glog libpng libxslt ocaml
];
diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix
index f0b07f9d0fa..2af8ec1b022 100644
--- a/pkgs/development/compilers/idris/default.nix
+++ b/pkgs/development/compilers/idris/default.nix
@@ -11,8 +11,8 @@
cabal.mkDerivation (self: {
pname = "idris";
- version = "0.9.14.1";
- sha256 = "11x4f0hvd51m9rlf9r0i5xsjmc73kjsayny4xyv0wgb88v9v737b";
+ version = "0.9.14.3";
+ sha256 = "03zppfqjamy4mdwcfx3x1wzxav67ha1zgnynrxhvdqw3zcsrwnlr";
isLibrary = true;
isExecutable = true;
buildDepends = [
@@ -26,7 +26,6 @@ cabal.mkDerivation (self: {
buildTools = [ happy ];
extraLibraries = [ boehmgc gmp ];
configureFlags = "-fllvm -fgmp -fffi";
- jailbreak = true;
meta = {
homepage = "http://www.idris-lang.org/";
description = "Functional Programming Language with Dependent Types";
diff --git a/pkgs/development/compilers/idris/wrapper.nix b/pkgs/development/compilers/idris/wrapper.nix
index fce5c0c89f3..2985b33c170 100644
--- a/pkgs/development/compilers/idris/wrapper.nix
+++ b/pkgs/development/compilers/idris/wrapper.nix
@@ -6,5 +6,6 @@ runCommand "idris-wrapper" {} ''
ln -s ${idris_plain}/bin/idris $out/bin
wrapProgram $out/bin/idris \
--suffix NIX_CFLAGS_COMPILE : '"-I${gmp}/include -L${gmp}/lib -L${boehmgc}/lib"' \
- --suffix PATH : ${gcc}/bin
+ --suffix PATH : ${gcc}/bin \
+ --suffix PATH : ${idris_plain}/bin
''
diff --git a/pkgs/development/compilers/lessc/default.nix b/pkgs/development/compilers/lessc/default.nix
index 1d2bd5e7d0b..266e9eb5255 100644
--- a/pkgs/development/compilers/lessc/default.nix
+++ b/pkgs/development/compilers/lessc/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "lessc-${version}";
- version = "1.4.0";
+ version = "1.4.2";
src = fetchgit {
url = https://github.com/less/less.js.git;
rev = "refs/tags/v${version}";
- sha256 = "12nzaz7v1bnqzylh4zm1srrj7w7f45fqj4sihxyg0bknfvfwdc56";
+ sha256 = "1v3b4f1np3mxkj0irh1pk52r26nzpf4k2ax14cbn7mxx16mqjp50";
};
phases = [ "installPhase" ];
@@ -19,10 +19,11 @@ stdenv.mkDerivation rec {
substituteInPlace $out/bin/lessc --replace "/usr/bin/env node" ${nodejs}/bin/node
'';
- meta = {
+ meta = with stdenv.lib; {
description = "LESS to CSS compiler";
homepage = http://lesscss.org/;
- license = stdenv.lib.licenses.asl20;
- platforms = stdenv.lib.platforms.linux;
+ license = licenses.asl20;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ pSub ];
};
}
diff --git a/pkgs/development/compilers/mezzo/default.nix b/pkgs/development/compilers/mezzo/default.nix
new file mode 100644
index 00000000000..183640f5985
--- /dev/null
+++ b/pkgs/development/compilers/mezzo/default.nix
@@ -0,0 +1,29 @@
+{stdenv, fetchurl, ocaml, findlib, menhir, yojson, ulex, pprint, fix, functory}:
+
+stdenv.mkDerivation {
+
+ name = "mezzo-0.0.m8";
+
+ src = fetchurl {
+ url = https://github.com/protz/mezzo/archive/m8.tar.gz;
+ sha256 = "17mfapgqp8ssa5x9blv72zg9l561zbiwv3ikwi6nl9dd36lwkkc6";
+ };
+
+ buildInputs = [ ocaml findlib yojson menhir ulex pprint fix functory ];
+
+ createFindlibDestdir = true;
+
+ postInstall = ''
+ mkdir $out/bin
+ cp mezzo $out/bin/
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = http://protz.github.io/mezzo/;
+ description = "A programming language in the ML tradition, which places strong emphasis on the control of aliasing and access to mutable memory";
+ license = licenses.gpl2;
+ platforms = ocaml.meta.platforms;
+ };
+}
+
+
diff --git a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix
index 23b5883c009..68b4a22220e 100644
--- a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix
+++ b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix
@@ -3,9 +3,9 @@
assert stdenv ? glibc;
stdenv.mkDerivation rec {
- version = "3.0";
+ version = "3.1";
- date = "February2011";
+ date = "April2012";
name = "nvidia-cg-toolkit-${version}";
@@ -13,12 +13,12 @@ stdenv.mkDerivation rec {
if stdenv.system == "x86_64-linux" then
fetchurl {
url = "http://developer.download.nvidia.com/cg/Cg_${version}/Cg-${version}_${date}_x86_64.tgz";
- sha256 = "07gmnzfsla3vf1kf00cj86p87h6wrdbp6ri4ycslc5kmfxsq7ypq";
+ sha256 = "e8ff01e6cc38d1b3fd56a083f5860737dbd2f319a39037528fb1a74a89ae9878";
}
else if stdenv.system == "i686-linux" then
fetchurl {
url = "http://developer.download.nvidia.com/cg/Cg_${version}/Cg-${version}_${date}_x86.tgz";
- sha256 = "0hr8l0r20akbfm5j0vqv4ghl0acwjf5996pxnfxlajacl9w58nam";
+ sha256 = "cef3591e436f528852db0e8c145d3842f920e0c89bcfb219c466797cb7b18879";
}
else throw "nvidia-cg-toolkit does not support platform ${stdenv.system}";
@@ -35,11 +35,6 @@ stdenv.mkDerivation rec {
mkdir -p "$out/lib/"
[ "$system" == "x86_64-linux" ] && cp -v lib64/* "$out/lib/"
[ "$system" == "i686-linux" ] && cp -v lib/* "$out/lib/"
- for mandir in man1 man3 manCg manCgFX
- do
- mkdir -p "$out/share/man/$mandir/"
- cp -v share/man/$mandir/* "$out/share/man/$mandir/"
- done
mkdir -p "$out/share/doc/$name/"
cp -v -r local/Cg/* "$out/share/doc/$name/"
'';
diff --git a/pkgs/development/compilers/ocaml/4.02.0.nix b/pkgs/development/compilers/ocaml/4.02.0.nix
new file mode 100644
index 00000000000..b6753cc6297
--- /dev/null
+++ b/pkgs/development/compilers/ocaml/4.02.0.nix
@@ -0,0 +1,74 @@
+let
+ safeX11 = stdenv: !(stdenv.isArm || stdenv.isMips);
+in
+
+{ stdenv, fetchurl, ncurses, buildEnv, libX11, xproto, useX11 ? safeX11 stdenv }:
+
+assert useX11 -> !stdenv.isArm && !stdenv.isMips;
+
+let
+ useNativeCompilers = !stdenv.isMips;
+ inherit (stdenv.lib) optionals optionalString;
+in
+
+stdenv.mkDerivation rec {
+
+ x11env = buildEnv { name = "x11env"; paths = [libX11 xproto]; };
+ x11lib = x11env + "/lib";
+ x11inc = x11env + "/include";
+
+ name = "ocaml-4.02.0";
+
+ src = fetchurl {
+ url = "http://caml.inria.fr/pub/distrib/ocaml-4.02/${name}.tar.xz";
+ sha256 = "1ml5r8vzbwqhnq8jlps6jfgf0vym4nyrnr95mrbym6v5j2gabmw7";
+ };
+
+ prefixKey = "-prefix ";
+ configureFlags = optionals useX11 [ "-x11lib" x11lib
+ "-x11include" x11inc ];
+
+ buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt";
+ buildInputs = [ncurses] ++ optionals useX11 [ libX11 xproto ];
+ installTargets = "install" + optionalString useNativeCompilers " installopt";
+ preConfigure = ''
+ CAT=$(type -tp cat)
+ sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang
+ '';
+ postBuild = ''
+ mkdir -p $out/include
+ ln -sv $out/lib/ocaml/caml $out/include/caml
+ '';
+
+ passthru = {
+ nativeCompilers = useNativeCompilers;
+ };
+
+ meta = {
+ homepage = http://caml.inria.fr/ocaml;
+ license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
+ description = "Most popular variant of the Caml language";
+
+ longDescription =
+ ''
+ OCaml is the most popular variant of the Caml language. From a
+ language standpoint, it extends the core Caml language with a
+ fully-fledged object-oriented layer, as well as a powerful module
+ system, all connected by a sound, polymorphic type system featuring
+ type inference.
+
+ The OCaml system is an industrial-strength implementation of this
+ language, featuring a high-performance native-code compiler (ocamlopt)
+ for 9 processor architectures (IA32, PowerPC, AMD64, Alpha, Sparc,
+ Mips, IA64, HPPA, StrongArm), as well as a bytecode compiler (ocamlc)
+ and an interactive read-eval-print loop (ocaml) for quick development
+ and portability. The OCaml distribution includes a comprehensive
+ standard library, a replay debugger (ocamldebug), lexer (ocamllex) and
+ parser (ocamlyacc) generators, a pre-processor pretty-printer (camlp4)
+ and a documentation generator (ocamldoc).
+ '';
+
+ platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+ };
+
+}
diff --git a/pkgs/development/compilers/oraclejdk/jdk7-linux.nix b/pkgs/development/compilers/oraclejdk/jdk7-linux.nix
index 55e8ad45085..cf4990c33b5 100644
--- a/pkgs/development/compilers/oraclejdk/jdk7-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk7-linux.nix
@@ -1,9 +1,9 @@
import ./jdk-linux-base.nix {
productVersion = "7";
- patchVersion = "65";
+ patchVersion = "67";
downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html;
- sha256_i686 = "e3032c561deb237c033b485a358cc429ec83b621303bc6b31768855778a9eaa0";
- sha256_x86_64 = "33fac9630ca8c2d374247abc5c010ac8d2875a3384968aa3e74448361808e4b7";
+ sha256_i686 = "0p58pag1x85r911lxhmr4blk687ivjqigflx175vp7rcmmj108xn";
+ sha256_x86_64 = "0db36jg08qy8712qy6lgyifdqlqb468rrnjm3aa6937ixl9ixpal";
jceName = "UnlimitedJCEPolicyJDK7.zip";
jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html;
sha256JCE = "7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d";
diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix
index 7dfbe218bb7..d654ebe6b0a 100644
--- a/pkgs/development/compilers/orc/default.nix
+++ b/pkgs/development/compilers/orc/default.nix
@@ -1,14 +1,17 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "orc-0.4.19";
+ name = "orc-0.4.22";
src = fetchurl {
- url = "http://gstreamer.freedesktop.org/src/orc/${name}.tar.gz";
- sha256 = "17mmgwll2waz44m908lcxc5fd6n44yysh7p4pdw33hr138r507z2";
+ url = "http://gstreamer.freedesktop.org/src/orc/${name}.tar.xz";
+ sha256 = "0dgrbjm94y9l63s3srlddjcdxgrv6iazmvwh630jrw159dzhgjh4";
};
- doCheck = true;
+ # building memcpy_speed.log
+ # ../test-driver: line 107: 4495 Segmentation fault "$@" > $log_file 2>&1
+ # FAIL: memcpy_speed
+ doCheck = false; # see https://bugzilla.gnome.org/show_bug.cgi?id=728129#c7
meta = {
description = "The Oil Runtime Compiler";
@@ -17,5 +20,6 @@ stdenv.mkDerivation rec {
# under the 3-clause BSD license. The rest is 2-clause BSD license.
license = stdenv.lib.licenses.bsd3;
platform = stdenv.lib.platforms.linux;
+ maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
};
}
diff --git a/pkgs/development/compilers/polyml/default.nix b/pkgs/development/compilers/polyml/default.nix
index 9c0af4ec9ab..76bb811dd66 100644
--- a/pkgs/development/compilers/polyml/default.nix
+++ b/pkgs/development/compilers/polyml/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchurl}:
let
- version = "5.5.1";
+ version = "5.5.2";
in
stdenv.mkDerivation {
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "mirror://sourceforge/polyml/polyml.${version}.tar.gz";
- sha256 = "16i0ir5mydl7381aijihkll19khp3z8dq0g2ja6k0pcbpkd0k06g";
+ sha256 = "10m680qdad6bd50bav9xjsgmsxw8yxg55vr7grbg0gvykzl2pzbk";
};
meta = {
diff --git a/pkgs/development/compilers/rustc/hardcode_paths.HEAD.patch b/pkgs/development/compilers/rustc/hardcode_paths.HEAD.patch
new file mode 100644
index 00000000000..21e6576e4e3
--- /dev/null
+++ b/pkgs/development/compilers/rustc/hardcode_paths.HEAD.patch
@@ -0,0 +1,38 @@
+diff --git a/src/librustc/back/link.rs b/src/librustc/back/link.rs
+index 6332485..9500a23 100644
+--- a/src/librustc/back/link.rs
++++ b/src/librustc/back/link.rs
+@@ -383,18 +383,9 @@ pub fn mangle_internal_name_by_path_and_seq(path: PathElems, flav: &str) -> Stri
+
+ pub fn get_cc_prog(sess: &Session) -> String {
+ match sess.opts.cg.linker {
+- Some(ref linker) => return linker.to_string(),
+- None => {}
++ Some(ref linker) => linker.to_string(),
++ None => "@ccPath@".to_string()
+ }
+-
+- // In the future, FreeBSD will use clang as default compiler.
+- // It would be flexible to use cc (system's default C compiler)
+- // instead of hard-coded gcc.
+- // For Windows, there is no cc command, so we add a condition to make it use gcc.
+- match sess.targ_cfg.os {
+- abi::OsWindows => "gcc",
+- _ => "cc",
+- }.to_string()
+ }
+
+ pub fn remove(sess: &Session, path: &Path) {
+diff --git a/src/librustc_back/archive.rs b/src/librustc_back/archive.rs
+index 060dda5..fecf76b 100644
+--- a/src/librustc_back/archive.rs
++++ b/src/librustc_back/archive.rs
+@@ -53,7 +53,7 @@ fn run_ar(handler: &ErrorHandler, maybe_ar_prog: &Option,
+ paths: &[&Path]) -> ProcessOutput {
+ let ar = match *maybe_ar_prog {
+ Some(ref ar) => ar.as_slice(),
+- None => "ar"
++ None => "@arPath@"
+ };
+ let mut cmd = Command::new(ar);
+
diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix
index 4f512096a42..f81539fad9a 100644
--- a/pkgs/development/compilers/rustc/head.nix
+++ b/pkgs/development/compilers/rustc/head.nix
@@ -1,4 +1,6 @@
-{stdenv, fetchurl, fetchgit, which, file, perl, curl, python27, makeWrapper}:
+{ stdenv, fetchurl, fetchgit, which, file, perl, curl, python27, makeWrapper
+, tzdata, git
+}:
assert stdenv.gcc.gcc != null;
@@ -16,19 +18,19 @@ assert stdenv.gcc.gcc != null;
*/
-with ((import ./common.nix) {inherit stdenv; version = "0.12.0-pre-7a25cf3f3"; });
+with ((import ./common.nix) {inherit stdenv; version = "0.12.0-pre-a2e7c4da9"; });
let snapshot = if stdenv.system == "i686-linux"
- then "a5e1bb723020ac35173d49600e76b0935e257a6a"
+ then "555aca74f9a268f80cab2df1147dc6406403e9e4"
else if stdenv.system == "x86_64-linux"
- then "1a2407df17442d93d1c34c916269a345658045d7"
+ then "6a43c2f6c8ba2cbbcb9da1f7b58f748aef99f431"
else if stdenv.system == "i686-darwin"
- then "6648fa88e41ad7c0991a085366e36d56005873ca"
+ then "331bd7ef519cbb424188c546273e8c7d738f0894"
else if stdenv.system == "x86_64-darwin"
- then "71b2d1dfd0abe1052908dc091e098ed22cf272c6"
+ then "2c83a79a9febfe1d326acb17c3af76ba053c6ca9"
else abort "no-snapshot for platform ${stdenv.system}";
- snapshotDate = "2014-07-17";
- snapshotRev = "9fc8394";
+ snapshotDate = "2014-10-04";
+ snapshotRev = "749ff5e";
snapshotName = "rust-stage0-${snapshotDate}-${snapshotRev}-${platform}-${snapshot}.tar.bz2";
in stdenv.mkDerivation {
@@ -38,8 +40,8 @@ in stdenv.mkDerivation {
src = fetchgit {
url = https://github.com/rust-lang/rust;
- rev = "7a25cf3f30fa5fae2e868fa910ecc850f5e9ee65";
- sha256 = "1hx8vd4gn5plbdvr0zvdvqyw9x9r2vbmh112h2f5d2xxsf9p7rf1";
+ rev = "a2e7c4da9b331d337fba0b3911c6d3d7f48e8305";
+ sha256 = "1lpncqx3lfyjk6llfc7pd1iqxzfhj32hjqvj09zks73r4isc02n4";
};
# We need rust to build rust. If we don't provide it, configure will try to download it.
@@ -63,13 +65,19 @@ in stdenv.mkDerivation {
configureFlags = [ "--enable-local-rust" "--local-rust-root=$snapshot" ];
# The compiler requires cc, so we patch the source to tell it where to find it
- patches = [ ./hardcode_paths.patch ./local_stage0.patch ];
+ patches = [ ./hardcode_paths.HEAD.patch ./local_stage0.HEAD.patch ];
postPatch = ''
substituteInPlace src/librustc/back/link.rs \
- --subst-var-by "ccPath" "${stdenv.gcc}/bin/cc" \
+ --subst-var-by "ccPath" "${stdenv.gcc}/bin/cc"
+ substituteInPlace src/librustc_back/archive.rs \
--subst-var-by "arPath" "${stdenv.gcc.binutils}/bin/ar"
'';
- buildInputs = [ which file perl curl python27 makeWrapper ];
- enableParallelBuilding = true;
+ buildInputs = [ which file perl curl python27 makeWrapper git ];
+
+ enableParallelBuilding = false; # disabled due to rust-lang/rust#16305
+
+ preCheck = "export TZDIR=${tzdata}/share/zoneinfo";
+
+ doCheck = true;
}
diff --git a/pkgs/development/compilers/rustc/local_stage0.HEAD.patch b/pkgs/development/compilers/rustc/local_stage0.HEAD.patch
new file mode 100644
index 00000000000..2f38d7c1757
--- /dev/null
+++ b/pkgs/development/compilers/rustc/local_stage0.HEAD.patch
@@ -0,0 +1,16 @@
+diff --git a/src/etc/local_stage0.sh b/src/etc/local_stage0.sh
+index e78f231..6b6773b 100755
+--- a/src/etc/local_stage0.sh
++++ b/src/etc/local_stage0.sh
+@@ -53,11 +53,6 @@
+ fi
+
+ cp ${PREFIX}/bin/rustc${BIN_SUF} ${TARG_DIR}/stage0/bin/
+-cp ${PREFIX}/${LIB_DIR}/${RUSTLIBDIR}/${TARG_DIR}/${LIB_DIR}/* ${TARG_DIR}/stage0/${LIB_DIR}/
+-cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}extra*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/
+-cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}rust*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/
+-cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}std*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/
+-cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}syntax*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/
+
+ # do not fail if one of the above fails, as all we need is a working rustc!
+ exit 0
diff --git a/pkgs/development/compilers/sbcl/1.2.0.nix b/pkgs/development/compilers/sbcl/1.2.0.nix
new file mode 100644
index 00000000000..c9d360f0ec5
--- /dev/null
+++ b/pkgs/development/compilers/sbcl/1.2.0.nix
@@ -0,0 +1,78 @@
+{ stdenv, fetchurl, sbclBootstrap, clisp}:
+
+stdenv.mkDerivation rec {
+ name = "sbcl-${version}";
+ version = "1.2.0";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
+ sha256 = "13k20sys1v4lvgis8cnbczww6zs93rw176vz07g4jx06418k53x2";
+ };
+
+ buildInputs = [ ]
+ ++ (stdenv.lib.optional stdenv.isDarwin sbclBootstrap)
+ ++ (stdenv.lib.optional stdenv.isLinux clisp)
+ ;
+
+ patchPhase = ''
+ echo '"${version}.nixos"' > version.lisp-expr
+ echo "
+ (lambda (features)
+ (flet ((enable (x)
+ (pushnew x features))
+ (disable (x)
+ (setf features (remove x features))))
+ (enable :sb-thread))) " > customize-target-features.lisp
+
+ pwd
+
+ # SBCL checks whether files are up-to-date in many places..
+ # Unfortunately, same timestamp is not good enough
+ sed -e 's@> x y@>= x y@' -i contrib/sb-aclrepl/repl.lisp
+ sed -e '/(date)/i((= date 2208988801) 2208988800)' -i contrib/asdf/asdf.lisp
+ sed -i src/cold/slam.lisp -e \
+ '/file-write-date input/a)'
+ sed -i src/cold/slam.lisp -e \
+ '/file-write-date output/i(or (and (= 2208988801 (file-write-date output)) (= 2208988801 (file-write-date input)))'
+ sed -i src/code/target-load.lisp -e \
+ '/date defaulted-fasl/a)'
+ sed -i src/code/target-load.lisp -e \
+ '/date defaulted-source/i(or (and (= 2208988801 (file-write-date defaulted-source-truename)) (= 2208988801 (file-write-date defaulted-fasl-truename)))'
+
+ # Fix the tests
+ sed -e '/deftest pwent/inil' -i contrib/sb-posix/posix-tests.lisp
+ sed -e '/deftest grent/inil' -i contrib/sb-posix/posix-tests.lisp
+ sed -e '/deftest .*ent.non-existing/,+5d' -i contrib/sb-posix/posix-tests.lisp
+ sed -e '/deftest \(pw\|gr\)ent/,+3d' -i contrib/sb-posix/posix-tests.lisp
+
+ sed -e '5,$d' -i contrib/sb-bsd-sockets/tests.lisp
+ sed -e '5,$d' -i contrib/sb-simple-streams/*test*.lisp
+ '';
+
+ preBuild = ''
+ export INSTALL_ROOT=$out
+ mkdir -p test-home
+ export HOME=$PWD/test-home
+ '';
+
+ buildPhase = if stdenv.isLinux
+ then ''
+ sh make.sh clisp --prefix=$out
+ ''
+ else ''
+ sh make.sh --prefix=$out --xc-host='${sbclBootstrap}/bin/sbcl --core ${sbclBootstrap}/share/sbcl/sbcl.core --disable-debugger --no-userinit --no-sysinit'
+ '';
+
+ installPhase = ''
+ INSTALL_ROOT=$out sh install.sh
+ '';
+
+ meta = {
+ description = "Lisp compiler";
+ homepage = http://www.sbcl.org;
+ license = stdenv.lib.licenses.bsd3;
+ maintainers = [stdenv.lib.maintainers.raskin];
+ platforms = stdenv.lib.platforms.all;
+ inherit version;
+ };
+}
diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index d3892d43d15..535f2697fea 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "sbcl-${version}";
- version = "1.2.0";
+ version = "1.2.3";
src = fetchurl {
url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
- sha256 = "13k20sys1v4lvgis8cnbczww6zs93rw176vz07g4jx06418k53x2";
+ sha256 = "0lz2a79dlxxyw05s14l6xp35zjsazgbp1dmqygqi0cmd8dc5vj6j";
};
buildInputs = [ ]
diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix
index e299be9144e..c556870d519 100644
--- a/pkgs/development/compilers/scala/default.nix
+++ b/pkgs/development/compilers/scala/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, makeWrapper, jre }:
stdenv.mkDerivation rec {
- name = "scala-2.11.0";
+ name = "scala-2.11.1";
src = fetchurl {
url = "http://www.scala-lang.org/files/archive/${name}.tgz";
- sha256 = "00lap31c6rxvg7vipmj0j7f4mv6c58wpfyd3785bxwlhrzmmwgq7";
+ sha256 = "1vjsmqjwpxavyj29wrbvvx7799fsa65d4iha5mj63cgs8qp605gk";
};
buildInputs = [ jre makeWrapper ] ;
diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix
index bd457b227e6..01dbaee8cde 100644
--- a/pkgs/development/compilers/urweb/default.nix
+++ b/pkgs/development/compilers/urweb/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "urweb";
- version = "20140531";
+ version = "20140830";
name = "${pname}-${version}";
src = fetchurl {
url = "http://www.impredicative.com/ur/${name}.tgz";
- sha256 = "0gbk16hzs8267cfhb7w1cqgjxdv2icxg5clxdbda6qsn84jaf3n4";
+ sha256 = "0l4zhvdy2fdvhihyl4gl09v8q4w05b1k0c6h4k8281px96d5ljgr";
};
buildInputs = [ stdenv.gcc file openssl mlton mysql postgresql sqlite ];
diff --git a/pkgs/development/coq-modules/containers/default.nix b/pkgs/development/coq-modules/containers/default.nix
new file mode 100644
index 00000000000..8c20d64d8c7
--- /dev/null
+++ b/pkgs/development/coq-modules/containers/default.nix
@@ -0,0 +1,25 @@
+{stdenv, fetchurl, coq}:
+
+stdenv.mkDerivation {
+
+ name = "coq-containers-${coq.coq-version}";
+
+ src = fetchurl {
+ url = http://coq.inria.fr/pylons/contribs/files/Containers/v8.4/Containers.tar.gz;
+ sha256 = "1y9x2lwrskv2231z9ac3kv4bmg6h1415xpp4gl7v5w90ba6p6w8w";
+ };
+
+ buildInputs = [ coq.ocaml coq.camlp5 ];
+ propagatedBuildInputs = [ coq ];
+
+ installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
+
+ meta = with stdenv.lib; {
+ homepage = http://coq.inria.fr/pylons/pylons/contribs/view/Containers/v8.4;
+ description = "A typeclass-based Coq library of finite sets/maps";
+ maintainers = with maintainers; [ vbgl ];
+ platforms = coq.meta.platforms;
+ broken = true; /* the source hash is wrong */
+ };
+
+}
diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix
new file mode 100644
index 00000000000..ca8bd6481ef
--- /dev/null
+++ b/pkgs/development/coq-modules/mathcomp/default.nix
@@ -0,0 +1,24 @@
+{stdenv, fetchurl, coq, ssreflect}:
+
+stdenv.mkDerivation {
+
+ name = "coq-mathcomp-1.5";
+
+ src = fetchurl {
+ url = http://ssr.msr-inria.inria.fr/FTP/mathcomp-1.5.tar.gz;
+ sha256 = "1297svwi18blrlyd8vsqilar2h5nfixlvlifdkbx47aljq4m5bam";
+ };
+
+ propagatedBuildInputs = [ coq ssreflect ];
+
+ installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
+
+ meta = with stdenv.lib; {
+ homepage = http://ssr.msr-inria.inria.fr/;
+ license = licenses.cecill-b;
+ maintainers = [ maintainers.vbgl ];
+ platforms = coq.meta.platforms;
+ hydraPlatforms = [];
+ };
+
+}
diff --git a/pkgs/development/coq-modules/ssreflect/default.nix b/pkgs/development/coq-modules/ssreflect/default.nix
new file mode 100644
index 00000000000..912ff7071f8
--- /dev/null
+++ b/pkgs/development/coq-modules/ssreflect/default.nix
@@ -0,0 +1,26 @@
+{stdenv, fetchurl, coq}:
+
+assert coq.coq-version == "8.4";
+
+stdenv.mkDerivation {
+
+ name = "coq-ssreflect-1.5";
+
+ src = fetchurl {
+ url = http://ssr.msr-inria.inria.fr/FTP/ssreflect-1.5.tar.gz;
+ sha256 = "0hm1ha7sxqfqhc7iwhx6zdz3nki4rj5nfd3ab24hmz8v7mlpinds";
+ };
+
+ buildInputs = [ coq.ocaml coq.camlp5 ];
+ propagatedBuildInputs = [ coq ];
+
+ installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
+
+ meta = with stdenv.lib; {
+ homepage = http://ssr.msr-inria.inria.fr/;
+ license = licenses.cecill-b;
+ maintainers = with maintainers; [ vbgl ];
+ platforms = coq.meta.platforms;
+ };
+
+}
diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix
index 6d074ac9f27..e723133e256 100644
--- a/pkgs/development/interpreters/acl2/default.nix
+++ b/pkgs/development/interpreters/acl2/default.nix
@@ -2,7 +2,7 @@ a :
let
fetchurl = a.fetchurl;
- version = a.lib.attrByPath ["version"] "v3-5" a;
+ version = a.lib.attrByPath ["version"] "v6-5" a;
buildInputs = with a; [
sbcl
];
@@ -10,7 +10,7 @@ in
rec {
src = fetchurl {
url = "http://www.cs.utexas.edu/users/moore/acl2/${version}/distrib/acl2.tar.gz";
- sha256 = "0zmh1njpp7n7azcyjlygr0h0k51d18s1jkj0dr1jn2bh7mpysajk";
+ sha256 = "19kfclgpdyms016s06pjf3icj3mx9jlcj8vfgpbx2ac4ls0ir36g";
name = "acl2-${version}.tar.gz";
};
@@ -26,8 +26,8 @@ rec {
doDeploy = (a.simplyShare installSuffix);
doBuild = a.fullDepEntry (''
cd $out/share/${installSuffix}
- make LISP=${a.sbcl}/bin/sbcl
- make LISP=${a.sbcl}/bin/sbcl regression
+ make LISP='${a.sbcl}/bin/sbcl --dynamic-space-size 2000'
+ make LISP='${a.sbcl}/bin/sbcl --dynamic-space-size 2000' regression
mkdir -p "$out/bin"
cp saved_acl2 "$out/bin/acl2"
'') ["doDeploy" "addInputs" "defEnsureDir"];
diff --git a/pkgs/development/interpreters/chibi/default.nix b/pkgs/development/interpreters/chibi/default.nix
new file mode 100644
index 00000000000..b4a0b77e705
--- /dev/null
+++ b/pkgs/development/interpreters/chibi/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, makeWrapper }:
+let
+ version = "0.7";
+ name = "chibi-scheme-${version}";
+in
+stdenv.mkDerivation {
+ inherit name;
+
+ meta = {
+ homepage = "https://code.google.com/p/chibi-scheme/";
+ description = "Small Footprint Scheme for use as a C Extension Language";
+ platforms = stdenv.lib.platforms.all;
+ license = stdenv.lib.licenses.bsd3;
+ maintainers = [ stdenv.lib.maintainers.DerGuteMoritz ];
+ };
+
+ src = fetchurl {
+ url = "http://abrek.synthcode.com/${name}.tgz";
+ sha256 = "1hhkq0khgi8i24xv66y7r6pgk1issn1i2bf7rv91rbk0wm0kv7qm";
+ };
+
+ buildInputs = [ makeWrapper ];
+
+ installPhase = ''
+ make install PREFIX="$out"
+ '';
+
+ fixupPhase = ''
+ wrapProgram "$out/bin/chibi-scheme" \
+ --prefix CHIBI_MODULE_PATH : "$out/share/chibi:$out/lib/chibi"
+
+ for f in chibi-doc chibi-ffi snow-chibi; do
+ substituteInPlace "$out/bin/$f" \
+ --replace "/usr/bin/env chibi-scheme" "$out/bin/chibi-scheme"
+ done
+ '';
+}
diff --git a/pkgs/development/interpreters/clisp/2.44.1.nix b/pkgs/development/interpreters/clisp/2.44.1.nix
index 7b811732a62..521933b0ed1 100644
--- a/pkgs/development/interpreters/clisp/2.44.1.nix
+++ b/pkgs/development/interpreters/clisp/2.44.1.nix
@@ -3,12 +3,12 @@
, libffi, libffcall, coreutils }:
stdenv.mkDerivation rec {
- v = "2.49";
+ v = "2.44.1";
name = "clisp-${v}";
src = fetchurl {
url = "mirror://gnu/clisp/release/${v}/${name}.tar.gz";
- sha256 = "0rp82nqp5362isl9i34rwgg04cidz7izljd9d85pqcw1qr964bxx";
+ sha256 = "0rkp6j6rih4s5d9acifh7pi4b9xfgcspif512l269dqy9qgyy4j1";
};
buildInputs =
diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix
index 59629eb2f59..9a5d2417df7 100644
--- a/pkgs/development/interpreters/elixir/default.nix
+++ b/pkgs/development/interpreters/elixir/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, erlang, rebar, makeWrapper, coreutils }:
+{ stdenv, fetchurl, erlang, rebar, makeWrapper, coreutils, curl, bash, cacert }:
let
- version = "0.15.1";
+ version = "1.0.0";
in
stdenv.mkDerivation {
name = "elixir-${version}";
src = fetchurl {
url = "https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz";
- sha256 = "8e608abf90a6e9a25ef5fb7e45dfd04e2cb7e1fecb4ac260bf6652885a7f0c50";
+ sha256 = "1ci8g6nh89xnn0ax9kazcs47w406nqsj1d4rf8sb1b6abfq78xsj";
};
buildInputs = [ erlang rebar makeWrapper ];
@@ -20,6 +20,8 @@ stdenv.mkDerivation {
substituteInPlace Makefile \
--replace "/usr/local" $out
+ substituteInPlace bin/mix \
+ --replace "/usr/bin/env elixir" "$out/bin/elixir"
'';
postFixup = ''
@@ -29,7 +31,8 @@ stdenv.mkDerivation {
for f in $out/bin/*
do
wrapProgram $f \
- --prefix PATH ":" "${erlang}/bin:${coreutils}/bin"
+ --prefix PATH ":" "${erlang}/bin:${coreutils}/bin:${curl}/bin:${bash}/bin" \
+ --set CURL_CA_BUNDLE "${cacert}/etc/ca-bundle.crt"
done
'';
@@ -46,7 +49,7 @@ stdenv.mkDerivation {
'';
license = licenses.epl10;
- platforms = platforms.linux;
+ platforms = platforms.unix;
maintainers = [ maintainers.the-kenny ];
};
}
diff --git a/pkgs/development/interpreters/erlang/R16.nix b/pkgs/development/interpreters/erlang/R16.nix
index 5945cdd8299..23243803e8d 100644
--- a/pkgs/development/interpreters/erlang/R16.nix
+++ b/pkgs/development/interpreters/erlang/R16.nix
@@ -1,13 +1,15 @@
{ stdenv, fetchurl, perl, gnum4, ncurses, openssl
, gnused, gawk, makeWrapper
+, odbcSupport ? false, unixODBC ? null
, wxSupport ? false, mesa ? null, wxGTK ? null, xlibs ? null }:
assert wxSupport -> mesa != null && wxGTK != null && xlibs != null;
+assert odbcSupport -> unixODBC != null;
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "erlang-" + version;
+ name = "erlang-" + version + "${optionalString odbcSupport "-odbc"}";
version = "16B03-1";
src = fetchurl {
@@ -17,7 +19,8 @@ stdenv.mkDerivation rec {
buildInputs =
[ perl gnum4 ncurses openssl makeWrapper
- ] ++ optional wxSupport [ mesa wxGTK xlibs.libX11 ];
+ ] ++ optional wxSupport [ mesa wxGTK xlibs.libX11 ]
+ ++ optional odbcSupport [ unixODBC ];
patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure '';
@@ -26,7 +29,7 @@ stdenv.mkDerivation rec {
sed -e s@/bin/pwd@pwd@g -i otp_build
'';
- configureFlags= "--with-ssl=${openssl} ${optionalString stdenv.isDarwin "--enable-darwin-64bit"}";
+ configureFlags= "--with-ssl=${openssl} ${optionalString odbcSupport "--with-odbc=${unixODBC}"} ${optionalString stdenv.isDarwin "--enable-darwin-64bit"}";
postInstall = let
manpages = fetchurl {
diff --git a/pkgs/development/interpreters/erlang/R17.nix b/pkgs/development/interpreters/erlang/R17.nix
index 2aba55d3679..a7378e69c3a 100644
--- a/pkgs/development/interpreters/erlang/R17.nix
+++ b/pkgs/development/interpreters/erlang/R17.nix
@@ -1,23 +1,26 @@
{ stdenv, fetchurl, perl, gnum4, ncurses, openssl
, gnused, gawk, makeWrapper
+, odbcSupport ? false, unixODBC ? null
, wxSupport ? false, mesa ? null, wxGTK ? null, xlibs ? null }:
assert wxSupport -> mesa != null && wxGTK != null && xlibs != null;
+assert odbcSupport -> unixODBC != null;
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "erlang-" + version;
- version = "17.1";
+ name = "erlang-" + version + "${optionalString odbcSupport "-odbc"}";
+ version = "17.3";
src = fetchurl {
url = "http://www.erlang.org/download/otp_src_${version}.tar.gz";
- sha256 = "0mn3p5rwvjfsxjnn1vrm0lxdq40wq9bmd9nibl6hqbfcnnrga1mq";
+ sha256 = "1r3n7drzgmwcv46n4lzic9ki19psgx1vjgnmjp5g85k06kmh7gnl";
};
buildInputs =
[ perl gnum4 ncurses openssl makeWrapper
- ] ++ optional wxSupport [ mesa wxGTK xlibs.libX11 ];
+ ] ++ optional wxSupport [ mesa wxGTK xlibs.libX11 ]
+ ++ optional odbcSupport [ unixODBC ];
patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure '';
@@ -26,12 +29,12 @@ stdenv.mkDerivation rec {
sed -e s@/bin/pwd@pwd@g -i otp_build
'';
- configureFlags= "--with-ssl=${openssl} ${optionalString stdenv.isDarwin "--enable-darwin-64bit"}";
+ configureFlags= "--with-ssl=${openssl} ${optionalString odbcSupport "--with-odbc=${unixODBC}"} ${optionalString stdenv.isDarwin "--enable-darwin-64bit"}";
postInstall = let
manpages = fetchurl {
url = "http://www.erlang.org/download/otp_doc_man_${version}.tar.gz";
- sha256 = "1aza6hxhh7ag2frsa0hg6il6ancjrbazvgz7jc2p7qrmy5vh48sa";
+ sha256 = "1dys0903snk0ppip8hfckfd656pl9z3s4vqqv3yk4i2rn30dmarz";
};
in ''
ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call
diff --git a/pkgs/development/interpreters/falcon/default.nix b/pkgs/development/interpreters/falcon/default.nix
index 0b4bfacb6de..d9ce07f16f7 100644
--- a/pkgs/development/interpreters/falcon/default.nix
+++ b/pkgs/development/interpreters/falcon/default.nix
@@ -1,34 +1,21 @@
-a :
-let
- fetchurl = a.fetchurl;
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, zlib, sqlite }:
- version = a.lib.attrByPath ["version"] "0.9.2" a;
- buildInputs = with a; [
- cmake
- ];
-in
-rec {
- src = fetchurl {
- url = "http://www.falconpl.org/project_dl/_official_rel/Falcon-${version}.tar.gz";
- sha256 = "0p32syiz2nc6lmmzi0078g4nzariw5ymdjkmhw6iamc0lkkb9x3i";
+stdenv.mkDerivation rec {
+ name = "faclon-${version}";
+ version = "2013-09-19";
+
+ src = fetchFromGitHub {
+ owner = "falconpl";
+ repo = "falcon";
+ rev = "095141903c4ebab928ce803055f9bda363215c37";
+ sha256 = "1x3gdcz1gqhi060ngqi0ghryf69v8bn50yrbzfad8bhblvhzzdlf";
};
- inherit buildInputs;
- configureFlags = [];
+ buildInputs = [ cmake pkgconfig pcre zlib sqlite ];
- /* doConfigure should be removed if not needed */
- phaseNames = ["doDeploy"];
-
- doDeploy = a.fullDepEntry (''
- ./build.sh -i -p $out
- '') ["minInit" "addInputs" "doFixInterpreter" "defEnsureDir"];
-
- doFixInterpreter = a.fullDepEntry (''
- sed -e "s@/bin/bash@$shell@" -i build.sh
- '') ["minInit" "doUnpack"];
-
- name = "falcon-" + version;
- meta = {
+ meta = with stdenv.lib; {
description = "Programming language with macros and syntax at once";
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ pSub ];
};
}
diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix
index fdfb5d8ca30..c611577adfb 100644
--- a/pkgs/development/interpreters/groovy/default.nix
+++ b/pkgs/development/interpreters/groovy/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "groovy-${version}";
- version = "2.3.6";
+ version = "2.3.7";
src = fetchurl {
url = "http://dl.bintray.com/groovy/maven/groovy-binary-${version}.zip";
- sha256 = "0yvk6x1f68avl52zzwx9p3faiqr98rfps70vql05j6kd7syyp0ah";
+ sha256 = "09957vi33c8bgk6z4wnidch5sz3s183yh6xba8cdjy5f7jpzmmiq";
};
installPhase = ''
diff --git a/pkgs/development/interpreters/jimtcl/default.nix b/pkgs/development/interpreters/jimtcl/default.nix
new file mode 100644
index 00000000000..a6b8478b5e2
--- /dev/null
+++ b/pkgs/development/interpreters/jimtcl/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchgit, sqlite }:
+
+stdenv.mkDerivation {
+ name = "jimtcl-0.75-git";
+
+ src = fetchgit {
+ url = https://github.com/msteveb/jimtcl.git;
+ rev = "c4d4bf8bc104733db1f5992a27d88fbfca9ba882";
+ sha256 = "0vnl2k5sj250l08bplqd61zj6261v7kp202pss66g01rhp42fj3r";
+ };
+
+ buildInputs = [
+ sqlite
+ ];
+
+ configureFlags = [
+ "--with-ext=oo"
+ "--with-ext=tree"
+ "--with-ext=binary"
+ "--with-ext=sqlite3"
+ "--enable-utf8"
+ "--ipv6"
+ ];
+
+ meta = {
+ description = "An open source small-footprint implementation of the Tcl programming language";
+ homepage = http://jim.tcl.tk/;
+ license = stdenv.lib.licenses.bsd2;
+ platforms = stdenv.lib.platforms.all;
+ maintainers = with stdenv.lib.maintainers; [ dbohdan ];
+ };
+}
diff --git a/pkgs/development/interpreters/lua-5/5.1.nix b/pkgs/development/interpreters/lua-5/5.1.nix
index 1b05cb8f778..444ecbc787a 100644
--- a/pkgs/development/interpreters/lua-5/5.1.nix
+++ b/pkgs/development/interpreters/lua-5/5.1.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, readline }:
+{ stdenv, fetchurl, fetchpatch, readline }:
let
dsoPatch = fetchurl {
@@ -18,7 +18,13 @@ stdenv.mkDerivation rec {
buildInputs = [ readline ];
- patches = if stdenv.isDarwin then [ ./5.1.darwin.patch ] else [ dsoPatch ];
+ patches = (if stdenv.isDarwin then [ ./5.1.darwin.patch ] else [ dsoPatch ])
+ ++ [(fetchpatch {
+ name = "CVE-2014-5461.patch";
+ url = "http://anonscm.debian.org/cgit/pkg-lua/lua5.1.git/plain/debian/patches/"
+ + "0004-Fix-stack-overflow-in-vararg-functions.patch?id=b75a2014db2ad65683521f7bb295bfa37b48b389";
+ sha256 = "05i5vh53d9i6dy11ibg9i9qpwz5hdm0s8bkx1d9cfcvy80cm4c7f";
+ })];
configurePhase =
if stdenv.isDarwin
diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix
index ea44adb462c..1812ccbf7d6 100644
--- a/pkgs/development/interpreters/lua-5/5.2.nix
+++ b/pkgs/development/interpreters/lua-5/5.2.nix
@@ -9,12 +9,12 @@ let
in
stdenv.mkDerivation rec {
name = "lua-${version}";
- majorVersion = "5.2";
- version = "${majorVersion}.2";
+ luaversion = "5.2";
+ version = "${luaversion}.3";
src = fetchurl {
url = "http://www.lua.org/ftp/${name}.tar.gz";
- sha256 = "004zyh9p3lpvbwhyhlmrw6wwcia5abx84q4h2brkn4zdypipvmiz";
+ sha1 = "926b7907bc8d274e063d42804666b40a3f3c124c";
};
nativeBuildInputs = [ readline ];
@@ -24,17 +24,17 @@ stdenv.mkDerivation rec {
configurePhase =
if stdenv.isDarwin
then ''
- makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=macosx CFLAGS="-DLUA_USE_LINUX -fno-common -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDFLAGS="-fPIC" V=${majorVersion} R=${version} )
+ makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=macosx CFLAGS="-DLUA_USE_LINUX -fno-common -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDFLAGS="-fPIC" V=${luaversion} R=${version} )
installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.${version}.dylib" INSTALL_DATA='cp -d' )
'' else ''
- makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-DLUA_USE_LINUX -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDFLAGS="-fPIC" V=${majorVersion} R=${version} )
- installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.a liblua.so liblua.so.${majorVersion} liblua.so.${version}" INSTALL_DATA='cp -d' )
+ makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-DLUA_USE_LINUX -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDFLAGS="-fPIC" V=${luaversion} R=${version} )
+ installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.a liblua.so liblua.so.${luaversion} liblua.so.${version}" INSTALL_DATA='cp -d' )
'';
postInstall = ''
mkdir -p "$out/share/doc/lua" "$out/lib/pkgconfig"
mv "doc/"*.{gif,png,css,html} "$out/share/doc/lua/"
- rmdir $out/{share,lib}/lua/${majorVersion} $out/{share,lib}/lua
+ rmdir $out/{share,lib}/lua/${luaversion} $out/{share,lib}/lua
mkdir -p "$out/lib/pkgconfig"
cat >"$out/lib/pkgconfig/lua.pc" < tmp
+ cat tmp cygwin/cygwin.c.bak > cygwin/cygwin.c
+ ''}
'';
preBuild = optionalString (!(stdenv ? gcc && stdenv.gcc.nativeTools))
diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix
index e39661b224a..4f378ddff4f 100644
--- a/pkgs/development/interpreters/php/5.4.nix
+++ b/pkgs/development/interpreters/php/5.4.nix
@@ -9,7 +9,7 @@ in
composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
- version = "5.4.31";
+ version = "5.4.32";
name = "php-${version}";
@@ -249,7 +249,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
src = fetchurl {
url = "http://www.php.net/distributions/php-${version}.tar.bz2";
- sha256 = "0kci0yir923fc7dv7j9qrc10pj05v82jnxjxjbgrj7gx64a4k3jy";
+ sha256 = "09n8lxnc5p2xfwk0ql2lh183h78hha1axhrdsa6g3650d5v73l16";
};
meta = {
diff --git a/pkgs/development/interpreters/pypy/2.3/default.nix b/pkgs/development/interpreters/pypy/2.4/default.nix
similarity index 79%
rename from pkgs/development/interpreters/pypy/2.3/default.nix
rename to pkgs/development/interpreters/pypy/2.4/default.nix
index ba0fb6f111a..8f9647c2134 100644
--- a/pkgs/development/interpreters/pypy/2.3/default.nix
+++ b/pkgs/development/interpreters/pypy/2.4/default.nix
@@ -1,12 +1,13 @@
{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi
-, sqlite, openssl, ncurses, pythonFull, expat, tcl, tk, x11, libX11 }:
+, sqlite, openssl, ncurses, pythonFull, expat, tcl, tk, x11, libX11
+, makeWrapper }:
assert zlibSupport -> zlib != null;
let
- majorVersion = "2.3";
- version = "${majorVersion}.1";
+ majorVersion = "2.4";
+ version = "${majorVersion}.0";
pythonVersion = "2.7";
libPrefix = "pypy${majorVersion}";
@@ -17,10 +18,10 @@ let
src = fetchurl {
url = "https://bitbucket.org/pypy/pypy/get/release-${version}.tar.bz2";
- sha256 = "0fg4l48c7n59n5j3b1dgcsr927xzylkfny4a6pnk6z0pq2bhvl9z";
+ sha256 = "1lhk86clnkj305dxa6xr9wjib6ckf6xxl6qj0bq20vqh80nfq3by";
};
- buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite tk tcl x11 libX11 ]
+ buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite tk tcl x11 libX11 makeWrapper ]
++ stdenv.lib.optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc
++ stdenv.lib.optional zlibSupport zlib;
@@ -53,8 +54,7 @@ let
--replace "linklibs=['tcl', 'tk']" "linklibs=['tcl8.5', 'tk8.5']" \
--replace "libdirs = []" "libdirs = ['${tk}/lib', '${tcl}/lib']"
- substituteInPlace lib_pypy/_sqlite3.py \
- --replace "libraries=['sqlite3']" "libraries=['sqlite3'], include_dirs=['${sqlite}/include'], library_dirs=['${sqlite}/lib']"
+ sed -i "s@libraries=\['sqlite3'\]\$@libraries=['sqlite3'], include_dirs=['${sqlite}/include'], library_dirs=['${sqlite}/lib']@" lib_pypy/_sqlite3.py
'';
setupHook = ./setup-hook.sh;
@@ -67,10 +67,11 @@ let
# disable shutils because it assumes gid 0 exists
# disable socket because it has two actual network tests that fail
# disable test_mhlib because it fails for unknown reason
- # disable test_multiprocessing due to transient errors
# disable sqlite3 due to https://bugs.pypy.org/issue1740
+ # disable test_multiprocessing due to transient errors
# disable test_os because test_urandom_failure fails
- ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k '-test_sqlite -test_socket -test_os -test_shutil -test_mhlib -test_multiprocessing' lib-python
+ # disable test_urllib2net and test_urllibnet because it requires networking (example.com)
+ ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k 'not (test_sqlite or test_urllib2net or test_urllibnet or test_socket or test_os or test_shutil or test_mhlib or test_multiprocessing)' lib-python
'';
installPhase = ''
@@ -85,9 +86,12 @@ let
ln -s $out/pypy-c/lib-python/${pythonVersion} $out/lib/${libPrefix}
# verify cffi modules
- $out/bin/pypy -c "import Tkinter"
+ $out/bin/pypy -c "import Tkinter;import sqlite3;import curses"
- # TODO: compile python files?
+ # make sure pypy finds sqlite3 library
+ wrapProgram "$out/bin/pypy" \
+ --set LD_LIBRARY_PATH "${LD_LIBRARY_PATH}" \
+ --set LIBRARY_PATH "${LIBRARY_PATH}"
'';
passthru = {
@@ -99,7 +103,7 @@ let
enableParallelBuilding = true;
meta = with stdenv.lib; {
- homepage = "http://pypy.org/";
+ homepage = http://pypy.org/;
description = "Fast, compliant alternative implementation of the Python language (2.7.3)";
license = licenses.mit;
platforms = platforms.linux;
diff --git a/pkgs/development/interpreters/pypy/2.3/setup-hook.sh b/pkgs/development/interpreters/pypy/2.4/setup-hook.sh
similarity index 82%
rename from pkgs/development/interpreters/pypy/2.3/setup-hook.sh
rename to pkgs/development/interpreters/pypy/2.4/setup-hook.sh
index 67c71bf0081..4cf7247fb9e 100644
--- a/pkgs/development/interpreters/pypy/2.3/setup-hook.sh
+++ b/pkgs/development/interpreters/pypy/2.4/setup-hook.sh
@@ -1,12 +1,12 @@
addPythonPath() {
- addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/pypy2.3/site-packages
+ addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/pypy2.4/site-packages
}
toPythonPath() {
local paths="$1"
local result=
for i in $paths; do
- p="$i/lib/pypy2.3/site-packages"
+ p="$i/lib/pypy2.4/site-packages"
result="${result}${result:+:}$p"
done
echo $result
diff --git a/pkgs/development/interpreters/python/3.4/default.nix b/pkgs/development/interpreters/python/3.4/default.nix
index 3477cedf4b7..312bf247de7 100644
--- a/pkgs/development/interpreters/python/3.4/default.nix
+++ b/pkgs/development/interpreters/python/3.4/default.nix
@@ -36,6 +36,8 @@ stdenv.mkDerivation {
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
+ patches = [ ./issue21121-3.patch ];
+
preConfigure = ''
for i in /usr /sw /opt /pkg; do # improve purity
substituteInPlace ./setup.py --replace $i /no-such-path
diff --git a/pkgs/development/interpreters/python/3.4/issue21121-3.patch b/pkgs/development/interpreters/python/3.4/issue21121-3.patch
new file mode 100644
index 00000000000..506d9ea9b3d
--- /dev/null
+++ b/pkgs/development/interpreters/python/3.4/issue21121-3.patch
@@ -0,0 +1,86 @@
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -71,12 +71,17 @@
+ BASECFLAGS= @BASECFLAGS@
+ BASECPPFLAGS= @BASECPPFLAGS@
+ CONFIGURE_CFLAGS= @CFLAGS@
++# CFLAGS_NODIST is used for building the interpreter and stdlib C extensions.
++# Use it when a compiler flag should _not_ be part of the distutils CFLAGS
++# once Python is installed (Issue #21121).
++CONFIGURE_CFLAGS_NODIST=@CFLAGS_NODIST@
+ CONFIGURE_CPPFLAGS= @CPPFLAGS@
+ CONFIGURE_LDFLAGS= @LDFLAGS@
+ # Avoid assigning CFLAGS, LDFLAGS, etc. so users can use them on the
+ # command line to append to these values without stomping the pre-set
+ # values.
+ PY_CFLAGS= $(BASECFLAGS) $(OPT) $(CONFIGURE_CFLAGS) $(CFLAGS) $(EXTRA_CFLAGS)
++PY_CFLAGS_NODIST=$(CONFIGURE_CFLAGS_NODIST) $(CFLAGS_NODIST)
+ # Both CPPFLAGS and LDFLAGS need to contain the shell's value for setup.py to
+ # be able to build extension modules using the directories specified in the
+ # environment variables
+@@ -91,7 +96,7 @@
+ # Extra C flags added for building the interpreter object files.
+ CFLAGSFORSHARED=@CFLAGSFORSHARED@
+ # C flags used for building the interpreter object files
+-PY_CORE_CFLAGS= $(PY_CFLAGS) $(PY_CPPFLAGS) $(CFLAGSFORSHARED) -DPy_BUILD_CORE
++PY_CORE_CFLAGS= $(PY_CFLAGS) $(PY_CFLAGS_NODIST) $(PY_CPPFLAGS) $(CFLAGSFORSHARED) -DPy_BUILD_CORE
+
+
+ # Machine-dependent subdirectories
+diff --git a/configure b/configure
+--- a/configure
++++ b/configure
+@@ -662,6 +662,7 @@
+ LIBTOOL_CRUFT
+ OTHER_LIBTOOL_OPT
+ UNIVERSAL_ARCH_FLAGS
++CFLAGS_NODIST
+ BASECFLAGS
+ OPT
+ ABIFLAGS
+@@ -6504,7 +6505,7 @@
+
+ if test $ac_cv_declaration_after_statement_warning = yes
+ then
+- BASECFLAGS="$BASECFLAGS -Werror=declaration-after-statement"
++ CFLAGS_NODIST="$CFLAGS_NODIST -Werror=declaration-after-statement"
+ fi
+
+ # if using gcc on alpha, use -mieee to get (near) full IEEE 754
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -1147,6 +1147,7 @@
+ fi
+
+ AC_SUBST(BASECFLAGS)
++AC_SUBST(CFLAGS_NODIST)
+
+ # The -arch flags for universal builds on OSX
+ UNIVERSAL_ARCH_FLAGS=
+@@ -1231,7 +1232,7 @@
+
+ if test $ac_cv_declaration_after_statement_warning = yes
+ then
+- BASECFLAGS="$BASECFLAGS -Werror=declaration-after-statement"
++ CFLAGS_NODIST="$CFLAGS_NODIST -Werror=declaration-after-statement"
+ fi
+
+ # if using gcc on alpha, use -mieee to get (near) full IEEE 754
+diff --git a/setup.py b/setup.py
+--- a/setup.py
++++ b/setup.py
+@@ -19,6 +19,12 @@
+
+ cross_compiling = "_PYTHON_HOST_PLATFORM" in os.environ
+
++# Add special CFLAGS reserved for building the interpreter and the stdlib
++# modules (Issue #21121).
++cflags = sysconfig.get_config_var('CFLAGS')
++py_cflags_nodist = sysconfig.get_config_var('PY_CFLAGS_NODIST')
++sysconfig.get_config_vars()['CFLAGS'] = cflags + ' ' + py_cflags_nodist
++
+ def get_platform():
+ # cross build
+ if "_PYTHON_HOST_PLATFORM" in os.environ:
diff --git a/pkgs/development/interpreters/regina/default.nix b/pkgs/development/interpreters/regina/default.nix
index d8b3558be4f..992f7281554 100644
--- a/pkgs/development/interpreters/regina/default.nix
+++ b/pkgs/development/interpreters/regina/default.nix
@@ -12,16 +12,15 @@ let
sourceInfo = rec {
baseName="Regina-REXX";
pname="regina-rexx";
- version="3.5";
+ version = "3.8.2";
name="${baseName}-${version}";
url="mirror://sourceforge/${pname}/${pname}/${version}/${name}.tar.gz";
- hash="0gh0k6lbhfixs44adha7lxirl3a08jabdylzr6m7mh5q5fhzv5f8";
};
in
rec {
src = a.fetchurl {
url = sourceInfo.url;
- sha256 = sourceInfo.hash;
+ sha256 = "06vr6p9pqr5zzsxm1l9iwb2w9z8qkm971c2knh0vf5bbm6znjz35";
};
inherit (sourceInfo) name version;
@@ -43,11 +42,8 @@ rec {
platforms = with a.lib.platforms;
linux;
license = a.lib.licenses.lgpl2;
- };
- passthru = {
- updateInfo = {
- downloadPage = "http://sourceforge.net/projects/regina-rexx/files/regina-rexx/";
- };
+ downloadPage = "http://sourceforge.net/projects/regina-rexx/files/regina-rexx/";
+ inherit version;
};
}) x
diff --git a/pkgs/development/interpreters/regina/default.upstream b/pkgs/development/interpreters/regina/default.upstream
new file mode 100644
index 00000000000..7b3c6905a1c
--- /dev/null
+++ b/pkgs/development/interpreters/regina/default.upstream
@@ -0,0 +1,5 @@
+url http://sourceforge.net/projects/regina-rexx/files/regina-rexx/
+SF_version_dir
+SF_version_tarball
+SF_redirect
+minimize_overwrite
diff --git a/pkgs/development/interpreters/ruby/config.nix b/pkgs/development/interpreters/ruby/config.nix
new file mode 100644
index 00000000000..c03c0520d7a
--- /dev/null
+++ b/pkgs/development/interpreters/ruby/config.nix
@@ -0,0 +1,6 @@
+# Ruby >= 2.1.0 tries to download config.{guess,sub}
+fetchgit: fetchgit {
+ url = "git://git.sv.gnu.org/config.git";
+ rev = "576c839acca0e082e536fd27568b90a446ce5b96";
+ sha256 = "11bjngchjhj0qq0ppp8c37rfw0yhp230nvhs2jvlx15i9qbf56a0";
+}
diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix
index 6ec0f4f73e5..78567b1979f 100644
--- a/pkgs/development/interpreters/ruby/generated.nix
+++ b/pkgs/development/interpreters/ruby/generated.nix
@@ -4,30 +4,41 @@ g: # Get dependencies from patched gems
{
aliases = {
ZenTest = g.ZenTest_4_10_1;
- actionmailer = g.actionmailer_4_1_5;
- actionpack = g.actionpack_4_1_5;
- actionview = g.actionview_4_1_5;
- activemodel = g.activemodel_4_1_5;
- activerecord = g.activerecord_4_1_5;
- activesupport = g.activesupport_4_1_5;
+ actionmailer = g.actionmailer_4_1_6;
+ actionpack = g.actionpack_4_1_6;
+ actionview = g.actionview_4_1_6;
+ activemodel = g.activemodel_4_1_6;
+ activerecord = g.activerecord_4_1_6;
+ activesupport = g.activesupport_4_1_6;
addressable = g.addressable_2_3_6;
arel = g.arel_5_0_1_20140414130214;
atoulme_Antwrap = g.atoulme_Antwrap_0_7_4;
autotest_rails = g.autotest_rails_4_2_1;
- aws_sdk = g.aws_sdk_1_51_0;
- backports = g.backports_3_6_0;
+ aws_sdk = g.aws_sdk_1_53_0;
+ aws_sdk_v1 = g.aws_sdk_v1_1_53_0;
+ backports = g.backports_3_6_1;
bitbucket_backup = g.bitbucket_backup_0_3_1;
+ blankslate = g.blankslate_2_1_2_4;
builder = g.builder_3_2_2;
- buildr = g.buildr_1_4_19;
- bundler = g.bundler_1_7_1;
+ buildr = g.buildr_1_4_20;
+ bundler = g.bundler_1_7_3;
+ celluloid = g.celluloid_0_16_0;
childprocess = g.childprocess_0_5_3;
chronic = g.chronic_0_10_2;
+ chunky_png = g.chunky_png_1_3_1;
+ classifier_reborn = g.classifier_reborn_2_0_1;
coderay = g.coderay_1_1_0;
- cucumber = g.cucumber_1_3_16;
+ coffee_script = g.coffee_script_2_3_0;
+ coffee_script_source = g.coffee_script_source_1_8_0;
+ colorator = g.colorator_0_1;
+ compass = g.compass_1_0_1;
+ compass_core = g.compass_core_1_0_1;
+ compass_import_once = g.compass_import_once_1_0_5;
+ cucumber = g.cucumber_1_3_17;
daemons = g.daemons_1_1_9;
diff_lcs = g.diff_lcs_1_2_5;
dimensions = g.dimensions_1_2_0;
- domain_name = g.domain_name_0_5_20;
+ domain_name = g.domain_name_0_5_21;
dotenv = g.dotenv_0_11_1;
dotenv_deployment = g.dotenv_deployment_0_0_2;
em_resolv_replace = g.em_resolv_replace_1_1_3;
@@ -35,35 +46,51 @@ g: # Get dependencies from patched gems
ethon = g.ethon_0_7_1;
eventmachine = g.eventmachine_1_0_3;
eventmachine_tail = g.eventmachine_tail_0_6_4;
+ excon = g.excon_0_39_5;
+ execjs = g.execjs_2_2_1;
fakes3 = g.fakes3_0_1_5_2;
faraday = g.faraday_0_9_0;
faraday_middleware = g.faraday_middleware_0_9_1;
+ fast_stemmer = g.fast_stemmer_1_0_2;
ffi = g.ffi_1_9_3;
file_tail = g.file_tail_1_0_12;
- foreman = g.foreman_0_74_0;
- gettext = g.gettext_3_1_3;
+ foreman = g.foreman_0_75_0;
+ gettext = g.gettext_3_1_4;
gh = g.gh_0_13_2;
gherkin = g.gherkin_2_12_2;
+ heroku = g.heroku_3_10_3;
+ heroku_api = g.heroku_api_0_3_19;
highline = g.highline_1_6_21;
hike = g.hike_1_2_3;
+ hitimes = g.hitimes_1_2_2;
hoe = g.hoe_3_7_1;
http_cookie = g.http_cookie_1_0_2;
i18n = g.i18n_0_6_11;
iconv = g.iconv_1_0_4;
+ jekyll = g.jekyll_2_4_0;
+ jekyll_coffeescript = g.jekyll_coffeescript_1_0_1;
+ jekyll_gist = g.jekyll_gist_1_1_0;
+ jekyll_paginate = g.jekyll_paginate_1_0_0;
+ jekyll_sass_converter = g.jekyll_sass_converter_1_2_1;
+ jekyll_watch = g.jekyll_watch_1_1_1;
jsduck = g.jsduck_5_3_4;
json = g.json_1_8_1;
json_pure = g.json_pure_1_8_0;
+ kramdown = g.kramdown_1_4_2;
launchy = g.launchy_2_4_2;
+ liquid = g.liquid_2_6_1;
+ listen = g.listen_2_7_9;
locale = g.locale_2_1_0;
lockfile = g.lockfile_2_1_3;
macaddr = g.macaddr_1_7_1;
mail = g.mail_2_6_1;
mechanize = g.mechanize_2_7_3;
+ mercenary = g.mercenary_0_3_4;
method_source = g.method_source_0_8_2;
mime_types = g.mime_types_2_3;
mini_portile = g.mini_portile_0_6_0;
minitar = g.minitar_0_5_4;
- minitest = g.minitest_5_4_0;
+ minitest = g.minitest_5_4_1;
multi_json = g.multi_json_1_10_1;
multi_test = g.multi_test_0_1_1;
multipart_post = g.multipart_post_2_0_0;
@@ -72,6 +99,7 @@ g: # Get dependencies from patched gems
net_http_pipeline = g.net_http_pipeline_1_0_1;
net_sftp = g.net_sftp_2_1_2;
net_ssh = g.net_ssh_2_9_1;
+ netrc = g.netrc_0_7_7;
nix = g.nix_0_1_1;
nokogiri = g.nokogiri_1_6_3_1;
ntlm_http = g.ntlm_http_0_1_1;
@@ -79,22 +107,28 @@ g: # Get dependencies from patched gems
papertrail = g.papertrail_0_9_10;
papertrail_cli = g.papertrail_cli_0_9_3;
parallel = g.parallel_0_7_1;
- polyglot = g.polyglot_0_3_5;
+ parslet = g.parslet_1_5_0;
+ posix_spawn = g.posix_spawn_0_3_9;
pry = g.pry_0_9_12_6;
pusher_client = g.pusher_client_0_6_0;
+ pygments_rb = g.pygments_rb_0_6_0;
rack = g.rack_1_5_2;
rack_protection = g.rack_protection_1_5_3;
rack_test = g.rack_test_0_6_2;
- rails = g.rails_4_1_5;
- railties = g.railties_4_1_5;
+ rails = g.rails_4_1_6;
+ railties = g.railties_4_1_6;
rake = g.rake_10_3_2;
rb_fsevent = g.rb_fsevent_0_9_4;
+ rb_inotify = g.rb_inotify_0_9_5;
rdiscount = g.rdiscount_2_1_7_1;
+ rdoc = g.rdoc_4_1_2;
+ redcarpet = g.redcarpet_3_1_2;
remote_syslog = g.remote_syslog_1_6_14;
+ rest_client = g.rest_client_1_6_7;
riemann_dash = g.riemann_dash_0_2_9;
right_aws = g.right_aws_3_1_0;
right_http_connection = g.right_http_connection_1_5_0;
- rjb = g.rjb_1_4_9;
+ rjb = g.rjb_1_5_0;
rkelly_remix = g.rkelly_remix_0_0_6;
rmail = g.rmail_1_0_0;
rspec = g.rspec_2_14_1;
@@ -102,13 +136,14 @@ g: # Get dependencies from patched gems
rspec_expectations = g.rspec_expectations_2_14_5;
rspec_mocks = g.rspec_mocks_2_14_6;
rubyzip = g.rubyzip_1_1_6;
- sass = g.sass_3_4_1;
- selenium_webdriver = g.selenium_webdriver_2_42_0;
+ safe_yaml = g.safe_yaml_1_0_3;
+ sass = g.sass_3_4_5;
+ selenium_webdriver = g.selenium_webdriver_2_43_0;
servolux = g.servolux_0_10_0;
sinatra = g.sinatra_1_4_5;
slop = g.slop_3_6_0;
- sprockets = g.sprockets_2_12_1;
- sprockets_rails = g.sprockets_rails_2_1_3;
+ sprockets = g.sprockets_2_12_2;
+ sprockets_rails = g.sprockets_rails_2_1_4;
syslog_protocol = g.syslog_protocol_0_9_2;
systemu = g.systemu_2_6_4;
taskjuggler = g.taskjuggler_3_5_0;
@@ -119,23 +154,26 @@ g: # Get dependencies from patched gems
thor = g.thor_0_19_1;
thread_safe = g.thread_safe_0_3_4;
tilt = g.tilt_1_4_1;
- tins = g.tins_1_3_2;
- travis = g.travis_1_7_1;
- treetop = g.treetop_1_4_15;
+ timers = g.timers_4_0_1;
+ tins = g.tins_1_3_3;
+ toml = g.toml_0_1_1;
+ travis = g.travis_1_7_2;
trollop = g.trollop_2_0;
typhoeus = g.typhoeus_0_6_9;
tzinfo = g.tzinfo_1_2_2;
+ uglifier = g.uglifier_2_5_3;
unf = g.unf_0_1_4;
unf_ext = g.unf_ext_0_0_6;
uuid = g.uuid_2_3_7;
webrick = g.webrick_1_3_1;
webrobots = g.webrobots_0_1_1;
- websocket = g.websocket_1_2_0;
+ websocket = g.websocket_1_2_1;
xapian_full = g.xapian_full_1_2_3;
xapian_ruby = g.xapian_ruby_1_2_17;
xml_simple = g.xml_simple_1_1_2;
+ yajl_ruby = g.yajl_ruby_1_2_1;
};
- gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''cucumber'' ''fakes3'' ''foreman'' ''gettext'' ''iconv'' ''jsduck'' ''lockfile'' ''mechanize'' ''nix'' ''papertrail-cli'' ''rails'' ''rake'' ''rb-fsevent'' ''remote_syslog'' ''riemann-dash'' ''right_aws'' ''rmail'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''taskjuggler'' ''terminal-notifier'' ''thin'' ''travis'' ''trollop'' ''uuid'' ''xapian-full'' ''xapian-ruby'' ];
+ gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''compass'' ''cucumber'' ''erubis'' ''execjs'' ''fakes3'' ''foreman'' ''gettext'' ''heroku'' ''iconv'' ''jekyll'' ''jsduck'' ''lockfile'' ''mechanize'' ''nix'' ''papertrail-cli'' ''rails'' ''rake'' ''rb-fsevent'' ''rdoc'' ''remote_syslog'' ''riemann-dash'' ''right_aws'' ''rmail'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''taskjuggler'' ''terminal-notifier'' ''thin'' ''travis'' ''trollop'' ''uglifier'' ''uuid'' ''xapian-full'' ''xapian-ruby'' ''yajl-ruby'' ];
gems = {
ZenTest_4_10_1 = {
basename = ''ZenTest'';
@@ -168,71 +206,71 @@ installed versions.'';
requiredGems = [ ];
sha256 = ''1jyk0lag27s71idna2h72ljskimj0snsiw7diyjx5rqxnz6fj7z1'';
};
- actionmailer_4_1_5 = {
+ actionmailer_4_1_6 = {
basename = ''actionmailer'';
meta = {
description = ''Email composition, delivery, and receiving framework (part of Rails).'';
homepage = ''http://www.rubyonrails.org'';
longDescription = ''Email on Rails. Compose, deliver, receive, and test emails using the familiar controller/view pattern. First-class support for multipart email and attachments.'';
};
- name = ''actionmailer-4.1.5'';
- requiredGems = [ g.actionpack_4_1_5 g.actionview_4_1_5 g.mail_2_5_4 ];
- sha256 = ''19frz9njy6jbxh7yasx62l4ifns3dxfkfqvnxlqb4pwsz7lqcp9c'';
+ name = ''actionmailer-4.1.6'';
+ requiredGems = [ g.actionpack_4_1_6 g.actionview_4_1_6 g.mail_2_6_1 ];
+ sha256 = ''1lsw9h0wm7pwdzm9jdq3y5b8b1cf56fd4dcgx4s91qf0lc0dw0wv'';
};
- actionpack_4_1_5 = {
+ actionpack_4_1_6 = {
basename = ''actionpack'';
meta = {
description = ''Web-flow and rendering framework putting the VC in MVC (part of Rails).'';
homepage = ''http://www.rubyonrails.org'';
longDescription = ''Web apps on Rails. Simple, battle-tested conventions for building and testing MVC web applications. Works with any Rack-compatible server.'';
};
- name = ''actionpack-4.1.5'';
- requiredGems = [ g.activesupport_4_1_5 g.rack_1_5_2 g.rack_test_0_6_2 g.actionview_4_1_5 ];
- sha256 = ''05wh3c5rw3c0rsza3bnpmr6s63n481d4gkbhsp3ngwn9lpp3jdb6'';
+ name = ''actionpack-4.1.6'';
+ requiredGems = [ g.activesupport_4_1_6 g.rack_1_5_2 g.rack_test_0_6_2 g.actionview_4_1_6 ];
+ sha256 = ''07a95iahv04gikk4qbgpi9is709ynkpcd4g00kqm629jaffrsyj2'';
};
- actionview_4_1_5 = {
+ actionview_4_1_6 = {
basename = ''actionview'';
meta = {
description = ''Rendering framework putting the V in MVC (part of Rails).'';
homepage = ''http://www.rubyonrails.org'';
longDescription = ''Simple, battle-tested conventions and helpers for building web pages.'';
};
- name = ''actionview-4.1.5'';
- requiredGems = [ g.activesupport_4_1_5 g.builder_3_2_2 g.erubis_2_7_0 ];
- sha256 = ''02zb4xi2farzh892j9awxshyly7ijlvbj39g6cwq5mhs5cx59qk8'';
+ name = ''actionview-4.1.6'';
+ requiredGems = [ g.activesupport_4_1_6 g.builder_3_2_2 g.erubis_2_7_0 ];
+ sha256 = ''1r06r4zsaqsq1wyqy2g29nnycw50v37ab7zmnvzjhy24y53rv9w7'';
};
- activemodel_4_1_5 = {
+ activemodel_4_1_6 = {
basename = ''activemodel'';
meta = {
description = ''A toolkit for building modeling frameworks (part of Rails).'';
homepage = ''http://www.rubyonrails.org'';
longDescription = ''A toolkit for building modeling frameworks like Active Record. Rich support for attributes, callbacks, validations, serialization, internationalization, and testing.'';
};
- name = ''activemodel-4.1.5'';
- requiredGems = [ g.activesupport_4_1_5 g.builder_3_2_2 ];
- sha256 = ''1anbjwdfgdjfxiv5vzysrdd98mapvd2h8xjkayq3vq54n13ymjvl'';
+ name = ''activemodel-4.1.6'';
+ requiredGems = [ g.activesupport_4_1_6 g.builder_3_2_2 ];
+ sha256 = ''14mw7d0jax7sky4nc2a7rspcf2inb3m6mxhx653i00v0xjrxa3x6'';
};
- activerecord_4_1_5 = {
+ activerecord_4_1_6 = {
basename = ''activerecord'';
meta = {
description = ''Object-relational mapper framework (part of Rails).'';
homepage = ''http://www.rubyonrails.org'';
longDescription = ''Databases on Rails. Build a persistent domain model by mapping database tables to Ruby classes. Strong conventions for associations, validations, aggregations, migrations, and testing come baked-in.'';
};
- name = ''activerecord-4.1.5'';
- requiredGems = [ g.activesupport_4_1_5 g.activemodel_4_1_5 g.arel_5_0_1_20140414130214 ];
- sha256 = ''1z8awkkl4bn4ghdp432n2qpagbb8569ffq63kmgkbwf8127kmzrc'';
+ name = ''activerecord-4.1.6'';
+ requiredGems = [ g.activesupport_4_1_6 g.activemodel_4_1_6 g.arel_5_0_1_20140414130214 ];
+ sha256 = ''15s72gawgvd7msa2i7hmjw81znif8zh1v57pmans8vmphfg2n9l7'';
};
- activesupport_4_1_5 = {
+ activesupport_4_1_6 = {
basename = ''activesupport'';
meta = {
description = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework.'';
homepage = ''http://www.rubyonrails.org'';
longDescription = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework. Rich support for multibyte strings, internationalization, time zones, and testing.'';
};
- name = ''activesupport-4.1.5'';
- requiredGems = [ g.i18n_0_6_11 g.json_1_8_1 g.tzinfo_1_2_2 g.minitest_5_4_0 g.thread_safe_0_3_4 ];
- sha256 = ''0vmf58q96469dci509hhbqxwr7gaxq4yjsb37xd56ggpqn3qm30k'';
+ name = ''activesupport-4.1.6'';
+ requiredGems = [ g.i18n_0_6_11 g.json_1_8_1 g.tzinfo_1_2_2 g.minitest_5_4_1 g.thread_safe_0_3_4 ];
+ sha256 = ''0crwl6rlxpv5fvvnvcbrjc7iygj8nklj83v1734h5lrhjzirxc22'';
};
addressable_2_3_6 = {
basename = ''addressable'';
@@ -285,7 +323,7 @@ database compatibility and query generation.'';
check out Buildr!'';
};
name = ''atoulme-Antwrap-0.7.4'';
- requiredGems = [ g.rjb_1_4_9 ];
+ requiredGems = [ g.rjb_1_5_0 ];
sha256 = ''0sh9capkya88qm9mvixwly32fwb2c4nzif9j9vv0f73rqw8kz4j4'';
};
autotest_rails_4_2_1 = {
@@ -300,27 +338,42 @@ rails support and extra plugins for migrations and fixtures.'';
requiredGems = [ g.ZenTest_4_10_1 ];
sha256 = ''1v1dm9zlhdlrxvk90zs8d439ldar674ix41s7pncddgyswcfgg5l'';
};
- aws_sdk_1_51_0 = {
+ aws_sdk_1_53_0 = {
basename = ''aws_sdk'';
meta = {
- description = ''AWS SDK for Ruby'';
+ description = ''AWS SDK for Ruby V1'';
homepage = ''http://aws.amazon.com/sdkforruby'';
- longDescription = ''AWS SDK for Ruby'';
+ longDescription = ''Version 1 of the AWS SDK for Ruby. Available as both `aws-sdk` and `aws-sdk-v1`.
+Use `aws-sdk-v1` if you want to load v1 and v2 of the Ruby SDK in the same
+application.'';
};
- name = ''aws-sdk-1.51.0'';
- requiredGems = [ g.nokogiri_1_6_3_1 g.json_1_8_1 ];
- sha256 = ''092a7km6ar7zvyyzgiqsb0dm354sqa6mzx7sa0c8ndwm918lbqai'';
+ name = ''aws-sdk-1.53.0'';
+ requiredGems = [ g.aws_sdk_v1_1_53_0 ];
+ sha256 = ''1jwvzlpyh5hpa3qn972wmn2pmhqpzw5vjal2n5i14qplvafmj7p2'';
};
- backports_3_6_0 = {
+ aws_sdk_v1_1_53_0 = {
+ basename = ''aws_sdk_v1'';
+ meta = {
+ description = ''AWS SDK for Ruby V1'';
+ homepage = ''http://aws.amazon.com/sdkforruby'';
+ longDescription = ''Version 1 of the AWS SDK for Ruby. Available as both `aws-sdk` and `aws-sdk-v1`.
+Use `aws-sdk-v1` if you want to load v1 and v2 of the Ruby SDK in the same
+application.'';
+ };
+ name = ''aws-sdk-v1-1.53.0'';
+ requiredGems = [ g.nokogiri_1_6_3_1 g.json_1_8_1 ];
+ sha256 = ''00yagrm2d5agwkfgkv4rqbxymwmgjmv5n8hah3xhrc90q1ywr7hw'';
+ };
+ backports_3_6_1 = {
basename = ''backports'';
meta = {
description = ''Backports of Ruby features for older Ruby.'';
homepage = ''http://github.com/marcandre/backports'';
- longDescription = ''Essential backports that enable many of the nice features of Ruby 1.8.7 up to 2.0.0 for earlier versions.'';
+ longDescription = ''Essential backports that enable many of the nice features of Ruby 1.8.7 up to 2.1.0 for earlier versions.'';
};
- name = ''backports-3.6.0'';
+ name = ''backports-3.6.1'';
requiredGems = [ ];
- sha256 = ''1pinn0m4fmq124adc6xjl2hk9799xq5jw4bva82cdzd4h2hwrgq5'';
+ sha256 = ''182fzzmzhjknnh8r6196lnws5fik86wnsn64a382w0fqb2vz98bq'';
};
bitbucket_backup_0_3_1 = {
basename = ''bitbucket_backup'';
@@ -333,6 +386,16 @@ rails support and extra plugins for migrations and fixtures.'';
requiredGems = [ g.highline_1_6_21 g.json_1_8_1 ];
sha256 = ''17d2pfk0z3cxcx9m90avcp5wxhdbrq23zd665263m3hh9b5qi0fj'';
};
+ blankslate_2_1_2_4 = {
+ basename = ''blankslate'';
+ meta = {
+ description = ''BlankSlate extracted from Builder.'';
+ homepage = ''http://github.com/masover/blankslate'';
+ };
+ name = ''blankslate-2.1.2.4'';
+ requiredGems = [ ];
+ sha256 = ''0jnnq5q5dwy2rbfcl769vd9bk1yn0242f6yjlb9mnqdm9627cdcx'';
+ };
builder_3_2_2 = {
basename = ''builder'';
meta = {
@@ -349,7 +412,7 @@ simple to do. Currently the following builder objects are supported:
requiredGems = [ ];
sha256 = ''14fii7ab8qszrvsvhz6z2z3i4dw0h41a62fjr2h1j8m41vbrmyv2'';
};
- buildr_1_4_19 = {
+ buildr_1_4_20 = {
basename = ''buildr'';
meta = {
description = ''Build like you code'';
@@ -361,20 +424,31 @@ to do, and it takes care of the rest. But also something we can easily extend
for those one-off tasks, with a language that's a joy to use.
'';
};
- name = ''buildr-1.4.19'';
- requiredGems = [ g.rake_0_9_2_2 g.builder_3_2_2 g.net_ssh_2_7_0 g.net_sftp_2_1_2 g.rubyzip_0_9_9 g.json_pure_1_8_0 g.hoe_3_7_1 g.rjb_1_4_8 g.atoulme_Antwrap_0_7_4 g.diff_lcs_1_2_4 g.rspec_expectations_2_14_3 g.rspec_mocks_2_14_3 g.rspec_core_2_14_5 g.rspec_2_14_1 g.xml_simple_1_1_2 g.minitar_0_5_4 g.bundler_1_7_1 g.orderedhash_0_0_6 ];
- sha256 = ''07k6z149si7v1h5m1bvdhjcv0nnjwkd2c6a8n1779l8g47ckccj0'';
+ name = ''buildr-1.4.20'';
+ requiredGems = [ g.rake_0_9_2_2 g.builder_3_2_2 g.net_ssh_2_7_0 g.net_sftp_2_1_2 g.rubyzip_0_9_9 g.json_pure_1_8_0 g.hoe_3_7_1 g.rjb_1_4_9 g.atoulme_Antwrap_0_7_4 g.diff_lcs_1_2_4 g.rspec_expectations_2_14_3 g.rspec_mocks_2_14_3 g.rspec_core_2_14_5 g.rspec_2_14_1 g.xml_simple_1_1_2 g.minitar_0_5_4 g.bundler_1_7_3 g.orderedhash_0_0_6 ];
+ sha256 = ''0x4ffblw7jg0z49ywfm5abfxgg23di3d661czndwi904cvmghrkv'';
};
- bundler_1_7_1 = {
+ bundler_1_7_3 = {
basename = ''bundler'';
meta = {
description = ''The best way to manage your application's dependencies'';
homepage = ''http://bundler.io'';
longDescription = ''Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably'';
};
- name = ''bundler-1.7.1'';
+ name = ''bundler-1.7.3'';
requiredGems = [ ];
- sha256 = ''144yqbmi89gl933rh8dv58bm7ia14s4a098qdi2z0q09ank9n5h2'';
+ sha256 = ''00r3b4bchiqbd12y896hmrp5sa6n4391fygg1jmvljx1635x5kyj'';
+ };
+ celluloid_0_16_0 = {
+ basename = ''celluloid'';
+ meta = {
+ description = ''Actor-based concurrent object framework for Ruby'';
+ homepage = ''https://github.com/celluloid/celluloid'';
+ longDescription = ''Celluloid enables people to build concurrent programs out of concurrent objects just as easily as they build sequential programs out of sequential objects'';
+ };
+ name = ''celluloid-0.16.0'';
+ requiredGems = [ g.timers_4_0_1 ];
+ sha256 = ''044xk0y7i1xjafzv7blzj5r56s7zr8nzb619arkrl390mf19jxv3'';
};
childprocess_0_5_3 = {
basename = ''childprocess'';
@@ -398,6 +472,43 @@ for those one-off tasks, with a language that's a joy to use.
requiredGems = [ ];
sha256 = ''1hrdkn4g8x7dlzxwb1rfgr8kw3bp4ywg5l4y4i9c2g5cwv62yvvn'';
};
+ chunky_png_1_3_1 = {
+ basename = ''chunky_png'';
+ meta = {
+ description = ''Pure ruby library for read/write, chunk-level access to PNG files'';
+ homepage = ''http://wiki.github.com/wvanbergen/chunky_png'';
+ longDescription = '' This pure Ruby library can read and write PNG images without depending on an external
+ image library, like RMagick. It tries to be memory efficient and reasonably fast.
+
+ It supports reading and writing all PNG variants that are defined in the specification,
+ with one limitation: only 8-bit color depth is supported. It supports all transparency,
+ interlacing and filtering options the PNG specifications allows. It can also read and
+ write textual metadata from PNG files. Low-level read/write access to PNG chunks is
+ also possible.
+
+ This library supports simple drawing on the image canvas and simple operations like
+ alpha composition and cropping. Finally, it can import from and export to RMagick for
+ interoperability.
+
+ Also, have a look at OilyPNG at http://github.com/wvanbergen/oily_png. OilyPNG is a
+ drop in mixin module that implements some of the ChunkyPNG algorithms in C, which
+ provides a massive speed boost to encoding and decoding.
+'';
+ };
+ name = ''chunky_png-1.3.1'';
+ requiredGems = [ ];
+ sha256 = ''1kpcv2wrx3zyfi5jbsnd9da1wmkjwidnmpshq6vhzz0r8hp7ai8a'';
+ };
+ classifier_reborn_2_0_1 = {
+ basename = ''classifier_reborn'';
+ meta = {
+ description = ''A general classifier module to allow Bayesian and other types of classifications.'';
+ homepage = ''https://github.com/jekyll/classifier-reborn'';
+ };
+ name = ''classifier-reborn-2.0.1'';
+ requiredGems = [ g.fast_stemmer_1_0_2 ];
+ sha256 = ''1p90lwn6x2akg882h597vb6fdbw6zmiw7pqlpqsc1dj243zf0pks'';
+ };
coderay_1_1_0 = {
basename = ''coderay'';
meta = {
@@ -409,16 +520,88 @@ for those one-off tasks, with a language that's a joy to use.
requiredGems = [ ];
sha256 = ''059wkzlap2jlkhg460pkwc1ay4v4clsmg1bp4vfzjzkgwdckr52s'';
};
- cucumber_1_3_16 = {
+ coffee_script_2_3_0 = {
+ basename = ''coffee_script'';
+ meta = {
+ description = ''Ruby CoffeeScript Compiler'';
+ homepage = ''http://github.com/josh/ruby-coffee-script'';
+ longDescription = '' Ruby CoffeeScript is a bridge to the JS CoffeeScript compiler.
+'';
+ };
+ name = ''coffee-script-2.3.0'';
+ requiredGems = [ g.coffee_script_source_1_8_0 g.execjs_2_2_1 ];
+ sha256 = ''0i0p52f2s7hk8sq3q9342and3whjnhjhc7ldg8zmnjjcm44asm3d'';
+ };
+ coffee_script_source_1_8_0 = {
+ basename = ''coffee_script_source'';
+ meta = {
+ description = ''The CoffeeScript Compiler'';
+ homepage = ''http://jashkenas.github.com/coffee-script/'';
+ longDescription = '' CoffeeScript is a little language that compiles into JavaScript.
+ Underneath all of those embarrassing braces and semicolons,
+ JavaScript has always had a gorgeous object model at its heart.
+ CoffeeScript is an attempt to expose the good parts of JavaScript
+ in a simple way.
+'';
+ };
+ name = ''coffee-script-source-1.8.0'';
+ requiredGems = [ ];
+ sha256 = ''04998xd43z9kqs6kmzvng90s2xn3ybp8918rq7xz6ljhv8yjqm88'';
+ };
+ colorator_0_1 = {
+ basename = ''colorator'';
+ meta = {
+ description = ''String core extensions for terminal coloring.'';
+ homepage = ''https://github.com/octopress/colorator'';
+ longDescription = ''Colorize your text in the terminal.'';
+ };
+ name = ''colorator-0.1'';
+ requiredGems = [ ];
+ sha256 = ''09zp15hyd9wlbgf1kmrf4rnry8cpvh1h9fj7afarlqcy4hrfdpvs'';
+ };
+ compass_1_0_1 = {
+ basename = ''compass'';
+ meta = {
+ description = ''A Real Stylesheet Framework'';
+ homepage = ''http://compass-style.org'';
+ longDescription = ''Compass is a Sass-based Stylesheet Framework that streamlines the creation and maintenance of CSS.'';
+ };
+ name = ''compass-1.0.1'';
+ requiredGems = [ g.sass_3_4_5 g.compass_core_1_0_1 g.compass_import_once_1_0_5 g.chunky_png_1_3_1 g.rb_fsevent_0_9_4 g.rb_inotify_0_9_5 ];
+ sha256 = ''0cxb6nbj37wz2zwwb4pkbvg9pg0ymamxx9v400h9ibvlb5n0ri40'';
+ };
+ compass_core_1_0_1 = {
+ basename = ''compass_core'';
+ meta = {
+ description = ''The Compass core stylesheet library'';
+ homepage = ''http://compass-style.org/reference/compass/'';
+ longDescription = ''The Compass core stylesheet library and minimum required ruby extensions. This library can be used stand-alone without the compass ruby configuration file or compass command line tools.'';
+ };
+ name = ''compass-core-1.0.1'';
+ requiredGems = [ g.sass_3_4_5 g.multi_json_1_10_1 ];
+ sha256 = ''0zhbmgjq6s9j2qdx3cz0v8s216mh8g0ymk4fzmq3c4an9rryl1zx'';
+ };
+ compass_import_once_1_0_5 = {
+ basename = ''compass_import_once'';
+ meta = {
+ description = ''Speed up your Sass compilation by making @import only import each file once.'';
+ homepage = ''https://github.com/chriseppstein/compass/tree/master/import-once'';
+ longDescription = ''Changes the behavior of Sass's @import directive to only import a file once.'';
+ };
+ name = ''compass-import-once-1.0.5'';
+ requiredGems = [ g.sass_3_4_5 ];
+ sha256 = ''0bn7gwbfz7jvvdd0qdfqlx67fcb83gyvxqc7dr9fhcnks3z8z5rq'';
+ };
+ cucumber_1_3_17 = {
basename = ''cucumber'';
meta = {
- description = ''cucumber-1.3.16'';
+ description = ''cucumber-1.3.17'';
homepage = ''http://cukes.info'';
longDescription = ''Behaviour Driven Development with elegance and joy'';
};
- name = ''cucumber-1.3.16'';
+ name = ''cucumber-1.3.17'';
requiredGems = [ g.builder_3_2_2 g.diff_lcs_1_2_5 g.gherkin_2_12_2 g.multi_json_1_10_1 g.multi_test_0_1_1 ];
- sha256 = ''11cjw2d03r41b5pn5in6q822s3v6bpd8isxc9dl7by01jrzi0662'';
+ sha256 = ''1gjnxxrcf43mzs5qlg1m0b61g8vwfzjkj1wwi6xbpsqlhcwjjq1x'';
};
daemons_1_1_9 = {
basename = ''daemons'';
@@ -486,7 +669,7 @@ We are happy to report that this issue has been resolved.'';
requiredGems = [ ];
sha256 = ''1pqb7yzjcpbgbyi196ifqbd1wy570cn12bkzcvpcha4xilhajja0'';
};
- domain_name_0_5_20 = {
+ domain_name_0_5_21 = {
basename = ''domain_name'';
meta = {
description = ''Domain Name manipulation library for Ruby'';
@@ -497,9 +680,9 @@ It can also be used for cookie domain validation based on the Public
Suffix List.
'';
};
- name = ''domain_name-0.5.20'';
+ name = ''domain_name-0.5.21'';
requiredGems = [ g.unf_0_1_4 ];
- sha256 = ''17ls88kp18dxjc93q8kmyx2anknva0vbmny60xbgpbwq3hg0qv6s'';
+ sha256 = ''1ryb2gmryzcrqm9gl19658m1kcjkjz5m0r24mzq4j0zfrs95nfnq'';
};
dotenv_0_11_1 = {
basename = ''dotenv'';
@@ -597,6 +780,28 @@ using TCP/IP, especially if custom protocols are required.'';
requiredGems = [ g.eventmachine_1_0_3 ];
sha256 = ''1pvlb34vdzd81kf9f3xyibb4f55xjqm7lqqy28dgyci5cyv50y61'';
};
+ excon_0_39_5 = {
+ basename = ''excon'';
+ meta = {
+ description = ''speed, persistence, http(s)'';
+ homepage = ''https://github.com/excon/excon'';
+ longDescription = ''EXtended http(s) CONnections'';
+ };
+ name = ''excon-0.39.5'';
+ requiredGems = [ ];
+ sha256 = ''04dgrjq6b955bv2bps0g59gvn089mz8339nhlqksjf9jimgjglcq'';
+ };
+ execjs_2_2_1 = {
+ basename = ''execjs'';
+ meta = {
+ description = ''Run JavaScript code from Ruby'';
+ homepage = ''https://github.com/sstephenson/execjs'';
+ longDescription = ''ExecJS lets you run JavaScript code from Ruby.'';
+ };
+ name = ''execjs-2.2.1'';
+ requiredGems = [ ];
+ sha256 = ''1s41g9qwq0h4452q4gp934lnkzfkxh4wrg8fd4bcynba86bf3j8b'';
+ };
fakes3_0_1_5_2 = {
basename = ''fakes3'';
meta = {
@@ -628,6 +833,17 @@ using TCP/IP, especially if custom protocols are required.'';
requiredGems = [ g.faraday_0_9_0 ];
sha256 = ''1kndkrww1biz9j64fnyaqgis1gdiawxfv0ncadsz06gd555fgs6q'';
};
+ fast_stemmer_1_0_2 = {
+ basename = ''fast_stemmer'';
+ meta = {
+ description = ''Fast Porter stemmer based on a C version of algorithm'';
+ homepage = ''http://github.com/romanbsd/fast-stemmer'';
+ longDescription = ''Fast Porter stemmer based on a C version of algorithm'';
+ };
+ name = ''fast-stemmer-1.0.2'';
+ requiredGems = [ ];
+ sha256 = ''0688clyk4xxh3kdb18vi089k90mca8ji5fwaknh3da5wrzcrzanh'';
+ };
ffi_1_9_3 = {
basename = ''ffi'';
meta = {
@@ -650,18 +866,18 @@ using TCP/IP, especially if custom protocols are required.'';
requiredGems = [ g.tins_0_13_2 ];
sha256 = ''0mzxxnwj7k5pwxs0rdbmb3b41zgvzw7x40sf3qlkch4zdfx91i1j'';
};
- foreman_0_74_0 = {
+ foreman_0_75_0 = {
basename = ''foreman'';
meta = {
description = ''Process manager for applications with multiple components'';
homepage = ''http://github.com/ddollar/foreman'';
longDescription = ''Process manager for applications with multiple components'';
};
- name = ''foreman-0.74.0'';
+ name = ''foreman-0.75.0'';
requiredGems = [ g.thor_0_19_1 g.dotenv_0_11_1 ];
- sha256 = ''0jqblq0myzmdp2cywzz7flvgqnhf267ykcdn250cccy68s9wm37m'';
+ sha256 = ''0iicqdjwwms86nchk80ia7x4wjcd3p5c8s53bc0z0h063i0ks9ha'';
};
- gettext_3_1_3 = {
+ gettext_3_1_4 = {
basename = ''gettext'';
meta = {
description = ''Gettext is a pure Ruby libary and tools to localize messages.'';
@@ -671,9 +887,9 @@ The catalog file(po-file) is same format with GNU gettext.
So you can use GNU gettext tools for maintaining.
'';
};
- name = ''gettext-3.1.3'';
+ name = ''gettext-3.1.4'';
requiredGems = [ g.locale_2_1_0 g.text_1_3_0 ];
- sha256 = ''066x2dbryab02kdbk6km79h4j9b0f0ynsnzcygjgvzn9001ybf9q'';
+ sha256 = ''0gfnbkj2knpq8jxplkdr18by64kcadqxjhrxr3ncldz2ghm5zhvb'';
};
gh_0_13_2 = {
basename = ''gh'';
@@ -683,7 +899,7 @@ So you can use GNU gettext tools for maintaining.
longDescription = ''multi-layer client for the github api v3'';
};
name = ''gh-0.13.2'';
- requiredGems = [ g.faraday_0_9_0 g.backports_3_6_0 g.multi_json_1_10_1 g.addressable_2_3_6 g.net_http_persistent_2_9_4 g.net_http_pipeline_1_0_1 ];
+ requiredGems = [ g.faraday_0_9_0 g.backports_3_6_1 g.multi_json_1_10_1 g.addressable_2_3_6 g.net_http_persistent_2_9_4 g.net_http_pipeline_1_0_1 ];
sha256 = ''17scqa35j6ghpykzk986gnd6dvbrh8nn60ib04hb2gbyh9dns1dj'';
};
gherkin_2_12_2 = {
@@ -697,6 +913,28 @@ So you can use GNU gettext tools for maintaining.
requiredGems = [ g.multi_json_1_10_1 ];
sha256 = ''1mxfgw15pii1jmq00xxbyp77v71mh3bp99ndgwzfwkxvbcisha25'';
};
+ heroku_3_10_3 = {
+ basename = ''heroku'';
+ meta = {
+ description = ''Client library and CLI to deploy apps on Heroku.'';
+ homepage = ''http://heroku.com/'';
+ longDescription = ''Client library and command-line tool to deploy and manage apps on Heroku.'';
+ };
+ name = ''heroku-3.10.3'';
+ requiredGems = [ g.heroku_api_0_3_19 g.launchy_2_4_2 g.netrc_0_7_7 g.rest_client_1_6_7 g.rubyzip_0_9_9 ];
+ sha256 = ''04j9rndygkf5gkv2w5a29wvn683viskhaqyj4fsvnj02qfhfrvnr'';
+ };
+ heroku_api_0_3_19 = {
+ basename = ''heroku_api'';
+ meta = {
+ description = ''Ruby Client for the Heroku API'';
+ homepage = ''http://github.com/heroku/heroku.rb'';
+ longDescription = ''Ruby Client for the Heroku API'';
+ };
+ name = ''heroku-api-0.3.19'';
+ requiredGems = [ g.excon_0_39_5 g.multi_json_1_10_1 ];
+ sha256 = ''08wddhsnvjyb2a1wl85gbb00rjb1xs26pjlkd068635hi6wmx2id'';
+ };
highline_1_6_21 = {
basename = ''highline'';
meta = {
@@ -723,6 +961,17 @@ minutes of work.
requiredGems = [ ];
sha256 = ''0i6c9hrszzg3gn2j41v3ijnwcm8cc2931fnjiv6mnpl4jcjjykhm'';
};
+ hitimes_1_2_2 = {
+ basename = ''hitimes'';
+ meta = {
+ description = ''Hitimes is a fast, high resolution timer library for recording performance metrics. It uses the appropriate low method calls for each system to get the highest granularity time increments possible.'';
+ homepage = ''http://github.com/copiousfreetime/hitimes'';
+ longDescription = ''Hitimes is a fast, high resolution timer library for recording performance metrics. It uses the appropriate low method calls for each system to get the highest granularity time increments possible. It currently supports any of the following systems: * any system with the POSIX call `clock_gettime()` * Mac OS X * Windows * JRuby Using Hitimes can be faster than using a series of `Time.new` calls, and it will have a much higher granularity. It is definitely faster than using `Process.times`.'';
+ };
+ name = ''hitimes-1.2.2'';
+ requiredGems = [ ];
+ sha256 = ''17y3ggqxl3m6x9gqpgdn39z0pxpmw666d40r39bs7ngdmy680jn4'';
+ };
hoe_3_7_1 = {
basename = ''hoe'';
meta = {
@@ -751,7 +1000,7 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
longDescription = ''HTTP::Cookie is a Ruby library to handle HTTP Cookies based on RFC 6265. It has with security, standards compliance and compatibility in mind, to behave just the same as today's major web browsers. It has builtin support for the legacy cookies.txt and the latest cookies.sqlite formats of Mozilla Firefox, and its modular API makes it easy to add support for a new backend store.'';
};
name = ''http-cookie-1.0.2'';
- requiredGems = [ g.domain_name_0_5_20 ];
+ requiredGems = [ g.domain_name_0_5_21 ];
sha256 = ''0cz2fdkngs3jc5w32a6xcl511hy03a7zdiy988jk1sf3bf5v3hdw'';
};
i18n_0_6_11 = {
@@ -776,6 +1025,67 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
requiredGems = [ ];
sha256 = ''16sgj6gqs4bgwv6q4vv811fb43908psr33dz7sphn1z8la3y7m2v'';
};
+ jekyll_2_4_0 = {
+ basename = ''jekyll'';
+ meta = {
+ description = ''A simple, blog aware, static site generator.'';
+ homepage = ''https://github.com/jekyll/jekyll'';
+ longDescription = ''Jekyll is a simple, blog aware, static site generator.'';
+ };
+ name = ''jekyll-2.4.0'';
+ requiredGems = [ g.liquid_2_6_1 g.kramdown_1_4_2 g.mercenary_0_3_4 g.safe_yaml_1_0_3 g.colorator_0_1 g.pygments_rb_0_6_0 g.redcarpet_3_1_2 g.toml_0_1_1 g.jekyll_paginate_1_0_0 g.jekyll_gist_1_1_0 g.jekyll_coffeescript_1_0_1 g.jekyll_sass_converter_1_2_1 g.jekyll_watch_1_1_1 g.classifier_reborn_2_0_1 ];
+ sha256 = ''1n8m0cw91yayvcspqi3x9y9y0nahagg0sy8r6pn0zplqg1vh7y1l'';
+ };
+ jekyll_coffeescript_1_0_1 = {
+ basename = ''jekyll_coffeescript'';
+ meta = {
+ description = ''A CoffeeScript converter for Jekyll.'';
+ homepage = ''https://github.com/jekyll/jekyll-coffeescript'';
+ };
+ name = ''jekyll-coffeescript-1.0.1'';
+ requiredGems = [ g.coffee_script_2_3_0 ];
+ sha256 = ''19nkqbaxqbzqbfbi7sgshshj2krp9ap88m9fc5pa6mglb2ypk3hg'';
+ };
+ jekyll_gist_1_1_0 = {
+ basename = ''jekyll_gist'';
+ meta = {
+ description = ''Liquid tag for displaying GitHub Gists in Jekyll sites.'';
+ homepage = ''https://github.com/jekyll/jekyll-gist'';
+ };
+ name = ''jekyll-gist-1.1.0'';
+ requiredGems = [ ];
+ sha256 = ''06d4jwf64fl7x3dqfimnfqzr4d3wbsdz2l4fif35j91mmh37nmq9'';
+ };
+ jekyll_paginate_1_0_0 = {
+ basename = ''jekyll_paginate'';
+ meta = {
+ description = ''Built-in Pagination Generator for Jekyll'';
+ homepage = ''https://github.com/jekyll/jekyll-paginate'';
+ };
+ name = ''jekyll-paginate-1.0.0'';
+ requiredGems = [ ];
+ sha256 = ''1p01c3mncqrzyiskggdxd4cka1fl4ydlphhzbcfx9pylhrishkjk'';
+ };
+ jekyll_sass_converter_1_2_1 = {
+ basename = ''jekyll_sass_converter'';
+ meta = {
+ description = ''A basic Sass converter for Jekyll.'';
+ homepage = ''https://github.com/jekyll/jekyll-sass-converter'';
+ };
+ name = ''jekyll-sass-converter-1.2.1'';
+ requiredGems = [ g.sass_3_4_5 ];
+ sha256 = ''1w221nzcpaqh2llflciwhbzw1sqxjavwwzbri9n4qkj057a73ar1'';
+ };
+ jekyll_watch_1_1_1 = {
+ basename = ''jekyll_watch'';
+ meta = {
+ description = ''Rebuild your Jekyll site when a file changes with the `--watch` switch.'';
+ homepage = ''https://github.com/jekyll/jekyll-watch'';
+ };
+ name = ''jekyll-watch-1.1.1'';
+ requiredGems = [ g.listen_2_7_9 ];
+ sha256 = ''0q0skw4fjfrjaskfdvkknfy81a1pbr0mlhc2lrbpb533l5xm3gwz'';
+ };
jsduck_5_3_4 = {
basename = ''jsduck'';
meta = {
@@ -809,6 +1119,19 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
requiredGems = [ ];
sha256 = ''0kkn5zhiffav2cffj43wwvzj07825r4j463ilfjgik034vnbjs83'';
};
+ kramdown_1_4_2 = {
+ basename = ''kramdown'';
+ meta = {
+ description = ''kramdown is a fast, pure-Ruby Markdown-superset converter.'';
+ homepage = ''http://kramdown.gettalong.org'';
+ longDescription = ''kramdown is yet-another-markdown-parser but fast, pure Ruby,
+using a strict syntax definition and supporting several common extensions.
+'';
+ };
+ name = ''kramdown-1.4.2'';
+ requiredGems = [ ];
+ sha256 = ''1a1y2a7aysx45qhc6dpbfnlcs1syp04ix12q62f6z84zqrb996xf'';
+ };
launchy_2_4_2 = {
basename = ''launchy'';
meta = {
@@ -820,6 +1143,27 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
requiredGems = [ g.addressable_2_3_6 ];
sha256 = ''0i1nmlrqpnk2q6f7iq85cqaa7b8fw4bmqm57w60g92lsfmszs8iv'';
};
+ liquid_2_6_1 = {
+ basename = ''liquid'';
+ meta = {
+ description = ''A secure, non-evaling end user template engine with aesthetic markup.'';
+ homepage = ''http://www.liquidmarkup.org'';
+ };
+ name = ''liquid-2.6.1'';
+ requiredGems = [ ];
+ sha256 = ''0fc67cx36x05hsw0cc56la4qr3939g34cdgqmqgdi8yzs72cbv7x'';
+ };
+ listen_2_7_9 = {
+ basename = ''listen'';
+ meta = {
+ description = ''Listen to file modifications'';
+ homepage = ''https://github.com/guard/listen'';
+ longDescription = ''The Listen gem listens to file modifications and notifies you about the changes. Works everywhere!'';
+ };
+ name = ''listen-2.7.9'';
+ requiredGems = [ g.celluloid_0_16_0 g.rb_fsevent_0_9_4 g.rb_inotify_0_9_5 ];
+ sha256 = ''1i9m8fc1w8khwpjxfv9430bqbl4df128i4r8gskgvi3pd4678llf'';
+ };
locale_2_1_0 = {
basename = ''locale'';
meta = {
@@ -854,17 +1198,6 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
requiredGems = [ g.systemu_2_6_4 ];
sha256 = ''1clii8mvhmh5lmnm95ljnjygyiyhdpja85c5vy487rhxn52scn0b'';
};
- mail_2_5_4 = {
- basename = ''mail'';
- meta = {
- description = ''Mail provides a nice Ruby DSL for making, sending and reading emails.'';
- homepage = ''http://github.com/mikel/mail'';
- longDescription = ''A really Ruby Mail handler.'';
- };
- name = ''mail-2.5.4'';
- requiredGems = [ g.mime_types_1_25_1 g.treetop_1_4_15 ];
- sha256 = ''0z15ksb8blcppchv03g34844f7xgf36ckp484qjj2886ig1qara4'';
- };
mail_2_6_1 = {
basename = ''mail'';
meta = {
@@ -888,9 +1221,20 @@ submitted. Mechanize also keeps track of the sites that you have visited as
a history.'';
};
name = ''mechanize-2.7.3'';
- requiredGems = [ g.net_http_digest_auth_1_4 g.net_http_persistent_2_9_4 g.mime_types_2_3 g.http_cookie_1_0_2 g.nokogiri_1_6_3_1 g.ntlm_http_0_1_1 g.webrobots_0_1_1 g.domain_name_0_5_20 ];
+ requiredGems = [ g.net_http_digest_auth_1_4 g.net_http_persistent_2_9_4 g.mime_types_2_3 g.http_cookie_1_0_2 g.nokogiri_1_6_3_1 g.ntlm_http_0_1_1 g.webrobots_0_1_1 g.domain_name_0_5_21 ];
sha256 = ''00jkazj8fqnynaxca0lnwx5a084irxrnw8n8i0kppq4vg71g7rrx'';
};
+ mercenary_0_3_4 = {
+ basename = ''mercenary'';
+ meta = {
+ description = ''Lightweight and flexible library for writing command-line apps in Ruby.'';
+ homepage = ''https://github.com/jekyll/mercenary'';
+ longDescription = ''Lightweight and flexible library for writing command-line apps in Ruby.'';
+ };
+ name = ''mercenary-0.3.4'';
+ requiredGems = [ ];
+ sha256 = ''0fg8pbixs68aqx6slp7cpbl0cwa8c4x8rf1s66f7icqa6i9ifcfn'';
+ };
method_source_0_8_2 = {
basename = ''method_source'';
meta = {
@@ -902,64 +1246,6 @@ a history.'';
requiredGems = [ ];
sha256 = ''1g5i4w0dmlhzd18dijlqw5gk27bv6dj2kziqzrzb7mpgxgsd1sf2'';
};
- mime_types_1_25_1 = {
- basename = ''mime_types'';
- meta = {
- description = ''This library allows for the identification of a file's likely MIME content type'';
- homepage = ''http://mime-types.rubyforge.org/'';
- longDescription = ''This library allows for the identification of a file's likely MIME content
-type. This is release 1.25.1, fixing an issue with priority comparison for
-mime-types 1.x. The current release is 2.0, which only supports Ruby 1.9 or
-later.
-
-Release 1.25.1 contains all features of 1.25, including the experimental
-caching and lazy loading functionality. The caching and lazy loading features
-were initially implemented by Greg Brockman (gdb). As these features are
-experimental, they are disabled by default and must be enabled through the use
-of environment variables. The cache is invalidated on a per-version basis; the
-cache for version 1.25 will not be reused for any later version.
-
-To use lazy loading, set the environment variable +RUBY_MIME_TYPES_LAZY_LOAD+
-to any value other than 'false'. When using lazy loading, the initial startup
-of MIME::Types is around 12–25× faster than normal startup (on my system,
-normal startup is about 90 ms; lazy startup is about 4 ms). This isn't
-generally useful, however, as the MIME::Types database has not been loaded.
-Lazy startup and load is just *slightly* faster—around 1 ms. The real advantage
-comes from using the cache.
-
-To enable the cache, set the environment variable +RUBY_MIME_TYPES_CACHE+ to a
-filename where MIME::Types will have read-write access. The first time a new
-version of MIME::Types is run using this file, it will be created, taking a
-little longer than normal. Subsequent loads using the same cache file will be
-approximately 3½× faster (25 ms) than normal loads. This can be combined with
-+RUBY_MIME_TYPES_LAZY_LOAD+, but this is *not* recommended in a multithreaded
-or multiprocess environment where all threads or processes will be using the
-same cache file.
-
-As the caching interface is still experimental, the only values cached are the
-default MIME::Types database, not any custom MIME::Types added by users.
-
-MIME types are used in MIME-compliant communications, as in e-mail or HTTP
-traffic, to indicate the type of content which is transmitted. MIME::Types
-provides the ability for detailed information about MIME entities (provided as
-a set of MIME::Type objects) to be determined and used programmatically. There
-are many types defined by RFCs and vendors, so the list is long but not
-complete; don't hesitate to ask to add additional information. This library
-follows the IANA collection of MIME types (see below for reference).
-
-MIME::Types for Ruby was originally based on MIME::Types for Perl by Mark
-Overmeer, copyright 2001 - 2009.
-
-MIME::Types is built to conform to the MIME types of RFCs 2045 and 2231. It
-tracks the {IANA registry}[http://www.iana.org/assignments/media-types/]
-({ftp}[ftp://ftp.iana.org/assignments/media-types]) with some unofficial types
-added from the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp]
-and added by the users of MIME::Types.'';
- };
- name = ''mime-types-1.25.1'';
- requiredGems = [ ];
- sha256 = ''0mhzsanmnzdshaba7gmsjwnv168r1yj8y0flzw88frw1cickrvw8'';
- };
mime_types_2_3 = {
basename = ''mime_types'';
meta = {
@@ -1023,7 +1309,7 @@ with some types added by the users of mime-types.'';
requiredGems = [ ];
sha256 = ''1vpdjfmdq1yc4i620frfp9af02ia435dnpj8ybsd7dc3rypkvbka'';
};
- minitest_5_4_0 = {
+ minitest_5_4_1 = {
basename = ''minitest'';
meta = {
description = ''minitest provides a complete suite of testing facilities supporting TDD, BDD, mocking, and benchmarking'';
@@ -1082,9 +1368,9 @@ classes, modules, inheritance, methods. This means you only have to
learn ruby to use minitest and all of your regular OO practices like
extract-method refactorings still apply.'';
};
- name = ''minitest-5.4.0'';
+ name = ''minitest-5.4.1'';
requiredGems = [ ];
- sha256 = ''002xflqz5wl8gcj9gw4q66mq5jkp445zgd9c5vs6cw6lsfsyg4rl'';
+ sha256 = ''04iqz25v8vngw4z5pzhwnsf72fb8gf2vzhidrfcbphwsqqik5s4r'';
};
multi_json_1_10_1 = {
basename = ''multi_json'';
@@ -1213,6 +1499,17 @@ The server will respond in-order.'';
requiredGems = [ ];
sha256 = ''1vscp4r58jisiigqc6d6752w19m1m6hmi3jkzmp3ydxai7h3jb2j'';
};
+ netrc_0_7_7 = {
+ basename = ''netrc'';
+ meta = {
+ description = ''Library to read and write netrc files.'';
+ homepage = ''https://github.com/geemus/netrc'';
+ longDescription = ''This library can read and update netrc files, preserving formatting including comments and whitespace.'';
+ };
+ name = ''netrc-0.7.7'';
+ requiredGems = [ ];
+ sha256 = ''1y64v93hsxdwgx3dfkyzdki3zqd1slm42dmi23v0zy3kap4vpard'';
+ };
nix_0_1_1 = {
basename = ''nix'';
meta = {
@@ -1292,19 +1589,26 @@ enough of it.'';
requiredGems = [ ];
sha256 = ''1kzz6ydg7r23ks2b7zbpx4vz3h186n19vhgnjcwi7xwd6h2f1fsq'';
};
- polyglot_0_3_5 = {
- basename = ''polyglot'';
+ parslet_1_5_0 = {
+ basename = ''parslet'';
meta = {
- description = ''Augment 'require' to load non-Ruby file types'';
- homepage = ''http://github.com/cjheath/polyglot'';
- longDescription = ''
-The Polyglot library allows a Ruby module to register a loader
-for the file type associated with a filename extension, and it
-augments 'require' to find and load matching files.'';
+ description = ''Parser construction library with great error reporting in Ruby.'';
+ homepage = ''http://kschiess.github.com/parslet'';
};
- name = ''polyglot-0.3.5'';
+ name = ''parslet-1.5.0'';
+ requiredGems = [ g.blankslate_2_1_2_4 ];
+ sha256 = ''0qp1m8n3m6k6g22nn1ivcfkvccq5jmbkw53vvcjw5xssq179l9z3'';
+ };
+ posix_spawn_0_3_9 = {
+ basename = ''posix_spawn'';
+ meta = {
+ description = ''posix_spawnp(2) for ruby'';
+ homepage = ''http://github.com/rtomayko/posix-spawn'';
+ longDescription = ''posix-spawn uses posix_spawnp(2) for faster process spawning'';
+ };
+ name = ''posix-spawn-0.3.9'';
requiredGems = [ ];
- sha256 = ''1bqnxwyip623d8pr29rg6m8r0hdg08fpr2yb74f46rn1wgsnxmjr'';
+ sha256 = ''042i1afggy1sv2jmdjjjhyffas28xp2r1ylj5xfv3hchy3b4civ3'';
};
pry_0_9_12_6 = {
basename = ''pry'';
@@ -1325,9 +1629,20 @@ augments 'require' to find and load matching files.'';
longDescription = ''Client for consuming WebSockets from http://pusher.com'';
};
name = ''pusher-client-0.6.0'';
- requiredGems = [ g.websocket_1_2_0 g.json_1_8_1 ];
+ requiredGems = [ g.websocket_1_2_1 g.json_1_8_1 ];
sha256 = ''0n7l630qg6wgzak45b6gfjg9a0fmpbrs7mwchqqbja9mjs95r8qy'';
};
+ pygments_rb_0_6_0 = {
+ basename = ''pygments_rb'';
+ meta = {
+ description = ''pygments wrapper for ruby'';
+ homepage = ''https://github.com/tmm1/pygments.rb'';
+ longDescription = ''pygments.rb exposes the pygments syntax highlighter to Ruby'';
+ };
+ name = ''pygments.rb-0.6.0'';
+ requiredGems = [ g.yajl_ruby_1_1_0 g.posix_spawn_0_3_9 ];
+ sha256 = ''0jszj99cirbkxaqllbgnp9718v32xhvg08rfldvr10gy8i7bhy2s'';
+ };
rack_1_5_2 = {
basename = ''rack'';
meta = {
@@ -1371,27 +1686,27 @@ request helpers feature.'';
requiredGems = [ g.rack_1_5_2 ];
sha256 = ''01mk715ab5qnqf6va8k3hjsvsmplrfqpz6g58qw4m3l8mim0p4ky'';
};
- rails_4_1_5 = {
+ rails_4_1_6 = {
basename = ''rails'';
meta = {
description = ''Full-stack web application framework.'';
homepage = ''http://www.rubyonrails.org'';
longDescription = ''Ruby on Rails is a full-stack web framework optimized for programmer happiness and sustainable productivity. It encourages beautiful code by favoring convention over configuration.'';
};
- name = ''rails-4.1.5'';
- requiredGems = [ g.activesupport_4_1_5 g.actionpack_4_1_5 g.actionview_4_1_5 g.activemodel_4_1_5 g.activerecord_4_1_5 g.actionmailer_4_1_5 g.railties_4_1_5 g.bundler_1_7_1 g.sprockets_rails_2_1_3 ];
- sha256 = ''12s3jkvd6bn40apxc3973czgs7s6y36aclbwif6j770v7sjd9qj7'';
+ name = ''rails-4.1.6'';
+ requiredGems = [ g.activesupport_4_1_6 g.actionpack_4_1_6 g.actionview_4_1_6 g.activemodel_4_1_6 g.activerecord_4_1_6 g.actionmailer_4_1_6 g.railties_4_1_6 g.bundler_1_7_3 g.sprockets_rails_2_1_4 ];
+ sha256 = ''187g903gmni3prd5i768yfgszc4ak5kmrazavr93d0ybfdbcjlgk'';
};
- railties_4_1_5 = {
+ railties_4_1_6 = {
basename = ''railties'';
meta = {
description = ''Tools for creating, working with, and running Rails applications.'';
homepage = ''http://www.rubyonrails.org'';
longDescription = ''Rails internals: application bootup, plugins, generators, and rake tasks.'';
};
- name = ''railties-4.1.5'';
- requiredGems = [ g.activesupport_4_1_5 g.actionpack_4_1_5 g.rake_10_3_2 g.thor_0_19_1 ];
- sha256 = ''18jkjvny51vk53l2g9ibcnjk3gjj1vgh3pyrskmk69csqm2hmaha'';
+ name = ''railties-4.1.6'';
+ requiredGems = [ g.activesupport_4_1_6 g.actionpack_4_1_6 g.rake_10_3_2 g.thor_0_19_1 ];
+ sha256 = ''11valflllkrrz06bsflz78h5nmxhrhm7hdpm1lwmgm8hwd4ybl0c'';
};
rake_0_9_2_2 = {
basename = ''rake'';
@@ -1447,6 +1762,17 @@ Rake has the following features:
requiredGems = [ ];
sha256 = ''12if5xsik64kihxf5awsyavlp595y47g9qz77vfp2zvkxgglaka7'';
};
+ rb_inotify_0_9_5 = {
+ basename = ''rb_inotify'';
+ meta = {
+ description = ''A Ruby wrapper for Linux's inotify, using FFI'';
+ homepage = ''http://github.com/nex3/rb-inotify'';
+ longDescription = ''A Ruby wrapper for Linux's inotify, using FFI'';
+ };
+ name = ''rb-inotify-0.9.5'';
+ requiredGems = [ g.ffi_1_9_3 ];
+ sha256 = ''0kddx2ia0qylw3r52nhg83irkaclvrncgy2m1ywpbhlhsz1rymb9'';
+ };
rdiscount_2_1_7_1 = {
basename = ''rdiscount'';
meta = {
@@ -1457,6 +1783,30 @@ Rake has the following features:
requiredGems = [ ];
sha256 = ''1g70vsgv7mdwcyk9rxja7wm4qqap67prqwkj335c460vlzs6pqii'';
};
+ rdoc_4_1_2 = {
+ basename = ''rdoc'';
+ meta = {
+ description = ''RDoc produces HTML and command-line documentation for Ruby projects'';
+ homepage = ''http://docs.seattlerb.org/rdoc'';
+ longDescription = ''RDoc produces HTML and command-line documentation for Ruby projects. RDoc
+includes the +rdoc+ and +ri+ tools for generating and displaying documentation
+from the command-line.'';
+ };
+ name = ''rdoc-4.1.2'';
+ requiredGems = [ g.json_1_8_1 ];
+ sha256 = ''0cqhjidw657d8irkypxsrv6dr4y9r8csg9inaq40c3iz110cc8w6'';
+ };
+ redcarpet_3_1_2 = {
+ basename = ''redcarpet'';
+ meta = {
+ description = ''Markdown that smells nice'';
+ homepage = ''http://github.com/vmg/redcarpet'';
+ longDescription = ''A fast, safe and extensible Markdown to (X)HTML parser'';
+ };
+ name = ''redcarpet-3.1.2'';
+ requiredGems = [ ];
+ sha256 = ''076p52lkns90hqs27rs4kns2bg7maz8qxr87bl34yd6in319flzz'';
+ };
remote_syslog_1_6_14 = {
basename = ''remote_syslog'';
meta = {
@@ -1468,6 +1818,17 @@ Rake has the following features:
requiredGems = [ g.servolux_0_10_0 g.file_tail_1_0_12 g.eventmachine_1_0_3 g.eventmachine_tail_0_6_4 g.syslog_protocol_0_9_2 g.em_resolv_replace_1_1_3 ];
sha256 = ''1f2yjyqhbdc4vlx52zli1b33f6yn8qc1kd4n0dpv27zswj9qfdkr'';
};
+ rest_client_1_6_7 = {
+ basename = ''rest_client'';
+ meta = {
+ description = ''Simple HTTP and REST client for Ruby, inspired by microframework syntax for specifying actions.'';
+ homepage = ''http://github.com/archiloque/rest-client'';
+ longDescription = ''A simple HTTP and REST client for Ruby, inspired by the Sinatra microframework style of specifying actions: get, put, post, delete.'';
+ };
+ name = ''rest-client-1.6.7'';
+ requiredGems = [ g.mime_types_2_3 ];
+ sha256 = ''0nn7zalgidz2yj0iqh3xvzh626krm2al79dfiij19jdhp0rk8853'';
+ };
riemann_dash_0_2_9 = {
basename = ''riemann_dash'';
meta = {
@@ -1476,7 +1837,7 @@ Rake has the following features:
longDescription = ''HTTP dashboard for the distributed event system Riemann.'';
};
name = ''riemann-dash-0.2.9'';
- requiredGems = [ g.erubis_2_7_0 g.sinatra_1_4_5 g.sass_3_4_1 g.webrick_1_3_1 g.multi_json_1_3_6 ];
+ requiredGems = [ g.erubis_2_7_0 g.sinatra_1_4_5 g.sass_3_4_5 g.webrick_1_3_1 g.multi_json_1_3_6 ];
sha256 = ''0ws5wmjbv8w9lcr3i2mdinj2qm91p6c85k6c067i67cf0p90jxq3'';
};
right_aws_3_1_0 = {
@@ -1546,18 +1907,6 @@ algorithm for low-level network errors.
requiredGems = [ ];
sha256 = ''0shd8v24aqxdvim1gdqzwxpanjhfgkhdaw0m0lzz7sybkb02j8qf'';
};
- rjb_1_4_8 = {
- basename = ''rjb'';
- meta = {
- description = ''Ruby Java bridge'';
- homepage = ''http://rjb.rubyforge.org/'';
- longDescription = ''RJB is a bridge program that connect between Ruby and Java with Java Native Interface.
-'';
- };
- name = ''rjb-1.4.8'';
- requiredGems = [ ];
- sha256 = ''06ps4ssaxb8jwja53h7v7kb31hsdr997b8na89d1yasm5zyraliw'';
- };
rjb_1_4_9 = {
basename = ''rjb'';
meta = {
@@ -1570,6 +1919,18 @@ algorithm for low-level network errors.
requiredGems = [ ];
sha256 = ''062f7bjwz6iz6da49nzzbbx4xn8ahqqha2smqvqhbf0i7kd5v0yz'';
};
+ rjb_1_5_0 = {
+ basename = ''rjb'';
+ meta = {
+ description = ''Ruby Java bridge'';
+ homepage = ''http://rjb.rubyforge.org/'';
+ longDescription = ''RJB is a bridge program that connect between Ruby and Java with Java Native Interface.
+'';
+ };
+ name = ''rjb-1.5.0'';
+ requiredGems = [ ];
+ sha256 = ''0hjc0l3241lqrfracgb7gmsyd54v0lzplqfv9kfzk8km61pkjlfb'';
+ };
rkelly_remix_0_0_6 = {
basename = ''rkelly_remix'';
meta = {
@@ -1690,7 +2051,18 @@ RKelly[https://github.com/tenderlove/rkelly] JavaScript parser.'';
requiredGems = [ ];
sha256 = ''17ha7kmgcnhnxyfp9wgyrd2synp17v9g8j1pknhfd2v9x5g475m9'';
};
- sass_3_4_1 = {
+ safe_yaml_1_0_3 = {
+ basename = ''safe_yaml'';
+ meta = {
+ description = ''SameYAML provides an alternative implementation of YAML.load suitable for accepting user input in Ruby applications.'';
+ homepage = ''https://github.com/dtao/safe_yaml'';
+ longDescription = ''Parse YAML safely'';
+ };
+ name = ''safe_yaml-1.0.3'';
+ requiredGems = [ ];
+ sha256 = ''063bykyk40s3rhy1dxfbvl69s179n1iny418z4wqjbvhrmjn18wl'';
+ };
+ sass_3_4_5 = {
basename = ''sass'';
meta = {
description = ''A powerful but elegant CSS compiler that makes CSS fun again.'';
@@ -1701,20 +2073,20 @@ RKelly[https://github.com/tenderlove/rkelly] JavaScript parser.'';
command line tool or a web-framework plugin.
'';
};
- name = ''sass-3.4.1'';
+ name = ''sass-3.4.5'';
requiredGems = [ ];
- sha256 = ''0f997m7g6gcd4yaxxrf1nylk2x8ynf7w2l631sby51zfn21rfli4'';
+ sha256 = ''1rd07m2gprzgd6a4vnrlnyx5lkslfn30hcgfav86rb82a8zqmxah'';
};
- selenium_webdriver_2_42_0 = {
+ selenium_webdriver_2_43_0 = {
basename = ''selenium_webdriver'';
meta = {
description = ''The next generation developer focused tool for automated testing of webapps'';
homepage = ''http://selenium.googlecode.com'';
longDescription = ''WebDriver is a tool for writing automated tests of websites. It aims to mimic the behaviour of a real user, and as such interacts with the HTML of the application.'';
};
- name = ''selenium-webdriver-2.42.0'';
- requiredGems = [ g.multi_json_1_10_1 g.rubyzip_1_1_6 g.childprocess_0_5_3 g.websocket_1_0_7 ];
- sha256 = ''04yjwzc7cy2ax5xgp618z9jbm55cx4b5l546l7xnxj1hk30znw6q'';
+ name = ''selenium-webdriver-2.43.0'';
+ requiredGems = [ g.multi_json_1_10_1 g.rubyzip_1_1_6 g.childprocess_0_5_3 g.websocket_1_2_1 ];
+ sha256 = ''06jjkb4hcyh8mwsqc8c5p6pz6ac1v313h4md0dab872ls5s47zh9'';
};
servolux_0_10_0 = {
basename = ''servolux'';
@@ -1763,26 +2135,26 @@ interpreters.'';
requiredGems = [ ];
sha256 = ''00w8g3j7k7kl8ri2cf1m58ckxk8rn350gp4chfscmgv6pq1spk3n'';
};
- sprockets_2_12_1 = {
+ sprockets_2_12_2 = {
basename = ''sprockets'';
meta = {
description = ''Rack-based asset packaging system'';
homepage = ''http://getsprockets.org/'';
longDescription = ''Sprockets is a Rack-based asset packaging system that concatenates and serves JavaScript, CoffeeScript, CSS, LESS, Sass, and SCSS.'';
};
- name = ''sprockets-2.12.1'';
+ name = ''sprockets-2.12.2'';
requiredGems = [ g.hike_1_2_3 g.multi_json_1_10_1 g.rack_1_5_2 g.tilt_1_4_1 ];
- sha256 = ''0fi5f32i3bj739qb0zn050k5jjkfqzkn8fjz5dfjwhmh9hl5pb1y'';
+ sha256 = ''0sclb5nqs5hhr7qfp42rgpasy0f9k4c3jcr3hz89amf2bg5v7slx'';
};
- sprockets_rails_2_1_3 = {
+ sprockets_rails_2_1_4 = {
basename = ''sprockets_rails'';
meta = {
description = ''Sprockets Rails integration'';
homepage = ''https://github.com/rails/sprockets-rails'';
};
- name = ''sprockets-rails-2.1.3'';
- requiredGems = [ g.sprockets_2_12_1 g.actionpack_4_1_5 g.activesupport_4_1_5 ];
- sha256 = ''12kdy9vjn3ygrxhn9jxxx0rvsq601vayrkgbr3rqcpyhqhl4s4wy'';
+ name = ''sprockets-rails-2.1.4'';
+ requiredGems = [ g.sprockets_2_12_2 g.actionpack_4_1_6 g.activesupport_4_1_6 ];
+ sha256 = ''1difqidflj71qh8a84lcfdfg9vy4rw5hkgf2j0jis8bcczcq54l3'';
};
syslog_protocol_0_9_2 = {
basename = ''syslog_protocol'';
@@ -1834,7 +2206,7 @@ management.
longDescription = ''This library uses ANSI escape sequences to control the attributes of terminal output'';
};
name = ''term-ansicolor-1.3.0'';
- requiredGems = [ g.tins_1_3_2 ];
+ requiredGems = [ g.tins_1_3_3 ];
sha256 = ''1a2gw7gmpmx57sdpyhjwl0zn4bqp7jyjz7aslpvvphd075layp4b'';
};
terminal_notifier_1_6_1 = {
@@ -1902,6 +2274,17 @@ management.
requiredGems = [ ];
sha256 = ''00sr3yy7sbqaq7cb2d2kpycajxqf1b1wr1yy33z4bnzmqii0b0ir'';
};
+ timers_4_0_1 = {
+ basename = ''timers'';
+ meta = {
+ description = ''Schedule procs to run after a certain time, or at periodic intervals, using any API that accepts a timeout'';
+ homepage = ''https://github.com/celluloid/timers'';
+ longDescription = ''Pure Ruby one-shot and periodic timers'';
+ };
+ name = ''timers-4.0.1'';
+ requiredGems = [ g.hitimes_1_2_2 ];
+ sha256 = ''03ahv07wn1f2g3c5843q7sf03a81518lq5624s9f49kbrswa2p7l'';
+ };
tins_0_13_2 = {
basename = ''tins'';
meta = {
@@ -1913,37 +2296,38 @@ management.
requiredGems = [ ];
sha256 = ''1ygkm4ava7x6ap61qz6pn79193g6g29248fa04mwknsz6acfjs2y'';
};
- tins_1_3_2 = {
+ tins_1_3_3 = {
basename = ''tins'';
meta = {
description = ''Useful stuff.'';
homepage = ''http://flori.github.com/tins'';
longDescription = ''All the stuff that isn't good/big enough for a real library.'';
};
- name = ''tins-1.3.2'';
+ name = ''tins-1.3.3'';
requiredGems = [ ];
- sha256 = ''1i27zj1bhmgq19f3i5i08njprfnlv3yi5frm8ax6w0b342p6v8ly'';
+ sha256 = ''14jnsg15wakdk1ljh2iv9yvzk8nb7gpzd2zw4yvjikmffqjyqvna'';
};
- travis_1_7_1 = {
+ toml_0_1_1 = {
+ basename = ''toml'';
+ meta = {
+ description = ''Parse your TOML.'';
+ homepage = ''http://github.com/jm/toml'';
+ longDescription = ''Parse your TOML, seriously.'';
+ };
+ name = ''toml-0.1.1'';
+ requiredGems = [ g.parslet_1_5_0 ];
+ sha256 = ''1m5dv66qnbbg0r2zpp45hzq2nkmc4qaq0xmqw8j1kwkrpiwihwp8'';
+ };
+ travis_1_7_2 = {
basename = ''travis'';
meta = {
description = ''Travis CI client'';
homepage = ''https://github.com/travis-ci/travis.rb'';
longDescription = ''CLI and Ruby client library for Travis CI'';
};
- name = ''travis-1.7.1'';
- requiredGems = [ g.faraday_0_9_0 g.faraday_middleware_0_9_1 g.highline_1_6_21 g.backports_3_6_0 g.gh_0_13_2 g.launchy_2_4_2 g.pry_0_9_12_6 g.typhoeus_0_6_9 g.pusher_client_0_6_0 g.addressable_2_3_6 ];
- sha256 = ''1h0xajfzkz7pdrbhs2650nl5www8qfmgazmmmw0bcr3dai5kimdf'';
- };
- treetop_1_4_15 = {
- basename = ''treetop'';
- meta = {
- description = ''A Ruby-based text parsing and interpretation DSL'';
- homepage = ''https://github.com/cjheath/treetop'';
- };
- name = ''treetop-1.4.15'';
- requiredGems = [ g.polyglot_0_3_5 g.polyglot_0_3_5 ];
- sha256 = ''1zqj5y0mvfvyz11nhsb4d5ch0i0rfcyj64qx19mw4qhg3hh8z9pz'';
+ name = ''travis-1.7.2'';
+ requiredGems = [ g.faraday_0_9_0 g.faraday_middleware_0_9_1 g.highline_1_6_21 g.backports_3_6_1 g.gh_0_13_2 g.launchy_2_4_2 g.pry_0_9_12_6 g.typhoeus_0_6_9 g.pusher_client_0_6_0 g.addressable_2_3_6 ];
+ sha256 = ''0zl9b48dv0v0gmrj6xyprhysa4g0r3yz8a6f99h0qgwiw2l2xxcc'';
};
trollop_2_0 = {
basename = ''trollop'';
@@ -1982,6 +2366,17 @@ specify.'';
requiredGems = [ g.thread_safe_0_3_4 ];
sha256 = ''1c01p3kg6xvy1cgjnzdfq45fggbwish8krd0h864jvbpybyx7cgx'';
};
+ uglifier_2_5_3 = {
+ basename = ''uglifier'';
+ meta = {
+ description = ''Ruby wrapper for UglifyJS JavaScript compressor'';
+ homepage = ''http://github.com/lautis/uglifier'';
+ longDescription = ''Uglifier minifies JavaScript files by wrapping UglifyJS to be accessible in Ruby'';
+ };
+ name = ''uglifier-2.5.3'';
+ requiredGems = [ g.execjs_2_2_1 g.json_1_8_1 ];
+ sha256 = ''0rlx9nrcavpfffyacsrh7xyvz3adv7jvylz0sv0jnix1mj5rkpd9'';
+ };
unf_0_1_4 = {
basename = ''unf'';
meta = {
@@ -2041,27 +2436,16 @@ to Ruby/JRuby.
requiredGems = [ ];
sha256 = ''1jlnhhpa1mkrgsmihs2qx13z3n6xhswjnlk5a2ypyplw2id5x32n'';
};
- websocket_1_0_7 = {
+ websocket_1_2_1 = {
basename = ''websocket'';
meta = {
description = ''Universal Ruby library to handle WebSocket protocol'';
homepage = ''http://github.com/imanel/websocket-ruby'';
longDescription = ''Universal Ruby library to handle WebSocket protocol'';
};
- name = ''websocket-1.0.7'';
+ name = ''websocket-1.2.1'';
requiredGems = [ ];
- sha256 = ''1jrfz4295qbnjaxv37fw9jzxyxz61izp7c0683mnscacpx262zw0'';
- };
- websocket_1_2_0 = {
- basename = ''websocket'';
- meta = {
- description = ''Universal Ruby library to handle WebSocket protocol'';
- homepage = ''http://github.com/imanel/websocket-ruby'';
- longDescription = ''Universal Ruby library to handle WebSocket protocol'';
- };
- name = ''websocket-1.2.0'';
- requiredGems = [ ];
- sha256 = ''17q3fsqwa44cali3x852jzjpzgcvvly0n8gszmkaqx520lb9r5l4'';
+ sha256 = ''17mf28xp6h4gglbn1606jjrhdz9r6kyb2pr603ckadsrx31wh9p6'';
};
xapian_full_1_2_3 = {
basename = ''xapian_full'';
@@ -2093,5 +2477,25 @@ to Ruby/JRuby.
requiredGems = [ ];
sha256 = ''0ni8cbkj7l2k5pc4fs2jzp1ymxy4xqa2jc681l4y9iy9chrayddb'';
};
+ yajl_ruby_1_1_0 = {
+ basename = ''yajl_ruby'';
+ meta = {
+ description = ''Ruby C bindings to the excellent Yajl JSON stream-based parser library.'';
+ homepage = ''http://github.com/brianmario/yajl-ruby'';
+ };
+ name = ''yajl-ruby-1.1.0'';
+ requiredGems = [ ];
+ sha256 = ''0sj46j47icb12hdhcfh76rnvddyiic5ifqzkh3kla1vcr505kf4m'';
+ };
+ yajl_ruby_1_2_1 = {
+ basename = ''yajl_ruby'';
+ meta = {
+ description = ''Ruby C bindings to the excellent Yajl JSON stream-based parser library.'';
+ homepage = ''http://github.com/brianmario/yajl-ruby'';
+ };
+ name = ''yajl-ruby-1.2.1'';
+ requiredGems = [ ];
+ sha256 = ''0zvvb7i1bl98k3zkdrnx9vasq0rp2cyy5n7p9804dqs4fz9xh9vf'';
+ };
};
}
diff --git a/pkgs/development/interpreters/ruby/patches.nix b/pkgs/development/interpreters/ruby/patches.nix
index 9d694eac1e4..438aaf7ba54 100644
--- a/pkgs/development/interpreters/ruby/patches.nix
+++ b/pkgs/development/interpreters/ruby/patches.nix
@@ -132,4 +132,6 @@ in
zcat ${patch} | patch -p 1
''; # */
};
+
+ bundler = { dontPatchShebangs=1; };
}
diff --git a/pkgs/development/interpreters/ruby/ruby-1.8.7.nix b/pkgs/development/interpreters/ruby/ruby-1.8.7.nix
new file mode 100644
index 00000000000..9b43368c617
--- /dev/null
+++ b/pkgs/development/interpreters/ruby/ruby-1.8.7.nix
@@ -0,0 +1,94 @@
+{ stdenv, fetchurl, fetchFromGitHub
+, zlib, zlibSupport ? true
+, openssl, opensslSupport ? true
+, gdbm, gdbmSupport ? true
+, ncurses, readline, cursesSupport ? false
+, groff, docSupport ? false
+, ruby_1_8_7, autoreconfHook, bison, useRailsExpress ? true
+}:
+
+let
+ op = stdenv.lib.optional;
+ ops = stdenv.lib.optionals;
+ patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; };
+ baseruby = ruby_1_8_7.override { useRailsExpress = false; };
+in
+
+stdenv.mkDerivation rec {
+ version = with passthru; "${majorVersion}.${minorVersion}.${teenyVersion}-p${patchLevel}";
+
+ name = "ruby-${version}";
+
+ src = if useRailsExpress then fetchFromGitHub {
+ owner = "ruby";
+ repo = "ruby";
+ rev = "v1_8_7_${passthru.patchLevel}";
+ sha256 = "1xddhxr0j26hpxfixvhqdscwk2ri846w2129fcfwfjzvy19igswx";
+ } else fetchurl {
+ url = "http://cache.ruby-lang.org/pub/ruby/1.8/${name}.tar.bz2";
+ sha256 = "1qq7khilwkayrhwmzlxk83scrmiqfi7lgsn4c63znyvz2c1lgqxl";
+ };
+
+ # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
+ NROFF = "${groff}/bin/nroff";
+
+ buildInputs = ops useRailsExpress [ autoreconfHook bison ]
+ ++ (ops cursesSupport [ ncurses readline ] )
+ ++ (op docSupport groff )
+ ++ (op zlibSupport zlib)
+ ++ (op opensslSupport openssl)
+ ++ (op gdbmSupport gdbm);
+
+ patches = ops useRailsExpress [
+ "${patchSet}/patches/ruby/1.8.7/p374/railsexpress/01-ignore-generated-files.patch"
+ "${patchSet}/patches/ruby/1.8.7/p374/railsexpress/02-fix-tests-for-osx.patch"
+ "${patchSet}/patches/ruby/1.8.7/p374/railsexpress/03-sigvtalrm-fix.patch"
+ "${patchSet}/patches/ruby/1.8.7/p374/railsexpress/04-railsbench-gc-patch.patch"
+ "${patchSet}/patches/ruby/1.8.7/p374/railsexpress/05-display-full-stack-trace.patch"
+ "${patchSet}/patches/ruby/1.8.7/p374/railsexpress/06-better-source-file-tracing.patch"
+ "${patchSet}/patches/ruby/1.8.7/p374/railsexpress/07-heap-dump-support.patch"
+ "${patchSet}/patches/ruby/1.8.7/p374/railsexpress/08-fork-support-for-gc-logging.patch"
+ "${patchSet}/patches/ruby/1.8.7/p374/railsexpress/09-track-malloc-size.patch"
+ "${patchSet}/patches/ruby/1.8.7/p374/railsexpress/10-track-object-allocation.patch"
+ "${patchSet}/patches/ruby/1.8.7/p374/railsexpress/11-expose-heap-slots.patch"
+ "${patchSet}/patches/ruby/1.8.7/p374/railsexpress/12-fix-heap-size-growth-logic.patch"
+ "${patchSet}/patches/ruby/1.8.7/p374/railsexpress/13-heap-slot-size.patch"
+ "${patchSet}/patches/ruby/1.8.7/p374/railsexpress/14-add-trace-stats-enabled-methods.patch"
+ "${patchSet}/patches/ruby/1.8.7/p374/railsexpress/15-track-live-dataset-size.patch"
+ "${patchSet}/patches/ruby/1.8.7/p374/railsexpress/16-add-object-size-information-to-heap-dump.patch"
+ "${patchSet}/patches/ruby/1.8.7/p374/railsexpress/17-caller-for-all-threads.patch"
+ ];
+
+ configureFlags = [ "--enable-shared" "--enable-pthread" ]
+ ++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby";
+
+ installFlags = stdenv.lib.optionalString docSupport "install-doc";
+
+ postInstall = ''
+ # Bundler tries to create this directory
+ mkdir -pv $out/${passthru.gemPath}
+ mkdir -p $out/nix-support
+ cat > $out/nix-support/setup-hook < $out/nix-support/setup-hook < $out/nix-support/setup-hook < $out/nix-support/setup-hook <= 2.1.0 tries to download config.{guess,sub}
+ postPatch = ''
+ rm tool/config_files.rb
+ cp ${config}/config.guess tool/
+ cp ${config}/config.sub tool/
+ '';
+
+ configureFlags = ["--enable-shared" ]
+ ++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby"
+ # on darwin, we have /usr/include/tk.h -- so the configure script detects
+ # that tk is installed
+ ++ ( if stdenv.isDarwin then [ "--with-out-ext=tk " ] else [ ]);
+
+ installFlags = stdenv.lib.optionalString docSupport "install-doc";
+ # Bundler tries to create this directory
+ postInstall = ''
+ # Bundler tries to create this directory
+ mkdir -pv $out/${passthru.gemPath}
+ mkdir -p $out/nix-support
+ cat > $out/nix-support/setup-hook <= 2.1.0 tries to download config.{guess,sub}
+ postPatch = ''
+ rm tool/config_files.rb
+ cp ${config}/config.guess tool/
+ cp ${config}/config.sub tool/
+ '';
+
+ configureFlags = ["--enable-shared" ]
+ ++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby"
+ # on darwin, we have /usr/include/tk.h -- so the configure script detects
+ # that tk is installed
+ ++ ( if stdenv.isDarwin then [ "--with-out-ext=tk " ] else [ ]);
+
+ installFlags = stdenv.lib.optionalString docSupport "install-doc";
+ # Bundler tries to create this directory
+ postInstall = ''
+ # Bundler tries to create this directory
+ mkdir -pv $out/${passthru.gemPath}
+ mkdir -p $out/nix-support
+ cat > $out/nix-support/setup-hook <= 2.1.0 tries to download config.{guess,sub}
+ postPatch = ''
+ rm tool/config_files.rb
+ cp ${config}/config.guess tool/
+ cp ${config}/config.sub tool/
+ '';
+
+ configureFlags = ["--enable-shared" ]
+ ++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby"
+ # on darwin, we have /usr/include/tk.h -- so the configure script detects
+ # that tk is installed
+ ++ ( if stdenv.isDarwin then [ "--with-out-ext=tk " ] else [ ]);
+
+ installFlags = stdenv.lib.optionalString docSupport "install-doc";
+ # Bundler tries to create this directory
+ postInstall = ''
+ # Bundler tries to create this directory
+ mkdir -pv $out/${passthru.gemPath}
+ mkdir -p $out/nix-support
+ cat > $out/nix-support/setup-hook < 'worldBuilder.self' _RunScript
+ #
+ # This image can later be started with:
+ # $ Self -s myimage.snap
+ #
+ version = "4.5.0";
+ name = "self-${version}";
+
+ src = fetchgit {
+ url = "https://github.com/russellallen/self";
+ rev = "d16bcaad3c5092dae81ad0b16d503f2a53b8ef86";
+ sha256 = "966025b71542e44fc830b951f404f5721ad410ed24f7236fd0cd820ea0fc5731";
+ };
+
+ # gcc 4.6 and above causes crashes on Self startup but gcc 4.4 works.
+ buildInputs = [ gcc44 ncurses xlibs.libX11 xlibs.libXext makeWrapper cmake ];
+
+ selfWrapper = ./self;
+
+ installPhase = ''
+ mkdir -p "$out"/bin
+ cp ./vm/Self "$out"/bin/Self.wrapped
+ mkdir -p "$out"/share/self
+ cp -r ../objects "$out"/share/self/
+ makeWrapper $selfWrapper $out/bin/Self \
+ --set SELF_ROOT "$out"
+ '';
+
+ meta = {
+ description = "A prototype-based dynamic object-oriented programming language, environment, and virtual machine";
+ homepage = "http://selflanguage.org/";
+ license = stdenv.lib.licenses.bsd3;
+ maintainers = [ stdenv.lib.maintainers.doublec ];
+ platforms = with stdenv.lib.platforms; linux;
+ };
+}
diff --git a/pkgs/development/interpreters/self/self b/pkgs/development/interpreters/self/self
new file mode 100755
index 00000000000..d504682086b
--- /dev/null
+++ b/pkgs/development/interpreters/self/self
@@ -0,0 +1,18 @@
+#! /usr/bin/env bash
+
+export SELF_HOME="$HOME/.local/share/self"
+if [ -n "$XDG_DATA_HOME" ]
+ then export SELF_HOME="$XDG_DATA_HOME/self"
+fi
+
+if [ ! -d $SELF_HOME ]; then
+ mkdir -p $SELF_HOME
+fi
+
+if [ ! -d $SELF_HOME/objects ]; then
+ mkdir -p $SELF_HOME/objects
+ cp -r $SELF_ROOT/share/self/objects/* $SELF_HOME/objects
+ chmod -R +w $SELF_HOME/objects
+fi
+
+exec $SELF_ROOT/bin/Self.wrapped "$@"
diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix
index 12273f84566..512a17e6d3e 100644
--- a/pkgs/development/libraries/CGAL/default.nix
+++ b/pkgs/development/libraries/CGAL/default.nix
@@ -1,16 +1,16 @@
{ stdenv, fetchurl, cmake, boost, gmp, mpfr }:
stdenv.mkDerivation rec {
- version = "4.3";
+ version = "4.4";
name = "cgal-${version}";
src = fetchurl {
- url = "https://gforge.inria.fr/frs/download.php/32995/CGAL-${version}.tar.xz";
- sha256 = "015vw57dmy43bf63mg3916cgcsbv9dahwv24bnmiajyanj2mhiyc";
+ url = "https://gforge.inria.fr/frs/download.php/33526/CGAL-${version}.tar.xz";
+ sha256 = "1s0ylyrx74vgw6vsg6xxk4b07jrxh8pqcmxcbkx46v01nczv3ixj";
};
- buildInputs = [ cmake boost gmp mpfr ];
+ buildInputs = [ cmake boost boost.lib gmp mpfr ];
doCheck = false;
diff --git a/pkgs/development/libraries/LASzip/default.nix b/pkgs/development/libraries/LASzip/default.nix
new file mode 100644
index 00000000000..df9d126ad71
--- /dev/null
+++ b/pkgs/development/libraries/LASzip/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, cmake }:
+
+stdenv.mkDerivation rec {
+ version = "2.2.0";
+ name = "LASzip-${version}";
+
+ src = fetchurl {
+ url = "https://github.com/LASzip/LASzip/archive/v${version}.tar.gz";
+ sha256 = "b8e8cc295f764b9d402bc587f3aac67c83ed8b39f1cb686b07c168579c61fbb2";
+ };
+
+ buildInputs = [cmake];
+
+ meta = {
+ description = "Turn quickly bulky LAS files into compact LAZ files without information loss";
+ homepage = http://www.laszip.org;
+ license = stdenv.lib.licenses.lgpl2;
+ maintainers = [ stdenv.lib.maintainers.michelk ];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix
index 7b85d29c81b..7914dac4933 100644
--- a/pkgs/development/libraries/accountsservice/default.nix
+++ b/pkgs/development/libraries/accountsservice/default.nix
@@ -2,11 +2,12 @@
, libtool, gobjectIntrospection, polkit, systemd, coreutils }:
stdenv.mkDerivation rec {
- name = "accountsservice-0.6.37";
+ name = "accountsservice-${version}";
+ version = "0.6.38";
src = fetchurl {
- url = http://www.freedesktop.org/software/accountsservice/accountsservice-0.6.37.tar.xz;
- sha256 = "1hd58lrl698ij7w1xk3fpj8zp7h6m2hpzvfmbw9sfx4xvhv13cmh";
+ url = "http://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz";
+ sha256 = "1ad32qv57rx9yzrvzsw0d0lh0j7adlh664lachv621wb8ya22crn";
};
buildInputs = [ pkgconfig glib intltool libtool makeWrapper
@@ -24,7 +25,10 @@ stdenv.mkDerivation rec {
--run "${coreutils}/bin/mkdir -p /var/lib/AccountsService/icons"
'';
- meta = {
+ meta = with stdenv.lib; {
description = "D-Bus interface for user account query and manipulation";
+ homepage = http://www.freedesktop.org/wiki/Software/AccountsService;
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ pSub ];
};
}
diff --git a/pkgs/development/libraries/agda/AgdaSheaves/default.nix b/pkgs/development/libraries/agda/AgdaSheaves/default.nix
new file mode 100644
index 00000000000..83066f5da63
--- /dev/null
+++ b/pkgs/development/libraries/agda/AgdaSheaves/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, agda, fetchgit }:
+
+agda.mkDerivation (self: rec {
+ version = "8a06162a8f0f7df308458db91d720cf8f7345d69";
+ name = "Agda-Sheaves-${version}";
+ src = fetchgit {
+ url = "https://github.com/jonsterling/Agda-Sheaves.git";
+ rev = version;
+ sha256 = "39e0e4a1f05e359c099cf50a5ec7dd2db7b55f98dcc019f1e4667dca8b37f001";
+ };
+
+ everythingFile = "sheaves.agda";
+ topSourceDirectories = [ "../$sourceRoot" ];
+ sourceDirectories = [];
+
+ meta = {
+ homepage = "https://github.com/jonsterling/Agda-Sheaves";
+ description = "Sheaves in Agda";
+ license = stdenv.lib.licenses.cc-by-40;
+ platforms = stdenv.lib.platforms.unix;
+ maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ };
+})
\ No newline at end of file
diff --git a/pkgs/development/libraries/agda/TotalParserCombinators/contextfile b/pkgs/development/libraries/agda/TotalParserCombinators/contextfile
new file mode 100644
index 00000000000..1d211f397af
--- /dev/null
+++ b/pkgs/development/libraries/agda/TotalParserCombinators/contextfile
@@ -0,0 +1,213 @@
+
+Context:
+
+[Updated code to reflect changes to Agda.
+Nils Anders Danielsson **20140425121055
+ Ignore-this: 54d80fd647cb897eef85f57e9172f7db
+]
+
+[Workaround for (possible) Agda bug.
+Nils Anders Danielsson **20140228200347
+ Ignore-this: b17884ad17a3bdb7faff678622365a8
+]
+
+[Updated code to reflect changes to library API.
+Nils Anders Danielsson **20130307134644
+ Ignore-this: 50d070a22a6796b9acdf19d44ba5de16
+]
+
+[Updated code to reflect changes to Agda and the library API.
+Nils Anders Danielsson **20130228122951
+ Ignore-this: 761dc4d85683a59cc3667a8706c88093
+]
+
+[Turned _◇_ into a constructor.
+Nils Anders Danielsson **20120316125431
+ Ignore-this: 41b492c3106a575f28f146253f78a5ae
+]
+
+[Updated code to reflect changes to Agda.
+Nils Anders Danielsson **20120316125416
+ Ignore-this: e77d817d8b391c3b4806119d10848eb3
+]
+
+[Updated code to reflect changes to Agda.
+Nils Anders Danielsson **20120215103344
+ Ignore-this: 467716429d5553cd122722108ea82a08
+]
+
+[Modified a comment.
+Nils Anders Danielsson **20120215103319
+ Ignore-this: e57d4911f692f8a96a80017d910efc5f
+]
+
+[Updated code to reflect change to library API.
+Nils Anders Danielsson **20111006160229
+ Ignore-this: 5359da54e7e6e0f92983fa3ecaccebf3
+]
+
+[Updated code to reflect changes to Agda and the library API.
+Nils Anders Danielsson **20111003170117
+ Ignore-this: cbdd35172e372779e12642985cf17268
+]
+
+[Rolled back addition of inversion lemmas.
+Nils Anders Danielsson **20110930150912
+ Ignore-this: 9c9b083f0afcf95aaaa55a01d871274e
+]
+
+[Added inversion lemmas, implemented other lemmas using these lemmas.
+Nils Anders Danielsson **20110930150842
+ Ignore-this: 19b832c3f9e14d1e713b5911c094a130
+ + This change was a response to a change to Agda's pattern matching
+ machinery. Subsequently the machinery was made more liberal again,
+ making this change unnecessary.
+]
+
+[Updated code to reflect changes to library API.
+Nils Anders Danielsson **20110517220158
+ Ignore-this: ea9771a5014a25cb20afc2118638f8b5
+]
+
+[Updated code to reflect changes to Agda.
+Nils Anders Danielsson **20110512124425
+ Ignore-this: 97b154661679f574f6ab914583b14580
+]
+
+[Proved that many constructions preserve various preorders.
+Nils Anders Danielsson **20110313012617
+ Ignore-this: 8008efaff967c228448baa33b82edb81
+]
+
+[Updated code to reflect changes to library API.
+Nils Anders Danielsson **20110313002106
+ Ignore-this: 94799ba1ae411e59fd8c6c7eac3b8dfb
+]
+
+[Simplified TotalRecognisers.LeftRecursion.MatchingParentheses.
+Nils Anders Danielsson **20110118102159
+ Ignore-this: 1e01a8092b0c0124979ffc5fe17a245c
+]
+
+[Added TotalRecognisers.LeftRecursion.MatchingParentheses.
+Nils Anders Danielsson **20110118102146
+ Ignore-this: 13a3bc91425364e26c3047561655bb25
+]
+
+[Added a simplifying backend.
+Nils Anders Danielsson **20101229012716
+ Ignore-this: 9ac7ae21cd44c099633678a994fb9a3
+]
+
+[Fixed another "bug" in the deep simplifier.
+Nils Anders Danielsson **20101229010854
+ Ignore-this: e258adf963436ef715242db23c6808e
+ + Sometimes the first layer of bind's right-hand argument was not
+ simplified.
+]
+
+[Made simplify₁ public and changed its type.
+Nils Anders Danielsson **20101228235603
+ Ignore-this: d39b8453a15089126261e098080223c6
+]
+
+[Deep simplification no longer adds casts.
+Nils Anders Danielsson **20101228192850
+ Ignore-this: 2ba016825adfa3a1e36922869eabfd39
+]
+
+[The first constructor in a simplified parser can no longer be a cast.
+Nils Anders Danielsson **20101228175822
+ Ignore-this: ce3e38cc0b9a096aa436655c9013ae97
+]
+
+[Modified the outline.
+Nils Anders Danielsson **20101228173414
+ Ignore-this: f8866e69f6d1a344e79fb6f708dfa4c
+]
+
+[Added an example: a right recursive expression grammar.
+Nils Anders Danielsson **20101228173159
+ Ignore-this: 9a4d732b451cca08ba19aac5d115c678
+]
+
+[Rearranged the code.
+Nils Anders Danielsson **20101228172209
+ Ignore-this: 50fa29406d0f150669ff3feec4dbe513
+]
+
+[Renamed same-bag/set to (initial-bag-)cong.
+Nils Anders Danielsson **20101228170706
+ Ignore-this: dd3ce43d77dde74cc2428d2568dd2d30
+]
+
+[Added TotalParserCombinators.Force.
+Nils Anders Danielsson **20101228153638
+ Ignore-this: 3b6ff6ea20df0c1293494f06845d17eb
+]
+
+[Proved that uses of subst can be erased.
+Nils Anders Danielsson **20101228153621
+ Ignore-this: f503ba495b923ae521718b6957167128
+]
+
+[The deep simplifier no longer skips layers.
+Nils Anders Danielsson **20101228141138
+ Ignore-this: 733a4a4a9aa0f890ad1740ecfc6a599f
+]
+
+[Documented that the deep simplifier misses every second layer.
+Nils Anders Danielsson **20101228121910
+ Ignore-this: 8a0baf25b12f63f8748dbc1d16affacf
+]
+
+[The simplifier now applies the token-bind rule more often.
+Nils Anders Danielsson **20101227165413
+ Ignore-this: 40132fa6f19602886bbe29aadd8a683c
+]
+
+[Switched back to deep simplification, now with a proper proof.
+Nils Anders Danielsson **20101227125434
+ Ignore-this: ccc46e82f6f9c6c2a27ddb43d315f7dd
+]
+
+[Simplified the soundness proof.
+Nils Anders Danielsson **20101227123839
+ Ignore-this: fb6826dd9836e34fc3bfdce2928ba13d
+]
+
+[Made some _≈[_]P_ constructors conditionally coinductive.
+Nils Anders Danielsson **20101227123827
+ Ignore-this: f521f70475403697229051b62343a080
+ + The structure of the soundness proof was also changed.
+]
+
+[Unified And, AsymmetricChoice and Not.
+Nils Anders Danielsson **20101225103109
+ Ignore-this: 5ae8b80e1505fe6e707bb2307d22688c
+]
+
+[Modified some comments.
+Nils Anders Danielsson **20101225101051
+ Ignore-this: e812d8c3e9720895c368f7a286f8315c
+]
+
+[Modified a comment.
+Nils Anders Danielsson **20101223202647
+ Ignore-this: 16ea5dc01a4cbe0fe38714b2e4b7ff6
+]
+
+[Updated code to reflect changes to library API.
+Nils Anders Danielsson **20101107162658
+ Ignore-this: 9e38a10a9997c9825ece6ad9f871b673
+]
+
+[Added an alternative backend for TotalRecognisers.Simple.
+Nils Anders Danielsson **20101020183743
+ Ignore-this: a111a89e0c237e132b649561000f53d6
+]
+
+[TAG Code corresponding to the paper "Total Parser Combinators" (4).
+Nils Anders Danielsson **20100928013815
+ Ignore-this: 45ccc28373ed3974047315613eb14833
+]
diff --git a/pkgs/development/libraries/agda/TotalParserCombinators/default.nix b/pkgs/development/libraries/agda/TotalParserCombinators/default.nix
new file mode 100644
index 00000000000..6b0a63066b2
--- /dev/null
+++ b/pkgs/development/libraries/agda/TotalParserCombinators/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, agda, fetchdarcs, AgdaStdlib }:
+
+agda.mkDerivation (self: rec {
+ version = "2014-09-27";
+ name = "TotalParserCombinators-${version}";
+
+ src = fetchdarcs {
+ url = "http://www.cse.chalmers.se/~nad/repos/parser-combinators.code/";
+ context = ./contextfile;
+ sha256 = "1rb8prqqp4dnz9s83ays7xfvpqs0n20vl1bg2zlg5si171j9rd4i";
+ };
+
+ buildDepends = [ AgdaStdlib ];
+ everythingFile = "TotalParserCombinators.agda";
+ sourceDirectories = [];
+ topSourceDirectories = [ "../$sourceRoot" ];
+
+ meta = with stdenv.lib; {
+ homepage = "http://www.cse.chalmers.se/~nad/publications/danielsson-parser-combinators.html";
+ description = "A monadic parser combinator library which guarantees termination of parsing";
+ license = stdenv.lib.licenses.mit;
+ platforms = stdenv.lib.platforms.unix;
+ maintainers = with maintainers; [ fuuzetsu ];
+ };
+})
diff --git a/pkgs/development/libraries/agda/agda-base/default.nix b/pkgs/development/libraries/agda/agda-base/default.nix
new file mode 100644
index 00000000000..cf73d7dea06
--- /dev/null
+++ b/pkgs/development/libraries/agda/agda-base/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, agda, fetchurl }:
+
+agda.mkDerivation (self: rec {
+ version = "0.1";
+ name = "agda-base-${version}";
+
+ src = fetchurl {
+ url = "https://github.com/pcapriotti/agda-base/archive/v${version}.tar.gz";
+ sha256 = "124h06p7jdiqr2x6r46sfab9r0cgb0fznr2qs5i1psl5yf3z74h8";
+ };
+
+ sourceDirectories = [ "./." ];
+ everythingFile = "README.agda";
+
+ meta = {
+ homepage = "https://github.com/pcapriotti/agda-base";
+ description = "Base library for HoTT in Agda";
+ license = stdenv.lib.licenses.bsd3;
+ platforms = stdenv.lib.platforms.unix;
+ maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ };
+})
diff --git a/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix b/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix
new file mode 100644
index 00000000000..fa8ed9e80a7
--- /dev/null
+++ b/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, agda, fetchsvn }:
+
+agda.mkDerivation (self: rec {
+ version = "18437";
+ name = "agda-iowa-stdlib-${version}";
+
+ src = fetchsvn {
+ url = "https://svn.divms.uiowa.edu/repos/clc/projects/agda/lib";
+ rev = version;
+ sha256 = "1g6pwvrcir53ppf6wd8s62gizc3qy35mp229b66mh53abg4brik2";
+ };
+
+ sourceDirectories = [ "./." ];
+ buildPhase = ''
+ patchShebangs find-deps.sh
+ make
+ '';
+
+ meta = {
+ homepage = "https://svn.divms.uiowa.edu/repos/clc/projects/agda/lib/";
+ description = "Agda standard library developed at Iowa";
+ license = stdenv.lib.licenses.free;
+ platforms = stdenv.lib.platforms.unix;
+ maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ };
+})
diff --git a/pkgs/development/libraries/agda/agda-prelude/default.nix b/pkgs/development/libraries/agda/agda-prelude/default.nix
new file mode 100644
index 00000000000..9b67c5dbb5b
--- /dev/null
+++ b/pkgs/development/libraries/agda/agda-prelude/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, agda, fetchgit }:
+
+agda.mkDerivation (self: rec {
+ version = "d598f35d88596c5a63766a7188a0c0144e467c8c";
+ name = "agda-prelude-${version}";
+
+ src = fetchgit {
+ url = "https://github.com/UlfNorell/agda-prelude.git";
+ rev = version;
+ sha256 = "bdcffb675d0ad1bafa2b47f581b6a9b90347ae739b6218f89f365fda2cc4f8c8";
+ };
+
+ topSourceDirectories = [ "src" ];
+ everythingFile = "src/Prelude.agda";
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/UlfNorell/agda-prelude";
+ description = "Programming library for Agda";
+ license = stdenv.lib.licenses.mit;
+ platforms = stdenv.lib.platforms.unix;
+ maintainers = with maintainers; [ fuuzetsu ];
+ };
+})
diff --git a/pkgs/development/libraries/agda/bitvector/default.nix b/pkgs/development/libraries/agda/bitvector/default.nix
new file mode 100644
index 00000000000..290a2f1206d
--- /dev/null
+++ b/pkgs/development/libraries/agda/bitvector/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, agda, fetchgit, AgdaStdlib }:
+
+agda.mkDerivation (self: rec {
+ version = "f1c173313f2a41d95a8dc6053f9365a24690e18d";
+ name = "bitvector-${version}";
+
+ src = fetchgit {
+ url = "https://github.com/copumpkin/bitvector.git";
+ rev = version;
+ sha256 = "c39f55b709366f2c627d1a3a68d4b013c415b0e0f68ca6b69e387d07e2ce6d9a";
+ };
+
+ buildDepends = [ AgdaStdlib ];
+ sourceDirectories = [ "Data" ];
+
+ meta = {
+ homepage = "https://github.com/copumpkin/bitvector";
+ description = "Sequences of bits and common operations on them";
+ license = stdenv.lib.licenses.bsd3;
+ platforms = stdenv.lib.platforms.unix;
+ maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ };
+})
diff --git a/pkgs/development/libraries/agda/categories/default.nix b/pkgs/development/libraries/agda/categories/default.nix
new file mode 100644
index 00000000000..1a860496a4d
--- /dev/null
+++ b/pkgs/development/libraries/agda/categories/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, agda, fetchgit, AgdaStdlib }:
+
+agda.mkDerivation (self: rec {
+ version = "33409120d071656f5198c658145889ae2e86249c";
+ name = "categories-${version}";
+
+ src = fetchgit {
+ url = "https://github.com/copumpkin/categories.git";
+ rev = version;
+ sha256 = "cb7e8c911e10ab582c077208f5f6675711c0d65f0d9d679639d4b67a467cc4de";
+ };
+
+ buildDepends = [ AgdaStdlib ];
+ sourceDirectories = [ "Categories" "Graphs" ];
+
+ meta = {
+ homepage = "https://github.com/copumpkin/categories";
+ description = "Categories parametrized by morphism equality, in Agda";
+ license = stdenv.lib.licenses.bsd3;
+ platforms = stdenv.lib.platforms.unix;
+ maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ };
+})
diff --git a/pkgs/development/libraries/agda/pretty/contextfile b/pkgs/development/libraries/agda/pretty/contextfile
new file mode 100644
index 00000000000..4ad31c2e7fa
--- /dev/null
+++ b/pkgs/development/libraries/agda/pretty/contextfile
@@ -0,0 +1,7 @@
+
+Context:
+
+[TAG Correct-by-Construction Pretty-Printing (2013-06-14)
+Nils Anders Danielsson **20130614153155
+ Ignore-this: a64ae32de9e22d60d64ef3da19847e00
+]
diff --git a/pkgs/development/libraries/agda/pretty/default.nix b/pkgs/development/libraries/agda/pretty/default.nix
new file mode 100644
index 00000000000..1bcb9f8459b
--- /dev/null
+++ b/pkgs/development/libraries/agda/pretty/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, agda, fetchdarcs, AgdaStdlib }:
+
+agda.mkDerivation (self: rec {
+ version = "2014-09-27";
+ name = "pretty-${version}";
+
+ src = fetchdarcs {
+ url = "http://www.cse.chalmers.se/~nad/repos/pretty/";
+ context = ./contextfile;
+ sha256 = "067pv55r3wlchbgjpx3ha5hyzr29y6xsix0ywwgirm8njcc8nv16";
+ };
+
+ buildDepends = [ AgdaStdlib ];
+ everythingFile = "Pretty.agda";
+ sourceDirectories = [];
+ topSourceDirectories = [ "../$sourceRoot" ];
+
+ meta = with stdenv.lib; {
+ homepage = "http://www.cse.chalmers.se/~nad/publications/danielsson-correct-pretty.html";
+ description = "Correct-by-Construction Pretty-Printing";
+ license = stdenv.lib.licenses.mit;
+ platforms = stdenv.lib.platforms.unix;
+ maintainers = with maintainers; [ fuuzetsu ];
+ };
+})
diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix
index 229529f08ce..6932f389b84 100644
--- a/pkgs/development/libraries/apr-util/default.nix
+++ b/pkgs/development/libraries/apr-util/default.nix
@@ -13,11 +13,11 @@ let
in
stdenv.mkDerivation rec {
- name = "apr-util-1.5.3";
+ name = "apr-util-1.5.4";
src = fetchurl {
url = "mirror://apache/apr/${name}.tar.bz2";
- sha256 = "0s1rpqjy5xr03k9s4xrsm5wvhj5286vlkf6jvqayw99yy5sb3vbq";
+ sha256 = "0bn81pfscy9yjvbmyx442svf43s6dhrdfcsnkpxz43fai5qk5kx6";
};
configureFlags = ''
@@ -47,5 +47,6 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://apr.apache.org/;
description = "A companion library to APR, the Apache Portable Runtime";
+ maintainers = [ stdenv.lib.maintainers.eelco ];
};
}
diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/development/libraries/assimp/default.nix
new file mode 100644
index 00000000000..229db910ffd
--- /dev/null
+++ b/pkgs/development/libraries/assimp/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, unzip, cmake, boost }:
+
+let
+ major = "3";
+ minor = "1";
+ revision = "1";
+ version = "${major}.${minor}.${revision}";
+in
+stdenv.mkDerivation {
+ name = "assimp-${version}";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/project/assimp/assimp-${major}.${minor}/assimp-${version}_no_test_models.zip";
+ sha256 = "17nyzsqzqpafamhi779f1bkh5mfgj8rpas034x3v9a0hdy3jg66s";
+ };
+
+ buildInputs = [ unzip cmake boost ];
+
+ meta = with stdenv.lib; {
+ description = "Open Asset Import Library is a library to import various 3D model formats";
+ homepage = http://assimp.sourceforge.net/;
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ emery ];
+ platfroms = platforms.linux;
+ inherit version;
+ };
+}
\ No newline at end of file
diff --git a/pkgs/development/libraries/aterm/2.5.nix b/pkgs/development/libraries/aterm/2.5.nix
index df509943ba2..10a22e00f65 100644
--- a/pkgs/development/libraries/aterm/2.5.nix
+++ b/pkgs/development/libraries/aterm/2.5.nix
@@ -26,6 +26,6 @@ stdenv.mkDerivation {
license = "LGPL";
description = "Library for manipulation of term data structures in C";
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
- maintainers = stdenv.lib.maintainers.eelco;
+ maintainers = [ stdenv.lib.maintainers.eelco ];
};
}
diff --git a/pkgs/development/libraries/aterm/2.8.nix b/pkgs/development/libraries/aterm/2.8.nix
index a153443a54e..3aa0e95305a 100644
--- a/pkgs/development/libraries/aterm/2.8.nix
+++ b/pkgs/development/libraries/aterm/2.8.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
license = "LGPL";
description = "Library for manipulation of term data structures in C";
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
- maintainers = stdenv.lib.maintainers.eelco;
+ maintainers = [ stdenv.lib.maintainers.eelco ];
broken = true;
};
}
diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix
index d1510e34238..9f3307742ec 100644
--- a/pkgs/development/libraries/audio/lilv/default.nix
+++ b/pkgs/development/libraries/audio/lilv/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "lilv-${version}";
- version = "0.18.0";
+ version = "0.20.0";
src = fetchurl {
url = "http://download.drobilla.net/${name}.tar.bz2";
- sha256 = "1k9wfc08ylgbkwbnvh1fx1bdzl3y59xrrx8gv0vk68yzcvcmv6am";
+ sha256 = "0aj2plkx56iar8vzjbq2l7hi7sp0ml99m0h44rgwai2x4vqkk2j2";
};
buildInputs = [ lv2 pkgconfig python serd sord sratom ];
diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/development/libraries/audio/lv2/default.nix
index 25d19d089a5..f03f6b3d371 100644
--- a/pkgs/development/libraries/audio/lv2/default.nix
+++ b/pkgs/development/libraries/audio/lv2/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "lv2-${version}";
- version = "1.8.0";
+ version = "1.10.0";
src = fetchurl {
url = "http://lv2plug.in/spec/${name}.tar.bz2";
- sha256 = "1mxkp7gajh1alw6s358cqwf3qkpr1ld9wfxwswnqrxcd9a7hxjd4";
+ sha256 = "1md41x9snrp4mcfyli7lyfpvcfa78nfy6xkdy84kppnl8m5qw378";
};
buildInputs = [ gtk libsndfile pkgconfig python ];
diff --git a/pkgs/development/libraries/audio/raul/default.nix b/pkgs/development/libraries/audio/raul/default.nix
index aad3656cde8..269e7472280 100644
--- a/pkgs/development/libraries/audio/raul/default.nix
+++ b/pkgs/development/libraries/audio/raul/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "raul-svn-${rev}";
- rev = "5205";
+ rev = "5449";
src = fetchsvn {
url = "http://svn.drobilla.net/lad/trunk/raul";
rev = rev;
- sha256 = "1rkl7vxhwf6d0qfl2ymfd1qwmh9cl1xv6kkz893xg0blpvzcdmp3";
+ sha256 = "02ph1hikp1iynwbxbiaf28brkwig7n4lsb3djaivnf14arg5vmzx";
};
buildInputs = [ boost gtk pkgconfig python ];
diff --git a/pkgs/development/libraries/audio/sratom/default.nix b/pkgs/development/libraries/audio/sratom/default.nix
index ac0b9d233fa..a4ba4c16c87 100644
--- a/pkgs/development/libraries/audio/sratom/default.nix
+++ b/pkgs/development/libraries/audio/sratom/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "sratom-${version}";
- version = "0.4.4";
+ version = "0.4.6";
src = fetchurl {
url = "http://download.drobilla.net/${name}.tar.bz2";
- sha256 = "1q4044md8nmqah8ay5mf4lgdl6x0sfa4cjqyqk9da8nqzvs2j37s";
+ sha256 = "080jjiyxjnj7hf25844hd9rb01grvzz1rk8mxcdnakywmspbxfd4";
};
buildInputs = [ lv2 pkgconfig python serd sord ];
diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix
index 87e03472659..f5a98750ded 100644
--- a/pkgs/development/libraries/audio/suil/default.nix
+++ b/pkgs/development/libraries/audio/suil/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "suil-${version}";
- version = "0.8.0";
+ version = "0.8.2";
src = fetchurl {
url = "http://download.drobilla.net/${name}.tar.bz2";
- sha256 = "0y5sbgaivb03vmr3jcpzj16wqxa5h744ml4w3ylzglbxs2bqgl7n";
+ sha256 = "1s3adyiw7sa5gfvm5wasa61qa23629kprxyv6w8hbxdiwp0hhxkq";
};
buildInputs = [ gtk lv2 pkgconfig python qt4 serd sord sratom ];
diff --git a/pkgs/development/libraries/axis/builder.sh b/pkgs/development/libraries/axis/builder.sh
deleted file mode 100644
index d979eb9d803..00000000000
--- a/pkgs/development/libraries/axis/builder.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-source $stdenv/setup
-
-mkdir -p $out
-unpackPhase
-mv $directory/* $out
diff --git a/pkgs/development/libraries/axis/default.nix b/pkgs/development/libraries/axis/default.nix
deleted file mode 100644
index 62ae463b5fc..00000000000
--- a/pkgs/development/libraries/axis/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
- name = "axis-1.3";
- directory = "axis-1_3";
- builder = ./builder.sh;
- src = fetchurl {
- url = "http://archive.apache.org/dist/ws/axis/1_3/axis-bin-1_3.tar.gz";
- md5 = "dd8203f08c37872f4fd2bfb45c4bfe04";
- };
- inherit stdenv;
-
- meta = {
- description = "Implementation of the SOAP (Simple Object Access Protocol) submission to W3C";
- };
-}
diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix
index cc047da2758..68b1fb1c9ba 100644
--- a/pkgs/development/libraries/boehm-gc/default.nix
+++ b/pkgs/development/libraries/boehm-gc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl, enableLargeConfig ? false }:
stdenv.mkDerivation rec {
name = "boehm-gc-7.2f";
@@ -8,7 +8,9 @@ stdenv.mkDerivation rec {
sha256 = "119x7p1cqw40mpwj80xfq879l9m1dkc7vbc1f3bz3kvkf8bf6p16";
};
- configureFlags = "--enable-cplusplus";
+ configureFlags =
+ [ "--enable-cplusplus" ]
+ ++ lib.optional enableLargeConfig "--enable-large-config";
doCheck = true;
diff --git a/pkgs/development/libraries/boost/1.55.nix b/pkgs/development/libraries/boost/1.55.nix
index 1e9d2134d12..31469b3e06c 100644
--- a/pkgs/development/libraries/boost/1.55.nix
+++ b/pkgs/development/libraries/boost/1.55.nix
@@ -40,7 +40,7 @@ let
withToolset = stdenv.lib.optionalString (toolset != null) " --with-toolset=${toolset}";
in
-stdenv.mkDerivation {
+let res = stdenv.mkDerivation {
name = "boost-1.55.0";
meta = {
@@ -96,4 +96,4 @@ stdenv.mkDerivation {
./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.crossDrv}/include -sEXPAT_LIBPATH=${expat.crossDrv}/lib --layout=${layout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install
'';
};
-}
+}; in res // { lib = res; }
diff --git a/pkgs/development/libraries/boost/1.56.nix b/pkgs/development/libraries/boost/1.56.nix
new file mode 100644
index 00000000000..212b6ca0dee
--- /dev/null
+++ b/pkgs/development/libraries/boost/1.56.nix
@@ -0,0 +1,146 @@
+{ stdenv, fetchurl, icu, expat, zlib, bzip2, python, fixDarwinDylibNames
+, toolset ? null
+, enableRelease ? true
+, enableDebug ? false
+, enableSingleThreaded ? false
+, enableMultiThreaded ? true
+, enableShared ? true
+, enableStatic ? false
+, enablePIC ? false
+, enableExceptions ? false
+, taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic))
+}:
+
+# We must build at least one type of libraries
+assert !enableShared -> enableStatic;
+
+with stdenv.lib;
+let
+
+ variant = concatStringsSep ","
+ (optional enableRelease "release" ++
+ optional enableDebug "debug");
+
+ threading = concatStringsSep ","
+ (optional enableSingleThreaded "single" ++
+ optional enableMultiThreaded "multi");
+
+ link = concatStringsSep ","
+ (optional enableShared "shared" ++
+ optional enableStatic "static");
+
+ runtime-link = if enableShared then "shared" else "static";
+
+ # To avoid library name collisions
+ layout = if taggedLayout then "tagged" else "system";
+
+ cflags = if enablePIC && enableExceptions then
+ "cflags=\"-fPIC -fexceptions\" cxxflags=-fPIC linkflags=-fPIC"
+ else if enablePIC then
+ "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC"
+ else if enableExceptions then
+ "cflags=-fexceptions"
+ else
+ "";
+
+ withToolset = stdenv.lib.optionalString (toolset != null) "--with-toolset=${toolset}";
+
+ genericB2Flags = [
+ "--prefix=$out"
+ "--libdir=$lib/lib"
+ "-j$NIX_BUILD_CORES"
+ "--layout=${layout}"
+ "variant=${variant}"
+ "threading=${threading}"
+ "runtime-link=${runtime-link}"
+ "link=${link}"
+ "${cflags}"
+ ] ++ optional (variant == "release") "debug-symbols=off";
+
+ nativeB2Flags = [
+ "-sEXPAT_INCLUDE=${expat}/include"
+ "-sEXPAT_LIBPATH=${expat}/lib"
+ ] ++ optional (toolset != null) "toolset=${toolset}";
+ nativeB2Args = concatStringsSep " " (genericB2Flags ++ nativeB2Flags);
+
+ crossB2Flags = [
+ "-sEXPAT_INCLUDE=${expat.crossDrv}/include"
+ "-sEXPAT_LIBPATH=${expat.crossDrv}/lib"
+ "--user-config=user-config.jam"
+ "toolset=gcc-cross"
+ "--without-python"
+ ];
+ crossB2Args = concatMapStringsSep " " (genericB2Flags ++ crossB2Flags);
+
+ builder = b2Args: ''
+ ./b2 ${b2Args}
+ '';
+
+ installer = b2Args: ''
+ # boostbook is needed by some applications
+ mkdir -p $out/share/boostbook
+ cp -a tools/boostbook/{xsl,dtd} $out/share/boostbook/
+
+ # Let boost install everything else
+ ./b2 ${b2Args} install
+ '';
+
+ commonConfigureFlags = [
+ "--libdir=$(lib)/lib"
+ ];
+in
+
+stdenv.mkDerivation {
+ name = "boost-1.56.0";
+
+ meta = {
+ homepage = "http://boost.org/";
+ description = "Collection of C++ libraries";
+ license = "boost-license";
+
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ simons wkennington ];
+ };
+
+ src = fetchurl {
+ url = "mirror://sourceforge/boost/boost_1_56_0.tar.bz2";
+ sha256 = "07gz62nj767qzwqm3xjh11znpyph8gcii0cqhnx7wvismyn34iqk";
+ };
+
+ enableParallelBuilding = true;
+
+ buildInputs = [ icu expat zlib bzip2 python ]
+ ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+
+ configureScript = "./bootstrap.sh";
+ configureFlags = commonConfigureFlags ++ [
+ "--with-icu=${icu}"
+ "--with-python=${python}/bin/python"
+ ] ++ optional (toolset != null) "--with-toolset=${toolset}";
+
+ buildPhase = ''
+ ${stdenv.lib.optionalString (toolset == "clang") "unset NIX_ENFORCE_PURITY"}
+ '' + builder nativeB2Args;
+
+ installPhase = installer nativeB2Args;
+
+ outputs = [ "out" "lib" ];
+
+ crossAttrs = rec {
+ buildInputs = [ expat.crossDrv zlib.crossDrv bzip2.crossDrv ];
+ # all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to
+ # override them.
+ propagatedBuildInputs = buildInputs;
+ # We want to substitute the contents of configureFlags, removing thus the
+ # usual --build and --host added on cross building.
+ preConfigure = ''
+ export configureFlags="--prefix=$out --without-icu ${concatStringsSep " " commonConfigureFlags}"
+ set -x
+ cat << EOF > user-config.jam
+ using gcc : cross : $crossConfig-g++ ;
+ EOF
+ '';
+ buildPhase = builder crossB2Args;
+ installPhase = installer crossB2Args;
+ };
+}
diff --git a/pkgs/development/libraries/boost/header-only-wrapper.nix b/pkgs/development/libraries/boost/header-only-wrapper.nix
deleted file mode 100644
index 96c9216a371..00000000000
--- a/pkgs/development/libraries/boost/header-only-wrapper.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchurl, boost }:
-
-let
- version = stdenv.lib.removePrefix "boost-" boost.name;
- pkgid = stdenv.lib.replaceChars ["-" "."] ["_" "_"] boost.name;
-in
-
-stdenv.mkDerivation {
- name = "boost-headers-${version}";
-
- src = boost.src;
-
- phases = [ "installPhase" ];
-
- installPhase = ''
- mkdir -p $out/include
- tar xf $src -C $out/include --strip-components=1 ${pkgid}/boost
- '';
-
- preferLocalBuild = true;
-
- meta = {
- homepage = "http://boost.org/";
- description = "Boost C++ Library Collection";
- license = "boost-license";
-
- platforms = stdenv.lib.platforms.unix;
- maintainers = [ stdenv.lib.maintainers.viric stdenv.lib.maintainers.simons ];
- };
-}
diff --git a/pkgs/development/libraries/botan/default.nix b/pkgs/development/libraries/botan/default.nix
index 64dd821c43f..e603b904dda 100644
--- a/pkgs/development/libraries/botan/default.nix
+++ b/pkgs/development/libraries/botan/default.nix
@@ -9,8 +9,9 @@ let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[];
- buildInputs = map (n: builtins.getAttr n x)
- (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+ buildInputs = [ boost.lib ]
+ ++ map (n: builtins.getAttr n x)
+ (builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
baseName="botan";
tarBaseName="Botan";
diff --git a/pkgs/development/libraries/botan/unstable.nix b/pkgs/development/libraries/botan/unstable.nix
index 677172dd3ac..be541a1d8ec 100644
--- a/pkgs/development/libraries/botan/unstable.nix
+++ b/pkgs/development/libraries/botan/unstable.nix
@@ -9,8 +9,9 @@ let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[];
- buildInputs = map (n: builtins.getAttr n x)
- (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+ buildInputs = [ boost.lib ]
+ ++ map (n: builtins.getAttr n x)
+ (builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
baseName="botan";
tarBaseName="Botan";
diff --git a/pkgs/development/libraries/chromaprint/default.nix b/pkgs/development/libraries/chromaprint/default.nix
index 40d41b633d2..010d2cb7ccc 100644
--- a/pkgs/development/libraries/chromaprint/default.nix
+++ b/pkgs/development/libraries/chromaprint/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, fftw, boost }:
+{ stdenv, fetchurl, cmake, ffmpeg, boost }:
stdenv.mkDerivation rec {
name = "chromaprint-${version}";
@@ -9,11 +9,17 @@ stdenv.mkDerivation rec {
sha256 = "04nd8xmy4kgnpfffj6hw893f80bwhp43i01zpmrinn3497mdf53b";
};
- buildInputs = [ cmake fftw boost ];
+ buildInputs = [ cmake ffmpeg boost ];
- meta = {
+ cmakeFlags = [ "-DBUILD_EXAMPLES=ON" ];
+
+ postInstall = "installBin examples/fpcalc";
+
+ meta = with stdenv.lib; {
homepage = "http://acoustid.org/chromaprint";
description = "AcoustID audio fingerprinting library";
- license = stdenv.lib.licenses.lgpl21Plus;
+ maintainers = with maintainers; [ emery ];
+ license = licenses.lgpl21Plus;
+ platforms = platforms.all;
};
}
diff --git a/pkgs/development/libraries/cimg/builder.sh b/pkgs/development/libraries/cimg/builder.sh
new file mode 100644
index 00000000000..bbd5f712551
--- /dev/null
+++ b/pkgs/development/libraries/cimg/builder.sh
@@ -0,0 +1,12 @@
+
+source $stdenv/setup
+
+unpackPhase
+cd $sourceRoot
+
+install -dm 755 $out/include/cimg $out/share/doc/cimg/html $out/share/cimg/examples $out/share/cimg/plugins
+
+install -m 644 CImg.h $out/include/cimg
+cp -dr --no-preserve=ownership html/* $out/share/doc/cimg/html/
+cp -dr --no-preserve=ownership examples/* $out/share/cimg/examples/
+cp -dr --no-preserve=ownership plugins/* $out/share/cimg/plugins/
diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix
new file mode 100644
index 00000000000..049938e1f45
--- /dev/null
+++ b/pkgs/development/libraries/cimg/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl
+, unzip }:
+
+stdenv.mkDerivation rec {
+
+ name = "cimg-${version}";
+ version = "1.5.9";
+
+ src = fetchurl {
+ url = "http://downloads.sourceforge.net/project/cimg/CImg-${version}.zip";
+ sha256 = "1xn20643gcbl76kvy9ajhwbyjjb73mg65q32ma8mdkwn1qhn7f7c";
+ };
+
+ buildInputs = with stdenv.lib;
+ [ unzip ];
+
+ builder = ./builder.sh;
+
+ meta = with stdenv.lib; {
+ description = "A small, open source, C++ toolkit for image processing";
+ homepage = http://cimg.sourceforge.net/;
+ license = licenses.cecill-c;
+ maintainers = [ maintainers.AndersonTorres ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/development/libraries/cloog/default.nix b/pkgs/development/libraries/cloog/default.nix
index 7ea7e597d40..926da22b280 100644
--- a/pkgs/development/libraries/cloog/default.nix
+++ b/pkgs/development/libraries/cloog/default.nix
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
configureFlags = [ "--with-isl=system" ];
+ enableParallelBuilding = true;
+
doCheck = true;
meta = {
diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix
index c73aac074e7..7cef673dbc6 100644
--- a/pkgs/development/libraries/clutter-gst/default.nix
+++ b/pkgs/development/libraries/clutter-gst/default.nix
@@ -1,11 +1,11 @@
{ fetchurl, stdenv, pkgconfig, clutter, gtk3, glib, cogl }:
stdenv.mkDerivation rec {
- name = "clutter-gst-2.0.10";
+ name = "clutter-gst-2.0.12";
src = fetchurl {
url = "mirror://gnome/sources/clutter-gst/2.0/${name}.tar.xz";
- sha256 = "f00cf492a6d4f1036c70d8a0ebd2f0f47586ea9a9b49b1ffda79c9dc7eadca00";
+ sha256 = "1dgzpd5l5ld622b8185c3khvvllm5hfvq4q1a1mgzhxhj8v4bwf2";
};
propagatedBuildInputs = [ clutter gtk3 glib cogl ];
diff --git a/pkgs/development/libraries/clutter-gtk/0.10.8.nix b/pkgs/development/libraries/clutter-gtk/0.10.8.nix
index e5f5a455c89..d3754ecd6c6 100644
--- a/pkgs/development/libraries/clutter-gtk/0.10.8.nix
+++ b/pkgs/development/libraries/clutter-gtk/0.10.8.nix
@@ -4,7 +4,10 @@ stdenv.mkDerivation rec {
name = "clutter-gtk-0.10.8";
src = fetchurl {
- url = "http://source.clutter-project.org/sources/clutter-gtk/0.10/${name}.tar.bz2";
+ urls = [
+ "http://download.gnome.org/sources/clutter-gtk/0.10/${name}.tar.bz2"
+ "http://source.clutter-project.org/sources/clutter-gtk/0.10/${name}.tar.bz2"
+ ];
sha256 = "0508x1jfnlq0zhgscysvfa7i7ljkzm23d2myikvdjwc8ar8zjrvq";
};
diff --git a/pkgs/development/libraries/coprthr/default.nix b/pkgs/development/libraries/coprthr/default.nix
index 0e521aa19e8..40be21131d2 100644
--- a/pkgs/development/libraries/coprthr/default.nix
+++ b/pkgs/development/libraries/coprthr/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://github.com/browndeer/coprthr/archive/stable-${version}.zip";
- sha256 = "042aykmcxhdpck0j6k5rcp6a0b5i377fv2nz96v1bpfhzxd1mjwg";
+ sha256 = "0ilx4v1ydppjnq1i0z5j0x4lmi29z39sappar7c0wqady0b5dpz9";
};
buildInputs =
@@ -33,5 +33,6 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.lgpl3;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+ broken = true;
};
}
diff --git a/pkgs/development/libraries/cpp-netlib/default.nix b/pkgs/development/libraries/cpp-netlib/default.nix
index 43849bf8ed8..3ce9dc38b3c 100644
--- a/pkgs/development/libraries/cpp-netlib/default.nix
+++ b/pkgs/development/libraries/cpp-netlib/default.nix
@@ -12,17 +12,17 @@ stdenv.mkDerivation rec {
md5 = "0765cf203f451394df98e6ddf7bf2541";
};
- buildInputs = [ cmake boost openssl ];
+ buildInputs = [ cmake boost boost.lib openssl ];
cmakeFlags = [ "-DCPP-NETLIB_BUILD_SHARED_LIBS=ON" "-DCMAKE_BUILD_TYPE=RELEASE" ];
enableParallelBuilding = true;
- meta = {
+ meta = with stdenv.lib; {
description = "A collection of open-source libraries for high level network programming";
homepage = http://cpp-netlib.org;
- license = stdenv.lib.licenses.boost;
- maintainers = [ stdenv.lib.maintainers.shlevy ];
- platforms = stdenv.lib.platforms.all;
+ license = licenses.boost;
+ maintainers = with maintainers; [ shlevy ];
+ platforms = platforms.all;
};
}
diff --git a/pkgs/development/libraries/directfb/src-for-default.nix b/pkgs/development/libraries/directfb/src-for-default.nix
index be583e08b6b..ed03b758b75 100644
--- a/pkgs/development/libraries/directfb/src-for-default.nix
+++ b/pkgs/development/libraries/directfb/src-for-default.nix
@@ -1,9 +1,9 @@
rec {
- version="1.6.3";
- name="directfb-1.6.3";
- hash="0w2yyx6l2wn8jj9y14ymknqyc88wwrl314p9204frck91znsr5ks";
- url="http://directfb.org/downloads/Core/DirectFB-1.6/DirectFB-${version}.tar.gz";
- advertisedUrl="http://directfb.org/downloads/Core/DirectFB-1.6/DirectFB-1.6.3.tar.gz";
+ version="1.7.6";
+ name="directfb-${version}";
+ hash="1qf94vgsbcwfa00x2aqd6795n6z43x4ghclmb4sa4bl4zfn2pws4";
+ url="http://directfb.org/downloads/Core/DirectFB-1.7/DirectFB-${version}.tar.gz";
+ advertisedUrl="http://directfb.org/downloads/Core/DirectFB-1.7/DirectFB-1.7.6.tar.gz";
}
diff --git a/pkgs/development/libraries/dotconf/default.nix b/pkgs/development/libraries/dotconf/default.nix
index 2c22af1684d..74e4b6c5666 100644
--- a/pkgs/development/libraries/dotconf/default.nix
+++ b/pkgs/development/libraries/dotconf/default.nix
@@ -1,18 +1,24 @@
-{ fetchurl, stdenv }:
+{ fetchFromGitHub, stdenv, autoconf, automake, libtool }:
stdenv.mkDerivation rec {
name = "dotconf-" + version;
- version = "1.0.13";
+ version = "1.3";
- src = fetchurl {
- url = "http://www.azzit.de/dotconf/download/v1.0/dotconf-1.0.13.tar.gz";
- sha256 = "0rcvi743jgnrq2p5gknnvsqiv47479y5gyc2g9pz7bp7v7bzlmc9";
+ src = fetchFromGitHub {
+ owner = "williamh";
+ repo = "dotconf";
+ rev = "v${version}";
+ sha256 = "1sc95hw5k2xagpafny0v35filmcn05k1ds5ghkldfpf6xw4hakp7";
};
- meta = {
- description = "A configuration parser library";
+ buildInputs = [ autoconf automake libtool ];
+ preConfigure = "autoreconf --install";
+
+ meta = with stdenv.lib; {
+ description = "A configuration parser library";
+ maintainers = with maintainers; [ pSub ];
homepage = http://www.azzit.de/dotconf/;
- license = stdenv.lib.licenses.lgpl21Plus;
+ license = licenses.lgpl21Plus;
};
}
diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix
index 72a140ed371..14308dc0eb0 100644
--- a/pkgs/development/libraries/eigen/default.nix
+++ b/pkgs/development/libraries/eigen/default.nix
@@ -1,15 +1,15 @@
{stdenv, fetchurl, cmake}:
let
- v = "3.2.1";
+ version = "3.2.2";
in
stdenv.mkDerivation {
- name = "eigen-${v}";
+ name = "eigen-${version}";
src = fetchurl {
- url = "http://bitbucket.org/eigen/eigen/get/${v}.tar.bz2";
- name = "eigen-${v}.tar.bz2";
- sha256 = "12ljdirih9n3cf8hy00in285c2ccah7mgalmmr8gc3ldwznz5rk6";
+ url = "http://bitbucket.org/eigen/eigen/get/${version}.tar.gz";
+ name = "eigen-${version}.tar.gz";
+ sha256 = "0pwykjkz5n8wfyg9cjj7smgs54a9zc80m9gi106w43n2m72ni39i";
};
nativeBuildInputs = [ cmake ];
@@ -19,5 +19,6 @@ stdenv.mkDerivation {
license = licenses.lgpl3Plus;
homepage = http://eigen.tuxfamily.org ;
maintainers = with stdenv.lib.maintainers; [ sander urkud raskin ];
+ inherit version;
};
}
diff --git a/pkgs/development/libraries/eigen/default.upstream b/pkgs/development/libraries/eigen/default.upstream
new file mode 100644
index 00000000000..c0c05efc466
--- /dev/null
+++ b/pkgs/development/libraries/eigen/default.upstream
@@ -0,0 +1,4 @@
+url http://eigen.tuxfamily.org/
+ensure_choice
+version '.*/([-0-9.]+)[.]tar[.].*' '\1'
+do_overwrite() { do_overwrite_just_version; }
diff --git a/pkgs/development/libraries/enet/default.nix b/pkgs/development/libraries/enet/default.nix
index 39a332223ea..5c029adbf84 100644
--- a/pkgs/development/libraries/enet/default.nix
+++ b/pkgs/development/libraries/enet/default.nix
@@ -1,16 +1,17 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
- name = "enet-1.3.9";
-
+ name = "enet-1.3.12";
+
src = fetchurl {
url = "http://enet.bespin.org/download/${name}.tar.gz";
- sha256 = "0z4blmkyfjrkvgr12adjx7nnjrx4mvcm4zj8jp581m6rral7nf9y";
+ sha256 = "02qxgsn20m306hg3pklfa35mjlc2fqcsd1x4pi3xnbfy1nyir1d5";
};
meta = {
homepage = http://enet.bespin.org/;
description = "Simple and robust network communication layer on top of UDP";
- license = "BSD";
+ license = stdenv.lib.licenses.mit;
+ maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
};
}
diff --git a/pkgs/development/libraries/exempi/default.nix b/pkgs/development/libraries/exempi/default.nix
index 991c3e2fa4c..4fb184f8d60 100644
--- a/pkgs/development/libraries/exempi/default.nix
+++ b/pkgs/development/libraries/exempi/default.nix
@@ -1,18 +1,19 @@
{ stdenv, fetchurl, expat, zlib, boost }:
stdenv.mkDerivation rec {
- name = "exempi-2.2.1";
+ name = "exempi-2.2.2";
src = fetchurl {
url = "http://libopenraw.freedesktop.org/download/${name}.tar.bz2";
- sha256 = "00d6gycl0wcyd3c71y0jp033a64z203rq0p0y07aig0s0j0477kc";
+ sha256 = "01vcd1mfn2s0iiq2cjyzgvnxx6kcq9cwra1iipijhs0vwvjx0yhf";
};
configureFlags = [ "--with-boost=${boost}" ];
- buildInputs = [ expat zlib boost ];
+ buildInputs = [ expat zlib boost boost.lib ];
meta = with stdenv.lib; {
+ homepage = http://libopenraw.freedesktop.org/wiki/Exempi/;
platforms = platforms.linux;
license = licenses.bsd3;
};
diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix
index d7915a93962..9a49225d172 100644
--- a/pkgs/development/libraries/expat/default.nix
+++ b/pkgs/development/libraries/expat/default.nix
@@ -8,9 +8,10 @@ stdenv.mkDerivation rec {
sha256 = "11pblz61zyxh68s5pdcbhc30ha1b2vfjd83aiwfg4vc15x3hadw2";
};
- meta = {
+ meta = with stdenv.lib; {
homepage = http://www.libexpat.org/;
description = "A stream-oriented XML parser library written in C";
- platforms = stdenv.lib.platforms.all;
+ platforms = platforms.all;
+ license = licenses.mit; # expat version
};
}
diff --git a/pkgs/development/libraries/fcgi/default.nix b/pkgs/development/libraries/fcgi/default.nix
index 26ff5dd245e..f75c2117084 100644
--- a/pkgs/development/libraries/fcgi/default.nix
+++ b/pkgs/development/libraries/fcgi/default.nix
@@ -12,9 +12,11 @@ stdenv.mkDerivation rec {
postInstall = "ln -s . $out/include/fastcgi";
- meta = {
+ meta = with stdenv.lib; {
description = "FastCGI is a language independent, scalable, open extension to CG";
homepage = http://www.fastcgi.com/;
license = "FastCGI see LICENSE.TERMS";
+ platforms = platforms.all;
+ maintainers = with maintainers; [ wkennington ];
};
}
diff --git a/pkgs/development/libraries/ffmpeg/0.10.nix b/pkgs/development/libraries/ffmpeg/0.10.nix
index 8ffe2daebf6..556a41e2dca 100644
--- a/pkgs/development/libraries/ffmpeg/0.10.nix
+++ b/pkgs/development/libraries/ffmpeg/0.10.nix
@@ -21,11 +21,11 @@ assert vdpauSupport -> libvdpau != null;
assert faacSupport -> faac != null;
stdenv.mkDerivation rec {
- name = "ffmpeg-0.10.14";
+ name = "ffmpeg-0.10.15";
src = fetchurl {
url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
- sha256 = "1frkz3971zc2a60ras5ia26b2h8wbh017x1x80q8cfw0ycrpbxqy";
+ sha256 = "0p9x559fpj4zxll7rn3kwdig6y66c3ahv3pddmz23lljq5rvyvcb";
};
# `--enable-gpl' (as well as the `postproc' and `swscale') mean that
@@ -83,5 +83,6 @@ stdenv.mkDerivation rec {
description = "A complete, cross-platform solution to record, convert and stream audio and video";
maintainers = with maintainers; [ lovek323 ];
platforms = platforms.unix;
+ branch = "0.10";
};
}
diff --git a/pkgs/development/libraries/ffmpeg/0.6.nix b/pkgs/development/libraries/ffmpeg/0.6.nix
index 053843d5313..79ab5f1c980 100644
--- a/pkgs/development/libraries/ffmpeg/0.6.nix
+++ b/pkgs/development/libraries/ffmpeg/0.6.nix
@@ -73,5 +73,6 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://www.ffmpeg.org/;
description = "A complete, cross-platform solution to record, convert and stream audio and video";
+ branch = "0.6";
};
}
diff --git a/pkgs/development/libraries/ffmpeg/1.x.nix b/pkgs/development/libraries/ffmpeg/1.x.nix
index a0dcf52dcce..1dadf1be127 100644
--- a/pkgs/development/libraries/ffmpeg/1.x.nix
+++ b/pkgs/development/libraries/ffmpeg/1.x.nix
@@ -31,11 +31,11 @@ assert playSupport -> SDL != null;
assert freetypeSupport -> freetype != null;
stdenv.mkDerivation rec {
- name = "ffmpeg-1.2.7";
+ name = "ffmpeg-1.2.8";
src = fetchurl {
url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
- sha256 = "13nj5q5ad0kcrid8r5x6x8lqfhk8kms14pmncf6vbdbk6x45k6v6";
+ sha256 = "0n9fklr8zqkd60dc5ai161l6k4dbiac5hqy0pi1w82yamc25k6s2";
};
# `--enable-gpl' (as well as the `postproc' and `swscale') mean that
@@ -100,5 +100,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://www.ffmpeg.org/;
description = "A complete, cross-platform solution to record, convert and stream audio and video";
+ maintainers = with stdenv.lib.maintainers; [ the-kenny ];
+ branch = "1";
};
}
diff --git a/pkgs/development/libraries/ffmpeg/2.3.x.nix b/pkgs/development/libraries/ffmpeg/2.3.x.nix
new file mode 100644
index 00000000000..2b4b0569b55
--- /dev/null
+++ b/pkgs/development/libraries/ffmpeg/2.3.x.nix
@@ -0,0 +1,109 @@
+{ stdenv, fetchurl, config, pkgconfig, yasm, zlib, bzip2, alsaLib, texinfo, perl
+, lame, speex, libass, libtheora, libvorbis, libvpx, x264, xvidcore, libopus
+, libvdpau, libva, faac, libdc1394, libXext, libXfixes, SDL
+, freetype, fontconfig, fdk_aac, gnutls
+}:
+
+stdenv.mkDerivation rec {
+ version = "2.3.3";
+ name = "ffmpeg-${version}";
+
+ src = fetchurl {
+ url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
+ sha256 = "0ik4c06anh49r5b0d3rq9if4zl6ysjsa341655kzw22fl880sk5v";
+ };
+
+ subtitleSupport = config.ffmpeg.subtitle or true;
+ mp3Support = config.ffmpeg.mp3 or true;
+ speexSupport = config.ffmpeg.speex or true;
+ theoraSupport = config.ffmpeg.theora or true;
+ vorbisSupport = config.ffmpeg.vorbis or true;
+ vpxSupport = config.ffmpeg.vpx or true;
+ x264Support = config.ffmpeg.x264 or true;
+ xvidSupport = config.ffmpeg.xvid or true;
+ opusSupport = config.ffmpeg.opus or true;
+ vdpauSupport = config.ffmpeg.vdpau or true;
+ vaapiSupport = config.ffmpeg.vaapi or true;
+ faacSupport = config.ffmpeg.faac or false;
+ fdkAACSupport = config.ffmpeg.fdk or false;
+ dc1394Support = config.ffmpeg.dc1394 or false;
+ x11grabSupport = config.ffmpeg.x11grab or false;
+ playSupport = config.ffmpeg.play or true;
+ freetypeSupport = config.ffmpeg.freetype or true;
+ gnutlsSupport = config.ffmpeg.gnutls or true;
+
+ # `--enable-gpl' (as well as the `postproc' and `swscale') mean that
+ # the resulting library is GPL'ed, so it can only be used in GPL'ed
+ # applications.
+ configureFlags = [
+ "--enable-gpl"
+ "--enable-postproc"
+ "--enable-swscale"
+ "--enable-shared"
+ "--enable-avresample"
+ "--enable-runtime-cpudetect"
+ ]
+ ++ stdenv.lib.optional (!stdenv.isDarwin && subtitleSupport) "--enable-libass"
+ ++ stdenv.lib.optional mp3Support "--enable-libmp3lame"
+ ++ stdenv.lib.optional speexSupport "--enable-libspeex"
+ ++ stdenv.lib.optional theoraSupport "--enable-libtheora"
+ ++ stdenv.lib.optional vorbisSupport "--enable-libvorbis"
+ ++ stdenv.lib.optional vpxSupport "--enable-libvpx"
+ ++ stdenv.lib.optional x264Support "--enable-libx264"
+ ++ stdenv.lib.optional xvidSupport "--enable-libxvid"
+ ++ stdenv.lib.optional opusSupport "--enable-libopus"
+ ++ stdenv.lib.optional vdpauSupport "--enable-vdpau"
+ ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree"
+ ++ stdenv.lib.optional dc1394Support "--enable-libdc1394"
+ ++ stdenv.lib.optional x11grabSupport "--enable-x11grab"
+ ++ stdenv.lib.optional (!stdenv.isDarwin && playSupport) "--enable-ffplay"
+ ++ stdenv.lib.optional freetypeSupport "--enable-libfreetype --enable-fontconfig"
+ ++ stdenv.lib.optional fdkAACSupport "--enable-libfdk_aac --enable-nonfree"
+ ++ stdenv.lib.optional gnutlsSupport "--enable-gnutls";
+
+ buildInputs = [ pkgconfig lame yasm zlib bzip2 texinfo perl ]
+ ++ stdenv.lib.optional mp3Support lame
+ ++ stdenv.lib.optional speexSupport speex
+ ++ stdenv.lib.optional theoraSupport libtheora
+ ++ stdenv.lib.optional vorbisSupport libvorbis
+ ++ stdenv.lib.optional vpxSupport libvpx
+ ++ stdenv.lib.optional x264Support x264
+ ++ stdenv.lib.optional xvidSupport xvidcore
+ ++ stdenv.lib.optional opusSupport libopus
+ ++ stdenv.lib.optional vdpauSupport libvdpau
+ ++ stdenv.lib.optional vaapiSupport libva
+ ++ stdenv.lib.optional faacSupport faac
+ ++ stdenv.lib.optional dc1394Support libdc1394
+ ++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ]
+ ++ stdenv.lib.optional (!stdenv.isDarwin && playSupport) SDL
+ ++ stdenv.lib.optionals freetypeSupport [ freetype fontconfig ]
+ ++ stdenv.lib.optional fdkAACSupport fdk_aac
+ ++ stdenv.lib.optional gnutlsSupport gnutls
+ ++ stdenv.lib.optional (!stdenv.isDarwin && subtitleSupport) libass
+ ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib;
+
+ enableParallelBuilding = true;
+
+ crossAttrs = {
+ dontSetConfigureCross = true;
+ configureFlags = configureFlags ++ [
+ "--cross-prefix=${stdenv.cross.config}-"
+ "--enable-cross-compile"
+ "--target_os=linux"
+ "--arch=${stdenv.cross.arch}"
+ ];
+ };
+
+ passthru = {
+ inherit vdpauSupport;
+ };
+
+ meta = {
+ homepage = http://www.ffmpeg.org/;
+ description = "A complete, cross-platform solution to record, convert and stream audio and video";
+ license = if (fdkAACSupport || faacSupport) then stdenv.lib.licenses.unfree else stdenv.lib.licenses.gpl2Plus;
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ branch = "2.3";
+ };
+}
diff --git a/pkgs/development/libraries/ffmpeg/2.x.nix b/pkgs/development/libraries/ffmpeg/2.x.nix
index 19a4099a8b1..4bd10216e6b 100644
--- a/pkgs/development/libraries/ffmpeg/2.x.nix
+++ b/pkgs/development/libraries/ffmpeg/2.x.nix
@@ -5,11 +5,12 @@
}:
stdenv.mkDerivation rec {
- name = "ffmpeg-2.3.2";
+ version = "2.4.1";
+ name = "ffmpeg-${version}";
src = fetchurl {
url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
- sha256 = "1lpzqjpklmcjzk327pz070m3qz3s1cwg8v90w6r1sdh8491kbqc4";
+ sha256 = "1wy7hdkaijsr6cbvgq5gkjdb0rd3m6583b8d68hlmsj15k7czbml";
};
subtitleSupport = config.ffmpeg.subtitle or true;
@@ -102,5 +103,6 @@ stdenv.mkDerivation rec {
description = "A complete, cross-platform solution to record, convert and stream audio and video";
license = if (fdkAACSupport || faacSupport) then stdenv.lib.licenses.unfree else stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
+ maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
};
}
diff --git a/pkgs/development/libraries/ffms/default.nix b/pkgs/development/libraries/ffms/default.nix
index c394fd07028..6f78c198f40 100644
--- a/pkgs/development/libraries/ffms/default.nix
+++ b/pkgs/development/libraries/ffms/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, zlib, ffmpeg, pkgconfig }:
stdenv.mkDerivation rec {
- name = "ffms-2.19";
+ name = "ffms-2.20";
src = fetchurl {
- url = https://codeload.github.com/FFMS/ffms2/tar.gz/2.19;
+ url = https://codeload.github.com/FFMS/ffms2/tar.gz/2.20;
name = "${name}.tar.gz";
- sha256 = "0498si8bzwyxxq0f1yc6invzb1lv1ab436gwzn9418839x8pj4vg";
+ sha256 = "183klnhl57zf0i8xlr7yvj89ih83pzd48c37qpr57hjn4wbq1n67";
};
NIX_CFLAGS_COMPILE = "-fPIC";
@@ -17,5 +17,6 @@ stdenv.mkDerivation rec {
homepage = http://code.google.com/p/ffmpegsource/;
description = "Libav/ffmpeg based source library for easy frame accurate access";
license = stdenv.lib.licenses.mit;
+ maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
};
}
diff --git a/pkgs/development/libraries/flite/default.nix b/pkgs/development/libraries/flite/default.nix
index 85896cdb5e3..5b1dc6fc0a4 100644
--- a/pkgs/development/libraries/flite/default.nix
+++ b/pkgs/development/libraries/flite/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig }:
stdenv.mkDerivation rec {
- name = "flite-1.4";
+ name = "flite-1.9.0";
src = fetchurl {
- url = "http://www.speech.cs.cmu.edu/flite/packed/${name}/${name}-release.tar.bz2";
- sha256 = "036dagsydi0qh71ayi6jshfi3ik2md1az3gpi42md9pc18b65ij5";
+ url = "http://www.festvox.org/bard/${name}-current.tar.bz2";
+ sha256 = "197cc2a1f045b1666a29a9b5f035b3d676db6db94a4439d99a03b65e551ae2e0";
};
buildInputs = [ pkgconfig ];
@@ -16,8 +16,9 @@ stdenv.mkDerivation rec {
meta = {
description = "A small, fast run-time speech synthesis engine";
- homepage = http://www.speech.cs.cmu.edu/flite/index.html;
+ homepage = http://www.festvox.org/flite/;
license = "free-non-copyleft";
+ platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl b/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl
index 59071ce9e22..e3938663c9b 100644
--- a/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl
+++ b/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl
@@ -20,7 +20,7 @@
-
+
/etc/fonts/conf.d
/etc/fonts/conf.d
@@ -40,4 +40,12 @@
+
+
+
+
+
+
+
+
diff --git a/pkgs/development/libraries/fribidi/default.nix b/pkgs/development/libraries/fribidi/default.nix
index 71e5b91a26f..23795e9633e 100644
--- a/pkgs/development/libraries/fribidi/default.nix
+++ b/pkgs/development/libraries/fribidi/default.nix
@@ -2,15 +2,16 @@
stdenv.mkDerivation rec {
name = "fribidi-${version}";
- version = "0.19.2";
+ version = "0.19.6";
src = fetchurl {
- url = "http://fribidi.org/download/${name}.tar.gz";
- sha256 = "0xs1yr22zw9a1qq9ygsrqam0vzqdvb0ndzvjb3i2zda8drc93ks9";
+ url = "http://fribidi.org/download/${name}.tar.bz2";
+ sha256 = "0zg1hpaml34ny74fif97j7ngrshlkl3wk3nja3gmlzl17i1bga6b";
};
- meta = {
+ meta = with stdenv.lib; {
homepage = http://fribidi.org/;
description = "GNU implementation of the Unicode Bidirectional Algorithm (bidi)";
+ license = licenses.gpl2;
};
}
diff --git a/pkgs/development/libraries/ganv/default.nix b/pkgs/development/libraries/ganv/default.nix
index 40e0388d749..6639f2e498b 100644
--- a/pkgs/development/libraries/ganv/default.nix
+++ b/pkgs/development/libraries/ganv/default.nix
@@ -1,13 +1,12 @@
-{ stdenv, fetchsvn, graphviz, gtk, gtkmm, pkgconfig, python }:
+{ stdenv, fetchurl, graphviz, gtk, gtkmm, pkgconfig, python }:
stdenv.mkDerivation rec {
- name = "ganv-svn-${rev}";
- rev = "5318";
+ name = "ganv-${version}";
+ version = "1.4.2";
- src = fetchsvn {
- url = "http://svn.drobilla.net/lad/trunk/ganv";
- rev = rev;
- sha256 = "0wi87ks2xjma979d9hy82wmlm06g4sr0pm3b1n3zv27y52wrf7fl";
+ src = fetchurl {
+ url = "http://download.drobilla.net/${name}.tar.bz2";
+ sha256 = "0g7s5mp14qgbfjdql0k1s8464r21g47ssn5dws6jazsnw6njhl0l";
};
buildInputs = [ graphviz gtk gtkmm pkgconfig python ];
diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index 7c78ca3ed6f..c397013750b 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -1,15 +1,15 @@
{ stdenv, fetchurl, composableDerivation, unzip, libjpeg, libtiff, zlib
-, postgresql, mysql, libgeotiff }:
+, postgresql, mysql, libgeotiff, python, pythonPackages}:
-composableDerivation.composableDerivation {} (fixed: {
- name = "gdal-1.7.1";
+composableDerivation.composableDerivation {} (fixed: rec {
+ name = "gdal-1.11.0";
src = fetchurl {
- url = ftp://ftp.remotesensing.org/gdal/gdal171.zip;
- md5 = "f5592cff69b239166c9b64ff81943b1a";
+ url = "http://download.osgeo.org/gdal/1.11.0/${name}.tar.gz";
+ md5 = "9fdf0f2371a3e9863d83e69951c71ec4";
};
- buildInputs = [ unzip libjpeg libtiff ];
+ buildInputs = [ unzip libjpeg libtiff python pythonPackages.numpy];
# don't use optimization for gcc >= 4.3. That's said to be causeing segfaults
preConfigure = "export CFLAGS=-O0; export CXXFLAGS=-O0";
@@ -22,6 +22,7 @@ composableDerivation.composableDerivation {} (fixed: {
"--with-pg=${postgresql}/bin/pg_config"
"--with-mysql=${mysql}/bin/mysql_config"
"--with-geotiff=${libgeotiff}"
+ "--with-python" # optional
];
meta = {
diff --git a/pkgs/development/libraries/gdome2/default.nix b/pkgs/development/libraries/gdome2/default.nix
index 516fb932983..f16a39e6ab0 100644
--- a/pkgs/development/libraries/gdome2/default.nix
+++ b/pkgs/development/libraries/gdome2/default.nix
@@ -21,5 +21,6 @@ stdenv.mkDerivation {
description = "DOM C library developped for the Gnome project";
license = stdenv.lib.licenses.lgpl21Plus;
maintainers = [ stdenv.lib.maintainers.roconnor ];
+ broken = true;
};
}
diff --git a/pkgs/development/libraries/gecode/default.nix b/pkgs/development/libraries/gecode/default.nix
new file mode 100644
index 00000000000..c897609ee59
--- /dev/null
+++ b/pkgs/development/libraries/gecode/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, perl }:
+
+stdenv.mkDerivation rec {
+ name = "gecode-${version}";
+ version = "4.3.0";
+
+ src = fetchurl {
+ url = "http://www.gecode.org/download/${name}.tar.gz";
+ sha256 = "18a1nd6sxqqh05hd9zwcgq9qhqrr6hi0nbzpwpay1flkv5gvg2d7";
+ };
+
+ buildInputs = [ perl ];
+
+ meta = with stdenv.lib; {
+ license = licenses.mit;
+ homepage = http://www.gecode.org;
+ description = "Toolkit for developing constraint-based systems";
+ platforms = platforms.all;
+ maintainers = [ maintainers.manveru ];
+ };
+}
diff --git a/pkgs/development/libraries/gettext/0.17.nix b/pkgs/development/libraries/gettext/0.17.nix
index ef0a1d41bd6..3ea70bea80b 100644
--- a/pkgs/development/libraries/gettext/0.17.nix
+++ b/pkgs/development/libraries/gettext/0.17.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
name = "gettext-0.17";
-
+
src = fetchurl {
url = "mirror://gnu/gettext/${name}.tar.gz";
sha256 = "1fipjpaxxwifdw6cbr7mkxp1yvy643i38nhlh7124bqnisxki5i0";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
'';
buildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv;
-
+
meta = {
description = "GNU gettext, a well integrated set of translation tools and documentation";
@@ -48,5 +48,6 @@ stdenv.mkDerivation rec {
homepage = http://www.gnu.org/software/gettext/;
maintainers = [ ];
+ branch = "0.17";
};
}
\ No newline at end of file
diff --git a/pkgs/development/libraries/giflib/default.nix b/pkgs/development/libraries/giflib/5.0.nix
similarity index 100%
rename from pkgs/development/libraries/giflib/default.nix
rename to pkgs/development/libraries/giflib/5.0.nix
diff --git a/pkgs/development/libraries/giflib/5.1.nix b/pkgs/development/libraries/giflib/5.1.nix
new file mode 100644
index 00000000000..3ff71255b85
--- /dev/null
+++ b/pkgs/development/libraries/giflib/5.1.nix
@@ -0,0 +1,17 @@
+{stdenv, fetchurl, xmlto, docbook_xml_dtd_412, docbook_xsl, libxml2 }:
+
+stdenv.mkDerivation {
+ name = "giflib-5.1.0";
+ src = fetchurl {
+ url = mirror://sourceforge/giflib/giflib-5.1.0.tar.bz2;
+ sha256 = "06wd32akyawppar9mqdvyhcw47ssdfcj39lryim2w4v83i7nkv2s";
+ };
+
+ buildInputs = [ xmlto docbook_xml_dtd_412 docbook_xsl libxml2 ];
+ meta = {
+ description = "giflib is a library for reading and writing gif images";
+ platforms = stdenv.lib.platforms.unix;
+ license = stdenv.lib.licenses.mit;
+ maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ };
+}
diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix
index abb782641dd..7cab317380e 100644
--- a/pkgs/development/libraries/git2/default.nix
+++ b/pkgs/development/libraries/git2/default.nix
@@ -1,13 +1,13 @@
{stdenv, fetchurl, cmake, zlib, python}:
stdenv.mkDerivation rec {
- version = "0.20.0";
+ version = "0.21.1";
name = "libgit2-${version}";
src = fetchurl {
name = "${name}.tar.gz";
url = "https://github.com/libgit2/libgit2/tarball/v${version}";
- sha256 = "1iyncz8fqazw683dxjls3lf5pw3f5ma8kachkvjz7dsq57wxllbj";
+ sha256 = "0afbvcsryg7bsmbfj23l09b1xngkmqhf043njl8wm44qslrxibkz";
};
cmakeFlags = "-DTHREADSAFE=ON";
diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix
index 9ec88799d0d..5127311e7c9 100644
--- a/pkgs/development/libraries/glew/default.nix
+++ b/pkgs/development/libraries/glew/default.nix
@@ -3,11 +3,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "glew-1.10.0";
+ name = "glew-1.11.0";
src = fetchurl {
url = "mirror://sourceforge/glew/${name}.tgz";
- sha256 = "01zki46dr5khzlyywr3cg615bcal32dazfazkf360s1znqh17i4r";
+ sha256 = "1mhkllxz49l1x680dmzrv2i82qjrq017sykah3xc90f2d8qcxfv9";
};
nativeBuildInputs = [ x11 libXmu libXi ];
@@ -42,9 +42,11 @@ stdenv.mkDerivation rec {
] ++ optional (stdenv.cross.libc == "msvcrt") "SYSTEM=mingw"
++ optional (stdenv.cross.libc == "libSystem") "SYSTEM=darwin";
- meta = {
+ meta = with stdenv.lib; {
description = "An OpenGL extension loading library for C(++)";
homepage = http://glew.sourceforge.net/;
- license = ["BSD" "GLX" "SGI-B" "GPL2"]; # License description copied from gentoo-1.4.0
+ license = licenses.free; # different files under different licenses
+ #["BSD" "GLX" "SGI-B" "GPL2"]
+ platforms = platforms.mesaPlatforms;
};
}
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 93e96bef536..839ba7cfa95 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
sha256 = "1d98mbqjmc34s8095lkw1j1bwvnnkw9581yfvjaikjvfjsaz29qd";
};
- patches = optional stdenv.isDarwin ./darwin-compilation.patch;
+ patches = optional stdenv.isDarwin ./darwin-compilation.patch ++ optional doCheck ./skip-timer-test.patch;
setupHook = ./setup-hook.sh;
diff --git a/pkgs/development/libraries/glib/skip-timer-test.patch b/pkgs/development/libraries/glib/skip-timer-test.patch
new file mode 100644
index 00000000000..942f3e7864c
--- /dev/null
+++ b/pkgs/development/libraries/glib/skip-timer-test.patch
@@ -0,0 +1,17 @@
+Description: Skip test which performs some unreliable floating point comparisons
+Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=722604
+
+Index: b/glib/tests/timer.c
+===================================================================
+--- a/glib/tests/timer.c
++++ b/glib/tests/timer.c
+@@ -203,7 +203,7 @@
+ {
+ g_test_init (&argc, &argv, NULL);
+
+- g_test_add_func ("/timer/basic", test_timer_basic);
++/* g_test_add_func ("/timer/basic", test_timer_basic);*/
+- g_test_add_func ("/timer/stop", test_timer_stop);
++/* g_test_add_func ("/timer/stop", test_timer_stop);*/
+ g_test_add_func ("/timer/continue", test_timer_continue);
+ g_test_add_func ("/timer/reset", test_timer_reset);
diff --git a/pkgs/development/libraries/glibc/2.19/common.nix b/pkgs/development/libraries/glibc/2.19/common.nix
index cd1ba747d7c..a828148c3d5 100644
--- a/pkgs/development/libraries/glibc/2.19/common.nix
+++ b/pkgs/development/libraries/glibc/2.19/common.nix
@@ -60,6 +60,7 @@ stdenv.mkDerivation ({
./fix-math.patch
./cve-2014-0475.patch
+ ./cve-2014-5119.patch
];
postPatch = ''
diff --git a/pkgs/development/libraries/glibc/2.19/cve-2014-5119.patch b/pkgs/development/libraries/glibc/2.19/cve-2014-5119.patch
new file mode 100644
index 00000000000..cbae03425eb
--- /dev/null
+++ b/pkgs/development/libraries/glibc/2.19/cve-2014-5119.patch
@@ -0,0 +1,206 @@
+http://anonscm.debian.org/viewvc/pkg-glibc/glibc-package/trunk/debian/patches/any/cvs-CVE-2014-5119.diff?revision=6248&view=co
+
+commit a1a6a401ab0a3c9f15fb7eaebbdcee24192254e8
+Author: Florian Weimer
+Date: Tue Aug 26 19:38:59 2014 +0200
+
+ __gconv_translit_find: Disable function [BZ #17187]
+
+ This functionality has never worked correctly, and the implementation
+ contained a security vulnerability (CVE-2014-5119).
+
+2014-08-26 Florian Weimer
+
+ [BZ #17187]
+ * iconv/gconv_trans.c (struct known_trans, search_tree, lock,
+ trans_compare, open_translit, __gconv_translit_find):
+ Remove module loading code.
+
+--- a/iconv/gconv_trans.c
++++ b/iconv/gconv_trans.c
+@@ -238,181 +238,12 @@ __gconv_transliterate (struct __gconv_step *step,
+ return __GCONV_ILLEGAL_INPUT;
+ }
+
+-
+-/* Structure to represent results of found (or not) transliteration
+- modules. */
+-struct known_trans
+-{
+- /* This structure must remain the first member. */
+- struct trans_struct info;
+-
+- char *fname;
+- void *handle;
+- int open_count;
+-};
+-
+-
+-/* Tree with results of previous calls to __gconv_translit_find. */
+-static void *search_tree;
+-
+-/* We modify global data. */
+-__libc_lock_define_initialized (static, lock);
+-
+-
+-/* Compare two transliteration entries. */
+-static int
+-trans_compare (const void *p1, const void *p2)
+-{
+- const struct known_trans *s1 = (const struct known_trans *) p1;
+- const struct known_trans *s2 = (const struct known_trans *) p2;
+-
+- return strcmp (s1->info.name, s2->info.name);
+-}
+-
+-
+-/* Open (maybe reopen) the module named in the struct. Get the function
+- and data structure pointers we need. */
+-static int
+-open_translit (struct known_trans *trans)
+-{
+- __gconv_trans_query_fct queryfct;
+-
+- trans->handle = __libc_dlopen (trans->fname);
+- if (trans->handle == NULL)
+- /* Not available. */
+- return 1;
+-
+- /* Find the required symbol. */
+- queryfct = __libc_dlsym (trans->handle, "gconv_trans_context");
+- if (queryfct == NULL)
+- {
+- /* We cannot live with that. */
+- close_and_out:
+- __libc_dlclose (trans->handle);
+- trans->handle = NULL;
+- return 1;
+- }
+-
+- /* Get the context. */
+- if (queryfct (trans->info.name, &trans->info.csnames, &trans->info.ncsnames)
+- != 0)
+- goto close_and_out;
+-
+- /* Of course we also have to have the actual function. */
+- trans->info.trans_fct = __libc_dlsym (trans->handle, "gconv_trans");
+- if (trans->info.trans_fct == NULL)
+- goto close_and_out;
+-
+- /* Now the optional functions. */
+- trans->info.trans_init_fct =
+- __libc_dlsym (trans->handle, "gconv_trans_init");
+- trans->info.trans_context_fct =
+- __libc_dlsym (trans->handle, "gconv_trans_context");
+- trans->info.trans_end_fct =
+- __libc_dlsym (trans->handle, "gconv_trans_end");
+-
+- trans->open_count = 1;
+-
+- return 0;
+-}
+-
+-
+ int
+ internal_function
+ __gconv_translit_find (struct trans_struct *trans)
+ {
+- struct known_trans **found;
+- const struct path_elem *runp;
+- int res = 1;
+-
+- /* We have to have a name. */
+- assert (trans->name != NULL);
+-
+- /* Acquire the lock. */
+- __libc_lock_lock (lock);
+-
+- /* See whether we know this module already. */
+- found = __tfind (trans, &search_tree, trans_compare);
+- if (found != NULL)
+- {
+- /* Is this module available? */
+- if ((*found)->handle != NULL)
+- {
+- /* Maybe we have to reopen the file. */
+- if ((*found)->handle != (void *) -1)
+- /* The object is not unloaded. */
+- res = 0;
+- else if (open_translit (*found) == 0)
+- {
+- /* Copy the data. */
+- *trans = (*found)->info;
+- (*found)->open_count++;
+- res = 0;
+- }
+- }
+- }
+- else
+- {
+- size_t name_len = strlen (trans->name) + 1;
+- int need_so = 0;
+- struct known_trans *newp;
+-
+- /* We have to continue looking for the module. */
+- if (__gconv_path_elem == NULL)
+- __gconv_get_path ();
+-
+- /* See whether we have to append .so. */
+- if (name_len <= 4 || memcmp (&trans->name[name_len - 4], ".so", 3) != 0)
+- need_so = 1;
+-
+- /* Create a new entry. */
+- newp = (struct known_trans *) malloc (sizeof (struct known_trans)
+- + (__gconv_max_path_elem_len
+- + name_len + 3)
+- + name_len);
+- if (newp != NULL)
+- {
+- char *cp;
+-
+- /* Clear the struct. */
+- memset (newp, '\0', sizeof (struct known_trans));
+-
+- /* Store a copy of the module name. */
+- newp->info.name = cp = (char *) (newp + 1);
+- cp = __mempcpy (cp, trans->name, name_len);
+-
+- newp->fname = cp;
+-
+- /* Search in all the directories. */
+- for (runp = __gconv_path_elem; runp->name != NULL; ++runp)
+- {
+- cp = __mempcpy (__stpcpy ((char *) newp->fname, runp->name),
+- trans->name, name_len);
+- if (need_so)
+- memcpy (cp, ".so", sizeof (".so"));
+-
+- if (open_translit (newp) == 0)
+- {
+- /* We found a module. */
+- res = 0;
+- break;
+- }
+- }
+-
+- if (res)
+- newp->fname = NULL;
+-
+- /* In any case we'll add the entry to our search tree. */
+- if (__tsearch (newp, &search_tree, trans_compare) == NULL)
+- {
+- /* Yickes, this should not happen. Unload the object. */
+- res = 1;
+- /* XXX unload here. */
+- }
+- }
+- }
+-
+- __libc_lock_unlock (lock);
+-
+- return res;
++ /* Transliteration module loading has been removed because it never
++ worked as intended and suffered from a security vulnerability.
++ Consequently, this function always fails. */
++ return 1;
+ }
diff --git a/pkgs/development/libraries/glibc/2.19/multi.nix b/pkgs/development/libraries/glibc/2.19/multi.nix
new file mode 100644
index 00000000000..ad4a34152b6
--- /dev/null
+++ b/pkgs/development/libraries/glibc/2.19/multi.nix
@@ -0,0 +1,31 @@
+{ runCommand, glibc, glibc32
+}:
+
+runCommand "${glibc.name}-multi"
+ { inherit glibc32;
+ glibc64 = glibc;
+ }
+ ''
+ mkdir -p $out
+ ln -s $glibc64/* $out/
+
+ rm $out/lib $out/lib64
+ mkdir -p $out/lib
+ ln -s $glibc64/lib/* $out/lib
+ ln -s $glibc32/lib $out/lib/32
+ ln -s lib $out/lib64
+
+ # fixing ldd RLTDLIST
+ rm $out/bin
+ cp -rs $glibc64/bin $out
+ chmod u+w $out/bin
+ rm $out/bin/ldd
+ sed -e "s|^RTLDLIST=.*$|RTLDLIST=\"$out/lib/ld-2.19.so $out/lib/32/ld-linux.so.2\"|g" \
+ $glibc64/bin/ldd > $out/bin/ldd
+ chmod 555 $out/bin/ldd
+
+ rm $out/include
+ cp -rs $glibc32/include $out
+ chmod -R u+w $out/include
+ cp -rsf $glibc64/include $out
+ ''
diff --git a/pkgs/development/libraries/glm/default.nix b/pkgs/development/libraries/glm/default.nix
index b35fe1e7855..010a2aee88e 100644
--- a/pkgs/development/libraries/glm/default.nix
+++ b/pkgs/development/libraries/glm/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, unzip }:
stdenv.mkDerivation rec {
- name = "glm-0.9.5.1";
+ name = "glm-0.9.5.3";
src = fetchurl {
url = "mirror://sourceforge/project/ogl-math/${name}/${name}.zip";
- sha256 = "1x8bpmqdszzkg21r411w7cy4mqd5dcvb9jghc8h3xrx7ldbicqjg";
+ sha256 = "0ndwaw2mp7pzcwwm4dghbv5qqax5a8c5plnwdgnpc9adm79gj1rl";
};
buildInputs = [ unzip ];
@@ -30,5 +30,6 @@ stdenv.mkDerivation rec {
homepage = http://glm.g-truc.net/;
license = licenses.mit;
platforms = platforms.unix;
+ maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
};
}
diff --git a/pkgs/development/libraries/gloox/default.nix b/pkgs/development/libraries/gloox/default.nix
index 4e271a8c678..9ab31e51157 100644
--- a/pkgs/development/libraries/gloox/default.nix
+++ b/pkgs/development/libraries/gloox/default.nix
@@ -9,14 +9,14 @@ assert sslSupport -> openssl != null;
assert idnSupport -> libidn != null;
let
- version = "1.0.10";
+ version = "1.0.11";
in
stdenv.mkDerivation rec {
name = "gloox-${version}";
src = fetchurl {
url = "http://camaya.net/download/gloox-${version}.tar.bz2";
- sha256 = "300e756af97d43f3f70f1e68e4d4c7129d587dface61633f50d2c490876f58a3";
+ sha256 = "1hrkvn4ddzmydvpr541l6pi8nr0k6xi9g7yxdp84ns7v463kjrq9";
};
buildInputs = [ ]
@@ -27,6 +27,7 @@ stdenv.mkDerivation rec {
meta = {
description = "A portable high-level Jabber/XMPP library for C++";
homepage = "http://camaya.net/gloox";
- license = [ "GPLv3" ];
+ license = stdenv.lib.licenses.gpl3;
+ maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
};
}
diff --git a/pkgs/development/libraries/gmm/default.nix b/pkgs/development/libraries/gmm/default.nix
index d79293eced1..cf62b6a224b 100644
--- a/pkgs/development/libraries/gmm/default.nix
+++ b/pkgs/development/libraries/gmm/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation {
- name = "gmm-3.0";
+ name = "gmm-4.3";
src = fetchurl {
- url = http://download.gna.org/getfem/stable/gmm-3.0.tar.gz;
- sha256 = "1lc34w68s0rhii6caklvq2pyc3jaa4g6kza948ya8ha6rr8d1ypp";
+ url = http://download.gna.org/getfem/stable/gmm-4.3.tar.gz;
+ sha256 = "0wpp3k73wd3rblsrwxl6djq6m11fx3q5wgw0pl41m9liswsw6din";
};
meta = {
diff --git a/pkgs/development/libraries/gmock/default.nix b/pkgs/development/libraries/gmock/default.nix
new file mode 100644
index 00000000000..71ac281195b
--- /dev/null
+++ b/pkgs/development/libraries/gmock/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, unzip, cmake}:
+
+stdenv.mkDerivation rec {
+ version = "1.7.0";
+ name = "gmock-${version}";
+
+ src = fetchurl {
+ url = "https://googlemock.googlecode.com/files/${name}.zip";
+ sha256="26fcbb5925b74ad5fc8c26b0495dfc96353f4d553492eb97e85a8a6d2f43095b";
+ };
+
+ buildInputs = [ unzip cmake ];
+
+ buildPhase = ''
+ # avoid building gtest
+ make gmock gmock_main
+ '';
+
+ installPhase = ''
+ mkdir -p $out/lib
+ cp -v libgmock.a libgmock_main.a $out/lib
+ cp -v -r ../include $out
+ cp -v -r ../src $out
+ '';
+
+ meta = {
+ description = "Google mock: Google's framework for writing C++ mock classes";
+ homepage = https://code.google.com/p/googlemock/;
+ license = stdenv.lib.licenses.bsd3;
+ maintainers = [ stdenv.lib.maintainers.auntie ];
+ };
+}
diff --git a/pkgs/development/libraries/gnutls/3.1.nix b/pkgs/development/libraries/gnutls/3.1.nix
index 6aea78a3ac5..44ea0176e38 100644
--- a/pkgs/development/libraries/gnutls/3.1.nix
+++ b/pkgs/development/libraries/gnutls/3.1.nix
@@ -4,11 +4,11 @@
assert guileBindings -> guile != null;
stdenv.mkDerivation rec {
- name = "gnutls-3.1.25";
+ name = "gnutls-3.1.26";
src = fetchurl {
url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/${name}.tar.lz";
- sha256 = "1i1v8pbaw72k0ps09i3lvc1zr9gn34jpliiijbs8k7axrv2w9n5g";
+ sha256 = "7947e18fd0c292c0274d810c9bdf674b8faa3566e056ea404a39f335982607a3";
};
# FreeBSD doesn't have , and Gnulib's `alloca' module isn't used.
diff --git a/pkgs/development/libraries/gnutls/3.2.nix b/pkgs/development/libraries/gnutls/3.2.nix
index cd48e08a39c..5bf933fbc96 100644
--- a/pkgs/development/libraries/gnutls/3.2.nix
+++ b/pkgs/development/libraries/gnutls/3.2.nix
@@ -4,11 +4,11 @@
assert guileBindings -> guile != null;
stdenv.mkDerivation rec {
- name = "gnutls-3.2.15";
+ name = "gnutls-3.2.17";
src = fetchurl {
url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/${name}.tar.lz";
- sha256 = "16c5c4k41mxib8i06npks940p9xllgn1wrackfp8712wdvl5zc4q";
+ sha256 = "a332adda1d294fbee859ae46ee0c128d8959c4a5b9c28e7cdbe5c9b56898fc25";
};
patches =
diff --git a/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch b/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
new file mode 100644
index 00000000000..04bcc42a032
--- /dev/null
+++ b/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
@@ -0,0 +1,25 @@
+--- ./giscanner/utils.py.orig 2014-08-14 22:05:05.055334080 +0200
++++ ./giscanner/utils.py 2014-08-14 22:05:24.687497334 +0200
+@@ -110,17 +110,11 @@
+ if dlname is None:
+ return None
+
+- # Darwin uses absolute paths where possible; since the libtool files never
+- # contain absolute paths, use the libdir field
+- if platform.system() == 'Darwin':
+- dlbasename = os.path.basename(dlname)
+- libdir = _extract_libdir_field(la_file)
+- if libdir is None:
+- return dlbasename
+- return libdir + '/' + dlbasename
+- # From the comments in extract_libtool(), older libtools had
+- # a path rather than the raw dlname
+- return os.path.basename(dlname)
++ dlbasename = os.path.basename(dlname)
++ libdir = _extract_libdir_field(la_file)
++ if libdir is None:
++ return dlbasename
++ return libdir + '/' + dlbasename
+
+
+ def extract_libtool(la_file):
diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
index 7686fb30838..4b7ec1f4116 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -29,6 +29,8 @@ stdenv.mkDerivation rec {
setupHook = ./setup-hook.sh;
+ patches = [ ./absolute_shlib_path.patch ];
+
meta = with stdenv.lib; {
description = "A middleware layer between C libraries and language bindings";
homepage = http://live.gnome.org/GObjectIntrospection;
diff --git a/pkgs/development/libraries/gperftools/default.nix b/pkgs/development/libraries/gperftools/default.nix
index 9ffccac1e0f..cd8edcb1b26 100644
--- a/pkgs/development/libraries/gperftools/default.nix
+++ b/pkgs/development/libraries/gperftools/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, libunwind }:
stdenv.mkDerivation rec {
- name = "gperftools-2.1";
+ name = "gperftools-2.2.1";
src = fetchurl {
- url = "https://gperftools.googlecode.com/files/${name}.tar.gz";
- sha256 = "0ks9gsnhxrs2vccc6ha9m8xmj83lmw09xcws4zc0k57q4jcy5bgk";
+ url = "https://googledrive.com/host/0B6NtGsLhIcf7MWxMMF9JdTN3UVk/gperftools-2.2.1.tar.gz";
+ sha256 = "04zkz5mh4vzcc7cx72b21bq70xy7y5kq9gsk4nbssxk5wlqggy2n";
};
buildInputs = stdenv.lib.optional stdenv.isLinux libunwind;
@@ -16,9 +16,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- meta = {
+ meta = with stdenv.lib; {
homepage = https://code.google.com/p/gperftools/;
description = "Fast, multi-threaded malloc() and nifty performance analysis tools";
- platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+ platforms = with platforms; linux ++ darwin;
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ wkennington ];
};
}
diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index ae3b53b4f44..a84d96edca9 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -11,16 +11,24 @@ let
"${gnupg}/bin/gpg2";
in
stdenv.mkDerivation rec {
- name = "gpgme-1.4.3";
-
+ name = "gpgme-1.5.1";
+
src = fetchurl {
url = "ftp://ftp.gnupg.org/gcrypt/gpgme/${name}.tar.bz2";
- sha256 = "15h429h6pd67iiv580bjmwbkadpxsdppw0xrqpcm4dvm24jc271d";
+ sha256 = "1qqi9bxwxxsc4r15j7drclgp0w8jk9nj3h2fsivk4c7brvw3lbvc";
};
-
+
propagatedBuildInputs = [ libgpgerror glib libassuan pth ];
nativeBuildInputs = [ pkgconfig gnupg ];
configureFlags = "--with-gpg=${gpgPath}";
+
+ meta = {
+ homepage = "http://www.gnupg.org/related_software/gpgme";
+ description = "Library for making GnuPG easier to use";
+ license = stdenv.lib.licenses.gpl2;
+ platforms = stdenv.lib.platforms.unix;
+ maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ };
}
diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index d86e450477d..a02af7f0cd7 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, python, gst-plugins-base, orc
, faacSupport ? false, faac ? null
, faad2, libass, libkate, libmms
-, libmodplug, mpeg2dec, mpg123
+, libmodplug, mpeg2dec, mpg123
, openjpeg, libopus, librsvg
, wildmidi, fluidsynth, libvdpau, wayland
, libwebp, xvidcore, gnutls
@@ -10,7 +10,7 @@
assert faacSupport -> faac != null;
stdenv.mkDerivation rec {
- name = "gst-plugins-bad-1.4.0";
+ name = "gst-plugins-bad-1.4.1";
meta = with stdenv.lib; {
description = "Gstreamer Bad Plugins";
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz";
- sha256 = "1y821785rvr6s79cmdll66hg6h740qa2n036xid20nvjyxabfb7z";
+ sha256 = "0268db2faaf0bb22e5b709a11633abbca4f3d289b1f513bb262d0bf3f53e19ae";
};
nativeBuildInputs = [ pkgconfig python ];
diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix
index 9ae5f194fa2..3b9e94f4c65 100644
--- a/pkgs/development/libraries/gstreamer/base/default.nix
+++ b/pkgs/development/libraries/gstreamer/base/default.nix
@@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec {
- name = "gst-plugins-base-1.4.0";
+ name = "gst-plugins-base-1.4.1";
meta = {
description = "Base plugins and helper libraries";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz";
- sha256 = "07jcs08hjyban0amls5s0g6i4a1hwiir1llwpqzlwkmnhfwx9bjx";
+ sha256 = "aea9e25be6691bd3cc0785d005b2b5d70ce313a2c897901680a3f7e7cab5a499";
};
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix
index a99c0f14ecc..8e9a2b87a01 100644
--- a/pkgs/development/libraries/gstreamer/core/default.nix
+++ b/pkgs/development/libraries/gstreamer/core/default.nix
@@ -1,9 +1,9 @@
{ stdenv, fetchurl, pkgconfig, perl, bison, flex, python, gobjectIntrospection
-, glib
+, glib
}:
stdenv.mkDerivation rec {
- name = "gstreamer-1.4.0";
+ name = "gstreamer-1.4.1";
meta = {
description = "Open source multimedia framework";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/gstreamer/${name}.tar.xz";
- sha256 = "15f68pn2b47x543ih7hj59czgzl4af14j15bgjq8ky145gf9zhr3";
+ sha256 = "5638f75003282135815c0077d491da11e9a884ad91d4ba6ab3cc78bae0fb452e";
};
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix
index 69ffa81cb25..176814c5ecd 100644
--- a/pkgs/development/libraries/gstreamer/good/default.nix
+++ b/pkgs/development/libraries/gstreamer/good/default.nix
@@ -7,7 +7,7 @@
}:
stdenv.mkDerivation rec {
- name = "gst-plugins-good-1.4.0";
+ name = "gst-plugins-good-1.4.1";
meta = with stdenv.lib; {
description = "Gstreamer Good Plugins";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz";
- sha256 = "11965w4zr0jvrsnw33rbcc8d20dlh368rz0x16d2iypzhxwjx9j8";
+ sha256 = "8559d4270065b30ed5c49b826e1b7a3a2bd5ee9a340ae745a2ae3f9718e4c637";
};
nativeBuildInputs = [ pkgconfig python ];
diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix
index ee4b3c392dd..e25492c1d13 100644
--- a/pkgs/development/libraries/gstreamer/libav/default.nix
+++ b/pkgs/development/libraries/gstreamer/libav/default.nix
@@ -6,7 +6,7 @@
assert withSystemLibav -> libav != null;
stdenv.mkDerivation rec {
- name = "gst-libav-1.4.0";
+ name = "gst-libav-1.4.1";
meta = {
homepage = "http://gstreamer.freedesktop.org";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/gst-libav/${name}.tar.xz";
- sha256 = "1073p7xdpr3pwyx37fnldfni908apnq3k9fbqmxf5wk3g1jplb68";
+ sha256 = "fc125521187fa84f3210269a0eecc51f8a856802f1ca4bb251f118dab90c5a9d";
};
configureFlags = stdenv.lib.optionalString withSystemLibav
diff --git a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix
new file mode 100644
index 00000000000..057fa7cc83a
--- /dev/null
+++ b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, gst_all_1, boost, glib, qt4, cmake
+, automoc4, flex, bison, pkgconfig }:
+
+stdenv.mkDerivation rec {
+ name = "${pname}-1.2.0";
+ pname = "qt-gstreamer";
+
+ src = fetchurl {
+ url = "http://gstreamer.freedesktop.org/src/${pname}/${name}.tar.xz";
+ sha256 = "9f3b492b74cad9be918e4c4db96df48dab9c012f2ae5667f438b64a4d92e8fd4";
+ };
+
+ buildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base glib qt4 ];
+ propagatedBuildInputs = [ boost ];
+ nativeBuildInputs = [ cmake automoc4 flex bison pkgconfig ];
+
+ cmakeFlags = "-DUSE_QT_PLUGIN_DIR=OFF -DUSE_GST_PLUGIN_DIR=OFF";
+}
diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix
index da37280af99..6a80514e8a1 100644
--- a/pkgs/development/libraries/gstreamer/ugly/default.nix
+++ b/pkgs/development/libraries/gstreamer/ugly/default.nix
@@ -5,7 +5,7 @@
}:
stdenv.mkDerivation rec {
- name = "gst-plugins-ugly-1.4.0";
+ name = "gst-plugins-ugly-1.4.1";
meta = with stdenv.lib; {
description = "Gstreamer Ugly Plugins";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz";
- sha256 = "0kblc5f4n0mh2sw8dhf7c9dg3wzm7a0p7pqpcff7n6ixy5hbn52k";
+ sha256 = "25440435ac4ed795d213f2420a0e7355e4a2e2e76d1f9d020b2073f815e8b071";
};
nativeBuildInputs = [ pkgconfig python ];
diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix
index a59e3d07cb4..787cd4066c0 100644
--- a/pkgs/development/libraries/gtest/default.nix
+++ b/pkgs/development/libraries/gtest/default.nix
@@ -24,11 +24,12 @@ stdenv.mkDerivation rec {
cp -v -r ../src $out
'';
- meta = {
+ meta = with stdenv.lib; {
description = "Google test: Google's framework for writing C++ tests.";
homepage = https://code.google.com/p/googletest/;
- license = stdenv.lib.licenses.bsd3;
- maintainers = [ stdenv.lib.maintainers.zoomulator ];
+ license = licenses.bsd3;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ zoomulator ];
};
}
diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix
index 8812ea70c79..ff4d6ca6733 100644
--- a/pkgs/development/libraries/gtk+/2.x.nix
+++ b/pkgs/development/libraries/gtk+/2.x.nix
@@ -37,6 +37,13 @@ stdenv.mkDerivation rec {
postInstall = "rm -rf $out/share/gtk-doc";
+ passthru = {
+ gtkExeEnvPostBuild = ''
+ rm $out/lib/gtk-2.0/2.10.0/immodules.cache
+ $out/bin/gtk-query-immodules-2.0 $out/lib/gtk-2.0/2.10.0/immodules/*.so > $out/lib/gtk-2.0/2.10.0/immodules.cache
+ ''; # workaround for bug of nix-mode for Emacs */ '';
+ };
+
meta = with stdenv.lib; {
description = "A multi-platform toolkit for creating graphical user interfaces";
homepage = http://www.gtk.org/;
diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index 09221502e36..fa350110476 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -38,6 +38,13 @@ stdenv.mkDerivation rec {
postInstall = "rm -rf $out/share/gtk-doc";
+ passthru = {
+ gtkExeEnvPostBuild = ''
+ rm $out/lib/gtk-3.0/3.0.0/immodules.cache
+ $out/bin/gtk-query-immodules-3.0 $out/lib/gtk-3.0/3.0.0/immodules/*.so > $out/lib/gtk-3.0/3.0.0/immodules.cache
+ ''; # workaround for bug of nix-mode for Emacs */ '';
+ };
+
meta = {
description = "A multi-platform toolkit for creating graphical user interfaces";
diff --git a/pkgs/development/libraries/gtkspell/3.nix b/pkgs/development/libraries/gtkspell/3.nix
index 54023f29a07..c9098fc0850 100644
--- a/pkgs/development/libraries/gtkspell/3.nix
+++ b/pkgs/development/libraries/gtkspell/3.nix
@@ -2,17 +2,21 @@
stdenv.mkDerivation rec {
name = "gtkspell-${version}";
- version = "3.0.4";
-
+ version = "3.0.6";
+
src = fetchurl {
url = "mirror://sourceforge/gtkspell/gtkspell3-${version}.tar.gz";
- sha256 = "19z48gfbraasrxai7qdkxxvky0kwifkkzqz0jqcskhcr1ikqxgzs";
+ sha256 = "1hqaddgzxjw9lpsphankld6a8bpm92hfv46kp99cgmj82rdjwdq1";
};
-
+
buildInputs = [ aspell pkgconfig gtk3 enchant intltool ];
propagatedBuildInputs = [ enchant ];
- meta = with stdenv.lib; {
- platforms = platforms.linux;
+ meta = {
+ homepage = "http://gtkspell.sourceforge.net/";
+ description = "Word-processor-style highlighting GtkTextView widget";
+ license = stdenv.lib.licenses.gpl2Plus;
+ platforms = stdenv.lib.platforms.unix;
+ maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
};
}
diff --git a/pkgs/development/libraries/gtkspellmm/default.nix b/pkgs/development/libraries/gtkspellmm/default.nix
new file mode 100644
index 00000000000..d24ec46d905
--- /dev/null
+++ b/pkgs/development/libraries/gtkspellmm/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl
+, pkgconfig
+, gtk3, glib, glibmm, gtkmm3, gtkspell3
+}:
+
+let
+ version = "3.0.3";
+
+in
+
+stdenv.mkDerivation rec {
+ name = "gtkspellmm-${version}";
+
+ src = fetchurl {
+ url = "http://downloads.sourceforge.net/project/gtkspell/gtkspellmm/" +
+ "${name}.tar.gz";
+ sha256 = "f9dcc0991621c08e7a972f33487afd6b37491468f0b654f50c741a7e6d810624";
+ };
+
+ propagatedBuildInputs = [
+ gtkspell3
+ ];
+
+ buildInputs = [
+ pkgconfig
+ gtk3 glib glibmm gtkmm3
+ ];
+
+ meta = with stdenv.lib; {
+ description = "C++ binding for the gtkspell library";
+ homepage = http://gtkspell.sourceforge.net/;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix
index 8340660e392..45cdc5be02b 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -8,11 +8,11 @@
# (icu is a ~30 MB dependency, the rest is very small in comparison)
stdenv.mkDerivation rec {
- name = "harfbuzz-0.9.33";
+ name = "harfbuzz-0.9.35";
src = fetchurl {
url = "http://www.freedesktop.org/software/harfbuzz/release/${name}.tar.bz2";
- sha256 = "1iql2ghlndqgx9q6p098xf253rjz5rnrv5qniwgd1b5q0jzwa4yk";
+ sha256 = "1v86596994bnb9hx7laykhw4ipixqz9ckwzyyqf340pmlsmsi88a";
};
configureFlags = [
diff --git a/pkgs/development/libraries/haskell/Boolean/default.nix b/pkgs/development/libraries/haskell/Boolean/default.nix
index 53eea4f738d..d7a8474bd5b 100644
--- a/pkgs/development/libraries/haskell/Boolean/default.nix
+++ b/pkgs/development/libraries/haskell/Boolean/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "Boolean";
- version = "0.2.1";
- sha256 = "0vi09icwc254mbx85lf1n81mx4hr2sdf61a4njaqa91cf046sjlr";
+ version = "0.2.2";
+ sha256 = "1awi9ff2gb9gddalzn2hgp8klvcsizicqpd7xb5fds5j3278qrdz";
meta = {
description = "Generalized booleans and numbers";
license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/Chart-cairo/default.nix b/pkgs/development/libraries/haskell/Chart-cairo/default.nix
index d2dea815819..95d346cd9f3 100644
--- a/pkgs/development/libraries/haskell/Chart-cairo/default.nix
+++ b/pkgs/development/libraries/haskell/Chart-cairo/default.nix
@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "Chart-cairo";
- version = "1.2.4";
- sha256 = "1ggqh3v14mwv9q1pmz3hbx7g1dvibfwl1vzvag92q7432q4pqm2z";
+ version = "1.3.1";
+ sha256 = "15d52x0xr0klkfp9jh9i2aqki8gkm805mm6yk53f3ky92vdylg6q";
buildDepends = [
cairo Chart colour dataDefaultClass lens mtl operational time
];
diff --git a/pkgs/development/libraries/haskell/Chart-diagrams/default.nix b/pkgs/development/libraries/haskell/Chart-diagrams/default.nix
index 002b762fbac..6b90954c4a7 100644
--- a/pkgs/development/libraries/haskell/Chart-diagrams/default.nix
+++ b/pkgs/development/libraries/haskell/Chart-diagrams/default.nix
@@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "Chart-diagrams";
- version = "1.2.4";
- sha256 = "099frqvfjqqc7h3zr52saqyg37di0klr0y649afzxd7lj3d67mvw";
+ version = "1.3.1";
+ sha256 = "0p959m350rj0fl91f94c0gcxnzgy8yrz27naw9ciqi36za7sxl6j";
buildDepends = [
blazeSvg Chart colour dataDefaultClass diagramsCore diagramsLib
diagramsPostscript diagramsSvg lens mtl operational SVGFonts text
@@ -20,6 +20,5 @@ cabal.mkDerivation (self: {
description = "Diagrams backend for Charts";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
- hydraPlatforms = self.stdenv.lib.platforms.none;
};
})
diff --git a/pkgs/development/libraries/haskell/Chart-gtk/default.nix b/pkgs/development/libraries/haskell/Chart-gtk/default.nix
index 9dbb3c8ae9a..7e6f7d794af 100644
--- a/pkgs/development/libraries/haskell/Chart-gtk/default.nix
+++ b/pkgs/development/libraries/haskell/Chart-gtk/default.nix
@@ -1,12 +1,16 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-{ cabal, cairo, Chart, ChartCairo, colour, gtk, mtl, time }:
+{ cabal, cairo, Chart, ChartCairo, colour, dataDefaultClass, gtk
+, mtl, time
+}:
cabal.mkDerivation (self: {
pname = "Chart-gtk";
- version = "1.2.4";
- sha256 = "16dfmkls341cmk13j1z3rw2wxdvxr5rqsv1ff4qjhjak9j7hkqjq";
- buildDepends = [ cairo Chart ChartCairo colour gtk mtl time ];
+ version = "1.3.1";
+ sha256 = "1bnhwiabwjhry6pfwi9xs4zg23vycqx3rpbc5qs7773sij93v7bj";
+ buildDepends = [
+ cairo Chart ChartCairo colour dataDefaultClass gtk mtl time
+ ];
meta = {
homepage = "https://github.com/timbod7/haskell-chart/wiki";
description = "Utility functions for using the chart library with GTK";
diff --git a/pkgs/development/libraries/haskell/Chart/default.nix b/pkgs/development/libraries/haskell/Chart/default.nix
index d5696a562da..94e40a28afa 100644
--- a/pkgs/development/libraries/haskell/Chart/default.nix
+++ b/pkgs/development/libraries/haskell/Chart/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "Chart";
- version = "1.2.4";
- sha256 = "0zizrkxsligvxs5x5r2j0pynf6ncjl4mgyzbh1zfqgnz29frylh7";
+ version = "1.3.1";
+ sha256 = "019q77hgv5hyhfpsfs2k1a4qn8fandk1nj7xkzn00z21jqhman2s";
buildDepends = [
colour dataDefaultClass lens mtl operational time
];
diff --git a/pkgs/development/libraries/haskell/DAV/default.nix b/pkgs/development/libraries/haskell/DAV/default.nix
index 30289ed9d08..be383fd4143 100644
--- a/pkgs/development/libraries/haskell/DAV/default.nix
+++ b/pkgs/development/libraries/haskell/DAV/default.nix
@@ -8,8 +8,8 @@
cabal.mkDerivation (self: {
pname = "DAV";
- version = "1.0.1";
- sha256 = "0j8z7hi5dykimv6da584zgyn8xlvfhg1k9sbhj5ay7ncxszb134k";
+ version = "1.0.2";
+ sha256 = "0xbiq3q8w1cjnh71sfnincir8igvwig734r8schbsps993p2d24b";
isLibrary = true;
isExecutable = true;
buildDepends = [
@@ -17,7 +17,6 @@ cabal.mkDerivation (self: {
httpClientTls httpTypes lens mtl network optparseApplicative
transformers transformersBase utf8String xmlConduit xmlHamlet
];
- jailbreak = true;
meta = {
homepage = "http://floss.scru.org/hDAV";
description = "RFC 4918 WebDAV support";
diff --git a/pkgs/development/libraries/haskell/FontyFruity/default.nix b/pkgs/development/libraries/haskell/FontyFruity/default.nix
new file mode 100644
index 00000000000..1a613492f43
--- /dev/null
+++ b/pkgs/development/libraries/haskell/FontyFruity/default.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, binary, deepseq, filepath, text, vector }:
+
+cabal.mkDerivation (self: {
+ pname = "FontyFruity";
+ version = "0.3";
+ sha256 = "0ivz7hkz5mx8bqqv5av56a8rw4231wyzzg0dhz6465d59iqmjhd4";
+ buildDepends = [ binary deepseq filepath text vector ];
+ meta = {
+ description = "A true type file format loader";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = with self.stdenv.lib.maintainers; [ bergey ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/HPDF/default.nix b/pkgs/development/libraries/haskell/HPDF/default.nix
index 7dcdbaa8cf9..d34e590e9e6 100644
--- a/pkgs/development/libraries/haskell/HPDF/default.nix
+++ b/pkgs/development/libraries/haskell/HPDF/default.nix
@@ -12,5 +12,6 @@ cabal.mkDerivation (self: {
description = "Generation of PDF documents";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
+ maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
};
})
diff --git a/pkgs/development/libraries/haskell/HTF/default.nix b/pkgs/development/libraries/haskell/HTF/default.nix
index 5908498bd0a..76ba94e8bfc 100644
--- a/pkgs/development/libraries/haskell/HTF/default.nix
+++ b/pkgs/development/libraries/haskell/HTF/default.nix
@@ -8,8 +8,8 @@
cabal.mkDerivation (self: {
pname = "HTF";
- version = "0.12.0.0";
- sha256 = "1mbil44gbcl52f84dphxkdvxsyz8bhc532mlq37aqr1bmj54rv0i";
+ version = "0.12.1.0";
+ sha256 = "1symg1y6i47rd1jshj84cwpn5vgmvh6v07jidjg5w5w3syyxqnz4";
isLibrary = true;
isExecutable = true;
buildDepends = [
diff --git a/pkgs/development/libraries/haskell/IntervalMap/default.nix b/pkgs/development/libraries/haskell/IntervalMap/default.nix
index 774cbd8a19e..65b53d91b52 100644
--- a/pkgs/development/libraries/haskell/IntervalMap/default.nix
+++ b/pkgs/development/libraries/haskell/IntervalMap/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "IntervalMap";
- version = "0.3.0.3";
- sha256 = "11lxsjq9nw9mmj5ga0x03d8rgcx2s85kzi17d9cm7m28mq4dqdag";
+ version = "0.4.0.1";
+ sha256 = "0cq0dmmawrss4jjkz3br0lhp37d4k7rd3cinbcyf0bf39dfk6mrf";
buildDepends = [ deepseq ];
testDepends = [ Cabal deepseq QuickCheck ];
meta = {
diff --git a/pkgs/development/libraries/haskell/JuicyPixels/default.nix b/pkgs/development/libraries/haskell/JuicyPixels/default.nix
index fcd2689c548..2305756f93b 100644
--- a/pkgs/development/libraries/haskell/JuicyPixels/default.nix
+++ b/pkgs/development/libraries/haskell/JuicyPixels/default.nix
@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "JuicyPixels";
- version = "3.1.6.1";
- sha256 = "1v560y0l1zpznbpw8zgb2j6zlcwi8i207xgzggzzd3p0v2m8955c";
+ version = "3.1.7.1";
+ sha256 = "0mhsknqdrhxnm622mgrswvj4kvksh87x18s5ddgk4ylf0s2fjlap";
buildDepends = [
binary deepseq mtl primitive transformers vector zlib
];
diff --git a/pkgs/development/libraries/haskell/MFlow/default.nix b/pkgs/development/libraries/haskell/MFlow/default.nix
index a0e4b787ec9..aaf84a84187 100644
--- a/pkgs/development/libraries/haskell/MFlow/default.nix
+++ b/pkgs/development/libraries/haskell/MFlow/default.nix
@@ -9,8 +9,8 @@
cabal.mkDerivation (self: {
pname = "MFlow";
- version = "0.4.5.7";
- sha256 = "0faw082z8yyzf0k1vrgpqa8kvwb2zwmasy1p1vvj3a7lhhnlr20s";
+ version = "0.4.5.9";
+ sha256 = "0mqsyx7wkfgvpppqgpjpvzwx79vj7lh4c8afzzj1hgh8z0ilb4ik";
buildDepends = [
blazeHtml blazeMarkup caseInsensitive clientsession conduit
conduitExtra extensibleExceptions httpTypes monadloc mtl parsec
diff --git a/pkgs/development/libraries/haskell/MonadPrompt/default.nix b/pkgs/development/libraries/haskell/MonadPrompt/default.nix
index 3221cbe7f55..412f24450c4 100644
--- a/pkgs/development/libraries/haskell/MonadPrompt/default.nix
+++ b/pkgs/development/libraries/haskell/MonadPrompt/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "MonadPrompt";
- version = "1.0.0.3";
- sha256 = "0v6svyiajri7c463bz1a1x1nin5s9s7c3s7y0gjc4cn7lhgdsvf2";
+ version = "1.0.0.5";
+ sha256 = "1nmy7dfzrkd8yfv5i9vlmjq9khnyi76ayvkzgcf783v5hfzcn4mh";
buildDepends = [ mtl ];
meta = {
description = "MonadPrompt, implementation & examples";
diff --git a/pkgs/development/libraries/haskell/Rasterific/default.nix b/pkgs/development/libraries/haskell/Rasterific/default.nix
new file mode 100644
index 00000000000..c53e9f72858
--- /dev/null
+++ b/pkgs/development/libraries/haskell/Rasterific/default.nix
@@ -0,0 +1,26 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, binary, criterion, deepseq, dlist, filepath, FontyFruity
+, free, JuicyPixels, mtl, QuickCheck, statistics, vector
+, vectorAlgorithms
+}:
+
+cabal.mkDerivation (self: {
+ pname = "Rasterific";
+ version = "0.3";
+ sha256 = "1chbcfcb5il7fbzivszap60qfwcwrq85kpx9y6qdr2pim39199fa";
+ buildDepends = [
+ dlist FontyFruity free JuicyPixels mtl vector vectorAlgorithms
+ ];
+ testDepends = [
+ binary criterion deepseq filepath FontyFruity JuicyPixels
+ QuickCheck statistics vector
+ ];
+ doCheck = false;
+ meta = {
+ description = "A pure haskell drawing engine";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = with self.stdenv.lib.maintainers; [ bergey ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/Yampa/default.nix b/pkgs/development/libraries/haskell/Yampa/default.nix
index a4d1ea666a2..5ae451f8163 100644
--- a/pkgs/development/libraries/haskell/Yampa/default.nix
+++ b/pkgs/development/libraries/haskell/Yampa/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "Yampa";
- version = "0.9.5";
- sha256 = "0r6fm2ccls7gbc5s0vbrzrqv6marnzlzc7zr4afkgfk9jsqfmqjh";
+ version = "0.9.6";
+ sha256 = "0a1m0sb0i3kkxbp10vpqd6iw83ksm4alavrg04arzrv71p3skyg0";
buildDepends = [ random ];
meta = {
homepage = "http://www.haskell.org/haskellwiki/Yampa";
diff --git a/pkgs/development/libraries/haskell/ad/default.nix b/pkgs/development/libraries/haskell/ad/default.nix
index d53d11385f4..afe8992aeea 100644
--- a/pkgs/development/libraries/haskell/ad/default.nix
+++ b/pkgs/development/libraries/haskell/ad/default.nix
@@ -1,17 +1,17 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-{ cabal, comonad, dataReify, doctest, erf, filepath, free, mtl
-, nats, reflection, tagged, transformers
+{ cabal, comonad, dataReify, doctest, erf, filepath, free, nats
+, reflection, tagged, transformers
}:
cabal.mkDerivation (self: {
pname = "ad";
- version = "4.2.0.1";
- sha256 = "06vjllcrnr4dv5h3xkcy5zhnhyamp6b6jahpnh2y0i6mp2bdw0pz";
+ version = "4.2.1";
+ sha256 = "05ndr26lsc4xa18vfb3qdjcp03gsq2bhc8dc0yr5g1x9dybq6dx2";
buildDepends = [
- comonad dataReify erf free mtl nats reflection tagged transformers
+ comonad dataReify erf free nats reflection tagged transformers
];
- testDepends = [ doctest filepath mtl ];
+ testDepends = [ doctest filepath ];
meta = {
homepage = "http://github.com/ekmett/ad";
description = "Automatic Differentiation";
diff --git a/pkgs/development/libraries/haskell/aeson-qq/default.nix b/pkgs/development/libraries/haskell/aeson-qq/default.nix
index 2090a20fa8d..d7c86d853fa 100644
--- a/pkgs/development/libraries/haskell/aeson-qq/default.nix
+++ b/pkgs/development/libraries/haskell/aeson-qq/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "aeson-qq";
- version = "0.7.2";
- sha256 = "1h4agwl8kr6qpy4775pxmaizhlzbwjqb23pxn2vvz9wbm2vnixwk";
+ version = "0.7.4";
+ sha256 = "0wnc9pdjvd15gfkdxzf084393vwmxv2xaxdchzgal1qhwa1mak4v";
buildDepends = [ aeson haskellSrcMeta parsec text vector ];
testDepends = [ aeson haskellSrcMeta hspec parsec text vector ];
meta = {
diff --git a/pkgs/development/libraries/haskell/aeson-utils/default.nix b/pkgs/development/libraries/haskell/aeson-utils/default.nix
index db783c012bc..ee0df96618c 100644
--- a/pkgs/development/libraries/haskell/aeson-utils/default.nix
+++ b/pkgs/development/libraries/haskell/aeson-utils/default.nix
@@ -12,5 +12,6 @@ cabal.mkDerivation (self: {
description = "Utilities for working with Aeson";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
+ maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
};
})
diff --git a/pkgs/development/libraries/haskell/async/2.0.1.5.nix b/pkgs/development/libraries/haskell/async/2.0.1.6.nix
similarity index 85%
rename from pkgs/development/libraries/haskell/async/2.0.1.5.nix
rename to pkgs/development/libraries/haskell/async/2.0.1.6.nix
index a4251e9e80b..6c1aed15eab 100644
--- a/pkgs/development/libraries/haskell/async/2.0.1.5.nix
+++ b/pkgs/development/libraries/haskell/async/2.0.1.6.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "async";
- version = "2.0.1.5";
- sha256 = "0g587b64zgn971qb2lh846ihg4z89037f18821kyaqsgixasq4yd";
+ version = "2.0.1.6";
+ sha256 = "06fzkqjliccxqiygms7v1xff3wlkg54n9xwzv7m1yxylkzlikjkz";
buildDepends = [ stm ];
testDepends = [ HUnit testFramework testFrameworkHunit ];
jailbreak = true;
diff --git a/pkgs/development/libraries/haskell/attoparsec/0.12.1.1.nix b/pkgs/development/libraries/haskell/attoparsec/0.12.1.2.nix
similarity index 75%
rename from pkgs/development/libraries/haskell/attoparsec/0.12.1.1.nix
rename to pkgs/development/libraries/haskell/attoparsec/0.12.1.2.nix
index b8e2104f739..a6083866248 100644
--- a/pkgs/development/libraries/haskell/attoparsec/0.12.1.1.nix
+++ b/pkgs/development/libraries/haskell/attoparsec/0.12.1.2.nix
@@ -1,17 +1,17 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, deepseq, QuickCheck, scientific, testFramework
-, testFrameworkQuickcheck2, text
+, testFrameworkQuickcheck2, text, vector
}:
cabal.mkDerivation (self: {
pname = "attoparsec";
- version = "0.12.1.1";
- sha256 = "0whj2wscw9pdf6avnhnqiapsllh6228j4hifyfvr4v0w663plh7p";
+ version = "0.12.1.2";
+ sha256 = "1vazyr3fdahdg1q503sbj0zv4xj7sm7j32mjm856bm51j2s0rhlc";
buildDepends = [ deepseq scientific text ];
testDepends = [
deepseq QuickCheck scientific testFramework
- testFrameworkQuickcheck2 text
+ testFrameworkQuickcheck2 text vector
];
meta = {
homepage = "https://github.com/bos/attoparsec";
diff --git a/pkgs/development/libraries/haskell/auto-update/default.nix b/pkgs/development/libraries/haskell/auto-update/default.nix
index e047e938dae..edfcbe4e342 100644
--- a/pkgs/development/libraries/haskell/auto-update/default.nix
+++ b/pkgs/development/libraries/haskell/auto-update/default.nix
@@ -1,12 +1,11 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-{ cabal, hspec }:
+{ cabal }:
cabal.mkDerivation (self: {
pname = "auto-update";
- version = "0.1.1.2";
- sha256 = "0901zqky70wyxl17vwz6smhnpsfjnsk0f2xqiyz902vl7apx66c6";
- testDepends = [ hspec ];
+ version = "0.1.1.3";
+ sha256 = "06izsfd3xiragzac682vg3bmr6947y8s4yr2r7rip7qjvsja2yhy";
meta = {
homepage = "https://github.com/yesodweb/wai";
description = "Efficiently run periodic, on-demand actions";
diff --git a/pkgs/development/libraries/haskell/aws/default.nix b/pkgs/development/libraries/haskell/aws/default.nix
index 3df47d95618..8f0818f43d6 100644
--- a/pkgs/development/libraries/haskell/aws/default.nix
+++ b/pkgs/development/libraries/haskell/aws/default.nix
@@ -3,16 +3,17 @@
{ cabal, aeson, attoparsec, base16Bytestring, base64Bytestring
, blazeBuilder, byteable, caseInsensitive, cereal, conduit
, conduitExtra, cryptohash, dataDefault, errors, filepath
-, httpConduit, httpTypes, liftedBase, monadControl, mtl, network
-, QuickCheck, quickcheckInstances, resourcet, safe, scientific
-, tagged, tasty, tastyQuickcheck, text, time, transformers
-, unorderedContainers, utf8String, vector, xmlConduit
+, httpClient, httpConduit, httpTypes, liftedBase, monadControl, mtl
+, network, QuickCheck, quickcheckInstances, resourcet, safe
+, scientific, tagged, tasty, tastyQuickcheck, text, time
+, transformers, transformersBase, unorderedContainers, utf8String
+, vector, xmlConduit
}:
cabal.mkDerivation (self: {
pname = "aws";
- version = "0.10.3";
- sha256 = "042vx5nhafvgw0crymkw8pyhiawhpxwj03n1k538y2wr181hmz5f";
+ version = "0.10.5";
+ sha256 = "1d82q2477wp08zavlkzsksalbkiczz3vzy17ijk2z5xsw5yslqnj";
isLibrary = true;
isExecutable = true;
buildDepends = [
@@ -23,9 +24,11 @@ cabal.mkDerivation (self: {
unorderedContainers utf8String vector xmlConduit
];
testDepends = [
- aeson errors mtl QuickCheck quickcheckInstances tagged tasty
- tastyQuickcheck text transformers
+ aeson errors httpClient liftedBase monadControl mtl QuickCheck
+ quickcheckInstances resourcet tagged tasty tastyQuickcheck text
+ time transformers transformersBase
];
+ jailbreak = true;
doCheck = false;
meta = {
homepage = "http://github.com/aristidb/aws";
diff --git a/pkgs/development/libraries/haskell/base-prelude/default.nix b/pkgs/development/libraries/haskell/base-prelude/default.nix
index 824576293f4..1799fa6a6ba 100644
--- a/pkgs/development/libraries/haskell/base-prelude/default.nix
+++ b/pkgs/development/libraries/haskell/base-prelude/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "base-prelude";
- version = "0.1.3";
- sha256 = "07s5j538zxd0hlazqqbz4nwa82rcrmv25v7jr6nxafmgn83mkqhx";
+ version = "0.1.4";
+ sha256 = "10xvzkzlmyrq0mi6056rl6hq4bga1k1c6671b1bxjhgzgqrzpjpz";
meta = {
homepage = "https://github.com/nikita-volkov/base-prelude";
description = "The most complete prelude formed from only the \"base\" package";
diff --git a/pkgs/development/libraries/haskell/basic-prelude/default.nix b/pkgs/development/libraries/haskell/basic-prelude/default.nix
index ab462229aa5..d5a33db11ac 100644
--- a/pkgs/development/libraries/haskell/basic-prelude/default.nix
+++ b/pkgs/development/libraries/haskell/basic-prelude/default.nix
@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "basic-prelude";
- version = "0.3.8";
- sha256 = "0lywnsds0q1nr466s3pc2izfr58kp23z7ing9k7dlgbmh9cqxypg";
+ version = "0.3.9";
+ sha256 = "0f2l8xryagl1f0d30gq1hhydjnn77qhhwgg9l44gvqn30y2n66h7";
buildDepends = [
hashable liftedBase ReadArgs safe systemFilepath text transformers
unorderedContainers vector
diff --git a/pkgs/development/libraries/haskell/binary-conduit/default.nix b/pkgs/development/libraries/haskell/binary-conduit/default.nix
index 37774c1a16a..848004ca6af 100644
--- a/pkgs/development/libraries/haskell/binary-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/binary-conduit/default.nix
@@ -12,6 +12,7 @@ cabal.mkDerivation (self: {
testDepends = [
binary conduit hspec QuickCheck quickcheckAssertions resourcet
];
+ jailbreak = true;
meta = {
homepage = "http://github.com/qnikst/binary-conduit";
description = "data serialization/deserialization conduit library";
diff --git a/pkgs/development/libraries/haskell/blank-canvas/default.nix b/pkgs/development/libraries/haskell/blank-canvas/default.nix
new file mode 100644
index 00000000000..47c343f49b8
--- /dev/null
+++ b/pkgs/development/libraries/haskell/blank-canvas/default.nix
@@ -0,0 +1,22 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, aeson, base64Bytestring, colour, dataDefaultClass
+, httpTypes, kansasComet, scotty, stm, text, transformers, vector
+, wai, waiExtra, warp
+}:
+
+cabal.mkDerivation (self: {
+ pname = "blank-canvas";
+ version = "0.5";
+ sha256 = "05kfyjp9vncyzsvq018ilb8vh7fyzbc06nlx35jk3dzj6i6x5bgs";
+ buildDepends = [
+ aeson base64Bytestring colour dataDefaultClass httpTypes
+ kansasComet scotty stm text transformers vector wai waiExtra warp
+ ];
+ meta = {
+ homepage = "https://github.com/ku-fpg/blank-canvas/wiki";
+ description = "HTML5 Canvas Graphics Library";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/blaze-builder/default.nix b/pkgs/development/libraries/haskell/blaze-builder/default.nix
index c031633c233..4dd5376cad3 100644
--- a/pkgs/development/libraries/haskell/blaze-builder/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-builder/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "blaze-builder";
- version = "0.3.3.2";
- sha256 = "038ig1a1iz0hc36l53f5g7h6aiz7b1lggq1d04y3ql9a0553vd40";
+ version = "0.3.3.4";
+ sha256 = "12xgmi8bc3h3cfk31rrfaklmwvyxgdwzwmxzw22yxd0dd8g11hg5";
buildDepends = [ text ];
meta = {
homepage = "http://github.com/meiersi/blaze-builder";
diff --git a/pkgs/development/libraries/haskell/blaze-html/default.nix b/pkgs/development/libraries/haskell/blaze-html/default.nix
index e29b4c02521..16c967d78a2 100644
--- a/pkgs/development/libraries/haskell/blaze-html/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-html/default.nix
@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "blaze-html";
- version = "0.7.0.2";
- sha256 = "0yqgm5nrryx0qlz9qhpbfxvkwjdbl9876v4gnn0src81j9dzcx2v";
+ version = "0.7.0.3";
+ sha256 = "1jn3vvrxb3ifxb5yzs76pjlk8c366xg1sab7qlw9a4kwmigvl6vx";
buildDepends = [ blazeBuilder blazeMarkup text ];
testDepends = [
blazeBuilder blazeMarkup HUnit QuickCheck testFramework
diff --git a/pkgs/development/libraries/haskell/blaze-markup/default.nix b/pkgs/development/libraries/haskell/blaze-markup/default.nix
index d4b52d54436..cdea333abcd 100644
--- a/pkgs/development/libraries/haskell/blaze-markup/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-markup/default.nix
@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "blaze-markup";
- version = "0.6.1.0";
- sha256 = "0ydk34y1j8bssdiqw6m70383dh4khbcac3jd7fpr37cx7ighlp7l";
+ version = "0.6.1.1";
+ sha256 = "1ah6fgfqsmarq8g4gw81yhckz4pclb2ifxv237cqz5zhy9il4j5d";
buildDepends = [ blazeBuilder text ];
testDepends = [
blazeBuilder HUnit QuickCheck testFramework testFrameworkHunit
diff --git a/pkgs/development/libraries/haskell/boomerang/default.nix b/pkgs/development/libraries/haskell/boomerang/default.nix
index b5d5bc74f80..3747b2cc877 100644
--- a/pkgs/development/libraries/haskell/boomerang/default.nix
+++ b/pkgs/development/libraries/haskell/boomerang/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "boomerang";
- version = "1.4.3";
- sha256 = "1i72mrl8n2cbrdi05zn37y1339r13vzvmrcc1zbkcak4c7r004zw";
+ version = "1.4.4";
+ sha256 = "0ik2wxcvz2y3bn3r2p9kzjiy78vjhxyz4fn3nkaz5wl3jmh4gydf";
buildDepends = [ mtl text ];
meta = {
description = "Library for invertible parsing and printing";
diff --git a/pkgs/development/libraries/haskell/boundingboxes/0.1.1.nix b/pkgs/development/libraries/haskell/boundingboxes/0.1.1.nix
deleted file mode 100644
index 205b05f30d8..00000000000
--- a/pkgs/development/libraries/haskell/boundingboxes/0.1.1.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, lens, linear, QuickCheck, random, testFramework
-, testFrameworkQuickcheck2, testFrameworkTh
-}:
-
-cabal.mkDerivation (self: {
- pname = "boundingboxes";
- version = "0.1.1";
- sha256 = "1nl0lqgfwd98jzhhw7i4vvd88lpnn8770x2pcbyfzqcyr27079f0";
- buildDepends = [ lens linear ];
- testDepends = [
- lens linear QuickCheck random testFramework
- testFrameworkQuickcheck2 testFrameworkTh
- ];
- doCheck = false;
- meta = {
- homepage = "https://github.com/fumieval/boundingboxes";
- description = "The type for 2D bounding box";
- license = self.stdenv.lib.licenses.bsd3;
- platforms = self.ghc.meta.platforms;
- hydraPlatforms = self.stdenv.lib.platforms.none;
- };
-})
diff --git a/pkgs/development/libraries/haskell/boundingboxes/0.2.nix b/pkgs/development/libraries/haskell/boundingboxes/default.nix
similarity index 78%
rename from pkgs/development/libraries/haskell/boundingboxes/0.2.nix
rename to pkgs/development/libraries/haskell/boundingboxes/default.nix
index 686f4ffbbab..ab5cfabad44 100644
--- a/pkgs/development/libraries/haskell/boundingboxes/0.2.nix
+++ b/pkgs/development/libraries/haskell/boundingboxes/default.nix
@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "boundingboxes";
- version = "0.2";
- sha256 = "0xvh1h4papfrf6dg553rx6q8fqi06ff1ivgn4rdx3haqg1zf40hp";
+ version = "0.2.2";
+ sha256 = "09yj85ikpdgzbibpdk0mw9vcaklmqlbhwpm6knz595596wr25fcx";
buildDepends = [ lens ];
testDepends = [
lens linear QuickCheck random testFramework
@@ -16,7 +16,7 @@ cabal.mkDerivation (self: {
doCheck = false;
meta = {
homepage = "https://github.com/fumieval/boundingboxes";
- description = "The type for 2D bounding box";
+ description = "A generic boundingbox for an arbitrary vector";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
diff --git a/pkgs/development/libraries/haskell/bv/default.nix b/pkgs/development/libraries/haskell/bv/default.nix
index 4a2be6244e7..1e12288624f 100644
--- a/pkgs/development/libraries/haskell/bv/default.nix
+++ b/pkgs/development/libraries/haskell/bv/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "bv";
- version = "0.2.2";
- sha256 = "0d5hscjakp7dwifa4l8xikyip45y402kf9pbmpfmmnybja23zhg0";
+ version = "0.3.0";
+ sha256 = "0r2bp39ilwq3zx38spbx5qrpccwm255ax2skab3i7jxjmf7yj025";
isLibrary = true;
isExecutable = true;
meta = {
@@ -13,7 +13,6 @@ cabal.mkDerivation (self: {
description = "Bit-vector arithmetic library";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
- hydraPlatforms = self.stdenv.lib.platforms.none;
- broken = true;
+ maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
};
})
diff --git a/pkgs/development/libraries/haskell/bytes/default.nix b/pkgs/development/libraries/haskell/bytes/default.nix
index 4a8877b6a59..4f6387781c2 100644
--- a/pkgs/development/libraries/haskell/bytes/default.nix
+++ b/pkgs/development/libraries/haskell/bytes/default.nix
@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "bytes";
- version = "0.14.1";
- sha256 = "023sdwdirvigrdg03f6jrdndm6pkqsmsrwz9ji57dpqg4f5k9jzk";
+ version = "0.14.1.1";
+ sha256 = "11bsl31352h5lj7ad68byqqc27d5iz53kwx7b433l44g9kaijrvc";
buildDepends = [
binary cereal mtl text time transformers transformersCompat void
];
diff --git a/pkgs/development/libraries/haskell/c2hs/default.nix b/pkgs/development/libraries/haskell/c2hs/default.nix
index 95ead17f01f..a082a9ef2af 100644
--- a/pkgs/development/libraries/haskell/c2hs/default.nix
+++ b/pkgs/development/libraries/haskell/c2hs/default.nix
@@ -1,18 +1,19 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-{ cabal, filepath, HUnit, languageC, shelly, testFramework
-, testFrameworkHunit, text, yaml
+{ cabal, dlist, filepath, HUnit, languageC, shelly, testFramework
+, testFrameworkHunit, text, transformers
}:
cabal.mkDerivation (self: {
pname = "c2hs";
- version = "0.17.2";
- sha256 = "1xrk0izdy5akjgmg9k4l9ccmmgv1avwh152pfpc1xm2rrwrg4bxk";
+ version = "0.18.2";
+ sha256 = "0rkarj8y8sj83svjz9jivrr1dh2ryky4sb35cxlyxv623bl6sc1x";
isLibrary = false;
isExecutable = true;
- buildDepends = [ filepath languageC ];
+ buildDepends = [ dlist filepath languageC ];
testDepends = [
- filepath HUnit shelly testFramework testFrameworkHunit text yaml
+ filepath HUnit shelly testFramework testFrameworkHunit text
+ transformers
];
jailbreak = true;
doCheck = false;
diff --git a/pkgs/development/libraries/haskell/cabal-cargs/default.nix b/pkgs/development/libraries/haskell/cabal-cargs/default.nix
index a74e54f7e43..c96fab45c19 100644
--- a/pkgs/development/libraries/haskell/cabal-cargs/default.nix
+++ b/pkgs/development/libraries/haskell/cabal-cargs/default.nix
@@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "cabal-cargs";
- version = "0.7.1";
- sha256 = "0y6v663mw4giwypdv34qr2l2fy1q7zdjvgw39m16sjna5lbwvm1n";
+ version = "0.7.3";
+ sha256 = "10707nja5j9hbx5yj7pq8s9zgfx21n36r4xhs71g70g6hwpciqjb";
isLibrary = true;
isExecutable = true;
buildDepends = [
diff --git a/pkgs/development/libraries/haskell/cabal-lenses/default.nix b/pkgs/development/libraries/haskell/cabal-lenses/default.nix
index b5427b3b747..8bf0148ba6b 100644
--- a/pkgs/development/libraries/haskell/cabal-lenses/default.nix
+++ b/pkgs/development/libraries/haskell/cabal-lenses/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "cabal-lenses";
- version = "0.3.1";
- sha256 = "17piwqyzd33shp12qa6j4s579rrs34l44x19p2nzz69anhc4g1j7";
+ version = "0.4";
+ sha256 = "19ryd1qvsc301kdpk0zvw89aqhvk26ccbrgddm9j5m31mn62jl2d";
buildDepends = [ Cabal lens unorderedContainers ];
meta = {
description = "Lenses and traversals for the Cabal library";
diff --git a/pkgs/development/libraries/haskell/cabalg/default.nix b/pkgs/development/libraries/haskell/cabalg/default.nix
new file mode 100644
index 00000000000..62dea42b3d5
--- /dev/null
+++ b/pkgs/development/libraries/haskell/cabalg/default.nix
@@ -0,0 +1,19 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, doctest, filepath }:
+
+cabal.mkDerivation (self: {
+ pname = "cabalg";
+ version = "0.2.9";
+ sha256 = "02brl9b1g3cyw5nmk0mih073kbszpc6g2nqgs0sh93h7y5naf5kp";
+ isLibrary = true;
+ isExecutable = true;
+ buildDepends = [ filepath ];
+ testDepends = [ doctest filepath ];
+ meta = {
+ description = "alias for cabal install from given git repo";
+ license = self.stdenv.lib.licenses.mit;
+ platforms = self.ghc.meta.platforms;
+ maintainers = with self.stdenv.lib.maintainers; [ dmalikov ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/case-insensitive/1.2.0.0.nix b/pkgs/development/libraries/haskell/case-insensitive/1.2.0.1.nix
similarity index 86%
rename from pkgs/development/libraries/haskell/case-insensitive/1.2.0.0.nix
rename to pkgs/development/libraries/haskell/case-insensitive/1.2.0.1.nix
index c8c544610e3..96b5bc114a3 100644
--- a/pkgs/development/libraries/haskell/case-insensitive/1.2.0.0.nix
+++ b/pkgs/development/libraries/haskell/case-insensitive/1.2.0.1.nix
@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "case-insensitive";
- version = "1.2.0.0";
- sha256 = "0ybdmqaqh9hdl3dl5kx8qhs4b67g78fhnkqnd3y2lpgqjvhnbzp4";
+ version = "1.2.0.1";
+ sha256 = "1hnckzi6yq3332fx4b140lwa9p6x69rlpaw6y1pmldj2h9nsxl6m";
buildDepends = [ deepseq hashable text ];
testDepends = [ HUnit testFramework testFrameworkHunit text ];
meta = {
diff --git a/pkgs/development/libraries/haskell/cassava/default.nix b/pkgs/development/libraries/haskell/cassava/default.nix
index c8cb347f10a..0ae9782a33b 100644
--- a/pkgs/development/libraries/haskell/cassava/default.nix
+++ b/pkgs/development/libraries/haskell/cassava/default.nix
@@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "cassava";
- version = "0.4.1.0";
- sha256 = "0whky3mavmprr8cgnzlg2ich99w09bdlks8rg6z9m1x86q66ivw2";
+ version = "0.4.2.0";
+ sha256 = "1v1izdjd4maqrlpm4cf2xpackpjp1i4vg1s7mzq90dwa6r9572x3";
buildDepends = [
attoparsec blazeBuilder deepseq text unorderedContainers vector
];
diff --git a/pkgs/development/libraries/haskell/cereal-conduit/default.nix b/pkgs/development/libraries/haskell/cereal-conduit/default.nix
index e15d10bd45b..baad2943358 100644
--- a/pkgs/development/libraries/haskell/cereal-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/cereal-conduit/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "cereal-conduit";
- version = "0.7.2.2";
- sha256 = "1syqilka5rv2j3yp419f2wdrcfw8js6i2p7qif4yxvlkm2hkvzzk";
+ version = "0.7.2.3";
+ sha256 = "0s1s8jm25wxj44x44vjz4kz5qblkyjaz7f8rw5i81bzam32afj9s";
buildDepends = [ cereal conduit resourcet transformers ];
testDepends = [ cereal conduit HUnit mtl resourcet transformers ];
meta = {
diff --git a/pkgs/development/libraries/haskell/cgi/3001.2.0.0.nix b/pkgs/development/libraries/haskell/cgi/3001.2.0.0.nix
new file mode 100644
index 00000000000..2bacef96e08
--- /dev/null
+++ b/pkgs/development/libraries/haskell/cgi/3001.2.0.0.nix
@@ -0,0 +1,18 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, exceptions, mtl, network, networkUri, parsec, xhtml }:
+
+cabal.mkDerivation (self: {
+ pname = "cgi";
+ version = "3001.2.0.0";
+ sha256 = "03az978d5ayv5v4g89h4wajjhcribyf37b8ws8kvsqir3i7h7k8d";
+ buildDepends = [ exceptions mtl network networkUri parsec xhtml ];
+ meta = {
+ homepage = "https://github.com/cheecheeo/haskell-cgi";
+ description = "A library for writing CGI programs";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ hydraPlatforms = self.stdenv.lib.platforms.none;
+ broken = true;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/checkers/default.nix b/pkgs/development/libraries/haskell/checkers/default.nix
index fb7e86fc75f..65f9d20a19a 100644
--- a/pkgs/development/libraries/haskell/checkers/default.nix
+++ b/pkgs/development/libraries/haskell/checkers/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "checkers";
- version = "0.3.2";
- sha256 = "0v8i6754syvjh2p5qdqh95j3swkar9077gidsnahwk9h6qfsx6r3";
+ version = "0.4.1";
+ sha256 = "19ndgbivd07vchsqs6z9iqjl2jldbq7h4skqc9acracd9xyq1vdr";
buildDepends = [ QuickCheck random ];
meta = {
description = "Check properties on standard classes and data structures";
diff --git a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix
index 28e940f3489..b2a85e35699 100644
--- a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix
@@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "classy-prelude-conduit";
- version = "0.9.3";
- sha256 = "0wsl3mhczinxl6ij8dpv5001db740z4jq43l2gpzdylv6pmpldzr";
+ version = "0.9.5";
+ sha256 = "1m26d463h5hxiyc4dm6fwbyjwzmd0bwl2blwpgp4wqnyvspz195m";
buildDepends = [
classyPrelude conduit conduitCombinators monadControl resourcet
systemFileio transformers void
diff --git a/pkgs/development/libraries/haskell/classy-prelude/default.nix b/pkgs/development/libraries/haskell/classy-prelude/default.nix
index e45a6f256b9..b3f94ea7bdf 100644
--- a/pkgs/development/libraries/haskell/classy-prelude/default.nix
+++ b/pkgs/development/libraries/haskell/classy-prelude/default.nix
@@ -1,19 +1,20 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, basicPrelude, chunkedData, enclosedExceptions, exceptions
-, hashable, hspec, liftedBase, monoTraversable, QuickCheck
-, semigroups, stm, systemFilepath, text, time, transformers
-, unorderedContainers, vector, vectorInstances
+, hashable, hspec, liftedBase, monoTraversable, mtl, primitive
+, QuickCheck, semigroups, stm, systemFilepath, text, time
+, transformers, unorderedContainers, vector, vectorInstances
}:
cabal.mkDerivation (self: {
pname = "classy-prelude";
- version = "0.9.3";
- sha256 = "06y6zx3mmqjnha5p7y7blzn77bij71kndw2bmi07wz4s4lj9xsiv";
+ version = "0.9.5";
+ sha256 = "1gd5z4gd62v3k59psmrj41ca6mly4fjqgf4l80smv89kc2s2w809";
buildDepends = [
basicPrelude chunkedData enclosedExceptions exceptions hashable
- liftedBase monoTraversable semigroups stm systemFilepath text time
- transformers unorderedContainers vector vectorInstances
+ liftedBase monoTraversable mtl primitive semigroups stm
+ systemFilepath text time transformers unorderedContainers vector
+ vectorInstances
];
testDepends = [
hspec QuickCheck transformers unorderedContainers
diff --git a/pkgs/development/libraries/haskell/clock/default.nix b/pkgs/development/libraries/haskell/clock/default.nix
index 3c064d1db2d..60bea4fed83 100644
--- a/pkgs/development/libraries/haskell/clock/default.nix
+++ b/pkgs/development/libraries/haskell/clock/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "clock";
- version = "0.4.0.1";
- sha256 = "1bn6dalank30l680iifyam0mg9izxbyscgq0vmr1aw5brba5kv6j";
+ version = "0.4.1.1";
+ sha256 = "0xbhx16sa0rwidaljp8lklb5ifhdc8cccbyznrpxqqwh8icm5pjp";
meta = {
homepage = "http://corsis.github.com/clock/";
description = "High-resolution clock functions: monotonic, realtime, cputime";
diff --git a/pkgs/development/libraries/haskell/cmdargs/default.nix b/pkgs/development/libraries/haskell/cmdargs/default.nix
index 829f7be4fba..a3c7cd1773f 100644
--- a/pkgs/development/libraries/haskell/cmdargs/default.nix
+++ b/pkgs/development/libraries/haskell/cmdargs/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "cmdargs";
- version = "0.10.9";
- sha256 = "12phn22iri2v65gbxzl580mikkj05rwx4sjn5c31f871wp0538my";
+ version = "0.10.10";
+ sha256 = "17glliishfxc01ippgzb8v12i40id2b6l18rqp6wfygbb7f93rvv";
isLibrary = true;
isExecutable = true;
buildDepends = [ filepath transformers ];
diff --git a/pkgs/development/libraries/haskell/code-builder/default.nix b/pkgs/development/libraries/haskell/code-builder/default.nix
index 77883f5a07a..92cc3f0f9d8 100644
--- a/pkgs/development/libraries/haskell/code-builder/default.nix
+++ b/pkgs/development/libraries/haskell/code-builder/default.nix
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
description = "Simple system for generating code";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
+ maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
};
})
diff --git a/pkgs/development/libraries/haskell/compdata-param/default.nix b/pkgs/development/libraries/haskell/compdata-param/default.nix
new file mode 100644
index 00000000000..2ab1ecd9131
--- /dev/null
+++ b/pkgs/development/libraries/haskell/compdata-param/default.nix
@@ -0,0 +1,20 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, compdata, HUnit, mtl, testFramework, testFrameworkHunit
+, transformers
+}:
+
+cabal.mkDerivation (self: {
+ pname = "compdata-param";
+ version = "0.8.0.2";
+ sha256 = "0496i1vnawl7m7ymvf5hl3kxy352rnhxy2gni4xkfz36psnnr7fs";
+ buildDepends = [ compdata mtl transformers ];
+ testDepends = [
+ compdata HUnit mtl testFramework testFrameworkHunit transformers
+ ];
+ meta = {
+ description = "Parametric Compositional Data Types";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/conduit-combinators/default.nix b/pkgs/development/libraries/haskell/conduit-combinators/default.nix
index 17598dda06b..4c194279b4e 100644
--- a/pkgs/development/libraries/haskell/conduit-combinators/default.nix
+++ b/pkgs/development/libraries/haskell/conduit-combinators/default.nix
@@ -8,8 +8,8 @@
cabal.mkDerivation (self: {
pname = "conduit-combinators";
- version = "0.2.8.2";
- sha256 = "1x2g333ygiv4jvwx4lw579kwx1z5m80cqfqgzv0pi5xdxcagy1ha";
+ version = "0.2.8.3";
+ sha256 = "1a3dysrxg7mhm9naqj6vq45k0vxihar7pn650rb8aw22k85ifmkz";
buildDepends = [
base16Bytestring base64Bytestring chunkedData conduit conduitExtra
monadControl monoTraversable mwcRandom primitive resourcet
diff --git a/pkgs/development/libraries/haskell/conduit-extra/default.nix b/pkgs/development/libraries/haskell/conduit-extra/default.nix
index 1cb2b0efe6c..8443a4909fc 100644
--- a/pkgs/development/libraries/haskell/conduit-extra/default.nix
+++ b/pkgs/development/libraries/haskell/conduit-extra/default.nix
@@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "conduit-extra";
- version = "1.1.3.2";
- sha256 = "15flywjw5ha8cgn4yznwlnx31ls4y82gfmvbniby0d51y4x8dmgq";
+ version = "1.1.4";
+ sha256 = "117mzy0qm8w2kzjcshcwcfbx01ybbhn63vdgzllc7cb9x4cj2ibv";
buildDepends = [
attoparsec blazeBuilder conduit filepath monadControl network
primitive resourcet stm streamingCommons text transformers
diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix
index f3c27ebae95..5b82a2f26a0 100644
--- a/pkgs/development/libraries/haskell/conduit/default.nix
+++ b/pkgs/development/libraries/haskell/conduit/default.nix
@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "conduit";
- version = "1.1.7";
- sha256 = "0xk2his7qbidnzs56xcgnjipbnqmmnh74qy8dfvbznkkqhxdzmz6";
+ version = "1.2.0.2";
+ sha256 = "0gr4vqyvy3jdc1l7sinwr5dgmwzv7dq2z1npwvmbxz85bq89rmd9";
buildDepends = [
exceptions liftedBase mmorph monadControl mtl resourcet
transformers transformersBase void
diff --git a/pkgs/development/libraries/haskell/criterion/default.nix b/pkgs/development/libraries/haskell/criterion/default.nix
index 7cac43769f8..5a5ce89f732 100644
--- a/pkgs/development/libraries/haskell/criterion/default.nix
+++ b/pkgs/development/libraries/haskell/criterion/default.nix
@@ -9,8 +9,8 @@
cabal.mkDerivation (self: {
pname = "criterion";
- version = "1.0.0.2";
- sha256 = "1r30vcrplilj3silnrmn0r5m0df27icdsgd5hx35li9yrs862n95";
+ version = "1.0.1.0";
+ sha256 = "1mp4rm6jd8g38yyhfrxk1xzhp6mxrwwns9kl6494ylsdpsv0v4ll";
isLibrary = true;
isExecutable = true;
buildDepends = [
diff --git a/pkgs/development/libraries/haskell/crypto-api/default.nix b/pkgs/development/libraries/haskell/crypto-api/default.nix
index 7c1d6308131..2a83b248674 100644
--- a/pkgs/development/libraries/haskell/crypto-api/default.nix
+++ b/pkgs/development/libraries/haskell/crypto-api/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "crypto-api";
- version = "0.13";
- sha256 = "00zw9cymjhsdiy2p4prjvmmy7xnk12qggdpvxrp0hjnwlakfvyb2";
+ version = "0.13.2";
+ sha256 = "1vc27qcgbg7hf50rkqhlrs58zn1888ilh4b6wrrm07bnm48xacak";
buildDepends = [ cereal entropy tagged transformers ];
meta = {
homepage = "https://github.com/TomMD/crypto-api";
diff --git a/pkgs/development/libraries/haskell/crypto-random/default.nix b/pkgs/development/libraries/haskell/crypto-random/default.nix
index 878eb3d2c71..c7053cbf1e3 100644
--- a/pkgs/development/libraries/haskell/crypto-random/default.nix
+++ b/pkgs/development/libraries/haskell/crypto-random/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "crypto-random";
- version = "0.0.7";
- sha256 = "1dj63y85l3f1x7fw8j7hykz56ajd38iikl3f8ygaz8r95pd1zjxw";
+ version = "0.0.8";
+ sha256 = "058ilm05ni5ribggx25cfrhsv1z0abvgxzf3wd3d6qqq58p5wbkv";
buildDepends = [ securemem vector ];
meta = {
homepage = "http://github.com/vincenthz/hs-crypto-random";
diff --git a/pkgs/development/libraries/haskell/cuda/default.nix b/pkgs/development/libraries/haskell/cuda/default.nix
index c6daa8b5fdd..7e09fc12f70 100644
--- a/pkgs/development/libraries/haskell/cuda/default.nix
+++ b/pkgs/development/libraries/haskell/cuda/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "cuda";
- version = "0.6.0.1";
- sha256 = "03wnkqgdvy6h2dqcmj0xlag3am3s3rjzhx0kqaq362mq365n9y51";
+ version = "0.6.5.0";
+ sha256 = "0q4c2xgffkchn8kxhiwjganmb3ki4yjhx5665zwfd18bgvmlnp60";
buildTools = [ c2hs ];
extraLibraries = [ cudatoolkit nvidia_x11 self.stdenv.gcc ];
doCheck = false;
diff --git a/pkgs/development/libraries/haskell/diagrams/cairo.nix b/pkgs/development/libraries/haskell/diagrams/cairo.nix
index 3a695fa8203..cd42f175b96 100644
--- a/pkgs/development/libraries/haskell/diagrams/cairo.nix
+++ b/pkgs/development/libraries/haskell/diagrams/cairo.nix
@@ -7,13 +7,14 @@
cabal.mkDerivation (self: {
pname = "diagrams-cairo";
- version = "1.2.0.1";
- sha256 = "0y7llxxs34i814nc3c79ykv75znplzqq7njvq7a5fyxl81ji0z4c";
+ version = "1.2.0.2";
+ sha256 = "0qm1s56kg7l96p5cvmdxc0g8r8ibh7vpyavp64178mdy62b6xavh";
buildDepends = [
cairo colour dataDefaultClass diagramsCore diagramsLib filepath
hashable JuicyPixels lens mtl optparseApplicative pango split
statestack time transformers vector
];
+ jailbreak = true;
meta = {
homepage = "http://projects.haskell.org/diagrams";
description = "Cairo backend for diagrams drawing EDSL";
diff --git a/pkgs/development/libraries/haskell/diagrams/contrib.nix b/pkgs/development/libraries/haskell/diagrams/contrib.nix
index f1044870f3a..832617d64b7 100644
--- a/pkgs/development/libraries/haskell/diagrams/contrib.nix
+++ b/pkgs/development/libraries/haskell/diagrams/contrib.nix
@@ -9,8 +9,8 @@
cabal.mkDerivation (self: {
pname = "diagrams-contrib";
- version = "1.1.2.1";
- sha256 = "05jsqc9wm87hpnaclzfa376m5z8lnp4qgll6lqnfa5m49cqcabki";
+ version = "1.1.2.2";
+ sha256 = "1a9ayqyffgwq8k9d8l12s6l1pqv27fvzngsklnh3y1bgp20d2z01";
buildDepends = [
arithmoi circlePacking colour dataDefault dataDefaultClass
diagramsCore diagramsLib forceLayout lens MonadRandom mtl parsec
diff --git a/pkgs/development/libraries/haskell/diagrams/gtk.nix b/pkgs/development/libraries/haskell/diagrams/gtk.nix
new file mode 100644
index 00000000000..c169c9e0e48
--- /dev/null
+++ b/pkgs/development/libraries/haskell/diagrams/gtk.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, cairo, diagramsCairo, diagramsLib, gtk }:
+
+cabal.mkDerivation (self: {
+ pname = "diagrams-gtk";
+ version = "1.0.1.3";
+ sha256 = "1bcgplmg01sp7iwhgx7ircbn9bj15m42w6vkh539sd65y01z3hc8";
+ buildDepends = [ cairo diagramsCairo diagramsLib gtk ];
+ meta = {
+ homepage = "http://projects.haskell.org/diagrams/";
+ description = "Backend for rendering diagrams directly to GTK windows";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/diagrams/lib.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix
index b15f05dbf27..ea5b1aad27f 100644
--- a/pkgs/development/libraries/haskell/diagrams/lib.nix
+++ b/pkgs/development/libraries/haskell/diagrams/lib.nix
@@ -8,8 +8,8 @@
cabal.mkDerivation (self: {
pname = "diagrams-lib";
- version = "1.2.0.2";
- sha256 = "0ylrsldq7nmqvprgwbw7bkwp31zhgbyxjx462lcayk0lbhqb5k5p";
+ version = "1.2.0.3";
+ sha256 = "1rgyv7yywmqk3s2cmv5s923421ybj6mnii7jgxri56jzw0agfyq7";
buildDepends = [
active colour dataDefaultClass diagramsCore dualTree filepath
fingertree hashable intervals JuicyPixels lens MemoTrie
diff --git a/pkgs/development/libraries/haskell/diagrams/rasterific.nix b/pkgs/development/libraries/haskell/diagrams/rasterific.nix
new file mode 100644
index 00000000000..6d20bcd2376
--- /dev/null
+++ b/pkgs/development/libraries/haskell/diagrams/rasterific.nix
@@ -0,0 +1,24 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, dataDefaultClass, diagramsCore, diagramsLib, filepath
+, FontyFruity, JuicyPixels, lens, mtl, optparseApplicative
+, Rasterific, split, statestack, time
+}:
+
+cabal.mkDerivation (self: {
+ pname = "diagrams-rasterific";
+ version = "0.1.0.2";
+ sha256 = "16pwpa34hxf8qd7mf3zn4k7sr6p2pkvag3c77iwcs5qwqf5vhyf9";
+ buildDepends = [
+ dataDefaultClass diagramsCore diagramsLib filepath FontyFruity
+ JuicyPixels lens mtl optparseApplicative Rasterific split
+ statestack time
+ ];
+ meta = {
+ homepage = "http://projects.haskell.org/diagrams/";
+ description = "Rasterific backend for diagrams";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = with self.stdenv.lib.maintainers; [ bergey ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix
index aae120d5681..4c1ca9cd9ae 100644
--- a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix
+++ b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix
@@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "digestive-functors-heist";
- version = "0.8.5.0";
- sha256 = "0pjjr3b1zm23wpqnmcbr8ly08bp63sz3c9vbxcani4mwgx05qp87";
+ version = "0.8.6.0";
+ sha256 = "0n73hw8xl70x7c3hn4hz1qqijvvhv0qk30q0c22lnbjaf4n8dki2";
buildDepends = [
blazeBuilder digestiveFunctors heist mtl text xmlhtml
];
diff --git a/pkgs/development/libraries/haskell/dimensional-tf/default.nix b/pkgs/development/libraries/haskell/dimensional-tf/default.nix
index c93a564c3e3..b6e3f40f937 100644
--- a/pkgs/development/libraries/haskell/dimensional-tf/default.nix
+++ b/pkgs/development/libraries/haskell/dimensional-tf/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "dimensional-tf";
- version = "0.3";
- sha256 = "0z3k9962zz652bk2azv9lcms1j06v60hid3iach043dpg5r083qg";
+ version = "0.3.0.1";
+ sha256 = "0gnaylxhjcyvsibq15bw9k4c846l2329yvvl79cdw2jqggfnzxw6";
buildDepends = [ numtypeTf time ];
meta = {
homepage = "http://dimensional.googlecode.com/";
diff --git a/pkgs/development/libraries/haskell/dimensional/default.nix b/pkgs/development/libraries/haskell/dimensional/default.nix
index 3435bf57d5c..9be32b5596a 100644
--- a/pkgs/development/libraries/haskell/dimensional/default.nix
+++ b/pkgs/development/libraries/haskell/dimensional/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "dimensional";
- version = "0.13";
- sha256 = "1nj8h79iq7pirqlj8iw1p782nm05xgym3469x7hlzaz3ig9nwgrg";
+ version = "0.13.0.1";
+ sha256 = "1cn7gyskp0ax5lm5k05p6qp461hirjyhj0k1qyd64fgdmmp81vi6";
buildDepends = [ numtype time ];
meta = {
homepage = "http://dimensional.googlecode.com/";
diff --git a/pkgs/development/libraries/haskell/directory-layout/default.nix b/pkgs/development/libraries/haskell/directory-layout/default.nix
new file mode 100644
index 00000000000..2cc9682dccb
--- /dev/null
+++ b/pkgs/development/libraries/haskell/directory-layout/default.nix
@@ -0,0 +1,25 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, commandQq, doctest, filepath, free, hspec, lens
+, semigroups, temporary, text, transformers, unorderedContainers
+}:
+
+cabal.mkDerivation (self: {
+ pname = "directory-layout";
+ version = "0.7.4.1";
+ sha256 = "0hj7dfv5i2s1dk0rws2fg84crpxz1kgvrq68f373a6hwkbfhv89b";
+ buildDepends = [
+ commandQq filepath free hspec lens semigroups text transformers
+ unorderedContainers
+ ];
+ testDepends = [
+ commandQq doctest filepath free hspec lens semigroups temporary
+ text transformers unorderedContainers
+ ];
+ doCheck = false;
+ meta = {
+ description = "Directory layout DSL";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/djinn/default.nix b/pkgs/development/libraries/haskell/djinn/default.nix
index 12ff67c7f20..e922d9ff7be 100644
--- a/pkgs/development/libraries/haskell/djinn/default.nix
+++ b/pkgs/development/libraries/haskell/djinn/default.nix
@@ -4,20 +4,14 @@
cabal.mkDerivation (self: {
pname = "djinn";
- version = "2011.7.23";
- sha256 = "14748pqzrd1r9jg2vc9v232pi38q99l9zdlia6ashm2v871hp1xv";
+ version = "2014.9.7";
+ sha256 = "1p9dvzb83nlrq8h4brdq5l9dm2zf28rjhsmi7nwmac79p5pk9y2g";
isLibrary = false;
isExecutable = true;
buildDepends = [ haskeline mtl ];
- preConfigure = self.stdenv.lib.optionalString self.stdenv.isDarwin ''
- sed -i 's/-Wall -optl-Wl/-Wall/' djinn.cabal
- '';
meta = {
- homepage = "http://www.augustsson.net/Darcs/Djinn/";
description = "Generate Haskell code from a type";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
- hydraPlatforms = self.stdenv.lib.platforms.none;
- broken = self.stdenv.lib.versionOlder "7.7" self.ghc.version;
};
})
diff --git a/pkgs/development/libraries/haskell/dns/default.nix b/pkgs/development/libraries/haskell/dns/default.nix
index 113e1af46ee..ab74819965a 100644
--- a/pkgs/development/libraries/haskell/dns/default.nix
+++ b/pkgs/development/libraries/haskell/dns/default.nix
@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "dns";
- version = "1.4.3";
- sha256 = "15v24f338w71dn3cxrzwyg04hk3vxvrvswbv3nnf2ggjgg46yq3i";
+ version = "1.4.4";
+ sha256 = "1g910rlahvrhjlg6jl7gpya1y3mqkkpmihfr2jnmmlzykll10dnd";
buildDepends = [
attoparsec binary blazeBuilder conduit conduitExtra iproute mtl
network random resourcet
@@ -21,5 +21,6 @@ cabal.mkDerivation (self: {
description = "DNS library in Haskell";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
+ maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
};
})
diff --git a/pkgs/development/libraries/haskell/doctest/default.nix b/pkgs/development/libraries/haskell/doctest/default.nix
index 018fac06670..af3f9e2d525 100644
--- a/pkgs/development/libraries/haskell/doctest/default.nix
+++ b/pkgs/development/libraries/haskell/doctest/default.nix
@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "doctest";
- version = "0.9.11";
- sha256 = "04y6y5hixqh8awl37wrss20c2drvx070w7wd6icfx7r0jqds97jr";
+ version = "0.9.11.1";
+ sha256 = "1gzzzwr7f7281mlbfbk74nxr28l70lwfaws4xjfx2v06xazl99db";
isLibrary = true;
isExecutable = true;
buildDepends = [ deepseq filepath ghcPaths syb transformers ];
@@ -18,7 +18,7 @@ cabal.mkDerivation (self: {
doCheck = false;
noHaddock = self.stdenv.lib.versionOlder self.ghc.version "7.4";
meta = {
- homepage = "https://github.com/sol/doctest-haskell#readme";
+ homepage = "https://github.com/sol/doctest#readme";
description = "Test interactive Haskell examples";
license = self.stdenv.lib.licenses.mit;
platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/either/default.nix b/pkgs/development/libraries/haskell/either/default.nix
index 6d55afd41d6..d2fb0964dd9 100644
--- a/pkgs/development/libraries/haskell/either/default.nix
+++ b/pkgs/development/libraries/haskell/either/default.nix
@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "either";
- version = "4.3.0.1";
- sha256 = "1ib6288gxzqfm2y198dzhhq588mlwqxm07pcrj4h66g1mcy54q1f";
+ version = "4.3.1";
+ sha256 = "1k7aqy3k0ivpbqhym79q49dx41gnrkn1nw2inkm6gv8dy7bj9h6x";
buildDepends = [
exceptions free monadControl MonadRandom mtl semigroupoids
semigroups transformers transformersBase
diff --git a/pkgs/development/libraries/haskell/engine-io-snap/default.nix b/pkgs/development/libraries/haskell/engine-io-snap/default.nix
index 70c7a1c7d4f..b37ef7c2bc1 100644
--- a/pkgs/development/libraries/haskell/engine-io-snap/default.nix
+++ b/pkgs/development/libraries/haskell/engine-io-snap/default.nix
@@ -1,18 +1,19 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-{ cabal, attoparsecEnumerator, engineIo, snapCore
-, unorderedContainers, websockets, websocketsSnap
+{ cabal, attoparsecEnumerator, engineIo, MonadCatchIOTransformers
+, snapCore, unorderedContainers, websockets, websocketsSnap
}:
cabal.mkDerivation (self: {
pname = "engine-io-snap";
- version = "1.0.1";
- sha256 = "1hw3gmi23fdcgvz817b95bf23wa7qyg10axsnvan5qxr73pwp5iv";
+ version = "1.0.2";
+ sha256 = "0x2sb3b825ds1g2g15yyqxdrw6bh968ivmyd1933l47649qbs0xr";
buildDepends = [
- attoparsecEnumerator engineIo snapCore unorderedContainers
- websockets websocketsSnap
+ attoparsecEnumerator engineIo MonadCatchIOTransformers snapCore
+ unorderedContainers websockets websocketsSnap
];
meta = {
+ homepage = "http://github.com/ocharles/engine.io";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
diff --git a/pkgs/development/libraries/haskell/engine-io/default.nix b/pkgs/development/libraries/haskell/engine-io/default.nix
index 82cb1240610..9e3d6a5b5b1 100644
--- a/pkgs/development/libraries/haskell/engine-io/default.nix
+++ b/pkgs/development/libraries/haskell/engine-io/default.nix
@@ -7,13 +7,12 @@
cabal.mkDerivation (self: {
pname = "engine-io";
- version = "1.1.0";
- sha256 = "0l2jwgzi22ky13k9kmqhn15zyxyg5gr167rkywb458n1si4jr3jh";
+ version = "1.2.0";
+ sha256 = "07k5zc8zbjpcj3iql0kcs4zrw5g24cngkp9yanpdmnhi18ms45dv";
buildDepends = [
aeson async attoparsec base64Bytestring either monadLoops mwcRandom
stm text transformers unorderedContainers vector websockets
];
- jailbreak = true;
meta = {
homepage = "http://github.com/ocharles/engine.io";
description = "A Haskell implementation of Engine.IO";
diff --git a/pkgs/development/libraries/haskell/entropy/default.nix b/pkgs/development/libraries/haskell/entropy/default.nix
index 881a9cd9a0a..207cc0ea5da 100644
--- a/pkgs/development/libraries/haskell/entropy/default.nix
+++ b/pkgs/development/libraries/haskell/entropy/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "entropy";
- version = "0.3.2";
- sha256 = "1kk0vmfmfqcsw0pzbii9rvz32fvhvxqpn6p6jw6q2x33z6gm5f9x";
+ version = "0.3.3";
+ sha256 = "0px97mims7pbxyh8jqckc14ahdjj7r3hhckzpjqnxpkcisb2c738";
meta = {
homepage = "https://github.com/TomMD/entropy";
description = "A platform independent entropy source";
diff --git a/pkgs/development/libraries/haskell/esqueleto/default.nix b/pkgs/development/libraries/haskell/esqueleto/default.nix
index 637f32c3996..c3b4850f5b2 100644
--- a/pkgs/development/libraries/haskell/esqueleto/default.nix
+++ b/pkgs/development/libraries/haskell/esqueleto/default.nix
@@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "esqueleto";
- version = "1.4.4";
- sha256 = "00s52f8l5pbsab83fq8d03xhispyp9mqsh5vvzwiki6kspkj26a0";
+ version = "2.0.2";
+ sha256 = "1r8w3h36fhj77llcfgiq6ww634jymz8fpm86fm17arj7m7ll6rq3";
buildDepends = [
conduit monadLogger persistent resourcet tagged text transformers
unorderedContainers
diff --git a/pkgs/development/libraries/haskell/fay/default.nix b/pkgs/development/libraries/haskell/fay/default.nix
index edbf19bda62..90e3c5dadfc 100644
--- a/pkgs/development/libraries/haskell/fay/default.nix
+++ b/pkgs/development/libraries/haskell/fay/default.nix
@@ -1,24 +1,23 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-{ cabal, aeson, attoparsec, dataDefault, filepath, ghcPaths, groom
-, haskellNames, haskellPackages, haskellSrcExts, languageEcmascript
-, mtl, optparseApplicative, safe, sourcemap, split, spoon, syb
-, tasty, tastyHunit, tastyTh, text, time, transformers, uniplate
-, unorderedContainers, utf8String, vector
+{ cabal, aeson, dataDefault, filepath, ghcPaths, haskellNames
+, haskellPackages, haskellSrcExts, languageEcmascript, mtl
+, optparseApplicative, safe, sourcemap, split, spoon, syb, text
+, time, transformers, uniplate, unorderedContainers, utf8String
+, vector
}:
cabal.mkDerivation (self: {
pname = "fay";
- version = "0.20.1.2";
- sha256 = "1ssii9wkml8jn8kcdq8h6sxrq4gap4asyglakvif2zawl3sqrdji";
+ version = "0.20.2.0";
+ sha256 = "1xblfsd1rj38nlw0dl56zvvnad3l0bpsncv1k5vjs4h8cmwl1ik2";
isLibrary = true;
isExecutable = true;
buildDepends = [
- aeson attoparsec dataDefault filepath ghcPaths groom haskellNames
- haskellPackages haskellSrcExts languageEcmascript mtl
- optparseApplicative safe sourcemap split spoon syb tasty tastyHunit
- tastyTh text time transformers uniplate unorderedContainers
- utf8String vector
+ aeson dataDefault filepath ghcPaths haskellNames haskellPackages
+ haskellSrcExts languageEcmascript mtl optparseApplicative safe
+ sourcemap split spoon syb text time transformers uniplate
+ unorderedContainers utf8String vector
];
meta = {
homepage = "https://github.com/faylang/fay/wiki";
diff --git a/pkgs/development/libraries/haskell/fb/default.nix b/pkgs/development/libraries/haskell/fb/default.nix
index 37d24309732..b35f994caaa 100644
--- a/pkgs/development/libraries/haskell/fb/default.nix
+++ b/pkgs/development/libraries/haskell/fb/default.nix
@@ -10,8 +10,8 @@
cabal.mkDerivation (self: {
pname = "fb";
- version = "1.0.4";
- sha256 = "1sp0x5p9l02i2ynvynazhgs5lqqwih997c2fyfp0xi24qsc7ilr2";
+ version = "1.0.5";
+ sha256 = "1y4i6w659v4zm6kxz8fnzrwm0gjv7siqlh1wdsm03rcadkicyxmr";
buildDepends = [
aeson attoparsec base16Bytestring base64Bytestring cereal conduit
conduitExtra cryptoApi cryptohash cryptohashCryptoapi dataDefault
diff --git a/pkgs/development/libraries/haskell/file-location/default.nix b/pkgs/development/libraries/haskell/file-location/default.nix
index 6cff9640cdf..e027047a9ea 100644
--- a/pkgs/development/libraries/haskell/file-location/default.nix
+++ b/pkgs/development/libraries/haskell/file-location/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "file-location";
- version = "0.4.5.2";
- sha256 = "0dyzf2lhh0n4hwbh44qfh6bw9snl4hha9sv76c4ndi7v1rvnx197";
+ version = "0.4.5.3";
+ sha256 = "0d1iqhdac1gcag1d7ch9ia4fm97jpp31m46b794z90bmm6nr29h9";
buildDepends = [ liftedBase transformers ];
testDepends = [ liftedBase transformers ];
meta = {
diff --git a/pkgs/development/libraries/haskell/foldl/default.nix b/pkgs/development/libraries/haskell/foldl/default.nix
index 7a942e97dc8..bd0cd070d11 100644
--- a/pkgs/development/libraries/haskell/foldl/default.nix
+++ b/pkgs/development/libraries/haskell/foldl/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "foldl";
- version = "1.0.5";
- sha256 = "08yjzzplg715hzkhwbf8nv2zm7c5wd2kph4zx94iml0cnc6ip048";
+ version = "1.0.7";
+ sha256 = "0mqxibifrlfqnibzy9b2rncy4dyljdz35560ni3rwi8hkyix74a9";
buildDepends = [ primitive text transformers vector ];
meta = {
description = "Composable, streaming, and efficient left folds";
diff --git a/pkgs/development/libraries/haskell/formatting/default.nix b/pkgs/development/libraries/haskell/formatting/default.nix
index 1345ac76243..04fd9185081 100644
--- a/pkgs/development/libraries/haskell/formatting/default.nix
+++ b/pkgs/development/libraries/haskell/formatting/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "formatting";
- version = "5.2";
- sha256 = "0lmbzm98idy7bzpvaqnk9j6181vakk553smqkf959gn5jdj95z3k";
+ version = "5.4";
+ sha256 = "017fm3pqr2nqpcqmpldr74cvb641hxvybhvnwv8a8vv4ry1vdrk9";
buildDepends = [ scientific text textFormat time ];
meta = {
description = "Combinator-based type-safe formatting (like printf() or FORMAT)";
diff --git a/pkgs/development/libraries/haskell/free-game/default.nix b/pkgs/development/libraries/haskell/free-game/default.nix
index d2a0f33892f..ee47e6bb3f5 100644
--- a/pkgs/development/libraries/haskell/free-game/default.nix
+++ b/pkgs/development/libraries/haskell/free-game/default.nix
@@ -21,5 +21,6 @@ cabal.mkDerivation (self: {
description = "Create games for free";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
+ maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
};
})
diff --git a/pkgs/development/libraries/haskell/fsnotify/default.nix b/pkgs/development/libraries/haskell/fsnotify/default.nix
index 3d308f6a88f..4db72b35234 100644
--- a/pkgs/development/libraries/haskell/fsnotify/default.nix
+++ b/pkgs/development/libraries/haskell/fsnotify/default.nix
@@ -1,18 +1,19 @@
-{ stdenv, cabal, Cabal, Glob, hspec, QuickCheck, random
-, systemFileio, systemFilepath, text, time, uniqueid
-, hinotify, hfsevents
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, async, hinotify, systemFileio, systemFilepath, tasty
+, tastyHunit, temporaryRc, text, time
}:
cabal.mkDerivation (self: {
pname = "fsnotify";
- version = "0.0.11";
- sha256 = "03m911pncyzgfdx4aj38azbbmj25fdm3s9l1w27zv0l730fy8ywq";
- buildDepends = [ systemFileio systemFilepath text time ] ++
- (if stdenv.isDarwin then [ hfsevents ] else [ hinotify ]);
+ version = "0.1.0.3";
+ sha256 = "0m6jyg45azk377jklgwyqrx95q174cxd5znpyh9azznkh09wq58z";
+ buildDepends = [
+ async hinotify systemFileio systemFilepath text time
+ ];
testDepends = [
- Cabal Glob hspec QuickCheck random systemFileio
- systemFilepath text time uniqueid
- ] ++ (if stdenv.isDarwin then [ hfsevents ] else [ hinotify ]);
+ async systemFileio systemFilepath tasty tastyHunit temporaryRc
+ ];
doCheck = false;
meta = {
description = "Cross platform library for file change notification";
diff --git a/pkgs/development/libraries/haskell/functor-infix/default.nix b/pkgs/development/libraries/haskell/functor-infix/default.nix
new file mode 100644
index 00000000000..d3e6322a7cb
--- /dev/null
+++ b/pkgs/development/libraries/haskell/functor-infix/default.nix
@@ -0,0 +1,15 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal }:
+
+cabal.mkDerivation (self: {
+ pname = "functor-infix";
+ version = "0.0.1";
+ sha256 = "1f8m4nxlr2il9j0ilgw91fhp6mmz5xqlhylavncqwvbcq82362dc";
+ meta = {
+ homepage = "https://github.com/fmap/functor-infix";
+ description = "Compositions of functors";
+ license = self.stdenv.lib.licenses.mit;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/generic-aeson/default.nix b/pkgs/development/libraries/haskell/generic-aeson/default.nix
index 9c18b511efc..7cea462a1cb 100644
--- a/pkgs/development/libraries/haskell/generic-aeson/default.nix
+++ b/pkgs/development/libraries/haskell/generic-aeson/default.nix
@@ -1,19 +1,21 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, aeson, attoparsec, genericDeriving, mtl, tagged, text
-, vector
+, unorderedContainers, vector
}:
cabal.mkDerivation (self: {
pname = "generic-aeson";
- version = "0.1.1.1";
- sha256 = "14jpma2p4dxmzpwd557igbg7xhgdzp9w9fm6dxa06sgfqxvb7ln1";
+ version = "0.2.0.0";
+ sha256 = "0w7bwmbjsskynyfisnhp4piikdw2jkr4zg24c9ipsp28szy8qsb9";
buildDepends = [
- aeson attoparsec genericDeriving mtl tagged text vector
+ aeson attoparsec genericDeriving mtl tagged text
+ unorderedContainers vector
];
meta = {
description = "Derivation of Aeson instances using GHC generics";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
+ maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
};
})
diff --git a/pkgs/development/libraries/haskell/geniplate/default.nix b/pkgs/development/libraries/haskell/geniplate/default.nix
index 9ab6d2df709..87e1296330a 100644
--- a/pkgs/development/libraries/haskell/geniplate/default.nix
+++ b/pkgs/development/libraries/haskell/geniplate/default.nix
@@ -4,11 +4,11 @@
cabal.mkDerivation (self: {
pname = "geniplate";
- version = "0.6.0.4";
- sha256 = "1sw1bs3nzbdmvphy5g65pl40y8wdqkgvszx1i6viqjymjq96xv20";
+ version = "0.6.0.5";
+ sha256 = "01cwyf5kql4hf76p1ssqpmhaxyl7rmnmqwv644wgd0j8km8b6szc";
buildDepends = [ mtl ];
meta = {
- description = "Use template Haskell to generate Uniplate-like functions";
+ description = "Use Template Haskell to generate Uniplate-like functions";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
diff --git a/pkgs/development/libraries/haskell/ghc-mod/4.1.6.nix b/pkgs/development/libraries/haskell/ghc-mod/4.1.6.nix
deleted file mode 100644
index a9c06e80f8a..00000000000
--- a/pkgs/development/libraries/haskell/ghc-mod/4.1.6.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Cabal, convertible, deepseq, doctest, emacs, filepath
-, ghcSybUtils, hlint, hspec, ioChoice, syb, time, transformers
-}:
-
-cabal.mkDerivation (self: {
- pname = "ghc-mod";
- version = "4.1.6";
- sha256 = "093wafaizr2xf7vmzj6f3vs8ch0vpcmwlrja6af6hshgaj2d80qs";
- isLibrary = true;
- isExecutable = true;
- buildDepends = [
- Cabal convertible deepseq filepath ghcSybUtils hlint ioChoice syb
- time transformers
- ];
- testDepends = [
- Cabal convertible deepseq doctest filepath ghcSybUtils hlint hspec
- ioChoice syb time transformers
- ];
- buildTools = [ emacs ];
- doCheck = false;
- configureFlags = "--datasubdir=${self.pname}-${self.version}";
- postInstall = ''
- cd $out/share/$pname-$version
- make
- rm Makefile
- cd ..
- mkdir -p "$out/share/emacs"
- mv $pname-$version emacs/site-lisp
- mv $out/bin/ghc-mod $out/bin/.ghc-mod-wrapped
- cat - > $out/bin/ghc-mod < getEnvironment
- let xs = [takeDirectory (takeDirectory lib) > "doc" {- Windows, installed with Cabal -} ] ++
- [takeDirectory (takeDirectory ghc) > "doc/html/libraries" | Just ghc <- [ghc] {- Windows, installed by GHC -} ] ++
-+ maybeToList path ++
- [home > ".cabal/share/doc" {- Linux -} ]
- filterM doesDirectoryExist xs
-
-diff --git a/src/Hoogle/Language/Haskell.hs b/src/Hoogle/Language/Haskell.hs
-index b037f11..f2ac047 100644
---- a/src/Hoogle/Language/Haskell.hs
-+++ b/src/Hoogle/Language/Haskell.hs
-@@ -112,7 +112,7 @@ setPriority pkg mod x = x{itemPriority = pri}
-
- setModuleURL (Just pkg) _ x | itemLevel x == 1 = x{itemURL=if null $ itemURL x then f $ itemName x else itemURL x}
- where f xs = if "http://hackage.haskell.org/package/" `isPrefixOf` itemURL pkg
-- then "http://hackage.haskell.org/packages/archive/" ++ itemName pkg ++ "/latest/doc/html/" ++ file
-+ then "http://hackage.haskell.org/package/" ++ itemName pkg ++ "/docs/" ++ file
- else takeDirectory (itemURL pkg) ++ "/" ++ file
- where file = reps '.' '-' xs ++ ".html"
- setModuleURL _ _ x = x
diff --git a/pkgs/development/libraries/haskell/hoogle/local.nix b/pkgs/development/libraries/haskell/hoogle/local.nix
index 490898a75b2..ba907948b14 100644
--- a/pkgs/development/libraries/haskell/hoogle/local.nix
+++ b/pkgs/development/libraries/haskell/hoogle/local.nix
@@ -9,12 +9,12 @@
# haskellPackages =
# let callPackage = pkgs.lib.callPackageWith haskellPackages;
# in pkgs.recurseIntoAttrs (pkgs.haskellPackages.override {
-# extraPrefs = self: {
+# extension = self: super: {
# hoogleLocal = pkgs.haskellPackages.hoogleLocal.override {
# packages = with pkgs.haskellPackages; [
# mmorph
# monadControl
-# ]
+# ];
# };
# };
# });
@@ -23,43 +23,22 @@
# This will build mmorph and monadControl, and have the hoogle installation
# refer to their documentation via symlink so they are not garbage collected.
-{ cabal, aeson, binary, blazeBuilder, Cabal, caseInsensitive
-, cmdargs, conduit, deepseq, filepath, haskellSrcExts, httpTypes
-, parsec, QuickCheck, random, resourcet, safe, shake, tagsoup, text
-, time, transformers, uniplate, vector, vectorAlgorithms, wai, warp
-, fetchurl
-
-, parallel, perl, wget, rehoo, haskellPlatform
-, packages ? haskellPlatform.propagatedUserEnvPkgs
+{ stdenv, hoogle, rehoo
+, haskellPlatform, ghc, packages ? [ haskellPlatform ghc.ghc ]
}:
-cabal.mkDerivation (self: rec {
- pname = "hoogle";
- version = "4.2.32";
- sha256 = "1rhr7xh4x9fgflcszbsl176r8jq6rm81bwzmbz73f3pa1zf1v0zc";
- isLibrary = true;
- isExecutable = true;
- buildInputs = [self.ghc Cabal] ++ self.extraBuildInputs
- ++ [ parallel perl wget rehoo ] ++ packages;
- buildDepends = [
- aeson binary blazeBuilder Cabal caseInsensitive cmdargs conduit
- deepseq filepath haskellSrcExts httpTypes parsec QuickCheck random
- resourcet safe shake tagsoup text time transformers uniplate vector
- vectorAlgorithms wai warp
- ];
- testDepends = [ filepath ];
- testTarget = "--test-option=--no-net";
+let
+ inherit (stdenv.lib) optional;
+ wrapper = ./hoogle-local-wrapper.sh;
+in
+stdenv.mkDerivation {
+ name = "hoogle-local-0.1";
+ buildInputs = [hoogle rehoo];
- # The tests will fail because of the added documentation.
- doCheck = false;
- patches = [ ./hoogle-local.diff
- (fetchurl { url = "https://github.com/ndmitchell/hoogle/commit/5fc294f2b5412fda107c7700f4d833b52f26184c.diff";
- sha256 = "1fn52g90p2jsy87gf5rqrcg49s8hfwway5hi4v9i2rpg5mzxaq3i"; })
- ];
+ phases = [ "installPhase" ];
docPackages = packages;
-
- postInstall = ''
+ installPhase = ''
if [ -z "$docPackages" ]; then
echo "ERROR: The packages attribute has not been set"
exit 1
@@ -71,27 +50,38 @@ cabal.mkDerivation (self: rec {
cd $out/share/hoogle
function import_dbs() {
- find $1 -name '*.txt' \
- | parallel -j$NIX_BUILD_CORES 'cp -p {} .; perl -i -pe "print \"\@url file://{//}/index.html\n\" if /^\@version/;" {/}; $out/bin/hoogle convert {/}'
+ find $1 -name '*.txt' | while read f; do
+ newname=$(basename "$f" | tr '[:upper:]' '[:lower:]')
+ if [[ -f $f && ! -f ./$newname ]]; then
+ cp -p $f ./$newname
+ hoogle convert -d "$(dirname $f)" "./$newname"
+ fi
+ done
}
for i in $docPackages; do
- import_dbs $i/share/doc
- ln -sf $i/share/doc/*-ghc-*/* $out/share/hoogle/doc 2> /dev/null \
- || ln -sf $i/share/doc/* $out/share/hoogle/doc
+ findInputs $i docPackages propagated-native-build-inputs
+ findInputs $i docPackages propagated-build-inputs
done
- import_dbs ${self.ghc}/share/doc/ghc*/html/libraries
- ln -sf ${self.ghc}/share/doc/ghc*/html/libraries/* $out/share/hoogle/doc
+ for i in $docPackages; do
+ if [[ ! $i == $out ]]; then
+ for docdir in $i/share/doc/*-ghc-*/* $i/share/doc/*; do
+ if [[ -d $docdir ]]; then
+ import_dbs $docdir
+ ln -sf $docdir $out/share/hoogle/doc
+ fi
+ done
+ fi
+ done
- unset http_proxy
- unset ftp_proxy
+ import_dbs ${ghc}/share/doc/ghc*/html/libraries
+ ln -sf ${ghc}/share/doc/ghc*/html/libraries/* $out/share/hoogle/doc
chmod 644 *.hoo *.txt
- $out/bin/hoogle data -d $PWD --redownload -l $(echo *.txt | sed 's/\.txt//g')
- PATH=$out/bin:$PATH ${rehoo}/bin/rehoo -j4 -c64 .
+ rehoo -j4 -c64 .
- rm -fr downloads *.txt *.dep
+ rm -fr downloads *.dep *.txt
mv default.hoo x || exit 0
rm -f *.hoo
mv x default.hoo || exit 1
@@ -101,23 +91,17 @@ cabal.mkDerivation (self: rec {
exit 1
fi
- mv $out/bin/hoogle $out/bin/.hoogle-wrapped
- cat - > $out/bin/hoogle < 1.7.6 update
};
}
diff --git a/pkgs/development/libraries/indilib/0_9_9.nix b/pkgs/development/libraries/indilib/0_9_9.nix
new file mode 100644
index 00000000000..f9447b14364
--- /dev/null
+++ b/pkgs/development/libraries/indilib/0_9_9.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, cmake, cfitsio, libusb1, zlib, boost, libnova, libjpeg, gsl, pkgconfig }:
+
+stdenv.mkDerivation {
+ name = "indilib-0.9.9";
+
+ src = fetchurl {
+ url = mirror://sourceforge/indi/libindi_0.9.9.tar.gz;
+ sha256 = "720b9096baef1489fd7d7d4a236177863a7f7cec86809f21d291b0d9758e4039";
+ };
+
+ propagatedBuildInputs = [ cfitsio libusb1 zlib boost libnova libjpeg gsl ];
+ nativeBuildInputs = [ cmake pkgconfig ];
+
+ preConfigure = ''
+ cmakeFlags+=" -DUDEVRULES_INSTALL_DIR=$out/etc/udev/rules.d"
+ '';
+
+ meta = {
+ homepage = http://indi.sf.net;
+ };
+}
diff --git a/pkgs/development/libraries/isl/0.12.2.nix b/pkgs/development/libraries/isl/0.12.2.nix
index f1da2c06409..67620881bca 100644
--- a/pkgs/development/libraries/isl/0.12.2.nix
+++ b/pkgs/development/libraries/isl/0.12.2.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
buildInputs = [ gmp ];
+ enableParallelBuilding = true;
+
meta = {
homepage = http://www.kotnet.org/~skimo/isl/;
license = stdenv.lib.licenses.lgpl21;
diff --git a/pkgs/development/libraries/isl/default.nix b/pkgs/development/libraries/isl/default.nix
index 7e08c8afe6f..931ee831b73 100644
--- a/pkgs/development/libraries/isl/default.nix
+++ b/pkgs/development/libraries/isl/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
buildInputs = [ gmp ];
patches = [ ./fix-gcc-build.diff ];
+ enableParallelBuilding = true;
+
meta = {
homepage = http://www.kotnet.org/~skimo/isl/;
license = stdenv.lib.licenses.lgpl21;
diff --git a/pkgs/development/libraries/java/commons/bcel/default.nix b/pkgs/development/libraries/java/commons/bcel/default.nix
new file mode 100644
index 00000000000..0bcd164a525
--- /dev/null
+++ b/pkgs/development/libraries/java/commons/bcel/default.nix
@@ -0,0 +1,24 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation rec {
+ version = "5.2";
+ name = "commons-bcel-${version}";
+
+ src = fetchurl {
+ url = "mirror://apache/commons/bcel/binaries/bcel-${version}.tar.gz";
+ sha256 = "13ppnd6afljdjq21jpn4ik2h1yxq8k2kg21ghi0lyb1yap1rd7k6";
+ };
+
+ installPhase = ''
+ tar xf ${src}
+ mkdir -p $out/share/java
+ cp bcel-5.2.jar $out/share/java/
+ '';
+
+ meta = {
+ homepage = "http://commons.apache.org/proper/commons-bcel/";
+ description = "Gives users a convenient way to analyze, create, and manipulate (binary) Java class files";
+ maintainers = with stdenv.lib.maintainers; [ copumpkin ];
+ license = stdenv.lib.licenses.asl20;
+ };
+}
diff --git a/pkgs/development/libraries/java/commons/compress/default.nix b/pkgs/development/libraries/java/commons/compress/default.nix
new file mode 100644
index 00000000000..2c20d9a9b36
--- /dev/null
+++ b/pkgs/development/libraries/java/commons/compress/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ version = "1.8.1";
+ name = "commons-compress-${version}";
+
+ src = fetchurl {
+ url = "mirror://apache/commons/compress/binaries/${name}-bin.tar.gz";
+ sha256 = "11viabgf34r3zx1avj51n00hzmx89kym3i90l6a5v5dbfh61h0lp";
+ };
+
+ installPhase = ''
+ tar xf ${src}
+ mkdir -p $out/share/java
+ cp *.jar $out/share/java/
+ '';
+
+ meta = {
+ homepage = "http://commons.apache.org/proper/commons-compress";
+ description = "Allows manipulation of ar, cpio, Unix dump, tar, zip, gzip, XZ, Pack200, bzip2, 7z, arj, lzma, snappy, DEFLATE and Z files.";
+ maintainers = with stdenv.lib.maintainers; [ copumpkin ];
+ license = stdenv.lib.licenses.asl20;
+ };
+}
diff --git a/pkgs/development/libraries/java/commons/fileupload/default.nix b/pkgs/development/libraries/java/commons/fileupload/default.nix
new file mode 100644
index 00000000000..ebb8a7d7f9d
--- /dev/null
+++ b/pkgs/development/libraries/java/commons/fileupload/default.nix
@@ -0,0 +1,23 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation rec {
+ version = "1.3.1";
+ name = "commons-fileupload-${version}";
+
+ src = fetchurl {
+ url = "mirror://apache/commons/fileupload/binaries/${name}-bin.tar.gz";
+ sha256 = "1jy7w2j2ay56mpq4ij3331cf9zgpkm832ydr63svb35j0ymnky72";
+ };
+ installPhase = ''
+ tar xf ${src}
+ mkdir -p $out/share/java
+ cp lib/*.jar $out/share/java/
+ '';
+
+ meta = {
+ homepage = "http://commons.apache.org/proper/commons-fileupload";
+ description = "Makes it easy to add robust, high-performance, file upload capability to your servlets and web applications.";
+ maintainers = with stdenv.lib.maintainers; [ copumpkin ];
+ license = stdenv.lib.licenses.asl20;
+ };
+}
diff --git a/pkgs/development/libraries/java/commons/io/default.nix b/pkgs/development/libraries/java/commons/io/default.nix
new file mode 100644
index 00000000000..5c80bcadf4b
--- /dev/null
+++ b/pkgs/development/libraries/java/commons/io/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ version = "2.4";
+ name = "commons-io-${version}";
+
+ src = fetchurl {
+ url = "mirror://apache/commons/io/binaries/${name}-bin.tar.gz";
+ sha256 = "0m5xmjfr9k2zmbrz425q530jd0lm6368c4wm3jsjlsrqmqjpsvz1";
+ };
+
+ installPhase = ''
+ tar xf ${src}
+ mkdir -p $out/share/java
+ cp *.jar $out/share/java/
+ '';
+
+ meta = {
+ homepage = "http://commons.apache.org/proper/commons-io";
+ description = "A library of utilities to assist with developing IO functionality";
+ maintainers = with stdenv.lib.maintainers; [ copumpkin ];
+ license = stdenv.lib.licenses.asl20;
+ };
+}
diff --git a/pkgs/development/libraries/java/commons/lang/default.nix b/pkgs/development/libraries/java/commons/lang/default.nix
new file mode 100644
index 00000000000..82806871a62
--- /dev/null
+++ b/pkgs/development/libraries/java/commons/lang/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ version = "3.3.2";
+ name = "commons-lang-${version}";
+
+ src = fetchurl {
+ url = "mirror://apache/commons/lang/binaries/commons-lang3-${version}-bin.tar.gz";
+ sha256 = "1fmcx52h4cd2b7bplm7wy3725vh8bix64j3ykkxcn357y4j8ddzr";
+ };
+
+ installPhase = ''
+ tar xf ${src}
+ mkdir -p $out/share/java
+ cp *.jar $out/share/java/
+ '';
+
+ meta = {
+ homepage = "http://commons.apache.org/proper/commons-lang";
+ description = "Provides additional methods to manipulate standard Java library classes";
+ maintainers = with stdenv.lib.maintainers; [ copumpkin ];
+ license = stdenv.lib.licenses.asl20;
+ };
+}
diff --git a/pkgs/development/libraries/java/commons/math/default.nix b/pkgs/development/libraries/java/commons/math/default.nix
new file mode 100644
index 00000000000..ed04e2f410b
--- /dev/null
+++ b/pkgs/development/libraries/java/commons/math/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ version = "3.3";
+ name = "commons-math-${version}";
+
+ src = fetchurl {
+ url = "mirror://apache/commons/math/binaries/commons-math3-${version}-bin.tar.gz";
+ sha256 = "1xs71c4vbai6zr84982g4ggv6c18dhkilkzw9n1irjqnjbgm5kzc";
+ };
+
+ installPhase = ''
+ tar xf ${src}
+ mkdir -p $out/share/java
+ cp *.jar $out/share/java/
+ '';
+
+ meta = {
+ homepage = "http://commons.apache.org/proper/commons-math/";
+ description = "A library of lightweight, self-contained mathematics and statistics components";
+ maintainers = with stdenv.lib.maintainers; [ copumpkin ];
+ license = stdenv.lib.licenses.asl20;
+ };
+}
diff --git a/pkgs/development/libraries/java/jakarta-bcel/builder.sh b/pkgs/development/libraries/java/jakarta-bcel/builder.sh
deleted file mode 100755
index 9ead7cfebde..00000000000
--- a/pkgs/development/libraries/java/jakarta-bcel/builder.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-source $stdenv/setup
-
-tar zxvf $src
-cd bcel-5.1
-mkdir -p $out/share/java/
-cp bcel-5.1.jar $out/share/java/
diff --git a/pkgs/development/libraries/java/jakarta-bcel/default.nix b/pkgs/development/libraries/java/jakarta-bcel/default.nix
deleted file mode 100644
index 1ff88a36247..00000000000
--- a/pkgs/development/libraries/java/jakarta-bcel/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{stdenv, fetchurl, regexp}:
-
-stdenv.mkDerivation {
- name = "jakarta-bcel-5.1";
- builder = ./builder.sh;
-
- src = fetchurl {
- url = http://tarballs.nixos.org/bcel-5.1.tar.gz;
- md5 = "318f22e4f5f59b68cd004db83a7d65dc";
- };
-
- inherit regexp;
- buildInputs = [stdenv];
-}
diff --git a/pkgs/development/libraries/java/jakarta-commons/file-upload/builder.sh b/pkgs/development/libraries/java/jakarta-commons/file-upload/builder.sh
deleted file mode 100755
index d95feb5eeb4..00000000000
--- a/pkgs/development/libraries/java/jakarta-commons/file-upload/builder.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-set -e
-source $stdenv/setup
-
-tar zxvf $src
-mkdir -p $out
-mv $name/* $out
diff --git a/pkgs/development/libraries/java/jakarta-commons/file-upload/default.nix b/pkgs/development/libraries/java/jakarta-commons/file-upload/default.nix
deleted file mode 100644
index a609532f282..00000000000
--- a/pkgs/development/libraries/java/jakarta-commons/file-upload/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{stdenv, fetchurl} :
-
-stdenv.mkDerivation {
- name = "commons-fileupload-1.0";
- builder = ./builder.sh;
-
- src = fetchurl {
- url = http://archive.apache.org/dist/jakarta/commons/fileupload/binaries/commons-fileupload-1.0.tar.gz;
- md5 = "5618b26b1a5c006d7236fb4465e907b6";
- };
-}
\ No newline at end of file
diff --git a/pkgs/development/libraries/java/jakarta-regexp/default.nix b/pkgs/development/libraries/java/jakarta-regexp/default.nix
deleted file mode 100644
index 55c3beff70a..00000000000
--- a/pkgs/development/libraries/java/jakarta-regexp/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{stdenv, fetchurl}:
-
-# I want some provides mechanism for jar files. These
-# jars can then be added to the CLASSPATH by a dependent package.
-
-stdenv.mkDerivation {
- name = "jakarta-regexp-1.4";
- builder = ./java-bin-builder.sh;
-
- src = fetchurl {
- url = http://tarballs.nixos.org/jakarta-regexp-1.4.tar.gz;
- md5 = "d903d84c949df848009f3bf205b32c97";
- };
-
- jars = ["jakarta-regexp-1.4.jar"];
-
- buildInputs = [stdenv];
-}
diff --git a/pkgs/development/libraries/java/jakarta-regexp/java-bin-builder.sh b/pkgs/development/libraries/java/jakarta-regexp/java-bin-builder.sh
deleted file mode 100755
index c26173ab457..00000000000
--- a/pkgs/development/libraries/java/jakarta-regexp/java-bin-builder.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-source $stdenv/setup
-
-tar zxvf $src
-cd jakarta-regexp-1.4
-mkdir -p $out/share/java/
-cp jakarta-regexp-1.4.jar $out/share/java/
diff --git a/pkgs/development/libraries/javascript/jquery-ui/default.nix b/pkgs/development/libraries/javascript/jquery-ui/default.nix
index 9a485906e53..fd7f5367c8e 100644
--- a/pkgs/development/libraries/javascript/jquery-ui/default.nix
+++ b/pkgs/development/libraries/javascript/jquery-ui/default.nix
@@ -1,29 +1,19 @@
{ stdenv, fetchurl, unzip }:
stdenv.mkDerivation rec {
- name = "jquery-ui-1.10.4";
+ name = "jquery-ui-1.11.1";
src = fetchurl {
- url = "http://jqueryui.com/resources/download/${name}.custom.zip";
- sha256 = "04kp27ln74j4k2jacs54264x2bsdjx1dxlw5zlpd889jqv2m6dfc";
+ url = "http://jqueryui.com/resources/download/${name}.zip";
+ sha256 = "05dlcfwklymx94fb4n88l5syf80l6zrs862zzmla477vd8ndk537";
};
buildInputs = [ unzip ];
installPhase =
''
- mkdir -p $out
- cp -prvd css js $out/
-
- # For convenience, provide symlinks "jquery.min.js" etc. (i.e.,
- # without the version number).
- pushd $out/js
- ln -s jquery-ui-*.custom.js jquery-ui.js
- ln -s jquery-ui-*.custom.min.js jquery-ui.min.js
- ln -s jquery-1.*.js jquery.js
- popd
- pushd $out/css/smoothness
- ln -s jquery-ui-*.custom.css jquery-ui.css
+ mkdir -p "$out/js"
+ cp -rv . "$out/js"
'';
meta = {
diff --git a/pkgs/development/libraries/javascript/jquery/default.nix b/pkgs/development/libraries/javascript/jquery/default.nix
new file mode 100644
index 00000000000..7dd2b6284fa
--- /dev/null
+++ b/pkgs/development/libraries/javascript/jquery/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, compressed ? true }:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+ name = "jquery-1.11.1";
+
+ src = if compressed then
+ fetchurl {
+ url = "http://code.jquery.com/${name}.min.js";
+ sha256 = "0hgly37jhg0n5cqlx3ylmwcxkxmbkvv07f9z9pm94jyxq7gcc2sl";
+ }
+ else
+ fetchurl {
+ url = "http://code.jquery.com/${name}.js";
+ sha256 = "1g7nhy8dwzzai7h7m800fsig4gzw34kjxxbpqdac2y8ch9586a9h";
+ };
+
+ unpackPhase = "true";
+
+ installPhase =
+ ''
+ mkdir -p "$out/js"
+ cp -v "$src" "$out/js/jquery.js"
+ ${optionalString compressed ''
+ (cd "$out/js" && ln -s jquery.js jquery.min.js)
+ ''}
+ '';
+
+ meta = with stdenv.lib; {
+ description = "JavaScript library designed to simplify the client-side scripting of HTML";
+ homepage = http://jquery.com/;
+ license = licenses.mit;
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix
index 7a45ca0f227..a50163c601d 100644
--- a/pkgs/development/libraries/json-glib/default.nix
+++ b/pkgs/development/libraries/json-glib/default.nix
@@ -7,9 +7,9 @@ stdenv.mkDerivation rec {
project = "json-glib";
major = "1";
minor = "0";
- patchlevel = "0";
+ patchlevel = "2";
extension = "xz";
- sha256 = "dbf558d2da989ab84a27e4e13daa51ceaa97eb959c2c2f80976c9322a8f4cdde";
+ sha256 = "887bd192da8f5edc53b490ec51bf3ffebd958a671f5963e4f3af32c22e35660a";
};
configureflags= "--with-introspection" ;
diff --git a/pkgs/development/libraries/kdevplatform/default.nix b/pkgs/development/libraries/kdevplatform/default.nix
index 6f874450fc5..49598cfae68 100644
--- a/pkgs/development/libraries/kdevplatform/default.nix
+++ b/pkgs/development/libraries/kdevplatform/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl, cmake, kdelibs, subversion, qt4, automoc4, perl, phonon,
+{ stdenv, fetchurl, cmake, kdelibs, subversion, qt4, automoc4, phonon,
gettext, pkgconfig, apr, aprutil, boost, qjson, grantlee }:
stdenv.mkDerivation rec {
- name = "kdevplatform-1.6.0";
+ name = "kdevplatform-1.7.0";
src = fetchurl {
- url = "mirror://kde/stable/kdevelop/4.6.0/src/${name}.tar.xz";
- sha256 = "cdf7c88ca8860258f46e41d2107c826a307212fd041345bee54fbd70c9794f80";
+ url = "mirror://kde/stable/kdevelop/4.7.0/src/${name}.tar.xz";
+ sha256 = "bfd765019511c5c9abc19bc412c75d7abd468f1a077ce4bc471cd6704b9f53f7";
};
propagatedBuildInputs = [ kdelibs qt4 phonon ];
diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix
index eeb09a68afb..e1b4798dc0c 100644
--- a/pkgs/development/libraries/kerberos/krb5.nix
+++ b/pkgs/development/libraries/kerberos/krb5.nix
@@ -2,7 +2,7 @@
let
pname = "krb5";
- version = "1.11.3";
+ version = "1.12.2";
name = "${pname}-${version}";
webpage = http://web.mit.edu/kerberos/;
in
@@ -11,8 +11,8 @@ stdenv.mkDerivation (rec {
inherit name;
src = fetchurl {
- url = "${webpage}/dist/krb5/1.11/${name}-signed.tar";
- sha256 = "1daiaxgkxcryqs37w28v4x1vajqmay4l144d1zd9c2d7jjxr9gcs";
+ url = "${webpage}dist/krb5/1.12/${name}-signed.tar";
+ sha256 = "0i1p9xx5s9q0sqnnz7f3rba07882zciw0mwc6yvv7hmm0w0iig89";
};
buildInputs = [ perl ncurses yacc ];
diff --git a/pkgs/development/libraries/lesstif/c-bad_integer_cast.patch b/pkgs/development/libraries/lesstif/c-bad_integer_cast.patch
deleted file mode 100644
index 620d702f0f0..00000000000
--- a/pkgs/development/libraries/lesstif/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/c-linkage.patch b/pkgs/development/libraries/lesstif/c-linkage.patch
deleted file mode 100644
index 343d9f789b8..00000000000
--- a/pkgs/development/libraries/lesstif/c-linkage.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/include/Motif-2.1/Xm/VendorSP.h 2006-07-07 15:58:04.000000000 +0200
-+++ b/include/Motif-2.1/Xm/VendorSP.h 2006-07-07 15:58:19.000000000 +0200
-@@ -30,10 +30,6 @@
- #include
- #include
-
--#ifdef __cplusplus
--extern "C" {
--#endif
--
- XMLIBEXPORT extern Cardinal _XmFilterResources(XtResource *resources,
- Cardinal numResources,
- WidgetClass filterClass,
-@@ -57,9 +53,4 @@
-
- XMLIBEXPORT extern VendorShellClassRec vendorShellClassRec;
-
--
--#ifdef __cplusplus
--}
--#endif
--
- #endif /* _XM_VENDORSP_H */
diff --git a/pkgs/development/libraries/lesstif/c-unsigned_int.patch b/pkgs/development/libraries/lesstif/c-unsigned_int.patch
deleted file mode 100644
index a682d9704c3..00000000000
--- a/pkgs/development/libraries/lesstif/c-unsigned_int.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- lesstif2-0.94.4.orig/lib/Xm-2.1/Xpmcreate.c
-+++ lesstif2-0.94.4/lib/Xm-2.1/Xpmcreate.c
-@@ -1265,10 +1265,10 @@
- register char *src;
- register char *dst;
- register unsigned int *iptr;
-- register unsigned int x, y, i;
-+ register unsigned int x, y;
- register char *data;
- Pixel pixel, px;
-- int nbytes, depth, ibu, ibpp;
-+ int nbytes, depth, ibu, ibpp, i;
-
- data = image->data;
- iptr = pixelindex;
---- lesstif2-0.94.4.orig/lib/Xm-2.1/Xpmscan.c
-+++ lesstif2-0.94.4/lib/Xm-2.1/Xpmscan.c
-@@ -672,8 +672,8 @@
- char *dst;
- unsigned int *iptr;
- char *data;
-- unsigned int x, y, i;
-- int bits, depth, ibu, ibpp, offset;
-+ unsigned int x, y;
-+ int bits, depth, ibu, ibpp, offset, i;
- unsigned long lbt;
- Pixel pixel, px;
-
-@@ -684,6 +684,9 @@
- ibpp = image->bits_per_pixel;
- offset = image->xoffset;
-
-+ if (image->bitmap_unit < 0)
-+ return (XpmNoMemory);
-+
- if ((image->bits_per_pixel | image->depth) == 1) {
- ibu = image->bitmap_unit;
- for (y = 0; y < height; y++)
diff --git a/pkgs/development/libraries/lesstif/c-xim_chained_list_crash.patch b/pkgs/development/libraries/lesstif/c-xim_chained_list_crash.patch
deleted file mode 100644
index 10bdf8d0b97..00000000000
--- a/pkgs/development/libraries/lesstif/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/default.nix b/pkgs/development/libraries/lesstif/default.nix
index 8d01c2f2f43..f5c959bba7a 100644
--- a/pkgs/development/libraries/lesstif/default.nix
+++ b/pkgs/development/libraries/lesstif/default.nix
@@ -3,8 +3,8 @@
stdenv.mkDerivation {
name = "lesstif-0.95.0-p2";
src = fetchurl {
- url = mirror://sourceforge/lesstif/lesstif-0.95.0.tar.bz2;
- md5 = "ab895165c149d7f95843c7584b1c7ad4";
+ url = mirror://sourceforge/lesstif/lesstif-0.95.2.tar.bz2;
+ sha256 = "1qzpxjjf7ri1jzv71mvq5m9g8hfaj5yzwp30rwxlm6n2b24a6jpb";
};
buildInputs = [xlibsWrapper];
propagatedBuildInputs = [libXp libXau];
@@ -15,11 +15,7 @@ stdenv.mkDerivation {
# in Debian, so we assume they have been sent upstream.
#
patches = [
- ./c-bad_integer_cast.patch
- ./c-linkage.patch
- ./c-unsigned_int.patch
./c-missing_xm_h.patch
- ./c-xim_chained_list_crash.patch
./c-render_table_crash.patch
./c-xpmpipethrough.patch
];
diff --git a/pkgs/development/libraries/libHX/default.nix b/pkgs/development/libraries/libHX/default.nix
new file mode 100644
index 00000000000..31dfe6085ee
--- /dev/null
+++ b/pkgs/development/libraries/libHX/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, autoconf, automake, libtool }:
+
+stdenv.mkDerivation rec {
+ name = "libHX-3.21";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/libhx/libHX/3.21/${name}.tar.xz";
+ sha256 = "0wcr6kbhsw6v4js7q4p7fhli37c39dv1rryjf768rkwshl2z8f6v";
+ };
+
+ patches = [];
+
+ buildInputs = [ autoconf automake libtool ];
+
+ preConfigure = ''
+ sh autogen.sh
+ '';
+
+ meta = {
+ homepage = http://libhx.sourceforge.net/;
+ longDescription = ''
+ libHX is a C library (with some C++ bindings available) that provides data structures
+ and functions commonly needed, such as maps, deques, linked lists, string formatting
+ and autoresizing, option and config file parsing, type checking casts and more.
+ '';
+ maintainers = [ stdenv.lib.maintainers.tstrobel ];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/development/libraries/libLAS/default.nix b/pkgs/development/libraries/libLAS/default.nix
new file mode 100644
index 00000000000..c67b3701ec9
--- /dev/null
+++ b/pkgs/development/libraries/libLAS/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, boost, cmake, gdal, libgeotiff, libtiff, LASzip }:
+
+stdenv.mkDerivation rec {
+ name = "libLAS-1.8.0";
+
+ src = fetchurl {
+
+ url = "http://download.osgeo.org/liblas/${name}.tar.bz2";
+ md5 = "599881281d45db4ce9adb2d75458391e";
+ };
+
+ buildInputs = [ boost cmake gdal libgeotiff libtiff LASzip];
+
+
+ meta = {
+ description = "LAS 1.0/1.1/1.2 ASPRS LiDAR data translation toolset";
+ homepage = http://www.liblas.org;
+ license = stdenv.lib.licenses.bsd3;
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = [ stdenv.lib.maintainers.michelk ];
+ };
+}
diff --git a/pkgs/development/libraries/libaal/default.nix b/pkgs/development/libraries/libaal/default.nix
index 596b8e2e84c..36d1ddc7151 100644
--- a/pkgs/development/libraries/libaal/default.nix
+++ b/pkgs/development/libraries/libaal/default.nix
@@ -1,11 +1,12 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl }:
-stdenv.mkDerivation {
- name = "libaal-1.0.5";
+stdenv.mkDerivation rec {
+ version = "1.0.6";
+ name = "libaal-${version}";
src = fetchurl {
- url = http://chichkin_i.zelnet.ru/namesys/libaal-1.0.5.tar.gz;
- sha256 = "109f464hxwms90mpczc7h7lmrdlcmlglabkzh86h25xrlxxdn6pz";
+ url = "mirror://sourceforge/reiser4/${name}.tar.gz";
+ sha256 = "176f2sns6iyxv3h9zyirdinjwi05gdak48zqarhib2s38rvm98di";
};
preInstall = ''
@@ -15,5 +16,7 @@ stdenv.mkDerivation {
meta = {
homepage = http://www.namesys.com/;
description = "Support library for Reiser4";
+ license = stdenv.lib.licenses.gpl2;
+ maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
};
}
diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix
index 401573378ee..44e800b6f1e 100644
--- a/pkgs/development/libraries/libao/default.nix
+++ b/pkgs/development/libraries/libao/default.nix
@@ -1,14 +1,15 @@
{ lib, stdenv, fetchurl, pkgconfig, pulseaudio, alsaLib
, usePulseAudio }:
-stdenv.mkDerivation {
- name = "libao-1.1.0";
+stdenv.mkDerivation rec {
+ version = "1.2.0";
+ name = "libao-${version}";
src = fetchurl {
- url = http://downloads.xiph.org/releases/ao/libao-1.1.0.tar.gz;
- sha256 = "1m0v2y6bhr4iwsgdkc7b3y0qgpvpv1ifbxsy8n8ahsvjn6wmppi9";
+ url = "http://downloads.xiph.org/releases/ao/${name}.tar.gz";
+ sha256 = "1bwwv1g9lchaq6qmhvj1pp3hnyqr64ydd4j38x94pmprs4d27b83";
};
- buildInputs =
+ buildInputs =
[ pkgconfig ] ++
lib.optional stdenv.isLinux (if usePulseAudio then [ pulseaudio ] else [ alsaLib ]);
@@ -19,6 +20,7 @@ stdenv.mkDerivation {
platforms.
'';
homepage = http://xiph.org/ao/;
- license = stdenv.lib.licenses.gpl2Plus;
+ license = stdenv.lib.licenses.gpl2;
+ maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
};
}
diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix
index 2f9e1786473..ce0b0d5d755 100644
--- a/pkgs/development/libraries/libav/default.nix
+++ b/pkgs/development/libraries/libav/default.nix
@@ -26,17 +26,17 @@ with { inherit (stdenv.lib) optional optionals; };
let
result = {
- libav_0_8 = libavFun "0.8.13" "1fr3rzykrlm1cla0csm9hqa3gcqp19hf5rgn70nyb9w92r67v685";
- libav_9 = libavFun "9.16" "18378gdgzqsxaacc9vl7ligwndbdvy95wbn50hs8xvdqn1rn916a";
- libav_10 = libavFun "10.3" "1fq83rc5534fjqjlhkw5i9k54dmyqn2pgvyillm6pws8rkn9yb5r";
+ libav_0_8 = libavFun "0.8.16" "df88b8f7d04d47edea8b19d80814227f0c058e57";
+ libav_9 = libavFun "9.17" "5899d51947b62f6b0cf9795ec2330d5ed59a3273";
+ libav_10 = libavFun "10.5" "925a45d2700a436c28e0b663510fc8df5bb7e861";
};
- libavFun = version : sha256 : stdenv.mkDerivation rec {
+ libavFun = version : sha1 : stdenv.mkDerivation rec {
name = "libav-${version}";
src = fetchurl {
url = "${meta.homepage}/releases/${name}.tar.xz";
- inherit sha256;
+ inherit sha1; # upstream directly provides sha1 of releases over https
};
configureFlags =
assert stdenv.lib.all (x: x!=null) buildInputs;
diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix
index f0eea80e89d..34352484738 100644
--- a/pkgs/development/libraries/libbluray/default.nix
+++ b/pkgs/development/libraries/libbluray/default.nix
@@ -1,37 +1,47 @@
-{stdenv, fetchgit, autoconf, automake, libtool, libaacs ? null, jdk ? null, ant ? null, withAACS ? false}:
+{ stdenv, fetchurl, pkgconfig
+, withAACS ? false, libaacs ? null, jdk ? null, ant ? null
+, withMetadata ? true, libxml2 ? null
+, withFonts ? true, freetype ? null
+}:
assert withAACS -> jdk != null && ant != null && libaacs != null;
+assert withMetadata -> libxml2 != null;
+assert withFonts -> freetype != null;
# Info on how to use:
# https://wiki.archlinux.org/index.php/BluRay
-let baseName = "libbluray";
- version = "0.2.1";
+stdenv.mkDerivation rec {
+ baseName = "libbluray";
+ version = "0.6.0";
+ name = "${baseName}-${version}";
-in
-
-stdenv.mkDerivation {
- name = "${baseName}-${version}p1";
-
- src = fetchgit {
- url = git://git.videolan.org/libbluray.git;
- rev = "3b9a9f044644a6abe9cb09377f714ded9fdd6c87";
- sha256 = "551b623e76c2dba44b5490fb42ccdc491b28cd42841de28237b8edbed0f0711c";
+ src = fetchurl {
+ url = "ftp://ftp.videolan.org/pub/videolan/${baseName}/${version}/${name}.tar.bz2";
+ sha256 = "0zsk16p7rxwbyizm87i7x2fcy3gwjfnlfd2gi2n17fv6gajvsyv2";
};
- nativeBuildInputs = [autoconf automake libtool];
- buildInputs = stdenv.lib.optionals withAACS [jdk ant libaacs];
- NIX_LDFLAGS = stdenv.lib.optionalString withAACS "-laacs";
+ nativeBuildInputs = with stdenv.lib;
+ [pkgconfig]
+ ++ optional withAACS ant
+ ;
- preConfigure = "./bootstrap";
- configureFlags = ["--disable-static"] ++ stdenv.lib.optionals withAACS ["--enable-bdjava" "--with-jdk=${jdk}"];
+ buildInputs = with stdenv.lib;
+ optionals withAACS [jdk libaacs]
+ ++ optional withMetadata libxml2
+ ++ optional withFonts freetype
+ ;
- # From Handbrake
- patches = [ ./A01-filter-dup.patch ];
+ configureFlags = with stdenv.lib;
+ optionals withAACS ["--enable-bdjava" "--with-jdk=${jdk}"]
+ ++ optional (! withMetadata) "--without-libxml2"
+ ++ optional (! withFonts) "--without-freetype"
+ ;
- meta = {
+ meta = with stdenv.lib; {
homepage = http://www.videolan.org/developers/libbluray.html;
description = "Library to access Blu-Ray disks for video playback";
- license = stdenv.lib.licenses.lgpl21;
+ license = licenses.lgpl21;
+ maintainers = [ maintainers.abbradar ];
};
}
diff --git a/pkgs/development/libraries/libc++/default.nix b/pkgs/development/libraries/libc++/default.nix
index 32035709d8f..21a07d6f7d4 100644
--- a/pkgs/development/libraries/libc++/default.nix
+++ b/pkgs/development/libraries/libc++/default.nix
@@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
homepage = http://libcxx.llvm.org/;
description = "A new implementation of the C++ standard library, targeting C++11";
license = "BSD";
- maintainers = stdenv.lib.maintainers.shlevy;
+ maintainers = [ stdenv.lib.maintainers.shlevy ];
platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/development/libraries/libc++abi/default.nix b/pkgs/development/libraries/libc++abi/default.nix
index 8218cbb966f..dd1f46a9ab3 100644
--- a/pkgs/development/libraries/libc++abi/default.nix
+++ b/pkgs/development/libraries/libc++abi/default.nix
@@ -33,7 +33,7 @@ in stdenv.mkDerivation {
homepage = http://libcxxabi.llvm.org/;
description = "A new implementation of low level support for a standard C++ library";
license = "BSD";
- maintainers = stdenv.lib.maintainers.shlevy;
+ maintainers = [ stdenv.lib.maintainers.shlevy ];
platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/development/libraries/libchamplain/0.6.nix b/pkgs/development/libraries/libchamplain/0.6.nix
deleted file mode 100644
index a2b35a72651..00000000000
--- a/pkgs/development/libraries/libchamplain/0.6.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, glib, gtk, cairo, clutter, sqlite
-, clutter_gtk_0_10, libsoup /*, libmenphis */ }:
-
-stdenv.mkDerivation rec {
- name = "libchamplain-0.6.1";
-
- src = fetchurl {
- url = "mirror://gnome/sources/libchamplain/0.6/${name}.tar.gz";
- sha256 = "1l1in4khnral157j46aq2d26nviz23icnm353587vcwjhdbw86sg";
- };
-
- buildInputs = [ pkgconfig ];
-
- # These all appear in `champlain{,-gtk}-0.6.pc'.
- propagatedBuildInputs =
- [ glib gtk cairo clutter clutter_gtk_0_10 sqlite libsoup ];
-
- configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK
-
- meta = {
- homepage = http://projects.gnome.org/libchamplain/;
- license = stdenv.lib.licenses.lgpl2Plus;
-
- description = "libchamplain, a C library providing a ClutterActor to display maps";
-
- longDescription =
- '' libchamplain is a C library providing a ClutterActor to display
- maps. It also provides a Gtk+ widget to display maps in Gtk+
- applications. Python and Perl bindings are also available. It
- supports numerous free map sources such as OpenStreetMap,
- OpenCycleMap, OpenAerialMap, and Maps for free.
- '';
-
- maintainers = [ ];
- platforms = stdenv.lib.platforms.gnu; # arbitrary choice
- };
-}
diff --git a/pkgs/development/libraries/libchardet/default.nix b/pkgs/development/libraries/libchardet/default.nix
new file mode 100644
index 00000000000..f7834c56b63
--- /dev/null
+++ b/pkgs/development/libraries/libchardet/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, perl }:
+
+stdenv.mkDerivation rec {
+ name = "libchardet-1.0.4";
+
+ src = fetchurl {
+ url = "ftp://ftp.oops.org/pub/oops/libchardet/${name}.tar.bz2";
+ sha256 = "0cvwba4la25qw70ap8jd5r743a9jshqd26nnbh5ph68zj1imlgzl";
+ };
+
+ nativeBuildInputs = [ perl ];
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ description = "Mozilla's Universal Charset Detector C/C++ API";
+ homepage = ftp://ftp.oops.org/pub/oops/libchardet/index.html;
+ license = licenses.mpl11;
+ maintainers = [ maintainers.abbradar ];
+ };
+}
diff --git a/pkgs/development/libraries/libdiscid/default.nix b/pkgs/development/libraries/libdiscid/default.nix
index f9d1fc87870..8c5c8bef351 100644
--- a/pkgs/development/libraries/libdiscid/default.nix
+++ b/pkgs/development/libraries/libdiscid/default.nix
@@ -1,26 +1,21 @@
{ stdenv, fetchurl, cmake, pkgconfig }:
stdenv.mkDerivation rec {
- name = "libdiscid-0.2.2";
+ name = "libdiscid-0.6.1";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cmake ];
src = fetchurl {
- url = "http://users.musicbrainz.org/~matt/${name}.tar.gz";
- sha256 = "00l4ln9rk0vqf67iccwqrgc9qx1al92i05zylh85kd1zn9d5sjwp";
+ url = "http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/${name}.tar.gz";
+ sha256 = "1mbd5y9056638cffpfwc6772xwrsk18prv1djsr6jpfim38jpsxc";
};
- # developer forgot to update his version number
- # this is propagated to pkg-config
- preConfigure = ''
- substituteInPlace "CMakeLists.txt" \
- --replace "PROJECT_VERSION 0.1.1" "PROJECT_VERSION 0.2.2"
- '';
-
- meta = {
+ meta = with stdenv.lib; {
description = "A C library for creating MusicBrainz DiscIDs from audio CDs";
homepage = http://musicbrainz.org/doc/libdiscid;
- license = stdenv.lib.licenses.lgpl21;
+ maintainers = with maintainers; [ emery ];
+ license = licenses.lgpl21;
+ platforms = platforms.all;
};
}
diff --git a/pkgs/development/libraries/libe-book/0.0.nix b/pkgs/development/libraries/libe-book/0.0.nix
deleted file mode 100644
index 2dc8de67039..00000000000
--- a/pkgs/development/libraries/libe-book/0.0.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{stdenv, fetchurl, gperf, pkgconfig, librevenge, libxml2, boost, icu, cppunit
-, libwpd}:
-let
- s = # Generated upstream information
- rec {
- baseName="libe-book";
- version="0.0.3";
- name="${baseName}-${version}";
- hash="06xhg319wbqrkj8914npasv5lr7k2904mmy7wa78063mkh31365i";
- url="mirror://sourceforge/project/libebook/libe-book-0.0.3/libe-book-0.0.3.tar.xz";
- sha256="06xhg319wbqrkj8914npasv5lr7k2904mmy7wa78063mkh31365i";
- };
- buildInputs = [
- gperf pkgconfig librevenge libxml2 boost icu cppunit libwpd
- ];
-in
-stdenv.mkDerivation {
- inherit (s) name version;
- inherit buildInputs;
- src = fetchurl {
- inherit (s) url sha256;
- };
- meta = {
- inherit (s) version;
- description = ''Library for import of reflowable e-book formats'';
- license = stdenv.lib.licenses.lgpl21Plus ;
- maintainers = [stdenv.lib.maintainers.raskin];
- platforms = stdenv.lib.platforms.linux;
- };
-}
diff --git a/pkgs/development/libraries/libe-book/0.0.upstream b/pkgs/development/libraries/libe-book/0.0.upstream
deleted file mode 100644
index e2994f52691..00000000000
--- a/pkgs/development/libraries/libe-book/0.0.upstream
+++ /dev/null
@@ -1,4 +0,0 @@
-url http://sourceforge.net/projects/libebook/files/
-SF_version_dir libe-book-0.0.
-version_link '[.]tar.xz/download$'
-SF_redirect
diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix
index 1382af16484..27c803fd81e 100644
--- a/pkgs/development/libraries/libedit/default.nix
+++ b/pkgs/development/libraries/libedit/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, ncurses, groff }:
stdenv.mkDerivation rec {
- name = "libedit-20130712-3.1";
+ name = "libedit-20140620-3.1";
src = fetchurl {
url = "http://www.thrysoee.dk/editline/${name}.tar.gz";
- sha256 = "0dwav34041sariyl00nr106xmn123bnxir4qpn5y47vgssfim6sx";
+ sha256 = "1wnapwcpl4yq8p95j898jl0hsr39if28qzm5a7zwkbplihm9nax2";
};
# Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
@@ -15,10 +15,7 @@ stdenv.mkDerivation rec {
sed -i s/-lncurses/-lncursesw/g $out/lib/pkgconfig/libedit.pc
'';
- # taken from gentoo http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/libedit/files/
- patches = [ ./freebsd.patch ./freebsd_weak_ref.patch ];
-
- configureFlags = "--enable-widec";
+ configureFlags = [ "--enable-widec" ];
propagatedBuildInputs = [ ncurses ];
diff --git a/pkgs/development/libraries/libewf/default.nix b/pkgs/development/libraries/libewf/default.nix
index 7c948aa9824..fad0170ade7 100644
--- a/pkgs/development/libraries/libewf/default.nix
+++ b/pkgs/development/libraries/libewf/default.nix
@@ -1,10 +1,11 @@
-{ fetchurl, stdenv, zlib, openssl, libuuid, file }:
+{ fetchurl, stdenv, zlib, openssl, libuuid, file, fuse }:
stdenv.mkDerivation rec {
- name = "libewf-20100226";
+ version = "20140608";
+ name = "libewf-${version}";
src = fetchurl {
- url = "mirror://sourceforge/libewf/${name}.tar.gz";
- sha256 = "aedd2a6b3df6525ff535ab95cd569ebb361a4022eb4163390f26257913c2941a";
+ url = "https://googledrive.com/host/0B3fBvzttpiiSMTdoaVExWWNsRjg/libewf-20140608.tar.gz";
+ sha256 = "0wfsffzxk934hl8cpwr14w8ixnh8d23x0xnnzcspjwi2c7730h6i";
};
preConfigure = ''sed -e 's@/usr/bin/file@file@g' -i configure'';
@@ -14,6 +15,8 @@ stdenv.mkDerivation rec {
meta = {
description = "Library for support of the Expert Witness Compression Format";
homepage = http://sourceforge.net/projects/libewf/;
- license = "free";
+ license = stdenv.lib.licenses.lgpl3;
+ maintainers = [ stdenv.lib.maintainers.raskin ] ;
+ inherit version;
};
}
diff --git a/pkgs/development/libraries/libewf/default.upstream b/pkgs/development/libraries/libewf/default.upstream
new file mode 100644
index 00000000000..a071132463f
--- /dev/null
+++ b/pkgs/development/libraries/libewf/default.upstream
@@ -0,0 +1,7 @@
+url https://code.google.com/p/libewf/
+version_link 'googledrive[.]com'
+version_link '[.]tar[.]'
+do_overwrite () {
+ do_overwrite_just_version
+ set_var_value url "$CURRENT_URL"
+}
diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix
index 7a005c9fda2..9f42a1c8c3e 100644
--- a/pkgs/development/libraries/libfm/default.nix
+++ b/pkgs/development/libraries/libfm/default.nix
@@ -1,13 +1,19 @@
-{ stdenv, fetchurl, glib, gtk, intltool, menu-cache, pango, pkgconfig, vala }:
-
+{ stdenv, fetchurl, glib, gtk, intltool, menu-cache, pango, pkgconfig, vala
+, extraOnly ? false }:
+let name = "libfm-1.2.2.1";
+ inherit (stdenv.lib) optional;
+in
stdenv.mkDerivation {
- name = "libfm-1.2.0";
+ name = if extraOnly then "libfm-extra-1.2.2.1" else "libfm-1.2.2.1";
src = fetchurl {
- url = "mirror://sourceforge/pcmanfm/libfm-1.2.0.tar.xz";
- sha256 = "08pwdrmfm9rl41lj2niyjqq2bdvydxk7v2shjxh5gk1xwj238lgh";
+ url = "mirror://sourceforge/pcmanfm/libfm-1.2.2.1.tar.xz";
+ sha256 = "0aa37arr0h2nppjh7ppf00np2d8mb43imvfq9b7wq5cnzpvs7c6v";
};
- buildInputs = [ glib gtk intltool menu-cache pango pkgconfig vala ];
+ buildInputs = [ glib gtk intltool pango pkgconfig vala ]
+ ++ optional (!extraOnly) menu-cache;
+
+ configureFlags = optional extraOnly "--with-extra-only";
meta = with stdenv.lib; {
homepage = "http://blog.lxde.org/?cat=28/";
diff --git a/pkgs/development/libraries/libfreefare/default.nix b/pkgs/development/libraries/libfreefare/default.nix
new file mode 100644
index 00000000000..17afa9423b0
--- /dev/null
+++ b/pkgs/development/libraries/libfreefare/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, pkgconfig, libnfc, openssl }:
+
+stdenv.mkDerivation rec {
+ name = "libfreefare-${version}";
+ version = "0.4.0";
+
+ src = fetchurl {
+ url = "https://libfreefare.googlecode.com/files/libfreefare-0.4.0.tar.bz2";
+ sha256 = "0r5wfvwgf35lb1v65wavnwz2wlfyfdims6a9xpslf4lsm4a1v8xz";
+ };
+
+ buildInputs = [ pkgconfig libnfc openssl ];
+
+ meta = with stdenv.lib; {
+ description = "The libfreefare project aims to provide a convenient API for MIFARE card manipulations";
+ license = licenses.gpl3;
+ homepage = http://code.google.com/p/libfreefare/;
+ maintainers = with maintainers; [bobvanderlinden];
+ platforms = with platforms; unix;
+ };
+}
diff --git a/pkgs/development/libraries/libgcrypt/1.6.nix b/pkgs/development/libraries/libgcrypt/1.6.nix
index ced3b723b13..e468c3163d3 100644
--- a/pkgs/development/libraries/libgcrypt/1.6.nix
+++ b/pkgs/development/libraries/libgcrypt/1.6.nix
@@ -1,11 +1,11 @@
{ fetchurl, stdenv, libgpgerror, transfig, ghostscript, texinfo }:
stdenv.mkDerivation rec {
- name = "libgcrypt-1.6.1";
+ name = "libgcrypt-1.6.2";
src = fetchurl {
url = "mirror://gnupg/libgcrypt/${name}.tar.bz2";
- sha256 = "0w10vhpj1r5nq7qm6jp21p1v1vhf37701cw8yilygzzqd7mfzhx1";
+ sha256 = "de084492a6b38cdb27b67eaf749ceba76bf7029f63a9c0c3c1b05c88c9885c4c";
};
nativeBuildInputs = [ transfig ghostscript texinfo ];
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
};
meta = {
- description = "GNU Libgcrypt, a general-pupose cryptographic library";
+ description = "General-pupose cryptographic library";
longDescription = ''
GNU Libgcrypt is a general purpose cryptographic library based on
diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix
index f47d3a62729..ed267e23c87 100644
--- a/pkgs/development/libraries/libgcrypt/default.nix
+++ b/pkgs/development/libraries/libgcrypt/default.nix
@@ -1,11 +1,11 @@
{ fetchurl, stdenv, libgpgerror }:
stdenv.mkDerivation (rec {
- name = "libgcrypt-1.5.3";
+ name = "libgcrypt-1.5.4";
src = fetchurl {
url = "mirror://gnupg/libgcrypt/${name}.tar.bz2";
- sha256 = "1lar8y3lh61zl5flljpz540d78g99h4d5idfwrfw8lm3gm737xdw";
+ sha256 = "d5f88d9f41a46953dc250cdb8575129b37ee2208401b7fa338c897f667c7fb33";
};
propagatedBuildInputs = [ libgpgerror ];
diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix
index 663bd944fb9..4a6021918de 100644
--- a/pkgs/development/libraries/libgpg-error/default.nix
+++ b/pkgs/development/libraries/libgpg-error/default.nix
@@ -1,21 +1,22 @@
{ stdenv, fetchurl, bash, gettext }:
stdenv.mkDerivation (rec {
- name = "libgpg-error-1.12";
+ name = "libgpg-error-1.16";
src = fetchurl {
url = "mirror://gnupg/libgpg-error/${name}.tar.bz2";
- sha256 = "0pz58vr12qihq2f0bypjxsb6cf6ajq5258fmfm8s6lvwm3b9xz6a";
+ sha256 = "16xv59zcr177gvgj97vg0rm4rixrpb4lz1q9fji3xay47i83gm62";
};
- # If architecture-dependant MO files aren't available, they're generated
+ # If architecture-dependent MO files aren't available, they're generated
# during build, so we need gettext for cross-builds.
crossAttrs.buildInputs = [ gettext ];
doCheck = true;
meta = {
- description = "Libgpg-error, a small library that defines common error values for all GnuPG components";
+ homepage = "https://www.gnupg.org/related_software/libgpg-error/index.html";
+ description = "A small library that defines common error values for all GnuPG components";
longDescription = ''
Libgpg-error is a small library that defines common error values
@@ -24,10 +25,9 @@ stdenv.mkDerivation (rec {
Daemon and possibly more in the future.
'';
- homepage = http://gnupg.org;
-
license = stdenv.lib.licenses.lgpl2Plus;
platforms = stdenv.lib.platforms.all;
+ maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
};
}
diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix
index ca8073fbe30..d739b094874 100644
--- a/pkgs/development/libraries/libgphoto2/default.nix
+++ b/pkgs/development/libraries/libgphoto2/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
- sha256 = "1h0bwrbc69yq561pw4fjyclwvk0g6rrj3pw6zrdx33isipi15d2z";
+ sha256 = "0ij80nixichihv3iic7cgdq3irssk8waz1c25m6yypjl4kg6n3k0";
};
nativeBuildInputs = [ pkgconfig gettext ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
MTP, and other vendor specific protocols for controlling and transferring data
from digital cameras.
'';
- version = "2.5.4";
+ version = "2.5.5.1";
# XXX: the homepage claims LGPL, but several src files are lgpl21Plus
license = stdenv.lib.licenses.lgpl21Plus;
platforms = with stdenv.lib.platforms; unix;
diff --git a/pkgs/development/libraries/libharu/default.nix b/pkgs/development/libraries/libharu/default.nix
index db1aa4a7473..11b3bf4f6d5 100644
--- a/pkgs/development/libraries/libharu/default.nix
+++ b/pkgs/development/libraries/libharu/default.nix
@@ -17,8 +17,8 @@ stdenv.mkDerivation {
name = "linpng15.patch";
src = fetchurl {
- url = https://github.com/tony2001/libharu/commit/e5bf8b01f6c3d5e3fe0e26ac5345e0da10c03934.diff;
- sha256 = "1993vskpycyr43rwdp8f688fc5zvllrqq935r7rhsgbqbipkk73h";
+ url = https://github.com/libharu/libharu/commit/e5bf8b01f6c3d5e3fe0e26ac5345e0da10c03934.diff;
+ sha256 = "07k2x5d4pvpf8a5hvfb9pj0dpjgcvv8sdvxwx3wzbwqsf9swwrxb";
};
nativeBuildInputs = [ patchutils ];
@@ -26,9 +26,9 @@ stdenv.mkDerivation {
buildCommand = "filterdiff -x '*/CHANGES' $src > $out";
})
(fetchurl {
- url = https://github.com/tony2001/libharu/commit/b472b64ab44d834eb29d237f31bf12396fee9aca.diff;
+ url = https://github.com/libharu/libharu/commit/b472b64ab44d834eb29d237f31bf12396fee9aca.diff;
name = "endless-loop.patch";
- sha256 = "1c95mn6a5wddznqgrsaf3xsh27lz8q0pzc0a7ampxpscq0w6c9fq";
+ sha256 = "1jrajz6zdch2pyzjkhmhm1b6ms8dk62snps7fwphnpvndrm4h4rr";
})
];
diff --git a/pkgs/development/libraries/libibmad/default.nix b/pkgs/development/libraries/libibmad/default.nix
new file mode 100644
index 00000000000..8a4f27ad9c0
--- /dev/null
+++ b/pkgs/development/libraries/libibmad/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, libibumad }:
+
+stdenv.mkDerivation rec {
+ name = "libibmad-1.3.11";
+
+ src = fetchurl {
+ url = "https://www.openfabrics.org/downloads/management/${name}.tar.gz";
+ sha256 = "1d5lh2lhz7zzs7bbjjv9i0pj3v1xgp8sdmcr425h563v2c3bp53h";
+ };
+
+ buildInputs = [ libibumad ];
+
+ meta = with stdenv.lib; {
+ homepage = http://www.openfabrics.org/;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ wkennington ];
+ };
+}
diff --git a/pkgs/development/libraries/libibumad/default.nix b/pkgs/development/libraries/libibumad/default.nix
new file mode 100644
index 00000000000..911c5c84612
--- /dev/null
+++ b/pkgs/development/libraries/libibumad/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ name = "libibumad-1.3.9";
+
+ src = fetchurl {
+ url = "https://www.openfabrics.org/downloads/management/${name}.tar.gz";
+ sha256 = "0j52aiwfgasf7bzx65svd5h2ya7848c5racf191i8irsxa155q74";
+ };
+
+ meta = with stdenv.lib; {
+ homepage = http://www.openfabrics.org/;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ wkennington ];
+ };
+}
diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix
index 37d19d10f29..5aea194e39d 100644
--- a/pkgs/development/libraries/libidn/default.nix
+++ b/pkgs/development/libraries/libidn/default.nix
@@ -1,11 +1,11 @@
{ fetchurl, stdenv }:
stdenv.mkDerivation rec {
- name = "libidn-1.28";
+ name = "libidn-1.29";
src = fetchurl {
url = "mirror://gnu/libidn/${name}.tar.gz";
- sha256 = "1yxbfdiwr3l91m79sksn6v5mgpl4lfj8i82zgryckas9hjb7ldfx";
+ sha256 = "fb82747dbbf9b36f703ed27293317d818d7e851d4f5773dedf3efa4db32a7c7c";
};
doCheck = ! stdenv.isDarwin;
@@ -30,6 +30,7 @@ stdenv.mkDerivation rec {
included.
'';
+ repositories.git = git://git.savannah.gnu.org/libidn.git;
license = stdenv.lib.licenses.lgpl2Plus;
platforms = stdenv.lib.platforms.all;
maintainers = [ ];
diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix
index 39795267a2c..dc197fc6409 100644
--- a/pkgs/development/libraries/libmicrohttpd/default.nix
+++ b/pkgs/development/libraries/libmicrohttpd/default.nix
@@ -1,11 +1,11 @@
{stdenv, fetchurl, curl, libgcrypt}:
stdenv.mkDerivation rec {
- name = "libmicrohttpd-0.9.35";
+ name = "libmicrohttpd-0.9.37";
src = fetchurl {
url = "mirror://gnu/libmicrohttpd/${name}.tar.gz";
- sha256 = "1z0h6llx7pra78358ryi3bdh8p0ns0bn97n6bl0fj6cib9cz2pdw";
+ sha256 = "1p3wnhr43v6vqdgl86r76298wjfxz2ihj9zh9kpz8l7va30br357";
};
buildInputs = [ curl libgcrypt ];
diff --git a/pkgs/development/libraries/libmpeg2/A00-tags.patch b/pkgs/development/libraries/libmpeg2/A00-tags.patch
deleted file mode 100644
index 0b5d7d7da12..00000000000
--- a/pkgs/development/libraries/libmpeg2/A00-tags.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -ru mpeg2dec.orig/libmpeg2/decode.c mpeg2dec/libmpeg2/decode.c
---- mpeg2dec.orig/libmpeg2/decode.c 2008-07-09 12:16:05.000000000 -0700
-+++ mpeg2dec/libmpeg2/decode.c 2009-07-03 16:29:48.000000000 -0700
-@@ -212,7 +212,7 @@
-
- mpeg2_state_t mpeg2_parse_header (mpeg2dec_t * mpeg2dec)
- {
-- static int (* process_header[]) (mpeg2dec_t * mpeg2dec) = {
-+ static int (* process_header[]) (mpeg2dec_t *) = {
- mpeg2_header_picture, mpeg2_header_extension, mpeg2_header_user_data,
- mpeg2_header_sequence, NULL, NULL, NULL, NULL, mpeg2_header_gop
- };
-@@ -368,6 +368,14 @@
-
- void mpeg2_tag_picture (mpeg2dec_t * mpeg2dec, uint32_t tag, uint32_t tag2)
- {
-+ if (mpeg2dec->num_tags == 0 && mpeg2dec->state == STATE_PICTURE && mpeg2dec->picture) {
-+ // since tags got processed when we entered this state we
-+ // have to set them directly or they'll end up on the next frame.
-+ mpeg2dec->picture->tag = tag;
-+ mpeg2dec->picture->tag2 = tag2;
-+ mpeg2dec->picture->flags |= PIC_FLAG_TAGS;
-+ return;
-+ }
- mpeg2dec->tag_previous = mpeg2dec->tag_current;
- mpeg2dec->tag2_previous = mpeg2dec->tag2_current;
- mpeg2dec->tag_current = tag;
diff --git a/pkgs/development/libraries/libmpeg2/default.nix b/pkgs/development/libraries/libmpeg2/default.nix
index e651a932efe..7ecac071ce4 100644
--- a/pkgs/development/libraries/libmpeg2/default.nix
+++ b/pkgs/development/libraries/libmpeg2/default.nix
@@ -1,20 +1,18 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "libmpeg2-0.5.1p4";
-
+ version = "0.5.1";
+ name = "libmpeg2-${version}";
+
src = fetchurl {
url = "http://libmpeg2.sourceforge.net/files/${name}.tar.gz";
sha256 = "1m3i322n2fwgrvbs1yck7g5md1dbg22bhq5xdqmjpz5m7j4jxqny";
};
- # From Handbrake - Project seems unmaintained
- patches = [
- ./A00-tags.patch
- ];
-
meta = {
homepage = http://libmpeg2.sourceforge.net/;
description = "A free library for decoding mpeg-2 and mpeg-1 video streams";
+ license = stdenv.lib.licenses.gpl2;
+ maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
};
}
diff --git a/pkgs/development/libraries/libmsgpack/CMakeLists.patch b/pkgs/development/libraries/libmsgpack/CMakeLists.patch
new file mode 100644
index 00000000000..657c30d5fe9
--- /dev/null
+++ b/pkgs/development/libraries/libmsgpack/CMakeLists.patch
@@ -0,0 +1,12 @@
+diff -r 791a4edd7e1d CMakeLists.txt
+--- a/CMakeLists.txt Sun Oct 05 13:14:14 2014 +0100
++++ b/CMakeLists.txt Sun Oct 05 13:20:12 2014 +0100
+@@ -158,7 +158,7 @@
+ INSTALL (TARGETS msgpack msgpack-static DESTINATION lib)
+ INSTALL (DIRECTORY src/msgpack DESTINATION include)
+ INSTALL (FILES src/msgpack.h src/msgpack.hpp DESTINATION include)
+-INSTALL (FILES msgpack.pc DESTINATION lib/pkgconfig)
++INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/msgpack.pc DESTINATION lib/pkgconfig)
+
+ # Doxygen
+ FIND_PACKAGE (Doxygen)
diff --git a/pkgs/development/libraries/libmsgpack/default.nix b/pkgs/development/libraries/libmsgpack/default.nix
index ab9dbd48ea4..d9f4bfcc750 100644
--- a/pkgs/development/libraries/libmsgpack/default.nix
+++ b/pkgs/development/libraries/libmsgpack/default.nix
@@ -1,25 +1,16 @@
-{ stdenv, fetchurl, autoconf, automake, libtool, ruby, scatterOutputHook }:
+{ stdenv, fetchurl, cmake}:
stdenv.mkDerivation rec {
- version = "0.5.8";
+ version = "0.5.9";
name = "libmsgpack-${version}";
src = fetchurl {
url = "https://github.com/msgpack/msgpack-c/archive/cpp-${version}.tar.gz";
- sha256 = "1h6k9kdbfavmw3by5kk3raszwa64hn9k8yw9rdhvl5m8g2lks89k";
+ sha256 = "0xy204srq5grng7p17hwdxpfzbsfrn89gi4c3k62a23p4f9z0szq";
};
- nativeBuildInputs = [ scatterOutputHook ];
- buildInputs = [ autoconf automake libtool ruby ];
-
- outputs = [ "out" "bin" ];
-
- preConfigure = ''
- sed -i s,glibtoolize,libtoolize, ./bootstrap
- ./bootstrap
- '';
-
- enableParallelBuilding = true;
+ buildInputs = [ cmake ];
+ patches = [ ./CMakeLists.patch ];
meta = with stdenv.lib; {
description = "MessagePack implementation for C and C++";
diff --git a/pkgs/development/libraries/libmwaw/0.2.nix b/pkgs/development/libraries/libmwaw/0.2.nix
deleted file mode 100644
index d66414b6814..00000000000
--- a/pkgs/development/libraries/libmwaw/0.2.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{stdenv, fetchurl, boost, pkgconfig, cppunit, zlib, libwpg, libwpd, librevenge}:
-let
- s = # Generated upstream information
- rec {
- baseName="libmwaw";
- version="0.2.1";
- name="${baseName}-${version}";
- hash="1fil1ll84pq0k3g6rcc2xfg1yrigkljp4ay5p2wpwd9qlmfvvvqn";
- url="mirror://sourceforge/project/libmwaw/libmwaw/libmwaw-0.2.1/libmwaw-0.2.1.tar.xz";
- sha256="1fil1ll84pq0k3g6rcc2xfg1yrigkljp4ay5p2wpwd9qlmfvvvqn";
- };
- buildInputs = [
- boost pkgconfig cppunit zlib libwpg libwpd librevenge
- ];
-in
-stdenv.mkDerivation {
- inherit (s) name version;
- inherit buildInputs;
- src = fetchurl {
- inherit (s) url sha256;
- };
- meta = {
- inherit (s) version;
- description = ''Import library for some old mac text documents'';
- license = stdenv.lib.licenses.mpl20 ;
- maintainers = [stdenv.lib.maintainers.raskin];
- platforms = stdenv.lib.platforms.linux;
- };
-}
diff --git a/pkgs/development/libraries/libmwaw/0.2.upstream b/pkgs/development/libraries/libmwaw/0.2.upstream
deleted file mode 100644
index 8ce00ecf767..00000000000
--- a/pkgs/development/libraries/libmwaw/0.2.upstream
+++ /dev/null
@@ -1,4 +0,0 @@
-url http://sourceforge.net/projects/libmwaw/files/libmwaw/
-SF_version_dir libmwaw-0.2.
-version_link '[.]tar.xz/download$'
-SF_redirect
diff --git a/pkgs/development/libraries/liboauth/default.nix b/pkgs/development/libraries/liboauth/default.nix
index b3eee8ed434..3cb9629e3e1 100644
--- a/pkgs/development/libraries/liboauth/default.nix
+++ b/pkgs/development/libraries/liboauth/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
- name = "liboauth-1.0.2";
+ name = "liboauth-1.0.3";
src = fetchurl {
url = "mirror://sourceforge/liboauth/${name}.tar.gz";
- sha256 = "1qs58yzydw20dmzvx22i541w641kwd6ja80s9na1az32n1krh6zv";
+ sha256 = "07w1aq8y8wld43wmbk2q8134p3bfkp2vma78mmsfgw2jn1bh3xhd";
};
buildInputs = [ nss openssl ];
diff --git a/pkgs/development/libraries/libogg/default.nix b/pkgs/development/libraries/libogg/default.nix
index 492538f1802..57b8b2fc66e 100644
--- a/pkgs/development/libraries/libogg/default.nix
+++ b/pkgs/development/libraries/libogg/default.nix
@@ -1,11 +1,8 @@
{ stdenv, fetchurl }:
-let
+stdenv.mkDerivation rec {
name = "libogg-1.3.2";
-in
-stdenv.mkDerivation {
- inherit name;
-
+
src = fetchurl {
url = "http://downloads.xiph.org/releases/ogg/${name}.tar.xz";
sha256 = "16z74q422jmprhyvy7c9x909li8cqzmvzyr8cgbm52xcsp6pqs1z";
diff --git a/pkgs/development/libraries/libotr/default.nix b/pkgs/development/libraries/libotr/default.nix
index 3782dabc67b..7b8f40d1886 100644
--- a/pkgs/development/libraries/libotr/default.nix
+++ b/pkgs/development/libraries/libotr/default.nix
@@ -1,23 +1,22 @@
-{stdenv, fetchgit, libgcrypt, autoconf, automake, libtool}:
+{ stdenv, fetchurl, libgcrypt, autoreconfHook }:
stdenv.mkDerivation rec {
- name = "libotr-20130821-git-f0f8a2";
- src = fetchgit {
- url = "http://git.code.sf.net/p/otr/libotr";
- rev = "f0f8a2";
- sha256 = "08019r8bnk8f4yx6574jdz217p283ry7dmpqcad2d87yhkdmc3mm";
+ name = "libotr-4.0.0";
+
+ src = fetchurl {
+ url = "https://otr.cypherpunks.ca/${name}.tar.gz";
+ sha256 = "1d4k0b7v4d3scwm858cmqr9c6xgd6ppla1vk4x2yg64q82a1k49z";
};
- NIX_LDFLAGS = "-lssp";
+ buildInputs = [ autoreconfHook ];
+ propagatedBuildInputs = [ libgcrypt ];
- propagatedBuildInputs = [ libgcrypt autoconf automake libtool ];
-
- preConfigure = "autoreconf -vfi";
-
- meta = {
+ meta = with stdenv.lib; {
homepage = "http://www.cypherpunks.ca/otr/";
repositories.git = git://git.code.sf.net/p/otr/libotr;
- license = stdenv.lib.licenses.lgpl21;
+ license = licenses.lgpl21;
description = "Library for Off-The-Record Messaging";
+ maintainers = with maintainers; [ wkennington ];
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/libpng/12.nix b/pkgs/development/libraries/libpng/12.nix
index ff04c7181df..fae6f9ba556 100644
--- a/pkgs/development/libraries/libpng/12.nix
+++ b/pkgs/development/libraries/libpng/12.nix
@@ -26,6 +26,8 @@ stdenv.mkDerivation rec {
meta = {
description = "The official reference implementation for the PNG file format";
homepage = http://www.libpng.org/pub/png/libpng.html;
- license = "free-non-copyleft"; # http://www.libpng.org/pub/png/src/libpng-LICENSE.txt
+ license = stdenv.lib.licenses.libpng;
+ maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ branch = "1.2";
};
}
diff --git a/pkgs/development/libraries/libpng/15.nix b/pkgs/development/libraries/libpng/15.nix
index 15351798633..177c534ffaf 100644
--- a/pkgs/development/libraries/libpng/15.nix
+++ b/pkgs/development/libraries/libpng/15.nix
@@ -3,11 +3,11 @@
assert zlib != null;
stdenv.mkDerivation rec {
- name = "libpng-1.5.18";
+ name = "libpng-1.5.19";
src = fetchurl {
url = "mirror://sourceforge/libpng/${name}.tar.xz";
- sha256 = "119m71p60iq3yn2n8ckl4j4cxvbpddj6sgdpa6g05jzyg7vw54y0";
+ sha256 = "1s990cdsdlbb78aq4sj2vq2849p2nbbbnbk5p8f9w45rn0v5q98y";
};
propagatedBuildInputs = [ zlib ];
@@ -19,6 +19,8 @@ stdenv.mkDerivation rec {
meta = {
description = "The official reference implementation for the PNG file format";
homepage = http://www.libpng.org/pub/png/libpng.html;
- license = "free-non-copyleft"; # http://www.libpng.org/pub/png/src/libpng-LICENSE.txt
+ license = stdenv.lib.licenses.libpng;
+ maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ branch = "1.5";
};
}
diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix
index 1f04ae8fca5..06fff495f54 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/pkgs/development/libraries/libpng/default.nix
@@ -3,11 +3,11 @@
assert zlib != null;
let
- version = "1.6.12";
- sha256 = "0pkcirbfzhqqsm3hr2alxprw5n22a836qk4df1jnns6jk79gcby3";
+ version = "1.6.13";
+ sha256 = "09g631h1f1xvrdiy36mh1034r9w46damp9jcg7nm507wlmacxj6r";
patch_src = fetchurl {
url = "mirror://sourceforge/libpng-apng/libpng-${version}-apng.patch.gz";
- sha256 = "0r2vmsc4cvxisjr7jqw2vjf66isb2fhs4nnssz3l3jgdangj8wz0";
+ sha256 = "017pnxp3zhhlh6mg2yqn5xrb6dcxc5p3dp1kr46p8xx052i0hzqb";
};
whenPatched = stdenv.lib.optionalString apngSupport;
@@ -30,8 +30,8 @@ in stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "The official reference implementation for the PNG file format" + whenPatched " with animation patch";
homepage = http://www.libpng.org/pub/png/libpng.html;
- license = "free-non-copyleft"; # http://www.libpng.org/pub/png/src/libpng-LICENSE.txt
+ license = licenses.libpng;
platforms = platforms.all;
- maintainers = [ maintainers.vcunat ];
+ maintainers = [ maintainers.vcunat maintainers.fuuzetsu ];
};
}
diff --git a/pkgs/development/libraries/libresample/default.nix b/pkgs/development/libraries/libresample/default.nix
index 9ef1ada0a42..e8d4f98028f 100644
--- a/pkgs/development/libraries/libresample/default.nix
+++ b/pkgs/development/libraries/libresample/default.nix
@@ -22,6 +22,6 @@ stdenv.mkDerivation {
description = "A real-time library for sampling rate conversion library";
license = stdenv.lib.licenses.lgpl2Plus;
homepage = https://ccrma.stanford.edu/~jos/resample/Free_Resampling_Software.html;
- maintainers = stdenv.lib.maintainers.sander;
+ maintainers = [ stdenv.lib.maintainers.sander ];
};
}
diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix
index 754893894b6..dcef77d5919 100644
--- a/pkgs/development/libraries/libsodium/default.nix
+++ b/pkgs/development/libraries/libsodium/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "libsodium-0.4.5";
+ name = "libsodium-0.7.0";
src = fetchurl {
url = "https://download.libsodium.org/libsodium/releases/${name}.tar.gz";
- sha256 = "0cmcw479p866r6cjh20wzjr84pdn0mfswr5h57mw1siyylnj1mbs";
+ sha256 = "0s4iis5h7yh27kamwic3rddyp5ra941bcqcawa37grjvl78zzjjc";
};
NIX_LDFLAGS = "-lssp";
diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
index 0745313b41e..becca407ce9 100644
--- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix
+++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
@@ -9,11 +9,11 @@ stdenv.mkDerivation rec {
sha256 = "1a3yxwjs4qb0rwx6cfpvar0a8jmavb6ik580b27md08jhvq80if7";
};
- buildInputs = [ boost pkgconfig openssl zlib python libiconvOrNull geoip ];
+ buildInputs = [ boost boost.lib pkgconfig openssl zlib python libiconvOrNull geoip ];
configureFlags = [
"--with-boost=${boost}/include/boost"
- "--with-boost-libdir=${boost}/lib"
+ "--with-boost-libdir=${boost.lib}/lib"
"--enable-python-binding"
"--with-libgeoip=system"
"--with-libiconv=yes"
diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix
index b5665fe402e..f6bdbdb3c75 100644
--- a/pkgs/development/libraries/libtoxcore/default.nix
+++ b/pkgs/development/libraries/libtoxcore/default.nix
@@ -2,8 +2,8 @@
, libvpx, check, libconfig, pkgconfig }:
let
- version = "f83fcbb13c0";
- date = "20140811";
+ version = "900d72f951";
+ date = "20140921";
in
stdenv.mkDerivation rec {
name = "tox-core-${date}-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://github.com/irungentoo/toxcore/tarball/${version}";
name = "${name}.tar.gz";
- sha256 = "09g74h3qnx9adyxxvzay8m2idbgbln7m4kkm7sg9925mvi5abb1w";
+ sha256 = "1fwgflizb21mp4jwkfac7mgmahlly1f3ldbma6h8h6a2qf3pkn2r";
};
NIX_LDFLAGS = "-lgcc_s";
@@ -36,11 +36,15 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- autoconf libtool automake libsodium ncurses libopus
- libvpx check libconfig pkgconfig
+ autoconf libtool automake libsodium ncurses
+ libconfig pkgconfig
+ ] ++ stdenv.lib.optionals (!stdenv.isArm) [
+ libopus
];
- doCheck = true;
+ propagatedBuildInputs = stdenv.lib.optionals (!stdenv.isArm) [ libvpx ];
+
+ doCheck = !stdenv.isArm;
meta = {
description = "P2P FOSS instant messaging application aimed to replace Skype with crypto";
diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index e2ff06fcd43..a4c8c167b39 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -39,6 +39,7 @@ stdenv.mkDerivation rec {
];
postInstall = ''
+ sed -i 's/ON_SHUTDOWN=suspend/ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}/' $out/libexec/libvirt-guests.sh
substituteInPlace $out/libexec/libvirt-guests.sh \
--replace "$out/bin" "${gettext}/bin"
wrapProgram $out/sbin/libvirtd \
diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix
index 0dd99605b33..80381743100 100644
--- a/pkgs/development/libraries/libvorbis/default.nix
+++ b/pkgs/development/libraries/libvorbis/default.nix
@@ -1,11 +1,8 @@
{ stdenv, fetchurl, libogg, pkgconfig }:
-let
+stdenv.mkDerivation rec {
name = "libvorbis-1.3.4";
-in
-stdenv.mkDerivation {
- inherit name;
-
+
src = fetchurl {
url = "http://downloads.xiph.org/releases/vorbis/${name}.tar.xz";
sha256 = "0wpk87jnhngcl3nc5i39flkycx1sjzilx8jjx4zc4p8r55ylj19g";
diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix
index 6800541d923..2346e4b7501 100644
--- a/pkgs/development/libraries/libwebp/default.nix
+++ b/pkgs/development/libraries/libwebp/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, libpng, libjpeg, giflib, libtiff }:
stdenv.mkDerivation rec {
- name = "libwebp-0.4.0";
+ name = "libwebp-0.4.1";
src = fetchurl {
- url = "http://webp.googlecode.com/files/${name}.tar.gz";
- sha256 = "0sadjkx8m6sf064r5gngjvz4b5246q3j27dlaml5b1k3x5vkb49i";
+ url = "http://downloads.webmproject.org/releases/webp/${name}.tar.gz";
+ sha256 = "09yhfhb90hlhr0vq8ajnpk9rxvmb1bkiywcqm7xahl35yvk4ddh0";
};
buildInputs = [ libpng libjpeg giflib libtiff ];
diff --git a/pkgs/development/libraries/libyaml-cpp/0.3.x.nix b/pkgs/development/libraries/libyaml-cpp/0.3.x.nix
deleted file mode 100644
index f94ca128228..00000000000
--- a/pkgs/development/libraries/libyaml-cpp/0.3.x.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{stdenv, fetchurl, cmake, boostHeaders}:
-
-stdenv.mkDerivation {
- name = "libyaml-cpp-0.3.0";
-
- src = fetchurl {
- url = http://yaml-cpp.googlecode.com/files/yaml-cpp-0.3.0.tar.gz;
- sha256 = "10kv25zgq96ybxc6c19lzpax1xi5lpxrdqa9x52nffsql6skil1c";
- };
-
- buildInputs = [ cmake boostHeaders ];
-
- meta = {
- homepage = http://code.google.com/p/yaml-cpp/;
- description = "A YAML parser and emitter for C++";
- license = stdenv.lib.licenses.mit;
- };
-}
diff --git a/pkgs/development/libraries/libyaml-cpp/default.nix b/pkgs/development/libraries/libyaml-cpp/default.nix
index fb81dc425f1..1ba31a7a6d5 100644
--- a/pkgs/development/libraries/libyaml-cpp/default.nix
+++ b/pkgs/development/libraries/libyaml-cpp/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, cmake, boostHeaders}:
+{ stdenv, fetchurl, cmake, boost }:
stdenv.mkDerivation {
name = "libyaml-cpp-0.5.1";
@@ -8,11 +8,13 @@ stdenv.mkDerivation {
sha256 = "01kg0h8ksp162kdhyzn67vnlxpj5zjbks84sh50pv61xni990z1y";
};
- buildInputs = [ cmake boostHeaders ];
+ buildInputs = [ cmake boost ];
- meta = {
+ meta = with stdenv.lib; {
homepage = http://code.google.com/p/yaml-cpp/;
description = "A YAML parser and emitter for C++";
- license = stdenv.lib.licenses.mit;
+ license = licenses.mit;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ wkennington ];
};
}
diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/development/libraries/libyaml/default.nix
index d0ad17048aa..33376cbdad3 100644
--- a/pkgs/development/libraries/libyaml/default.nix
+++ b/pkgs/development/libraries/libyaml/default.nix
@@ -14,5 +14,7 @@ stdenv.mkDerivation {
homepage = http://pyyaml.org/;
description = "A YAML 1.1 parser and emitter written in C";
license = licenses.mit;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ wkennington ];
};
}
diff --git a/pkgs/development/libraries/lightning/default.nix b/pkgs/development/libraries/lightning/default.nix
index 73d98023c84..036d9c61d07 100644
--- a/pkgs/development/libraries/lightning/default.nix
+++ b/pkgs/development/libraries/lightning/default.nix
@@ -1,11 +1,11 @@
{ fetchurl, stdenv, binutils }:
stdenv.mkDerivation rec {
- name = "lightning-2.0.4";
+ name = "lightning-2.0.5";
src = fetchurl {
- url = "ftp://ftp.gnu.org/gnu/lightning/${name}.tar.gz";
- sha256 = "1lrckrx51d5hrv66bc99fd4b7g2wwn4vr304hwq3glfzhb8jqcdy";
+ url = "mirror://gnu/lightning/${name}.tar.gz";
+ sha256 = "0jm9a8ddxc1v9hyzyv4ybg37fjac2yjqv1hkd262wxzqms36mdk5";
};
# Needs libopcodes.so from binutils for 'make check'
diff --git a/pkgs/development/libraries/liquidfun/default.nix b/pkgs/development/libraries/liquidfun/default.nix
new file mode 100644
index 00000000000..a4dc7b5e93d
--- /dev/null
+++ b/pkgs/development/libraries/liquidfun/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, requireFile, cmake, mesa, libX11, libXi }:
+
+let
+ sourceInfo = rec {
+ version="1.1.0";
+ name="liquidfun-${version}";
+ url="https://github.com/google/liquidfun/releases/download/v${version}/${name}";
+ hash="5011a000eacd6202a47317c489e44aa753a833fb562d970e7b8c0da9de01df86";
+ };
+in
+stdenv.mkDerivation rec {
+ src = requireFile {
+ url = sourceInfo.url;
+ sha256 = sourceInfo.hash;
+ name = sourceInfo.name + ".tar.gz";
+ };
+
+ inherit (sourceInfo) name version;
+ buildInputs = [ cmake mesa libX11 libXi ];
+
+ sourceRoot = "liquidfun/Box2D/";
+
+ preConfigurePhases = "preConfigure";
+
+ preConfigure = ''
+ sed -i Box2D/Common/b2Settings.h -e 's@b2_maxPolygonVertices .*@b2_maxPolygonVertices 15@'
+ substituteInPlace Box2D/CMakeLists.txt --replace "Common/b2GrowableStack.h" "Common/b2GrowableStack.h Common/b2GrowableBuffer.h"
+ '';
+
+ configurePhase = ''
+ mkdir Build
+ cd Build;
+ cmake -DBOX2D_INSTALL=ON -DBOX2D_BUILD_SHARED=ON -DCMAKE_INSTALL_PREFIX=$out ..
+ '';
+
+ meta = {
+ description = "2D physics engine based on Box2D";
+ maintainers = with stdenv.lib.maintainers;
+ [
+ qknight
+ ];
+ platforms = stdenv.lib.platforms.linux;
+ hydraPlatforms = [];
+ license = stdenv.lib.licenses.bsd2;
+ homepage = https://google.github.io/liquidfun/;
+ };
+}
+
diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix
index 75f175a5b2d..278eb8e9e52 100644
--- a/pkgs/development/libraries/lirc/default.nix
+++ b/pkgs/development/libraries/lirc/default.nix
@@ -1,18 +1,37 @@
-{ stdenv, fetchurl, alsaLib }:
+{ stdenv, fetchurl, alsaLib, bash, help2man }:
stdenv.mkDerivation rec {
- name = "lirc-0.9.0";
+ name = "lirc-0.9.1a";
src = fetchurl {
url = "mirror://sourceforge/lirc/${name}.tar.bz2";
- sha256 = "1zx4mcnjwzz6jsi6ln7a3dkgx05nvg1pxxvmjqvd966ldapay8v3";
+ sha256 = "191vhgsds221rzpzjibj005pfr182hq65hniqfd0qqsl5h1zwq8r";
};
- buildInputs = [ alsaLib ];
+ patches = [
+ (fetchurl {
+ url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/lirc-0.9.1a-fix-segfaults.patch?h=packages/lirc";
+ sha256 = "00ainq7y8yh2r447968jid06cqfb1xirv24xxrkl0gvakrrv9gnh";
+ })
+ ];
+
+ preBuild = "patchShebangs .";
+
+ buildInputs = [ alsaLib help2man ];
configureFlags = [
"--with-driver=devinput"
"--sysconfdir=$(out)/etc"
"--enable-sandboxed"
];
+
+ makeFlags = [ "m4dir=$(out)/m4" ];
+
+ meta = with stdenv.lib; {
+ description = "Allows to receive and send infrared signals";
+ homepage = http://www.lirc.org/;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ pSub ];
+ };
}
diff --git a/pkgs/development/libraries/lzo/default.nix b/pkgs/development/libraries/lzo/default.nix
index 7fa6194cbca..f4bff72fa80 100644
--- a/pkgs/development/libraries/lzo/default.nix
+++ b/pkgs/development/libraries/lzo/default.nix
@@ -1,11 +1,11 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
- name = "lzo-2.06";
+ name = "lzo-2.08";
src = fetchurl {
url = "${meta.homepage}/download/${name}.tar.gz";
- sha256 = "0wryshs446s7cclrbjykyj766znhcpnr7s3cxy33ybfn6vwfcygz";
+ sha256 = "0536ad3ksk1r8h2a27d0y4p27lwjarzyndw7sagvxzj6xr6kw6xc";
};
configureFlags = [ "--enable-shared" ];
diff --git a/pkgs/development/libraries/menu-cache/default.nix b/pkgs/development/libraries/menu-cache/default.nix
index 8e2e202f432..3131b6b2918 100644
--- a/pkgs/development/libraries/menu-cache/default.nix
+++ b/pkgs/development/libraries/menu-cache/default.nix
@@ -1,13 +1,15 @@
-{ stdenv, fetchurl, glib, pkgconfig }:
+{ stdenv, fetchurl, glib, pkgconfig, libfm-extra }:
+let name = "menu-cache-0.7.0";
+in
stdenv.mkDerivation {
- name = "menu-cache-0.5.1";
+ inherit name;
src = fetchurl {
- url = "mirror://sourceforge/lxde/menu-cache-0.5.1.tar.gz";
- sha256 = "08m1msgbl6j7j72cwcg18klb99jif8h1phkcnbplxkdf3w15irh8";
+ url = "mirror://sourceforge/lxde/${name}.tar.xz";
+ sha256 = "0wwkk4jrcl2sp11bspabplchh4ipi1zyn39j3skyzgbm8k40gkhk";
};
- buildInputs = [ glib pkgconfig ];
+ buildInputs = [ glib pkgconfig libfm-extra ];
meta = with stdenv.lib; {
homepage = "http://blog.lxde.org/?tag=menu-cache";
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index bbad10898bf..54fd8d3810e 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -24,7 +24,7 @@ else
*/
let
- version = "10.2.5";
+ version = "10.2.6";
# this is the default search path for DRI drivers
driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32";
in
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2";
- sha256 = "039is15p8pkhf8m0yiyb72zybl63xb9ckqzcg3xwi8zlyw5ryidl";
+ sha256 = "01n8ib190s12m8hiiyi4wfm9jhkbqjd769npjwvf965smp918cqr";
};
prePatch = "patchShebangs .";
diff --git a/pkgs/development/libraries/muparser/default.nix b/pkgs/development/libraries/muparser/default.nix
index 9d9a524e86d..b68f04f642f 100644
--- a/pkgs/development/libraries/muparser/default.nix
+++ b/pkgs/development/libraries/muparser/default.nix
@@ -1,11 +1,14 @@
{stdenv, fetchurl, unzip}:
-stdenv.mkDerivation {
- name = "muparser-2.2.2";
- src = fetchurl {
- url = mirror://sourceforge/muparser/muparser_v2_2_2.zip;
- sha256 = "0pncvjzzbwcadgpwnq5r7sl9v5r2y9gjgfnlw0mrs9wj206dbhx9";
- };
+stdenv.mkDerivation rec {
+ name = "muparser-${version}";
+ version = "2.2.3";
+ url-version = stdenv.lib.replaceChars ["."] ["_"] version;
+
+ src = fetchurl {
+ url = "mirror://sourceforge/muparser/muparser_v${url-version}.zip";
+ sha256 = "00l92k231yb49wijzkspa2l58mapn6vh2dlxnlg0pawjjfv33s6z";
+ };
buildInputs = [ unzip ];
diff --git a/pkgs/development/libraries/mythes/default.nix b/pkgs/development/libraries/mythes/default.nix
index 8fc160ae11d..dd40a396244 100644
--- a/pkgs/development/libraries/mythes/default.nix
+++ b/pkgs/development/libraries/mythes/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, hunspell, pkgconfig, perl }:
stdenv.mkDerivation rec {
- name = "mythes-1.2.3";
+ name = "mythes-1.2.4";
src = fetchurl {
url = "mirror://sourceforge/hunspell/${name}.tar.gz";
- sha256 = "0f5q7yiwg9bw4a5zxg0dapqdfc2grfb4ss34ifir3mhhy4q3jf4j";
+ sha256 = "0prh19wy1c74kmzkkavm9qslk99gz8h8wmjvwzjc6lf8v2az708y";
};
buildInputs = [ hunspell ];
diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix
index 0355ce25c62..01967718c40 100644
--- a/pkgs/development/libraries/nspr/default.nix
+++ b/pkgs/development/libraries/nspr/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl }:
-let version = "4.10.6"; in
+let version = "4.10.7"; in
stdenv.mkDerivation {
name = "nspr-${version}";
src = fetchurl {
url = "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
- sha1 = "3hzcslcfql1rg7drvcn4nmrigy7jfgwz";
+ sha256 = "389af5cfa863ea9bc6de7b30c15f8a4f9bddd8002f8c6fdc8b33caef43893938";
};
preConfigure = "cd nspr";
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index 447030f5fcc..630d1890409 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -11,11 +11,11 @@ let
in stdenv.mkDerivation rec {
name = "nss-${version}";
- version = "3.16.3";
+ version = "3.16.5";
src = fetchurl {
- url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_16_3_RTM/src/${name}.tar.gz";
- sha256 = "657711ff7a4058043b69019a66f44101d0234eae2b6b80ab900439dbf02add60";
+ url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_16_5_RTM/src/${name}.tar.gz";
+ sha256 = "e744b9fb2a6291d7eaf1b3f0157082f4214984db33f896e4adf3141340d64196";
};
buildInputs = [ nspr perl zlib sqlite ];
diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/development/libraries/oniguruma/default.nix
index 08069533713..d12423ffc27 100644
--- a/pkgs/development/libraries/oniguruma/default.nix
+++ b/pkgs/development/libraries/oniguruma/default.nix
@@ -1,16 +1,17 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "onig-5.9.4";
-
+ name = "onig-5.9.5";
+
src = fetchurl {
- url = http://www.geocities.jp/kosako3/oniguruma/archive/onig-5.9.4.tar.gz;
- sha256 = "15q62c2id918fj2i7xbdrcc79xrdafdc75lhhld98rgq3y8j30lq";
+ url = http://www.geocities.jp/kosako3/oniguruma/archive/onig-5.9.5.tar.gz;
+ sha256 = "12j3fsdb8hbhnj29hysal9l7i7s71l0ln3lx8hjpxx5535wawjcz";
};
-
+
meta = {
homepage = http://www.geocities.jp/kosako3/oniguruma/;
description = "Regular expressions library";
- license = "BSD";
+ license = stdenv.lib.licenses.bsd2;
+ maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
};
}
diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix
index 7dafcfce948..45ac75340b1 100644
--- a/pkgs/development/libraries/opencv/default.nix
+++ b/pkgs/development/libraries/opencv/default.nix
@@ -1,19 +1,19 @@
{ lib, stdenv, fetchurl, cmake, gtk, libjpeg, libpng, libtiff, jasper, ffmpeg
-, pkgconfig, gstreamer, xineLib, glib, python27, python27Packages
+, pkgconfig, gstreamer, xineLib, glib, python27, python27Packages, unzip
, enableBloat ? false }:
-let v = "2.4.7"; in
+let v = "2.4.9"; in
stdenv.mkDerivation rec {
name = "opencv-${v}";
src = fetchurl {
- url = "mirror://sourceforge/opencvlibrary/opencv-${v}.tar.gz";
- sha256 = "0hravl3yhyv4r4n7vb055d4qnp893q2hc0fcmmncfh7sbdrnr3f4";
+ url = "mirror://sourceforge/opencvlibrary/opencv-${v}.zip";
+ sha256 = "0wacpc00dr57w4lxfvllqa177cnbgy2zmcx8pnf8x62lh6210c40";
};
buildInputs =
- [ libjpeg libpng libtiff ]
+ [ unzip libjpeg libpng libtiff ]
++ lib.optionals enableBloat [ gtk glib jasper ffmpeg xineLib gstreamer python27 python27Packages.numpy ];
nativeBuildInputs = [ cmake pkgconfig ];
diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix
index c9da441705c..01a4e2e21da 100644
--- a/pkgs/development/libraries/openldap/default.nix
+++ b/pkgs/development/libraries/openldap/default.nix
@@ -12,14 +12,16 @@ stdenv.mkDerivation rec {
configureFlags =
[ "--enable-overlays"
+ "--disable-dependency-tracking" # speeds up one-time build
] ++ stdenv.lib.optional (openssl == null) "--without-tls"
++ stdenv.lib.optional (cyrus_sasl == null) "--without-cyrus-sasl";
dontPatchELF = 1; # !!!
- meta = {
- homepage = "http://www.openldap.org/";
+ meta = with stdenv.lib; {
+ homepage = http://www.openldap.org/;
description = "An open source implementation of the Lightweight Directory Access Protocol";
- maintainers = stdenv.lib.maintainers.mornfall;
+ maintainers = with maintainers; [ lovek323 mornfall ];
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix
index 678a439fe0a..14d88e381b3 100644
--- a/pkgs/development/libraries/openmpi/default.nix
+++ b/pkgs/development/libraries/openmpi/default.nix
@@ -1,4 +1,13 @@
-{stdenv, fetchurl, gfortran}:
+{stdenv, fetchurl, gfortran
+
+# Enable the Sun Grid Engine bindings
+, enableSGE ? false
+
+# Pass PATH/LD_LIBRARY_PATH to point to current mpirun by default
+, enablePrefix ? false
+}:
+
+with stdenv.lib;
stdenv.mkDerivation {
name = "openmpi-1.6.5";
@@ -7,11 +16,15 @@ stdenv.mkDerivation {
sha256 = "11gws4d3z7934zna2r7m1f80iay2ha17kp42mkh39wjykfwbldzy";
};
buildInputs = [ gfortran ];
+ configureFlags = []
+ ++ optional enableSGE "--with-sge"
+ ++ optional enablePrefix "--enable-mpirun-prefix-by-default"
+ ;
meta = {
homePage = http://www.open-mpi.org/;
description = "Open source MPI-2 implementation";
longDescription = "The Open MPI Project is an open source MPI-2 implementation that is developed and maintained by a consortium of academic, research, and industry partners. Open MPI is therefore able to combine the expertise, technologies, and resources from all across the High Performance Computing community in order to build the best MPI library available. Open MPI offers advantages for system and software vendors, application developers and computer science researchers.";
- maintainers = stdenv.lib.maintainers.mornfall;
+ maintainers = [ stdenv.lib.maintainers.mornfall ];
};
}
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 8c88df984f0..c972635c9c7 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -60,7 +60,12 @@ stdenv.mkDerivation {
else "./config";
configureFlags = "shared --libdir=lib --openssldir=etc/ssl" +
- stdenv.lib.optionalString withCryptodev " -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS";
+ stdenv.lib.optionalString withCryptodev " -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS" +
+ stdenv.lib.optionalString (stdenv.system == "x86_64-cygwin") " no-asm";
+
+ preBuild = stdenv.lib.optionalString (stdenv.system == "x86_64-cygwin") ''
+ sed -i -e "s|-march=i486|-march=x86-64|g" Makefile
+ '';
makeFlags = "MANDIR=$(out)/share/man";
diff --git a/pkgs/development/libraries/osip/default.nix b/pkgs/development/libraries/osip/default.nix
index cfa838f5a37..4db1cb5b524 100644
--- a/pkgs/development/libraries/osip/default.nix
+++ b/pkgs/development/libraries/osip/default.nix
@@ -1,9 +1,9 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
- version = "4.0.0";
+ version = "4.1.0";
src = fetchurl {
url = "mirror://gnu/osip/libosip2-${version}.tar.gz";
- sha256 = "05dhj4s5k4qmhn2amca070xgh1gkcl42n040fhwsn3vm86524bdv";
+ sha256 = "014503kqv7z63az6lgxr5fbajlrqylm5c4kgbf8p3a0n6cva0slr";
};
name = "libosip2-${version}";
@@ -13,5 +13,6 @@ stdenv.mkDerivation rec {
description = "The GNU oSIP library, an implementation of the Session Initiation Protocol (SIP)";
maintainers = with stdenv.lib.maintainers; [ raskin ];
platforms = stdenv.lib.platforms.linux;
+ inherit version;
};
}
diff --git a/pkgs/development/libraries/osip/default.upstream b/pkgs/development/libraries/osip/default.upstream
new file mode 100644
index 00000000000..ba0ed2a9b29
--- /dev/null
+++ b/pkgs/development/libraries/osip/default.upstream
@@ -0,0 +1,3 @@
+url http://ftp.u-tx.net/gnu/osip/
+attribute_name libosip
+minimize_overwrite
diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix
index 4cf6bd44dd3..930d7b86f06 100644
--- a/pkgs/development/libraries/pcre/default.nix
+++ b/pkgs/development/libraries/pcre/default.nix
@@ -5,11 +5,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "pcre-8.34";
+ name = "pcre-8.35";
src = fetchurl {
url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${name}.tar.bz2";
- sha256 = "0gsqmsp0q0n3q0ba32gkjvgcsdy6nwidqa7sbxkbw817zzhkl15n";
+ sha256 = "0nw66r92dr24vy9k4lw17bkv8x5nlzn6wx9hq4y2dvzgig3w2qd9";
};
# The compiler on Darwin crashes with an internal error while building the
diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix
new file mode 100644
index 00000000000..1e1fc7ea3b8
--- /dev/null
+++ b/pkgs/development/libraries/physics/geant4/default.nix
@@ -0,0 +1,150 @@
+{ enableMultiThreading ? false
+, enableG3toG4 ? false
+, enableInventor ? false
+, enableGDML ? false
+, enableQT ? false
+, enableXM ? false
+, enableOpenGLX11 ? false
+, enableRaytracerX11 ? false
+
+# Standard build environment with cmake.
+, stdenv, fetchurl, cmake
+
+# Optional system packages, otherwise internal GEANT4 packages are used.
+, clhep ? null
+, expat ? null
+, zlib ? null
+
+# For enableGDML.
+, xercesc ? null
+
+# For enableQT.
+, qt ? null # qt4SDK or qt5SDK
+
+# For enableXM.
+, motif ? null # motif or lesstif
+
+# For enableQT, enableXM, enableOpenGLX11, enableRaytracerX11.
+, mesa ? null
+, x11 ? null
+, libXmu ? null
+}:
+
+# G4persistency library with support for GDML
+assert enableGDML -> xercesc != null;
+
+# If enableQT, Qt4/5 User Interface and Visualization drivers.
+assert enableQT -> qt != null;
+
+# Motif User Interface and Visualisation drivers.
+assert enableXM -> motif != null;
+
+# OpenGL/X11 User Interface and Visualisation drivers.
+assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> mesa != null;
+assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> x11 != null;
+assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> libXmu != null;
+
+let
+ buildGeant4 =
+ { version, src, multiThreadingCapable ? false }:
+
+ stdenv.mkDerivation rec {
+ inherit version src;
+ name = "geant4-${version}";
+
+ # The data directory holds not just interaction cross section data, but other
+ # files which the installer needs to write, so we link to the previously installed
+ # data instead. This assumes the default data installation location of $out/share.
+ preConfigure = ''
+ mkdir -p $out/share/Geant4-${version}
+ ln -s ${g4data}/Geant4-${version}/data $out/share/Geant4-${version}/data
+ '';
+
+ multiThreadingFlag = if multiThreadingCapable then "-DGEANT4_BUILD_MULTITHREADED=${if enableMultiThreading then "ON" else "OFF"}" else "";
+
+ cmakeFlags = ''
+ ${multiThreadingFlag}
+ -DGEANT4_USE_GDML=${if enableGDML then "ON" else "OFF"}
+ -DGEANT4_USE_G3TOG4=${if enableG3toG4 then "ON" else "OFF"}
+ -DGEANT4_USE_QT=${if enableQT then "ON" else "OFF"}
+ -DGEANT4_USE_XM=${if enableXM then "ON" else "OFF"}
+ -DGEANT4_USE_OPENGL_X11=${if enableOpenGLX11 then "ON" else "OFF"}
+ -DGEANT4_USE_INVENTOR=${if enableInventor then "ON" else "OFF"}
+ -DGEANT4_USE_RAYTRACER_X11=${if enableRaytracerX11 then "ON" else "OFF"}
+ -DGEANT4_USE_SYSTEM_CLHEP=${if clhep != null then "ON" else "OFF"}
+ -DGEANT4_USE_SYSTEM_EXPAT=${if expat != null then "ON" else "OFF"}
+ -DGEANT4_USE_SYSTEM_ZLIB=${if zlib != null then "ON" else "OFF"}
+ '';
+
+ g4data = installData {
+ inherit version src;
+ };
+
+ enableParallelBuilding = true;
+ buildInputs = [ cmake clhep expat zlib xercesc qt motif mesa x11 libXmu ];
+ propagatedBuildInputs = [ g4data clhep expat zlib xercesc qt motif mesa x11 libXmu ];
+
+ setupHook = ./setup-hook.sh;
+
+ # Set the myriad of envars required by Geant4 if we use a nix-shell.
+ shellHook = ''
+ source $out/nix-support/setup-hook
+ '';
+
+ meta = {
+ description = "A toolkit for the simulation of the passage of particles through matter.";
+ longDescription = ''
+ Geant4 is a toolkit for the simulation of the passage of particles through matter.
+ Its areas of application include high energy, nuclear and accelerator physics, as well as studies in medical and space science.
+ The two main reference papers for Geant4 are published in Nuclear Instruments and Methods in Physics Research A 506 (2003) 250-303, and IEEE Transactions on Nuclear Science 53 No. 1 (2006) 270-278.
+ '';
+ homepage = http://www.geant4.org;
+ license = stdenv.lib.licenses.g4sl;
+ maintainers = [ ];
+ platforms = stdenv.lib.platforms.all;
+ };
+ };
+
+ installData =
+ { version, src }:
+
+ stdenv.mkDerivation rec {
+ inherit version src;
+ name = "g4data-${version}";
+
+ cmakeFlags = ''
+ -DGEANT4_INSTALL_DATA="ON"
+ '';
+
+ buildInputs = [ cmake expat ];
+
+ enableParallelBuilding = true;
+ buildPhase = ''
+ make G4EMLOW G4NDL G4NEUTRONXS G4PII G4SAIDDATA PhotonEvaporation RadioactiveDecay RealSurface
+ '';
+
+ installPhase = ''
+ mkdir -p $out/Geant4-${version}
+ cp -R data/ $out/Geant4-${version}
+ '';
+
+ meta = {
+ description = "Data files for the Geant4 toolkit.";
+ homepage = http://www.geant4.org;
+ license = stdenv.lib.licenses.g4sl;
+ maintainers = [ ];
+ platforms = stdenv.lib.platforms.all;
+ };
+ };
+
+ fetchGeant4 = import ./fetch.nix {
+ inherit stdenv fetchurl;
+ };
+
+in {
+ v10_0_2 = buildGeant4 {
+ inherit (fetchGeant4.v10_0_2) version src;
+ multiThreadingCapable = true;
+ };
+}
+
diff --git a/pkgs/development/libraries/physics/geant4/fetch.nix b/pkgs/development/libraries/physics/geant4/fetch.nix
new file mode 100644
index 00000000000..0e5dd54c6ae
--- /dev/null
+++ b/pkgs/development/libraries/physics/geant4/fetch.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl }:
+
+let
+ fetch = { version, src ? builtins.getAttr stdenv.system sources, sources ? null }:
+ {
+ inherit version src;
+ };
+
+in {
+ v10_0_2 = fetch {
+ version = "10.0.2";
+
+ src = fetchurl{
+ url = "http://geant4.cern.ch/support/source/geant4.10.00.p02.tar.gz";
+ sha256 = "9d615200901f1a5760970e8f5970625ea146253e4f7c5ad9df2a9cf84549e848";
+ };
+ };
+}
+
diff --git a/pkgs/development/libraries/physics/geant4/g4py/configure.patch b/pkgs/development/libraries/physics/geant4/g4py/configure.patch
new file mode 100644
index 00000000000..886618abd34
--- /dev/null
+++ b/pkgs/development/libraries/physics/geant4/g4py/configure.patch
@@ -0,0 +1,12 @@
+--- environments/g4py/configure 2014-03-17 22:47:05.000000000 +1100
++++ environments/g4py/configure 2014-09-01 15:33:46.523637686 +1000
+@@ -4,9 +4,6 @@
+ # ======================================================================
+ export LANG=C
+
+-PATH=/bin:/usr/bin
+-export PATH
+-
+ # ======================================================================
+ # testing the echo features
+ # ======================================================================
diff --git a/pkgs/development/libraries/physics/geant4/g4py/default.nix b/pkgs/development/libraries/physics/geant4/g4py/default.nix
new file mode 100644
index 00000000000..f90b2e6c4ae
--- /dev/null
+++ b/pkgs/development/libraries/physics/geant4/g4py/default.nix
@@ -0,0 +1,70 @@
+{ stdenv, fetchurl
+
+# The target version of Geant4
+, geant4
+
+# Python (obviously) and boost::python for wrapping.
+, python
+, boost
+}:
+
+let
+ buildG4py =
+ { version, src, geant4}:
+
+ stdenv.mkDerivation rec {
+ inherit version src geant4;
+ name = "g4py-${version}";
+
+ # ./configure overwrites $PATH, which clobbers everything.
+ patches = [ ./configure.patch ];
+ patchFlags = "-p0";
+
+ configurePhase = ''
+ export PYTHONPATH=$PYTHONPATH:${geant4}/lib64:$prefix
+
+ source ${geant4}/share/Geant4-*/geant4make/geant4make.sh
+ cd environments/g4py
+
+ ./configure linux64 --prefix=$prefix \
+ --with-g4install-dir=${geant4} \
+ --with-python-incdir=${python}/include/python${python.majorVersion} \
+ --with-python-libdir=${python}/lib \
+ --with-boost-incdir=${boost}/include \
+ --with-boost-libdir=${boost}/lib
+ '';
+
+ enableParallelBuilding = true;
+ buildInputs = [ geant4 boost python ];
+
+ setupHook = ./setup-hook.sh;
+
+ # Make sure we set PYTHONPATH
+ shellHook = ''
+ source $out/nix-support/setup-hook
+ '';
+
+ meta = {
+ description = "Python bindings and utilities for Geant4.";
+ longDescription = ''
+ Geant4 is a toolkit for the simulation of the passage of particles through matter.
+ Its areas of application include high energy, nuclear and accelerator physics, as well as studies in medical and space science.
+ The two main reference papers for Geant4 are published in Nuclear Instruments and Methods in Physics Research A 506 (2003) 250-303, and IEEE Transactions on Nuclear Science 53 No. 1 (2006) 270-278.
+ '';
+ homepage = http://www.geant4.org;
+ license = stdenv.lib.licenses.g4sl;
+ maintainers = [ ];
+ platforms = stdenv.lib.platforms.all;
+ };
+ };
+
+ fetchGeant4 = import ../fetch.nix {
+ inherit stdenv fetchurl;
+ };
+
+in {
+ v10_0_2 = buildG4py {
+ inherit (fetchGeant4.v10_0_2) version src;
+ geant4 = geant4.v10_0_2;
+ };
+}
diff --git a/pkgs/development/libraries/physics/geant4/g4py/setup-hook.sh b/pkgs/development/libraries/physics/geant4/g4py/setup-hook.sh
new file mode 100644
index 00000000000..8abfb461fc0
--- /dev/null
+++ b/pkgs/development/libraries/physics/geant4/g4py/setup-hook.sh
@@ -0,0 +1 @@
+export PYTHONPATH=$PYTHONPATH:@out@/lib
diff --git a/pkgs/development/libraries/physics/geant4/setup-hook.sh b/pkgs/development/libraries/physics/geant4/setup-hook.sh
new file mode 100644
index 00000000000..0b775d43283
--- /dev/null
+++ b/pkgs/development/libraries/physics/geant4/setup-hook.sh
@@ -0,0 +1 @@
+source @out@/bin/geant4.sh
diff --git a/pkgs/development/libraries/protobufc/default.nix b/pkgs/development/libraries/protobufc/default.nix
index 58c639ee604..4d2c1d4349f 100644
--- a/pkgs/development/libraries/protobufc/default.nix
+++ b/pkgs/development/libraries/protobufc/default.nix
@@ -1,22 +1,23 @@
-{ fetchurl, stdenv, zlib, protobuf }:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, protobuf, zlib }:
stdenv.mkDerivation rec {
- name = "protobuf-c-0.15";
+ name = "protobuf-c-${version}";
+ version = "1.0.2";
- src = fetchurl {
- url = "http://protobuf-c.googlecode.com/files/${name}.tar.gz";
- sha256 = "0dh0180lzqk6n1r0qk38kgdy4x15mpkg5j4g2r31qhx52f757jwg";
+ src = fetchFromGitHub {
+ owner = "protobuf-c";
+ repo = "protobuf-c";
+ rev = "v${version}";
+ sha256 = "1harabw7qdgcmh098664xkcv8bkyach6i35sisc40yhvagr3fzsz";
};
- buildInputs = [ protobuf ];
+ buildInputs = [ autoreconfHook pkgconfig protobuf zlib ];
- doCheck = true;
-
- meta = {
+ meta = with stdenv.lib; {
+ homepage = http://github.com/protobuf-c/protobuf-c/;
description = "C bindings for Google's Protocol Buffers";
-
- license = "BSD";
-
- homepage = http://code.google.com/p/protobuf-c/;
+ license = licenses.bsd2;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ wkennington ];
};
}
diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix
new file mode 100644
index 00000000000..52736ba5d34
--- /dev/null
+++ b/pkgs/development/libraries/qscintilla/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchurl, qt }:
+
+stdenv.mkDerivation rec {
+ pname = "qscintilla";
+ version = "2.8.3";
+
+ name = "${pname}-${version}";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/pyqt/QScintilla2/QScintilla-${version}/QScintilla-gpl-${version}.tar.gz";
+ sha256 = "fb94e6d61c3ccd4bf167d5f092629e619f7069d42207469458998b761a7cf505";
+ };
+
+ buildInputs = [ qt ];
+
+ preConfigure = ''
+ cd Qt4Qt5
+ sed -i -e "s,\$\$\\[QT_INSTALL_LIBS\\],$out/libs," \
+ -e "s,\$\$\\[QT_INSTALL_HEADERS\\],$out/include/," \
+ -e "s,\$\$\\[QT_INSTALL_TRANSLATIONS\\],$out/share/qt/translations," \
+ -e "s,\$\$\\[QT_INSTALL_DATA\\],$out/share/qt," \
+ qscintilla.pro
+ qmake qscintilla.pro
+ '';
+
+ # TODO PyQt Support.
+
+ meta = {
+ description = "A Qt port of the Scintilla text editing library";
+ longDescription = ''
+ QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ editor
+ control.
+
+ As well as features found in standard text editing components,
+ QScintilla includes features especially useful when editing and
+ debugging source code. These include support for syntax styling,
+ error indicators, code completion and call tips. The selection
+ margin can contain markers like those used in debuggers to
+ indicate breakpoints and the current line. Styling choices are
+ more open than with many editors, allowing the use of
+ proportional fonts, bold and italics, multiple foreground and
+ background colours and multiple fonts.
+ '';
+ homepage = http://www.riverbankcomputing.com/software/qscintilla/intro;
+ license = stdenv.lib.licenses.gpl2; # and gpl3 and commercial
+ };
+}
diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix
new file mode 100644
index 00000000000..9eb068bebb0
--- /dev/null
+++ b/pkgs/development/libraries/quazip/default.nix
@@ -0,0 +1,23 @@
+{ fetchurl, stdenv, zip, zlib, qt5 }:
+
+stdenv.mkDerivation rec {
+ name = "quazip-0.7";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/quazip/${name}.tar.gz";
+ sha256 = "8af5e7f9bff98b5a2982800a292eae0176c2b41a98a8deab14f4e1cbe07674a4";
+ };
+
+ configurePhase = "cd quazip && qmake quazip.pro";
+
+ installFlags = "INSTALL_ROOT=$(out)";
+
+ buildInputs = [ zlib qt5 ];
+
+ meta = {
+ description = "Provides access to ZIP archives from Qt programs";
+ license = stdenv.lib.licenses.gpl2Plus;
+ homepage = http://quazip.sourceforge.net/;
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/development/libraries/readline/readline5.nix b/pkgs/development/libraries/readline/5.x.nix
similarity index 97%
rename from pkgs/development/libraries/readline/readline5.nix
rename to pkgs/development/libraries/readline/5.x.nix
index c208d5b9fe6..ad9860d855e 100644
--- a/pkgs/development/libraries/readline/readline5.nix
+++ b/pkgs/development/libraries/readline/5.x.nix
@@ -2,13 +2,14 @@
stdenv.mkDerivation {
name = "readline-5.2";
-
+
src = fetchurl {
url = mirror://gnu/readline/readline-5.2.tar.gz;
sha256 = "0icz4hqqq8mlkwrpczyaha94kns0am9z0mh3a2913kg2msb8vs0j";
};
-
+
propagatedBuildInputs = [ncurses];
-
+
patches = stdenv.lib.optional stdenv.isDarwin ./shobj-darwin.patch;
}
+
diff --git a/pkgs/development/libraries/readline/readline6.nix b/pkgs/development/libraries/readline/6.2.nix
similarity index 100%
rename from pkgs/development/libraries/readline/readline6.nix
rename to pkgs/development/libraries/readline/6.2.nix
diff --git a/pkgs/development/libraries/readline/readline6.3.nix b/pkgs/development/libraries/readline/6.3.nix
similarity index 65%
rename from pkgs/development/libraries/readline/readline6.3.nix
rename to pkgs/development/libraries/readline/6.3.nix
index 17299e5f10d..38ecc034d89 100644
--- a/pkgs/development/libraries/readline/readline6.3.nix
+++ b/pkgs/development/libraries/readline/6.3.nix
@@ -1,10 +1,10 @@
{ fetchurl, stdenv, ncurses }:
-stdenv.mkDerivation (rec {
- name = "readline-6.3";
+stdenv.mkDerivation rec {
+ name = "readline-6.3p08";
src = fetchurl {
- url = "mirror://gnu/readline/${name}.tar.gz";
+ url = "mirror://gnu/readline/readline-6.3.tar.gz";
sha256 = "0hzxr9jxqqx5sxsv9vmlxdnvlr9vi4ih1avjb869hbs6p5qn1fjn";
};
@@ -15,9 +15,21 @@ stdenv.mkDerivation (rec {
patches =
[ ./link-against-ncurses.patch
./no-arch_only-6.3.patch
- ];
+ ]
+ ++
+ (let
+ patch = nr: sha256:
+ fetchurl {
+ url = "mirror://gnu/readline/readline-6.3-patches/readline63-${nr}";
+ inherit sha256;
+ };
+ in
+ import ./readline-6.3-patches.nix patch);
- meta = {
+ # Don't run the native `strip' when cross-compiling.
+ dontStrip = stdenv ? cross;
+
+ meta = with stdenv.lib; {
description = "Library for interactive line editing";
longDescription = ''
@@ -37,15 +49,10 @@ stdenv.mkDerivation (rec {
homepage = http://savannah.gnu.org/projects/readline/;
- license = stdenv.lib.licenses.gpl3Plus;
+ license = licenses.gpl3Plus;
- maintainers = [ stdenv.lib.maintainers.ludo ];
+ maintainers = [ maintainers.ludo ];
+
+ platforms = platforms.unix;
};
}
-
-//
-
-# Don't run the native `strip' when cross-compiling.
-(if (stdenv ? cross)
- then { dontStrip = true; }
- else { }))
diff --git a/pkgs/development/libraries/readline/readline-6.3-patches.nix b/pkgs/development/libraries/readline/readline-6.3-patches.nix
new file mode 100644
index 00000000000..d0aaaf38f70
--- /dev/null
+++ b/pkgs/development/libraries/readline/readline-6.3-patches.nix
@@ -0,0 +1,12 @@
+# Automatically generated by `update-patch-set.sh'; do not edit.
+
+patch: [
+(patch "001" "0vqlj22mkbn3x42qx2iqir7capx462dhagbzdw6hwxgfxavbny8s")
+(patch "002" "19g0l6vlfcqzwfwjj1slkmxzndjp4543hwrf26g8z216lp3h9qrr")
+(patch "003" "0bx53k876w8vwf4h2s6brr1i46ym87gi71bh8zl89n0gn3cbshgc")
+(patch "004" "1k2m8dg1awmjhmivdbx1c25866gfbpg0fy4845n8cw15zc3bjis5")
+(patch "005" "0jr7c28bzn882as5i54l53bhi723s1nkvzmwlh3rj6ld4bwqhxw7")
+(patch "006" "0mp5zgx50792gigkmjap3d0zpdv5qanii8djab7j6z69qsrpl8sw")
+(patch "007" "1sjv9w0mglh395i6hlq3ck7wdxvi2wyddlyb2j0jwg7cmnibayad")
+(patch "008" "11rpqhsxd132gc8455v51ma3a5zshznb0mh2p0zc5skcab7r7h1v")
+]
diff --git a/pkgs/development/libraries/readline/readline4.nix b/pkgs/development/libraries/readline/readline4.nix
deleted file mode 100644
index d9dcdc9f048..00000000000
--- a/pkgs/development/libraries/readline/readline4.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ stdenv, fetchurl, ncurses }:
-
-stdenv.mkDerivation {
- name = "readline-4.3";
- src = fetchurl {
- url = mirror://gnu/readline/readline-4.3.tar.gz;
- md5 = "f86f7cb717ab321fe15f1bbcb058c11e";
- };
- propagatedBuildInputs = [ncurses];
-}
diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix
index 9aab09094a0..938778734e0 100644
--- a/pkgs/development/libraries/science/math/atlas/default.nix
+++ b/pkgs/development/libraries/science/math/atlas/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, gfortran, tolerateCpuTimingInaccuracy ? true, shared ? false
-, cpuConfig ? if stdenv.isi686 then "-b 32 -A 18 -V 1" else "-b 64 -A 31 -V 192"
+, cpuConfig ? if stdenv.isi686 then "-b 32 -A 18 -V 1" else "-b 64 -A 31 -V 384"
}:
# Atlas detects the CPU and optimizes its build accordingly. This is great when
@@ -15,13 +15,18 @@
# |---------------------------------------------+------------------------|
# | -b 32 | -b 64 |
# | -A 18 (Pentium II) | -A 31 (Athlon K7) |
-# | -V 1 (No SIMD: Pentium II doesn't have SSE) | -V 192 (SSE1 and SSE2) |
+# | -V 1 (No SIMD: Pentium II doesn't have SSE) | -V 384 (SSE1 and SSE2) |
#
# Users who want to compile a highly optimized version of ATLAS that's suitable
# for their local machine can override these settings accordingly.
+#
+# The -V flags can change with each release as new instruction sets are added
+# because upstream thinks it's a good idea to add entries at the start of an
+# enum, rather than the end. If the build suddenly fails with messages about
+# missing instruction sets, you may need to poke around in the source a bit.
let
- version = "3.10.1";
+ version = "3.10.2";
optionalString = stdenv.lib.optionalString;
optional = stdenv.lib.optional;
@@ -32,7 +37,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "mirror://sourceforge/math-atlas/atlas${version}.tar.bz2";
- sha256 = "11ncgdc7kzb2y2gqb3sgarm5saj9fr07r3h2yh2h5bja429b85d2";
+ sha256 = "0bqh4bdnjdyww4mcpg6kn0x7338mfqbdgysn97dzrwwb26di7ars";
};
buildInputs = [ gfortran ];
@@ -67,5 +72,7 @@ stdenv.mkDerivation {
portable performance. At present, it provides C and Fortran77 interfaces to a
portably efficient BLAS implementation, as well as a few routines from LAPACK.
'';
+
+ maintainers = with stdenv.lib.maintainers; [ ttuegel ];
};
}
diff --git a/pkgs/development/libraries/science/math/openblas/0.2.10.nix b/pkgs/development/libraries/science/math/openblas/0.2.10.nix
index a8db0631911..ec4422ce895 100644
--- a/pkgs/development/libraries/science/math/openblas/0.2.10.nix
+++ b/pkgs/development/libraries/science/math/openblas/0.2.10.nix
@@ -1,5 +1,8 @@
-{ stdenv, fetchurl, gfortran, perl, liblapack }:
+{ stdenv, fetchurl, gfortran, perl, liblapack, config }:
+let local = config.openblas.preferLocalBuild or false;
+ localTarget = config.openblas.target or "";
+in
stdenv.mkDerivation rec {
version = "0.2.10";
@@ -16,17 +19,19 @@ stdenv.mkDerivation rec {
cpu = builtins.head (stdenv.lib.splitString "-" stdenv.system);
- target = if cpu == "i686" then "P2" else
+ target = if local then localTarget else
+ if cpu == "i686" then "P2" else
if cpu == "x86_64" then "CORE2" else
# allow autodetect
"";
makeFlags = "${if target != "" then "TARGET=" else ""}${target} FC=gfortran CC=cc PREFIX=\"\$(out)\" INTERFACE64=1";
- meta = {
+ meta = with stdenv.lib; {
description = "Basic Linear Algebra Subprograms";
- license = stdenv.lib.licenses.bsd3;
+ license = licenses.bsd3;
homepage = "https://github.com/xianyi/OpenBLAS";
platforms = [ "x86_64-linux" ];
+ maintainers = with maintainers; [ ttuegel ];
};
}
diff --git a/pkgs/development/libraries/science/math/openblas/0.2.2.nix b/pkgs/development/libraries/science/math/openblas/0.2.2.nix
new file mode 100644
index 00000000000..c476dac955a
--- /dev/null
+++ b/pkgs/development/libraries/science/math/openblas/0.2.2.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, gfortran, perl, liblapack, config }:
+
+let local = config.openblas.preferLocalBuild or false;
+ localTarget = config.openblas.target or "";
+in
+stdenv.mkDerivation rec {
+ version = "0.2.2";
+
+ name = "openblas-${version}";
+ src = fetchurl {
+ url = "https://github.com/xianyi/OpenBLAS/tarball/v${version}";
+ sha256 = "13kdx3knff5ajnmgn419g0dnh83plin07p7akwamr3v7z5qfrzqr";
+ name = "openblas-${version}.tar.gz";
+ };
+
+ preBuild = "cp ${liblapack.src} lapack-${liblapack.meta.version}.tgz";
+
+ buildInputs = [gfortran perl];
+
+ cpu = builtins.head (stdenv.lib.splitString "-" stdenv.system);
+
+ target = if local then localTarget else
+ if cpu == "i686" then "P2" else
+ if cpu == "x86_64" then "CORE2" else
+ # allow autodetect
+ "";
+
+ makeFlags = "${if target != "" then "TARGET=" else ""}${target} FC=gfortran CC=cc PREFIX=\"\$(out)\"";
+
+ meta = with stdenv.lib; {
+ description = "Basic Linear Algebra Subprograms";
+ license = licenses.bsd3;
+ homepage = "https://github.com/xianyi/OpenBLAS";
+ platforms = [ "x86_64-linux" ];
+ maintainers = with maintainers; [ ttuegel ];
+ };
+}
diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index c535b1a39db..6ca1f4ccada 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -1,12 +1,15 @@
-{ stdenv, fetchurl, gfortran, perl, liblapack }:
+{ stdenv, fetchurl, gfortran, perl, liblapack, config }:
+let local = config.openblas.preferLocalBuild or false;
+ localTarget = config.openblas.target or "";
+in
stdenv.mkDerivation rec {
- version = "0.2.2";
+ version = "0.2.11";
name = "openblas-${version}";
src = fetchurl {
url = "https://github.com/xianyi/OpenBLAS/tarball/v${version}";
- sha256 = "13kdx3knff5ajnmgn419g0dnh83plin07p7akwamr3v7z5qfrzqr";
+ sha256 = "1va4yhzgj2chcj6kaxgfbzirajp1zgvkic61959aka2xq2c5igms";
name = "openblas-${version}.tar.gz";
};
@@ -16,17 +19,19 @@ stdenv.mkDerivation rec {
cpu = builtins.head (stdenv.lib.splitString "-" stdenv.system);
- target = if cpu == "i686" then "P2" else
+ target = if local then localTarget else
+ if cpu == "i686" then "P2" else
if cpu == "x86_64" then "CORE2" else
# allow autodetect
"";
- makeFlags = "${if target != "" then "TARGET=" else ""}${target} FC=gfortran CC=cc PREFIX=\"\$(out)\"";
+ makeFlags = "${if target != "" then "TARGET=" else ""}${target} FC=gfortran CC=cc PREFIX=\"\$(out)\" INTERFACE64=1";
- meta = {
+ meta = with stdenv.lib; {
description = "Basic Linear Algebra Subprograms";
- license = stdenv.lib.licenses.bsd3;
+ license = licenses.bsd3;
homepage = "https://github.com/xianyi/OpenBLAS";
platforms = [ "x86_64-linux" ];
+ maintainers = with maintainers; [ ttuegel ];
};
}
diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix
index 2fd5c9ad493..c0935bd33fd 100644
--- a/pkgs/development/libraries/serd/default.nix
+++ b/pkgs/development/libraries/serd/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "serd-${version}";
- version = "0.18.2";
+ version = "0.20.0";
src = fetchurl {
url = "http://download.drobilla.net/${name}.tar.bz2";
- sha256 = "1hgajhm4iar4n2kh71pv6yr0yhipj28kds9y5mbig8izqc188gcf";
+ sha256 = "1gxbzqsm212wmn8qkdd3lbl6wbv7fwmaf9qh2nxa4yxjbr7mylb4";
};
buildInputs = [ pcre pkgconfig python ];
diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix
index 409b5db0104..1e8eec6ae45 100644
--- a/pkgs/development/libraries/serf/default.nix
+++ b/pkgs/development/libraries/serf/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, krb5, pkgconfig }:
stdenv.mkDerivation rec {
- name = "serf-1.3.6";
+ name = "serf-1.3.7";
src = fetchurl {
url = "http://serf.googlecode.com/svn/src_releases/${name}.tar.bz2";
- sha256 = "1wk3cplazs8jznjc9ylpd63rrk9k2y05xa7zqx7psycr0gmpnqya";
+ sha256 = "1bphz616dv1svc50kkm8xbgyszhg3ni2dqbij99sfvjycr7bgk7c";
};
buildInputs = [ apr scons openssl aprutil zlib krb5 pkgconfig ];
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
meta = {
description = "HTTP client library based on APR";
- license = stdenv.lib.licenses.asl20 ;
+ license = stdenv.lib.licenses.asl20;
maintainers = [stdenv.lib.maintainers.raskin];
hydraPlatforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
};
diff --git a/pkgs/development/libraries/simgear/default.nix b/pkgs/development/libraries/simgear/default.nix
index f5394fffdaa..0fd3caffd5c 100644
--- a/pkgs/development/libraries/simgear/default.nix
+++ b/pkgs/development/libraries/simgear/default.nix
@@ -1,51 +1,27 @@
-x@{builderDefsPackage
- , plib, freeglut, xproto, libX11, libXext, xextproto, libXi , inputproto
- , libICE, libSM, libXt, libXmu, mesa, boost, zlib, libjpeg , freealut
- , openscenegraph, openal, expat, cmake, apr
- , ...}:
-builderDefsPackage
-(a :
-let
- helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
- [];
+{ stdenv, fetchurl, plib, freeglut, xproto, libX11, libXext, xextproto, libXi
+, inputproto, libICE, libSM, libXt, libXmu, mesa, boost, zlib, libjpeg, freealut
+, openscenegraph, openal, expat, cmake, apr
+}:
- buildInputs = map (n: builtins.getAttr n x)
- (builtins.attrNames (builtins.removeAttrs x helperArgNames));
- sourceInfo = rec {
- baseName="simgear";
- version="3.0.0";
- name="${baseName}-${version}";
- extension="tar.bz2";
- url="http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/${name}.${extension}";
- hash="05l0wvi0s4a98ihmjbpcc66rj6qy3hrsqkjs388bddf2ws3qyi09";
- };
-in
-rec {
- src = a.fetchurl {
- url = sourceInfo.url;
- sha256 = sourceInfo.hash;
+stdenv.mkDerivation rec {
+ name = "simgear-${version}";
+ version = "3.0.0";
+
+ src = fetchurl {
+ url = "http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/${name}.tar.bz2";
+ sha256 = "1ssrcmvk3a4dv0k4vjzndmirwmdgzk689d7wpmjm423nydmwajh0";
};
- inherit (sourceInfo) name version;
- inherit buildInputs;
+ buildInputs = [ plib freeglut xproto libX11 libXext xextproto libXi inputproto
+ libICE libSM libXt libXmu mesa boost zlib libjpeg freealut
+ openscenegraph openal expat cmake apr ];
- /* doConfigure should be removed if not needed */
- phaseNames = [ "doCmake" "doMakeInstall" ];
-
- meta = {
+ meta = with stdenv.lib; {
description = "Simulation construction toolkit";
- maintainers = with a.lib.maintainers;
- [
- raskin
- ];
- platforms = with a.lib.platforms;
- linux;
- license = a.lib.licenses.lgpl2;
+ homepage = https://gitorious.org/fg/simgear;
+ maintainers = with maintainers; [ raskin ];
+ platforms = platforms.linux;
+ license = licenses.lgpl2;
};
- passthru = {
- updateInfo = {
- downloadPage = "ftp://ftp.goflyflightgear.com/simgear/Source/";
- };
- };
-}) x
+}
diff --git a/pkgs/development/libraries/slang/default.nix b/pkgs/development/libraries/slang/default.nix
index a7db634dbd0..69617c0345e 100644
--- a/pkgs/development/libraries/slang/default.nix
+++ b/pkgs/development/libraries/slang/default.nix
@@ -1,17 +1,26 @@
-{stdenv, fetchurl, ncurses, pcre, libpng, zlib, readline}:
+{ stdenv, fetchurl, ncurses, pcre, libpng, zlib, readline }:
-stdenv.mkDerivation {
- name = "slang-2.2.1";
+stdenv.mkDerivation rec {
+ name = "slang-2.3.0";
src = fetchurl {
- url = ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v2.2/slang-2.2.1.tar.bz2;
- sha256 = "1qgfg6i5lzmw8j9aqd8pgz3vnhn80giij9bpgm5r3gmna2h0rzfj";
+ url = "http://www.jedsoft.org/releases/slang/${name}.tar.gz";
+ sha256 = "0aqd2cjabj6nhd4r3dc4vhqif2bf3dmqnrn2gj0xm4gqyfd177jy";
};
+
# Fix some wrong hardcoded paths
preConfigure = ''
sed -i -e "s|/usr/lib/terminfo|${ncurses}/lib/terminfo|" configure
- sed -i -e "s|/usr/lib/terminfo|${ncurses}/lib/terminfo|" src/sltermin.c
+ sed -i -e "s|/usr/lib/terminfo|${ncurses}/lib/terminfo|" src/sltermin.c
sed -i -e "s|/bin/ln|ln|" src/Makefile.in
'';
configureFlags = "--with-png=${libpng} --with-z=${zlib} --with-pcre=${pcre} --with-readline=${readline}";
buildInputs = [ncurses pcre libpng zlib readline];
+
+ meta = {
+ description = "A multi-platform programmer's library designed to allow a developer to create robust software";
+ homepage = http://www.jedsoft.org/slang/;
+ license = stdenv.lib.licenses.gpl2Plus;
+ platform = stdenv.lib.platforms.unix;
+ maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ };
}
diff --git a/pkgs/development/libraries/snappy/default.nix b/pkgs/development/libraries/snappy/default.nix
index acba85ec43b..90469508d0e 100644
--- a/pkgs/development/libraries/snappy/default.nix
+++ b/pkgs/development/libraries/snappy/default.nix
@@ -1,23 +1,31 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook }:
stdenv.mkDerivation rec {
- name = "snappy-1.1.1";
+ name = "snappy-1.1.2";
- src = fetchurl {
- url = "http://snappy.googlecode.com/files/${name}.tar.gz";
- sha256 = "1czscb5i003jg1amw3g1fmasv8crr5g3d922800kll8b3fj097yp";
+ src = fetchFromGitHub {
+ owner = "google";
+ repo = "snappy";
+ rev = "1ff9be9b8fafc8528ca9e055646f5932aa5db9c4";
+ sha256 = "1zyjj13max0z42g3ii54n3qn7rbcga34dbi26lpm7v5ya752shx7";
};
- # -DNDEBUG for speed
+ buildInputs = [ pkgconfig autoreconfHook ];
+
preConfigure = ''
- configureFlagsArray=("CXXFLAGS=-DNDEBUG -O2")
+ sh autogen.sh
'';
+ # -DNDEBUG for speed
+ configureFlags = [ "CXXFLAGS=-DNDEBUG" ];
+
doCheck = true;
- meta = {
+ meta = with stdenv.lib; {
homepage = http://code.google.com/p/snappy/;
- license = "BSD";
+ license = licenses.bsd3;
description = "Compression/decompression library for very high speeds";
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ wkennington ];
};
}
diff --git a/pkgs/development/libraries/sodium/default.nix b/pkgs/development/libraries/sodium/default.nix
index be52725f2c8..7e51d411bc4 100644
--- a/pkgs/development/libraries/sodium/default.nix
+++ b/pkgs/development/libraries/sodium/default.nix
@@ -3,11 +3,11 @@ let
s = # Generated upstream information
rec {
baseName="sodium";
- version="0.6.1";
+ version="1.0.0";
name="${baseName}-${version}";
- hash="151nril3kzkpmy6khvqphk4zk15ri0dqv0isyyhz6n9nsbmzxk04";
- url="http://download.dnscrypt.org/libsodium/releases/libsodium-0.6.1.tar.gz";
- sha256="151nril3kzkpmy6khvqphk4zk15ri0dqv0isyyhz6n9nsbmzxk04";
+ hash="19f9vf0shfp4rc4l791r6xjg06z4i8psj1zkjkm3z5b640yzxlff";
+ url="http://download.dnscrypt.org/libsodium/releases/libsodium-1.0.0.tar.gz";
+ sha256="19f9vf0shfp4rc4l791r6xjg06z4i8psj1zkjkm3z5b640yzxlff";
};
buildInputs = [
];
diff --git a/pkgs/development/libraries/sord/default.nix b/pkgs/development/libraries/sord/default.nix
index 8f122cb699a..96a19bf37cc 100644
--- a/pkgs/development/libraries/sord/default.nix
+++ b/pkgs/development/libraries/sord/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "sord-${version}";
- version = "0.12.0";
+ version = "0.12.2";
src = fetchurl {
url = "http://download.drobilla.net/${name}.tar.bz2";
- sha256 = "1f0wz7ynnk72hyr4jfi0lgvj90ld2va1kig8fkw30s8b903alsqj";
+ sha256 = "0rq7vafdv4vsxi6xk9zf5shr59w3kppdhqbj78185rz5gp9kh1dx";
};
buildInputs = [ pkgconfig python serd ];
diff --git a/pkgs/development/libraries/spandsp/default.nix b/pkgs/development/libraries/spandsp/default.nix
index f88ab48e027..24dc443ca70 100644
--- a/pkgs/development/libraries/spandsp/default.nix
+++ b/pkgs/development/libraries/spandsp/default.nix
@@ -1,10 +1,10 @@
{stdenv, fetchurl, audiofile, libtiff}:
stdenv.mkDerivation rec {
- version = "0.0.5";
+ version = "0.0.6";
name = "spandsp-${version}";
src=fetchurl {
- url = "http://www.soft-switch.org/downloads/spandsp/spandsp-${version}.tgz";
- sha256 = "07f42a237c77b08fa765c3a148c83cdfa267bf24c0ab681d80b90d30dd0b3dbf";
+ url = "http://www.soft-switch.org/downloads/spandsp/spandsp-${version}.tar.gz";
+ sha256 = "0rclrkyspzk575v8fslzjpgp4y2s4x7xk3r55ycvpi4agv33l1fc";
};
buildInputs = [];
propagatedBuildInputs = [audiofile libtiff];
@@ -13,6 +13,9 @@ stdenv.mkDerivation rec {
platforms = with stdenv.lib.platforms; linux;
maintainers = with stdenv.lib.maintainers; [raskin];
license = with stdenv.lib.licenses; gpl2;
+ downloadPage = "http://www.soft-switch.org/downloads/spandsp/";
+ inherit version;
+ updateWalker = true;
};
}
diff --git a/pkgs/development/libraries/sphinxbase/default.nix b/pkgs/development/libraries/sphinxbase/default.nix
index 1841fcbe4a1..1b4cf69f704 100644
--- a/pkgs/development/libraries/sphinxbase/default.nix
+++ b/pkgs/development/libraries/sphinxbase/default.nix
@@ -6,11 +6,11 @@
}:
stdenv.mkDerivation (rec {
- name = "sphinxbase-0.7";
+ name = "sphinxbase-0.8";
src = fetchurl {
url = "mirror://sourceforge/cmusphinx/${name}.tar.gz";
- sha256 = "1v3kfzw42ahxmr002i6wqigs832958vgghrv5dd62zazajdbk71q";
+ sha256 = "1a3c91g6rcfb2k8qyfhnd7s68ds6pxwv61xfp0ai1arbhx28jw2m";
};
buildInputs = [ pkgconfig bison ];
@@ -18,8 +18,11 @@ stdenv.mkDerivation (rec {
meta = {
description = "Support Library for Pocketsphinx";
homepage = http://cmusphinx.sourceforge.net;
- license = "free-non-copyleft";
+ license = stdenv.lib.licenses.bsd2;
+ platforms = stdenv.lib.platforms.unix;
+ maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
};
+
} // (stdenv.lib.optionalAttrs multipleOutputs {
outputs = [ "out" "lib" "headers" ];
@@ -31,4 +34,3 @@ stdenv.mkDerivation (rec {
cp -av $out/include $headers
'';
}))
-
diff --git a/pkgs/development/libraries/spice-protocol/default.nix b/pkgs/development/libraries/spice-protocol/default.nix
index 162a832c93a..79fe47ff476 100644
--- a/pkgs/development/libraries/spice-protocol/default.nix
+++ b/pkgs/development/libraries/spice-protocol/default.nix
@@ -1,19 +1,18 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "spice-protocol-0.12.6";
+ name = "spice-protocol-0.12.7";
src = fetchurl {
url = "http://www.spice-space.org/download/releases/${name}.tar.bz2";
- sha256 = "16r5x2sppiaa6pzawkrvk5q4hmw7ynmlp2xr38f1vaxj5rh4aiwx";
+ sha256 = "1hhn94bw2l76h09sy05a15bs6zalsijnylyqpwcys5hq6rrwpiln";
};
- meta = {
+ meta = with stdenv.lib; {
description = "Protocol headers for the SPICE protocol";
homepage = http://www.spice-space.org;
- license = stdenv.lib.licenses.bsd3;
-
- maintainers = [ stdenv.lib.maintainers.bluescreen303 ];
- platforms = stdenv.lib.platforms.linux;
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ bluescreen303 ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix
index 2af9565e0b4..2353eec7348 100644
--- a/pkgs/development/libraries/spice/default.nix
+++ b/pkgs/development/libraries/spice/default.nix
@@ -5,11 +5,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "spice-0.12.4";
+ name = "spice-0.12.5";
src = fetchurl {
url = "http://www.spice-space.org/download/releases/${name}.tar.bz2";
- sha256 = "11xkdz26b39syynxm3iyjsr8q7x0v09zdli9an1ilcrfyiykw1ng";
+ sha256 = "10gmqaanfg929aamf11n4si4r3d1g7z9qjdclsl9kjv7iw6s42a2";
};
buildInputs = [ pixman celt alsaLib openssl libjpeg zlib
diff --git a/pkgs/development/libraries/sword/default.nix b/pkgs/development/libraries/sword/default.nix
index 28afdf85dfb..6faf2224b0c 100644
--- a/pkgs/development/libraries/sword/default.nix
+++ b/pkgs/development/libraries/sword/default.nix
@@ -1,14 +1,14 @@
-{stdenv, fetchurl, pkgconfig, icu, clucene_core, curl}:
+{ stdenv, fetchurl, pkgconfig, icu, clucene_core, curl }:
stdenv.mkDerivation rec {
- version = "1.7.2";
+ version = "1.7.3";
name = "sword-${version}";
src = fetchurl {
url = "http://www.crosswire.org/ftpmirror/pub/sword/source/v1.7/${name}.tar.gz";
- sha256 = "ac7aace0ecb7a405d4b4b211ee1ae5b2250bb5c57c9197179747c9e830787871";
+ sha256 = "1sm9ivypsx3mraqnziic7qkxjx1b7crvlln0zq6cnpjx2pzqfgas";
};
buildInputs = [ pkgconfig icu clucene_core curl ];
@@ -19,12 +19,12 @@ stdenv.mkDerivation rec {
configureFlags = "--without-conf --enable-tests=no CXXFLAGS=-Wno-unused-but-set-variable";
- meta = {
+ meta = with stdenv.lib; {
description = "A software framework that allows research manipulation of Biblical texts";
homepage = http://www.crosswire.org/sword/;
- platforms = stdenv.lib.platforms.linux;
- license = stdenv.lib.licenses.gpl2;
- maintainers = [ stdenv.lib.maintainers.piotr stdenv.lib.maintainers.AndersonTorres ];
+ platforms = platforms.linux;
+ license = licenses.gpl2;
+ maintainers = [ maintainers.piotr maintainers.AndersonTorres ];
};
}
diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix
index 4ec8c4befc6..7ef48d09725 100644
--- a/pkgs/development/libraries/telepathy/qt/default.nix
+++ b/pkgs/development/libraries/telepathy/qt/default.nix
@@ -2,15 +2,13 @@
, telepathy_farstream, telepathy_glib, pythonDBus }:
stdenv.mkDerivation rec {
- name = "telepathy-qt-0.9.4";
+ name = "telepathy-qt-0.9.5";
src = fetchurl {
url = "http://telepathy.freedesktop.org/releases/telepathy-qt/${name}.tar.gz";
- sha256 = "1wk13rwpas1crj19xsbgl1c4qzri616xxa1hyhnykv4nkwxdpcgi";
+ sha256 = "13lwh23ad9bg7hx1mj4xjc2lb8nlaaw8hbrmx5gg8nz5xxc4hiwk";
};
- patches = [ ./farstream-0.2.diff ];
-
nativeBuildInputs = [ cmake pkgconfig python libxslt ];
propagatedBuildInputs = [ qt4 dbus_glib telepathy_farstream telepathy_glib pythonDBus ];
@@ -22,4 +20,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
doCheck = false; # giving up for now
+
+ meta = {
+ platforms = stdenv.lib.platforms.linux;
+ };
}
diff --git a/pkgs/development/libraries/telepathy/qt/farstream-0.2.diff b/pkgs/development/libraries/telepathy/qt/farstream-0.2.diff
deleted file mode 100644
index 86d392fe1ac..00000000000
--- a/pkgs/development/libraries/telepathy/qt/farstream-0.2.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -urB telepathy-qt/cmake/modules/FindFarstream.cmake new/cmake/modules/FindFarstream.cmake
---- telepathy-qt/cmake/modules/FindFarstream.cmake 2012-04-25 22:14:22.275967164 +0200
-+++ new/cmake/modules/FindFarstream.cmake 2012-10-07 12:19:46.543103512 +0200
-@@ -23,9 +23,9 @@
- # in the find_path() and find_library() calls
- find_package(PkgConfig)
- if (FARSTREAM_MIN_VERSION)
-- PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.1>=${FARSTREAM_MIN_VERSION})
-+ PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.2>=${FARSTREAM_MIN_VERSION})
- else (FARSTREAM_MIN_VERSION)
-- PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.1)
-+ PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.2)
- endif (FARSTREAM_MIN_VERSION)
- set(FARSTREAM_DEFINITIONS ${PC_FARSTREAM_CFLAGS_OTHER})
- endif (NOT WIN32)
-@@ -34,10 +34,10 @@
- PATHS
- ${PC_FARSTREAM_INCLUDEDIR}
- ${PC_FARSTREAM_INCLUDE_DIRS}
-- PATH_SUFFIXES farstream-0.1
-+ PATH_SUFFIXES farstream-0.2
- )
-
--find_library(FARSTREAM_LIBRARIES NAMES farstream-0.1
-+find_library(FARSTREAM_LIBRARIES NAMES farstream-0.2
- PATHS
- ${PC_FARSTREAM_LIBDIR}
- ${PC_FARSTREAM_LIBRARY_DIRS}
diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix
index 4c86de7fb56..fda32a7ddbd 100644
--- a/pkgs/development/libraries/v8/default.nix
+++ b/pkgs/development/libraries/v8/default.nix
@@ -8,17 +8,22 @@ in
stdenv.mkDerivation rec {
name = "v8-${version}";
- version = "3.26.8";
+ version = "3.26.31.15";
src = fetchurl {
url = "https://commondatastorage.googleapis.com/chromium-browser-official/"
+ "${name}.tar.bz2";
- sha256 = "0w8mfy8jlqvp958c0zhsfwf0s3m6kw53jhcyg6aiwh877g6s21iz";
+ sha256 = "067pk6hr7wjx7yxhla5la0rnv51kf7837kfydzydjwapsbcx6m8l";
};
+ patchPhase = ''
+ sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,' build/gyp_v8
+ '';
+
configurePhase = ''
PYTHONPATH="tools/generate_shim_headers:$PYTHONPATH" \
- ${gyp}/bin/gyp \
+ PYTHONPATH="$(toPythonPath ${gyp}):$PYTHONPATH" \
+ build/gyp_v8 \
-f make \
--generator-output="out" \
-Dflock_index=0 \
@@ -26,9 +31,7 @@ stdenv.mkDerivation rec {
-Duse_system_icu=1 \
-Dconsole=readline \
-Dcomponent=shared_library \
- -Dv8_target_arch=${arch} \
- --depth=. -Ibuild/standalone.gypi \
- build/all.gyp
+ -Dv8_target_arch=${arch}
'';
nativeBuildInputs = [ which ];
@@ -60,7 +63,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Google's open source JavaScript engine";
- platforms = platforms.linux ++ platforms.darwin;
+ platforms = with platforms; linux ++ darwin;
license = licenses.bsd3;
};
}
diff --git a/pkgs/development/libraries/v8/fix-GetLocalizedMessage-usage.patch b/pkgs/development/libraries/v8/fix-GetLocalizedMessage-usage.patch
deleted file mode 100644
index 3bc0fff4d50..00000000000
--- a/pkgs/development/libraries/v8/fix-GetLocalizedMessage-usage.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From dbe142c4eda0f15fad9fa85743dd11b81292fa8f Mon Sep 17 00:00:00 2001
-From: Timothy J Fontaine
-Date: Thu, 23 May 2013 13:57:59 -0700
-Subject: [PATCH] v8: fix GetLocalizedMessage usage
-
-As is the backport of the abort on uncaught exception wouldn't compile
-because we it was passing in `this` when it was unnecessary.
----
- deps/v8/src/isolate.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/isolate.cc b/src/isolate.cc
-index 04a438b..5a5293e 100644
---- a/src/isolate.cc
-+++ b/src/isolate.cc
-@@ -1161,7 +1161,7 @@ void Isolate::DoThrow(Object* exception, MessageLocation* location) {
- (report_exception || can_be_caught_externally)) {
- fatal_exception_depth++;
- fprintf(stderr, "%s\n\nFROM\n",
-- *MessageHandler::GetLocalizedMessage(this, message_obj));
-+ *MessageHandler::GetLocalizedMessage(message_obj));
- PrintCurrentStackTrace(stderr);
- OS::Abort();
- }
---
-1.8.1.6
-
diff --git a/pkgs/development/libraries/vaapi-vdpau/default.nix b/pkgs/development/libraries/vaapi-vdpau/default.nix
index 9b28d0016dd..02a4155947f 100644
--- a/pkgs/development/libraries/vaapi-vdpau/default.nix
+++ b/pkgs/development/libraries/vaapi-vdpau/default.nix
@@ -1,5 +1,10 @@
{ stdenv, fetchurl, libvdpau, mesa, libva, pkgconfig }:
-
+let
+ libvdpau08patch = (fetchurl { url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-libvdpau-0.8.patch?revision=1.1";
+ name = "libva-vdpau-driver-0.7.4-libvdpau-0.8.patch";
+ sha256 = "1n2cys59wyv8ylx9i5m3s6856mgx24hzcp45w1ahdfbzdv9wrfbl";
+ });
+in
stdenv.mkDerivation rec {
name = "libva-vdpau-driver-0.7.4";
@@ -17,6 +22,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libvdpau mesa libva pkgconfig ];
preConfigure = ''
+ patch -p0 < ${libvdpau08patch} # use -p0 instead of -p1
sed -i -e "s,LIBVA_DRIVERS_PATH=.*,LIBVA_DRIVERS_PATH=$out/lib/dri," configure
'';
diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix
index 0e0625a2cbb..9d16edb0f2e 100644
--- a/pkgs/development/libraries/vtk/default.nix
+++ b/pkgs/development/libraries/vtk/default.nix
@@ -6,7 +6,7 @@ with stdenv.lib;
let
os = stdenv.lib.optionalString;
majorVersion = "5.10";
- minorVersion = "0";
+ minorVersion = "1";
version = "${majorVersion}.${minorVersion}";
in
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
name = "vtk-${os (qtLib != null) "qvtk-"}${version}";
src = fetchurl {
url = "${meta.homepage}files/release/${majorVersion}/vtk-${version}.tar.gz";
- md5 = "a0363f78910f466ba8f1bd5ab5437cb9";
+ sha256 = "1fxxgsa7967gdphkl07lbfr6dcbq9a72z5kynlklxn7hyp0l18pi";
};
buildInputs = [ cmake mesa libX11 xproto libXt ]
diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index 82cff159a56..fa3cdc82c41 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -8,7 +8,7 @@
}:
stdenv.mkDerivation rec {
- name = "webkitgtk-2.4.4";
+ name = "webkitgtk-2.4.6";
meta = {
description = "Web content rendering engine, GTK+ port";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://webkitgtk.org/releases/${name}.tar.xz";
- sha256 = "1f9sypnnxxcml9vj79g9hf2di52pg5kggyc3wgsy3q9a6mzgrjsq";
+ sha256 = "0mqlq4ivh921k92xjsp5pdvbg9vf75qjliqmx81qwrm2sjl4mvvg";
};
patches = [ ./webcore-svg-libxml-cflags.patch ];
diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix
index 3ef43baca5e..d0de624890b 100644
--- a/pkgs/development/libraries/zeitgeist/default.nix
+++ b/pkgs/development/libraries/zeitgeist/default.nix
@@ -3,10 +3,11 @@
, gtk3, json_glib, librdf_raptor2, pythonPackages, dbus_glib }:
stdenv.mkDerivation rec {
- name = "zeitgeist-0.0.14";
+ version = "0.9.15";
+ name = "zeitgeist-${version}";
src = fetchurl {
- url = "https://github.com/seiflotfy/zeitgeist/archive/v0.9.15.tar.gz";
+ url = "https://github.com/seiflotfy/zeitgeist/archive/v${version}.tar.gz";
sha256 = "07pnc7kmjpd0ncm32z6s3ny5p4zl52v9lld0n0f8sp6cw87k12p0";
};
diff --git a/pkgs/development/lisp-modules/asdf/default.nix b/pkgs/development/lisp-modules/asdf/default.nix
index 97e1661544b..100577b3a7f 100644
--- a/pkgs/development/lisp-modules/asdf/default.nix
+++ b/pkgs/development/lisp-modules/asdf/default.nix
@@ -3,11 +3,11 @@ let
s = # Generated upstream information
rec {
baseName="asdf";
- version="3.1.2";
+ version="3.1.3";
name="${baseName}-${version}";
- hash="0d427908q4hcspmdhc5ps38dbvz113hy6687l9ypmfl79qfb2qki";
- url="http://common-lisp.net/project/asdf/archives/asdf-3.1.2.tar.gz";
- sha256="0d427908q4hcspmdhc5ps38dbvz113hy6687l9ypmfl79qfb2qki";
+ hash="11jgbl2ys98i7lir0z76g0msm89zmz1b91gwkdz0gnxr6gavj6cn";
+ url="http://common-lisp.net/project/asdf/archives/asdf-3.1.3.tar.gz";
+ sha256="11jgbl2ys98i7lir0z76g0msm89zmz1b91gwkdz0gnxr6gavj6cn";
};
buildInputs = [
texinfo texLive
@@ -29,7 +29,6 @@ stdenv.mkDerivation {
cp -r ./* "$out"/lib/common-lisp/asdf/
cp -r doc/* "$out"/share/doc/asdf/
'';
- sourceRoot=".";
meta = {
inherit (s) version;
description = ''Standard software-system definition library for Common Lisp'';
diff --git a/pkgs/development/lua-modules/generic/default.nix b/pkgs/development/lua-modules/generic/default.nix
new file mode 100644
index 00000000000..2a44cdfca0b
--- /dev/null
+++ b/pkgs/development/lua-modules/generic/default.nix
@@ -0,0 +1,24 @@
+lua:
+
+{ buildInputs ? [], disabled ? false, ... } @ attrs:
+
+if disabled then
+ throw "${attrs.name} not supported by interpreter lua-${lua.luaversion}"
+else
+ lua.stdenv.mkDerivation ({
+
+ preBuild = ''
+ makeFlagsArray=(
+ PREFIX=$out
+ LUA_LIBDIR="$out/lib/lua/${lua.luaversion}"
+ LUA_INC="-I${lua}/include");
+ '';
+ }
+ //
+ attrs
+ //
+ {
+ name = "lua${lua.luaversion}-" + attrs.name;
+ buildInputs = buildInputs ++ [ lua ];
+ }
+ )
diff --git a/pkgs/development/lua-modules/luasql.patch b/pkgs/development/lua-modules/luasql.patch
new file mode 100644
index 00000000000..e91840101ee
--- /dev/null
+++ b/pkgs/development/lua-modules/luasql.patch
@@ -0,0 +1,37 @@
+--- a/config 2013-02-18 19:36:44.000000000 +0400
++++ b/config 2014-10-01 08:36:37.104254404 +0400
+@@ -1,12 +1,12 @@
+ # $Id: config,v 1.10 2008/05/30 17:21:18 tomas Exp $
+
+ # Driver (leave uncommented ONLY the line with the name of the driver)
+-T= mysql
++#T= mysql
+ #T= oci8
+ #T= odbc
+ #T= postgres
+ #T= sqlite
+-#T=sqlite3
++T=sqlite3
+ #T=firebird
+
+ # Installation directories
+@@ -37,8 +37,8 @@
+ ######## MySQL
+ #DRIVER_LIBS= -L/usr/local/mysql/lib -lmysqlclient -lz
+ #DRIVER_INCS= -I/usr/local/mysql/include
+-DRIVER_LIBS= -L/usr/lib -lmysqlclient -lz
+-DRIVER_INCS= -I/usr/include/mysql
++#DRIVER_LIBS= -L/usr/lib -lmysqlclient -lz
++#DRIVER_INCS= -I/usr/include/mysql
+ ######## Oracle OCI8
+ #DRIVER_LIBS= -L/home/oracle/OraHome1/lib -lz -lclntsh
+ #DRIVER_INCS= -I/home/oracle/OraHome1/rdbms/demo -I/home/oracle/OraHome1/rdbms/public
+@@ -51,7 +51,7 @@
+ #DRIVER_LIBS= -lsqlite
+ #DRIVER_INCS=
+ ######## SQLite3
+-#DRIVER_LIBS= -L/opt/local/lib -lsqlite3
++DRIVER_LIBS= -lsqlite3
+ #DRIVER_INCS= -I/opt/local/include
+ ######## ODBC
+ #DRIVER_LIBS= -L/usr/local/lib -lodbc
diff --git a/pkgs/development/lua-modules/zip.patch b/pkgs/development/lua-modules/zip.patch
new file mode 100644
index 00000000000..c3f88f451e8
--- /dev/null
+++ b/pkgs/development/lua-modules/zip.patch
@@ -0,0 +1,23 @@
+--- a/Makefile 2007-10-30 01:59:10.000000000 +0300
++++ b/Makefile 2014-09-18 11:04:53.176320021 +0400
+@@ -6,10 +6,6 @@
+
+ include $(CONFIG)
+
+-ifeq "$(LUA_VERSION_NUM)" "500"
+-COMPAT_O= $(COMPAT_DIR)/compat-5.1.o
+-endif
+-
+ SRCS= src/lua$T.c
+ OBJS= src/lua$T.o $(COMPAT_O)
+
+@@ -19,9 +15,6 @@
+ src/$(LIBNAME): $(OBJS)
+ export MACOSX_DEPLOYMENT_TARGET="10.3"; $(CC) $(CFLAGS) $(LIB_OPTION) -o src/$(LIBNAME) $(OBJS) -lzzip
+
+-$(COMPAT_DIR)/compat-5.1.o: $(COMPAT_DIR)/compat-5.1.c
+- $(CC) -c $(CFLAGS) -o $@ $(COMPAT_DIR)/compat-5.1.c
+-
+ install: src/$(LIBNAME)
+ mkdir -p $(LUA_LIBDIR)
+ cp src/$(LIBNAME) $(LUA_LIBDIR)
diff --git a/pkgs/development/mobile/androidenv/addon.xml b/pkgs/development/mobile/androidenv/addon.xml
index aee3c847e93..274ae734b6e 100644
--- a/pkgs/development/mobile/androidenv/addon.xml
+++ b/pkgs/development/mobile/androidenv/addon.xml
@@ -14,167 +14,274 @@
* See the License for the specific language governing permissions and
* limitations under the License.
-->
-
+
- Terms and Conditions
-
-This is the Android Software Development Kit License Agreement.
+ To get started with the Android SDK, you must agree to the following terms and conditions.
+This is the Android SDK License Agreement (the "License Agreement").
1. Introduction
-
-1.1 The Android Software Development Kit (referred to in this License Agreement as the "SDK" and specifically including the Android system files, packaged APIs, and Google APIs add-ons) is licensed to you subject to the terms of this License Agreement. This License Agreement forms a legally binding contract between you and Google in relation to your use of the SDK.
+1.1 The Android SDK (referred to in the License Agreement as the "SDK" and specifically including the Android system files, packaged APIs, and SDK library files and tools , if and when they are made available) is licensed to you subject to the terms of the License Agreement. The License Agreement forms a legally binding contract between you and Google in relation to your use of the SDK.
1.2 "Android" means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time.
1.3 "Google" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.
+2. Accepting the License Agreement
-2. Accepting this License Agreement
+2.1 In order to use the SDK, you must first agree to the License Agreement. You may not use the SDK if you do not accept the License Agreement.
-
-2.1 In order to use the SDK, you must first agree to this License Agreement. You may not use the SDK if you do not accept this License Agreement.
-
-2.2 By clicking to accept, you hereby agree to the terms of this License Agreement.
+2.2 By clicking to accept and/or using the SDK, you hereby agree to the terms of the License Agreement.
2.3 You may not use the SDK and may not accept the License Agreement if you are a person barred from receiving the SDK under the laws of the United States or other countries including the country in which you are resident or from which you use the SDK.
-2.4 If you are agreeing to be bound by this License Agreement on behalf of your employer or other entity, you represent and warrant that you have full legal authority to bind your employer or such entity to this License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the SDK on behalf of your employer or other entity.
-
+2.4 If you will use the SDK internally within your company or organization you agree to be bound by the License Agreement on behalf of your employer or other entity, and you represent and warrant that you have full legal authority to bind your employer or such entity to the License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the SDK on behalf of your employer or other entity.
3. SDK License from Google
-
-3.1 Subject to the terms of this License Agreement, Google grants you a limited, worldwide, royalty-free, non-assignable and non-exclusive license to use the SDK solely to develop applications to run on the Android platform.
+3.1 Subject to the terms of the License Agreement, Google grants you a royalty-free, non-assignable, non-exclusive, non-sublicensable, limited, revocable license to use the SDK, personally or internally within your company or organization, solely to develop and distribute applications to run on the Android platform.
3.2 You agree that Google or third parties own all legal right, title and interest in and to the SDK, including any Intellectual Property Rights that subsist in the SDK. "Intellectual Property Rights" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you.
-3.3 You may not use the SDK for any purpose not expressly permitted by this License Agreement. Except to the extent required by applicable third party licenses, you may not: (a) copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK; or (b) load any part of the SDK onto a mobile handset or any other hardware device except a personal computer, combine any part of the SDK with other software, or distribute any software or device incorporating a part of the SDK.
+3.3 You may not use the SDK for any purpose not expressly permitted by the License Agreement. Except to the extent required by applicable third party licenses, you may not: (a) copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK; or (b) load any part of the SDK onto a mobile handset or any other hardware device except a personal computer, combine any part of the SDK with other software, or distribute any software or device incorporating a part of the SDK.
3.4 You agree that you will not take any actions that may cause or result in the fragmentation of Android, including but not limited to distributing, participating in the creation of, or promoting in any way a software development kit derived from the SDK.
-3.5 Use, reproduction and distribution of components of the SDK licensed under an open source software license are governed solely by the terms of that open source software license and not this License Agreement.
+3.5 Use, reproduction and distribution of components of the SDK licensed under an open source software license are governed solely by the terms of that open source software license and not the License Agreement. You agree to remain a licensee in good standing in regard to such open source software licenses under all the rights granted and to refrain from any actions that may terminate, suspend, or breach such rights.
3.6 You agree that the form and nature of the SDK that Google provides may change without prior notice to you and that future versions of the SDK may be incompatible with applications developed on previous versions of the SDK. You agree that Google may stop (permanently or temporarily) providing the SDK (or any features within the SDK) to you or to users generally at Google's sole discretion, without prior notice to you.
-3.7 Nothing in this License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features.
+3.7 Nothing in the License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features.
3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the SDK.
-
4. Use of the SDK by You
+4.1 Google agrees that nothing in the License Agreement gives Google any right, title or interest from you (or your licensors) under the License Agreement in or to any software applications that you develop using the SDK, including any intellectual property rights that subsist in those applications.
-4.1 Google agrees that it obtains no right, title or interest from you (or your licensors) under this License Agreement in or to any software applications that you develop using the SDK, including any intellectual property rights that subsist in those applications.
+4.2 You agree to use the SDK and write applications only for purposes that are permitted by (a) the License Agreement, and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries).
-4.2 You agree to use the SDK and write applications only for purposes that are permitted by (a) this License Agreement and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries).
+4.3 You agree that if you use the SDK to develop applications, you will protect the privacy and legal rights of users. If users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If users provide you with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, each user has given you permission to do so.
-4.3 You agree that if you use the SDK to develop applications for general public users, you will protect the privacy and legal rights of those users. If the users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If the user provides your application with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, the user has given you permission to do so.
-
-4.4 You agree that you will not engage in any activity with the SDK, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of any third party including, but not limited to, Google or any mobile communications carrier.
+4.4 You agree that you will not engage in any activity with the SDK, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of Google or any third party.
4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through Android and/or applications for Android, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so.
-4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under this License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach.
-
+4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under the License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach.
5. Your Developer Credentials
-
5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials.
-
6. Privacy and Information
-
6.1 In order to continually innovate and improve the SDK, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the SDK are being used and how they are being used. Before any of this information is collected, the SDK will notify you and seek your consent. If you withhold consent, the information will not be collected.
-6.2 The data collected is examined in the aggregate to improve the SDK and is maintained in accordance with Google's Privacy Policy.
-
+6.2 The data collected is examined in the aggregate to improve the SDK and is maintained in accordance with Google's Privacy Policy located at http://www.google.com/policies/privacy/.
7. Third Party Applications
-
7.1 If you use the SDK to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources.
7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners.
-7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party. In that case, this License Agreement does not affect your legal relationship with these third parties.
+7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party.
+8. Using Google APIs
-8. Using Android APIs
-
-
-8.1 Google Data APIs
+8.1 Google APIs
8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service.
8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so.
+9. Terminating the License Agreement
-9. Terminating this License Agreement
+9.1 The License Agreement will continue to apply until terminated by either you or Google as set out below.
+9.2 If you want to terminate the License Agreement, you may do so by ceasing your use of the SDK and any relevant developer credentials.
-9.1 This License Agreement will continue to apply until terminated by either you or Google as set out below.
+9.3 Google may at any time, terminate the License Agreement, with or without cause, upon notice to you.
-9.2 If you want to terminate this License Agreement, you may do so by ceasing your use of the SDK and any relevant developer credentials.
+9.4 The License Agreement will automatically terminate without notice or other action when Google ceases to provide the SDK or certain parts of the SDK to users in the country in which you are resident or from which you use the service.
-9.3 Google may at any time, terminate this License Agreement with you if:
-(A) you have breached any provision of this License Agreement; or
-(B) Google is required to do so by law; or
-(C) the partner with whom Google offered certain parts of SDK (such as APIs) to you has terminated its relationship with Google or ceased to offer certain parts of the SDK to you; or
-(D) Google decides to no longer provide the SDK or certain parts of the SDK to users in the country in which you are resident or from which you use the service, or the provision of the SDK or certain SDK services to you by Google is, in Google's sole discretion, no longer commercially viable.
-
-9.4 When this License Agreement comes to an end, all of the legal rights, obligations and liabilities that you and Google have benefited from, been subject to (or which have accrued over time whilst this License Agreement has been in force) or which are expressed to continue indefinitely, shall be unaffected by this cessation, and the provisions of paragraph 14.7 shall continue to apply to such rights, obligations and liabilities indefinitely.
-
-
-10. DISCLAIMER OF WARRANTIES
+9.5 When the License Agreement is terminated, the license granted to you in the License Agreement will terminate, you will immediately cease all use of the SDK, and the provisions of paragraphs 10, 11, 12 and 14 shall survive indefinitely.
+10. DISCLAIMERS
10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE SDK IS AT YOUR SOLE RISK AND THAT THE SDK IS PROVIDED "AS IS" AND "AS AVAILABLE" WITHOUT WARRANTY OF ANY KIND FROM GOOGLE.
-10.2 YOUR USE OF THE SDK AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE SDK IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE.
+10.2 YOUR USE OF THE SDK AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE SDK IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE. WITHOUT LIMITING THE FOREGOING, YOU UNDERSTAND THAT THE SDK MAY CONTAIN ERRORS, DEFECTS AND SECURITY VULNERABILITIES THAT CAN RESULT IN SIGNIFICANT DAMAGE, INCLUDING THE COMPLETE, IRRECOVERABLE LOSS OF USE OF YOUR COMPUTER SYSTEM OR OTHER DEVICE.
10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-
11. LIMITATION OF LIABILITY
-
11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING.
-
12. Indemnification
-
-12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys fees) arising out of or accruing from (a) your use of the SDK, (b) any application you develop on the SDK that infringes any copyright, trademark, trade secret, trade dress, patent or other intellectual property right of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you with this License Agreement.
-
+12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys’ fees) arising out of or accruing from (a) your use of the SDK, (b) any application you develop on the SDK that infringes any Intellectual Property Rights of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you of the License Agreement.
13. Changes to the License Agreement
-
13.1 Google may make changes to the License Agreement as it distributes new versions of the SDK. When these changes are made, Google will make a new version of the License Agreement available on the website where the SDK is made available.
-
14. General Legal Terms
+14.1 The License Agreement constitutes the whole legal agreement between you and Google and governs your use of the SDK (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the SDK.
-14.1 This License Agreement constitutes the whole legal agreement between you and Google and governs your use of the SDK (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the SDK.
+14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in the License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google.
-14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in this License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google.
+14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of the License Agreement is invalid, then that provision will be removed from the License Agreement without affecting the rest of the License Agreement. The remaining provisions of the License Agreement will continue to be valid and enforceable.
-14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of this License Agreement is invalid, then that provision will be removed from this License Agreement without affecting the rest of this License Agreement. The remaining provisions of this License Agreement will continue to be valid and enforceable.
-
-14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to this License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of this License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to this License Agreement.
+14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to the License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of the License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to the License Agreement.
14.5 EXPORT RESTRICTIONS. THE SDK IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE SDK. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE.
-14.6 The rights granted in this License Agreement may not be assigned or transferred by either you or Google without the prior written approval of the other party. Neither you nor Google shall be permitted to delegate their responsibilities or obligations under this License Agreement without the prior written approval of the other party.
+14.6 The License Agreement may not be assigned or transferred by you without the prior written approval of Google, and any attempted assignment without such approval will be void. You shall not delegate your responsibilities or obligations under the License Agreement without the prior written approval of Google.
-14.7 This License Agreement, and your relationship with Google under this License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from this License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.
+14.7 The License Agreement, and your relationship with Google under the License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from the License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.
-November 13, 2012
+June 2014.
+
+
+
+ To get started with the Android SDK Preview, you must agree to the following terms and conditions.
+As described below, please note that this is a preview version of the Android SDK, subject to change, that you use at your own risk. The Android SDK Preview is not a stable release, and may contain errors and defects that can result in serious damage to your computer systems, devices and data.
+
+This is the Android SDK Preview License Agreement (the "License Agreement").
+
+1. Introduction
+
+1.1 The Android SDK Preview (referred to in the License Agreement as the “Preview” and specifically including the Android system files, packaged APIs, and Preview library files, if and when they are made available) is licensed to you subject to the terms of the License Agreement. The License Agreement forms a legally binding contract between you and Google in relation to your use of the Preview.
+
+1.2 "Android" means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time.
+
+1.3 "Google" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.
+
+2. Accepting the License Agreement
+
+2.1 In order to use the Preview, you must first agree to the License Agreement. You may not use the Preview if you do not accept the License Agreement.
+
+2.2 By clicking to accept and/or using the Preview, you hereby agree to the terms of the License Agreement.
+
+2.3 You may not use the Preview and may not accept the License Agreement if you are a person barred from receiving the Preview under the laws of the United States or other countries including the country in which you are resident or from which you use the Preview.
+
+2.4 If you will use the Preview internally within your company or organization you agree to be bound by the License Agreement on behalf of your employer or other entity, and you represent and warrant that you have full legal authority to bind your employer or such entity to the License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the Preview on behalf of your employer or other entity.
+
+3. Preview License from Google
+
+3.1 Subject to the terms of the License Agreement, Google grants you a royalty-free, non-assignable, non-exclusive, non-sublicensable, limited, revocable license to use the Preview, personally or internally within your company or organization, solely to develop applications to run on the Android platform.
+
+3.2 You agree that Google or third parties owns all legal right, title and interest in and to the Preview, including any Intellectual Property Rights that subsist in the Preview. "Intellectual Property Rights" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you.
+
+3.3 You may not use the Preview for any purpose not expressly permitted by the License Agreement. Except to the extent required by applicable third party licenses, you may not: (a) copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the Preview or any part of the Preview; or (b) load any part of the Preview onto a mobile handset or any other hardware device except a personal computer, combine any part of the Preview with other software, or distribute any software or device incorporating a part of the Preview.
+
+3.4 You agree that you will not take any actions that may cause or result in the fragmentation of Android, including but not limited to distributing, participating in the creation of, or promoting in any way a software development kit derived from the Preview.
+
+3.5 Use, reproduction and distribution of components of the Preview licensed under an open source software license are governed solely by the terms of that open source software license and not the License Agreement. You agree to remain a licensee in good standing in regard to such open source software licenses under all the rights granted and to refrain from any actions that may terminate, suspend, or breach such rights.
+
+3.6 You agree that the form and nature of the Preview that Google provides may change without prior notice to you and that future versions of the Preview may be incompatible with applications developed on previous versions of the Preview. You agree that Google may stop (permanently or temporarily) providing the Preview (or any features within the Preview) to you or to users generally at Google's sole discretion, without prior notice to you.
+
+3.7 Nothing in the License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features.
+
+3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the Preview.
+
+4. Use of the Preview by You
+
+4.1 Google agrees that nothing in the License Agreement gives Google any right, title or interest from you (or your licensors) under the License Agreement in or to any software applications that you develop using the Preview, including any intellectual property rights that subsist in those applications.
+
+4.2 You agree to use the Preview and write applications only for purposes that are permitted by (a) the License Agreement, and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries).
+
+4.3 You agree that if you use the Preview to develop applications, you will protect the privacy and legal rights of users. If users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If users provide you with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, each user has given you permission to do so.
+
+4.4 You agree that you will not engage in any activity with the Preview, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of Google or any third party.
+
+4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through Android and/or applications for Android, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so.
+
+4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under the License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach.
+
+4.7 The Preview is in development, and your testing and feedback are an important part of the development process. By using the Preview, you acknowledge that implementation of some features are still under development and that you should not rely on the Preview having the full functionality of a stable release. You agree not to publicly distribute or ship any application using this Preview as this Preview will no longer be supported after the official Android SDK is released.
+
+5. Your Developer Credentials
+
+5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials.
+
+6. Privacy and Information
+
+6.1 In order to continually innovate and improve the Preview, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the Preview are being used and how they are being used. Before any of this information is collected, the Preview will notify you and seek your consent. If you withhold consent, the information will not be collected.
+
+6.2 The data collected is examined in the aggregate to improve the Preview and is maintained in accordance with Google's Privacy Policy located at http://www.google.com/policies/privacy/.
+
+7. Third Party Applications
+
+7.1 If you use the Preview to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources.
+
+7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners.
+
+7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party.
+
+8. Using Google APIs
+
+8.1 Google APIs
+
+8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service.
+
+8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so.
+
+9. Terminating the License Agreement
+
+9.1 the License Agreement will continue to apply until terminated by either you or Google as set out below.
+
+9.2 If you want to terminate the License Agreement, you may do so by ceasing your use of the Preview and any relevant developer credentials.
+
+9.3 Google may at any time, terminate the License Agreement, with or without cause, upon notice to you.
+
+9.4 The License Agreement will automatically terminate without notice or other action upon the earlier of:
+(A) when Google ceases to provide the Preview or certain parts of the Preview to users in the country in which you are resident or from which you use the service; and
+(B) Google issues a final release version of the Android SDK.
+
+9.5 When the License Agreement is terminated, the license granted to you in the License Agreement will terminate, you will immediately cease all use of the Preview, and the provisions of paragraphs 10, 11, 12 and 14 shall survive indefinitely.
+
+10. DISCLAIMERS
+
+10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE PREVIEW IS AT YOUR SOLE RISK AND THAT THE PREVIEW IS PROVIDED "AS IS" AND "AS AVAILABLE" WITHOUT WARRANTY OF ANY KIND FROM GOOGLE.
+
+10.2 YOUR USE OF THE PREVIEW AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE PREVIEW IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE. WITHOUT LIMITING THE FOREGOING, YOU UNDERSTAND THAT THE PREVIEW IS NOT A STABLE RELEASE AND MAY CONTAIN ERRORS, DEFECTS AND SECURITY VULNERABILITIES THAT CAN RESULT IN SIGNIFICANT DAMAGE, INCLUDING THE COMPLETE, IRRECOVERABLE LOSS OF USE OF YOUR COMPUTER SYSTEM OR OTHER DEVICE.
+
+10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+
+11. LIMITATION OF LIABILITY
+
+11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING.
+
+12. Indemnification
+
+12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys’ fees) arising out of or accruing from (a) your use of the Preview, (b) any application you develop on the Preview that infringes any Intellectual Property Rights of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you of the License Agreement.
+
+13. Changes to the License Agreement
+
+13.1 Google may make changes to the License Agreement as it distributes new versions of the Preview. When these changes are made, Google will make a new version of the License Agreement available on the website where the Preview is made available.
+
+14. General Legal Terms
+
+14.1 the License Agreement constitutes the whole legal agreement between you and Google and governs your use of the Preview (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the Preview.
+
+14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in the License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google.
+
+14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of the License Agreement is invalid, then that provision will be removed from the License Agreement without affecting the rest of the License Agreement. The remaining provisions of the License Agreement will continue to be valid and enforceable.
+
+14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to the License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of the License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to the License Agreement.
+
+14.5 EXPORT RESTRICTIONS. THE PREVIEW IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE PREVIEW. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE.
+
+14.6 The License Agreement may not be assigned or transferred by you without the prior written approval of Google, and any attempted assignment without such approval will be void. You shall not delegate your responsibilities or obligations under the License Agreement without the prior written approval of Google.
+
+14.7 The License Agreement, and your relationship with Google under the License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from the License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.
+
+June 2014.
Terms and Conditions
@@ -321,151 +428,6 @@ This is the Google TV Add-on for the Android Software Development Kit License Ag
August 15, 2011
- This is an early Sneak Peek of the GDK that is subject to change. Please stay tuned for the full Developer Preview coming soon.
-
-Terms and Conditions
-
-This is the Glass Development Kit License Agreement.
-
-1. Introduction
-
-1.1 The Glass Development Kit (referred to in this License Agreement as the "GDK" and specifically including the Android system files, packaged APIs, and GDK library files, if and when they are made available) is licensed to you subject to the terms of this License Agreement. This License Agreement forms a legally binding contract between you and Google in relation to your use of the GDK.
-
-1.2 "Glass" means Glass devices and the Glass software stack for use on Glass devices.
-
-
-1.3 "Android" means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time.
-
-1.4 "Google" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.
-
-2. Accepting this License Agreement
-
-2.1 In order to use the GDK, you must first agree to this License Agreement. You may not use the GDK if you do not accept this License Agreement.
-
-2.2 By clicking to accept, you hereby agree to the terms of this License Agreement.
-
-2.3 You may not use the GDK and may not accept the License Agreement if you are a person barred from receiving the GDK under the laws of the United States or other countries including the country in which you are resident or from which you use the GDK.
-
-2.4 If you are agreeing to be bound by this License Agreement on behalf of your employer or other entity, you represent and warrant that you have full legal authority to bind your employer or such entity to this License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the GDK on behalf of your employer or other entity.
-
-3. GDK License from Google
-
-3.1 Subject to the terms of this License Agreement, Google grants you a limited, worldwide, royalty-free, non-assignable and non-exclusive license to use the GDK solely to develop applications to run on the Glass platform for Glass devices.
-
-3.2 You agree that Google or third parties own all legal right, title and interest in and to the GDK, including any Intellectual Property Rights that subsist in the GDK. "Intellectual Property Rights" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you.
-
-3.3 You may not use the GDK for any purpose not expressly permitted by this License Agreement. Except to the extent required by applicable third party licenses, you may not: (a) copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the GDK or any part of the GDK; or (b) load any part of the GDK onto a mobile handset or wearable computing device or any other hardware device except a Glass device personal computer, combine any part of the GDK with other software, or distribute any software or device incorporating a part of the GDK.
-
-3.4 You agree that you will not take any actions that may cause or result in the fragmentation of Glass, including but not limited to distributing, participating in the creation of, or promoting in any way a software development kit derived from the GDK.
-
-3.5 Use, reproduction and distribution of components of the GDK licensed under an open source software license are governed solely by the terms of that open source software license and not this License Agreement.
-
-3.6 You agree that the form and nature of the GDK that Google provides may change without prior notice to you and that future versions of the GDK may be incompatible with applications developed on previous versions of the GDK. You agree that Google may stop (permanently or temporarily) providing the GDK (or any features within the GDK) to you or to users generally at Google's sole discretion, without prior notice to you.
-
-3.7 Nothing in this License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features.
-
-3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the GDK.
-
-
-3.9 Your use of any Android system files, packaged APIs, or other components of the GDK which are part of the Android Software Development Kit is subject to the terms of the Android Software Development Kit License Agreement located at http://developer.android.com/sdk/terms.html. These terms are hereby incorporated by reference into this License Agreement.
-
-4. Use of the GDK by You
-
-4.1 Google agrees that it obtains no right, title or interest from you (or your licensors) under this License Agreement in or to any software applications that you develop using the GDK, including any intellectual property rights that subsist in those applications.
-
-4.2 You agree to use the GDK and write applications only for purposes that are permitted by (a) this License Agreement, (b) the Glass Platform Developer Policies (located at https://developers.google.com/glass/policies, and hereby incorporated into this License Agreement by reference), and (c) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries).
-
-4.3 You agree that if you use the GDK to develop applications for general public users, you will protect the privacy and legal rights of those users. If the users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If the user provides your application with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, the user has given you permission to do so.
-
-4.4 You agree that you will not engage in any activity with the GDK, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of any third party including, but not limited to, Google.
-
-4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through Glass and/or applications for Glass, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so.
-
-4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under this License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach.
-
-
-4.7 The GDK is in development, and your testing and feedback are an important part of the development process. By using the GDK, you acknowledge that implementation of some features are still under development and that you should not rely on the GDK, Glass devices, Glass system software, Google Mirror API, or Glass services having the full functionality of a stable release.
-
-5. Your Developer Credentials
-
-5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials.
-
-6. Privacy and Information
-
-
-6.1 In order to continually innovate and improve the GDK, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the GDK are being used and how they are being used. Before any of this information is collected, the GDK will notify you and seek your consent. If you withhold consent, the information will not be collected.
-
-6.2 The data collected is examined in the aggregate to improve the GDK and is maintained in accordance with Google's Privacy Policy.
-
-7. Third Party Applications
-
-7.1 If you use the GDK to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources.
-
-7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners.
-
-7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party. In that case, this License Agreement does not affect your legal relationship with these third parties.
-
-8. Using Google APIs
-
-8.1 Google APIs
-
-8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service.
-
-8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so.
-
-9. Terminating this License Agreement
-
-9.1 This License Agreement will continue to apply until terminated by either you or Google as set out below.
-
-9.2 If you want to terminate this License Agreement, you may do so by ceasing your use of the GDK and any relevant developer credentials.
-
-9.3 Google may at any time, terminate this License Agreement with you if:
-(A) you have breached any provision of this License Agreement; or
-(B) Google is required to do so by law; or
-(C) the partner with whom Google offered certain parts of GDK (such as APIs) to you has terminated its relationship with Google or ceased to offer certain parts of the GDK to you; or
-(D) Google decides to no longer provide the GDK or certain parts of the GDK to users in the country in which you are resident or from which you use the service, or the provision of the GDK or certain GDK services to you by Google is, in Google's sole discretion, no longer commercially viable.
-
-9.4 When this License Agreement comes to an end, all of the legal rights, obligations and liabilities that you and Google have benefited from, been subject to (or which have accrued over time whilst this License Agreement has been in force) or which are expressed to continue indefinitely, shall be unaffected by this cessation, and the provisions of paragraph 14.7 shall continue to apply to such rights, obligations and liabilities indefinitely.
-
-10. DISCLAIMER OF WARRANTIES
-
-10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE GDK IS AT YOUR SOLE RISK AND THAT THE GDK IS PROVIDED "AS IS" AND "AS AVAILABLE" WITHOUT WARRANTY OF ANY KIND FROM GOOGLE.
-
-10.2 YOUR USE OF THE GDK AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE GDK IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE.
-
-10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-
-11. LIMITATION OF LIABILITY
-
-11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING.
-
-12. Indemnification
-
-12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys fees) arising out of or accruing from (a) your use of the GDK, (b) any application you develop on the GDK that infringes any copyright, trademark, trade secret, trade dress, patent or other intellectual property right of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you with this License Agreement.
-
-13. Changes to the License Agreement
-
-13.1 Google may make changes to the License Agreement as it distributes new versions of the GDK. When these changes are made, Google will make a new version of the License Agreement available on the website where the GDK is made available.
-
-14. General Legal Terms
-
-14.1 This License Agreement constitutes the whole legal agreement between you and Google and governs your use of the GDK (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the GDK.
-
-14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in this License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google.
-
-14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of this License Agreement is invalid, then that provision will be removed from this License Agreement without affecting the rest of this License Agreement. The remaining provisions of this License Agreement will continue to be valid and enforceable.
-
-14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to this License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of this License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to this License Agreement.
-
-14.5 EXPORT RESTRICTIONS. THE GDK IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE GDK. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE.
-
-14.6 The rights granted in this License Agreement may not be assigned or transferred by either you or Google without the prior written approval of the other party. Neither you nor Google shall be permitted to delegate their responsibilities or obligations under this License Agreement without the prior written approval of the other party.
-
-14.7 This License Agreement, and your relationship with Google under this License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from this License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.
-
-November 19, 2013
-
-
@@ -479,7 +441,7 @@ November 19, 2013
http://developer.android.com/
-
+
34908058
1f92abf3a76be66ae8032257fc7620acbd2b2e3a
google_apis-3-r03.zip
@@ -506,7 +468,7 @@ November 19, 2013
http://developer.android.com/
-
+
42435735
9b6e86d8568558de4d606a7debc4f6049608dbd0
google_apis-4_r02.zip
@@ -534,7 +496,7 @@ November 19, 2013
-
+
49123776
46eaeb56b645ee7ffa24ede8fa17f3df70db0503
google_apis-5_r01.zip
@@ -562,7 +524,7 @@ November 19, 2013
-
+
53382941
5ff545d96e031e09580a6cf55713015c7d4936b2
google_apis-6_r01.zip
@@ -589,7 +551,7 @@ November 19, 2013
http://developer.android.com/
-
+
53691339
2e7f91e0fe34fef7f58aeced973c6ae52361b5ac
google_apis-7_r01.zip
@@ -616,7 +578,7 @@ November 19, 2013
http://developer.android.com/
-
+
59505020
3079958e7ec87222cac1e6b27bc471b27bf2c352
google_apis-8_r02.zip
@@ -643,7 +605,7 @@ November 19, 2013
http://developer.android.com/
-
+
63401546
78664645a1e9accea4430814f8694291a7f1ea5d
google_apis-9_r02.zip
@@ -671,7 +633,7 @@ November 19, 2013
http://developer.android.com/
-
+
65781578
cc0711857c881fa7534f90cf8cc09b8fe985484d
google_apis-10_r02.zip
@@ -698,7 +660,7 @@ November 19, 2013
http://developer.android.com/
-
+
83477179
5eab5e81addee9f3576d456d205208314b5146a5
google_apis-11_r01.zip
@@ -725,7 +687,7 @@ November 19, 2013
http://developer.android.com/
-
+
86099835
e9999f4fa978812174dfeceec0721c793a636e5d
google_apis-12_r01.zip
@@ -752,7 +714,7 @@ November 19, 2013
http://developer.android.com/
-
+
88615525
3b153edd211c27dc736c893c658418a4f9041417
google_apis-13_r01.zip
@@ -785,7 +747,7 @@ November 19, 2013
-
+
106533714
f8eb4d96ad0492b4c0db2d7e4f1a1a3836664d39
google_apis-14_r02.zip
@@ -814,7 +776,7 @@ November 19, 2013
-
+
106612472
6757c12788da0ea00c2ab58e54cb438b9f2bcf66
google_apis-15_r02.zip
@@ -844,7 +806,7 @@ November 19, 2013
-
+
127278413
63467dd32f471e3e81e33e9772c22f33235aa3b3
google_apis-16_r03.zip
@@ -874,7 +836,7 @@ November 19, 2013
-
+
137156978
8246f61d24f0408c8e7bc352a1e522b7e2b619ba
google_apis-17_r03.zip
@@ -904,7 +866,7 @@ November 19, 2013
-
+
143149689
147bce09c1163edc17194f3db496ec1086fcf965
google_apis-18_r03.zip
@@ -914,14 +876,14 @@ November 19, 2013
-
+
google
Google Inc.
google_apis
- Google APIs
+ Google APIs (ARM System Image)
Android + Google APIs
19
- 1
+ 7
com.google.android.maps
@@ -934,16 +896,15 @@ November 19, 2013
-
- 150689239
- 6c530a8318446e4da1e3ab7d2abd154bc493bc5a
- google_apis-19_r01.zip
+
+ 160661775
+ 150f5a3fec4f03313ca770b90126605619bd713c
+ google_apis-19_r07.zip
-
@@ -957,10 +918,11 @@ November 19, 2013
http://developer.android.com/
-
+
78266751
92128a12e7e8b0fb5bac59153d7779b717e7b840
google_tv-12_r02.zip
+ linux
@@ -977,7 +939,7 @@ November 19, 2013
http://developer.android.com/
-
+
87721879
b73f7c66011ac8180b44aa4e83b8d78c66ea9a09
google_tv-13_r01.zip
@@ -986,71 +948,48 @@ November 19, 2013
-
-
-
-
- google
- Google Inc.
- google_gdk
- Glass Development Kit Sneak Peek
- 15
- 01
- Sneak peek of the Glass Development Kit
- https://developers.google.com/glass/gdk/
-
-
-
- 281839
- a3c7317fb2fe8a0dfc06828a5aabc457372b82a7
- https://dl-ssl.google.com/glass/xe11/google-gdk.zip
-
-
-
-
- com.google.android.glass
- APIs for Google Glass Development Kit Sneak Peek.
-
-
-
-
-
-
- 19
+
+
+ 20
+ 0
+ 0
+
Android
android
Android Support Library
support
compatibility
-
- 4905998
- 54b8661595856a08f032d41bb139f375a7609308
- support_r19.zip
+
+ 5508097
+ 719c260dc3eb950712988f987daaf91afa9e36af
+ support_r20.zip
-
- 3
+
+
+ 6
+
Android
android
Android Support Repository
Local Maven repository for Support Libraries
m2repository
-
- 6282146
- db4650f817f1507211ec6186d2d9e72074e6df12
- android_m2repository_r03.zip
+
+ 22271942
+ d4874fd330f41a7c16de392ce917c2a3562dd620
+ android_m2repository_r06.zip
-
+
@@ -1060,14 +999,16 @@ November 19, 2013
Google Inc.
Google Repository
m2repository
- 4
+
+ 11
+
Local Maven repository for Google Libraries
-
- 3891592
- c418daafd203a8cb4899d49bd321da83b927586e
- google_m2repository_r04.zip
+
+ 18832133
+ 08b5114037d187cf3d4b44a25570149ef4f8ab3d
+ google_m2repository_r11.zip
@@ -1078,11 +1019,13 @@ November 19, 2013
Google Play Licensing Library
play_licensing
market_licensing
- 2
+
+ 2
+
Google Play Licensing client library
http://developer.android.com/guide/publishing/licensing.html
-
+
75109
355e8dc304a92a5616db235af8ee7bd554356254
market_licensing-r02.zip
@@ -1097,11 +1040,13 @@ November 19, 2013
Google Play APK Expansion Library
play_apk_expansion
market_apk_expansion
- 3
+
+ 3
+
Google Play APK Expansion library
http://developer.android.com/guide/market/expansion-files.html
-
+
110201
5305399dc1a56814e86b8459ce24871916f78b8c
market_apk_expansion-r03.zip
@@ -1115,12 +1060,14 @@ November 19, 2013
Google Inc.
Google Play services for Froyo
google_play_services_froyo
- 12
+
+ 12
+
Google Play services client library and sample code
https://developers.google.com/android/google-play-services/index
-
+
5265389
92558dbc380bba3d55d0ec181167fb05ce7c79d9
google_play_services_3265130_r12.zip
@@ -1133,34 +1080,59 @@ November 19, 2013
Google Inc.
Google Play services
google_play_services
- 13
+
+ 19
+
Google Play services client library and sample code
https://developers.google.com/android/google-play-services/index
-
- 7958511
- 1be94e8f767616e862f0088ab673e1980a6022c4
- google_play_services_4030530_r13.zip
+
+ 13982276
+ 847a8806dd3c43effc2afdd7b49fc6ba27f72d5d
+ google_play_services_5089000_r19.zip
-
google
Google Inc.
- Google USB Driver
- usb_driver
- 8
- USB Driver for Windows, revision 8
- http://developer.android.com/
-
+ Google Play services for Fit Preview
+ google_play_services_fit_preview
+
+ 1
+
+ Google Play services client library and sample code
+ https://developers.google.com/android/google-play-services/index
+
-
- 8682230
- 2b2f91098a984a865a70f0bd841a843fb54462fc
- usb_driver_r08-windows.zip
+
+ 15224769
+ 34369ca796268ec7274bc49d659d9e8f042b55ae
+ google_play_services_fit_preview_5208000_r01.zip
+
+
+
+
+
+
+ google
+
+ http://developer.android.com/
+ usb_driver
+ USB Driver for Windows, revision 10
+ Google USB Driver
+ Google Inc.
+
+ 10
+
+
+
+ usb_driver_r10-windows.zip
+ a5f8280829f07bb3144a8d657ec7aa0128443a2c
+ 8682752
+ windows
@@ -1171,11 +1143,13 @@ November 19, 2013
Google Play Billing Library
play_billing
market_billing
- 5
+
+ 5
+
Google Play Billing files and sample code
http://developer.android.com/google/play/billing/index.html
-
+
436654
bd2ac5ce7127070ac3229003eb69cfb806628ac9
play_billing_r05.zip
@@ -1189,29 +1163,35 @@ November 19, 2013
Google Inc.
Google AdMob Ads SDK
admob_ads_sdk
- 11
+
+ 11
+
AdMob Ads SDK
https://developers.google.com/mobile-ads-sdk/docs/
-
+
704512
0102859d9575baa0bf4fd5eb422af2ad0fe6cb82
https://dl-ssl.google.com/googleadmobadssdk/googleadmobadssdkandroid-6.4.1.zip
+
+
google
Google Inc.
Google Analytics App Tracking SDK
analytics_sdk_v2
- 3
+
+ 3
+
Analytics App Tracking SDK
http://developers.google.com/analytics/devguides/collection/
-
+
211432
dc14026bf0ce78315cb5dd00552607de0894de83
https://dl.google.com/gaformobileapps/GoogleAnalyticsAndroid_2.0beta5.zip
@@ -1225,11 +1205,13 @@ November 19, 2013
Google Inc.
Google Web Driver
webdriver
- 2
+
+ 2
+
WebDriver
http://selenium.googlecode.com
-
+
4055193
13f3a3b2670a5fc04a7342861644be9a01b07e38
webdriver_r02.zip
@@ -1241,18 +1223,21 @@ November 19, 2013
google
Google Inc.
- [Deprecated] Google Cloud Messaging for Android Library
+ Google Cloud Messaging for Android Library
gcm
- 3
+
+ 3
+
GCM library has been moved to Google Play Services (com.google.android.gms.gcm) and this standalone version is no longer supported
https://developers.google.com/android/gcm/index
-
+
5901400
ad066fd0dc7fc99d8aadac09c65a3c2519fbc7bf
gcm_r03.zip
+
diff --git a/pkgs/development/mobile/androidenv/addons.nix b/pkgs/development/mobile/androidenv/addons.nix
index 8aacde4eee7..4f7ed6e9e8e 100644
--- a/pkgs/development/mobile/androidenv/addons.nix
+++ b/pkgs/development/mobile/androidenv/addons.nix
@@ -209,8 +209,8 @@ in
google_apis_19 = buildGoogleApis {
name = "google_apis-19";
src = fetchurl {
- url = https://dl-ssl.google.com/android/repository/google_apis-19_r01.zip;
- sha1 = "6c530a8318446e4da1e3ab7d2abd154bc493bc5a";
+ url = https://dl-ssl.google.com/android/repository/google_apis-19_r07.zip;
+ sha1 = "150f5a3fec4f03313ca770b90126605619bd713c";
};
meta = {
description = "Android + Google APIs";
diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix
index cbcff8178e3..2b3bb333948 100644
--- a/pkgs/development/mobile/androidenv/androidndk.nix
+++ b/pkgs/development/mobile/androidenv/androidndk.nix
@@ -22,6 +22,10 @@ stdenv.mkDerivation rec {
mkdir -pv $out
tar xf $src
mv */* $out
+
+ # so that it doesn't fail because of read-only permissions set
+ patch -p1 -d $out < ${ ./make-standalone-toolchain.patch }
+
find $out \( \
\( -type f -a -name "*.so*" \) -o \
\( -type f -a -perm +0100 \) \
diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix
index 3c9327f1c59..560753eecfc 100644
--- a/pkgs/development/mobile/androidenv/androidsdk.nix
+++ b/pkgs/development/mobile/androidenv/androidsdk.nix
@@ -1,5 +1,5 @@
{ stdenv, stdenv_32bit, fetchurl, unzip, makeWrapper
-, platformTools, buildTools, support, platforms, sysimages, addons
+, platformTools, buildTools, support, supportRepository, platforms, sysimages, addons
, zlib_32bit
, libX11_32bit, libxcb_32bit, libXau_32bit, libXdmcp_32bit, libXext_32bit, mesa_32bit, alsaLib_32bit
, libX11, libXext, libXrender, libxcb, libXau, libXdmcp, libXtst, mesa, alsaLib
@@ -9,36 +9,35 @@
stdenv.mkDerivation rec {
name = "android-sdk-${version}";
- version = "22.6.2";
+ version = "23.0.2";
src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
then fetchurl {
url = "http://dl.google.com/android/android-sdk_r${version}-linux.tgz";
- md5 = "ff1541418a44d894bedc5cef10622220";
+ md5 = "94a8c62086a7398cc0e73e1c8e65f71e";
}
else if stdenv.system == "x86_64-darwin" then fetchurl {
url = "http://dl.google.com/android/android-sdk_r${version}-macosx.zip";
- md5 = "2a319c862dd1dcf450bfe2a6b3d9c608";
+ md5 = "322787b0e6c629d926c28690c79ac0d8";
}
else throw "platform not ${stdenv.system} supported!";
buildCommand = ''
mkdir -p $out/libexec
cd $out/libexec
- unpackFile $src;
-
+ unpackFile $src
cd android-sdk-*/tools
${stdenv.lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
''
# There are a number of native binaries. We must patch them to let them find the interpreter and libstdc++
-
- for i in dmtracedump emulator emulator-arm emulator-mips emulator-x86 hprof-conv mksdcard sqlite3
+
+ for i in emulator emulator-arm emulator-mips emulator-x86 mksdcard
do
patchelf --set-interpreter ${stdenv_32bit.gcc.libc}/lib/ld-linux.so.2 $i
patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib $i
done
-
+
${stdenv.lib.optionalString (stdenv.system == "x86_64-linux") ''
# We must also patch the 64-bit emulator instances, if needed
@@ -49,17 +48,6 @@ stdenv.mkDerivation rec {
done
''}
- # These tools also need zlib in addition to libstdc++
-
- for i in etc1tool zipalign
- do
- patchelf --set-interpreter ${stdenv_32bit.gcc.libc}/lib/ld-linux.so.2 $i
- patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib:${zlib_32bit}/lib $i
- done
-
- # The android script has a hardcoded reference to /bin/ls that must be patched
- sed -i -e "s|/bin/ls|ls|" android
-
# The android script used SWT and wants to dynamically load some GTK+ stuff.
# The following wrapper ensures that they can be found:
wrapProgram `pwd`/android \
@@ -139,6 +127,15 @@ stdenv.mkDerivation rec {
cd ..
+ # Symlink required extras
+
+ mkdir -p extras/android
+ cd extras/android
+
+ ln -s ${supportRepository}/m2repository
+
+ cd ../..
+
# Symlink required platforms
mkdir -p platforms
diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix
index 58bf3549361..11beb29f3ce 100644
--- a/pkgs/development/mobile/androidenv/build-tools.nix
+++ b/pkgs/development/mobile/androidenv/build-tools.nix
@@ -1,15 +1,15 @@
{stdenv, stdenv_32bit, fetchurl, unzip, zlib_32bit}:
stdenv.mkDerivation {
- name = "android-build-tools-r18.1.0";
+ name = "android-build-tools-r20";
src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
then fetchurl {
- url = https://dl-ssl.google.com/android/repository/build-tools_r18.1-linux.zip;
- sha1 = "f314a0599e51397f0886fe888b50dd98f2f050d8";
+ url = https://dl-ssl.google.com/android/repository/build-tools_r20-linux.zip;
+ sha1 = "b688905526a5584d1327a662d871a635ff502758";
}
else if stdenv.system == "x86_64-darwin" then fetchurl {
- url = https://dl-ssl.google.com/android/repository/build-tools_r18.1-macosx.zip;
- sha1 = "16ddb299b8b43063e5bb3387ec17147c5053dfd8";
+ url = https://dl-ssl.google.com/android/repository/build-tools_r20-macosx.zip;
+ sha1 = "1240f629411c108a714c4ddd756937c7fab93f83";
}
else throw "System ${stdenv.system} not supported!";
@@ -39,6 +39,13 @@ stdenv.mkDerivation {
do
patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib:`pwd` $i
done
+
+ # These binaries also need zlib in addition to libstdc++
+ for i in zipalign
+ do
+ patchelf --set-interpreter ${stdenv_32bit.gcc.libc}/lib/ld-linux.so.2 $i
+ patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib:${zlib_32bit}/lib $i
+ done
# These binaries need to find libstdc++, libgcc_s, and zlib
for i in aapt dexdump
diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix
index 422c1516f2d..796f0f862bd 100644
--- a/pkgs/development/mobile/androidenv/default.nix
+++ b/pkgs/development/mobile/androidenv/default.nix
@@ -16,6 +16,10 @@ rec {
inherit (pkgs) stdenv fetchurl unzip;
};
+ supportRepository = import ./support-repository.nix {
+ inherit (pkgs) stdenv fetchurl unzip;
+ };
+
platforms = if (pkgs.stdenv.system == "i686-linux" || pkgs.stdenv.system == "x86_64-linux")
then import ./platforms-linux.nix {
inherit (pkgs) stdenv fetchurl unzip;
@@ -39,7 +43,7 @@ rec {
inherit (pkgs) freetype fontconfig glib gtk atk mesa file alsaLib jdk;
inherit (pkgs.xorg) libX11 libXext libXrender libxcb libXau libXdmcp libXtst;
- inherit platformTools buildTools support platforms sysimages addons;
+ inherit platformTools buildTools support supportRepository platforms sysimages addons;
stdenv_32bit = pkgs_i686.stdenv;
zlib_32bit = pkgs_i686.zlib;
@@ -63,8 +67,38 @@ rec {
abiVersions = [ "armeabi-v7a" ];
useGoogleAPIs = true;
};
+
+ androidsdk_2_3_3 = androidsdk {
+ platformVersions = [ "10" ];
+ abiVersions = [ "armeabi-v7a" ];
+ useGoogleAPIs = true;
+ };
+
+ androidsdk_3_0 = androidsdk {
+ platformVersions = [ "11" ];
+ abiVersions = [ "armeabi-v7a" ];
+ useGoogleAPIs = true;
+ };
+
+ androidsdk_3_1 = androidsdk {
+ platformVersions = [ "12" ];
+ abiVersions = [ "armeabi-v7a" ];
+ useGoogleAPIs = true;
+ };
+
+ androidsdk_3_2 = androidsdk {
+ platformVersions = [ "13" ];
+ abiVersions = [ "armeabi-v7a" ];
+ useGoogleAPIs = true;
+ };
androidsdk_4_0 = androidsdk {
+ platformVersions = [ "14" ];
+ abiVersions = [ "armeabi-v7a" ];
+ useGoogleAPIs = true;
+ };
+
+ androidsdk_4_0_3 = androidsdk {
platformVersions = [ "15" ];
abiVersions = [ "armeabi-v7a" ];
useGoogleAPIs = true;
diff --git a/pkgs/development/mobile/androidenv/emulate-app.nix b/pkgs/development/mobile/androidenv/emulate-app.nix
index 278c073dc58..cad77ec7d62 100644
--- a/pkgs/development/mobile/androidenv/emulate-app.nix
+++ b/pkgs/development/mobile/androidenv/emulate-app.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation {
# Create a virtual android device for testing if it does not exists
- if [ "$(android list avd | grep 'Name: device')" = "" ]
+ if [ "$(${androidsdkComposition}/libexec/android-sdk-*/tools/android list avd | grep 'Name: device')" = "" ]
then
# Create a virtual android device
yes "" | ${androidsdkComposition}/libexec/android-sdk-*/tools/android create avd -n device -t ${if useGoogleAPIs then "'Google Inc.:Google APIs:"+platformVersion+"'" else "android-"+platformVersion} $NIX_ANDROID_AVD_FLAGS
@@ -106,7 +106,7 @@ stdenv.mkDerivation {
${stdenv.lib.optionalString (app != null) ''
# Install the App through the debugger, if it has not been installed yet
- if [ -z "${package}" ] || [ "$(adb -s emulator-$port shell pm list packages | grep package:${package})" = "" ]
+ if [ -z "${package}" ] || [ "$(${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port shell pm list packages | grep package:${package})" = "" ]
then
if [ -d "${app}" ]
then
diff --git a/pkgs/development/mobile/androidenv/fetch b/pkgs/development/mobile/androidenv/fetch.sh
similarity index 58%
rename from pkgs/development/mobile/androidenv/fetch
rename to pkgs/development/mobile/androidenv/fetch.sh
index 30aabc9e086..92abb18f25f 100755
--- a/pkgs/development/mobile/androidenv/fetch
+++ b/pkgs/development/mobile/androidenv/fetch.sh
@@ -5,10 +5,9 @@ android list sdk | grep 'Parse XML:' | cut -f8- -d\ # | xargs -n 1 curl -O
# we skip the intel addons, as they are Windows+osX only
# we skip the default sys-img (arm?) because it is empty
-curl -o repository-8.xml https://dl-ssl.google.com/android/repository/repository-8.xml
+curl -o repository-10.xml https://dl-ssl.google.com/android/repository/repository-10.xml
curl -o addon.xml https://dl-ssl.google.com/android/repository/addon.xml
-curl -o sys-img-mips.xml https://dl-ssl.google.com/android/repository/sys-img/mips/sys-img.xml
-curl -o sys-img-x86.xml https://dl-ssl.google.com/android/repository/sys-img/x86/sys-img.xml
+curl -o sys-img.xml https://dl-ssl.google.com/android/repository/sys-img/android/sys-img.xml
./generate-addons.sh
./generate-platforms.sh
diff --git a/pkgs/development/mobile/androidenv/generate-addons.xsl b/pkgs/development/mobile/androidenv/generate-addons.xsl
index 0100b980a4e..51d0c07c934 100644
--- a/pkgs/development/mobile/androidenv/generate-addons.xsl
+++ b/pkgs/development/mobile/androidenv/generate-addons.xsl
@@ -1,7 +1,7 @@
+ xmlns:sdk="http://schemas.android.com/sdk/android/addon/7">
@@ -23,8 +23,8 @@ in
google_apis_ = buildGoogleApis {
name = "-";
src = fetchurl {
- url = https://dl-ssl.google.com/android/repository/;
- sha1 = "";
+ url = https://dl-ssl.google.com/android/repository/;
+ sha1 = "";
};
meta = {
description = "";
diff --git a/pkgs/development/mobile/androidenv/generate-platforms.sh b/pkgs/development/mobile/androidenv/generate-platforms.sh
index 8ac4ad328f4..58d3ba58d37 100755
--- a/pkgs/development/mobile/androidenv/generate-platforms.sh
+++ b/pkgs/development/mobile/androidenv/generate-platforms.sh
@@ -1,4 +1,4 @@
#!/bin/sh -e
-xsltproc --stringparam os linux generate-platforms.xsl repository-8.xml > platforms-linux.nix
-xsltproc --stringparam os macosx generate-platforms.xsl repository-8.xml > platforms-macosx.nix
+xsltproc --stringparam os linux generate-platforms.xsl repository-10.xml > platforms-linux.nix
+xsltproc --stringparam os macosx generate-platforms.xsl repository-10.xml > platforms-macosx.nix
diff --git a/pkgs/development/mobile/androidenv/generate-platforms.xsl b/pkgs/development/mobile/androidenv/generate-platforms.xsl
index 249f044550b..ba556f2baac 100644
--- a/pkgs/development/mobile/androidenv/generate-platforms.xsl
+++ b/pkgs/development/mobile/androidenv/generate-platforms.xsl
@@ -1,7 +1,7 @@
+ xmlns:sdk="http://schemas.android.com/sdk/android/repository/10">
@@ -10,7 +10,7 @@
let
buildPlatform = args:
- stdenv.mkDerivation (args // {
+ stdenv.mkDerivation (args // {
buildInputs = [ unzip ];
buildCommand = ''
mkdir -p $out
@@ -20,12 +20,12 @@ let
});
in
{
-
+
platform_ = buildPlatform {
name = "android-platform-";
src = fetchurl {
- url = https://dl-ssl.google.com/android/repository/;
- sha1 = "";
+ url = ;
+ sha1 = "";
};
meta = {
description = "";
diff --git a/pkgs/development/mobile/androidenv/generate-sysimages-others.xsl b/pkgs/development/mobile/androidenv/generate-sysimages-others.xsl
deleted file mode 100644
index 31ab72add36..00000000000
--- a/pkgs/development/mobile/androidenv/generate-sysimages-others.xsl
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
- sysimg__ = buildSystemImage {
- name = "-";
- src = fetchurl {
- url = https://dl-ssl.google.com/android/repository/sys-img//;
- sha1 = "";
- };
- };
-
-
-
diff --git a/pkgs/development/mobile/androidenv/generate-sysimages.sh b/pkgs/development/mobile/androidenv/generate-sysimages.sh
index 90b1e04c229..ef2f825642b 100755
--- a/pkgs/development/mobile/androidenv/generate-sysimages.sh
+++ b/pkgs/development/mobile/androidenv/generate-sysimages.sh
@@ -17,9 +17,7 @@ in
{
EOF
-xsltproc generate-sysimages.xsl repository-8.xml >> sysimages.nix
-xsltproc --stringparam abi x86 generate-sysimages-others.xsl sys-img-x86.xml >> sysimages.nix
-xsltproc --stringparam abi mips generate-sysimages-others.xsl sys-img-mips.xml >> sysimages.nix
+xsltproc generate-sysimages.xsl sys-img.xml >> sysimages.nix
cat >> sysimages.nix << "EOF"
}
diff --git a/pkgs/development/mobile/androidenv/generate-sysimages.xsl b/pkgs/development/mobile/androidenv/generate-sysimages.xsl
index be9947d536a..6de690622b5 100644
--- a/pkgs/development/mobile/androidenv/generate-sysimages.xsl
+++ b/pkgs/development/mobile/androidenv/generate-sysimages.xsl
@@ -2,17 +2,17 @@
+ xmlns:sdk="http://schemas.android.com/sdk/android/sys-img/3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
+
sysimg__ = buildSystemImage {
- name = "-";
+ name = "sysimg--";
src = fetchurl {
- url = https://dl-ssl.google.com/android/repository/;
- sha1 = "";
+ url = https://dl-ssl.google.com/android/repository/sys-img/android/;
+ sha1 = "";
};
};
diff --git a/pkgs/development/mobile/androidenv/make-standalone-toolchain.patch b/pkgs/development/mobile/androidenv/make-standalone-toolchain.patch
new file mode 100644
index 00000000000..afc3470aaba
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/make-standalone-toolchain.patch
@@ -0,0 +1,13 @@
+diff -ru android-ndk-r9d.old/build/tools/make-standalone-toolchain.sh android-ndk-r9d/build/tools/make-standalone-toolchain.sh
+--- android-ndk-r9d.old/build/tools/make-standalone-toolchain.sh 2014-09-25 11:42:09.990500975 +0200
++++ android-ndk-r9d/build/tools/make-standalone-toolchain.sh 2014-09-25 11:43:06.097501636 +0200
+@@ -252,6 +252,9 @@
+ # Now copy the GCC toolchain prebuilt binaries
+ run copy_directory "$TOOLCHAIN_PATH" "$TMPDIR"
+
++# Making it writable again
++chmod -R +w "$TMPDIR"
++
+ # Replace soft-link mcld by real file
+ ALL_LDS=`find $TMPDIR -name "*mcld"`
+ for LD in $ALL_LDS; do
diff --git a/pkgs/development/mobile/androidenv/platforms-linux.nix b/pkgs/development/mobile/androidenv/platforms-linux.nix
index f9f5a2d50f4..feb967d0108 100644
--- a/pkgs/development/mobile/androidenv/platforms-linux.nix
+++ b/pkgs/development/mobile/androidenv/platforms-linux.nix
@@ -3,7 +3,7 @@
let
buildPlatform = args:
- stdenv.mkDerivation (args // {
+ stdenv.mkDerivation (args // {
buildInputs = [ unzip ];
buildCommand = ''
mkdir -p $out
@@ -219,13 +219,13 @@ in
};
platform_19 = buildPlatform {
- name = "android-platform-4.4";
+ name = "android-platform-4.4.2";
src = fetchurl {
- url = https://dl-ssl.google.com/android/repository/android-19_r01.zip;
- sha1 = "96281811998272dce46e8285d15fce444a3d5a96";
+ url = https://dl-ssl.google.com/android/repository/android-19_r03.zip;
+ sha1 = "5f33d8fd36a384fe2b170035e04a29c274a9ef95";
};
meta = {
- description = "Android SDK Platform 4.4";
+ description = "Android SDK Platform 4.4.2";
};
};
diff --git a/pkgs/development/mobile/androidenv/platforms-macosx.nix b/pkgs/development/mobile/androidenv/platforms-macosx.nix
index a95561d3e85..0e93ed9412b 100644
--- a/pkgs/development/mobile/androidenv/platforms-macosx.nix
+++ b/pkgs/development/mobile/androidenv/platforms-macosx.nix
@@ -3,7 +3,7 @@
let
buildPlatform = args:
- stdenv.mkDerivation (args // {
+ stdenv.mkDerivation (args // {
buildInputs = [ unzip ];
buildCommand = ''
mkdir -p $out
@@ -219,13 +219,13 @@ in
};
platform_19 = buildPlatform {
- name = "android-platform-4.4";
+ name = "android-platform-4.4.2";
src = fetchurl {
- url = https://dl-ssl.google.com/android/repository/android-19_r01.zip;
- sha1 = "96281811998272dce46e8285d15fce444a3d5a96";
+ url = https://dl-ssl.google.com/android/repository/android-19_r03.zip;
+ sha1 = "5f33d8fd36a384fe2b170035e04a29c274a9ef95";
};
meta = {
- description = "Android SDK Platform 4.4";
+ description = "Android SDK Platform 4.4.2";
};
};
diff --git a/pkgs/development/mobile/androidenv/repository-10.xml b/pkgs/development/mobile/androidenv/repository-10.xml
new file mode 100644
index 00000000000..81023cae2ee
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/repository-10.xml
@@ -0,0 +1,1562 @@
+
+
+
+
+ To get started with the Android SDK, you must agree to the following terms and conditions.
+
+This is the Android SDK License Agreement (the "License Agreement").
+
+1. Introduction
+
+1.1 The Android SDK (referred to in the License Agreement as the "SDK" and specifically including the Android system files, packaged APIs, and SDK library files and tools , if and when they are made available) is licensed to you subject to the terms of the License Agreement. The License Agreement forms a legally binding contract between you and Google in relation to your use of the SDK.
+
+1.2 "Android" means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time.
+
+1.3 "Google" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.
+
+2. Accepting the License Agreement
+
+2.1 In order to use the SDK, you must first agree to the License Agreement. You may not use the SDK if you do not accept the License Agreement.
+
+2.2 By clicking to accept and/or using the SDK, you hereby agree to the terms of the License Agreement.
+
+2.3 You may not use the SDK and may not accept the License Agreement if you are a person barred from receiving the SDK under the laws of the United States or other countries including the country in which you are resident or from which you use the SDK.
+
+2.4 If you will use the SDK internally within your company or organization you agree to be bound by the License Agreement on behalf of your employer or other entity, and you represent and warrant that you have full legal authority to bind your employer or such entity to the License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the SDK on behalf of your employer or other entity.
+
+3. SDK License from Google
+
+3.1 Subject to the terms of the License Agreement, Google grants you a royalty-free, non-assignable, non-exclusive, non-sublicensable, limited, revocable license to use the SDK, personally or internally within your company or organization, solely to develop and distribute applications to run on the Android platform.
+
+3.2 You agree that Google or third parties own all legal right, title and interest in and to the SDK, including any Intellectual Property Rights that subsist in the SDK. "Intellectual Property Rights" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you.
+
+3.3 You may not use the SDK for any purpose not expressly permitted by the License Agreement. Except to the extent required by applicable third party licenses, you may not: (a) copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK; or (b) load any part of the SDK onto a mobile handset or any other hardware device except a personal computer, combine any part of the SDK with other software, or distribute any software or device incorporating a part of the SDK.
+
+3.4 You agree that you will not take any actions that may cause or result in the fragmentation of Android, including but not limited to distributing, participating in the creation of, or promoting in any way a software development kit derived from the SDK.
+
+3.5 Use, reproduction and distribution of components of the SDK licensed under an open source software license are governed solely by the terms of that open source software license and not the License Agreement. You agree to remain a licensee in good standing in regard to such open source software licenses under all the rights granted and to refrain from any actions that may terminate, suspend, or breach such rights.
+
+3.6 You agree that the form and nature of the SDK that Google provides may change without prior notice to you and that future versions of the SDK may be incompatible with applications developed on previous versions of the SDK. You agree that Google may stop (permanently or temporarily) providing the SDK (or any features within the SDK) to you or to users generally at Google's sole discretion, without prior notice to you.
+
+3.7 Nothing in the License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features.
+
+3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the SDK.
+
+4. Use of the SDK by You
+
+4.1 Google agrees that nothing in the License Agreement gives Google any right, title or interest from you (or your licensors) under the License Agreement in or to any software applications that you develop using the SDK, including any intellectual property rights that subsist in those applications.
+
+4.2 You agree to use the SDK and write applications only for purposes that are permitted by (a) the License Agreement, and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries).
+
+4.3 You agree that if you use the SDK to develop applications, you will protect the privacy and legal rights of users. If users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If users provide you with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, each user has given you permission to do so.
+
+4.4 You agree that you will not engage in any activity with the SDK, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of Google or any third party.
+
+4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through Android and/or applications for Android, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so.
+
+4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under the License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach.
+
+5. Your Developer Credentials
+
+5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials.
+
+6. Privacy and Information
+
+6.1 In order to continually innovate and improve the SDK, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the SDK are being used and how they are being used. Before any of this information is collected, the SDK will notify you and seek your consent. If you withhold consent, the information will not be collected.
+
+6.2 The data collected is examined in the aggregate to improve the SDK and is maintained in accordance with Google's Privacy Policy located at http://www.google.com/policies/privacy/.
+
+7. Third Party Applications
+
+7.1 If you use the SDK to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources.
+
+7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners.
+
+7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party.
+
+8. Using Google APIs
+
+8.1 Google APIs
+
+8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service.
+
+8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so.
+
+9. Terminating the License Agreement
+
+9.1 The License Agreement will continue to apply until terminated by either you or Google as set out below.
+
+9.2 If you want to terminate the License Agreement, you may do so by ceasing your use of the SDK and any relevant developer credentials.
+
+9.3 Google may at any time, terminate the License Agreement, with or without cause, upon notice to you.
+
+9.4 The License Agreement will automatically terminate without notice or other action when Google ceases to provide the SDK or certain parts of the SDK to users in the country in which you are resident or from which you use the service.
+
+9.5 When the License Agreement is terminated, the license granted to you in the License Agreement will terminate, you will immediately cease all use of the SDK, and the provisions of paragraphs 10, 11, 12 and 14 shall survive indefinitely.
+
+10. DISCLAIMERS
+
+10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE SDK IS AT YOUR SOLE RISK AND THAT THE SDK IS PROVIDED "AS IS" AND "AS AVAILABLE" WITHOUT WARRANTY OF ANY KIND FROM GOOGLE.
+
+10.2 YOUR USE OF THE SDK AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE SDK IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE. WITHOUT LIMITING THE FOREGOING, YOU UNDERSTAND THAT THE SDK MAY CONTAIN ERRORS, DEFECTS AND SECURITY VULNERABILITIES THAT CAN RESULT IN SIGNIFICANT DAMAGE, INCLUDING THE COMPLETE, IRRECOVERABLE LOSS OF USE OF YOUR COMPUTER SYSTEM OR OTHER DEVICE.
+
+10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+
+11. LIMITATION OF LIABILITY
+
+11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING.
+
+12. Indemnification
+
+12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys’ fees) arising out of or accruing from (a) your use of the SDK, (b) any application you develop on the SDK that infringes any Intellectual Property Rights of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you of the License Agreement.
+
+13. Changes to the License Agreement
+
+13.1 Google may make changes to the License Agreement as it distributes new versions of the SDK. When these changes are made, Google will make a new version of the License Agreement available on the website where the SDK is made available.
+
+14. General Legal Terms
+
+14.1 The License Agreement constitutes the whole legal agreement between you and Google and governs your use of the SDK (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the SDK.
+
+14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in the License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google.
+
+14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of the License Agreement is invalid, then that provision will be removed from the License Agreement without affecting the rest of the License Agreement. The remaining provisions of the License Agreement will continue to be valid and enforceable.
+
+14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to the License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of the License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to the License Agreement.
+
+14.5 EXPORT RESTRICTIONS. THE SDK IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE SDK. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE.
+
+14.6 The License Agreement may not be assigned or transferred by you without the prior written approval of Google, and any attempted assignment without such approval will be void. You shall not delegate your responsibilities or obligations under the License Agreement without the prior written approval of Google.
+
+14.7 The License Agreement, and your relationship with Google under the License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from the License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.
+
+June 2014.
+
+
+ To get started with the Android SDK Preview, you must agree to the following terms and conditions.
+As described below, please note that this is a preview version of the Android SDK, subject to change, that you use at your own risk. The Android SDK Preview is not a stable release, and may contain errors and defects that can result in serious damage to your computer systems, devices and data.
+
+This is the Android SDK Preview License Agreement (the "License Agreement").
+
+1. Introduction
+
+1.1 The Android SDK Preview (referred to in the License Agreement as the “Preview” and specifically including the Android system files, packaged APIs, and Preview library files, if and when they are made available) is licensed to you subject to the terms of the License Agreement. The License Agreement forms a legally binding contract between you and Google in relation to your use of the Preview.
+
+1.2 "Android" means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time.
+
+1.3 "Google" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.
+
+2. Accepting the License Agreement
+
+2.1 In order to use the Preview, you must first agree to the License Agreement. You may not use the Preview if you do not accept the License Agreement.
+
+2.2 By clicking to accept and/or using the Preview, you hereby agree to the terms of the License Agreement.
+
+2.3 You may not use the Preview and may not accept the License Agreement if you are a person barred from receiving the Preview under the laws of the United States or other countries including the country in which you are resident or from which you use the Preview.
+
+2.4 If you will use the Preview internally within your company or organization you agree to be bound by the License Agreement on behalf of your employer or other entity, and you represent and warrant that you have full legal authority to bind your employer or such entity to the License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the Preview on behalf of your employer or other entity.
+
+3. Preview License from Google
+
+3.1 Subject to the terms of the License Agreement, Google grants you a royalty-free, non-assignable, non-exclusive, non-sublicensable, limited, revocable license to use the Preview, personally or internally within your company or organization, solely to develop applications to run on the Android platform.
+
+3.2 You agree that Google or third parties owns all legal right, title and interest in and to the Preview, including any Intellectual Property Rights that subsist in the Preview. "Intellectual Property Rights" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you.
+
+3.3 You may not use the Preview for any purpose not expressly permitted by the License Agreement. Except to the extent required by applicable third party licenses, you may not: (a) copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the Preview or any part of the Preview; or (b) load any part of the Preview onto a mobile handset or any other hardware device except a personal computer, combine any part of the Preview with other software, or distribute any software or device incorporating a part of the Preview.
+
+3.4 You agree that you will not take any actions that may cause or result in the fragmentation of Android, including but not limited to distributing, participating in the creation of, or promoting in any way a software development kit derived from the Preview.
+
+3.5 Use, reproduction and distribution of components of the Preview licensed under an open source software license are governed solely by the terms of that open source software license and not the License Agreement. You agree to remain a licensee in good standing in regard to such open source software licenses under all the rights granted and to refrain from any actions that may terminate, suspend, or breach such rights.
+
+3.6 You agree that the form and nature of the Preview that Google provides may change without prior notice to you and that future versions of the Preview may be incompatible with applications developed on previous versions of the Preview. You agree that Google may stop (permanently or temporarily) providing the Preview (or any features within the Preview) to you or to users generally at Google's sole discretion, without prior notice to you.
+
+3.7 Nothing in the License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features.
+
+3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the Preview.
+
+4. Use of the Preview by You
+
+4.1 Google agrees that nothing in the License Agreement gives Google any right, title or interest from you (or your licensors) under the License Agreement in or to any software applications that you develop using the Preview, including any intellectual property rights that subsist in those applications.
+
+4.2 You agree to use the Preview and write applications only for purposes that are permitted by (a) the License Agreement, and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries).
+
+4.3 You agree that if you use the Preview to develop applications, you will protect the privacy and legal rights of users. If users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If users provide you with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, each user has given you permission to do so.
+
+4.4 You agree that you will not engage in any activity with the Preview, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of Google or any third party.
+
+4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through Android and/or applications for Android, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so.
+
+4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under the License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach.
+
+4.7 The Preview is in development, and your testing and feedback are an important part of the development process. By using the Preview, you acknowledge that implementation of some features are still under development and that you should not rely on the Preview having the full functionality of a stable release. You agree not to publicly distribute or ship any application using this Preview as this Preview will no longer be supported after the official Android SDK is released.
+
+5. Your Developer Credentials
+
+5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials.
+
+6. Privacy and Information
+
+6.1 In order to continually innovate and improve the Preview, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the Preview are being used and how they are being used. Before any of this information is collected, the Preview will notify you and seek your consent. If you withhold consent, the information will not be collected.
+
+6.2 The data collected is examined in the aggregate to improve the Preview and is maintained in accordance with Google's Privacy Policy located at http://www.google.com/policies/privacy/.
+
+7. Third Party Applications
+
+7.1 If you use the Preview to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources.
+
+7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners.
+
+7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party.
+
+8. Using Google APIs
+
+8.1 Google APIs
+
+8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service.
+
+8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so.
+
+9. Terminating the License Agreement
+
+9.1 the License Agreement will continue to apply until terminated by either you or Google as set out below.
+
+9.2 If you want to terminate the License Agreement, you may do so by ceasing your use of the Preview and any relevant developer credentials.
+
+9.3 Google may at any time, terminate the License Agreement, with or without cause, upon notice to you.
+
+9.4 The License Agreement will automatically terminate without notice or other action upon the earlier of:
+(A) when Google ceases to provide the Preview or certain parts of the Preview to users in the country in which you are resident or from which you use the service; and
+(B) Google issues a final release version of the Android SDK.
+
+9.5 When the License Agreement is terminated, the license granted to you in the License Agreement will terminate, you will immediately cease all use of the Preview, and the provisions of paragraphs 10, 11, 12 and 14 shall survive indefinitely.
+
+10. DISCLAIMERS
+
+10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE PREVIEW IS AT YOUR SOLE RISK AND THAT THE PREVIEW IS PROVIDED "AS IS" AND "AS AVAILABLE" WITHOUT WARRANTY OF ANY KIND FROM GOOGLE.
+
+10.2 YOUR USE OF THE PREVIEW AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE PREVIEW IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE. WITHOUT LIMITING THE FOREGOING, YOU UNDERSTAND THAT THE PREVIEW IS NOT A STABLE RELEASE AND MAY CONTAIN ERRORS, DEFECTS AND SECURITY VULNERABILITIES THAT CAN RESULT IN SIGNIFICANT DAMAGE, INCLUDING THE COMPLETE, IRRECOVERABLE LOSS OF USE OF YOUR COMPUTER SYSTEM OR OTHER DEVICE.
+
+10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+
+11. LIMITATION OF LIABILITY
+
+11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING.
+
+12. Indemnification
+
+12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys’ fees) arising out of or accruing from (a) your use of the Preview, (b) any application you develop on the Preview that infringes any Intellectual Property Rights of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you of the License Agreement.
+
+13. Changes to the License Agreement
+
+13.1 Google may make changes to the License Agreement as it distributes new versions of the Preview. When these changes are made, Google will make a new version of the License Agreement available on the website where the Preview is made available.
+
+14. General Legal Terms
+
+14.1 the License Agreement constitutes the whole legal agreement between you and Google and governs your use of the Preview (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the Preview.
+
+14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in the License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google.
+
+14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of the License Agreement is invalid, then that provision will be removed from the License Agreement without affecting the rest of the License Agreement. The remaining provisions of the License Agreement will continue to be valid and enforceable.
+
+14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to the License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of the License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to the License Agreement.
+
+14.5 EXPORT RESTRICTIONS. THE PREVIEW IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE PREVIEW. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE.
+
+14.6 The License Agreement may not be assigned or transferred by you without the prior written approval of Google, and any attempted assignment without such approval will be void. You shall not delegate your responsibilities or obligations under the License Agreement without the prior written approval of Google.
+
+14.7 The License Agreement, and your relationship with Google under the License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from the License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.
+
+June 2014.
+
+
+
+
+
+ 1.1
+ 2
+ 1
+ Android SDK Platform 1.1_r1
+ http://developer.android.com/sdk/android-1.1.html
+
+
+
+ 46828615
+ a4060f29ed39fc929c302836d488998c53c3002e
+ https://dl-ssl.google.com/android/repository/android-1.1_r1-windows.zip
+ windows
+
+
+ 45584305
+ e21dbcff45b7356657449ebb3c7e941be2bb5ebe
+ https://dl-ssl.google.com/android/repository/android-1.1_r1-macosx.zip
+ macosx
+
+
+ 45476658
+ c054d25c9b4c6251fa49c2f9c54336998679d3fe
+ https://dl-ssl.google.com/android/repository/android-1.1_r1-linux.zip
+ linux
+
+
+
+ 4
+
+
+
+
+
+
+
+ 1.5
+ 3
+ 04
+
+ 6
+
+ Android SDK Platform 1.5_r3
+ http://developer.android.com/sdk/android-1.5.html
+
+
+ 54624370
+ 5bb106d2e40d481edd337b0833093843e15fe49a
+ https://dl-ssl.google.com/android/repository/android-1.5_r04-windows.zip
+ windows
+
+
+ 52440607
+ d3a67c2369afa48b6c3c7624de5031c262018d1e
+ https://dl-ssl.google.com/android/repository/android-1.5_r04-macosx.zip
+ macosx
+
+
+ 53348669
+ 5c134b7df5f4b8bd5b61ba93bdaebada8fa3468c
+ https://dl-ssl.google.com/android/repository/android-1.5_r04-linux.zip
+ linux
+
+
+
+ 4
+
+
+
+
+
+ 1.6
+ 4
+
+ 03
+
+ 6
+
+ Android SDK Platform 1.6_r2
+ http://developer.android.com/sdk/android-1.6.html
+
+
+ 63454485
+ 483ed088e45bbdf3444baaf9250c8b02e5383cb0
+ https://dl-ssl.google.com/android/repository/android-1.6_r03-linux.zip
+ linux
+
+
+ 62418496
+ bdafad44f5df9f127979bdb21a1fdd87ee3cd625
+ https://dl-ssl.google.com/android/repository/android-1.6_r03-macosx.zip
+ macosx
+
+
+ 64654625
+ ce0b5e4ffaf12ca4fd07c2da71a8a1ab4a03dc22
+ https://dl-ssl.google.com/android/repository/android-1.6_r03-windows.zip
+ windows
+
+
+
+ 4
+
+
+
+
+
+
+
+ 2.0
+ 5
+
+ 01
+
+ 3
+
+ Android SDK Platform 2.0, revision 1
+ http://developer.android.com/sdk/android-2.0.html
+
+
+
+ 75095268
+ be9be6a99ca32875c96ec7f91160ca9fce7e3c7d
+ https://dl-ssl.google.com/android/repository/android-2.0_r01-linux.zip
+ linux
+
+
+ 74956356
+ 2a866d0870dbba18e0503cd41e5fae988a21b314
+ https://dl-ssl.google.com/android/repository/android-2.0_r01-macosx.zip
+ macosx
+
+
+ 76288040
+ aeb623217ff88b87216d6eb7dbc846ed53f68f57
+ https://dl-ssl.google.com/android/repository/android-2.0_r01-windows.zip
+ windows
+
+
+
+ 4
+
+
+
+
+
+
+
+ 2.0.1
+ 6
+
+ 01
+
+ 4
+
+ Android SDK Platform 2.0.1_r1
+ http://developer.android.com/sdk/android-2.0.1.html
+
+
+
+ 79192618
+ ce2c971dce352aa28af06bda92a070116aa5ae1a
+ https://dl-ssl.google.com/android/repository/android-2.0.1_r01-linux.zip
+ linux
+
+
+ 79035527
+ c3096f80d75a6fc8cb38ef8a18aec920e53d42c0
+ https://dl-ssl.google.com/android/repository/android-2.0.1_r01-macosx.zip
+ macosx
+
+
+ 80385601
+ 255781ebe4509d9707d0e77edda2815e2bc216e6
+ https://dl-ssl.google.com/android/repository/android-2.0.1_r01-windows.zip
+ windows
+
+
+
+ 4
+
+
+
+
+
+
+
+ 2.1
+ 7
+
+ 03
+
+ 8
+
+ Android SDK Platform 2.1_r3
+ http://developer.android.com/sdk/
+
+
+ 70142829
+ 5ce51b023ac19f8738500b1007a1da5de2349a1e
+ https://dl-ssl.google.com/android/repository/android-2.1_r03-linux.zip
+
+
+
+ 4
+
+
+
+
+
+
+
+ 2.2
+ 8
+
+ 03
+
+ 8
+
+ Android SDK Platform 2.2_r3
+ http://developer.android.com/sdk/
+
+
+ 74652366
+ 231262c63eefdff8fd0386e9ccfefeb27a8f9202
+ https://dl-ssl.google.com/android/repository/android-2.2_r03-linux.zip
+
+
+
+ 4
+
+
+
+
+
+
+
+ 2.3.1
+ 9
+
+ 02
+
+ 8
+
+ Android SDK Platform 2.3.1_r2
+ http://developer.android.com/sdk/
+
+
+
+ 78732563
+ 209f8a7a8b2cb093fce858b8b55fed3ba5206773
+ https://dl-ssl.google.com/android/repository/android-2.3.1_r02-linux.zip
+
+
+
+ 4
+
+
+
+
+
+
+
+ 2.3.3
+ 10
+
+ 02
+
+ 8
+
+ Android SDK Platform 2.3.3._r2
+ http://developer.android.com/sdk/
+
+
+ 85470907
+ 887e37783ec32f541ea33c2c649dda648e8e6fb3
+ https://dl-ssl.google.com/android/repository/android-2.3.3_r02-linux.zip
+
+
+
+ 4
+
+
+
+
+
+
+
+ 3.0
+ 11
+
+ 02
+
+ 10
+
+ Android SDK Platform 3.0, revision 2
+ http://developer.android.com/sdk/
+
+
+ 104513908
+ 2c7d4bd13f276e76f6bbd87315fe27aba351dd37
+ https://dl-ssl.google.com/android/repository/android-3.0_r02-linux.zip
+
+
+
+ 4
+
+
+
+
+
+
+
+ 3.1
+ 12
+
+ 03
+
+ 11
+
+ Android SDK Platform 3.1, revision 3
+ http://developer.android.com/sdk/
+
+
+ 106472351
+ 4a50a6679cd95bb68bb5fc032e754cd7c5e2b1bf
+ https://dl-ssl.google.com/android/repository/android-3.1_r03-linux.zip
+
+
+
+ 4
+
+
+
+
+
+
+
+ 3.2
+ 13
+
+ 01
+
+ 12
+
+ Android SDK Platform 3.2, revision 1
+ http://developer.android.com/sdk/
+
+
+ 108426536
+ 6189a500a8c44ae73a439604363de93591163cd9
+ https://dl-ssl.google.com/android/repository/android-3.2_r01-linux.zip
+
+
+
+ 4
+
+
+
+
+
+
+ 3
+ Android SDK Platform 4.0
+ 4.0
+ 14
+
+ 7
+ 1
+
+
+
+ 45919570
+ 41ba83b51e886461628c41b1b4d47762e0688ed5
+ https://dl-ssl.google.com/android/repository/android-14_r03.zip
+
+
+
+
+
+
+
+ 3
+ Android SDK Platform 4.0.3
+ 4.0.3
+ 15
+
+ 15
+
+
+ 7
+ 1
+
+
+
+ 44414679
+ 23da24610a8da51054c5391001c51ce43a778b97
+ https://dl-ssl.google.com/android/repository/android-15_r03.zip
+
+
+
+
+
+
+
+ 4
+ Android SDK Platform 4.1.2
+ 4.1.2
+ 16
+
+ 21
+
+
+ 9
+ 1
+
+
+
+ 48005140
+ 90b9157b8b45f966be97e11a22fba4591b96c2ee
+ https://dl-ssl.google.com/android/repository/android-16_r04.zip
+
+
+
+
+
+
+
+ 2
+ Android SDK Platform 4.2.2
+ 4.2.2
+ 17
+
+ 21
+
+
+ 9
+ 1
+
+
+
+ 48057484
+ c442c32c1b702173ab0929a74486e4f86fe528ec
+ https://dl-ssl.google.com/android/repository/android-17_r02.zip
+
+
+
+
+
+
+
+ 2
+ Android SDK Platform 4.3
+ 4.3
+ 18
+
+ 21
+
+
+ 10
+ 1
+
+
+
+ 57319855
+ 62a9438d4cf6692f4d6510c27a380be195db9534
+ https://dl-ssl.google.com/android/repository/android-18_r02.zip
+
+
+
+
+
+
+
+ 3
+ Android SDK Platform 4.4.2
+ 4.4.2
+ 19
+
+ 22
+
+
+ 10
+ 1
+
+
+
+ 63798840
+ 5f33d8fd36a384fe2b170035e04a29c274a9ef95
+ https://dl-ssl.google.com/android/repository/android-19_r03.zip
+
+
+
+
+
+
+
+ 1
+ Android SDK Platform 4.4W
+ 4.4W
+ 20
+
+ 22
+
+
+ 10
+ 1
+
+
+
+ 63548914
+ 928b1d181101a5bc06f739eb40501e1249dd4895
+ android-20_r01.zip
+
+
+
+
+
+
+
+ 3
+ Android SDK Platform L
+ L
+ 20
+ L
+
+ 22
+
+
+ 11
+ 1
+
+
+
+ 69421660
+ 76b6da426db06b2e2901dbc5e02d210ba83753c4
+ android-L_r03.zip
+
+
+
+
+
+
+
+
+
+
+ 7
+
+ 01
+ Android SDK Samples for Android API 7, revision 1
+ http://developer.android.com/sdk/
+
+
+ 7677831
+ 51e4907f60f248ede5c58b54ce7b6ae0b473e0ca
+ https://dl-ssl.google.com/android/repository/samples-2.1_r01-linux.zip
+
+
+
+
+
+
+
+
+ 8
+
+ 01
+ Android SDK Samples for Android API 8, revision 1
+ http://developer.android.com/sdk/
+
+
+ 7969716
+ d16d8bf2dd84cedf73b98b948d66461c8f19d6fb
+ https://dl-ssl.google.com/android/repository/samples-2.2_r01-linux.zip
+
+
+
+
+
+
+
+
+ 9
+
+ 01
+ Android SDK Samples for Android API 9, revision 1
+ http://developer.android.com/sdk/
+
+
+
+ 8516326
+ 36f7dd6c8b5dbb50b3cf3e3ac5209f3fe55db2aa
+ https://dl-ssl.google.com/android/repository/samples-2.3_r01-linux.zip
+
+
+
+
+
+
+
+
+ 10
+
+ 01
+ Android SDK Samples for Android API 10, revision 1
+ http://developer.android.com/sdk/
+
+
+ 8539583
+ 93b0c3f3bdf5b07f1f115100b4954f0665297a0d
+ https://dl-ssl.google.com/android/repository/samples-2.3.3_r01-linux.zip
+
+
+
+
+
+
+
+
+ 11
+
+ 01
+ Android SDK Samples for Android API 11, revision 1
+ http://developer.android.com/sdk/
+
+
+ 11976920
+ 3749ace584631270268d65bb1d0ad61b0d691682
+ https://dl-ssl.google.com/android/repository/samples-3.0_r01-linux.zip
+
+
+
+
+
+
+
+
+ 12
+
+ 01
+ Android SDK Samples for Android API 12, revision 1
+ http://developer.android.com/sdk/
+
+
+ 12150514
+ df0ace37cbca73373fe94080f94c71557cac73a7
+ https://dl-ssl.google.com/android/repository/samples-3.1_r01-linux.zip
+
+
+
+
+
+
+
+
+ 13
+
+ 01
+ Android SDK Samples for Android API 13, revision 1
+ http://developer.android.com/sdk/
+
+
+ 12193502
+ 078bcf1abc1cb8921f3fa482c252963a782bed60
+ https://dl-ssl.google.com/android/repository/samples-3.2_r01-linux.zip
+
+
+
+
+
+
+
+ 2
+ 14
+
+
+ 16253619
+ 1312c22ab0b650e26835cc3945d4ff8cea183416
+ https://dl-ssl.google.com/android/repository/samples-14_r02.zip
+
+
+
+
+
+
+
+ 2
+ 15
+
+
+ 16366656
+ 042f368c5b09eca4d278264e6dbf9c12c5f73d1f
+ https://dl-ssl.google.com/android/repository/samples-15_r02.zip
+
+
+
+
+
+
+
+ 1
+ 16
+
+
+ 14729945
+ dce3a2d41db50a381ef47ee8bddbe928520e685e
+ https://dl-ssl.google.com/android/repository/samples-16_r01.zip
+
+
+
+
+
+
+
+ 1
+ 17
+
+
+ 14840030
+ 12d58cb26503610fc05bd7618c434cc6f983bc41
+ https://dl-ssl.google.com/android/repository/samples-17_r01.zip
+
+
+
+
+
+
+
+ 1
+ 18
+
+
+ 19897793
+ 73e879ce46c04a6e63ad1a9107018b4782945007
+ https://dl-ssl.google.com/android/repository/samples-18_r01.zip
+
+
+
+
+
+
+
+ 6
+ 19
+
+
+ 31900752
+ 19593662771934b0b1e3be56ed18d13e6489bcd4
+ samples-19_r06.zip
+
+
+
+
+
+
+
+ 2
+ 20
+
+
+ 49718791
+ 4b906c46057ee8f502b4f27c23670fd87a49d6ff
+ samples-20_r02.zip
+
+
+
+
+
+
+
+ 2
+ 20
+ L
+
+
+ 41182182
+ 4afc36cf3f53051881729f733fe9bb571104c48f
+ samples-L_r02.zip
+
+
+
+
+
+
+
+
+
+
+ 20
+ 0
+ 0
+
+
+
+ 1741113
+ 72c34cc6a991f53e2588f9d5487559f013bc30f9
+ platform-tools_r20-windows.zip
+ windows
+
+
+ 1753061
+ fb120ce85b6698b801cb4788b204693c1d682b87
+ platform-tools_r20-linux.zip
+ linux
+
+
+ 1666257
+ f2c65c58caf76169d9bebf25eef5c69ff99670b5
+ platform-tools_r20-macosx.zip
+ macosx
+
+
+
+
+
+
+
+
+
+
+ 17
+ 0
+ 0
+
+
+
+ 11004914
+ 899897d327b0bad492d3a40d3db4d96119c15bc0
+ https://dl-ssl.google.com/android/repository/build-tools_r17-windows.zip
+ windows
+
+
+ 11696007
+ 2c2872bc3806aabf16a12e3959c2183ddc866e6d
+ https://dl-ssl.google.com/android/repository/build-tools_r17-linux.zip
+ linux
+
+
+ 12208114
+ 602ee709be9dbb8f179b1e4075148a57f9419930
+ https://dl-ssl.google.com/android/repository/build-tools_r17-macosx.zip
+ macosx
+
+
+
+
+
+
+
+
+
+
+ 18
+ 0
+ 1
+
+
+
+ 15413527
+ a6c2afd0b6289d589351956d2f5212b37014ca7d
+ https://dl-ssl.google.com/android/repository/build-tools_r18.0.1-windows.zip
+ windows
+
+
+ 16627330
+ f11618492b0d2270c332325d45d752d3656a9640
+ https://dl-ssl.google.com/android/repository/build-tools_r18.0.1-linux.zip
+ linux
+
+
+ 16633121
+ d84f5692fb44d60fc53e5b2507cebf9f24626902
+ https://dl-ssl.google.com/android/repository/build-tools_r18.0.1-macosx.zip
+ macosx
+
+
+
+
+
+
+
+
+ 18
+ 1
+ 0
+
+
+
+ 19659547
+ 3a9810fc8559ab03c09378f07531e8cae2f1db30
+ https://dl-ssl.google.com/android/repository/build-tools_r18.1-windows.zip
+ windows
+
+
+ 20229298
+ f314a0599e51397f0886fe888b50dd98f2f050d8
+ https://dl-ssl.google.com/android/repository/build-tools_r18.1-linux.zip
+ linux
+
+
+ 20451524
+ 16ddb299b8b43063e5bb3387ec17147c5053dfd8
+ https://dl-ssl.google.com/android/repository/build-tools_r18.1-macosx.zip
+ macosx
+
+
+
+
+
+
+
+
+ 18
+ 1
+ 1
+
+
+
+ 19660000
+ c4605066e2f851387ea70bc1442b1968bd7b4a15
+ https://dl-ssl.google.com/android/repository/build-tools_r18.1.1-windows.zip
+ windows
+
+
+ 20229760
+ 68c9acbfc0cec2d51b19efaed39831a17055d998
+ https://dl-ssl.google.com/android/repository/build-tools_r18.1.1-linux.zip
+ linux
+
+
+ 20452157
+ a9d9d37f6ddf859e57abc78802a77aaa166e48d4
+ https://dl-ssl.google.com/android/repository/build-tools_r18.1.1-macosx.zip
+ macosx
+
+
+
+
+
+
+
+
+ 19
+ 0
+ 0
+
+
+
+ 20611447
+ 6edf505c20f5ece9c48fa0aff9a90488f9654d52
+ https://dl-ssl.google.com/android/repository/build-tools_r19-windows.zip
+ windows
+
+
+ 21339943
+ 55c1a6cf632e7d346f0002b275ec41fd3137fd83
+ https://dl-ssl.google.com/android/repository/build-tools_r19-linux.zip
+ linux
+
+
+ 21441270
+ 86ec1c12db1bc446b7bcaefc5cc14eb361044e90
+ https://dl-ssl.google.com/android/repository/build-tools_r19-macosx.zip
+ macosx
+
+
+
+
+
+
+
+
+ 19
+ 0
+ 1
+
+
+
+ 20500648
+ 5ef422bac5b28f4ced108319ed4a6bc7050a6234
+ https://dl-ssl.google.com/android/repository/build-tools_r19.0.1-windows.zip
+ windows
+
+
+ 21229048
+ 18d2312dc4368858914213087f4e61445aca4517
+ https://dl-ssl.google.com/android/repository/build-tools_r19.0.1-linux.zip
+ linux
+
+
+ 21450597
+ efaf50fb19a3edb8d03efbff76f89a249ad2920b
+ https://dl-ssl.google.com/android/repository/build-tools_r19.0.1-macosx.zip
+ macosx
+
+
+
+
+
+
+
+
+ 19
+ 0
+ 2
+
+
+
+ 20621117
+ af664672d0d709c9ae30937b1062317d3ade7f95
+ https://dl-ssl.google.com/android/repository/build-tools_r19.0.2-windows.zip
+ windows
+
+
+ 21352552
+ a03a6bdea0091aea32e1b35b90a7294c9f04e3dd
+ https://dl-ssl.google.com/android/repository/build-tools_r19.0.2-linux.zip
+ linux
+
+
+ 21453726
+ 145bc43065d45f756d99d87329d899052b9a9288
+ https://dl-ssl.google.com/android/repository/build-tools_r19.0.2-macosx.zip
+ macosx
+
+
+
+
+
+
+
+
+ 19
+ 0
+ 3
+
+
+
+ 20730715
+ cb46b433b67a0a6910ff00db84be8b527ea3102f
+ https://dl-ssl.google.com/android/repository/build-tools_r19.0.3-windows.zip
+ windows
+
+
+ 21462150
+ c2d6055478e9d2d4fba476ee85f99181ddd1160c
+ https://dl-ssl.google.com/android/repository/build-tools_r19.0.3-linux.zip
+ linux
+
+
+ 21563992
+ 651cf8754373b2d52e7f6aab2c52eabffe4e9ea4
+ https://dl-ssl.google.com/android/repository/build-tools_r19.0.3-macosx.zip
+ macosx
+
+
+
+
+
+
+
+
+ 19
+ 1
+ 0
+
+
+
+ 20812533
+ 13b367fbdbff8132cb4356f716e8dc8a8df745c5
+ https://dl-ssl.google.com/android/repository/build-tools_r19.1-windows.zip
+ windows
+
+
+ 21490972
+ 1ff20ac15fa47a75d00346ec12f180d531b3ca89
+ https://dl-ssl.google.com/android/repository/build-tools_r19.1-linux.zip
+ linux
+
+
+ 21590160
+ 0d11aae3417de1efb4b9a0e0a7855904a61bcec1
+ https://dl-ssl.google.com/android/repository/build-tools_r19.1-macosx.zip
+ macosx
+
+
+
+
+
+
+
+
+ 20
+ 0
+ 0
+
+
+
+ 20828006
+ cf20720e452b642d5eb59dabe05c0c729b36ec75
+ build-tools_r20-windows.zip
+ windows
+
+
+ 21445463
+ b688905526a5584d1327a662d871a635ff502758
+ build-tools_r20-linux.zip
+ linux
+
+
+ 21650508
+ 1240f629411c108a714c4ddd756937c7fab93f83
+ build-tools_r20-macosx.zip
+ macosx
+
+
+
+
+
+
+
+
+
+
+ 23
+ 0
+ 2
+
+
+ 20
+
+
+
+ 141154615
+ 0a64ec9b7777bb00ff299c94c359163ef5e443ae
+ tools_r23.0.2-windows.zip
+ windows
+
+
+ 141930870
+ e8a2d55d750adeaded60a3daad48e62b09aa472a
+ tools_r23.0.2-linux.zip
+ linux
+
+
+ 90920343
+ c46b1e173188ba82a56d6b9e349fdae4e8922bab
+ tools_r23.0.2-macosx.zip
+ macosx
+
+
+
+
+
+
+
+
+
+ 1
+ 20
+ L
+
+
+ 207889084
+ 58a94248c7c960829db3d779c84534e5e783210f
+ docs-L_r01.zip
+
+
+
+
+
+
+
+
+
+ 1
+ 14
+
+
+ 16152383
+ eaf4ed7dcac46e68516a1b4aa5b0d9e5a39a7555
+ https://dl-ssl.google.com/android/repository/sources-14_r01.zip
+
+
+
+
+
+
+
+ 2
+ 15
+
+
+ 16468746
+ e5992a5747c9590783fbbdd700337bf0c9f6b1fa
+ https://dl-ssl.google.com/android/repository/sources-15_r02.zip
+
+
+
+
+
+
+
+ 2
+ 16
+
+
+ 17876720
+ 0f83c14ed333c45d962279ab5d6bc98a0269ef84
+ https://dl-ssl.google.com/android/repository/sources-16_r02.zip
+
+
+
+
+
+
+
+ 1
+ 17
+
+
+ 18976816
+ 6f1f18cd2d2b1852d7f6892df9cee3823349d43a
+ https://dl-ssl.google.com/android/repository/sources-17_r01.zip
+
+
+
+
+
+
+
+ 1
+ 18
+
+
+ 20226735
+ 8b49fdf7433f4881a2bfb559b5dd05d8ec65fb78
+ https://dl-ssl.google.com/android/repository/sources-18_r01.zip
+
+
+
+
+
+
+
+ 2
+ 19
+
+
+ 21819439
+ 433a1d043ef77561571250e94cb7a0ef24a202e7
+ https://dl-ssl.google.com/android/repository/sources-19_r02.zip
+
+
+
+
+
+
+
+ 1
+ 20
+
+
+ 23367603
+ 8da3e40f2625f9f7ef38b7e403f49f67226c0d76
+ sources-20_r01.zip
+
+
+
+
+
+
diff --git a/pkgs/development/mobile/androidenv/repository-8.xml b/pkgs/development/mobile/androidenv/repository-8.xml
deleted file mode 100644
index 46ae8aa9a7c..00000000000
--- a/pkgs/development/mobile/androidenv/repository-8.xml
+++ /dev/null
@@ -1,1277 +0,0 @@
-
-
-
-
- Terms and Conditions
-
-This is the Android Software Development Kit License Agreement.
-
-
-1. Introduction
-
-
-1.1 The Android Software Development Kit (referred to in this License Agreement as the "SDK" and specifically including the Android system files, packaged APIs, and Google APIs add-ons) is licensed to you subject to the terms of this License Agreement. This License Agreement forms a legally binding contract between you and Google in relation to your use of the SDK.
-
-1.2 "Android" means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time.
-
-1.3 "Google" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.
-
-
-2. Accepting this License Agreement
-
-
-2.1 In order to use the SDK, you must first agree to this License Agreement. You may not use the SDK if you do not accept this License Agreement.
-
-2.2 By clicking to accept, you hereby agree to the terms of this License Agreement.
-
-2.3 You may not use the SDK and may not accept the License Agreement if you are a person barred from receiving the SDK under the laws of the United States or other countries including the country in which you are resident or from which you use the SDK.
-
-2.4 If you are agreeing to be bound by this License Agreement on behalf of your employer or other entity, you represent and warrant that you have full legal authority to bind your employer or such entity to this License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the SDK on behalf of your employer or other entity.
-
-
-3. SDK License from Google
-
-
-3.1 Subject to the terms of this License Agreement, Google grants you a limited, worldwide, royalty-free, non-assignable and non-exclusive license to use the SDK solely to develop applications to run on the Android platform.
-
-3.2 You agree that Google or third parties own all legal right, title and interest in and to the SDK, including any Intellectual Property Rights that subsist in the SDK. "Intellectual Property Rights" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you.
-
-3.3 You may not use the SDK for any purpose not expressly permitted by this License Agreement. Except to the extent required by applicable third party licenses, you may not: (a) copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK; or (b) load any part of the SDK onto a mobile handset or any other hardware device except a personal computer, combine any part of the SDK with other software, or distribute any software or device incorporating a part of the SDK.
-
-3.4 You agree that you will not take any actions that may cause or result in the fragmentation of Android, including but not limited to distributing, participating in the creation of, or promoting in any way a software development kit derived from the SDK.
-
-3.5 Use, reproduction and distribution of components of the SDK licensed under an open source software license are governed solely by the terms of that open source software license and not this License Agreement.
-
-3.6 You agree that the form and nature of the SDK that Google provides may change without prior notice to you and that future versions of the SDK may be incompatible with applications developed on previous versions of the SDK. You agree that Google may stop (permanently or temporarily) providing the SDK (or any features within the SDK) to you or to users generally at Google's sole discretion, without prior notice to you.
-
-3.7 Nothing in this License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features.
-
-3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the SDK.
-
-
-4. Use of the SDK by You
-
-
-4.1 Google agrees that it obtains no right, title or interest from you (or your licensors) under this License Agreement in or to any software applications that you develop using the SDK, including any intellectual property rights that subsist in those applications.
-
-4.2 You agree to use the SDK and write applications only for purposes that are permitted by (a) this License Agreement and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries).
-
-4.3 You agree that if you use the SDK to develop applications for general public users, you will protect the privacy and legal rights of those users. If the users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If the user provides your application with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, the user has given you permission to do so.
-
-4.4 You agree that you will not engage in any activity with the SDK, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of any third party including, but not limited to, Google or any mobile communications carrier.
-
-4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through Android and/or applications for Android, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so.
-
-4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under this License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach.
-
-
-5. Your Developer Credentials
-
-
-5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials.
-
-
-6. Privacy and Information
-
-
-6.1 In order to continually innovate and improve the SDK, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the SDK are being used and how they are being used. Before any of this information is collected, the SDK will notify you and seek your consent. If you withhold consent, the information will not be collected.
-
-6.2 The data collected is examined in the aggregate to improve the SDK and is maintained in accordance with Google's Privacy Policy.
-
-
-7. Third Party Applications
-
-
-7.1 If you use the SDK to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources.
-
-7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners.
-
-7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party. In that case, this License Agreement does not affect your legal relationship with these third parties.
-
-
-8. Using Android APIs
-
-
-8.1 Google Data APIs
-
-8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service.
-
-8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so.
-
-
-9. Terminating this License Agreement
-
-
-9.1 This License Agreement will continue to apply until terminated by either you or Google as set out below.
-
-9.2 If you want to terminate this License Agreement, you may do so by ceasing your use of the SDK and any relevant developer credentials.
-
-9.3 Google may at any time, terminate this License Agreement with you if:
-(A) you have breached any provision of this License Agreement; or
-(B) Google is required to do so by law; or
-(C) the partner with whom Google offered certain parts of SDK (such as APIs) to you has terminated its relationship with Google or ceased to offer certain parts of the SDK to you; or
-(D) Google decides to no longer provide the SDK or certain parts of the SDK to users in the country in which you are resident or from which you use the service, or the provision of the SDK or certain SDK services to you by Google is, in Google's sole discretion, no longer commercially viable.
-
-9.4 When this License Agreement comes to an end, all of the legal rights, obligations and liabilities that you and Google have benefited from, been subject to (or which have accrued over time whilst this License Agreement has been in force) or which are expressed to continue indefinitely, shall be unaffected by this cessation, and the provisions of paragraph 14.7 shall continue to apply to such rights, obligations and liabilities indefinitely.
-
-
-10. DISCLAIMER OF WARRANTIES
-
-
-10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE SDK IS AT YOUR SOLE RISK AND THAT THE SDK IS PROVIDED "AS IS" AND "AS AVAILABLE" WITHOUT WARRANTY OF ANY KIND FROM GOOGLE.
-
-10.2 YOUR USE OF THE SDK AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE SDK IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE.
-
-10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-
-
-11. LIMITATION OF LIABILITY
-
-
-11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING.
-
-
-12. Indemnification
-
-
-12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys fees) arising out of or accruing from (a) your use of the SDK, (b) any application you develop on the SDK that infringes any copyright, trademark, trade secret, trade dress, patent or other intellectual property right of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you with this License Agreement.
-
-
-13. Changes to the License Agreement
-
-
-13.1 Google may make changes to the License Agreement as it distributes new versions of the SDK. When these changes are made, Google will make a new version of the License Agreement available on the website where the SDK is made available.
-
-
-14. General Legal Terms
-
-
-14.1 This License Agreement constitutes the whole legal agreement between you and Google and governs your use of the SDK (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the SDK.
-
-14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in this License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google.
-
-14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of this License Agreement is invalid, then that provision will be removed from this License Agreement without affecting the rest of this License Agreement. The remaining provisions of this License Agreement will continue to be valid and enforceable.
-
-14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to this License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of this License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to this License Agreement.
-
-14.5 EXPORT RESTRICTIONS. THE SDK IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE SDK. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE.
-
-14.6 The rights granted in this License Agreement may not be assigned or transferred by either you or Google without the prior written approval of the other party. Neither you nor Google shall be permitted to delegate their responsibilities or obligations under this License Agreement without the prior written approval of the other party.
-
-14.7 This License Agreement, and your relationship with Google under this License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from this License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.
-
-November 13, 2012
-
-
-
-
-
- 1.1
- 2
- 1
- Android SDK Platform 1.1_r1
- http://developer.android.com/sdk/android-1.1.html
-
-
-
- 46828615
- a4060f29ed39fc929c302836d488998c53c3002e
- android-1.1_r1-windows.zip
-
-
- 45584305
- e21dbcff45b7356657449ebb3c7e941be2bb5ebe
- android-1.1_r1-macosx.zip
-
-
- 45476658
- c054d25c9b4c6251fa49c2f9c54336998679d3fe
- android-1.1_r1-linux.zip
-
-
-
- 4
-
-
-
-
-
-
-
- 1.5
- 3
- 04
-
- 6
-
- Android SDK Platform 1.5_r3
- http://developer.android.com/sdk/android-1.5.html
-
-
- 54624370
- 5bb106d2e40d481edd337b0833093843e15fe49a
- android-1.5_r04-windows.zip
-
-
- 52440607
- d3a67c2369afa48b6c3c7624de5031c262018d1e
- android-1.5_r04-macosx.zip
-
-
- 53348669
- 5c134b7df5f4b8bd5b61ba93bdaebada8fa3468c
- android-1.5_r04-linux.zip
-
-
-
- 4
-
-
-
-
-
- 1.6
- 4
-
- 03
-
- 6
-
- Android SDK Platform 1.6_r2
- http://developer.android.com/sdk/android-1.6.html
-
-
- 63454485
- 483ed088e45bbdf3444baaf9250c8b02e5383cb0
- android-1.6_r03-linux.zip
-
-
- 62418496
- bdafad44f5df9f127979bdb21a1fdd87ee3cd625
- android-1.6_r03-macosx.zip
-
-
- 64654625
- ce0b5e4ffaf12ca4fd07c2da71a8a1ab4a03dc22
- android-1.6_r03-windows.zip
-
-
-
- 4
-
-
-
-
-
-
-
- 2.0
- 5
-
- 01
-
- 3
-
- Android SDK Platform 2.0, revision 1
- http://developer.android.com/sdk/android-2.0.html
-
-
-
- 75095268
- be9be6a99ca32875c96ec7f91160ca9fce7e3c7d
- android-2.0_r01-linux.zip
-
-
- 74956356
- 2a866d0870dbba18e0503cd41e5fae988a21b314
- android-2.0_r01-macosx.zip
-
-
- 76288040
- aeb623217ff88b87216d6eb7dbc846ed53f68f57
- android-2.0_r01-windows.zip
-
-
-
- 4
-
-
-
-
-
-
-
- 2.0.1
- 6
-
- 01
-
- 4
-
- Android SDK Platform 2.0.1_r1
- http://developer.android.com/sdk/android-2.0.1.html
-
-
-
- 79192618
- ce2c971dce352aa28af06bda92a070116aa5ae1a
- android-2.0.1_r01-linux.zip
-
-
- 79035527
- c3096f80d75a6fc8cb38ef8a18aec920e53d42c0
- android-2.0.1_r01-macosx.zip
-
-
- 80385601
- 255781ebe4509d9707d0e77edda2815e2bc216e6
- android-2.0.1_r01-windows.zip
-
-
-
- 4
-
-
-
-
-
-
-
- 2.1
- 7
-
- 03
-
- 8
-
- Android SDK Platform 2.1_r3
- http://developer.android.com/sdk/
-
-
- 70142829
- 5ce51b023ac19f8738500b1007a1da5de2349a1e
- android-2.1_r03-linux.zip
-
-
-
- 4
-
-
-
-
-
-
-
- 2.2
- 8
-
- 03
-
- 8
-
- Android SDK Platform 2.2_r3
- http://developer.android.com/sdk/
-
-
- 74652366
- 231262c63eefdff8fd0386e9ccfefeb27a8f9202
- android-2.2_r03-linux.zip
-
-
-
- 4
-
-
-
-
-
-
-
- 2.3.1
- 9
-
- 02
-
- 8
-
- Android SDK Platform 2.3.1_r2
- http://developer.android.com/sdk/
-
-
-
- 78732563
- 209f8a7a8b2cb093fce858b8b55fed3ba5206773
- android-2.3.1_r02-linux.zip
-
-
-
- 4
-
-
-
-
-
-
-
- 2.3.3
- 10
-
- 02
-
- 8
-
- Android SDK Platform 2.3.3._r2
- http://developer.android.com/sdk/
-
-
- 85470907
- 887e37783ec32f541ea33c2c649dda648e8e6fb3
- android-2.3.3_r02-linux.zip
-
-
-
- 4
-
-
-
-
-
-
-
- 3.0
- 11
-
- 02
-
- 10
-
- Android SDK Platform 3.0, revision 2
- http://developer.android.com/sdk/
-
-
- 104513908
- 2c7d4bd13f276e76f6bbd87315fe27aba351dd37
- android-3.0_r02-linux.zip
-
-
-
- 4
-
-
-
-
-
-
-
- 3.1
- 12
-
- 03
-
- 11
-
- Android SDK Platform 3.1, revision 3
- http://developer.android.com/sdk/
-
-
- 106472351
- 4a50a6679cd95bb68bb5fc032e754cd7c5e2b1bf
- android-3.1_r03-linux.zip
-
-
-
- 4
-
-
-
-
-
-
-
- 3.2
- 13
-
- 01
-
- 12
-
- Android SDK Platform 3.2, revision 1
- http://developer.android.com/sdk/
-
-
- 108426536
- 6189a500a8c44ae73a439604363de93591163cd9
- android-3.2_r01-linux.zip
-
-
-
- 4
-
-
-
-
-
-
- 3
- Android SDK Platform 4.0
- 4.0
- 14
-
- 7
- 1
-
-
-
- 45919570
- 41ba83b51e886461628c41b1b4d47762e0688ed5
- android-14_r03.zip
-
-
-
-
-
-
-
- 3
- Android SDK Platform 4.0.3
- 4.0.3
- 15
-
- 15
-
-
- 7
- 1
-
-
-
- 44414679
- 23da24610a8da51054c5391001c51ce43a778b97
- android-15_r03.zip
-
-
-
-
-
-
-
- 4
- Android SDK Platform 4.1.2
- 4.1.2
- 16
-
- 21
-
-
- 9
- 1
-
-
-
- 48005140
- 90b9157b8b45f966be97e11a22fba4591b96c2ee
- android-16_r04.zip
-
-
-
-
-
-
-
- 2
- Android SDK Platform 4.2.2
- 4.2.2
- 17
-
- 21
-
-
- 9
- 1
-
-
-
- 48057484
- c442c32c1b702173ab0929a74486e4f86fe528ec
- android-17_r02.zip
-
-
-
-
-
-
-
- 2
- Android SDK Platform 4.3
- 4.3
- 18
-
- 21
-
-
- 10
- 1
-
-
-
- 57319855
- 62a9438d4cf6692f4d6510c27a380be195db9534
- android-18_r02.zip
-
-
-
-
-
-
-
- 1
- Android SDK Platform 4.4
- 4.4
- 19
-
- 22
-
-
- 10
- 1
-
-
-
- 59279956
- 96281811998272dce46e8285d15fce444a3d5a96
- android-19_r01.zip
-
-
-
-
-
-
-
-
-
-
- 2
- Android SDK Platform 4.0
- 14
- armeabi-v7a
-
-
- 99621822
- d8991b0c06b18d7d6ed4169d67460ee1add6661b
- sysimg_armv7a-14_r02.zip
-
-
-
-
-
-
-
- 2
- Android SDK Platform 4.0.3
- 15
- armeabi-v7a
-
-
- 96227377
- 1bf977d6cb4e0ad38dceac0c4863d1caa21f326e
- sysimg_armv7a-15_r02.zip
-
-
-
-
-
-
-
- 3
- Android SDK Platform 4.1
- 16
- armeabi-v7a
-
-
- 112528368
- d1cddb23f17aad5821a089c403d4cddad2cf9ef7
- sysimg_armv7a-16_r03.zip
-
-
-
-
-
-
-
- 2
- Android SDK Platform 4.2.2
- 17
- armeabi-v7a
-
-
- 116553808
- 1c321cda1af793b84d47d1a8d15f85444d265e3c
- sysimg_armv7a-17_r02.zip
-
-
-
-
-
-
-
- 2
- Android SDK Platform 4.3
- 18
- armeabi-v7a
-
-
- 125457135
- 4a1a93200210d8c42793324362868846f67401ab
- sysimg_armv7a-18_r02.zip
-
-
-
-
-
-
-
- 1
- Android SDK Platform 4.4
- 19
- armeabi-v7a
-
-
- 155838103
- 12dd1187dfd953b1ffcef5067d94578590f9e600
- sysimg_armv7a-19_r01.zip
-
-
-
-
-
-
-
-
-
-
-
- 7
-
- 01
- Android SDK Samples for Android API 7, revision 1
- http://developer.android.com/sdk/
-
-
- 7677831
- 51e4907f60f248ede5c58b54ce7b6ae0b473e0ca
- samples-2.1_r01-linux.zip
-
-
-
-
-
-
-
-
- 8
-
- 01
- Android SDK Samples for Android API 8, revision 1
- http://developer.android.com/sdk/
-
-
- 7969716
- d16d8bf2dd84cedf73b98b948d66461c8f19d6fb
- samples-2.2_r01-linux.zip
-
-
-
-
-
-
-
-
- 9
-
- 01
- Android SDK Samples for Android API 9, revision 1
- http://developer.android.com/sdk/
-
-
-
- 8516326
- 36f7dd6c8b5dbb50b3cf3e3ac5209f3fe55db2aa
- samples-2.3_r01-linux.zip
-
-
-
-
-
-
-
-
- 10
-
- 01
- Android SDK Samples for Android API 10, revision 1
- http://developer.android.com/sdk/
-
-
- 8539583
- 93b0c3f3bdf5b07f1f115100b4954f0665297a0d
- samples-2.3.3_r01-linux.zip
-
-
-
-
-
-
-
-
- 11
-
- 01
- Android SDK Samples for Android API 11, revision 1
- http://developer.android.com/sdk/
-
-
- 11976920
- 3749ace584631270268d65bb1d0ad61b0d691682
- samples-3.0_r01-linux.zip
-
-
-
-
-
-
-
-
- 12
-
- 01
- Android SDK Samples for Android API 12, revision 1
- http://developer.android.com/sdk/
-
-
- 12150514
- df0ace37cbca73373fe94080f94c71557cac73a7
- samples-3.1_r01-linux.zip
-
-
-
-
-
-
-
-
- 13
-
- 01
- Android SDK Samples for Android API 13, revision 1
- http://developer.android.com/sdk/
-
-
- 12193502
- 078bcf1abc1cb8921f3fa482c252963a782bed60
- samples-3.2_r01-linux.zip
-
-
-
-
-
-
-
- 2
- 14
-
-
- 16253619
- 1312c22ab0b650e26835cc3945d4ff8cea183416
- samples-14_r02.zip
-
-
-
-
-
-
-
- 2
- 15
-
-
- 16366656
- 042f368c5b09eca4d278264e6dbf9c12c5f73d1f
- samples-15_r02.zip
-
-
-
-
-
-
-
- 1
- 16
-
-
- 14729945
- dce3a2d41db50a381ef47ee8bddbe928520e685e
- samples-16_r01.zip
-
-
-
-
-
-
-
- 1
- 17
-
-
- 14840030
- 12d58cb26503610fc05bd7618c434cc6f983bc41
- samples-17_r01.zip
-
-
-
-
-
-
-
- 1
- 18
-
-
- 19897793
- 73e879ce46c04a6e63ad1a9107018b4782945007
- samples-18_r01.zip
-
-
-
-
-
-
-
- 1
- 19
-
-
- 20697510
- c2007694b5e5ad6737f647db8160155d5258cb7f
- samples-19_r01.zip
-
-
-
-
-
-
-
-
-
-
- 19
- 0
- 0
-
-
-
- 1116358
- 755dcb5b5b72bbca90dd055eec4c8d0b1fce7cfd
- platform-tools_r19-windows.zip
-
-
- 1172749
- 66ee37daf8a2a8f1aa8939ccd4093658e30aa49b
- platform-tools_r19-linux.zip
-
-
- 1120849
- 69af30f488163dfc3da8cef1bb6cc7e8a6df5681
- platform-tools_r19-macosx.zip
-
-
-
-
-
-
-
-
-
-
- 17
- 0
- 0
-
-
-
- 11004914
- 899897d327b0bad492d3a40d3db4d96119c15bc0
- build-tools_r17-windows.zip
-
-
- 11696007
- 2c2872bc3806aabf16a12e3959c2183ddc866e6d
- build-tools_r17-linux.zip
-
-
- 12208114
- 602ee709be9dbb8f179b1e4075148a57f9419930
- build-tools_r17-macosx.zip
-
-
-
-
-
-
-
-
-
-
- 18
- 0
- 1
-
-
-
- 15413527
- a6c2afd0b6289d589351956d2f5212b37014ca7d
- build-tools_r18.0.1-windows.zip
-
-
- 16627330
- f11618492b0d2270c332325d45d752d3656a9640
- build-tools_r18.0.1-linux.zip
-
-
- 16633121
- d84f5692fb44d60fc53e5b2507cebf9f24626902
- build-tools_r18.0.1-macosx.zip
-
-
-
-
-
-
-
-
- 18
- 1
- 0
-
-
-
- 19659547
- 3a9810fc8559ab03c09378f07531e8cae2f1db30
- build-tools_r18.1-windows.zip
-
-
- 20229298
- f314a0599e51397f0886fe888b50dd98f2f050d8
- build-tools_r18.1-linux.zip
-
-
- 20451524
- 16ddb299b8b43063e5bb3387ec17147c5053dfd8
- build-tools_r18.1-macosx.zip
-
-
-
-
-
-
-
-
- 18
- 1
- 1
-
-
-
- 19660000
- c4605066e2f851387ea70bc1442b1968bd7b4a15
- build-tools_r18.1.1-windows.zip
-
-
- 20229760
- 68c9acbfc0cec2d51b19efaed39831a17055d998
- build-tools_r18.1.1-linux.zip
-
-
- 20452157
- a9d9d37f6ddf859e57abc78802a77aaa166e48d4
- build-tools_r18.1.1-macosx.zip
-
-
-
-
-
-
-
-
- 19
- 0
- 0
-
-
-
- 20611447
- 6edf505c20f5ece9c48fa0aff9a90488f9654d52
- build-tools_r19-windows.zip
-
-
- 21339943
- 55c1a6cf632e7d346f0002b275ec41fd3137fd83
- build-tools_r19-linux.zip
-
-
- 21441270
- 86ec1c12db1bc446b7bcaefc5cc14eb361044e90
- build-tools_r19-macosx.zip
-
-
-
-
-
-
-
-
-
-
- 22
- 3
-
-
- 18
-
-
-
- 108726734
- 1cdc825c9a84ccf69b4a6386076a881d962dd7a9
- tools_r22.3-windows.zip
-
-
- 101224750
- f76251916a23cb3d85e579f01cc6711a334f9064
- tools_r22.3-linux.zip
-
-
- 74859563
- 697d7f6fa44f02e6894d0eeb948ea97e3cdc8c3c
- tools_r22.3-macosx.zip
-
-
-
-
-
-
-
-
-
- 1
- 19
-
-
- 181765706
- 6c92bb045f75a2eabfbdc3e26ff64ce0a7a2b3fc
- docs-19_r01.zip
-
-
-
-
-
-
-
-
-
- 1
- 14
-
-
- 16152383
- eaf4ed7dcac46e68516a1b4aa5b0d9e5a39a7555
- sources-14_r01.zip
-
-
-
-
-
-
-
- 2
- 15
-
-
- 16468746
- e5992a5747c9590783fbbdd700337bf0c9f6b1fa
- sources-15_r02.zip
-
-
-
-
-
-
-
- 2
- 16
-
-
- 17876720
- 0f83c14ed333c45d962279ab5d6bc98a0269ef84
- sources-16_r02.zip
-
-
-
-
-
-
-
- 1
- 17
-
-
- 18976816
- 6f1f18cd2d2b1852d7f6892df9cee3823349d43a
- sources-17_r01.zip
-
-
-
-
-
-
-
- 1
- 18
-
-
- 20226735
- 8b49fdf7433f4881a2bfb559b5dd05d8ec65fb78
- sources-18_r01.zip
-
-
-
-
-
-
-
- 1
- 19
-
-
- 21656670
- 91d9f5f4117723eecc4434b7de0e7f6295ea0508
- sources-19_r01.zip
-
-
-
-
-
diff --git a/pkgs/development/mobile/androidenv/support-repository.nix b/pkgs/development/mobile/androidenv/support-repository.nix
new file mode 100644
index 00000000000..66a532328b1
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/support-repository.nix
@@ -0,0 +1,17 @@
+{stdenv, fetchurl, unzip}:
+
+stdenv.mkDerivation {
+ name = "android-support-repository-r5";
+ src = fetchurl {
+ url = http://dl-ssl.google.com/android/repository/android_m2repository_r05.zip;
+ sha1 = "2ee9723da079ba0d4fe2a185e00ded842de96f13";
+ };
+
+ buildCommand = ''
+ mkdir -p $out
+ cd $out
+ unzip $src
+ '';
+
+ buildInputs = [ unzip ];
+}
diff --git a/pkgs/development/mobile/androidenv/sys-img-mips.xml b/pkgs/development/mobile/androidenv/sys-img-mips.xml
deleted file mode 100644
index c839d283f4e..00000000000
--- a/pkgs/development/mobile/androidenv/sys-img-mips.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-
-
-
-
-
-
-
-
-
- 1
- Android 4.0.4
- 15
- mips
-
-
-
- 117503178
- a753bb4a6783124dad726c500ce9aec9d2c1b2d9
- sysimg_mips-15_r01.zip
-
-
-
-
-
- 4
-
- Android 4.1.2
- 16
- mips
-
-
-
- 122482530
- 67943c54fb3943943ffeb05fdd39c0b753681f6e
- sysimg_mips-16_r04.zip
-
-
-
-
-
- 1
-
- Android 4.2.1
- 17
- mips
-
-
-
- 131781761
- f0c6e153bd584c29e51b5c9723cfbf30f996a05d
- sysimg_mips-17_r01.zip
-
-
-
-
-
diff --git a/pkgs/development/mobile/androidenv/sys-img-x86.xml b/pkgs/development/mobile/androidenv/sys-img-x86.xml
deleted file mode 100644
index 75ddf73eb1d..00000000000
--- a/pkgs/development/mobile/androidenv/sys-img-x86.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- Android SDK Platform 2.3.7
- 2
- 10
- x86
-
-
-
- 55463895
- 34e2436f69606cdfe35d3ef9112f0c64e3ff021d
- sysimg_x86-10_r02.zip
-
-
-
-
-
- Android SDK Platform 4.0.4
- 1
- 15
- x86
-
-
-
- 112619605
- d540325952e0f097509622b9e685737584b83e40
- sysimg_x86-15_r01.zip
-
-
-
-
-
- Android SDK Platform 4.1.1
- 1
- 16
- x86
-
-
-
- 131840348
- 9d35bcaa4f9b40443941f32b8a50337f413c021a
- sysimg_x86-16_r01.zip
-
-
-
-
-
- Android SDK Platform 4.2
- 1
- 17
- x86
-
-
-
- 138799122
- ddb3313e8dcd07926003f7b828eafea1115ea35b
- sysimg_x86-17_r01.zip
-
-
-
-
-
- Android SDK Platform 4.3
- 1
- 18
- x86
-
-
-
- 155656419
- f11bc9fccd3e7e46c07d8b26e112a8d0b45966c1
- sysimg_x86-18_r01.zip
-
-
-
-
-
diff --git a/pkgs/development/mobile/androidenv/sys-img.xml b/pkgs/development/mobile/androidenv/sys-img.xml
new file mode 100644
index 00000000000..5d2b0f7a883
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/sys-img.xml
@@ -0,0 +1,712 @@
+
+
+
+
+ To get started with the Android SDK, you must agree to the following terms and conditions.
+
+This is the Android SDK License Agreement (the "License Agreement").
+
+1. Introduction
+
+1.1 The Android SDK (referred to in the License Agreement as the "SDK" and specifically including the Android system files, packaged APIs, and SDK library files and tools , if and when they are made available) is licensed to you subject to the terms of the License Agreement. The License Agreement forms a legally binding contract between you and Google in relation to your use of the SDK.
+
+1.2 "Android" means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time.
+
+1.3 "Google" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.
+
+2. Accepting the License Agreement
+
+2.1 In order to use the SDK, you must first agree to the License Agreement. You may not use the SDK if you do not accept the License Agreement.
+
+2.2 By clicking to accept and/or using the SDK, you hereby agree to the terms of the License Agreement.
+
+2.3 You may not use the SDK and may not accept the License Agreement if you are a person barred from receiving the SDK under the laws of the United States or other countries including the country in which you are resident or from which you use the SDK.
+
+2.4 If you will use the SDK internally within your company or organization you agree to be bound by the License Agreement on behalf of your employer or other entity, and you represent and warrant that you have full legal authority to bind your employer or such entity to the License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the SDK on behalf of your employer or other entity.
+
+3. SDK License from Google
+
+3.1 Subject to the terms of the License Agreement, Google grants you a royalty-free, non-assignable, non-exclusive, non-sublicensable, limited, revocable license to use the SDK, personally or internally within your company or organization, solely to develop and distribute applications to run on the Android platform.
+
+3.2 You agree that Google or third parties own all legal right, title and interest in and to the SDK, including any Intellectual Property Rights that subsist in the SDK. "Intellectual Property Rights" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you.
+
+3.3 You may not use the SDK for any purpose not expressly permitted by the License Agreement. Except to the extent required by applicable third party licenses, you may not: (a) copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK; or (b) load any part of the SDK onto a mobile handset or any other hardware device except a personal computer, combine any part of the SDK with other software, or distribute any software or device incorporating a part of the SDK.
+
+3.4 You agree that you will not take any actions that may cause or result in the fragmentation of Android, including but not limited to distributing, participating in the creation of, or promoting in any way a software development kit derived from the SDK.
+
+3.5 Use, reproduction and distribution of components of the SDK licensed under an open source software license are governed solely by the terms of that open source software license and not the License Agreement. You agree to remain a licensee in good standing in regard to such open source software licenses under all the rights granted and to refrain from any actions that may terminate, suspend, or breach such rights.
+
+3.6 You agree that the form and nature of the SDK that Google provides may change without prior notice to you and that future versions of the SDK may be incompatible with applications developed on previous versions of the SDK. You agree that Google may stop (permanently or temporarily) providing the SDK (or any features within the SDK) to you or to users generally at Google's sole discretion, without prior notice to you.
+
+3.7 Nothing in the License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features.
+
+3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the SDK.
+
+4. Use of the SDK by You
+
+4.1 Google agrees that nothing in the License Agreement gives Google any right, title or interest from you (or your licensors) under the License Agreement in or to any software applications that you develop using the SDK, including any intellectual property rights that subsist in those applications.
+
+4.2 You agree to use the SDK and write applications only for purposes that are permitted by (a) the License Agreement, and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries).
+
+4.3 You agree that if you use the SDK to develop applications, you will protect the privacy and legal rights of users. If users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If users provide you with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, each user has given you permission to do so.
+
+4.4 You agree that you will not engage in any activity with the SDK, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of Google or any third party.
+
+4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through Android and/or applications for Android, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so.
+
+4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under the License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach.
+
+5. Your Developer Credentials
+
+5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials.
+
+6. Privacy and Information
+
+6.1 In order to continually innovate and improve the SDK, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the SDK are being used and how they are being used. Before any of this information is collected, the SDK will notify you and seek your consent. If you withhold consent, the information will not be collected.
+
+6.2 The data collected is examined in the aggregate to improve the SDK and is maintained in accordance with Google's Privacy Policy located at http://www.google.com/policies/privacy/.
+
+7. Third Party Applications
+
+7.1 If you use the SDK to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources.
+
+7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners.
+
+7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party.
+
+8. Using Google APIs
+
+8.1 Google APIs
+
+8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service.
+
+8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so.
+
+9. Terminating the License Agreement
+
+9.1 The License Agreement will continue to apply until terminated by either you or Google as set out below.
+
+9.2 If you want to terminate the License Agreement, you may do so by ceasing your use of the SDK and any relevant developer credentials.
+
+9.3 Google may at any time, terminate the License Agreement, with or without cause, upon notice to you.
+
+9.4 The License Agreement will automatically terminate without notice or other action when Google ceases to provide the SDK or certain parts of the SDK to users in the country in which you are resident or from which you use the service.
+
+9.5 When the License Agreement is terminated, the license granted to you in the License Agreement will terminate, you will immediately cease all use of the SDK, and the provisions of paragraphs 10, 11, 12 and 14 shall survive indefinitely.
+
+10. DISCLAIMERS
+
+10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE SDK IS AT YOUR SOLE RISK AND THAT THE SDK IS PROVIDED "AS IS" AND "AS AVAILABLE" WITHOUT WARRANTY OF ANY KIND FROM GOOGLE.
+
+10.2 YOUR USE OF THE SDK AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE SDK IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE. WITHOUT LIMITING THE FOREGOING, YOU UNDERSTAND THAT THE SDK MAY CONTAIN ERRORS, DEFECTS AND SECURITY VULNERABILITIES THAT CAN RESULT IN SIGNIFICANT DAMAGE, INCLUDING THE COMPLETE, IRRECOVERABLE LOSS OF USE OF YOUR COMPUTER SYSTEM OR OTHER DEVICE.
+
+10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+
+11. LIMITATION OF LIABILITY
+
+11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING.
+
+12. Indemnification
+
+12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys’ fees) arising out of or accruing from (a) your use of the SDK, (b) any application you develop on the SDK that infringes any Intellectual Property Rights of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you of the License Agreement.
+
+13. Changes to the License Agreement
+
+13.1 Google may make changes to the License Agreement as it distributes new versions of the SDK. When these changes are made, Google will make a new version of the License Agreement available on the website where the SDK is made available.
+
+14. General Legal Terms
+
+14.1 The License Agreement constitutes the whole legal agreement between you and Google and governs your use of the SDK (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the SDK.
+
+14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in the License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google.
+
+14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of the License Agreement is invalid, then that provision will be removed from the License Agreement without affecting the rest of the License Agreement. The remaining provisions of the License Agreement will continue to be valid and enforceable.
+
+14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to the License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of the License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to the License Agreement.
+
+14.5 EXPORT RESTRICTIONS. THE SDK IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE SDK. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE.
+
+14.6 The License Agreement may not be assigned or transferred by you without the prior written approval of Google, and any attempted assignment without such approval will be void. You shall not delegate your responsibilities or obligations under the License Agreement without the prior written approval of Google.
+
+14.7 The License Agreement, and your relationship with Google under the License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from the License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.
+
+June 2014.
+
+
+ To get started with the Android SDK Preview, you must agree to the following terms and conditions.
+As described below, please note that this is a preview version of the Android SDK, subject to change, that you use at your own risk. The Android SDK Preview is not a stable release, and may contain errors and defects that can result in serious damage to your computer systems, devices and data.
+
+This is the Android SDK Preview License Agreement (the "License Agreement").
+
+1. Introduction
+
+1.1 The Android SDK Preview (referred to in the License Agreement as the “Preview” and specifically including the Android system files, packaged APIs, and Preview library files, if and when they are made available) is licensed to you subject to the terms of the License Agreement. The License Agreement forms a legally binding contract between you and Google in relation to your use of the Preview.
+
+1.2 "Android" means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time.
+
+1.3 "Google" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.
+
+2. Accepting the License Agreement
+
+2.1 In order to use the Preview, you must first agree to the License Agreement. You may not use the Preview if you do not accept the License Agreement.
+
+2.2 By clicking to accept and/or using the Preview, you hereby agree to the terms of the License Agreement.
+
+2.3 You may not use the Preview and may not accept the License Agreement if you are a person barred from receiving the Preview under the laws of the United States or other countries including the country in which you are resident or from which you use the Preview.
+
+2.4 If you will use the Preview internally within your company or organization you agree to be bound by the License Agreement on behalf of your employer or other entity, and you represent and warrant that you have full legal authority to bind your employer or such entity to the License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the Preview on behalf of your employer or other entity.
+
+3. Preview License from Google
+
+3.1 Subject to the terms of the License Agreement, Google grants you a royalty-free, non-assignable, non-exclusive, non-sublicensable, limited, revocable license to use the Preview, personally or internally within your company or organization, solely to develop applications to run on the Android platform.
+
+3.2 You agree that Google or third parties owns all legal right, title and interest in and to the Preview, including any Intellectual Property Rights that subsist in the Preview. "Intellectual Property Rights" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you.
+
+3.3 You may not use the Preview for any purpose not expressly permitted by the License Agreement. Except to the extent required by applicable third party licenses, you may not: (a) copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the Preview or any part of the Preview; or (b) load any part of the Preview onto a mobile handset or any other hardware device except a personal computer, combine any part of the Preview with other software, or distribute any software or device incorporating a part of the Preview.
+
+3.4 You agree that you will not take any actions that may cause or result in the fragmentation of Android, including but not limited to distributing, participating in the creation of, or promoting in any way a software development kit derived from the Preview.
+
+3.5 Use, reproduction and distribution of components of the Preview licensed under an open source software license are governed solely by the terms of that open source software license and not the License Agreement. You agree to remain a licensee in good standing in regard to such open source software licenses under all the rights granted and to refrain from any actions that may terminate, suspend, or breach such rights.
+
+3.6 You agree that the form and nature of the Preview that Google provides may change without prior notice to you and that future versions of the Preview may be incompatible with applications developed on previous versions of the Preview. You agree that Google may stop (permanently or temporarily) providing the Preview (or any features within the Preview) to you or to users generally at Google's sole discretion, without prior notice to you.
+
+3.7 Nothing in the License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features.
+
+3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the Preview.
+
+4. Use of the Preview by You
+
+4.1 Google agrees that nothing in the License Agreement gives Google any right, title or interest from you (or your licensors) under the License Agreement in or to any software applications that you develop using the Preview, including any intellectual property rights that subsist in those applications.
+
+4.2 You agree to use the Preview and write applications only for purposes that are permitted by (a) the License Agreement, and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries).
+
+4.3 You agree that if you use the Preview to develop applications, you will protect the privacy and legal rights of users. If users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If users provide you with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, each user has given you permission to do so.
+
+4.4 You agree that you will not engage in any activity with the Preview, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of Google or any third party.
+
+4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through Android and/or applications for Android, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so.
+
+4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under the License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach.
+
+4.7 The Preview is in development, and your testing and feedback are an important part of the development process. By using the Preview, you acknowledge that implementation of some features are still under development and that you should not rely on the Preview having the full functionality of a stable release. You agree not to publicly distribute or ship any application using this Preview as this Preview will no longer be supported after the official Android SDK is released.
+
+5. Your Developer Credentials
+
+5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials.
+
+6. Privacy and Information
+
+6.1 In order to continually innovate and improve the Preview, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the Preview are being used and how they are being used. Before any of this information is collected, the Preview will notify you and seek your consent. If you withhold consent, the information will not be collected.
+
+6.2 The data collected is examined in the aggregate to improve the Preview and is maintained in accordance with Google's Privacy Policy located at http://www.google.com/policies/privacy/.
+
+7. Third Party Applications
+
+7.1 If you use the Preview to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources.
+
+7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners.
+
+7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party.
+
+8. Using Google APIs
+
+8.1 Google APIs
+
+8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service.
+
+8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so.
+
+9. Terminating the License Agreement
+
+9.1 the License Agreement will continue to apply until terminated by either you or Google as set out below.
+
+9.2 If you want to terminate the License Agreement, you may do so by ceasing your use of the Preview and any relevant developer credentials.
+
+9.3 Google may at any time, terminate the License Agreement, with or without cause, upon notice to you.
+
+9.4 The License Agreement will automatically terminate without notice or other action upon the earlier of:
+(A) when Google ceases to provide the Preview or certain parts of the Preview to users in the country in which you are resident or from which you use the service; and
+(B) Google issues a final release version of the Android SDK.
+
+9.5 When the License Agreement is terminated, the license granted to you in the License Agreement will terminate, you will immediately cease all use of the Preview, and the provisions of paragraphs 10, 11, 12 and 14 shall survive indefinitely.
+
+10. DISCLAIMERS
+
+10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE PREVIEW IS AT YOUR SOLE RISK AND THAT THE PREVIEW IS PROVIDED "AS IS" AND "AS AVAILABLE" WITHOUT WARRANTY OF ANY KIND FROM GOOGLE.
+
+10.2 YOUR USE OF THE PREVIEW AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE PREVIEW IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE. WITHOUT LIMITING THE FOREGOING, YOU UNDERSTAND THAT THE PREVIEW IS NOT A STABLE RELEASE AND MAY CONTAIN ERRORS, DEFECTS AND SECURITY VULNERABILITIES THAT CAN RESULT IN SIGNIFICANT DAMAGE, INCLUDING THE COMPLETE, IRRECOVERABLE LOSS OF USE OF YOUR COMPUTER SYSTEM OR OTHER DEVICE.
+
+10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+
+11. LIMITATION OF LIABILITY
+
+11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING.
+
+12. Indemnification
+
+12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys’ fees) arising out of or accruing from (a) your use of the Preview, (b) any application you develop on the Preview that infringes any Intellectual Property Rights of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you of the License Agreement.
+
+13. Changes to the License Agreement
+
+13.1 Google may make changes to the License Agreement as it distributes new versions of the Preview. When these changes are made, Google will make a new version of the License Agreement available on the website where the Preview is made available.
+
+14. General Legal Terms
+
+14.1 the License Agreement constitutes the whole legal agreement between you and Google and governs your use of the Preview (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the Preview.
+
+14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in the License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google.
+
+14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of the License Agreement is invalid, then that provision will be removed from the License Agreement without affecting the rest of the License Agreement. The remaining provisions of the License Agreement will continue to be valid and enforceable.
+
+14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to the License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of the License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to the License Agreement.
+
+14.5 EXPORT RESTRICTIONS. THE PREVIEW IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE PREVIEW. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE.
+
+14.6 The License Agreement may not be assigned or transferred by you without the prior written approval of Google, and any attempted assignment without such approval will be void. You shall not delegate your responsibilities or obligations under the License Agreement without the prior written approval of Google.
+
+14.7 The License Agreement, and your relationship with Google under the License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from the License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.
+
+June 2014.
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 2
+ Android SDK Platform 4.0
+ 14
+ armeabi-v7a
+
+
+ 99621822
+ d8991b0c06b18d7d6ed4169d67460ee1add6661b
+ sysimg_armv7a-14_r02.zip
+
+
+
+ default
+
+
+
+
+ 2
+ Android SDK Platform 4.0.3
+ 15
+ armeabi-v7a
+
+
+ 96227377
+ 1bf977d6cb4e0ad38dceac0c4863d1caa21f326e
+ sysimg_armv7a-15_r02.zip
+
+
+
+ default
+
+
+
+
+ 3
+ Android SDK Platform 4.1
+ 16
+ armeabi-v7a
+
+
+ 112528368
+ d1cddb23f17aad5821a089c403d4cddad2cf9ef7
+ sysimg_armv7a-16_r03.zip
+
+
+
+ default
+
+
+
+
+ 2
+ Android SDK Platform 4.2.2
+ 17
+ armeabi-v7a
+
+
+ 116553808
+ 1c321cda1af793b84d47d1a8d15f85444d265e3c
+ sysimg_armv7a-17_r02.zip
+
+
+
+ default
+
+
+
+
+ 2
+ Android SDK Platform 4.3
+ 18
+ armeabi-v7a
+
+
+ 125457135
+ 4a1a93200210d8c42793324362868846f67401ab
+ sysimg_armv7a-18_r02.zip
+
+
+
+ default
+
+
+
+
+ 2
+ Android SDK Platform 4.4.2
+ 19
+ armeabi-v7a
+
+
+ 158478012
+ e0d375397e28e3d5d9577a00132463a4696248e5
+ sysimg_armv7a-19_r02.zip
+
+
+
+ default
+
+
+
+
+ 1
+ Android SDK Platform L
+ 20
+ L
+ armeabi-v7a
+ default
+
+
+ 227716008
+ 1d5d81a7078b5b2a685620d93e1e04a51d2e786a
+ sysimg_armv7a-L_r01.zip
+
+
+
+
+
+
+
+ 1
+ Android SDK Platform L
+ 20
+ L
+ x86
+ default
+
+
+ 245850484
+ c2d32d6244821ff59f370469778525f6a5345010
+ sysimg_x86-L_r01.zip
+
+
+
+
+
+
+
+ Android SDK Platform 2.3.7
+ 2
+ 10
+ x86
+
+
+
+ 55463895
+ 34e2436f69606cdfe35d3ef9112f0c64e3ff021d
+ https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-10_r02.zip
+
+
+ default
+
+
+
+ Android SDK Platform 4.0.4
+ 1
+ 15
+ x86
+
+
+
+ 112619605
+ d540325952e0f097509622b9e685737584b83e40
+ https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-15_r01.zip
+
+
+ default
+
+
+
+ Android SDK Platform 4.1.1
+ 1
+ 16
+ x86
+
+
+
+ 131840348
+ 9d35bcaa4f9b40443941f32b8a50337f413c021a
+ https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-16_r01.zip
+
+
+ default
+
+
+
+ Android SDK Platform 4.2
+ 1
+ 17
+ x86
+
+
+
+ 138799122
+ ddb3313e8dcd07926003f7b828eafea1115ea35b
+ https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-17_r01.zip
+
+
+ default
+
+
+
+ Android SDK Platform 4.3
+ 1
+ 18
+ x86
+
+
+
+ 155656419
+ f11bc9fccd3e7e46c07d8b26e112a8d0b45966c1
+ https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-18_r01.zip
+
+
+ default
+
+
+
+
+ 2
+ Android SDK Platform 4.4.2
+ 19
+ x86
+
+
+ 178922720
+ 8889cb418984a2a7916a359da7c429d2431ed060
+ sysimg_x86-19_r02.zip
+
+
+
+ default
+
+
+
+
+
+ 1
+ Android 4.0.4
+ 15
+ mips
+
+
+
+ 117503178
+ a753bb4a6783124dad726c500ce9aec9d2c1b2d9
+ sysimg_mips-15_r01.zip
+
+
+ default
+
+
+
+ 4
+
+ Android 4.1.2
+ 16
+ mips
+
+
+
+ 122482530
+ 67943c54fb3943943ffeb05fdd39c0b753681f6e
+ sysimg_mips-16_r04.zip
+
+
+ default
+
+
+
+ 1
+
+ Android 4.2.1
+ 17
+ mips
+
+
+
+ 131781761
+ f0c6e153bd584c29e51b5c9723cfbf30f996a05d
+ sysimg_mips-17_r01.zip
+
+
+ default
+
+
+
diff --git a/pkgs/development/mobile/androidenv/sysimages.nix b/pkgs/development/mobile/androidenv/sysimages.nix
index bbbf3a4fc68..ddc6dd99d39 100644
--- a/pkgs/development/mobile/androidenv/sysimages.nix
+++ b/pkgs/development/mobile/androidenv/sysimages.nix
@@ -14,113 +14,137 @@ in
{
sysimg_armeabi-v7a_14 = buildSystemImage {
- name = "armeabi-v7a-14";
+ name = "sysimg-armeabi-v7a-14";
src = fetchurl {
- url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-14_r02.zip;
+ url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_armv7a-14_r02.zip;
sha1 = "d8991b0c06b18d7d6ed4169d67460ee1add6661b";
};
};
sysimg_armeabi-v7a_15 = buildSystemImage {
- name = "armeabi-v7a-15";
+ name = "sysimg-armeabi-v7a-15";
src = fetchurl {
- url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-15_r02.zip;
+ url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_armv7a-15_r02.zip;
sha1 = "1bf977d6cb4e0ad38dceac0c4863d1caa21f326e";
};
};
sysimg_armeabi-v7a_16 = buildSystemImage {
- name = "armeabi-v7a-16";
+ name = "sysimg-armeabi-v7a-16";
src = fetchurl {
- url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-16_r03.zip;
+ url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_armv7a-16_r03.zip;
sha1 = "d1cddb23f17aad5821a089c403d4cddad2cf9ef7";
};
};
sysimg_armeabi-v7a_17 = buildSystemImage {
- name = "armeabi-v7a-17";
+ name = "sysimg-armeabi-v7a-17";
src = fetchurl {
- url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-17_r02.zip;
+ url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_armv7a-17_r02.zip;
sha1 = "1c321cda1af793b84d47d1a8d15f85444d265e3c";
};
};
sysimg_armeabi-v7a_18 = buildSystemImage {
- name = "armeabi-v7a-18";
+ name = "sysimg-armeabi-v7a-18";
src = fetchurl {
- url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-18_r02.zip;
+ url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_armv7a-18_r02.zip;
sha1 = "4a1a93200210d8c42793324362868846f67401ab";
};
};
sysimg_armeabi-v7a_19 = buildSystemImage {
- name = "armeabi-v7a-19";
+ name = "sysimg-armeabi-v7a-19";
src = fetchurl {
- url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-19_r01.zip;
- sha1 = "12dd1187dfd953b1ffcef5067d94578590f9e600";
+ url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_armv7a-19_r02.zip;
+ sha1 = "e0d375397e28e3d5d9577a00132463a4696248e5";
+ };
+ };
+
+ sysimg_armeabi-v7a_20 = buildSystemImage {
+ name = "sysimg-armeabi-v7a-20";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_armv7a-L_r01.zip;
+ sha1 = "1d5d81a7078b5b2a685620d93e1e04a51d2e786a";
+ };
+ };
+
+ sysimg_x86_20 = buildSystemImage {
+ name = "sysimg-x86-20";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-L_r01.zip;
+ sha1 = "c2d32d6244821ff59f370469778525f6a5345010";
};
};
sysimg_x86_10 = buildSystemImage {
- name = "x86-10";
+ name = "sysimg-x86-10";
src = fetchurl {
- url = https://dl-ssl.google.com/android/repository/sys-img/x86/sysimg_x86-10_r02.zip;
+ url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-10_r02.zip;
sha1 = "34e2436f69606cdfe35d3ef9112f0c64e3ff021d";
};
};
sysimg_x86_15 = buildSystemImage {
- name = "x86-15";
+ name = "sysimg-x86-15";
src = fetchurl {
- url = https://dl-ssl.google.com/android/repository/sys-img/x86/sysimg_x86-15_r01.zip;
+ url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-15_r01.zip;
sha1 = "d540325952e0f097509622b9e685737584b83e40";
};
};
sysimg_x86_16 = buildSystemImage {
- name = "x86-16";
+ name = "sysimg-x86-16";
src = fetchurl {
- url = https://dl-ssl.google.com/android/repository/sys-img/x86/sysimg_x86-16_r01.zip;
+ url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-16_r01.zip;
sha1 = "9d35bcaa4f9b40443941f32b8a50337f413c021a";
};
};
sysimg_x86_17 = buildSystemImage {
- name = "x86-17";
+ name = "sysimg-x86-17";
src = fetchurl {
- url = https://dl-ssl.google.com/android/repository/sys-img/x86/sysimg_x86-17_r01.zip;
+ url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-17_r01.zip;
sha1 = "ddb3313e8dcd07926003f7b828eafea1115ea35b";
};
};
sysimg_x86_18 = buildSystemImage {
- name = "x86-18";
+ name = "sysimg-x86-18";
src = fetchurl {
- url = https://dl-ssl.google.com/android/repository/sys-img/x86/sysimg_x86-18_r01.zip;
+ url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-18_r01.zip;
sha1 = "f11bc9fccd3e7e46c07d8b26e112a8d0b45966c1";
};
};
- sysimg_mips_15 = buildSystemImage {
- name = "mips-15";
+ sysimg_x86_19 = buildSystemImage {
+ name = "sysimg-x86-19";
src = fetchurl {
- url = https://dl-ssl.google.com/android/repository/sys-img/mips/sysimg_mips-15_r01.zip;
+ url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-19_r02.zip;
+ sha1 = "8889cb418984a2a7916a359da7c429d2431ed060";
+ };
+ };
+
+ sysimg_mips_15 = buildSystemImage {
+ name = "sysimg-mips-15";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_mips-15_r01.zip;
sha1 = "a753bb4a6783124dad726c500ce9aec9d2c1b2d9";
};
};
sysimg_mips_16 = buildSystemImage {
- name = "mips-16";
+ name = "sysimg-mips-16";
src = fetchurl {
- url = https://dl-ssl.google.com/android/repository/sys-img/mips/sysimg_mips-16_r04.zip;
+ url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_mips-16_r04.zip;
sha1 = "67943c54fb3943943ffeb05fdd39c0b753681f6e";
};
};
sysimg_mips_17 = buildSystemImage {
- name = "mips-17";
+ name = "sysimg-mips-17";
src = fetchurl {
- url = https://dl-ssl.google.com/android/repository/sys-img/mips/sysimg_mips-17_r01.zip;
+ url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_mips-17_r01.zip;
sha1 = "f0c6e153bd584c29e51b5c9723cfbf30f996a05d";
};
};
diff --git a/pkgs/development/mobile/xcodeenv/default.nix b/pkgs/development/mobile/xcodeenv/default.nix
index ad6569d9478..0d221a8952b 100644
--- a/pkgs/development/mobile/xcodeenv/default.nix
+++ b/pkgs/development/mobile/xcodeenv/default.nix
@@ -1,8 +1,8 @@
-{stdenv, version ? "5.0"}:
+{stdenv, version ? "5.0", xcodeBaseDir ? "/Applications/Xcode.app"}:
rec {
xcodewrapper = import ./xcodewrapper.nix {
- inherit stdenv version;
+ inherit stdenv version xcodeBaseDir;
};
buildApp = import ./build-app.nix {
diff --git a/pkgs/development/mobile/xcodeenv/xcodewrapper.nix b/pkgs/development/mobile/xcodeenv/xcodewrapper.nix
index fd375d6213c..4545ea8dae1 100644
--- a/pkgs/development/mobile/xcodeenv/xcodewrapper.nix
+++ b/pkgs/development/mobile/xcodeenv/xcodewrapper.nix
@@ -1,4 +1,4 @@
-{stdenv, version}:
+{stdenv, version, xcodeBaseDir}:
stdenv.mkDerivation {
name = "xcode-wrapper-"+version;
@@ -6,14 +6,14 @@ stdenv.mkDerivation {
mkdir -p $out/bin
cd $out/bin
ln -s /usr/bin/xcode-select
- ln -s /usr/bin/xcodebuild
- ln -s /usr/bin/xcrun
ln -s /usr/bin/security
ln -s /usr/bin/codesign
- ln -s "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/Applications/iPhone Simulator.app/Contents/MacOS/iPhone Simulator"
+ ln -s "${xcodeBaseDir}/Contents/Developer/usr/bin/xcodebuild"
+ ln -s "${xcodeBaseDir}/Contents/Developer/usr/bin/xcrun"
+ ln -s "${xcodeBaseDir}/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/Applications/iPhone Simulator.app/Contents/MacOS/iPhone Simulator"
cd ..
- ln -s "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs"
+ ln -s "${xcodeBaseDir}/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs"
# Check if we have the xcodebuild version that we want
if [ -z "$($out/bin/xcodebuild -version | grep -x 'Xcode ${version}')" ]
diff --git a/pkgs/development/mobile/xpwn/default.nix b/pkgs/development/mobile/xpwn/default.nix
index 049595c49a5..e1b2b0cb2fa 100644
--- a/pkgs/development/mobile/xpwn/default.nix
+++ b/pkgs/development/mobile/xpwn/default.nix
@@ -1,13 +1,12 @@
-{ stdenv, fetchgit, cmake, zlib, libpng, bzip2, libusb, openssl }:
+{ stdenv, fetchgit, cmake, zlib, libpng, bzip2, libusb1, openssl }:
stdenv.mkDerivation {
name = "xpwn-0.5.8git";
src = fetchgit {
- url = "git://github.com/dborca/xpwn.git";
- rev = "4534da88d4e8a32cdc9da9b5326e2cc482c95ef0";
- sha256 =
- "1h1ak40fg5bym0hifpii9q2hqdp2m387cwfzb4bl6qq36xpkd6wv";
+ url = "git://github.com/dborca/xpwn.git";
+ rev = "4534da88d4e8a32cdc9da9b5326e2cc482c95ef0";
+ sha256 = "1h1ak40fg5bym0hifpii9q2hqdp2m387cwfzb4bl6qq36xpkd6wv";
};
preConfigure = ''
@@ -19,11 +18,16 @@ stdenv.mkDerivation {
sed -i -e '/install/d' CMakeLists.txt
'';
- buildInputs = [ cmake zlib libpng bzip2 libusb openssl ];
+ buildInputs = [ cmake zlib libpng bzip2 libusb1 openssl ];
- meta = {
- homepage = "http://planetbeing.lighthouseapp.com/projects/15246-xpwn";
+ cmakeFlags = [
+ "-DCMAKE_OSX_DEPLOYMENT_TARGET="
+ ];
+
+ meta = with stdenv.lib; {
+ homepage = "http://planetbeing.lighthouseapp.com/projects/15246-xpwn";
description = "Custom NOR firmware loader/IPSW generator for the iPhone";
- license = stdenv.lib.licenses.gpl3Plus;
+ license = licenses.gpl3Plus;
+ platforms = with platforms; linux ++ darwin;
};
}
diff --git a/pkgs/development/ocaml-modules/biniou/default.nix b/pkgs/development/ocaml-modules/biniou/default.nix
index 59f30de5e84..565176276f9 100644
--- a/pkgs/development/ocaml-modules/biniou/default.nix
+++ b/pkgs/development/ocaml-modules/biniou/default.nix
@@ -4,6 +4,9 @@ let
version = "1.0.9";
webpage = "http://mjambon.com/${pname}.html";
in
+
+assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11";
+
stdenv.mkDerivation rec {
name = "${pname}-${version}";
@@ -23,10 +26,11 @@ stdenv.mkDerivation rec {
mkdir $out/bin
'';
- meta = {
+ meta = with stdenv.lib; {
description = "A binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve";
homepage = "${webpage}";
- license = stdenv.lib.licenses.bsd3;
+ license = licenses.bsd3;
+ maintainers = [ maintainers.vbgl ];
platforms = ocaml.meta.platforms;
};
}
diff --git a/pkgs/development/ocaml-modules/calendar/default.nix b/pkgs/development/ocaml-modules/calendar/default.nix
new file mode 100644
index 00000000000..6af7ce25077
--- /dev/null
+++ b/pkgs/development/ocaml-modules/calendar/default.nix
@@ -0,0 +1,23 @@
+{stdenv, fetchurl, ocaml, findlib}:
+
+stdenv.mkDerivation {
+ name = "ocaml-calendar-2.03.2";
+ src = fetchurl {
+ url = https://forge.ocamlcore.org/frs/download.php/915/calendar-2.03.2.tar.gz;
+ sha256 = "04pvhwb664g3s644c7v7419a3kvf5s3pynkhmk5j59dvlfm1yf0f";
+ };
+
+ buildInputs = [ocaml findlib];
+
+ createFindlibDestdir = true;
+
+ meta = {
+ homepage = https://forge.ocamlcore.org/projects/calendar/;
+ description = "An Objective Caml library managing dates and times";
+ license = "LGPL";
+ platforms = ocaml.meta.platforms;
+ maintainers = [
+ stdenv.lib.maintainers.gal_bolle
+ ];
+ };
+}
diff --git a/pkgs/development/ocaml-modules/camomile/0.8.2.nix b/pkgs/development/ocaml-modules/camomile/0.8.2.nix
index 674c6c0367b..adbdc936d1e 100644
--- a/pkgs/development/ocaml-modules/camomile/0.8.2.nix
+++ b/pkgs/development/ocaml-modules/camomile/0.8.2.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ocaml, findlib}:
+{stdenv, fetchurl, ocaml, findlib, camlp4}:
let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
sha256 = "0x43pjxx70kgip86mmdn08s97k4qzdqc8i79xfyyx28smy1bsa00";
};
- buildInputs = [ocaml findlib];
+ buildInputs = [ocaml findlib camlp4];
createFindlibDestdir = true;
diff --git a/pkgs/development/ocaml-modules/camomile/default.nix b/pkgs/development/ocaml-modules/camomile/default.nix
index 332230615d1..ecdc5bef295 100644
--- a/pkgs/development/ocaml-modules/camomile/default.nix
+++ b/pkgs/development/ocaml-modules/camomile/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ocaml, findlib}:
+{stdenv, fetchurl, ocaml, findlib, camlp4}:
let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
sha256 = "003ikpvpaliy5hblhckfmln34zqz0mk3y2m1fqvbjngh3h2np045";
};
- buildInputs = [ocaml findlib];
+ buildInputs = [ocaml findlib camlp4];
createFindlibDestdir = true;
diff --git a/pkgs/development/ocaml-modules/cmdliner/default.nix b/pkgs/development/ocaml-modules/cmdliner/default.nix
new file mode 100644
index 00000000000..2dfd7ba1286
--- /dev/null
+++ b/pkgs/development/ocaml-modules/cmdliner/default.nix
@@ -0,0 +1,40 @@
+{stdenv, fetchurl, ocaml, findlib, opam}:
+
+let
+ pname = "cmdliner";
+ version = "0.9.5";
+ ocaml_version = (builtins.parseDrvName ocaml.name).version;
+in
+
+assert stdenv.lib.versionAtLeast ocaml_version "3.12";
+
+stdenv.mkDerivation {
+
+ name = "ocaml-${pname}-${version}";
+
+ src = fetchurl {
+ url = "http://erratique.ch/software/${pname}/releases/${pname}-${version}.tbz";
+ sha256 = "a0e199c4930450e12edf81604eeceddeeb32d55c43438be689e60df282277a7e";
+ };
+
+ unpackCmd = "tar xjf $src";
+ buildInputs = [ ocaml findlib opam ];
+
+ createFindlibDestdir = true;
+
+ configurePhase = "ocaml pkg/git.ml";
+ buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true";
+ installPhase = ''
+ opam-installer --script --prefix=$out ${pname}.install > install.sh
+ sh install.sh
+ ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml_version}/site-lib/
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = http://erratique.ch/software/cmdliner;
+ description = "An OCaml module for the declarative definition of command line interfaces";
+ license = licenses.bsd3;
+ maintainers = [ maintainers.vbgl ];
+ platforms = ocaml.meta.platforms;
+ };
+}
diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix
index 1f9e2b44e00..cfb353bfe3e 100644
--- a/pkgs/development/ocaml-modules/cryptokit/default.nix
+++ b/pkgs/development/ocaml-modules/cryptokit/default.nix
@@ -4,6 +4,8 @@ let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
in
+assert stdenv.lib.versionAtLeast ocaml_version "3.12";
+
stdenv.mkDerivation {
name = "cryptokit-1.9";
diff --git a/pkgs/development/ocaml-modules/csv/default.nix b/pkgs/development/ocaml-modules/csv/default.nix
index 7178452e3dd..09679ced744 100644
--- a/pkgs/development/ocaml-modules/csv/default.nix
+++ b/pkgs/development/ocaml-modules/csv/default.nix
@@ -1,4 +1,7 @@
{stdenv, fetchurl, ocaml, findlib}:
+
+assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11";
+
stdenv.mkDerivation {
name = "ocaml-csv-1.3.3";
@@ -18,10 +21,11 @@ stdenv.mkDerivation {
installPhase = "ocaml setup.ml -install";
- meta = {
+ meta = with stdenv.lib; {
description = "A pure OCaml library to read and write CSV files";
homepage = "https://forge.ocamlcore.org/projects/csv/";
- license = stdenv.lib.licenses.lgpl21;
+ license = licenses.lgpl21;
+ maintainers = [ maintainers.vbgl ];
platforms = ocaml.meta.platforms;
};
}
diff --git a/pkgs/development/ocaml-modules/easy-format/default.nix b/pkgs/development/ocaml-modules/easy-format/default.nix
index d01a4edf26e..0554b67f1d7 100644
--- a/pkgs/development/ocaml-modules/easy-format/default.nix
+++ b/pkgs/development/ocaml-modules/easy-format/default.nix
@@ -17,11 +17,10 @@ stdenv.mkDerivation rec {
createFindlibDestdir = true;
- meta = {
+ meta = with stdenv.lib; {
description = "A high-level and functional interface to the Format module of the OCaml standard library";
homepage = "${webpage}";
- license = "bsd";
+ license = licenses.bsd3;
+ maintainers = [ maintainers.vbgl ];
};
}
-
-
diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix
new file mode 100644
index 00000000000..8a7045e263a
--- /dev/null
+++ b/pkgs/development/ocaml-modules/eliom/default.nix
@@ -0,0 +1,50 @@
+{ 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}:
+
+stdenv.mkDerivation
+{
+ name = "eliom-4.0.0";
+
+ src = fetchurl {
+ url = https://github.com/ocsigen/eliom/archive/4.0.0.tar.gz;
+ sha256 = "1xf2l6lvngxzwaw6lvr6sgi48rz0wxg65q9lz4jzqjarkp0sx206";
+ };
+
+ buildInputs = [ocaml which ocsigen_server findlib ocsigen_deriving
+ js_of_ocaml ocaml_react ocaml_lwt calendar
+ cryptokit tyxml ocaml_ipaddr ocamlnet ocaml_ssl
+ ocaml_pcre ocaml_optcomp];
+
+ preConfigure =
+ ''chmod a+x configure
+ sed s/deriving-ocsigen/deriving/g -i configure
+ '';
+
+ configureFlags = "--root $(out) --prefix /";
+
+ dontAddPrefix = true;
+
+ createFindlibDestdir = true;
+
+ meta = {
+ homepage = http://ocsigen.org/eliom/;
+ description = "Ocaml Framework for programming Web sites and client/server Web applications";
+
+ longDescription =''Eliom is a framework for programming Web sites
+ and client/server Web applications. It introduces new concepts to
+ simplify programming common behaviours and uses advanced static
+ typing features of OCaml to check many properties of the Web site
+ at compile time. If you want to write a Web application, Eliom
+ makes possible to write the whole application as a single program
+ (client and server parts). A syntax extension is used to
+ distinguish both parts and the client side is compiled to JS using
+ Ocsigen Js_of_ocaml.'';
+
+ license = stdenv.lib.licenses.lgpl21;
+
+ platforms = ocaml.meta.platforms;
+
+ maintainers = [ stdenv.lib.maintainers.gal_bolle ];
+ };
+}
diff --git a/pkgs/development/ocaml-modules/extlib/default.nix b/pkgs/development/ocaml-modules/extlib/default.nix
index 7bc7e398948..9f5f8119fb6 100644
--- a/pkgs/development/ocaml-modules/extlib/default.nix
+++ b/pkgs/development/ocaml-modules/extlib/default.nix
@@ -1,4 +1,6 @@
-{stdenv, fetchurl, ocaml, findlib, minimal ? true}:
+{stdenv, fetchurl, ocaml, findlib, camlp4, minimal ? true}:
+
+assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11";
stdenv.mkDerivation {
name = "ocaml-extlib-1.6.1";
@@ -8,7 +10,7 @@ stdenv.mkDerivation {
sha256 = "1jmfj2w0f3ap0swz8k3qqmrl6x2y4gkmg88vv024xnmliiiv7m48";
};
- buildInputs = [ocaml findlib];
+ buildInputs = [ocaml findlib camlp4];
createFindlibDestdir = true;
diff --git a/pkgs/development/ocaml-modules/fix/default.nix b/pkgs/development/ocaml-modules/fix/default.nix
new file mode 100644
index 00000000000..b0429e0e910
--- /dev/null
+++ b/pkgs/development/ocaml-modules/fix/default.nix
@@ -0,0 +1,25 @@
+{stdenv, fetchurl, ocaml, findlib}:
+
+assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12";
+
+stdenv.mkDerivation {
+
+ name = "ocaml-fix-20130611";
+
+ src = fetchurl {
+ url = http://gallium.inria.fr/~fpottier/fix/fix-20130611.tar.gz;
+ sha256 = "1phlqcs1nb93x9cf0w0hnq2ck4dmn71zm4mxf60w96vb9yb9qzp0";
+ };
+
+ buildInputs = [ ocaml findlib ];
+
+ createFindlibDestdir = true;
+
+ meta = with stdenv.lib; {
+ homepage = http://gallium.inria.fr/~fpottier/fix/;
+ description = "A simple OCaml module for computing the least solution of a system of monotone equations";
+ license = licenses.cecill-c;
+ maintainers = [ maintainers.vbgl ];
+ platforms = ocaml.meta.platforms;
+ };
+}
diff --git a/pkgs/development/ocaml-modules/functory/default.nix b/pkgs/development/ocaml-modules/functory/default.nix
new file mode 100644
index 00000000000..35dd542af9e
--- /dev/null
+++ b/pkgs/development/ocaml-modules/functory/default.nix
@@ -0,0 +1,27 @@
+{stdenv, fetchurl, ocaml, findlib}:
+
+assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11";
+
+stdenv.mkDerivation {
+
+ name = "ocaml-functory-0.5";
+
+ src = fetchurl {
+ url = https://www.lri.fr/~filliatr/functory/download/functory-0.5.tar.gz;
+ sha256 = "1j17rhifdjv1z262dma148ywg34x0zjn8vczdrnkwajsm4qg1hw3";
+ };
+
+ buildInputs = [ ocaml findlib ];
+
+ installTargets = "ocamlfind-install";
+
+ createFindlibDestdir = true;
+
+ meta = with stdenv.lib; {
+ homepage = https://www.lri.fr/~filliatr/functory/;
+ description = "A distributed computing library for Objective Caml which facilitates distributed execution of parallelizable computations in a seamless fashion";
+ license = licenses.lgpl21;
+ maintainers = [ maintainers.vbgl ];
+ platforms = ocaml.meta.platforms;
+ };
+}
diff --git a/pkgs/development/ocaml-modules/javalib/default.nix b/pkgs/development/ocaml-modules/javalib/default.nix
index 2fa72dcf07f..7272e668aa2 100644
--- a/pkgs/development/ocaml-modules/javalib/default.nix
+++ b/pkgs/development/ocaml-modules/javalib/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, which, ocaml, findlib, camlzip, extlib}:
+{stdenv, fetchurl, which, ocaml, findlib, camlzip, extlib, camlp4}:
let
pname = "javalib";
version = "2.3";
@@ -14,12 +14,14 @@ stdenv.mkDerivation rec {
sha256 = "1i8djcanzm250mwilm3jfy37cz0k0x7jbnrz8a5vvdi91kyzh52j";
};
- buildInputs = [ which ocaml findlib camlzip extlib ];
+ buildInputs = [ which ocaml findlib camlp4 ];
patches = [ ./configure.sh.patch ./Makefile.config.example.patch ];
createFindlibDestdir = true;
+ preConfigure = "patchShebangs ./configure.sh";
+
configureScript = "./configure.sh";
dontAddPrefix = "true";
@@ -31,10 +33,11 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ camlzip extlib ];
- meta = {
+ meta = with stdenv.lib; {
description = "A library that parses Java .class files into OCaml data structures";
homepage = "${webpage}";
- license = stdenv.lib.licenses.lgpl3;
+ license = licenses.lgpl3;
+ maintainers = [ maintainers.vbgl ];
platforms = ocaml.meta.platforms;
};
}
diff --git a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix
new file mode 100644
index 00000000000..5fb9969e62e
--- /dev/null
+++ b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix
@@ -0,0 +1,37 @@
+{stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk, libgnomecanvas, libglade, gtksourceview}:
+
+let
+ ocaml_version = (builtins.parseDrvName ocaml.name).version;
+ pname = "lablgtk";
+ version = "2.14.0";
+in
+
+stdenv.mkDerivation (rec {
+ name = "${pname}-${version}";
+
+ src = fetchurl {
+ url = "https://forge.ocamlcore.org/frs/download.php/561/${name}.tar.gz";
+ sha256 = "1fnh0amm7lwgyjdhmlqgsp62gwlar1140425yc1j6inwmgnsp0a9";
+ };
+
+ buildInputs = [ocaml findlib pkgconfig gtk libgnomecanvas libglade gtksourceview];
+
+ configureFlags = "--with-libdir=$(out)/lib/ocaml/${ocaml_version}/site-lib";
+ buildFlags = "world";
+
+ preInstall = ''
+ mkdir -p $out/lib/ocaml/${ocaml_version}/site-lib
+ export OCAMLPATH=$out/lib/ocaml/${ocaml_version}/site-lib/:$OCAMLPATH
+ '';
+
+ meta = {
+ platforms = ocaml.meta.platforms;
+ maintainers = [
+ stdenv.lib.maintainers.z77z
+ stdenv.lib.maintainers.roconnor
+ ];
+ homepage = http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgtk.html;
+ description = "LablGTK is is an Objective Caml interface to gtk+";
+ license = stdenv.lib.licenses.lgpl21Plus;
+ };
+})
diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix
index c2f50c4e5b8..7499be9c5dd 100644
--- a/pkgs/development/ocaml-modules/lablgtk/default.nix
+++ b/pkgs/development/ocaml-modules/lablgtk/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk, libgnomecanvas, libglade, gtksourceview}:
+{stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk, libgnomecanvas, libglade, gtksourceview, camlp4}:
let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
@@ -6,6 +6,8 @@ let
version = "2.16.0";
in
+assert stdenv.lib.versionAtLeast ocaml_version "3.12";
+
stdenv.mkDerivation (rec {
name = "${pname}-${version}";
src = fetchurl {
@@ -13,7 +15,7 @@ stdenv.mkDerivation (rec {
sha256 = "a0ea9752eb257dadcfc2914408fff339d4c34357802f02c63329dd41b777de2f";
};
- buildInputs = [ocaml findlib pkgconfig gtk libgnomecanvas libglade gtksourceview];
+ buildInputs = [ocaml findlib pkgconfig gtk libgnomecanvas libglade gtksourceview camlp4];
configureFlags = "--with-libdir=$(out)/lib/ocaml/${ocaml_version}/site-lib";
buildFlags = "world";
diff --git a/pkgs/development/ocaml-modules/lambda-term/default.nix b/pkgs/development/ocaml-modules/lambda-term/default.nix
new file mode 100644
index 00000000000..b6edadb0b14
--- /dev/null
+++ b/pkgs/development/ocaml-modules/lambda-term/default.nix
@@ -0,0 +1,41 @@
+{stdenv, fetchurl, libev, ocaml, findlib, ocaml_lwt, ocaml_react, zed}:
+
+stdenv.mkDerivation rec {
+ version = "1.6";
+ name = "lambda-term-${version}";
+
+ src = fetchurl {
+ url = https://github.com/diml/lambda-term/archive/1.6.tar.gz;
+ sha256 = "1rhfixdgpylxznf6sa9wr31wb4pjzpfn5mxhxqpbchmpl2afwa09";
+ };
+
+ buildInputs = [ libev ocaml findlib ocaml_lwt ocaml_react ];
+
+ propagatedBuildInputs = [ zed ];
+
+ createFindlibDestdir = true;
+
+ meta = { description = "Terminal manipulation library for OCaml";
+ longDescription = ''
+ Lambda-term is a cross-platform library for
+ manipulating the terminal. It provides an abstraction for keys,
+ mouse events, colors, as well as a set of widgets to write
+ curses-like applications.
+
+ The main objective of lambda-term is to provide a higher level
+ functional interface to terminal manipulation than, for example,
+ ncurses, by providing a native OCaml interface instead of bindings to
+ a C library.
+
+ Lambda-term integrates with zed to provide text edition facilities in
+ console applications.
+ '';
+
+ homepage = https://github.com/diml/lambda-term;
+ license = stdenv.lib.licenses.bsd3;
+ platforms = ocaml.meta.platforms;
+ maintainers = [
+ stdenv.lib.maintainers.gal_bolle
+ ];
+ };
+}
diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix
index 9ef10906365..061dbb398fe 100644
--- a/pkgs/development/ocaml-modules/lwt/default.nix
+++ b/pkgs/development/ocaml-modules/lwt/default.nix
@@ -1,21 +1,27 @@
-{stdenv, fetchurl, which, cryptopp, ocaml, findlib, ocaml_react, ocaml_ssl}:
+{stdenv, fetchgit, which, cryptopp, ocaml, findlib, ocaml_react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, ocaml_text, glib}:
let
- ocaml_version = (builtins.parseDrvName ocaml.name).version;
- version = "2.1.1";
+ version = "2.4.5";
in
stdenv.mkDerivation {
+
+
name = "ocaml-lwt-${version}";
- src = fetchurl {
- url = "http://ocsigen.org/download/lwt-${version}.tar.gz";
- sha256 = "1zjn0sgihryshancn4kna1xslhc8gifliny1qd3a85f72xxxnw0w";
+ src = fetchgit {
+ url = git://github.com/ocsigen/lwt;
+ rev = "refs/tags/${version}";
+ sha256 = "2bbf4f216dd62eeb765a89413f3b2b6d417a9c289ca49d595bb4d7a0545e343e";
};
- buildInputs = [which cryptopp ocaml findlib ocaml_react ocaml_ssl];
+ buildInputs = [ocaml_oasis pkgconfig which cryptopp ocaml findlib glib libev ncurses];
- configurePhase = "true";
+ propagatedBuildInputs = [ ocaml_react ocaml_ssl ocaml_text ];
+
+ configureFlags = [ "--enable-all" ];
+
+ createFindlibDestdir = true;
meta = {
homepage = http://ocsigen.org/lwt;
@@ -23,7 +29,7 @@ stdenv.mkDerivation {
license = "LGPL";
platforms = ocaml.meta.platforms;
maintainers = [
- stdenv.lib.maintainers.z77z
+ stdenv.lib.maintainers.z77z stdenv.lib.maintainers.gal_bolle
];
};
}
diff --git a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix
index 94395f601aa..f77bd3acc62 100644
--- a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, automake, ocaml, autoconf, gnum4, pkgconfig, freetype, lablgtk, unzip, cairo, findlib, gdk_pixbuf, glib, gtk, pango }:
+{stdenv, fetchurl, automake, ocaml, autoconf, gnum4, pkgconfig, freetype, lablgtk, unzip, cairo, findlib, gdk_pixbuf, glib, gtk, pango }:
let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
@@ -9,21 +9,22 @@ in
stdenv.mkDerivation {
name = "${pname}-${version}";
- src = fetchurl {
+ src = fetchurl {
url = "http://cgit.freedesktop.org/cairo-ocaml/snapshot/cairo-ocaml-${version}.zip";
- sha256 = "2d59678e322c331e3f4bc02a77240fce4a0917acb0d3ae75953a6ac62d70a125";
+ sha256 = "0l4p9bp6kclr570mxma8wafibr1g5fsjj8h10yr4b507g0hmlh0l";
};
patches = [ ./META.patch ];
- buildInputs = [ocaml automake gnum4 autoconf unzip pkgconfig findlib freetype lablgtk cairo gdk_pixbuf gtk pango ];
+ buildInputs = [ ocaml automake gnum4 autoconf unzip pkgconfig
+ findlib freetype lablgtk cairo gdk_pixbuf gtk pango ];
createFindlibDestdir = true;
preConfigure = ''
aclocal -I support
autoconf
- export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE `pkg-config --cflags cairo gdk-pixbuf glib gtk+ pango`"
+ export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE `pkg-config --cflags cairo gdk-pixbuf glib gtk+ pango`"
export LABLGTKDIR=${lablgtk}/lib/ocaml/${ocaml_version}/site-lib/lablgtk2
cp ${lablgtk}/lib/ocaml/${ocaml_version}/site-lib/lablgtk2/pango.ml ./src
cp ${lablgtk}/lib/ocaml/${ocaml_version}/site-lib/lablgtk2/gaux.ml ./src
@@ -39,6 +40,6 @@ stdenv.mkDerivation {
homepage = http://cairographics.org/cairo-ocaml;
description = "ocaml bindings for cairo library";
license = stdenv.lib.licenses.gpl2;
-# maintainers = [ stdenv.lib.maintainers.roconnor ];
+ platforms = ocaml.meta.platforms;
};
}
diff --git a/pkgs/development/ocaml-modules/ocaml-ipaddr/default.nix b/pkgs/development/ocaml-modules/ocaml-ipaddr/default.nix
new file mode 100644
index 00000000000..09cfe1c350d
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ocaml-ipaddr/default.nix
@@ -0,0 +1,23 @@
+{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/ocaml-text/default.nix b/pkgs/development/ocaml-modules/ocaml-text/default.nix
new file mode 100644
index 00000000000..08136dd2b10
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ocaml-text/default.nix
@@ -0,0 +1,26 @@
+{stdenv, fetchurl, libiconv, ocaml, findlib, ncurses}:
+
+stdenv.mkDerivation {
+ name = "ocaml-text-0.6";
+
+ src = fetchurl {
+ url = https://forge.ocamlcore.org/frs/download.php/937/ocaml-text-0.6.tar.gz;
+ sha256 = "0j8gaak0ajnlmn8knvfygqwwzs7awjv5rfn5cbj6qxqbxhjd5m6g";
+ };
+
+ buildInputs = [ocaml findlib libiconv ncurses];
+
+ configurePhase = "iconv_prefix=${libiconv} ocaml setup.ml -configure";
+
+ createFindlibDestdir = true;
+
+
+ meta = {
+ homepage = "http://ocaml-text.forge.ocamlcore.org/";
+ description = "OCaml-Text is a library for dealing with ``text'', i.e. sequence of unicode characters, in a convenient way. ";
+ license = "BSD";
+ platforms = ocaml.meta.platforms;
+ maintainers = [
+ ];
+ };
+}
diff --git a/pkgs/development/ocaml-modules/ocamlgraph/default.nix b/pkgs/development/ocaml-modules/ocamlgraph/default.nix
index 9f411dd2a6f..98747e2a193 100644
--- a/pkgs/development/ocaml-modules/ocamlgraph/default.nix
+++ b/pkgs/development/ocaml-modules/ocamlgraph/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
sha256 = "0bxqxzd5sd7siz57vhzb8bmiz1ddhgdv49gcsmwwfmd16mj4cryi";
};
- buildInputs = [ ocaml findlib ocamlPackages.lablgtk ];
+ buildInputs = [ ocaml findlib ocamlPackages.lablgtk ocamlPackages.camlp4 ];
patches = ./destdir.patch;
diff --git a/pkgs/development/ocaml-modules/ocamlnet/configure.patch b/pkgs/development/ocaml-modules/ocamlnet/configure.patch
deleted file mode 100644
index 38b240f3c2c..00000000000
--- a/pkgs/development/ocaml-modules/ocamlnet/configure.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -Naur ocamlnet-3.6.3.ori/configure ocamlnet-3.6.3/configure
---- ocamlnet-3.6.3.ori/configure 2013-01-14 00:04:59.000000000 +0000
-+++ ocamlnet-3.6.3/configure 2013-06-02 21:33:08.000000000 +0000
-@@ -642,59 +642,6 @@
- exit 1
- fi
-
-- printf "%s" "Checking whether lablgtk2 has GMain.Io.remove... "
-- mkdir -p tmp
-- cat <tmp/gtk.ml
--let _ = GMain.Io.remove;;
--EOF
--
-- if ocamlfind ocamlc -package lablgtk2 -c tmp/gtk.ml >/dev/null 2>/dev/null;
-- then
-- echo "yes"
-- else
-- echo "no"
-- echo "Your version of lablgtk2 is too old!"
-- exit 1
-- fi
--
-- printf "%s" "Checking whether lablgtk2 has GMain.Io.add_watch with list support... "
-- mkdir -p tmp
-- cat <<'EOF' >tmp/gtk.ml
--open GMain.Io
--let _ = (add_watch : cond:condition list -> callback:(condition list -> bool) -> ?prio:int -> channel -> id);;
--exit 0
--EOF
-- # Note: this newer API is never broken in the sense checked below, i.e.
-- # such lablgtk2 versions do not exist.
-- if ocamlfind ocamlc -package unix,lablgtk2 -linkpkg -o tmp/gtk tmp/gtk.ml >/dev/null 2>/dev/null && tmp/gtk; then
-- echo "yes"
-- gtk2_io_add_watch_supports_lists="-ppopt -DGTK2_IO_ADD_WATCH_SUPPORTS_LISTS"
-- else
-- echo "no"
-- printf "%s" "Checking whether lablgtk2's GMain.Io.add_watch is broken... "
-- mkdir -p tmp
-- cat <<'EOF' >tmp/gtk.ml
--GMain.Main.init();;
--let ch = GMain.Io.channel_of_descr (Unix.stdout) in
--let w = GMain.Io.add_watch
-- ~cond:`OUT ~callback:(fun () -> true) ch in
--(* add_watch is broken when it just returns Val_unit, and ok when it
-- * returns a positive int
-- *)
--if (Obj.magic w : int) > 0 then
-- exit 0
--else
-- exit 1
--EOF
-- if ocamlfind ocamlc -package unix,lablgtk2 -linkpkg -o tmp/gtk tmp/gtk.ml >/dev/null 2>/dev/null && tmp/gtk; then
-- echo "no"
-- else
-- echo "yes"
-- echo "You should apply the patch-ab-ml_glib.c to lablgtk2 to fix this!"
-- exit 1
-- fi
-- fi
--
- for f in Makefile uq_gtk.ml uq_gtk.mli uq_gtk_helper.ml; do
- rm -f src/equeue-gtk2/$f
- ln -s ../equeue-gtk1/$f src/equeue-gtk2
diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix
index f1bf39a283d..06e54a67733 100644
--- a/pkgs/development/ocaml-modules/ocamlnet/default.nix
+++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix
@@ -5,19 +5,17 @@ let
in
stdenv.mkDerivation {
- name = "ocamlnet-3.7.3";
+ name = "ocamlnet-3.7.6";
src = fetchurl {
- url = http://download.camlcity.org/download/ocamlnet-3.7.3.tar.gz;
- sha256 = "0s24icyrxkqqai91rgxpf52s1fx70j7p12c8vq9vcmvdhll6kp2d";
+ url = http://download.camlcity.org/download/ocamlnet-3.7.6.tar.gz;
+ sha256 = "0z17kxn1cyn1x5wgajw737m9rsjwji823rxdwvv8a5239xd1whji";
};
buildInputs = [ncurses ocaml findlib ocaml_pcre camlzip openssl ocaml_ssl cryptokit];
propagatedbuildInputs = [ncurses ocaml_pcre camlzip openssl ocaml_ssl cryptokit];
- patches = [ ./configure.patch ];
-
createFindlibDestdir = true;
dontAddPrefix = true;
diff --git a/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix b/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix
new file mode 100644
index 00000000000..d2a1ed3a624
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix
@@ -0,0 +1,32 @@
+{stdenv, fetchgit, ocaml, findlib, ocaml_oasis, ocaml_data_notation, ocaml_optcomp}:
+
+stdenv.mkDerivation {
+ name = "ocsigen-deriving";
+ src = fetchgit {
+ url = "git://github.com/ocsigen/deriving";
+ rev = "refs/tags/0.6.2";
+ sha256 = "2b3bf3f4972d0e6eaf075f7353ce482b776726e0cd04947a89b7156384ec0662";
+ };
+
+ buildInputs = [ocaml findlib ocaml_oasis ocaml_data_notation ocaml_optcomp];
+
+ configurePhase = ''
+ make setup-dev.exe
+ ./setup-dev.exe -configure --prefix $out
+ '';
+
+ createFindlibDestdir = true;
+
+
+ meta = {
+ homepage = https://github.com/ocsigen/deriving;
+ description = "Extension to OCaml for deriving functions from type declarations";
+ license = "MIT";
+ platforms = ocaml.meta.platforms;
+ maintainers = [
+ stdenv.lib.maintainers.gal_bolle
+ ];
+ };
+
+
+}
diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix
new file mode 100644
index 00000000000..e33d4037379
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix
@@ -0,0 +1,37 @@
+{stdenv, fetchurl, ocaml, findlib, which, ocaml_react, ocaml_ssl, ocaml_lwt, ocamlnet, ocaml_pcre, cryptokit, tyxml, ocaml_ipaddr, zlib, libev, openssl, ocaml_sqlite3, tree}:
+
+stdenv.mkDerivation {
+ name = "ocsigenserver-2.4.0";
+
+ src = fetchurl {
+ url = https://github.com/ocsigen/ocsigenserver/archive/2.4.0.tar.gz;
+ sha256 = "1fjj8g6ivyfsa0446w77rjihhbw0gh5pgx7brywql2shk999riby";
+ };
+
+ buildInputs = [ocaml which findlib ocaml_react ocaml_ssl ocaml_lwt ocamlnet ocaml_pcre cryptokit tyxml ocaml_ipaddr zlib libev openssl ocaml_sqlite3 tree];
+
+ configureFlags = "--root $(out) --prefix /";
+
+ dontAddPrefix = true;
+
+ createFindlibDestdir = true;
+
+ postFixup =
+ ''
+ rm -rf $out/var/run
+ '';
+
+ dontPatchShebangs = true;
+
+ meta = {
+ homepage = http://ocsigen.org/ocsigenserver/;
+ description = "A full featured Web server";
+ longDescription =''
+ A full featured Web server. It implements most features of the HTTP protocol, and has a very powerful extension mechanism that make very easy to plug your own OCaml modules for generating pages.
+ '';
+ license = stdenv.lib.licenses.lgpl21;
+ platforms = ocaml.meta.platforms;
+ maintainers = [ stdenv.lib.maintainers.gal_bolle ];
+ };
+
+}
diff --git a/pkgs/development/ocaml-modules/optcomp/default.nix b/pkgs/development/ocaml-modules/optcomp/default.nix
new file mode 100644
index 00000000000..6075bc4ab2a
--- /dev/null
+++ b/pkgs/development/ocaml-modules/optcomp/default.nix
@@ -0,0 +1,25 @@
+{stdenv, fetchurl, ocaml, findlib}:
+
+stdenv.mkDerivation {
+ name = "ocaml-optcomp";
+ src = fetchurl {
+ url = https://github.com/diml/optcomp/archive/1.6.tar.gz;
+ md5 = "d3587244dba1b8b10f24d0b60a8c700d";
+ };
+
+ createFindlibDestdir = true;
+
+ buildInputs = [ocaml findlib];
+
+
+ meta = {
+ homepage = https://github.com/diml/optcomp;
+ description = "Optional compilation for OCaml with cpp-like directives";
+ license = "BSD";
+ platforms = ocaml.meta.platforms;
+ maintainers = [
+ stdenv.lib.maintainers.gal_bolle
+ ];
+ };
+
+}
diff --git a/pkgs/development/ocaml-modules/ounit/default.nix b/pkgs/development/ocaml-modules/ounit/default.nix
index 43ec474cf5e..5807ceb256b 100644
--- a/pkgs/development/ocaml-modules/ounit/default.nix
+++ b/pkgs/development/ocaml-modules/ounit/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ocaml, findlib}:
+{stdenv, fetchurl, ocaml, findlib, camlp4}:
let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
sha256 = "1qw8k2czy0bxhsf25kfpgywhpqmg7bi57rmyhlnmbddmvc61pg76";
};
- buildInputs = [ocaml findlib];
+ buildInputs = [ocaml findlib camlp4];
dontAddPrefix = true;
diff --git a/pkgs/development/ocaml-modules/pprint/default.nix b/pkgs/development/ocaml-modules/pprint/default.nix
new file mode 100644
index 00000000000..18cc4817b13
--- /dev/null
+++ b/pkgs/development/ocaml-modules/pprint/default.nix
@@ -0,0 +1,28 @@
+{stdenv, fetchurl, ocaml, findlib}:
+
+assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12";
+
+stdenv.mkDerivation {
+
+ name = "ocaml-pprint-20140424";
+
+ src = fetchurl {
+ url = http://gallium.inria.fr/~fpottier/pprint/pprint-20140424.tar.gz;
+ sha256 = "0sc9q89dnyarcg24czyhr6ams0ylqvia3745s6rfwd2nldpygsdk";
+ };
+
+ buildInputs = [ ocaml findlib ];
+
+ createFindlibDestdir = true;
+
+ dontBuild = true;
+ installFlags = "-C src";
+
+ meta = with stdenv.lib; {
+ homepage = http://gallium.inria.fr/~fpottier/pprint/;
+ description = "An OCaml adaptation of Wadler’s and Leijen’s prettier printer";
+ license = licenses.cecill-c;
+ maintainers = [ maintainers.vbgl ];
+ platforms = ocaml.meta.platforms;
+ };
+}
diff --git a/pkgs/development/ocaml-modules/react/default.nix b/pkgs/development/ocaml-modules/react/default.nix
index 6b0e694d54a..dfc8dcd1439 100644
--- a/pkgs/development/ocaml-modules/react/default.nix
+++ b/pkgs/development/ocaml-modules/react/default.nix
@@ -1,11 +1,11 @@
{stdenv, fetchurl, ocaml, findlib, opam}:
stdenv.mkDerivation {
- name = "ocaml-react-1.0.1";
+ name = "ocaml-react-1.1.0";
src = fetchurl {
- url = "http://erratique.ch/software/react/releases/react-1.0.1.tbz";
- sha256 = "007c9kzl0i6xvxnqj9jny4hgm28v9a1i079q53vl5hfb5f7h1mda";
+ url = http://erratique.ch/software/react/releases/react-1.1.0.tbz;
+ sha256 = "1gymn8hy7ga0l9qymmb1jcnnkqvy7l2zr87xavzqz0dfi9ci8dm7";
};
unpackCmd = "tar xjf $src";
@@ -15,8 +15,13 @@ stdenv.mkDerivation {
configurePhase = "ocaml pkg/git.ml";
buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true";
- installPhase = ''
+
+ installPhase =
+ let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version;
+ in
+ ''
opam-installer --script --prefix=$out react.install > install.sh
+ sed -i s!lib/react!lib/ocaml/${ocamlVersion}/site-lib/react! install.sh
sh install.sh
'';
@@ -25,6 +30,6 @@ stdenv.mkDerivation {
description = "Applicative events and signals for OCaml";
license = licenses.bsd3;
platforms = ocaml.meta.platforms;
- maintainers = with maintainers; [ z77z vbmithr ];
+ maintainers = with maintainers; [ z77z vbmithr gal_bolle];
};
}
diff --git a/pkgs/development/ocaml-modules/sawja/default.nix b/pkgs/development/ocaml-modules/sawja/default.nix
index bed87a50f81..534a7684cec 100644
--- a/pkgs/development/ocaml-modules/sawja/default.nix
+++ b/pkgs/development/ocaml-modules/sawja/default.nix
@@ -1,4 +1,7 @@
-{stdenv, fetchurl, which, perl, ocaml, findlib, javalib }:
+{stdenv, fetchurl, which, perl, ocaml, findlib, javalib, camlp4 }:
+
+assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12";
+
let
pname = "sawja";
version = "1.5";
@@ -13,21 +16,24 @@ stdenv.mkDerivation rec {
sha256 = "0i8qgqkw9vgj6k2g6npss268ivxdkzx5qj2a52jbd8ih59rn68cm";
};
- buildInputs = [ which perl ocaml findlib javalib ];
+ buildInputs = [ which perl ocaml findlib camlp4 ];
patches = [ ./configure.sh.patch ./Makefile.config.example.patch ];
createFindlibDestdir = true;
+ preConfigure = "patchShebangs ./configure.sh";
+
configureScript = "./configure.sh";
dontAddPrefix = "true";
propagatedBuildInputs = [ javalib ];
- meta = {
+ meta = with stdenv.lib; {
description = "A library written in OCaml, relying on Javalib to provide a high level representation of Java bytecode programs";
homepage = "${webpage}";
- license = stdenv.lib.licenses.gpl3Plus;
+ license = licenses.gpl3Plus;
+ maintainers = [ maintainers.vbgl ];
platforms = ocaml.meta.platforms;
};
}
diff --git a/pkgs/development/ocaml-modules/sexplib/108.08.00.nix b/pkgs/development/ocaml-modules/sexplib/108.08.00.nix
new file mode 100644
index 00000000000..3dbb0ea8e81
--- /dev/null
+++ b/pkgs/development/ocaml-modules/sexplib/108.08.00.nix
@@ -0,0 +1,29 @@
+{stdenv, fetchurl, ocaml, findlib, typeconv, camlp4}:
+
+let
+ ocaml_version = (builtins.parseDrvName ocaml.name).version;
+in
+
+assert stdenv.lib.versionOlder "3.12" ocaml_version;
+
+stdenv.mkDerivation {
+ name = "ocaml-sexplib-108.08.00";
+
+ src = fetchurl {
+ url = https://ocaml.janestreet.com/ocaml-core/108.08.00/individual/sexplib-108.08.00.tar.gz;
+ sha256 = "11z1k1d7dbb5m957klgalimpr0r602xp5zkkbgbffib1bphasarg";
+ };
+
+ buildInputs = [ocaml findlib];
+ propagatedBuildInputs = [typeconv camlp4];
+
+ createFindlibDestdir = true;
+
+ 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.vbgl ];
+ platforms = ocaml.meta.platforms;
+ };
+}
diff --git a/pkgs/development/ocaml-modules/sexplib/default.nix b/pkgs/development/ocaml-modules/sexplib/default.nix
index 7c40b5e6cfb..a32c6a0e2ce 100644
--- a/pkgs/development/ocaml-modules/sexplib/default.nix
+++ b/pkgs/development/ocaml-modules/sexplib/default.nix
@@ -1,22 +1,29 @@
-{stdenv, fetchurl, ocaml, findlib, ocaml_typeconv}:
+{stdenv, fetchurl, ocaml, findlib, ocaml_typeconv, camlp4}:
+
+let
+ ocaml_version = (builtins.parseDrvName ocaml.name).version;
+in
+
+assert stdenv.lib.versionOlder "4.00" ocaml_version;
stdenv.mkDerivation {
- name = "ocaml-sexplib-7.0.5";
+ name = "ocaml-sexplib-111.25.0";
src = fetchurl {
- url = "http://forge.ocamlcore.org/frs/download.php/832/sexplib-7.0.5.tar.gz";
- sha256 = "b1022da052254581aae51fb634345920364439f715a2c786abcd0b828c2ce697";
+ url = https://ocaml.janestreet.com/ocaml-core/111.25.00/individual/sexplib-111.25.00.tar.gz;
+ sha256 = "0qh0zqp5nakqpmmhh4x7cg03vqj3j2bj4zj0nqdlksai188p9ila";
};
- patches = [ ./sexp-3.10-compat.patch ./sexplib-7.0.5-patch-ocamlbuild-ocaml4.patch ];
- buildInputs = [ocaml findlib ocaml_typeconv ];
+ buildInputs = [ocaml findlib];
+ propagatedBuildInputs = [ocaml_typeconv camlp4];
createFindlibDestdir = true;
- meta = {
- homepage = "http://forge.ocamlcore.org/projects/sexplib/";
+ meta = with stdenv.lib; {
+ homepage = https://ocaml.janestreet.com/;
description = "Library for serializing OCaml values to and from S-expressions";
- license = "LGPL";
+ license = licenses.asl20;
+ maintainers = [ maintainers.vbgl ];
platforms = ocaml.meta.platforms;
};
}
diff --git a/pkgs/development/ocaml-modules/sexplib/sexp-3.10-compat.patch b/pkgs/development/ocaml-modules/sexplib/sexp-3.10-compat.patch
deleted file mode 100644
index 45e2abc6186..00000000000
--- a/pkgs/development/ocaml-modules/sexplib/sexp-3.10-compat.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-diff -ur orig/sexplib-7.0.5/lib/conv.ml sexplib-7.0.5/lib/conv.ml
---- orig/sexplib-7.0.5/lib/conv.ml 2012-03-20 17:41:54.000000000 +0100
-+++ sexplib-7.0.5/lib/conv.ml 2012-03-26 20:04:58.128032729 +0200
-@@ -665,7 +665,7 @@
- | Parse_error pe ->
- let ppos =
- match pe.parse_state with
-- | `Sexp { parse_pos } | `Annot { parse_pos } -> parse_pos
-+ | `Sexp { parse_pos = parse_pos } | `Annot { parse_pos = parse_pos } -> parse_pos
- in
- List [
- Atom "Sexplib.Sexp.Parse_error";
-diff -ur orig/sexplib-7.0.5/lib/pre_sexp.ml sexplib-7.0.5/lib/pre_sexp.ml
---- orig/sexplib-7.0.5/lib/pre_sexp.ml 2012-03-20 17:41:54.000000000 +0100
-+++ sexplib-7.0.5/lib/pre_sexp.ml 2012-03-26 20:04:58.129032741 +0200
-@@ -172,13 +172,7 @@
- (* Output of S-expressions to file *)
-
- let save_of_output ?perm output_function file sexp =
-- let tmp_name, oc =
-- let temp_dir =
-- if Filename.is_relative file then "."
-- else Filename.dir_sep
-- in
-- Filename.open_temp_file ~temp_dir file "tmp"
-- in
-+ let tmp_name, oc = Filename.open_temp_file file "tmp" in
- try
- output_function oc sexp;
- close_out oc;
-@@ -316,9 +310,9 @@
- else if text_char < 0 then fail "text_char < 0"
- else if global_offset < 0 then fail "global_offset < 0"
- else if buf_pos < 0 then fail "buf_pos < 0"
-- else { text_line; text_char; global_offset; buf_pos }
-+ else { text_line = text_line; text_char = text_char; global_offset = global_offset; buf_pos = buf_pos }
-
-- let with_buf_pos t buf_pos = { t with buf_pos }
-+ let with_buf_pos t buf_pos = { t with buf_pos = buf_pos }
- end
-
- type ('a, 't) parse_result =
-@@ -347,11 +341,11 @@
-
- exception Parse_error of parse_error
-
--let bump_text_line { parse_pos } =
-+let bump_text_line { parse_pos = parse_pos } =
- parse_pos.Parse_pos.text_line <- parse_pos.Parse_pos.text_line + 1;
- parse_pos.Parse_pos.text_char <- 0
-
--let bump_text_pos { parse_pos } =
-+let bump_text_pos { parse_pos = parse_pos } =
- parse_pos.Parse_pos.text_char <- parse_pos.Parse_pos.text_char + 1
-
- let bump_pos_cont state str ~max_pos ~pos cont =
-@@ -378,18 +372,18 @@
- parse_pos.Parse_pos.buf_pos <- buf_pos;
- parse_pos.Parse_pos.global_offset <- parse_pos.Parse_pos.global_offset + len
-
--let mk_parse_pos { parse_pos } buf_pos =
-+let mk_parse_pos { parse_pos = parse_pos } buf_pos =
- set_parse_pos parse_pos buf_pos;
- parse_pos
-
- let raise_parse_error parse_state location buf_pos err_msg =
- begin
- match parse_state with
-- | `Sexp { parse_pos } | `Annot { parse_pos } ->
-+ | `Sexp { parse_pos = parse_pos } | `Annot { parse_pos = parse_pos } ->
- set_parse_pos parse_pos buf_pos;
- parse_pos.Parse_pos.text_char <- parse_pos.Parse_pos.text_char + 1;
- end;
-- let parse_error = { location; err_msg; parse_state } in
-+ let parse_error = { location = location; err_msg = err_msg; parse_state = parse_state } in
- raise (Parse_error parse_error)
-
- let raise_unexpected_char parse_state location buf_pos c =
-@@ -657,7 +651,7 @@
- let max_pos = check_str_bounds "parse" ~pos ~len str in \
- let state = \
- { \
-- parse_pos; \
-+ parse_pos = parse_pos; \
- pstack = INIT_PSTACK; \
- pbuf = Buffer.create 128; \
- } \
-@@ -681,20 +675,20 @@
-
- let mk_annot_pos
- ({ Parse_pos.text_line = line; text_char = col } as parse_pos) pos =
-- { Annot.line; col; offset = get_glob_ofs parse_pos pos }
-+ { Annot.line = line; col = col; offset = get_glob_ofs parse_pos pos }
-
- let mk_annot_pos1
- ({ Parse_pos.text_line = line; text_char = col } as parse_pos) pos =
-- { Annot.line; col = col + 1; offset = get_glob_ofs parse_pos pos }
-+ { Annot.line = line; col = col + 1; offset = get_glob_ofs parse_pos pos }
-
--let add_annot_pos { parse_pos; pstack } pos =
-+let add_annot_pos { parse_pos = parse_pos; pstack = pstack } pos =
- pstack.Annot.positions <- mk_annot_pos parse_pos pos :: pstack.Annot.positions
-
--let add_annot_pos1 { parse_pos; pstack } pos =
-+let add_annot_pos1 { parse_pos = parse_pos; pstack = pstack } pos =
- pstack.Annot.positions <-
- mk_annot_pos1 parse_pos pos :: pstack.Annot.positions
-
--let get_annot_range { parse_pos; pstack } pos =
-+let get_annot_range { parse_pos = parse_pos; pstack = pstack } pos =
- let start_pos =
- match pstack.Annot.positions with
- | [] -> assert false (* impossible *)
-@@ -708,7 +702,7 @@
- offset = get_glob_ofs parse_pos pos;
- }
- in
-- { Annot.start_pos; end_pos }
-+ { Annot.start_pos = start_pos; end_pos = end_pos }
-
- let mk_annot_atom parse_state str pos =
- Annot.Atom (get_annot_range parse_state pos, Atom str)
-@@ -780,7 +774,7 @@
- let rec loop this_parse ~pos ~len ~is_incomplete =
- if len > 0 then
- match this_parse ~pos ~len buf with
-- | Done (sexp, ({ Parse_pos.buf_pos } as parse_pos)) ->
-+ | Done (sexp, ({ Parse_pos.buf_pos = buf_pos } as parse_pos)) ->
- rev_sexps_ref := sexp :: !rev_sexps_ref;
- let n_parsed = buf_pos - pos in
- let this_parse = mk_this_parse ~parse_pos my_parse in
-@@ -813,7 +807,7 @@
-
- let of_string_bigstring loc this_parse ws_buf get_len get_sub str =
- match this_parse str with
-- | Done (_, { Parse_pos.buf_pos }) when buf_pos <> get_len str ->
-+ | Done (_, { Parse_pos.buf_pos = buf_pos }) when buf_pos <> get_len str ->
- let prefix_len = min (get_len str - buf_pos) 20 in
- let prefix = get_sub str buf_pos prefix_len in
- let msg =
-@@ -874,7 +868,7 @@
- failwith (sprintf "Sexplib.Sexp.gen_load_sexp: end of file: %s" file)
- else
- match this_parse ~pos:0 ~len buf with
-- | Done (sexp, ({ Parse_pos.buf_pos } as parse_pos))
-+ | Done (sexp, ({ Parse_pos.buf_pos = buf_pos } as parse_pos))
- when strict ->
- let rec strict_loop this_parse ~pos ~len =
- match this_parse ~pos ~len buf with
-@@ -938,7 +932,7 @@
-
- let get_conv_exn ~file ~exc annot_sexp =
- let range = get_range annot_sexp in
-- let { start_pos = { line; col } } = range in
-+ let { start_pos = { line = line; col = col } } = range in
- let loc = sprintf "%s:%d:%d" file line col in
- Of_sexp_error (Annot.Conv_exn (loc, exc), get_sexp annot_sexp)
- end
-@@ -1003,7 +997,7 @@
- let sexp = of_string str in
- try f sexp
- with Of_sexp_error (exc, sub_sexp) ->
-- raise (Of_string_conv_exn.E { Of_string_conv_exn.exc; sexp; sub_sexp })
-+ raise (Of_string_conv_exn.E { Of_string_conv_exn.exc = exc; sexp = sexp; sub_sexp = sub_sexp })
-
- let of_string_conv_exn str f = gen_of_string_conv_exn of_string str f
- let of_bigstring_conv_exn bstr f = gen_of_string_conv_exn of_bigstring bstr f
diff --git a/pkgs/development/ocaml-modules/sexplib/sexplib-7.0.5-patch-ocamlbuild-ocaml4.patch b/pkgs/development/ocaml-modules/sexplib/sexplib-7.0.5-patch-ocamlbuild-ocaml4.patch
deleted file mode 100644
index 02e13e39445..00000000000
--- a/pkgs/development/ocaml-modules/sexplib/sexplib-7.0.5-patch-ocamlbuild-ocaml4.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Patch from the fedora repository.
-
---- sexplib-7.0.5.old/myocamlbuild.ml 2012-03-20 16:41:54.000000000 +0000
-+++ sexplib-7.0.5/myocamlbuild.ml 2012-07-30 11:38:21.829869635 +0100
-@@ -438,7 +438,13 @@
- BaseEnvLight.var_choose cond_specs env
- in
- flag tags & spec)
-- t.flags
-+ t.flags;
-+
-+ flag ["ocaml"; "compile"; "byte"; "use_toploop"] (S[A"-I"; A"+compiler-libs"]);
-+ flag ["ocaml"; "link"; "byte"; "use_toploop"] (S[A"-I"; A"+compiler-libs"; A"+compiler-libs/ocamltoplevel.cma"]);
-+ flag ["ocaml"; "compile"; "native"; "use_toploop"] (S[A"-I"; A"+compiler-libs"]);
-+ flag ["ocaml"; "link"; "native"; "use_toploop"] (S[A"-I"; A"+compiler-libs"; A"+compiler-libs/ocamltoplevel.cmxa"]);
-+
- | _ ->
- ()
-
---- sexplib-7.0.5.old/_tags 2012-03-20 16:41:54.000000000 +0000
-+++ sexplib-7.0.5/_tags 2012-07-30 11:37:01.749255839 +0100
-@@ -49,6 +49,7 @@
- : pkg_camlp4.extend
- # Library sexplib_top
- "top": include
-+: use_toploop
- # Executable sexp_test
- "lib_test/sexp_test.byte": use_sexplib
- "lib_test/sexp_test.byte": pkg_unix
diff --git a/pkgs/development/ocaml-modules/sqlite3EZ/default.nix b/pkgs/development/ocaml-modules/sqlite3EZ/default.nix
new file mode 100644
index 00000000000..94377a646c1
--- /dev/null
+++ b/pkgs/development/ocaml-modules/sqlite3EZ/default.nix
@@ -0,0 +1,26 @@
+{stdenv, fetchurl, ocaml, findlib, twt, ocaml_sqlite3 }:
+
+assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12";
+
+stdenv.mkDerivation {
+ name = "ocaml-sqlite3EZ-0.1.0";
+
+ src = fetchurl {
+ url = https://github.com/mlin/ocaml-sqlite3EZ/archive/v0.1.0.tar.gz;
+ sha256 = "8ed2c5d5914a65cbd95589ef11bfb8b38a020eb850cdd49b8adce7ee3a563748";
+ };
+
+ buildInputs = [ ocaml findlib twt ];
+
+ propagatedBuildInputs = [ ocaml_sqlite3 ];
+
+ createFindlibDestdir = true;
+
+ meta = with stdenv.lib; {
+ homepage = http://github.com/mlin/ocaml-sqlite3EZ;
+ description = "A thin wrapper for sqlite3-ocaml with a simplified interface";
+ license = licenses.mit;
+ maintainers = [ maintainers.vbgl ];
+ platforms = ocaml.meta.platforms;
+ };
+}
diff --git a/pkgs/development/ocaml-modules/twt/default.nix b/pkgs/development/ocaml-modules/twt/default.nix
new file mode 100644
index 00000000000..0dc7170552c
--- /dev/null
+++ b/pkgs/development/ocaml-modules/twt/default.nix
@@ -0,0 +1,30 @@
+{stdenv, fetchurl, ocaml, findlib }:
+
+stdenv.mkDerivation {
+ name = "ocaml-twt-0.93.2";
+
+ src = fetchurl {
+ url = https://github.com/mlin/twt/archive/v0.93.2.tar.gz;
+ sha256 = "aec091fbd1e6c4d252cf9664237418b4bc8c7d6b7a17475589be78365397e768";
+ };
+
+ buildInputs = [ ocaml findlib ];
+
+ createFindlibDestdir = true;
+
+ configurePhase = ''
+ mkdir $out/bin
+ '';
+
+ dontBuild = true;
+
+ installFlags = "PREFIX=$(out)";
+
+ meta = with stdenv.lib; {
+ homepage = http://people.csail.mit.edu/mikelin/ocaml+twt/;
+ description = "“The Whitespace Thing” for OCaml";
+ license = licenses.mit;
+ maintainers = [ maintainers.vbgl ];
+ platforms = ocaml.meta.platforms;
+ };
+}
diff --git a/pkgs/development/ocaml-modules/typeconv/108.08.00.nix b/pkgs/development/ocaml-modules/typeconv/108.08.00.nix
new file mode 100644
index 00000000000..805a8926e18
--- /dev/null
+++ b/pkgs/development/ocaml-modules/typeconv/108.08.00.nix
@@ -0,0 +1,28 @@
+{stdenv, fetchurl, ocaml, findlib, camlp4}:
+
+let
+ ocaml_version = (builtins.parseDrvName ocaml.name).version;
+in
+
+assert stdenv.lib.versionOlder "3.12" ocaml_version;
+
+stdenv.mkDerivation {
+ name = "ocaml-typeconv-108.08.00";
+
+ src = fetchurl {
+ url = https://ocaml.janestreet.com/ocaml-core/108.08.00/individual/type_conv-108.08.00.tar.gz;
+ sha256 = "08ysikwwp69zvc147lzzg79nwlrzrk738rj0ggcfadi8h5il42sl";
+ };
+
+ buildInputs = [ocaml findlib camlp4];
+
+ createFindlibDestdir = true;
+
+ meta = with stdenv.lib; {
+ homepage = https://ocaml.janestreet.com/;
+ description = "Support library for OCaml preprocessor type conversions";
+ #license = licenses.apl20; invalid license
+ platforms = ocaml.meta.platforms;
+ maintainers = with maintainers; [ z77z ];
+ };
+}
diff --git a/pkgs/development/ocaml-modules/typeconv/3.0.5.nix b/pkgs/development/ocaml-modules/typeconv/3.0.5.nix
deleted file mode 100644
index 299e7729b91..00000000000
--- a/pkgs/development/ocaml-modules/typeconv/3.0.5.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{stdenv, fetchurl, ocaml, findlib}:
-
-# note: works only with ocaml >3.12
-
-stdenv.mkDerivation {
- name = "ocaml-typeconv-3.0.5";
-
- src = fetchurl {
- url = "http://forge.ocamlcore.org/frs/download.php/821/type_conv-3.0.5.tar.gz";
- sha256 = "90ac6c401a600a23012a3f513def6f67d4979b11bd551f4d0af78f0f0b479198";
- };
-
- buildInputs = [ocaml findlib ];
-
- createFindlibDestdir = true;
-
- meta = {
- homepage = "http://forge.ocamlcore.org/projects/type-conv/";
- description = "Support library for OCaml preprocessor type conversions";
- license = "LGPL";
- platforms = ocaml.meta.platforms;
- };
-}
diff --git a/pkgs/development/ocaml-modules/typeconv/default.nix b/pkgs/development/ocaml-modules/typeconv/default.nix
index 33e30f5d5c8..359f906ce34 100644
--- a/pkgs/development/ocaml-modules/typeconv/default.nix
+++ b/pkgs/development/ocaml-modules/typeconv/default.nix
@@ -1,4 +1,10 @@
-{stdenv, fetchurl, ocaml, findlib}:
+{stdenv, fetchurl, ocaml, findlib, camlp4}:
+
+let
+ ocaml_version = (builtins.parseDrvName ocaml.name).version;
+in
+
+assert stdenv.lib.versionOlder "4.00" ocaml_version;
stdenv.mkDerivation {
name = "ocaml-typeconv-109.60.01";
@@ -8,7 +14,7 @@ stdenv.mkDerivation {
sha256 = "0lpxri68glgq1z2pp02rp45cb909xywbff8d4idljrf6fzzil2zx";
};
- buildInputs = [ocaml findlib ];
+ buildInputs = [ocaml findlib camlp4];
createFindlibDestdir = true;
diff --git a/pkgs/development/ocaml-modules/tyxml/default.nix b/pkgs/development/ocaml-modules/tyxml/default.nix
new file mode 100644
index 00000000000..648f0a9cd17
--- /dev/null
+++ b/pkgs/development/ocaml-modules/tyxml/default.nix
@@ -0,0 +1,25 @@
+{stdenv, fetchurl, ocaml, findlib, ocaml_oasis, camlp4}:
+
+stdenv.mkDerivation {
+ name = "tyxml-3.1.1";
+
+ src = fetchurl {
+ url = http://github.com/ocsigen/tyxml/archive/3.1.1.tar.gz;
+ sha256 = "1r8im382r68kn8qy0857nv3y7h42i6ajyclxzmigfai7v2xdd05z";
+ };
+
+ buildInputs = [ocaml findlib ocaml_oasis camlp4];
+
+ createFindlibDestdir = true;
+
+ meta = with stdenv.lib; {
+ homepage = http://ocsigen.org/tyxml/;
+ description = "A library that makes it almost impossible for your OCaml programs to generate wrong XML ouput, using static typing";
+ license = licenses.lgpl21;
+ platforms = ocaml.meta.platforms;
+ maintainers = with maintainers; [
+ gal_bolle vbgl
+ ];
+ };
+
+}
diff --git a/pkgs/development/ocaml-modules/uucd/default.nix b/pkgs/development/ocaml-modules/uucd/default.nix
index 1d0f5c6cd50..476f0e9bbe8 100644
--- a/pkgs/development/ocaml-modules/uucd/default.nix
+++ b/pkgs/development/ocaml-modules/uucd/default.nix
@@ -30,10 +30,11 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ xmlm ];
- meta = {
+ meta = with stdenv.lib; {
description = "An OCaml module to decode the data of the Unicode character database from its XML representation";
homepage = "${webpage}";
platforms = ocaml.meta.platforms;
- license = stdenv.lib.licenses.bsd3;
+ maintainers = [ maintainers.vbgl ];
+ license = licenses.bsd3;
};
}
diff --git a/pkgs/development/ocaml-modules/uunf/default.nix b/pkgs/development/ocaml-modules/uunf/default.nix
index c807bbd4463..ece5fb5e3e3 100644
--- a/pkgs/development/ocaml-modules/uunf/default.nix
+++ b/pkgs/development/ocaml-modules/uunf/default.nix
@@ -5,6 +5,9 @@ let
webpage = "http://erratique.ch/software/${pname}";
ocaml_version = (builtins.parseDrvName ocaml.name).version;
in
+
+assert stdenv.lib.versionAtLeast ocaml_version "3.12";
+
stdenv.mkDerivation rec {
name = "ocaml-${pname}-${version}";
@@ -28,10 +31,11 @@ stdenv.mkDerivation rec {
ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml_version}/site-lib/
'';
- meta = {
+ meta = with stdenv.lib; {
description = "An OCaml module for normalizing Unicode text";
homepage = "${webpage}";
platforms = ocaml.meta.platforms;
- license = stdenv.lib.licenses.bsd3;
+ license = licenses.bsd3;
+ maintainers = [ maintainers.vbgl ];
};
}
diff --git a/pkgs/development/ocaml-modules/uutf/default.nix b/pkgs/development/ocaml-modules/uutf/default.nix
index 862236c169b..26dc9742aeb 100644
--- a/pkgs/development/ocaml-modules/uutf/default.nix
+++ b/pkgs/development/ocaml-modules/uutf/default.nix
@@ -5,6 +5,9 @@ let
webpage = "http://erratique.ch/software/${pname}";
ocaml_version = (builtins.parseDrvName ocaml.name).version;
in
+
+assert stdenv.lib.versionAtLeast ocaml_version "3.12";
+
stdenv.mkDerivation rec {
name = "ocaml-${pname}-${version}";
@@ -28,10 +31,11 @@ stdenv.mkDerivation rec {
ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml_version}/site-lib/
'';
- meta = {
+ meta = with stdenv.lib; {
description = "Non-blocking streaming Unicode codec for OCaml";
homepage = "${webpage}";
platforms = ocaml.meta.platforms;
- license = stdenv.lib.licenses.bsd3;
+ license = licenses.bsd3;
+ maintainers = [ maintainers.vbgl ];
};
}
diff --git a/pkgs/development/ocaml-modules/xmlm/default.nix b/pkgs/development/ocaml-modules/xmlm/default.nix
index bd19ab716f6..dacaeea49f4 100644
--- a/pkgs/development/ocaml-modules/xmlm/default.nix
+++ b/pkgs/development/ocaml-modules/xmlm/default.nix
@@ -5,6 +5,9 @@ let
webpage = "http://erratique.ch/software/${pname}";
ocaml_version = (builtins.parseDrvName ocaml.name).version;
in
+
+assert stdenv.lib.versionAtLeast ocaml_version "3.12";
+
stdenv.mkDerivation rec {
name = "ocaml-${pname}-${version}";
@@ -28,10 +31,11 @@ stdenv.mkDerivation rec {
ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml_version}/site-lib/
'';
- meta = {
+ meta = with stdenv.lib; {
description = "An OCaml streaming codec to decode and encode the XML data format";
homepage = "${webpage}";
platforms = ocaml.meta.platforms;
- license = stdenv.lib.licenses.bsd3;
+ maintainers = [ maintainers.vbgl ];
+ license = licenses.bsd3;
};
}
diff --git a/pkgs/development/ocaml-modules/yojson/default.nix b/pkgs/development/ocaml-modules/yojson/default.nix
index 9237db080d6..0b40b68a7e8 100644
--- a/pkgs/development/ocaml-modules/yojson/default.nix
+++ b/pkgs/development/ocaml-modules/yojson/default.nix
@@ -4,16 +4,18 @@ let
version = "1.1.8";
webpage = "http://mjambon.com/${pname}.html";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
- name = "${pname}-${version}";
+ name = "ocaml-${pname}-${version}";
src = fetchurl {
- url = "http://mjambon.com/releases/${pname}/${name}.tar.gz";
+ url = "http://mjambon.com/releases/${pname}/${pname}-${version}.tar.gz";
sha256 = "0ayx17dimnpavdfyq6dk9xv2x1fx69by85vc6vl3nqxjkcv5d2rv";
};
- buildInputs = [ ocaml findlib cppo easy-format biniou ];
+ buildInputs = [ ocaml findlib ];
+
+ propagatedBuildInputs = [ cppo easy-format biniou ];
createFindlibDestdir = true;
@@ -23,10 +25,11 @@ stdenv.mkDerivation rec {
mkdir $out/bin
'';
- meta = {
+ meta = with stdenv.lib; {
description = "An optimized parsing and printing library for the JSON format";
homepage = "${webpage}";
- license = stdenv.lib.licenses.bsd3;
+ license = licenses.bsd3;
+ maintainers = [ maintainers.vbgl ];
platforms = ocaml.meta.platforms;
};
}
diff --git a/pkgs/development/ocaml-modules/zed/default.nix b/pkgs/development/ocaml-modules/zed/default.nix
new file mode 100644
index 00000000000..3c2fae472be
--- /dev/null
+++ b/pkgs/development/ocaml-modules/zed/default.nix
@@ -0,0 +1,34 @@
+{stdenv, fetchurl, ocaml, findlib, camomile, ocaml_react}:
+
+stdenv.mkDerivation rec {
+ version = "1.3";
+ name = "ocaml-zed-${version}";
+
+ src = fetchurl {
+ url = https://github.com/diml/zed/archive/1.3.tar.gz;
+ sha256 = "1fr9xzf5msdnl2wx279aqj051nqbhs6v9aq1mfpv3r1mrqvrrfwj";
+ };
+
+ buildInputs = [ ocaml findlib ocaml_react];
+
+ propagatedBuildInputs = [ camomile ];
+
+ createFindlibDestdir = true;
+
+ meta = {
+ description = "Abstract engine for text edition in OCaml";
+ longDescription = ''
+ Zed is an abstract engine for text edition. It can be used to write text editors, edition widgets, readlines, ...
+
+ Zed uses Camomile to fully support the Unicode specification, and implements an UTF-8 encoded string type with validation, and a rope datastructure to achieve efficient operations on large Unicode buffers. Zed also features a regular expression search on ropes.
+
+ To support efficient text edition capabilities, Zed provides macro recording and cursor management facilities.
+ '';
+ homepage = https://github.com/diml/zed;
+ license = stdenv.lib.licenses.bsd3;
+ platforms = ocaml.meta.platforms;
+ maintainers = [
+ stdenv.lib.maintainers.gal_bolle
+ ];
+ };
+}
diff --git a/pkgs/development/pharo/launcher/default.nix b/pkgs/development/pharo/launcher/default.nix
new file mode 100644
index 00000000000..928a5d33f8f
--- /dev/null
+++ b/pkgs/development/pharo/launcher/default.nix
@@ -0,0 +1,71 @@
+{ stdenv, fetchurl, bash, pharo-vm, unzip, makeDesktopItem }:
+
+stdenv.mkDerivation rec {
+ version = "0.2.1-2014.09.29";
+ name = "pharo-launcher-${version}";
+ src = fetchurl {
+ url = "http://files.pharo.org/platform/launcher/blessed/PharoLauncher-user-${version}.zip";
+ md5 = "10945989c2b323c7f09a3b4e42ee7f2d";
+ };
+
+ executable-name = "pharo-launcher";
+
+ desktopItem = makeDesktopItem {
+ name = "Pharo";
+ exec = "${executable-name}";
+ icon = "pharo";
+ comment = "Launcher for Pharo distributions";
+ desktopName = "Pharo";
+ genericName = "Pharo";
+ categories = "Development;";
+ };
+
+ # because upstream tarball has no top-level directory.
+ sourceRoot = ".";
+
+ buildInputs = [ bash pharo-vm unzip ];
+
+ installPhase = ''
+ mkdir -p $prefix/share/pharo-launcher
+ mkdir -p $prefix/bin
+
+ mv PharoLauncher.image $prefix/share/pharo-launcher/pharo-launcher.image
+ mv PharoLauncher.changes $prefix/share/pharo-launcher/pharo-launcher.changes
+
+ mkdir -p $prefix/share/applications
+ cp "${desktopItem}/share/applications/"* $out/share/applications
+
+ cat > $prefix/bin/${executable-name} <
-Subject: Fix use of absolute paths in cmake files
-
-* build/directories.cmake
-* build/CMakeLists.txt
-* build/vm-sound-ALSA/CMakeLists.txt
-* build/vm-sound-null/CMakeLists.txt
-* build/vm-display-null/CMakeLists.txt
-* build/vm-display-X11/CMakeLists.txt
---- a/build/CMakeLists.txt
-+++ b/build/CMakeLists.txt
-@@ -71,7 +71,7 @@
- list(APPEND LINKLIBS m)
- list(APPEND LINKLIBS dl)
- list(APPEND LINKLIBS pthread)
--set(EXECUTABLE_OUTPUT_PATH "/builds/workspace/Pharo-vm-unix-sources/cog/results")
-+set(EXECUTABLE_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/../results")
- add_subdirectory("vm-display-null")
- add_subdirectory("vm-display-X11")
- add_subdirectory("vm-sound-ALSA")
---- a/build/directories.cmake
-+++ b/build/directories.cmake
-@@ -1,12 +1,12 @@
--set(topDir "/builds/workspace/Pharo-vm-unix-sources/cog")
--set(buildDir "/builds/workspace/Pharo-vm-unix-sources/cog/build")
-+set(topDir "${CMAKE_SOURCE_DIR}/..")
-+set(buildDir "${CMAKE_SOURCE_DIR}/../build")
- set(thirdpartyDir "${buildDir}/thirdParty")
--set(platformsDir "/builds/workspace/Pharo-vm-unix-sources/cog/platforms")
--set(srcDir "/builds/workspace/Pharo-vm-unix-sources/cog/src")
-+set(platformsDir "${CMAKE_SOURCE_DIR}/../platforms")
-+set(srcDir "${CMAKE_SOURCE_DIR}/../src")
- set(srcPluginsDir "${srcDir}/plugins")
- set(srcVMDir "${srcDir}/vm")
- set(platformName "unix")
- set(targetPlatform ${platformsDir}/${platformName})
- set(crossDir "${platformsDir}/Cross")
- set(platformVMDir "${targetPlatform}/vm")
--set(outputDir "/builds/workspace/Pharo-vm-unix-sources/cog/results")
-+set(outputDir "${CMAKE_SOURCE_DIR}/../results")
---- a/build/vm-display-X11/CMakeLists.txt
-+++ b/build/vm-display-X11/CMakeLists.txt
-@@ -11,7 +11,7 @@
- include_directories(${crossDir}/plugins/FilePlugin)
- include_directories(${targetPlatform}/plugins/B3DAcceleratorPlugin)
- include_directories(${crossDir}/plugins/B3DAcceleratorPlugin)
--set(LIBRARY_OUTPUT_PATH "/builds/workspace/Pharo-vm-unix-sources/cog/results")
-+set(LIBRARY_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/../results")
- list(APPEND LINKLIBS SM)
- list(APPEND LINKLIBS ICE)
- list(APPEND LINKLIBS GL)
---- a/build/vm-display-null/CMakeLists.txt
-+++ b/build/vm-display-null/CMakeLists.txt
-@@ -11,7 +11,7 @@
- include_directories(${crossDir}/plugins/FilePlugin)
- include_directories(${targetPlatform}/plugins/B3DAcceleratorPlugin)
- include_directories(${crossDir}/plugins/B3DAcceleratorPlugin)
--set(LIBRARY_OUTPUT_PATH "/builds/workspace/Pharo-vm-unix-sources/cog/results")
-+set(LIBRARY_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/../results")
- target_link_libraries(vm-display-null ${LINKLIBS})
- set_target_properties(vm-display-null PROPERTIES PREFIX "" SUFFIX ""
- LINK_FLAGS -m32)
---- a/build/vm-sound-ALSA/CMakeLists.txt
-+++ b/build/vm-sound-ALSA/CMakeLists.txt
-@@ -11,7 +11,7 @@
- include_directories(${crossDir}/plugins/FilePlugin)
- include_directories(${targetPlatform}/plugins/B3DAcceleratorPlugin)
- include_directories(${crossDir}/plugins/B3DAcceleratorPlugin)
--set(LIBRARY_OUTPUT_PATH "/builds/workspace/Pharo-vm-unix-sources/cog/results")
-+set(LIBRARY_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/../results")
- target_link_libraries(vm-sound-ALSA ${LINKLIBS})
- set_target_properties(vm-sound-ALSA PROPERTIES PREFIX "" SUFFIX ""
- LINK_FLAGS -m32)
---- a/build/vm-sound-null/CMakeLists.txt
-+++ b/build/vm-sound-null/CMakeLists.txt
-@@ -11,7 +11,7 @@
- include_directories(${crossDir}/plugins/FilePlugin)
- include_directories(${targetPlatform}/plugins/B3DAcceleratorPlugin)
- include_directories(${crossDir}/plugins/B3DAcceleratorPlugin)
--set(LIBRARY_OUTPUT_PATH "/builds/workspace/Pharo-vm-unix-sources/cog/results")
-+set(LIBRARY_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/../results")
- target_link_libraries(vm-sound-null ${LINKLIBS})
- set_target_properties(vm-sound-null PROPERTIES PREFIX "" SUFFIX ""
- LINK_FLAGS -m32)
diff --git a/pkgs/development/pharo/vm/patches/fix-executable-name.patch b/pkgs/development/pharo/vm/patches/fix-executable-name.patch
deleted file mode 100644
index b32ed7a32d2..00000000000
--- a/pkgs/development/pharo/vm/patches/fix-executable-name.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Change the name of the executable file from Squeak to Pharo
---- a/platforms/unix/vm-display-X11/sqUnixX11.c
-+++ b/platforms/unix/vm-display-X11/sqUnixX11.c
-@@ -153,8 +153,8 @@
- /*** Variables -- X11 Related ***/
-
- /* name of Squeak windows in Xrm and the WM */
--#define xResClass "Squeak"
--#define xResName "squeak"
-+#define xResClass "pharo-vm"
-+#define xResName "Pharo"
-
- char *displayName= 0; /* name of display, or 0 for $DISPLAY */
- Display *stDisplay= null; /* Squeak display */
diff --git a/pkgs/development/pharo/vm/patches/pharo-is-not-squeak.patch b/pkgs/development/pharo/vm/patches/pharo-is-not-squeak.patch
deleted file mode 100644
index c06916c96ee..00000000000
--- a/pkgs/development/pharo/vm/patches/pharo-is-not-squeak.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-pharo --help must talk about Pharo and not about Squeak
---- a/platforms/unix/vm-display-X11/sqUnixX11.c
-+++ b/platforms/unix/vm-display-X11/sqUnixX11.c
-@@ -7075,8 +7075,8 @@
- printf(" -lazy go to sleep when main window unmapped\n");
- printf(" -mapdelbs map Delete key onto Backspace\n");
- printf(" -nointl disable international keyboard support\n");
-- printf(" -notitle disable the Squeak window title bar\n");
-- printf(" -title use t as the Squeak window title instead of the image name\n");
-+ printf(" -notitle disable the Pharo window title bar\n");
-+ printf(" -title use t as the Pharo window title instead of the image name\n");
- printf(" -ldtoms launch drop timeout milliseconds\n");
- printf(" -noxdnd disable X drag-and-drop protocol support\n");
- printf(" -optmod map Mod to the Option key\n");
-@@ -7095,7 +7095,7 @@
- static void display_printUsageNotes(void)
- {
- printf(" Using `unix:0' for may improve local display performance.\n");
-- printf(" -xshm only works when Squeak is running on the X server host.\n");
-+ printf(" -xshm only works when Pharo is running on the X server host.\n");
- }
-
-
diff --git a/pkgs/development/python-modules/dbus/default.nix b/pkgs/development/python-modules/dbus/default.nix
index d88504379ed..bc386e7e5ac 100644
--- a/pkgs/development/python-modules/dbus/default.nix
+++ b/pkgs/development/python-modules/dbus/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, python, pkgconfig, dbus, dbus_glib, dbus_tools }:
+{ stdenv, fetchurl, python, pkgconfig, dbus, dbus_glib, dbus_tools, isPyPy }:
-stdenv.mkDerivation rec {
+if isPyPy then throw "dbus-python not supported for interpreter ${python.executable}" else stdenv.mkDerivation rec {
name = "dbus-python-1.2.0";
src = fetchurl {
diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix
index 0f5d8499454..6ec7934e563 100644
--- a/pkgs/development/python-modules/generic/default.nix
+++ b/pkgs/development/python-modules/generic/default.nix
@@ -49,10 +49,9 @@
, ... } @ attrs:
-assert (!disabled);
# Keep extra attributes from `attrs`, e.g., `patchPhase', etc.
-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;
@@ -162,11 +161,12 @@ python.stdenv.mkDerivation (attrs // {
shellHook = attrs.shellHook or ''
if test -e setup.py; then
- mkdir -p /tmp/$name/lib/${python.libPrefix}/site-packages
+ tmp_path=/tmp/`pwd | md5sum | cut -f 1 -d " "`-$name
+ mkdir -p $tmp_path/lib/${python.libPrefix}/site-packages
${preShellHook}
- export PATH="/tmp/$name/bin:$PATH"
- export PYTHONPATH="/tmp/$name/lib/${python.libPrefix}/site-packages:$PYTHONPATH"
- ${python}/bin/${python.executable} setup.py develop --prefix /tmp/$name
+ export PATH="$tmp_path/bin:$PATH"
+ export PYTHONPATH="$tmp_path/lib/${python.libPrefix}/site-packages:$PYTHONPATH"
+ ${python}/bin/${python.executable} setup.py develop --prefix $tmp_path
${postShellHook}
fi
'';
diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix
new file mode 100644
index 00000000000..39a35ad49c6
--- /dev/null
+++ b/pkgs/development/python-modules/h5py/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchurl, python, buildPythonPackage
+, numpy, hdf5, cython
+, mpiSupport ? false, mpi4py ? null, mpi ? null }:
+
+assert mpiSupport == hdf5.mpiSupport;
+assert mpiSupport -> mpi != null
+ && mpi4py != null
+ && mpi == mpi4py.mpi
+ && mpi == hdf5.mpi
+ ;
+
+with stdenv.lib;
+
+buildPythonPackage rec {
+ name = "h5py-2.3.1";
+
+ src = fetchurl {
+ url = "https://pypi.python.org/packages/source/h/h5py/${name}.tar.gz";
+ md5 = "8f32f96d653e904d20f9f910c6d9dd91";
+ };
+
+ setupPyBuildFlags = [ "--hdf5=${hdf5}" ]
+ ++ optional mpiSupport "--mpi"
+ ;
+ setupPyInstallFlags = setupPyBuildFlags;
+
+ preBuild = if mpiSupport then "export CC=${mpi}/bin/mpicc" else "";
+
+ buildInputs = [ hdf5 cython ]
+ ++ optional mpiSupport mpi
+ ;
+ propagatedBuildInputs = [ numpy ]
+ ++ optional mpiSupport mpi4py
+ ;
+
+ meta = {
+ description =
+ "Pythonic interface to the HDF5 binary data format";
+ homepage = "http://www.h5py.org/";
+ license = stdenv.lib.licenses.bsd2;
+ };
+}
diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix
new file mode 100644
index 00000000000..c38d948dd6b
--- /dev/null
+++ b/pkgs/development/python-modules/mpi4py/default.nix
@@ -0,0 +1,56 @@
+{ stdenv, fetchurl, python, buildPythonPackage, mpi, openssh, isPy3k, isPyPy }:
+
+buildPythonPackage rec {
+ name = "mpi4py-1.3.1";
+
+ src = fetchurl {
+ url = "https://bitbucket.org/mpi4py/mpi4py/downloads/${name}.tar.gz";
+ sha256 = "e7bd2044aaac5a6ea87a87b2ecc73b310bb6efe5026031e33067ea3c2efc3507";
+ };
+
+ passthru = {
+ inherit mpi;
+ };
+
+ # The tests in the `test_spawn` module fail in the chroot build environment.
+ # However, they do pass in a pure, or non-pure nix-shell. Hence, we
+ # deactivate these particular tests.
+ # Unfortunately, the command-line arguments to `./setup.py test` are not
+ # correctly passed to the test-runner. Hence, these arguments are patched
+ # directly into `setup.py`.
+ patchPhase = ''
+ sed 's/err = main(cmd.args or \[\])/err = main(cmd.args or ["-v", "-e", "test_spawn"])/' -i setup.py
+ '';
+
+ configurePhase = "";
+
+ installPhase = ''
+ mkdir -p "$out/lib/${python.libPrefix}/site-packages"
+ export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH"
+
+ ${python}/bin/${python.executable} setup.py install \
+ --install-lib=$out/lib/${python.libPrefix}/site-packages \
+ --prefix="$out"
+
+ # --install-lib:
+ # sometimes packages specify where files should be installed outside the usual
+ # python lib prefix, we override that back so all infrastructure (setup hooks)
+ # work as expected
+ '';
+
+ setupPyBuildFlags = ["--mpicc=${mpi}/bin/mpicc"];
+
+ buildInputs = [ mpi ];
+ # Requires openssh for tests. Tests of dependent packages will also fail,
+ # if openssh is not present. E.g. h5py with mpi support.
+ propagatedBuildInputs = [ openssh ];
+
+ disabled = isPy3k || isPyPy;
+
+ meta = {
+ description =
+ "Python bindings for the Message Passing Interface standard";
+ homepage = "http://code.google.com/p/mpi4py/";
+ license = stdenv.lib.licenses.bsd3;
+ };
+}
diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix
index 3dc64f68129..0589bec36b9 100644
--- a/pkgs/development/python-modules/pycairo/default.nix
+++ b/pkgs/development/python-modules/pycairo/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, fetchpatch, python, pkgconfig, cairo, x11 }:
+{ stdenv, fetchurl, fetchpatch, python, pkgconfig, cairo, x11, isPyPy }:
-stdenv.mkDerivation rec {
+if isPyPy then throw "pycairo not supported for interpreter ${python.executable}" else stdenv.mkDerivation rec {
version = "1.10.0";
name = "pycairo-${version}";
src = if python.is_py3k or false
diff --git a/pkgs/development/python-modules/rbtools/default.nix b/pkgs/development/python-modules/rbtools/default.nix
index 7d82ef9adf2..b874d3d5c52 100644
--- a/pkgs/development/python-modules/rbtools/default.nix
+++ b/pkgs/development/python-modules/rbtools/default.nix
@@ -1,13 +1,11 @@
{ stdenv, fetchurl, pythonPackages }:
pythonPackages.buildPythonPackage rec {
- name = "rbtools-0.4.1";
+ name = "rbtools-0.6.1";
namePrefix = "";
src = fetchurl {
- url = "http://downloads.reviewboard.org/releases/RBTools/0.4/RBTools-0.4.1.tar.gz";
- sha256 = "1v0r7rfzrasj56s53mib51wl056g7ykh2y1c6dwv12r6hzqsycgv";
+ url = "http://downloads.reviewboard.org/releases/RBTools/0.6/RBTools-0.6.1.tar.gz";
+ sha256 = "0dbpd08b0k00fszi3r7wlgn2989aypgd60jq6wc99lq4yxsmhp28";
};
-
- propagatedBuildInputs = [ pythonPackages.setuptools ];
}
diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix
index e33c815d23b..4649bc5a2a7 100644
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -4,11 +4,11 @@ stdenv.mkDerivation rec {
shortName = "setuptools-${version}";
name = "${python.executable}-${shortName}";
- version = "2.1";
+ version = "5.8";
src = fetchurl {
url = "http://pypi.python.org/packages/source/s/setuptools/${shortName}.tar.gz";
- sha256 = "1m8qjvj5bfbphdags5s6pgmvk3xnw509lgdlq9whkq5a9mgxf8m7";
+ sha256 = "15h643gf821b72d0s59cjj60c6dm5l57rggv5za9d05mccp3psff";
};
buildInputs = [ python wrapPython distutils-cfg ];
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
wrapPythonPrograms
'';
- doCheck = stdenv.system != "x86_64-darwin";
+ doCheck = false; # requires pytest
checkPhase = ''
${python}/bin/${python.executable} setup.py test
diff --git a/pkgs/development/python-modules/sip/4.16.nix b/pkgs/development/python-modules/sip/4.16.nix
index aa1fb198438..210346062f9 100644
--- a/pkgs/development/python-modules/sip/4.16.nix
+++ b/pkgs/development/python-modules/sip/4.16.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, python }:
+{ stdenv, fetchurl, python, isPyPy }:
-stdenv.mkDerivation rec {
+if isPyPy then throw "sip not supported for interpreter ${python.executable}" else stdenv.mkDerivation rec {
name = "sip-4.16.1";
src = fetchurl {
diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix
index db397f95944..cf3a0149844 100644
--- a/pkgs/development/python-modules/sip/default.nix
+++ b/pkgs/development/python-modules/sip/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, python }:
+{ stdenv, fetchurl, python, isPyPy }:
-stdenv.mkDerivation rec {
+if isPyPy then throw "sip not supported for interpreter ${python.executable}" else stdenv.mkDerivation rec {
name = "sip-4.14.7"; # kde410.pykde4 doesn't build with 4.15
src = fetchurl {
diff --git a/pkgs/development/python-modules/wxPython/2.8.nix b/pkgs/development/python-modules/wxPython/2.8.nix
index 8819605528d..64dd59242c2 100644
--- a/pkgs/development/python-modules/wxPython/2.8.nix
+++ b/pkgs/development/python-modules/wxPython/2.8.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, pkgconfig, wxGTK, pythonPackages }:
+{ stdenv, fetchurl, pkgconfig, wxGTK, pythonPackages, python, isPyPy }:
assert wxGTK.unicode;
let version = "2.8.12.1"; in
-stdenv.mkDerivation {
+if isPyPy then throw "wxPython-${version} not supported for interpreter ${python.executable}" else stdenv.mkDerivation {
name = "wxPython-${version}";
builder = ./builder.sh;
diff --git a/pkgs/development/python-modules/wxPython/3.0.nix b/pkgs/development/python-modules/wxPython/3.0.nix
index 9aa6148643b..4f89dbeb410 100644
--- a/pkgs/development/python-modules/wxPython/3.0.nix
+++ b/pkgs/development/python-modules/wxPython/3.0.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, wxGTK, pythonPackages, openglSupport ? true }:
+{ stdenv, fetchurl, pkgconfig, wxGTK, pythonPackages, openglSupport ? true, python, isPyPy }:
assert wxGTK.unicode;
@@ -6,7 +6,7 @@ with stdenv.lib;
let version = "3.0.0.0"; in
-stdenv.mkDerivation {
+if isPyPy then throw "wxPython-${version} not supported for interpreter ${python.executable}" else stdenv.mkDerivation {
name = "wxPython-${version}";
builder = ./builder3.0.sh;
diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix
index dec94a912e0..f7ca5f2ec93 100644
--- a/pkgs/development/qtcreator/default.nix
+++ b/pkgs/development/qtcreator/default.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
let
- baseVersion = "3.1";
+ baseVersion = "3.2";
revision = "0";
version = "${baseVersion}.${revision}";
in
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.gz";
- sha256 = "c8c648f4988b707393e0f1958a8868718f27e59263f05f3b6599fa62290c2bbf";
+ sha256 = "0giilb0sl71w2p0vlaj4f9qjyaa4llbflp4m1dfdal30facbwizd";
};
# This property can be used in a nix development environment to refer to the Qt package
diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix
index dcffbccb510..2f1f2651063 100644
--- a/pkgs/development/r-modules/cran-packages.nix
+++ b/pkgs/development/r-modules/cran-packages.nix
@@ -2479,7 +2479,7 @@ let self = _self // overrides; _self = with self; {
jpeg = derive { name="jpeg"; version="0.1-8"; sha256="05hawv5qcb82ljc1l2nchx1wah8mq2k2kfkhpzyww554ngzbwcnh"; depends=[]; };
JPSurv = derive { name="JPSurv"; version="1.0.1"; sha256="11hfji0nyfmw1d7y2cijpp7ivlv5s9k8g771kmgwy14wflkyf7g2"; depends=[]; };
jSonarR = derive { name="jSonarR"; version="1.0"; sha256="1369v79y2679p1c1s6pfi0zdj21zbbln3a4gqsxivx82m0lwqprp"; depends=[RCurl]; };
- jsonlite = derive { name="jsonlite"; version="0.9.10"; sha256="0w49mv4fabzgc86gv2jn9apwf9k6bk1s1p3mjmaxpmw95wgjpc9r"; depends=[]; };
+ jsonlite = derive { name="jsonlite"; version="0.9.11"; sha256="4e6d86dfd1584ed2b96b1eb6c067b07847df5fff673d07ffacca6399c330552e"; depends=[]; };
jtrans = derive { name="jtrans"; version="0.1"; sha256="1wcrjyifsnpk9jfmwc1cx30qp5vavwl87i0avbbls8cmji7z0nay"; depends=[]; };
JudgeIt = derive { name="JudgeIt"; version="1.5.1"; sha256="1jssz1x9gw9hjpqlqbvlxa99icl8gffzl6qya0cnaxr50p82hdag"; depends=[]; };
Julia = derive { name="Julia"; version="1.0"; sha256="0df72mjkfsaz7wbrg3l6fcypwm59hdxxndjv1b833xa4qpq5301g"; depends=[]; };
@@ -4252,7 +4252,7 @@ let self = _self // overrides; _self = with self; {
rcqp = derive { name="rcqp"; version="0.3"; sha256="0vxcgchnxdsdamclcshjbkn00ysmfmqp586a36wsyv3zqrd6rg7p"; depends=[plyr]; };
Rcsdp = derive { name="Rcsdp"; version="0.1.53"; sha256="0x91hyx6z9f4zd7djxlq7dnznmr9skyzwbbcbjyid9hxbcfyvhcp"; depends=[]; };
rCUR = derive { name="rCUR"; version="1.3"; sha256="1f38xbc5n91k2y88cg0sv1z2p4g5vl7v2k1024f42f7526g2p2lx"; depends=[MASS Matrix lattice]; };
- RCurl = derive { name="RCurl"; version="1.95-4.3"; sha256="1gyjarnxwz3ldpm1vwq9ls6al66rvs7yshzhrl1fv9lbm1qi8yfg"; depends=[bitops]; };
+ RCurl = derive { name="RCurl"; version="1.95-4.3"; sha256="1gyjarnxwz3ldpm1vwq9ls6al66rvs7yshzhrl1fv9lbm1qi8yfg"; depends=[bitops pkgs.curl]; };
Rd2roxygen = derive { name="Rd2roxygen"; version="1.4"; sha256="09dxgp65zac5b9mxbjrvy3ihdwski98xva5afq659b8yfvkviq4g"; depends=[roxygen2 formatR]; };
rda = derive { name="rda"; version="1.0.2-2"; sha256="1g2q7c0y138i9r7jgjrlpqznvwpqsj6f7vljqqfzh2l6kcj43vjj"; depends=[]; };
rdatamarket = derive { name="rdatamarket"; version="0.6.4"; sha256="16a1yxvf841505a8gh7jf09fx6ipysymrpvsd4b07xdg5hvbzx25"; depends=[zoo RCurl RJSONIO]; };
@@ -4387,11 +4387,11 @@ let self = _self // overrides; _self = with self; {
Rgbp = derive { name="Rgbp"; version="1.0.6"; sha256="1j4j7g9z7p592f82k0yvibrydynkd9v1ldil2vf3ikc650bn2l02"; depends=[sn]; };
RGCCA = derive { name="RGCCA"; version="2.0"; sha256="0mcp51z5jkn7yxmspp5cvmmvq0cwh7hj66g7wjmxsi74dwxcinvg"; depends=[MASS]; };
rgcvpack = derive { name="rgcvpack"; version="0.1-4"; sha256="1vlvw9slrra18qaizqk2xglzky0i6z3bsan85x908wrg8drss4h5"; depends=[]; };
- rgdal = derive { name="rgdal"; version="0.8-16"; sha256="17qk7kd0l0l52nyf6drr0gv4b0ibkggyn6g3ky9flsjy05b3wg8j"; depends=[sp]; };
+ rgdal = derive { name="rgdal"; version="0.8-16"; sha256="17qk7kd0l0l52nyf6drr0gv4b0ibkggyn6g3ky9flsjy05b3wg8j"; depends=[sp pkgs.gdal pkgs.proj]; };
RGENERATE = derive { name="RGENERATE"; version="1.1"; sha256="1da3b50cfv5jb63ijzbnr226jadbww2bapcxzx8am7zydm6gqnss"; depends=[RMAWGEN]; };
RGenetics = derive { name="RGenetics"; version="0.1"; sha256="0x5sspd67hh08qm62whlnnd838m0np29q3bfzgwp6j85lhil3jrx"; depends=[]; };
rgenoud = derive { name="rgenoud"; version="5.7-12"; sha256="17gzkn4laylnksy8h2w8c0whcxpchsx7bwjzk1q5sfqxswclqq0g"; depends=[]; };
- rgeos = derive { name="rgeos"; version="0.3-6"; sha256="134cppgg5349i5qs9k2161fakd15l1fx1x6mgv28c5vic2xdm4wl"; depends=[sp]; };
+ rgeos = derive { name="rgeos"; version="0.3-6"; sha256="134cppgg5349i5qs9k2161fakd15l1fx1x6mgv28c5vic2xdm4wl"; depends=[sp pkgs.geos]; };
rgexf = derive { name="rgexf"; version="0.14.3.11"; sha256="16mil1csyzkaywcdrjzz5r60n4xhhinxawg30skc7d9awkf26qfa"; depends=[XML Rook igraph]; };
rggobi = derive { name="rggobi"; version="2.1.20"; sha256="1a7l68h3m9cq14k7y96ijgh0iz3d6j4j2anxg50pykz20lnykr9g"; depends=[RGtk2]; };
RGIFT = derive { name="RGIFT"; version="0.1-5"; sha256="1745fs4bq0ss39fiwljspvrmnkgbbpc1fjvhvcrsmp2iizq12sgn"; depends=[]; };
@@ -4450,7 +4450,19 @@ let self = _self // overrides; _self = with self; {
Rivivc = derive { name="Rivivc"; version="0.9"; sha256="0gl3040pp9nqm4g2ympnx80z64zfnn1hfsxka8ynd2cqhjn3b5i1"; depends=[signal]; };
RJaCGH = derive { name="RJaCGH"; version="2.0.2"; sha256="1fy8wsnv7diwg2w7j61scm6vd35a5jb36i9pzh5m7jz6yqsank50"; depends=[]; };
rjags = derive { name="rjags"; version="3-13"; sha256="0npfyphi8z25h7w4frplbyjgib1gawz7ib9gz5w6h2i0pricm53r"; depends=[coda]; };
- rJava = derive { name="rJava"; version="0.9-6"; sha256="008g6s6rcb5lnz5y2a2rs4iq85a4nl522g714s1w1r153qcc0jz0"; depends=[]; };
+ rJava = buildRPackage {
+ name = "rJava-0.9-6";
+ src = fetchurl {
+ url = "mirror://cran/src/contrib/rJava_0.9-6.tar.gz";
+ sha256 ="008g6s6rcb5lnz5y2a2rs4iq85a4nl522g714s1w1r153qcc0jz0";
+ };
+ propagatedBuildInputs = [pkgs.jdk pkgs.lzma pkgs.bzip2 pkgs.pcre pkgs.icu pkgs.libzip];
+ preConfigure = ''
+ export JAVA_CPPFLAGS=-I${pkgs.jdk}/include/
+ export JAVA_HOME=${pkgs.jdk}
+ '';
+ meta.hydraPlatforms = R.meta.hydraPlatforms;
+ };
rJavax = derive { name="rJavax"; version="0.3"; sha256="0sv2fjinp4wmdfvcpgm4hv8v3fkiiv84ywqyr4hz86j50ncd79km"; depends=[rJava]; };
RJDBC = derive { name="RJDBC"; version="0.2-4"; sha256="14nqz4gx24gcjmnd3hrhvfs5f68c3nqhb6nypv9gvk19dx1jayg0"; depends=[DBI rJava]; };
rje = derive { name="rje"; version="1.9"; sha256="1dyd34z6lb0p6zmyax5dpzflgc9a4saka33mvdfcxi5pj0rnygaz"; depends=[]; };
@@ -5841,7 +5853,7 @@ let self = _self // overrides; _self = with self; {
xlsx = derive { name="xlsx"; version="0.5.7"; sha256="0qxkdpf1dvi0x7fy65abjx2j60rdx7fv5yi8l2wdm0f2631pnwin"; depends=[rJava xlsxjars]; };
xlsxjars = derive { name="xlsxjars"; version="0.6.0"; sha256="0mjfvd433iz742gn3avaq48172yi5hhd0ajc3v22y1j4k9w82pr7"; depends=[rJava]; };
Xmisc = derive { name="Xmisc"; version="0.1.0"; sha256="1iyv9gp7fw3r7s3v9srd799nhwgpn5851v3n2xfwpcvj9kczrd5r"; depends=[]; };
- XML = derive { name="XML"; version="3.98-1.1"; sha256="0n9i6746211wihglbpsgalj2cyvggn4rv6a4fbavqwnjw3h1hwwl"; depends=[]; };
+ XML = derive { name="XML"; version="3.98-1.1"; sha256="0n9i6746211wihglbpsgalj2cyvggn4rv6a4fbavqwnjw3h1hwwl"; depends=[pkgs.libxml2]; };
XML2R = derive { name="XML2R"; version="0.0.6"; sha256="0azfh950r2b7ck3n1vzk3mdll7zy844nx3mbk676jxnj8gg7nxk5"; depends=[XML RCurl plyr]; };
XNomial = derive { name="XNomial"; version="1.0.1"; sha256="134bwglqhgah7v3w6ir65dch2dwp5h4vldw521ba74l5v9b2j2h4"; depends=[]; };
xoi = derive { name="xoi"; version="0.61-1"; sha256="0ypy0rb0f0bns41vjzyln04k3hypgr3wysqbdi0b0r14ip5rb47k"; depends=[qtl]; };
diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix
index 1dfaa5cf875..56797d9c702 100644
--- a/pkgs/development/tools/analysis/checkstyle/default.nix
+++ b/pkgs/development/tools/analysis/checkstyle/default.nix
@@ -1,12 +1,12 @@
-{stdenv, fetchurl, unzip}:
+{ stdenv, fetchurl }:
-stdenv.mkDerivation {
- name = "checkstyle-5.0";
- buildInputs = [unzip] ;
+stdenv.mkDerivation rec {
+ version = "5.7";
+ name = "checkstyle-${version}";
src = fetchurl {
- url = mirror://sourceforge/checkstyle/checkstyle-5.0.zip ;
- sha256 = "0972afcxjniz64hlnc89ddnd1d0mcd5hb1sd7lpw5k52h39683nh";
+ url = "mirror://sourceforge/checkstyle/${version}/${name}-bin.tar.gz";
+ sha256 = "0kzj507ylynq6p7v097bjzsckkjny5i2fxwxyrlwi5samhi2m06x";
};
installPhase = ''
@@ -22,6 +22,6 @@ stdenv.mkDerivation {
Conventions, but is highly configurable.
'';
homepage = http://checkstyle.sourceforge.net/;
+ license = stdenv.lib.licenses.lgpl21;
};
}
-
diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix
index ca4176dbe1e..094cabb7306 100644
--- a/pkgs/development/tools/analysis/cppcheck/default.nix
+++ b/pkgs/development/tools/analysis/cppcheck/default.nix
@@ -4,14 +4,14 @@
let
name = "cppcheck";
- version = "1.65";
+ version = "1.66";
in
stdenv.mkDerivation {
name = "${name}-${version}";
src = fetchurl {
url = "mirror://sourceforge/${name}/${name}-${version}.tar.bz2";
- sha256 = "0rsxnqvjyiviqsq4y5x4p1jpvcmhf8hh7d710rsvnv5d4cj7lmqn";
+ sha256 = "1dy1jd9ckqs565iwcv281pc3xmp9fnfw5ydh3wq06pyz74yw4scl";
};
configurePhase = ''
diff --git a/pkgs/development/tools/analysis/findbugs/default.nix b/pkgs/development/tools/analysis/findbugs/default.nix
index cf60f1af767..fb7d8e74e45 100644
--- a/pkgs/development/tools/analysis/findbugs/default.nix
+++ b/pkgs/development/tools/analysis/findbugs/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation {
- name = "findbugs-2.0.3";
+ name = "findbugs-3.0.0";
src = fetchurl {
- url = mirror://sourceforge/findbugs/findbugs-2.0.3.tar.gz;
- sha256 = "17s93vszc5s2b7pwi0yk8d6w54gandxrr7vflhzmpbl6sxj2mfjr";
+ url = mirror://sourceforge/findbugs/findbugs-3.0.0.tar.gz;
+ sha256 = "0csz6drzdz867r2p2wa4cvick6bv9dpz2yym9wrvp3fnxabmgiri";
};
buildPhase = ''
diff --git a/pkgs/development/tools/analysis/massif-visualizer/default.nix b/pkgs/development/tools/analysis/massif-visualizer/default.nix
new file mode 100644
index 00000000000..e21f5ed15e9
--- /dev/null
+++ b/pkgs/development/tools/analysis/massif-visualizer/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, kdelibs, kgraphviewer, gettext }:
+
+stdenv.mkDerivation rec {
+ name = "massif-visualizer-${version}";
+ version = "0.3.90";
+
+ src = fetchurl {
+ url = "mirror://kde/unstable/massif-visualizer/${version}/src/${name}.tar.xz";
+ sha256 = "9940fa90137ca5eef08b9ec220825fadbf03db423a670a2c7fe3edab271d9922";
+ };
+
+ buildInputs = [ kdelibs kgraphviewer gettext ];
+
+ meta = with stdenv.lib; {
+ description = "Tool that visualizes massif data generated by valgrind";
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.lethalman ];
+ };
+}
diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix
index 14007d80b0f..2709caaab06 100644
--- a/pkgs/development/tools/analysis/pmd/default.nix
+++ b/pkgs/development/tools/analysis/pmd/default.nix
@@ -1,12 +1,12 @@
{stdenv, fetchurl, unzip}:
stdenv.mkDerivation {
- name = "pmd-4.2.5";
+ name = "pmd-4.2.6";
buildInputs = [unzip] ;
src = fetchurl {
- url = mirror://sourceforge/pmd/pmd-bin-4.2.5.zip ;
- sha256 = "07cb18mv7rplksy3iw3rxyjaav4m7kcjqfhzv20ki73hfkqxa85c";
+ url = mirror://sourceforge/pmd/pmd-bin-4.2.6.zip ;
+ sha256 = "0gg1px2jmqn09f5vjzgy9gck37qjm9p2d7gf9grsmrr2xncbipp8";
};
installPhase = ''
diff --git a/pkgs/development/tools/analysis/radare/default.nix b/pkgs/development/tools/analysis/radare/default.nix
index 2ab8c05ebf8..3c83f0e9d49 100644
--- a/pkgs/development/tools/analysis/radare/default.nix
+++ b/pkgs/development/tools/analysis/radare/default.nix
@@ -12,15 +12,15 @@ let
optional = stdenv.lib.optional;
in
stdenv.mkDerivation rec {
- name = "radare-1.5";
+ name = "radare-1.5.2";
src = fetchurl {
url = "http://radare.org/get/${name}.tar.gz";
- sha256 = "1r0c9cc7z9likma8zicp2pbv2y85vjjmnk0k45wdhbvhgqh6il1h";
+ sha256 = "1qdrmcnzfvfvqb27c7pknwm8jl2hqa6c4l66wzyddwlb8yjm46hd";
};
- buildInputs = [pkgconfig readline libusb libewf perl]
+ buildInputs = [pkgconfig readline libusb perl]
++ optional useX11 [gtkdialog vte gtk]
++ optional rubyBindings [ruby]
++ optional pythonBindings [python]
diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix
new file mode 100644
index 00000000000..7e199c29aed
--- /dev/null
+++ b/pkgs/development/tools/analysis/radare2/default.nix
@@ -0,0 +1,39 @@
+{stdenv, fetchurl, pkgconfig, libusb, readline, libewf, perl, zlib, openssl,
+gtk ? null, vte ? null, gtkdialog ? null,
+python ? null,
+ruby ? null,
+lua ? null,
+useX11, rubyBindings, pythonBindings, luaBindings}:
+
+assert useX11 -> (gtk != null && vte != null && gtkdialog != null);
+assert rubyBindings -> ruby != null;
+assert pythonBindings -> python != null;
+
+let
+ optional = stdenv.lib.optional;
+in
+stdenv.mkDerivation rec {
+ version = "0.9.7";
+ name = "radare2-${version}";
+
+ src = fetchurl {
+ url = "http://radare.org/get/${name}.tar.xz";
+ sha256 = "01sdsnbvx1qzyradj03sg24rk2bi9x58m40r0aqj8skv92c87s7l";
+ };
+
+
+ buildInputs = [pkgconfig readline libusb libewf perl zlib openssl]
+ ++ optional useX11 [gtkdialog vte gtk]
+ ++ optional rubyBindings [ruby]
+ ++ optional pythonBindings [python]
+ ++ optional luaBindings [lua];
+
+ meta = {
+ description = "Free advanced command line hexadecimal editor";
+ homepage = http://radare.org/;
+ license = stdenv.lib.licenses.gpl2Plus;
+ maintainers = with stdenv.lib.maintainers; [raskin];
+ platforms = with stdenv.lib.platforms; linux;
+ inherit version;
+ };
+}
diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/development/tools/analysis/spin/default.nix
index 06c04ca41b5..62182d0b845 100644
--- a/pkgs/development/tools/analysis/spin/default.nix
+++ b/pkgs/development/tools/analysis/spin/default.nix
@@ -1,13 +1,14 @@
{stdenv, fetchurl, yacc }:
stdenv.mkDerivation rec {
- version = "6.3.2";
name = "spin-${version}";
+ version = "6.4.1";
+ url-version = stdenv.lib.replaceChars ["."] [""] version;
src = fetchurl {
- url = http://spinroot.com/spin/Src/spin632.tar.gz;
+ url = "http://spinroot.com/spin/Src/spin${url-version}.tar.gz";
curlOpts = "--user-agent 'Mozilla/5.0'";
- sha256 = "1llsv1mnwr99hvsm052i3wwpa3dm5j12s5p10hizi6i9hlp00b5y";
+ sha256 = "02r2jazb2hnhcqcjnmlj6sjd9dvyfalgi99bzncwfadixf3hmpvn";
};
buildInputs = [ yacc ];
@@ -16,10 +17,10 @@ stdenv.mkDerivation rec {
installPhase = "install -D spin $out/bin/spin";
- meta = {
+ meta = with stdenv.lib; {
description = "Formal verification tool for distributed software systems";
homepage = http://spinroot.com/;
license = "free";
- maintainers = stdenv.lib.maintainers.mornfall;
+ maintainers = with maintainers; [ mornfall pSub ];
};
}
diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix
index aaeee026d0a..64f3b7d60ab 100644
--- a/pkgs/development/tools/analysis/valgrind/default.nix
+++ b/pkgs/development/tools/analysis/valgrind/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, perl, gdb }:
stdenv.mkDerivation rec {
- name = "valgrind-3.9.0";
+ name = "valgrind-3.10.0";
src = fetchurl {
url = "http://valgrind.org/downloads/${name}.tar.bz2";
- sha256 = "1w6n5qvxy2ssbczcl1c2yd2ggjn3ipay2hvpn10laly2dfh73bz6";
+ sha256 = "1jgd42vsx0bcblp91bd61hd5wpy0gghh09wxgm65m666vy17y103";
};
patches = [ ./glibc-2.19.patch ];
diff --git a/pkgs/development/tools/boost-build/default.nix b/pkgs/development/tools/boost-build/default.nix
new file mode 100644
index 00000000000..5538eae4104
--- /dev/null
+++ b/pkgs/development/tools/boost-build/default.nix
@@ -0,0 +1,44 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ name = "boost-build-2.0-m12";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/boost/${name}.tar.bz2";
+ sha256 = "10sbbkx2752r4i1yshyp47nw29lyi1p34sy6hj7ivvnddiliayca";
+ };
+
+ patchPhase = ''
+ grep -r '/usr/share/boost-build' \
+ | awk '{split($0,a,":"); print a[1];}' \
+ | xargs sed -i "s,/usr/share/boost-build,$out/share/boost-build,"
+ '';
+
+ buildPhase = ''
+ cd jam_src
+ ./build.sh
+ '';
+
+ installPhase = ''
+ # Install Bjam
+ mkdir -p $out/bin
+ cd "$(ls | grep bin)"
+ cp -a bjam $out/bin
+
+ # Bjam is B2
+ ln -s bjam $out/bin/b2
+
+ # Install the shared files (don't include jam_src)
+ cd ../..
+ rm -rf jam_src
+ mkdir -p $out/share
+ cp -a . $out/share/boost-build
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = http://www.boost.org/boost-build2/;
+ license = "boost-license";
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ wkennington ];
+ };
+}
diff --git a/pkgs/development/tools/build-managers/apache-ant/default.nix b/pkgs/development/tools/build-managers/apache-ant/default.nix
index 0dfb634c594..476d2cb8ac5 100644
--- a/pkgs/development/tools/build-managers/apache-ant/default.nix
+++ b/pkgs/development/tools/build-managers/apache-ant/default.nix
@@ -1,6 +1,6 @@
-{ fetchurl, stdenv, makeWrapper }:
+{ fetchurl, stdenv, coreutils, makeWrapper }:
-let version = "1.9.3"; in
+let version = "1.9.4"; in
stdenv.mkDerivation {
name = "ant-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "mirror://apache/ant/binaries/apache-ant-${version}-bin.tar.bz2";
- sha1 = "efcf206e24b0dd1583c501182ad163af277951a4";
+ sha256 = "1kw801p8h5x4f0g8i5yknppssrj5a3xy1aqrkpfnk22bd1snbh90";
};
contrib = fetchurl {
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
if [ -z "\$JAVA_HOME" ]; then
for i in javac java gij; do
if p="\$(type -p \$i)"; then
- export JAVA_HOME="\$(dirname \$(dirname \$(readlink -f \$p)))"
+ export JAVA_HOME="\$(${coreutils}/bin/dirname \$(${coreutils}/bin/dirname \$(${coreutils}/bin/readlink -f \$p)))"
break
fi
done
diff --git a/pkgs/misc/maven/builder.sh b/pkgs/development/tools/build-managers/apache-maven/builder.sh
similarity index 100%
rename from pkgs/misc/maven/builder.sh
rename to pkgs/development/tools/build-managers/apache-maven/builder.sh
diff --git a/pkgs/misc/maven/default.nix b/pkgs/development/tools/build-managers/apache-maven/default.nix
similarity index 66%
rename from pkgs/misc/maven/default.nix
rename to pkgs/development/tools/build-managers/apache-maven/default.nix
index b7cb84fbb3c..69dbf46bcdd 100644
--- a/pkgs/misc/maven/default.nix
+++ b/pkgs/development/tools/build-managers/apache-maven/default.nix
@@ -3,13 +3,13 @@
assert jdk != null;
stdenv.mkDerivation {
- name = "apache-maven-3.1.1";
+ name = "apache-maven-3.2.3";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://apache/maven/binaries/apache-maven-3.1.1-bin.tar.gz;
- sha256 = "06ymc5y8bp5crcz74z2m9pf58aid5q11v2klnjmxb4ar8mkd8zh7";
+ url = mirror://apache/maven/maven-3/3.2.3/binaries/apache-maven-3.2.3-bin.tar.gz;
+ sha256 = "1vd81bhj68mhnkb0zlarshlk61i2n160pyxxmrc739p3vsm08gxz";
};
buildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/build-managers/cargo/common.nix b/pkgs/development/tools/build-managers/cargo/common.nix
new file mode 100644
index 00000000000..e60efc18d29
--- /dev/null
+++ b/pkgs/development/tools/build-managers/cargo/common.nix
@@ -0,0 +1,52 @@
+{stdenv, fetchurl, zlib}:
+
+with stdenv.lib;
+
+rec {
+ platform = if stdenv.system == "i686-linux"
+ then "i686-unknown-linux-gnu"
+ else if stdenv.system == "x86_64-linux"
+ then "x86_64-unknown-linux-gnu"
+ else if stdenv.system == "i686-darwin"
+ then "i686-apple-darwin"
+ else if stdenv.system == "x86_64-darwin"
+ then "x86_64-apple-darwin"
+ else throw "no snapshot to boostrap for this platform (missing platform url suffix)";
+
+ snapshotHash = if stdenv.system == "i686-linux"
+ then "c92895421e6fa170dbd713e74334b8c3cf22b817"
+ else if stdenv.system == "x86_64-linux"
+ then "66ee4126f9e4820cd82e78181931f8ea365904de"
+ else if stdenv.system == "i686-darwin"
+ then "e2364b1f1ece338b9fc4c308c472fc2413bff04e"
+ else if stdenv.system == "x86_64-darwin"
+ then "09f92f06ab4f048acf71d83dc0426ff1509779a9"
+ else throw "no snapshot for platform ${stdenv.system}";
+
+ snapshotDate = "2014-09-19";
+ snapshotName = "cargo-nightly-${platform}.tar.gz";
+
+ snapshot = stdenv.mkDerivation {
+ name = "cargo-snapshot-${snapshotDate}";
+ src = fetchurl {
+ url = "https://static-rust-lang-org.s3.amazonaws.com/cargo-dist/${snapshotDate}/${snapshotName}";
+ sha1 = snapshotHash;
+ };
+ dontStrip = true;
+ installPhase = ''
+ mkdir -p "$out"
+ cp -r bin "$out/bin"
+ '' + (if stdenv.isLinux then ''
+ patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.gcc.dynamicLinker}" \
+ --set-rpath "${stdenv.gcc.gcc}/lib/:${stdenv.gcc.gcc}/lib64/:${zlib}/lib" \
+ "$out/bin/cargo"
+ '' else "");
+ };
+
+ meta = {
+ homepage = http://crates.io;
+ description = "Downloads your Rust project's dependencies and builds your project";
+ license = [ licenses.mit licenses.asl20 ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/development/tools/build-managers/cargo/snapshot.nix b/pkgs/development/tools/build-managers/cargo/snapshot.nix
new file mode 100644
index 00000000000..e86b19ca33e
--- /dev/null
+++ b/pkgs/development/tools/build-managers/cargo/snapshot.nix
@@ -0,0 +1,7 @@
+{ stdenv, fetchurl, zlib }:
+
+/* Cargo binary snapshot */
+
+with ((import ./common.nix) { inherit stdenv fetchurl zlib; });
+
+snapshot // { inherit meta; }
diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix
index 99353a1a192..49e1dcb29c3 100644
--- a/pkgs/development/tools/build-managers/leiningen/default.nix
+++ b/pkgs/development/tools/build-managers/leiningen/default.nix
@@ -3,17 +3,17 @@
stdenv.mkDerivation rec {
pname = "leiningen";
- version = "2.4.2";
+ version = "2.5.0";
name = "${pname}-${version}";
src = fetchurl {
url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg";
- sha256 = "1qdq3v7wv9jacw4bipgx24knlipw6zdcx43yd1qyw6zwaad51ckw";
+ sha256 = "1drl35313xp2gg5y52wp8414i2fm806rhgcsghl4igrm3afrv85x";
};
jarsrc = fetchurl {
url = "https://github.com/technomancy/leiningen/releases/download/${version}/${name}-standalone.jar";
- sha256 = "0n4kpmzw9nvppq758lhnrr7xps5j6gwmdm98m772cj7j4vixsrzb";
+ sha256 = "0fd7yqrj9asx1n3nszli7hr4fj47v2pdr9msk5g75955pw7yavp9";
};
patches = [ ./lein-fix-jar-path.patch ];
diff --git a/pkgs/development/tools/build-managers/rebar/default.nix b/pkgs/development/tools/build-managers/rebar/default.nix
index d10d9d6d1a3..d62ae35b854 100644
--- a/pkgs/development/tools/build-managers/rebar/default.nix
+++ b/pkgs/development/tools/build-managers/rebar/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
variety of locations (git, hg, etc).
'';
- platforms = stdenv.lib.platforms.linux;
+ platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.the-kenny ];
};
}
diff --git a/pkgs/development/tools/build-managers/simple-build-tool/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix
similarity index 87%
rename from pkgs/development/tools/build-managers/simple-build-tool/default.nix
rename to pkgs/development/tools/build-managers/sbt/default.nix
index b54f894d8eb..39937f7d378 100644
--- a/pkgs/development/tools/build-managers/simple-build-tool/default.nix
+++ b/pkgs/development/tools/build-managers/sbt/default.nix
@@ -14,8 +14,7 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/bin
cat > $out/bin/sbt << EOF
- #!/bin/sh
- SBT_OPTS="-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=384M"
+ #! ${stdenv.shell}
${jre}/bin/java \$SBT_OPTS -jar ${src} "\$@"
EOF
chmod +x $out/bin/sbt
diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix
index 93f7699481c..07268867044 100644
--- a/pkgs/development/tools/build-managers/scons/default.nix
+++ b/pkgs/development/tools/build-managers/scons/default.nix
@@ -2,7 +2,7 @@
let
name = "scons";
- version = "2.3.2";
+ version = "2.3.4";
in
stdenv.mkDerivation {
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "mirror://sourceforge/scons/${name}-${version}.tar.gz";
- sha256 = "1m29lhwz7p6k4f8wc8qjpwa89058lzq3vrycgxbfc5cmbq6354zr";
+ sha256 = "0hdlci43wjz8maryj83mz04ir6rwcdrrzpd7cpzvdlzycqhdfmsb";
};
buildInputs = [python makeWrapper];
diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix
index 5194684261c..7ba30991d20 100644
--- a/pkgs/development/tools/continuous-integration/jenkins/default.nix
+++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix
@@ -1,19 +1,19 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "jenkins";
- version = "1.550";
+ name = "jenkins-${version}";
+ version = "1.579";
src = fetchurl {
url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war";
- sha256 = "1ziimbfs9kylga0xmxlfsfcc7qsirs5bnx00pa99m2l5sz2ki793";
+ sha256 = "1l2a8h3js42gkqn8kiysbgrxksqmhmmfp9l4kbrmw609q2wn5119";
};
- meta = {
- description = "An extendable open source continuous integration server.";
+ meta = with stdenv.lib; {
+ description = "An extendable open source continuous integration server";
homepage = http://jenkins-ci.org;
- license = stdenv.lib.licenses.mit;
- platforms = stdenv.lib.platforms.all;
- maintainers = [ stdenv.lib.maintainers.coconnor ];
+ license = licenses.mit;
+ platforms = platforms.all;
+ maintainers = [ maintainers.coconnor ];
};
buildCommand = "ln -s $src $out";
diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix
index a5d7d260804..e1f7f19dd56 100644
--- a/pkgs/development/tools/documentation/gtk-doc/default.nix
+++ b/pkgs/development/tools/documentation/gtk-doc/default.nix
@@ -1,12 +1,13 @@
{ stdenv, fetchurl, pkgconfig, perl, python, libxml2Python, libxslt, which
-, docbook_xml_dtd_43, docbook_xsl, gnome_doc_utils, dblatex, gettext }:
+, docbook_xml_dtd_43, docbook_xsl, gnome_doc_utils, dblatex, gettext, itstool }:
-stdenv.mkDerivation {
- name = "gtk-doc-1.18";
+stdenv.mkDerivation rec {
+ name = "gtk-doc-${version}";
+ version = "1.21";
src = fetchurl {
- url = mirror://gnome/sources/gtk-doc/1.18/gtk-doc-1.18.tar.xz;
- sha256 = "084scak99ppgqk5lkziskhcsd3jmcgf7a98ddwhciq8vaqf5jnvq";
+ url = "mirror://gnome/sources/gtk-doc/${version}/${name}.tar.xz";
+ sha256 = "0gpfh25qxsic7n25pfl74mjp38hdm3pr4islhlaxv3p05q0lv4sx";
};
# maybe there is a better way to pass the needed dtd and xsl files
@@ -27,6 +28,13 @@ stdenv.mkDerivation {
buildInputs =
[ pkgconfig perl python libxml2Python libxslt docbook_xml_dtd_43 docbook_xsl
- gnome_doc_utils dblatex gettext which
+ gnome_doc_utils dblatex gettext which itstool
];
+
+ meta = with stdenv.lib; {
+ homepage = http://www.gtk.org/gtk-doc;
+ description = "Tools to extract documentation embedded in GTK+ and GNOME source code";
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ pSub ];
+ };
}
diff --git a/pkgs/development/tools/documentation/haddock/2.15.0.nix b/pkgs/development/tools/documentation/haddock/2.15.0.nix
new file mode 100644
index 00000000000..3b3d91a1f2f
--- /dev/null
+++ b/pkgs/development/tools/documentation/haddock/2.15.0.nix
@@ -0,0 +1,20 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, Cabal, filepath, haddockApi }:
+
+cabal.mkDerivation (self: {
+ pname = "haddock";
+ version = "2.15.0";
+ sha256 = "1vay0v0a02xj2m40w71vmjadlm6pzv309r1jhr61xv1wnj88i75w";
+ isLibrary = false;
+ isExecutable = true;
+ buildDepends = [ haddockApi ];
+ testDepends = [ Cabal filepath ];
+ preCheck = "unset GHC_PACKAGE_PATH";
+ meta = {
+ homepage = "http://www.haskell.org/haddock/";
+ description = "A documentation-generation tool for Haskell libraries";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/tools/haskell/BNFC/default.nix b/pkgs/development/tools/haskell/BNFC/default.nix
index f335aebc570..4acc8f38f17 100644
--- a/pkgs/development/tools/haskell/BNFC/default.nix
+++ b/pkgs/development/tools/haskell/BNFC/default.nix
@@ -1,24 +1,25 @@
-{ cabal, mtl, fetchpatch, alex, happy }:
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, alex, deepseq, filepath, happy, hspec, HUnit, mtl
+, QuickCheck, temporary
+}:
cabal.mkDerivation (self: {
pname = "BNFC";
- version = "2.6.0.3";
- sha256 = "0i38rwslkvnicnlxbrxybnwkgfin04lnr4q12lcvli4ldp2ylfjq";
+ version = "2.7.0.1";
+ sha256 = "18009jrpd5kcaz06j4ksay4c7c65m4zrc7jrp3rjx81bs6gkrwk1";
isLibrary = true;
isExecutable = true;
- buildDepends = [ mtl ];
+ buildDepends = [ deepseq filepath mtl ];
+ testDepends = [
+ deepseq filepath hspec HUnit mtl QuickCheck temporary
+ ];
buildTools = [ alex happy ];
- patches = [ (fetchpatch { url = "https://github.com/BNFC/bnfc/pull/3.patch"; sha256 = "1i87crwva5m3v095lv3zxs38pr6nmly58krlr6sxpwnakpr0pxsp"; }) ];
- patchFlags = "-p2";
- preConfigure = "runhaskell Setup.lhs clean";
meta = {
homepage = "http://bnfc.digitalgrammars.com/";
description = "A compiler front-end generator";
- license = "GPL";
+ license = self.stdenv.lib.licenses.gpl2;
platforms = self.ghc.meta.platforms;
- maintainers = [
- self.stdenv.lib.maintainers.andres
- self.stdenv.lib.maintainers.simons
- ];
+ maintainers = with self.stdenv.lib.maintainers; [ andres simons ];
};
})
diff --git a/pkgs/development/tools/haskell/cabal-bounds/default.nix b/pkgs/development/tools/haskell/cabal-bounds/default.nix
index 97dac34af3b..b0bf11bb2a0 100644
--- a/pkgs/development/tools/haskell/cabal-bounds/default.nix
+++ b/pkgs/development/tools/haskell/cabal-bounds/default.nix
@@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "cabal-bounds";
- version = "0.8.5";
- sha256 = "19lai2gdxs76mrvcz77sjsx7hh87cf1f4qmy7z1zcd130z11q04a";
+ version = "0.8.7";
+ sha256 = "03kp59nhdyq3bl91akd38iwvwwy3zgvadx85lwl3827nr6s774qk";
isLibrary = true;
isExecutable = true;
buildDepends = [
diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix
index db7e472934c..07ba2a4a09e 100644
--- a/pkgs/development/tools/haskell/cabal2nix/default.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/default.nix
@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "cabal2nix";
- version = "1.69";
- sha256 = "0430086lh1h7w8wxc42aqrdjb8i12vz8m0jr1q2c45h3k6brb5r5";
+ version = "1.70";
+ sha256 = "0jc66x6p6blcz1pk4pkdh93dx17658pr0i5h4w3zynv4c2jgy138";
isLibrary = false;
isExecutable = true;
buildDepends = [
diff --git a/pkgs/development/tools/haskell/cake3/default.nix b/pkgs/development/tools/haskell/cake3/default.nix
index 5b948f510bf..fba7d2e4d2a 100644
--- a/pkgs/development/tools/haskell/cake3/default.nix
+++ b/pkgs/development/tools/haskell/cake3/default.nix
@@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "cake3";
- version = "0.5.1.0";
- sha256 = "0kqx8xr0ynbn7fhfz11is7lbi32dfladsx32bcpspykqj1bjv954";
+ version = "0.5.2.0";
+ sha256 = "0wr797r7sg8f48r2pjl2nw70vcdkiamqghz2zpfr6awy9018fhgw";
isLibrary = true;
isExecutable = true;
buildDepends = [
diff --git a/pkgs/development/tools/haskell/codex/default.nix b/pkgs/development/tools/haskell/codex/default.nix
index fac145b14c2..b3c1ba9fa66 100644
--- a/pkgs/development/tools/haskell/codex/default.nix
+++ b/pkgs/development/tools/haskell/codex/default.nix
@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "codex";
- version = "0.1.0.3";
- sha256 = "0sbkri6y9f4wws120kbb93sv1z0z75hjw9pw5r3wadmmd0lygsn9";
+ version = "0.1.0.5";
+ sha256 = "0hlx72dan9qvwrpp6rkyr6y9zk2lafa15va098w38r7658jymfy0";
isLibrary = true;
isExecutable = true;
buildDepends = [
diff --git a/pkgs/development/tools/haskell/graphmod/default.nix b/pkgs/development/tools/haskell/graphmod/default.nix
new file mode 100644
index 00000000000..6165e46dd5b
--- /dev/null
+++ b/pkgs/development/tools/haskell/graphmod/default.nix
@@ -0,0 +1,18 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, dotgen, filepath, haskellLexer }:
+
+cabal.mkDerivation (self: {
+ pname = "graphmod";
+ version = "1.2.5";
+ sha256 = "1rmrsfvajzrak7jlhwnvhrgszgyg1b6z5wp21k0d7pv2cbfdkp8s";
+ isLibrary = false;
+ isExecutable = true;
+ buildDepends = [ dotgen filepath haskellLexer ];
+ meta = {
+ homepage = "http://github.com/yav/graphmod/wiki";
+ description = "Present the module dependencies of a program as a \"dot\" graph";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/tools/haskell/haskell-docs/default.nix b/pkgs/development/tools/haskell/haskell-docs/default.nix
index b9cd34c716e..9cc92aafc21 100644
--- a/pkgs/development/tools/haskell/haskell-docs/default.nix
+++ b/pkgs/development/tools/haskell/haskell-docs/default.nix
@@ -20,5 +20,7 @@ cabal.mkDerivation (self: {
description = "A program to find and display the docs and type of a name";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
+ hydraPlatforms = self.stdenv.lib.platforms.none;
+ broken = true;
};
})
diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix
index 4fe5f01c3d1..92a33602a1f 100644
--- a/pkgs/development/tools/haskell/hlint/default.nix
+++ b/pkgs/development/tools/haskell/hlint/default.nix
@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "hlint";
- version = "1.9.3";
- sha256 = "1sdz981yq0amsw9q6hx0aqkd0ayrax5p77s3n3gz4bphpk37n09b";
+ version = "1.9.4";
+ sha256 = "0vqdkrhzxi99py9zrk01cz3hayfbp757rh1c1sgz00a1gf1pyz8m";
isLibrary = true;
isExecutable = true;
buildDepends = [
diff --git a/pkgs/development/tools/haskell/ihaskell/default.nix b/pkgs/development/tools/haskell/ihaskell/default.nix
new file mode 100644
index 00000000000..f6505384128
--- /dev/null
+++ b/pkgs/development/tools/haskell/ihaskell/default.nix
@@ -0,0 +1,49 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+# This file was later edited to add patches, disable testing.
+# Also patch the profile config to point to the ihaskell kernel exe
+
+{ cabal, aeson, base64Bytestring, cereal, classyPrelude, cmdargs
+, filepath, ghcParser, ghcPaths, haskeline, haskellSrcExts, here
+, hlint, hspec, HTTP, HUnit, MissingH, monoTraversable, mtl, parsec
+, random, setenv, shelly, split, stm, strict, systemArgv0
+, systemFilepath, tar, text, transformers, unorderedContainers
+, utf8String, uuid, vector, zeromq4Haskell, fetchpatch
+}:
+
+cabal.mkDerivation (self: {
+ pname = "ihaskell";
+ version = "0.4.2.0";
+ sha256 = "012rmasdc167w6gl18ysr53737j4p4afk0qcsv81hif92vvg5j1c";
+ isLibrary = true;
+ isExecutable = true;
+ patches = [ (fetchpatch { url = "https://github.com/gibiansky/IHaskell/pull/288.patch"; sha256 = "022zdz4wnyra6cfa7mq0w2ycsb007cvppn2f1360nr3fa5s9wibg"; }) ];
+ prePatch = ''
+ tar xvf profile/profile.tar -C profile
+ sed -i -e '1iexe = "'$out'/bin/IHaskell".replace(" ", "\\ ")\' profile/ipython_config.py
+ '';
+ doCheck = false;
+ buildDepends = [
+ aeson base64Bytestring cereal classyPrelude cmdargs filepath
+ ghcParser ghcPaths haskeline haskellSrcExts here hlint hspec HTTP
+ HUnit MissingH monoTraversable mtl parsec random shelly split stm
+ strict systemArgv0 systemFilepath tar text transformers
+ unorderedContainers utf8String uuid vector zeromq4Haskell
+ ];
+ testDepends = [ # let's keep these anyway
+ aeson base64Bytestring cereal classyPrelude cmdargs filepath
+ ghcParser ghcPaths haskeline haskellSrcExts here hlint hspec HTTP
+ HUnit MissingH monoTraversable mtl parsec random setenv shelly
+ split stm strict systemArgv0 systemFilepath tar text transformers
+ unorderedContainers utf8String uuid vector zeromq4Haskell
+ ];
+ postInstall = ''
+ patchShebangs .
+ '';
+ meta = with self.stdenv.lib; {
+ homepage = "http://gibiansky.github.io/IHaskell/";
+ description = "A Haskell backend kernel for the IPython project";
+ license = licenses.mit;
+ platforms = self.ghc.meta.platforms;
+ maintainers = with maintainers; [ edwtjo ];
+ };
+})
diff --git a/pkgs/development/tools/haskell/ihaskell/use-classy-prelude.patch b/pkgs/development/tools/haskell/ihaskell/use-classy-prelude.patch
new file mode 100644
index 00000000000..b2c1362b62f
--- /dev/null
+++ b/pkgs/development/tools/haskell/ihaskell/use-classy-prelude.patch
@@ -0,0 +1,34 @@
+From fad4e38079e91b13bf1e94732b7494504071b224 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?=
+Date: Sun, 28 Sep 2014 09:27:40 +0200
+Subject: [PATCH] catMaybes, explicitly use ClassyPrelude
+
+---
+ src/IHaskell/Eval/Completion.hs | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/IHaskell/Eval/Completion.hs b/src/IHaskell/Eval/Completion.hs
+index 790c903..93d7ac1 100644
+--- a/src/IHaskell/Eval/Completion.hs
++++ b/src/IHaskell/Eval/Completion.hs
+@@ -141,7 +141,7 @@ getTrueModuleName name = do
+ onlyImportDecl _ = Nothing
+
+ -- Get all imports that we use.
+- imports <- catMaybes <$> map onlyImportDecl <$> getContext
++ imports <- ClassyPrelude.catMaybes <$> map onlyImportDecl <$> getContext
+
+ -- Find the ones that have a qualified name attached.
+ -- If this name isn't one of them, it already is the true name.
+@@ -178,7 +178,7 @@ completionType line loc target
+ = Empty
+
+ -- When in a string, complete filenames.
+- | cursorInString line loc
++ | cursorInString line loc
+ = FilePath (getStringTarget lineUpToCursor) (getStringTarget lineUpToCursor)
+
+ -- Complete module names in imports and elsewhere.
+--
+2.1.0
+
diff --git a/pkgs/development/tools/haskell/ihaskell/wrapper.nix b/pkgs/development/tools/haskell/ihaskell/wrapper.nix
new file mode 100644
index 00000000000..f98de4af229
--- /dev/null
+++ b/pkgs/development/tools/haskell/ihaskell/wrapper.nix
@@ -0,0 +1,26 @@
+{ stdenv, makeWrapper, ihaskell, ipython, ghc }:
+
+stdenv.mkDerivation rec {
+
+ name = "ihaskell-" + ihaskell.version ;
+
+ buildInputs = [ makeWrapper ];
+
+ preferLocalBuild = true;
+
+ buildCommand = ''
+ makeWrapper "${ihaskell}/bin/IHaskell" "$out/bin/ihaskell" \
+ --prefix PATH : "${ghc}/bin:${ihaskell}/bin:${ipython}/bin" \
+ --prefix LD_LIBRARY_PATH : "${ihaskell}/lib/ghc-${ghc.version}/${name}/" \
+ --add-flags "--ipython=${ipython}/bin/ipython" \
+ --set PROFILE_DIR "\$HOME/.ipython/profile_haskell" \
+ --set PROFILE_TAR "$(find ${ihaskell} -iname "profile.tar")" \
+ --set PROFILE_INIT "\$([ ! -d \$PROFILE_DIR ] && mkdir -p \$PROFILE_DIR && tar xvf \$PROFILE_TAR -C \$PROFILE_DIR)" \
+ --prefix GHC_PACKAGE_PATH : "\$(${ghc.GHCGetPackages} ${ghc.version}|sed -e 's, -package-db ,:,g'|cut -b 2-):${ihaskell}/lib/ghc-${ghc.version}/package.conf.d/${name}.installedconf" \
+ --set GHC_PACKAGE_PATH "\$GHC_PACKAGE_PATH:" # always end with : to include base packages
+ '';
+
+ meta = {
+ description = ihaskell.meta.description;
+ };
+}
\ No newline at end of file
diff --git a/pkgs/development/tools/haskell/keter/default.nix b/pkgs/development/tools/haskell/keter/default.nix
index 34bc45e7471..22b52975cde 100644
--- a/pkgs/development/tools/haskell/keter/default.nix
+++ b/pkgs/development/tools/haskell/keter/default.nix
@@ -11,8 +11,8 @@
cabal.mkDerivation (self: {
pname = "keter";
- version = "1.3.3";
- sha256 = "1i4yjzqp8if0h88k8ga0dvqbrh57nvcr9dbfbj1sdw40pd74yb3i";
+ version = "1.3.4";
+ sha256 = "127sv155kgwz64adylfn2dmpnqh833pa53lnc8ahhwa63xwf9pzk";
isLibrary = true;
isExecutable = true;
buildDepends = [
diff --git a/pkgs/development/tools/haskell/timeplot/default.nix b/pkgs/development/tools/haskell/timeplot/default.nix
index 4342b877a2e..a07383778ed 100644
--- a/pkgs/development/tools/haskell/timeplot/default.nix
+++ b/pkgs/development/tools/haskell/timeplot/default.nix
@@ -20,5 +20,7 @@ cabal.mkDerivation (self: {
description = "A tool for visualizing time series from log files";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
+ hydraPlatforms = self.stdenv.lib.platforms.none;
+ broken = true;
};
})
diff --git a/pkgs/development/tools/haskell/uuagc/cabal.nix b/pkgs/development/tools/haskell/uuagc/cabal.nix
index 1a735a2471e..ab85b50688b 100644
--- a/pkgs/development/tools/haskell/uuagc/cabal.nix
+++ b/pkgs/development/tools/haskell/uuagc/cabal.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "uuagc-cabal";
- version = "1.0.5.0";
- sha256 = "0p3rc1gszd62wwzzqz0hmj6jdmwdnpx92rdf6mgd7w63ic1wdxj5";
+ version = "1.0.6.0";
+ sha256 = "02xqj4vz7hir0llxl8n517qv22jlmilknhqzx4l55gccffg7zj6w";
buildDepends = [ Cabal filepath mtl uulib ];
meta = {
homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome";
diff --git a/pkgs/development/tools/misc/ShellCheck/default.nix b/pkgs/development/tools/misc/ShellCheck/default.nix
index 8beca12325b..d93383171dd 100644
--- a/pkgs/development/tools/misc/ShellCheck/default.nix
+++ b/pkgs/development/tools/misc/ShellCheck/default.nix
@@ -15,5 +15,6 @@ cabal.mkDerivation (self: {
description = "Shell script analysis tool";
license = "unknown";
platforms = self.ghc.meta.platforms;
+ maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
};
})
diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix
index c4f4caa3b65..3fdb75b3fdf 100644
--- a/pkgs/development/tools/misc/arcanist/default.nix
+++ b/pkgs/development/tools/misc/arcanist/default.nix
@@ -3,18 +3,18 @@
let
libphutil = fetchgit {
url = "git://github.com/facebook/libphutil.git";
- rev = "49f08a756a54f12405d3704c0f978b71c7b13811";
- sha256 = "b32267fe19c6e9532887388815b8553519e2844bc5b839b5ad35efeab6b07fb8";
+ rev = "6c29d5c8d169084927df75b18761312195080550";
+ sha256 = "5891e5d7688a2f026e02a2684a2002c0715f0492fd8475bdcb8fab2066eff37a";
};
arcanist = fetchgit {
url = "git://github.com/facebook/arcanist.git";
- rev = "4c0edd296e3301fffdda33c447f6fcafe7d1de01";
- sha256 = "a9f162fb6b47bcf628130e0e8988ab650278b3a6606fa425e4707241ed22dd3e";
+ rev = "a70a00a960ff4a7e30e20b4db1c68c081f16eaa0";
+ sha256 = "37d9b80fbfc694df86a4bf75a540f81aa2e65f463d301d1f8a5930ecae8ba9fc";
};
in
stdenv.mkDerivation rec {
name = "arcanist-${version}";
- version = "20140812";
+ version = "20140924";
src = [ arcanist libphutil ];
buildInputs = [ php makeWrapper flex ];
diff --git a/pkgs/development/tools/misc/babeltrace/default.nix b/pkgs/development/tools/misc/babeltrace/default.nix
index aa8e70b5edc..3c8c2fbec61 100644
--- a/pkgs/development/tools/misc/babeltrace/default.nix
+++ b/pkgs/development/tools/misc/babeltrace/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, glib, libuuid, popt }:
stdenv.mkDerivation rec {
- name = "babeltrace-1.2.1";
+ name = "babeltrace-1.2.3";
src = fetchurl {
url = "http://www.efficios.com/files/babeltrace/${name}.tar.bz2";
- sha256 = "1pwg0y57iy4c8wynb6bj7f6bxaiclmxcm4f3nllpw9brhbdzygc1";
+ sha256 = "1b47d4i4f3gjb37m62k6hq0jlag4qkmblx6lcjf4s902h6bscvvr";
};
buildInputs = [ pkgconfig glib libuuid popt ];
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index fc48a4aabad..adff07ac35a 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -2,6 +2,8 @@
, cross ? null, gold ? true, bison ? null
}:
+assert !stdenv.isDarwin;
+
let basename = "binutils-2.23.1"; in
with { inherit (stdenv.lib) optional optionals optionalString; };
diff --git a/pkgs/development/tools/misc/bossa/bin2c.c b/pkgs/development/tools/misc/bossa/bin2c.c
new file mode 100644
index 00000000000..f0b915de540
--- /dev/null
+++ b/pkgs/development/tools/misc/bossa/bin2c.c
@@ -0,0 +1,122 @@
+// bin2c.c
+//
+// convert a binary file into a C source vector
+//
+// THE "BEER-WARE LICENSE" (Revision 3.1415):
+// sandro AT sigala DOT it wrote this file. As long as you retain this notice you can do
+// whatever you want with this stuff. If we meet some day, and you think this stuff is
+// worth it, you can buy me a beer in return. Sandro Sigala
+//
+// syntax: bin2c [-c] [-z]
+//
+// -c add the "const" keyword to definition
+// -z terminate the array with a zero (useful for embedded C strings)
+//
+// examples:
+// bin2c -c myimage.png myimage_png.cpp
+// bin2c -z sometext.txt sometext_txt.cpp
+
+#include
+#include
+#include
+#include
+
+#ifndef PATH_MAX
+#define PATH_MAX 1024
+#endif
+
+int useconst = 0;
+int zeroterminated = 0;
+
+int myfgetc(FILE *f)
+{
+ int c = fgetc(f);
+ if (c == EOF && zeroterminated)
+ {
+ zeroterminated = 0;
+ return 0;
+ }
+ return c;
+}
+
+void process(const char *ifname, const char *ofname)
+{
+ FILE *ifile, *ofile;
+ ifile = fopen(ifname, "rb");
+ if (ifile == NULL)
+ {
+ fprintf(stderr, "cannot open %s for reading\n", ifname);
+ exit(1);
+ }
+ ofile = fopen(ofname, "wb");
+ if (ofile == NULL)
+ {
+ fprintf(stderr, "cannot open %s for writing\n", ofname);
+ exit(1);
+ }
+ char buf[PATH_MAX], *p;
+ const char *cp;
+ if ((cp = strrchr(ifname, '/')) != NULL)
+ {
+ ++cp;
+ } else {
+ if ((cp = strrchr(ifname, '\\')) != NULL)
+ ++cp;
+ else
+ cp = ifname;
+ }
+ strcpy(buf, cp);
+ for (p = buf; *p != '\0'; ++p)
+ {
+ if (!isalnum(*p))
+ *p = '_';
+ }
+ fprintf(ofile, "static %sunsigned char %s[] = {\n", useconst ? "const " : "", buf);
+ int c, col = 1;
+ while ((c = myfgetc(ifile)) != EOF)
+ {
+ if (col >= 78 - 6)
+ {
+ fputc('\n', ofile);
+ col = 1;
+ }
+ fprintf(ofile, "0x%.2x, ", c);
+ col += 6;
+ }
+ fprintf(ofile, "\n};\n");
+
+ fclose(ifile);
+ fclose(ofile);
+}
+
+void usage(void)
+{
+ fprintf(stderr, "usage: bin2c [-cz] \n");
+ exit(1);
+}
+
+int main(int argc, char **argv)
+{
+ while (argc > 3)
+ {
+ if (!strcmp(argv[1], "-c"))
+ {
+ useconst = 1;
+ --argc;
+ ++argv;
+ } else if (!strcmp(argv[1], "-z"))
+ {
+ zeroterminated = 1;
+ --argc;
+ ++argv;
+ } else {
+ usage();
+ }
+ }
+ if (argc != 3)
+ {
+ usage();
+ }
+ process(argv[1], argv[2]);
+ return 0;
+}
diff --git a/pkgs/development/tools/misc/bossa/bossa-no-applet-build.patch b/pkgs/development/tools/misc/bossa/bossa-no-applet-build.patch
new file mode 100644
index 00000000000..4284245f485
--- /dev/null
+++ b/pkgs/development/tools/misc/bossa/bossa-no-applet-build.patch
@@ -0,0 +1,16 @@
+diff --git a/Makefile b/Makefile
+index cc8882e..97b11ee 100644
+--- a/Makefile
++++ b/Makefile
+@@ -184,11 +184,6 @@ $(foreach src,$(COMMON_SRCS),$(eval $(call common_obj,$(src))))
+ # Applet rules
+ #
+ define applet_obj
+-$(SRCDIR)/$(1:%.asm=%.cpp): $(SRCDIR)/$(1)
+- @echo APPLET $(1:%.asm=%)
+- $$(Q)$$(ARMAS) -o $$(@:%.o=%.obj) $$<
+- $$(Q)$$(ARMOBJCOPY) -O binary $$(@:%.o=%.obj) $$(@:%.o=%.bin)
+- $$(Q)appletgen $(1:%.asm=%) $(SRCDIR) $(OBJDIR)
+ $(OBJDIR)/$(1:%.asm=%.o): $(SRCDIR)/$(1:%.asm=%.cpp)
+ @echo CPP APPLET $$<
+ $$(Q)$$(CXX) $$(COMMON_CXXFLAGS) -c -o $$(@) $$(<:%.asm=%.cpp)
diff --git a/pkgs/development/tools/misc/bossa/default.nix b/pkgs/development/tools/misc/bossa/default.nix
new file mode 100644
index 00000000000..71148755a75
--- /dev/null
+++ b/pkgs/development/tools/misc/bossa/default.nix
@@ -0,0 +1,51 @@
+{ stdenv, fetchgit, wxGTK, libX11, readline }:
+
+let
+ # BOSSA needs a "bin2c" program to embed images.
+ # Source taken from:
+ # http://wiki.wxwidgets.org/Embedding_PNG_Images-Bin2c_In_C
+ bin2c = stdenv.mkDerivation {
+ name = "bossa-bin2c";
+ src = ./bin2c.c;
+ unpackPhase = "true";
+ buildPhase = ''cc $src -o bin2c'';
+ installPhase = ''mkdir -p $out/bin; cp bin2c $out/bin/'';
+ };
+
+in
+stdenv.mkDerivation rec {
+ name = "bossa";
+
+ src = fetchgit {
+ url = https://github.com/shumatech/BOSSA;
+ rev = "0f0a41cb1c3a65e909c5c744d8ae664e896a08ac"; /* arduino branch */
+ sha256 = "01y8r45fw02rps9q995mv82bxrm6p0mysv4wir5glpagrhnyw7md";
+ };
+
+ patches = [ ./bossa-no-applet-build.patch ];
+
+ nativeBuildInputs = [ bin2c ];
+ buildInputs = [ wxGTK libX11 readline ];
+
+ # Explicitly specify targets so they don't get stripped.
+ makeFlags = [ "bin/bossac" "bin/bossash" "bin/bossa" ];
+
+ installPhase = ''
+ mkdir -p $out/bin
+ cp bin/bossa{c,sh,} $out/bin/
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A flash programming utility for Atmel's SAM family of flash-based ARM microcontrollers";
+ longDescription = ''
+ BOSSA is a flash programming utility for Atmel's SAM family of
+ flash-based ARM microcontrollers. The motivation behind BOSSA is
+ to create a simple, easy-to-use, open source utility to replace
+ Atmel's SAM-BA software. BOSSA is an acronym for Basic Open
+ Source SAM-BA Application to reflect that goal.
+ '';
+ homepage = http://www.shumatech.com/web/products/bossa;
+ license = licenses.bsd3;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/development/tools/misc/cl-launch/default.nix b/pkgs/development/tools/misc/cl-launch/default.nix
index d66ca9868f5..085af9df3a3 100644
--- a/pkgs/development/tools/misc/cl-launch/default.nix
+++ b/pkgs/development/tools/misc/cl-launch/default.nix
@@ -3,11 +3,11 @@ let
s = # Generated upstream information
rec {
baseName="cl-launch";
- version="4.0.5";
+ version="4.1";
name="${baseName}-${version}";
- hash="00i11pkwsb9r9cjzxjmj0dsp369i0gpz04f447xss9a9v192dhlj";
- url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-4.0.5.tar.gz";
- sha256="00i11pkwsb9r9cjzxjmj0dsp369i0gpz04f447xss9a9v192dhlj";
+ hash="0fmxa8013sgxmbfmh1wqffywg72zynzlw5yyrdvy9qpx1my36pwb";
+ url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-4.1.tar.gz";
+ sha256="0fmxa8013sgxmbfmh1wqffywg72zynzlw5yyrdvy9qpx1my36pwb";
};
buildInputs = [
];
diff --git a/pkgs/development/tools/misc/coccinelle/default.nix b/pkgs/development/tools/misc/coccinelle/default.nix
index 51f5ed6091f..3ec898e0459 100644
--- a/pkgs/development/tools/misc/coccinelle/default.nix
+++ b/pkgs/development/tools/misc/coccinelle/default.nix
@@ -14,7 +14,7 @@ in stdenv.mkDerivation {
};
buildInputs = with ocamlPackages; [
- ocaml findlib menhir
+ ocaml findlib menhir ocamlPackages.camlp4
ocaml_pcre pycaml
python ncurses pkgconfig
makeWrapper
diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix
index 852c1b74219..df5fdbfab5a 100644
--- a/pkgs/development/tools/misc/d-feet/default.nix
+++ b/pkgs/development/tools/misc/d-feet/default.nix
@@ -26,7 +26,6 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/d-feet \
--prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pygobject3})" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
- --prefix LD_LIBRARY_PATH : "${gtk3}/lib:${atk}/lib:${libwnck3}/lib" \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$out/share"
rm $out/share/icons/hicolor/icon-theme.cache
diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix
index 5ee0f64a4e4..d9af1e3eb54 100644
--- a/pkgs/development/tools/misc/gdb/default.nix
+++ b/pkgs/development/tools/misc/gdb/default.nix
@@ -1,5 +1,5 @@
{ fetchurl, stdenv, ncurses, readline, gmp, mpfr, expat, texinfo
-, dejagnu, python, target ? null
+, dejagnu, python, pkgconfig, guile, target ? null
# Additional dependencies for GNU/Hurd.
, mig ? null, hurd ? null
@@ -8,7 +8,7 @@
let
- basename = "gdb-7.7";
+ basename = "gdb-7.8";
# Whether (cross-)building for GNU/Hurd. This is an approximation since
# having `stdenv ? cross' doesn't tell us if we're building `crossDrv' and
@@ -26,8 +26,8 @@ stdenv.mkDerivation rec {
("-" + target.config);
src = fetchurl {
- url = "mirror://gnu/gdb/${basename}.tar.bz2";
- sha256 = "08vcb97j1b7vxwq6088wb6s3g3bm8iwikd922y0xsgbbxv3d2104";
+ url = "mirror://gnu/gdb/${basename}.tar.xz";
+ sha256 = "49c4abe174f79f54e1f9e75210ffb590d9b497d5b5200b5398c0e073a4ecb875";
};
patches = [ ./edit-signals.patch ];
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ texinfo python ]
++ stdenv.lib.optional isGNU mig;
- buildInputs = [ ncurses readline gmp mpfr expat ]
+ buildInputs = [ ncurses readline gmp mpfr expat pkgconfig guile ]
++ stdenv.lib.optional isGNU hurd
++ stdenv.lib.optional doCheck dejagnu;
diff --git a/pkgs/development/tools/misc/go-repo-root/default.nix b/pkgs/development/tools/misc/go-repo-root/default.nix
new file mode 100644
index 00000000000..c4eaf03a358
--- /dev/null
+++ b/pkgs/development/tools/misc/go-repo-root/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, lib, go, fetchgit, fetchhg, fetchFromGitHub }:
+
+let
+ version = "0.0.1";
+in
+
+with lib;
+stdenv.mkDerivation {
+ name = "go-repo-root-${version}";
+
+ src = import ./deps.nix {
+ inherit stdenv lib fetchhg fetchFromGitHub;
+ };
+
+ buildInputs = [ go ];
+
+ buildPhase = ''
+ export GOPATH=$src
+ go build -v -o go-repo-root github.com/cstrahan/go-repo-root
+ '';
+
+ installPhase = ''
+ mkdir -p $out/bin
+ cp go-repo-root $out/bin
+ '';
+
+ meta = with lib; {
+ homepage = "https://github.com/cstrahan/go-repo-root";
+ maintainers = with maintainers; [ cstrahan ];
+ license = licenses.mit;
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/development/tools/misc/go-repo-root/deps.nix b/pkgs/development/tools/misc/go-repo-root/deps.nix
new file mode 100644
index 00000000000..585e9955ab2
--- /dev/null
+++ b/pkgs/development/tools/misc/go-repo-root/deps.nix
@@ -0,0 +1,67 @@
+{ stdenv, lib, fetchFromGitHub, fetchhg }:
+
+let
+ goDeps = [
+ {
+ root = "code.google.com/p/go.net";
+ src = fetchhg {
+ url = "http://code.google.com/p/go.net";
+ rev = "ad01a6fcc8a19d3a4478c836895ffe883bd2ceab";
+ sha256 = "0s0aa8hxrpggn6wwx4x591k6abvawrmhsk8ji327pgj08fdy3ahq";
+ };
+ }
+ {
+ root = "code.google.com/p/go.text";
+ src = fetchhg {
+ url = "http://code.google.com/p/go.text";
+ rev = "12288f41f508af9490f03a9780afa295c9b0a063";
+ sha256 = "17kr0h79pznb3nn5znbh1d7dinmqjwvg5iqqk4l05569q50gqwww";
+ };
+ }
+ {
+ root = "code.google.com/p/go.tools";
+ src = fetchhg {
+ url = "http://code.google.com/p/go.tools";
+ rev = "140fcaadc5860b1a014ec69fdeec807fe3b787e8";
+ sha256 = "1vgz4kxy0p56qh6pfbs2c68156hakgx4cmrci9jbg7lnrdaz4y56";
+ };
+ }
+ {
+ root = "code.google.com/p/goauth2";
+ src = fetchhg {
+ url = "http://code.google.com/p/goauth2";
+ rev = "afe77d958c701557ec5dc56f6936fcc194d15520";
+ sha256 = "0xgkgcb97hv2rvzvh21rvydq5cc83j7sdsdb1chrymq8k7l4dzc1";
+ };
+ }
+ {
+ root = "code.google.com/p/google-api-go-client";
+ src = fetchhg {
+ url = "http://code.google.com/p/google-api-go-client";
+ rev = "e1c259484b495133836706f46319f5897f1e9bf6";
+ sha256 = "051dqhjhp3bz2xp7lv9v60xlmphbxj1vyc46wg8v74yjvqvsiwzd";
+ };
+ }
+ {
+ root = "github.com/cstrahan/go-repo-root";
+ src = fetchFromGitHub {
+ owner = "cstrahan";
+ repo = "go-repo-root";
+ rev = "90041e5c7dc634651549f96814a452f4e0e680f9";
+ sha256 = "1rlzp8kjv0a3dnfhyqcggny0ad648j5csr2x0siq5prahlp48mg4";
+ };
+ }
+ ];
+
+in
+
+stdenv.mkDerivation rec {
+ name = "go-deps";
+
+ buildCommand =
+ lib.concatStrings
+ (map (dep: ''
+ mkdir -p $out/src/`dirname ${dep.root}`
+ ln -s ${dep.src} $out/src/${dep.root}
+ '') goDeps);
+}
diff --git a/pkgs/development/tools/misc/grafana/default.nix b/pkgs/development/tools/misc/grafana/default.nix
index b1566684cf0..9337bf4052f 100644
--- a/pkgs/development/tools/misc/grafana/default.nix
+++ b/pkgs/development/tools/misc/grafana/default.nix
@@ -4,11 +4,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "grafana-${version}";
- version = "1.5.4";
+ version = "1.8.0-rc1";
src = fetchurl {
url = "http://grafanarel.s3.amazonaws.com/${name}.zip";
- sha256 = "fee7334efba967142955be2fa39ecae7bca0cc9b7a76c301430746be4fc7ec6d";
+ sha256 = "1wx4zwkpgvb8lxcrkp67zgqd8aqms4bnxzwz3i9190sl55j1yf4i";
};
buildInputs = [ unzip ];
diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix
index c4ba7073889..caf9dc489b5 100644
--- a/pkgs/development/tools/misc/help2man/default.nix
+++ b/pkgs/development/tools/misc/help2man/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, perl, gettext, LocaleGettext, makeWrapper }:
stdenv.mkDerivation rec {
- name = "help2man-1.44.1";
+ name = "help2man-1.46.3";
src = fetchurl {
url = "mirror://gnu/help2man/${name}.tar.xz";
- sha256 = "1yyyfw9zrfdvslnv91bnhyqmazwx243wmkc9wdaz888rfx36ipi2";
+ sha256 = "0hi94a6ai96yw0v8xgjzpp5c6jr33ifmbn2mkp7wz7rgmwxxqsd6";
};
buildInputs = [ makeWrapper perl gettext LocaleGettext ];
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
'';
- meta = {
+ meta = with stdenv.lib; {
description = "Generate man pages from `--help' output";
longDescription =
@@ -28,8 +28,8 @@ stdenv.mkDerivation rec {
homepage = http://www.gnu.org/software/help2man/;
- license = stdenv.lib.licenses.gpl3Plus;
- platforms = stdenv.lib.platforms.gnu; # arbitrary choice
- maintainers = [ stdenv.lib.maintainers.ludo ];
+ license = licenses.gpl3Plus;
+ platforms = platforms.gnu; # arbitrary choice
+ maintainers = with maintainers; [ ludo pSub ];
};
}
diff --git a/pkgs/development/tools/misc/inotify-tools/default.nix b/pkgs/development/tools/misc/inotify-tools/default.nix
index 3402c2060e7..4c1cd5bd7bd 100644
--- a/pkgs/development/tools/misc/inotify-tools/default.nix
+++ b/pkgs/development/tools/misc/inotify-tools/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://github.com/downloads/rvoicilas/inotify-tools/inotify-tools-${version}.tar.gz";
- sha256 = "0icl4bx041axd5dvhg89kilfkysjj86hjakc7bk8n49cxjn4cha6";
+ sha256 = "0by9frv1k59f76cx08sn06sk6lmdxsfb6zr0rshzhyrxi6lcqar2";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/misc/kibana/default.nix b/pkgs/development/tools/misc/kibana/default.nix
new file mode 100644
index 00000000000..42e5c2209f1
--- /dev/null
+++ b/pkgs/development/tools/misc/kibana/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, unzip, conf ? null }:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+ name = "kibana-${version}";
+ version = "3.1.0";
+
+ src = fetchurl {
+ url = "https://download.elasticsearch.org/kibana/kibana/${name}.zip";
+ sha256 = "05i97zi08rxwx951hgs92fbhk6cchpvdlikrfz07v1dpn787xz8j";
+ };
+
+ buildInputs = [ unzip ];
+
+ phases = ["unpackPhase" "installPhase"];
+ installPhase = ''
+ mkdir -p $out && cp -R * $out
+ ${optionalString (conf!=null) ''cp ${conf} $out/config.js''}
+ '';
+
+ meta = {
+ description = "Visualize logs and time-stamped data";
+ homepage = http://www.elasticsearch.org/overview/kibana;
+ license = licenses.asl20;
+
+ maintainers = [ maintainers.offline ];
+ };
+}
diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix
index ec3a5e9bcbf..1ef292407a4 100644
--- a/pkgs/development/tools/misc/lsof/default.nix
+++ b/pkgs/development/tools/misc/lsof/default.nix
@@ -30,6 +30,6 @@ stdenv.mkDerivation {
socket (IPv6/IPv4/UNIX local), or partition (by opening a file
from it).
'';
- maintainers = stdenv.lib.maintainers.mornfall;
+ maintainers = [ stdenv.lib.maintainers.mornfall ];
};
}
diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix
index 732423da5cd..7cc878a2839 100644
--- a/pkgs/development/tools/misc/strace/default.nix
+++ b/pkgs/development/tools/misc/strace/default.nix
@@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
description = "A system call tracer for Linux";
license = licenses.bsd3;
platforms = platforms.linux;
- maintainers = maintainers.mornfall;
+ maintainers = [ maintainers.mornfall ];
};
}
diff --git a/pkgs/development/tools/misc/swig/default.nix b/pkgs/development/tools/misc/swig/default.nix
index 66d6b65453e..c4fcd315845 100644
--- a/pkgs/development/tools/misc/swig/default.nix
+++ b/pkgs/development/tools/misc/swig/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
# 'make check' uses boost and tcl
buildInputs = stdenv.lib.optionals doCheck [ boost tcl ];
- configureFlags = stdenv.lib.optionalString stdenv.isDarwin "--disable-ccache";
+ configureFlags = "--disable-ccache";
meta = {
description = "Interface compiler that connects C/C++ code to higher-level languages";
diff --git a/pkgs/development/tools/neoload/default.nix b/pkgs/development/tools/neoload/default.nix
index 5b66ea75f65..fc9446408de 100644
--- a/pkgs/development/tools/neoload/default.nix
+++ b/pkgs/development/tools/neoload/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, writeTextFile, jre, makeWrapper, licenseAccepted ? false }:
+{ stdenv, fetchurl, writeTextFile, jre, makeWrapper, fontsConf, licenseAccepted ? false }:
# If you happen to use this software on the XMonad window manager, you will have issues with
# grey windows, no resizing, menus not showing and other glitches.
@@ -62,6 +62,7 @@ in stdenv.mkDerivation rec {
export HOME=`pwd`
export INSTALL4J_JAVA_HOME=${jre}
+ export FONTCONFIG_FILE=${fontsConf}
bash -ic './installer -q -varfile response.varfile'
sed -i 's/Xmx450m/Xmx900m/;s/Xss192k/Xss384k/' $out/lib/neoload/conf/agent.properties
diff --git a/pkgs/development/tools/node-webkit/default.nix b/pkgs/development/tools/node-webkit/default.nix
index 1f101776064..f79a5f562c0 100644
--- a/pkgs/development/tools/node-webkit/default.nix
+++ b/pkgs/development/tools/node-webkit/default.nix
@@ -9,8 +9,9 @@ let
name = "node-webkit-env";
paths = [
xlibs.libX11 xlibs.libXrender glib gtk atk pango cairo gdk_pixbuf
- freetype fontconfig xlibs.libXcomposite alsaLib xlibs.libXdamage xlibs.libXext
- xlibs.libXfixes nss nspr gconf expat dbus udev stdenv.gcc.gcc
+ freetype fontconfig xlibs.libXcomposite alsaLib xlibs.libXdamage
+ xlibs.libXext xlibs.libXfixes nss nspr gconf expat dbus stdenv.gcc.gcc
+ xlibs.libXtst xlibs.libXi
];
};
@@ -19,28 +20,27 @@ in stdenv.mkDerivation rec {
version = "0.9.2";
src = fetchurl {
- url = "https://s3.amazonaws.com/node-webkit/v${version}/node-webkit-v${version}-linux-${bits}.tar.gz";
+ url = "http://dl.node-webkit.org/v${version}/node-webkit-v${version}-linux-${bits}.tar.gz";
sha256 = if bits == "x64" then
"04b9hgrxxnvrzyc7kmlabvrfbzj9d6lif7z69zgsbn3x25nxxd2n" else
"0icwdl564sbx27124js1l4whfld0n6nbysdd522frzk1759dzgri";
};
- patchPhase = ''
- patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" nw
- patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" nwsnapshot
- '';
-
- installPhase = let
- LD_LIBRARY_PATH = "${nwEnv}/lib:${nwEnv}/lib64:$out/share/node-webkit";
- in ''
- mkdir -p $out/bin
+ installPhase = ''
mkdir -p $out/share/node-webkit
cp -R * $out/share/node-webkit
+ patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" $out/share/node-webkit/nw
+ patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" $out/share/node-webkit/nwsnapshot
+
ln -s ${udev}/lib/libudev.so $out/share/node-webkit/libudev.so.0
- makeWrapper $out/share/node-webkit/nw $out/bin/nw --prefix LD_LIBRARY_PATH : "${LD_LIBRARY_PATH}"
- makeWrapper $out/share/node-webkit/nwsnapshot $out/bin/nwsnapshot --prefix LD_LIBRARY_PATH : "${LD_LIBRARY_PATH}"
+ patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/node-webkit" $out/share/node-webkit/nw
+ patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/node-webkit" $out/share/node-webkit/nwsnapshot
+
+ mkdir -p $out/bin
+ ln -s $out/share/node-webkit/nw $out/bin
+ ln -s $out/share/node-webkit/nwsnapshot $out/bin
'';
buildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/ocaml/camlp4/default.nix b/pkgs/development/tools/ocaml/camlp4/default.nix
new file mode 100644
index 00000000000..bd2466c8854
--- /dev/null
+++ b/pkgs/development/tools/ocaml/camlp4/default.nix
@@ -0,0 +1,46 @@
+{stdenv, fetchurl, which, ocaml}:
+let
+ ocaml_version = (stdenv.lib.getVersion ocaml);
+in
+
+assert stdenv.lib.versionAtLeast ocaml_version "4.02";
+
+stdenv.mkDerivation {
+ name = "camlp4-4.02.0+1";
+ src = fetchurl {
+ url = https://github.com/ocaml/camlp4/archive/4.02.0+1.tar.gz;
+ sha256 = "0055f4jiz82rgn581xhq3mr4qgq2qgdxqppmp8i2x1xnsim4h9pn";
+ };
+
+ buildInputs = [ which ocaml ];
+
+ dontAddPrefix = true;
+
+ preConfigure = ''
+ configureFlagsArray=(
+ --bindir=$out/bin
+ --libdir=$out/lib/ocaml/${ocaml_version}/site-lib
+ --pkgdir=$out/lib/ocaml/${ocaml_version}/site-lib
+ )
+ '';
+
+ postConfigure = ''
+ substituteInPlace camlp4/META.in \
+ --replace +camlp4 $out/lib/ocaml/${ocaml_version}/site-lib/camlp4
+ substituteInPlace camlp4/config/Camlp4_config.ml \
+ --replace \
+ "Filename.concat ocaml_standard_library" \
+ "Filename.concat \"$out/lib/ocaml/${ocaml_version}/site-lib\""
+ '';
+
+
+ makePhase = "make all";
+
+ installTargets = "install install-META";
+
+ meta = with stdenv.lib; {
+ description = "A software system for writing extensible parsers for programming languages";
+ homepage = https://github.com/ocaml/camlp4;
+ platforms = ocaml.meta.platforms;
+ };
+}
diff --git a/pkgs/development/tools/ocaml/camlp5/5.15.nix b/pkgs/development/tools/ocaml/camlp5/5.15.nix
index 7247041cb1d..97099d1b492 100644
--- a/pkgs/development/tools/ocaml/camlp5/5.15.nix
+++ b/pkgs/development/tools/ocaml/camlp5/5.15.nix
@@ -8,6 +8,8 @@ let
metafile = ./META;
in
+assert !stdenv.lib.versionOlder "4.00" ocaml_version;
+
stdenv.mkDerivation {
name = "${pname}${if transitional then "_transitional" else ""}-${version}";
diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix
index 8691e1b9d11..1c811b21758 100644
--- a/pkgs/development/tools/ocaml/camlp5/default.nix
+++ b/pkgs/development/tools/ocaml/camlp5/default.nix
@@ -7,11 +7,11 @@ in
stdenv.mkDerivation {
- name = "camlp5${if transitional then "_transitional" else ""}-6.11";
+ name = "camlp5${if transitional then "_transitional" else ""}-6.12";
src = fetchurl {
- url = http://pauillac.inria.fr/~ddr/camlp5/distrib/src/camlp5-6.11.tgz;
- sha256 = "0dxb5id6imq502sic75l786q94dhplqx6yyhjkkw19kf64fiqlk5";
+ url = http://camlp5.gforge.inria.fr/distrib/src/camlp5-6.12.tgz;
+ sha256 = "00jwgp6w4g64lfqjx77xziy532091fy00c42fsy0b4i892rch5mp";
};
buildInputs = [ ocaml ];
@@ -25,17 +25,17 @@ stdenv.mkDerivation {
postInstall = "cp ${metafile} $out/lib/ocaml/${ocaml_version}/site-lib/camlp5/META";
- meta = {
+ meta = with stdenv.lib; {
description = "Preprocessor-pretty-printer for OCaml";
longDescription = ''
Camlp5 is a preprocessor and pretty-printer for OCaml programs.
It also provides parsing and printing tools.
'';
homepage = http://pauillac.inria.fr/~ddr/camlp5/;
- license = stdenv.lib.licenses.bsd3;
+ license = licenses.bsd3;
platforms = ocaml.meta.platforms;
- maintainers = [
- stdenv.lib.maintainers.z77z
+ maintainers = with maintainers; [
+ z77z vbgl
];
};
}
diff --git a/pkgs/development/tools/ocaml/cppo/default.nix b/pkgs/development/tools/ocaml/cppo/default.nix
index 04475959f3d..49a63b616c7 100644
--- a/pkgs/development/tools/ocaml/cppo/default.nix
+++ b/pkgs/development/tools/ocaml/cppo/default.nix
@@ -4,6 +4,7 @@ let
version = "0.9.4";
webpage = "http://mjambon.com/${pname}.html";
in
+assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12";
stdenv.mkDerivation rec {
name = "${pname}-${version}";
@@ -23,15 +24,13 @@ stdenv.mkDerivation rec {
mkdir $out/bin
'';
- meta = {
+ meta = with stdenv.lib; {
description = "The C preprocessor for OCaml";
longDescription = ''
Cppo is an equivalent of the C preprocessor targeted at the OCaml language and its variants.
'';
homepage = "${webpage}";
- license = "bsd";
+ maintainers = [ maintainers.vbgl ];
+ license = licenses.bsd3;
};
}
-
-
-
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff b/pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff
new file mode 100644
index 00000000000..ee39855fec9
--- /dev/null
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff
@@ -0,0 +1,10 @@
+--- old/Makefile.conf 2014-05-19 16:53:09.263564921 +0200
++++ new/Makefile.conf 2014-05-19 16:53:42.213152994 +0200
+@@ -1,6 +1,6 @@
+
+ # Where binaries are installed:
+-BINDIR := /usr/local/bin
++BINDIR := $(out)/bin
+
+ ####
+
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
new file mode 100644
index 00000000000..a7167d0c226
--- /dev/null
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
@@ -0,0 +1,28 @@
+{stdenv, fetchurl, ocaml, findlib, ocaml_lwt, menhir, ocsigen_deriving}:
+
+stdenv.mkDerivation {
+ name = "js_of_ocaml";
+ src = fetchurl {
+ url = https://github.com/ocsigen/js_of_ocaml/archive/2.2.tar.gz;
+ sha256 = "1cp81gpvyxgvzxg0vzyl8aa2zvcixp6m433w8zjifrg6vb7lhp97";
+ };
+
+ buildInputs = [ocaml findlib ocaml_lwt menhir ocsigen_deriving];
+
+ patches = [ ./Makefile.conf.diff ];
+
+ createFindlibDestdir = true;
+
+
+ meta = {
+ homepage = http://ocsigen.org/js_of_ocaml/;
+ description = "Compiler of OCaml bytecode to Javascript. It makes it possible to run Ocaml programs in a Web browser";
+ license = "LGPL";
+ platforms = ocaml.meta.platforms;
+ maintainers = [
+ stdenv.lib.maintainers.gal_bolle
+ ];
+ };
+
+
+}
diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix
index c0882439f5c..30fabf19362 100644
--- a/pkgs/development/tools/ocaml/merlin/default.nix
+++ b/pkgs/development/tools/ocaml/merlin/default.nix
@@ -1,21 +1,24 @@
-{stdenv, fetchurl, ocaml, findlib, easy-format, biniou, yojson, menhir}:
+{stdenv, fetchurl, ocaml, findlib, yojson, menhir}:
+
+assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00";
+
stdenv.mkDerivation {
- name = "merlin-1.6";
+ name = "merlin-1.7.1";
src = fetchurl {
- url = "https://github.com/the-lambda-church/merlin/archive/v1.6.tar.gz";
- sha256 = "0wq75hgffaszazrhkl0nfjxgx8bvazi2sjannd8q64hvax8hxzcy";
+ url = https://github.com/the-lambda-church/merlin/archive/v1.7.1.tar.gz;
+ sha256 = "c3b60c7b3fddaa2860e0d8ac0d4fed2ed60e319875734c7ac1a93df524c67aff";
};
- buildInputs = [ ocaml findlib biniou yojson menhir easy-format ];
+ buildInputs = [ ocaml findlib yojson menhir ];
prefixKey = "--prefix ";
- meta = {
- description = "An editor-independant tool to ease the developpement of programs in OCaml";
+ meta = with stdenv.lib; {
+ description = "An editor-independent tool to ease the development of programs in OCaml";
homepage = "http://the-lambda-church.github.io/merlin/";
- license = stdenv.lib.licenses.mit;
+ license = licenses.mit;
+ maintainers = [ maintainers.vbgl ];
};
}
-
diff --git a/pkgs/development/tools/ocaml/oasis/default.nix b/pkgs/development/tools/ocaml/oasis/default.nix
index 3ab935705a2..a5260b499c4 100644
--- a/pkgs/development/tools/ocaml/oasis/default.nix
+++ b/pkgs/development/tools/ocaml/oasis/default.nix
@@ -13,9 +13,11 @@ stdenv.mkDerivation {
buildInputs =
[
- ocaml findlib ocaml_data_notation ocaml_typeconv ocamlmod ocamlify ounit
+ ocaml findlib ocaml_typeconv ocamlmod ocamlify ounit
];
+ propagatedBuildInputs = [ ocaml_data_notation ];
+
configurePhase = "ocaml setup.ml -configure --prefix $out";
buildPhase = "ocaml setup.ml -build";
installPhase = "ocaml setup.ml -install";
diff --git a/pkgs/development/tools/ocaml/ocamlify/default.nix b/pkgs/development/tools/ocaml/ocamlify/default.nix
index 88b7451e0f0..0a402d4ba46 100644
--- a/pkgs/development/tools/ocaml/ocamlify/default.nix
+++ b/pkgs/development/tools/ocaml/ocamlify/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ocaml, findlib, ounit}:
+{stdenv, fetchurl, ocaml, findlib}:
stdenv.mkDerivation {
name = "ocamlify-0.0.2";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "1f0fghvlbfryf5h3j4as7vcqrgfjb4c8abl5y0y5h069vs4kp5ii";
};
- buildInputs = [ocaml findlib ounit];
+ buildInputs = [ocaml findlib];
configurePhase = "ocaml setup.ml -configure --prefix $out";
buildPhase = "ocaml setup.ml -build";
diff --git a/pkgs/development/tools/ocaml/ocamlmod/default.nix b/pkgs/development/tools/ocaml/ocamlmod/default.nix
index d72df18f899..65359049a96 100644
--- a/pkgs/development/tools/ocaml/ocamlmod/default.nix
+++ b/pkgs/development/tools/ocaml/ocamlmod/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ocaml, findlib, ounit}:
+{stdenv, fetchurl, ocaml, findlib}:
stdenv.mkDerivation {
name = "ocamlmod-0.0.7";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "11kg7wh0gy492ma5c6bcjh6frv1a9lh9f26hiys2i0d1ky8s0ad3";
};
- buildInputs = [ocaml findlib ounit];
+ buildInputs = [ocaml findlib];
configurePhase = "ocaml setup.ml -configure --prefix $out";
buildPhase = "ocaml setup.ml -build";
diff --git a/pkgs/development/tools/ocaml/opam/1.0.0.nix b/pkgs/development/tools/ocaml/opam/1.0.0.nix
index f8f680ef4a5..52c710a86b8 100644
--- a/pkgs/development/tools/ocaml/opam/1.0.0.nix
+++ b/pkgs/development/tools/ocaml/opam/1.0.0.nix
@@ -1,5 +1,7 @@
{ stdenv, fetchgit, fetchurl, ocaml, unzip, ncurses, curl }:
+assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12.1";
+
let
srcs = {
cudf = fetchurl {
@@ -53,7 +55,7 @@ stdenv.mkDerivation rec {
doCheck = false;
meta = {
- maintainers = stdenv.lib.maintainers.orbitz;
+ maintainers = [ stdenv.lib.maintainers.orbitz ];
description = "A package manager for OCaml";
platforms = stdenv.lib.platforms.all;
};
diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix
new file mode 100644
index 00000000000..1b99c4d4d43
--- /dev/null
+++ b/pkgs/development/tools/ocaml/utop/default.nix
@@ -0,0 +1,46 @@
+{stdenv, fetchurl, ocaml, findlib, lambdaTerm, ocaml_lwt, makeWrapper,
+ ocaml_react, camomile, zed
+}:
+
+stdenv.mkDerivation rec {
+ version = "1.14";
+ name = "utop-${version}";
+
+ src = fetchurl {
+ url = https://github.com/diml/utop/archive/1.14.tar.gz;
+ sha256 = "17dqinvdrpba2fjs7sl6gxs47rrx6j8a5bbjhc7flp6bdls898zk";
+ };
+
+ buildInputs = [ ocaml findlib makeWrapper];
+
+ propagatedBuildInputs = [ lambdaTerm ocaml_lwt ];
+
+ createFindlibDestdir = true;
+
+ buildPhase = ''
+ make
+ make doc
+ '';
+
+ postFixup =
+ let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version;
+ in
+ ''
+ wrapProgram "$out"/bin/utop --set CAML_LD_LIBRARY_PATH "${ocaml_lwt}"/lib/ocaml/${ocamlVersion}/site-lib/lwt/:"${lambdaTerm}"/lib/ocaml/${ocamlVersion}/site-lib/lambda-term/:'$CAML_LD_LIBRARY_PATH' --set OCAMLPATH "${ocaml_lwt}"/lib/ocaml/${ocamlVersion}/site-lib:${ocaml_react}/lib/ocaml/${ocamlVersion}/site-lib:${camomile}/lib/ocaml/${ocamlVersion}/site-lib:${zed}/lib/ocaml/${ocamlVersion}/site-lib:${lambdaTerm}/lib/ocaml/${ocamlVersion}/site-lib:"$out"/lib/ocaml/${ocamlVersion}/site-lib:'$OCAMLPATH'
+ '';
+
+ meta = {
+ description = "Universal toplevel for OCaml";
+ longDescription = ''
+ utop is an improved toplevel for OCaml. It can run in a terminal or in Emacs. It supports line edition, history, real-time and context sensitive completion, colors, and more.
+
+ It integrates with the tuareg mode in Emacs.
+ '';
+ homepage = https://github.com/diml/utop;
+ license = stdenv.lib.licenses.bsd3;
+ platforms = ocaml.meta.platforms;
+ maintainers = [
+ stdenv.lib.maintainers.gal_bolle
+ ];
+ };
+}
diff --git a/pkgs/development/tools/parsing/Ebnf2ps/default.nix b/pkgs/development/tools/parsing/Ebnf2ps/default.nix
index b3d4c125bb9..4b4eae915f5 100644
--- a/pkgs/development/tools/parsing/Ebnf2ps/default.nix
+++ b/pkgs/development/tools/parsing/Ebnf2ps/default.nix
@@ -4,13 +4,13 @@
cabal.mkDerivation (self: {
pname = "Ebnf2ps";
- version = "1.0.11";
- sha256 = "0n0maihalnrks3l7ay1i16p6i7f69xv33jxhlsyshzck0v64qivb";
+ version = "1.0.12";
+ sha256 = "1rd0pxj2bfx06z1p0sy8kdhyfg1y51gn1bhr71j33czls6m9ry8c";
isLibrary = false;
isExecutable = true;
buildTools = [ happy ];
meta = {
- homepage = "http://www.informatik.uni-freiburg.de/~thiemann/haskell/ebnf2ps/";
+ homepage = "https://github.com/FranklinChen/Ebnf2ps";
description = "Peter's Syntax Diagram Drawing Tool";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix
index ec302611053..8842c8723b1 100644
--- a/pkgs/development/tools/parsing/byacc/default.nix
+++ b/pkgs/development/tools/parsing/byacc/default.nix
@@ -4,15 +4,10 @@ stdenv.mkDerivation {
name = "byacc-1.9";
src = fetchurl {
- url = http://www.isc.org/sources/devel/tools/byacc-1.9.tar.gz;
- sha256 = "d61a15ac4ac007c188d0c0e99365f016f8d327755f43032b58e400754846f736";
+ url = ftp://invisible-island.net/byacc/byacc-20140715.tgz;
+ sha256 = "1rbzx5ipkvih9rjfdfv6310wcr6mxjbdlsh9zcv5aaz6yxxxil7c";
};
- preConfigure =
- ''mkdir -p $out/bin
- sed -i "s@^DEST.*\$@DEST = $out/bin/yacc@" Makefile
- '';
-
meta = {
description = "Berkeley YACC";
homepage = http://dickey.his.com/byacc/byacc.html;
diff --git a/pkgs/development/tools/slimerjs/default.nix b/pkgs/development/tools/slimerjs/default.nix
index 9741b0930d2..c155cd30944 100644
--- a/pkgs/development/tools/slimerjs/default.nix
+++ b/pkgs/development/tools/slimerjs/default.nix
@@ -3,11 +3,11 @@ let
s = # Generated upstream information
rec {
baseName="slimerjs";
- version="0.9.1";
+ version="0.9.3";
name="${baseName}-${version}";
- hash="1ss69z2794mv40nfa5bfjd8h78jzcjq5xm63hzay1iyvp5rjbl7k";
- url="http://download.slimerjs.org/v0.9/0.9.1/slimerjs-0.9.1.zip";
- sha256="1ss69z2794mv40nfa5bfjd8h78jzcjq5xm63hzay1iyvp5rjbl7k";
+ hash="17vfnz6njn8zk39ywpg7bd9wp98ppxjvna6gn2443ylgh428v707";
+ url="http://download.slimerjs.org/releases/0.9.3/slimerjs-0.9.3.zip";
+ sha256="17vfnz6njn8zk39ywpg7bd9wp98ppxjvna6gn2443ylgh428v707";
};
buildInputs = [
unzip zip
diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix
index 072b8eeff5c..bd9ccf4947b 100644
--- a/pkgs/development/tools/vagrant/default.nix
+++ b/pkgs/development/tools/vagrant/default.nix
@@ -3,19 +3,21 @@
assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux";
+let version = "1.6.5";
+in
stdenv.mkDerivation rec {
- name = "vagrant-1.6.3";
+ name = "vagrant-${version}";
src =
if stdenv.system == "x86_64-linux" then
fetchurl {
- url = https://dl.bintray.com/mitchellh/vagrant/vagrant_1.6.3_x86_64.deb;
- sha256 = "1gmdg92dw7afnvpji0wg4nzr7vhk8mrmcqk3hcrkwscby2f2bhqg";
+ url = "https://dl.bintray.com/mitchellh/vagrant/vagrant_${version}_x86_64.deb";
+ sha256 = "12m2mnpnfzqv2s4j58cnzg4h4i5nkk5nb4irsvmm3i9a0dnsziz2";
}
else
fetchurl {
- url = https://dl.bintray.com/mitchellh/vagrant/vagrant_1.6.3_i686.deb;
- sha256 = "1z26b6yghqgx8jbi2igf4kk4h6rzy869gli2vj7ayl7vbqdfvb60";
+ url = "https://dl.bintray.com/mitchellh/vagrant/vagrant_${version}_i686.deb";
+ sha256 = "1d4w0ni6mkb378v6rd7b188fw38vi8qql7pkwzsykr6389krbkbq";
};
meta = with stdenv.lib; {
@@ -84,10 +86,10 @@ stdenv.mkDerivation rec {
preFixup = ''
# 'hide' the template file from shebang-patching
- chmod -x $out/opt/vagrant/embedded/gems/gems/bundler-1.6.2/lib/bundler/templates/Executable
+ chmod -x $out/opt/vagrant/embedded/gems/gems/bundler-1.6.6/lib/bundler/templates/Executable
'';
postFixup = ''
- chmod +x $out/opt/vagrant/embedded/gems/gems/bundler-1.6.2/lib/bundler/templates/Executable
+ chmod +x $out/opt/vagrant/embedded/gems/gems/bundler-1.6.6/lib/bundler/templates/Executable
'';
}
diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix
new file mode 100644
index 00000000000..b1ff7064003
--- /dev/null
+++ b/pkgs/development/web/grails/default.nix
@@ -0,0 +1,52 @@
+{ stdenv, fetchurl, unzip
+# If jdkPath is null, require JAVA_HOME in runtime environment, else store
+# JAVA_HOME=${jdkPath} into grails.
+, jdkPath ? null
+, coreutils, ncurses, gnused, gnugrep # for purity
+}:
+
+let
+ binpath = stdenv.lib.makeSearchPath "bin"
+ ([ coreutils ncurses gnused gnugrep ]
+ ++ stdenv.lib.optional (jdkPath != null) jdkPath);
+in
+stdenv.mkDerivation rec {
+ name = "grails-2.4.3";
+
+ src = fetchurl {
+ url = "http://dist.springframework.org.s3.amazonaws.com/release/GRAILS/${name}.zip";
+ sha256 = "0lqkv0hsiiqa36pfnq5wv7s7nsp9xadmh1ri039bn0llpfck4742";
+ };
+
+ buildInputs = [ unzip ];
+
+ buildPhase = "true";
+
+ installPhase = ''
+ mkdir -p "$out"
+ cp -vr . "$out"
+ # Remove (for now) uneeded Windows .bat files
+ rm -f "$out"/bin/*.bat
+ # Improve purity
+ sed -i -e '2iPATH=${binpath}:\$PATH' "$out"/bin/grails
+ '' + stdenv.lib.optionalString (jdkPath != null) ''
+ # Inject JDK path into grails
+ sed -i -e '2iJAVA_HOME=${jdkPath}' "$out"/bin/grails
+ '';
+
+ preferLocalBuild = true;
+
+ meta = with stdenv.lib; {
+ description = "Full stack, web application framework for the JVM";
+ longDescription = ''
+ Grails is an Open Source, full stack, web application framework for the
+ JVM. It takes advantage of the Groovy programming language and convention
+ over configuration to provide a productive and stream-lined development
+ experience.
+ '';
+ homepage = http://grails.org/;
+ license = licenses.asl20;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.bjornfor ];
+ };
+}
diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix
index ca3439df4c4..46067632410 100644
--- a/pkgs/development/web/nodejs/build-node-package.nix
+++ b/pkgs/development/web/nodejs/build-node-package.nix
@@ -1,6 +1,6 @@
{ stdenv, runCommand, nodejs, neededNatives}:
-args @ { name, src, deps ? [], peerDependencies ? [], flags ? [], preShellHook ? "", postShellHook ? "", ... }:
+args @ { name, src, deps ? {}, peerDependencies ? [], flags ? [], preShellHook ? "", postShellHook ? "", resolvedDeps ? {}, bin ? null, ... }:
with stdenv.lib;
@@ -12,88 +12,135 @@ let
mv *node* $out
'';
+ # Convert deps to attribute set
+ attrDeps = if isAttrs deps then deps else
+ (listToAttrs (map (dep: nameValuePair dep.name dep) deps));
+
+ # All required node modules, without already resolved dependencies
+ requiredDeps = removeAttrs attrDeps (attrNames resolvedDeps);
+
+ # Recursive dependencies that we want to avoid with shim creation
+ recursiveDeps = removeAttrs attrDeps (attrNames requiredDeps);
+
peerDeps = listToAttrs (concatMap (dep: map (name: {
inherit name;
value = dep;
}) (filter (nm: !(elem nm (args.passthru.names or []))) dep.names)) (peerDependencies));
-in
-stdenv.mkDerivation ({
- unpackPhase = "true";
- inherit src;
+ self = let
+ # Pass resolved dependencies to dependencies of this package
+ deps = map (
+ dep: dep.override {
+ resolvedDeps = resolvedDeps // { "${name}" = self; };
+ }
+ ) (attrValues requiredDeps);
- configurePhase = ''
- runHook preConfigure
- mkdir node_modules
- ${concatStrings (concatMap (dep: map (name: ''
- ln -sv ${dep}/lib/node_modules/${name} node_modules/
- '') dep.names) deps)}
- ${concatStrings (mapAttrsToList (name: dep: ''
- ln -sv ${dep}/lib/node_modules/${name} node_modules/
- '') peerDeps)}
- export HOME=$(pwd)
- runHook postConfigure
- '';
+ in stdenv.mkDerivation ({
+ unpackPhase = "true";
- buildPhase = ''
- runHook preBuild
- npm --registry http://www.example.com --nodedir=${sources} install $src ${npmFlags}
- runHook postBuild
- '';
+ inherit src;
+
+ configurePhase = ''
+ runHook preConfigure
+ mkdir node_modules
- installPhase = ''
- runHook preInstall
- mkdir -p $out/lib/node_modules
- ${concatStrings (map (name: ''
- mv node_modules/${name} $out/lib/node_modules
- rm -fR $out/lib/node_modules/${name}/node_modules
- ln -sv $out/.dependent-node-modules $out/lib/node_modules/${name}/node_modules
- if [ -e "$out/lib/node_modules/${name}/man" ]; then
- mkdir -p $out/share
- for dir in "$out/lib/node_modules/${name}/man/"*; do
- mkdir -p $out/share/man/$(basename "$dir")
- for page in "$dir"/*; do
- ln -sv $page $out/share/man/$(basename "$dir")
+ # Symlink dependencies for node modules
+ ${concatStrings (concatMap (dep: map (name: ''
+ ln -sv ${dep}/lib/node_modules/${name} node_modules/
+ '') dep.names) deps)}
+
+ # Symlink peer dependencies
+ ${concatStrings (mapAttrsToList (name: dep: ''
+ ln -sv ${dep}/lib/node_modules/${name} node_modules/
+ '') peerDeps)}
+
+ # Create shims for recursive dependenceies
+ ${concatStrings (concatMap (dep: map (name: ''
+ mkdir -p node_modules/${name}
+ cat > node_modules/${name}/package.json </dev/null || true
+ mv node_modules $out/.dependent-node-modules
+ if [ -d "$out/lib/node_modules/.bin" ]; then
+ ln -sv $out/lib/node_modules/.bin $out/bin
+ node=`type -p node`
+ coffee=`type -p coffee || true`
+ find -L $out/lib/node_modules/.bin/* -type f -print0 | \
+ xargs -0 sed --follow-symlinks -i \
+ -e 's@#!/usr/bin/env node@#!'"$node"'@' \
+ -e 's@#!/usr/bin/env coffee@#!'"$coffee"'@' \
+ -e 's@#!/.*/node@#!'"$node"'@' \
+ -e 's@#!/.*/coffee@#!'"$coffee"'@'
fi
- '') args.passthru.names)}
- ${concatStrings (mapAttrsToList (name: dep: ''
- mv node_modules/${name} $out/lib/node_modules
- '') peerDeps)}
- mv node_modules/.bin $out/lib/node_modules 2>/dev/null || true
- mv node_modules $out/.dependent-node-modules
- if [ -d "$out/lib/node_modules/.bin" ]; then
- ln -sv $out/lib/node_modules/.bin $out/bin
- node=`type -p node`
- coffee=`type -p coffee || true`
- find -L $out/lib/node_modules/.bin/* -type f -print0 | \
- xargs -0 sed --follow-symlinks -i \
- -e 's@#!/usr/bin/env node@#!'"$node"'@' \
- -e 's@#!/usr/bin/env coffee@#!'"$coffee"'@' \
- -e 's@#!/.*/node@#!'"$node"'@' \
- -e 's@#!/.*/coffee@#!'"$coffee"'@'
- fi
- runHook postInstall
- '';
+ runHook postInstall
+ '';
- preFixup = concatStringsSep "\n" (map (src: ''
- find $out -type f -print0 | xargs -0 sed -i 's|${src}|${src.name}|g'
- '') src);
+ preFixup = concatStringsSep "\n" (map (src: ''
+ find $out -type f -print0 | xargs -0 sed -i 's|${src}|${src.name}|g'
+ '') src);
- shellHook = ''
- ${preShellHook}
- export PATH=${nodejs}/bin:$(pwd)/node_modules/.bin:$PATH
- mkdir -p node_modules
- ${concatStrings (concatMap (dep: map (name: ''
- ln -sfv ${dep}/lib/node_modules/${name} node_modules/
- '') dep.names) deps)}
- ${postShellHook}
- '';
-} // args // {
- # Run the node setup hook when this package is a build input
- propagatedNativeBuildInputs = (args.propagatedNativeBuildInputs or []) ++ [ nodejs ];
+ shellHook = ''
+ ${preShellHook}
+ export PATH=${nodejs}/bin:$(pwd)/node_modules/.bin:$PATH
+ mkdir -p node_modules
+ ${concatStrings (concatMap (dep: map (name: ''
+ ln -sfv ${dep}/lib/node_modules/${name} node_modules/
+ '') dep.names) deps)}
+ ${postShellHook}
+ '';
+ } // (filterAttrs (n: v: n != "deps" && n != "resolvedDeps") args) // {
+ name = "${
+ if bin == true then "bin-" else if bin == false then "node-" else ""
+ }${name}";
- # Make buildNodePackage useful with --run-env
- nativeBuildInputs = (args.nativeBuildInputs or []) ++ deps ++ peerDependencies ++ neededNatives;
-} )
+ # Run the node setup hook when this package is a build input
+ propagatedNativeBuildInputs = (args.propagatedNativeBuildInputs or []) ++ [ nodejs ];
+
+ # Make buildNodePackage useful with --run-env
+ nativeBuildInputs = (args.nativeBuildInputs or []) ++ deps ++ peerDependencies ++ neededNatives;
+ });
+
+in self
diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix
index 1b3d4950e37..deb5188750a 100644
--- a/pkgs/development/web/nodejs/default.nix
+++ b/pkgs/development/web/nodejs/default.nix
@@ -6,7 +6,7 @@ let
ln -sv /usr/sbin/dtrace $out/bin
'';
- version = "0.10.30";
+ version = "0.10.32";
# !!! Should we also do shared libuv?
deps = {
@@ -30,7 +30,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz";
- sha256 = "1li5hs8dada2lj9j82xas39kr1fs0wql9qbly5p2cpszgwqbvz1x";
+ sha256 = "040g0gh2nl593ml1fcqp68vxa5kj7aiw1nqirda1c69d7l70s4n2";
};
configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps);
diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
index 1925c73b2e4..7c8c2bd2377 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/games/anki/default.nix
@@ -6,13 +6,13 @@
let
py = pythonPackages;
- version = "2.0.28";
+ version = "2.0.29";
in
stdenv.mkDerivation rec {
name = "anki-${version}";
src = fetchurl {
url = "http://ankisrs.net/download/mirror/${name}.tgz";
- sha256 = "0dj33mlc23y982kcl4h0aganb4fy70rl28mpj2mbcfphykzkv05s";
+ sha256 = "12qw0as5cdgh4hi0vyl0zpdzha93x8rid5xrhpjgiyj5s9fisf40";
};
pythonPath = [ pyqt4 py.pysqlite py.sqlalchemy py.pyaudio ]
diff --git a/pkgs/games/asc/default.nix b/pkgs/games/asc/default.nix
index 93297171bcb..41c527f462c 100644
--- a/pkgs/games/asc/default.nix
+++ b/pkgs/games/asc/default.nix
@@ -15,11 +15,11 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-fpermissive"; # I'm too lazy to catch all gcc47-related problems
buildInputs = [
- SDL SDL_image SDL_mixer SDL_sound libsigcxx physfs boost expat freetype
- libjpeg wxGTK lua perl pkgconfig zlib zip bzip2 libpng
+ SDL SDL_image SDL_mixer SDL_sound libsigcxx physfs boost boost.lib expat
+ freetype libjpeg wxGTK lua perl pkgconfig zlib zip bzip2 libpng
];
- meta = {
+ meta = with stdenv.lib; {
description = "Turn based strategy game";
longDescription = ''
@@ -30,9 +30,9 @@ stdenv.mkDerivation rec {
homepage = http://www.asc-hq.org/;
- license = stdenv.lib.licenses.gpl2Plus;
+ license = licenses.gpl2Plus;
- maintainers = with stdenv.lib.maintainers; [viric];
- platforms = with stdenv.lib.platforms; linux;
+ maintainers = with maintainers; [ viric ];
+ platforms = with platforms; linux;
};
}
diff --git a/pkgs/games/bsdgames/default.nix b/pkgs/games/bsdgames/default.nix
index 59423d7a5a6..882f5f3cde6 100644
--- a/pkgs/games/bsdgames/default.nix
+++ b/pkgs/games/bsdgames/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
bsd_games_cfg_varlibdir=.
bsd_games_cfg_non_interactive=y
bsd_games_cfg_no_build_dirs="dab hack phantasia sail"
- bsd_games_cfg_dictionary_src=${miscfiles}/share/dict/words
+ bsd_games_cfg_dictionary_src=${miscfiles}/share/web2
bsd_games_cfg_pager=${less}
EOF
diff --git a/pkgs/games/chocolate-doom/default.nix b/pkgs/games/chocolate-doom/default.nix
new file mode 100644
index 00000000000..157d1b42af6
--- /dev/null
+++ b/pkgs/games/chocolate-doom/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, autoconf, automake, pkgconfig, SDL, SDL_mixer, SDL_net, fetchurl }:
+
+stdenv.mkDerivation rec {
+ name = "chocolate-doom-2.0.0";
+ src = fetchurl {
+ url = https://github.com/chocolate-doom/chocolate-doom/archive/chocolate-doom-2.0.0.tar.gz;
+ sha256 = "1n9lkx97h987bq8z586jgissdhs07xyfr0xfdk7m2wpw4yhw10k1";
+ };
+ buildInputs = [ autoconf autoconf automake pkgconfig SDL SDL_mixer SDL_net ];
+ patchPhase = ''
+ sed -e 's#/games#/bin#g' -i src{,/setup}/Makefile.am
+ ./autogen.sh --prefix=$out
+ '';
+
+ enableParallelBuilding = true;
+
+ meta = {
+ homepage = http://chocolate-doom.org/;
+ description = "A Doom source port that accurately reproduces the experience of Doom as it was played in the 1990s";
+ license = stdenv.lib.licenses.gpl2Plus;
+ maintainers = with stdenv.lib.maintainers; [ MP2E ];
+ };
+}
diff --git a/pkgs/games/chocolate-doom/master.nix b/pkgs/games/chocolate-doom/master.nix
new file mode 100644
index 00000000000..f0dc62aaaae
--- /dev/null
+++ b/pkgs/games/chocolate-doom/master.nix
@@ -0,0 +1,24 @@
+{ stdenv, autoconf, automake, pkgconfig, SDL, SDL_mixer, SDL_net, git, fetchgit }:
+
+stdenv.mkDerivation rec {
+ name = "chocolate-doom-20140902";
+ src = fetchgit {
+ url = git://github.com/fragglet/chocolate-doom.git;
+ rev = "204814c7bb16a8ad45435a15328072681978ea57";
+ sha256 = "1xcdxpkgb9dk3zwqf4xcr3qn7dh5rx6hmniky67imbvi1h74p587";
+ };
+ buildInputs = [ autoconf autoconf automake pkgconfig SDL SDL_mixer SDL_net git ];
+ patchPhase = ''
+ sed -e 's#/games#/bin#g' -i src{,/setup}/Makefile.am
+ ./autogen.sh --prefix=$out
+ '';
+
+ enableParallelBuilding = true;
+
+ meta = {
+ homepage = http://chocolate-doom.org/;
+ description = "A Doom source port that accurately reproduces the experience of Doom as it was played in the 1990s";
+ license = stdenv.lib.licenses.gpl2Plus;
+ maintainers = with stdenv.lib.maintainers; [ MP2E ];
+ };
+}
diff --git a/pkgs/games/dwarf-fortress/df2014.nix b/pkgs/games/dwarf-fortress/df2014.nix
index 6a0d30ea89f..64a3e5bc975 100644
--- a/pkgs/games/dwarf-fortress/df2014.nix
+++ b/pkgs/games/dwarf-fortress/df2014.nix
@@ -1,17 +1,41 @@
-{ stdenv, fetchurl, SDL, SDL_image, SDL_ttf, gtk, glib, mesa, openal, glibc, libsndfile
-, copyDataDirectory ? false }:
+{ stdenv, fetchgit, fetchurl, cmake, glew, ncurses, SDL, SDL_image, SDL_ttf, gtk2, glib, mesa, openal, pango, atk, gdk_pixbuf, glibc, libsndfile
+ , copyDataDirectory ? true }:
+
+/* set copyDataDirectory as true by default since df 40 does not seem to run without it */
+
+let
+
+ srcs = {
+ df_unfuck = fetchgit {
+ url = "https://github.com/svenstaro/dwarf_fortress_unfuck";
+ rev = "044b266ce3e03b54a4228d51d6b75d70963debc9";
+ sha256 = "0xc839zmg1bqyrdirhy2ixm8i58q7nwhyi86h60qmrfdg3bsnnpr";
+ };
+
+ df = fetchurl {
+ url = "http://www.bay12games.com/dwarves/df_40_13_linux.tar.bz2";
+ sha256 = "1azsxgjc1fh8i041p6i7dmvdk0v3xpmhg44lmimlrs78a08h4z61";
+ };
+ };
+
+in
assert stdenv.system == "i686-linux";
stdenv.mkDerivation rec {
- name = "dwarf-fortress-0.40.05";
+ name = "dwarf-fortress-0.40.13";
- src = fetchurl {
- url = "http://www.bay12games.com/dwarves/df_40_05_linux.tar.bz2";
- sha256 = "1b9nd33yz5a945v9jyqii1k4s71i701m2d0h7fw6f5g9p6nvx43s";
- };
- phases = "unpackPhase patchPhase installPhase";
+ buildInputs = [ SDL SDL_image SDL_ttf gtk2 glib glew mesa ncurses openal glibc libsndfile pango atk cmake gdk_pixbuf];
+ src = "${srcs.df_unfuck} ${srcs.df}";
+ phases = "unpackPhase patchPhase configurePhase buildPhase installPhase";
+
+ sourceRoot = "git-export";
+
+ cmakeFlags = [
+ "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include"
+ "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2}/lib/gtk-2.0/include"
+ ];
/* :TODO: Game options should be configurable by patching the default configuration files */
@@ -21,11 +45,15 @@ stdenv.mkDerivation rec {
set -x
mkdir -p $out/bin
mkdir -p $out/share/df_linux
- cp -r * $out/share/df_linux
+ cd ../../
+ cp -r ./df_linux/* $out/share/df_linux
+ rm $out/share/df_linux/libs/lib*
+ patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.gcc.gcc stdenv.glibc ]}:$out/share/df_linux/libs" $out/share/df_linux/libs/Dwarf_Fortress
+ cp -f ./git-export/build/libgraphics.so $out/share/df_linux/libs/libgraphics.so
+
cp $permission $out/share/df_linux/nix_permission
patchelf --set-interpreter ${glibc}/lib/ld-linux.so.2 $out/share/df_linux/libs/Dwarf_Fortress
- ln -s ${libsndfile}/lib/libsndfile.so $out/share/df_linux/libs/
cat > $out/bin/dwarf-fortress << EOF
#!${stdenv.shell}
@@ -66,7 +94,7 @@ stdenv.mkDerivation rec {
''}
# now run Dwarf Fortress!
- export LD_LIBRARY_PATH=\$DF_DIR/df_linux/libs/:${SDL}/lib:${SDL_image}/lib/:${SDL_ttf}/lib/:${gtk}/lib/:${glib}/lib/:${mesa}/lib/:${openal}/lib/
+ export LD_LIBRARY_PATH=\${stdenv.gcc}/lib:${SDL}/lib:${SDL_image}/lib/:${SDL_ttf}/lib/:${gtk2}/lib/:${glib}/lib/:${mesa}/lib/:${openal}/lib/:${libsndfile}/lib:$DF_DIR/df_linux/libs/
\$DF_DIR/df "\$@"
EOF
diff --git a/pkgs/games/eternity-engine/default.nix b/pkgs/games/eternity-engine/default.nix
new file mode 100644
index 00000000000..2e04c76a990
--- /dev/null
+++ b/pkgs/games/eternity-engine/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, cmake, mesa, SDL, SDL_mixer, SDL_net, fetchurl }:
+
+stdenv.mkDerivation rec {
+ name = "eternity-engine-3.40.46";
+ src = fetchurl {
+ url = https://github.com/team-eternity/eternity/archive/3.40.46.tar.gz;
+ sha256 = "0jq8q0agw7lgab9q2h8wcaakvg913l9j3a6ss0hn9661plkw2yb4";
+ };
+
+ cmakeFlags = ''
+ -DCMAKE_BUILD_TYPE=Release
+ '';
+
+ buildInputs = [ stdenv cmake mesa SDL SDL_mixer SDL_net ];
+
+ enableParallelBuilding = true;
+
+ installPhase = ''
+ mkdir -p $out/bin
+ cp source/eternity $out/bin
+ '';
+
+ meta = {
+ homepage = http://doomworld.com/eternity;
+ description = "New school Doom port by James Haley";
+ license = stdenv.lib.licenses.gpl3;
+ maintainers = with stdenv.lib.maintainers; [ MP2E ];
+ };
+}
diff --git a/pkgs/games/extremetuxracer/default.nix b/pkgs/games/extremetuxracer/default.nix
index e35eb3266c2..af80467c960 100644
--- a/pkgs/games/extremetuxracer/default.nix
+++ b/pkgs/games/extremetuxracer/default.nix
@@ -1,34 +1,38 @@
-a :
-let
- fetchurl = a.fetchurl;
+{ stdenv, fetchurl, mesa, libX11, xproto, tcl, freeglut
+, SDL, SDL_mixer, SDL_image, libXi, inputproto
+, libXmu, libXext, xextproto, libXt, libSM, libICE
+, libpng, pkgconfig, gettext, intltool
+}:
- version = a.lib.attrByPath ["version"] "0.5beta" a;
- buildInputs = with a; [
+stdenv.mkDerivation rec {
+ version = "0.6.0";
+ name = "extremetuxracer-${version}";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/extremetuxracer/etr-${version}.tar.xz";
+ sha256 = "0fl9pwkywqnsmgr6plfj9zb05xrdnl5xb2hcmbjk7ap9l4cjfca4";
+ };
+
+ buildInputs = [
mesa libX11 xproto tcl freeglut
- SDL SDL_mixer libXi inputproto
+ SDL SDL_mixer SDL_image libXi inputproto
libXmu libXext xextproto libXt libSM libICE
libpng pkgconfig gettext intltool
];
-in
-rec {
- src = fetchurl {
- url = "mirror://sourceforge/extremetuxracer/extremetuxracer-${version}.tar.gz";
- sha256 = "04d99fsfna5mc9apjxsiyw0zgnswy33kwmm1s9d03ihw6rba2zxs";
- };
- inherit buildInputs;
- configureFlags = [
- "--with-tcl=${a.tcl}/lib"
- ];
+ configureFlags = [ "--with-tcl=${tcl}/lib" ];
- /* doConfigure should be removed if not needed */
- phaseNames = ["doConfigure" "doMakeInstall"];
+ preConfigure = ''
+ export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${SDL}/include/SDL"
+ '';
- name = "extremetuxracer-" + version;
meta = {
description = "High speed arctic racing game based on Tux Racer";
longDescription = ''
ExtremeTuxRacer - Tux lies on his belly and accelerates down ice slopes.
'';
+ license = stdenv.lib.licenses.gpl2Plus;
+ homepage = http://sourceforge.net/projects/extremetuxracer/;
+ maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
};
}
diff --git a/pkgs/games/globulation/default.nix b/pkgs/games/globulation/default.nix
index f1ffec85566..7ac83d512b3 100644
--- a/pkgs/games/globulation/default.nix
+++ b/pkgs/games/globulation/default.nix
@@ -8,8 +8,9 @@ let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[];
- buildInputs = map (n: builtins.getAttr n x)
- (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+ buildInputs = [ boost.lib ]
+ ++ map (n: builtins.getAttr n x)
+ (builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
baseName="glob2";
version="0.9.4";
diff --git a/pkgs/games/gtypist/default.nix b/pkgs/games/gtypist/default.nix
index 3db7aecfe1a..c47a2317b0e 100644
--- a/pkgs/games/gtypist/default.nix
+++ b/pkgs/games/gtypist/default.nix
@@ -1,20 +1,26 @@
-{stdenv, fetchurl, ncurses}:
+{stdenv, fetchurl, makeWrapper, ncurses, perl, fortune}:
-stdenv.mkDerivation {
- name = "gtypist-2.9.4";
+stdenv.mkDerivation rec {
+ name = "gtypist-${version}";
+ version = "2.9.5";
src = fetchurl {
- url = "mirror://gnu/gtypist/gtypist-2.9.4.tar.xz";
- sha256 = "18f54lh7ihhfvgwk3xd9d087kmganrgi2jd7avhvwn5gcc31vrqq";
+ url = "mirror://gnu/gtypist/gtypist-${version}.tar.xz";
+ sha256 = "0xzrkkmj0b1dw3yr0m9hml2y634cc4h61im6zwcq57s7285z8fn1";
};
- buildInputs = [ncurses];
+ buildInputs = [ makeWrapper ncurses perl fortune ];
- patchPhase = "sed -e 's#ncursesw/##' -i configure src/*";
+ preFixup = ''
+ wrapProgram "$out/bin/typefortune" \
+ --prefix PATH : "${fortune}/bin" \
+ '';
- meta = {
+ meta = with stdenv.lib; {
homepage = http://www.gnu.org/software/gtypist;
description = "Universal typing tutor";
- license = stdenv.lib.licenses.gpl3Plus;
+ license = licenses.gpl3Plus;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ pSub ];
};
}
diff --git a/pkgs/games/hawkthorne/default.nix b/pkgs/games/hawkthorne/default.nix
new file mode 100644
index 00000000000..4a99ec44764
--- /dev/null
+++ b/pkgs/games/hawkthorne/default.nix
@@ -0,0 +1,38 @@
+{ fetchgit, stdenv, love, curl, zip }:
+
+stdenv.mkDerivation rec {
+ version = "0.9.1";
+ name = "hawkthorne-${version}";
+
+ src = fetchgit {
+ url = "https://github.com/hawkthorne/hawkthorne-journey.git";
+ rev = "e48b5eef0058f63bb8ee746bc00b47b3e03f0854";
+ sha256 = "0rvcpv8fsi450xs2cglv4w6m5iqbhsr2n09pcvhh0krhg7xay538";
+ };
+
+ buildInputs = [
+ love curl zip
+ ];
+
+ patches = [
+ ./makefile.patch
+ ];
+
+ enableParallelBuilding = true;
+
+ meta = {
+ description = "Journey to the Center of Hawkthorne - A fan-made retro-style game based on the show Community";
+ longDescription = ''
+ Journey to the Center of Hawkthorne is an open source game written in Love2D.
+ It's based on the show Community, starring Jim Rash and Joel McHale as
+ the primary will-they-or-won't-they relationship.
+
+ This game has been entirely developed by fans of the show, who were inspired
+ to bring to life the video game used to determine the winner of Pierce
+ Hawthorne's inheritance.
+ '';
+ homepage = "http://www.reddit.com/r/hawkthorne";
+ license = stdenv.lib.licenses.mit;
+ maintainers = with stdenv.lib.maintainers; [ campadrenalin ];
+ };
+}
diff --git a/pkgs/games/hawkthorne/makefile.patch b/pkgs/games/hawkthorne/makefile.patch
new file mode 100644
index 00000000000..16a79683149
--- /dev/null
+++ b/pkgs/games/hawkthorne/makefile.patch
@@ -0,0 +1,33 @@
+diff --git a/Makefile b/Makefile
+index 55eb817..f3406aa 100644
+--- a/Makefile
++++ b/Makefile
+@@ -18,10 +18,14 @@ endif
+
+ tilemaps := $(patsubst %.tmx,%.lua,$(wildcard src/maps/*.tmx))
+
+-maps: $(tilemaps)
+-
+ love: build/hawkthorne.love
+
++shebang: build/hawkthorne.love
++ cat <(echo '#!/usr/bin/env love') build/hawkthorne.love > build/hawkthorne
++ chmod +x build/hawkthorne
++
++maps: $(tilemaps)
++
+ build/hawkthorne.love: $(tilemaps) src/*
+ mkdir -p build
+ cd src && zip --symlinks -q -r ../build/hawkthorne.love . -x ".*" \
+@@ -30,6 +34,12 @@ build/hawkthorne.love: $(tilemaps) src/*
+ run: $(tilemaps) $(LOVE)
+ $(LOVE) src
+
++check: test
++
++install: shebang
++ mkdir -p $(out)/bin
++ cp build/hawkthorne $(out)/bin
++
+ src/maps/%.lua: src/maps/%.tmx bin/tmx2lua
+ bin/tmx2lua $<
diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix
index 12497579bdc..3bbfdedd746 100644
--- a/pkgs/games/minecraft-server/default.nix
+++ b/pkgs/games/minecraft-server/default.nix
@@ -1,7 +1,5 @@
{ stdenv, fetchurl, jre }:
-with import {};
-
stdenv.mkDerivation rec {
name = "minecraft-server-${version}";
version = "1.7.10";
diff --git a/pkgs/games/mudlet/default.nix b/pkgs/games/mudlet/default.nix
new file mode 100644
index 00000000000..fd8948276f1
--- /dev/null
+++ b/pkgs/games/mudlet/default.nix
@@ -0,0 +1,40 @@
+{ fetchurl, pkgs, stdenv, makeWrapper, qt5, yajl, libzip, hunspell, boost, lua5_1, luafilesystem, luazip, lrexlib, luasqlite3 }:
+
+stdenv.mkDerivation rec {
+ name = "mudlet-${version}";
+ version = "3.0";
+
+ src = fetchurl {
+ url = "https://github.com/Mudlet/Mudlet/archive/6bc55dde0499cffab48b0021f27dcff1d57b0b66.zip";
+ sha256 = "c7b9a383d2cf393da730ce07ac8f06478eaec1fdf730054e837e58c598222d38";
+ };
+
+ buildInputs = [ pkgs.unzip qt5 lua5_1 hunspell libzip yajl boost makeWrapper luafilesystem luazip lrexlib luasqlite3 ];
+
+ configurePhase = "cd src && qmake";
+
+ installPhase = let
+ luaZipPath = "${luazip}/lib/lua/5.1/?.so";
+ luaFileSystemPath = "${luafilesystem}/lib/lua/5.1/?.so";
+ lrexlibPath = "${lrexlib}/lib/lua/5.1/?.so";
+ luasqlitePath = "${luasqlite3}/lib/lua/5.1/?.so";
+ in ''
+ mkdir -pv $out/bin
+ cp mudlet $out
+ cp -r mudlet-lua $out
+
+ makeWrapper $out/mudlet $out/bin/mudlet \
+ --set LUA_CPATH "\"${luaFileSystemPath};${luaZipPath};${lrexlibPath};${luasqlitePath}\"" \
+ --run "cd $out";
+ '';
+
+ patches = [ ./libs.patch ];
+
+ meta = {
+ description = "Crossplatform mud client";
+ homepage = http://mudlet.org/;
+ maintainers = [ stdenv.lib.maintainers.wyvie ];
+ platforms = stdenv.lib.platforms.linux;
+ license = stdenv.lib.licenses.gpl2;
+ };
+}
diff --git a/pkgs/games/mudlet/libs.patch b/pkgs/games/mudlet/libs.patch
new file mode 100644
index 00000000000..3943c16e0ea
--- /dev/null
+++ b/pkgs/games/mudlet/libs.patch
@@ -0,0 +1,13 @@
+--- a/src/src.pro 2014-09-05 12:51:09.000000000 +0400
++++ b/src/src.pro 2014-09-15 16:54:34.812560065 +0400
+@@ -85,8 +85,8 @@
+ # Again according to FHS /usr/local/share/games is the corresponding place for locally built games documentation:
+ isEmpty( DOCDIR ) DOCDIR = $${DATAROOTDIR}/doc/mudlet
+ LIBS += -lpcre \
+- -llua5.1 \
+- -lhunspell \
++ -llua \
++ -lhunspell-1.3 \
+ -L/usr/local/lib/ \
+ -lyajl \
+ -lGLU \
diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix
index ff96622cb59..be011f2497e 100644
--- a/pkgs/games/openttd/default.nix
+++ b/pkgs/games/openttd/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "openttd-${version}";
- version = "1.4.1";
+ version = "1.4.3";
src = fetchurl {
url = "http://binaries.openttd.org/releases/${version}/${name}-source.tar.xz";
- sha256 = "0gkmf2jj1rab81y10dp8cirr90kv9dpr3ww4wb06j8cvgapy7b0z";
+ sha256 = "1pb3vzmqkzxdrrrxvrji66bjiz5bx7n6c6d1pkqnjkc6p7fvpg0i";
};
buildInputs = [ SDL libpng pkgconfig xz zlib freetype fontconfig ];
diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix
index 19aff03daca..7b939af096a 100644
--- a/pkgs/games/openxcom/default.nix
+++ b/pkgs/games/openxcom/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, cmake, mesa, zlib, openssl, libyamlcpp, boostHeaders
+{stdenv, fetchurl, cmake, mesa, zlib, openssl, libyamlcpp, boost
, SDL, SDL_image, SDL_mixer, SDL_gfx }:
let version = "1.0.0"; in
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
name = "openxcom-${version}.tar.gz";
};
- buildInputs = [ cmake mesa zlib openssl libyamlcpp boostHeaders
+ buildInputs = [ cmake mesa zlib openssl libyamlcpp boost
SDL SDL_image SDL_mixer SDL_gfx ];
meta = {
diff --git a/pkgs/games/pingus/default.nix b/pkgs/games/pingus/default.nix
index 43cdc2031bf..af635379ac8 100644
--- a/pkgs/games/pingus/default.nix
+++ b/pkgs/games/pingus/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchurl, scons, SDL, SDL_image, boost, libpng, SDL_mixer, pkgconfig
, mesa}:
let
- buildInputs = [scons SDL SDL_image boost libpng SDL_mixer pkgconfig mesa];
+ buildInputs = [scons SDL SDL_image boost boost.lib libpng SDL_mixer pkgconfig mesa];
s = # Generated upstream information
rec {
baseName="pingus";
diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix
index 539be06bf7f..1c26dde00a9 100644
--- a/pkgs/games/spring/default.nix
+++ b/pkgs/games/spring/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
"-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON"
"-DPREFER_STATIC_LIBS:BOOL=OFF"];
- buildInputs = [ cmake lzma boost libdevil zlib p7zip openal libvorbis freetype SDL
+ buildInputs = [ cmake lzma boost boost.lib libdevil zlib p7zip openal libvorbis freetype SDL
xlibs.libX11 xlibs.libXcursor mesa glew asciidoc libxslt docbook_xsl curl makeWrapper
docbook_xsl_ns systemd ]
++ stdenv.lib.optional withAI jdk
@@ -28,6 +28,8 @@ stdenv.mkDerivation rec {
# reported upstream http://springrts.com/mantis/view.php?id=4305
#enableParallelBuilding = true; # occasionally missing generated files on Hydra
+ NIX_CFLAGS_COMPILE = "-fpermissive"; # GL header minor incompatibility
+
postInstall = ''
wrapProgram "$out/bin/spring" \
--prefix LD_LIBRARY_PATH : "${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib::${systemd}/lib"
diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix
index 35fdbc0a19e..5305759369b 100644
--- a/pkgs/games/spring/springlobby.nix
+++ b/pkgs/games/spring/springlobby.nix
@@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
};
buildInputs = [
- cmake wxGTK openal pkgconfig curl gettext libtorrentRasterbar boost libpng libX11
- libnotify gtk doxygen makeWrapper
+ cmake wxGTK openal pkgconfig curl gettext libtorrentRasterbar
+ boost boost.lib libpng libX11 libnotify gtk doxygen makeWrapper
];
prePatch = ''
diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix
index 2173d12666e..404eaf4ce9f 100644
--- a/pkgs/games/steam/chrootenv.nix
+++ b/pkgs/games/steam/chrootenv.nix
@@ -1,12 +1,72 @@
-{ buildFHSChrootEnv, steam
-, xterm, libX11, zenity, python, mesa, xdg_utils, dbus_tools, alsaLib
-}:
+{ buildFHSChrootEnv, config }:
buildFHSChrootEnv {
name = "steam";
- pkgs = [ steam xterm libX11 zenity python mesa xdg_utils dbus_tools alsaLib ];
+
+ targetPkgs = pkgs:
+ [ pkgs.steam
+ pkgs.corefonts
+ pkgs.curl
+ pkgs.dbus
+ pkgs.dpkg
+ pkgs.mono
+ pkgs.python
+ pkgs.gnome2.zenity
+ pkgs.xdg_utils
+ ]
+ ++ (if config.steam.java or false then [ pkgs.jdk ] else [ ])
+ ;
+
+ multiPkgs = pkgs:
+ [ pkgs.cairo
+ pkgs.glib
+ pkgs.gtk
+ pkgs.gdk_pixbuf
+ pkgs.pango
+
+ pkgs.freetype
+ pkgs.xlibs.libICE
+ pkgs.xlibs.libSM
+ pkgs.xlibs.libX11
+ pkgs.xlibs.libXau
+ pkgs.xlibs.libxcb
+ pkgs.xlibs.libXcursor
+ pkgs.xlibs.libXdamage
+ pkgs.xlibs.libXdmcp
+ pkgs.xlibs.libXext
+ pkgs.xlibs.libXfixes
+ pkgs.xlibs.libXi
+ pkgs.xlibs.libXinerama
+ pkgs.xlibs.libXrandr
+ pkgs.xlibs.libXrender
+ pkgs.xlibs.libXScrnSaver
+ pkgs.xlibs.libXtst
+ pkgs.xlibs.libXxf86vm
+
+ pkgs.ffmpeg
+ pkgs.libpng12
+ pkgs.mesa
+ pkgs.SDL
+ pkgs.SDL2
+
+ pkgs.libgcrypt
+ pkgs.zlib
+
+ pkgs.alsaLib
+ pkgs.libvorbis
+ pkgs.openal
+ pkgs.pulseaudio
+
+ pkgs.flashplayer
+ ];
+
+ extraBuildCommandsMulti = ''
+ cd usr/lib
+ ln -sf ../lib64/steam steam
+ '';
+
profile = ''
- export LD_LIBRARY_PATH=/run/opengl-driver/lib:/run/opengl-driver-32/lib:/lib
- export FONTCONFIG_FILE=/etc/fonts/fonts.conf
+ export LD_LIBRARY_PATH=/run/opengl-driver/lib:/run/opengl-driver-32/lib:/lib:/lib32:/lib64
+ export PATH=$PATH:/usr/bin:/usr/sbin
'';
}
diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix
index c1273e9a20f..9104bb40f77 100644
--- a/pkgs/games/steam/default.nix
+++ b/pkgs/games/steam/default.nix
@@ -1,118 +1,19 @@
-/*{ stdenv, fetchurl, dpkg, makeWrapper, xz, libX11, gcc, glibc
-, libselinux, libXrandr, pango, freetype, fontconfig, glib, gtk
-, gdk_pixbuf, cairo, libXi, alsaLib, libXrender, nss, nspr, zlib
-, dbus, libpng12, libXfixes, cups, libgcrypt, openal, pulseaudio
-, libxcb, libXau, libXdmcp, flashplayer, libSM, libICE, libXext
-, dbus_glib, libusb1, networkmanager
-, SDL # World of Goo
-, libvorbis # Osmos
-, curl, mesa # Superbrothers: S&S EP
-, patchelf }:
-
-assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
-
-let version = "1.0.0.39"; in
-
-stdenv.mkDerivation rec {
- name = "steam-${version}";
-
- src = fetchurl {
- url = "http://repo.steampowered.com/steam/pool/steam/s/steam/steam-launcher_${version}_all.deb";
- sha256 = "1z1cnlr2qw2ndnqsfwjck9617m2p0f3p9q9409vczj909h2a9wyk";
- };
-
- buildInputs = [ dpkg makeWrapper ];
-
- phases = "installPhase";
-
- installPhase = ''
- mkdir -p $out
- dpkg-deb -x $src $out
- cp -r $out/usr/* $out/
- rm -rf $out/usr
- substituteInPlace "$out/bin/steam" --replace "/usr/bin/env bash" "/bin/sh"
- substituteInPlace "$out/bin/steam" --replace "/usr/" "$out/"
- sed -i 's,STEAMPACKAGE=.*,STEAMPACKAGE=steam,' $out/bin/steam
- sed -i '/STEAMSCRIPT/d' $out/bin/steam
-
- mv $out/bin/steam $out/bin/.steam-wrapped
- cat > $out/bin/steam << EOF
-
- export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${libX11}/lib:${gcc.gcc}/lib:${libselinux}/lib:${libXrandr}/lib:${pango}/lib:${freetype}/lib:${fontconfig}/lib:${glib}/lib:${gtk}/lib:${gdk_pixbuf}/lib:${cairo}/lib:${libXi}/lib:${alsaLib}/lib:${libXrender}/lib:${nss}/lib:${nspr}/lib:${zlib}/lib:${dbus}/lib:${libpng12}/lib:${libXfixes}/lib:${cups}/lib:${libgcrypt}/lib:${openal}/lib:${pulseaudio}/lib:${libxcb}/lib:${libXau}/lib:${libXdmcp}/lib:${SDL}/lib:${libvorbis}/lib:${curl}/lib:${libSM}/lib:${libICE}/lib:${dbus_glib}/lib:${networkmanager}/lib:${libXext}/lib:${libusb1}/lib
- STEAMBOOTSTRAP=~/.steam/steam/steam.sh
- if [ -f \$STEAMBOOTSTRAP ]; then
- PLATFORM32=ubuntu12_32
- STEAMCONFIG=~/.steam
- STEAMROOT=~/.local/share/Steam
- STEAMDATA="\$STEAMROOT"
- PIDFILE="\$STEAMCONFIG/steam.pid"
- STEAMBIN32LINK="\$STEAMCONFIG/bin32"
- STEAMBIN64LINK="\$STEAMCONFIG/bin64"
- STEAMSDK32LINK="\$STEAMCONFIG/sdk32"
- STEAMSDK64LINK="\$STEAMCONFIG/sdk64"
- STEAMROOTLINK="\$STEAMCONFIG/root"
- STEAMDATALINK="\$STEAMCONFIG/steam"
- STEAMSTARTING="\$STEAMCONFIG/starting"
- # Create symbolic links for the Steam API
- if [ ! -e "\$STEAMCONFIG" ]; then
- mkdir "\$STEAMCONFIG"
- fi
- if [ "\$STEAMROOT" != "\$STEAMROOTLINK" -a "\$STEAMROOT" != "\$STEAMDATALINK" ]; then
- rm -f "\$STEAMBIN32LINK" && ln -s "\$STEAMROOT/\$PLATFORM32" "\$STEAMBIN32LINK"
- rm -f "\$STEAMBIN64LINK" && ln -s "\$STEAMROOT/\$PLATFORM64" "\$STEAMBIN64LINK"
- rm -f "\$STEAMSDK32LINK" && ln -s "\$STEAMROOT/linux32" "\$STEAMSDK32LINK"
- rm -f "\$STEAMSDK64LINK" && ln -s "\$STEAMROOT/linux64" "\$STEAMSDK64LINK"
- rm -f "\$STEAMROOTLINK" && ln -s "\$STEAMROOT" "\$STEAMROOTLINK"
- if [ "\$STEAMDATALINK" ]; then
- rm -f "\$STEAMDATALINK" && ln -s "\$STEAMDATA" "\$STEAMDATALINK"
- fi
- fi
- # Temporary bandaid until everyone has the new libsteam_api.so
- rm -f ~/.steampath && ln -s "\$STEAMCONFIG/bin32/steam" ~/.steampath
- rm -f ~/.steampid && ln -s "\$PIDFILE" ~/.steampid
- rm -f ~/.steam/bin && ln -s "\$STEAMBIN32LINK" ~/.steam/bin
- export LD_LIBRARY_PATH="\$STEAMBIN32LINK:\$LD_LIBRARY_PATH:${mesa}/lib"
- export SDL_VIDEO_X11_DGAMOUSE=0
- cd "\$STEAMROOT"
- FLASHLINK="\$STEAMCONFIG/bin32/plugins"
- rm -f "\$FLASHLINK" && ln -s "${flashplayer}/lib/mozilla/plugins" "\$FLASHLINK"
- LDSO="\$STEAMBIN32LINK/ld.so"
- cp ${glibc}/lib/ld-linux.so.2 "\$LDSO"
- chmod u+w "\$LDSO"
- echo \$\$ > "\$PIDFILE" # pid of the shell will become pid of steam
- export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${glibc}/lib
- exec "\$LDSO" "\$STEAMBIN32LINK/steam"
- else
- export PATH=${xz}/bin:\$PATH
- exec $out/bin/.steam-wrapped
- fi
- EOF
-
- chmod +x $out/bin/steam
- '';
-
- meta = {
- description = "A digital distribution platform";
- homepage = http://store.steampowered.com/;
- license = stdenv.lib.licenses.unfree;
- };
-}
-*/
-
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "steam-1.0.0.48";
+
src = fetchurl {
url = http://repo.steampowered.com/steam/pool/steam/s/steam/steam_1.0.0.48.tar.gz;
sha256 = "08y5qf75ssk4fnazyv2yz1c5zs7gjiwigaibv8yz1gbr290r0b52";
};
+
installPhase = ''
make DESTDIR=$out install
mv $out/usr/* $out #*/
rmdir $out/usr
'';
-
+
meta = {
description = "A digital distribution platform";
homepage = http://store.steampowered.com/;
diff --git a/pkgs/games/stepmania/default.nix b/pkgs/games/stepmania/default.nix
index 6a54dd7512f..2379ac9ecd4 100644
--- a/pkgs/games/stepmania/default.nix
+++ b/pkgs/games/stepmania/default.nix
@@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
platforms = platforms.linux;
- maintainers = maintainers.mornfall;
+ maintainers = [ maintainers.mornfall ];
};
}
diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix
index 29d3b4e4557..db42572de5e 100644
--- a/pkgs/games/super-tux-kart/default.nix
+++ b/pkgs/games/super-tux-kart/default.nix
@@ -1,18 +1,19 @@
{ fetchurl, cmake, stdenv, plib, SDL, openal, freealut, mesa
, libvorbis, libogg, gettext, libXxf86vm, curl, pkgconfig
-, fribidi, autoconf, automake, libtool }:
+, fribidi, autoconf, automake, libtool, bluez }:
stdenv.mkDerivation rec {
- name = "supertuxkart-0.8";
+ version = "0.8.1";
+ name = "supertuxkart-${version}";
src = fetchurl {
url = "mirror://sourceforge/supertuxkart/${name}-src.tar.bz2";
- sha256 = "12sbml4wxg2x2wgnnkxfisj96a9gcsaj3fj27kdk8yj524ikv7xr";
+ sha256 = "1mpqmi62a2kl6n58mw11fj0dr5xiwmjkqnfmd2z7ghdhc6p02lrk";
};
buildInputs = [
plib SDL openal freealut mesa libvorbis libogg gettext
- libXxf86vm curl pkgconfig fribidi autoconf automake libtool cmake
+ libXxf86vm curl pkgconfig fribidi autoconf automake libtool cmake bluez
];
enableParallelBuilding = true;
@@ -27,15 +28,13 @@ stdenv.mkDerivation rec {
meta = {
description = "SuperTuxKart is a Free 3D kart racing game";
-
longDescription = ''
SuperTuxKart is a Free 3D kart racing game, with many tracks,
characters and items for you to try, similar in spirit to Mario
Kart.
'';
-
homepage = http://supertuxkart.sourceforge.net/;
-
license = stdenv.lib.licenses.gpl2Plus;
+ maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
};
}
diff --git a/pkgs/games/tcl2048/builder.sh b/pkgs/games/tcl2048/builder.sh
new file mode 100644
index 00000000000..b34441cdc99
--- /dev/null
+++ b/pkgs/games/tcl2048/builder.sh
@@ -0,0 +1,5 @@
+source $stdenv/setup
+
+mkdir -p $out/bin
+cp $src $out/bin/2048
+chmod +x $out/bin/2048
diff --git a/pkgs/games/tcl2048/default.nix b/pkgs/games/tcl2048/default.nix
new file mode 100644
index 00000000000..01ffd27d5bb
--- /dev/null
+++ b/pkgs/games/tcl2048/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, tcl, tcllib }:
+
+stdenv.mkDerivation {
+ name = "tcl2048-0.2.6";
+
+ src = fetchurl {
+ url = https://raw.githubusercontent.com/dbohdan/2048-tcl/v0.2.6/2048.tcl;
+ sha256 = "481eac7cccc37d1122c3069da6186f584906bd27b86b8d4ae1a2d7e355c1b6b2";
+ };
+
+ builder = ./builder.sh;
+
+ meta = {
+ homepage = https://github.com/dbohdan/2048-tcl;
+ description = "The game of 2048 implemented in Tcl.";
+ license = stdenv.lib.licenses.mit;
+ platforms = stdenv.lib.platforms.all;
+ };
+}
diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix
index a2355ba9d1e..f175894dfe7 100644
--- a/pkgs/games/tibia/default.nix
+++ b/pkgs/games/tibia/default.nix
@@ -1,13 +1,13 @@
-{stdenv, fetchurl, patchelf, glibc, libX11, mesa}:
+{ stdenv, fetchurl, patchelf, glibc, libX11, mesa }:
with stdenv.lib;
assert stdenv.isi686;
stdenv.mkDerivation {
- name = "tibia-10.41";
+ name = "tibia-10.57";
src = fetchurl {
- url = http://static.tibia.com/download/tibia1041.tgz;
- sha256 = "1hmqn9c6qaa79ldcnl4ws9dm6rd3ymy48fw254pl6g601amn7b8v";
+ url = http://static.tibia.com/download/tibia1057.tgz;
+ sha256 = "1bhfrz66n1cvvy11ybr3yfn3i3vr98nnp3q11gssk8nby5bqm2fi";
};
shell = stdenv.shell;
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
installPhase = ''
mkdir -pv $out/res
- cp -r ./* $out/res
+ cp -r * $out/res
patchelf --set-interpreter ${glibc}/lib/ld-linux.so.2 \
--set-rpath ${stdenv.gcc.gcc}/lib:${libX11}/lib:${mesa}/lib \
diff --git a/pkgs/games/ue4demos/default.nix b/pkgs/games/ue4demos/default.nix
new file mode 100644
index 00000000000..10975f88516
--- /dev/null
+++ b/pkgs/games/ue4demos/default.nix
@@ -0,0 +1,192 @@
+{ stdenv, fetchurl, unzip, patchelf, xlibs, openal }:
+
+assert stdenv.isLinux;
+assert stdenv.isx86_64;
+
+let
+ buildDemo = { name, src }:
+ stdenv.mkDerivation rec {
+ inherit name src;
+
+ buildInputs = [ unzip patchelf ];
+
+ rtdeps = stdenv.lib.makeLibraryPath
+ [ xlibs.libXxf86vm xlibs.libXext openal ]
+ + ":" + stdenv.lib.makeSearchPath "lib64" [ stdenv.gcc.gcc ];
+
+ buildCommand =
+ ''
+ mkdir -p "$out"
+ cd $out
+ unzip $src
+
+ interpreter=$(echo ${stdenv.glibc}/lib/ld-linux*.so.2)
+ binary=$(find . -executable -type f)
+ patchelf \
+ --set-interpreter $interpreter \
+ --set-rpath ${rtdeps} \
+ "$binary"
+
+ # Workaround on
+ # LogLinuxPlatformFile:Warning: open('/nix/store/hash-ue4demos-demo/demo/demo/Saved/Config/CleanSourceConfigs/Engine.ini', Flags=0x00080241) failed: errno=2 (No such file or directory)
+ # for Vehicle, Shooter and Strategy games.
+ ls | grep ' ' && $(
+ haxname=$(ls | grep ' ' | sed 's/ //g'); \
+ haxpath=$(ls | grep ' ')/$haxname/Saved; \
+ mkdir -p "$haxpath"/Config/CleanSourceConfigs; \
+ ln -s /dev/null "$haxpath"/Config/CleanSourceConfigs/Engine.ini; \
+ mkdir -p "$haxpath"/Logs; \
+ ln -s /dev/null "$haxpath"/Logs/$haxname.log)
+
+ # Executables are buried under a varied paths across demos.
+ mkdir bin
+ cd bin
+ ln -s "$out/$binary" $(basename "$out/$binary")
+ '';
+
+ meta = {
+ description = "Unreal Engine 4 Linux demos";
+ homepage = https://wiki.unrealengine.com/Linux_Demos;
+ platforms = stdenv.lib.platforms.linux;
+ license = stdenv.lib.licenses.unfree;
+ };
+ };
+
+in {
+ tappy_chicken = buildDemo rec {
+ name = "ue4demos-tappy_chicken";
+ src = fetchurl {
+ url = "http://ue4linux.raxxy.com/tappy_chicken.zip";
+ sha256 = "0lwhvk3lpb2r5ng2cnzk7fpjj5lwhy2sch1a8v154x1xfhfb3h4v";
+ };
+ };
+
+ swing_ninja = buildDemo rec {
+ name = "ue4demos-swing_ninja";
+ src = fetchurl {
+ url = "http://ue4linux.raxxy.com/swing_ninja.zip";
+ sha256 = "1bmgqqk3lda5h7nnqi59jgyrsn0clr3xs0k1jclnqf9fk0m8hjcv";
+ };
+ };
+
+ card_game = buildDemo rec {
+ name = "ue4demos-card_game";
+ src = fetchurl {
+ url = "http://ue4linux.raxxy.com/card_game.zip";
+ sha256 = "154baqias5q7kad0c89k35jbmnmlm865sll02mi7bk1yllcckz5z";
+ };
+ };
+
+ vehicle_game = buildDemo rec {
+ name = "ue4demos-vehicle_game";
+ src = fetchurl {
+ url = "http://ue4linux.raxxy.com/vehicle_game.zip";
+ sha256 = "03dlacf1iv7sgn7pl3sx9r6243wy8fsi2kd858syfm9slg0190bs";
+ };
+ };
+
+ shooter_game = buildDemo rec {
+ name = "ue4demos-shooter_game";
+ src = fetchurl {
+ url = "http://ue4linux.raxxy.com/shooter_game.zip";
+ sha256 = "1bk32k349iqbqk8x8jffnqq0pjiqmvrvv675xxmlvkkr8qrlhz98";
+ };
+ };
+
+ strategy_game = buildDemo rec {
+ name = "ue4demos-strategy_game";
+ src = fetchurl {
+ url = "http://ue4linux.raxxy.com/strategy_game.zip";
+ sha256 = "1p7i966v1ssm20y12g4wsccpgnky3szy19qyjlacynk7bgbk6lg7";
+ };
+ };
+
+ black_jack = buildDemo rec {
+ name = "ue4demos-black_jack";
+ src = fetchurl {
+ url = "http://ue4linux.raxxy.com/black_jack.zip";
+ sha256 = "0g52wkzn5isa3az32y25yx5b56wxks97pajqwkmm6gf4qpkfksxv";
+ };
+ };
+
+ landscape_mountains = buildDemo rec {
+ name = "ue4demos-landscape_mountains";
+ src = fetchurl {
+ url = "http://ue4linux.raxxy.com/landscape_mountains.zip";
+ sha256 = "14jzajhs3cpydvf3ag7lpj4hkpbjpwnn3xkdvdx92fi0pcl8cwym";
+ };
+ };
+
+ matinee_demo = buildDemo rec {
+ name = "ue4demos-matinee_demo";
+ src = fetchurl {
+ url = "http://ue4linux.raxxy.com/matinee_demo.zip";
+ sha256 = "0ib8k6fl15cxzdarar2sqq5v3g3c7p2jidkdjd00nym6cvkibb4d";
+ };
+ };
+
+ elemental_demo = buildDemo rec {
+ name = "ue4demos-elemental_demo";
+ src = fetchurl {
+ url = "http://ue4linux.raxxy.com/elemental_demo.zip";
+ sha256 = "1v4jdsy8jvv8wgc8dx17q17xigfrya5q0nfdzw4md7fzm3bg9z0v";
+ };
+ };
+
+ effects_cave_demo = buildDemo rec {
+ name = "ue4demos-effects_cave_demo";
+ src = fetchurl {
+ url = "http://ue4linux.raxxy.com/effects_cave_demo.zip";
+ sha256 = "0lvd3aaha2x9pnpkdmrzi6nf7hymr95834z3l8shygjf9kbbzsz4";
+ };
+ };
+
+ realistic_rendering = buildDemo rec {
+ name = "ue4demos-realistic_rendering";
+ src = fetchurl {
+ url = "http://ue4linux.raxxy.com/realistic_rendering_demo.zip";
+ sha256 = "0r16nznkv475hkw5rnngqsc69ch8vh86dppyyyr9nn43dkr2110a";
+ };
+ };
+
+ reflections_subway = buildDemo rec {
+ name = "ue4demos-reflections_subway";
+ src = fetchurl {
+ url = "http://ue4linux.raxxy.com/reflections_subway_demo.zip";
+ sha256 = "0dw5sm7405gxw9iqz0vpnhdprrb4wl5i14pvzl1381k973m8bd00";
+ };
+ };
+
+ scifi_hallway_demo = buildDemo rec {
+ name = "ue4demos-scifi_hallway_demo";
+ src = fetchurl {
+ url = "http://ue4linux.raxxy.com/sci-fi_hallway_demo.zip";
+ sha256 = "14qp9iwm47awn8d9j6ijh6cnds308x60xs4vi2fvz2666jlz1pq2";
+ };
+ };
+
+ mobile_temple_demo = buildDemo rec {
+ name = "ue4demos-mobile_temple_demo";
+ src = fetchurl {
+ url = "http://ue4linux.raxxy.com/mobile_temple_demo.zip";
+ sha256 = "12bz4h1b9lhmqglwsa6r8q48ijqbjdha9fql31540d01kigaka75";
+ };
+ };
+
+ stylized_demo = buildDemo rec {
+ name = "ue4demos-stylized_demo";
+ src = fetchurl {
+ url = "http://ue4linux.raxxy.com/stylized_demo.zip";
+ sha256 = "1676ridmj8rk4y4hbdscfnnka5l636av1xxl0qwvk236kq9j7v0l";
+ };
+ };
+
+ blueprint_examples_demo = buildDemo rec {
+ name = "ue4demos-blueprint_examples_demo";
+ src = fetchurl {
+ url = "http://ue4linux.raxxy.com/blueprint_examples_demo.zip";
+ sha256 = "076q33h2hy965fvr805hsprkpcmizf638lj2ik8k923v86b15nbv";
+ };
+ };
+}
+
diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix
index 284d420fe7f..248b58a4e1a 100644
--- a/pkgs/games/warzone2100/default.nix
+++ b/pkgs/games/warzone2100/default.nix
@@ -28,9 +28,13 @@ stdenv.mkDerivation rec {
--replace "which %s" "${which}/bin/which %s"
'';
configureFlags = "--with-backend=qt --with-distributor=NixOS";
+
+ NIX_CFLAGS_COMPILE = "-fpermissive"; # GL header minor incompatibility
+
postInstall = []
++ stdenv.lib.optional withVideos "cp ${sequences_src} $out/share/warzone2100/sequences.wz";
- meta = {
+
+ meta = with stdenv.lib; {
description = "A free RTS game, originally developed by Pumpkin Studios";
longDescription = ''
Warzone 2100 is an open source real-time strategy and real-time tactics
@@ -44,8 +48,8 @@ stdenv.mkDerivation rec {
variety of possible units and tactics.
'';
homepage = http://wz2100.net;
- license = [ "GPLv2+" ];
- maintainers = with stdenv.lib.maintainers; [ astsmtl ];
- platforms = with stdenv.lib.platforms; linux;
+ license = licenses.gpl2Plus;
+ maintainers = [ maintainers.astsmtl ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix
index f279127b62b..c1c1b5b0756 100644
--- a/pkgs/games/wesnoth/default.nix
+++ b/pkgs/games/wesnoth/default.nix
@@ -13,8 +13,9 @@ stdenv.mkDerivation rec {
sha256 = "0gi5fzij48hmhhqxc370jxvxig5q3d70jiz56rjn8yx514s5lfwa";
};
- buildInputs = [ SDL SDL_image SDL_mixer SDL_net SDL_ttf pango gettext zlib boost fribidi
- cmake freetype libpng pkgconfig lua dbus fontconfig libtool ];
+ buildInputs = [ SDL SDL_image SDL_mixer SDL_net SDL_ttf pango gettext zlib
+ boost boost.lib fribidi cmake freetype libpng pkgconfig lua
+ dbus fontconfig libtool ];
cmakeFlags = [ "-DENABLE_STRICT_COMPILATION=FALSE" ]; # newer gcc problems http://gna.org/bugs/?21030
diff --git a/pkgs/misc/drivers/foomatic-filters/default.nix b/pkgs/misc/drivers/foomatic-filters/default.nix
index f618a28b4d6..ffc5e093c21 100644
--- a/pkgs/misc/drivers/foomatic-filters/default.nix
+++ b/pkgs/misc/drivers/foomatic-filters/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Foomatic printing filters";
- maintainers = stdenv.lib.maintainers.raskin;
+ maintainers = [ stdenv.lib.maintainers.raskin ];
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.gpl2Plus;
};
diff --git a/pkgs/misc/drivers/gutenprint/default.nix b/pkgs/misc/drivers/gutenprint/default.nix
index ebec9867a61..98776c0c42b 100644
--- a/pkgs/misc/drivers/gutenprint/default.nix
+++ b/pkgs/misc/drivers/gutenprint/default.nix
@@ -3,7 +3,7 @@
, libtiff, libpng, makeWrapper, openssl, gimp }:
let
- version = "5.2.9";
+ version = "5.2.10";
inherit (composableDerivation) edf wwf;
in
@@ -12,7 +12,7 @@ composableDerivation.composableDerivation {} {
src = fetchurl {
url = "mirror://sourceforge/gimp-print/gutenprint-${version}.tar.bz2";
- sha256 = "185wai9hk0z0144hpxn5mqncy6xikc4bdv49vxqh5lrjdzqf89sb";
+ sha256 = "0n8f6vpadnagrp6yib3mca1c3lgwl4vmma16s44riyrd84mka7s3";
};
# gimp, gui is still not working (TODO)
diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/misc/emulators/dolphin-emu/default.nix
new file mode 100644
index 00000000000..bf03e1e52aa
--- /dev/null
+++ b/pkgs/misc/emulators/dolphin-emu/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib
+, gettext, libpthreadstubs, libXrandr, libXext, readline
+, openal, libXdmcp, portaudio, SDL, wxGTK30, fetchurl
+, pulseaudio ? null }:
+
+stdenv.mkDerivation rec {
+ name = "dolphin-emu-4.0.2";
+ src = fetchurl {
+ url = https://github.com/dolphin-emu/dolphin/archive/4.0.2.tar.gz;
+ sha256 = "0a8ikcxdify9d7lqz8fn2axk2hq4q1nvbcsi1b8vb9z0mdrhzw89";
+ };
+
+ cmakeFlags = ''
+ -DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include
+ -DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2}/lib/gtk-2.0/include
+ -DGTK2_INCLUDE_DIRS=${gtk2}/include/gtk-2.0
+ -DCMAKE_BUILD_TYPE=Release
+ -DENABLE_LTO=True
+ '';
+
+ enableParallelBuilding = true;
+
+ buildInputs = [ stdenv pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib
+ gettext libpthreadstubs libXrandr libXext readline openal
+ libXdmcp portaudio SDL wxGTK30 pulseaudio ];
+
+ meta = {
+ homepage = http://dolphin-emu.org/;
+ description = "Gamecube/Wii/Triforce emulator for x86_64 and ARM";
+ license = stdenv.lib.licenses.gpl2;
+ maintainers = with stdenv.lib.maintainers; [ MP2E ];
+ };
+}
diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix
new file mode 100644
index 00000000000..cf7cd541690
--- /dev/null
+++ b/pkgs/misc/emulators/dolphin-emu/master.nix
@@ -0,0 +1,35 @@
+{ stdenv, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib
+, gettext, git, libpthreadstubs, libXrandr, libXext, readline
+, openal, libXdmcp, portaudio, SDL, wxGTK30, fetchgit
+, pulseaudio ? null }:
+
+stdenv.mkDerivation rec {
+ name = "dolphin-emu-20141002";
+ src = fetchgit {
+ url = git://github.com/dolphin-emu/dolphin.git;
+ rev = "ed7f0739ae31c07c31d013964986c549317aba6e";
+ sha256 = "01qwlkh3c0ij97zycq0v4kclxmnlbwcc1bmvjzl4cbczhxbbx4hk";
+ fetchSubmodules = false;
+ };
+
+ cmakeFlags = ''
+ -DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include
+ -DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2}/lib/gtk-2.0/include
+ -DGTK2_INCLUDE_DIRS=${gtk2}/include/gtk-2.0
+ -DCMAKE_BUILD_TYPE=Release
+ -DENABLE_LTO=True
+ '';
+
+ enableParallelBuilding = true;
+
+ buildInputs = [ stdenv pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib
+ gettext libpthreadstubs libXrandr libXext readline openal
+ git libXdmcp portaudio SDL wxGTK30 pulseaudio ];
+
+ meta = {
+ homepage = http://dolphin-emu.org/;
+ description = "Gamecube/Wii/Triforce emulator for x86_64 and ARM";
+ license = stdenv.lib.licenses.gpl2;
+ maintainers = with stdenv.lib.maintainers; [ MP2E ];
+ };
+}
diff --git a/pkgs/misc/emulators/emulationstation/default.nix b/pkgs/misc/emulators/emulationstation/default.nix
index 5767786e814..6ff0a21135a 100644
--- a/pkgs/misc/emulators/emulationstation/default.nix
+++ b/pkgs/misc/emulators/emulationstation/default.nix
@@ -1,25 +1,22 @@
-{ stdenv, fetchurl, pkgconfig, cmake, boost, eigen, freeimage, freetype
-, mesa, SDL, dejavu_fonts }:
+{ stdenv, fetchFromGitHub, pkgconfig, cmake, curl, boost, eigen
+, freeimage, freetype, mesa, SDL2, alsaLib, libarchive }:
stdenv.mkDerivation rec {
name = "emulationstation-${version}";
- version = "1.0.2";
- src = fetchurl {
- url = "https://github.com/Aloshi/EmulationStation/archive/v${version}.tar.gz";
- sha256 = "809d67aaa727809c1426fb543e36bb788ca6a3404f8c46dd1917088b57ab5f50";
+ version = "2.0.0-rc1";
+
+ src = fetchFromGitHub {
+ owner = "Aloshi";
+ repo = "EmulationStation";
+ rev = "8739519e1591819cab85e1d2056804d20c197dac";
+ sha256 = "1psq5cqyq2yy1lqxrcj7pfp8szfmzhamxf3111l97w2h2zzcgvq9";
};
- buildInputs = [ pkgconfig cmake boost eigen freeimage freetype mesa SDL ];
-
- prePatch = ''
- sed -i \
- -e 's,/usr\(.*\)/ttf-dejavu\(.*\),${dejavu_fonts}\1\2,' src/Font.cpp
- '';
+ buildInputs = [ pkgconfig cmake alsaLib boost curl eigen freeimage freetype libarchive mesa SDL2 ];
buildPhase = "cmake . && make";
installPhase = ''
- mkdir -p $out/bin
- mv ../emulationstation $out/bin/.
+ install -D ../emulationstation $out/bin/emulationstation
'';
meta = {
diff --git a/pkgs/misc/emulators/hatari/default.nix b/pkgs/misc/emulators/hatari/default.nix
index 5c9138ed2e2..1206bdefcb1 100644
--- a/pkgs/misc/emulators/hatari/default.nix
+++ b/pkgs/misc/emulators/hatari/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, zlib, SDL, cmake }:
stdenv.mkDerivation rec {
- name = "hatari-1.6.2";
+ name = "hatari-1.8.0";
src = fetchurl {
- url = "http://download.tuxfamily.org/hatari/1.6.2/${name}.tar.bz2";
- sha256 = "0gqvfqqd0lg3hi261rwh6gi2b5kmza480kfzx43d4l49xcq09pi0";
+ url = "http://download.tuxfamily.org/hatari/1.8.0/${name}.tar.bz2";
+ sha256 = "1szznnndmbyc71751hir3dhybmbrx3rnxs6klgbv9qvqlmmlikvy";
};
# For pthread_cancel
@@ -18,5 +18,6 @@ stdenv.mkDerivation rec {
description = "Atari ST/STE/TT/Falcon emulator";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
+ maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
};
}
diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix
new file mode 100644
index 00000000000..b3c793f00e1
--- /dev/null
+++ b/pkgs/misc/emulators/higan/default.nix
@@ -0,0 +1,89 @@
+{ stdenv, fetchurl
+, pkgconfig
+, libX11, libXv
+, udev
+, mesa, SDL
+, libao, openal, pulseaudio
+, profile ? "performance" # Options: accuracy, balanced, performance
+, guiToolkit ? "gtk" # can be gtk or qt4
+, gtk ? null, qt4 ? null }:
+
+assert guiToolkit == "gtk" || guiToolkit == "qt4";
+assert (guiToolkit == "gtk" -> gtk != null) || (guiToolkit == "qt4" -> qt4 != null);
+
+stdenv.mkDerivation rec {
+
+ name = "higan-${version}";
+ version = "094";
+ sourceName = "higan_v${version}-source";
+
+ src = fetchurl {
+ urls = [ "http://byuu.org/files/${sourceName}.tar.xz" "http://byuu.net/files/${sourceName}.tar.xz" ];
+ sha256 = "06qm271pzf3qf2labfw2lx6k0xcd89jndmn0jzmnc40cspwrs52y";
+ curlOpts = "--user-agent 'Mozilla/5.0'"; # the good old user-agent trick...
+ };
+
+ buildInputs = with stdenv.lib;
+ [ pkgconfig libX11 libXv udev mesa SDL libao openal pulseaudio ]
+ ++ optionals (guiToolkit == "gtk") [ gtk ]
+ ++ optionals (guiToolkit == "qt4") [ qt4 ];
+
+ buildPhase = ''
+ make phoenix=${guiToolkit} profile=${profile} -C ananke
+ make phoenix=${guiToolkit} profile=${profile}
+ '';
+
+ installPhase = ''
+ install -dm 755 $out/share/applications $out/share/pixmaps $out/share/higan/Video\ Shaders $out/bin $out/lib
+
+ install -m 644 data/higan.desktop $out/share/applications/
+ install -m 644 data/higan.png $out/share/pixmaps/
+ cp -dr --no-preserve=ownership profile/* data/cheats.bml $out/share/higan/
+ cp -dr --no-preserve=ownership shaders/*.shader $out/share/higan/Video\ Shaders/
+
+ install -m 755 out/higan $out/bin/higan
+ install -m 644 ananke/libananke.so $out/lib/libananke.so.1
+ (cd $out/lib && ln -s libananke.so.1 libananke.so)
+ '';
+
+ fixupPhase = ''
+ oldRPath=$(patchelf --print-rpath $out/bin/higan)
+ patchelf --set-rpath $oldRPath:$out/lib $out/bin/higan
+
+ # A dirty workaround, suggested by @cpages:
+ # we create a first-run script to populate
+ # the local $HOME with all the auxiliary
+ # stuff needed by higan at runtime
+
+ cat < $out/bin/higan-init.sh
+ #!${stdenv.shell}
+
+ cp --update --recursive $out/share/higan \$HOME/.config
+ chmod --recursive u+w \$HOME/.config/higan
+ EOF
+
+ chmod +x $out/bin/higan-init.sh
+ '';
+
+ meta = with stdenv.lib; {
+ description = "An open-source, cycle-accurate Nintendo multi-system emulator";
+ longDescription = ''
+ Higan (formerly bsnes) is a Nintendo multi-system emulator.
+ It currently supports the following systems:
+ Famicom; Super Famicom;
+ Game Boy; Game Boy Color; Game Boy Advance
+ higan also supports the following subsystems:
+ Super Game Boy; BS-X Satellaview; Sufami Turbo
+ '';
+ homepage = http://byuu.org/higan/;
+ license = licenses.gpl3Plus;
+ maintainers = [ maintainers.AndersonTorres ];
+ platforms = platforms.linux;
+ };
+}
+
+#
+# TODO:
+# - fix the BML and BIOS paths - maybe submitting
+# a custom patch to Higan project would not be a bad idea...
+# - Qt support
diff --git a/pkgs/misc/emulators/mednafen/default.nix b/pkgs/misc/emulators/mednafen/default.nix
index e3bb3965739..6fe92e4cfb6 100644
--- a/pkgs/misc/emulators/mednafen/default.nix
+++ b/pkgs/misc/emulators/mednafen/default.nix
@@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
name = "mednafen-${version}";
- version = "0.9.36.3";
+ version = "0.9.36.4";
src = fetchurl {
url = "http://downloads.sourceforge.net/project/mednafen/Mednafen/${version}/${name}.tar.bz2";
- sha256 = "00byql2p28l4476mvzmv5ysclb6yv9f4qrf6vz0x7ii648rp97in";
+ sha256 = "0s6dhdar6y64fah2ij98a9gskm0rzcbqdbksicnba8cakc87nsfy";
};
buildInputs = with stdenv.lib;
@@ -25,11 +25,11 @@ stdenv.mkDerivation rec {
install -m 644 -t $out/share/doc/$name *.css *.def *.html *.php *.png *.txt
'';
- meta = {
+ meta = with stdenv.lib; {
description = "A portable, CLI-driven, SDL+OpenGL-based, multi-system emulator";
homepage = http://mednafen.sourceforge.net/;
- license = stdenv.lib.licenses.gpl2;
- maintainers = [ stdenv.lib.maintainers.AndersonTorres ];
- platforms = stdenv.lib.platforms.linux;
+ license = licenses.gpl2;
+ maintainers = [ maintainers.AndersonTorres ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/misc/emulators/mednafen/server.nix b/pkgs/misc/emulators/mednafen/server.nix
index d4515b7db03..ce361ef9fbc 100644
--- a/pkgs/misc/emulators/mednafen/server.nix
+++ b/pkgs/misc/emulators/mednafen/server.nix
@@ -15,11 +15,11 @@ stdenv.mkDerivation rec {
install -m 644 -t $out/share/$name standard.conf
'';
- meta = {
+ meta = with stdenv.lib; {
description = "Netplay server for Mednafen";
homepage = http://mednafen.sourceforge.net/;
- license = stdenv.lib.licenses.gpl2;
- maintainers = [ stdenv.lib.maintainers.AndersonTorres ];
- platforms = stdenv.lib.platforms.linux;
+ license = licenses.gpl2;
+ maintainers = [ maintainers.AndersonTorres ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix
new file mode 100644
index 00000000000..db412eb883d
--- /dev/null
+++ b/pkgs/misc/emulators/retroarch/cores.nix
@@ -0,0 +1,235 @@
+{ stdenv, fetchgit, pkgconfig, makeWrapper, python27, retroarch
+, fluidsynth, mesa, SDL, ffmpeg, libpng, libjpeg, libvorbis, zlib }:
+
+let
+
+ d2u = stdenv.lib.replaceChars ["-"] ["_"];
+
+ mkLibRetroCore = ({ core, src, description, ... }@a:
+ stdenv.lib.makeOverridable stdenv.mkDerivation rec {
+
+ name = "libretro-${core}-${version}";
+ version = "20140902";
+ inherit src;
+
+ buildInputs = [ makeWrapper retroarch zlib ] ++ a.extraBuildInputs or [];
+
+ buildPhase = "make -f Makefile.libretro";
+ installPhase = ''
+ COREDIR="$out/lib/retroarch/cores"
+ mkdir -p $out/bin
+ mkdir -p $COREDIR
+ mv ${d2u core}_libretro.so $COREDIR/.
+ makeWrapper ${retroarch}/bin/retroarch $out/bin/retroarch-${core} \
+ --add-flags "-L $COREDIR/${d2u core}_libretro.so $@"
+ '';
+
+ passthru = {
+ core = core;
+ libretroCore = "/lib/retroarch/cores";
+ };
+
+ meta = with stdenv.lib; {
+ inherit description;
+ homepage = "http://www.libretro.com/";
+ license = licenses.gpl3Plus;
+ maintainers = [ maintainers.edwtjo ];
+ platforms = platforms.linux;
+ };
+ } // a);
+
+ fetchRetro = { repo, rev, sha256 }:
+ fetchgit {
+ inherit rev sha256;
+ url = "https://github.com/libretro/${repo}.git";
+ fetchSubmodules = true;
+ };
+
+in
+
+{
+
+ _4do = (mkLibRetroCore rec {
+ core = "4do";
+ src = fetchRetro {
+ repo = core + "-libretro";
+ rev = "961812bc421f3fbfd83ea211783bb511a0b6d31c";
+ sha256 = "0217iq8sj8gn161c3mj632csl1da8ir2ffxxdillpcddv6ppsayl";
+ };
+ description = "Port of 4DO/libfreedo to libretro";
+ }).override {
+ buildPhase = "make";
+ };
+
+ bsnes-mercury = (mkLibRetroCore rec {
+ core = "bsnes-mercury";
+ src = fetchRetro {
+ repo = core;
+ rev = "cc44e91bfba6f7b3d1d3d51a9fa28b39a579f5e0";
+ sha256 = "0nzwjrbfvzywsimrvp4vbpj7zxf9iwpghd9z7f9f1q027l0vj42f";
+ };
+ description = "Fork of bsnes with HLE DSP emulation restored";
+ }).override {
+ buildPhase = "make && cd out";
+ };
+
+ desmume = mkLibRetroCore rec {
+ core = "desmume";
+ src = fetchRetro {
+ repo = core + "-libretro";
+ rev = "1dd58e4a9fa375b6909cd8718165a429d4b8bd6d";
+ sha256 = "137bw9316qxm8s6p0bzyvk39dv5b5bn60fgllmyj9z5y8x5lrc9l";
+ };
+ description = "libretro wrapper for desmume NDS emulator";
+ };
+
+ fceumm = mkLibRetroCore rec {
+ core = "fceumm";
+ src = fetchRetro {
+ repo = "libretro-" + core;
+ rev = "17e081541c9d36d0658e7139afa5b085aa0316c9";
+ sha256 = "0cn74z976rgjh7hf0yb1sdjlm347157893s2z397rgjvks8xssb0";
+ };
+ description = "FCEUmm libretro port";
+ };
+
+ fba = (mkLibRetroCore rec {
+ core = "fba";
+ src = fetchRetro {
+ repo = core + "-libretro";
+ rev = "da6355526a9b02a642447994414baababe904c1e";
+ sha256 = "14kba506m9dnldmkpq3vgw416pm7cgc167hgm3f0l59ylp2592ff";
+ };
+ description = "Port of Final Burn Alpha to libretro";
+ }).override {
+ buildPhase = ''
+ cd svn-current/trunk \
+ && make -f makefile.libretro \
+ && mv fb_alpha_libretro.so fba_libretro.so
+ '';
+ };
+
+ gambatte = (mkLibRetroCore rec {
+ core = "gambatte";
+ src = fetchRetro {
+ repo = core + "-libretro";
+ rev = "267a4e09bf8f0877483abdffde6295f29d7235ee";
+ sha256 = "1swx3mjb6qmlg6grcakhl17vrmy4vdvimxkv5gbv6gnj5riya4vl";
+ };
+ description = "Gambatte libretro port";
+ }).override {
+ configurePhase = "cd libgambatte";
+ };
+
+ genesis-plus-gx = mkLibRetroCore rec {
+ core = "genesis-plus-gx";
+ src = fetchRetro {
+ repo = "Genesis-Plus-GX";
+ rev = "c0015e27e3ae607ea0490b2accfe31097ef3cbce";
+ sha256 = "1k4b5wib7nqzk53qwvhkh4a70gc4pq7vkrpvmfzp5f2c4vrbw1i7";
+ };
+ description = "Enhanced Genesis Plus libretro port";
+ };
+
+ mupen64plus = (mkLibRetroCore rec {
+ core = "mupen64plus";
+ src = fetchRetro {
+ repo = core + "-libretro";
+ rev = "2251b3aba2a5bb233ff49dd9b6472f2c0feb9b83";
+ sha256 = "04g93kj6n5vddbzfb30d8n711kg0yxfnl5v567aa854misn6gfxd";
+ };
+ description = "Libretro port of Mupen64 Plus, GL only";
+
+ extraBuildInputs = [ mesa ];
+ }).override {
+ buildPhase = "make WITH_DYNAREC=${if stdenv.system == "x86_64-linux" then "x86_64" else "x86"}";
+ };
+
+ picodrive = (mkLibRetroCore rec {
+ core = "picodrive";
+ src = fetchRetro {
+ repo = core;
+ rev = "d84817550ac064fbba7ee718fb3baeda7d5546da";
+ sha256 = "17zh9m2v7h1cifzz8dcwqm4wn94zyhz6g85gf0aw6xylxahza627";
+ };
+ description = "Fast MegaDrive/MegaCD/32X emulator";
+
+ extraBuildInputs = [ libpng SDL ];
+ }).override {
+ patchPhase = "sed -i -e 's,SDL_CONFIG=\".*\",SDL_CONFIG=\"${SDL}/bin/sdl-config\",' configure";
+ configurePhase = "./configure";
+ };
+
+ prboom = (mkLibRetroCore rec {
+ core = "prboom";
+ src = fetchRetro {
+ repo = "libretro-" + core;
+ rev = "de2f0a0fab1a73a28cd501fdb9291ffc7dc357f5";
+ sha256 = "01gxa6hh9vijic2n44q1lndhdyw0kdpmajabs0nizn7bni51b29c";
+ };
+ description = "Prboom libretro port";
+ }).override {
+ buildPhase = "make";
+ };
+
+ ppsspp = (mkLibRetroCore rec {
+ core = "ppsspp";
+ src = fetchRetro {
+ repo = "libretro-" + core;
+ rev = "6ee828171218b26e124c5e8fa7877e6ee1d5ff79";
+ sha256 = "1559d4k3h0a2dv3684j4w924p2dg8z2j1fwhy7w9mhb5z4kddjhk";
+ };
+ description = "ppsspp libretro port";
+
+ extraBuildInputs = [ mesa ffmpeg ];
+ }).override{
+ buildPhase = "cd libretro && make";
+ };
+
+ scummvm = (mkLibRetroCore rec {
+ core = "scummvm";
+ src = fetchRetro {
+ repo = core;
+ rev = "c00247171ba8201614e85556c638b8825dc9f225";
+ sha256 = "1wir3x928b37va6gn14bmwsydkpk4afma5hppmbivw4qp8mj25pa";
+ };
+ description = "Libretro port of ScummVM";
+
+ extraBuildInputs = [ fluidsynth libjpeg libvorbis mesa SDL ];
+ }).override {
+ buildPhase = "cd backends/platform/libretro/build/;make";
+ };
+
+ snes9x-next = mkLibRetroCore rec {
+ core = "snes9x-next";
+ src = fetchRetro {
+ repo = core;
+ rev = "461d92be09e1857d215f51aeea448a8e180bbfdd";
+ sha256 = "0ci453qsyrv3brmy2szngis2xyvxilcv9yhc2qjz285mirg6fj57";
+ };
+ description = "Optimized port/rewrite of SNES9x 1.52+ to Libretro";
+ };
+
+ stella = (mkLibRetroCore rec {
+ core = "stella";
+ src = fetchRetro {
+ repo = core + "-libretro";
+ rev = "c7ee7ca7e8a29c986f49306c75832972f5749f72";
+ sha256 = "15wy9h3a2qk66lh8x40b3a9il0zkdflqil1h51zjmhq2zzsq8p95";
+ };
+ description = "Port of Stella to libretro";
+ }).override {
+ buildPhase = "make";
+ };
+
+ vba-next = mkLibRetroCore rec {
+ core = "vba-next";
+ src = fetchRetro {
+ repo = core;
+ rev = "fb095107f83df5f93b8ba4833eaf43901f42c0c0";
+ sha256 = "0fvq1dfll27vjbmyh4qsp2nw166jsd91sjmf1sl84z56ab3q3iw8";
+ };
+ description = "VBA-M libretro port";
+ };
+
+}
\ No newline at end of file
diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix
index 8bc53da8f0c..d110f2b789e 100644
--- a/pkgs/misc/emulators/retroarch/default.nix
+++ b/pkgs/misc/emulators/retroarch/default.nix
@@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec {
- name = "retroarch-0.9.9.7";
+ name = "retroarch-bare-0.9.9.7";
src = fetchgit {
url = "https://github.com/libretro/RetroArch.git";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
preConfigure = ''
configureFlags="--global-config-dir=$out/etc"
'';
-
+
meta = {
description = "Modular multi-system game/emulator system";
homepage = "http://www.libretro.com/";
diff --git a/pkgs/misc/emulators/retroarch/master.nix b/pkgs/misc/emulators/retroarch/master.nix
new file mode 100644
index 00000000000..2efb43e5d5e
--- /dev/null
+++ b/pkgs/misc/emulators/retroarch/master.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchgit, pkgconfig, ffmpeg, mesa, nvidia_cg_toolkit
+, freetype, libxml2, libv4l, coreutils, python34, which, udev, alsaLib
+, libX11, libXext, libXxf86vm, libXdmcp, SDL, pulseaudio ? null }:
+
+stdenv.mkDerivation rec {
+ name = "retroarch-bare-${version}";
+ version = "20140902";
+
+ src = fetchgit {
+ url = git://github.com/libretro/RetroArch.git;
+ rev = "0856091296c2e47409f36e13007805d71db69483";
+ sha256 = "152dfp6jd7yzvasqrqw4ydjbdcwq4khisia2dax3gydvxkq87nl4";
+ };
+
+ buildInputs = [ pkgconfig ffmpeg mesa nvidia_cg_toolkit freetype libxml2 libv4l coreutils
+ python34 which udev alsaLib libX11 libXext libXxf86vm libXdmcp SDL pulseaudio ];
+
+ patchPhase = ''
+ export GLOBAL_CONFIG_DIR=$out/etc
+ sed -e 's#/bin/true#${coreutils}/bin/true#' -i qb/qb.libs.sh
+ '';
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ homepage = http://libretro.org/;
+ description = "Multi-platform emulator frontend for libretro cores";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ MP2E ];
+ };
+}
diff --git a/pkgs/misc/emulators/retroarch/wrapper.nix b/pkgs/misc/emulators/retroarch/wrapper.nix
new file mode 100644
index 00000000000..f7e903ef529
--- /dev/null
+++ b/pkgs/misc/emulators/retroarch/wrapper.nix
@@ -0,0 +1,36 @@
+{ stdenv, lib, makeWrapper, retroarch, cores }:
+
+let
+
+ p = builtins.parseDrvName retroarch.name;
+
+in
+
+stdenv.mkDerivation {
+ name = "retroarch-" + p.version;
+ version = p.version;
+
+ buildInputs = [ makeWrapper ];
+
+ buildCommand = ''
+ mkdir -p $out/lib
+ $(for coreDir in $cores
+ do
+ $(ln -s $coreDir/*.so $out/lib/.)
+ done)
+ makeWrapper ${retroarch}/bin/retroarch $out/bin/retroarch \
+ --suffix-each LD_LIBRARY_PATH ':' "$cores" \
+ --add-flags "-L $out/lib/ --menu" \
+ '';
+
+ cores = map (x: x + x.libretroCore) cores;
+ preferLocalBuild = true;
+
+ meta = with retroarch.meta; {
+ inherit license homepage;
+ description = description
+ + " (with cores: "
+ + lib.concatStrings (lib.intersperse ", " (map (x: ""+x.name) cores))
+ + ")";
+ };
+}
diff --git a/pkgs/misc/emulators/retroarch/xbmc-advanced-launchers.nix b/pkgs/misc/emulators/retroarch/xbmc-advanced-launchers.nix
new file mode 100644
index 00000000000..ec539cb43f9
--- /dev/null
+++ b/pkgs/misc/emulators/retroarch/xbmc-advanced-launchers.nix
@@ -0,0 +1,39 @@
+{ stdenv, pkgs, cores }:
+
+assert cores != [];
+
+with pkgs.lib;
+
+let
+
+ script = exec: ''
+ #!${stdenv.shell}
+ nohup sh -c "sleep 1 && pkill -SIGSTOP xbmc" &
+ nohup sh -c "${exec} '$@' -f;pkill -SIGCONT xbmc"
+ '';
+ scriptSh = exec: pkgs.writeScript ("xbmc-"+exec.name) (script exec.path);
+ execs = map (core: rec { name = core.core; path = core+"/bin/retroarch-"+name;}) cores;
+
+in
+
+stdenv.mkDerivation rec {
+ name = "xbmc-retroarch-advanced-launchers-${version}";
+ version = "0.2";
+
+ dontBuild = true;
+
+ buildCommand = ''
+ mkdir -p $out/bin
+ ${stdenv.lib.concatMapStrings (exec: "ln -s ${scriptSh exec} $out/bin/xbmc-${exec.name};") execs}
+ '';
+
+ meta = {
+ description = "XBMC retroarch advanced launchers";
+ longDescription = ''
+ These retroarch launchers are intended to be used with
+ anglescry advanced launcher for XBMC since device input is
+ caught by both XBMC and the retroarch process.
+ '';
+ license = "GPL-3";
+ };
+}
diff --git a/pkgs/misc/emulators/stella/default.nix b/pkgs/misc/emulators/stella/default.nix
new file mode 100644
index 00000000000..768d018ba51
--- /dev/null
+++ b/pkgs/misc/emulators/stella/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, pkgconfig
+, SDL2 }:
+
+stdenv.mkDerivation rec {
+
+ name = "stella-${version}";
+ version = "4.0";
+
+ src = fetchurl {
+ url = "http://downloads.sourceforge.net/project/stella/stella/${version}/${name}-src.tar.gz";
+ sha256 = "1j96sj2qflq3agb7fvb08ih3pxy8nsvlkwj40q3n00q9k884ad5w";
+ };
+
+ buildInputs = with stdenv.lib;
+ [ pkgconfig SDL2 ];
+
+ meta = with stdenv.lib; {
+ description = "An open-source Atari 2600 VCS emulator";
+ longDescription = ''
+ Stella is a multi-platform Atari 2600 VCS emulator released under
+ the GNU General Public License (GPL). Stella was originally
+ developed for Linux by Bradford W. Mott, and is currently
+ maintained by Stephen Anthony.
+ As of its 3.5 release, Stella is officialy donationware.
+ '';
+ homepage = http://stella.sourceforge.net/;
+ license = licenses.gpl2;
+ maintainers = [ maintainers.AndersonTorres ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/misc/emulators/wine/unstable.nix b/pkgs/misc/emulators/wine/unstable.nix
index cd5c5a8b479..36437c4e57b 100644
--- a/pkgs/misc/emulators/wine/unstable.nix
+++ b/pkgs/misc/emulators/wine/unstable.nix
@@ -7,12 +7,12 @@ assert stdenv.isLinux;
assert stdenv.gcc.gcc != null;
let
- version = "1.7.23";
+ version = "1.7.28";
name = "wine-${version}";
src = fetchurl {
url = "mirror://sourceforge/wine/${name}.tar.bz2";
- sha256 = "012ww1yifayakw9n2m23sx83dc3i2xiq3bn5n9iprppdhwxpp76v";
+ sha256 = "04r3zk3dz2vzly2a4nqbcvppjs5iy3lq5ibx3wfrf877p5bz3hv7";
};
gecko = fetchurl {
@@ -49,7 +49,7 @@ in stdenv.mkDerivation rec {
freetype fontconfig stdenv.gcc.gcc mesa mesa_noglu.osmesa libdrm
xlibs.libXinerama xlibs.libXrender xlibs.libXrandr
xlibs.libXcursor xlibs.libXcomposite libpng libjpeg
- openssl gnutls cups
+ openssl gnutls cups ncurses
];
# Don't shrink the ELF RPATHs in order to keep the extra RPATH
diff --git a/pkgs/misc/emulators/wine/unstable.upstream b/pkgs/misc/emulators/wine/unstable.upstream
index e3616df7680..fa78360c76a 100644
--- a/pkgs/misc/emulators/wine/unstable.upstream
+++ b/pkgs/misc/emulators/wine/unstable.upstream
@@ -1,5 +1,5 @@
url http://sourceforge.net/projects/wine/files/Source/
-attribute_name wine_unstable
+attribute_name wineUnstable
version_link '[.]tar[.][^./]+/download$'
SF_redirect
do_overwrite () {
diff --git a/pkgs/misc/my-env/loadenv.sh b/pkgs/misc/my-env/loadenv.sh
index 1aab4ac0208..2a990e8685c 100644
--- a/pkgs/misc/my-env/loadenv.sh
+++ b/pkgs/misc/my-env/loadenv.sh
@@ -2,6 +2,8 @@
OLDPATH="$PATH"
OLDTZ="$TZ"
+OLD_http_proxy="$http_proxy"
+OLD_ftp_proxy="$http_proxy"
source @myenvpath@
PATH="$PATH:$OLDPATH"
@@ -10,6 +12,8 @@ export NIX_MYENV_NAME="@name@"
export buildInputs
export NIX_STRIP_DEBUG=0
export TZ="$OLDTZ"
+export http_proxy="$OLD_http_proxy"
+export ftp_proxy="$OLD_ftp_proxy"
if test $# -gt 0; then
exec "$@"
diff --git a/pkgs/misc/phabricator/default.nix b/pkgs/misc/phabricator/default.nix
new file mode 100644
index 00000000000..3162dd0079d
--- /dev/null
+++ b/pkgs/misc/phabricator/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchgit, pkgs, ... }:
+
+stdenv.mkDerivation rec {
+ version = "2014-07-16";
+ name = "phabricator-${version}";
+ srcLibphutil = pkgs.fetchgit {
+ url = git://github.com/facebook/libphutil.git;
+ rev = "48a04395363d6c1dd9f66057bd11fd70d4665ba9";
+ sha256 = "d570d2c1e68471c2eda35b8722d8083bcc13163fbd5c944529464f2c7b55a2e5";
+ };
+ srcArcanist = pkgs.fetchgit {
+ url = git://github.com/facebook/arcanist.git;
+ rev = "97501da16416fbfdc6e84bd60abcbf5ad9506225";
+ sha256 = "9031c4ae228bdc986131e0c93c98fb73290bb0e297be1ec32f22ab09cdacafa3";
+ };
+ srcPhabricator = pkgs.fetchgit {
+ url = git://github.com/phacility/phabricator.git;
+ rev = "7ac5abb97934f7399b67762aa98f59f667711bf3";
+ sha256 = "6a1d449597ae4432e40a3e6cdb14e3a5a8a40e019f3930493064c35911f2adcc";
+ };
+
+ buildCommand = ''
+ mkdir -p $out
+ cp -R ${srcLibphutil} $out/libphutil
+ cp -R ${srcArcanist} $out/arcanist
+ cp -R ${srcPhabricator} $out/phabricator
+ '';
+}
diff --git a/pkgs/misc/screensavers/alock/default.nix b/pkgs/misc/screensavers/alock/default.nix
new file mode 100644
index 00000000000..9db2fe45ed3
--- /dev/null
+++ b/pkgs/misc/screensavers/alock/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchgit, pkgconfig, autoconf, automake
+, libX11, pam, libgcrypt, libXrender, imlib2 }:
+
+stdenv.mkDerivation rec {
+ date = "20140724";
+ name = "alock-${date}";
+
+ src = fetchgit {
+ url = https://github.com/Arkq/alock;
+ rev = "928ae09a85627570b7f6986fe161b71327405fc0";
+ sha256 = "0z605w2cf0pc988qq931b2zis6dqavm0wcjfdmr6q4vamvinjfv0";
+ };
+
+ preConfigure = "autoreconf -fvi";
+ configureFlags = [
+ "--enable-pam"
+ "--enable-hash"
+ "--enable-xrender"
+ "--enable-imlib2"
+ ];
+ buildInputs = [
+ pkgconfig autoconf automake libX11
+ pam libgcrypt libXrender imlib2
+ ];
+
+ meta = {
+ homepage = https://github.com/Arkq/alock;
+ description = "Simple screen lock application for X server";
+ longDescription = ''
+ alock locks the X server until the user enters a password
+ via the keyboard. If the authentification was successful
+ the X server is unlocked and the user can continue to work.
+
+ alock does not provide any fancy animations like xlock or
+ xscreensaver and never will. Its just for locking the current
+ X session.
+ '';
+ platforms = with stdenv.lib.platforms; allBut cygwin;
+ maintainers = [ stdenv.lib.maintainers.ftrvxmtrx ];
+ };
+}
diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix
index 04791749810..29acf04000c 100644
--- a/pkgs/misc/screensavers/xscreensaver/default.nix
+++ b/pkgs/misc/screensavers/xscreensaver/default.nix
@@ -4,12 +4,12 @@
}:
stdenv.mkDerivation rec {
- version = "5.29";
+ version = "5.30";
name = "xscreensaver-${version}";
src = fetchurl {
url = "http://www.jwz.org/xscreensaver/${name}.tar.gz";
- sha256 = "157jy1mh84h6p4mpzsgcadv6c660c212rmjgdpgpidcn0rsza664";
+ sha256 = "0ljx10fsypdddcx43lwhrwqa9ksp9djv7p4i1y7760m4frl1fw9p";
};
buildInputs =
@@ -41,5 +41,8 @@ stdenv.mkDerivation rec {
description = "A set of screensavers";
maintainers = with stdenv.lib.maintainers; [ raskin urkud ];
platforms = with stdenv.lib.platforms; allBut cygwin;
+ inherit version;
+ downloadPage = "http://www.jwz.org/xscreensaver/download.html";
+ updateWalker = true;
};
}
diff --git a/pkgs/misc/sound-of-sorting/default.nix b/pkgs/misc/sound-of-sorting/default.nix
new file mode 100644
index 00000000000..fa1be80287a
--- /dev/null
+++ b/pkgs/misc/sound-of-sorting/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl
+, SDL2, wxGTK
+}:
+
+stdenv.mkDerivation rec {
+
+ name = "sound-of-sorting-${version}";
+ version = "0.6.5";
+
+ src = fetchurl {
+ url = "https://github.com/bingmann/sound-of-sorting/archive/${name}.tar.gz";
+ sha256 = "1524bhmy5067z9bjc15hvqslw43adgpdn4272iymq09ahja4x76b";
+ };
+
+ buildInputs = with stdenv.lib;
+ [ wxGTK SDL2 ];
+
+ preConfigure = ''
+ export SDL_CONFIG=${SDL2}/bin/sdl2-config
+ '';
+
+ meta = with stdenv.lib;{
+ description = "Audibilization and Visualization of Sorting Algorithms";
+ homepage = http://panthema.net/2013/sound-of-sorting/;
+ license = licenses.gpl3;
+ maintainers = [ maintainers.AndersonTorres ];
+ };
+}
diff --git a/pkgs/misc/themes/gtk3/oxygen-gtk3/default.nix b/pkgs/misc/themes/gtk3/oxygen-gtk3/default.nix
new file mode 100644
index 00000000000..34141c91f91
--- /dev/null
+++ b/pkgs/misc/themes/gtk3/oxygen-gtk3/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl
+, cmake, dbus_glib, glib, gtk3, gdk_pixbuf, pkgconfig, xorg }:
+
+stdenv.mkDerivation rec {
+ version = "1.4.0";
+ name = "oxygen-gtk3-${version}";
+
+ src = fetchurl {
+ url = "mirror://kde/stable/oxygen-gtk3/${version}/src/${name}.tar.bz2";
+ sha256 = "d119bcc94ffc04b67e7d238fc922b37f2904447085a06758451b8c0b0302ab80";
+ };
+
+ buildInputs = [ cmake dbus_glib glib gtk3 gdk_pixbuf
+ pkgconfig xorg.libXau xorg.libXdmcp xorg.libpthreadstubs
+ xorg.libxcb xorg.pixman ];
+
+ meta = with stdenv.lib; {
+ description = "Port of the default KDE widget theme (Oxygen), to gtk 3";
+ homepage = https://projects.kde.org/projects/playground/artwork/oxygen-gtk;
+ license = licenses.lgpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 648ddb1b430..8dd17c074a7 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -111,26 +111,27 @@ in rec
YouCompleteMe = stdenv.mkDerivation {
src = fetchgit {
url = "https://github.com/Valloric/YouCompleteMe.git";
- rev = "67288080ea7057ea3111cb4c863484e3b150e738";
- sha256 = "1a3rwdl458z1yrp50jdwp629j4al0zld21n15sad28g51m8gw5ka";
+ rev = "a2cae90f7ba1746bf1209edd6739f87d5914b375";
+ sha256 = "1yxrxskxnr2da5awm59ra4s9wg67rimcbazvln9bayg9saxs540d";
};
- name = "youcompleteme-git-6728808";
+ name = "youcompleteme-20140929"; # commit date
buildInputs = [ python cmake clang.clang ];
configurePhase = ":";
buildPhase = ''
+ patchShebangs .
+
target=$out/share/vim-plugins/YouCompleteMe
mkdir -p $target
cp -a ./ $target
-
mkdir $target/build
cd $target/build
cmake -G "Unix Makefiles" . $target/third_party/ycmd/cpp -DPYTHON_LIBRARIES:PATH=${python}/lib/libpython2.7.so -DPYTHON_INCLUDE_DIR:PATH=${python}/include/python2.7 -DUSE_CLANG_COMPLETER=ON -DUSE_SYSTEM_LIBCLANG=ON
make ycm_support_libs -j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}}
- ${bash}/bin/bash $target/install.sh --clang-completer
+ ${bash}/bin/bash $target/install.sh --clang-completer --system-libclang
${vimHelpTags}
vimHelpTags $target
@@ -645,4 +646,14 @@ in rec
path = "pathogen";
};
+ vimoutliner = simpleDerivation {
+ name = "vimoutliner-git-dce383e7";
+ src = fetchgit {
+ url = "https://github.com/vimoutliner/vimoutliner";
+ rev = "2fc82976683c8770bece157ae3ada55251b6ddeb";
+ sha256 = "dce383e7842c42bcfa8e7c3329fa426cb0fb05786d40a733da705c03aabd196b";
+ };
+ path = "vimoutliner";
+ };
+
}
diff --git a/pkgs/os-specific/darwin/command-line-tools/default.nix b/pkgs/os-specific/darwin/command-line-tools/default.nix
new file mode 100644
index 00000000000..a4ac20fa085
--- /dev/null
+++ b/pkgs/os-specific/darwin/command-line-tools/default.nix
@@ -0,0 +1,71 @@
+{ stdenv, fetchadc, xar, gzip, cpio }:
+
+let
+ name = "command-line-tools-mac-os-10.9";
+
+ pkg = { installPhase }: stdenv.mkDerivation {
+ name = "${name}.pkg";
+
+ phases = [ "installPhase" ];
+
+ inherit installPhase;
+
+ meta = with stdenv.lib; {
+ description = "Developer tools .pkg file";
+ maintainers = with maintainers; [ copumpkin ];
+ platforms = platforms.darwin;
+ license = licenses.unfree;
+ };
+ };
+
+ basic = pkg: stdenv.mkDerivation {
+ inherit name;
+
+ phases = [ "unpackPhase" "installPhase" ];
+
+ outputs = [ "sdk" "tools" ];
+
+ unpackPhase = ''
+ ${xar}/bin/xar -x -f "${pkg}"
+ '';
+
+ installPhase = ''
+ start="$(pwd)"
+ mkdir -p $sdk
+ mkdir -p $tools
+
+ cd $sdk
+ cat $start/DevSDK_OSX109.pkg/Payload | ${gzip}/bin/gzip -d | ${cpio}/bin/cpio -idm
+
+ cd $tools
+ cat $start/CLTools_Executables.pkg/Payload | ${gzip}/bin/gzip -d | ${cpio}/bin/cpio -idm
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Mac OS command-line developer tools and SDK";
+ maintainers = with maintainers; [ copumpkin ];
+ platforms = platforms.darwin;
+ license = licenses.unfree;
+ };
+ };
+in rec {
+ dmg = fetchadc {
+ # Isn't this a beautiful path? Note the subtle differences before and after the slash!
+ path = "Developer_Tools/command_line_tools_os_x_10.9_for_xcode__xcode_6/command_line_tools_for_os_x_10.9_for_xcode_6.dmg";
+ sha256 = "0zrpf73r3kfk9pdh6p6j6w1sbw7s2pp0f8rd83660r5hk1y3j5jc";
+ };
+
+ pure = { xpwn }: basic (pkg {
+ installPhase = ''
+ ${xpwn}/bin/hdutil ${dmg} extract "Command Line Tools (OS X 10.9).pkg" $out
+ '';
+ });
+
+ impure = basic (pkg {
+ installPhase = ''
+ /usr/bin/hdiutil attach ${dmg} -mountpoint clt-mount -nobrowse
+ cp "clt-mount/Command Line Tools (OS X 10.9).pkg" $out
+ /usr/bin/hdiutil unmount clt-mount
+ '';
+ });
+}
diff --git a/pkgs/os-specific/darwin/osx-private-sdk/default.nix b/pkgs/os-specific/darwin/osx-private-sdk/default.nix
new file mode 100644
index 00000000000..d12ad24c9f8
--- /dev/null
+++ b/pkgs/os-specific/darwin/osx-private-sdk/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, python, osx_sdk }:
+
+let
+ sdkVersion = "10.9";
+in stdenv.mkDerivation {
+ name = "PrivateMacOSX${sdkVersion}.sdk";
+
+ src = fetchFromGitHub {
+ owner = "copumpkin";
+ repo = "OSXPrivateSDK";
+ rev = "bde9cba13e6ae62a8e4e0f405008ea719526e7ad";
+ sha256 = "1vj3fxwp32irxjk987p7a223sm5bl5rrlajcvgy69k0wb0fp0krc";
+ };
+
+ buildInputs = [ python ];
+
+ configurePhase = "true";
+
+ buildPhase = ''
+ python PrivateSDK.py -i ${osx_sdk}/Developer/SDKs/MacOSX${sdkVersion}.sdk -o PrivateMacOSX${sdkVersion}.sdk
+ '';
+
+ installPhase = ''
+ mkdir -p $out/Developer/SDKs/
+ mv PrivateMacOSX${sdkVersion}.sdk $out/Developer/SDKs
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A private Mac OS ${version} SDK, suitable for building many of Apple's open source releases";
+ maintainers = with maintainers; [ copumpkin ];
+ platforms = platforms.darwin;
+ license = licenses.unfree;
+ };
+}
\ No newline at end of file
diff --git a/pkgs/os-specific/darwin/osx-sdk/default.nix b/pkgs/os-specific/darwin/osx-sdk/default.nix
new file mode 100644
index 00000000000..612bf003743
--- /dev/null
+++ b/pkgs/os-specific/darwin/osx-sdk/default.nix
@@ -0,0 +1,26 @@
+{ stdenv }:
+
+let
+ version = "10.9";
+in stdenv.mkDerivation {
+ name = "MacOSX10.9.sdk";
+
+ src = "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk";
+
+ unpackPhase = "true";
+ configurePhase = "true";
+ buildPhase = "true";
+
+ installPhase = ''
+ mkdir -p $out/Developer/SDKs/
+ echo "Source is: $src"
+ cp -r $src $out/Developer/SDKs/
+ '';
+
+ meta = with stdenv.lib; {
+ description = "The Mac OS ${version} SDK";
+ maintainers = with maintainers; [ copumpkin ];
+ platforms = platforms.darwin;
+ license = licenses.unfree;
+ };
+}
\ No newline at end of file
diff --git a/pkgs/os-specific/darwin/security-tool/default.nix b/pkgs/os-specific/darwin/security-tool/default.nix
new file mode 100644
index 00000000000..49d61f392c5
--- /dev/null
+++ b/pkgs/os-specific/darwin/security-tool/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, osx_private_sdk }:
+
+stdenv.mkDerivation rec {
+ version = "55115";
+ name = "SecurityTool-${version}";
+
+ src = fetchurl {
+ url = "http://opensource.apple.com/tarballs/SecurityTool/SecurityTool-${version}.tar.gz";
+ sha256 = "0apcz4vy2z5645jhrs60wj3w27mncjjqv42h5lln36g6qs2n9113";
+ };
+
+ configurePhase = "";
+
+ # Someday we shall purge this impurity!
+ buildPhase = ''
+ /usr/bin/xcodebuild SDKROOT=${osx_private_sdk}/Developer/SDKs/PrivateMacOSX10.9.sdk/
+ '';
+
+ installPhase = ''
+ mkdir -p $out/bin/
+ cp build/Release/security $out/bin
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Command line interface to Mac OS X keychains and Security framework";
+ maintainers = with maintainers; [ copumpkin ];
+ platforms = platforms.darwin;
+ license = licenses.apsl20;
+ };
+}
\ No newline at end of file
diff --git a/pkgs/os-specific/linux/acpi-call/default.nix b/pkgs/os-specific/linux/acpi-call/default.nix
index 63c55341b14..289b54f1b54 100644
--- a/pkgs/os-specific/linux/acpi-call/default.nix
+++ b/pkgs/os-specific/linux/acpi-call/default.nix
@@ -13,6 +13,7 @@ stdenv.mkDerivation {
sed -e 's/break/true/' -i examples/turn_off_gpu.sh
sed -e 's@/bin/bash@.bin/sh@' -i examples/turn_off_gpu.sh
sed -e "s@/lib/modules/\$(.*)@${kernel.dev}/lib/modules/${kernel.modDirVersion}@" -i Makefile
+ sed -e 's@acpi/acpi[.]h@linux/acpi.h@g' -i acpi_call.c
'';
installPhase = ''
diff --git a/pkgs/os-specific/linux/acpi/default.nix b/pkgs/os-specific/linux/acpi/default.nix
index 0fc79922515..b815cd778fa 100644
--- a/pkgs/os-specific/linux/acpi/default.nix
+++ b/pkgs/os-specific/linux/acpi/default.nix
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
homepage = http://sourceforge.net/projects/acpiclient/;
license = stdenv.lib.licenses.gpl2Plus;
platforms = platforms.linux;
- maintainers = maintainers.mornfall;
+ maintainers = [ maintainers.mornfall ];
};
}
diff --git a/pkgs/os-specific/linux/acpid/default.nix b/pkgs/os-specific/linux/acpid/default.nix
index c9d45835cfd..39b5565ffbd 100644
--- a/pkgs/os-specific/linux/acpid/default.nix
+++ b/pkgs/os-specific/linux/acpid/default.nix
@@ -1,11 +1,11 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
- name = "acpid-2.0.22";
+ name = "acpid-2.0.23";
src = fetchurl {
url = "mirror://sourceforge/acpid2/${name}.tar.xz";
- sha256 = "0cdbcy5xjdcyp2x6hzgpv6a9vg9bbxmypmfvv1qzgj43897la49x";
+ sha256 = "1vl7c6vc724v4jwki17czgj6lnrknnj1a6llm8gkl32i2gnam5j3";
};
preBuild = ''
diff --git a/pkgs/os-specific/linux/alsa-lib/alsa-plugin-conf-multilib.patch b/pkgs/os-specific/linux/alsa-lib/alsa-plugin-conf-multilib.patch
new file mode 100644
index 00000000000..b17df9a492e
--- /dev/null
+++ b/pkgs/os-specific/linux/alsa-lib/alsa-plugin-conf-multilib.patch
@@ -0,0 +1,232 @@
+diff --git a/src/control/control.c b/src/control/control.c
+index d66ed75..42cecad 100644
+--- a/src/control/control.c
++++ b/src/control/control.c
+@@ -838,6 +838,10 @@ static int snd_ctl_open_conf(snd_ctl_t **ctlp, const char *name,
+ #ifndef PIC
+ extern void *snd_control_open_symbols(void);
+ #endif
++
++ snd_config_t *libs = NULL;
++ const char *libs_lib = NULL;
++
+ if (snd_config_get_type(ctl_conf) != SND_CONFIG_TYPE_COMPOUND) {
+ if (name)
+ SNDERR("Invalid type for CTL %s definition", name);
+@@ -879,6 +883,19 @@ static int snd_ctl_open_conf(snd_ctl_t **ctlp, const char *name,
+ SNDERR("Invalid type for %s", id);
+ goto _err;
+ }
++
++ continue;
++ }
++ // Handle an array of extra libs.
++ if (strcmp(id, "libs") == 0) {
++ if (snd_config_get_type(n) != SND_CONFIG_TYPE_COMPOUND) {
++ SNDERR("Invalid type for libs definition in CTL %s definition",
++ str);
++ goto _err;
++ }
++
++ libs = n;
++
+ continue;
+ }
+ if (strcmp(id, "open") == 0) {
+@@ -903,7 +920,62 @@ static int snd_ctl_open_conf(snd_ctl_t **ctlp, const char *name,
+ open_name = buf;
+ sprintf(buf, "_snd_ctl_%s_open", str);
+ }
+- if (!lib) {
++
++#ifndef PIC
++ snd_control_open_symbols();
++#endif
++
++ // Normal alsa behaviour when there is no libs array.
++ if (!libs) {
++ if (lib) {
++ open_func = snd_dlobj_cache_get(lib, open_name,
++ SND_DLSYM_VERSION(SND_CONTROL_DLSYM_VERSION), 1);
++ }
++ }
++ // Handle libs array.
++ // Suppresses error messages if any function is loaded successfully.
++ else {
++ if (lib) {
++ open_func = snd_dlobj_cache_get(lib, open_name,
++ SND_DLSYM_VERSION(SND_CONTROL_DLSYM_VERSION), 0);
++ }
++
++ if (!open_func) {
++ snd_config_for_each(i, next, libs) {
++ snd_config_t *n = snd_config_iterator_entry(i);
++
++ err = snd_config_get_string(n, &libs_lib);
++ if (err < 0) {
++ SNDERR("Invalid entry in CTL %s libs definition", str);
++ goto _err;
++ }
++
++ if (!open_func) {
++ open_func = snd_dlobj_cache_get(libs_lib, open_name,
++ SND_DLSYM_VERSION(SND_CONTROL_DLSYM_VERSION), 0);
++ }
++ }
++ }
++
++ // Print error messages.
++ if (!open_func) {
++ if (lib) {
++ SNDERR("Either %s cannot be opened or %s was not defined inside",
++ lib, open_name);
++ }
++
++ snd_config_for_each(i, next, libs) {
++ snd_config_t *n = snd_config_iterator_entry(i);
++
++ snd_config_get_string(n, &libs_lib);
++ SNDERR("Either %s cannot be opened or %s was not defined inside",
++ libs_lib, open_name);
++ }
++ }
++ }
++
++ // Look in ALSA_PLUGIN_DIR iff we found nowhere else to look.
++ if (!lib && (!libs || !libs_lib)) {
+ const char *const *build_in = build_in_ctls;
+ while (*build_in) {
+ if (!strcmp(*build_in, str))
+@@ -919,12 +991,11 @@ static int snd_ctl_open_conf(snd_ctl_t **ctlp, const char *name,
+ lib = buf1;
+ sprintf(buf1, "%s/libasound_module_ctl_%s.so", ALSA_PLUGIN_DIR, str);
+ }
+- }
+-#ifndef PIC
+- snd_control_open_symbols();
+-#endif
+- open_func = snd_dlobj_cache_get(lib, open_name,
++
++ open_func = snd_dlobj_cache_get(lib, open_name,
+ SND_DLSYM_VERSION(SND_CONTROL_DLSYM_VERSION), 1);
++ }
++
+ if (open_func) {
+ err = open_func(ctlp, name, ctl_root, ctl_conf, mode);
+ if (err >= 0) {
+diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c
+index 2e24338..7f489f4 100644
+--- a/src/pcm/pcm.c
++++ b/src/pcm/pcm.c
+@@ -2116,6 +2116,10 @@ static int snd_pcm_open_conf(snd_pcm_t **pcmp, const char *name,
+ #ifndef PIC
+ extern void *snd_pcm_open_symbols(void);
+ #endif
++
++ snd_config_t *libs = NULL;
++ const char *libs_lib = NULL;
++
+ if (snd_config_get_type(pcm_conf) != SND_CONFIG_TYPE_COMPOUND) {
+ char *val;
+ id = NULL;
+@@ -2160,6 +2164,19 @@ static int snd_pcm_open_conf(snd_pcm_t **pcmp, const char *name,
+ SNDERR("Invalid type for %s", id);
+ goto _err;
+ }
++
++ continue;
++ }
++ // Handle an array of extra libs.
++ if (strcmp(id, "libs") == 0) {
++ if (snd_config_get_type(n) != SND_CONFIG_TYPE_COMPOUND) {
++ SNDERR("Invalid type for libs definition in PCM %s definition",
++ str);
++ goto _err;
++ }
++
++ libs = n;
++
+ continue;
+ }
+ if (strcmp(id, "open") == 0) {
+@@ -2184,7 +2201,62 @@ static int snd_pcm_open_conf(snd_pcm_t **pcmp, const char *name,
+ open_name = buf;
+ sprintf(buf, "_snd_pcm_%s_open", str);
+ }
+- if (!lib) {
++
++#ifndef PIC
++ snd_pcm_open_symbols(); /* this call is for static linking only */
++#endif
++
++ // Normal alsa behaviour when there is no libs array.
++ if (!libs) {
++ if (lib) {
++ open_func = snd_dlobj_cache_get(lib, open_name,
++ SND_DLSYM_VERSION(SND_PCM_DLSYM_VERSION), 1);
++ }
++ }
++ // Handle libs array.
++ // Suppresses error messages if any function is loaded successfully.
++ else {
++ if (lib) {
++ open_func = snd_dlobj_cache_get(lib, open_name,
++ SND_DLSYM_VERSION(SND_PCM_DLSYM_VERSION), 0);
++ }
++
++ if (!open_func) {
++ snd_config_for_each(i, next, libs) {
++ snd_config_t *n = snd_config_iterator_entry(i);
++
++ err = snd_config_get_string(n, &libs_lib);
++ if (err < 0) {
++ SNDERR("Invalid entry in PCM %s libs definition", str);
++ goto _err;
++ }
++
++ if (!open_func) {
++ open_func = snd_dlobj_cache_get(libs_lib, open_name,
++ SND_DLSYM_VERSION(SND_PCM_DLSYM_VERSION), 0);
++ }
++ }
++ }
++
++ // Print error messages.
++ if (!open_func) {
++ if (lib) {
++ SNDERR("Either %s cannot be opened or %s was not defined inside",
++ lib, open_name);
++ }
++
++ snd_config_for_each(i, next, libs) {
++ snd_config_t *n = snd_config_iterator_entry(i);
++
++ snd_config_get_string(n, &libs_lib);
++ SNDERR("Either %s cannot be opened or %s was not defined inside",
++ libs_lib, open_name);
++ }
++ }
++ }
++
++ // Look in ALSA_PLUGIN_DIR iff we found nowhere else to look.
++ if (!lib && (!libs || !libs_lib)) {
+ const char *const *build_in = build_in_pcms;
+ while (*build_in) {
+ if (!strcmp(*build_in, str))
+@@ -2200,12 +2272,11 @@ static int snd_pcm_open_conf(snd_pcm_t **pcmp, const char *name,
+ lib = buf1;
+ sprintf(buf1, "%s/libasound_module_pcm_%s.so", ALSA_PLUGIN_DIR, str);
+ }
+- }
+-#ifndef PIC
+- snd_pcm_open_symbols(); /* this call is for static linking only */
+-#endif
+- open_func = snd_dlobj_cache_get(lib, open_name,
++
++ open_func = snd_dlobj_cache_get(lib, open_name,
+ SND_DLSYM_VERSION(SND_PCM_DLSYM_VERSION), 1);
++ }
++
+ if (open_func) {
+ err = open_func(pcmp, name, pcm_root, pcm_conf, stream, mode);
+ if (err >= 0) {
diff --git a/pkgs/os-specific/linux/alsa-lib/alsa-plugin-dirs.patch b/pkgs/os-specific/linux/alsa-lib/alsa-plugin-dirs.patch
deleted file mode 100644
index 3cee02aa0cd..00000000000
--- a/pkgs/os-specific/linux/alsa-lib/alsa-plugin-dirs.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c
-index 74d1d1a..17ffb12 100644
---- a/src/pcm/pcm.c
-+++ b/src/pcm/pcm.c
-@@ -2042,6 +2042,19 @@ static const char *const build_in_pcms[] = {
- NULL
- };
-
-+
-+// helper funcion used below
-+int file_exists(const char * filename)
-+{
-+ FILE * file;
-+ if (file = fopen(filename, "r"))
-+ {
-+ fclose(file);
-+ return 1;
-+ }
-+ return 0;
-+}
-+
- static int snd_pcm_open_conf(snd_pcm_t **pcmp, const char *name,
- snd_config_t *pcm_root, snd_config_t *pcm_conf,
- snd_pcm_stream_t stream, int mode)
-@@ -2141,8 +2154,38 @@ static int snd_pcm_open_conf(snd_pcm_t **pcmp, const char *name,
- err = -ENOMEM;
- goto _err;
- }
-- lib = buf1;
- sprintf(buf1, "%s/libasound_module_pcm_%s.so", ALSA_PLUGIN_DIR, str);
-+ if (!file_exists(buf1)){
-+ // try to locate plugin in one of ALSA_PLUGIN_DIRS which is colon separated list of paths
-+ char * pdirs = getenv("ALSA_PLUGIN_DIRS");
-+
-+ if (pdirs){ // env var set?
-+ char * saveptr;
-+ while (1) {
-+ char * dir_tok = strtok_r(pdirs, "::::", &saveptr); // "::::" to work around bug in glibc and -O2 ? ":" seems to cause a segfault
-+ if (dir_tok == NULL)
-+ break;
-+ char * so_file = malloc(strlen(str) + strlen(dir_tok) + 32);
-+ if (so_file == NULL) {
-+ err = -ENOMEM;
-+ goto _err;
-+ }
-+
-+ sprintf(so_file, "%s/libasound_module_pcm_%s.so", dir_tok, str);
-+
-+ if (file_exists(so_file)){
-+
-+ free(buf1);
-+ buf1 = so_file;
-+ break;
-+ } else {
-+ free (so_file);
-+ }
-+ pdirs = NULL;
-+ }
-+ }
-+ }
-+ lib = buf1;
- }
- }
- #ifndef PIC
-
-
-diff --git a/src/control/control.c b/src/control/control.c
-index c090797..137fe57 100644
---- a/src/control/control.c
-+++ b/src/control/control.c
-@@ -854,8 +854,38 @@ static int snd_ctl_open_conf(snd_ctl_t **ctlp, const char *name,
- err = -ENOMEM;
- goto _err;
- }
-+ sprintf(buf1, "%s/libasound_module_pcm_%s.so", ALSA_PLUGIN_DIR, str);
-+ if (!file_exists(buf1)){
-+ // try to locate plugin in one of ALSA_PLUGIN_DIRS which is colon separated list of paths
-+ char * pdirs = getenv("ALSA_PLUGIN_DIRS");
-+
-+ if (pdirs){ // env var set?
-+ char * saveptr;
-+ while (1) {
-+ char * dir_tok = strtok_r(pdirs, "::::", &saveptr); // "::::" to work around bug in glibc and -O2 ? ":" seems to cause a segfault
-+ if (dir_tok == NULL)
-+ break;
-+ char * so_file = malloc(strlen(str) + strlen(dir_tok) + 32);
-+ if (so_file == NULL) {
-+ err = -ENOMEM;
-+ goto _err;
-+ }
-+
-+ sprintf(so_file, "%s/libasound_module_ctl_%s.so", dir_tok, str);
-+
-+ if (file_exists(so_file)){
-+
-+ free(buf1);
-+ buf1 = so_file;
-+ break;
-+ } else {
-+ free (so_file);
-+ }
-+ pdirs = NULL;
-+ }
-+ }
-+ }
- lib = buf1;
-- sprintf(buf1, "%s/libasound_module_ctl_%s.so", ALSA_PLUGIN_DIR, str);
- }
- }
- #ifndef PIC
diff --git a/pkgs/os-specific/linux/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-lib/default.nix
index f46e54448b9..41abf488673 100644
--- a/pkgs/os-specific/linux/alsa-lib/default.nix
+++ b/pkgs/os-specific/linux/alsa-lib/default.nix
@@ -12,12 +12,7 @@ stdenv.mkDerivation rec {
};
patches = [
- /* allow specifying alternatives alsa plugin locations using
- export ALSA_PLUGIN_DIRS=$(nix-build -A alsaPlugins)/lib/alsa-lib
- This patch should be improved:
- See http://thread.gmane.org/gmane.linux.distributions.nixos/3435
- */
- ./alsa-plugin-dirs.patch
+ ./alsa-plugin-conf-multilib.patch
];
# Fix pcm.h file in order to prevent some compilation bugs
diff --git a/pkgs/os-specific/linux/ati-drivers/builder.sh b/pkgs/os-specific/linux/ati-drivers/builder.sh
index d1ca1b35452..c91274c50bf 100644
--- a/pkgs/os-specific/linux/ati-drivers/builder.sh
+++ b/pkgs/os-specific/linux/ati-drivers/builder.sh
@@ -8,126 +8,129 @@ die(){ echo $@; exit 1; }
# custom unpack:
unzip $src
-run_file=$(echo amd-catalyst-*)
+run_file=$(echo fglrx-*/amd-driver-installer-*)
sh $run_file --extract .
eval "$patchPhase"
-kernelVersion=$(cd ${kernel}/lib/modules && ls)
-kernelBuild=$(echo ${kernel}/lib/modules/$kernelVersion/build)
-linuxsources=$(echo ${kernel}/lib/modules/$kernelVersion/source)
+case "$system" in
+ x86_64-linux)
+ arch=x86_64
+ lib_arch=lib64
+ DIR_DEPENDING_ON_XORG_VERSION=xpic_64a
+ ;;
+ i686-linux)
+ arch=x86
+ lib_arch=lib
+ DIR_DEPENDING_ON_XORG_VERSION=xpic
+ ;;
+ *) exit 1;;
+esac
+# Handle/Build the kernel module.
+if test -z "$libsOnly"; then
-# note: maybe the .config file should be used to determine this ?
-# current kbuild infrastructure allows using CONFIG_* defines
-# but ati sources don't use them yet..
-# copy paste from make.sh
-setSMP(){
+ kernelVersion=$(cd ${kernel}/lib/modules && ls)
+ kernelBuild=$(echo ${kernel}/lib/modules/$kernelVersion/build)
+ linuxsources=$(echo ${kernel}/lib/modules/$kernelVersion/source)
- linuxincludes=$kernelBuild/include
+ # note: maybe the .config file should be used to determine this ?
+ # current kbuild infrastructure allows using CONFIG_* defines
+ # but ati sources don't use them yet..
+ # copy paste from make.sh
+ setSMP(){
- # copied and stripped. source: make.sh:
+ linuxincludes=$kernelBuild/include
- # 3
- # linux/autoconf.h may contain this: #define CONFIG_SMP 1
+ # copied and stripped. source: make.sh:
+ # 3
+ # linux/autoconf.h may contain this: #define CONFIG_SMP 1
- # Before 2.6.33 autoconf.h is under linux/.
- # For 2.6.33 and later autoconf.h is under generated/.
- if [ -f $linuxincludes/generated/autoconf.h ]; then
- autoconf_h=$linuxincludes/generated/autoconf.h
- else
- autoconf_h=$linuxincludes/linux/autoconf.h
- fi
- src_file=$autoconf_h
+ # Before 2.6.33 autoconf.h is under linux/.
+ # For 2.6.33 and later autoconf.h is under generated/.
+ if [ -f $linuxincludes/generated/autoconf.h ]; then
+ autoconf_h=$linuxincludes/generated/autoconf.h
+ else
+ autoconf_h=$linuxincludes/linux/autoconf.h
+ fi
+ src_file=$autoconf_h
- [ -e $src_file ] || die "$src_file not found"
+ [ -e $src_file ] || die "$src_file not found"
- if [ `cat $src_file | grep "#undef" | grep "CONFIG_SMP" -c` = 0 ]; then
- SMP=`cat $src_file | grep CONFIG_SMP | cut -d' ' -f3`
- echo "file $src_file says: SMP=$SMP"
- fi
+ if [ `cat $src_file | grep "#undef" | grep "CONFIG_SMP" -c` = 0 ]; then
+ SMP=`cat $src_file | grep CONFIG_SMP | cut -d' ' -f3`
+ echo "file $src_file says: SMP=$SMP"
+ fi
- if [ "$SMP" = 0 ]; then
- echo "assuming default: SMP=$SMP"
- fi
+ if [ "$SMP" = 0 ]; then
+ echo "assuming default: SMP=$SMP"
+ fi
- # act on final result
- if [ ! "$SMP" = 0 ]; then
- smp="-SMP"
- def_smp=-D__SMP__
- fi
+ # act on final result
+ if [ ! "$SMP" = 0 ]; then
+ smp="-SMP"
+ def_smp=-D__SMP__
+ fi
-}
+ }
-setModVersions(){
- ! grep CONFIG_MODVERSIONS=y $kernel/config ||
- def_modversions="-DMODVERSIONS"
- # make.sh contains much more code to determine this whether its enabled
-}
+ setModVersions(){
+ ! grep CONFIG_MODVERSIONS=y $kernelBuild/.config ||
+ def_modversions="-DMODVERSIONS"
+ # make.sh contains much more code to determine this whether its enabled
+ }
-# ==============================================================
-# resolve if we are building for a kernel with a fix for CVE-2010-3081
-# On kernels with the fix, use arch_compat_alloc_user_space instead
-# of compat_alloc_user_space since the latter is GPL-only
+ # ==============================================================
+ # resolve if we are building for a kernel with a fix for CVE-2010-3081
+ # On kernels with the fix, use arch_compat_alloc_user_space instead
+ # of compat_alloc_user_space since the latter is GPL-only
-COMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space
+ COMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space
-for src_file in \
+ for src_file in \
$kernelBuild/arch/x86/include/asm/compat.h \
$linuxsources/arch/x86/include/asm/compat.h \
$kernelBuild/include/asm-x86_64/compat.h \
$linuxsources/include/asm-x86_64/compat.h \
$kernelBuild/include/asm/compat.h;
-do
- if [ -e $src_file ];
- then
- break
+ do
+ if [ -e $src_file ];
+ then
+ break
+ fi
+ done
+ if [ ! -e $src_file ];
+ then
+ echo "Warning: x86 compat.h not found in kernel headers"
+ echo "neither arch/x86/include/asm/compat.h nor include/asm-x86_64/compat.h"
+ echo "could be found in $kernelBuild or $linuxsources"
+ echo ""
+ else
+ if [ `cat $src_file | grep -c arch_compat_alloc_user_space` -gt 0 ]
+ then
+ COMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space
+ fi
+ echo "file $src_file says: COMPAT_ALLOC_USER_SPACE=$COMPAT_ALLOC_USER_SPACE"
fi
-done
-if [ ! -e $src_file ];
-then
- echo "Warning: x86 compat.h not found in kernel headers"
- echo "neither arch/x86/include/asm/compat.h nor include/asm-x86_64/compat.h"
- echo "could be found in $kernelBuild or $linuxsources"
- echo ""
-else
- if [ `cat $src_file | grep -c arch_compat_alloc_user_space` -gt 0 ]
- then
- COMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space
- fi
- echo "file $src_file says: COMPAT_ALLOC_USER_SPACE=$COMPAT_ALLOC_USER_SPACE"
-fi
+ # make.sh contains some code figuring out whether to use these or not..
+ PAGE_ATTR_FIX=0
+ setSMP
+ setModVersions
+ CC=gcc
+ MODULE=fglrx
+ LIBIP_PREFIX=$TMP/arch/$arch/lib/modules/fglrx/build_mod
+ [ -d $LIBIP_PREFIX ]
+ GCC_MAJOR="`gcc --version | grep -o -e ") ." | head -1 | cut -d " " -f 2`"
-# make.sh contains some code figuring out whether to use these or not..
-PAGE_ATTR_FIX=0
-setSMP
-setModVersions
-CC=gcc
-MODULE=fglrx
-case "$system" in
- x86_64-linux)
- arch=x86_64
- lib_arch=lib64
- ;;
- i686-linux)
- arch=x86
- lib_arch=lib
- ;;
- *) exit 1;;
-esac
-LIBIP_PREFIX=$TMP/arch/$arch/lib/modules/fglrx/build_mod
-[ -d $LIBIP_PREFIX ]
-GCC_MAJOR="`gcc --version | grep -o -e ") ." | head -1 | cut -d " " -f 2`"
+ { # build .ko module
+ cd ./common/lib/modules/fglrx/build_mod/2.6.x
+ echo .lib${MODULE}_ip.a.GCC${GCC_MAJOR}.cmd
+ echo 'This is a dummy file created to suppress this warning: could not find /lib/modules/fglrx/build_mod/2.6.x/.libfglrx_ip.a.GCC4.cmd for /lib/modules/fglrx/build_mod/2.6.x/libfglrx_ip.a.GCC4' > lib${MODULE}_ip.a.GCC${GCC_MAJOR}.cmd
-{ # build .ko module
- cd ./common/lib/modules/fglrx/build_mod/2.6.x
- echo .lib${MODULE}_ip.a.GCC${GCC_MAJOR}.cmd
- echo 'This is a dummy file created to suppress this warning: could not find /lib/modules/fglrx/build_mod/2.6.x/.libfglrx_ip.a.GCC4.cmd for /lib/modules/fglrx/build_mod/2.6.x/libfglrx_ip.a.GCC4' > lib${MODULE}_ip.a.GCC${GCC_MAJOR}.cmd
+ sed -i -e "s@COMPAT_ALLOC_USER_SPACE@$COMPAT_ALLOC_USER_SPACE@" ../kcl_ioctl.c
- sed -i -e "s@COMPAT_ALLOC_USER_SPACE@$COMPAT_ALLOC_USER_SPACE@" ../kcl_ioctl.c
-
- make CC=${CC} \
+ make CC=${CC} \
LIBIP_PREFIX=$(echo "$LIBIP_PREFIX" | sed -e 's|^\([^/]\)|../\1|') \
MODFLAGS="-DMODULE -DATI -DFGL -DPAGE_ATTR_FIX=$PAGE_ATTR_FIX -DCOMPAT_ALLOC_USER_SPACE=$COMPAT_ALLOC_USER_SPACE $def_smp $def_modversions" \
KVER=$kernelVersion \
@@ -135,8 +138,10 @@ GCC_MAJOR="`gcc --version | grep -o -e ") ." | head -1 | cut -d " " -f 2`"
PAGE_ATTR_FIX=$PAGE_ATTR_FIX \
-j4
- cd $TMP
-}
+ cd $TMP
+ }
+
+fi
{ # install
@@ -152,13 +157,15 @@ GCC_MAJOR="`gcc --version | grep -o -e ") ." | head -1 | cut -d " " -f 2`"
# what are those files used for?
cp -r common/etc $out
- DIR_DEPENDING_ON_XORG_VERSION=xpic_64a
cp -r $DIR_DEPENDING_ON_XORG_VERSION/usr/X11R6/$lib_arch/* $out/lib/xorg
- t=$out/lib/modules/${kernelVersion}/kernel/drivers/misc
- mkdir -p $t
+ # install kernel module
+ if test -z "$libsOnly"; then
+ t=$out/lib/modules/${kernelVersion}/kernel/drivers/misc
+ mkdir -p $t
- cp ./common/lib/modules/fglrx/build_mod/2.6.x/fglrx.ko $t
+ cp ./common/lib/modules/fglrx/build_mod/2.6.x/fglrx.ko $t
+ fi
# should this be installed at all?
# its used by the example fglrx_gamma only
@@ -181,10 +188,46 @@ GCC_MAJOR="`gcc --version | grep -o -e ") ." | head -1 | cut -d " " -f 2`"
# make xorg use the ati version
ln -s $out/lib/xorg/modules/extensions/{fglrx/fglrx-libglx.so,libglx.so}
+ # Correct some paths that are hardcoded into binary libs.
+ if [ "$arch" == "x86_64" ]; then
+ for lib in \
+ lib/xorg/modules/extensions/fglrx/fglrx-libglx.so \
+ lib/xorg/modules/glesx.so \
+ lib/dri/fglrx_dri.so \
+ lib/fglrx_dri.so \
+ lib/fglrx-libGL.so.1.2
+ do
+ oldPaths="/usr/X11R6/lib/modules/dri"
+ newPaths="/run/opengl-driver/lib/dri"
+ sed -i -e "s|$oldPaths|$newPaths|" $out/$lib
+ done
+ else
+ oldPaths="/usr/X11R6/lib32/modules/dri\x00/usr/lib32/dri"
+ newPaths="/run/opengl-driver-32/lib/dri\x00/dev/null/dri"
+ sed -i -e "s|$oldPaths|$newPaths|" \
+ $out/lib/xorg/modules/extensions/fglrx/fglrx-libglx.so
+
+ for lib in \
+ lib/dri/fglrx_dri.so \
+ lib/fglrx_dri.so \
+ lib/xorg/modules/glesx.so
+ do
+ oldPaths="/usr/X11R6/lib32/modules/dri/"
+ newPaths="/run/opengl-driver-32/lib/dri"
+ sed -i -e "s|$oldPaths|$newPaths|" $out/$lib
+ done
+
+ oldPaths="/usr/X11R6/lib32/modules/dri\x00"
+ newPaths="/run/opengl-driver-32/lib/dri"
+ sed -i -e "s|$oldPaths|$newPaths|" $out/lib/fglrx-libGL.so.1.2
+ fi
+
# libstdc++ and gcc are needed by some libs
patchelf --set-rpath $gcc/$lib_arch $out/lib/libatiadlxx.so
}
+if test -z "$libsOnly"; then
+
{ # build samples
mkdir -p $out/bin
@@ -229,6 +272,8 @@ GCC_MAJOR="`gcc --version | grep -o -e ") ." | head -1 | cut -d " " -f 2`"
}
+fi
+
for p in $extraDRIlibs; do
for lib in $p/lib/*.so*; do
ln -s $lib $out/lib/
diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix
index 0aa67dba237..45452c1ea6d 100644
--- a/pkgs/os-specific/linux/ati-drivers/default.nix
+++ b/pkgs/os-specific/linux/ati-drivers/default.nix
@@ -1,10 +1,16 @@
-{ stdenv, fetchurl, kernel, xlibs, which, imake
+{ stdenv, fetchurl, kernel ? null, xlibs, which, imake
, mesa # for fgl_glxgears
, libXxf86vm, xf86vidmodeproto # for fglrx_gamma
, xorg, makeWrapper, glibc, patchelf
, unzip
+, # Whether to build the libraries only (i.e. not the kernel module or
+ # driver utils). Used to support 32-bit binaries on 64-bit
+ # Linux.
+ libsOnly ? false
}:
+assert (!libsOnly) -> kernel != null;
+
# If you want to use a different Xorg version probably
# DIR_DEPENDING_ON_XORG_VERSION in builder.sh has to be adopted (?)
# make sure libglx.so of ati is used. xorg.xorgserver does provide it as well
@@ -21,12 +27,10 @@
# There is one issue left:
# /usr/lib/dri/fglrx_dri.so must point to /run/opengl-driver/lib/fglrx_dri.so
-# You eventually have to blacklist radeon module (?)
-
-assert stdenv.system == "x86_64-linux";
+with stdenv.lib;
stdenv.mkDerivation {
- name = "ati-drivers-13.12-${kernel.version}";
+ name = "ati-drivers-14.4" + (optionalString (!libsOnly) "-${kernel.version}");
builder = ./builder.sh;
@@ -34,8 +38,8 @@ stdenv.mkDerivation {
gcc = stdenv.gcc.gcc;
src = fetchurl {
- url = http://www2.ati.com/drivers/linux/amd-catalyst-13.12-linux-x86.x86_64.zip;
- sha256 = "1c3fn328340by4qn99dgfj8c2q34fxdb2alcak0vnyc6bw7l5sms";
+ url = http://www2.ati.com/drivers/linux/amd-catalyst-14-4-rev2-linux-x86-x86-64-may6.zip;
+ sha256 = "1xbhn55yifis9b0lzb3s03hc1bcq8jmy7l96m4x8d842n7ji7qlk";
curlOpts = "--referer http://support.amd.com/en-us/download/desktop?os=Linux%20x86_64";
};
@@ -51,7 +55,9 @@ stdenv.mkDerivation {
mesa
];
- kernel = kernel.dev;
+ inherit libsOnly;
+
+ kernel = if libsOnly then null else kernel.dev;
inherit glibc /* glibc only used for setting interpreter */;
@@ -75,15 +81,7 @@ stdenv.mkDerivation {
homepage = http://support.amd.com/us/gpudownload/Pages/index.aspx;
license = licenses.unfree;
maintainers = with maintainers; [marcweber offline];
- platforms = [ "x86_64-linux" ];
+ platforms = platforms.linux;
hydraPlatforms = [];
};
-
- # moved assertions here because the name is evaluated when the NixOS manual is generated
- # Don't make that fail - fail lazily when a users tries to build this derivation only
- dummy =
- # assert xorg.xorgserver.name == "xorg-server-1.7.5";
- assert stdenv.system == "x86_64-linux"; # i686-linux should work as well - however I didn't test it.
- null;
-
}
diff --git a/pkgs/os-specific/linux/ati-drivers/gentoo-patches.patch b/pkgs/os-specific/linux/ati-drivers/gentoo-patches.patch
index 392c2a8c29e..fd1d12cccb6 100644
--- a/pkgs/os-specific/linux/ati-drivers/gentoo-patches.patch
+++ b/pkgs/os-specific/linux/ati-drivers/gentoo-patches.patch
@@ -31,21 +31,3 @@ index d3ad3ce..9362b58 100755
+# endif
#endif
}
-
-
-diff -urN a/common/lib/modules/fglrx/build_mod/kcl_acpi.c common/lib/modules/fglrx/build_mod/kcl_acpi.c
---- a/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2013-12-27 13:32:34.734832283 +0100
-+++ b/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2013-12-27 13:33:31.849831765 +0100
-@@ -1002,7 +1002,11 @@
- #endif
- {
- return KCL_ACPI_ERROR;
-- }
-+ }
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,1)
-+ ((acpi_tbl_table_handler)handler)(hdr);
-+#else
- ((acpi_table_handler)handler)(hdr);
-+#endif
- return KCL_ACPI_OK;
- }
diff --git a/pkgs/os-specific/linux/atop/default.nix b/pkgs/os-specific/linux/atop/default.nix
index fd4b6df9552..17adcabf223 100644
--- a/pkgs/os-specific/linux/atop/default.nix
+++ b/pkgs/os-specific/linux/atop/default.nix
@@ -1,12 +1,12 @@
{stdenv, fetchurl, zlib, ncurses}:
stdenv.mkDerivation rec {
- version = "2.0.2";
+ version = "2.1-1";
name = "atop-${version}";
src = fetchurl {
url = "http://www.atoptool.nl/download/atop-${version}.tar.gz";
- sha256 = "029lfa2capz1lg3m3rnyrgb8v6jm4znin84vjh2f0zkwvvhdn856";
+ sha256 = "17wqqyym4d02cqmn1l1asah3sld939nlkc84g4ad939kpkzd98ir";
};
buildInputs = [zlib ncurses];
@@ -27,6 +27,10 @@ stdenv.mkDerivation rec {
sed -e '/chkconfig/d' -i Makefile
'';
+ preInstall = ''
+ mkdir -p "$out"/{bin,sbin}
+ '';
+
meta = {
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [raskin];
@@ -37,6 +41,5 @@ stdenv.mkDerivation rec {
'';
inherit version;
downloadPage = http://atoptool.nl/downloadatop.php;
- updateWalker = true;
};
}
diff --git a/pkgs/os-specific/linux/atop/default.upstream b/pkgs/os-specific/linux/atop/default.upstream
new file mode 100644
index 00000000000..46099d9c959
--- /dev/null
+++ b/pkgs/os-specific/linux/atop/default.upstream
@@ -0,0 +1,4 @@
+url http://atoptool.nl/downloadatop.php
+version_link '[.]tar[.]'
+version '[^0-9]*[-.]([0-9]([-0-9.]*[0-9])?)[.].*' '\1'
+minimize_overwrite
diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix
index 9de84e228c4..42aff7fa126 100644
--- a/pkgs/os-specific/linux/audit/default.nix
+++ b/pkgs/os-specific/linux/audit/default.nix
@@ -5,11 +5,11 @@
assert enablePython -> python != null;
stdenv.mkDerivation rec {
- name = "audit-2.3.2";
+ name = "audit-2.4";
src = fetchurl {
url = "http://people.redhat.com/sgrubb/audit/${name}.tar.gz";
- sha256 = "0a8x10wz0xfj0iq1wgjl6hdhxvq58cb3906vc687i21876sy0wl8";
+ sha256 = "16z9iyi7yzkbyczrkmk9g0i3mlivr7l4p0hgyrz4f04xmzkkjpbf";
};
buildInputs = [ openldap ]
@@ -24,5 +24,6 @@ stdenv.mkDerivation rec {
homepage = "http://people.redhat.com/sgrubb/audit/";
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
+ maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
};
}
diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix
index fee955bcca2..f7b2a984e40 100644
--- a/pkgs/os-specific/linux/batman-adv/default.nix
+++ b/pkgs/os-specific/linux/batman-adv/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, kernel }:
-let base = "batman-adv-2013.4.0"; in
+let base = "batman-adv-2014.3.0"; in
stdenv.mkDerivation rec {
name = "${base}-${kernel.version}";
src = fetchurl {
url = "http://downloads.open-mesh.org/batman/releases/${base}/${base}.tar.gz";
- sha1 = "870a85df5410b3b5623be69e75297e642c91a7d4";
+ sha1 = "wh3if8v4wfwskvzwqsjsyr929krzfmsx";
};
preBuild = ''
diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix
index 2a87611a680..dc83ecae6e2 100644
--- a/pkgs/os-specific/linux/bluez/bluez5.nix
+++ b/pkgs/os-specific/linux/bluez/bluez5.nix
@@ -5,11 +5,11 @@
assert stdenv.isLinux;
stdenv.mkDerivation rec {
- name = "bluez-5.22";
+ name = "bluez-5.23";
src = fetchurl {
url = "mirror://kernel/linux/bluetooth/${name}.tar.xz";
- sha256 = "10h8p89jnhxhjw4x53j4r53i999qjaz82l5591q6q48qb98ndf78";
+ sha256 = "1hgj6ymha75r79fvlh2h27j7gci0q7apczfffwm3kpf8ga6x7ayd";
};
pythonPath = with pythonPackages;
diff --git a/pkgs/os-specific/linux/consoletools/default.nix b/pkgs/os-specific/linux/consoletools/default.nix
index f8be37edfe2..83c694972e6 100644
--- a/pkgs/os-specific/linux/consoletools/default.nix
+++ b/pkgs/os-specific/linux/consoletools/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "linuxconsoletools-${version}";
- version = "1.4.6";
+ version = "1.4.7";
src = fetchurl {
url = "mirror://sourceforge/linuxconsole/${name}.tar.bz2";
- sha256 = "0035yhjbjdis5wqmbdz67xq61065x7vrx5mb7kb1rhrx3ag43wcf";
+ sha256 = "1wgcmmjiqw3hh36jzvhgq07kq13ar2miafz02xshds2b0kdcz4s4";
};
buildInputs = [ SDL ];
diff --git a/pkgs/os-specific/linux/conspy/default.nix b/pkgs/os-specific/linux/conspy/default.nix
index d252d9ce162..78d403a3afc 100644
--- a/pkgs/os-specific/linux/conspy/default.nix
+++ b/pkgs/os-specific/linux/conspy/default.nix
@@ -3,11 +3,11 @@ let
s = # Generated upstream information
rec {
baseName="conspy";
- version="1.9";
+ version="1.10";
name="${baseName}-${version}";
- hash="1ndwdx8x5lnjl6cddy1d8g8m7ndxyj3wrs100w2bp9gnvbxbb8vv";
- url="http://ace-host.stuart.id.au/russell/files/conspy/conspy-1.9.tar.gz";
- sha256="1ndwdx8x5lnjl6cddy1d8g8m7ndxyj3wrs100w2bp9gnvbxbb8vv";
+ hash="1vnph4xa1qp4sr52jc9zldmbdpkr6z5j7hk2vgyhfn7m1vc5g0qw";
+ url="mirror://sourceforge/project/conspy/conspy-1.10-1/conspy-1.10.tar.gz";
+ sha256="1vnph4xa1qp4sr52jc9zldmbdpkr6z5j7hk2vgyhfn7m1vc5g0qw";
};
buildInputs = [
autoconf automake ncurses
diff --git a/pkgs/os-specific/linux/conspy/default.upstream b/pkgs/os-specific/linux/conspy/default.upstream
index db0c0fd9680..3eeacf34694 100644
--- a/pkgs/os-specific/linux/conspy/default.upstream
+++ b/pkgs/os-specific/linux/conspy/default.upstream
@@ -1 +1,5 @@
-url http://ace-host.stuart.id.au/russell/files/conspy/
+url http://sourceforge.net/projects/conspy/files/
+version_link 'conspy-[-0-9.]+/$'
+version_link '[-0-9.]+[.]tar[.][a-z0-9]+/download$'
+SF_redirect
+version '.*-([-0-9.]+)[.]tar[.].*' '\1'
diff --git a/pkgs/os-specific/linux/dmraid/default.nix b/pkgs/os-specific/linux/dmraid/default.nix
index 35efa8533ab..9e7e2a6bb8e 100644
--- a/pkgs/os-specific/linux/dmraid/default.nix
+++ b/pkgs/os-specific/linux/dmraid/default.nix
@@ -1,13 +1,17 @@
{ stdenv, fetchurl, devicemapper }:
stdenv.mkDerivation rec {
- name = "dmraid-1.0.0.rc15";
+ name = "dmraid-1.0.0.rc16";
src = fetchurl {
url = "http://people.redhat.com/~heinzm/sw/dmraid/src/old/${name}.tar.bz2";
- sha256 = "01bcaq0sc329ghgj7f182xws7jgjpdc41bvris8fsiprnxc7511h";
+ sha256 = "0m92971gyqp61darxbiri6a48jz3wq3gkp8r2k39320z0i6w8jgq";
};
+ postPatch = ''
+ sed -i 's/\[\[[^]]*\]\]/[ "''$''${n##*.}" = "so" ]/' */lib/Makefile.in
+ '';
+
preConfigure = "cd */";
buildInputs = [ devicemapper ];
diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix
index c1fa2c26205..ec9b3537fad 100644
--- a/pkgs/os-specific/linux/firejail/default.nix
+++ b/pkgs/os-specific/linux/firejail/default.nix
@@ -3,11 +3,11 @@ let
s = # Generated upstream information
rec {
baseName="firejail";
- version="0.9.8.1";
+ version="0.9.14";
name="${baseName}-${version}";
- hash="0wjanz42k301zdwv06ylnzqrabxy424j0k9dh4i4aqhvihvxr83x";
- url="mirror://sourceforge/project/firejail/firejail/firejail-0.9.8.1.tar.bz2";
- sha256="0wjanz42k301zdwv06ylnzqrabxy424j0k9dh4i4aqhvihvxr83x";
+ hash="0mwlvxl4fcfqvw7scldh4wz0i3b22cf5a2aglaxc9i1c3jld3w9l";
+ url="http://softlayer-ams.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.14-rc1.tar.bz2";
+ sha256="0mwlvxl4fcfqvw7scldh4wz0i3b22cf5a2aglaxc9i1c3jld3w9l";
};
buildInputs = [
];
diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix
index d6513f7ebb5..036ece4627b 100644
--- a/pkgs/os-specific/linux/fuse/default.nix
+++ b/pkgs/os-specific/linux/fuse/default.nix
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
homepage = http://fuse.sourceforge.net/;
description = "Kernel module and library that allows filesystems to be implemented in user space";
platforms = platforms.linux;
- maintainers = maintainers.mornfall;
+ maintainers = [ maintainers.mornfall ];
};
}
diff --git a/pkgs/os-specific/linux/gradm/default.nix b/pkgs/os-specific/linux/gradm/default.nix
index 87e8fa5b074..404d785146c 100644
--- a/pkgs/os-specific/linux/gradm/default.nix
+++ b/pkgs/os-specific/linux/gradm/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "gradm-${version}";
- version = "3.0-201405281853";
+ version = "3.0-201408301734";
src = fetchurl {
url = "http://grsecurity.net/stable/${name}.tar.gz";
- sha256 = "0yjmbjhm71cik5j8h2prgk40wki3sflwbf2zqmc4pwaqlvis9s2f";
+ sha256 = "171i1jyw82dnv2fi4dnh40dw1wa5hrllnpjf181cafnzxjpyb45i";
};
buildInputs = [ gcc coreutils findutils binutils pam flex bison bash ];
diff --git a/pkgs/os-specific/linux/hdparm/default.nix b/pkgs/os-specific/linux/hdparm/default.nix
index bc83738acc8..a0cd09fbf35 100644
--- a/pkgs/os-specific/linux/hdparm/default.nix
+++ b/pkgs/os-specific/linux/hdparm/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "hdparm-9.43";
+ name = "hdparm-9.45";
src = fetchurl {
url = "mirror://sourceforge/hdparm/${name}.tar.gz";
- sha256 = "0amm2s67vzfgs0jv59jgj9pqkr6j9glj1chsj292263i94kr5gib";
+ sha256 = "0sc6yf3k6sd7n6a2ig2my9fjlqpak3znlyw7jw4cz5d9asm1rc13";
};
preBuild = ''
@@ -16,5 +16,7 @@ stdenv.mkDerivation rec {
description = "A tool to get/set ATA/SATA drive parameters under Linux";
homepage = http://sourceforge.net/projects/hdparm/;
platforms = stdenv.lib.platforms.linux;
+ license = stdenv.lib.licenses.bsd2;
+ maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
};
}
diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix
index 2cfbc2a1df1..cf602a46f81 100644
--- a/pkgs/os-specific/linux/iproute/default.nix
+++ b/pkgs/os-specific/linux/iproute/default.nix
@@ -1,14 +1,17 @@
{ fetchurl, stdenv, flex, bison, db, iptables, pkgconfig }:
stdenv.mkDerivation rec {
- name = "iproute2-3.12.0";
+ name = "iproute2-3.16.0";
src = fetchurl {
url = "mirror://kernel/linux/utils/net/iproute2/${name}.tar.xz";
- sha256 = "04gi11gh087bg2nlxhj0lxrk8l9qxkpr88nsiil23917bm3h1xj4";
+ sha256 = "0ybv29m88lccpfrh2dgiqash4c3gfvwwpx9kakvnc8c71rn8l2hz";
};
- patch = [ "vpnc.patch" ];
+ patch = [
+ ./vpnc.patch
+ ./device-checking.patch # Remove after 3.16.0
+ ];
preConfigure =
''
diff --git a/pkgs/os-specific/linux/iproute/device-checking.patch b/pkgs/os-specific/linux/iproute/device-checking.patch
new file mode 100644
index 00000000000..a55423be38c
--- /dev/null
+++ b/pkgs/os-specific/linux/iproute/device-checking.patch
@@ -0,0 +1,32 @@
+From f1b66ff83a0babbe99fef81b3a960d7a4ce8dbc6 Mon Sep 17 00:00:00 2001
+From: vadimk
+Date: Sat, 30 Aug 2014 15:06:00 +0300
+Subject: ip link: Remove unnecessary device checking
+
+The real checking is performed later in iplink_modify(..) func which
+checks device existence if NLM_F_CREATE flag is set.
+
+Also it fixes the case when impossible to add veth link which was
+caused by 9a02651a87 (ip: check for missing dev arg when doing VF rate)
+because these devices are not exist yet.
+
+Signed-off-by: Vadim Kochan
+Acked-by: Oliver Hartkopp
+Signed-off-by: Stephen Hemminger
+
+diff --git a/ip/iplink.c b/ip/iplink.c
+index 1a907d9..ea06871 100644
+--- a/ip/iplink.c
++++ b/ip/iplink.c
+@@ -593,8 +593,6 @@ int iplink_parse(int argc, char **argv, struct iplink_req *req,
+ duparg2("dev", *argv);
+ *dev = *argv;
+ dev_index = ll_name_to_index(*dev);
+- if (dev_index == 0)
+- invarg("Unknown device", *argv);
+ }
+ argc--; argv++;
+ }
+--
+cgit v0.10.1
+
diff --git a/pkgs/os-specific/linux/iw/default.nix b/pkgs/os-specific/linux/iw/default.nix
index ab01231f334..a3b2f23c8c7 100644
--- a/pkgs/os-specific/linux/iw/default.nix
+++ b/pkgs/os-specific/linux/iw/default.nix
@@ -1,11 +1,11 @@
{stdenv, fetchurl, libnl, pkgconfig}:
stdenv.mkDerivation rec {
- name = "iw-3.14";
+ name = "iw-3.15";
src = fetchurl {
url = "https://www.kernel.org/pub/software/network/iw/${name}.tar.xz";
- sha256 = "16fr13cl02702d9yjqlgvnxvpv0w0mqn0acba39iwn2lln5b4747";
+ sha256 = "12jby9nv5nypadgdksbqw0y2kfm3j47zw7a3rwmy56d7rs90lp5x";
};
buildInputs = [ libnl pkgconfig ];
diff --git a/pkgs/os-specific/linux/kernel/3.17-buildfix.patch b/pkgs/os-specific/linux/kernel/3.17-buildfix.patch
new file mode 100644
index 00000000000..234f0ac749f
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/3.17-buildfix.patch
@@ -0,0 +1,62 @@
+From Shea Levy <>
+Subject [PATCH 1/1] usb: gadget: Remove use of PWD in Makefiles
+Date Thu, 28 Aug 2014 01:30:46 -0400
+
+Using PWD breaks out-of-tree builds in certain circumstances [1], and
+other kernel Makefiles use relative paths just fine.
+
+[1]: https://bugzilla.kernel.org/show_bug.cgi?id=83251
+
+Signed-off-by: Shea Levy
+---
+ drivers/usb/gadget/Makefile | 2 +-
+ drivers/usb/gadget/function/Makefile | 4 ++--
+ drivers/usb/gadget/legacy/Makefile | 6 +++---
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile
+index a186afe..9add915 100644
+--- a/drivers/usb/gadget/Makefile
++++ b/drivers/usb/gadget/Makefile
+@@ -3,7 +3,7 @@
+ #
+ subdir-ccflags-$(CONFIG_USB_GADGET_DEBUG) := -DDEBUG
+ subdir-ccflags-$(CONFIG_USB_GADGET_VERBOSE) += -DVERBOSE_DEBUG
+-ccflags-y += -I$(PWD)/drivers/usb/gadget/udc
++ccflags-y += -Idrivers/usb/gadget/udc
+
+ obj-$(CONFIG_USB_LIBCOMPOSITE) += libcomposite.o
+ libcomposite-y := usbstring.o config.o epautoconf.o
+diff --git a/drivers/usb/gadget/function/Makefile b/drivers/usb/gadget/function/Makefile
+index 6d91f21..83ae106 100644
+--- a/drivers/usb/gadget/function/Makefile
++++ b/drivers/usb/gadget/function/Makefile
+@@ -2,8 +2,8 @@
+ # USB peripheral controller drivers
+ #
+
+-ccflags-y := -I$(PWD)/drivers/usb/gadget/
+-ccflags-y += -I$(PWD)/drivers/usb/gadget/udc/
++ccflags-y := -Idrivers/usb/gadget/
++ccflags-y += -Idrivers/usb/gadget/udc/
+
+ # USB Functions
+ usb_f_acm-y := f_acm.o
+diff --git a/drivers/usb/gadget/legacy/Makefile b/drivers/usb/gadget/legacy/Makefile
+index a11aad5..edba2d1 100644
+--- a/drivers/usb/gadget/legacy/Makefile
++++ b/drivers/usb/gadget/legacy/Makefile
+@@ -2,9 +2,9 @@
+ # USB gadget drivers
+ #
+
+-ccflags-y := -I$(PWD)/drivers/usb/gadget/
+-ccflags-y += -I$(PWD)/drivers/usb/gadget/udc/
+-ccflags-y += -I$(PWD)/drivers/usb/gadget/function/
++ccflags-y := -Idrivers/usb/gadget/
++ccflags-y += -Idrivers/usb/gadget/udc/
++ccflags-y += -Idrivers/usb/gadget/function/
+
+ g_zero-y := zero.o
+ g_audio-y := audio.o
+--
+2.1.0
\ No newline at end of file
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 7a6ba94eb9f..d5c754eebc7 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -337,6 +337,8 @@ with stdenv.lib;
ZSMALLOC y
''}
ZRAM m
+
+ ${optionalString (versionAtLeast version "3.17") "NFC? n"}
${kernelPlatform.kernelExtraConfig or ""}
${extraConfig}
diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix
index 8fa684e407c..a7913fea091 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, ... } @ args:
import ./generic.nix (args // rec {
- version = "3.10.53";
+ version = "3.10.56";
extraMeta.branch = "3.10";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
- sha256 = "1sxa6ppgpy9fgj4lyj8d53y309v6r5nmifbrcf5pqs6l944frhq6";
+ sha256 = "02q0rda1dsapfi2d3nz398fhlk0gvr2q6mj6jcck2izcxzqhsz9a";
};
features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix
index 291e43a98e5..b0da31ff074 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.12.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, ... } @ args:
import ./generic.nix (args // rec {
- version = "3.12.26";
+ version = "3.12.29";
extraMeta.branch = "3.12";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
- sha256 = "1gp6brk2ix30g8dznd5yv1fq7yx82295va6cn7lwv6jj9w287s6c";
+ sha256 = "1ckzd9s64iahlnv7wh687m827f94q8hw0s4h8s69ijhay6igqqzm";
};
features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix
index 74d83345ec1..b3d7fb1e7f3 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, ... } @ args:
import ./generic.nix (args // rec {
- version = "3.14.17";
+ version = "3.14.20";
extraMeta.branch = "3.14";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
- sha256 = "1dl9skwd1xvkdm9gblidcawkck6x5slb41gbx0i8jxby2k6w6i5n";
+ sha256 = "090i8drjwhxawn7jfg9mrmvqik13j58v0hb272b457k48qyc070y";
};
features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.16.nix b/pkgs/os-specific/linux/kernel/linux-3.16.nix
index be2e68ab81e..06079716a81 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.16.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.16.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, ... } @ args:
import ./generic.nix (args // rec {
- version = "3.16.1";
+ version = "3.16.4";
extraMeta.branch = "3.16";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
- sha256 = "0wbxqlmk7w9047ir51dsz6vi7ww0hpycgrb43mk2a189xaldsdxy";
+ sha256 = "0x8jh9j7kdfbxcf3f69p28j5dwjjdxf92sjnlhk3mp016yv02i99";
};
features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.17.nix b/pkgs/os-specific/linux/kernel/linux-3.17.nix
new file mode 100644
index 00000000000..736973d3c4d
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-3.17.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, ... } @ args:
+
+import ./generic.nix (args // rec {
+ version = "3.17";
+ modDirVersion = "3.17.0";
+ extraMeta.branch = "3.17";
+
+ src = fetchurl {
+ url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
+ sha256 = "0lb2yyh3j932789jq4gxx9xshgy6rfdnl3lm8yr43kaz7k4kw5gm";
+ };
+
+ features.iwlwifi = true;
+ features.efiBootStub = true;
+ features.needsCifsUtils = true;
+ features.canDisableNetfilterConntrackHelpers = true;
+ features.netfilterRPFilter = true;
+} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index f44f3d32792..ebbdd79ba16 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,16 +1,17 @@
{ stdenv, fetchurl, ... } @ args:
import ./generic.nix (args // rec {
- # Reason to add: RTL8192EE
- version = "3.16-rc3";
- modDirVersion = "3.16.0-rc3";
- extraMeta.branch = "3.16";
+ version = "3.17-rc2";
+ modDirVersion = "3.17.0-rc2";
+ extraMeta.branch = "3.17";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/testing/linux-${version}.tar.xz";
- sha256 = "17jgv1hnx2im68f8721x11yfg8mpas7lsxg0j00qxv2fc6km2glm";
+ sha256 = "094r4kqp7bj1wcdfsgdmv73law4zb7d0sd8lw82v3rz944mlm9y3";
};
+ kernelPatches = args.kernelPatches ++ [ { name = "3.17-buildfix.patch"; patch = ./3.17-buildfix.patch; } ];
+
features.iwlwifi = true;
features.efiBootStub = true;
features.needsCifsUtils = true;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index cfe006fbe4b..52d003a2970 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -60,17 +60,17 @@ rec {
};
grsecurity_stable = grsecPatch
- { kversion = "3.14.10";
- revision = "201407012152";
+ { kversion = "3.14.19";
+ revision = "201409282024";
branch = "stable";
- sha256 = "1119044lzkr9wpr1gpl1g0bz67c2xpdd9bkddllij7ja24jv8sx1";
+ sha256 = "05xjfllw6kx6y2cs0pwvlp5cpspqb7nf7kgfzk2z5gd04vc8ywqm";
};
grsecurity_unstable = grsecPatch
- { kversion = "3.15.3";
- revision = "201407012153";
+ { kversion = "3.16.3";
+ revision = "201409282025";
branch = "test";
- sha256 = "0bccayakprc77530crxfr9v2hbs6hlcf290pj1ywlh1p861ljgbm";
+ sha256 = "14vzg513xkqa71hp9drs2z9smamhxh87fxxyfjdbi3k93cbvkk22";
};
grsec_fix_path =
diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix
index df44cb68d8b..b948dbff2c1 100644
--- a/pkgs/os-specific/linux/klibc/default.nix
+++ b/pkgs/os-specific/linux/klibc/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, kernelHeaders, kernel, perl }:
let
- version = "2.0.3";
+ version = "2.0.4";
commonMakeFlags = [
"prefix=$(out)"
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "mirror://kernel/linux/libs/klibc/2.0/klibc-${version}.tar.xz";
- sha256 = "02035f2b230020de569d40605485121e0fe481ed33a93bdb8bf8c6ee2695fffa";
+ sha256 = "7f9a0850586def7cf4faeeb75e5d0f66e613674c524f6e77b0f4d93a26c801cb";
};
patches = [ ./no-reinstall-kernel-headers.patch ];
diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix
index 380b4a35f1c..9ee13135d63 100644
--- a/pkgs/os-specific/linux/kmod/default.nix
+++ b/pkgs/os-specific/linux/kmod/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, xz, zlib, pkgconfig, libxslt }:
stdenv.mkDerivation rec {
- name = "kmod-17";
+ name = "kmod-18";
src = fetchurl {
url = "mirror://kernel/linux/utils/kernel/kmod/${name}.tar.xz";
- sha256 = "1yid3a9b64a60ybj66fk2ysrq5klnl0ijl4g624cl16y8404g9rv";
+ sha256 = "e16e57272b54acb219c465b334715cfdddb5d97ff5d8948d4830ca1a372a868e";
};
# Disable xz/zlib support to prevent needing them in the initrd.
diff --git a/pkgs/os-specific/linux/libaio/default.nix b/pkgs/os-specific/linux/libaio/default.nix
index bf30530e9ad..b3df129912e 100644
--- a/pkgs/os-specific/linux/libaio/default.nix
+++ b/pkgs/os-specific/linux/libaio/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchgit }:
+{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "libaio-0.3.109";
+ version = "0.3.110";
+ name = "libaio-${version}";
- src = fetchgit {
- url = https://git.fedorahosted.org/git/libaio.git;
- rev = "refs/tags/${name}";
- sha256 = "1wbziq0hqvnbckpxrz1cgr8dlw3mifs4xpy3qhnagbrrsmrq2rhi";
+ src = fetchurl {
+ url = "https://fedorahosted.org/releases/l/i/libaio/${name}.tar.gz";
+ sha256 = "0zjzfkwd1kdvq6zpawhzisv7qbq1ffs343i5fs9p498pcf7046g0";
};
makeFlags = "prefix=$(out)";
@@ -15,5 +15,7 @@ stdenv.mkDerivation rec {
description = "Library for asynchronous I/O in Linux";
homepage = http://lse.sourceforge.net/io/aio.html;
platforms = stdenv.lib.platforms.linux;
+ license = stdenv.lib.licenses.lgpl21;
+ maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
};
}
diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix
index 8e20bf1e3d3..4794cd8f96c 100644
--- a/pkgs/os-specific/linux/lttng-modules/default.nix
+++ b/pkgs/os-specific/linux/lttng-modules/default.nix
@@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
# TODO license = with licenses; [ lgpl21 gpl2 mit ];
platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];
+ broken = true;
};
}
diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix
index 9e2b0c90079..dbce7602301 100644
--- a/pkgs/os-specific/linux/lvm2/default.nix
+++ b/pkgs/os-specific/linux/lvm2/default.nix
@@ -1,19 +1,21 @@
-{ stdenv, fetchurl, pkgconfig, udev, utillinux, coreutils }:
+{ stdenv, fetchurl, pkgconfig, udev, utillinux, coreutils, enable_dmeventd ? false }:
let
- v = "2.02.106";
+ version = "2.02.111";
in
stdenv.mkDerivation {
- name = "lvm2-${v}";
+ name = "lvm2-${version}";
src = fetchurl {
- url = "ftp://sources.redhat.com/pub/lvm2/releases/LVM2.${v}.tgz";
- sha256 = "0nr833bl0q4zq52drjxmmpf7bs6kqxwa5kahwwxm9411khkxz0vc";
+ url = "ftp://sources.redhat.com/pub/lvm2/releases/LVM2.${version}.tgz";
+ sha256 = "096xjcay4l2ph2dlyknic11pmz65jfgjs34fblqi9xh7zrr3x3vd";
};
configureFlags =
- "--disable-readline --enable-udev_rules --enable-udev_sync --enable-pkgconfig --enable-applib";
+ "--disable-readline --enable-udev_rules --enable-udev_sync --enable-pkgconfig --enable-applib --enable-cmdlib"
+ + (stdenv.lib.optionalString enable_dmeventd " --enable-dmeventd")
+ ;
buildInputs = [ pkgconfig udev ];
@@ -54,5 +56,8 @@ stdenv.mkDerivation {
homepage = http://sourceware.org/lvm2/;
descriptions = "Tools to support Logical Volume Management (LVM) on Linux";
platforms = stdenv.lib.platforms.linux;
+ maintainers = with stdenv.lib.maintainers; [raskin];
+ inherit version;
+ downloadPage = "ftp://sources.redhat.com/pub/lvm2/";
};
}
diff --git a/pkgs/os-specific/linux/lvm2/default.upstream b/pkgs/os-specific/linux/lvm2/default.upstream
new file mode 100644
index 00000000000..1e5aaf5ab5c
--- /dev/null
+++ b/pkgs/os-specific/linux/lvm2/default.upstream
@@ -0,0 +1,4 @@
+url ftp://sources.redhat.com/pub/lvm2/
+version_link '[.]tgz$'
+version '.*[^0-9.][^.]*[.]([0-9.]+)[.].*' '\1'
+do_overwrite () { do_overwrite_just_version; }
diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix
index bb85acf4dcb..9c4905bd529 100644
--- a/pkgs/os-specific/linux/nfs-utils/default.nix
+++ b/pkgs/os-specific/linux/nfs-utils/default.nix
@@ -1,5 +1,6 @@
{ fetchurl, stdenv, tcp_wrappers, utillinux, libcap, libtirpc, libevent, libnfsidmap
-, lvm2, e2fsprogs }:
+, lvm2, e2fsprogs, python
+}:
stdenv.mkDerivation rec {
name = "nfs-utils-1.2.5";
@@ -11,7 +12,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ tcp_wrappers utillinux libcap libtirpc libevent libnfsidmap
- lvm2 e2fsprogs
+ lvm2 e2fsprogs python
];
# FIXME: Add the dependencies needed for NFSv4 and TI-RPC.
diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix
new file mode 100644
index 00000000000..2e25c0383b7
--- /dev/null
+++ b/pkgs/os-specific/linux/openvswitch/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, fetchurl, openssl, python27, iproute, perl, kernel ? null}:
+let
+
+ version = "2.1.2";
+
+ skipKernelMod = kernel == null;
+
+in
+stdenv.mkDerivation {
+ version = "2.1.2";
+ name = "openvswitch-${version}";
+ src = fetchurl {
+ url = "http://openvswitch.org/releases/openvswitch-2.1.2.tar.gz";
+ sha256 = "16q7faqrj2pfchhn0x5s9ggi5ckcg9n62f6bnqaih064aaq2jm47";
+ };
+ kernel = if skipKernelMod then null else kernel.dev;
+ buildInputs = [
+ openssl
+ python27
+ perl
+ ];
+ configureFlags = [
+ "--localstatedir=/var"
+ "--sharedstatedir=/var"
+ "--sbindir=$(out)/bin"
+ ] ++ (if skipKernelMod then [] else ["--with-linux"]);
+ # Leave /var out of this!
+ installFlags = [
+ "LOGDIR=$(TMPDIR)/dummy"
+ "RUNDIR=$(TMPDIR)/dummy"
+ "PKIDIR=$(TMPDIR)/dummy"
+ ];
+ meta = {
+ platforms = stdenv.lib.platforms.linux;
+ description = "A multilayer virtual switch";
+ 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
+ to VMware's vNetwork distributed vswitch or Cisco's Nexus 1000V.
+ '';
+ homepage = "http://openvswitch.org/";
+ licence = "Apache 2.0";
+ };
+}
diff --git a/pkgs/os-specific/linux/pam_krb5/default.nix b/pkgs/os-specific/linux/pam_krb5/default.nix
index ad60e63c263..0c182b5baa6 100644
--- a/pkgs/os-specific/linux/pam_krb5/default.nix
+++ b/pkgs/os-specific/linux/pam_krb5/default.nix
@@ -19,6 +19,6 @@ stdenv.mkDerivation {
pam_krb5 can optionally convert Kerberos 5 credentials to Kerberos IV
credentials and/or use them to set up AFS tokens for a user's session.
'';
- maintainers = stdenv.lib.maintainers.mornfall;
+ maintainers = [ stdenv.lib.maintainers.mornfall ];
};
}
diff --git a/pkgs/os-specific/linux/pam_mount/default.nix b/pkgs/os-specific/linux/pam_mount/default.nix
new file mode 100644
index 00000000000..05438c6945c
--- /dev/null
+++ b/pkgs/os-specific/linux/pam_mount/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, autoconf, automake, pkgconfig, libtool, pam, libHX, utillinux, libxml2, pcre, perl, openssl, cryptsetup }:
+
+stdenv.mkDerivation rec {
+ name = "pam_mount-2.14";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/pam-mount/pam_mount/2.14/${name}.tar.xz";
+ sha256 = "1yfwg8i4n7af8yi3w3pkqzqz75wgjjlg5lslv1r5g1v88nrwnrkg";
+ };
+
+ buildInputs = [ autoconf automake pkgconfig libtool pam libHX utillinux libxml2 pcre perl openssl cryptsetup ];
+
+ preConfigure = "sh autogen.sh --prefix=$out";
+
+ makeFlags = "DESTDIR=$(out)";
+
+ # Probably a hack, but using DESTDIR and PREFIX makes everything work!
+ postInstall = ''
+ cp -r $out/$out/* $out
+ rm -r $out/nix
+ '';
+
+ meta = {
+ homepage = http://pam-mount.sourceforge.net/;
+ description = "PAM module to mount volumes for a user session";
+ maintainers = [ stdenv.lib.maintainers.tstrobel ];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/os-specific/linux/paxctl/default.nix b/pkgs/os-specific/linux/paxctl/default.nix
index 8e70ddd8434..148048f6505 100644
--- a/pkgs/os-specific/linux/paxctl/default.nix
+++ b/pkgs/os-specific/linux/paxctl/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "paxctl-${version}";
- version = "0.8";
+ version = "0.9";
src = fetchurl {
url = "http://pax.grsecurity.net/${name}.tar.gz";
- sha256 = "107gmriq5icsk9yni5q949rnjapjkcs0823pw6zra6h1xml2f0mm";
+ sha256 = "0biw882fp1lmgs6kpxznp1v6758r7dg9x8iv5a06k0b82bcdsc53";
};
preBuild = ''
diff --git a/pkgs/os-specific/linux/s6-linux-utils/default.nix b/pkgs/os-specific/linux/s6-linux-utils/default.nix
new file mode 100644
index 00000000000..0f0967079df
--- /dev/null
+++ b/pkgs/os-specific/linux/s6-linux-utils/default.nix
@@ -0,0 +1,53 @@
+{ stdenv, fetchurl, skalibs }:
+
+let
+
+ version = "1.0.3.1";
+
+in stdenv.mkDerivation rec {
+
+ name = "s6-linux-utils-${version}";
+
+ src = fetchurl {
+ url = "http://www.skarnet.org/software/s6-linux-utils/${name}.tar.gz";
+ sha256 = "1s17g03z5hfpiz32g001g5wyamyvn9l36fr2csk3k7r0jkqfnl0d";
+ };
+
+ buildInputs = [ skalibs ];
+
+ sourceRoot = "admin/${name}";
+
+ configurePhase = ''
+ pushd conf-compile
+
+ printf "$out/bin" > conf-install-command
+ printf "$out/include" > conf-install-include
+ printf "$out/lib" > conf-install-library
+ printf "$out/lib" > conf-install-library.so
+
+ # let nix builder strip things, cross-platform
+ truncate --size 0 conf-stripbins
+ truncate --size 0 conf-striplibs
+
+ printf "${skalibs}/sysdeps" > import
+ printf "%s" "${skalibs}/include" > path-include
+ printf "%s" "${skalibs}/lib" > path-library
+
+ rm -f flag-slashpackage
+ touch flag-allstatic
+
+ popd
+ '';
+
+ preBuild = ''
+ patchShebangs src/sys
+ '';
+
+ meta = {
+ homepage = http://www.skarnet.org/software/s6-linux-utils/;
+ description = "A set of minimalistic Linux-specific system utilities.";
+ platforms = stdenv.lib.platforms.linux;
+ license = stdenv.lib.licenses.isc;
+ };
+
+}
diff --git a/pkgs/os-specific/linux/seturgent/default.nix b/pkgs/os-specific/linux/seturgent/default.nix
new file mode 100644
index 00000000000..ad77a7a1031
--- /dev/null
+++ b/pkgs/os-specific/linux/seturgent/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, libX11, xproto, xdotool, unzip }:
+
+stdenv.mkDerivation {
+ name = "seturgent";
+
+ src = fetchurl {
+ url = "https://github.com/hiltjo/seturgent/archive/ada70dcb15865391e5cdcab27a0739a304a17e03.zip";
+ sha256 = "0q1sr6aljkw2jr9b4xxzbc01qvnd5vk3pxrypif9yd8xjw4wqwri";
+ };
+
+ buildInputs = [
+ libX11 xproto unzip
+ ];
+
+ installPhase = ''
+ mkdir -pv $out/bin
+ mv seturgent $out/bin
+ '';
+
+ meta = {
+ platforms = stdenv.lib.platforms.linux;
+ description = "Set an application's urgency hint (or not)";
+ maintainers = [ stdenv.lib.maintainers.yarr ];
+ homepage = https://github.com/hiltjo/seturgent;
+ license = stdenv.lib.licenses.mit;
+ };
+}
\ No newline at end of file
diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix
index b52801cacff..f928dc8e657 100644
--- a/pkgs/os-specific/linux/shadow/default.nix
+++ b/pkgs/os-specific/linux/shadow/default.nix
@@ -15,11 +15,11 @@ let
in
stdenv.mkDerivation rec {
- name = "shadow-4.1.5.1";
+ name = "shadow-4.2.1";
src = fetchurl {
- url = "http://pkg-shadow.alioth.debian.org/releases/${name}.tar.bz2";
- sha256 = "1yvqx57vzih0jdy3grir8vfbkxp0cl0myql37bnmi2yn90vk6cma";
+ url = "http://pkg-shadow.alioth.debian.org/releases/${name}.tar.xz";
+ sha256 = "0h9x1zdbq0pqmygmc1x459jraiqw4gqz8849v268crk78z8r621v";
};
buildInputs = stdenv.lib.optional (pam != null && stdenv.isLinux) pam;
diff --git a/pkgs/os-specific/linux/smem/default.nix b/pkgs/os-specific/linux/smem/default.nix
new file mode 100644
index 00000000000..a61a54afc38
--- /dev/null
+++ b/pkgs/os-specific/linux/smem/default.nix
@@ -0,0 +1,33 @@
+{ lib, stdenv, fetchurl, python }:
+
+stdenv.mkDerivation rec {
+ name = "smem-1.4";
+
+ src = fetchurl {
+ url = "http://www.selenic.com/smem/download/${name}.tar.gz";
+ sha256 = "1v31vy23s7szl6vdrllq9zbg58bp36jf5xy3fikjfg6gyiwgia9f";
+ };
+
+ buildInputs = [ python ];
+
+ buildPhase =
+ ''
+ gcc -O2 smemcap.c -o smemcap
+ '';
+
+ installPhase =
+ ''
+ mkdir -p $out/bin
+ cp smem smemcap $out/bin/
+
+ mkdir -p $out/share/man/man8
+ cp smem.8 $out/share/man/man8/
+ '';
+
+ meta = {
+ homepage = http://www.selenic.com/smem/;
+ description = "A memory usage reporting tool that takes shared memory into account";
+ platforms = lib.platforms.linux;
+ maintainers = [ lib.maintainers.eelco ];
+ };
+}
diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix
index d5e2ed3ff94..0e62ab86f6d 100644
--- a/pkgs/os-specific/linux/sysdig/default.nix
+++ b/pkgs/os-specific/linux/sysdig/default.nix
@@ -3,14 +3,14 @@ let
inherit (stdenv.lib) optional optionalString;
s = rec {
baseName="sysdig";
- version="0.1.87";
+ version = "0.1.89";
name="${baseName}-${version}";
url="https://github.com/draios/sysdig/archive/${version}.tar.gz";
- sha256="0xfildaj8kzbngpza47zqm363i6q87m97a18qlmdisrxmz11s32b";
+ sha256 = "06g0s38xvsmi8m80719m4h3h4by8q12imlp4k8sixhw06k959mhw";
};
buildInputs = [
cmake zlib luajit
- ] ++ optional (kernel != null) kernel;
+ ];
in
stdenv.mkDerivation {
inherit (s) name version;
@@ -30,6 +30,10 @@ stdenv.mkDerivation {
'';
postInstall = optionalString (kernel != null) ''
make install_driver
+ kernel_dev=${kernel.dev}
+ kernel_dev=''${kernel_dev#/nix/store/}
+ kernel_dev=''${kernel_dev%%-linux*dev*}
+ sed -i "s#$kernel_dev#................................#g" $out/lib/modules/${kernel.modDirVersion}/extra/sysdig-probe.ko
'';
meta = with stdenv.lib; {
diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix
index ec504bd9235..7944f612fb0 100644
--- a/pkgs/os-specific/linux/sysstat/default.nix
+++ b/pkgs/os-specific/linux/sysstat/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, gettext }:
-
+{ stdenv, fetchurl, gettext, bzip2 }:
+
stdenv.mkDerivation rec {
- name = "sysstat-10.1.1";
-
+ name = "sysstat-11.0.1";
+
src = fetchurl {
- url = "http://perso.orange.fr/sebastien.godard/${name}.tar.bz2";
- sha256 = "1ig6k4yjkkazddjr90hykiapl30s9r9c1gy1h8hqzn2c3xgkm7p3";
+ url = "http://perso.orange.fr/sebastien.godard/${name}.tar.xz";
+ sha256 = "1cwgsxvs7jkr3il6r344mw46502yjnhrsbcp4217vh4b7xv6czaq";
};
buildInputs = [ gettext ];
@@ -13,10 +13,17 @@ stdenv.mkDerivation rec {
preConfigure = ''
export PATH_CP=$(type -tp cp)
export PATH_CHKCONFIG=/no-such-program
- makeFlagsArray=(SA_DIR=/var/log/sa SYSCONFIG_DIR=$out/etc CHOWN=true IGNORE_MAN_GROUP=y)
+ export BZIP=${bzip2}/bin/bzip2
+ export SYSTEMCTL=systemctl
+ makeFlagsArray=(SYSCONFIG_DIR=$out/etc CHOWN=true IGNORE_MAN_GROUP=y CHOWN=true)
+ installFlagsArray=(SA_DIR=$TMPDIR/dummy)
+ # Note: --enable-install-cron actually installs systemd units.
+ configureFlagsArray+=(--with-systemdsystemunitdir=$out/lib/systemd/system --enable-install-cron)
'';
- patches = [ ./no-install-statedir.patch ];
+ preInstall = ''
+ mkdir -p $out/lib/systemd/system
+ '';
meta = {
homepage = http://sebastien.godard.pagesperso-orange.fr/;
diff --git a/pkgs/os-specific/linux/sysstat/no-install-statedir.patch b/pkgs/os-specific/linux/sysstat/no-install-statedir.patch
deleted file mode 100644
index ef81f97217f..00000000000
--- a/pkgs/os-specific/linux/sysstat/no-install-statedir.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -rc sysstat-10.1.1/Makefile.in sysstat-10.1.1-new/Makefile.in
-*** sysstat-10.1.1/Makefile.in 2012-01-02 14:36:00.000000000 +0100
---- sysstat-10.1.1-new/Makefile.in 2012-08-14 14:11:17.676124739 +0200
-***************
-*** 309,315 ****
- install_base: all sa1 sa2 sysstat.sysconfig install_man install_nls \
- contrib/isag/isag
- mkdir -p $(DESTDIR)$(SA_LIB_DIR)
-! mkdir -p $(DESTDIR)$(SA_DIR)
- ifeq ($(CLEAN_SA_DIR),y)
- find $(DESTDIR)$(SA_DIR) \( -name 'sar??' -o -name 'sa??' -o -name 'sar??.gz' -o -name 'sa??.gz' \) \
- -exec rm -f {} \;
---- 309,315 ----
- install_base: all sa1 sa2 sysstat.sysconfig install_man install_nls \
- contrib/isag/isag
- mkdir -p $(DESTDIR)$(SA_LIB_DIR)
-! #mkdir -p $(DESTDIR)$(SA_DIR)
- ifeq ($(CLEAN_SA_DIR),y)
- find $(DESTDIR)$(SA_DIR) \( -name 'sar??' -o -name 'sa??' -o -name 'sar??.gz' -o -name 'sa??.gz' \) \
- -exec rm -f {} \;
-***************
-*** 344,350 ****
-
- install_all: install_base cron/crontab sysstat \
- cron/sysstat.crond cron/sysstat.cron.daily cron/sysstat.cron.hourly
-! $(CHOWN) $(CRON_OWNER) $(DESTDIR)$(SA_DIR)
- if [ -d $(DESTDIR)/etc/cron.d ]; then \
- $(INSTALL_DATA) cron/sysstat.crond $(DESTDIR)/etc/cron.d/sysstat; \
- elif [ -d $(DESTDIR)/etc/cron.hourly -a -d $(DESTDIR)/etc/cron.daily ]; then \
---- 344,350 ----
-
- install_all: install_base cron/crontab sysstat \
- cron/sysstat.crond cron/sysstat.cron.daily cron/sysstat.cron.hourly
-! #$(CHOWN) $(CRON_OWNER) $(DESTDIR)$(SA_DIR)
- if [ -d $(DESTDIR)/etc/cron.d ]; then \
- $(INSTALL_DATA) cron/sysstat.crond $(DESTDIR)/etc/cron.d/sysstat; \
- elif [ -d $(DESTDIR)/etc/cron.hourly -a -d $(DESTDIR)/etc/cron.daily ]; then \
diff --git a/pkgs/os-specific/linux/systemd/fixes.patch b/pkgs/os-specific/linux/systemd/fixes.patch
index 7410c87e277..72cf0e92bb8 100644
--- a/pkgs/os-specific/linux/systemd/fixes.patch
+++ b/pkgs/os-specific/linux/systemd/fixes.patch
@@ -1,7 +1,25 @@
diff --git a/Makefile.am b/Makefile.am
-index 3d9e5c1..4d43cb4 100644
+index 3d9e5c1..46487f6 100644
--- a/Makefile.am
+++ b/Makefile.am
+@@ -1095,7 +1095,7 @@ BUILT_SOURCES += \
+
+ src/shared/errno-list.txt:
+ $(AM_V_at)$(MKDIR_P) $(dir $@)
+- $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include errno.h - < /dev/null | $(AWK) '/^#define[ \t]+E[^ _]+[ \t]+[0-9]/ { print $$2; }' > $@
++ $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include errno.h - < /dev/null | $(AWK) '/^#define[ \t]+E[^ _]+[ \t]+/ { print $$2; }' > $@
+
+ src/shared/errno-from-name.gperf: src/shared/errno-list.txt
+ $(AM_V_at)$(MKDIR_P) $(dir $@)
+@@ -1107,7 +1107,7 @@ src/shared/errno-from-name.h: src/shared/errno-from-name.gperf
+
+ src/shared/errno-to-name.h: src/shared/errno-list.txt
+ $(AM_V_at)$(MKDIR_P) $(dir $@)
+- $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const errno_names[] = { "} { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' < $< > $@
++ $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const errno_names[] = { "} !/EDEADLOCK/ && !/EWOULDBLOCK/ && !/ENOTSUP/ { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' < $< > $@
+
+ src/shared/af-list.txt:
+ $(AM_V_at)$(MKDIR_P) $(dir $@)
@@ -1707,7 +1707,9 @@ dist_tmpfiles_DATA += \
endif
@@ -13,8 +31,42 @@ index 3d9e5c1..4d43cb4 100644
systemd-tmpfiles-setup.service
dist_zshcompletion_DATA += \
+@@ -1961,6 +1963,7 @@ systemd_cgls_SOURCES = \
+ src/cgls/cgls.c
+
+ systemd_cgls_LDADD = \
++ libsystemd-internal.la \
+ libsystemd-shared.la
+
+ # ------------------------------------------------------------------------------
+diff --git a/TODO b/TODO
+index e2ca1e6..d7efdd5 100644
+--- a/TODO
++++ b/TODO
+@@ -1,4 +1,6 @@
+ Bugfixes:
++* Should systemctl status \* work on all unit types, not just .service?
++
+ * enabling an instance unit creates a pointless link, and
+ the unit will be started with getty@getty.service:
+ $ systemctl enable getty@.service
+diff --git a/rules/42-usb-hid-pm.rules b/rules/42-usb-hid-pm.rules
+index c675b5b..4c300da 100644
+--- a/rules/42-usb-hid-pm.rules
++++ b/rules/42-usb-hid-pm.rules
+@@ -12,10 +12,6 @@ ACTION=="add", SUBSYSTEM=="usb", ATTR{product}=="QEMU USB Mouse", ATTR{serial}!=
+ ACTION=="add", SUBSYSTEM=="usb", ATTR{product}=="QEMU USB Tablet", ATTR{serial}!="1", TEST=="power/control", ATTR{power/control}="auto"
+ ACTION=="add", SUBSYSTEM=="usb", ATTR{product}=="QEMU USB Keyboard", ATTR{serial}!="1", TEST=="power/control", ATTR{power/control}="auto"
+
+-# Catch-all for Avocent HID devices. Keyed off interface in order to only
+-# trigger on HID class devices.
+-ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="0624", ATTR{bInterfaceClass}=="03", TEST=="../power/control", ATTR{../power/control}="auto"
+-
+ # Dell DRAC 4
+ ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="413c", ATTR{idProduct}=="2500", TEST=="power/control", ATTR{power/control}="auto"
+
diff --git a/rules/99-systemd.rules.in b/rules/99-systemd.rules.in
-index db72373..2fc12ca 100644
+index db72373..2875958 100644
--- a/rules/99-systemd.rules.in
+++ b/rules/99-systemd.rules.in
@@ -14,10 +14,6 @@ KERNEL=="vport*", TAG+="systemd"
@@ -28,11 +80,329 @@ index db72373..2fc12ca 100644
# Ignore raid devices that are not yet assembled and started
SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", KERNEL=="md*", TEST!="md/array_state", ENV{SYSTEMD_READY}="0"
SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", KERNEL=="md*", ATTR{md/array_state}=="|clear|inactive", ENV{SYSTEMD_READY}="0"
+@@ -43,7 +39,7 @@ SUBSYSTEM=="net", KERNEL!="lo", TAG+="systemd", ENV{SYSTEMD_ALIAS}+="/sys/subsys
+ SUBSYSTEM=="bluetooth", TAG+="systemd", ENV{SYSTEMD_ALIAS}+="/sys/subsystem/bluetooth/devices/%k"
+
+ SUBSYSTEM=="bluetooth", TAG+="systemd", ENV{SYSTEMD_WANTS}+="bluetooth.target"
+-ENV{ID_SMARTCARD_READER}=="*?", TAG+="systemd", ENV{SYSTEMD_WANTS}+="smartcard.target"
++ENV{ID_SMARTCARD_READER}=="?*", TAG+="systemd", ENV{SYSTEMD_WANTS}+="smartcard.target"
+ SUBSYSTEM=="sound", KERNEL=="card*", TAG+="systemd", ENV{SYSTEMD_WANTS}+="sound.target"
+
+ SUBSYSTEM=="printer", TAG+="systemd", ENV{SYSTEMD_WANTS}+="printer.target"
+diff --git a/src/cgls/cgls.c b/src/cgls/cgls.c
+index b8e275d..1840594 100644
+--- a/src/cgls/cgls.c
++++ b/src/cgls/cgls.c
+@@ -35,6 +35,10 @@
+ #include "build.h"
+ #include "output-mode.h"
+ #include "fileio.h"
++#include "sd-bus.h"
++#include "bus-util.h"
++#include "bus-error.h"
++#include "unit-name.h"
+
+ static bool arg_no_pager = false;
+ static bool arg_kernel_threads = false;
+@@ -127,6 +131,7 @@ int main(int argc, char *argv[]) {
+ int r = 0, retval = EXIT_FAILURE;
+ int output_flags;
+ char _cleanup_free_ *root = NULL;
++ _cleanup_bus_unref_ sd_bus *bus = NULL;
+
+ log_parse_environment();
+ log_open();
+@@ -151,6 +156,12 @@ int main(int argc, char *argv[]) {
+ arg_all * OUTPUT_SHOW_ALL |
+ (arg_full > 0) * OUTPUT_FULL_WIDTH;
+
++ r = bus_open_transport(BUS_TRANSPORT_LOCAL, NULL, false, &bus);
++ if (r < 0) {
++ log_error("Failed to create bus connection: %s", strerror(-r));
++ goto finish;
++ }
++
+ if (optind < argc) {
+ int i;
+
+@@ -189,8 +200,52 @@ int main(int argc, char *argv[]) {
+ } else {
+ if (arg_machine) {
+ char *m;
++ const char *cgroup;
++ _cleanup_free_ char *scope = NULL;
++ _cleanup_free_ char *path = NULL;
++ _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
++ _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
++
+ m = strappenda("/run/systemd/machines/", arg_machine);
+- r = parse_env_file(m, NEWLINE, "CGROUP", &root, NULL);
++ r = parse_env_file(m, NEWLINE, "SCOPE", &scope, NULL);
++ if (r < 0) {
++ log_error("Failed to get machine path: %s", strerror(-r));
++ goto finish;
++ }
++
++ path = unit_dbus_path_from_name(scope);
++ if (!path) {
++ r = log_oom();
++ goto finish;
++ }
++
++ r = sd_bus_get_property(
++ bus,
++ "org.freedesktop.systemd1",
++ path,
++ "org.freedesktop.systemd1.Scope",
++ "ControlGroup",
++ &error,
++ &reply,
++ "s");
++
++ if (r < 0) {
++ log_error("Failed to query ControlGroup: %s", bus_error_message(&error, -r));
++ goto finish;
++ }
++
++ r = sd_bus_message_read(reply, "s", &cgroup);
++ if (r < 0) {
++ bus_log_parse_error(r);
++ goto finish;
++ }
++
++ root = strdup(cgroup);
++ if (!root) {
++ r = log_oom();
++ goto finish;
++ }
++
+ } else
+ r = cg_get_root_path(&root);
+ if (r < 0) {
+diff --git a/src/core/cgroup.c b/src/core/cgroup.c
+index 3dd4c91..4201e1e 100644
+--- a/src/core/cgroup.c
++++ b/src/core/cgroup.c
+@@ -871,7 +871,7 @@ int manager_setup_cgroup(Manager *m) {
+ safe_close(m->pin_cgroupfs_fd);
+
+ m->pin_cgroupfs_fd = open(path, O_RDONLY|O_CLOEXEC|O_DIRECTORY|O_NOCTTY|O_NONBLOCK);
+- if (r < 0) {
++ if (m->pin_cgroupfs_fd < 0) {
+ log_error("Failed to open pin file: %m");
+ return -errno;
+ }
+diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c
+index 775825b..5b1c4e3 100644
+--- a/src/core/dbus-cgroup.c
++++ b/src/core/dbus-cgroup.c
+@@ -173,6 +173,7 @@ int bus_cgroup_set_property(
+
+ if (mode != UNIT_CHECK) {
+ c->cpu_accounting = b;
++ u->cgroup_realized_mask &= ~CGROUP_CPUACCT;
+ unit_write_drop_in_private(u, mode, name, b ? "CPUAccounting=yes" : "CPUAccounting=no");
+ }
+
+@@ -192,6 +193,7 @@ int bus_cgroup_set_property(
+
+ if (mode != UNIT_CHECK) {
+ c->cpu_shares = ul;
++ u->cgroup_realized_mask &= ~CGROUP_CPU;
+ unit_write_drop_in_private_format(u, mode, name, "CPUShares=%lu", ul);
+ }
+
+@@ -206,6 +208,7 @@ int bus_cgroup_set_property(
+
+ if (mode != UNIT_CHECK) {
+ c->blockio_accounting = b;
++ u->cgroup_realized_mask &= ~CGROUP_BLKIO;
+ unit_write_drop_in_private(u, mode, name, b ? "BlockIOAccounting=yes" : "BlockIOAccounting=no");
+ }
+
+@@ -225,6 +228,7 @@ int bus_cgroup_set_property(
+
+ if (mode != UNIT_CHECK) {
+ c->blockio_weight = ul;
++ u->cgroup_realized_mask &= ~CGROUP_BLKIO;
+ unit_write_drop_in_private_format(u, mode, name, "BlockIOWeight=%lu", ul);
+ }
+
+@@ -294,6 +298,8 @@ int bus_cgroup_set_property(
+ cgroup_context_free_blockio_device_bandwidth(c, a);
+ }
+
++ u->cgroup_realized_mask &= ~CGROUP_BLKIO;
++
+ f = open_memstream(&buf, &size);
+ if (!f)
+ return -ENOMEM;
+@@ -375,6 +381,8 @@ int bus_cgroup_set_property(
+ cgroup_context_free_blockio_device_weight(c, c->blockio_device_weights);
+ }
+
++ u->cgroup_realized_mask &= ~CGROUP_BLKIO;
++
+ f = open_memstream(&buf, &size);
+ if (!f)
+ return -ENOMEM;
+@@ -398,6 +406,7 @@ int bus_cgroup_set_property(
+
+ if (mode != UNIT_CHECK) {
+ c->memory_accounting = b;
++ u->cgroup_realized_mask &= ~CGROUP_MEMORY;
+ unit_write_drop_in_private(u, mode, name, b ? "MemoryAccounting=yes" : "MemoryAccounting=no");
+ }
+
+@@ -412,6 +421,7 @@ int bus_cgroup_set_property(
+
+ if (mode != UNIT_CHECK) {
+ c->memory_limit = limit;
++ u->cgroup_realized_mask &= ~CGROUP_MEMORY;
+ unit_write_drop_in_private_format(u, mode, name, "%s=%" PRIu64, name, limit);
+ }
+
+@@ -433,6 +443,7 @@ int bus_cgroup_set_property(
+ char *buf;
+
+ c->device_policy = p;
++ u->cgroup_realized_mask &= ~CGROUP_DEVICE;
+
+ buf = strappenda("DevicePolicy=", policy);
+ unit_write_drop_in_private(u, mode, name, buf);
+@@ -511,6 +522,8 @@ int bus_cgroup_set_property(
+ cgroup_context_free_device_allow(c, c->device_allow);
+ }
+
++ u->cgroup_realized_mask &= ~CGROUP_DEVICE;
++
+ f = open_memstream(&buf, &size);
+ if (!f)
+ return -ENOMEM;
+diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c
+index 13b3d0d..37d4154 100644
+--- a/src/core/dbus-execute.c
++++ b/src/core/dbus-execute.c
+@@ -842,7 +842,7 @@ int bus_exec_context_set_transient_property(
+ strv_free(c->environment);
+ c->environment = e;
+
+- joined = strv_join(c->environment, " ");
++ joined = strv_join_quoted(c->environment);
+ if (!joined)
+ return -ENOMEM;
+
+diff --git a/src/core/job.c b/src/core/job.c
+index 35a9de6..dc4f441 100644
+--- a/src/core/job.c
++++ b/src/core/job.c
+@@ -1060,6 +1060,9 @@ int job_coldplug(Job *j) {
+ if (r < 0)
+ return r;
+
++ if (j->state == JOB_WAITING)
++ job_add_to_run_queue(j);
++
+ if (j->begin_usec == 0 || j->unit->job_timeout == 0)
+ return 0;
+
+diff --git a/src/core/killall.c b/src/core/killall.c
+index 57ed41c..eab48f7 100644
+--- a/src/core/killall.c
++++ b/src/core/killall.c
+@@ -168,7 +168,7 @@ static int killall(int sig, Set *pids, bool send_sighup) {
+ continue;
+
+ if (sig == SIGKILL) {
+- _cleanup_free_ char *s;
++ _cleanup_free_ char *s = NULL;
+
+ get_process_comm(pid, &s);
+ log_notice("Sending SIGKILL to PID "PID_FMT" (%s).", pid, strna(s));
+diff --git a/src/core/machine-id-setup.c b/src/core/machine-id-setup.c
+index d459afe..2a58e48 100644
+--- a/src/core/machine-id-setup.c
++++ b/src/core/machine-id-setup.c
+@@ -93,32 +93,9 @@ static int generate(char id[34], const char *root) {
+ }
+ }
+
+- /* If that didn't work, see if we are running in qemu/kvm and a
+- * machine ID was passed in via -uuid on the qemu/kvm command
+- * line */
+-
+- r = detect_vm(&vm_id);
+- if (r > 0 && streq(vm_id, "kvm")) {
+- char uuid[37];
+-
+- fd = open("/sys/class/dmi/id/product_uuid", O_RDONLY|O_CLOEXEC|O_NOCTTY|O_NOFOLLOW);
+- if (fd >= 0) {
+- k = loop_read(fd, uuid, 36, false);
+- safe_close(fd);
+-
+- if (k >= 36) {
+- r = shorten_uuid(id, uuid);
+- if (r >= 0) {
+- log_info("Initializing machine ID from KVM UUID.");
+- return 0;
+- }
+- }
+- }
+- }
+-
+- /* If that didn't work either, see if we are running in a
+- * container, and a machine ID was passed in via
+- * $container_uuid the way libvirt/LXC does it */
++ /* If that didn't work, see if we are running in a container,
++ * and a machine ID was passed in via $container_uuid the way
++ * libvirt/LXC does it */
+ r = detect_container(NULL);
+ if (r > 0) {
+ _cleanup_free_ char *e = NULL;
+@@ -133,6 +110,30 @@ static int generate(char id[34], const char *root) {
+ }
+ }
+ }
++
++ } else {
++ /* If we are not running in a container, see if we are
++ * running in qemu/kvm and a machine ID was passed in
++ * via -uuid on the qemu/kvm command line */
++
++ r = detect_vm(&vm_id);
++ if (r > 0 && streq(vm_id, "kvm")) {
++ char uuid[37];
++
++ fd = open("/sys/class/dmi/id/product_uuid", O_RDONLY|O_CLOEXEC|O_NOCTTY|O_NOFOLLOW);
++ if (fd >= 0) {
++ k = loop_read(fd, uuid, 36, false);
++ safe_close(fd);
++
++ if (k >= 36) {
++ r = shorten_uuid(id, uuid);
++ if (r >= 0) {
++ log_info("Initializing machine ID from KVM UUID.");
++ return 0;
++ }
++ }
++ }
++ }
+ }
+
+ /* If that didn't work, generate a random machine id */
diff --git a/src/core/main.c b/src/core/main.c
-index 41605ee..8517369 100644
+index 41605ee..c65701d 100644
--- a/src/core/main.c
+++ b/src/core/main.c
-@@ -1883,7 +1883,7 @@ finish:
+@@ -1840,6 +1840,7 @@ finish:
+ if (reexecute) {
+ const char **args;
+ unsigned i, args_size;
++ sigset_t ss;
+
+ /* Close and disarm the watchdog, so that the new
+ * instance can reinitialize it, but doesn't get
+@@ -1883,7 +1884,7 @@ finish:
char_array_0(sfd);
i = 0;
@@ -41,6 +411,83 @@ index 41605ee..8517369 100644
if (switch_root_dir)
args[i++] = "--switched-root";
args[i++] = arg_running_as == SYSTEMD_SYSTEM ? "--system" : "--user";
+@@ -1923,6 +1924,13 @@ finish:
+ args[i++] = NULL;
+ assert(i <= args_size);
+
++ /* reenable any blocked signals, especially important
++ * if we switch from initial ramdisk to init=... */
++ reset_all_signal_handlers();
++
++ assert_se(sigemptyset(&ss) == 0);
++ assert_se(sigprocmask(SIG_SETMASK, &ss, NULL) == 0);
++
+ if (switch_root_init) {
+ args[0] = switch_root_init;
+ execv(args[0], (char* const*) args);
+diff --git a/src/core/manager.c b/src/core/manager.c
+index 224106c..7342095 100644
+--- a/src/core/manager.c
++++ b/src/core/manager.c
+@@ -422,7 +422,7 @@ int manager_new(SystemdRunningAs running_as, Manager **_m) {
+ return -ENOMEM;
+
+ #ifdef ENABLE_EFI
+- if (detect_container(NULL) <= 0)
++ if (running_as == SYSTEMD_SYSTEM && detect_container(NULL) <= 0)
+ boot_timestamps(&m->userspace_timestamp, &m->firmware_timestamp, &m->loader_timestamp);
+ #endif
+
+@@ -2129,9 +2129,6 @@ int manager_serialize(Manager *m, FILE *f, FDSet *fds, bool switching_root) {
+ if (u->id != t)
+ continue;
+
+- if (!unit_can_serialize(u))
+- continue;
+-
+ /* Start marker */
+ fputs(u->id, f);
+ fputc('\n', f);
+diff --git a/src/core/namespace.c b/src/core/namespace.c
+index 9f15211..e41cf5b 100644
+--- a/src/core/namespace.c
++++ b/src/core/namespace.c
+@@ -42,6 +42,7 @@
+ #include "mkdir.h"
+ #include "dev-setup.h"
+ #include "def.h"
++#include "label.h"
+
+ typedef enum MountMode {
+ /* This is ordered by priority! */
+@@ -68,6 +69,7 @@ static int append_mounts(BindMount **p, char **strv, MountMode mode) {
+ STRV_FOREACH(i, strv) {
+
+ (*p)->ignore = false;
++ (*p)->done = false;
+
+ if ((mode == INACCESSIBLE || mode == READONLY || mode == READWRITE) && (*i)[0] == '-') {
+ (*p)->ignore = true;
+@@ -217,7 +219,10 @@ static int mount_dev(BindMount *m) {
+ goto fail;
+ }
+
++ label_context_set(d, st.st_mode);
+ r = mknod(dn, st.st_mode, st.st_rdev);
++ label_context_clear();
++
+ if (r < 0) {
+ r = -errno;
+ goto fail;
+@@ -350,7 +355,7 @@ int setup_namespace(
+ private_dev;
+
+ if (n > 0) {
+- m = mounts = (BindMount *) alloca(n * sizeof(BindMount));
++ m = mounts = (BindMount *) alloca0(n * sizeof(BindMount));
+ r = append_mounts(&m, read_write_dirs, READWRITE);
+ if (r < 0)
+ return r;
diff --git a/src/core/service.c b/src/core/service.c
index ae3695a..6b3aa45 100644
--- a/src/core/service.c
@@ -58,7 +505,7 @@ index ae3695a..6b3aa45 100644
log_error_unit(UNIT(s)->id, "%s is of type D-Bus but no D-Bus service name has been specified. Refusing.", UNIT(s)->id);
return -EINVAL;
diff --git a/src/core/socket.c b/src/core/socket.c
-index 7c18a2b..eba67d5 100644
+index 7c18a2b..1a560a6 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -663,16 +663,25 @@ static int instance_from_socket(int fd, unsigned nr, char **instance) {
@@ -96,6 +543,115 @@ index 7c18a2b..eba67d5 100644
break;
}
+@@ -1242,6 +1251,8 @@ static int socket_spawn(Socket *s, ExecCommand *c, pid_t *_pid) {
+ NULL,
+ s->exec_runtime,
+ &pid);
++ if (r < 0)
++ goto fail;
+
+ strv_free(argv);
+ if (r < 0)
+@@ -1497,6 +1508,12 @@ static void socket_enter_running(Socket *s, int cfd) {
+ }
+
+ if (!pending) {
++ if (!UNIT_ISSET(s->service)) {
++ log_error_unit(UNIT(s)->id, "%s: service to activate vanished, refusing activation.", UNIT(s)->id);
++ r = -ENOENT;
++ goto fail;
++ }
++
+ r = manager_add_job(UNIT(s)->manager, JOB_START, UNIT_DEREF(s->service), JOB_REPLACE, true, &error, NULL);
+ if (r < 0)
+ goto fail;
+diff --git a/src/core/timer.c b/src/core/timer.c
+index 6c85304..720b8af 100644
+--- a/src/core/timer.c
++++ b/src/core/timer.c
+@@ -111,6 +111,23 @@ static int timer_add_default_dependencies(Timer *t) {
+ return unit_add_two_dependencies_by_name(UNIT(t), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_SHUTDOWN_TARGET, NULL, true);
+ }
+
++static void update_stampfile(Timer *t, usec_t timestamp) {
++ _cleanup_close_ int fd = -1;
++
++ mkdir_parents_label(t->stamp_path, 0755);
++
++ /* Update the file atime + mtime, if we can */
++ fd = open(t->stamp_path, O_WRONLY|O_CREAT|O_TRUNC|O_CLOEXEC, 0644);
++ if (fd >= 0) {
++ struct timespec ts[2];
++
++ timespec_store(&ts[0], timestamp);
++ ts[1] = ts[0];
++
++ futimens(fd, ts);
++ }
++}
++
+ static int timer_setup_persistent(Timer *t) {
+ int r;
+
+@@ -131,7 +148,7 @@ static int timer_setup_persistent(Timer *t) {
+
+ e = getenv("XDG_DATA_HOME");
+ if (e)
+- t->stamp_path = strjoin(e, "/systemd/timers/", UNIT(t)->id, NULL);
++ t->stamp_path = strjoin(e, "/systemd/timers/stamp-", UNIT(t)->id, NULL);
+ else {
+
+ _cleanup_free_ char *h = NULL;
+@@ -496,22 +513,8 @@ static void timer_enter_running(Timer *t) {
+
+ dual_timestamp_get(&t->last_trigger);
+
+- if (t->stamp_path) {
+- _cleanup_close_ int fd = -1;
+-
+- mkdir_parents_label(t->stamp_path, 0755);
+-
+- /* Update the file atime + mtime, if we can */
+- fd = open(t->stamp_path, O_WRONLY|O_CREAT|O_TRUNC|O_CLOEXEC, 0644);
+- if (fd >= 0) {
+- struct timespec ts[2];
+-
+- timespec_store(&ts[0], t->last_trigger.realtime);
+- ts[1] = ts[0];
+-
+- futimens(fd, ts);
+- }
+- }
++ if (t->stamp_path)
++ update_stampfile(t, t->last_trigger.realtime);
+
+ timer_set_state(t, TIMER_RUNNING);
+ return;
+@@ -539,6 +542,11 @@ static int timer_start(Unit *u) {
+
+ if (stat(t->stamp_path, &st) >= 0)
+ t->last_trigger.realtime = timespec_load(&st.st_atim);
++ else if (errno == ENOENT)
++ /* The timer has never run before,
++ * make sure a stamp file exists.
++ */
++ update_stampfile(t, now(CLOCK_REALTIME));
+ }
+
+ t->result = TIMER_SUCCESS;
+diff --git a/src/core/transaction.c b/src/core/transaction.c
+index d00f427..2befc32 100644
+--- a/src/core/transaction.c
++++ b/src/core/transaction.c
+@@ -378,7 +378,7 @@ static int transaction_verify_order_one(Transaction *tr, Job *j, Job *from, unsi
+ "Found dependency on %s/%s",
+ k->unit->id, job_type_to_string(k->type));
+
+- if (!delete &&
++ if (!delete && hashmap_get(tr->jobs, k->unit) &&
+ !unit_matters_to_anchor(k->unit, k)) {
+ /* Ok, we can drop this one, so let's
+ * do so. */
diff --git a/src/core/umount.c b/src/core/umount.c
index d1258f0..0311812 100644
--- a/src/core/umount.c
@@ -109,6 +665,195 @@ index d1258f0..0311812 100644
#ifndef HAVE_SPLIT_USR
|| path_equal(m->path, "/usr")
#endif
+diff --git a/src/core/unit.c b/src/core/unit.c
+index 153b79b..ed52694 100644
+--- a/src/core/unit.c
++++ b/src/core/unit.c
+@@ -2287,25 +2287,25 @@ bool unit_can_serialize(Unit *u) {
+ }
+
+ int unit_serialize(Unit *u, FILE *f, FDSet *fds, bool serialize_jobs) {
+- ExecRuntime *rt;
+ int r;
+
+ assert(u);
+ assert(f);
+ assert(fds);
+
+- if (!unit_can_serialize(u))
+- return 0;
+-
+- r = UNIT_VTABLE(u)->serialize(u, f, fds);
+- if (r < 0)
+- return r;
++ if (unit_can_serialize(u)) {
++ ExecRuntime *rt;
+
+- rt = unit_get_exec_runtime(u);
+- if (rt) {
+- r = exec_runtime_serialize(rt, u, f, fds);
++ r = UNIT_VTABLE(u)->serialize(u, f, fds);
+ if (r < 0)
+ return r;
++
++ rt = unit_get_exec_runtime(u);
++ if (rt) {
++ r = exec_runtime_serialize(rt, u, f, fds);
++ if (r < 0)
++ return r;
++ }
+ }
+
+ dual_timestamp_serialize(f, "inactive-exit-timestamp", &u->inactive_exit_timestamp);
+@@ -2367,17 +2367,14 @@ void unit_serialize_item(Unit *u, FILE *f, const char *key, const char *value) {
+ }
+
+ int unit_deserialize(Unit *u, FILE *f, FDSet *fds) {
+- size_t offset;
+ ExecRuntime **rt = NULL;
++ size_t offset;
+ int r;
+
+ assert(u);
+ assert(f);
+ assert(fds);
+
+- if (!unit_can_serialize(u))
+- return 0;
+-
+ offset = UNIT_VTABLE(u)->exec_runtime_offset;
+ if (offset > 0)
+ rt = (ExecRuntime**) ((uint8_t*) u + offset);
+@@ -2487,24 +2484,34 @@ int unit_deserialize(Unit *u, FILE *f, FDSet *fds) {
+ if (!s)
+ return -ENOMEM;
+
+- free(u->cgroup_path);
+- u->cgroup_path = s;
++ if (u->cgroup_path) {
++ void *p;
+
++ p = hashmap_remove(u->manager->cgroup_unit, u->cgroup_path);
++ log_info("Removing cgroup_path %s from hashmap (%p)",
++ u->cgroup_path, p);
++ free(u->cgroup_path);
++ }
++
++ u->cgroup_path = s;
+ assert(hashmap_put(u->manager->cgroup_unit, s, u) == 1);
++
+ continue;
+ }
+
+- if (rt) {
+- r = exec_runtime_deserialize_item(rt, u, l, v, fds);
++ if (unit_can_serialize(u)) {
++ if (rt) {
++ r = exec_runtime_deserialize_item(rt, u, l, v, fds);
++ if (r < 0)
++ return r;
++ if (r > 0)
++ continue;
++ }
++
++ r = UNIT_VTABLE(u)->deserialize_item(u, l, v, fds);
+ if (r < 0)
+ return r;
+- if (r > 0)
+- continue;
+ }
+-
+- r = UNIT_VTABLE(u)->deserialize_item(u, l, v, fds);
+- if (r < 0)
+- return r;
+ }
+ }
+
+diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
+index 75d56dd..be8fb2f 100644
+--- a/src/cryptsetup/cryptsetup-generator.c
++++ b/src/cryptsetup/cryptsetup-generator.c
+@@ -29,6 +29,7 @@
+ #include "mkdir.h"
+ #include "strv.h"
+ #include "fileio.h"
++#include "path-util.h"
+
+ static const char *arg_dest = "/tmp";
+ static bool arg_enabled = true;
+@@ -144,16 +145,19 @@ static int create_disk(
+ if (!uu)
+ return log_oom();
+
+- if (is_device_path(uu)) {
+- _cleanup_free_ char *dd;
++ if (!path_equal(uu, "/dev/null")) {
+
+- dd = unit_name_from_path(uu, ".device");
+- if (!dd)
+- return log_oom();
++ if (is_device_path(uu)) {
++ _cleanup_free_ char *dd;
+
+- fprintf(f, "After=%1$s\nRequires=%1$s\n", dd);
+- } else
+- fprintf(f, "RequiresMountsFor=%s\n", password);
++ dd = unit_name_from_path(uu, ".device");
++ if (!dd)
++ return log_oom();
++
++ fprintf(f, "After=%1$s\nRequires=%1$s\n", dd);
++ } else
++ fprintf(f, "RequiresMountsFor=%s\n", password);
++ }
+ }
+ }
+
+@@ -287,7 +291,7 @@ static int parse_proc_cmdline_item(const char *key, const char *value) {
+ } else if (STR_IN_SET(key, "luks.key", "rd.luks.key") && value) {
+
+ free(arg_keyfile);
+- arg_keyfile = strdup(key);
++ arg_keyfile = strdup(value);
+ if (!arg_keyfile)
+ return log_oom();
+
+diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
+index 9b9074c..ad6c76c 100644
+--- a/src/cryptsetup/cryptsetup.c
++++ b/src/cryptsetup/cryptsetup.c
+@@ -88,6 +88,13 @@ static int parse_one_option(const char *option) {
+ return 0;
+ }
+
++ if (arg_key_size % 8) {
++ log_error("size= not a multiple of 8, ignoring.");
++ return 0;
++ }
++
++ arg_key_size /= 8;
++
+ } else if (startswith(option, "key-slot=")) {
+
+ arg_type = CRYPT_LUKS1;
+@@ -404,7 +411,7 @@ static int attach_luks_or_plain(struct crypt_device *cd,
+ /* for CRYPT_PLAIN limit reads
+ * from keyfile to key length, and
+ * ignore keyfile-size */
+- arg_keyfile_size = arg_key_size / 8;
++ arg_keyfile_size = arg_key_size;
+
+ /* In contrast to what the name
+ * crypt_setup() might suggest this
+@@ -567,7 +574,7 @@ int main(int argc, char *argv[]) {
+ else
+ until = 0;
+
+- arg_key_size = (arg_key_size > 0 ? arg_key_size : 256);
++ arg_key_size = (arg_key_size > 0 ? arg_key_size : (256 / 8));
+
+ if (key_file) {
+ struct stat st;
diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
index 18f2aca..2a2b1ea 100644
--- a/src/fsck/fsck.c
@@ -131,11 +876,715 @@ index 18f2aca..2a2b1ea 100644
cmdline[i++] = "-a";
cmdline[i++] = "-T";
cmdline[i++] = "-l";
+diff --git a/src/getty-generator/getty-generator.c b/src/getty-generator/getty-generator.c
+index 6a4aa2c..700e90a 100644
+--- a/src/getty-generator/getty-generator.c
++++ b/src/getty-generator/getty-generator.c
+@@ -72,7 +72,7 @@ static int add_serial_getty(const char *tty) {
+
+ log_debug("Automatically adding serial getty for /dev/%s.", tty);
+
+- n = unit_name_replace_instance("serial-getty@.service", tty);
++ n = unit_name_from_path_instance("serial-getty", tty, ".service");
+ if (!n)
+ return log_oom();
+
+@@ -86,7 +86,7 @@ static int add_container_getty(const char *tty) {
+
+ log_debug("Automatically adding container getty for /dev/pts/%s.", tty);
+
+- n = unit_name_replace_instance("container-getty@.service", tty);
++ n = unit_name_from_path_instance("container-getty", tty, ".service");
+ if (!n)
+ return log_oom();
+
+diff --git a/src/journal/catalog.c b/src/journal/catalog.c
+index 3ed0b7e..02dedc4 100644
+--- a/src/journal/catalog.c
++++ b/src/journal/catalog.c
+@@ -103,7 +103,7 @@ static int finish_item(
+ const char *payload) {
+
+ ssize_t offset;
+- CatalogItem *i;
++ _cleanup_free_ CatalogItem *i = NULL;
+ int r;
+
+ assert(h);
+@@ -126,13 +126,14 @@ static int finish_item(
+ i->offset = htole64((uint64_t) offset);
+
+ r = hashmap_put(h, i, i);
+- if (r == EEXIST) {
++ if (r == -EEXIST) {
+ log_warning("Duplicate entry for " SD_ID128_FORMAT_STR ".%s, ignoring.",
+ SD_ID128_FORMAT_VAL(id), language ? language : "C");
+- free(i);
+ return 0;
+- }
++ } else if (r < 0)
++ return r;
+
++ i = NULL;
+ return 0;
+ }
+
+@@ -383,8 +384,8 @@ error:
+ int catalog_update(const char* database, const char* root, const char* const* dirs) {
+ _cleanup_strv_free_ char **files = NULL;
+ char **f;
+- Hashmap *h;
+ struct strbuf *sb = NULL;
++ _cleanup_hashmap_free_free_ Hashmap *h = NULL;
+ _cleanup_free_ CatalogItem *items = NULL;
+ CatalogItem *i;
+ Iterator j;
+@@ -406,13 +407,17 @@ int catalog_update(const char* database, const char* root, const char* const* di
+ }
+
+ STRV_FOREACH(f, files) {
+- log_debug("reading file '%s'", *f);
+- catalog_import_file(h, sb, *f);
++ log_debug("Reading file '%s'", *f);
++ r = catalog_import_file(h, sb, *f);
++ if (r < 0) {
++ log_error("Failed to import file '%s': %s.",
++ *f, strerror(-r));
++ goto finish;
++ }
+ }
+
+ if (hashmap_size(h) <= 0) {
+ log_info("No items in catalog.");
+- r = 0;
+ goto finish;
+ } else
+ log_debug("Found %u items in catalog.", hashmap_size(h));
+@@ -443,11 +448,7 @@ int catalog_update(const char* database, const char* root, const char* const* di
+ log_debug("%s: wrote %u items, with %zu bytes of strings, %ld total size.",
+ database, n, sb->len, r);
+
+- r = 0;
+-
+ finish:
+- if (h)
+- hashmap_free_free(h);
+ if (sb)
+ strbuf_cleanup(sb);
+
+diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
+index f2f1f35..fd9d2a8 100644
+--- a/src/journal/journal-file.c
++++ b/src/journal/journal-file.c
+@@ -274,12 +274,6 @@ static int journal_file_verify_header(JournalFile *f) {
+ !VALID64(le64toh(f->header->entry_array_offset)))
+ return -ENODATA;
+
+- if (le64toh(f->header->data_hash_table_offset) < le64toh(f->header->header_size) ||
+- le64toh(f->header->field_hash_table_offset) < le64toh(f->header->header_size) ||
+- le64toh(f->header->tail_object_offset) < le64toh(f->header->header_size) ||
+- le64toh(f->header->entry_array_offset) < le64toh(f->header->header_size))
+- return -ENODATA;
+-
+ if (f->writable) {
+ uint8_t state;
+ sd_id128_t machine_id;
+diff --git a/src/journal/journal-remote-parse.c b/src/journal/journal-remote-parse.c
+index 142de0e..239ff38 100644
+--- a/src/journal/journal-remote-parse.c
++++ b/src/journal/journal-remote-parse.c
+@@ -40,7 +40,7 @@ void source_free(RemoteSource *source) {
+
+ static int get_line(RemoteSource *source, char **line, size_t *size) {
+ ssize_t n, remain;
+- char *c;
++ char *c = NULL;
+ char *newbuf = NULL;
+ size_t newsize = 0;
+
+@@ -49,7 +49,9 @@ static int get_line(RemoteSource *source, char **line, size_t *size) {
+ assert(source->filled <= source->size);
+ assert(source->buf == NULL || source->size > 0);
+
+- c = memchr(source->buf, '\n', source->filled);
++ if (source->buf)
++ c = memchr(source->buf, '\n', source->filled);
++
+ if (c != NULL)
+ goto docopy;
+
+diff --git a/src/journal/journald-kmsg.c b/src/journal/journald-kmsg.c
+index 35948ea..48725e4 100644
+--- a/src/journal/journald-kmsg.c
++++ b/src/journal/journald-kmsg.c
+@@ -152,7 +152,7 @@ static void dev_kmsg_record(Server *s, char *p, size_t l) {
+ /* Did we lose any? */
+ if (serial > *s->kernel_seqnum)
+ server_driver_message(s, SD_MESSAGE_JOURNAL_MISSED, "Missed %"PRIu64" kernel messages",
+- serial - *s->kernel_seqnum - 1);
++ serial - *s->kernel_seqnum);
+
+ /* Make sure we never read this one again. Note that
+ * we always store the next message serial we expect
+diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
+index 6da81e7..b6f8e7e 100644
+--- a/src/journal/journald-server.c
++++ b/src/journal/journald-server.c
+@@ -67,6 +67,7 @@
+ #define DEFAULT_SYNC_INTERVAL_USEC (5*USEC_PER_MINUTE)
+ #define DEFAULT_RATE_LIMIT_INTERVAL (30*USEC_PER_SEC)
+ #define DEFAULT_RATE_LIMIT_BURST 1000
++#define DEFAULT_MAX_FILE_USEC USEC_PER_MONTH
+
+ #define RECHECK_AVAILABLE_SPACE_USEC (30*USEC_PER_SEC)
+
+@@ -1473,6 +1474,8 @@ int server_init(Server *s) {
+ s->forward_to_syslog = true;
+ s->forward_to_wall = true;
+
++ s->max_file_usec = DEFAULT_MAX_FILE_USEC;
++
+ s->max_level_store = LOG_DEBUG;
+ s->max_level_syslog = LOG_DEBUG;
+ s->max_level_kmsg = LOG_NOTICE;
+diff --git a/src/journal/microhttpd-util.c b/src/journal/microhttpd-util.c
+index f693e0f..9a8d5c6 100644
+--- a/src/journal/microhttpd-util.c
++++ b/src/journal/microhttpd-util.c
+@@ -129,7 +129,7 @@ void log_func_gnutls(int level, const char *message) {
+ if (0 <= level && level < (int) ELEMENTSOF(log_level_map))
+ ourlevel = log_level_map[level];
+ else
+- level = LOG_DEBUG;
++ ourlevel = LOG_DEBUG;
+
+ log_meta(ourlevel, NULL, 0, NULL, "gnutls: %s", message);
+ }
+diff --git a/src/journal/test-catalog.c b/src/journal/test-catalog.c
+index b087a8b..967ab67 100644
+--- a/src/journal/test-catalog.c
++++ b/src/journal/test-catalog.c
+@@ -157,7 +157,8 @@ int main(int argc, char *argv[]) {
+
+ setlocale(LC_ALL, "de_DE.UTF-8");
+
+- log_set_max_level(LOG_DEBUG);
++ log_parse_environment();
++ log_open();
+
+ test_catalog_file_lang();
+
+diff --git a/src/libsystemd/sd-rtnl/rtnl-message.c b/src/libsystemd/sd-rtnl/rtnl-message.c
+index 84a8ffa..e79b318 100644
+--- a/src/libsystemd/sd-rtnl/rtnl-message.c
++++ b/src/libsystemd/sd-rtnl/rtnl-message.c
+@@ -335,24 +335,28 @@ int sd_rtnl_message_link_get_flags(sd_rtnl_message *m, unsigned *flags) {
+ /* If successful the updated message will be correctly aligned, if
+ unsuccessful the old message is untouched. */
+ static int add_rtattr(sd_rtnl_message *m, unsigned short type, const void *data, size_t data_length) {
+- uint32_t rta_length, message_length;
++ uint32_t rta_length;
++ size_t message_length, padding_length;
+ struct nlmsghdr *new_hdr;
+ struct rtattr *rta;
+ char *padding;
+ unsigned i;
++ int offset;
+
+ assert(m);
+ assert(m->hdr);
+ assert(!m->sealed);
+ assert(NLMSG_ALIGN(m->hdr->nlmsg_len) == m->hdr->nlmsg_len);
+- assert(!data || data_length > 0);
+- assert(data || m->n_containers < RTNL_CONTAINER_DEPTH);
++ assert(!data || data_length);
++
++ /* get offset of the new attribute */
++ offset = m->hdr->nlmsg_len;
+
+ /* get the size of the new rta attribute (with padding at the end) */
+ rta_length = RTA_LENGTH(data_length);
+
+ /* get the new message size (with padding at the end) */
+- message_length = m->hdr->nlmsg_len + RTA_ALIGN(rta_length);
++ message_length = offset + RTA_ALIGN(rta_length);
+
+ /* realloc to fit the new attribute */
+ new_hdr = realloc(m->hdr, message_length);
+@@ -361,32 +365,35 @@ static int add_rtattr(sd_rtnl_message *m, unsigned short type, const void *data,
+ m->hdr = new_hdr;
+
+ /* get pointer to the attribute we are about to add */
+- rta = (struct rtattr *) ((uint8_t *) m->hdr + m->hdr->nlmsg_len);
++ rta = (struct rtattr *) ((uint8_t *) m->hdr + offset);
+
+ /* if we are inside containers, extend them */
+ for (i = 0; i < m->n_containers; i++)
+- GET_CONTAINER(m, i)->rta_len += message_length - m->hdr->nlmsg_len;
++ GET_CONTAINER(m, i)->rta_len += message_length - offset;
+
+ /* fill in the attribute */
+ rta->rta_type = type;
+ rta->rta_len = rta_length;
+- if (!data) {
+- /* this is the start of a new container */
+- m->container_offsets[m->n_containers ++] = m->hdr->nlmsg_len;
+- } else {
++ if (data)
+ /* we don't deal with the case where the user lies about the type
+ * and gives us too little data (so don't do that)
+- */
++ */
+ padding = mempcpy(RTA_DATA(rta), data, data_length);
+- /* make sure also the padding at the end of the message is initialized */
+- memzero(padding,
+- (uint8_t *) m->hdr + message_length - (uint8_t *) padding);
++ else {
++ /* if no data was passed, make sure we still initialize the padding
++ note that we can have data_length > 0 (used by some containers) */
++ padding = RTA_DATA(rta);
++ data_length = 0;
+ }
+
++ /* make sure also the padding at the end of the message is initialized */
++ padding_length = (uint8_t*)m->hdr + message_length - (uint8_t*)padding;
++ memzero(padding, padding_length);
++
+ /* update message size */
+ m->hdr->nlmsg_len = message_length;
+
+- return 0;
++ return offset;
+ }
+
+ int sd_rtnl_message_append_string(sd_rtnl_message *m, unsigned short type, const char *data) {
+@@ -761,22 +768,29 @@ int sd_rtnl_message_open_container(sd_rtnl_message *m, unsigned short type) {
+
+ assert_return(m, -EINVAL);
+ assert_return(!m->sealed, -EPERM);
++ assert_return(m->n_containers < RTNL_CONTAINER_DEPTH, -ERANGE);
+
+ sd_rtnl_message_get_type(m, &rtm_type);
+
++ int r = -ENOTSUP;
++
+ if (rtnl_message_type_is_link(rtm_type)) {
+
+ if ((type == IFLA_LINKINFO && m->n_containers == 0) ||
+ (type == IFLA_INFO_DATA && m->n_containers == 1 &&
+ GET_CONTAINER(m, 0)->rta_type == IFLA_LINKINFO))
+- return add_rtattr(m, type, NULL, 0);
++ r = add_rtattr(m, type, NULL, 0);
+ else if (type == VETH_INFO_PEER && m->n_containers == 2 &&
+ GET_CONTAINER(m, 1)->rta_type == IFLA_INFO_DATA &&
+ GET_CONTAINER(m, 0)->rta_type == IFLA_LINKINFO)
+- return add_rtattr(m, type, NULL, sizeof(struct ifinfomsg));
++ r= add_rtattr(m, type, NULL, sizeof(struct ifinfomsg));
+ }
+
+- return -ENOTSUP;
++ if (r < 0) return r;
++
++ m->container_offsets[m->n_containers ++] = r;
++
++ return 0;
+ }
+
+ int sd_rtnl_message_close_container(sd_rtnl_message *m) {
+diff --git a/src/libudev/libudev-monitor.c b/src/libudev/libudev-monitor.c
+index ba1b04d..85b1e40 100644
+--- a/src/libudev/libudev-monitor.c
++++ b/src/libudev/libudev-monitor.c
+@@ -108,15 +108,13 @@ static struct udev_monitor *udev_monitor_new(struct udev *udev)
+
+ /* we consider udev running when /dev is on devtmpfs */
+ static bool udev_has_devtmpfs(struct udev *udev) {
+- struct file_handle *h;
++ union file_handle_union h = { .handle.handle_bytes = MAX_HANDLE_SZ, };
+ int mount_id;
+ _cleanup_fclose_ FILE *f = NULL;
+ char line[LINE_MAX], *e;
+ int r;
+
+- h = alloca(MAX_HANDLE_SZ);
+- h->handle_bytes = MAX_HANDLE_SZ;
+- r = name_to_handle_at(AT_FDCWD, "/dev", h, &mount_id, 0);
++ r = name_to_handle_at(AT_FDCWD, "/dev", &h.handle, &mount_id, 0);
+ if (r < 0)
+ return false;
+
+diff --git a/src/login/70-uaccess.rules b/src/login/70-uaccess.rules
+index e1cf897..57f619d 100644
+--- a/src/login/70-uaccess.rules
++++ b/src/login/70-uaccess.rules
+@@ -12,7 +12,7 @@ ENV{MAJOR}=="", GOTO="uaccess_end"
+ SUBSYSTEM=="usb", ENV{ID_USB_INTERFACES}=="*:060101:*", TAG+="uaccess"
+
+ # Digicams with proprietary protocol
+-ENV{ID_GPHOTO2}=="*?", TAG+="uaccess"
++ENV{ID_GPHOTO2}=="?*", TAG+="uaccess"
+
+ # SCSI and USB scanners
+ ENV{libsane_matched}=="yes", TAG+="uaccess"
+@@ -49,13 +49,13 @@ SUBSYSTEM=="drm", KERNEL=="card*|renderD*", TAG+="uaccess"
+ SUBSYSTEM=="misc", KERNEL=="kvm", TAG+="uaccess"
+
+ # smart-card readers
+-ENV{ID_SMARTCARD_READER}=="*?", TAG+="uaccess"
++ENV{ID_SMARTCARD_READER}=="?*", TAG+="uaccess"
+
+ # (USB) authentication devices
+-ENV{ID_SECURITY_TOKEN}=="*?", TAG+="uaccess"
++ENV{ID_SECURITY_TOKEN}=="?*", TAG+="uaccess"
+
+ # PDA devices
+-ENV{ID_PDA}=="*?", TAG+="uaccess"
++ENV{ID_PDA}=="?*", TAG+="uaccess"
+
+ # Programmable remote control
+ ENV{ID_REMOTE_CONTROL}=="1", TAG+="uaccess"
+@@ -64,10 +64,10 @@ ENV{ID_REMOTE_CONTROL}=="1", TAG+="uaccess"
+ SUBSYSTEM=="input", ENV{ID_INPUT_JOYSTICK}=="?*", TAG+="uaccess"
+
+ # color measurement devices
+-ENV{COLOR_MEASUREMENT_DEVICE}=="*?", TAG+="uaccess"
++ENV{COLOR_MEASUREMENT_DEVICE}=="?*", TAG+="uaccess"
+
+ # DDC/CI device, usually high-end monitors such as the DreamColor
+-ENV{DDC_DEVICE}=="*?", TAG+="uaccess"
++ENV{DDC_DEVICE}=="?*", TAG+="uaccess"
+
+ # media player raw devices (for user-mode drivers, Android SDK, etc.)
+ SUBSYSTEM=="usb", ENV{ID_MEDIA_PLAYER}=="?*", TAG+="uaccess"
+diff --git a/src/login/logind-acl.c b/src/login/logind-acl.c
+index dc86f0f..4bbeb64 100644
+--- a/src/login/logind-acl.c
++++ b/src/login/logind-acl.c
+@@ -279,7 +279,9 @@ int devnode_acl_all(struct udev *udev,
+
+ log_debug("Fixing up ACLs at %s for seat %s", n, seat);
+ k = devnode_acl(n, flush, del, old_uid, add, new_uid);
+- if (k < 0)
++ if (k == -ENOENT)
++ log_debug("Device %s disappeared while setting ACLs", n);
++ else if (k < 0)
+ r = k;
+ }
+
+diff --git a/src/login/logind-action.c b/src/login/logind-action.c
+index 1928f43..d69c7ad 100644
+--- a/src/login/logind-action.c
++++ b/src/login/logind-action.c
+@@ -79,14 +79,12 @@ int manager_handle_action(
+ return 0;
+ }
+
+- /* If we have more than one or no displays connected,
+- * don't react to lid closing. The no display case we
+- * treat like this under the assumption that there is
+- * no modern drm driver available. */
++ /* If we have more than one display connected,
++ * don't react to lid closing. */
+ n = manager_count_displays(m);
+ if (n < 0)
+ log_warning("Display counting failed: %s", strerror(-n));
+- else if (n != 1) {
++ else if (n > 1) {
+ log_debug("Ignoring lid switch request, %i displays connected.", n);
+ return 0;
+ }
+diff --git a/src/login/logind-seat.c b/src/login/logind-seat.c
+index 3f5efdc..1ee6ced 100644
+--- a/src/login/logind-seat.c
++++ b/src/login/logind-seat.c
+@@ -275,8 +275,13 @@ int seat_switch_to(Seat *s, unsigned int num) {
+ if (!num)
+ return -EINVAL;
+
+- if (num >= s->position_count || !s->positions[num])
++ if (num >= s->position_count || !s->positions[num]) {
++ /* allow switching to unused VTs to trigger auto-activate */
++ if (seat_has_vts(s) && num < 64)
++ return chvt(num);
++
+ return -EINVAL;
++ }
+
+ return session_activate(s->positions[num]);
+ }
+diff --git a/src/login/logind-session.c b/src/login/logind-session.c
+index 4ca6b5d..02a780d 100644
+--- a/src/login/logind-session.c
++++ b/src/login/logind-session.c
+@@ -213,7 +213,6 @@ int session_save(Session *s) {
+
+ if (s->scope)
+ fprintf(f, "SCOPE=%s\n", s->scope);
+-
+ if (s->scope_job)
+ fprintf(f, "SCOPE_JOB=%s\n", s->scope_job);
+
+@@ -229,17 +228,54 @@ int session_save(Session *s) {
+ if (s->display)
+ fprintf(f, "DISPLAY=%s\n", s->display);
+
+- if (s->remote_host)
+- fprintf(f, "REMOTE_HOST=%s\n", s->remote_host);
++ if (s->remote_host) {
++ _cleanup_free_ char *escaped;
++
++ escaped = cescape(s->remote_host);
++ if (!escaped) {
++ r = -ENOMEM;
++ goto finish;
++ }
++
++ fprintf(f, "REMOTE_HOST=%s\n", escaped);
++ }
++
++ if (s->remote_user) {
++ _cleanup_free_ char *escaped;
++
++ escaped = cescape(s->remote_user);
++ if (!escaped) {
++ r = -ENOMEM;
++ goto finish;
++ }
++
++ fprintf(f, "REMOTE_USER=%s\n", escaped);
++ }
++
++ if (s->service) {
++ _cleanup_free_ char *escaped;
+
+- if (s->remote_user)
+- fprintf(f, "REMOTE_USER=%s\n", s->remote_user);
++ escaped = cescape(s->service);
++ if (!escaped) {
++ r = -ENOMEM;
++ goto finish;
++ }
++
++ fprintf(f, "SERVICE=%s\n", escaped);
++ }
+
+- if (s->service)
+- fprintf(f, "SERVICE=%s\n", s->service);
++ if (s->desktop) {
++ _cleanup_free_ char *escaped;
+
+- if (s->desktop)
+- fprintf(f, "DESKTOP=%s\n", s->desktop);
++
++ escaped = cescape(s->desktop);
++ if (!escaped) {
++ r = -ENOMEM;
++ goto finish;
++ }
++
++ fprintf(f, "DESKTOP=%s\n", escaped);
++ }
+
+ if (s->seat && seat_has_vts(s->seat))
+ fprintf(f, "VTNR=%u\n", s->vtnr);
+@@ -972,6 +1008,10 @@ void session_mute_vt(Session *s) {
+ if (vt < 0)
+ return;
+
++ r = fchown(vt, s->user->uid, -1);
++ if (r < 0)
++ goto error;
++
+ r = ioctl(vt, KDSKBMODE, K_OFF);
+ if (r < 0)
+ goto error;
+@@ -1026,6 +1066,8 @@ void session_restore_vt(Session *s) {
+ mode.mode = VT_AUTO;
+ ioctl(vt, VT_SETMODE, &mode);
+
++ fchown(vt, 0, -1);
++
+ s->vtfd = safe_close(s->vtfd);
+ }
+
+diff --git a/src/login/org.freedesktop.login1.policy.in b/src/login/org.freedesktop.login1.policy.in
+index b96d32d..b8e90f1 100644
+--- a/src/login/org.freedesktop.login1.policy.in
++++ b/src/login/org.freedesktop.login1.policy.in
+@@ -254,7 +254,7 @@
+
+ auth_admin_keep
+ auth_admin_keep
+- auth_admin_keep
++ yes
+
+ org.freedesktop.login1.hibernate
+
+diff --git a/src/login/pam-module.c b/src/login/pam-module.c
+index 9873dd5..1259457 100644
+--- a/src/login/pam-module.c
++++ b/src/login/pam-module.c
+@@ -475,7 +475,7 @@ _public_ PAM_EXTERN int pam_sm_open_session(
+ }
+
+ if (session_fd >= 0) {
+- session_fd = dup(session_fd);
++ session_fd = fcntl(session_fd, F_DUPFD_CLOEXEC, 3);
+ if (session_fd < 0) {
+ pam_syslog(handle, LOG_ERR, "Failed to dup session fd: %m");
+ return PAM_SESSION_ERR;
+diff --git a/src/machine/machine.c b/src/machine/machine.c
+index 9a5cc9a..de701ad 100644
+--- a/src/machine/machine.c
++++ b/src/machine/machine.c
+@@ -123,17 +123,42 @@ int machine_save(Machine *m) {
+ "NAME=%s\n",
+ m->name);
+
+- if (m->unit)
+- fprintf(f, "SCOPE=%s\n", m->unit); /* We continue to call this "SCOPE=" because it is internal only, and we want to stay compatible with old files */
++ if (m->unit) {
++ _cleanup_free_ char *escaped;
++
++ escaped = cescape(m->unit);
++ if (!escaped) {
++ r = -ENOMEM;
++ goto finish;
++ }
++
++ fprintf(f, "SCOPE=%s\n", escaped); /* We continue to call this "SCOPE=" because it is internal only, and we want to stay compatible with old files */
++ }
+
+ if (m->scope_job)
+ fprintf(f, "SCOPE_JOB=%s\n", m->scope_job);
+
+- if (m->service)
+- fprintf(f, "SERVICE=%s\n", m->service);
++ if (m->service) {
++ _cleanup_free_ char *escaped;
+
+- if (m->root_directory)
+- fprintf(f, "ROOT=%s\n", m->root_directory);
++ escaped = cescape(m->service);
++ if (!escaped) {
++ r = -ENOMEM;
++ goto finish;
++ }
++ fprintf(f, "SERVICE=%s\n", escaped);
++ }
++
++ if (m->root_directory) {
++ _cleanup_free_ char *escaped;
++
++ escaped = cescape(m->root_directory);
++ if (!escaped) {
++ r = -ENOMEM;
++ goto finish;
++ }
++ fprintf(f, "ROOT=%s\n", escaped);
++ }
+
+ if (!sd_id128_equal(m->id, SD_ID128_NULL))
+ fprintf(f, "ID=" SD_ID128_FORMAT_STR "\n", SD_ID128_FORMAT_VAL(m->id));
+@@ -330,16 +355,18 @@ static int machine_stop_scope(Machine *m) {
+ if (!m->unit)
+ return 0;
+
+- r = manager_stop_unit(m->manager, m->unit, &error, &job);
+- if (r < 0) {
+- log_error("Failed to stop machine scope: %s", bus_error_message(&error, r));
+- return r;
++ if (!m->registered) {
++ r = manager_stop_unit(m->manager, m->unit, &error, &job);
++ if (r < 0) {
++ log_error("Failed to stop machine scope: %s", bus_error_message(&error, r));
++ return r;
++ }
+ }
+
+ free(m->scope_job);
+ m->scope_job = job;
+
+- return r;
++ return 0;
+ }
+
+ int machine_stop(Machine *m) {
+@@ -415,6 +442,8 @@ int machine_kill(Machine *m, KillWho who, int signo) {
+
+ if (kill(m->leader, signo) < 0)
+ return -errno;
++
++ return 0;
+ }
+
+ /* Otherwise make PID 1 do it for us, for the entire cgroup */
+diff --git a/src/machine/machine.h b/src/machine/machine.h
+index f4aefc5..de3536d 100644
+--- a/src/machine/machine.h
++++ b/src/machine/machine.h
+@@ -72,6 +72,7 @@ struct Machine {
+
+ bool in_gc_queue:1;
+ bool started:1;
++ bool registered:1;
+
+ sd_bus_message *create_message;
+
+diff --git a/src/machine/machined-dbus.c b/src/machine/machined-dbus.c
+index 9473105..154a335 100644
+--- a/src/machine/machined-dbus.c
++++ b/src/machine/machined-dbus.c
+@@ -241,6 +241,7 @@ static int method_create_or_register_machine(Manager *manager, sd_bus_message *m
+ m->leader = leader;
+ m->class = c;
+ m->id = id;
++ m->registered = true;
+
+ if (!isempty(service)) {
+ m->service = strdup(service);
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
-index 9a9ed9d..9e46e18 100644
+index 9a9ed9d..c3e6d23 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
-@@ -2667,6 +2667,7 @@ int main(int argc, char *argv[]) {
+@@ -769,6 +769,15 @@ static int setup_resolv_conf(const char *dest) {
+ return 0;
+ }
+
++static char* id128_format_as_uuid(sd_id128_t id, char s[37]) {
++
++ snprintf(s, 37,
++ "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
++ SD_ID128_FORMAT_VAL(id));
++
++ return s;
++}
++
+ static int setup_boot_id(const char *dest) {
+ _cleanup_free_ char *from = NULL, *to = NULL;
+ sd_id128_t rnd = {};
+@@ -794,10 +803,7 @@ static int setup_boot_id(const char *dest) {
+ return r;
+ }
+
+- snprintf(as_uuid, sizeof(as_uuid),
+- "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
+- SD_ID128_FORMAT_VAL(rnd));
+- char_array_0(as_uuid);
++ id128_format_as_uuid(rnd, as_uuid);
+
+ r = write_string_file(from, as_uuid);
+ if (r < 0) {
+@@ -2378,7 +2384,7 @@ static int change_uid_gid(char **_home) {
+ _cleanup_fclose_ FILE *f = NULL;
+ _cleanup_close_ int fd = -1;
+ unsigned n_uids = 0;
+- size_t sz, l;
++ size_t sz = 0, l;
+ uid_t uid;
+ gid_t gid;
+ pid_t pid;
+@@ -2667,6 +2673,7 @@ int main(int argc, char *argv[]) {
goto finish;
}
} else {
@@ -143,7 +1592,7 @@ index 9a9ed9d..9e46e18 100644
const char *p;
p = strappenda(arg_directory,
-@@ -2676,6 +2677,7 @@ int main(int argc, char *argv[]) {
+@@ -2676,6 +2683,7 @@ int main(int argc, char *argv[]) {
goto finish;
}
@@ -151,6 +1600,46 @@ index 9a9ed9d..9e46e18 100644
}
} else {
char template[] = "/tmp/nspawn-root-XXXXXX";
+@@ -2748,8 +2756,6 @@ int main(int argc, char *argv[]) {
+ goto finish;
+ }
+
+- sd_notify(0, "READY=1");
+-
+ assert_se(sigemptyset(&mask) == 0);
+ sigset_add_many(&mask, SIGCHLD, SIGWINCH, SIGTERM, SIGINT, -1);
+ assert_se(sigprocmask(SIG_BLOCK, &mask, NULL) == 0);
+@@ -2966,7 +2972,9 @@ int main(int argc, char *argv[]) {
+ }
+
+ if (!sd_id128_equal(arg_uuid, SD_ID128_NULL)) {
+- if (asprintf((char**)(envp + n_env++), "container_uuid=" SD_ID128_FORMAT_STR, SD_ID128_FORMAT_VAL(arg_uuid)) < 0) {
++ char as_uuid[37];
++
++ if (asprintf((char**)(envp + n_env++), "container_uuid=%s", id128_format_as_uuid(arg_uuid, as_uuid)) < 0) {
+ log_oom();
+ goto child_fail;
+ }
+@@ -3086,6 +3094,8 @@ int main(int argc, char *argv[]) {
+ if (r < 0)
+ goto finish;
+
++ sd_notify(0, "READY=1");
++
+ /* Notify the child that the parent is ready with all
+ * its setup, and thtat the child can now hand over
+ * control to the code to run inside the container. */
+@@ -3136,6 +3146,10 @@ int main(int argc, char *argv[]) {
+
+ if (!arg_quiet)
+ log_info("Container %s is being rebooted.", arg_machine);
++ if (getenv("EXIT_ON_REBOOT") != 0) {
++ r = 10;
++ break;
++ }
+ continue;
+ } else if (status.si_code == CLD_KILLED ||
+ status.si_code == CLD_DUMPED) {
diff --git a/src/nss-myhostname/netlink.c b/src/nss-myhostname/netlink.c
index d61ecdf..228a3a4 100644
--- a/src/nss-myhostname/netlink.c
@@ -166,6 +1655,88 @@ index d61ecdf..228a3a4 100644
if (ifaddrmsg->ifa_flags & IFA_F_DEPRECATED)
continue;
+diff --git a/src/python-systemd/_reader.c b/src/python-systemd/_reader.c
+index 059b904..9a19a10 100644
+--- a/src/python-systemd/_reader.c
++++ b/src/python-systemd/_reader.c
+@@ -902,7 +902,6 @@ static PyObject* get_catalog(PyObject *self, PyObject *args) {
+ sd_id128_t id;
+ _cleanup_free_ char *msg = NULL;
+
+- assert(!self);
+ assert(args);
+
+ if (!PyArg_ParseTuple(args, "z:get_catalog", &id_))
+diff --git a/src/python-systemd/journal.py b/src/python-systemd/journal.py
+index 9c7e004..dd1f229 100644
+--- a/src/python-systemd/journal.py
++++ b/src/python-systemd/journal.py
+@@ -293,7 +293,7 @@ class Reader(_Reader):
+ monotonic = monotonic.totalseconds()
+ monotonic = int(monotonic * 1000000)
+ if isinstance(bootid, _uuid.UUID):
+- bootid = bootid.get_hex()
++ bootid = bootid.hex
+ return super(Reader, self).seek_monotonic(monotonic, bootid)
+
+ def log_level(self, level):
+@@ -314,7 +314,7 @@ class Reader(_Reader):
+ Equivalent to add_match(MESSAGE_ID=`messageid`).
+ """
+ if isinstance(messageid, _uuid.UUID):
+- messageid = messageid.get_hex()
++ messageid = messageid.hex
+ self.add_match(MESSAGE_ID=messageid)
+
+ def this_boot(self, bootid=None):
+@@ -346,7 +346,7 @@ class Reader(_Reader):
+
+ def get_catalog(mid):
+ if isinstance(mid, _uuid.UUID):
+- mid = mid.get_hex()
++ mid = mid.hex
+ return _get_catalog(mid)
+
+ def _make_line(field, value):
+diff --git a/src/readahead/readahead-common.c b/src/readahead/readahead-common.c
+index 5ffa88b..49679fc 100644
+--- a/src/readahead/readahead-common.c
++++ b/src/readahead/readahead-common.c
+@@ -75,7 +75,7 @@ int fs_on_ssd(const char *p) {
+ if (major(st.st_dev) == 0) {
+ _cleanup_fclose_ FILE *f = NULL;
+ int mount_id;
+- struct file_handle *h;
++ union file_handle_union h = { .handle.handle_bytes = MAX_HANDLE_SZ, };
+
+ /* Might be btrfs, which exposes "ssd" as mount flag if it is on ssd.
+ *
+@@ -83,9 +83,7 @@ int fs_on_ssd(const char *p) {
+ * and then lookup the mount ID in mountinfo to find
+ * the mount options. */
+
+- h = alloca(MAX_HANDLE_SZ);
+- h->handle_bytes = MAX_HANDLE_SZ;
+- r = name_to_handle_at(AT_FDCWD, p, h, &mount_id, AT_SYMLINK_FOLLOW);
++ r = name_to_handle_at(AT_FDCWD, p, &h.handle, &mount_id, AT_SYMLINK_FOLLOW);
+ if (r < 0)
+ return false;
+
+diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
+index d27b1b7..905a2e1 100644
+--- a/src/shared/conf-parser.c
++++ b/src/shared/conf-parser.c
+@@ -336,8 +336,8 @@ int config_parse(const char *unit,
+ if (!f) {
+ f = ours = fopen(filename, "re");
+ if (!f) {
+- log_error("Failed to open configuration file '%s': %m", filename);
+- return -errno;
++ log_full(errno == ENOENT ? LOG_DEBUG : LOG_ERR, "Failed to open configuration file '%s': %m", filename);
++ return errno == ENOENT ? 0 : -errno;
+ }
+ }
+
diff --git a/src/shared/generator.c b/src/shared/generator.c
index 6110303..e679cb1 100644
--- a/src/shared/generator.c
@@ -179,10 +1750,359 @@ index 6110303..e679cb1 100644
r = access(checker, X_OK);
if (r < 0) {
log_warning("Checking was requested for %s, but %s cannot be used: %m", what, checker);
+diff --git a/src/shared/install.c b/src/shared/install.c
+index 7409046..4517c9c 100644
+--- a/src/shared/install.c
++++ b/src/shared/install.c
+@@ -560,7 +560,7 @@ int unit_file_mask(
+ unsigned *n_changes) {
+
+ char **i;
+- _cleanup_free_ char *prefix;
++ _cleanup_free_ char *prefix = NULL;
+ int r;
+
+ assert(scope >= 0);
+diff --git a/src/shared/log.c b/src/shared/log.c
+index a4b3b68..890a9fa 100644
+--- a/src/shared/log.c
++++ b/src/shared/log.c
+@@ -878,6 +878,9 @@ void log_parse_environment(void) {
+ if (l == 5 && startswith(w, "debug")) {
+ log_set_max_level(LOG_DEBUG);
+ break;
++ } else if (l == 5 && startswith(w, "quiet")) {
++ log_set_max_level(LOG_WARNING);
++ break;
+ }
+ }
+ }
+diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c
+index 9d14933..b0b66f6 100644
+--- a/src/shared/logs-show.c
++++ b/src/shared/logs-show.c
+@@ -547,7 +547,9 @@ static int output_export(
+ startswith(data, "_BOOT_ID="))
+ continue;
+
+- if (!utf8_is_printable(data, length)) {
++ if (utf8_is_printable_newline(data, length, false))
++ fwrite(data, length, 1, f);
++ else {
+ const char *c;
+ uint64_t le64;
+
+@@ -562,8 +564,7 @@ static int output_export(
+ le64 = htole64(length - (c - (const char*) data) - 1);
+ fwrite(&le64, sizeof(le64), 1, f);
+ fwrite(c + 1, length - (c - (const char*) data) - 1, 1, f);
+- } else
+- fwrite(data, length, 1, f);
++ }
+
+ fputc('\n', f);
+ }
+diff --git a/src/shared/unit-name.c b/src/shared/unit-name.c
+index 6c167b4..d0e71f2 100644
+--- a/src/shared/unit-name.c
++++ b/src/shared/unit-name.c
+@@ -332,7 +332,7 @@ char *unit_name_path_unescape(const char *f) {
+ }
+
+ bool unit_name_is_template(const char *n) {
+- const char *p;
++ const char *p, *e;
+
+ assert(n);
+
+@@ -340,11 +340,15 @@ bool unit_name_is_template(const char *n) {
+ if (!p)
+ return false;
+
+- return p[1] == '.';
++ e = strrchr(p+1, '.');
++ if (!e)
++ return false;
++
++ return e == p + 1;
+ }
+
+ bool unit_name_is_instance(const char *n) {
+- const char *p;
++ const char *p, *e;
+
+ assert(n);
+
+@@ -352,7 +356,11 @@ bool unit_name_is_instance(const char *n) {
+ if (!p)
+ return false;
+
+- return p[1] != '.';
++ e = strrchr(p+1, '.');
++ if (!e)
++ return false;
++
++ return e > p + 1;
+ }
+
+ char *unit_name_replace_instance(const char *f, const char *i) {
+diff --git a/src/shared/utf8.c b/src/shared/utf8.c
+index 0b524d8..c559c13 100644
+--- a/src/shared/utf8.c
++++ b/src/shared/utf8.c
+@@ -136,7 +136,7 @@ int utf8_encoded_to_unichar(const char *str) {
+ return unichar;
+ }
+
+-bool utf8_is_printable(const char* str, size_t length) {
++bool utf8_is_printable_newline(const char* str, size_t length, bool newline) {
+ const uint8_t *p;
+
+ assert(str);
+@@ -145,7 +145,8 @@ bool utf8_is_printable(const char* str, size_t length) {
+ int encoded_len = utf8_encoded_valid_unichar((const char *)p);
+ int val = utf8_encoded_to_unichar((const char*)p);
+
+- if (encoded_len < 0 || val < 0 || is_unicode_control(val))
++ if (encoded_len < 0 || val < 0 || is_unicode_control(val) ||
++ (!newline && val == '\n'))
+ return false;
+
+ length -= encoded_len;
+diff --git a/src/shared/utf8.h b/src/shared/utf8.h
+index c0eb73a..c087995 100644
+--- a/src/shared/utf8.h
++++ b/src/shared/utf8.h
+@@ -31,7 +31,10 @@ const char *utf8_is_valid(const char *s) _pure_;
+ char *ascii_is_valid(const char *s) _pure_;
+ char *utf8_escape_invalid(const char *s);
+
+-bool utf8_is_printable(const char* str, size_t length) _pure_;
++bool utf8_is_printable_newline(const char* str, size_t length, bool newline) _pure_;
++_pure_ static inline bool utf8_is_printable(const char* str, size_t length) {
++ return utf8_is_printable_newline(str, length, true);
++}
+
+ char *utf16_to_utf8(const void *s, size_t length);
+
+diff --git a/src/shared/util.c b/src/shared/util.c
+index ffe6624..2a2b2b2 100644
+--- a/src/shared/util.c
++++ b/src/shared/util.c
+@@ -166,19 +166,19 @@ int close_nointr(int fd) {
+
+ assert(fd >= 0);
+ r = close(fd);
+-
+- /* Just ignore EINTR; a retry loop is the wrong
+- * thing to do on Linux.
+- *
+- * http://lkml.indiana.edu/hypermail/linux/kernel/0509.1/0877.html
+- * https://bugzilla.gnome.org/show_bug.cgi?id=682819
+- * http://utcc.utoronto.ca/~cks/space/blog/unix/CloseEINTR
+- * https://sites.google.com/site/michaelsafyan/software-engineering/checkforeintrwheninvokingclosethinkagain
+- */
+- if (_unlikely_(r < 0 && errno == EINTR))
+- return 0;
+- else if (r >= 0)
++ if (r >= 0)
+ return r;
++ else if (errno == EINTR)
++ /*
++ * Just ignore EINTR; a retry loop is the wrong
++ * thing to do on Linux.
++ *
++ * http://lkml.indiana.edu/hypermail/linux/kernel/0509.1/0877.html
++ * https://bugzilla.gnome.org/show_bug.cgi?id=682819
++ * http://utcc.utoronto.ca/~cks/space/blog/unix/CloseEINTR
++ * https://sites.google.com/site/michaelsafyan/software-engineering/checkforeintrwheninvokingclosethinkagain
++ */
++ return 0;
+ else
+ return -errno;
+ }
+@@ -195,7 +195,13 @@ int safe_close(int fd) {
+
+ if (fd >= 0) {
+ PROTECT_ERRNO;
+- assert_se(close_nointr(fd) == 0);
++
++ /* The kernel might return pretty much any error code
++ * via close(), but the fd will be closed anyway. The
++ * only condition we want to check for here is whether
++ * the fd was invalid at all... */
++
++ assert_se(close_nointr(fd) != -EBADF);
+ }
+
+ return -1;
+@@ -1365,7 +1371,7 @@ bool ignore_file(const char *filename) {
+ assert(filename);
+
+ if (endswith(filename, "~"))
+- return false;
++ return true;
+
+ return ignore_file_allow_backup(filename);
+ }
+@@ -1495,6 +1501,7 @@ bool fstype_is_network(const char *fstype) {
+ static const char table[] =
+ "cifs\0"
+ "smbfs\0"
++ "sshfs\0"
+ "ncpfs\0"
+ "ncp\0"
+ "nfs\0"
+@@ -1581,8 +1588,9 @@ int read_one_char(FILE *f, char *ret, usec_t t, bool *need_nl) {
+ if (fd_wait_for_event(fileno(f), POLLIN, t) <= 0)
+ return -ETIMEDOUT;
+
++ errno = 0;
+ if (!fgets(line, sizeof(line), f))
+- return -EIO;
++ return errno ? -errno : -EIO;
+
+ truncate_nl(line);
+
+@@ -5327,6 +5335,9 @@ bool string_is_safe(const char *p) {
+ if (*t > 0 && *t < ' ')
+ return false;
+
++ if (*t == 127)
++ return false;
++
+ if (strchr("\\\"\'", *t))
+ return false;
+ }
+@@ -5343,10 +5354,14 @@ bool string_has_cc(const char *p) {
+
+ assert(p);
+
+- for (t = p; *t; t++)
++ for (t = p; *t; t++) {
+ if (*t > 0 && *t < ' ' && *t != '\t')
+ return true;
+
++ if (*t == 127)
++ return true;
++ }
++
+ return false;
+ }
+
+@@ -6391,3 +6406,19 @@ void hexdump(FILE *f, const void *p, size_t s) {
+ s -= 16;
+ }
+ }
++
++int update_reboot_param_file(const char *param)
++{
++ int r = 0;
++
++ if (param) {
++
++ r = write_string_file(REBOOT_PARAM_FILE, param);
++ if (r < 0)
++ log_error("Failed to write reboot param to "
++ REBOOT_PARAM_FILE": %s", strerror(-r));
++ } else
++ unlink(REBOOT_PARAM_FILE);
++
++ return r;
++}
+diff --git a/src/shared/util.h b/src/shared/util.h
+index 90464c9..122ac91 100644
+--- a/src/shared/util.h
++++ b/src/shared/util.h
+@@ -22,6 +22,7 @@
+ ***/
+
+ #include
++#include
+ #include
+ #include
+ #include
+@@ -922,3 +923,10 @@ uint64_t physical_memory(void);
+ char* mount_test_option(const char *haystack, const char *needle);
+
+ void hexdump(FILE *f, const void *p, size_t s);
++
++union file_handle_union {
++ struct file_handle handle;
++ char padding[sizeof(struct file_handle) + MAX_HANDLE_SZ];
++};
++
++int update_reboot_param_file(const char *param);
+diff --git a/src/shared/virt.c b/src/shared/virt.c
+index ec2ddcf..f03e790 100644
+--- a/src/shared/virt.c
++++ b/src/shared/virt.c
+@@ -149,7 +149,7 @@ static int detect_vm_dmi(const char **_id) {
+
+ /* Returns a short identifier for the various VM implementations */
+ int detect_vm(const char **id) {
+- _cleanup_free_ char *hvtype = NULL, *cpuinfo_contents = NULL;
++ _cleanup_free_ char *domcap = NULL, *cpuinfo_contents = NULL;
+ static thread_local int cached_found = -1;
+ static thread_local const char *cached_id = NULL;
+ const char *_id = NULL;
+@@ -163,17 +163,37 @@ int detect_vm(const char **id) {
+ return cached_found;
+ }
+
+- /* Try high-level hypervisor sysfs file first:
++ /* Try xen capabilities file first, if not found try high-level hypervisor sysfs file:
+ *
+- * https://bugs.freedesktop.org/show_bug.cgi?id=61491 */
+- r = read_one_line_file("/sys/hypervisor/type", &hvtype);
++ * https://bugs.freedesktop.org/show_bug.cgi?id=77271 */
++ r = read_one_line_file("/proc/xen/capabilities", &domcap);
+ if (r >= 0) {
+- if (streq(hvtype, "xen")) {
++ char *cap, *i = domcap;
++
++ while ((cap = strsep(&i, ",")))
++ if (streq(cap, "control_d"))
++ break;
++
++ if (!i) {
+ _id = "xen";
+ r = 1;
+- goto finish;
+ }
+- } else if (r != -ENOENT)
++
++ goto finish;
++
++ } else if (r == -ENOENT) {
++ _cleanup_free_ char *hvtype = NULL;
++
++ r = read_one_line_file("/sys/hypervisor/type", &hvtype);
++ if (r >= 0) {
++ if (streq(hvtype, "xen")) {
++ _id = "xen";
++ r = 1;
++ goto finish;
++ }
++ } else if (r != -ENOENT)
++ return r;
++ } else
+ return r;
+
+ /* this will set _id to "other" and return 0 for unknown hypervisors */
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
-index 0887bc3..6b502ce 100644
+index 0887bc3..d02ee2b 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
+@@ -461,7 +461,7 @@ static int output_units_list(const UnitInfo *unit_infos, unsigned c) {
+ }
+
+ if (circle_len > 0)
+- printf("%s%s%s", on_circle, circle ? draw_special_char(DRAW_BLACK_CIRCLE) : " ", off_circle);
++ printf("%s%s%s ", on_circle, circle ? draw_special_char(DRAW_BLACK_CIRCLE) : " ", off_circle);
+
+ printf("%s%-*s%s %s%-*s%s %s%-*s %-*s%s %-*s",
+ on_active, id_len, id, off_active,
@@ -2561,7 +2561,7 @@ static int start_unit_one(
log_debug("Adding %s to the set", p);
@@ -192,6 +2112,523 @@ index 0887bc3..6b502ce 100644
return log_oom();
}
+@@ -4240,7 +4240,7 @@ static int show_all(
+ _cleanup_free_ UnitInfo *unit_infos = NULL;
+ const UnitInfo *u;
+ unsigned c;
+- int r;
++ int r, ret = 0;
+
+ r = get_unit_list(bus, NULL, NULL, &unit_infos, 0, &reply);
+ if (r < 0)
+@@ -4262,9 +4262,11 @@ static int show_all(
+ r = show_one(verb, bus, p, show_properties, new_line, ellipsized);
+ if (r < 0)
+ return r;
++ else if (r > 0 && ret == 0)
++ ret = r;
+ }
+
+- return 0;
++ return ret;
+ }
+
+ static int show_system_status(sd_bus *bus) {
+@@ -4386,7 +4388,12 @@ static int show(sd_bus *bus, char **args) {
+ }
+ }
+
+- show_one(args[0], bus, unit, show_properties, &new_line, &ellipsized);
++ r = show_one(args[0], bus, unit, show_properties,
++ &new_line, &ellipsized);
++ if (r < 0)
++ return r;
++ else if (r > 0 && ret == 0)
++ ret = r;
+ }
+
+ if (!strv_isempty(patterns)) {
+@@ -4403,7 +4410,12 @@ static int show(sd_bus *bus, char **args) {
+ if (!unit)
+ return log_oom();
+
+- show_one(args[0], bus, unit, show_properties, &new_line, &ellipsized);
++ r = show_one(args[0], bus, unit, show_properties,
++ &new_line, &ellipsized);
++ if (r < 0)
++ return r;
++ else if (r > 0 && ret == 0)
++ ret = r;
+ }
+ }
+ }
+@@ -5403,15 +5415,15 @@ static int systemctl_help(void) {
+ " otherwise restart if active\n"
+ " isolate NAME Start one unit and stop all others\n"
+ " kill NAME... Send signal to processes of a unit\n"
+- " is-active NAME... Check whether units are active\n"
+- " is-failed NAME... Check whether units are failed\n"
+- " status [NAME...|PID...] Show runtime status of one or more units\n"
+- " show [NAME...|JOB...] Show properties of one or more\n"
++ " is-active PATTERN... Check whether units are active\n"
++ " is-failed PATTERN... Check whether units are failed\n"
++ " status [PATTERN...|PID...] Show runtime status of one or more units\n"
++ " show [PATTERN...|JOB...] Show properties of one or more\n"
+ " units/jobs or the manager\n"
+- " cat NAME... Show files and drop-ins of one or more units\n"
++ " cat PATTERN... Show files and drop-ins of one or more units\n"
+ " set-property NAME ASSIGNMENT... Sets one or more properties of a unit\n"
+- " help NAME...|PID... Show manual for one or more units\n"
+- " reset-failed [NAME...] Reset failed state for all, one, or more\n"
++ " help PATTERN...|PID... Show manual for one or more units\n"
++ " reset-failed [PATTERN...] Reset failed state for all, one, or more\n"
+ " units\n"
+ " list-dependencies [NAME] Recursively show units which are required\n"
+ " or wanted by this unit or by which this\n"
+@@ -5973,13 +5985,10 @@ static int halt_parse_argv(int argc, char *argv[]) {
+ }
+ }
+
+- if (arg_action == ACTION_REBOOT && argc == optind + 1) {
+- r = write_string_file(REBOOT_PARAM_FILE, argv[optind]);
+- if (r < 0) {
+- log_error("Failed to write reboot param to "
+- REBOOT_PARAM_FILE": %s", strerror(-r));
++ if (arg_action == ACTION_REBOOT && (argc == optind || argc == optind + 1)) {
++ r = update_reboot_param_file(argc == optind + 1 ? argv[optind] : NULL);
++ if (r < 0)
+ return r;
+- }
+ } else if (optind < argc) {
+ log_error("Too many arguments.");
+ return -EINVAL;
+diff --git a/src/test/test-udev.c b/src/test/test-udev.c
+index b064744..b057cc8 100644
+--- a/src/test/test-udev.c
++++ b/src/test/test-udev.c
+@@ -155,9 +155,8 @@ int main(int argc, char *argv[]) {
+ }
+ }
+
+- err = udev_event_execute_rules(event, rules, &sigmask_orig);
+- if (err == 0)
+- udev_event_execute_run(event, NULL);
++ udev_event_execute_rules(event, rules, &sigmask_orig);
++ udev_event_execute_run(event, NULL);
+ out:
+ if (event != NULL && event->fd_signal >= 0)
+ close(event->fd_signal);
+diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
+index 33e7cbc..04b472d 100644
+--- a/src/tmpfiles/tmpfiles.c
++++ b/src/tmpfiles/tmpfiles.c
+@@ -217,19 +217,16 @@ static bool unix_socket_alive(const char *fn) {
+ }
+
+ static int dir_is_mount_point(DIR *d, const char *subdir) {
+- struct file_handle *h;
++ union file_handle_union h = { .handle.handle_bytes = MAX_HANDLE_SZ };
+ int mount_id_parent, mount_id;
+ int r_p, r;
+
+- h = alloca(MAX_HANDLE_SZ);
+-
+- h->handle_bytes = MAX_HANDLE_SZ;
+- r_p = name_to_handle_at(dirfd(d), ".", h, &mount_id_parent, 0);
++ r_p = name_to_handle_at(dirfd(d), ".", &h.handle, &mount_id_parent, 0);
+ if (r_p < 0)
+ r_p = -errno;
+
+- h->handle_bytes = MAX_HANDLE_SZ;
+- r = name_to_handle_at(dirfd(d), subdir, h, &mount_id, 0);
++ h.handle.handle_bytes = MAX_HANDLE_SZ;
++ r = name_to_handle_at(dirfd(d), subdir, &h.handle, &mount_id, 0);
+ if (r < 0)
+ r = -errno;
+
+diff --git a/src/tty-ask-password-agent/tty-ask-password-agent.c b/src/tty-ask-password-agent/tty-ask-password-agent.c
+index 1d067af..3203474 100644
+--- a/src/tty-ask-password-agent/tty-ask-password-agent.c
++++ b/src/tty-ask-password-agent/tty-ask-password-agent.c
+@@ -432,7 +432,7 @@ static int wall_tty_block(void) {
+
+ r = get_ctty_devnr(0, &devnr);
+ if (r < 0)
+- return -r;
++ return r;
+
+ if (asprintf(&p, "/run/systemd/ask-password-block/%u:%u", major(devnr), minor(devnr)) < 0)
+ return -ENOMEM;
+diff --git a/src/udev/accelerometer/accelerometer.c b/src/udev/accelerometer/accelerometer.c
+index 925d38d..32adf27 100644
+--- a/src/udev/accelerometer/accelerometer.c
++++ b/src/udev/accelerometer/accelerometer.c
+@@ -180,7 +180,7 @@ get_prev_orientation(struct udev_device *dev)
+ return string_to_orientation(value);
+ }
+
+-#define SET_AXIS(axis, code_) if (ev[i].code == code_) { if (got_##axis == 0) { axis = ev[i].value; got_##axis = true; } }
++#define READ_AXIS(axis, var) { memzero(&abs_info, sizeof(abs_info)); r = ioctl(fd, EVIOCGABS(axis), &abs_info); if (r < 0) return; var = abs_info.value; }
+
+ /* accelerometers */
+ static void test_orientation(struct udev *udev,
+@@ -189,10 +189,9 @@ static void test_orientation(struct udev *udev,
+ {
+ OrientationUp old, new;
+ _cleanup_close_ int fd = -1;
+- struct input_event ev[64];
+- bool got_syn = false;
+- bool got_x = false, got_y = false, got_z = false;
++ struct input_absinfo abs_info;
+ int x = 0, y = 0, z = 0;
++ int r;
+ char text[64];
+
+ old = get_prev_orientation(dev);
+@@ -201,30 +200,10 @@ static void test_orientation(struct udev *udev,
+ if (fd < 0)
+ return;
+
+- while (1) {
+- int i, r;
+-
+- r = read(fd, ev, sizeof(struct input_event) * 64);
+-
+- if (r < (int) sizeof(struct input_event))
+- return;
+-
+- for (i = 0; i < r / (int) sizeof(struct input_event); i++) {
+- if (got_syn) {
+- if (ev[i].type == EV_ABS) {
+- SET_AXIS(x, ABS_X);
+- SET_AXIS(y, ABS_Y);
+- SET_AXIS(z, ABS_Z);
+- }
+- }
+- if (ev[i].type == EV_SYN && ev[i].code == SYN_REPORT)
+- got_syn = true;
+- if (got_x && got_y && got_z)
+- goto read_dev;
+- }
+- }
++ READ_AXIS(ABS_X, x);
++ READ_AXIS(ABS_Y, y);
++ READ_AXIS(ABS_Z, z);
+
+-read_dev:
+ new = orientation_calc(old, x, y, z);
+ snprintf(text, sizeof(text),
+ "ID_INPUT_ACCELEROMETER_ORIENTATION=%s", orientation_to_string(new));
+diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c
+index 5bb6b02..b31ad80 100644
+--- a/src/udev/net/link-config.c
++++ b/src/udev/net/link-config.c
+@@ -184,7 +184,7 @@ failure:
+ }
+
+ static bool enable_name_policy(void) {
+- _cleanup_free_ char *line;
++ _cleanup_free_ char *line = NULL;
+ char *w, *state;
+ int r;
+ size_t l;
+@@ -391,7 +391,9 @@ int link_config_apply(link_config_ctx *ctx, link_config *config, struct udev_dev
+ case MACPOLICY_PERSISTENT:
+ if (!mac_is_permanent(device)) {
+ r = get_mac(device, false, &generated_mac);
+- if (r < 0)
++ if (r == -ENOENT)
++ break;
++ else if (r < 0)
+ return r;
+ mac = &generated_mac;
+ }
+@@ -399,7 +401,9 @@ int link_config_apply(link_config_ctx *ctx, link_config *config, struct udev_dev
+ case MACPOLICY_RANDOM:
+ if (!mac_is_random(device)) {
+ r = get_mac(device, true, &generated_mac);
+- if (r < 0)
++ if (r == -ENOENT)
++ break;
++ else if (r < 0)
+ return r;
+ mac = &generated_mac;
+ }
+diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
+index 5998be2..5213a4a 100644
+--- a/src/udev/udev-event.c
++++ b/src/udev/udev-event.c
+@@ -771,18 +771,17 @@ static int rename_netif(struct udev_event *event)
+ log_error("error changing net interface name %s to %s: %s",
+ oldname, name, strerror(-r));
+ else
+- print_kmsg("renamed network interface %s to %s", oldname, name);
++ print_kmsg("renamed network interface %s to %s\n", oldname, name);
+
+ return r;
+ }
+
+-int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules, const sigset_t *sigmask)
++void udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules, const sigset_t *sigmask)
+ {
+ struct udev_device *dev = event->dev;
+- int err = 0;
+
+ if (udev_device_get_subsystem(dev) == NULL)
+- return -1;
++ return;
+
+ if (streq(udev_device_get_action(dev), "remove")) {
+ udev_device_read_db(dev, NULL);
+@@ -816,9 +815,10 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules,
+ event->name != NULL && !streq(event->name, udev_device_get_sysname(dev))) {
+ char syspath[UTIL_PATH_SIZE];
+ char *pos;
++ int r;
+
+- err = rename_netif(event);
+- if (err == 0) {
++ r = rename_netif(event);
++ if (r >= 0) {
+ log_debug("renamed netif to '%s'", event->name);
+
+ /* remember old name */
+@@ -881,7 +881,6 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules,
+ udev_device_unref(event->dev_db);
+ event->dev_db = NULL;
+ }
+- return err;
+ }
+
+ void udev_event_execute_run(struct udev_event *event, const sigset_t *sigmask)
+diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
+index 2630264..17f47f2 100644
+--- a/src/udev/udev-rules.c
++++ b/src/udev/udev-rules.c
+@@ -2555,10 +2555,15 @@ int udev_rules_apply_static_dev_perms(struct udev_rules *rules)
+ struct stat stats;
+
+ /* we assure, that the permissions tokens are sorted before the static token */
++
+ if (mode == 0 && uid == 0 && gid == 0 && tags == NULL)
+ goto next;
+
+ strscpyl(device_node, sizeof(device_node), "/dev/", rules_str(rules, cur->key.value_off), NULL);
++ if (stat(device_node, &stats) != 0)
++ break;
++ if (!S_ISBLK(stats.st_mode) && !S_ISCHR(stats.st_mode))
++ break;
+
+ /* export the tags to a directory as symlinks, allowing otherwise dead nodes to be tagged */
+ if (tags) {
+@@ -2588,11 +2593,6 @@ int udev_rules_apply_static_dev_perms(struct udev_rules *rules)
+ if (mode == 0 && uid == 0 && gid == 0)
+ break;
+
+- if (stat(device_node, &stats) != 0)
+- break;
+- if (!S_ISBLK(stats.st_mode) && !S_ISCHR(stats.st_mode))
+- break;
+-
+ if (mode == 0) {
+ if (gid > 0)
+ mode = 0660;
+diff --git a/src/udev/udev.h b/src/udev/udev.h
+index 936adfb..62538bc 100644
+--- a/src/udev/udev.h
++++ b/src/udev/udev.h
+@@ -84,7 +84,7 @@ int udev_event_apply_subsys_kernel(struct udev_event *event, const char *string,
+ int udev_event_spawn(struct udev_event *event,
+ const char *cmd, char **envp, const sigset_t *sigmask,
+ char *result, size_t ressize);
+-int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules, const sigset_t *sigset);
++void udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules, const sigset_t *sigset);
+ void udev_event_execute_run(struct udev_event *event, const sigset_t *sigset);
+ int udev_build_argv(struct udev *udev, char *cmd, int *argc, char *argv[]);
+
+diff --git a/src/udev/udevadm-test.c b/src/udev/udevadm-test.c
+index 6cd311b..6a2f548 100644
+--- a/src/udev/udevadm-test.c
++++ b/src/udev/udevadm-test.c
+@@ -43,7 +43,6 @@ static int adm_test(struct udev *udev, int argc, char *argv[])
+ _cleanup_udev_device_unref_ struct udev_device *dev = NULL;
+ _cleanup_udev_event_unref_ struct udev_event *event = NULL;
+ sigset_t mask, sigmask_orig;
+- int err;
+ int rc = 0, c;
+
+ static const struct option options[] = {
+@@ -139,18 +138,16 @@ static int adm_test(struct udev *udev, int argc, char *argv[])
+ goto out;
+ }
+
+- err = udev_event_execute_rules(event, rules, &sigmask_orig);
++ udev_event_execute_rules(event, rules, &sigmask_orig);
+
+ udev_list_entry_foreach(entry, udev_device_get_properties_list_entry(dev))
+ printf("%s=%s\n", udev_list_entry_get_name(entry), udev_list_entry_get_value(entry));
+
+- if (err == 0) {
+- udev_list_entry_foreach(entry, udev_list_get_entry(&event->run_list)) {
+- char program[UTIL_PATH_SIZE];
++ udev_list_entry_foreach(entry, udev_list_get_entry(&event->run_list)) {
++ char program[UTIL_PATH_SIZE];
+
+- udev_event_apply_format(event, udev_list_entry_get_name(entry), program, sizeof(program));
+- printf("run: '%s'\n", program);
+- }
++ udev_event_apply_format(event, udev_list_entry_get_name(entry), program, sizeof(program));
++ printf("run: '%s'\n", program);
+ }
+ out:
+ if (event != NULL && event->fd_signal >= 0)
+diff --git a/src/udev/udevd.c b/src/udev/udevd.c
+index f21c227..93afca1 100644
+--- a/src/udev/udevd.c
++++ b/src/udev/udevd.c
+@@ -288,10 +288,9 @@ static void worker_new(struct event *event)
+ udev_event->exec_delay = exec_delay;
+
+ /* apply rules, create node, symlinks */
+- err = udev_event_execute_rules(udev_event, rules, &sigmask_orig);
++ udev_event_execute_rules(udev_event, rules, &sigmask_orig);
+
+- if (err == 0)
+- udev_event_execute_run(udev_event, &sigmask_orig);
++ udev_event_execute_run(udev_event, &sigmask_orig);
+
+ /* apply/restore inotify watch */
+ if (err == 0 && udev_event->inotify_watch) {
+diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c
+index 0f2b706..645b1e6 100644
+--- a/src/vconsole/vconsole-setup.c
++++ b/src/vconsole/vconsole-setup.c
+@@ -180,6 +180,10 @@ static int font_load(const char *vc, const char *font, const char *map, const ch
+ */
+ static void font_copy_to_all_vcs(int fd) {
+ struct vt_stat vcs = {};
++ unsigned char map8[E_TABSZ];
++ unsigned short map16[E_TABSZ];
++ struct unimapdesc unimapd;
++ struct unipair unipairs[USHRT_MAX];
+ int i, r;
+
+ /* get active, and 16 bit mask of used VT numbers */
+@@ -209,17 +213,35 @@ static void font_copy_to_all_vcs(int fd) {
+ cfo.op = KD_FONT_OP_COPY;
+ cfo.height = vcs.v_active-1; /* tty1 == index 0 */
+ ioctl(vcfd, KDFONTOP, &cfo);
++
++ /* copy map of 8bit chars */
++ if (ioctl(fd, GIO_SCRNMAP, map8) >= 0)
++ ioctl(vcfd, PIO_SCRNMAP, map8);
++
++ /* copy map of 8bit chars -> 16bit Unicode values */
++ if (ioctl(fd, GIO_UNISCRNMAP, map16) >= 0)
++ ioctl(vcfd, PIO_UNISCRNMAP, map16);
++
++ /* copy unicode translation table */
++ /* unimapd is a ushort count and a pointer to an
++ array of struct unipair { ushort, ushort } */
++ unimapd.entries = unipairs;
++ unimapd.entry_ct = USHRT_MAX;
++ if (ioctl(fd, GIO_UNIMAP, &unimapd) >= 0) {
++ struct unimapinit adv = { 0, 0, 0 };
++
++ ioctl(vcfd, PIO_UNIMAPCLR, &adv);
++ ioctl(vcfd, PIO_UNIMAP, &unimapd);
++ }
+ }
+ }
+
+ int main(int argc, char **argv) {
+ const char *vc;
+- char *vc_keymap = NULL;
+- char *vc_keymap_toggle = NULL;
+- char *vc_font = NULL;
+- char *vc_font_map = NULL;
+- char *vc_font_unimap = NULL;
+- int fd = -1;
++ _cleanup_free_ char
++ *vc_keymap = NULL, *vc_keymap_toggle = NULL,
++ *vc_font = NULL, *vc_font_map = NULL, *vc_font_unimap = NULL;
++ _cleanup_close_ int fd = -1;
+ bool utf8;
+ pid_t font_pid = 0, keymap_pid = 0;
+ bool font_copy = false;
+@@ -241,12 +263,12 @@ int main(int argc, char **argv) {
+ fd = open_terminal(vc, O_RDWR|O_CLOEXEC);
+ if (fd < 0) {
+ log_error("Failed to open %s: %m", vc);
+- goto finish;
++ return EXIT_FAILURE;
+ }
+
+ if (!is_vconsole(fd)) {
+ log_error("Device %s is not a virtual console.", vc);
+- goto finish;
++ return EXIT_FAILURE;
+ }
+
+ utf8 = is_locale_utf8();
+@@ -281,27 +303,27 @@ int main(int argc, char **argv) {
+ else
+ disable_utf8(fd);
+
+- r = EXIT_FAILURE;
+- if (keymap_load(vc, vc_keymap, vc_keymap_toggle, utf8, &keymap_pid) >= 0 &&
+- font_load(vc, vc_font, vc_font_map, vc_font_unimap, &font_pid) >= 0)
+- r = EXIT_SUCCESS;
+-
+-finish:
+- if (keymap_pid > 0)
+- wait_for_terminate_and_warn(KBD_LOADKEYS, keymap_pid);
++ r = font_load(vc, vc_font, vc_font_map, vc_font_unimap, &font_pid);
++ if (r < 0) {
++ log_error("Failed to start " KBD_SETFONT ": %s", strerror(-r));
++ return EXIT_FAILURE;
++ }
+
+- if (font_pid > 0) {
++ if (font_pid > 0)
+ wait_for_terminate_and_warn(KBD_SETFONT, font_pid);
+- if (font_copy)
+- font_copy_to_all_vcs(fd);
++
++ r = keymap_load(vc, vc_keymap, vc_keymap_toggle, utf8, &keymap_pid);
++ if (r < 0) {
++ log_error("Failed to start " KBD_LOADKEYS ": %s", strerror(-r));
++ return EXIT_FAILURE;
+ }
+
+- free(vc_keymap);
+- free(vc_font);
+- free(vc_font_map);
+- free(vc_font_unimap);
++ if (keymap_pid > 0)
++ wait_for_terminate_and_warn(KBD_LOADKEYS, keymap_pid);
+
+- safe_close(fd);
++ /* Only copy the font when we started setfont successfully */
++ if (font_copy && font_pid > 0)
++ font_copy_to_all_vcs(fd);
+
+- return r;
++ return EXIT_SUCCESS;
+ }
+diff --git a/tmpfiles.d/systemd.conf b/tmpfiles.d/systemd.conf
+index 7c6d6b9..c470045 100644
+--- a/tmpfiles.d/systemd.conf
++++ b/tmpfiles.d/systemd.conf
+@@ -23,6 +23,6 @@ d /run/systemd/machines 0755 root root -
+ d /run/systemd/shutdown 0755 root root -
+
+ m /var/log/journal 2755 root systemd-journal - -
+-m /var/log/journal/%m 2755 root systemd-journal - -
++Z /var/log/journal/%m 2755 root systemd-journal - -
+ m /run/log/journal 2755 root systemd-journal - -
+-m /run/log/journal/%m 2755 root systemd-journal - -
++Z /run/log/journal/%m 2755 root systemd-journal - -
diff --git a/units/console-getty.service.m4.in b/units/console-getty.service.m4.in
index 8ac51a4..cae9fb5 100644
--- a/units/console-getty.service.m4.in
@@ -294,17 +2731,20 @@ index 552ef89..af3915f 100644
ExecStart=-/sbin/sulogin
ExecStopPost=-@SYSTEMCTL@ --fail --no-block default
diff --git a/units/serial-getty@.service.m4 b/units/serial-getty@.service.m4
-index 4ac51e7..86a3b59 100644
+index 4ac51e7..96daa5c 100644
--- a/units/serial-getty@.service.m4
+++ b/units/serial-getty@.service.m4
-@@ -22,7 +22,6 @@ Before=getty.target
+@@ -22,10 +22,8 @@ Before=getty.target
IgnoreOnIsolate=yes
[Service]
-ExecStart=-/sbin/agetty --keep-baud 115200,38400,9600 %I $TERM
Type=idle
Restart=always
- RestartSec=0
+-RestartSec=0
+ UtmpIdentifier=%I
+ TTYPath=/dev/%I
+ TTYReset=yes
diff --git a/units/sysinit.target b/units/sysinit.target
index 8f4fb8f..e0f0147 100644
--- a/units/sysinit.target
@@ -354,6 +2794,18 @@ index de93879..c9a49f3 100644
+# journald to stop logging (see
+# https://bugs.freedesktop.org/show_bug.cgi?id=56043).
+X-RestartIfChanged=no
+diff --git a/units/systemd-nspawn@.service.in b/units/systemd-nspawn@.service.in
+index ff36e90..e373628 100644
+--- a/units/systemd-nspawn@.service.in
++++ b/units/systemd-nspawn@.service.in
+@@ -11,6 +11,7 @@ Documentation=man:systemd-nspawn(1)
+
+ [Service]
+ ExecStart=@bindir@/systemd-nspawn --quiet --keep-unit --boot --link-journal=guest --directory=/var/lib/container/%i
++KillMode=mixed
+ Type=notify
+
+ [Install]
diff --git a/units/systemd-random-seed.service.in b/units/systemd-random-seed.service.in
index 1879b2f..9b895b9 100644
--- a/units/systemd-random-seed.service.in
diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix
index 1dd7c0c089f..123f8e4354b 100644
--- a/pkgs/os-specific/linux/util-linux/default.nix
+++ b/pkgs/os-specific/linux/util-linux/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, zlib, ncurses ? null, perl ? null, pam }:
stdenv.mkDerivation rec {
- name = "util-linux-2.24.2";
+ name = "util-linux-2.25.1";
src = fetchurl {
- url = "http://www.kernel.org/pub/linux/utils/util-linux/v2.24/${name}.tar.xz";
- sha256 = "1w0g8q5aj5pjdf8l52g0mxyvlk62f4dch51q9jm3hnqwgz0dchqj";
+ url = "mirror://kernel/linux/utils/util-linux/v2.25/${name}.tar.xz";
+ sha256 = "4701305ae22790c3a92ce48e50794fa05b7ee01f4227f419a171c100d08986e8";
};
crossAttrs = {
diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix
index 962aca77753..4d5f585e7d7 100644
--- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix
+++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix
@@ -3,11 +3,11 @@
, ncurses, pkgconfig, randrproto, xorgserver, xproto, udev, libXinerama, pixman }:
stdenv.mkDerivation rec {
- name = "xf86-input-wacom-0.25.99.1";
+ name = "xf86-input-wacom-0.26.1";
src = fetchurl {
url = "mirror://sourceforge/linuxwacom/${name}.tar.bz2";
- sha256 = "0vjl4m1w6j5j9yr2kw6f66n723ghq5jwxivbdjmacjw6r3ml4l9r";
+ sha256 = "1qlls71k10igjx9c5lwqa6cdl31ncpdkzirpl85acpmqbqc63qh8";
};
buildInputs = [ inputproto libX11 libXext libXi libXrandr libXrender
diff --git a/pkgs/servers/amqp/qpid-cpp/default.nix b/pkgs/servers/amqp/qpid-cpp/default.nix
index 69c0a3dff41..6a71994091d 100644
--- a/pkgs/servers/amqp/qpid-cpp/default.nix
+++ b/pkgs/servers/amqp/qpid-cpp/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1c03yi19d5h5h78h37add9csmy0mzvvmvn7zkcalwszabdhsb5yk";
};
- buildInputs = [ cmake python boost libuuid ruby ];
+ buildInputs = [ cmake python boost boost.lib libuuid ruby ];
# the subdir managementgen wants to install python stuff in ${python} and
# the installation tries to create some folders in /var
diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix
index 09b091b323c..b5f9195abbd 100644
--- a/pkgs/servers/amqp/rabbitmq-server/default.nix
+++ b/pkgs/servers/amqp/rabbitmq-server/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "rabbitmq-server-${version}";
- version = "3.3.4";
+ version = "3.3.5";
src = fetchurl {
url = "http://www.rabbitmq.com/releases/rabbitmq-server/v${version}/${name}.tar.gz";
- sha256 = "13nnsn34b44mz8w4b69bcpxmq4daqnxzd0lppg0f138pcssha43l";
+ sha256 = "1hkhkpv2f0nzvw09zfrqg89mphdpn4nwvzrlqnhqf82bd2pzhsvs";
};
buildInputs =
diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix
index 585228af2b4..9b965505369 100644
--- a/pkgs/servers/bird/default.nix
+++ b/pkgs/servers/bird/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, flex, bison, readline }:
stdenv.mkDerivation rec {
- name = "bird-1.4.0";
+ name = "bird-1.4.4";
src = fetchurl {
url = "ftp://bird.network.cz/pub/bird/${name}.tar.gz";
- sha256 = "1ickqvzpnyycq4a0l4d0kvf25pvq2vjayc0whqfv1233nb5426ys";
+ sha256 = "0dh14zi3v1j0iwxxcyfymfdyaxxmilfbf3bc4mwj682jb3x6ll7g";
};
buildInputs = [ flex bison readline ];
diff --git a/pkgs/servers/computing/torque/default.nix b/pkgs/servers/computing/torque/default.nix
new file mode 100644
index 00000000000..d95e929ff82
--- /dev/null
+++ b/pkgs/servers/computing/torque/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, openssl, flex, bison, pkgconfig, groff, libxml2, utillinux }:
+
+stdenv.mkDerivation rec {
+ name = "torque-4.2.8";
+
+ src = fetchurl {
+ name = "${name}.tar.gz";
+ url = "http://www.adaptivecomputing.com/index.php?wpfb_dl=2730";
+ sha256 = "1sjpvndzm9ccdmfwdf9887ppmapawfsh5qdkzr92kadg5jxp796j";
+ };
+
+ buildInputs = [ openssl flex bison pkgconfig groff libxml2 utillinux ];
+
+ enableParallelBuilding = true;
+
+ preConfigure = ''
+ for s in fifo cray_t3e dec_cluster msic_cluster sgi_origin umn_cluster; do
+ substituteInPlace src/scheduler.cc/samples/$s/Makefile.in \
+ --replace "schedprivdir = " "schedprivdir = $out/"
+ done
+
+ for f in $(find ./ -name Makefile.in); do
+ echo patching $f...
+ sed -i $f -e '/PBS_MKDIRS/d'
+ done
+ '';
+
+ postInstall = ''
+ mv $out/sbin/* $out/bin/
+ rmdir $out/sbin
+ cp -v buildutils/pbs_mkdirs $out/bin/
+ cp -v torque.setup $out/bin/
+ chmod +x $out/bin/pbs_mkdirs $out/bin/torque.setup
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = http://www.adaptivecomputing.com/products/open-source/torque;
+ description = "Resource management system for submitting and controlling jobs on supercomputers, clusters, and grids";
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix
index 5282541e2f9..9244ee2f2cf 100644
--- a/pkgs/servers/consul/default.nix
+++ b/pkgs/servers/consul/default.nix
@@ -1,9 +1,11 @@
-{ stdenv, lib, go, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }:
+{ stdenv, lib, go, fetchgit, fetchhg, fetchbzr, fetchFromGitHub
+, ruby, rubyLibs, nodejs }:
let
- version = "0.3.0";
+ version = "0.4.0";
in
+with lib;
stdenv.mkDerivation {
name = "consul-${version}";
@@ -11,22 +13,44 @@ stdenv.mkDerivation {
inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub;
};
- buildInputs = [ go ];
+ buildInputs = [ go ruby rubyLibs.sass nodejs ];
+
+ configurePhase = flip concatMapStrings
+ (with rubyLibs; [ execjs json minitest rake rdoc sass uglifier ])
+ (gem: ''
+ export GEM_PATH="$GEM_PATH:${gem}/${ruby.gemPath}"
+ '');
buildPhase = ''
+ # Build consul binary
export GOPATH=$src
go build -v -o consul github.com/hashicorp/consul
+
+ # Build ui static files
+ ({
+ cp -r src/github.com/hashicorp/consul/ui .
+ cd ui
+ chmod -R u+w .
+ make dist
+ })
'';
+ outputs = [ "out" "ui" ];
+
installPhase = ''
- ensureDir $out/bin
+ # Install consul binary
+ mkdir -p $out/bin
cp consul $out/bin
+
+ # Install ui static files
+ mkdir -p $ui
+ mv ui/dist/* $ui
'';
meta = with lib; {
homepage = http://www.consul.io/;
description = "A tool for service discovery, monitoring and configuration";
- maintainers = with maintainers; [ cstrahan ];
+ maintainers = with maintainers; [ cstrahan wkennington ];
license = licenses.mpl20 ;
platforms = platforms.unix;
};
diff --git a/pkgs/servers/consul/deps.nix b/pkgs/servers/consul/deps.nix
index c1ebcf80928..c6e7cb735fe 100644
--- a/pkgs/servers/consul/deps.nix
+++ b/pkgs/servers/consul/deps.nix
@@ -2,22 +2,6 @@
let
goDeps = [
- {
- root = "code.google.com/p/go.net";
- src = fetchhg {
- url = "http://code.google.com/p/go.net";
- rev = "134";
- sha256 = "1jycpgrfwgkfac60zjbx6babcz7sgyn9xgy6cr3l811j6k8r2pbv";
- };
- }
- {
- root = "code.google.com/p/go.text";
- src = fetchhg {
- url = "http://code.google.com/p/go.text";
- rev = "85";
- sha256 = "1x8h6vq9g5gbi7iiwla6dkaaqqf7wmkdm4szj7wvzlsijf2x8dwr";
- };
- }
{
root = "github.com/armon/circbuf";
src = fetchFromGitHub {
@@ -27,13 +11,31 @@ let
sha256 = "06kwwdwa3hskdh6ws7clj1vim80dyc3ldim8k9y5qpd30x0avn5s";
};
}
+ {
+ root = "github.com/armon/consul-api";
+ src = fetchFromGitHub {
+ owner = "armon";
+ repo = "consul-api";
+ rev = "045662de1042be0662fe4a1e21b57c8f7669261a";
+ sha256 = "1cdf9mpfa97qwzc0nz0788d97xmwh08dsvqmkmijrdm2a6c07q1r";
+ };
+ }
{
root = "github.com/armon/go-metrics";
src = fetchFromGitHub {
owner = "armon";
repo = "go-metrics";
- rev = "02567bbc4f518a43853d262b651a3c8257c3f141";
- sha256 = "08fk3zmw0ywmdfp2qhrpv0vrk1y97hzqczrgr3y2yip3x8sr37ar";
+ rev = "2b75159ce5d3641fb35b5a159cff309ac3cf4177";
+ sha256 = "1fjsa7r97zlpdzi5l7qvgyabznn5pm6bpwi1rgrwaxh7gc3a28vi";
+ };
+ }
+ {
+ root = "github.com/armon/go-radix";
+ src = fetchFromGitHub {
+ owner = "armon";
+ repo = "go-radix";
+ rev = "b045fc0ad3587e8620fb42a0dea882cf8c08aef9";
+ sha256 = "1p09dwhngaszbr9si68xl1la74i359l0wibhhirpxrc8q4pgjplx";
};
}
{
@@ -45,22 +47,22 @@ let
sha256 = "0hiw5qkkyfd22v291w7rbnlrb4kraqzbkjfx2dvl7rqchkb0hv68";
};
}
- {
- root = "github.com/armon/mdns";
- src = fetchFromGitHub {
- owner = "armon";
- repo = "mdns";
- rev = "70462deb060d44247356ee238ebafd7699ddcffe";
- sha256 = "0xkm3d0hsixdm1yrkx9c39723kfjkb3wvrzrmx3np9ylcwn6h5p5";
- };
- }
{
root = "github.com/hashicorp/consul";
src = fetchFromGitHub {
owner = "hashicorp";
repo = "consul";
- rev = "441d613e1bd96254c78c46ee7c1b35c161fc7295";
- sha256 = "1v06ygzsvc9c02yxpxnnm407kd30fc46b2146k5zrk1v8lq0f91j";
+ rev = "e1d87dee26c05cea64342fadd2a728894b764aec";
+ sha256 = "0y05pjvvxlamf74s15pcgv48xyd6116m5lyyd7jkh28lb3l2fykf";
+ };
+ }
+ {
+ root = "github.com/hashicorp/go-checkpoint";
+ src = fetchFromGitHub {
+ owner = "hashicorp";
+ repo = "go-checkpoint";
+ rev = "89ef2a697dd8cdb4623097d5bb9acdb19a470767";
+ sha256 = "0mfykh9jkh1m2zxlm2df4j5i6hd6iq1kc8afjladdhcqyrkwcch0";
};
}
{
@@ -72,6 +74,24 @@ let
sha256 = "1r9s1gsa4azcs05gx1179ixk7qvrkrik3v92wr4s8gwm00m0gf81";
};
}
+ {
+ root = "github.com/hashicorp/golang-lru";
+ src = fetchFromGitHub {
+ owner = "hashicorp";
+ repo = "golang-lru";
+ rev = "4dfff096c4973178c8f35cf6dd1a732a0a139370";
+ sha256 = "16x78183xzk9bjn7il71l3mff3rqjwc88q9fpbj5i65kvl5ws9di";
+ };
+ }
+ {
+ root = "github.com/hashicorp/hcl";
+ src = fetchFromGitHub {
+ owner = "hashicorp";
+ repo = "hcl";
+ rev = "9b5d9eb9b09475889ae49a4a613c60280875b3d1";
+ sha256 = "02x5by78a3bblzqnhl9dm98wz61h0vkk1wcw7mx6480a7qj5jx3m";
+ };
+ }
{
root = "github.com/hashicorp/logutils";
src = fetchFromGitHub {
@@ -86,8 +106,8 @@ let
src = fetchFromGitHub {
owner = "hashicorp";
repo = "memberlist";
- rev = "17d39b695094be943bfb98442a80b082e6b9ac47";
- sha256 = "0nvgjnwmfqhv2wvr77d2q5mq1bfw4xbpil6wgyj4fyrmhsfzrv3g";
+ rev = "def5afe3702fce72d72922fb44ef2b8e5608b205";
+ sha256 = "1ch8c160nkqb79ql59vgpnf9kfq2v38xjrprvfv4hmnpmf6yx6i2";
};
}
{
@@ -95,8 +115,8 @@ let
src = fetchFromGitHub {
owner = "hashicorp";
repo = "raft";
- rev = "8bdafd1e83e7d85ffeb5dc8f0857dbddd61edba5";
- sha256 = "1yv3v0vhw5hgqqhh20jhyba2lpkkmmj80lfgf7v4vgjb0y3jqy6x";
+ rev = "35f5fa082f5a064595d84715b0cf8821f002e9ac";
+ sha256 = "0s5qhs19n0rxdhsxw77q5sjw4hrkfggxz3w0p3szcd8rsnpfswkg";
};
}
{
@@ -104,8 +124,8 @@ let
src = fetchFromGitHub {
owner = "hashicorp";
repo = "raft-mdb";
- rev = "70e1c88f4b6fb06fc94cc02109243160a443609d";
- sha256 = "1031yqgb91ch79m41gl8prrymlh4y4k9yklmbv3qvxkfqirdv247";
+ rev = "95d26447c3c54581de2bb102ecc3344079b234bd";
+ sha256 = "1fqf7s2snzbjzxy1k04wdfkqsrxddp6iz72b9hxz9jmgx3l7nl2z";
};
}
{
@@ -113,8 +133,17 @@ let
src = fetchFromGitHub {
owner = "hashicorp";
repo = "serf";
- rev = "83f220b4faa0614f49649156118b750b5b12fafb";
- sha256 = "144a4g5yfcjv1jnl3mi4jcwy4cd970h1924cdas2s7bcdx6kpnv4";
+ rev = "v0.6.3";
+ sha256 = "0ck77ji28bvm4ahzxyyi4sm17c3fxc16k0k5mihl1nlkgdd73m8y";
+ };
+ }
+ {
+ root = "github.com/hashicorp/terraform";
+ src = fetchFromGitHub {
+ owner = "hashicorp";
+ repo = "terraform";
+ rev = "v0.2.2";
+ sha256 = "05hy9vq8b05nxbmm277ll6p7ncjhxifnqii8y1dralz5x3cw27r3";
};
}
{
@@ -140,8 +169,8 @@ let
src = fetchFromGitHub {
owner = "miekg";
repo = "dns";
- rev = "05cfaca9f0712f44206ecbfa65a6769434164e7a";
- sha256 = "1qc12v5yqlsi1mg18i10pvz9g4a5diqzp73q5n4m00gyk41q855j";
+ rev = "5cdb7e11a3f60c88cf2dbce42866e7b42c74b394";
+ sha256 = "0glzs9r2i5vrncb3skdl987mdzqj2w86fqr5aj64lqgp7ghwj6hw";
};
}
{
@@ -149,8 +178,8 @@ let
src = fetchFromGitHub {
owner = "mitchellh";
repo = "cli";
- rev = "975a7477b1507ea6bb888c48108e05d26fb30434";
- sha256 = "0gxjizg8pf5p3zj04k7cpkwf8l2q9j1j270j2bw0wv2d2pgn6z5l";
+ rev = "bfacda5ba006a32b10ddfe2abad56c11661573eb";
+ sha256 = "0lzvsya04nh7m804azanhs28vsk4g8knw3yay2yx4wffikbkjbgk";
};
}
{
@@ -158,8 +187,8 @@ let
src = fetchFromGitHub {
owner = "mitchellh";
repo = "mapstructure";
- rev = "6fb2c832bcac61d01212ab1d172f7a14a8585b07";
- sha256 = "0mx855lwhv0rk461wmbnbzbpkhmq5p2ipmrm5bhzimagrr1w17hw";
+ rev = "740c764bc6149d3f1806231418adb9f52c11bcbf";
+ sha256 = "0rlz93rmz465nr0wmzvq1n58yc0qdw7v1chr6zmj9jj9pix0a7cb";
};
}
{
@@ -167,7 +196,7 @@ let
src = fetchFromGitHub {
owner = "ryanuber";
repo = "columnize";
- rev = "785d943a7b6886e0bb2f139a60487b823dd8d9de";
+ rev = "v2.0.1";
sha256 = "1h3sxzhiwz65vf3cvclirlf6zhdr97v01dpn5cmf3m09rxxpnp3f";
};
}
@@ -176,51 +205,8 @@ let
src = fetchFromGitHub {
owner = "ugorji";
repo = "go";
- rev = "71c2886f5a673a35f909803f38ece5810165097b";
- sha256 = "157f24xnkhclrjwwa1b7lmpj112ynlbf7g1cfw0c657iqny5720j";
- };
- }
- {
- root = "github.com/ugorji/go-msgpack";
- src = fetchFromGitHub {
- owner = "ugorji";
- repo = "go-msgpack";
- rev = "75092644046c5e38257395b86ed26c702dc95b92";
- sha256 = "1bmqi16bfiqw7qhb3d5hbh0dfzhx2bbq1g15nh2pxwxckwh80x98";
- };
- }
- {
- root = "github.com/vmihailenco/bufio";
- src = fetchFromGitHub {
- owner = "vmihailenco";
- repo = "bufio";
- rev = "24e7e48f60fc2d9e99e43c07485d9fff42051e66";
- sha256 = "0x46qnf2f15v7m0j2dcb16raxjamk5rdc7hqwgyxfr1sqmmw3983";
- };
- }
- {
- root = "github.com/vmihailenco/msgpack";
- src = fetchFromGitHub {
- owner = "vmihailenco";
- repo = "msgpack";
- rev = "20c1b88a6c7fc5432037439f4e8c582e236fb205";
- sha256 = "1dj5scpfhgnw0yrh0w6jlrb9d03halvsv4l3wgjhazrrimdqf0q0";
- };
- }
- {
- root = "launchpad.net/gocheck";
- src = fetchbzr {
- url = "https://launchpad.net/gocheck";
- rev = "87";
- sha256 = "1y9fa2mv61if51gpik9isls48idsdz87zkm1p3my7swjdix7fcl0";
- };
- }
- {
- root = "launchpad.net/mgo";
- src = fetchbzr {
- url = "https://launchpad.net/mgo";
- rev = "2";
- sha256 = "0h1dxzyx5c4r4gfnmjxv92hlhjxrgx9p4g53p4fhmz6x2fdglb0x";
+ rev = "e906e395b9d45d3230e800c8ad1f92f99764e753";
+ sha256 = "0dqzbxa4ziw10sa5ksl8sfzm0rhrddp6gs732zs9bjkq4rl50j89";
};
}
];
diff --git a/pkgs/servers/consul/ui.nix b/pkgs/servers/consul/ui.nix
deleted file mode 100644
index d1c04f959cb..00000000000
--- a/pkgs/servers/consul/ui.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ stdenv, fetchzip }:
-
-let
- version = "0.3.0";
- meta = with stdenv.lib; {
- homepage = http://www.consul.io/intro/getting-started/ui.html;
- description = "The static files for Consul's UI (used via -ui-dir)";
- maintainers = with maintainers; [ cstrahan ];
- license = licenses.mpl20 ;
- platforms = platforms.all;
- };
-in (fetchzip {
- name = "consul-ui-${version}";
- url = "https://dl.bintray.com/mitchellh/consul/${version}_web_ui.zip";
- sha256 = "0p4mhlrqidd6p3899wd3i9p41bdbb5avbz5986mnxg9f7dvhjdrc";
-}) // { inherit meta; }
-
diff --git a/pkgs/servers/dict/default.nix b/pkgs/servers/dict/default.nix
index 1fb7c24418f..ee0477734c2 100644
--- a/pkgs/servers/dict/default.nix
+++ b/pkgs/servers/dict/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Dict protocol server and client";
- maintainers = maintainers.mornfall;
+ maintainers = [ maintainers.mornfall ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/servers/dict/libmaa.nix b/pkgs/servers/dict/libmaa.nix
index c63306e1ff4..833aaa95b0c 100644
--- a/pkgs/servers/dict/libmaa.nix
+++ b/pkgs/servers/dict/libmaa.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Dict protocol server and client";
- maintainers = maintainers.mornfall;
+ maintainers = [ maintainers.mornfall ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/servers/diod/default.nix b/pkgs/servers/diod/default.nix
index 0753df43be5..dcda4e8c0bb 100644
--- a/pkgs/servers/diod/default.nix
+++ b/pkgs/servers/diod/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, munge, lua5, libcap, perl, ncurses }:
+{ stdenv, fetchurl, munge, lua, libcap, perl, ncurses }:
stdenv.mkDerivation rec {
name = "diod-${version}";
- version = "1.0.22";
+ version = "1.0.23";
src = fetchurl {
url = "https://github.com/chaos/diod/releases/download/${version}/${name}.tar.gz";
- sha256 = "0h92zadbkq4fjhqjzq17cl3x7bdkz2yakpcl0nccv4ml0gwfbx27";
+ sha256 = "002vxc9fwdwshda4jydxagr63xd6nnhbc6fh73974gi2pvp6gid3";
};
- buildInputs = [ munge lua5 libcap perl ncurses ];
+ buildInputs = [ munge lua libcap perl ncurses ];
meta = {
description = "An I/O forwarding server that implements a variant of the 9P protocol";
diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix
index 7279aa6d4ef..c0b460778d9 100644
--- a/pkgs/servers/dns/nsd/default.nix
+++ b/pkgs/servers/dns/nsd/default.nix
@@ -1,34 +1,44 @@
{ config, stdenv, fetchurl, libevent, openssl
+, bind8Stats ? false
+, checking ? false
+, ipv6 ? true
+, mmap ? false
+, minimalResponses ? true
+, nsec3 ? true
+, ratelimit ? false
+, recvmmsg ? false
+, rootServer ? false
}:
stdenv.mkDerivation rec {
- name = "nsd-4.0.3";
+ name = "nsd-4.1.0";
src = fetchurl {
url = "http://www.nlnetlabs.nl/downloads/nsd/${name}.tar.gz";
- sha256 = "4bf05f2234e1b41899198aa1070f409201fc3c4980feef6567cd92c7074c4a8b";
+ sha256 = "ec3f6902f6f26a6b9248dcd7e9f42472fa52755740b4ba6b9d3bd08910b39b62";
};
buildInputs = [ libevent openssl ];
configureFlags =
- let flag = state: flags: if state then map (x: "--enable-${x}") flags
- else map (x: "--disable-${x}") flags;
- in flag (config.nsd.bind8Stats or false) [ "bind8-stats" ]
- ++ flag (config.nsd.checking or false) [ "checking" ]
- ++ flag (config.nsd.ipv6 or true) [ "ipv6" ]
- ++ flag (config.nsd.mmap or false) [ "mmap" ]
- ++ flag (config.nsd.minimalResponses or true) [ "minimal-responses" ]
- ++ flag (config.nsd.nsec3 or true) [ "nsec3" ]
- ++ flag (config.nsd.ratelimit or false) [ "ratelimit" ]
- ++ flag (config.nsd.recvmmsg or false) [ "recvmmsg" ]
- ++ flag (config.nsd.rootServer or false) [ "root-server" ]
+ let edf = c: o: if c then ["--enable-${o}"] else ["--disable-${o}"];
+ in edf bind8Stats "bind8-stats"
+ ++ edf checking "checking"
+ ++ edf ipv6 "ipv6"
+ ++ edf mmap "mmap"
+ ++ edf minimalResponses "minimal-responses"
+ ++ edf nsec3 "nsec3"
+ ++ edf ratelimit "ratelimit"
+ ++ edf recvmmsg "recvmmsg"
+ ++ edf rootServer "root-server"
++ [ "--with-ssl=${openssl}" "--with-libevent=${libevent}" ];
- meta = {
- description = "Authoritative only, high performance, simple and open source name server.";
- license = "BSD";
+ meta = with stdenv.lib; {
homepage = http://www.nlnetlabs.nl;
- platforms = with stdenv.lib.platforms; linux;
+ description = "Authoritative only, high performance, simple and open source name server";
+ license = licenses.bsd3;
+
+ platforms = platforms.unix;
+ maintainers = [ maintainers.hrdinka ];
};
}
diff --git a/pkgs/servers/http/apache-httpd/2.2.nix b/pkgs/servers/http/apache-httpd/2.2.nix
index e5e2e2215b4..eb9c6846089 100644
--- a/pkgs/servers/http/apache-httpd/2.2.nix
+++ b/pkgs/servers/http/apache-httpd/2.2.nix
@@ -12,12 +12,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null;
assert mpm == "prefork" || mpm == "worker" || mpm == "event";
stdenv.mkDerivation rec {
- version = "2.2.27";
+ version = "2.2.29";
name = "apache-httpd-${version}";
src = fetchurl {
url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
- sha256 = "0iw19y6knijinqwvv4q16fgq5xq8nwxdg14wrrbc0mfasvg76n90";
+ sha1 = "1d6a8fbc1391d358cc6fe430edc16222b97258d5";
};
buildInputs = [perl apr aprutil pcre] ++
diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
index 07dff1cf585..7aded47dad1 100644
--- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
@@ -1,11 +1,12 @@
{ stdenv, fetchurl, apacheHttpd, python }:
-stdenv.mkDerivation {
- name = "mod_wsgi-3.4";
+stdenv.mkDerivation rec {
+ name = "mod_wsgi-${version}";
+ version = "3.5";
src = fetchurl {
- url = "http://modwsgi.googlecode.com/files/mod_wsgi-3.4.tar.gz";
- sha256 = "1s5nnjssvcl6lzy7kxmrk47yz6sgfzk90i1y7jml0s0lks7ck1df";
+ url = "https://github.com/GrahamDumpleton/mod_wsgi/archive/${version}.tar.gz";
+ sha256 = "14xz422jlakdhxzsl8xs9if86yf1fnkwdg0havjyqs7my0w4qrzh";
};
buildInputs = [ apacheHttpd python ];
@@ -17,7 +18,7 @@ stdenv.mkDerivation {
'';
meta = {
- homepage = "http://code.google.com/p/modwsgi/";
+ homepage = http://code.google.com/p/modwsgi/;
description = "Host Python applications in Apache through the WSGI interface";
license = stdenv.lib.licenses.asl20;
diff --git a/pkgs/servers/http/mini-httpd/default.nix b/pkgs/servers/http/mini-httpd/default.nix
index b8848f1e5d8..3a1cf687069 100644
--- a/pkgs/servers/http/mini-httpd/default.nix
+++ b/pkgs/servers/http/mini-httpd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, boostHeaders }:
+{ stdenv, fetchurl, boost }:
stdenv.mkDerivation rec {
name = "mini-httpd-1.4";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1i46klkx2ca1cgmlilajkx8gf7b7d7c2sj58llxfllh184pb6cpd";
};
- buildInputs = [ boostHeaders ];
+ buildInputs = [ boost ];
enableParallelBuilding = true;
diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix
index 903cf038d6e..e5c9b9b9456 100644
--- a/pkgs/servers/http/nginx/default.nix
+++ b/pkgs/servers/http/nginx/default.nix
@@ -1,49 +1,70 @@
-{ stdenv, fetchurl, fetchgit, openssl, zlib, pcre, libxml2, libxslt, expat
-, gd, geoip
+{ stdenv, fetchurl, fetchFromGitHub, openssl, zlib, pcre, libxml2, libxslt, expat
+, gd, geoip, luajit
, rtmp ? false
, fullWebDAV ? false
, syslog ? false
, moreheaders ? false
-, echo ? false }:
+, echo ? false
+, ngx_lua ? false }:
with stdenv.lib;
let
- version = "1.6.1";
+ version = "1.6.2";
mainSrc = fetchurl {
url = "http://nginx.org/download/nginx-${version}.tar.gz";
- sha256 = "0rv0hds8dhanh8fz8qv5jj7p96q4sl158w6aq814dvxfl61fdkzm";
+ sha256 = "060s77qxhkn02fjkcndsr0xppj2bppjzkj0gn84svrykb4lqqq5m";
};
- rtmp-ext = fetchgit {
- url = https://github.com/arut/nginx-rtmp-module.git;
- rev = "8c2229cce5d4d4574e8fb7b130281497f746f0fa";
- sha256 = "6caea2a13161345c3fc963679730be54cebebddf1406ac7d4ef4ce72ac0b90b0";
+ rtmp-ext = fetchFromGitHub {
+ owner = "arut";
+ repo = "nginx-rtmp-module";
+ rev = "v1.1.5";
+ sha256 = "1d9ws4prxz22yq3nhh5h18jrs331zivrdh784l6wznc1chg3gphn";
};
- dav-ext = fetchgit {
- url = "https://github.com/arut/nginx-dav-ext-module";
- rev = "89d582d31ab624ff1c6a4cec0c1a52839507b323";
- sha256 = "2175f83a291347504770d2a4bb5069999e9f7408697bd49464b6b54e994493e1";
+ dav-ext = fetchFromGitHub {
+ owner = "arut";
+ repo = "nginx-dav-ext-module";
+ rev = "v0.0.3";
+ sha256 = "1qck8jclxddncjad8yv911s9z7lrd58bp96jf13m0iqk54xghx91";
};
- syslog-ext = fetchgit {
- url = https://github.com/yaoweibin/nginx_syslog_patch.git;
- rev = "3ca5ba65541637f74467038aa032e2586321d0cb";
- sha256 = "15z9r17lx42fdcw8lalddc86wpabgmc1rqi7f90v4mcirjzrpgyi";
+ syslog-ext = fetchFromGitHub {
+ owner = "yaoweibin";
+ repo = "nginx_syslog_patch";
+ rev = "v0.25";
+ sha256 = "0734f884838wcjyrrddn8wzj834wid1zffrk093jrx18447cryxl";
};
- moreheaders-ext = fetchgit {
- url = https://github.com/openresty/headers-more-nginx-module.git;
- rev = "0c6e05d3125a97892a250e9ba8b7674163ba500b";
- sha256 = "e121d97fd3c81c64e6cbf6902bbcbdb01be9ac985c6832d40434379d5e998eaf";
+ moreheaders-ext = fetchFromGitHub {
+ owner = "openresty";
+ repo = "headers-more-nginx-module";
+ rev = "v0.25";
+ sha256 = "1d71y1i0smi4gkzz731fhn58gr03b3s6jz6ipnfzxxaizmgxm3rb";
};
- echo-ext = fetchgit {
- url = https://github.com/openresty/echo-nginx-module.git;
- rev = "refs/tags/v0.53";
- sha256 = "90d4e3a49c678019f4f335bc18529aa108fcc9cfe0747ea4e2f6084a70da2868";
+ echo-ext = fetchFromGitHub {
+ owner = "openresty";
+ repo = "echo-nginx-module";
+ rev = "v0.56";
+ sha256 = "03vaf1ffhkj2s089f90h45n079h3zw47h6y5zpk752f4ydiagpgd";
};
+
+ develkit-ext = fetchFromGitHub {
+ owner = "simpl";
+ repo = "ngx_devel_kit";
+ rev = "v0.2.19";
+ sha256 = "1cqcasp4lc6yq5pihfcdw4vp4wicngvdc3nqg3bg52r63c1qrz76";
+ };
+
+ lua-ext = fetchFromGitHub {
+ owner = "openresty";
+ repo = "lua-nginx-module";
+ rev = "v0.9.12";
+ sha256 = "0r07q1n3nvi7m3l8zk7nfk0z9kjhqknav61ys9lshh2ylsmz1lf4";
+ };
+
in
stdenv.mkDerivation rec {
@@ -52,7 +73,11 @@ stdenv.mkDerivation rec {
buildInputs =
[ openssl zlib pcre libxml2 libxslt gd geoip
- ] ++ optional fullWebDAV expat;
+ ] ++ optional fullWebDAV expat
+ ++ optional ngx_lua luajit;
+
+ LUAJIT_LIB = if ngx_lua then "${luajit}/lib" else "";
+ LUAJIT_INC = if ngx_lua then "${luajit}/include/luajit-2.0" else "";
patches = if syslog then [ "${syslog-ext}/syslog-1.5.6.patch" ] else [];
@@ -83,6 +108,7 @@ stdenv.mkDerivation rec {
++ optional syslog "--add-module=${syslog-ext}"
++ optional moreheaders "--add-module=${moreheaders-ext}"
++ optional echo "--add-module=${echo-ext}"
+ ++ optional ngx_lua "--add-module=${develkit-ext} --add-module=${lua-ext}"
++ optional (elem stdenv.system (with platforms; linux ++ freebsd)) "--with-file-aio";
diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix
index 571cd215356..8c878e856b8 100644
--- a/pkgs/servers/http/openresty/default.nix
+++ b/pkgs/servers/http/openresty/default.nix
@@ -7,11 +7,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "openresty-${version}";
- version = "1.7.4.1rc1";
+ version = "1.7.4.1rc2";
src = fetchurl {
url = "http://openresty.org/download/ngx_openresty-${version}.tar.gz";
- sha256 = "1j976kmbdv07j3n7bwkpdrjs8hlm13mzzdmfbsfwyxpnk034v0j1";
+ sha256 = "1208snm0g1x2p9ybl8br7mmcl5c4g4xzhm80n5jfjprr85gb7ajx";
};
buildInputs = [ openssl zlib pcre libxml2 libxslt gd geoip perl ];
@@ -41,8 +41,12 @@ stdenv.mkDerivation rec {
postInstall = ''
mv $out/nginx/sbin $out/bin
- ln -s $out/bin/nginx $out/bin/openresty
+ mv $out/bin/sbin $out/sbin
+
mv $out/luajit/bin/luajit-2.1.0-alpha $out/bin/luajit-openresty
+ ln -s $out/sbin/nginx $out/sbin/openresty
+ ln -s $out/sbin/nginx $out/bin/openresty
+ ln -s $out/sbin/nginx $out/bin/nginx
'';
preConfigure = ''
diff --git a/pkgs/servers/http/tomcat/6.0.nix b/pkgs/servers/http/tomcat/6.0.nix
index ee0049ce08f..19f20cc8823 100644
--- a/pkgs/servers/http/tomcat/6.0.nix
+++ b/pkgs/servers/http/tomcat/6.0.nix
@@ -1,23 +1,6 @@
-{ stdenv, fetchurl }:
-
-let version = "6.0.39"; in
-
-stdenv.mkDerivation rec {
- name = "apache-tomcat-${version}";
-
- src = fetchurl {
- url = "mirror://apache/tomcat/tomcat-6/v${version}/bin/${name}.tar.gz";
+import ./recent.nix
+ {
+ versionMajor = "6";
+ versionMinor = "0.39";
sha256 = "19qix6affhc252n03smjf482drg3nxd27shni1gvhphgj3zfmgfy";
- };
-
- installPhase =
- ''
- mkdir $out
- mv * $out
- '';
-
- meta = {
- homepage = http://tomcat.apache.org/;
- description = "An implementation of the Java Servlet and JavaServer Pages technologies";
- };
-}
+ }
diff --git a/pkgs/servers/http/tomcat/7.0.nix b/pkgs/servers/http/tomcat/7.0.nix
new file mode 100644
index 00000000000..87bc57eb2b6
--- /dev/null
+++ b/pkgs/servers/http/tomcat/7.0.nix
@@ -0,0 +1,6 @@
+import ./recent.nix
+ {
+ versionMajor = "7";
+ versionMinor = "0.55";
+ sha256 = "c20934fda63bc7311e2d8e067d67f886890c8be72280425c5f6f8fdd7a376c15";
+ }
diff --git a/pkgs/servers/http/tomcat/8.0.nix b/pkgs/servers/http/tomcat/8.0.nix
new file mode 100644
index 00000000000..63b8d2bbc94
--- /dev/null
+++ b/pkgs/servers/http/tomcat/8.0.nix
@@ -0,0 +1,6 @@
+import ./recent.nix
+ {
+ versionMajor = "8";
+ versionMinor = "0.9";
+ sha256 = "5ea3c8260088ee4fd223a532a4b0c23a10e549c34705e2f190279a1a7f1f83d9";
+ }
diff --git a/pkgs/servers/http/tomcat/recent.nix b/pkgs/servers/http/tomcat/recent.nix
new file mode 100644
index 00000000000..0d11ba7a104
--- /dev/null
+++ b/pkgs/servers/http/tomcat/recent.nix
@@ -0,0 +1,24 @@
+{ versionMajor, versionMinor, sha256 }:
+{ stdenv, fetchurl }:
+
+let version = "${versionMajor}.${versionMinor}"; in
+
+stdenv.mkDerivation rec {
+ name = "apache-tomcat-${version}";
+
+ src = fetchurl {
+ url = "mirror://apache/tomcat/tomcat-${versionMajor}/v${version}/bin/${name}.tar.gz";
+ inherit sha256;
+ };
+
+ installPhase =
+ ''
+ mkdir $out
+ mv * $out
+ '';
+
+ meta = {
+ homepage = http://tomcat.apache.org/;
+ description = "An implementation of the Java Servlet and JavaServer Pages technologies";
+ };
+}
diff --git a/pkgs/servers/irc/ircd-hybrid/default.nix b/pkgs/servers/irc/ircd-hybrid/default.nix
index b37aaca1eaa..f27bb009a43 100644
--- a/pkgs/servers/irc/ircd-hybrid/default.nix
+++ b/pkgs/servers/irc/ircd-hybrid/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, openssl, zlib }:
stdenv.mkDerivation {
- name = "ircd-hybrid-7.2.2";
+ name = "ircd-hybrid-7.2.3";
src = fetchurl {
- url = mirror://sourceforge/ircd-hybrid/ircd-hybrid-7.2.2.tgz;
- sha256 = "1xn4dfbgx019mhismfnr2idhslvarlajyahj7c6bqzmarcwwrvck";
+ url = mirror://sourceforge/ircd-hybrid/ircd-hybrid-7.2.3.tgz;
+ sha256 = "0w28w10vx3j2s6h2p0qx2p08gafyad7ddxa4f8i94vmx193l7w37";
};
buildInputs = [ openssl zlib ];
diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix
index 245c838607f..0ce58e64015 100644
--- a/pkgs/servers/monitoring/munin/default.nix
+++ b/pkgs/servers/monitoring/munin/default.nix
@@ -105,7 +105,7 @@ stdenv.mkDerivation rec {
*.jar) continue;;
esac
wrapProgram "$file" \
- --set PERL5LIB "$out/lib/perl5/site_perl:${with perlPackages; stdenv.lib.makePerlPath [
+ --set PERL5LIB "$out/lib/perl5/site_perl:${rrdtool}/lib/perl:${with perlPackages; stdenv.lib.makePerlPath [
Log4Perl IOSocketInet6 Socket6 URI DBFile DateManip
HTMLTemplate FileCopyRecursive FCGI NetSNMP NetServer
ListMoreUtils TimeHiRes DBDPg LWPUserAgent
diff --git a/pkgs/servers/monitoring/seyren/default.nix b/pkgs/servers/monitoring/seyren/default.nix
index e6e15129568..e428067ab62 100644
--- a/pkgs/servers/monitoring/seyren/default.nix
+++ b/pkgs/servers/monitoring/seyren/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "seyren-${version}";
- version = "1.0.0";
+ version = "1.1.0";
src = fetchurl {
url = "https://github.com/scobal/seyren/releases/download/${version}/seyren-${version}.jar";
- sha256 = "14p97yzfyacvavfms8qs3q5515vpfkjlfvislbwrf7qa89xzz8x0";
+ sha256 = "10m64zdci4swlvivii1jnmrwfi461af3xvn0xvwvy7i8kyb56vrr";
};
phases = ["installPhase"];
diff --git a/pkgs/servers/news/leafnode/default.nix b/pkgs/servers/news/leafnode/default.nix
index 23f236a9a34..a3579aa8309 100644
--- a/pkgs/servers/news/leafnode/default.nix
+++ b/pkgs/servers/news/leafnode/default.nix
@@ -10,6 +10,11 @@ stdenv.mkDerivation rec {
configureFlags = "--enable-runas-user=nobody";
+ preConfigure = ''
+ # configure uses id to check environment; we don't want this check
+ sed -re 's/^ID[=].*/ID="echo whatever"/' -i configure
+ '';
+
postConfigure = ''
# The is_validfqdn is far too restrictive, and only allows
# Internet-facing servers to run. In order to run leafnode via
@@ -24,6 +29,5 @@ stdenv.mkDerivation rec {
description = "Leafnode implements a store & forward NNTP proxy";
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.unix;
- broken = true; # The user check in the configure does not work in a chroot
};
}
diff --git a/pkgs/servers/nosql/apache-jena/binary.nix b/pkgs/servers/nosql/apache-jena/binary.nix
new file mode 100644
index 00000000000..b7132d2ea99
--- /dev/null
+++ b/pkgs/servers/nosql/apache-jena/binary.nix
@@ -0,0 +1,38 @@
+{stdenv, fetchurl, java, makeWrapper}:
+let
+ s = # Generated upstream information
+ rec {
+ baseName="apache-jena";
+ version="2.12.0";
+ name="${baseName}-${version}";
+ url="http://archive.apache.org/dist/jena/binaries/apache-jena-2.12.0.tar.gz";
+ sha256="02fzn5j7yllp9g6lfnncpdgc1wbljvfk6s6fgaypq8p0vx5zallc";
+ };
+ buildInputs = [
+ makeWrapper
+ ];
+in
+stdenv.mkDerivation {
+ inherit (s) name version;
+ inherit buildInputs;
+ src = fetchurl {
+ inherit (s) url sha256;
+ };
+ installPhase = ''
+ cp -r . "$out"
+ for i in "$out"/bin/*; do
+ wrapProgram "$i" --prefix "PATH" : "${java}/bin/"
+ done
+ '';
+ meta = {
+ inherit (s) version;
+ description = ''RDF database'';
+ license = stdenv.lib.licenses.asl20;
+ maintainers = [stdenv.lib.maintainers.raskin];
+ platforms = stdenv.lib.platforms.linux;
+ homepage = "http://jena.apache.org";
+ downloadPage = "http://archive.apache.org/dist/jena/binaries/";
+ updateWalker = true;
+ downloadURLRegex = "apache-jena-.*[.]tar[.]gz\$";
+ };
+}
diff --git a/pkgs/servers/nosql/cassandra/default.nix b/pkgs/servers/nosql/cassandra/default.nix
new file mode 100644
index 00000000000..1413888f3f1
--- /dev/null
+++ b/pkgs/servers/nosql/cassandra/default.nix
@@ -0,0 +1,43 @@
+{ stdenv
+, fetchurl
+, jre
+, python
+, makeWrapper
+, gawk
+, bash
+, getopt
+}:
+
+let version = "2.1.0";
+in stdenv.mkDerivation rec {
+ name = "cassandra-${version}";
+
+ src = fetchurl {
+ url = "http://apache.cs.utah.edu/cassandra/${version}/apache-${name}-bin.tar.gz";
+ sha256 = "da99c4ebc8de925dc6b493443b70d2183cf3090b1aad6b6b918efa9565f264dd";
+ };
+
+ buildInputs = [ makeWrapper ];
+
+ installPhase = ''
+ mkdir $out
+ mv * $out
+
+ for cmd in cassandra nodetool sstablekeys sstableloader sstableupgrade
+ do wrapProgram $out/bin/$cmd \
+ --set JAVA_HOME ${jre} \
+ --prefix PATH : ${bash}/bin \
+ --prefix PATH : ${getopt}/bin \
+ --prefix PATH : ${gawk}/bin
+ done
+
+ wrapProgram $out/bin/cqlsh --prefix PATH : ${python}/bin
+ '';
+
+ meta = {
+ homepage = "http://cassandra.apache.org/";
+ description = "Apache Cassandra™ is a massively scalable open source NoSQL database.";
+ platforms = stdenv.lib.platforms.all;
+ license = stdenv.lib.licenses.asl20;
+ };
+}
diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix
index 6c6fb213cb8..3eba1b9f895 100644
--- a/pkgs/servers/nosql/influxdb/default.nix
+++ b/pkgs/servers/nosql/influxdb/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchurl, makeWrapper }:
+{ stdenv, fetchurl, makeWrapper, zlib, bzip2 }:
assert stdenv.isLinux;
stdenv.mkDerivation rec {
name = "influxdb-${version}";
- version = "0.7.0";
+ version = "0.8.2";
arch = if stdenv.system == "x86_64-linux" then "amd64" else "386";
src = fetchurl {
url = "http://s3.amazonaws.com/influxdb/${name}.${arch}.tar.gz";
sha256 = if arch == "amd64" then
- "1mvi21z83abnprzj0n8r64ly9s48i5l7ndcrci7nk96z8xab7w3q" else
- "1zgxbfnam4r31g9yfwznhb7l4hf7s5sylhll92zr8q0qjhr4cj2b";
+ "0m27agjf9v76w5xms8w3z91k4hxw832nxqr030qzqxynwbxj0vg6" else
+ "0bdjpdq4yhfsmvl756xhkd1d8565d19g66l5rlymksc71ps8kbj6";
};
buildInputs = [ makeWrapper ];
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
install -D influxdb $out/bin/influxdb
patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" $out/bin/influxdb
wrapProgram "$out/bin/influxdb" \
- --prefix LD_LIBRARY_PATH : "${stdenv.gcc.gcc}/lib:${stdenv.gcc.gcc}/lib64"
+ --prefix LD_LIBRARY_PATH : "${stdenv.gcc.gcc}/lib:${stdenv.gcc.gcc}/lib64:${zlib}/lib:${bzip2}/lib"
mkdir -p $out/share/influxdb
cp -R admin scripts config.toml $out/share/influxdb
diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix
index aa9da965d17..651b84b7afe 100644
--- a/pkgs/servers/nosql/mongodb/default.nix
+++ b/pkgs/servers/nosql/mongodb/default.nix
@@ -1,48 +1,66 @@
-{ stdenv, fetchurl, scons, boost, gperftools, pcre, snappy }:
+{ stdenv, fetchurl, scons, boost, gperftools, pcre, snappy
+, libyamlcpp, sasl, openssl, libpcap }:
-let version = "2.6.0";
+with stdenv.lib;
+
+let version = "2.6.4";
system-libraries = [
- "tcmalloc"
"pcre"
"boost"
"snappy"
- # "v8" -- mongo still bundles 3.12 and does not work with 3.15+
# "stemmer" -- not nice to package yet (no versioning, no makefile, no shared libs)
- # "yaml" -- it seems nixpkgs' yamlcpp (0.5.1) is problematic for mongo
+ "yaml"
+ # "v8"
+ ] ++ optionals (!stdenv.isDarwin) [ "tcmalloc" ];
+ buildInputs = [
+ sasl boost boost.lib gperftools pcre snappy
+ libyamlcpp sasl openssl libpcap
];
- system-lib-args = stdenv.lib.concatStringsSep " "
- (map (lib: "--use-system-${lib}") system-libraries);
+
+ other-args = concatStringsSep " " ([
+ "--ssl"
+ "--use-sasl-client"
+ "--extrapath=${concatStringsSep "," buildInputs}"
+ ] ++ map (lib: "--use-system-${lib}") system-libraries);
in stdenv.mkDerivation rec {
name = "mongodb-${version}";
src = fetchurl {
url = "http://downloads.mongodb.org/src/mongodb-src-r${version}.tar.gz";
- sha256 = "066kppjdmdpadjr09ildla3aw42anzsc9pa55iwp3wa4rgqd2i33";
+ sha256 = "1h4rrgcb95234ryjma3fjg50qsm1bnxjx5ib0c3p9nzmc2ji2m07";
};
- nativeBuildInputs = [ scons boost gperftools pcre snappy ];
+ nativeBuildInputs = [ scons ];
+ inherit buildInputs;
postPatch = ''
+ # fix yaml-cpp detection
+ sed -i -e "s/\[\"yaml\"\]/\[\"yaml-cpp\"\]/" SConstruct
+
+ # bug #482576
+ sed -i -e "/-Werror/d" src/third_party/v8/SConscript
+
+ # fix environment variable reading
substituteInPlace SConstruct \
--replace "Environment( BUILD_DIR" "Environment( ENV = os.environ, BUILD_DIR"
'';
buildPhase = ''
- scons all --release ${system-lib-args}
+ scons all --release ${other-args}
'';
installPhase = ''
mkdir -p $out/lib
- scons install --release --prefix=$out ${system-lib-args}
+ scons install --release --prefix=$out ${other-args}
'';
meta = {
description = "a scalable, high-performance, open source NoSQL database";
homepage = http://www.mongodb.org;
- license = stdenv.lib.licenses.agpl3;
+ license = licenses.agpl3;
- maintainers = [ stdenv.lib.maintainers.bluescreen303 ];
- platforms = stdenv.lib.platforms.linux;
+ maintainers = with maintainers; [ bluescreen303 offline wkennington ];
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix
index 3694547c2d9..79fd61390e4 100644
--- a/pkgs/servers/nosql/rethinkdb/default.nix
+++ b/pkgs/servers/nosql/rethinkdb/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, which, protobuf, gperftools, boost, zlib, python, m4 }:
+{ stdenv, fetchurl, which, protobuf, gperftools, boost, zlib, curl, python, m4 }:
stdenv.mkDerivation rec {
- name = "rethinkdb-1.12.4";
+ name = "rethinkdb-1.14.1";
src = fetchurl {
url = "http://download.rethinkdb.com/dist/${name}.tgz";
- sha256 = "1dq2vbgms016ic2hifclm1m58i4804khkn0lnvz47rkm7i0564if";
+ sha256 = "0brsbb289hcsmipma4rsgrkqpqagwff2y6w46dvb25n95id65hx8";
};
preConfigure = ''
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
configureFlags = "--lib-path ${gperftools}/lib";
- buildInputs = [ protobuf zlib boost ];
+ buildInputs = [ protobuf boost boost.lib zlib curl ];
nativeBuildInputs = [ which m4 python ];
diff --git a/pkgs/servers/nosql/riak/1.3.1.nix b/pkgs/servers/nosql/riak/1.3.1.nix
index 96315c52f6b..e773f6ddcc3 100644
--- a/pkgs/servers/nosql/riak/1.3.1.nix
+++ b/pkgs/servers/nosql/riak/1.3.1.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
'';
meta = {
- maintainers = stdenv.lib.maintainers.orbitz;
+ maintainers = [ stdenv.lib.maintainers.orbitz ];
description = "Dynamo inspired NoSQL DB by Basho";
longDescription = ''
This patches the riak and riak-admin scripts to work better in Nix.
diff --git a/pkgs/servers/openafs-client/ae86b07f827d6f3e2032a412f5f6cb3951a27d2d.patch b/pkgs/servers/openafs-client/ae86b07f827d6f3e2032a412f5f6cb3951a27d2d.patch
new file mode 100644
index 00000000000..b95cfb4c620
--- /dev/null
+++ b/pkgs/servers/openafs-client/ae86b07f827d6f3e2032a412f5f6cb3951a27d2d.patch
@@ -0,0 +1,51 @@
+From e284db57f94c8f97ed1c95dcd0bd9518d86c050c Mon Sep 17 00:00:00 2001
+From: Marc Dionne
+Date: Wed, 18 Jun 2014 08:53:48 -0400
+Subject: [PATCH] Linux 3.16: Switch to iter_file_splice_write
+
+Users of generic_file_splice_write need to switch to
+using iter_file_splice_write.
+
+Change-Id: If4801d27e030e1cb986f483cf437a2cfa7398eb3
+Reviewed-on: http://gerrit.openafs.org/11302
+Reviewed-by: Chas Williams - CONTRACTOR
+Tested-by: Chas Williams - CONTRACTOR
+Reviewed-by: Jeffrey Altman
+Tested-by: Jeffrey Altman
+---
+ acinclude.m4 | 3 +++
+ src/afs/LINUX/osi_vnodeops.c | 4 ++++
+ 2 files changed, 7 insertions(+), 0 deletions(-)
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index ae8f1ed..9e39d90 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -958,6 +958,9 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
+ AC_CHECK_LINUX_FUNC([inode_setattr],
+ [#include ],
+ [inode_setattr(NULL, NULL);])
++ AC_CHECK_LINUX_FUNC([iter_file_splice_write],
++ [#include ],
++ [iter_file_splice_write(NULL,NULL,NULL,0,0);])
+ AC_CHECK_LINUX_FUNC([kernel_setsockopt],
+ [#include ],
+ [kernel_setsockopt(NULL, 0, 0, NULL, 0);])
+diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c
+index 6f4000b..2685915 100644
+--- a/src/afs/LINUX/osi_vnodeops.c
++++ b/src/afs/LINUX/osi_vnodeops.c
+@@ -827,7 +827,11 @@ struct file_operations afs_file_fops = {
+ .sendfile = generic_file_sendfile,
+ #endif
+ #if defined(STRUCT_FILE_OPERATIONS_HAS_SPLICE)
++# if defined(HAVE_LINUX_ITER_FILE_SPLICE_WRITE)
++ .splice_write = iter_file_splice_write,
++# else
+ .splice_write = generic_file_splice_write,
++# endif
+ .splice_read = generic_file_splice_read,
+ #endif
+ .release = afs_linux_release,
+--
+1.7.1
diff --git a/pkgs/servers/openafs-client/default.nix b/pkgs/servers/openafs-client/default.nix
index 47c8c12edef..4b5eb80b974 100644
--- a/pkgs/servers/openafs-client/default.nix
+++ b/pkgs/servers/openafs-client/default.nix
@@ -4,12 +4,17 @@
assert stdenv.isLinux;
stdenv.mkDerivation {
- name = "openafs-1.6.6-${kernel.version}";
+ name = "openafs-1.6.9-${kernel.version}";
src = fetchurl {
- url = http://www.openafs.org/dl/openafs/1.6.6/openafs-1.6.6-src.tar.bz2;
- sha256 = "0xfa64hvz0avp89zgz8ksmp24s6ns0z3103m4mspshhhdlikypk3";
+ url = http://www.openafs.org/dl/openafs/1.6.9/openafs-1.6.9-src.tar.bz2;
+ sha256 = "1isgw7znp10w0mr3sicnjzbc12bd1gdwfqqr667w6p3syyhs6bkv";
};
+
+ patches = [
+ ./f3c0f74186f4a323ffc5f125d961fe384d396cac.patch
+ ./ae86b07f827d6f3e2032a412f5f6cb3951a27d2d.patch
+ ];
buildInputs = [ autoconf automake flex yacc ncurses perl which ];
@@ -40,6 +45,6 @@ stdenv.mkDerivation {
homepage = http://www.openafs.org;
license = stdenv.lib.licenses.ipl10;
platforms = stdenv.lib.platforms.linux;
- maintainers = stdenv.lib.maintainers.z77z;
+ maintainers = [ stdenv.lib.maintainers.z77z ];
};
}
diff --git a/pkgs/servers/openafs-client/f3c0f74186f4a323ffc5f125d961fe384d396cac.patch b/pkgs/servers/openafs-client/f3c0f74186f4a323ffc5f125d961fe384d396cac.patch
new file mode 100644
index 00000000000..e197ee4a34c
--- /dev/null
+++ b/pkgs/servers/openafs-client/f3c0f74186f4a323ffc5f125d961fe384d396cac.patch
@@ -0,0 +1,130 @@
+From: Marc Dionne
+Date: Wed, 18 Jun 2014 13:06:39 +0000 (-0400)
+Subject: Linux 3.16: Convert to new write_iter/read_iter ops
+X-Git-Tag: openafs-stable-1_6_10pre1~76
+X-Git-Url: http://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=f3c0f74186f4a323ffc5f125d961fe384d396cac
+
+Linux 3.16: Convert to new write_iter/read_iter ops
+
+Change read/write operations to the new write_iter/read_iter
+operations.
+
+Reviewed-on: http://gerrit.openafs.org/11303
+Reviewed-by: Chas Williams - CONTRACTOR
+Tested-by: Chas Williams - CONTRACTOR
+Reviewed-by: Jeffrey Altman
+Tested-by: Jeffrey Altman
+(cherry picked from commit a303bb257ed9e790d8c14644779e9508167887b6)
+
+Change-Id: I3f66104be067698a4724ed78537765cf26d4aa10
+Reviewed-on: http://gerrit.openafs.org/11309
+Reviewed-by: Chas Williams - CONTRACTOR
+Tested-by: BuildBot
+Reviewed-by: Stephan Wiesand
+---
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index 83a1a8c..13d70db 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -836,6 +836,7 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
+ AC_CHECK_LINUX_STRUCT([inode], [i_security], [fs.h])
+ AC_CHECK_LINUX_STRUCT([file_operations], [flock], [fs.h])
+ AC_CHECK_LINUX_STRUCT([file_operations], [iterate], [fs.h])
++ AC_CHECK_LINUX_STRUCT([file_operations], [read_iter], [fs.h])
+ AC_CHECK_LINUX_STRUCT([file_operations], [sendfile], [fs.h])
+ AC_CHECK_LINUX_STRUCT([file_system_type], [mount], [fs.h])
+ AC_CHECK_LINUX_STRUCT([inode_operations], [truncate], [fs.h])
+diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c
+index 441cce7..818debe 100644
+--- a/src/afs/LINUX/osi_vnodeops.c
++++ b/src/afs/LINUX/osi_vnodeops.c
+@@ -99,8 +99,11 @@ afs_linux_VerifyVCache(struct vcache *avc, cred_t **retcred) {
+ return afs_convert_code(code);
+ }
+
+-#ifdef HAVE_LINUX_GENERIC_FILE_AIO_READ
+-# ifdef LINUX_HAS_NONVECTOR_AIO
++#if defined(STRUCT_FILE_OPERATIONS_HAS_READ_ITER) || defined(HAVE_LINUX_GENERIC_FILE_AIO_READ)
++# if defined(STRUCT_FILE_OPERATIONS_HAS_READ_ITER)
++static ssize_t
++afs_linux_read_iter(struct kiocb *iocb, struct iov_iter *iter)
++# elif defined(LINUX_HAS_NONVECTOR_AIO)
+ static ssize_t
+ afs_linux_aio_read(struct kiocb *iocb, char __user *buf, size_t bufsize,
+ loff_t pos)
+@@ -113,6 +116,11 @@ afs_linux_aio_read(struct kiocb *iocb, const struct iovec *buf,
+ struct file *fp = iocb->ki_filp;
+ ssize_t code = 0;
+ struct vcache *vcp = VTOAFS(fp->f_dentry->d_inode);
++# if defined(STRUCT_FILE_OPERATIONS_HAS_READ_ITER)
++ loff_t pos = iocb->ki_pos;
++ unsigned long bufsize = iter->nr_segs;
++# endif
++
+
+ AFS_GLOCK();
+ afs_Trace4(afs_iclSetp, CM_TRACE_AIOREADOP, ICL_TYPE_POINTER, vcp,
+@@ -125,7 +133,11 @@ afs_linux_aio_read(struct kiocb *iocb, const struct iovec *buf,
+ * so we optimise by not using it */
+ osi_FlushPages(vcp, NULL); /* ensure stale pages are gone */
+ AFS_GUNLOCK();
++# if defined(STRUCT_FILE_OPERATIONS_HAS_READ_ITER)
++ code = generic_file_read_iter(iocb, iter);
++# else
+ code = generic_file_aio_read(iocb, buf, bufsize, pos);
++# endif
+ AFS_GLOCK();
+ }
+
+@@ -170,8 +182,11 @@ afs_linux_read(struct file *fp, char *buf, size_t count, loff_t * offp)
+ * also take care of re-positioning the pointer if file is open in append
+ * mode. Call fake open/close to ensure we do writes of core dumps.
+ */
+-#ifdef HAVE_LINUX_GENERIC_FILE_AIO_READ
+-# ifdef LINUX_HAS_NONVECTOR_AIO
++#if defined(STRUCT_FILE_OPERATIONS_HAS_READ_ITER) || defined(HAVE_LINUX_GENERIC_FILE_AIO_READ)
++# if defined(STRUCT_FILE_OPERATIONS_HAS_READ_ITER)
++static ssize_t
++afs_linux_write_iter(struct kiocb *iocb, struct iov_iter *iter)
++# elif defined(LINUX_HAS_NONVECTOR_AIO)
+ static ssize_t
+ afs_linux_aio_write(struct kiocb *iocb, const char __user *buf, size_t bufsize,
+ loff_t pos)
+@@ -184,6 +199,10 @@ afs_linux_aio_write(struct kiocb *iocb, const struct iovec *buf,
+ ssize_t code = 0;
+ struct vcache *vcp = VTOAFS(iocb->ki_filp->f_dentry->d_inode);
+ cred_t *credp;
++# if defined(STRUCT_FILE_OPERATIONS_HAS_READ_ITER)
++ loff_t pos = iocb->ki_pos;
++ unsigned long bufsize = iter->nr_segs;
++# endif
+
+ AFS_GLOCK();
+
+@@ -199,7 +218,11 @@ afs_linux_aio_write(struct kiocb *iocb, const struct iovec *buf,
+ ReleaseWriteLock(&vcp->lock);
+ if (code == 0) {
+ AFS_GUNLOCK();
++# if defined(STRUCT_FILE_OPERATIONS_HAS_READ_ITER)
++ code = generic_file_write_iter(iocb, iter);
++# else
+ code = generic_file_aio_write(iocb, buf, bufsize, pos);
++# endif
+ AFS_GLOCK();
+ }
+
+@@ -788,7 +811,12 @@ struct file_operations afs_dir_fops = {
+ };
+
+ struct file_operations afs_file_fops = {
+-#ifdef HAVE_LINUX_GENERIC_FILE_AIO_READ
++#ifdef STRUCT_FILE_OPERATIONS_HAS_READ_ITER
++ .read_iter = afs_linux_read_iter,
++ .write_iter = afs_linux_write_iter,
++ .read = new_sync_read,
++ .write = new_sync_write,
++#elif defined(HAVE_LINUX_GENERIC_FILE_AIO_READ)
+ .aio_read = afs_linux_aio_read,
+ .aio_write = afs_linux_aio_write,
+ .read = do_sync_read,
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index a918007b47c..de262af095c 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -45,10 +45,15 @@ stdenv.mkDerivation rec {
-e "s|chmod r+s |true |"
'';
- configureFlags =
- [ "--disable-solaris" "--disable-jack" "--disable-oss-output"
- "--disable-oss-wrapper" "--localstatedir=/var" "--sysconfdir=/etc" ]
- ++ stdenv.lib.optional jackaudioSupport "--enable-jack"
+ configureFlags = [
+ "--disable-solaris"
+ "--disable-jack"
+ "--disable-oss-output"
+ "--disable-oss-wrapper"
+ "--localstatedir=/var"
+ "--sysconfdir=/etc"
+ "--with-access-group=audio"
+ ] ++ stdenv.lib.optional jackaudioSupport "--enable-jack"
++ stdenv.lib.optional stdenv.isDarwin "--with-mac-sysroot=/";
enableParallelBuilding = true;
diff --git a/pkgs/servers/rippled/default.nix b/pkgs/servers/rippled/default.nix
index 66a0743b367..d930c5b6a97 100644
--- a/pkgs/servers/rippled/default.nix
+++ b/pkgs/servers/rippled/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, scons, pkgconfig, openssl, protobuf, boost155, zlib}:
+{ stdenv, fetchurl, scons, pkgconfig, openssl, protobuf, boost, zlib}:
stdenv.mkDerivation rec {
name = "rippled-${version}";
@@ -11,9 +11,9 @@ stdenv.mkDerivation rec {
patches = [ ./scons-env.patch ];
- buildInputs = [ scons pkgconfig openssl protobuf boost155 zlib ];
+ buildInputs = [ scons pkgconfig openssl protobuf boost zlib ];
- RIPPLED_BOOST_HOME = boost155.out;
+ RIPPLED_BOOST_HOME = boost.out;
RIPPLED_ZLIB_HOME = zlib.out;
buildPhase = "scons build/rippled";
@@ -24,9 +24,9 @@ stdenv.mkDerivation rec {
meta = {
description = "Ripple P2P payment network reference server";
- homepage = "https://ripple.com";
- maintainers = stdenv.lib.maintainers.emery;
+ homepage = https://ripple.com;
+ maintainers = [ stdenv.lib.maintainers.emery ];
license = stdenv.lib.licenses.isc;
platforms = stdenv.lib.platforms.linux;
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/servers/search/elasticsearch/default.nix b/pkgs/servers/search/elasticsearch/default.nix
index 967eae40bb1..1cac6642484 100644
--- a/pkgs/servers/search/elasticsearch/default.nix
+++ b/pkgs/servers/search/elasticsearch/default.nix
@@ -3,11 +3,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "elasticsearch-1.2.2";
+ name = "elasticsearch-1.3.2";
src = fetchurl {
url = "https://download.elasticsearch.org/elasticsearch/elasticsearch/${name}.tar.gz";
- sha256 = "1vpvxndcq48rcsgw2jnzdh4fwnf141hf5wjxrjs1g7p2qw0d0cy8";
+ sha256 = "191fk7pbsxvihwj86b935d5b9n55h6q9gnpql68vfzjgvfjd09bm";
};
patches = [ ./es-home.patch ];
diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix
index c03a2feae5f..ae93d1a4b5f 100644
--- a/pkgs/servers/search/elasticsearch/plugins.nix
+++ b/pkgs/servers/search/elasticsearch/plugins.nix
@@ -6,7 +6,7 @@ let
esPlugin = a@{
pluginName,
installPhase ? ''
- mkdir -p $out
+ mkdir -p $out/bin
ES_HOME=$out ${elasticsearch}/bin/elasticsearch-plugin --install ${pluginName} --url file://$src
'',
...
@@ -23,11 +23,11 @@ let
in {
elasticsearch_river_jdbc = esPlugin rec {
name = "elasticsearch-river-jdbc-${version}";
- pluginName = "jdbc";
- version = "1.2.1.1";
+ pluginName = "elasticsearch-river-jdbc";
+ version = "1.3.0.4";
src = fetchurl {
url = "http://xbib.org/repository/org/xbib/elasticsearch/plugin/elasticsearch-river-jdbc/${version}/${name}-plugin.zip";
- sha1 = "68e7e1fdf45d0e5852b21610a84740595223ea11";
+ sha256 = "0272l6cr032iccwwa803shzfjg3505jc48d9qdazrwxjmnlkkzqk";
};
meta = {
homepage = "https://github.com/jprante/elasticsearch-river-jdbc";
@@ -50,4 +50,24 @@ in {
license = licenses.asl20;
};
};
+
+ elasticsearch_http_basic = stdenv.mkDerivation rec {
+ name = "elasticsearch-http-basic-${version}";
+ version = "1.3.2";
+
+ src = fetchurl {
+ url = "https://github.com/Asquera/elasticsearch-http-basic/releases/download/${version}/${name}.jar";
+ sha256 = "1qq8z0233mzz699zbzjwmx7ghn8k0djgyc5ixr8i5xchfrsrymn2";
+ };
+
+ phases = ["installPhase"];
+ installPhase = "install -D $src $out/plugins/http-basic/${name}.jar";
+
+ meta = {
+ homepage = https://github.com/Asquera/elasticsearch-http-basic;
+ description = "HTTP Basic Authentication for Elasticsearch";
+ license = licenses.mit;
+ platforms = elasticsearch.meta.platforms;
+ };
+ };
}
diff --git a/pkgs/servers/search/sphinxsearch/default.nix b/pkgs/servers/search/sphinxsearch/default.nix
new file mode 100644
index 00000000000..a72240064f2
--- /dev/null
+++ b/pkgs/servers/search/sphinxsearch/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, pkgconfig,
+ version ? "2.1.9",
+ mainSrc ? fetchurl {
+ url = "http://sphinxsearch.com/files/sphinx-${version}-release.tar.gz";
+ sha256 = "00vwxf3zr0g1fq9mls1z2rd8nxw74b76pkl1j466lig1qc5am2b2";
+ }
+}:
+
+stdenv.mkDerivation rec {
+ name = "sphinxsearch-${version}";
+ src = mainSrc;
+
+ configureFlags = [
+ "--program-prefix=sphinxsearch-"
+ "--without-mysql"
+ "--enable-id64"
+ ];
+
+ buildInputs = [
+ pkgconfig
+ ];
+
+ meta = {
+ description = "An open source full text search server";
+ homepage = http://sphinxsearch.com;
+ license = stdenv.lib.licenses.gpl2;
+ platforms = stdenv.lib.platforms.all;
+ maintainers = with stdenv.lib.maintainers; [ ederoyd46 ];
+ };
+}
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index bb0c0bc8da8..0efdd542fa4 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, ncurses, openssl, bison, boost, libxml2, libaio, judy, libevent, groff }:
+{ stdenv, fetchurl, cmake, ncurses, openssl, bison, boost, libxml2, libaio, judy, libevent, groff, perl, fixDarwinDylibNames }:
stdenv.mkDerivation rec {
name = "mariadb-${version}";
@@ -9,12 +9,25 @@ stdenv.mkDerivation rec {
sha256 = "039wz89vs03a27anpshj5xaqknm7cqi7mrypvwingqkq26ns0mhs";
};
- buildInputs = [ cmake ncurses openssl bison boost libxml2 libaio judy libevent groff ];
+ buildInputs = [ cmake ncurses openssl bison boost libxml2 judy libevent groff ]
+ ++ stdenv.lib.optional (!stdenv.isDarwin) libaio
+ ++ stdenv.lib.optionals stdenv.isDarwin [ perl fixDarwinDylibNames ];
+
+ patches = stdenv.lib.optional stdenv.isDarwin ./my_context_asm.patch;
cmakeFlags = [ "-DWITH_READLINE=yes" "-DWITH_EMBEDDED_SERVER=yes" "-DINSTALL_SCRIPTDIR=bin" ];
enableParallelBuilding = true;
+ prePatch = ''
+ substituteInPlace cmake/libutils.cmake \
+ --replace /usr/bin/libtool libtool
+ '';
+ postInstall = ''
+ substituteInPlace $out/bin/mysql_install_db \
+ --replace basedir=\"\" basedir=\"$out\"
+ '';
+
passthru.mysqlVersion = "5.5";
meta = {
diff --git a/pkgs/servers/sql/mariadb/my_context_asm.patch b/pkgs/servers/sql/mariadb/my_context_asm.patch
new file mode 100644
index 00000000000..3a747ed1b03
--- /dev/null
+++ b/pkgs/servers/sql/mariadb/my_context_asm.patch
@@ -0,0 +1,18 @@
+--- a/mysys/my_context.c
++++ b/mysys/my_context.c
+@@ -206,15 +206,6 @@ my_context_spawn(struct my_context *c, void (*f)(void *), void *d)
+ (
+ "movq %%rsp, (%[save])\n\t"
+ "movq %[stack], %%rsp\n\t"
+-#if __GNUC__ >= 4 && __GNUC_MINOR__ >= 4 && !defined(__INTEL_COMPILER)
+- /*
+- This emits a DWARF DW_CFA_undefined directive to make the return address
+- undefined. This indicates that this is the top of the stack frame, and
+- helps tools that use DWARF stack unwinding to obtain stack traces.
+- (I use numeric constant to avoid a dependency on libdwarf includes).
+- */
+- ".cfi_escape 0x07, 16\n\t"
+-#endif
+ "movq %%rbp, 8(%[save])\n\t"
+ "movq %%rbx, 16(%[save])\n\t"
+ "movq %%r12, 24(%[save])\n\t"
diff --git a/pkgs/servers/sql/mysql/5.1.x.nix b/pkgs/servers/sql/mysql/5.1.x.nix
index c309158a670..b422b993832 100644
--- a/pkgs/servers/sql/mysql/5.1.x.nix
+++ b/pkgs/servers/sql/mysql/5.1.x.nix
@@ -3,11 +3,11 @@
# Note: zlib is not required; MySQL can use an internal zlib.
stdenv.mkDerivation rec {
- name = "mysql-5.1.72";
+ name = "mysql-5.1.73";
src = fetchurl {
url = "http://cdn.mysql.com/Downloads/MySQL-5.1/${name}.tar.gz";
- md5 = "ed79cd48e3e7402143548917813cdb80";
+ sha256 = "1dfwi4ck0vq6sdci6gz0031s7zz5lc3pddqlgm0292s00l9y5sq5";
};
buildInputs = [ncurses zlib perl openssl] ++ stdenv.lib.optional stdenv.isLinux ps;
diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix
index 7c31bd7c582..7266727fdad 100644
--- a/pkgs/servers/sql/mysql/5.5.x.nix
+++ b/pkgs/servers/sql/mysql/5.5.x.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "mysql-${version}";
- version = "5.5.37";
+ version = "5.5.39";
src = fetchurl {
url = "http://cdn.mysql.com/Downloads/MySQL-5.5/${name}.tar.gz";
- md5 = "bf1d80c66d4822ec6036300399a33c03";
+ sha256 = "0qj8bc83v6vf8jyn4ag179nclpn6ilw4h4xqb50zz9jd0c5s14qq";
};
preConfigure = stdenv.lib.optional stdenv.isDarwin ''
diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix
index 5151299e3b9..4807052478c 100644
--- a/pkgs/servers/sql/postgresql/8.4.x.nix
+++ b/pkgs/servers/sql/postgresql/8.4.x.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://www.postgresql.org/;
description = "A powerful, open source object-relational database system";
- license = "bsd";
+ license = stdenv.lib.licenses.postgresql;
maintainers = [ stdenv.lib.maintainers.ocharles ];
hydraPlatforms = stdenv.lib.platforms.linux;
};
diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix
index 97e98217f8a..85c14931eed 100644
--- a/pkgs/servers/sql/postgresql/9.0.x.nix
+++ b/pkgs/servers/sql/postgresql/9.0.x.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://www.postgresql.org/;
description = "A powerful, open source object-relational database system";
- license = "bsd";
+ license = stdenv.lib.licenses.postgresql;
maintainers = [ stdenv.lib.maintainers.ocharles ];
hydraPlatforms = stdenv.lib.platforms.linux;
};
diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix
index 92417dc730c..ef335a77ab6 100644
--- a/pkgs/servers/sql/postgresql/9.1.x.nix
+++ b/pkgs/servers/sql/postgresql/9.1.x.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://www.postgresql.org/;
description = "A powerful, open source object-relational database system";
- license = "bsd";
+ license = stdenv.lib.licenses.postgresql;
maintainers = [ stdenv.lib.maintainers.ocharles ];
hydraPlatforms = stdenv.lib.platforms.linux;
};
diff --git a/pkgs/servers/sql/postgresql/9.2.x.nix b/pkgs/servers/sql/postgresql/9.2.x.nix
index e5dbdd034d3..fdfb5a17b54 100644
--- a/pkgs/servers/sql/postgresql/9.2.x.nix
+++ b/pkgs/servers/sql/postgresql/9.2.x.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://www.postgresql.org/;
description = "A powerful, open source object-relational database system";
- license = "bsd";
+ license = stdenv.lib.licenses.postgresql;
maintainers = [ stdenv.lib.maintainers.ocharles ];
hydraPlatforms = stdenv.lib.platforms.linux;
};
diff --git a/pkgs/servers/sql/postgresql/9.3.x.nix b/pkgs/servers/sql/postgresql/9.3.x.nix
index 6c6ef132e81..40f07d8ffe1 100644
--- a/pkgs/servers/sql/postgresql/9.3.x.nix
+++ b/pkgs/servers/sql/postgresql/9.3.x.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://www.postgresql.org/;
description = "A powerful, open source object-relational database system";
- license = "bsd";
+ license = stdenv.lib.licenses.postgresql;
maintainers = [ stdenv.lib.maintainers.ocharles ];
hydraPlatforms = stdenv.lib.platforms.linux;
};
diff --git a/pkgs/servers/sql/postgresql/9.4.x.nix b/pkgs/servers/sql/postgresql/9.4.x.nix
new file mode 100644
index 00000000000..2608dcae504
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/9.4.x.nix
@@ -0,0 +1,44 @@
+{ stdenv, fetchurl, zlib, readline, libossp_uuid }:
+
+with stdenv.lib;
+
+let version = "9.4beta2"; in
+
+stdenv.mkDerivation rec {
+ name = "postgresql-${version}";
+
+ src = fetchurl {
+ url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
+ sha256 = "131q3b9hv4pw02xhjsfi5is9i7pp5f4srxwfdn8ifs9qb37hcx2n";
+ };
+
+ buildInputs = [ zlib readline ] ++ optionals (!stdenv.isDarwin) [ libossp_uuid ];
+
+ enableParallelBuilding = true;
+
+ makeFlags = [ "world" ];
+
+ configureFlags = optional (!stdenv.isDarwin)
+ ''
+ --with-ossp-uuid
+ '';
+
+ patches = [ ./disable-resolve_symlinks-94.patch ./less-is-more.patch ];
+
+ installTargets = [ "install-world" ];
+
+ LC_ALL = "C";
+
+ passthru = {
+ inherit readline;
+ psqlSchema = "9.4";
+ };
+
+ meta = {
+ homepage = http://www.postgresql.org/ ;
+ description = "A powerful, open source object-relational database system";
+ license = stdenv.lib.licenses.postgresql;
+ maintainers = with stdenv.lib.maintainers; [ aristid ocharles ];
+ hydraPlatforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/servers/sql/postgresql/disable-resolve_symlinks-94.patch b/pkgs/servers/sql/postgresql/disable-resolve_symlinks-94.patch
new file mode 100644
index 00000000000..fadeea90ac4
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/disable-resolve_symlinks-94.patch
@@ -0,0 +1,12 @@
+--- a/src/common/exec.c 2014-09-04 20:19:12.236057588 +0200
++++ b/src/common/exec.c 2014-09-04 20:19:50.550251633 +0200
+@@ -218,6 +218,9 @@
+ static int
+ resolve_symlinks(char *path)
+ {
++ // On NixOS we *want* stuff relative to symlinks.
++ return 0;
++
+ #ifdef HAVE_READLINK
+ struct stat buf;
+ char orig_wd[MAXPGPATH],
diff --git a/pkgs/servers/uhub/default.nix b/pkgs/servers/uhub/default.nix
new file mode 100644
index 00000000000..a6e0d474d89
--- /dev/null
+++ b/pkgs/servers/uhub/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchurl, cmake, openssl, sqlite, pkgconfig, systemd
+, tlsSupport ? false }:
+
+assert tlsSupport -> openssl != null;
+
+let version = "0.4.1"; in
+stdenv.mkDerivation {
+ name = "uhub-${version}";
+
+ src = fetchurl {
+ url = "http://www.extatic.org/downloads/uhub/uhub-${version}-src.tar.bz2";
+ sha256 = "1q0n74fb0h5w0k9fhfkznxb4r46qyfb8g2ss3wflivx4l0m1f9x2";
+ };
+
+ buildInputs = [ cmake sqlite pkgconfig systemd ] ++ stdenv.lib.optional tlsSupport openssl;
+
+ outputs = [ "out"
+ "mod_example"
+ "mod_welcome"
+ "mod_logging"
+ "mod_auth_simple"
+ "mod_auth_sqlite"
+ "mod_chat_history"
+ "mod_chat_only"
+ "mod_topic"
+ "mod_no_guest_downloads"
+ ];
+
+ patches = [ ./plugin-dir.patch ./systemd.patch ];
+
+ cmakeFlags = ''
+ -DSYSTEMD_SUPPORT=ON
+ ${if tlsSupport then "-DSSL_SUPPORT=ON" else "-DSSL_SUPPORT=OFF"}
+ '';
+
+ meta = with stdenv.lib; {
+ description = "High performance peer-to-peer hub for the ADC network";
+ homepage = https://www.uhub.org/;
+ license = licenses.gpl3;
+ maintainers = [ maintainers.emery ];
+ platforms = platforms.unix;
+ };
+}
\ No newline at end of file
diff --git a/pkgs/servers/uhub/plugin-dir.patch b/pkgs/servers/uhub/plugin-dir.patch
new file mode 100644
index 00000000000..95ebfd6706f
--- /dev/null
+++ b/pkgs/servers/uhub/plugin-dir.patch
@@ -0,0 +1,23 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 40e996e..d3b7e6d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -185,10 +185,16 @@ else()
+ # add_definitions(-DDEBUG)
+ endif()
+
++set( PLUGINS mod_example mod_welcome mod_logging mod_auth_simple mod_auth_sqlite mod_chat_history mod_chat_only mod_topic mod_no_guest_downloads )
++
+ if (UNIX)
+ install( TARGETS uhub RUNTIME DESTINATION bin )
+- install( TARGETS mod_example mod_welcome mod_logging mod_auth_simple mod_auth_sqlite mod_chat_history mod_chat_only mod_topic mod_no_guest_downloads DESTINATION /usr/lib/uhub/ OPTIONAL )
+- install( FILES ${CMAKE_SOURCE_DIR}/doc/uhub.conf ${CMAKE_SOURCE_DIR}/doc/plugins.conf ${CMAKE_SOURCE_DIR}/doc/rules.txt ${CMAKE_SOURCE_DIR}/doc/motd.txt DESTINATION /etc/uhub OPTIONAL )
++
++ foreach( PLUGIN ${PLUGINS} )
++ install( TARGETS ${PLUGIN} DESTINATION $ENV{${PLUGIN}} OPTIONAL )
++ endforeach( PLUGIN )
++
++ install( FILES ${CMAKE_SOURCE_DIR}/doc/uhub.conf ${CMAKE_SOURCE_DIR}/doc/plugins.conf ${CMAKE_SOURCE_DIR}/doc/rules.txt ${CMAKE_SOURCE_DIR}/doc/motd.txt DESTINATION doc/ OPTIONAL )
+
+ if (SQLITE_SUPPORT)
+ install( TARGETS uhub-passwd RUNTIME DESTINATION bin )
diff --git a/pkgs/servers/uhub/systemd.patch b/pkgs/servers/uhub/systemd.patch
new file mode 100644
index 00000000000..05e7571d18d
--- /dev/null
+++ b/pkgs/servers/uhub/systemd.patch
@@ -0,0 +1,164 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 40e996e..fc4fb01 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -19,6 +19,7 @@ option(LINK_SUPPORT "Allow hub linking" OFF)
+ option(SSL_SUPPORT "Enable SSL support" ON)
+ option(USE_OPENSSL "Use OpenSSL's SSL support" ON )
+ option(SQLITE_SUPPORT "Enable SQLite support" ON)
++option(SYSTEMD_SUPPORT "Enable systemd notify and journal logging" OFF)
+ option(ADC_STRESS "Enable the stress tester client" OFF)
+
+ find_package(Git)
+@@ -34,6 +35,12 @@ if (SSL_SUPPORT)
+ endif()
+ endif()
+
++if (SYSTEMD_SUPPORT)
++ INCLUDE(FindPkgConfig)
++ pkg_search_module(SD_DAEMON REQUIRED libsystemd-daemon)
++ pkg_search_module(SD_JOURNAL REQUIRED libsystemd-journal)
++endif()
++
+ if (MSVC)
+ add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+ endif()
+@@ -175,6 +182,18 @@ if(SSL_SUPPORT)
+ endif()
+ endif()
+
++if (SYSTEMD_SUPPORT)
++ target_link_libraries(uhub ${SD_DAEMON_LIBRARIES})
++ target_link_libraries(uhub ${SD_JOURNAL_LIBRARIES})
++ target_link_libraries(test ${SD_DAEMON_LIBRARIES})
++ target_link_libraries(test ${SD_JOURNAL_LIBRARIES})
++ target_link_libraries(uhub-passwd ${SD_JOURNAL_LIBRARIES})
++ target_link_libraries(uhub-admin ${SD_JOURNAL_LIBRARIES})
++ include_directories(${SD_DAEMON_INCLUDE_DIRS})
++ include_directories(${SD_JOURNAL_INCLUDE_DIRS})
++ add_definitions(-DSYSTEMD)
++endif()
++
+ configure_file ("${PROJECT_SOURCE_DIR}/version.h.in" "${PROJECT_SOURCE_DIR}/version.h")
+
+ mark_as_advanced(FORCE CMAKE_BUILD_TYPE)
+diff --git a/src/core/main.c b/src/core/main.c
+index bb78672..ac2d2a8 100644
+--- a/src/core/main.c
++++ b/src/core/main.c
+@@ -19,6 +19,10 @@
+
+ #include "uhub.h"
+
++#ifdef SYSTEMD
++#include
++#endif
++
+ static int arg_verbose = 5;
+ static int arg_fork = 0;
+ static int arg_check_config = 0;
+@@ -145,7 +149,16 @@ int main_loop()
+ }
+ #if !defined(WIN32)
+ setup_signal_handlers(hub);
+-#endif
++#ifdef SYSTEMD
++ /* Notify the service manager that this daemon has
++ * been successfully initalized and shall enter the
++ * main loop.
++ */
++ sd_notifyf(0, "READY=1\n"
++ "MAINPID=%lu", (unsigned long) getpid());
++#endif /* SYSTEMD */
++
++#endif /* ! WIN32 */
+ }
+
+ hub_set_variables(hub, &acl);
+@@ -216,13 +229,17 @@ void print_usage(char* program)
+ " -q Quiet mode - no output\n"
+ " -f Fork to background\n"
+ " -l Log messages to given file (default: stderr)\n"
+- " -L Log messages to syslog\n"
+ " -c Specify configuration file (default: " SERVER_CONFIG ")\n"
+ " -C Check configuration and return\n"
+ " -s Show configuration parameters\n"
+ " -S Show configuration parameters, but ignore defaults\n"
+ " -h This message\n"
+ #ifndef WIN32
++#ifdef SYSTEMD
++ " -L Log messages to journal\n"
++#else
++ " -L Log messages to syslog\n"
++#endif
+ " -u Run as given user\n"
+ " -g Run with given group permissions\n"
+ " -p Store pid in file (process id)\n"
+diff --git a/src/util/log.c b/src/util/log.c
+index 42badb3..2d97528 100644
+--- a/src/util/log.c
++++ b/src/util/log.c
+@@ -21,7 +21,15 @@
+ #include
+
+ #ifndef WIN32
++
++#ifdef SYSTEMD
++#define SD_JOURNAL_SUPPRESS_LOCATION
++#include
++
++#else
+ #include
++#endif
++
+ static int use_syslog = 0;
+ #endif
+
+@@ -83,7 +91,9 @@ void hub_log_initialize(const char* file, int syslog)
+ if (syslog)
+ {
+ use_syslog = 1;
++ #ifndef SYSTEMD
+ openlog("uhub", LOG_PID, LOG_USER);
++ #endif
+ }
+ #endif
+
+@@ -132,7 +142,9 @@ void hub_log_shutdown()
+ if (use_syslog)
+ {
+ use_syslog = 0;
++ #ifndef SYSTEMD
+ closelog();
++ #endif
+ }
+ #endif
+ }
+@@ -212,7 +224,12 @@ void hub_log(int log_verbosity, const char *format, ...)
+ case log_fatal: level = LOG_CRIT; break;
+ case log_error: level = LOG_ERR; break;
+ case log_warning: level = LOG_WARNING; break;
+- case log_user: level = LOG_INFO | LOG_AUTH; break;
++ #ifdef SYSTEMD
++ case log_user: level = LOG_INFO; break;
++
++ #else
++ case log_user: level = LOG_INFO | LOG_AUTH; break;
++ #endif
+ case log_info: level = LOG_INFO; break;
+ case log_debug: level = LOG_DEBUG; break;
+
+@@ -224,8 +241,13 @@ void hub_log(int log_verbosity, const char *format, ...)
+ if (level == 0)
+ return;
+
++ #ifdef SYSTEMD
++ sd_journal_print(level, "%s", logmsg);
++
++ #else
+ level |= (LOG_USER | LOG_DAEMON);
+ syslog(level, "%s", logmsg);
++ #endif
+ }
+ #endif
+
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index c4dfa983f55..5dd7c0fa75d 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -915,11 +915,11 @@ let
}) // {inherit ;};
libxcb = (mkDerivation "libxcb" {
- name = "libxcb-1.10";
+ name = "libxcb-1.11";
builder = ./builder.sh;
src = fetchurl {
- url = http://xcb.freedesktop.org/dist/libxcb-1.10.tar.bz2;
- sha256 = "1dfmyb1zjx6n0zhr4y40mc1crlmj3bfjjhmn0f30ip9nnq2spncq";
+ url = http://xcb.freedesktop.org/dist/libxcb-1.11.tar.bz2;
+ sha256 = "1xqgc81krx14f2c8yl5chzg5g2l26mhm2rwffy8dx7jv0iq5sqq3";
};
buildInputs = [pkgconfig libxslt libpthreadstubs python libXau xcbproto libXdmcp ];
}) // {inherit libxslt libpthreadstubs python libXau xcbproto libXdmcp ;};
@@ -1175,11 +1175,11 @@ let
}) // {inherit ;};
xcbproto = (mkDerivation "xcbproto" {
- name = "xcb-proto-1.10";
+ name = "xcb-proto-1.11";
builder = ./builder.sh;
src = fetchurl {
- url = http://xcb.freedesktop.org/dist/xcb-proto-1.10.tar.bz2;
- sha256 = "01dgp802i4ic9wkmpa7g1wm50pp547d3b96jjz2hnxavhpfhvx3y";
+ url = http://xcb.freedesktop.org/dist/xcb-proto-1.11.tar.bz2;
+ sha256 = "0bp3f53l9fy5x3mn1rkj1g81aiyzl90wacwvqdgy831aa3kfxb5l";
};
buildInputs = [pkgconfig python ];
}) // {inherit python ;};
@@ -1405,11 +1405,11 @@ let
}) // {inherit inputproto xorgserver xproto ;};
xf86inputmouse = (mkDerivation "xf86inputmouse" {
- name = "xf86-input-mouse-1.9.0";
+ name = "xf86-input-mouse-1.9.1";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/driver/xf86-input-mouse-1.9.0.tar.bz2;
- sha256 = "12344w0cxac1ld54qqwynxwazbmmpvqh1mzcskmfkmakmr5iwq2x";
+ url = mirror://xorg/individual/driver/xf86-input-mouse-1.9.1.tar.bz2;
+ sha256 = "1kn5kx3qyn9qqvd6s24a2l1wfgck2pgfvzl90xpl024wfxsx719l";
};
buildInputs = [pkgconfig inputproto xorgserver xproto ];
}) // {inherit inputproto xorgserver xproto ;};
@@ -1515,11 +1515,11 @@ let
}) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ;};
xf86videogeode = (mkDerivation "xf86videogeode" {
- name = "xf86-video-geode-2.11.15";
+ name = "xf86-video-geode-2.11.16";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/driver/xf86-video-geode-2.11.15.tar.bz2;
- sha256 = "1w4ghr2a41kaw4g9na8ws5fjbmy8zkbxpxa21vmqc8mkjzb3pnq0";
+ url = mirror://xorg/individual/driver/xf86-video-geode-2.11.16.tar.bz2;
+ sha256 = "19y13xl7yfrgyis92rmxi0ld95ajgr5il0n9j1dridwzw9aizz1q";
};
buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
}) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
@@ -2035,11 +2035,11 @@ let
}) // {inherit ;};
xrandr = (mkDerivation "xrandr" {
- name = "xrandr-1.4.2";
+ name = "xrandr-1.4.3";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/app/xrandr-1.4.2.tar.bz2;
- sha256 = "1g4hnj53wknsjwiqivyy3jl4qw7jwrpncz7d5p2z29zq5zlnxrxj";
+ url = mirror://xorg/individual/app/xrandr-1.4.3.tar.bz2;
+ sha256 = "06xy0kr6ih7ilrwl6b5g6ay75vm2j4lxnv1d5xlj6sdqhqsaqm3i";
};
buildInputs = [pkgconfig libX11 xproto libXrandr libXrender ];
}) // {inherit libX11 xproto libXrandr libXrender ;};
diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list
index 2d105241c2d..84795ed980b 100644
--- a/pkgs/servers/x11/xorg/extra.list
+++ b/pkgs/servers/x11/xorg/extra.list
@@ -1,6 +1,6 @@
http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.bz2
-http://xcb.freedesktop.org/dist/libxcb-1.10.tar.bz2
-http://xcb.freedesktop.org/dist/xcb-proto-1.10.tar.bz2
+http://xcb.freedesktop.org/dist/libxcb-1.11.tar.bz2
+http://xcb.freedesktop.org/dist/xcb-proto-1.11.tar.bz2
http://xcb.freedesktop.org/dist/xcb-util-0.3.9.tar.bz2
http://xcb.freedesktop.org/dist/xcb-util-image-0.3.9.tar.bz2
http://xcb.freedesktop.org/dist/xcb-util-keysyms-0.3.9.tar.bz2
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 93acd927f3b..1cc028e60d7 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -118,7 +118,7 @@ mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2
mirror://xorg/individual/driver/xf86-input-evdev-2.8.4.tar.bz2
mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2
mirror://xorg/individual/driver/xf86-input-keyboard-1.8.0.tar.bz2
-mirror://xorg/individual/driver/xf86-input-mouse-1.9.0.tar.bz2
+mirror://xorg/individual/driver/xf86-input-mouse-1.9.1.tar.bz2
mirror://xorg/individual/driver/xf86-input-synaptics-1.7.6.tar.bz2
mirror://xorg/individual/driver/xf86-input-vmmouse-13.0.0.tar.bz2
mirror://xorg/individual/driver/xf86-input-void-1.4.0.tar.bz2
@@ -130,7 +130,7 @@ mirror://xorg/individual/driver/xf86-video-nouveau-1.0.10.tar.bz2
mirror://xorg/individual/driver/xf86-video-cirrus-1.5.2.tar.bz2
mirror://xorg/individual/driver/xf86-video-dummy-0.3.7.tar.bz2
mirror://xorg/individual/driver/xf86-video-fbdev-0.4.4.tar.bz2
-mirror://xorg/individual/driver/xf86-video-geode-2.11.15.tar.bz2
+mirror://xorg/individual/driver/xf86-video-geode-2.11.16.tar.bz2
mirror://xorg/individual/driver/xf86-video-glide-1.2.2.tar.bz2
mirror://xorg/individual/driver/xf86-video-glint-1.2.8.tar.bz2
mirror://xorg/individual/driver/xf86-video-i128-1.3.6.tar.bz2
@@ -176,7 +176,7 @@ mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2
mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2
mirror://xorg/individual/app/xprop-1.2.2.tar.bz2
mirror://xorg/individual/proto/xproto-7.0.26.tar.bz2
-mirror://xorg/individual/app/xrandr-1.4.2.tar.bz2
+mirror://xorg/individual/app/xrandr-1.4.3.tar.bz2
mirror://xorg/individual/app/xrdb-1.1.0.tar.bz2
mirror://xorg/individual/app/xrefresh-1.0.5.tar.bz2
mirror://xorg/individual/app/xset-1.2.3.tar.bz2
diff --git a/pkgs/servers/zookeeper/default.nix b/pkgs/servers/zookeeper/default.nix
new file mode 100755
index 00000000000..307993a958a
--- /dev/null
+++ b/pkgs/servers/zookeeper/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, jre, makeWrapper, bash }:
+
+stdenv.mkDerivation rec {
+ name = "zookeeper-3.4.6";
+
+ src = fetchurl {
+ url = "mirror://apache/zookeeper/${name}/${name}.tar.gz";
+ sha256 = "01b3938547cd620dc4c93efe07c0360411f4a66962a70500b163b59014046994";
+ };
+
+ buildInputs = [ makeWrapper jre ];
+
+ phases = ["unpackPhase" "installPhase"];
+
+ installPhase = ''
+ mkdir -p $out
+ cp -R conf docs lib ${name}.jar $out
+ mkdir -p $out/bin
+ cp -R bin/{zkCli,zkCleanup,zkEnv}.sh $out/bin
+ for i in $out/bin/{zkCli,zkCleanup}.sh; do
+ wrapProgram $i \
+ --set JAVA_HOME "${jre}" \
+ --prefix PATH : "${bash}/bin"
+ done
+ chmod -x $out/bin/zkEnv.sh
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = "http://zookeeper.apache.org";
+ description = "Apache Zookeeper";
+ license = licenses.asl20;
+ maintainers = [ maintainers.nathan-gs ];
+ platforms = platforms.unix;
+ };
+
+}
diff --git a/pkgs/shells/bash/bash-4.2-patches.nix b/pkgs/shells/bash/bash-4.2-patches.nix
index 567ec3c551c..0941252ef3e 100644
--- a/pkgs/shells/bash/bash-4.2-patches.nix
+++ b/pkgs/shells/bash/bash-4.2-patches.nix
@@ -48,4 +48,8 @@ patch: [
(patch "045" "0vcqn9rb26bahhrarbwhpa0ny0nrf4vyrzh97d44lfcxypqfzdyx")
(patch "046" "0vc1ngkxkamwr022ww3vjp9ww9c647az4pjn175c1v60d0xk5hcm")
(patch "047" "0ymgimqz65sx2izg1dvm1h5cc01arl3j9j5137212l1ls00r55y1")
+(patch "048" "091xk1ms7ycnczsl3fx461gjhj69j6ycnfijlymwj6mj60ims6km")
+(patch "049" "03jipi8qz5baf1dyhld7yvazkkad7lz5czchrjsrnglzvm6df74h")
+(patch "050" "19lb9nh0x5siwf21xkga3khy5pa3srfrlx97mby4cfz8am2bh68s")
+(patch "051" "0705948wzi27zxphkh5vx4n62i671afyrb4qx276n49sq9xk859y")
]
diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix
index 6a6b8563a55..ca12c26f256 100644
--- a/pkgs/shells/bash/default.nix
+++ b/pkgs/shells/bash/default.nix
@@ -27,14 +27,14 @@ stdenv.mkDerivation rec {
patchFlags = "-p0";
patches =
- let
+ (let
patch = nr: sha256:
fetchurl {
url = "mirror://gnu/bash/bash-4.2-patches/bash42-${nr}";
inherit sha256;
};
in
- import ./bash-4.2-patches.nix patch;
+ import ./bash-4.2-patches.nix patch);
crossAttrs = {
configureFlags = baseConfigureFlags +
diff --git a/pkgs/shells/dash/default.nix b/pkgs/shells/dash/default.nix
index a66ab994c81..d3104439e57 100644
--- a/pkgs/shells/dash/default.nix
+++ b/pkgs/shells/dash/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "dash-0.5.7";
+ name = "dash-0.5.8";
src = fetchurl {
url = "http://gondor.apana.org.au/~herbert/dash/files/${name}.tar.gz";
- sha256 = "0fafpbpq6jghs0fr392x525dybym9kq1s3kly2679ds526gzm2df";
+ sha256 = "03y6z8akj72swa6f42h2dhq3p09xasbi6xia70h2vc27fwikmny6";
};
meta = {
diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix
index adfe44b3bac..03ecc290d14 100644
--- a/pkgs/shells/fish/default.nix
+++ b/pkgs/shells/fish/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
description = "Smart and user-friendly command line shell";
homepage = "http://fishshell.com/";
license = licenses.gpl2;
- platforms = platforms.linux;
+ platforms = platforms.unix;
maintainers = with maintainers; [ ocharles ];
};
}
diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix
index d187c50f251..349d1719e56 100644
--- a/pkgs/shells/zsh/default.nix
+++ b/pkgs/shells/zsh/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl, ncurses, coreutils }:
+{ stdenv, fetchurl, ncurses, coreutils, pcre }:
let
- version = "5.0.5";
+ version = "5.0.6";
documentation = fetchurl {
url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.bz2";
- sha256 = "1wljqii2lkz5kc4y3xs65isnahvnlj678b9zv31bn444mapjpwp4";
+ sha256 = "1mngi85q56szzlrdzv60vg7wl03lih8vlnl800gwr0i6d1laawxj";
};
in
@@ -16,13 +16,13 @@ stdenv.mkDerivation {
src = fetchurl {
url = "mirror://sourceforge/zsh/zsh-${version}.tar.bz2";
- sha256 = "1bwfz9n850pclzmzrb437icfhzv1s5pgh2dhs92f194gdkxx4936";
+ sha256 = "0ic86y35v82d87ixjzdb6zrnzf002b7gn573jnva6cqm2jdm1jl4";
};
- buildInputs = [ ncurses coreutils ];
+ buildInputs = [ ncurses coreutils pcre ];
preConfigure = ''
- configureFlags="--enable-maildir-support --enable-multibyte --enable-zprofile=$out/etc/zprofile --with-tcsetpgrp"
+ configureFlags="--enable-maildir-support --enable-multibyte --enable-zprofile=$out/etc/zprofile --with-tcsetpgrp --enable-pcre"
'';
# XXX: think/discuss about this, also with respect to nixos vs nix-on-X
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 11731c1c1c1..399843c2760 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -115,12 +115,12 @@ let
__ignoreNulls = true;
# Inputs built by the cross compiler.
- buildInputs = lib.optionals (crossConfig != null) (buildInputs ++ extraBuildInputs);
- propagatedBuildInputs = lib.optionals (crossConfig != null) propagatedBuildInputs;
+ buildInputs = if crossConfig != null then buildInputs ++ extraBuildInputs else [];
+ propagatedBuildInputs = if crossConfig != null then propagatedBuildInputs else [];
# Inputs built by the usual native compiler.
- nativeBuildInputs = nativeBuildInputs ++ lib.optionals (crossConfig == null) (buildInputs ++ extraBuildInputs);
+ nativeBuildInputs = nativeBuildInputs ++ (if crossConfig == null then buildInputs ++ extraBuildInputs else []);
propagatedNativeBuildInputs = propagatedNativeBuildInputs ++
- lib.optionals (crossConfig == null) propagatedBuildInputs;
+ (if crossConfig == null then propagatedBuildInputs else []);
}))) (
{
# The meta attribute is passed in the resulting attribute set,
@@ -154,7 +154,8 @@ let
|| system == "x86_64-kfreebsd-gnu";
isSunOS = system == "i686-solaris"
|| system == "x86_64-solaris";
- isCygwin = system == "i686-cygwin";
+ isCygwin = system == "i686-cygwin"
+ || system == "x86_64-cygwin";
isFreeBSD = system == "i686-freebsd"
|| system == "x86_64-freebsd";
isOpenBSD = system == "i686-openbsd"
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 23cccf223f4..6f8b42c2266 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -35,8 +35,8 @@ rec {
# The bootstrap process proceeds in several steps.
- # 1) Create a standard environment by downloading pre-built binaries
- # of coreutils, GCC, etc.
+ # Create a standard environment by downloading pre-built binaries of
+ # coreutils, GCC, etc.
# Download and unpack the bootstrap tools (coreutils, GCC, Glibc, ...).
@@ -46,7 +46,7 @@ rec {
builder = bootstrapFiles.sh;
args =
- if system == "armv5tel-linux" || system == "armv6l-linux"
+ if system == "armv5tel-linux" || system == "armv6l-linux"
|| system == "armv7l-linux"
then [ ./scripts/unpack-bootstrap-tools-arm.sh ]
else [ ./scripts/unpack-bootstrap-tools.sh ];
@@ -66,137 +66,136 @@ rec {
};
- # This function builds the various standard environments used during
- # the bootstrap.
- stdenvBootFun =
- {gcc, extraAttrs ? {}, overrides ? (pkgs: {}), extraPath ? [], fetchurl}:
-
- import ../generic {
- inherit system config;
- name = "stdenv-linux-boot";
- preHook =
- ''
- # Don't patch #!/interpreter because it leads to retained
- # dependencies on the bootstrapTools in the final stdenv.
- dontPatchShebangs=1
- ${commonPreHook}
- '';
- shell = "${bootstrapTools}/bin/sh";
- initialPath = [bootstrapTools] ++ extraPath;
- fetchurlBoot = fetchurl;
- inherit gcc;
- # Having the proper 'platform' in all the stdenvs allows getting proper
- # linuxHeaders for example.
- extraAttrs = extraAttrs // { inherit platform; };
- overrides = pkgs: (overrides pkgs) // {
- inherit fetchurl;
- };
- };
-
- # Build a dummy stdenv with no GCC or working fetchurl. This is
- # because we need a stdenv to build the GCC wrapper and fetchurl.
- stdenvLinuxBoot0 = stdenvBootFun {
- gcc = "/no-such-path";
- fetchurl = null;
- };
-
-
- fetchurl = import ../../build-support/fetchurl {
- stdenv = stdenvLinuxBoot0;
- curl = bootstrapTools;
- };
-
-
- # The Glibc include directory cannot have the same prefix as the GCC
- # include directory, since GCC gets confused otherwise (it will
- # search the Glibc headers before the GCC headers). So create a
- # dummy Glibc.
- bootstrapGlibc = stdenvLinuxBoot0.mkDerivation {
- name = "bootstrap-glibc";
- buildCommand = ''
- mkdir -p $out
- ln -s ${bootstrapTools}/lib $out/lib
- ln -s ${bootstrapTools}/include-glibc $out/include
- '';
- };
-
-
# A helper function to call gcc-wrapper.
wrapGCC =
- { gcc ? bootstrapTools, libc, binutils, coreutils, shell ? "", name ? "bootstrap-gcc-wrapper" }:
+ { gcc, libc, binutils, coreutils, name }:
lib.makeOverridable (import ../../build-support/gcc-wrapper) {
nativeTools = false;
nativeLibc = false;
- inherit gcc binutils coreutils libc shell name;
- stdenv = stdenvLinuxBoot0;
+ inherit gcc binutils coreutils libc name;
+ stdenv = stage0.stdenv;
};
+ # This function builds the various standard environments used during
+ # the bootstrap. In all stages, we build an stdenv and the package
+ # set that can be built with that stdenv.
+ stageFun =
+ {gcc, extraAttrs ? {}, overrides ? (pkgs: {}), extraPath ? []}:
+
+ let
+
+ thisStdenv = import ../generic {
+ inherit system config;
+ name = "stdenv-linux-boot";
+ preHook =
+ ''
+ # Don't patch #!/interpreter because it leads to retained
+ # dependencies on the bootstrapTools in the final stdenv.
+ dontPatchShebangs=1
+ ${commonPreHook}
+ '';
+ shell = "${bootstrapTools}/bin/sh";
+ initialPath = [bootstrapTools] ++ extraPath;
+ fetchurlBoot = import ../../build-support/fetchurl {
+ stdenv = stage0.stdenv;
+ curl = bootstrapTools;
+ };
+ inherit gcc;
+ # Having the proper 'platform' in all the stdenvs allows getting proper
+ # linuxHeaders for example.
+ extraAttrs = extraAttrs // { inherit platform; };
+ overrides = pkgs: (overrides pkgs) // { fetchurl = thisStdenv.fetchurlBoot; };
+ };
+
+ thisPkgs = allPackages {
+ inherit system platform;
+ bootStdenv = thisStdenv;
+ };
+
+ in { stdenv = thisStdenv; pkgs = thisPkgs; };
+
+
+ # Build a dummy stdenv with no GCC or working fetchurl. This is
+ # because we need a stdenv to build the GCC wrapper and fetchurl.
+ stage0 = stageFun {
+ gcc = "/no-such-path";
+
+ overrides = pkgs: {
+ # The Glibc include directory cannot have the same prefix as the
+ # GCC include directory, since GCC gets confused otherwise (it
+ # will search the Glibc headers before the GCC headers). So
+ # create a dummy Glibc here, which will be used in the stdenv of
+ # stage1.
+ glibc = stage0.stdenv.mkDerivation {
+ name = "bootstrap-glibc";
+ buildCommand = ''
+ mkdir -p $out
+ ln -s ${bootstrapTools}/lib $out/lib
+ ln -s ${bootstrapTools}/include-glibc $out/include
+ '';
+ };
+ };
+ };
+
+
# Create the first "real" standard environment. This one consists
# of bootstrap tools only, and a minimal Glibc to keep the GCC
# configure script happy.
- stdenvLinuxBoot1 = stdenvBootFun {
+ #
+ # For clarity, we only use the previous stage when specifying these
+ # stages. So stageN should only ever have references for stage{N-1}.
+ #
+ # If we ever need to use a package from more than one stage back, we
+ # simply re-export those packages in the middle stage(s) using the
+ # overrides attribute and the inherit syntax.
+ stage1 = stageFun {
gcc = wrapGCC {
- libc = bootstrapGlibc;
+ gcc = bootstrapTools;
+ libc = stage0.pkgs.glibc;
binutils = bootstrapTools;
coreutils = bootstrapTools;
+ name = "bootstrap-gcc-wrapper";
+ };
+ # Rebuild binutils to use from stage2 onwards.
+ overrides = pkgs: {
+ binutils = pkgs.binutils.override { gold = false; };
+ inherit (stage0.pkgs) glibc;
};
- inherit fetchurl;
};
- # 2) These are the packages that we can build with the first
- # stdenv. We only need binutils, because recent Glibcs
- # require recent Binutils, and those in bootstrap-tools may
- # be too old.
- stdenvLinuxBoot1Pkgs = allPackages {
- inherit system platform;
- bootStdenv = stdenvLinuxBoot1;
- };
-
- binutils1 = stdenvLinuxBoot1Pkgs.binutils.override { gold = false; };
-
-
- # 3) 2nd stdenv that we will use to build only Glibc.
- stdenvLinuxBoot2 = stdenvBootFun {
+ # 2nd stdenv that contains our own rebuilt binutils and is used for
+ # compiling our own Glibc.
+ stage2 = stageFun {
gcc = wrapGCC {
- libc = bootstrapGlibc;
- binutils = binutils1;
+ gcc = bootstrapTools;
+ libc = stage1.pkgs.glibc;
+ binutils = stage1.pkgs.binutils;
coreutils = bootstrapTools;
+ name = "bootstrap-gcc-wrapper";
};
overrides = pkgs: {
- inherit (stdenvLinuxBoot1Pkgs) perl;
+ inherit (stage1.pkgs) perl binutils paxctl;
+ # This also contains the full, dynamically linked, final Glibc.
};
- inherit fetchurl;
};
- # 4) These are the packages that we can build with the 2nd
- # stdenv.
- stdenvLinuxBoot2Pkgs = allPackages {
- inherit system platform;
- bootStdenv = stdenvLinuxBoot2;
- };
-
-
- # 5) Build Glibc with the bootstrap tools. The result is the full,
- # dynamically linked, final Glibc.
- stdenvLinuxGlibc = stdenvLinuxBoot2Pkgs.glibc;
-
-
- # 6) Construct a third stdenv identical to the 2nd, except that this
- # one uses the Glibc built in step 5. It still uses the recent
- # binutils and rest of the bootstrap tools, including GCC.
- stdenvLinuxBoot3 = stdenvBootFun {
+ # Construct a third stdenv identical to the 2nd, except that this
+ # one uses the rebuilt Glibc from stage2. It still uses the recent
+ # binutils and rest of the bootstrap tools, including GCC.
+ stage3 = stageFun {
gcc = wrapGCC {
- binutils = binutils1;
+ gcc = bootstrapTools;
+ libc = stage2.pkgs.glibc;
+ binutils = stage2.pkgs.binutils;
coreutils = bootstrapTools;
- libc = stdenvLinuxGlibc;
+ name = "bootstrap-gcc-wrapper";
};
overrides = pkgs: {
- glibc = stdenvLinuxGlibc;
- inherit (stdenvLinuxBoot1Pkgs) perl;
+ inherit (stage2.pkgs) binutils glibc perl;
# Link GCC statically against GMP etc. This makes sense because
# these builds of the libraries are only used by GCC, so it
# reduces the size of the stdenv closure.
@@ -208,54 +207,40 @@ rec {
ppl = pkgs.ppl.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
};
extraAttrs = {
- glibc = stdenvLinuxGlibc; # Required by gcc47 build
+ glibc = stage2.pkgs.glibc; # Required by gcc47 build
};
- extraPath = [ stdenvLinuxBoot1Pkgs.paxctl ];
- inherit fetchurl;
+ extraPath = [ stage2.pkgs.paxctl ];
};
- # 7) The packages that can be built using the third stdenv.
- stdenvLinuxBoot3Pkgs = allPackages {
- inherit system platform;
- bootStdenv = stdenvLinuxBoot3;
- };
-
-
- # 8) Construct a fourth stdenv identical to the second, except that
- # this one uses the new GCC from step 7. The other tools
- # (e.g. coreutils) are still from the bootstrap tools.
- stdenvLinuxBoot4 = stdenvBootFun {
- gcc = wrapGCC rec {
- binutils = binutils1;
+ # Construct a fourth stdenv that uses the new GCC. But coreutils is
+ # still from the bootstrap tools.
+ stage4 = stageFun {
+ gcc = wrapGCC {
+ gcc = stage3.pkgs.gcc.gcc;
+ libc = stage3.pkgs.glibc;
+ binutils = stage3.pkgs.binutils;
coreutils = bootstrapTools;
- libc = stdenvLinuxGlibc;
- gcc = stdenvLinuxBoot3Pkgs.gcc.gcc;
name = "";
};
- extraPath = [ stdenvLinuxBoot3Pkgs.xz ];
+ extraPath = [ stage3.pkgs.xz ];
overrides = pkgs: {
- inherit (stdenvLinuxBoot1Pkgs) perl;
- inherit (stdenvLinuxBoot3Pkgs) gettext gnum4 gmp;
+ # Zlib has to be inherited and not rebuilt in this stage,
+ # because gcc (since JAR support) already depends on zlib, and
+ # then if we already have a zlib we want to use that for the
+ # other purposes (binutils and top-level pkgs) too.
+ inherit (stage3.pkgs) gettext gnum4 gmp perl glibc zlib;
};
- inherit fetchurl;
};
- # 9) The packages that can be built using the fourth stdenv.
- stdenvLinuxBoot4Pkgs = allPackages {
- inherit system platform;
- bootStdenv = stdenvLinuxBoot4;
- };
-
-
- # 10) Construct the final stdenv. It uses the Glibc and GCC, and
- # adds in a new binutils that doesn't depend on bootstrap-tools,
- # as well as dynamically linked versions of all other tools.
+ # Construct the final stdenv. It uses the Glibc and GCC, and adds
+ # in a new binutils that doesn't depend on bootstrap-tools, as well
+ # as dynamically linked versions of all other tools.
#
- # When updating stdenvLinux, make sure that the result has no
- # dependency (`nix-store -qR') on bootstrapTools or the
- # first binutils built.
+ # When updating stdenvLinux, make sure that the result has no
+ # dependency (`nix-store -qR') on bootstrapTools or the first
+ # binutils built.
stdenvLinux = import ../generic rec {
inherit system config;
@@ -268,35 +253,32 @@ rec {
'';
initialPath =
- ((import ../common-path.nix) {pkgs = stdenvLinuxBoot4Pkgs;})
- ++ [stdenvLinuxBoot4Pkgs.patchelf stdenvLinuxBoot4Pkgs.paxctl ];
+ ((import ../common-path.nix) {pkgs = stage4.pkgs;})
+ ++ [stage4.pkgs.patchelf stage4.pkgs.paxctl ];
- gcc = wrapGCC rec {
- inherit (stdenvLinuxBoot4Pkgs) binutils coreutils;
- libc = stdenvLinuxGlibc;
- gcc = stdenvLinuxBoot4.gcc.gcc;
- shell = stdenvLinuxBoot4Pkgs.bash + "/bin/bash";
+ shell = stage4.pkgs.bash + "/bin/bash";
+
+ gcc = (wrapGCC rec {
+ gcc = stage4.stdenv.gcc.gcc;
+ libc = stage4.pkgs.glibc;
+ inherit (stage4.pkgs) binutils coreutils;
name = "";
- };
+ }).override { inherit shell; };
- shell = stdenvLinuxBoot4Pkgs.bash + "/bin/bash";
-
- fetchurlBoot = fetchurl;
+ inherit (stage4.stdenv) fetchurlBoot;
extraAttrs = {
- inherit (stdenvLinuxBoot3Pkgs) glibc;
+ inherit (stage4.pkgs) glibc;
inherit platform bootstrapTools;
- shellPackage = stdenvLinuxBoot4Pkgs.bash;
+ shellPackage = stage4.pkgs.bash;
};
overrides = pkgs: {
inherit gcc;
- inherit (stdenvLinuxBoot3Pkgs) glibc;
- inherit (stdenvLinuxBoot4Pkgs) binutils;
- inherit (stdenvLinuxBoot4Pkgs)
- gzip bzip2 xz bash coreutils diffutils findutils gawk
- gnumake gnused gnutar gnugrep gnupatch patchelf
- attr acl paxctl;
+ inherit (stage4.pkgs)
+ gzip bzip2 xz bash binutils coreutils diffutils findutils gawk
+ glibc gnumake gnused gnutar gnugrep gnupatch patchelf
+ attr acl paxctl zlib;
};
};
diff --git a/pkgs/test/openftd/default.nix b/pkgs/test/openftd/default.nix
index 34cff9ac93f..91042fe0591 100644
--- a/pkgs/test/openftd/default.nix
+++ b/pkgs/test/openftd/default.nix
@@ -6,7 +6,7 @@ Systeemvereisten
* glib >= 2.2.0
* gtk >= 2.2.0
-Glib 2 is een 'dependancy' van gtk2. Als je gtk2 op je systeem hebt staan dan heb je ongetwijfeld ook glib2 op je systeem. Zie: www.gtk.org voor meer informatie omtrent Glib/gtk2
+Glib 2 is een 'dependency' van gtk2. Als je gtk2 op je systeem hebt staan dan heb je ongetwijfeld ook glib2 op je systeem. Zie: www.gtk.org voor meer informatie omtrent Glib/gtk2
Alhoewel FTD4Linux gtk 2.2 als minimumvereiste heeft raden we toch aan om gtk 2.4 te gebruiken. Dit vanwege een bug in gtk versies 2.2.2 t/m 2.2.4.
* libxml2 >= 2.2.5
diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix
index 58db0c13abb..f3b5208de87 100644
--- a/pkgs/tools/X11/bumblebee/default.nix
+++ b/pkgs/tools/X11/bumblebee/default.nix
@@ -88,7 +88,6 @@ in stdenv.mkDerivation {
wrapProgram "$out/sbin/bumblebeed" \
--prefix PATH : "${commonEnv}/sbin:${commonEnv}/bin:\$PATH" \
--prefix LD_LIBRARY_PATH : "${commonEnv}/lib:\$LD_LIBRARY_PATH" \
- --set FONTCONFIG_FILE "/etc/fonts/fonts.conf" \
--set XKB_BINDIR "${xorg.xkbcomp}/bin" \
--set XKB_DIR "${xkeyboard_config}/etc/X11/xkb"
diff --git a/pkgs/tools/X11/keynav/default.nix b/pkgs/tools/X11/keynav/default.nix
index 02b6321d18c..0b41e05e3f2 100644
--- a/pkgs/tools/X11/keynav/default.nix
+++ b/pkgs/tools/X11/keynav/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchurl, libX11, xextproto, libXtst, imake, libXi, libXext }:
+{ stdenv, fetchurl, pkgconfig, libX11, xextproto, libXtst, libXi, libXext
+, libXinerama, glib, cairo, xdotool }:
stdenv.mkDerivation rec {
- name = "keynav-20070903";
+ name = "keynav-0.20110708.0";
src = fetchurl {
- url = "http://www.semicomplete.com/files/keynav/${name}.tar.gz";
- sha256 = "037mbgm78jwy0qd0z691pgx4zcpkk5544fx8ajm2mx4y80k2d9kk";
+ url = "https://semicomplete.googlecode.com/files/${name}.tar.gz";
+ sha256 = "1gizjhji3yspxxxvb90js3z1bv18rbf5phxg8rciixpj3cccff8z";
};
- buildInputs = [libX11 xextproto libXtst imake libXi libXext];
-
- NIX_LDFLAGS = "-lXext";
+ buildInputs = [ pkgconfig libX11 xextproto libXtst libXi libXext libXinerama
+ glib cairo xdotool ];
installPhase =
''
@@ -19,7 +19,11 @@ stdenv.mkDerivation rec {
cp keynavrc $out/share/keynav/doc
'';
- meta = {
+ meta = with stdenv.lib; {
description = "Generate X11 mouse clicks from keyboard";
+ homepage = http://www.semicomplete.com/projects/keynav/;
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ pSub ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/tools/X11/xnee/default.nix b/pkgs/tools/X11/xnee/default.nix
index 35c4ca06c6c..43fa105e680 100644
--- a/pkgs/tools/X11/xnee/default.nix
+++ b/pkgs/tools/X11/xnee/default.nix
@@ -2,11 +2,12 @@
, gtk, libXi, inputproto, pkgconfig, recordproto, texinfo }:
stdenv.mkDerivation rec {
- name = "xnee-3.12";
+ version = "3.19";
+ name = "xnee-${version}";
src = fetchurl {
url = "mirror://gnu/xnee/${name}.tar.gz";
- sha256 = "10vxn0in0l2jir6x90grx5jc64x63l3b0f8liladdbplc8za8zmw";
+ sha256 = "04n2lac0vgpv8zsn7nmb50hf3qb56pmj90dmwnivg09gyrf1x92j";
};
patchPhase =
@@ -48,7 +49,7 @@ stdenv.mkDerivation rec {
homepage = http://www.gnu.org/software/xnee/;
- maintainers = [ ];
+ maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
platforms = stdenv.lib.platforms.gnu; # arbitrary choice
};
}
diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix
index a88c0b345d7..9ef93a30b68 100644
--- a/pkgs/tools/archivers/unrar/default.nix
+++ b/pkgs/tools/archivers/unrar/default.nix
@@ -1,32 +1,29 @@
{stdenv, fetchurl}:
let
- version = "5.1.5";
+ version = "5.1.7";
in
stdenv.mkDerivation {
name = "unrar-${version}";
src = fetchurl {
url = "http://www.rarlab.com/rar/unrarsrc-${version}.tar.gz";
- sha256 = "1jrla255911rbl953br2xbgvyw15kpi11r4lpqm3jlw553ccw912";
+ sha256 = "13ida8vcamiagl40d9yfjma9k6givxczhx278f1p7bv9wgb8gfmc";
};
- patchPhase = ''
- sed -i \
- -e "/CXX=/d" \
- -e "/CXXFLAGS=/d" \
- makefile
- '';
-
installPhase = ''
- mkdir -p $out/bin
- cp unrar $out/bin
+ installBin unrar
+
+ mkdir -p $out/share/doc/unrar
+ cp acknow.txt license.txt \
+ $out/share/doc/unrar
'';
- meta = {
+ meta = with stdenv.lib; {
description = "Utility for RAR archives";
- license = "freeware";
- maintainers = [ stdenv.lib.maintainers.emery ];
- platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; # arbitrary
+ homepage = http://www.rarlab.com/;
+ license = licenses.unfreeRedistributable;
+ maintainers = [ maintainers.emery ];
+ platforms = platforms.all;
};
}
diff --git a/pkgs/tools/audio/gvolicon/default.nix b/pkgs/tools/audio/gvolicon/default.nix
index 69c62985154..9bf9ee0d224 100644
--- a/pkgs/tools/audio/gvolicon/default.nix
+++ b/pkgs/tools/audio/gvolicon/default.nix
@@ -19,9 +19,9 @@ stdenv.mkDerivation {
meta = {
description = "A simple and lightweight volume icon that sits in your system tray.";
- homepage = "https://github.com/Unia/gvolicon";
+ homepage = https://github.com/Unia/gvolicon;
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.gpl3Plus;
- maintainers = stdenv.lib.maintainers.bennofs;
+ maintainers = [ stdenv.lib.maintainers.bennofs ];
};
}
\ No newline at end of file
diff --git a/pkgs/tools/audio/volumeicon/default.nix b/pkgs/tools/audio/volumeicon/default.nix
new file mode 100644
index 00000000000..0de3af28c19
--- /dev/null
+++ b/pkgs/tools/audio/volumeicon/default.nix
@@ -0,0 +1,23 @@
+{ pkgs, fetchurl, stdenv, gtk3, pkgconfig, intltool, alsaLib }:
+
+stdenv.mkDerivation rec {
+ name = "volumeicon-${version}";
+ version = "0.5.0";
+
+ src = fetchurl {
+ url = "http://softwarebakery.com/maato/files/volumeicon/volumeicon-0.5.0.tar.gz";
+ sha256 = "10np3fvfzyxkjw0kfzg81a7kcxda1fz6nkqffkijbay5ksgigwg5";
+ };
+
+ buildInputs = [ gtk3 pkgconfig intltool alsaLib ];
+
+ meta = with stdenv.lib; {
+ description = "A lightweight volume control that sits in your systray.";
+ homepage = "http://softwarebakery.com/maato/volumeicon.html";
+ platforms = pkgs.lib.platforms.linux;
+ maintainers = with maintainers; [ bobvanderlinden ];
+ license = pkgs.lib.licenses.gpl3;
+ };
+
+}
+
diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix
index 45d6cb83739..0f8c46e2dc3 100644
--- a/pkgs/tools/backup/duplicity/default.nix
+++ b/pkgs/tools/backup/duplicity/default.nix
@@ -1,14 +1,15 @@
-{ stdenv, fetchurl, python, librsync, ncftp, gnupg, boto, makeWrapper, lockfile }:
+{ stdenv, fetchurl, python, librsync, ncftp, gnupg, boto, makeWrapper
+, lockfile, setuptools }:
let
- version = "0.6.23";
+ version = "0.6.24";
in
stdenv.mkDerivation {
name = "duplicity-${version}";
src = fetchurl {
url = "http://code.launchpad.net/duplicity/0.6-series/${version}/+download/duplicity-${version}.tar.gz";
- sha256 = "0q0ckkmyq9z7xfbb1jajflmbzjwxpcjkkiab43rxrplm0ghz25vs";
+ sha256 = "0l14nrhbgkyjgvh339bbhnm6hrdwrjadphq1jmpi0mcgcdbdfh8x";
};
installPhase = ''
@@ -20,7 +21,7 @@ stdenv.mkDerivation {
--prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${boto}):$(toPythonPath ${lockfile})" \
'';
- buildInputs = [ python librsync makeWrapper ];
+ buildInputs = [ python librsync makeWrapper setuptools ];
meta = {
description = "Encrypted bandwidth-efficient backup using the rsync algorithm";
diff --git a/pkgs/tools/backup/duply/default.nix b/pkgs/tools/backup/duply/default.nix
index 73ef23059f4..4fbf871efaf 100644
--- a/pkgs/tools/backup/duply/default.nix
+++ b/pkgs/tools/backup/duply/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, coreutils, python, duplicity, gawk, gnupg1, bash
-, gnugrep, txt2man, makeWrapper
+, gnugrep, txt2man, makeWrapper, which
}:
stdenv.mkDerivation {
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
sed -i 's|/usr/bin/env bash|${bash}/bin/bash|' duply
mv duply "$out/bin"
wrapProgram "$out/bin/duply" --set PATH \
- "${coreutils}/bin:${python}/bin:${duplicity}/bin:${gawk}/bin:${gnupg1}/bin:${bash}/bin:${gnugrep}/bin:${txt2man}/bin"
+ "${coreutils}/bin:${python}/bin:${duplicity}/bin:${gawk}/bin:${gnupg1}/bin:${bash}/bin:${gnugrep}/bin:${txt2man}/bin:${which}/bin"
"$out/bin/duply" txt2man | gzip -c > "$out/share/man/man1/duply.1.gz"
'';
diff --git a/pkgs/tools/backup/httrack/default.nix b/pkgs/tools/backup/httrack/default.nix
index 4df142afe3a..fc5b8330522 100644
--- a/pkgs/tools/backup/httrack/default.nix
+++ b/pkgs/tools/backup/httrack/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, zlib, openssl }:
stdenv.mkDerivation rec {
- version = "3.48.17";
+ version = "3.48.19";
name = "httrack-${version}";
src = fetchurl {
url = "http://mirror.httrack.com/httrack-${version}.tar.gz";
- sha256 = "03q8sk7qihw9x4bfgfhv6523khgj13nilqps28qy7ndpzpggw9vn";
+ sha256 = "1zlayvl6x0ck1g5rvmj7cc88w0an5f4y93r3g5l10hhhl87cvw0n";
};
buildInputs = [ zlib openssl ];
@@ -15,5 +15,6 @@ stdenv.mkDerivation rec {
homepage = "http://www.httrack.com";
description = "Easy-to-use offline browser utility";
license = stdenv.lib.licenses.gpl3;
+ maintainers = with stdenv.lib.maintainers; [ the-kenny ];
};
}
diff --git a/pkgs/tools/backup/rsnapshot/default.nix b/pkgs/tools/backup/rsnapshot/default.nix
index 0bd19e2d6be..bacfbdfe1ca 100644
--- a/pkgs/tools/backup/rsnapshot/default.nix
+++ b/pkgs/tools/backup/rsnapshot/default.nix
@@ -30,9 +30,10 @@ stdenv.mkDerivation rec {
patch -p0 <${patch}
'';
- meta = {
+ meta = with stdenv.lib; {
description = "A filesystem snapshot utility for making backups of local and remote systems";
homepage = http://rsnapshot.org/;
license = stdenv.lib.licenses.gpl2Plus;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/tools/backup/wal-e/default.nix b/pkgs/tools/backup/wal-e/default.nix
index c272f0e8378..025a998aed4 100644
--- a/pkgs/tools/backup/wal-e/default.nix
+++ b/pkgs/tools/backup/wal-e/default.nix
@@ -2,13 +2,13 @@
pythonPackages.buildPythonPackage rec {
name = "wal-e-${version}";
- version = "0.6.9";
+ version = "0.6.10";
namePrefix = "";
src = fetchurl {
url = "https://github.com/wal-e/wal-e/archive/v${version}.tar.gz";
- sha256 = "1yzz9hic8amq7mp0kh04hsmwisk5r374ddja5g8345bl8y3bzbgk";
+ sha256 = "1hms24xz7wx3b91vv56fhcc3j0cszwqwnmwhka4yl90202hvdir2";
};
# needs tox
diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix
index 095337d1251..a9a167355ed 100644
--- a/pkgs/tools/bluetooth/blueman/default.nix
+++ b/pkgs/tools/bluetooth/blueman/default.nix
@@ -5,11 +5,11 @@
}:
stdenv.mkDerivation rec {
- name = "blueman-1.21";
+ name = "blueman-1.23";
src = fetchurl {
url = "http://download.tuxfamily.org/blueman/${name}.tar.gz";
- sha256 = "1bz31w0cqcl77r7vfjwm9c4gmk4hvq3nqn1pjnd5qndia2mhs846";
+ sha256 = "04ghlh4h5bwp9mqr5jxcmjm01595l5fq5561qxvf369fvjy63cjh";
};
configureFlags = "--disable-polkit";
diff --git a/pkgs/tools/cd-dvd/dvdisaster/default.nix b/pkgs/tools/cd-dvd/dvdisaster/default.nix
new file mode 100644
index 00000000000..b54f342b345
--- /dev/null
+++ b/pkgs/tools/cd-dvd/dvdisaster/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, pkgconfig, which, gettext, intltool
+, glib, gtk2
+}:
+
+stdenv.mkDerivation rec {
+ name = "dvdisaster-0.72.6";
+
+ src = fetchurl {
+ url = "http://dvdisaster.net/downloads/${name}.tar.bz2";
+ sha256 = "e9787dea39aeafa38b26604752561bc895083c17b588489d857ac05c58be196b";
+ };
+
+ postPatch = ''
+ patchShebangs ./
+ '';
+
+ buildInputs = [
+ pkgconfig which gettext intltool
+ glib gtk2
+ ];
+
+ meta = {
+ homepage = http://dvdisaster.net/;
+ description =
+ "Stores data on CD/DVD/BD in a way that it is fully recoverable even " +
+ "after some read errors have developed";
+ license = stdenv.lib.licenses.gpl2;
+ };
+}
diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix
index 516f0750807..9c538842816 100644
--- a/pkgs/tools/cd-dvd/unetbootin/default.nix
+++ b/pkgs/tools/cd-dvd/unetbootin/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, makeWrapper, qt4, utillinux, coreutils, which, p7zip, mtools, syslinux }:
-let version = "603"; in
+let version = "608"; in
stdenv.mkDerivation {
name = "unetbootin-${version}";
src = fetchurl {
url = "mirror://sourceforge/unetbootin/UNetbootin/${version}/unetbootin-source-${version}.tar.gz";
- sha256 = "03nhy1w9q0ycpcni6w61ps1mji859nvmvr1bhnlzi04z0s5ldbwx";
+ sha256 = "1010ccdrblsjr5zid6wl3c3b75ld37lrr1a1xc6dlrhz1gvcb6ff";
};
sourceRoot = ".";
diff --git a/pkgs/tools/cd-dvd/vobsub2srt/default.nix b/pkgs/tools/cd-dvd/vobsub2srt/default.nix
index 30ae07f9dbd..31f4348a992 100644
--- a/pkgs/tools/cd-dvd/vobsub2srt/default.nix
+++ b/pkgs/tools/cd-dvd/vobsub2srt/default.nix
@@ -1,15 +1,15 @@
{ stdenv, fetchgit, cmake, libtiff, pkgconfig, tesseract }:
-let rev = "b70b6f584e8151f70f9d90df054af0911ea7475e";
+let rev = "a6abbd61127a6392d420bbbebdf7612608c943c2";
shortRev = builtins.substring 0 7 rev;
in
stdenv.mkDerivation {
- name = "vobsub2srt-git-20140226-${shortRev}";
+ name = "vobsub2srt-git-20140817-${shortRev}";
src = fetchgit {
inherit rev;
url = https://github.com/ruediger/VobSub2SRT.git;
- sha256 = "15437eba07e674cec66bc54cfa42ffe8b05816975401c9950bf9016e3881cd6a";
+ sha256 = "8e867a021ac529e7607627d5944b95bb9f1378ffabd8837e7a028663a8ce5adf";
};
buildInputs = [ cmake libtiff pkgconfig ];
diff --git a/pkgs/tools/compression/advancecomp/default.nix b/pkgs/tools/compression/advancecomp/default.nix
new file mode 100644
index 00000000000..5737f1eca15
--- /dev/null
+++ b/pkgs/tools/compression/advancecomp/default.nix
@@ -0,0 +1,31 @@
+{stdenv, fetchurl, zlib}:
+let
+ s = # Generated upstream information
+ rec {
+ baseName="advancecomp";
+ version="1.19";
+ name="${baseName}-${version}";
+ url="http://prdownloads.sourceforge.net/advancemame/advancecomp-1.19.tar.gz?download";
+ sha256="0irhmwcn9r4jc29442skqr1f3lafiaahxc3m3ybalmm37l6cb56m";
+ };
+ buildInputs = [
+ zlib
+ ];
+in
+stdenv.mkDerivation {
+ inherit (s) name version;
+ inherit buildInputs;
+ src = fetchurl {
+ inherit (s) url sha256;
+ };
+ meta = {
+ inherit (s) version;
+ description = ''A set of tools to optimize deflate-compressed files'';
+ license = stdenv.lib.licenses.gpl2 ;
+ maintainers = [stdenv.lib.maintainers.raskin];
+ platforms = stdenv.lib.platforms.linux;
+ updateWalker = true;
+ homepage = "http://advancemame.sourceforge.net/comp-readme.html";
+ downloadPage = "http://advancemame.sourceforge.net/comp-download.html";
+ };
+}
diff --git a/pkgs/tools/compression/xar/default.nix b/pkgs/tools/compression/xar/default.nix
new file mode 100644
index 00000000000..0bb4a1fb2ae
--- /dev/null
+++ b/pkgs/tools/compression/xar/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, libxml2, openssl, zlib, bzip2 }:
+
+stdenv.mkDerivation rec {
+ version = "1.5.2";
+ name = "xar-${version}";
+
+ src = fetchurl {
+ url = "https://xar.googlecode.com/files/${name}.tar.gz";
+ sha256 = "1rp3va6akzlh35yqrapfqnbxaxa0zi8wyr93swbapprwh215cpac";
+ };
+
+ buildInputs = [ libxml2 openssl zlib bzip2 ];
+
+ meta = {
+ homepage = https://code.google.com/p/xar/;
+ description = "Extensible Archiver";
+
+ longDescription =
+ '' The XAR project aims to provide an easily extensible archive format.
+ Important design decisions include an easily extensible XML table of
+ contents for random access to archived files, storing the toc at the
+ beginning of the archive to allow for efficient handling of streamed
+ archives, the ability to handle files of arbitrarily large sizes, the
+ ability to choose independent encodings for individual files in the
+ archive, the ability to store checksums for individual files in both
+ compressed and uncompressed form, and the ability to query the table
+ of content's rich meta-data.
+ '';
+
+ license = stdenv.lib.licenses.bsd3;
+ maintainers = with stdenv.lib.maintainers; [ copumpkin ];
+ platforms = stdenv.lib.platforms.all;
+ };
+}
diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix
index b644f46dff8..e1d7c26fa43 100644
--- a/pkgs/tools/compression/xz/default.nix
+++ b/pkgs/tools/compression/xz/default.nix
@@ -10,6 +10,9 @@ stdenv.mkDerivation rec {
doCheck = true;
+ # In stdenv-linux, prevent a dependency on bootstrap-tools.
+ preHook = "unset CONFIG_SHELL";
+
meta = {
homepage = http://tukaani.org/xz/;
description = "XZ, general-purpose data compression software, successor of LZMA";
diff --git a/pkgs/tools/filesystems/bashmount/default.nix b/pkgs/tools/filesystems/bashmount/default.nix
new file mode 100644
index 00000000000..579258f63f9
--- /dev/null
+++ b/pkgs/tools/filesystems/bashmount/default.nix
@@ -0,0 +1,36 @@
+{stdenv, fetchFromGitHub}:
+
+stdenv.mkDerivation rec {
+ name = "bashmount-${version}";
+ version = "3.2.0";
+
+ src = fetchFromGitHub {
+ owner = "jamielinux";
+ repo = "bashmount";
+ rev = version;
+ sha256 = "0rki4s0jgz6vkywc6hcx9qa551r5bnjs7sw0rdh93k64l32kh644";
+ };
+
+ installPhase = ''
+ mkdir -p $out/bin
+ cp bashmount $out/bin
+
+ mkdir -p $out/etc
+ cp bashmount.conf $out/etc
+
+ mkdir -p $out/share/man/man1
+ gzip -c -9 bashmount.1 > bashmount.1.gz
+ cp bashmount.1.gz $out/share/man/man1
+
+ mkdir -p $out/share/doc/bashmount
+ cp COPYING $out/share/doc/bashmount
+ cp NEWS $out/share/doc/bashmount
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/jamielinux/bashmount;
+ description = "A menu-driven bash script for the management of removable media with udisks";
+ maintainers = [ maintainers.koral ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix
index 66152f9589b..619b4b9ff92 100644
--- a/pkgs/tools/filesystems/btrfsprogs/default.nix
+++ b/pkgs/tools/filesystems/btrfsprogs/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, attr, acl, zlib, libuuid, e2fsprogs, lzo
, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }:
-let version = "3.14.2"; in
+let version = "3.16.1"; in
stdenv.mkDerivation rec {
name = "btrfs-progs-${version}";
src = fetchurl {
- url = "mirror://kernel/linux/kernel/people/mason/btrfs-progs/btrfs-progs-v${version}.tar.xz";
- sha256 = "14vpj6f2v076v9zabgrz8l4dp6n1ar2mvk3lvii51ykvi35d1qbh";
+ url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
+ sha256 = "103ff31fn6x1r6y79hdzv5lqls68wqxmikwsl6q8mxllb5rqrwlk";
};
buildInputs = [
@@ -21,10 +21,11 @@ stdenv.mkDerivation rec {
makeFlags = "prefix=$(out)";
- meta = {
+ meta = with stdenv.lib; {
description = "Utilities for the btrfs filesystem";
homepage = https://btrfs.wiki.kernel.org/;
- maintainers = [ stdenv.lib.maintainers.raskin ];
- platforms = stdenv.lib.platforms.linux;
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ raskin wkennington ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/tools/filesystems/ceph/0001-Cleanup-boost-optionals.patch b/pkgs/tools/filesystems/ceph/0001-Cleanup-boost-optionals.patch
new file mode 100644
index 00000000000..a99e16ddc26
--- /dev/null
+++ b/pkgs/tools/filesystems/ceph/0001-Cleanup-boost-optionals.patch
@@ -0,0 +1,42 @@
+From 2507ab33236f0da12899fbcdd36535f7c7b68a06 Mon Sep 17 00:00:00 2001
+From: "William A. Kennington III"
+Date: Sat, 20 Sep 2014 22:52:31 -0700
+Subject: [PATCH] Cleanup boost optionals
+
+---
+ src/osd/ECBackend.cc | 2 +-
+ src/osd/ReplicatedPG.cc | 5 ++++-
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/osd/ECBackend.cc b/src/osd/ECBackend.cc
+index a87b5b4..c386900 100644
+--- a/src/osd/ECBackend.cc
++++ b/src/osd/ECBackend.cc
+@@ -81,7 +81,7 @@ ostream &operator<<(ostream &lhs, const ECBackend::read_result_t &rhs)
+ lhs << "read_result_t(r=" << rhs.r
+ << ", errors=" << rhs.errors;
+ if (rhs.attrs) {
+- lhs << ", attrs=" << rhs.attrs;
++ lhs << ", attrs=" << rhs.attrs.get();
+ } else {
+ lhs << ", noattrs";
+ }
+diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
+index 5e5510d..79e8616 100644
+--- a/src/osd/ReplicatedPG.cc
++++ b/src/osd/ReplicatedPG.cc
+@@ -5259,7 +5259,10 @@ void ReplicatedPG::do_osd_op_effects(OpContext *ctx)
+ for (list::iterator p = ctx->notify_acks.begin();
+ p != ctx->notify_acks.end();
+ ++p) {
+- dout(10) << "notify_ack " << make_pair(p->watch_cookie, p->notify_id) << dendl;
++ if (p->watch_cookie)
++ dout(10) << "notify_ack " << make_pair(p->watch_cookie.get(), p->notify_id) << dendl;
++ else
++ dout(10) << "notify_ack " << make_pair("NULL", p->notify_id) << dendl;
+ for (map, WatchRef>::iterator i =
+ ctx->obc->watchers.begin();
+ i != ctx->obc->watchers.end();
+--
+2.1.0
+
diff --git a/pkgs/tools/filesystems/ceph/0001-Makefile-env-Don-t-force-sbin.patch b/pkgs/tools/filesystems/ceph/0001-Makefile-env-Don-t-force-sbin.patch
new file mode 100644
index 00000000000..cb2de6ad4f5
--- /dev/null
+++ b/pkgs/tools/filesystems/ceph/0001-Makefile-env-Don-t-force-sbin.patch
@@ -0,0 +1,25 @@
+From 34c27f66210570adf5aba624d7da3c0382d5493f Mon Sep 17 00:00:00 2001
+From: "William A. Kennington III"
+Date: Sun, 21 Sep 2014 12:19:30 -0700
+Subject: [PATCH] Makefile-env: Don't force /sbin
+
+---
+ src/Makefile-env.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile-env.am b/src/Makefile-env.am
+index f2ab655..bf8876e 100644
+--- a/src/Makefile-env.am
++++ b/src/Makefile-env.am
+@@ -27,7 +27,7 @@ bin_DEBUGPROGRAMS =
+ ceph_sbindir = $(sbindir)
+
+ # certain things go straight into /sbin, though!
+-su_sbindir = /sbin
++su_sbindir = $(sbindir)
+
+ # C/C++ tests to build will be appended to this
+ check_PROGRAMS =
+--
+2.1.0
+
diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix
index 7a8b85a8945..c68eaab14d1 100644
--- a/pkgs/tools/filesystems/ceph/default.nix
+++ b/pkgs/tools/filesystems/ceph/default.nix
@@ -1,37 +1,62 @@
-{stdenv, fetchgit, libatomic_ops, autoconf, automake, boost, btrfsProgs, cryptopp, curl, expat,
- fcgi, fuse, gperftools, keyutils, leveldb, libaio, libedit, libtool,
- libuuid, linuxHeaders, openssl, pkgconfig, python, snappy, which, xfsprogs, xz}:
+{ stdenv, fetchgit, autoconf, automake, makeWrapper, pkgconfig, libtool, which
+, boost, btrfsProgs, cryptopp, curl, expat, fcgi, fuse, gperftools, keyutils
+, leveldb, libaio, libatomic_ops, libedit, libuuid, linuxHeaders, openssl
+, python, snappy, udev, xfsprogs, xz
+, zfs ? null
+}:
+with stdenv.lib;
+let
+ wrapArgs = "--prefix PYTHONPATH : \"$(toPythonPath $out)\""
+ + " --prefix PYTHONPATH : \"$(toPythonPath ${python.modules.readline})\""
+ + " --prefix PATH : \"$out/bin\""
+ + " --prefix LD_LIBRARY_PATH : \"$out/lib\"";
+in
stdenv.mkDerivation rec {
- baseName="ceph";
- version="0.79";
- name="${baseName}-${version}";
+ name="ceph-${version}";
+ version="0.85";
+
+ src = fetchgit {
+ url = "git://github.com/ceph/ceph.git";
+ rev = "refs/tags/v0.85";
+ sha256 = "0g98cgrs3gfsc8azg3k0n61bgna2w906qm69j4qbjkb61l83ld1z";
+ };
+
+ patches = [
+ ./0001-Cleanup-boost-optionals.patch # Remove in 0.86
+ ./0001-Makefile-env-Don-t-force-sbin.patch
+ ];
+
+ nativeBuildInputs = [ autoconf automake makeWrapper pkgconfig libtool which ];
buildInputs = [
- fuse linuxHeaders pkgconfig libatomic_ops autoconf automake boost btrfsProgs cryptopp expat
- fcgi fuse gperftools keyutils leveldb libaio libedit libtool libuuid openssl pkgconfig
- python snappy which xfsprogs.lib xz
+ boost boost.lib btrfsProgs cryptopp curl expat fcgi fuse gperftools keyutils
+ libatomic_ops leveldb libaio libedit libuuid linuxHeaders openssl python
+ snappy udev xfsprogs.lib xz zfs
];
preConfigure = ''
./autogen.sh
'';
- installFlags = "DESTDIR=\${out}";
+ configureFlags = [
+ "--exec_prefix=$(out)"
+ ] ++ optional (zfs != null) "--with-zfs=${zfs}";
+
+ postInstall = ''
+ wrapProgram $out/bin/ceph ${wrapArgs}
+ wrapProgram $out/bin/ceph-brag ${wrapArgs}
+ wrapProgram $out/bin/ceph-rest-api ${wrapArgs}
+ wrapProgram $out/sbin/ceph-create-keys ${wrapArgs}
+ wrapProgram $out/sbin/ceph-disk ${wrapArgs}
+ '';
enableParallelBuilding = true;
- src = fetchgit {
- url = "https://github.com/ceph/ceph";
- rev = "4c2d73a5095f527c3a2168deb5fa54b3c8991a6e";
- sha256 = "0850m817wqqmw2qdnwm5jvbdgifzlc7kcd05jv526pdvmq1x92rf";
- };
meta = {
- inherit version;
+ homepage = http://ceph.com/;
description = "Distributed storage system";
- maintainers = [
- stdenv.lib.maintainers.ak
- ];
- platforms = with stdenv.lib.platforms;
- linux;
+ license = licenses.lgpl21;
+ maintainers = with maintainers; [ ak wkennington ];
+ platforms = with platforms; linux;
};
}
diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix
index dcbf7235e49..7617e82f1a8 100644
--- a/pkgs/tools/filesystems/e2fsprogs/default.nix
+++ b/pkgs/tools/filesystems/e2fsprogs/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libuuid }:
stdenv.mkDerivation rec {
- name = "e2fsprogs-1.42.9";
+ name = "e2fsprogs-1.42.12";
src = fetchurl {
url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz";
- sha256 = "00i83w22sbyq849as9vmaf2xcx1d06npvriyv8m0z81gx43ar4ig";
+ sha256 = "0v0qcfyls0dlrjy8gx9m3s2wbkp5z3lbsr5hb7x8kp8f3bclcy71";
};
buildInputs = [ pkgconfig libuuid ];
diff --git a/pkgs/tools/filesystems/grive/default.nix b/pkgs/tools/filesystems/grive/default.nix
index c6d2776f437..559e2ae4c51 100644
--- a/pkgs/tools/filesystems/grive/default.nix
+++ b/pkgs/tools/filesystems/grive/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "f2b978cc93a2d16262c7b78c62019b2a58044eaef4ca95feaa74dfd4dfcbfa36";
};
- buildInputs = [cmake libgcrypt json_c curl expat stdenv binutils boost];
+ buildInputs = [cmake libgcrypt json_c curl expat stdenv binutils boost boost.lib];
# work around new binutils headers, see
# http://stackoverflow.com/questions/11748035/binutils-bfd-h-wants-config-h-now
diff --git a/pkgs/tools/filesystems/mtdutils/default.nix b/pkgs/tools/filesystems/mtdutils/default.nix
index 2a7d9672843..6e54de033d6 100644
--- a/pkgs/tools/filesystems/mtdutils/default.nix
+++ b/pkgs/tools/filesystems/mtdutils/default.nix
@@ -1,15 +1,13 @@
{stdenv, fetchgit, libuuid, lzo, zlib, acl}:
-let
- version = "1.5.0";
-in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
name = "mtd-utils-${version}";
+ version = "1.5.1";
src = fetchgit {
url = git://git.infradead.org/mtd-utils.git;
rev = "refs/tags/v" + version;
- sha256 = "cc645c0ec28083431b11f3b38f9f7759378d89e11047a883529f703e1b6c1cce";
+ sha256 = "1bjx42pwl789ara63c672chvgvmqhkj4y132gajqih6naq71f8g7";
};
patchPhase = ''
diff --git a/pkgs/tools/filesystems/smbnetfs/default.nix b/pkgs/tools/filesystems/smbnetfs/default.nix
index 616f61e6c84..e9d9b27d751 100644
--- a/pkgs/tools/filesystems/smbnetfs/default.nix
+++ b/pkgs/tools/filesystems/smbnetfs/default.nix
@@ -12,17 +12,16 @@ let
sourceInfo = rec {
baseName="smbnetfs";
dirBaseName="SMBNetFS";
- version="0.5.3a";
+ version = "0.5.3b";
name="${baseName}-${version}";
project="${baseName}";
url="mirror://sourceforge/project/${project}/${baseName}/${dirBaseName}-${version}/${name}.tar.bz2";
- hash="0fzlw11y2vkxmjzz3qcypqlvz074v6a3pl4pyffbniqal64qgrsw";
};
in
rec {
src = a.fetchurl {
url = sourceInfo.url;
- sha256 = sourceInfo.hash;
+ sha256 = "1j9b30kh4ymv4nr8c1qc7hfg6pscgyj75ib16pqa0zljjk1klx18";
};
inherit (sourceInfo) name version;
@@ -40,11 +39,9 @@ rec {
platforms = with a.lib.platforms;
linux;
license = a.lib.licenses.gpl2;
- };
- passthru = {
- updateInfo = {
- downloadPage = "http://sourceforge.net/projects/smbnetfs/files/smbnetfs";
- };
+ downloadPage = "http://sourceforge.net/projects/smbnetfs/files/smbnetfs";
+ updateWalker = true;
+ inherit version;
};
}) x
diff --git a/pkgs/tools/filesystems/smbnetfs/default.upstream b/pkgs/tools/filesystems/smbnetfs/default.upstream
new file mode 100644
index 00000000000..9e2ba2bd59b
--- /dev/null
+++ b/pkgs/tools/filesystems/smbnetfs/default.upstream
@@ -0,0 +1,6 @@
+url http://sourceforge.net/projects/smbnetfs/files/smbnetfs/
+version_link '[-][0-9.]+[a-z]*/$'
+version_link '[.]tar[.][a-z0-9]+/download$'
+SF_redirect
+version '.*[-]([0-9.]+[a-z]*)[.]tar[.].*' '\1'
+do_overwrite () { do_overwrite_just_version; }
diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix
index 7c9cd05009d..019f2178204 100644
--- a/pkgs/tools/filesystems/xfsprogs/default.nix
+++ b/pkgs/tools/filesystems/xfsprogs/default.nix
@@ -1,41 +1,58 @@
-{ stdenv, fetchurl, libtool, gettext, libuuid }:
+{ stdenv, fetchurl, gettext, libuuid, readline }:
stdenv.mkDerivation rec {
- name = "xfsprogs-3.1.11";
+ name = "xfsprogs-3.2.1";
src = fetchurl {
- urls = [ "ftp://oss.sgi.com/projects/xfs/cmd_tars/${name}.tar.gz" "ftp://oss.sgi.com/projects/xfs/previous/${name}.tar.gz" ];
- sha256 = "1gnnyhy3khl08a24c5y0pyakz6nnwkiw1fc6rb0r1j5mfw0rix5d";
+ urls = map (dir: "ftp://oss.sgi.com/projects/xfs/${dir}/${name}.tar.gz")
+ [ "cmd_tars" "previous" ];
+ sha256 = "0rsp31qrz0wskr70dwzl5ignkac7j98j7m9cy6wl57zy716fmy43";
};
- patchPhase = ''
- sed -i s,/bin/bash,`type -P bash`, install-sh
+ prePatch = ''
+ sed -i s,/bin/bash,`type -P bash`,g install-sh
+ sed -i s,ldconfig,`type -P ldconfig`,g configure m4/libtool.m4
+
+ # Fixes from gentoo 3.2.1 ebuild
+ sed -i "/^PKG_DOC_DIR/s:@pkg_name@:${name}:" include/builddefs.in
+ sed -i '1iLLDFLAGS = -static' {estimate,fsr}/Makefile
+ sed -i "/LLDFLAGS/s:-static::" $(find -name Makefile)
+ sed -i '/LIB_SUBDIRS/s:libdisk::' Makefile
'';
- outputs = ["out" "lib"];
+ patches = [
+ # This patch fixes shared libs installation, still not fixed in 3.2.1
+ ./xfsprogs-3.1.11-sharelibs.patch
+ ];
- postInstall = ''
- (cd include; make install-dev)
- # The make install-dev target is broken when --disable-shared
- mkdir -p $lib/lib $lib/include
- cp ./libhandle/.libs/libhandle.a \
- ./libxcmd/.libs/libxcmd.a \
- ./libxlog/.libs/libxlog.a \
- ./libxfs/.libs/libxfs.a $lib/lib
- mv $out/include/* $lib/include
+ buildInputs = [ gettext libuuid readline ];
+
+ outputs = [ "out" "lib" ];
+
+ preConfigure = ''
+ NIX_LDFLAGS="$(echo $NIX_LDFLAGS | sed "s,$out,$lib,g")"
'';
+ configureFlags = [
+ "MAKE=make"
+ "MSGFMT=msgfmt"
+ "MSGMERGE=msgmerge"
+ "XGETTEXT=xgettext"
+ "--disable-lib64"
+ "--enable-readline"
+ "--includedir=$(lib)/include"
+ "--libdir=$(lib)/lib"
+ ];
+
+ installFlags = [ "install-dev" ];
+
enableParallelBuilding = true;
- buildInputs = [ libtool gettext libuuid ];
-
- configureFlags = "MAKE=make MSGFMT=msgfmt MSGMERGE=msgmerge XGETTEXT=xgettext ZIP=gzip AWK=gawk --disable-shared";
- preConfigure = ''
- configureFlags="$configureFlags root_sbindir=$out/sbin root_libdir=$lib/lib"
- '';
- disableStatic = false;
-
- meta = {
+ meta = with stdenv.lib; {
+ homepage = http://xfs.org/;
description = "SGI XFS utilities";
+ license = licenses.lgpl21;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ wkennington ];
};
}
diff --git a/pkgs/tools/filesystems/xfsprogs/xfsprogs-3.1.11-sharelibs.patch b/pkgs/tools/filesystems/xfsprogs/xfsprogs-3.1.11-sharelibs.patch
new file mode 100644
index 00000000000..38599bd651f
--- /dev/null
+++ b/pkgs/tools/filesystems/xfsprogs/xfsprogs-3.1.11-sharelibs.patch
@@ -0,0 +1,106 @@
+use libtool to do all installing. do not use the manual file install as
+that'll copy files directly from the .libs/ subdir which might have rpaths
+that we do not want.
+
+--- a/libdisk/Makefile
++++ b/libdisk/Makefile
+@@ -25,6 +25,7 @@
+ install: default
+
+ install-dev: default
++ $(INSTALL_LTLIB_DEV)
+
+ install-qa: install-dev
+
+--- a/libhandle/Makefile
++++ b/libhandle/Makefile
+@@ -20,7 +20,6 @@
+ include $(BUILDRULES)
+
+ install: default
+- $(INSTALL_LTLIB)
+
+ install-dev: default
+ $(INSTALL_LTLIB_DEV)
+--- a/libxcmd/Makefile
++++ b/libxcmd/Makefile
+@@ -32,6 +32,11 @@
+
+ include $(BUILDRULES)
+
+-install install-dev install-qa: default
++install: default
++
++install-dev: default
++ $(INSTALL_LTLIB_DEV)
++
++install-qa: default
+
+ -include .dep
+--- a/libxfs/Makefile
++++ b/libxfs/Makefile
+@@ -41,5 +41,6 @@
+ install: default
+
+ install-dev: default
++ $(INSTALL_LTLIB_DEV)
+
+ install-qa: default
+--- a/libxlog/Makefile
++++ b/libxlog/Makefile
+@@ -12,6 +12,8 @@
+
+ CFILES = xfs_log_recover.c util.c
+
++LTLIBS = $(LIBUUID) $(LIBXFS)
++
+ # don't want to link xfs_repair with a debug libxlog.
+ DEBUG = -DNDEBUG
+
+@@ -19,6 +21,11 @@
+
+ include $(BUILDRULES)
+
+-install install-dev install-qa: default
++install: default
++
++install-dev: default
++ $(INSTALL_LTLIB_DEV)
++
++install-qa: default
+
+ -include .dep
+--- a/Makefile
++++ b/Makefile
+@@ -66,6 +66,8 @@
+ mkfs: libxfs
+ quota: libxcmd
+ repair: libxfs libxlog
++libxlog: libxfs
++libxlog-install-dev: libxfs-install-dev
+
+ ifneq ($(ENABLE_BLKID), yes)
+ mkfs: libdisk
+--- a/include/buildmacros
++++ b/include/buildmacros
+@@ -71,17 +71,9 @@
+ # /usr/lib.
+ ifeq ($(ENABLE_SHARED),yes)
+ INSTALL_LTLIB_DEV = \
+- cd $(TOPDIR)/$(LIBNAME)/.libs; \
+- ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
+- ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \
+- ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \
+- ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \
+- ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \
+- if test "x$(PKG_LIB_DIR)" != "x$(PKG_ROOT_LIB_DIR)" ; then \
+- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \
+- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \
+- ../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so $(PKG_LIB_DIR)/$(LIBNAME).so; \
+- fi
++ set -e; cd $(TOPDIR)/$(LIBNAME); \
++ $(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
++ env -uDIST_ROOT $(LTINSTALL) $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la $(DIST_ROOT)$(PKG_LIB_DIR)/$(LIBNAME).la
+ else
+ INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
+ endif
diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix
index c9078a0cb8b..e33f46ea9cc 100644
--- a/pkgs/tools/filesystems/yandex-disk/default.nix
+++ b/pkgs/tools/filesystems/yandex-disk/default.nix
@@ -6,17 +6,17 @@ let
p = if stdenv.is64bit then {
arch = "x86_64";
gcclib = "${stdenv.gcc.gcc}/lib64";
- sha256 = "1fmmlvvh97d60n9k08bn4k6ghwr3yhs8sib82025nwpw1sq08vim";
+ sha256 = "09kw7f0qsvx3vx1c1zb117yf3yk7kkz66agspz5xx9b0zh6i82jw";
}
else {
arch = "i386";
gcclib = "${stdenv.gcc.gcc}/lib";
- sha256 = "3940420bd9d1fe1ecec1a117bfd9d21d545bca59f5e0a4364304ab808c976f7f";
+ sha256 = "0f2230c91120f05159281b39c620ab6bad6559ce8a17a0874d0a82350ebba426";
};
in
stdenv.mkDerivation rec {
- name = "yandex-disk-0.1.2.481";
+ name = "yandex-disk-0.1.4.504";
src = fetchurl {
url = "http://repo.yandex.ru/yandex-disk/rpm/stable/${p.arch}/${name}-1.fedora.${p.arch}.rpm";
diff --git a/pkgs/tools/graphics/barcode/default.nix b/pkgs/tools/graphics/barcode/default.nix
index 60dc5a285da..23a2e6dd78f 100644
--- a/pkgs/tools/graphics/barcode/default.nix
+++ b/pkgs/tools/graphics/barcode/default.nix
@@ -9,17 +9,16 @@ let
buildInputs = map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
- version="0.99";
+ version = "0.99";
baseName="barcode";
name="${baseName}-${version}";
- url="mirror://gnu/${baseName}/${name}.tar.gz";
- hash="0r2b2lwg7a9i9ic5spkbnavy1ynrppmrldv46vsl44l1xgriq0vw";
+ url="mirror://gnu/${baseName}/${name}.tar.xz";
};
in
rec {
src = a.fetchurl {
url = sourceInfo.url;
- sha256 = sourceInfo.hash;
+ sha256 = "1indapql5fjz0bysyc88cmc54y8phqrbi7c76p71fgjp45jcyzp8";
};
inherit (sourceInfo) name version;
@@ -35,11 +34,9 @@ rec {
raskin
];
platforms = with a.lib.platforms; allBut darwin;
- };
- passthru = {
- updateInfo = {
- downloadPage = "ftp://ftp.gnu.org/gnu/barcode/";
- };
+ downloadPage = "http://ftp.gnu.org/gnu/barcode/";
+ updateWalker = true;
+ inherit version;
};
}) x
diff --git a/pkgs/tools/graphics/dmtx/default.nix b/pkgs/tools/graphics/dmtx/default.nix
index 74b1a2bf4ed..30b3baa4690 100644
--- a/pkgs/tools/graphics/dmtx/default.nix
+++ b/pkgs/tools/graphics/dmtx/default.nix
@@ -1,19 +1,19 @@
-args :
-let
+args :
+let
lib = args.lib;
fetchurl = args.fetchurl;
- version = lib.attrByPath ["version"] "0.7.2" args;
+ version = lib.attrByPath ["version"] "0.7.4" args;
buildInputs = with args; [
libpng libtiff libjpeg librsvg imagemagick pkgconfig
- zlib libX11 bzip2 libtool freetype fontconfig
+ zlib libX11 bzip2 libtool freetype fontconfig
ghostscript jasper xz
];
in
rec {
src = fetchurl {
url = "mirror://sourceforge/libdmtx/libdmtx-${version}.tar.bz2";
- sha256 = "0iin2j3ad7ldj32dwc04g28k54iv3lrc5121rgyphm7l9hvigbvk";
+ sha256 = "0xnxx075ycy58n92yfda2z9zgd41h3d4ik5d9l197lzsqim5hb5n";
};
inherit buildInputs;
@@ -21,7 +21,7 @@ rec {
/* doConfigure should be specified separately */
phaseNames = ["doConfigure" "doMakeInstall"];
-
+
name = "dmtx-" + version;
meta = {
description = "DataMatrix (2D bar code) processing tools";
diff --git a/pkgs/tools/graphics/enblend-enfuse/default.nix b/pkgs/tools/graphics/enblend-enfuse/default.nix
index 6b65d3df0d3..ac49a3c13a3 100644
--- a/pkgs/tools/graphics/enblend-enfuse/default.nix
+++ b/pkgs/tools/graphics/enblend-enfuse/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1b7r1nnwaind0344ckwggy0ghl0ipbk9jzylsxcjfl05rnasw00w";
};
- buildInputs = [ boost freeglut glew gsl lcms2 libpng libtiff libxmi mesa vigra ];
+ buildInputs = [ boost boost.lib freeglut glew gsl lcms2 libpng libtiff libxmi mesa vigra ];
nativeBuildInputs = [ perl pkgconfig ];
diff --git a/pkgs/tools/graphics/gifsicle/default.nix b/pkgs/tools/graphics/gifsicle/default.nix
index dc1a8b3abae..5216c1999e4 100644
--- a/pkgs/tools/graphics/gifsicle/default.nix
+++ b/pkgs/tools/graphics/gifsicle/default.nix
@@ -3,20 +3,21 @@
with stdenv.lib;
stdenv.mkDerivation {
- name = "gifsicle-1.78";
+ name = "gifsicle-1.84";
src = fetchurl {
- url = http://www.lcdf.org/gifsicle/gifsicle-1.78.tar.gz;
- sha256 = "0dzp5sg82klji4lbj1m4cyg9fb3l837gkipdx657clib97klyv53";
+ url = http://www.lcdf.org/gifsicle/gifsicle-1.84.tar.gz;
+ sha256 = "1ymk7lkk50fds6090icnjg69dswzz5zyiirq2ws23aagw3l46z86";
};
buildInputs = optional gifview [ xproto libXt libX11 ];
LDFLAGS = optional static "-static";
- meta = {
+ meta = {
description = "Command-line tool for creating, editing, and getting information about GIF images and animations";
homepage = http://www.lcdf.org/gifsicle/;
license = stdenv.lib.licenses.gpl2;
+ maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
};
}
diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix
index f92c82e3d74..b1d02149d37 100644
--- a/pkgs/tools/graphics/gnuplot/default.nix
+++ b/pkgs/tools/graphics/gnuplot/default.nix
@@ -21,11 +21,11 @@ let
withX = libX11 != null && !aquaterm && !stdenv.isDarwin;
in
stdenv.mkDerivation rec {
- name = "gnuplot-4.6.5";
+ name = "gnuplot-4.6.6";
src = fetchurl {
url = "mirror://sourceforge/gnuplot/${name}.tar.gz";
- sha256 = "0bcsa5b33msddjs6mj0rhi81cs19h9p3ykixkkl70ifhqwqg0l75";
+ sha256 = "0x022d7psl9g6q389x5rjlfsvfciz88yrgxg4lig4ichs1pmj68z";
};
buildInputs =
diff --git a/pkgs/tools/graphics/graphviz/2.32.nix b/pkgs/tools/graphics/graphviz/2.32.nix
new file mode 100644
index 00000000000..0a86a892417
--- /dev/null
+++ b/pkgs/tools/graphics/graphviz/2.32.nix
@@ -0,0 +1,61 @@
+{ stdenv, fetchurl, pkgconfig, libpng, libjpeg, expat, libXaw
+, yacc, libtool, fontconfig, pango, gd, xlibs, gts, gettext, cairo
+}:
+
+stdenv.mkDerivation rec {
+ version = "2.32.0";
+ name = "graphviz-${version}";
+
+ src = fetchurl {
+ url = "http://www.graphviz.org/pub/graphviz/ARCHIVE/${name}.tar.gz";
+ sha256 = "0ym7lw3xnkcgbk32vfmm3329xymca60gzn90rq6dv8887qqv4lyq";
+ };
+
+ buildInputs =
+ [ pkgconfig libpng libjpeg expat libXaw yacc libtool fontconfig
+ pango gd gts
+ ] ++ stdenv.lib.optionals (xlibs != null) [ xlibs.xlibs xlibs.libXrender ]
+ ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext;
+
+ CPPFLAGS = stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") "-I${cairo}/include/cairo";
+
+ configureFlags =
+ [ "--with-pngincludedir=${libpng}/include"
+ "--with-pnglibdir=${libpng}/lib"
+ "--with-jpegincludedir=${libjpeg}/include"
+ "--with-jpeglibdir=${libjpeg}/lib"
+ "--with-expatincludedir=${expat}/include"
+ "--with-expatlibdir=${expat}/lib"
+ "--with-cgraph=no"
+ "--with-sparse=no"
+ ]
+ ++ stdenv.lib.optional (xlibs == null) "--without-x";
+
+ preBuild = ''
+ sed -e 's@am__append_5 *=.*@am_append_5 =@' -i lib/gvc/Makefile
+ '';
+
+ # "command -v" is POSIX, "which" is not
+ postInstall = ''
+ sed -i 's|`which lefty`|"'$out'/bin/lefty"|' $out/bin/dotty
+ sed -i 's|which|command -v|' $out/bin/vimdot
+ '';
+
+ meta = {
+ homepage = "http://www.graphviz.org/";
+ description = "Open source graph visualization software";
+
+ longDescription = ''
+ Graphviz is open source graph visualization software. Graph
+ visualization is a way of representing structural information as
+ diagrams of abstract graphs and networks. It has important
+ applications in networking, bioinformatics, software engineering,
+ database and web design, machine learning, and in visual
+ interfaces for other technical domains.
+ '';
+
+ hydraPlatforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+ maintainers = with stdenv.lib.maintainers; [ simons bjornfor raskin ];
+ inherit version;
+ };
+}
diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix
index 27883ca6037..e9a552e3300 100644
--- a/pkgs/tools/graphics/graphviz/default.nix
+++ b/pkgs/tools/graphics/graphviz/default.nix
@@ -3,11 +3,12 @@
}:
stdenv.mkDerivation rec {
- name = "graphviz-2.36.0";
+ version = "2.38.0";
+ name = "graphviz-${version}";
src = fetchurl {
url = "http://www.graphviz.org/pub/graphviz/ARCHIVE/${name}.tar.gz";
- sha256 = "0qb30z5sxlbjni732ndad3j4x7l36vsxpxn4fmf5fn7ivvc6dz9p";
+ sha256 = "17l5czpvv5ilmg17frg0w4qwf89jzh2aglm9fgx0l0aakn6j7al1";
};
buildInputs =
@@ -52,6 +53,9 @@ stdenv.mkDerivation rec {
'';
hydraPlatforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
- maintainers = with stdenv.lib.maintainers; [ simons bjornfor ];
+ maintainers = with stdenv.lib.maintainers; [ simons bjornfor raskin ];
+ downloadPage = "http://www.graphviz.org/pub/graphviz/ARCHIVE/";
+ inherit version;
+ updateWalker = true;
};
}
diff --git a/pkgs/tools/graphics/logstalgia/default.nix b/pkgs/tools/graphics/logstalgia/default.nix
index bdde9daea9f..9ab36b582eb 100644
--- a/pkgs/tools/graphics/logstalgia/default.nix
+++ b/pkgs/tools/graphics/logstalgia/default.nix
@@ -1,22 +1,22 @@
-{ stdenv, fetchurl, SDL, ftgl, pkgconfig, libpng, libjpeg, pcre, SDL_image, glew, mesa }:
+{ stdenv, fetchurl, SDL, ftgl, pkgconfig, libpng, libjpeg, pcre, SDL_image, glew
+, mesa, boost, glm }:
-let
- name = "logstalgia-1.0.3";
-in
-stdenv.mkDerivation {
- inherit name;
+stdenv.mkDerivation rec {
+ name = "logstalgia-${version}";
+ version = "1.0.5";
src = fetchurl {
- url = "http://logstalgia.googlecode.com/files/logstalgia-1.0.3.tar.gz";
- sha256 = "1sv1cizyw3y7g558hnvvcal8z889gbr82v4qj35hxdmrzygqlcyk";
+ url = "https://github.com/acaudwell/Logstalgia/releases/download/${name}/${name}.tar.gz";
+ sha256 = "0hm4fcakz05j95kb9f14qpspb31xi07paka390dz3g5k980hm9sc";
};
- buildInputs = [glew SDL ftgl pkgconfig libpng libjpeg pcre SDL_image mesa];
+ buildInputs = [ glew SDL ftgl pkgconfig libpng libjpeg pcre SDL_image mesa boost
+ glm ];
- meta = {
- homepage = "http://code.google.com/p/logstalgia/";
- description = "website traffic visualization tool";
- license = stdenv.lib.licenses.gpl3Plus;
+ meta = with stdenv.lib; {
+ homepage = http://code.google.com/p/logstalgia;
+ description = "Website traffic visualization tool";
+ license = licenses.gpl3Plus;
longDescription = ''
Logstalgia is a website traffic visualization that replays or
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
a Miscellaneous section.
'';
- platforms = stdenv.lib.platforms.gnu;
- maintainers = [];
+ platforms = platforms.gnu;
+ maintainers = with maintainers; [ pSub ];
};
}
diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix
index 2e3274ca0ff..e69a73ff321 100644
--- a/pkgs/tools/graphics/netpbm/default.nix
+++ b/pkgs/tools/graphics/netpbm/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, fetchsvn, pkgconfig, libjpeg, libpng, flex, zlib, perl, libxml2, makeWrapper, libX11, libtiff }:
+{ lib, stdenv, fetchurl, pkgconfig, libjpeg, libpng, flex, zlib, perl, libxml2
+, makeWrapper, libtiff
+, enableX11 ? false, libX11 }:
-let rev = 1742; in
-stdenv.mkDerivation {
- name = "netpbm-advanced-${toString rev}";
+stdenv.mkDerivation rec {
+ name = "netpbm-10.66.00";
- src = fetchsvn {
- url = https://netpbm.svn.sourceforge.net/svnroot/netpbm/advanced;
- inherit rev;
- sha256 = "0csx6g0ci66nx1a6z0a9dkpfp66mdvcpp5r7g6zrx4jp18r9hzb2";
+ src = fetchurl {
+ url = "mirror://gentoo/distfiles/${name}.tar.xz";
+ sha256 = "1z33pxdir92m7jlvp5c2q44gxwj7jyf8skiqkr71kgirw4w4zsbz";
};
postPatch = /* CVE-2005-2471, from Arch */ ''
@@ -17,10 +17,13 @@ stdenv.mkDerivation {
NIX_CFLAGS_COMPILE = "-fPIC"; # Gentoo adds this on every platform
- buildInputs = [ pkgconfig flex zlib perl libpng libjpeg libxml2 makeWrapper libX11 libtiff ];
+ buildInputs =
+ [ pkgconfig flex zlib perl libpng libjpeg libxml2 makeWrapper libtiff ]
+ ++ lib.optional enableX11 libX11;
configurePhase = ''
cp config.mk.in config.mk
+ echo "STATICLIB_TOO = n" >> config.mk
substituteInPlace "config.mk" \
--replace "TIFFLIB = NONE" "TIFFLIB = ${libtiff}/lib/libtiff.so" \
--replace "TIFFHDR_DIR =" "TIFFHDR_DIR = ${libtiff}/include"
@@ -38,21 +41,12 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
installPhase = ''
- make package pkgdir=$PWD/netpbmpkg
- # Pass answers to the script questions
- ./installnetpbm << EOF
- $PWD/netpbmpkg
- $out
- Y
- $out/bin
- $out/lib
- N
- $out/lib
- $out/lib
- $out/include
- $out/man
- N
- EOF
+ make package pkgdir=$out
+
+ rm -rf $out/link $out/*_template $out/{pkginfo,README,VERSION} $out/man/web
+
+ mkdir -p $out/share/netpbm
+ mv $out/misc $out/share/netpbm/
# wrap any scripts that expect other programs in the package to be in their PATH
for prog in ppmquant; do
diff --git a/pkgs/tools/graphics/pdf2svg/default.nix b/pkgs/tools/graphics/pdf2svg/default.nix
new file mode 100644
index 00000000000..591a85c2447
--- /dev/null
+++ b/pkgs/tools/graphics/pdf2svg/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pkgconfig, cairo, gtk, poppler }:
+
+stdenv.mkDerivation {
+ name = "pdf2svg-0.2.2";
+
+ src = fetchurl {
+ url = "http://www.cityinthesky.co.uk/wp-content/uploads/2013/10/pdf2svg-0.2.2.tar.gz" ;
+ sha256 = "1jy6iqwwvd7drcybmdlmnc8m970f82fd7fisa8ha5zh13p49r8n2";
+ };
+
+ buildInputs = [ cairo pkgconfig poppler.poppler_glib gtk ];
+
+ meta = {
+ description = "PDF converter to SVG format";
+ homepage = http://www.cityinthesky.co.uk/opensource/pdf2svg;
+ license = stdenv.lib.licenses.gpl2;
+ maintainers = [ stdenv.lib.maintainers.ianwookim ];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix
index b27e5132804..0419732949d 100644
--- a/pkgs/tools/graphics/pngcrush/default.nix
+++ b/pkgs/tools/graphics/pngcrush/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, libpng }:
stdenv.mkDerivation rec {
- name = "pngcrush-1.7.76";
+ name = "pngcrush-1.7.77";
src = fetchurl {
url = "mirror://sourceforge/pmt/${name}-nolib.tar.xz";
- sha256 = "0jbv3ijc0nfhy6pkhv4dwbk2v488rwixd8rv1c7lfs59wblb44hv";
+ sha256 = "0404275rb6934aiwrysgapg0irbimcb2y8giqlc63gfspnvy67fa";
};
configurePhase = ''
diff --git a/pkgs/tools/graphics/qrencode/default.nix b/pkgs/tools/graphics/qrencode/default.nix
index 892ef54cdee..936956cbd17 100644
--- a/pkgs/tools/graphics/qrencode/default.nix
+++ b/pkgs/tools/graphics/qrencode/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, libpng, pkgconfig }:
stdenv.mkDerivation rec {
- name = "qrencode-3.4.3";
+ name = "qrencode-3.4.4";
src = fetchurl {
url = "${meta.homepage}/${name}.tar.bz2";
- sha256 = "163sb580p570p27imc6jhkfdw15kzp8vy1jq92nip1rwa63i9myz";
+ sha256 = "198zvsfa2y5bb3ccikrhmhd4i43apr3b26dqcf3zkjyv3n5iirgg";
};
buildInputs = [ libpng ];
diff --git a/pkgs/tools/graphics/wkhtmltopdf/default.nix b/pkgs/tools/graphics/wkhtmltopdf/default.nix
index 84b271acf2b..2f3929b82b8 100644
--- a/pkgs/tools/graphics/wkhtmltopdf/default.nix
+++ b/pkgs/tools/graphics/wkhtmltopdf/default.nix
@@ -1,22 +1,88 @@
-{ stdenv, fetchurl, qt4 }:
+{ stdenv, fetchgit, qt4, fontconfig, freetype, libpng, zlib, libjpeg
+, openssl, libX11, libXext, libXrender, overrideDerivation }:
stdenv.mkDerivation rec {
- name = "wkhtmltopdf-0.11.0_rc1";
+ version = "0.12.1";
+ name = "wkhtmltopdf-${version}";
- src = fetchurl {
- url = "http://wkhtmltopdf.googlecode.com/files/${name}.tar.bz2";
- sha1 = "db03922d281856e503b3d562614e3936285728c7";
+ src = fetchgit {
+ url = "https://github.com/wkhtmltopdf/wkhtmltopdf.git";
+ rev = "refs/tags/${version}";
+ sha256 = "0wjzaaviy1k3z8r2kzb2rmyx6xdj23a338b86sxcb15ws3kzwgwh";
};
- buildInputs = [ qt4 ];
+ wkQt = overrideDerivation qt4 (deriv: {
+ name = "qt-mod-4.8.6";
+ src = fetchgit {
+ url = "https://github.com/wkhtmltopdf/qt.git";
+ rev = "82b568b"; # From git submodule spec in wkhtml repo.
+ sha256 = "0whppwxnymh5bdayqsqx54n074m99yk6v78z7f0k5prja55yvwyx";
+ };
+ configureFlags =
+ ''
+ -v -no-separate-debug-info -release -confirm-license -opensource
+ -qdbus -glib -dbus-linked -openssl-linked
+ ''
+ + # This is taken from the wkhtml build script that we don't run
+ ''
+ -fast
+ -static
+ -exceptions
+ -xmlpatterns
+ -webkit
+ -system-zlib
+ -system-libpng
+ -system-libjpeg
+ -no-libmng
+ -no-libtiff
+ -no-accessibility
+ -no-stl
+ -no-qt3support
+ -no-phonon
+ -no-phonon-backend
+ -no-opengl
+ -no-declarative
+ -no-sql-ibase
+ -no-sql-mysql
+ -no-sql-odbc
+ -no-sql-psql
+ -no-sql-sqlite
+ -no-sql-sqlite2
+ -no-mmx
+ -no-3dnow
+ -no-sse
+ -no-sse2
+ -no-multimedia
+ -nomake demos
+ -nomake docs
+ -nomake examples
+ -nomake tools
+ -nomake tests
+ -nomake translations
+ '';
+ });
+
+ buildInputs = [ wkQt fontconfig freetype libpng zlib libjpeg openssl
+ libX11 libXext libXrender
+ ];
configurePhase = "qmake wkhtmltopdf.pro INSTALLBASE=$out";
+ patches = [ ./makefix.patch ];
+
enableParallelBuilding = true;
meta = {
- homepage = http://code.google.com/p/wkhtmltopdf/;
+ homepage = http://wkhtmltopdf.org/;
description = "Tools for rendering web pages to PDF or images";
+ longDescription = ''
+ wkhtmltopdf and wkhtmltoimage are open source (LGPL) command line tools
+ to render HTML into PDF and various image formats using the QT Webkit
+ rendering engine. These run entirely "headless" and do not require a
+ display or display service.
+
+ There is also a C library, if you're into that kind of thing.
+ '';
license = stdenv.lib.licenses.gpl3Plus;
};
}
diff --git a/pkgs/tools/graphics/wkhtmltopdf/makefix.patch b/pkgs/tools/graphics/wkhtmltopdf/makefix.patch
new file mode 100644
index 00000000000..0642a23afa9
--- /dev/null
+++ b/pkgs/tools/graphics/wkhtmltopdf/makefix.patch
@@ -0,0 +1,24 @@
+diff -Naur a/src/image/image.pro b/src/image/image.pro
+--- a/src/image/image.pro 2014-08-28 14:07:51.024561967 +0200
++++ b/src/image/image.pro 2014-08-28 14:08:22.383623390 +0200
+@@ -25,7 +25,7 @@
+
+ unix {
+ man.path=$$INSTALLBASE/share/man/man1
+- man.extra=LD_LIBRARY_PATH=../../bin/ ../../bin/wkhtmltoimage --manpage | gzip > $(INSTALL_ROOT)/share/man/man1/wkhtmltoimage.1.gz
++ man.extra=LD_LIBRARY_PATH=../../bin/ ../../bin/wkhtmltoimage --manpage | gzip > $$INSTALLBASE/share/man/man1/wkhtmltoimage.1.gz
+
+ QMAKE_EXTRA_TARGETS += man
+ INSTALLS += man
+diff -Naur a/src/pdf/pdf.pro b/src/pdf/pdf.pro
+--- a/src/pdf/pdf.pro 2014-08-28 14:10:02.305818775 +0200
++++ b/src/pdf/pdf.pro 2014-08-28 14:09:47.360789555 +0200
+@@ -25,7 +25,7 @@
+
+ unix {
+ man.path=$$INSTALLBASE/share/man/man1
+- man.extra=LD_LIBRARY_PATH=../../bin/ ../../bin/wkhtmltopdf --manpage | gzip > $(INSTALL_ROOT)/share/man/man1/wkhtmltopdf.1.gz
++ man.extra=LD_LIBRARY_PATH=../../bin/ ../../bin/wkhtmltopdf --manpage | gzip > $$INSTALLBASE/share/man/man1/wkhtmltopdf.1.gz
+
+ QMAKE_EXTRA_TARGETS += man
+ INSTALLS += man
diff --git a/pkgs/tools/inputmethods/anthy/default.nix b/pkgs/tools/inputmethods/anthy/default.nix
new file mode 100644
index 00000000000..34ffa1568b9
--- /dev/null
+++ b/pkgs/tools/inputmethods/anthy/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
+ name = "anthy-9100h";
+
+ meta = with stdenv.lib; {
+ description = "Hiragana text to Kana Kanji mixed text Japanese input method";
+ homepace = http://sourceforge.jp/projects/anthy/;
+ license = licenses.gpl2Plus;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ iyzsong ];
+ };
+
+ src = fetchurl {
+ url = "http://dl.sourceforge.jp/anthy/37536/anthy-9100h.tar.gz";
+ sha256 = "0ism4zibcsa5nl77wwi12vdsfjys3waxcphn1p5s7d0qy1sz0mnj";
+ };
+}
diff --git a/pkgs/tools/inputmethods/fcitx/default.nix b/pkgs/tools/inputmethods/fcitx/default.nix
index 2795b0d4d87..28f6c97949b 100644
--- a/pkgs/tools/inputmethods/fcitx/default.nix
+++ b/pkgs/tools/inputmethods/fcitx/default.nix
@@ -5,11 +5,11 @@
}:
stdenv.mkDerivation rec {
- name = "fcitx-4.2.8.3";
+ name = "fcitx-4.2.8.5";
src = fetchurl {
url = "http://download.fcitx-im.org/fcitx/${name}_dict.tar.xz";
- sha256 = "05dw6cbjh2jyjrkr4qx2bcq6nyhhrs0akf6fcjk5a72bgphhwqnb";
+ sha256 = "0whv7mnzig4l5v518r200psa1fp3dyl1jkr5z0q13ijzh1bnyggy";
};
patchPhase = ''
diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-anthy.nix b/pkgs/tools/inputmethods/fcitx/fcitx-anthy.nix
new file mode 100644
index 00000000000..2099220f2a1
--- /dev/null
+++ b/pkgs/tools/inputmethods/fcitx/fcitx-anthy.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, cmake, fcitx, anthy }:
+
+stdenv.mkDerivation rec {
+ name = "fcitx-anthy-0.2.1";
+
+ meta = with stdenv.lib; {
+ description = "Fcitx Wrapper for anthy";
+ license = licenses.gpl2Plus;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ iyzsong ];
+ };
+
+ src = fetchurl {
+ url = "http://download.fcitx-im.org/fcitx-anthy/${name}.tar.xz";
+ sha256 = "13fpfhhxkzbq53h10i3hifa37nngm47jq361i70z22bgcrs8887x";
+ };
+
+ buildInputs = [ cmake fcitx anthy ];
+
+ preInstall = ''
+ substituteInPlace src/cmake_install.cmake \
+ --replace ${fcitx} $out
+ '';
+}
diff --git a/pkgs/tools/inputmethods/uim/default.nix b/pkgs/tools/inputmethods/uim/default.nix
new file mode 100644
index 00000000000..b8ee95fae92
--- /dev/null
+++ b/pkgs/tools/inputmethods/uim/default.nix
@@ -0,0 +1,44 @@
+{stdenv, fetchurl, intltool, pkgconfig, qt4, gtk2, gtk3, kdelibs, cmake, ... }:
+
+stdenv.mkDerivation rec {
+ version = "1.8.6";
+ name = "uim-${version}";
+
+ buildInputs = [
+ intltool
+ pkgconfig
+ qt4
+ gtk2
+ gtk3
+ kdelibs
+ cmake
+ ];
+
+ patches = [ ./immodules_cache.patch ];
+
+ configureFlags = [
+ "--with-gtk2"
+ "--with-gtk3"
+ "--enable-kde4-applet"
+ "--enable-notify=knotify4"
+ "--enable-pref"
+ "--with-qt4"
+ "--with-qt4-immodule"
+ "--with-skk"
+ "--with-x"
+ ];
+
+ dontUseCmakeConfigure = true;
+
+ src = fetchurl {
+ url = "http://uim.googlecode.com/files/uim-${version}.tar.bz2";
+ sha1 = "43b9dbdead6797880e6cfc9c032ecb2d37d42777";
+ };
+
+ meta = {
+ homepage = "http://code.google.com/p/uim/";
+ description = "A multilingual input method framework";
+ license = stdenv.lib.licenses.bsd3;
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/tools/inputmethods/uim/immodules_cache.patch b/pkgs/tools/inputmethods/uim/immodules_cache.patch
new file mode 100644
index 00000000000..c2d08b661e3
--- /dev/null
+++ b/pkgs/tools/inputmethods/uim/immodules_cache.patch
@@ -0,0 +1,231 @@
+diff -ru -x '*~' uim-1.8.6.orig/gtk2/immodule/Makefile.am uim-1.8.6/gtk2/immodule/Makefile.am
+--- uim-1.8.6.orig/gtk2/immodule/Makefile.am 2013-06-30 13:26:09.000000000 +0900
++++ uim-1.8.6/gtk2/immodule/Makefile.am 2014-07-13 21:51:26.538400004 +0900
+@@ -1,5 +1,5 @@
+ uim_gtk_im_module_path = $(libdir)/gtk-2.0
+-uim_gtk_im_module_file = $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules
++uim_gtk_im_module_file = $(uim_gtk_im_module_path)/@GTK_BINARY_VERSION@/immodules.cache
+
+ moduledir = $(uim_gtk_im_module_path)/@GTK_BINARY_VERSION@/immodules
+
+@@ -38,48 +38,12 @@
+
+ install-data-hook: gtk-rc-get-immodule-file
+ if test -z $(DESTDIR); then \
+- if test $(libdir) = $(GTK_LIBDIR); then \
+- if type $(QUERY_COMMAND) > /dev/null 2>&1; then \
+- $(QUERY_COMMAND) > `$(GTK_RC_GET_IMMODULE_FILE)`; \
+- echo "*** \"`$(GTK_RC_GET_IMMODULE_FILE)`\" is updated. ***"; \
+- else \
+- echo "********************** Warning ***********************"; \
+- echo " $(QUERY_COMMAND) not found"; \
+- echo " Please make sure to update"; \
+- echo " \"`$(GTK_RC_GET_IMMODULE_FILE)`\""; \
+- echo " manually."; \
+- echo "******************************************************"; \
+- fi \
+- else \
+- if type $(QUERY_COMMAND) > /dev/null 2>&1; then \
+- $(mkinstalldirs) $(sysconfdir)/gtk-2.0; \
+- GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \
+- echo "******************************************************"; \
+- echo " You need to set"; \
+- echo " GTK_IM_MODULE_FILE=$(uim_gtk_im_module_file)"; \
+- echo " environment variable to use this module."; \
+- echo "******************************************************"; \
+- else \
+- echo "********************** Warning ***********************"; \
+- echo " $(QUERY_COMMAND) not found"; \
+- echo " Please make sure to update"; \
+- echo " \"$(uim_gtk_im_module_file)\""; \
+- echo " manually, and set"; \
+- echo " GTK_IM_MODULE_FILE=$(uim_gtk_im_module_file)"; \
+- echo " environment variable to use this module."; \
+- echo "******************************************************"; \
+- fi \
+- fi \
++ $(mkinstalldirs) $(uim_gtk_im_module_path)/@GTK_BINARY_VERSION@; \
++ GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \
+ fi
+ uninstall-hook:
+ if test -z $(DESTDIR); then \
+- if type $(QUERY_COMMAND) > /dev/null 2>&1; then \
+- if test $(libdir) = $(GTK_LIBDIR); then \
+- $(QUERY_COMMAND) > `$(GTK_RC_GET_IMMODULE_FILE)`; \
+- else \
+- GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \
+- fi \
+- fi \
++ GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \
+ fi
+ else
+ install-data-hook:
+diff -ru -x '*~' uim-1.8.6.orig/gtk2/immodule/Makefile.in uim-1.8.6/gtk2/immodule/Makefile.in
+--- uim-1.8.6.orig/gtk2/immodule/Makefile.in 2013-06-30 13:27:08.000000000 +0900
++++ uim-1.8.6/gtk2/immodule/Makefile.in 2014-07-13 22:12:27.947595507 +0900
+@@ -434,7 +434,7 @@
+ top_srcdir = @top_srcdir@
+ uim_pixmapsdir = @uim_pixmapsdir@
+ uim_gtk_im_module_path = $(libdir)/gtk-2.0
+-uim_gtk_im_module_file = $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules
++uim_gtk_im_module_file = $(uim_gtk_im_module_path)/@GTK_BINARY_VERSION@/immodules.cache
+ moduledir = $(uim_gtk_im_module_path)/@GTK_BINARY_VERSION@/immodules
+ @GTK2_TRUE@im_uim_la = im-uim.la
+ @GTK2_TRUE@im_uim_la_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
+@@ -875,48 +875,12 @@
+
+ @GTK2_TRUE@install-data-hook: gtk-rc-get-immodule-file
+ @GTK2_TRUE@ if test -z $(DESTDIR); then \
+-@GTK2_TRUE@ if test $(libdir) = $(GTK_LIBDIR); then \
+-@GTK2_TRUE@ if type $(QUERY_COMMAND) > /dev/null 2>&1; then \
+-@GTK2_TRUE@ $(QUERY_COMMAND) > `$(GTK_RC_GET_IMMODULE_FILE)`; \
+-@GTK2_TRUE@ echo "*** \"`$(GTK_RC_GET_IMMODULE_FILE)`\" is updated. ***"; \
+-@GTK2_TRUE@ else \
+-@GTK2_TRUE@ echo "********************** Warning ***********************"; \
+-@GTK2_TRUE@ echo " $(QUERY_COMMAND) not found"; \
+-@GTK2_TRUE@ echo " Please make sure to update"; \
+-@GTK2_TRUE@ echo " \"`$(GTK_RC_GET_IMMODULE_FILE)`\""; \
+-@GTK2_TRUE@ echo " manually."; \
+-@GTK2_TRUE@ echo "******************************************************"; \
+-@GTK2_TRUE@ fi \
+-@GTK2_TRUE@ else \
+-@GTK2_TRUE@ if type $(QUERY_COMMAND) > /dev/null 2>&1; then \
+-@GTK2_TRUE@ $(mkinstalldirs) $(sysconfdir)/gtk-2.0; \
+-@GTK2_TRUE@ GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \
+-@GTK2_TRUE@ echo "******************************************************"; \
+-@GTK2_TRUE@ echo " You need to set"; \
+-@GTK2_TRUE@ echo " GTK_IM_MODULE_FILE=$(uim_gtk_im_module_file)"; \
+-@GTK2_TRUE@ echo " environment variable to use this module."; \
+-@GTK2_TRUE@ echo "******************************************************"; \
+-@GTK2_TRUE@ else \
+-@GTK2_TRUE@ echo "********************** Warning ***********************"; \
+-@GTK2_TRUE@ echo " $(QUERY_COMMAND) not found"; \
+-@GTK2_TRUE@ echo " Please make sure to update"; \
+-@GTK2_TRUE@ echo " \"$(uim_gtk_im_module_file)\""; \
+-@GTK2_TRUE@ echo " manually, and set"; \
+-@GTK2_TRUE@ echo " GTK_IM_MODULE_FILE=$(uim_gtk_im_module_file)"; \
+-@GTK2_TRUE@ echo " environment variable to use this module."; \
+-@GTK2_TRUE@ echo "******************************************************"; \
+-@GTK2_TRUE@ fi \
+-@GTK2_TRUE@ fi \
++@GTK2_TRUE@ $(mkinstalldirs) $(uim_gtk_im_module_path)/@GTK_BINARY_VERSION@; \
++@GTK2_TRUE@ GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \
+ @GTK2_TRUE@ fi
+ @GTK2_TRUE@uninstall-hook:
+ @GTK2_TRUE@ if test -z $(DESTDIR); then \
+-@GTK2_TRUE@ if type $(QUERY_COMMAND) > /dev/null 2>&1; then \
+-@GTK2_TRUE@ if test $(libdir) = $(GTK_LIBDIR); then \
+-@GTK2_TRUE@ $(QUERY_COMMAND) > `$(GTK_RC_GET_IMMODULE_FILE)`; \
+-@GTK2_TRUE@ else \
+-@GTK2_TRUE@ GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \
+-@GTK2_TRUE@ fi \
+-@GTK2_TRUE@ fi \
++@GTK2_TRUE@ GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \
+ @GTK2_TRUE@ fi
+ @GTK2_FALSE@install-data-hook:
+
+diff -ru -x '*~' uim-1.8.6.orig/gtk3/immodule/Makefile.am uim-1.8.6/gtk3/immodule/Makefile.am
+--- uim-1.8.6.orig/gtk3/immodule/Makefile.am 2013-06-30 13:26:20.000000000 +0900
++++ uim-1.8.6/gtk3/immodule/Makefile.am 2014-07-13 21:55:38.114246503 +0900
+@@ -45,42 +45,11 @@
+
+ install-data-hook: gtk3-rc-get-immodule-file
+ if test -z $(DESTDIR); then \
+- if test $(libdir) = $(GTK3_LIBDIR); then \
+- if type $(QUERY_COMMAND) > /dev/null 2>&1; then \
+- $(QUERY_COMMAND) --update-cache; \
+- echo "*** \"`$(GTK3_RC_GET_IMMODULE_FILE)`\" is updated. ***"; \
+- else \
+- echo "********************** Warning ***********************"; \
+- echo " $(QUERY_COMMAND) not found"; \
+- echo " Please make sure to update"; \
+- echo " \"`$(GTK3_RC_GET_IMMODULE_FILE)`\""; \
+- echo " manually."; \
+- echo "******************************************************"; \
+- fi \
+- else \
+- if type $(QUERY_COMMAND) > /dev/null 2>&1; then \
+- GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) --update-cache; \
+- else \
+- echo "********************** Warning ***********************"; \
+- echo " $(QUERY_COMMAND) not found"; \
+- echo " Please make sure to update"; \
+- echo " immodules.cache"; \
+- echo " manually, and set"; \
+- echo " GTK_IM_MODULE_FILE=PATH_TO/immodule.cache"; \
+- echo " environment variable to use this module."; \
+- echo "******************************************************"; \
+- fi \
+- fi \
++ GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) > $(uim_gtk3_im_module_path)/@GTK3_BINARY_VERSION@/immodules.cache ; \
+ fi
+ uninstall-hook:
+ if test -z $(DESTDIR); then \
+- if type $(QUERY_COMMAND) > /dev/null 2>&1; then \
+- if test $(libdir) = $(GTK3_LIBDIR); then \
+- $(QUERY_COMMAND) --update-cache; \
+- else \
+- GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) --update-cache; \
+- fi \
+- fi \
++ GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) > $(uim_gtk3_im_module_path)/@GTK3_BINARY_VERSION@/immodules.cache ; \
+ fi
+ else
+ install-data-hook:
+diff -ru -x '*~' uim-1.8.6.orig/gtk3/immodule/Makefile.in uim-1.8.6/gtk3/immodule/Makefile.in
+--- uim-1.8.6.orig/gtk3/immodule/Makefile.in 2013-06-30 13:27:08.000000000 +0900
++++ uim-1.8.6/gtk3/immodule/Makefile.in 2014-07-13 21:56:11.531225832 +0900
+@@ -893,42 +893,11 @@
+
+ @GTK3_TRUE@install-data-hook: gtk3-rc-get-immodule-file
+ @GTK3_TRUE@ if test -z $(DESTDIR); then \
+-@GTK3_TRUE@ if test $(libdir) = $(GTK3_LIBDIR); then \
+-@GTK3_TRUE@ if type $(QUERY_COMMAND) > /dev/null 2>&1; then \
+-@GTK3_TRUE@ $(QUERY_COMMAND) --update-cache; \
+-@GTK3_TRUE@ echo "*** \"`$(GTK3_RC_GET_IMMODULE_FILE)`\" is updated. ***"; \
+-@GTK3_TRUE@ else \
+-@GTK3_TRUE@ echo "********************** Warning ***********************"; \
+-@GTK3_TRUE@ echo " $(QUERY_COMMAND) not found"; \
+-@GTK3_TRUE@ echo " Please make sure to update"; \
+-@GTK3_TRUE@ echo " \"`$(GTK3_RC_GET_IMMODULE_FILE)`\""; \
+-@GTK3_TRUE@ echo " manually."; \
+-@GTK3_TRUE@ echo "******************************************************"; \
+-@GTK3_TRUE@ fi \
+-@GTK3_TRUE@ else \
+-@GTK3_TRUE@ if type $(QUERY_COMMAND) > /dev/null 2>&1; then \
+-@GTK3_TRUE@ GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) --update-cache; \
+-@GTK3_TRUE@ else \
+-@GTK3_TRUE@ echo "********************** Warning ***********************"; \
+-@GTK3_TRUE@ echo " $(QUERY_COMMAND) not found"; \
+-@GTK3_TRUE@ echo " Please make sure to update"; \
+-@GTK3_TRUE@ echo " immodules.cache"; \
+-@GTK3_TRUE@ echo " manually, and set"; \
+-@GTK3_TRUE@ echo " GTK_IM_MODULE_FILE=PATH_TO/immodule.cache"; \
+-@GTK3_TRUE@ echo " environment variable to use this module."; \
+-@GTK3_TRUE@ echo "******************************************************"; \
+-@GTK3_TRUE@ fi \
+-@GTK3_TRUE@ fi \
++@GTK3_TRUE@ GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) > $(uim_gtk3_im_module_path)/@GTK3_BINARY_VERSION@/immodules.cache ; \
+ @GTK3_TRUE@ fi
+ @GTK3_TRUE@uninstall-hook:
+ @GTK3_TRUE@ if test -z $(DESTDIR); then \
+-@GTK3_TRUE@ if type $(QUERY_COMMAND) > /dev/null 2>&1; then \
+-@GTK3_TRUE@ if test $(libdir) = $(GTK3_LIBDIR); then \
+-@GTK3_TRUE@ $(QUERY_COMMAND) --update-cache; \
+-@GTK3_TRUE@ else \
+-@GTK3_TRUE@ GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) --update-cache; \
+-@GTK3_TRUE@ fi \
+-@GTK3_TRUE@ fi \
++@GTK3_TRUE@ GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) > $(uim_gtk3_im_module_path)/@GTK3_BINARY_VERSION@/immodules.cache ; \
+ @GTK3_TRUE@ fi
+ @GTK3_FALSE@install-data-hook:
+
+diff -ru -x '*~' uim-1.8.6.orig/qt4/immodule/quiminputcontextplugin.pro.in uim-1.8.6/qt4/immodule/quiminputcontextplugin.pro.in
+--- uim-1.8.6.orig/qt4/immodule/quiminputcontextplugin.pro.in 2013-06-30 13:26:20.000000000 +0900
++++ uim-1.8.6/qt4/immodule/quiminputcontextplugin.pro.in 2014-03-09 11:31:19.388085048 +0900
+@@ -35,4 +35,4 @@
+
+ TARGET = uiminputcontextplugin
+
+-target.path += @DESTDIR@$$[QT_INSTALL_PLUGINS]/inputmethods
++target.path += @DESTDIR@@exec_prefix@/lib/qt4/plugins/inputmethods
diff --git a/pkgs/tools/misc/binwalk/default.nix b/pkgs/tools/misc/binwalk/default.nix
new file mode 100644
index 00000000000..761ae6169eb
--- /dev/null
+++ b/pkgs/tools/misc/binwalk/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, python, wrapPython, curses, mtdutils, zlib, xz, ncompress, gzip, bzip2, gnutar, p7zip, cabextract
+, pyqtgraph ? null
+, visualizationSupport ? false }:
+
+assert visualizationSupport -> pyqtgraph != null;
+
+stdenv.mkDerivation rec {
+ version = "2.0.1";
+ name = "binwalk-${version}";
+
+ src = fetchFromGitHub {
+ owner = "devttys0";
+ repo = "binwalk";
+ rev = "v${version}";
+ sha256 = "1r5389lk3gk8y4ksrfljyb97l6pwnwvv8g1slbgr20avkzgw8zmn";
+ };
+
+ pythonPath = with stdenv.lib; [ curses ]
+ ++ optional visualizationSupport [ pyqtgraph ];
+
+ propagatedBuildInputs = with stdenv.lib; [ python wrapPython curses mtdutils zlib xz ncompress gzip bzip2 gnutar p7zip cabextract ]
+ ++ optional visualizationSupport [ pyqtgraph ];
+
+ postInstall = "wrapPythonPrograms";
+
+ meta = with stdenv.lib; {
+ homepage = "http://binwalk.org";
+ description = "A tool for searching a given binary image for embedded files";
+ platforms = platforms.all;
+ maintainers = [ maintainers.koral ];
+ };
+}
diff --git a/pkgs/tools/misc/bmon/default.nix b/pkgs/tools/misc/bmon/default.nix
index 29a6db4e6d2..4a1a272cc0f 100644
--- a/pkgs/tools/misc/bmon/default.nix
+++ b/pkgs/tools/misc/bmon/default.nix
@@ -1,25 +1,29 @@
-{ stdenv, fetchurl, pkgconfig, ncurses, confuse, libnl }:
+{ stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, ncurses, confuse
+, libnl }:
-stdenv.mkDerivation {
- name = "bmon-3.1";
+stdenv.mkDerivation rec {
+ name = "bmon-${version}";
+ version = "3.5";
- src = fetchurl {
- url = http://www.carisma.slowglass.com/~tgr/bmon/files/bmon-3.1.tar.gz;
- sha256 = "005ib7c3g3cva0rdwsgl6hfakxd5yp88sf4bjxb6iarcm3ax18ky";
+ src = fetchFromGitHub {
+ owner = "tgraf";
+ repo = "bmon";
+ rev = "v${version}";
+ sha256 = "0k6cwprwnrnilbs2fgkx7z9mg6rr11wf6djq6pjfc7fjn2fjvybi";
};
- buildInputs = [ pkgconfig ncurses confuse libnl ];
+ buildInputs = [ autoconf automake pkgconfig ncurses confuse libnl ];
+
+ preConfigure = "sh ./autogen.sh";
meta = with stdenv.lib; {
description = "Network bandwidth monitor";
- homepage = http://www.carisma.slowglass.com/~tgr/bmon/;
- # Neither the homepage nor the source archive has license info, but in the
- # latest git version there is a LICENSE file that is the 2-clause BSD
- # license.
- # - https://github.com/tgraf/bmon/blob/master/LICENSE
- # - http://opensource.org/licenses/BSD-2-Clause
+ homepage = https://github.com/tgraf/bmon;
+ # Licensed unter BSD and MIT
+ # - https://github.com/tgraf/bmon/blob/master/LICENSE.BSD
+ # - https://github.com/tgraf/bmon/blob/master/LICENSE.MIT
license = licenses.bsd2;
platforms = platforms.linux;
- maintainers = [ maintainers.bjornfor ];
+ maintainers = with maintainers; [ bjornfor pSub ];
};
}
diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/tools/misc/cloc/default.nix
index dfe5476f813..8d7ba0c70c8 100644
--- a/pkgs/tools/misc/cloc/default.nix
+++ b/pkgs/tools/misc/cloc/default.nix
@@ -1,30 +1,25 @@
{ stdenv, fetchurl, perl, AlgorithmDiff, RegexpCommon }:
stdenv.mkDerivation rec {
-
+
name = "cloc-${version}";
- version = "1.58";
+ version = "1.62";
src = fetchurl {
url = "mirror://sourceforge/cloc/cloc-${version}.tar.gz";
- sha256 = "1k92jldy4m717lh1xd6yachx3l2hhpx76qhj1ipnx12hsxw1zc8w";
+ sha256 = "1cxc663dccd0sc2m0aj5lxdbnbzrys6rh9n8q122h74bfvsiw4f4";
};
buildInputs = [ perl AlgorithmDiff RegexpCommon ];
- unpackPhase = ''
- mkdir ${name}
- tar xf $src -C ${name}
- cd ${name}
- '';
-
makeFlags = [ "prefix=" "DESTDIR=$(out)" "INSTALL=install" ];
meta = {
description = "A program that counts lines of source code";
homepage = http://cloc.sourceforge.net;
license = stdenv.lib.licenses.gpl2;
+ maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
};
}
diff --git a/pkgs/tools/misc/cpuminer-multi/default.nix b/pkgs/tools/misc/cpuminer-multi/default.nix
new file mode 100644
index 00000000000..22006310780
--- /dev/null
+++ b/pkgs/tools/misc/cpuminer-multi/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchgit, curl, jansson, autoconf, automake
+, aesni ? true }:
+
+let
+ rev = "977dad27e18627e5b723800f5f4201e385fe0d2e";
+ date = "20140723";
+in
+stdenv.mkDerivation rec {
+ name = "cpuminer-multi-${date}-${stdenv.lib.strings.substring 0 7 rev}";
+
+ src = fetchgit {
+ inherit rev;
+ url = https://github.com/wolf9466/cpuminer-multi.git;
+ sha256 = "9c438c6cd9f40273822f3d3103a370e43e8a40368695ed5e01ae87297dce7843";
+ };
+
+ buildInputs = [ autoconf automake curl jansson ];
+
+ preConfigure = ''
+ ./autogen.sh
+ '';
+
+ configureFlags = [ (if aesni then "--enable-aes-ni" else "--disable-aes-ni") ];
+
+ meta = with stdenv.lib; {
+ description = "Multi-algo CPUMiner";
+ homepage = https://github.com/wolf9466/cpuminer-multi;
+ license = licenses.gpl2;
+ maintainers = [ maintainers.emery ];
+ };
+}
\ No newline at end of file
diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix
index 16b1858e91d..43be10ee74d 100644
--- a/pkgs/tools/misc/debootstrap/default.nix
+++ b/pkgs/tools/misc/debootstrap/default.nix
@@ -32,13 +32,13 @@ in
stdenv.mkDerivation {
- name = "debootstrap-1.0.60";
+ name = "debootstrap-1.0.63";
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 = http://ftp.de.debian.org/debian/pool/main/d/debootstrap/debootstrap_1.0.60.tar.xz;
- sha256 = "0jyxfmx466fsqak00m4n6b04zsdqym81ybah7yx2l081d0518sw8";
+ url = http://ftp.de.debian.org/debian/pool/main/d/debootstrap/debootstrap_1.0.63.tar.xz;
+ sha256 = "1maavqg3qjfrmmh76zbl3fwy1hmws93qgwqrw9vh1dffjxgngvcw";
};
buildInputs = [ dpkg gettext gawk perl ];
diff --git a/pkgs/tools/misc/escoger/default.nix b/pkgs/tools/misc/escoger/default.nix
new file mode 100644
index 00000000000..2fe67f1b97f
--- /dev/null
+++ b/pkgs/tools/misc/escoger/default.nix
@@ -0,0 +1,33 @@
+{ cabal, dataDefault, fetchFromGitHub, HUnit, mtl, parallel
+, QuickCheck, testFramework, testFrameworkHunit
+, testFrameworkQuickcheck2, vector, vectorAlgorithms, vty
+}:
+
+let
+ rv = "b6b11c51846a9283ef4ee7c839b99ded9f6c3bc8";
+in
+cabal.mkDerivation (self: {
+ pname = "escoger";
+ version = "0.1.0.0-${rv}";
+ src = fetchFromGitHub {
+ owner = "tstat";
+ repo = "escoger";
+ rev = rv;
+ sha256 = "0n6mvg5cm50ym20bz74b7q1afkljp0fc9pxhqk0ai82a71xxbxy3";
+ };
+ isLibrary = false;
+ isExecutable = true;
+ buildDepends = [
+ dataDefault mtl parallel vector vectorAlgorithms vty
+ ];
+ testDepends = [
+ dataDefault HUnit mtl parallel QuickCheck testFramework
+ testFrameworkHunit testFrameworkQuickcheck2 vector vectorAlgorithms
+ vty
+ ];
+ meta = {
+ description = "A multithreaded terminal fuzzy selector";
+ license = self.stdenv.lib.licenses.mit;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix
index 1b6205db7ce..36d49ce9b23 100644
--- a/pkgs/tools/misc/ethtool/default.nix
+++ b/pkgs/tools/misc/ethtool/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "ethtool-3.14";
+ name = "ethtool-3.15";
src = fetchurl {
url = "mirror://kernel/software/network/ethtool/${name}.tar.xz";
- sha256 = "01v7a757757bk68vvap2x0v6jbqicchnjxvh52w8dccixxq2nkj3";
+ sha256 = "16kgw9y4fisldf1z6zpw3v965cc8nram0dycacwkc0js4l76klw8";
};
meta = with stdenv.lib; {
diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix
new file mode 100644
index 00000000000..c4e74359b15
--- /dev/null
+++ b/pkgs/tools/misc/flashrom/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, pkgconfig, libftdi, pciutils }:
+
+let version = "0.9.7"; in
+stdenv.mkDerivation rec {
+ name = "flashrom-${version}";
+
+ src = fetchurl {
+ url = "http://download.flashrom.org/releases/${name}.tar.bz2";
+ sha256 = "5a55212d00791981a9a1cb0cdca9d9e58bea6d399864251e7b410b4d3d6137e9";
+ };
+
+ buildInputs = [ pkgconfig libftdi pciutils ];
+
+ makeFlags = ["PREFIX=$out"];
+
+ meta = {
+ homepage = "http://www.flashrom.org";
+ description = "Utility for reading, writing, erasing and verifying flash ROM chips";
+ license = "GPLv2";
+ maintainers = [ stdenv.lib.maintainers.funfunctor ];
+ platforms = with stdenv.lib.platforms; linux;
+ };
+}
diff --git a/pkgs/tools/misc/go-bindata/default.nix b/pkgs/tools/misc/go-bindata/default.nix
new file mode 100644
index 00000000000..339126f7c98
--- /dev/null
+++ b/pkgs/tools/misc/go-bindata/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, lib, go, fetchFromGitHub }:
+
+stdenv.mkDerivation {
+ name = "go-bindata";
+
+ src = import ./deps.nix {
+ inherit stdenv lib fetchFromGitHub;
+ };
+
+ buildInputs = [ go ];
+
+ buildPhase = ''
+ export GOPATH=$src
+ go build -v -o go-bindata github.com/jteeuwen/go-bindata/go-bindata
+ '';
+
+ installPhase = ''
+ mkdir -p $out/bin
+ cp go-bindata $out/bin
+ '';
+
+ meta = with lib; {
+ homepage = "https://github.com/jteeuwen/go-bindata";
+ description = "A small utility which generates Go code from any file. Useful for embedding binary data in a Go program.";
+ maintainers = with maintainers; [ cstrahan ];
+ license = licenses.cc0 ;
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/tools/misc/go-bindata/deps.nix b/pkgs/tools/misc/go-bindata/deps.nix
new file mode 100644
index 00000000000..617f7dc6abe
--- /dev/null
+++ b/pkgs/tools/misc/go-bindata/deps.nix
@@ -0,0 +1,28 @@
+# This file was generated by go2nix.
+{ stdenv, lib, fetchFromGitHub }:
+
+let
+ goDeps = [
+ {
+ root = "github.com/jteeuwen/go-bindata";
+ src = fetchFromGitHub {
+ owner = "jteeuwen";
+ repo = "go-bindata";
+ rev = "93b909d1499a38620121b0a5eb43a18f3bccb083";
+ sha256 = "1v4jl9lnzy0p4nvjfkh96yy0w181n5mkr0kamh743911gfbpq4sh";
+ };
+ }
+ ];
+
+in
+
+stdenv.mkDerivation rec {
+ name = "go-deps";
+
+ buildCommand =
+ lib.concatStrings
+ (map (dep: ''
+ mkdir -p $out/src/`dirname ${dep.root}`
+ ln -s ${dep.src} $out/src/${dep.root}
+ '') goDeps);
+}
diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix
index 16c7f652dec..cc07ac95db8 100644
--- a/pkgs/tools/misc/gparted/default.nix
+++ b/pkgs/tools/misc/gparted/default.nix
@@ -2,11 +2,11 @@
, pkgconfig, gtkmm, libxml2 }:
stdenv.mkDerivation rec {
- name = "gparted-0.18.0";
+ name = "gparted-0.19.1";
src = fetchurl {
url = "mirror://sourceforge/gparted/${name}.tar.bz2";
- sha256 = "0slyf0sbv7a7xvdcpn9ibnixpy0w4s6zwpz6sklkxcyfybw1j7xz";
+ sha256 = "1x0mbks94jpzphb8hm8w0iqjrn665jkdm4qnzrvxrnvy0x3m2fwd";
};
configureFlags = "--disable-doc";
diff --git a/pkgs/tools/misc/grc/default.nix b/pkgs/tools/misc/grc/default.nix
index 03592440818..de380222a66 100644
--- a/pkgs/tools/misc/grc/default.nix
+++ b/pkgs/tools/misc/grc/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, python }:
stdenv.mkDerivation rec {
- version = "1.4";
+ version = "1.5";
name = "grc-${version}";
src = fetchurl {
url = "http://korpus.juls.savba.sk/~garabik/software/grc/grc_${version}.tar.gz";
- sha256 = "1l7lskxfjk32kkv4aaqw5qcxvh972nab3x2jzy67m1aa0zpcbzdv";
+ sha256 = "1p6xffp5mmnaw9llvrd4rc7zd4l7b1m62dlmn3c8p1ina831yn52";
};
installPhase = ''
@@ -29,4 +29,3 @@ stdenv.mkDerivation rec {
'';
};
}
-
diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix
index b1877bdcf98..e5471a6c404 100644
--- a/pkgs/tools/misc/grub/2.0x.nix
+++ b/pkgs/tools/misc/grub/2.0x.nix
@@ -1,30 +1,52 @@
-{ fetchurl, stdenv, flex, bison, gettext, ncurses, libusb, freetype, qemu
-, devicemapper, EFIsupport ? false }:
+{ stdenv, fetchurl, fetchgit, autogen, flex, bison, python, autoconf, automake
+, gettext, ncurses, libusb, freetype, qemu, devicemapper
+, linuxPackages ? null
+, efiSupport ? false
+, zfsSupport ? false
+}:
+with stdenv.lib;
let
+ efiSystems = {
+ "i686-linux".target = "i386";
+ "x86_64-linux".target = "x86_64";
+ };
- prefix = "grub${if EFIsupport then "-efi" else ""}";
+ canEfi = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) efiSystems);
- version = "2.00";
+ prefix = "grub${if efiSupport then "-efi" else ""}${optionalString zfsSupport "-zfs"}";
+
+ version = "2.02-git-1de3a4";
unifont_bdf = fetchurl {
url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz";
sha256 = "0s0qfff6n6282q28nwwblp5x295zd6n71kl43xj40vgvdqxv0fxx";
};
-in
+ po_src = fetchurl {
+ name = "grub-2.02-beta2.tar.gz";
+ url = "http://alpha.gnu.org/gnu/grub/grub-2.02~beta2.tar.gz";
+ sha256 = "1lr9h3xcx0wwrnkxdnkfjwy08j7g7mdlmmbdip2db4zfgi69h0rm";
+ };
+
+in (
+
+assert efiSupport -> canEfi;
+assert zfsSupport -> linuxPackages != null && linuxPackages.zfs != null;
stdenv.mkDerivation rec {
name = "${prefix}-${version}";
- src = fetchurl {
- url = "mirror://gnu/grub/grub-${version}.tar.xz";
- sha256 = "0n64hpmsccvicagvr0c6v0kgp2yw0kgnd3jvsyd26cnwgs7c6kkq";
+ src = fetchgit {
+ url = "git://git.savannah.gnu.org/grub.git";
+ rev = "1de3a48098053aaebd35232bd73e3ce3f3fdf51c";
+ sha256 = "0d1953nmi251czkm1dmd7vnm3iz2rkqbznlp6ph33va0d7kw1kfc";
};
- nativeBuildInputs = [ flex bison ];
+ nativeBuildInputs = [ autogen flex bison python autoconf automake ];
buildInputs = [ ncurses libusb freetype gettext devicemapper ]
- ++ stdenv.lib.optional doCheck qemu;
+ ++ optional doCheck qemu
+ ++ optional zfsSupport linuxPackages.zfs;
preConfigure =
'' for i in "tests/util/"*.in
@@ -43,27 +65,22 @@ stdenv.mkDerivation rec {
# See .
sed -i "tests/util/grub-shell.in" \
-e's/qemu-system-i386/qemu-system-x86_64 -nodefaults/g'
-
- # Fix for building on Glibc 2.16. Won't be needed once the
- # gnulib in grub is updated.
- sed -i '/gets is a security hole/d' grub-core/gnulib/stdio.in.h
'';
prePatch =
- '' gunzip < "${unifont_bdf}" > "unifont.bdf"
+ '' tar zxf ${po_src} grub-2.02~beta2/po
+ rm -rf po
+ mv grub-2.02~beta2/po po
+ sh autogen.sh
+ gunzip < "${unifont_bdf}" > "unifont.bdf"
sed -i "configure" \
-e "s|/usr/src/unifont.bdf|$PWD/unifont.bdf|g"
'';
patches = [ ./fix-bash-completion.patch ];
- configureFlags =
- let arch = if stdenv.system == "i686-linux" then "i386"
- else if stdenv.system == "x86_64-linux" then "x86_64"
- else throw "unsupported EFI firmware architecture";
- in
- stdenv.lib.optionals EFIsupport
- [ "--with-platform=efi" "--target=${arch}" "--program-prefix=" ];
+ configureFlags = optional zfsSupport "--enable-libzfs"
+ ++ optionals efiSupport [ "--with-platform=efi" "--target=${efiSystems.${stdenv.system}.target}" "--program-prefix=" ];
doCheck = false;
enableParallelBuilding = true;
@@ -72,7 +89,7 @@ stdenv.mkDerivation rec {
paxmark pms $out/sbin/grub-{probe,bios-setup}
'';
- meta = {
+ meta = with stdenv.lib; {
description = "GNU GRUB, the Grand Unified Boot Loader (2.x beta)";
longDescription =
@@ -89,11 +106,8 @@ stdenv.mkDerivation rec {
homepage = http://www.gnu.org/software/grub/;
- license = stdenv.lib.licenses.gpl3Plus;
+ license = licenses.gpl3Plus;
- platforms = if EFIsupport then
- [ "i686-linux" "x86_64-linux" ]
- else
- stdenv.lib.platforms.gnu;
+ platforms = platforms.gnu;
};
-}
+})
diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix
index a7d03d1335f..5cdc468c2a5 100644
--- a/pkgs/tools/misc/hdf5/default.nix
+++ b/pkgs/tools/misc/hdf5/default.nix
@@ -3,6 +3,8 @@
, fetchurl
, zlib ? null
, szip ? null
+, mpi ? null
+, enableShared ? true
}:
stdenv.mkDerivation rec {
version = "1.8.13";
@@ -12,11 +14,23 @@ stdenv.mkDerivation rec {
sha256 = "1h9qdl321gzm3ihdhlijbl9sh9qcdrw94j7izg64yfqhxj7b7xl2";
};
+ passthru = {
+ mpiSupport = (mpi != null);
+ inherit mpi;
+ };
+
buildInputs = []
++ stdenv.lib.optional (zlib != null) zlib
++ stdenv.lib.optional (szip != null) szip;
- configureFlags = if szip != null then "--with-szlib=${szip}" else "";
+ propagatedBuildInputs = []
+ ++ stdenv.lib.optional (mpi != null) mpi;
+
+ configureFlags = "
+ ${if szip != null then "--with-szlib=${szip}" else ""}
+ ${if mpi != null then "--enable-parallel" else ""}
+ ${if enableShared then "--enable-shared" else ""}
+ ";
patches = [./bin-mv.patch];
diff --git a/pkgs/tools/misc/ised/default.nix b/pkgs/tools/misc/ised/default.nix
index 02cb65b1060..96acc6c8ab9 100644
--- a/pkgs/tools/misc/ised/default.nix
+++ b/pkgs/tools/misc/ised/default.nix
@@ -10,16 +10,15 @@ let
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
baseName="ised";
- version="2.5.0";
+ version = "2.6.0";
name="${baseName}-${version}";
url="mirror://sourceforge/project/ised/${name}.tar.bz2";
- hash="1avfb4ivq6iz50rraci0pcxl0w94899sz6icdqc0l4954y4zs8qd";
};
in
rec {
src = a.fetchurl {
url = sourceInfo.url;
- sha256 = sourceInfo.hash;
+ sha256 = "0rf9brqkrad8f3czpfc1bxq9ybv3nxci9276wdxas033c82cqkjs";
};
inherit (sourceInfo) name version;
@@ -37,11 +36,7 @@ rec {
platforms = with a.lib.platforms;
linux;
license = a.lib.licenses.gpl3Plus;
- };
- passthru = {
- updateInfo = {
- downloadPage = "ised.sf.net";
- };
+ inherit version;
};
}) x
diff --git a/pkgs/tools/misc/ised/default.upstream b/pkgs/tools/misc/ised/default.upstream
new file mode 100644
index 00000000000..6539bf477e5
--- /dev/null
+++ b/pkgs/tools/misc/ised/default.upstream
@@ -0,0 +1,4 @@
+url http://ised.sourceforge.net/web_nav.html
+SF_version_tarball
+SF_redirect
+minimize_overwrite
diff --git a/pkgs/tools/misc/kde-gtk-config/default.nix b/pkgs/tools/misc/kde-gtk-config/default.nix
index 873d2adde7f..88df0b6b544 100644
--- a/pkgs/tools/misc/kde-gtk-config/default.nix
+++ b/pkgs/tools/misc/kde-gtk-config/default.nix
@@ -22,7 +22,10 @@ stdenv.mkDerivation {
pkgconfig
];
- patches = [ ./kde-gtk-config-2.2.1-install-paths.patch ];
+ patches = [
+ ./kde-gtk-config-2.2.1-install-paths.patch
+ ./kde-gtk-config-follow-symlinks.patch
+ ];
cmakeFlags = ''
-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include
diff --git a/pkgs/tools/misc/kde-gtk-config/kde-gtk-config-follow-symlinks.patch b/pkgs/tools/misc/kde-gtk-config/kde-gtk-config-follow-symlinks.patch
new file mode 100644
index 00000000000..e291589e82e
--- /dev/null
+++ b/pkgs/tools/misc/kde-gtk-config/kde-gtk-config-follow-symlinks.patch
@@ -0,0 +1,13 @@
+diff --git a/src/appearancegtk2.cpp b/src/appearancegtk2.cpp
+index 3d89c82..4dcce69 100644
+--- a/src/appearancegtk2.cpp
++++ b/src/appearancegtk2.cpp
+@@ -56,7 +56,7 @@ QString AppearanceGTK2::themesGtkrcFile(const QString& themeName) const
+ QStringList themes=installedThemes();
+ themes=themes.filter(QRegExp("/"+themeName+"/?$"));
+ if(themes.size()==1) {
+- QDirIterator it(themes.first(), QDirIterator::Subdirectories);
++ QDirIterator it(themes.first(), QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
+ while(it.hasNext()) {
+ it.next();
+ if(it.fileName()=="gtkrc") {
diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix
index c51219839b2..48e31246426 100644
--- a/pkgs/tools/misc/less/default.nix
+++ b/pkgs/tools/misc/less/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, ncurses }:
stdenv.mkDerivation rec {
- name = "less-462";
+ name = "less-468";
src = fetchurl {
- url = http://www.greenwoodsoftware.com/less/less-462.tar.gz;
- sha256 = "1kv5izyrkds8lkkzd46c9gxsnjgxbr7w4ficzma95dprcn92m97a";
+ url = "http://www.greenwoodsoftware.com/less/${name}.tar.gz";
+ sha256 = "1s36hppwcrvf2csw5xyjrbkyyfgshqp5vfg32ms480hdn76bbs28";
};
# Look for ‘sysless’ in /etc.
diff --git a/pkgs/tools/misc/mdbtools/git.nix b/pkgs/tools/misc/mdbtools/git.nix
index 2805514965e..b97af331093 100644
--- a/pkgs/tools/misc/mdbtools/git.nix
+++ b/pkgs/tools/misc/mdbtools/git.nix
@@ -3,12 +3,13 @@
scrollkeeper}:
stdenv.mkDerivation {
- name = "mdbtools-git";
+ name = "mdbtools-git-2014-07-25";
src = fetchgit {
url = "http://github.com/brianb/mdbtools.git";
- rev = "dfd752ec022097ee1e0999173aa604d8a0c0ca8b";
- sha256 = "0ibj36yxlhwjgi7cj170lwpbzdbgidkq5p8raa59v76bdrxwmb0n";
+ rev = "9ab40e83e6789015c965c92bdb62f92f8cdd0dbd";
+ sha256 = "18j1a9y9xhl7hhx30zvmx2n4w7dc8c7sdr6722sf3mh5230mvv59";
+ name = "mdbtools-git-export";
};
buildInputs = [glib readline bison flex pkgconfig libiconv autoconf automake
diff --git a/pkgs/tools/misc/memtest86/default.nix b/pkgs/tools/misc/memtest86/default.nix
index ebf0a89a707..6fccff7781d 100644
--- a/pkgs/tools/misc/memtest86/default.nix
+++ b/pkgs/tools/misc/memtest86/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation {
- name = "memtest86-4.3.3";
+ name = "memtest86-4.3.6";
src = fetchurl {
- url = http://www.memtest86.com/downloads/memtest86-4.3.3-src.tar.gz;
- sha256 = "1fzpk0s97lx8h1wbv2bgr6m8v4ag8i58kzr8fa25bvwyl8hks9sl";
+ url = http://www.memtest86.com/downloads/memtest86-4.3.6-src.tar.gz;
+ sha256 = "0qbksyl2hmkm12n7zbmf2m2n3q811skhykxx6a9a7y6r7k8y5qmv";
};
preBuild = ''
diff --git a/pkgs/tools/misc/mstflint/default.nix b/pkgs/tools/misc/mstflint/default.nix
new file mode 100644
index 00000000000..32953483daa
--- /dev/null
+++ b/pkgs/tools/misc/mstflint/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, zlib, libibmad }:
+
+stdenv.mkDerivation {
+ name = "mstflint-3.7.0-1.18";
+
+ src = fetchurl {
+ url = "https://www.openfabrics.org/downloads/mstflint/mstflint-3.7.0-1.18.gcdb9f80.tar.gz";
+ sha256 = "10x4l3i58ynnni18i8qq1gfbqd2028r4jd3frshiwrl9yrj7sxn2";
+ };
+
+ buildInputs = [ zlib libibmad ];
+
+ meta = with stdenv.lib; {
+ homepage = http://www.openfabrics.org/;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ wkennington ];
+ };
+}
diff --git a/pkgs/tools/misc/ngrok/default.nix b/pkgs/tools/misc/ngrok/default.nix
index 6435923b48a..b8bdfd5c896 100644
--- a/pkgs/tools/misc/ngrok/default.nix
+++ b/pkgs/tools/misc/ngrok/default.nix
@@ -1,101 +1,42 @@
-{ stdenv, fetchurl, go, fetchgit, fetchbzr, fetchhg }:
+{ stdenv, lib, go, go-bindata, fetchgit, fetchbzr, fetchhg, fetchFromGitHub }:
-let
- go-websocket = fetchgit {
- url = "git://github.com/garyburd/go-websocket";
- rev = "4bad98c955";
- sha256 = "1zh1r1xqar47awgv8a883zmxyvj65m0mbdm17d1xf74nkkrcykqy";
- };
- go-metrics = fetchgit {
- url = "https://github.com/inconshreveable/go-metrics";
- rev = "60ba4ca70c";
- sha256 = "3dc8c229ce5123d86269c0c48401a9cdd2cde7558d85374c9dbc4bbd531e86d5";
- };
- termbox-go = fetchgit {
- url = "https://github.com/nsf/termbox-go";
- rev = "cea198fce7";
- sha256 = "bde4190ae83d5c5870b8e11e16387cf03f2d44a8369f94674d4b9d0960c40693";
- };
- go-bindata = fetchgit {
- url = "https://github.com/inconshreveable/go-bindata";
- rev = "99016b3cc0";
- sha256 = "518a5b61cfbe58f8bc55bd6139adcd69997b6ba474536a70b538879aaf118578";
- };
- go-update = fetchgit {
- url = "https://github.com/inconshreveable/go-update";
- rev = "3f04666667";
- sha256 = "34647689a50b9d12e85a280d9034cc1772079163481c4778ee4b3e6c4b41e2f4";
- };
- goyaml = fetchbzr {
- url = "https://launchpad.net/goyaml";
- sha256 = "03is37cgw62cha316xrs5h7q97im46ry5qldkfvbhimjq3ww0swj";
- # Branch: "branch:lp:goyaml"
- rev = 47;
- };
- log4go = fetchhg {
- url = "https://code.google.com/p/log4go/";
- rev = "c3294304d93f";
- sha256 = "0q906sxrmwir295virfibqvdzlaj340qh2r4ysx1ccjrjazc0q5p";
- };
- osext = fetchhg {
- url = "https://bitbucket.org/kardianos/osext";
- rev = "364fb57";
- sha256 = "1w9x2zj716agfd5x5497ajb9nz3ljar74768vjidsyly143vzjws";
- };
+let deps = import ./deps.nix {
+ inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub;
+};
in stdenv.mkDerivation rec {
name = "ngrok-${version}";
- version = "1.6";
+ version = "1.7";
- src = fetchurl {
- url = "https://github.com/inconshreveable/ngrok/archive/${version}.tar.gz";
- sha256 = "0w54ck00ma8wd87gc3dligypdjs7vrzbi9py46sqphsid3rihkjr";
- };
+ buildInputs = [ go go-bindata ];
- buildInputs = [ go ];
+ unpackPhase = ''
+ export GOPATH=$(pwd)
+ cp -LR ${deps}/src src
+ chmod u+w -R src
+ sourceRoot=src/github.com/inconshreveable/ngrok
+ '';
preBuild = ''
- export HOME="$PWD"
-
- mkdir -p src/github.com/garyburd/go-websocket/
- ln -s ${go-websocket}/* src/github.com/garyburd/go-websocket
-
- mkdir -p src/github.com/inconshreveable/go-metrics/
- ln -s ${go-metrics}/* src/github.com/inconshreveable/go-metrics
-
- mkdir -p src/github.com/inconshreveable/go-bindata
- ln -s ${go-bindata}/* src/github.com/inconshreveable/go-bindata
-
- mkdir -p src/github.com/inconshreveable/go-update
- ln -s ${go-update}/* src/github.com/inconshreveable/go-update
-
- mkdir -p src/github.com/nsf/termbox-go/
- ln -s ${termbox-go}/* src/github.com/nsf/termbox-go
-
- mkdir -p src/launchpad.net/goyaml
- ln -s ${goyaml}/* src/launchpad.net/goyaml
-
- mkdir -p src/code.google.com/p/log4go
- ln -s ${log4go}/* src/code.google.com/p/log4go
-
- mkdir -p src/bitbucket.org/kardianos/osext
- ln -s ${osext}/* src/bitbucket.org/kardianos/osext
+ export HOME=$(pwd)
+ export GOPATH=$(pwd):$GOPATH
# don't download dependencies as we already have them
- sed -i '/go get/d' Makefile
+ sed -i '/jteeuwen\/go-bindata/d' Makefile
+ sed -i '/export GOPATH/d' Makefile
+ sed -i 's|bin/go-bindata|go-bindata|' Makefile
'';
installPhase = ''
- make release-client
+ make release-client release-server
mkdir -p $out/bin
- cp bin/ngrok $out/bin
- cp -R assets $out
+ cp bin/ngrok{d,} $out/bin
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Reverse proxy that creates a secure tunnel between from a public endpoint to a locally running web service";
homepage = https://ngrok.com/;
license = licenses.asl20;
- maintainers = with maintainers; [ iElectric ];
- platforms = stdenv.lib.platforms.linux;
+ maintainers = with maintainers; [ iElectric cstrahan ];
+ platforms = with platforms; linux ++ darwin;
};
}
diff --git a/pkgs/tools/misc/ngrok/deps.nix b/pkgs/tools/misc/ngrok/deps.nix
new file mode 100644
index 00000000000..cc1ed2f3d48
--- /dev/null
+++ b/pkgs/tools/misc/ngrok/deps.nix
@@ -0,0 +1,141 @@
+# This file was generated by go2nix.
+{ stdenv, lib, fetchFromGitHub, fetchgit, fetchhg, fetchbzr }:
+
+let
+ goDeps = [
+ {
+ root = "bitbucket.org/kardianos/osext";
+ src = fetchhg {
+ url = "https://bitbucket.org/kardianos/osext";
+ rev = "10";
+ sha256 = "1sj9r5pm28l9sqx6354fwp032n53znx9k8495k3dfnyqjrkvlw6n";
+ };
+ }
+ {
+ root = "code.google.com/p/log4go";
+ src = fetchhg {
+ url = "https://code.google.com/p/log4go";
+ rev = "48";
+ sha256 = "0q906sxrmwir295virfibqvdzlaj340qh2r4ysx1ccjrjazc0q5p";
+ };
+ }
+ {
+ root = "github.com/gorilla/websocket";
+ src = fetchFromGitHub {
+ owner = "gorilla";
+ repo = "websocket";
+ rev = "f4076986b69612ecb8bc7ce06d742eda6286200d";
+ sha256 = "09arvwlxw15maf4z8pcgjc25hd00mckqpdi0byafqfgm3nvvacvq";
+ };
+ }
+ {
+ root = "github.com/inconshreveable/go-update";
+ src = fetchFromGitHub {
+ owner = "inconshreveable";
+ repo = "go-update";
+ rev = "c1385108bc3a016f1c88b75ea7d2e2a356a1571d";
+ sha256 = "16zaxa0i07ismxdmkvjj4dpyc9lgp6wa94q090m9a48si40w9sjn";
+ };
+ }
+ {
+ root = "github.com/inconshreveable/go-vhost";
+ src = fetchFromGitHub {
+ owner = "inconshreveable";
+ repo = "go-vhost";
+ rev = "c4c28117502e4bf00960c8282b2d1c51c865fe2c";
+ sha256 = "1rway6sls6fl2s2jk20ajj36rrlzh9944ncc9pdd19kifix54z32";
+ };
+ }
+ {
+ root = "github.com/inconshreveable/mousetrap";
+ src = fetchFromGitHub {
+ owner = "inconshreveable";
+ repo = "mousetrap";
+ rev = "9dbb96d2c3a964935b0870b5abaea13c98b483aa";
+ sha256 = "1f9g8vm18qv1rcb745a4iahql9vfrz0jni9mnzriab2wy1pfdl5b";
+ };
+ }
+ {
+ root = "github.com/inconshreveable/ngrok";
+ src = fetchFromGitHub {
+ owner = "inconshreveable";
+ repo = "ngrok";
+ rev = "b7d5571aa7f12ac304b8f8286b855cc64dd9bab8";
+ sha256 = "0a5iq9l9f2xdg6gnc9pj0iczhycv1w5iwcqgzzap83xfpy01xkh4";
+ };
+ }
+ {
+ root = "github.com/influxdb/influxdb-go";
+ src = fetchFromGitHub {
+ owner = "influxdb";
+ repo = "influxdb-go";
+ rev = "63c9a5f67dcb633d05164bf8442160c9e2e402f7";
+ sha256 = "16in1xhx94pir06aw166inn0hzpb7836xbws16laabs1p2np7bld";
+ };
+ }
+ {
+ root = "github.com/kr/binarydist";
+ src = fetchFromGitHub {
+ owner = "kr";
+ repo = "binarydist";
+ rev = "9955b0ab8708602d411341e55fffd7e0700f86bd";
+ sha256 = "11wncbbbrdcxl5ff3h6w8vqfg4bxsf8709mh6vda0cv236flkyn3";
+ };
+ }
+ {
+ root = "github.com/nsf/termbox-go";
+ src = fetchFromGitHub {
+ owner = "nsf";
+ repo = "termbox-go";
+ rev = "9aecf65084a5754f12d27508fa2e6ed56851953b";
+ sha256 = "16sak07bgvmax4zxfrd4jia1dgygk733xa8vk8cdx28z98awbfsh";
+ };
+ }
+ {
+ root = "github.com/rcrowley/go-metrics";
+ src = fetchFromGitHub {
+ owner = "rcrowley";
+ repo = "go-metrics";
+ rev = "f770e6f5e91a8770cecee02d5d3f7c00b023b4df";
+ sha256 = "07dc74kiam8v5my7rhi3yxqrpnaapladhk8b3qbnrpjk3shvnx5f";
+ };
+ }
+ {
+ root = "github.com/stathat/go";
+ src = fetchFromGitHub {
+ owner = "stathat";
+ repo = "go";
+ rev = "01d012b9ee2ecc107cb28b6dd32d9019ed5c1d77";
+ sha256 = "0mrn70wjfcs4rfkmga3hbfqmbjk33skcsc8pyqxp02bzpwdpc4bi";
+ };
+ }
+ {
+ root = "gopkg.in/check.v1";
+ src = fetchgit {
+ url = "https://github.com/go-check/check.git";
+ rev = "871360013c92e1c715c2de6d06b54899468a8a2d";
+ sha256 = "0i83qjmd4ri9mrfddhsbpj9nb43rf2j9803k030fj155j31klwcx";
+ };
+ }
+ {
+ root = "gopkg.in/yaml.v1";
+ src = fetchgit {
+ url = "https://github.com/go-yaml/yaml.git";
+ rev = "b0c168ac0cf9493da1f9bb76c34b26ffef940b4a";
+ sha256 = "0jbdy41pplf2d1j24qwr8gc5qsig6ai5ch8rwgvg72kq9q0901cy";
+ };
+ }
+ ];
+
+in
+
+stdenv.mkDerivation rec {
+ name = "go-deps";
+
+ buildCommand =
+ lib.concatStrings
+ (map (dep: ''
+ mkdir -p $out/src/`dirname ${dep.root}`
+ ln -s ${dep.src} $out/src/${dep.root}
+ '') goDeps);
+}
diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index 4b0332c7506..60ca3adf29e 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -1,11 +1,11 @@
{ fetchurl, stdenv, perl }:
stdenv.mkDerivation rec {
- name = "parallel-20140222";
+ name = "parallel-20140922";
src = fetchurl {
url = "mirror://gnu/parallel/${name}.tar.bz2";
- sha256 = "0zb3hg92br6a53jn0pzfl16ffc1hfw81jk7nzw5spkshsdrcqx3y";
+ sha256 = "0hxx1h2ba6y2y1vy02r2hzndid2b469hj08f0vlmpjqw5g4f52a5";
};
patchPhase =
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
buildInputs = [ perl ];
doCheck = true;
- meta = {
+ meta = with stdenv.lib; {
description = "Shell tool for executing jobs in parallel";
longDescription =
@@ -43,9 +43,9 @@ stdenv.mkDerivation rec {
homepage = http://www.gnu.org/software/parallel/;
- license = stdenv.lib.licenses.gpl3Plus;
+ license = licenses.gpl3Plus;
- platforms = stdenv.lib.platforms.all;
- maintainers = [ ];
+ platforms = platforms.all;
+ maintainers = with maintainers; [ pSub ];
};
}
diff --git a/pkgs/tools/misc/pv/default.nix b/pkgs/tools/misc/pv/default.nix
index a8b6e046a9b..0af7143a320 100644
--- a/pkgs/tools/misc/pv/default.nix
+++ b/pkgs/tools/misc/pv/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl } :
stdenv.mkDerivation rec {
- name = "pv-1.5.3";
+ name = "pv-1.5.7";
src = fetchurl {
url = "http://www.ivarch.com/programs/sources/${name}.tar.bz2";
- sha256 = "03prg025kzivl1a5xqlf45szpnpqrmkzcvnf7lb2fc1v3jdrkwvn";
+ sha256 = "15srxzyssr8l25bl3rws476nx3fl58bdlh55gyv8cc3hpdhm0ly8";
};
meta = {
diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix
index fe0f3d646b8..95d3b5f183f 100644
--- a/pkgs/tools/misc/remind/default.nix
+++ b/pkgs/tools/misc/remind/default.nix
@@ -3,15 +3,15 @@
stdenv.mkDerivation {
name = "remind-3.1.8";
src = fetchurl {
- url = http://www.roaringpenguin.com/files/download/remind-03.01.08.tar.gz;
- sha256 = "0gvizrpkbanm515bhd6mq9xxs4g4ji9pplswaj4plaqsk3yw0qjw";
+ url = http://www.roaringpenguin.com/files/download/remind-03.01.13.tar.gz;
+ sha256 = "0kzw1d53nlj90qfsibbs2gkzp1hamqqxpj57ip4kz1j1xgan69ng";
};
meta = {
homepage = http://www.roaringpenguin.com/products/remind;
description = "Sophisticated calendar and alarm program for the console";
license = stdenv.lib.licenses.gpl2;
- maintainers = with stdenv.lib.maintainers; [viric];
+ maintainers = with stdenv.lib.maintainers; [viric raskin];
platforms = with stdenv.lib.platforms; linux;
};
}
diff --git a/pkgs/tools/misc/rlwrap/default.nix b/pkgs/tools/misc/rlwrap/default.nix
index 5c53d885e6f..ace42e41887 100644
--- a/pkgs/tools/misc/rlwrap/default.nix
+++ b/pkgs/tools/misc/rlwrap/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, readline }:
stdenv.mkDerivation rec {
- name = "rlwrap-0.37";
+ name = "rlwrap-0.41";
src = fetchurl {
url = "http://utopia.knoware.nl/~hlub/uck/rlwrap/${name}.tar.gz";
- sha256 = "1gcb95i839pwn9a3phs2wq7bwz9f6v8sydq6lf9y4gm3hk0s40w4";
+ sha256 = "02n22yy9wgz1cj59is17j0my17y7146ghkng381yxx4dnr3pcj9l";
};
buildInputs = [ readline ];
@@ -18,5 +18,8 @@ stdenv.mkDerivation rec {
meta = {
description = "Readline wrapper for console programs";
homepage = http://utopia.knoware.nl/~hlub/uck/rlwrap/;
+ license = stdenv.lib.licenses.gpl2Plus;
+ platform = stdenv.lib.platforms.unix;
+ maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
};
}
diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix
index aa14087dfc8..29d98284ccf 100644
--- a/pkgs/tools/misc/rrdtool/default.nix
+++ b/pkgs/tools/misc/rrdtool/default.nix
@@ -7,6 +7,11 @@ stdenv.mkDerivation {
sha256 = "07fgn0y4yj7p2vh6a37q273hf98gkfw2sdam5r1ldn1k0m1ayrqj";
};
buildInputs = [ gettext perl pkgconfig libxml2 pango cairo ];
+
+ postInstall = ''
+ # for munin support
+ mv $out/lib/perl/5*/*/*.pm $out/lib/perl/5*/
+ '';
meta = {
homepage = http://oss.oetiker.ch/rrdtool/;
diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix
new file mode 100644
index 00000000000..f8e7dfaddc9
--- /dev/null
+++ b/pkgs/tools/misc/s6-portable-utils/default.nix
@@ -0,0 +1,55 @@
+{ stdenv, fetchurl, skalibs }:
+
+let
+
+ version = "1.0.3.2";
+
+in stdenv.mkDerivation rec {
+
+ name = "s6-portable-utils-${version}";
+
+ src = fetchurl {
+ url = "http://www.skarnet.org/software/s6-portable-utils/${name}.tar.gz";
+ sha256 = "040nmls7qbgw8yn502lym4kgqh5zxr2ks734bqajpi2ricnasvhl";
+ };
+
+ buildInputs = [ skalibs ];
+
+ sourceRoot = "admin/${name}";
+
+ configurePhase = ''
+ pushd conf-compile
+
+ printf "$out/bin" > conf-install-command
+ printf "$out/libexec" > conf-install-libexec
+
+ # let nix builder strip things, cross-platform
+ truncate --size 0 conf-stripbins
+ truncate --size 0 conf-striplibs
+
+ printf "${skalibs}/sysdeps" > import
+ printf "%s" "${skalibs}/include" > path-include
+ printf "%s" "${skalibs}/lib" > path-library
+
+ rm -f flag-slashpackage
+ touch flag-allstatic
+
+ popd
+ '';
+
+ preBuild = ''
+ patchShebangs src/sys
+ '';
+
+ preInstall = ''
+ mkdir -p "$out/libexec"
+ '';
+
+ meta = {
+ homepage = http://www.skarnet.org/software/s6-portable-utils/;
+ description = "A set of tiny general Unix utilities optimized for simplicity and small size.";
+ platforms = stdenv.lib.platforms.all;
+ license = stdenv.lib.licenses.isc;
+ };
+
+}
diff --git a/pkgs/tools/misc/screenfetch/default.nix b/pkgs/tools/misc/screenfetch/default.nix
index 0ebc712fcf0..826f4e4d869 100644
--- a/pkgs/tools/misc/screenfetch/default.nix
+++ b/pkgs/tools/misc/screenfetch/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, xdpyinfo, xprop }:
let
- version = "2014-05-27";
+ version = "3.6.2";
in
stdenv.mkDerivation {
name = "screenFetch-${version}";
@@ -9,8 +9,8 @@ stdenv.mkDerivation {
src = fetchgit {
url = git://github.com/KittyKatt/screenFetch.git;
- rev = "69c46cb94b5765dbcb36905c5a35c42eb8e6e470";
- sha256 = "0479na831120bpyrg5nb3nb1jr8p8ahkixk1znwg730q3vdcjd6j";
+ rev = "dec1cd6c2471defe4459967fbc8ae15b55714338";
+ sha256 = "138a7g0za5dq27jx7x8gqg7gjkgyq0017v0nbcg68ys7dqlxsdl3";
};
installPhase = ''
diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix
new file mode 100644
index 00000000000..0f28b15ea97
--- /dev/null
+++ b/pkgs/tools/misc/snapper/default.nix
@@ -0,0 +1,52 @@
+{ stdenv, fetchgit, autoconf, automake, boost, pkgconfig, libtool, acl, libxml2, btrfsProgs, dbus_libs, docbook_xsl, libxslt, docbook_xml_dtd_45, diffutils, pam, utillinux, attr, gettext }:
+
+stdenv.mkDerivation rec {
+ name = "snapper-0.2.4";
+
+ src = fetchgit {
+ url = "https://github.com/openSUSE/snapper";
+ rev = "24e18153f7a32d0185dcfb20f8b8a4709ba8fe4a";
+ sha256 = "ec4b829430bd7181995e66a26ac86e8ac71c27e77faf8eb06db71d645c6f859b";
+ };
+
+ buildInputs = [ autoconf automake boost pkgconfig libtool acl libxml2 btrfsProgs dbus_libs docbook_xsl libxslt docbook_xml_dtd_45 diffutils pam utillinux attr gettext ];
+
+ patchPhase = ''
+ # work around missing btrfs/version.h; otherwise, use "-DHAVE_BTRFS_VERSION_H"
+ substituteInPlace snapper/Btrfs.cc --replace "define BTRFS_LIB_VERSION (100)" "define BTRFS_LIB_VERSION (200)";
+ # fix strange SuSE boost naming
+ substituteInPlace snapper/Makefile.am --replace \
+ "libsnapper_la_LIBADD = -lboost_thread-mt -lboost_system-mt -lxml2 -lacl -lz -lm" \
+ "libsnapper_la_LIBADD = -lboost_thread -lboost_system -lxml2 -lacl -lz -lm";
+ # general cleanup
+ sed -i 's/^INCLUDES/AM_CPPFLAGS/' $(grep -rl ^INCLUDES .|grep "\.am$")
+ '';
+
+ configurePhase = ''
+ aclocal
+ libtoolize --force --automake --copy
+ autoheader
+ automake --add-missing --copy
+ autoconf
+
+ ./configure --disable-silent-rules --disable-ext4 --disable-btrfs-quota --prefix=$out
+ '';
+
+ makeFlags = "DESTDIR=$(out)";
+
+ NIX_CFLAGS_COMPILE = [ "-I${libxml2}/include/libxml2" ];
+
+ # Probably a hack, but using DESTDIR and PREFIX makes everything work!
+ postInstall = ''
+ cp -r $out/$out/* $out
+ rm -r $out/nix
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Tool for Linux filesystem snapshot management";
+ homepage = http://snapper.io;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.tstrobel ];
+ };
+}
diff --git a/pkgs/tools/misc/sutils/default.nix b/pkgs/tools/misc/sutils/default.nix
index 6d2bee23813..53945113e7f 100644
--- a/pkgs/tools/misc/sutils/default.nix
+++ b/pkgs/tools/misc/sutils/default.nix
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
meta = {
description = "Small command-line utilities.";
- homepage = "https://github.com/baskerville/sutils";
- maintainers = stdenv.lib.maintainers.meisternu;
+ homepage = https://github.com/baskerville/sutils;
+ maintainers = [ stdenv.lib.maintainers.meisternu ];
license = "Custom";
platforms = stdenv.lib.platforms.linux;
};
diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix
index 32f681dabeb..82337477169 100644
--- a/pkgs/tools/misc/tmux/default.nix
+++ b/pkgs/tools/misc/tmux/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ncurses, libevent, pkgconfig}:
+{stdenv, fetchurl, ncurses, libevent, pkgconfig, makeWrapper}:
stdenv.mkDerivation rec {
pname = "tmux";
@@ -12,12 +12,13 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ ncurses libevent ];
+ buildInputs = [ ncurses libevent makeWrapper ];
postInstall =
''
mkdir -p $out/etc/bash_completion.d
cp -v examples/bash_completion_tmux.sh $out/etc/bash_completion.d/tmux
+ wrapProgram $out/bin/tmux --prefix TERMINFO : $out/share/terminfo
'';
meta = {
diff --git a/pkgs/tools/misc/tty-clock/default.nix b/pkgs/tools/misc/tty-clock/default.nix
new file mode 100644
index 00000000000..eb1a861db92
--- /dev/null
+++ b/pkgs/tools/misc/tty-clock/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, ncurses }:
+
+stdenv.mkDerivation rec {
+ name = "tty-clock-${version}";
+ version = "0.1";
+
+ src = fetchFromGitHub {
+ owner = "xorg62";
+ repo = "tty-clock";
+ rev = "v0.1";
+ sha256 = "14h70ky5y9nb3mzhlshdgq5n47hg3g6msnwbqd7nnmjzrw1nmarl";
+ };
+
+ buildInputs = [ ncurses ];
+
+ preInstall = ''
+ sed -i 's@/usr/local/@$(out)/@' Makefile
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/xorg62/tty-clock;
+ license = licenses.free;
+ description = "Digital clock in ncurses";
+ platforms = platforms.all;
+ maintainers = [ maintainers.koral ];
+ };
+}
diff --git a/pkgs/tools/misc/xdaliclock/default.nix b/pkgs/tools/misc/xdaliclock/default.nix
index 79c6a743bce..df1a7eedeff 100644
--- a/pkgs/tools/misc/xdaliclock/default.nix
+++ b/pkgs/tools/misc/xdaliclock/default.nix
@@ -12,17 +12,16 @@ let
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
baseName="xdaliclock";
- version="2.40";
+ version = "2.41";
name="${baseName}-${version}";
project="${baseName}";
url="http://www.jwz.org/${project}/${name}.tar.gz";
- hash="03i8vwi9vz3gr938wr4miiymwv283mg11wgfaf2jhl6aqbmz4id7";
};
in
rec {
src = a.fetchurl {
url = sourceInfo.url;
- sha256 = sourceInfo.hash;
+ sha256 = "1crkjvza692irkqm9vwgn58m8ps93n0rxigm6pasgl5dnx3p6d1d";
};
inherit (sourceInfo) name version;
@@ -46,10 +45,8 @@ rec {
platforms = with a.lib.platforms;
linux ++ freebsd;
license = "free"; #TODO BSD on Gentoo, looks like MIT
- };
- passthru = {
- updateInfo = {
- downloadPage = "http://www.jwz.org/xdaliclock/";
- };
+ downloadPage = "http://www.jwz.org/xdaliclock/";
+ inherit version;
+ updateWalker = true;
};
}) x
diff --git a/pkgs/tools/misc/xdo/default.nix b/pkgs/tools/misc/xdo/default.nix
index 9a059c9dbb5..e7a3d91967e 100644
--- a/pkgs/tools/misc/xdo/default.nix
+++ b/pkgs/tools/misc/xdo/default.nix
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
meta = {
description = "Small X utility to perform elementary actions on windows";
- homepage = "https://github.com/baskerville/xdo";
- maintainers = stdenv.lib.maintainers.meisternu;
+ homepage = https://github.com/baskerville/xdo;
+ maintainers = [ stdenv.lib.maintainers.meisternu ];
license = "Custom";
platforms = stdenv.lib.platforms.linux;
};
diff --git a/pkgs/tools/misc/xtitle/default.nix b/pkgs/tools/misc/xtitle/default.nix
index ca8be4c08ea..600f40a67b7 100644
--- a/pkgs/tools/misc/xtitle/default.nix
+++ b/pkgs/tools/misc/xtitle/default.nix
@@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
meta = {
description = "Outputs X window titles";
- homepage = "https://github.com/baskerville/xtitle";
- maintainers = stdenv.lib.maintainers.meisternu;
+ homepage = https://github.com/baskerville/xtitle;
+ maintainers = [ stdenv.lib.maintainers.meisternu ];
license = "Custom";
platforms = stdenv.lib.platforms.linux;
};
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index e237e0b25eb..bf23fbcf2cf 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, python, zip }:
let
- version = "2014.08.10";
+ version = "2014.09.19";
in
stdenv.mkDerivation rec {
name = "youtube-dl-${version}";
src = fetchurl {
url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz";
- sha256 = "1afa710vw0midpbv9pjw1b6h0x8kmdnj5dpipacnwsv3mbw1y4x1";
+ sha256 = "0xyn9rszvv0k0rqgwqzr69bk4n2crfxkwmmi8k26aw52yggba24k";
};
buildInputs = [ python ];
diff --git a/pkgs/tools/networking/airfield/default.nix b/pkgs/tools/networking/airfield/default.nix
new file mode 100644
index 00000000000..35dc507206d
--- /dev/null
+++ b/pkgs/tools/networking/airfield/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchgit, callPackage, python, utillinux }:
+
+with stdenv.lib;
+
+let
+ nodePackages = callPackage (import ../../../top-level/node-packages.nix) {
+ neededNatives = [python] ++ optional (stdenv.isLinux) utillinux;
+ self = nodePackages;
+ generated = ./package.nix;
+ };
+
+in nodePackages.buildNodePackage rec {
+ name = "airfield-${version}";
+ version = "5ae816562a";
+
+ src = [(fetchgit {
+ url = https://github.com/emblica/airfield.git;
+ rev = version;
+ sha256 = "0rv05pq0xdm0d977dc3hg6dam78acymzrdvkxs8ga8xj4vfs5npk";
+ })];
+
+ deps = (filter (v: nixType v == "derivation") (attrValues nodePackages));
+
+ preInstall = ''
+ substituteInPlace node_modules/Airfield/airfield.js \
+ --replace "'./settings'" "process.env.NODE_CONFIG"
+ '';
+
+ passthru.names = ["Airfield"];
+
+ meta = {
+ description = "Airfield is a web-interface for hipache-proxy";
+ license = licenses.mit;
+ homepage = https://github.com/emblica/airfield;
+ maintainers = with maintainers; [offline];
+ platforms = with platforms; linux;
+ };
+}
diff --git a/pkgs/tools/networking/airfield/package.nix b/pkgs/tools/networking/airfield/package.nix
new file mode 100644
index 00000000000..705061919e9
--- /dev/null
+++ b/pkgs/tools/networking/airfield/package.nix
@@ -0,0 +1,1495 @@
+{ self, fetchurl, fetchgit ? null, lib }:
+
+{
+ by-spec."asn1"."0.1.11" =
+ self.by-version."asn1"."0.1.11";
+ by-version."asn1"."0.1.11" = lib.makeOverridable self.buildNodePackage {
+ name = "asn1-0.1.11";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz";
+ name = "asn1-0.1.11.tgz";
+ sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."asn1" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "asn1" ];
+ };
+ by-spec."assert-plus"."0.1.2" =
+ self.by-version."assert-plus"."0.1.2";
+ by-version."assert-plus"."0.1.2" = lib.makeOverridable self.buildNodePackage {
+ name = "assert-plus-0.1.2";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz";
+ name = "assert-plus-0.1.2.tgz";
+ sha1 = "d93ffdbb67ac5507779be316a7d65146417beef8";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."assert-plus" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "assert-plus" ];
+ };
+ by-spec."async"."*" =
+ self.by-version."async"."0.9.0";
+ by-version."async"."0.9.0" = lib.makeOverridable self.buildNodePackage {
+ name = "async-0.9.0";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/async/-/async-0.9.0.tgz";
+ name = "async-0.9.0.tgz";
+ sha1 = "ac3613b1da9bed1b47510bb4651b8931e47146c7";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."async" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "async" ];
+ };
+ "async" = self.by-version."async"."0.9.0";
+ by-spec."async"."~0.9.0" =
+ self.by-version."async"."0.9.0";
+ by-spec."aws-sign2"."~0.5.0" =
+ self.by-version."aws-sign2"."0.5.0";
+ by-version."aws-sign2"."0.5.0" = lib.makeOverridable self.buildNodePackage {
+ name = "aws-sign2-0.5.0";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz";
+ name = "aws-sign2-0.5.0.tgz";
+ sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."aws-sign2" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "aws-sign2" ];
+ };
+ by-spec."base64-url"."1" =
+ self.by-version."base64-url"."1.0.0";
+ by-version."base64-url"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+ name = "base64-url-1.0.0";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/base64-url/-/base64-url-1.0.0.tgz";
+ name = "base64-url-1.0.0.tgz";
+ sha1 = "ab694376f2801af6c9260899ffef02f86b40ee2c";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."base64-url" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "base64-url" ];
+ };
+ by-spec."bl"."~0.9.0" =
+ self.by-version."bl"."0.9.3";
+ by-version."bl"."0.9.3" = lib.makeOverridable self.buildNodePackage {
+ name = "bl-0.9.3";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/bl/-/bl-0.9.3.tgz";
+ name = "bl-0.9.3.tgz";
+ sha1 = "c41eff3e7cb31bde107c8f10076d274eff7f7d44";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."bl" or []);
+ deps = {
+ "readable-stream-1.0.31" = self.by-version."readable-stream"."1.0.31";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "bl" ];
+ };
+ by-spec."boom"."0.4.x" =
+ self.by-version."boom"."0.4.2";
+ by-version."boom"."0.4.2" = lib.makeOverridable self.buildNodePackage {
+ name = "boom-0.4.2";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/boom/-/boom-0.4.2.tgz";
+ name = "boom-0.4.2.tgz";
+ sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."boom" or []);
+ deps = {
+ "hoek-0.9.1" = self.by-version."hoek"."0.9.1";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "boom" ];
+ };
+ by-spec."buffer-crc32"."0.1.1" =
+ self.by-version."buffer-crc32"."0.1.1";
+ by-version."buffer-crc32"."0.1.1" = lib.makeOverridable self.buildNodePackage {
+ name = "buffer-crc32-0.1.1";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.1.1.tgz";
+ name = "buffer-crc32-0.1.1.tgz";
+ sha1 = "7e110dc9953908ab7c32acdc70c9f945b1cbc526";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."buffer-crc32" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "buffer-crc32" ];
+ };
+ by-spec."bytes"."0.1.0" =
+ self.by-version."bytes"."0.1.0";
+ by-version."bytes"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+ name = "bytes-0.1.0";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/bytes/-/bytes-0.1.0.tgz";
+ name = "bytes-0.1.0.tgz";
+ sha1 = "c574812228126d6369d1576925a8579db3f8e5a2";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."bytes" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "bytes" ];
+ };
+ by-spec."caseless"."~0.6.0" =
+ self.by-version."caseless"."0.6.0";
+ by-version."caseless"."0.6.0" = lib.makeOverridable self.buildNodePackage {
+ name = "caseless-0.6.0";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/caseless/-/caseless-0.6.0.tgz";
+ name = "caseless-0.6.0.tgz";
+ sha1 = "8167c1ab8397fb5bb95f96d28e5a81c50f247ac4";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."caseless" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "caseless" ];
+ };
+ by-spec."combined-stream"."~0.0.4" =
+ self.by-version."combined-stream"."0.0.5";
+ by-version."combined-stream"."0.0.5" = lib.makeOverridable self.buildNodePackage {
+ name = "combined-stream-0.0.5";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.5.tgz";
+ name = "combined-stream-0.0.5.tgz";
+ sha1 = "29ed76e5c9aad07c4acf9ca3d32601cce28697a2";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."combined-stream" or []);
+ deps = {
+ "delayed-stream-0.0.5" = self.by-version."delayed-stream"."0.0.5";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "combined-stream" ];
+ };
+ by-spec."commander"."0.6.1" =
+ self.by-version."commander"."0.6.1";
+ by-version."commander"."0.6.1" = lib.makeOverridable self.buildNodePackage {
+ name = "commander-0.6.1";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/commander/-/commander-0.6.1.tgz";
+ name = "commander-0.6.1.tgz";
+ sha1 = "fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."commander" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "commander" ];
+ };
+ by-spec."connect"."2.7.1" =
+ self.by-version."connect"."2.7.1";
+ by-version."connect"."2.7.1" = lib.makeOverridable self.buildNodePackage {
+ name = "connect-2.7.1";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/connect/-/connect-2.7.1.tgz";
+ name = "connect-2.7.1.tgz";
+ sha1 = "b869df9acf3dd8a0af7523c7c6f1aa8b4b761daa";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."connect" or []);
+ deps = {
+ "qs-0.5.1" = self.by-version."qs"."0.5.1";
+ "formidable-1.0.11" = self.by-version."formidable"."1.0.11";
+ "cookie-signature-0.0.1" = self.by-version."cookie-signature"."0.0.1";
+ "crc-0.2.0" = self.by-version."crc"."0.2.0";
+ "cookie-0.0.5" = self.by-version."cookie"."0.0.5";
+ "bytes-0.1.0" = self.by-version."bytes"."0.1.0";
+ "send-0.1.0" = self.by-version."send"."0.1.0";
+ "fresh-0.1.0" = self.by-version."fresh"."0.1.0";
+ "pause-0.0.1" = self.by-version."pause"."0.0.1";
+ "debug-2.0.0" = self.by-version."debug"."2.0.0";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "connect" ];
+ };
+ by-spec."connect-redis"."*" =
+ self.by-version."connect-redis"."2.1.0";
+ by-version."connect-redis"."2.1.0" = lib.makeOverridable self.buildNodePackage {
+ name = "connect-redis-2.1.0";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/connect-redis/-/connect-redis-2.1.0.tgz";
+ name = "connect-redis-2.1.0.tgz";
+ sha1 = "bc20aab9791288c605f39f572f8cbb1fa8ab7cc4";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."connect-redis" or []);
+ deps = {
+ "debug-1.0.4" = self.by-version."debug"."1.0.4";
+ "express-session-1.8.2" = self.by-version."express-session"."1.8.2";
+ "redis-0.12.1" = self.by-version."redis"."0.12.1";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "connect-redis" ];
+ };
+ "connect-redis" = self.by-version."connect-redis"."2.1.0";
+ by-spec."consolidate"."*" =
+ self.by-version."consolidate"."0.10.0";
+ by-version."consolidate"."0.10.0" = lib.makeOverridable self.buildNodePackage {
+ name = "consolidate-0.10.0";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/consolidate/-/consolidate-0.10.0.tgz";
+ name = "consolidate-0.10.0.tgz";
+ sha1 = "81f1a6ceba1247df9cef7a261ce527c2ce538f7a";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."consolidate" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "consolidate" ];
+ };
+ "consolidate" = self.by-version."consolidate"."0.10.0";
+ by-spec."cookie"."0.0.5" =
+ self.by-version."cookie"."0.0.5";
+ by-version."cookie"."0.0.5" = lib.makeOverridable self.buildNodePackage {
+ name = "cookie-0.0.5";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/cookie/-/cookie-0.0.5.tgz";
+ name = "cookie-0.0.5.tgz";
+ sha1 = "f9acf9db57eb7568c9fcc596256b7bb22e307c81";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."cookie" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "cookie" ];
+ };
+ by-spec."cookie"."0.1.2" =
+ self.by-version."cookie"."0.1.2";
+ by-version."cookie"."0.1.2" = lib.makeOverridable self.buildNodePackage {
+ name = "cookie-0.1.2";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz";
+ name = "cookie-0.1.2.tgz";
+ sha1 = "72fec3d24e48a3432073d90c12642005061004b1";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."cookie" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "cookie" ];
+ };
+ by-spec."cookie-signature"."0.0.1" =
+ self.by-version."cookie-signature"."0.0.1";
+ by-version."cookie-signature"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+ name = "cookie-signature-0.0.1";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-0.0.1.tgz";
+ name = "cookie-signature-0.0.1.tgz";
+ sha1 = "13d3603b5cf63befbf85a8801e37aa900db46985";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."cookie-signature" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "cookie-signature" ];
+ };
+ by-spec."cookie-signature"."1.0.5" =
+ self.by-version."cookie-signature"."1.0.5";
+ by-version."cookie-signature"."1.0.5" = lib.makeOverridable self.buildNodePackage {
+ name = "cookie-signature-1.0.5";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.5.tgz";
+ name = "cookie-signature-1.0.5.tgz";
+ sha1 = "a122e3f1503eca0f5355795b0711bb2368d450f9";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."cookie-signature" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "cookie-signature" ];
+ };
+ by-spec."core-util-is"."~1.0.0" =
+ self.by-version."core-util-is"."1.0.1";
+ by-version."core-util-is"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+ name = "core-util-is-1.0.1";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz";
+ name = "core-util-is-1.0.1.tgz";
+ sha1 = "6b07085aef9a3ccac6ee53bf9d3df0c1521a5538";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."core-util-is" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "core-util-is" ];
+ };
+ by-spec."crc"."0.2.0" =
+ self.by-version."crc"."0.2.0";
+ by-version."crc"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+ name = "crc-0.2.0";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/crc/-/crc-0.2.0.tgz";
+ name = "crc-0.2.0.tgz";
+ sha1 = "f4486b9bf0a12df83c3fca14e31e030fdabd9454";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."crc" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "crc" ];
+ };
+ by-spec."crc"."3.0.0" =
+ self.by-version."crc"."3.0.0";
+ by-version."crc"."3.0.0" = lib.makeOverridable self.buildNodePackage {
+ name = "crc-3.0.0";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/crc/-/crc-3.0.0.tgz";
+ name = "crc-3.0.0.tgz";
+ sha1 = "d11e97ec44a844e5eb15a74fa2c7875d0aac4b22";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."crc" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "crc" ];
+ };
+ by-spec."cryptiles"."0.2.x" =
+ self.by-version."cryptiles"."0.2.2";
+ by-version."cryptiles"."0.2.2" = lib.makeOverridable self.buildNodePackage {
+ name = "cryptiles-0.2.2";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz";
+ name = "cryptiles-0.2.2.tgz";
+ sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."cryptiles" or []);
+ deps = {
+ "boom-0.4.2" = self.by-version."boom"."0.4.2";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "cryptiles" ];
+ };
+ by-spec."ctype"."0.5.2" =
+ self.by-version."ctype"."0.5.2";
+ by-version."ctype"."0.5.2" = lib.makeOverridable self.buildNodePackage {
+ name = "ctype-0.5.2";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz";
+ name = "ctype-0.5.2.tgz";
+ sha1 = "fe8091d468a373a0b0c9ff8bbfb3425c00973a1d";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."ctype" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "ctype" ];
+ };
+ by-spec."debug"."*" =
+ self.by-version."debug"."2.0.0";
+ by-version."debug"."2.0.0" = lib.makeOverridable self.buildNodePackage {
+ name = "debug-2.0.0";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/debug/-/debug-2.0.0.tgz";
+ name = "debug-2.0.0.tgz";
+ sha1 = "89bd9df6732b51256bc6705342bba02ed12131ef";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."debug" or []);
+ deps = {
+ "ms-0.6.2" = self.by-version."ms"."0.6.2";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "debug" ];
+ };
+ by-spec."debug"."^1.0.4" =
+ self.by-version."debug"."1.0.4";
+ by-version."debug"."1.0.4" = lib.makeOverridable self.buildNodePackage {
+ name = "debug-1.0.4";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/debug/-/debug-1.0.4.tgz";
+ name = "debug-1.0.4.tgz";
+ sha1 = "5b9c256bd54b6ec02283176fa8a0ede6d154cbf8";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."debug" or []);
+ deps = {
+ "ms-0.6.2" = self.by-version."ms"."0.6.2";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "debug" ];
+ };
+ by-spec."debug"."~2.0.0" =
+ self.by-version."debug"."2.0.0";
+ by-spec."delayed-stream"."0.0.5" =
+ self.by-version."delayed-stream"."0.0.5";
+ by-version."delayed-stream"."0.0.5" = lib.makeOverridable self.buildNodePackage {
+ name = "delayed-stream-0.0.5";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz";
+ name = "delayed-stream-0.0.5.tgz";
+ sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."delayed-stream" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "delayed-stream" ];
+ };
+ by-spec."depd"."0.4.5" =
+ self.by-version."depd"."0.4.5";
+ by-version."depd"."0.4.5" = lib.makeOverridable self.buildNodePackage {
+ name = "depd-0.4.5";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/depd/-/depd-0.4.5.tgz";
+ name = "depd-0.4.5.tgz";
+ sha1 = "1a664b53388b4a6573e8ae67b5f767c693ca97f1";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."depd" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "depd" ];
+ };
+ by-spec."express"."3.0.5" =
+ self.by-version."express"."3.0.5";
+ by-version."express"."3.0.5" = lib.makeOverridable self.buildNodePackage {
+ name = "express-3.0.5";
+ bin = true;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/express/-/express-3.0.5.tgz";
+ name = "express-3.0.5.tgz";
+ sha1 = "4c6e5850e6b5e8ca2af57f21ed7097de50948b73";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."express" or []);
+ deps = {
+ "connect-2.7.1" = self.by-version."connect"."2.7.1";
+ "commander-0.6.1" = self.by-version."commander"."0.6.1";
+ "range-parser-0.0.4" = self.by-version."range-parser"."0.0.4";
+ "mkdirp-0.3.3" = self.by-version."mkdirp"."0.3.3";
+ "cookie-0.0.5" = self.by-version."cookie"."0.0.5";
+ "buffer-crc32-0.1.1" = self.by-version."buffer-crc32"."0.1.1";
+ "fresh-0.1.0" = self.by-version."fresh"."0.1.0";
+ "methods-0.0.1" = self.by-version."methods"."0.0.1";
+ "send-0.1.0" = self.by-version."send"."0.1.0";
+ "cookie-signature-0.0.1" = self.by-version."cookie-signature"."0.0.1";
+ "debug-2.0.0" = self.by-version."debug"."2.0.0";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "express" ];
+ };
+ "express" = self.by-version."express"."3.0.5";
+ by-spec."express-session"."^1.7.6" =
+ self.by-version."express-session"."1.8.2";
+ by-version."express-session"."1.8.2" = lib.makeOverridable self.buildNodePackage {
+ name = "express-session-1.8.2";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/express-session/-/express-session-1.8.2.tgz";
+ name = "express-session-1.8.2.tgz";
+ sha1 = "c4011e728a2349b3c18f117a5409908985e83483";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."express-session" or []);
+ deps = {
+ "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
+ "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5";
+ "crc-3.0.0" = self.by-version."crc"."3.0.0";
+ "debug-2.0.0" = self.by-version."debug"."2.0.0";
+ "depd-0.4.5" = self.by-version."depd"."0.4.5";
+ "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0";
+ "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
+ "uid-safe-1.0.1" = self.by-version."uid-safe"."1.0.1";
+ "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "express-session" ];
+ };
+ by-spec."forever-agent"."~0.5.0" =
+ self.by-version."forever-agent"."0.5.2";
+ by-version."forever-agent"."0.5.2" = lib.makeOverridable self.buildNodePackage {
+ name = "forever-agent-0.5.2";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz";
+ name = "forever-agent-0.5.2.tgz";
+ sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."forever-agent" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "forever-agent" ];
+ };
+ by-spec."form-data"."~0.1.0" =
+ self.by-version."form-data"."0.1.4";
+ by-version."form-data"."0.1.4" = lib.makeOverridable self.buildNodePackage {
+ name = "form-data-0.1.4";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz";
+ name = "form-data-0.1.4.tgz";
+ sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."form-data" or []);
+ deps = {
+ "combined-stream-0.0.5" = self.by-version."combined-stream"."0.0.5";
+ "mime-1.2.11" = self.by-version."mime"."1.2.11";
+ "async-0.9.0" = self.by-version."async"."0.9.0";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "form-data" ];
+ };
+ by-spec."formidable"."1.0.11" =
+ self.by-version."formidable"."1.0.11";
+ by-version."formidable"."1.0.11" = lib.makeOverridable self.buildNodePackage {
+ name = "formidable-1.0.11";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/formidable/-/formidable-1.0.11.tgz";
+ name = "formidable-1.0.11.tgz";
+ sha1 = "68f63325a035e644b6f7bb3d11243b9761de1b30";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."formidable" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "formidable" ];
+ };
+ by-spec."fresh"."0.1.0" =
+ self.by-version."fresh"."0.1.0";
+ by-version."fresh"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+ name = "fresh-0.1.0";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/fresh/-/fresh-0.1.0.tgz";
+ name = "fresh-0.1.0.tgz";
+ sha1 = "03e4b0178424e4c2d5d19a54d8814cdc97934850";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."fresh" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "fresh" ];
+ };
+ by-spec."hawk"."1.1.1" =
+ self.by-version."hawk"."1.1.1";
+ by-version."hawk"."1.1.1" = lib.makeOverridable self.buildNodePackage {
+ name = "hawk-1.1.1";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz";
+ name = "hawk-1.1.1.tgz";
+ sha1 = "87cd491f9b46e4e2aeaca335416766885d2d1ed9";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."hawk" or []);
+ deps = {
+ "hoek-0.9.1" = self.by-version."hoek"."0.9.1";
+ "boom-0.4.2" = self.by-version."boom"."0.4.2";
+ "cryptiles-0.2.2" = self.by-version."cryptiles"."0.2.2";
+ "sntp-0.2.4" = self.by-version."sntp"."0.2.4";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "hawk" ];
+ };
+ by-spec."hoek"."0.9.x" =
+ self.by-version."hoek"."0.9.1";
+ by-version."hoek"."0.9.1" = lib.makeOverridable self.buildNodePackage {
+ name = "hoek-0.9.1";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz";
+ name = "hoek-0.9.1.tgz";
+ sha1 = "3d322462badf07716ea7eb85baf88079cddce505";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."hoek" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "hoek" ];
+ };
+ by-spec."http-signature"."~0.10.0" =
+ self.by-version."http-signature"."0.10.0";
+ by-version."http-signature"."0.10.0" = lib.makeOverridable self.buildNodePackage {
+ name = "http-signature-0.10.0";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/http-signature/-/http-signature-0.10.0.tgz";
+ name = "http-signature-0.10.0.tgz";
+ sha1 = "1494e4f5000a83c0f11bcc12d6007c530cb99582";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."http-signature" or []);
+ deps = {
+ "assert-plus-0.1.2" = self.by-version."assert-plus"."0.1.2";
+ "asn1-0.1.11" = self.by-version."asn1"."0.1.11";
+ "ctype-0.5.2" = self.by-version."ctype"."0.5.2";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "http-signature" ];
+ };
+ by-spec."inherits"."~2.0.1" =
+ self.by-version."inherits"."2.0.1";
+ by-version."inherits"."2.0.1" = lib.makeOverridable self.buildNodePackage {
+ name = "inherits-2.0.1";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz";
+ name = "inherits-2.0.1.tgz";
+ sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."inherits" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "inherits" ];
+ };
+ by-spec."isarray"."0.0.1" =
+ self.by-version."isarray"."0.0.1";
+ by-version."isarray"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+ name = "isarray-0.0.1";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz";
+ name = "isarray-0.0.1.tgz";
+ sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."isarray" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "isarray" ];
+ };
+ by-spec."json-stringify-safe"."~5.0.0" =
+ self.by-version."json-stringify-safe"."5.0.0";
+ by-version."json-stringify-safe"."5.0.0" = lib.makeOverridable self.buildNodePackage {
+ name = "json-stringify-safe-5.0.0";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz";
+ name = "json-stringify-safe-5.0.0.tgz";
+ sha1 = "4c1f228b5050837eba9d21f50c2e6e320624566e";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."json-stringify-safe" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "json-stringify-safe" ];
+ };
+ by-spec."methods"."0.0.1" =
+ self.by-version."methods"."0.0.1";
+ by-version."methods"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+ name = "methods-0.0.1";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/methods/-/methods-0.0.1.tgz";
+ name = "methods-0.0.1.tgz";
+ sha1 = "277c90f8bef39709645a8371c51c3b6c648e068c";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."methods" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "methods" ];
+ };
+ by-spec."mime"."1.2.6" =
+ self.by-version."mime"."1.2.6";
+ by-version."mime"."1.2.6" = lib.makeOverridable self.buildNodePackage {
+ name = "mime-1.2.6";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/mime/-/mime-1.2.6.tgz";
+ name = "mime-1.2.6.tgz";
+ sha1 = "b1f86c768c025fa87b48075f1709f28aeaf20365";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."mime" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "mime" ];
+ };
+ by-spec."mime"."~1.2.11" =
+ self.by-version."mime"."1.2.11";
+ by-version."mime"."1.2.11" = lib.makeOverridable self.buildNodePackage {
+ name = "mime-1.2.11";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz";
+ name = "mime-1.2.11.tgz";
+ sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."mime" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "mime" ];
+ };
+ by-spec."mime-types"."~1.0.1" =
+ self.by-version."mime-types"."1.0.2";
+ by-version."mime-types"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+ name = "mime-types-1.0.2";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz";
+ name = "mime-types-1.0.2.tgz";
+ sha1 = "995ae1392ab8affcbfcb2641dd054e943c0d5dce";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."mime-types" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "mime-types" ];
+ };
+ by-spec."mkdirp"."0.3.3" =
+ self.by-version."mkdirp"."0.3.3";
+ by-version."mkdirp"."0.3.3" = lib.makeOverridable self.buildNodePackage {
+ name = "mkdirp-0.3.3";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.3.tgz";
+ name = "mkdirp-0.3.3.tgz";
+ sha1 = "595e251c1370c3a68bab2136d0e348b8105adf13";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."mkdirp" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "mkdirp" ];
+ };
+ by-spec."ms"."0.6.2" =
+ self.by-version."ms"."0.6.2";
+ by-version."ms"."0.6.2" = lib.makeOverridable self.buildNodePackage {
+ name = "ms-0.6.2";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/ms/-/ms-0.6.2.tgz";
+ name = "ms-0.6.2.tgz";
+ sha1 = "d89c2124c6fdc1353d65a8b77bf1aac4b193708c";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."ms" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "ms" ];
+ };
+ by-spec."mz"."1" =
+ self.by-version."mz"."1.0.1";
+ by-version."mz"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+ name = "mz-1.0.1";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/mz/-/mz-1.0.1.tgz";
+ name = "mz-1.0.1.tgz";
+ sha1 = "5ce1d3fe5cb3267c9c3141fb6a070f8d17f215d8";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."mz" or []);
+ deps = {
+ "native-or-bluebird-1.1.1" = self.by-version."native-or-bluebird"."1.1.1";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "mz" ];
+ };
+ by-spec."native-or-bluebird"."1" =
+ self.by-version."native-or-bluebird"."1.1.1";
+ by-version."native-or-bluebird"."1.1.1" = lib.makeOverridable self.buildNodePackage {
+ name = "native-or-bluebird-1.1.1";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/native-or-bluebird/-/native-or-bluebird-1.1.1.tgz";
+ name = "native-or-bluebird-1.1.1.tgz";
+ sha1 = "9131a6d6532afdfb5635f9703734cc6652c905ee";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."native-or-bluebird" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "native-or-bluebird" ];
+ };
+ by-spec."node-uuid"."~1.4.0" =
+ self.by-version."node-uuid"."1.4.1";
+ by-version."node-uuid"."1.4.1" = lib.makeOverridable self.buildNodePackage {
+ name = "node-uuid-1.4.1";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz";
+ name = "node-uuid-1.4.1.tgz";
+ sha1 = "39aef510e5889a3dca9c895b506c73aae1bac048";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."node-uuid" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "node-uuid" ];
+ };
+ by-spec."oauth-sign"."~0.4.0" =
+ self.by-version."oauth-sign"."0.4.0";
+ by-version."oauth-sign"."0.4.0" = lib.makeOverridable self.buildNodePackage {
+ name = "oauth-sign-0.4.0";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.4.0.tgz";
+ name = "oauth-sign-0.4.0.tgz";
+ sha1 = "f22956f31ea7151a821e5f2fb32c113cad8b9f69";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."oauth-sign" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "oauth-sign" ];
+ };
+ by-spec."on-headers"."~1.0.0" =
+ self.by-version."on-headers"."1.0.0";
+ by-version."on-headers"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+ name = "on-headers-1.0.0";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/on-headers/-/on-headers-1.0.0.tgz";
+ name = "on-headers-1.0.0.tgz";
+ sha1 = "2c75b5da4375513d0161c6052e7fcbe4953fca5d";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."on-headers" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "on-headers" ];
+ };
+ by-spec."parseurl"."~1.3.0" =
+ self.by-version."parseurl"."1.3.0";
+ by-version."parseurl"."1.3.0" = lib.makeOverridable self.buildNodePackage {
+ name = "parseurl-1.3.0";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz";
+ name = "parseurl-1.3.0.tgz";
+ sha1 = "b58046db4223e145afa76009e61bac87cc2281b3";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."parseurl" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "parseurl" ];
+ };
+ by-spec."pause"."0.0.1" =
+ self.by-version."pause"."0.0.1";
+ by-version."pause"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+ name = "pause-0.0.1";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/pause/-/pause-0.0.1.tgz";
+ name = "pause-0.0.1.tgz";
+ sha1 = "1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."pause" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "pause" ];
+ };
+ by-spec."punycode".">=0.2.0" =
+ self.by-version."punycode"."1.3.1";
+ by-version."punycode"."1.3.1" = lib.makeOverridable self.buildNodePackage {
+ name = "punycode-1.3.1";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/punycode/-/punycode-1.3.1.tgz";
+ name = "punycode-1.3.1.tgz";
+ sha1 = "710afe5123c20a1530b712e3e682b9118fe8058e";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."punycode" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "punycode" ];
+ };
+ by-spec."qs"."0.5.1" =
+ self.by-version."qs"."0.5.1";
+ by-version."qs"."0.5.1" = lib.makeOverridable self.buildNodePackage {
+ name = "qs-0.5.1";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/qs/-/qs-0.5.1.tgz";
+ name = "qs-0.5.1.tgz";
+ sha1 = "9f6bf5d9ac6c76384e95d36d15b48980e5e4add0";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."qs" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "qs" ];
+ };
+ by-spec."qs"."~1.2.0" =
+ self.by-version."qs"."1.2.2";
+ by-version."qs"."1.2.2" = lib.makeOverridable self.buildNodePackage {
+ name = "qs-1.2.2";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/qs/-/qs-1.2.2.tgz";
+ name = "qs-1.2.2.tgz";
+ sha1 = "19b57ff24dc2a99ce1f8bdf6afcda59f8ef61f88";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."qs" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "qs" ];
+ };
+ by-spec."range-parser"."0.0.4" =
+ self.by-version."range-parser"."0.0.4";
+ by-version."range-parser"."0.0.4" = lib.makeOverridable self.buildNodePackage {
+ name = "range-parser-0.0.4";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/range-parser/-/range-parser-0.0.4.tgz";
+ name = "range-parser-0.0.4.tgz";
+ sha1 = "c0427ffef51c10acba0782a46c9602e744ff620b";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."range-parser" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "range-parser" ];
+ };
+ by-spec."readable-stream"."~1.0.26" =
+ self.by-version."readable-stream"."1.0.31";
+ by-version."readable-stream"."1.0.31" = lib.makeOverridable self.buildNodePackage {
+ name = "readable-stream-1.0.31";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.31.tgz";
+ name = "readable-stream-1.0.31.tgz";
+ sha1 = "8f2502e0bc9e3b0da1b94520aabb4e2603ecafae";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."readable-stream" or []);
+ deps = {
+ "core-util-is-1.0.1" = self.by-version."core-util-is"."1.0.1";
+ "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
+ "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31";
+ "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "readable-stream" ];
+ };
+ by-spec."redis"."*" =
+ self.by-version."redis"."0.12.1";
+ by-version."redis"."0.12.1" = lib.makeOverridable self.buildNodePackage {
+ name = "redis-0.12.1";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/redis/-/redis-0.12.1.tgz";
+ name = "redis-0.12.1.tgz";
+ sha1 = "64df76ad0fc8acebaebd2a0645e8a48fac49185e";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."redis" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "redis" ];
+ };
+ "redis" = self.by-version."redis"."0.12.1";
+ by-spec."redis"."^0.12.1" =
+ self.by-version."redis"."0.12.1";
+ by-spec."request"."*" =
+ self.by-version."request"."2.44.0";
+ by-version."request"."2.44.0" = lib.makeOverridable self.buildNodePackage {
+ name = "request-2.44.0";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/request/-/request-2.44.0.tgz";
+ name = "request-2.44.0.tgz";
+ sha1 = "78d62454d68853cadfb07ad31f58b9ec98072ea8";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."request" or []);
+ deps = {
+ "bl-0.9.3" = self.by-version."bl"."0.9.3";
+ "caseless-0.6.0" = self.by-version."caseless"."0.6.0";
+ "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
+ "qs-1.2.2" = self.by-version."qs"."1.2.2";
+ "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0";
+ "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2";
+ "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1";
+ "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0";
+ "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1";
+ "form-data-0.1.4" = self.by-version."form-data"."0.1.4";
+ "http-signature-0.10.0" = self.by-version."http-signature"."0.10.0";
+ "oauth-sign-0.4.0" = self.by-version."oauth-sign"."0.4.0";
+ "hawk-1.1.1" = self.by-version."hawk"."1.1.1";
+ "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
+ "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "request" ];
+ };
+ "request" = self.by-version."request"."2.44.0";
+ by-spec."send"."0.1.0" =
+ self.by-version."send"."0.1.0";
+ by-version."send"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+ name = "send-0.1.0";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/send/-/send-0.1.0.tgz";
+ name = "send-0.1.0.tgz";
+ sha1 = "cfb08ebd3cec9b7fc1a37d9ff9e875a971cf4640";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."send" or []);
+ deps = {
+ "debug-2.0.0" = self.by-version."debug"."2.0.0";
+ "mime-1.2.6" = self.by-version."mime"."1.2.6";
+ "fresh-0.1.0" = self.by-version."fresh"."0.1.0";
+ "range-parser-0.0.4" = self.by-version."range-parser"."0.0.4";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "send" ];
+ };
+ by-spec."sntp"."0.2.x" =
+ self.by-version."sntp"."0.2.4";
+ by-version."sntp"."0.2.4" = lib.makeOverridable self.buildNodePackage {
+ name = "sntp-0.2.4";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz";
+ name = "sntp-0.2.4.tgz";
+ sha1 = "fb885f18b0f3aad189f824862536bceeec750900";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."sntp" or []);
+ deps = {
+ "hoek-0.9.1" = self.by-version."hoek"."0.9.1";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "sntp" ];
+ };
+ by-spec."string_decoder"."~0.10.x" =
+ self.by-version."string_decoder"."0.10.31";
+ by-version."string_decoder"."0.10.31" = lib.makeOverridable self.buildNodePackage {
+ name = "string_decoder-0.10.31";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz";
+ name = "string_decoder-0.10.31.tgz";
+ sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."string_decoder" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "string_decoder" ];
+ };
+ by-spec."stringstream"."~0.0.4" =
+ self.by-version."stringstream"."0.0.4";
+ by-version."stringstream"."0.0.4" = lib.makeOverridable self.buildNodePackage {
+ name = "stringstream-0.0.4";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz";
+ name = "stringstream-0.0.4.tgz";
+ sha1 = "0f0e3423f942960b5692ac324a57dd093bc41a92";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."stringstream" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "stringstream" ];
+ };
+ by-spec."swig"."0.14.0" =
+ self.by-version."swig"."0.14.0";
+ by-version."swig"."0.14.0" = lib.makeOverridable self.buildNodePackage {
+ name = "swig-0.14.0";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/swig/-/swig-0.14.0.tgz";
+ name = "swig-0.14.0.tgz";
+ sha1 = "544bfb3bd837608873eed6a72c672a28cb1f1b3f";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."swig" or []);
+ deps = {
+ "underscore-1.7.0" = self.by-version."underscore"."1.7.0";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "swig" ];
+ };
+ "swig" = self.by-version."swig"."0.14.0";
+ by-spec."tough-cookie".">=0.12.0" =
+ self.by-version."tough-cookie"."0.12.1";
+ by-version."tough-cookie"."0.12.1" = lib.makeOverridable self.buildNodePackage {
+ name = "tough-cookie-0.12.1";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz";
+ name = "tough-cookie-0.12.1.tgz";
+ sha1 = "8220c7e21abd5b13d96804254bd5a81ebf2c7d62";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."tough-cookie" or []);
+ deps = {
+ "punycode-1.3.1" = self.by-version."punycode"."1.3.1";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "tough-cookie" ];
+ };
+ by-spec."tunnel-agent"."~0.4.0" =
+ self.by-version."tunnel-agent"."0.4.0";
+ by-version."tunnel-agent"."0.4.0" = lib.makeOverridable self.buildNodePackage {
+ name = "tunnel-agent-0.4.0";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz";
+ name = "tunnel-agent-0.4.0.tgz";
+ sha1 = "b1184e312ffbcf70b3b4c78e8c219de7ebb1c550";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."tunnel-agent" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "tunnel-agent" ];
+ };
+ by-spec."uid-safe"."1.0.1" =
+ self.by-version."uid-safe"."1.0.1";
+ by-version."uid-safe"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+ name = "uid-safe-1.0.1";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/uid-safe/-/uid-safe-1.0.1.tgz";
+ name = "uid-safe-1.0.1.tgz";
+ sha1 = "5bd148460a2e84f54f193fd20352c8c3d7de6ac8";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."uid-safe" or []);
+ deps = {
+ "mz-1.0.1" = self.by-version."mz"."1.0.1";
+ "base64-url-1.0.0" = self.by-version."base64-url"."1.0.0";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "uid-safe" ];
+ };
+ by-spec."underscore".">=1.1.7" =
+ self.by-version."underscore"."1.7.0";
+ by-version."underscore"."1.7.0" = lib.makeOverridable self.buildNodePackage {
+ name = "underscore-1.7.0";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz";
+ name = "underscore-1.7.0.tgz";
+ sha1 = "6bbaf0877500d36be34ecaa584e0db9fef035209";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."underscore" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "underscore" ];
+ };
+ by-spec."utils-merge"."1.0.0" =
+ self.by-version."utils-merge"."1.0.0";
+ by-version."utils-merge"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+ name = "utils-merge-1.0.0";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz";
+ name = "utils-merge-1.0.0.tgz";
+ sha1 = "0294fb922bb9375153541c4f7096231f287c8af8";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."utils-merge" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "utils-merge" ];
+ };
+}
diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix
index 72f3b5ec843..d2c93884141 100644
--- a/pkgs/tools/networking/aria2/default.nix
+++ b/pkgs/tools/networking/aria2/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, openssl, libxml2, sqlite, zlib }:
stdenv.mkDerivation rec {
- name = "aria2-1.18.5";
+ name = "aria2-1.18.8";
src = fetchurl {
url = "mirror://sourceforge/aria2/stable/${name}/${name}.tar.bz2";
- sha256 = "0gyfp4zw7rlaxcxhb402azazf1fi83kk3qg4w0j8d2i7pfa1zqi5";
+ sha256 = "1lpcdpkc22prkzhqrhrd6ccra6vpf2w8mla0z3jv26dqafaxif6b";
};
buildInputs = [ pkgconfig openssl libxml2 sqlite zlib ];
diff --git a/pkgs/tools/networking/atftp/default.nix b/pkgs/tools/networking/atftp/default.nix
index acd71ea893d..8524a964f15 100644
--- a/pkgs/tools/networking/atftp/default.nix
+++ b/pkgs/tools/networking/atftp/default.nix
@@ -1,27 +1,34 @@
-{ stdenv, fetchurl, pcre, readline }:
-
+{ lib, stdenv, fetchurl, readline, tcp_wrappers, pcre, makeWrapper }:
+assert stdenv.isLinux;
+assert stdenv.gcc.gcc != null;
+let
+version = "0.7";
+debianPatch = fetchurl {
+ url = "mirror://debian/pool/main/a/atftp/atftp_${version}.dfsg-11.diff.gz";
+ sha256 = "07g4qbmp0lnscg2dkj6nsj657jaghibvfysdm1cdxcn215n3zwqd";
+};
+in
stdenv.mkDerivation {
- name = "atftp-0.7.1";
-
+ name = "atftp";
+ inherit version;
src = fetchurl {
- url = "mirror://sourceforge/atftp/atftp-0.7.1.tar.gz";
- sha256 = "0bgr31gbnr3qx4ixf8hz47l58sh3367xhcnfqd8233fvr84nyk5f";
+ url = "mirror://debian/pool/main/a/atftp/atftp_${version}.dfsg.orig.tar.gz";
+ sha256 = "0nd5dl14d6z5abgcbxcn41rfn3syza6s57bbgh4aq3r9cxdmz08q";
};
-
- buildInputs = [ pcre readline ];
-
- NIX_LDFLAGS = "-lgcc_s"; # for pthread_cancel
-
- configureFlags = [
- "--enable-libreadline"
- "--enable-libpcre"
- "--enable-mtftp"
- ];
-
- meta = with stdenv.lib; {
- description = "Advanced TFTP server and client";
- homepage = http://sourceforge.net/projects/atftp/;
- license = licenses.gpl2Plus;
- platforms = platforms.linux;
+ buildInputs = [ readline tcp_wrappers pcre makeWrapper ];
+ patches = [ debianPatch ];
+ postInstall = ''
+ wrapProgram $out/sbin/atftpd --prefix LD_LIBRARY_PATH : ${stdenv.gcc.gcc}/lib${if stdenv.system == "x86_64-linux" then "64" else ""}
+ '';
+ meta = {
+ description = "Advanced tftp tools";
+ maintainers = [ lib.maintainers.raskin ];
+ platforms = lib.platforms.linux;
+ license = lib.licenses.gpl2Plus;
+ passthru = {
+ updateInfo = {
+ downloadPage = "http://packages.debian.org/source/wheezy/atftp";
+ };
};
+};
}
diff --git a/pkgs/tools/networking/babeld/default.nix b/pkgs/tools/networking/babeld/default.nix
index cfd72098261..c10da6f145d 100644
--- a/pkgs/tools/networking/babeld/default.nix
+++ b/pkgs/tools/networking/babeld/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "babeld-1.5.0";
+ name = "babeld-1.5.1";
src = fetchurl {
url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/${name}.tar.gz";
- sha256 = "0lpm1zras74b71y01fxndrcvfjzb1ny2hh62pjw6idaqpyrp797s";
+ sha256 = "1ch9nn2jmmpyq6c7106lzd3cfnxq4ychjx0pvwn960kssn2cgakk";
};
preBuild = ''
@@ -16,5 +16,6 @@ stdenv.mkDerivation rec {
homepage = "http://www.pps.univ-paris-diderot.fr/~jch/software/babel/";
description = "Loop-avoiding distance-vector routing protocol";
license = stdenv.lib.licenses.mit;
+ maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
};
}
diff --git a/pkgs/tools/networking/bud/default.nix b/pkgs/tools/networking/bud/default.nix
index 34e1a3964f6..500d78b4aec 100644
--- a/pkgs/tools/networking/bud/default.nix
+++ b/pkgs/tools/networking/bud/default.nix
@@ -3,12 +3,12 @@
stdenv.mkDerivation rec {
name = "bud-${version}";
- version = "0.25.0";
+ version = "0.32.0";
src = fetchgit {
url = "https://github.com/indutny/bud.git";
- rev = "f65b9c3531dac1a5b3c962e01f3bed1d41ab5621";
- sha256 = "000wwc88hsf6ccz8wxjn2af6l0nxm6a2fcad71xw35ymmdp9n5xg";
+ rev = "1bfcc8c73c386f0ac12763949cd6c214058900a6";
+ sha256 = "1lfq6q026yawi0ps0gf0nl9a76qkpcc40r3v7zrj9cxzjb9fcymc";
};
buildInputs = [
diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix
index 1e2b39869c5..e11fb377c21 100644
--- a/pkgs/tools/networking/chrony/default.nix
+++ b/pkgs/tools/networking/chrony/default.nix
@@ -5,11 +5,11 @@ assert stdenv.isLinux -> libcap != null;
stdenv.mkDerivation rec {
name = "chrony-${version}";
- version = "1.30";
+ version = "1.31";
src = fetchurl {
url = "http://download.tuxfamily.org/chrony/${name}.tar.gz";
- sha256 = "1pa6629nigcv95x2q9dnmzlrwhicxizq9z7ggy2c9cmyl1bakb23";
+ sha256 = "0vcr4hr1a01l5c3z0rgzna8rbmq35aklgfr342pi9gpc8sp1qpm3";
};
buildInputs = [ readline texinfo ] ++ stdenv.lib.optional stdenv.isLinux libcap;
diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix
index 48e21f4507e..c56faac690c 100644
--- a/pkgs/tools/networking/cjdns/default.nix
+++ b/pkgs/tools/networking/cjdns/default.nix
@@ -1,21 +1,24 @@
{ stdenv, fetchgit, nodejs, which, python27 }:
let
- date = "20140303";
- rev = "f11ce1fd4795b0173ac0ef18c8a6f752aa824adb";
+ date = "20140922";
+ rev = "5ebca772b0582173127e8c1e61ee235c5ab3fb50";
in
stdenv.mkDerivation {
name = "cjdns-${date}-${stdenv.lib.strings.substring 0 7 rev}";
src = fetchgit {
- url = "git://github.com/cjdelisle/cjdns.git";
+ url = "https://github.com/cjdelisle/cjdns.git";
inherit rev;
- sha256 = "1bxhf9f1v0slf9mz3ll6jf45mkwvwxlf3yqxx9k23kjyr1nsc8s8";
+ sha256 = "04abf73f4aede12c35b70ae09a367b3d6352a63f818185f788ed13356d06197a";
};
buildInputs = [ which python27 nodejs];
- builder = ./builder.sh;
+ patches = [ ./makekey.patch ];
+
+ buildPhase = "bash do";
+ installPhase = "installBin cjdroute makekey";
meta = {
homepage = https://github.com/cjdelisle/cjdns;
diff --git a/pkgs/tools/networking/cjdns/makekey.patch b/pkgs/tools/networking/cjdns/makekey.patch
new file mode 100644
index 00000000000..fcce5e3e728
--- /dev/null
+++ b/pkgs/tools/networking/cjdns/makekey.patch
@@ -0,0 +1,64 @@
+diff --git a/contrib/c/makekey.c b/contrib/c/makekey.c
+new file mode 100644
+index 0000000..c7184e5
+--- /dev/null
++++ b/contrib/c/makekey.c
+@@ -0,0 +1,46 @@
++/* vim: set expandtab ts=4 sw=4: */
++/*
++ * You may redistribute this program and/or modify it under the terms of
++ * the GNU General Public License as published by the Free Software Foundation,
++ * either version 3 of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program. If not, see .
++ */
++#include "crypto/random/Random.h"
++#include "memory/MallocAllocator.h"
++#include "crypto/AddressCalc.h"
++#include "util/AddrTools.h"
++#include "util/Hex.h"
++
++#include "crypto_scalarmult_curve25519.h"
++
++#include
++
++int main(int argc, char** argv)
++{
++ struct Allocator* alloc = MallocAllocator_new(1<<22);
++ struct Random* rand = Random_new(alloc, NULL, NULL);
++
++ uint8_t privateKey[32];
++ uint8_t publicKey[32];
++ uint8_t ip[16];
++ uint8_t hexPrivateKey[65];
++
++ for (;;) {
++ Random_bytes(rand, privateKey, 32);
++ crypto_scalarmult_curve25519_base(publicKey, privateKey);
++ if (AddressCalc_addressForPublicKey(ip, publicKey)) {
++ Hex_encode(hexPrivateKey, 65, privateKey, 32);
++ printf(hexPrivateKey);
++ return 0;
++ }
++ }
++ return 0;
++}
++
+diff --git a/node_build/make.js b/node_build/make.js
+index 5e51645..11465e3 100644
+--- a/node_build/make.js
++++ b/node_build/make.js
+@@ -339,6 +339,7 @@ Builder.configure({
+ builder.buildExecutable('contrib/c/privatetopublic.c');
+ builder.buildExecutable('contrib/c/sybilsim.c');
+ builder.buildExecutable('contrib/c/makekeys.c');
++ builder.buildExecutable('contrib/c/makekey.c');
+
+ builder.buildExecutable('crypto/random/randombytes.c');
+
diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/tools/networking/cmst/default.nix
new file mode 100644
index 00000000000..52a1baa05a6
--- /dev/null
+++ b/pkgs/tools/networking/cmst/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchgit, qt5, makeWrapper, libX11 }:
+
+stdenv.mkDerivation rec {
+ name = "cmst-2014.08.23";
+ rev = "refs/tags/${name}";
+ src = fetchgit {
+ url = "git://github.com/andrew-bibb/cmst.git";
+ inherit rev;
+ sha256 = "07g5i929jxlh6vm0ad8x33qmf2sryiichlv37x7fpn20h3xcsia0";
+ };
+
+ buildInputs = [ qt5 makeWrapper ];
+
+ configurePhase = ''
+ substituteInPlace ./cmst.pro \
+ --replace "/usr/bin" "$out/bin" \
+ --replace "/usr/share" "$out/usr/share"
+ '';
+
+ buildPhase = ''
+ qmake PREFIX=$out
+ make
+ '';
+
+ postInstall = ''
+ wrapProgram $out/bin/cmst \
+ --prefix "QTCOMPOSE" ":" "${libX11}/share/X11/locale"
+ '';
+
+ meta = {
+ description = "QT GUI for Connman with system tray icon";
+ homepage = "https://github.com/andrew-bibb/cmst";
+ maintainers = [ stdenv.lib.maintainers.matejc ];
+ platforms = stdenv.lib.platforms.linux;
+ license = stdenv.lib.licenses.mit;
+ };
+}
diff --git a/pkgs/tools/networking/curl-unix-socket/default.nix b/pkgs/tools/networking/curl-unix-socket/default.nix
new file mode 100644
index 00000000000..88d75ba570e
--- /dev/null
+++ b/pkgs/tools/networking/curl-unix-socket/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, go }:
+
+stdenv.mkDerivation {
+ name = "curl-unix-socket";
+
+ src = fetchFromGitHub {
+ owner = "Soulou";
+ repo = "curl-unix-socket";
+ rev = "e926dca77ba7d4a1eeae073918fdd3db92f1a350";
+ sha256 = "1ynrrav90y3dhk8jq2fxm3jswj5nvrffwslgykj429hk6n0czb3d";
+ };
+
+ buildInputs = [ go ];
+ buildPhase = "go build";
+ installPhase = "install -D curl-unix-socket* $out/bin/curl-unix-socket";
+
+ meta = with stdenv.lib; {
+ description = "Run HTTP requests over UNIX socket";
+ license = licenses.mit;
+ homepage = https://github.com/Soulou/curl-unix-socket;
+ maintainers = with maintainers; [offline];
+ platforms = with platforms; unix;
+ };
+}
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index 3d23d7950fb..e12db01ae72 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -13,11 +13,11 @@ assert scpSupport -> libssh2 != null;
assert c-aresSupport -> c-ares != null;
stdenv.mkDerivation rec {
- name = "curl-7.36.0";
+ name = "curl-7.38.0";
src = fetchurl {
url = "http://curl.haxx.se/download/${name}.tar.bz2";
- sha256 = "1kfgygvmxgaakxl2f3h3jlar23n6xmvg03ybm36pqsydkfw85ghz";
+ sha256 = "1flybwbdahx0sm9ipgp9k60wlrpkrmfflk1zf5j4w6mak4gd8nq3";
};
# Zlib and OpenSSL must be propagated because `libcurl.la' contains
diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix
index 8e93c424cb1..3a6249744f3 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.4.2";
+ name = "dhcpcd-6.4.7";
src = fetchurl {
url = "http://roy.marples.name/downloads/dhcpcd/${name}.tar.bz2";
- sha256 = "1dr08aqvazg4ncq5p93v6givwh7naj75dn2npgplf3dl2fg9zfzf";
+ sha256 = "11z14nxk91g232zk4j17b822b7lvrzaa9kaxz0n6nhvihsb8025v";
};
patches = [ /* ./lxc_ro_promote_secondaries.patch */ ];
diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix
index cec4057a284..3cfc902711e 100644
--- a/pkgs/tools/networking/dnsmasq/default.nix
+++ b/pkgs/tools/networking/dnsmasq/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ pkgconfig, dbus_libs, nettle, stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "dnsmasq-2.71";
@@ -8,13 +8,35 @@ stdenv.mkDerivation rec {
sha256 = "1fpzpzja7qr8b4kfdhh4i4sijp62c634yf0xvq2n4p7d5xbzn6a9";
};
+ # Can't rely on make flags because of space in one of the parameters
+ buildPhase = ''
+ make COPTS="-DHAVE_DNSSEC -DHAVE_DBUS"
+ '';
+
+ # make flags used for installation only
makeFlags = "DESTDIR= BINDIR=$(out)/bin MANDIR=$(out)/man LOCALEDIR=$(out)/share/locale";
- meta = {
+ postInstall = ''
+ install -Dm644 dbus/dnsmasq.conf $out/etc/dbus-1/system.d/dnsmasq.conf
+ install -Dm644 trust-anchors.conf $out/share/dnsmasq/trust-anchors.conf
+
+ mkdir -p $out/share/dbus-1/system-services
+ cat < $out/share/dbus-1/system-services/uk.org.thekelleys.dnsmasq.service
+ [D-BUS Service]
+ Name=uk.org.thekelleys.dnsmasq
+ Exec=$out/sbin/dnsmasq -k -1
+ User=root
+ SystemdService=dnsmasq.service
+ END
+ '';
+
+ buildInputs = [ pkgconfig dbus_libs nettle ];
+
+ meta = with stdenv.lib; {
description = "An integrated DNS, DHCP and TFTP server for small networks";
homepage = http://www.thekelleys.org.uk/dnsmasq/doc.html;
- license = "GPL";
- platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
- maintainers = [ stdenv.lib.maintainers.eelco ];
+ license = licenses.gpl2;
+ platforms = with platforms; linux ++ darwin;
+ maintainers = with maintainers; [ eelco ];
};
}
diff --git a/pkgs/tools/networking/fping/default.nix b/pkgs/tools/networking/fping/default.nix
index 10f31fb8297..c71f6b04084 100644
--- a/pkgs/tools/networking/fping/default.nix
+++ b/pkgs/tools/networking/fping/default.nix
@@ -1,15 +1,16 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "fping-3.8";
+ name = "fping-3.10";
src = fetchurl {
url = "http://www.fping.org/dist/${name}.tar.gz";
- sha256 = "04iwj4x3wns09wp777mb3kwfi7ypb4m9m73p0s2y699px77hcx67";
+ sha256 = "1n2psfxgww6wg5rz8rly06xkghgp8lshx2lx6rramrigyd1fhiyd";
};
meta = {
homepage = "http://fping.org/";
description = "Send ICMP echo probes to network hosts";
+ maintainers = with stdenv.lib.maintainers; [ the-kenny ];
};
}
diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix
index 6d9666506b8..8c9103790b9 100644
--- a/pkgs/tools/networking/getmail/default.nix
+++ b/pkgs/tools/networking/getmail/default.nix
@@ -1,12 +1,13 @@
{ stdenv, fetchurl, buildPythonPackage }:
buildPythonPackage rec {
- name = "getmail-4.43.0";
+ version = "4.46.0";
+ name = "getmail-${version}";
namePrefix = "";
src = fetchurl {
url = "http://pyropus.ca/software/getmail/old-versions/${name}.tar.gz";
- sha256 = "0abcj4d2jp9y56c85kq7265d8wcij91w9lpzib9q6j9lcs4la8hy";
+ sha256 = "15rqmm25pq6ll8aaqh8h6pfdkpqs7y6yismb3h3w1bz8j292c8zl";
};
doCheck = false;
@@ -15,5 +16,9 @@ buildPythonPackage rec {
description = "A program for retrieving mail";
maintainers = [ stdenv.lib.maintainers.raskin stdenv.lib.maintainers.iElectric ];
platforms = stdenv.lib.platforms.linux;
+
+ homepage = "http://pyropus.ca/software/getmail/";
+ inherit version;
+ updateWalker = true;
};
}
diff --git a/pkgs/tools/networking/httptunnel/default.nix b/pkgs/tools/networking/httptunnel/default.nix
new file mode 100644
index 00000000000..c47dd03cb9d
--- /dev/null
+++ b/pkgs/tools/networking/httptunnel/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ version = "3.3";
+ name = "httptunnel-${version}";
+
+ src = fetchurl {
+ url = "http://www.nocrew.org/software/httptunnel/${name}.tar.gz";
+ sha256 = "0mn5s6p68n32xzadz6ds5i6bp44dyxzkq68r1yljlv470jr84bql";
+ };
+
+ meta = with stdenv.lib; {
+ description = "Creates a bidirectional virtual data connection tunnelled in HTTP requests";
+ homepage = http://www.nocrew.org/software/httptunnel;
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ koral ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/tools/networking/iftop/default.nix b/pkgs/tools/networking/iftop/default.nix
index c40764866eb..cb1bf546bf6 100644
--- a/pkgs/tools/networking/iftop/default.nix
+++ b/pkgs/tools/networking/iftop/default.nix
@@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Plus;
homepage = http://ex-parrot.com/pdw/iftop/;
platforms = platforms.linux;
- maintainers = maintainers.mornfall;
+ maintainers = [ maintainers.mornfall ];
};
}
diff --git a/pkgs/tools/networking/iperf/default.nix b/pkgs/tools/networking/iperf/2.nix
similarity index 100%
rename from pkgs/tools/networking/iperf/default.nix
rename to pkgs/tools/networking/iperf/2.nix
diff --git a/pkgs/tools/networking/iperf/3.nix b/pkgs/tools/networking/iperf/3.nix
new file mode 100644
index 00000000000..3a9d49f8330
--- /dev/null
+++ b/pkgs/tools/networking/iperf/3.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ name = "iperf-3.0.8";
+
+ src = fetchurl {
+ url = "http://downloads.es.net/pub/iperf/${name}.tar.gz";
+ sha256 = "81b8d91159862896c57f9b90a006e8b5dc22bd94175d97bd0db50b0ae2c1a78e";
+ };
+
+ postInstall = ''
+ ln -s iperf3 $out/bin/iperf
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = http://software.es.net/iperf/;
+ description = "Tool to measure IP bandwidth using UDP or TCP";
+ platforms = platforms.unix;
+ license = "as-is";
+ maintainers = with maintainers; [ wkennington ];
+ };
+}
diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix
index 87f0db1946b..e83b935ff22 100644
--- a/pkgs/tools/networking/mu/default.nix
+++ b/pkgs/tools/networking/mu/default.nix
@@ -3,12 +3,12 @@
, gtk3, webkit, libsoup, icu, withMug ? false /* doesn't build with current gtk3 */ }:
stdenv.mkDerivation rec {
- version = "0.9.9.6";
+ version = "0.9.10";
name = "mu-${version}";
src = fetchurl {
url = "https://github.com/djcb/mu/archive/v${version}.tar.gz";
- sha256 = "1jr9ss29yi6d62hd4ap07p2abgf12hwqfhasv3gwdkrx8dzwmr2a";
+ sha256 = "0yrkzf0czp85fd3g4zh95z648lsvkc4g2r8xbjn48xgba1ygqbyq";
};
buildInputs =
diff --git a/pkgs/tools/networking/netkit/tftp/default.nix b/pkgs/tools/networking/netkit/tftp/default.nix
index 5752ff2a63c..7288bb7e39b 100644
--- a/pkgs/tools/networking/netkit/tftp/default.nix
+++ b/pkgs/tools/networking/netkit/tftp/default.nix
@@ -5,6 +5,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
urls = [
+ "mirror://ubuntu/pool/universe/n/netkit-tftp/netkit-tftp_0.17.orig.tar.gz"
"ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${name}.tar.gz"
"http://ftp.cc.uoc.gr/mirrors/linux/ubuntu/packages/pool/universe/n/netkit-tftp/netkit-tftp_0.17.orig.tar.gz"
];
diff --git a/pkgs/tools/networking/ntopng/default.nix b/pkgs/tools/networking/ntopng/default.nix
index 52554209d59..23b45358594 100644
--- a/pkgs/tools/networking/ntopng/default.nix
+++ b/pkgs/tools/networking/ntopng/default.nix
@@ -6,31 +6,31 @@
# directory.
stdenv.mkDerivation rec {
- name = "ntopng-1.2.0_r8116";
+ name = "ntopng-1.2.1";
geoLiteCity = fetchurl {
url = "http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz";
- sha256 = "1rv5yx5xgz04ymicx9pilidm19wh01ql2klwjcdakv558ndxdzd5";
+ sha256 = "1sqskc8nh9k46nif4i6abjil9nfl4x6na4gadzbxp0929lbzyh0f";
};
geoLiteCityV6 = fetchurl {
url = "http://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz";
- sha256 = "0j974qpi92wwnibq46h16vxpcz7yy8bbqc4k8kmby1yx994k33v4";
+ sha256 = "1427zljjhbixjcihinj7l79v1daii7ikcmxgkmwdp4rbr25qxlhz";
};
geoIPASNum = fetchurl {
url = "http://geolite.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz";
- sha256 = "1msnbls66npq001nmf1wmkrh6vyacgi8g5phfm1c34cz7vqnh683";
+ sha256 = "1rh2920sdciqn3pifl4rz0jl3m32ww4gjx495p5xd6ldpy95gn31";
};
geoIPASNumV6 = fetchurl {
url = "http://geolite.maxmind.com/download/geoip/database/asnum/GeoIPASNumv6.dat.gz";
- sha256 = "126syia75mkxs6xfinfp70xcfq6a3rgfmh673pzzkwxya393lbdn";
+ sha256 = "1064arl40c80kwhbdylhwk6gn2xs36dr0aq3634i1rdpd4jm1a41";
};
src = fetchurl {
url = "mirror://sourceforge/project/ntop/ntopng/${name}.tgz";
- sha256 = "0y7xc0l77k2qi2qalwfqiw2z361hdypirfv4k5gi652pb20jc9j6";
+ sha256 = "1db83cd1v4ivl8hxzzdvvdcgk22ji7mwrfnd5nnwll6kb11i364v";
};
patches = [
diff --git a/pkgs/tools/networking/openntpd/default.nix b/pkgs/tools/networking/openntpd/default.nix
new file mode 100644
index 00000000000..c90582a7547
--- /dev/null
+++ b/pkgs/tools/networking/openntpd/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchgit, openssl
+, privsepPath ? "/var/empty"
+, privsepUser ? "ntp"
+}:
+
+stdenv.mkDerivation rec {
+ name = "openntpd-${version}";
+ version = "20080406p-10";
+
+ src = fetchgit {
+ url = "git://git.debian.org/collab-maint/openntpd.git";
+ rev = "refs/tags/debian/${version}";
+ sha256 = "0gd6j4sw4x4adlz0jzbp6lblx5vlnk6l1034hzbj2xd95k8hjhh8";
+ };
+
+ postPatch = ''
+ sed -i -e '/^install:/,/^$/{/@if.*PRIVSEP_PATH/,/^$/d}' Makefile.in
+ '';
+
+ configureFlags = [
+ "--with-privsep-path=${privsepPath}"
+ "--with-privsep-user=${privsepUser}"
+ ];
+
+ buildInputs = [ openssl ];
+
+ meta = {
+ homepage = "http://www.openntpd.org/";
+ license = stdenv.lib.licenses.bsd3;
+ description = "OpenBSD NTP daemon (Debian port)";
+ };
+}
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index fec6679a14b..a894de64758 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -10,8 +10,8 @@ assert withKerberos -> kerberos != null;
let
hpnSrc = fetchurl {
- url = mirror://sourceforge/hpnssh/openssh-6.3p1-hpnssh14v2.diff.gz;
- sha256 = "1jldqjwry9qpxxzb3mikfmmmv90mfb7xkmcfdbvwqac6nl3r7bi3";
+ url = mirror://sourceforge/hpnssh/openssh-6.6p1-hpnssh14v5.diff.gz;
+ sha256 = "682b4a6880d224ee0b7447241b684330b731018585f1ba519f46660c10d63950";
};
optionalString = stdenv.lib.optionalString;
@@ -83,6 +83,5 @@ stdenv.mkDerivation rec {
license = "bsd"; # multi BSD GPL-2
platforms = platforms.unix;
maintainers = with maintainers; [ eelco ];
- broken = hpnSupport; # cf. https://github.com/NixOS/nixpkgs/pull/1640
};
}
diff --git a/pkgs/tools/networking/p2p/bittorrent/builder.sh b/pkgs/tools/networking/p2p/bittorrent/builder.sh
deleted file mode 100644
index 3f30aa5c851..00000000000
--- a/pkgs/tools/networking/p2p/bittorrent/builder.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-source $stdenv/setup
-
-
-# Workaround for:
-# File "...-python-2.4.4/lib/python2.4/posixpath.py", line 62, in join
-# elif path == '' or path.endswith('/'):
-# AttributeError: 'NoneType' object has no attribute 'endswith'
-export HOME=$TMP
-
-
-buildPhase() {
- python setup.py build
-}
-
-
-installPhase() {
- python setup.py install --prefix=$out
-
- # Create wrappers that set the environment correctly.
- for i in $(cd $out/bin && ls); do
- wrapProgram $out/bin/$i \
- --set PYTHONPATH "$(toPythonPath $out):$PYTHONPATH"
- done
-}
-
-
-genericBuild
diff --git a/pkgs/tools/networking/p2p/bittorrent/default.nix b/pkgs/tools/networking/p2p/bittorrent/default.nix
deleted file mode 100644
index 1d4f43445bf..00000000000
--- a/pkgs/tools/networking/p2p/bittorrent/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ gui ? false
-, stdenv, fetchurl, makeWrapper
-, python, wxPython ? null, pycrypto, twisted
-}:
-
-assert gui -> wxPython != null;
-
-stdenv.mkDerivation {
- name = "bittorrent-5.2.2";
-
- builder = ./builder.sh;
-
- src = fetchurl {
- url = http://download.bittorrent.com/dl/archive/BitTorrent-5.2.2.tar.gz;
- sha256 = "05k803hbwsyn51j4aibzdsnqxz24kw4rvr60v2c0wji8gcvy3kx9";
- };
-
- buildInputs = [ python pycrypto twisted makeWrapper ]
- ++ stdenv.lib.optional gui wxPython;
-
- meta = {
- description = "The original client for the BitTorrent peer-to-peer file sharing protocol";
- };
-}
diff --git a/pkgs/tools/networking/radvd/default.nix b/pkgs/tools/networking/radvd/default.nix
index e74106ec67f..b1c116266f2 100644
--- a/pkgs/tools/networking/radvd/default.nix
+++ b/pkgs/tools/networking/radvd/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libdaemon, bison, flex, check }:
stdenv.mkDerivation rec {
- name = "radvd-2.5";
+ name = "radvd-2.7";
src = fetchurl {
url = "http://www.litech.org/radvd/dist/${name}.tar.xz";
- sha256 = "0hsa647l236q9rhrwjb44xqmjfz4fxzcixlbf2chk4lzh8lzwjp0";
+ sha256 = "09rzw96cjkzywadxmhbhaw52ahawzjp3pv7pblcsnb0mrwaawny0";
};
buildInputs = [ pkgconfig libdaemon bison flex check ];
diff --git a/pkgs/tools/networking/s6-dns/default.nix b/pkgs/tools/networking/s6-dns/default.nix
new file mode 100644
index 00000000000..3165434de3d
--- /dev/null
+++ b/pkgs/tools/networking/s6-dns/default.nix
@@ -0,0 +1,53 @@
+{ stdenv, fetchurl, skalibs }:
+
+let
+
+ version = "0.1.0.0";
+
+in stdenv.mkDerivation rec {
+
+ name = "s6-dns-${version}";
+
+ src = fetchurl {
+ url = "http://www.skarnet.org/software/s6-dns/${name}.tar.gz";
+ sha256 = "1r82l5fnz2rrwm5wq2sldqp74lk9fifr0d8hyq98xdyh24hish68";
+ };
+
+ buildInputs = [ skalibs ];
+
+ sourceRoot = "web/${name}";
+
+ configurePhase = ''
+ pushd conf-compile
+
+ printf "$out/bin" > conf-install-command
+ printf "$out/include" > conf-install-include
+ printf "$out/lib" > conf-install-library
+ printf "$out/lib" > conf-install-library.so
+
+ # let nix builder strip things, cross-platform
+ truncate --size 0 conf-stripbins
+ truncate --size 0 conf-striplibs
+
+ printf "${skalibs}/sysdeps" > import
+ printf "%s" "${skalibs}/include" > path-include
+ printf "%s" "${skalibs}/lib" > path-library
+
+ rm -f flag-slashpackage
+ touch flag-allstatic
+
+ popd
+ '';
+
+ preBuild = ''
+ patchShebangs src/sys
+ '';
+
+ meta = {
+ homepage = http://www.skarnet.org/software/s6-dns/;
+ description = "A suite of DNS client programs and libraries for Unix systems.";
+ platforms = stdenv.lib.platforms.all;
+ license = stdenv.lib.licenses.isc;
+ };
+
+}
diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix
new file mode 100644
index 00000000000..3d5e3e04811
--- /dev/null
+++ b/pkgs/tools/networking/s6-networking/default.nix
@@ -0,0 +1,63 @@
+{ stdenv
+, execline
+, fetchurl
+, s6Dns
+, skalibs
+}:
+
+let
+
+ version = "0.1.0.0";
+
+in stdenv.mkDerivation rec {
+
+ name = "s6-networking-${version}";
+
+ src = fetchurl {
+ url = "http://www.skarnet.org/software/s6-networking/${name}.tar.gz";
+ sha256 = "1np9m2j1i2450mbcjvpbb56kv3wc2fbyvmv2a039q61j2lk6vjz7";
+ };
+
+ buildInputs = [ skalibs s6Dns execline ];
+
+ sourceRoot = "net/${name}";
+
+ configurePhase = ''
+ pushd conf-compile
+
+ printf "$out/bin" > conf-install-command
+ printf "$out/include" > conf-install-include
+ printf "$out/lib" > conf-install-library
+ printf "$out/lib" > conf-install-library.so
+
+ # let nix builder strip things, cross-platform
+ truncate --size 0 conf-stripbins
+ truncate --size 0 conf-striplibs
+
+ printf "${skalibs}/sysdeps" > import
+
+ rm -f path-include
+ rm -f path-library
+ for dep in "${execline}" "${s6Dns}" "${skalibs}"; do
+ printf "%s\n" "$dep/include" >> path-include
+ printf "%s\n" "$dep/lib" >> path-library
+ done
+
+ rm -f flag-slashpackage
+ touch flag-allstatic
+
+ popd
+ '';
+
+ preBuild = ''
+ patchShebangs src/sys
+ '';
+
+ meta = {
+ homepage = http://www.skarnet.org/software/s6-networking/;
+ description = "A suite of small networking utilities for Unix systems.";
+ platforms = stdenv.lib.platforms.all;
+ license = stdenv.lib.licenses.isc;
+ };
+
+}
diff --git a/pkgs/tools/networking/socat/2.x.nix b/pkgs/tools/networking/socat/2.x.nix
index fbd24946381..9f9e8dbe374 100644
--- a/pkgs/tools/networking/socat/2.x.nix
+++ b/pkgs/tools/networking/socat/2.x.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
repositories.git = git://repo.or.cz/socat.git;
platforms = stdenv.lib.platforms.unix;
license = stdenv.lib.licenses.gpl2;
- maintainers = stdenv.lib.maintainers.eelco;
+ maintainers = [ stdenv.lib.maintainers.eelco ];
};
}
diff --git a/pkgs/tools/networking/socat/default.nix b/pkgs/tools/networking/socat/default.nix
index 84ba2106a26..e33edaa32da 100644
--- a/pkgs/tools/networking/socat/default.nix
+++ b/pkgs/tools/networking/socat/default.nix
@@ -16,6 +16,6 @@ stdenv.mkDerivation rec {
repositories.git = git://repo.or.cz/socat.git;
platforms = stdenv.lib.platforms.unix;
license = stdenv.lib.licenses.gpl2;
- maintainers = stdenv.lib.maintainers.eelco;
+ maintainers = [ stdenv.lib.maintainers.eelco ];
};
}
diff --git a/pkgs/tools/networking/spiped/default.nix b/pkgs/tools/networking/spiped/default.nix
index ac2736ffb19..3f7c66e0406 100644
--- a/pkgs/tools/networking/spiped/default.nix
+++ b/pkgs/tools/networking/spiped/default.nix
@@ -2,18 +2,28 @@
stdenv.mkDerivation rec {
name = "spiped-${version}";
- version = "1.3.1";
+ version = "1.4.1";
src = fetchurl {
url = "http://www.tarsnap.com/spiped/${name}.tgz";
- sha256 = "1viglk61v1v2ga1n31r0h8rvib5gy2h02lhhbbnqh2s6ps1sjn4a";
+ sha256 = "1y642mn4jz2h83vhkji0l42r2l1hbzbwwlplc3xmr66zjj54psqf";
};
buildInputs = [ openssl ];
- patches = [ ./no-dev-stderr.patch ];
- postPatch = ''
- substituteInPlace POSIX/posix-l.sh --replace "rm" "${coreutils}/bin/rm"
+ patchPhase = ''
+ substituteInPlace libcperciva/cpusupport/Build/cpusupport.sh \
+ --replace "2>/dev/null" "2>stderr.log"
+
+ substituteInPlace POSIX/posix-l.sh \
+ --replace "rm" "${coreutils}/bin/rm" \
+ --replace ">/dev/stderr" ">stderr.log" \
+ --replace "2>/dev/null" "2>stderr.log"
+
+ substituteInPlace POSIX/posix-cflags.sh \
+ --replace "rm" "${coreutils}/bin/rm" \
+ --replace ">/dev/stderr" ">stderr.log" \
+ --replace "2>/dev/null" "2>stderr.log"
'';
installPhase = ''
diff --git a/pkgs/tools/networking/spiped/no-dev-stderr.patch b/pkgs/tools/networking/spiped/no-dev-stderr.patch
deleted file mode 100644
index 742a2e483d4..00000000000
--- a/pkgs/tools/networking/spiped/no-dev-stderr.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 7a2bbb0d0098d7a33ad3794d0199879ad50e755a Mon Sep 17 00:00:00 2001
-From: Austin Seipp
-Date: Tue, 8 Apr 2014 06:21:41 -0500
-Subject: [PATCH] Remove use of /dev/stderr
-
-Signed-off-by: Austin Seipp
----
- POSIX/posix-l.sh | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/POSIX/posix-l.sh b/POSIX/posix-l.sh
-index b3f0e31..71d6fe8 100755
---- a/POSIX/posix-l.sh
-+++ b/POSIX/posix-l.sh
-@@ -7,8 +7,6 @@ for LIB in rt xnet; do
- fi
- printf "%s" "-l${LIB}";
- FIRST=NO;
-- else
-- echo "WARNING: POSIX violation: make's CC doesn't understand -l${LIB}" >/dev/stderr
- fi
- rm -f a.out
- done
---
-1.8.3.2
-
diff --git a/pkgs/tools/networking/sproxy-web/default.nix b/pkgs/tools/networking/sproxy-web/default.nix
index fa3221a7759..67daab08359 100644
--- a/pkgs/tools/networking/sproxy-web/default.nix
+++ b/pkgs/tools/networking/sproxy-web/default.nix
@@ -22,5 +22,6 @@ cabal.mkDerivation (self: {
description = "Web interface to sproxy";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
+ broken = true;
};
})
diff --git a/pkgs/tools/networking/sshpass/default.nix b/pkgs/tools/networking/sshpass/default.nix
new file mode 100644
index 00000000000..3a8e106155f
--- /dev/null
+++ b/pkgs/tools/networking/sshpass/default.nix
@@ -0,0 +1,18 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation rec {
+ name = "sshpass-${version}";
+ version = "1.05";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/sshpass/sshpass-${version}.tar.gz";
+ sha256 = "0gj8r05h1hy01vh4csygyw21z2hcxb72qcxkxxi3y34alr98gxy3";
+ };
+
+ meta = {
+ homepage = http://sourceforge.net/projects/sshpass/;
+ description = "Non-interactive ssh password auth";
+ maintainers = [ stdenv.lib.maintainers.madjar ];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix
new file mode 100644
index 00000000000..9358b9aaa2f
--- /dev/null
+++ b/pkgs/tools/networking/strongswan/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, gmp, autoreconfHook, gettext, pkgconfig }:
+
+stdenv.mkDerivation rec {
+ name = "strongswan-5.2.0";
+
+ src = fetchurl {
+ url = "http://download.strongswan.org/${name}.tar.bz2";
+ sha256 = "1ki6v9c54ykppqnj3prgh62na97yajnvnm2zr1gjxzv05syk035h";
+ };
+
+ patches = [ ./respect-path.patch ./no-hardcoded-sysconfdir.patch ];
+
+ buildInputs = [ gmp autoreconfHook gettext pkgconfig ];
+
+ configureFlags = [ "--enable-swanctl" ];
+
+ meta = {
+ maintainers = [ stdenv.lib.maintainers.shlevy ];
+ description = "OpenSource IPsec-based VPN Solution";
+ homepage = https://www.strongswan.org;
+ license = stdenv.lib.licenses.gpl2Plus;
+ inherit (stdenv.gcc.clang.meta) platforms;
+ };
+}
diff --git a/pkgs/tools/networking/strongswan/no-hardcoded-sysconfdir.patch b/pkgs/tools/networking/strongswan/no-hardcoded-sysconfdir.patch
new file mode 100644
index 00000000000..b186b21a5dd
--- /dev/null
+++ b/pkgs/tools/networking/strongswan/no-hardcoded-sysconfdir.patch
@@ -0,0 +1,145 @@
+commit 8e2b65ebf597a4d48daa3308aa032962110ad8f6
+Author: Shea Levy
+Date: Tue Sep 30 15:14:47 2014 -0400
+
+ Allow specifying the ipsec.conf location in strongswan.conf
+
+diff --git a/conf/options/starter.opt b/conf/options/starter.opt
+index 4e6574d..6d7162a 100644
+--- a/conf/options/starter.opt
++++ b/conf/options/starter.opt
+@@ -3,3 +3,6 @@ starter.load =
+
+ starter.load_warning = yes
+ Disable charon plugin load option warning.
++
++starter.config_file = ${sysconfdir}/ipsec.conf
++ Location of the ipsec.conf conf file
+diff --git a/src/starter/starter.c b/src/starter/starter.c
+index 5c84593..1f365cc 100644
+--- a/src/starter/starter.c
++++ b/src/starter/starter.c
+@@ -488,7 +488,8 @@ int main (int argc, char **argv)
+ }
+ if (!config_file)
+ {
+- config_file = CONFIG_FILE;
++ config_file = lib->settings->get_str(lib->settings, "starter.config_file",
++ CONFIG_FILE);
+ }
+
+ init_log("ipsec_starter");
+
+commit 8b839cec684e26ed96f3d891b3ae3565558b2cff
+Author: Shea Levy
+Date: Tue Sep 30 15:11:03 2014 -0400
+
+ Allow specifying the ipsec.secrets location in strongswan.conf
+
+diff --git a/conf/plugins/stroke.opt b/conf/plugins/stroke.opt
+index 2cfc2c6..b3ca2b7 100644
+--- a/conf/plugins/stroke.opt
++++ b/conf/plugins/stroke.opt
+@@ -11,5 +11,8 @@ charon.plugins.stroke.prevent_loglevel_changes = no
+ charon.plugins.stroke.socket = unix://${piddir}/charon.ctl
+ Socket provided by the stroke plugin.
+
++charon.plugins.stroke.secrets_file = ${sysconfdir}/ipsec.secrets
++ Location of the ipsec.secrets conf file
++
+ charon.plugins.stroke.timeout = 0
+ Timeout in ms for any stroke command. Use 0 to disable the timeout.
+diff --git a/src/libcharon/plugins/stroke/stroke_cred.c b/src/libcharon/plugins/stroke/stroke_cred.c
+index f908219..673e492 100644
+--- a/src/libcharon/plugins/stroke/stroke_cred.c
++++ b/src/libcharon/plugins/stroke/stroke_cred.c
+@@ -67,6 +67,7 @@ struct private_stroke_cred_t {
+ /**
+ * credentials
+ */
++ char *secrets_file;
+ mem_cred_t *creds;
+
+ /**
+@@ -1297,7 +1298,7 @@ METHOD(stroke_cred_t, reread, void,
+ if (msg->reread.flags & REREAD_SECRETS)
+ {
+ DBG1(DBG_CFG, "rereading secrets");
+- load_secrets(this, NULL, SECRETS_FILE, 0, prompt);
++ load_secrets(this, NULL, this->secrets_file, 0, prompt);
+ }
+ if (msg->reread.flags & REREAD_CACERTS)
+ {
+@@ -1370,6 +1371,9 @@ stroke_cred_t *stroke_cred_create()
+ .cachecrl = _cachecrl,
+ .destroy = _destroy,
+ },
++ .secrets_file = lib->settings->get_str(lib->settings,
++ "%s.plugins.stroke.secrets_file", SECRETS_FILE,
++ lib->ns),
+ .creds = mem_cred_create(),
+ );
+
+@@ -1380,7 +1384,7 @@ stroke_cred_t *stroke_cred_create()
+ FALSE, lib->ns);
+
+ load_certs(this);
+- load_secrets(this, NULL, SECRETS_FILE, 0, NULL);
++ load_secrets(this, NULL, this->secrets_file, 0, NULL);
+
+ return &this->public;
+ }
+diff --git a/src/starter/starter.c b/src/starter/starter.c
+index 71f33ae..5c84593 100644
+--- a/src/starter/starter.c
++++ b/src/starter/starter.c
+@@ -263,8 +263,11 @@ static void generate_selfcert()
+ {
+ struct stat stb;
+
++ const char *secrets_file = lib->settings->get_str(lib->settings,
++ "charon.plugins.stroke.secrets_file", SECRETS_FILE);
++
+ /* if ipsec.secrets file is missing then generate RSA default key pair */
+- if (stat(SECRETS_FILE, &stb) != 0)
++ if (stat(secrets_file, &stb) != 0)
+ {
+ mode_t oldmask;
+ FILE *f;
+@@ -302,7 +305,7 @@ static void generate_selfcert()
+ /* ipsec.secrets is root readable only */
+ oldmask = umask(0066);
+
+- f = fopen(SECRETS_FILE, "w");
++ f = fopen(secrets_file, "w");
+ if (f)
+ {
+ fprintf(f, "# /etc/ipsec.secrets - strongSwan IPsec secrets file\n");
+@@ -310,7 +313,7 @@ static void generate_selfcert()
+ fprintf(f, ": RSA myKey.der\n");
+ fclose(f);
+ }
+- ignore_result(chown(SECRETS_FILE, uid, gid));
++ ignore_result(chown(secrets_file, uid, gid));
+ umask(oldmask);
+ }
+ }
+
+commit 5f2ca3b99b40c47a9b59c7cc75655e5dd041787e
+Author: Shea Levy
+Date: Tue Sep 30 14:31:50 2014 -0400
+
+ Allow specifying the path to strongswan.conf in the STRONGSWAN_CONF env var
+
+diff -Naur a/src/libstrongswan/library.c b/src/libstrongswan/library.c
+--- a/src/libstrongswan/library.c 2014-06-05 03:50:30.000000000 -0400
++++ b/src/libstrongswan/library.c 2014-09-30 15:25:27.927757711 -0400
+@@ -307,7 +307,7 @@
+ #ifdef STRONGSWAN_CONF
+ if (!settings)
+ {
+- settings = STRONGSWAN_CONF;
++ settings = getenv("STRONGSWAN_CONF") ?: STRONGSWAN_CONF;
+ }
+ #endif
+ this->public.settings = settings_create(settings);
diff --git a/pkgs/tools/networking/strongswan/no-sysconfdir-write.patch b/pkgs/tools/networking/strongswan/no-sysconfdir-write.patch
new file mode 100644
index 00000000000..afa85ce1d75
--- /dev/null
+++ b/pkgs/tools/networking/strongswan/no-sysconfdir-write.patch
@@ -0,0 +1,36 @@
+commit 0de10fe4950672053fe2b242bcec064e9e88c880
+Author: Shea Levy
+Date: Fri Sep 19 14:32:22 2014 -0400
+
+ Don't fail to install if sysconfdir isn't writable
+
+diff --git a/conf/Makefile.am b/conf/Makefile.am
+index 373be16..85b7b0e 100644
+--- a/conf/Makefile.am
++++ b/conf/Makefile.am
+@@ -152,9 +152,9 @@ maintainer-clean-local:
+ rm -f $(confsnippets) default.conf plugins/*.conf plugins/*.tmp
+
+ install-data-local: $(plugins_install_src)
+- test -e "$(DESTDIR)${strongswanconfdir}" || $(INSTALL) -d "$(DESTDIR)$(strongswanconfdir)"
+- test -e "$(DESTDIR)${strongswanddir}" || $(INSTALL) -d "$(DESTDIR)$(strongswanddir)"
+- test -e "$(DESTDIR)${charonconfdir}" || $(INSTALL) -d "$(DESTDIR)$(charonconfdir)"
++ test -e "$(DESTDIR)${strongswanconfdir}" || $(INSTALL) -d "$(DESTDIR)$(strongswanconfdir)" || true
++ test -e "$(DESTDIR)${strongswanddir}" || $(INSTALL) -d "$(DESTDIR)$(strongswanddir)" || true
++ test -e "$(DESTDIR)${charonconfdir}" || $(INSTALL) -d "$(DESTDIR)$(charonconfdir)" || true
+ test -e "$(DESTDIR)$(strongswanconfdir)/strongswan.conf" || $(INSTALL) -m 644 $(srcdir)/strongswan.conf $(DESTDIR)$(strongswanconfdir)/strongswan.conf || true
+ for f in $(options_install_src); do \
+ name=`basename $$f`; \
+diff --git a/src/swanctl/Makefile.am b/src/swanctl/Makefile.am
+index 385737a..912fdf8 100644
+--- a/src/swanctl/Makefile.am
++++ b/src/swanctl/Makefile.am
+@@ -54,7 +54,7 @@ maintainer-clean-local:
+ cd $(srcdir) && rm -f swanctl.conf swanctl.conf.5.main
+
+ install-data-local: swanctl.conf
+- test -e "$(DESTDIR)$(swanctldir)" || $(INSTALL) -d "$(DESTDIR)$(swanctldir)"
++ test -e "$(DESTDIR)$(swanctldir)" || $(INSTALL) -d "$(DESTDIR)$(swanctldir)" || true
+ test -e "$(DESTDIR)$(swanctldir)/x509" || $(INSTALL) -d "$(DESTDIR)$(swanctldir)/x509" || true
+ test -e "$(DESTDIR)$(swanctldir)/x509ca" || $(INSTALL) -d "$(DESTDIR)$(swanctldir)/x509ca" || true
+ test -e "$(DESTDIR)$(swanctldir)/x509aa" || $(INSTALL) -d "$(DESTDIR)$(swanctldir)/x509aa" || true
diff --git a/pkgs/tools/networking/strongswan/respect-path.patch b/pkgs/tools/networking/strongswan/respect-path.patch
new file mode 100644
index 00000000000..82f6a356b85
--- /dev/null
+++ b/pkgs/tools/networking/strongswan/respect-path.patch
@@ -0,0 +1,19 @@
+commit 09c4ae5b7bcd7057bede788f02c1d2d30aeeacda
+Author: Shea Levy
+Date: Thu Sep 18 02:00:03 2014 -0400
+
+ ipsec script: just append to PATH if already set
+
+diff --git a/src/ipsec/_ipsec.in b/src/ipsec/_ipsec.in
+index e6725d0..82041f4 100644
+--- a/src/ipsec/_ipsec.in
++++ b/src/ipsec/_ipsec.in
+@@ -15,7 +15,7 @@
+ # for more details.
+
+ # define a minimum PATH environment in case it is not set
+-PATH="/sbin:/bin:/usr/sbin:/usr/bin:@IPSEC_SBINDIR@:@IPSEC_BINDIR@"
++PATH="${PATH:-/sbin:/bin:/usr/sbin:/usr/bin}:@IPSEC_SBINDIR@:@IPSEC_BINDIR@"
+ export PATH
+
+ # set daemon name
diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix
index ed295e95a38..2db270c3f66 100644
--- a/pkgs/tools/networking/tcpdump/default.nix
+++ b/pkgs/tools/networking/tcpdump/default.nix
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
description = "Network sniffer";
homepage = http://www.tcpdump.org/;
license = "BSD-style";
- maintainers = stdenv.lib.maintainers.mornfall;
+ maintainers = [ stdenv.lib.maintainers.mornfall ];
};
}
diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix
new file mode 100644
index 00000000000..030cb30a150
--- /dev/null
+++ b/pkgs/tools/networking/tinc/pre.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchgit, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }:
+
+stdenv.mkDerivation rec {
+ name = "tinc-1.1pre38d7e73";
+
+ src = fetchgit {
+ url = "git://tinc-vpn.org/tinc";
+ rev = "38d7e730e619a8b86dfbf68d77773564595f12a1";
+ sha256 = "0xac1jm6x9lkybd6sz8lfcdrb8h69kh1ckg35ag1rssr45hxikbz";
+ };
+
+ buildInputs = [ autoreconfHook texinfo ncurses readline zlib lzo openssl ];
+
+ configureFlags = [
+ "--sysconfdir=/etc"
+ "--localstatedir=/var"
+ ];
+
+ meta = with stdenv.lib; {
+ description = "VPN daemon with full mesh routing";
+ longDescription = ''
+ tinc is a Virtual Private Network (VPN) daemon that uses tunnelling and
+ encryption to create a secure private network between hosts on the
+ Internet. It features full mesh routing, as well as encryption,
+ authentication, compression and ethernet bridging.
+ '';
+ homepage="http://www.tinc-vpn.org/";
+ license = licenses.gpl2Plus;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ wkennington ];
+ };
+}
diff --git a/pkgs/tools/networking/traceroute/default.nix b/pkgs/tools/networking/traceroute/default.nix
new file mode 100644
index 00000000000..3300d12ebfa
--- /dev/null
+++ b/pkgs/tools/networking/traceroute/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ name = "traceroute-${version}";
+ version = "2.0.20";
+
+ src = fetchurl {
+ url = "http://downloads.sourceforge.net/traceroute/${name}.tar.gz";
+ sha256 = "0wf2xnh5hm81fdn6dbkqqqlwbn6gdvy178zkpzbjhm694navmb1g";
+ };
+
+ makeFlags = "prefix=$(out)";
+
+ preConfigure = ''
+ sed -i 's@LIBS := \(.*\) -lm \(.*\)@LIBS := \1 \2@' Make.rules
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = http://traceroute.sourceforge.net/;
+ description = "Tracks the route taken by packets over an IP network";
+ license = stdenv.lib.licenses.gpl2;
+ maintainers = [ maintainers.koral ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix
new file mode 100644
index 00000000000..1be71942e70
--- /dev/null
+++ b/pkgs/tools/networking/urlwatch/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, python3Packages }:
+
+python3Packages.buildPythonPackage rec {
+ name = "urlwatch-1.16";
+
+ src = fetchurl {
+ url = "http://thp.io/2008/urlwatch/${name}.tar.gz";
+ sha256 = "0yf1m909awfm06z7xwn20qxbbgslb1vjwwb6rygp6bn7sq022f1f";
+ };
+
+ patchPhase = ''
+ ./convert-to-python3.sh
+ '';
+
+ postFixup = ''
+ wrapProgram "$out/bin/urlwatch" --prefix "PYTHONPATH" : "$PYTHONPATH"
+ '';
+
+ meta = {
+ description = "A tool for monitoring webpages for updates";
+ homepage = https://thp.io/2008/urlwatch/;
+ license = stdenv.lib.licenses.bsd3;
+ maintainers = [ stdenv.lib.maintainers.tv ];
+ };
+}
diff --git a/pkgs/tools/networking/wavemon/default.nix b/pkgs/tools/networking/wavemon/default.nix
index e9c102817e1..b5927fd2478 100644
--- a/pkgs/tools/networking/wavemon/default.nix
+++ b/pkgs/tools/networking/wavemon/default.nix
@@ -11,16 +11,15 @@ let
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
baseName="wavemon";
- version="0.7.5";
+ version = "0.7.6";
name="${baseName}-${version}";
url="http://eden-feed.erg.abdn.ac.uk/wavemon/stable-releases/${name}.tar.bz2";
- hash="0b1fx00aar2fsw49a10w5bpiyjpz8h8f4nrlwb1acfw36yi1pfkd";
};
in
rec {
src = a.fetchurl {
url = sourceInfo.url;
- sha256 = sourceInfo.hash;
+ sha256 = "18cwlzgmwzy7z9dfr6lwd8kmkv0pqiihizm4gi0kkm52bzz6836y";
};
inherit (sourceInfo) name version;
@@ -38,11 +37,9 @@ rec {
platforms = with a.lib.platforms;
linux;
license = a.lib.licenses.gpl2Plus;
- };
- passthru = {
- updateInfo = {
- downloadPage = "http://eden-feed.erg.abdn.ac.uk/wavemon/";
- };
+ downloadPage = "http://eden-feed.erg.abdn.ac.uk/wavemon/";
+ inherit version;
+ updateWalker = true;
};
}) x
diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix
index e0537c8e1fa..a32654696be 100644
--- a/pkgs/tools/networking/wicd/default.nix
+++ b/pkgs/tools/networking/wicd/default.nix
@@ -38,6 +38,8 @@ stdenv.mkDerivation rec {
sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-gtk.in
sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-cli.in
sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-cli.in
+ sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-curses.in
+ sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus}):$(toPythonPath ${pythonPackages.urwid}):$(toPythonPath ${pythonPackages.curses})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-curses.in
rm po/ast.po
'';
diff --git a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix
index 291f7e36ce0..44eb9f8f094 100644
--- a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix
+++ b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix
@@ -3,8 +3,8 @@
stdenv.mkDerivation {
name = "DisnixWebService-0.2";
src = fetchurl {
- url = http://hydra.nixos.org/build/910953/download/4/DisnixWebService-0.2.tar.bz2;
- sha256 = "1469l2ykhdjmplkw01x64f7aq9rms05ig9sagyb8l2zksjm6lla8";
+ url = http://hydra.nixos.org/build/14768380/download/4/DisnixWebService-0.2.tar.bz2;
+ sha256 = "1xmsxg95fjcbpnyyrg0sj3g8pqia2gij53ilh6198yd8f37zr4kw";
};
buildInputs = [ apacheAnt jdk ];
PREFIX = ''''${env.out}'';
@@ -13,8 +13,8 @@ stdenv.mkDerivation {
DBUS_JAVA_LIB = "${dbus_java}/share/java";
patchPhase = ''
sed -i -e "s|#JAVA_HOME=|JAVA_HOME=${jdk}|" \
- -e "s|#AXIS2_LIB=|AXIS2_LIB=${axis2}/lib|" \
- scripts/disnix-soap-client
+ -e "s|#AXIS2_LIB=|AXIS2_LIB=${axis2}/lib|" \
+ scripts/disnix-soap-client
'';
buildPhase = "ant";
installPhase = "ant install";
diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix
index 61e998fd545..19eef437ad7 100644
--- a/pkgs/tools/package-management/disnix/default.nix
+++ b/pkgs/tools/package-management/disnix/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, dysnomia, libintlOrEmpty, libiconvOrEmpty }:
stdenv.mkDerivation {
- name = "disnix-0.3pre174e883b7b09da822494876d2f297736f33707a7";
+ name = "disnix-0.3prea0484a2c19d1947c21f11b4fc7c3f6049bd11efa";
src = fetchurl {
- url = http://hydra.nixos.org/build/11773951/download/4/disnix-0.3pre174e883b7b09da822494876d2f297736f33707a7.tar.gz;
- sha256 = "19hdh2mrlyiq1g3z6lnnqqvripmfcdnm18jpm4anp5iarhnwh3y4";
+ url = http://hydra.nixos.org/build/14710186/download/4/disnix-0.3prea0484a2c19d1947c21f11b4fc7c3f6049bd11efa.tar.gz;
+ sha256 = "06qjaxysnkm31rgjlqy9n7p59q5v3jl57jm9jya7zf2g90syhdn7";
};
buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconvOrEmpty dysnomia ];
diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix
index 65ae91f6e18..936a5b03d23 100644
--- a/pkgs/tools/package-management/disnix/disnixos/default.nix
+++ b/pkgs/tools/package-management/disnix/disnixos/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, disnix, socat, pkgconfig, getopt }:
stdenv.mkDerivation {
- name = "disnixos-0.2prebb320d396f93d7062c28d6a54105d8e8196b9d99";
+ name = "disnixos-0.2prec3310e2d8975c45e4ffacec940049fb781739b8d";
src = fetchurl {
- url = http://hydra.nixos.org/build/9877039/download/3/disnixos-0.2preb10c56eeb1be3046645eea90c779e2d64045581f.tar.gz;
- sha256 = "1pkpf6vp9q3jjp212lghbs1km8iqh4rm9xa5jm0dqb5ya25f0jf2";
+ url = http://hydra.nixos.org/build/14721464/download/3/disnixos-0.2prec3310e2d8975c45e4ffacec940049fb781739b8d.tar.gz;
+ sha256 = "0wd0bhzwipn62lb90fk2s9s52aq60ndriyw7ymah6x3xm40d2cl9";
};
buildInputs = [ socat pkgconfig disnix getopt ];
diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix
index a1914224dbd..347fc65f98b 100644
--- a/pkgs/tools/package-management/disnix/dysnomia/default.nix
+++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix
@@ -19,10 +19,10 @@ assert enableEjabberdDump -> ejabberd != null;
assert enableMongoDatabase -> mongodb != null;
stdenv.mkDerivation {
- name = "dysnomia-0.3pre09cc08f5ffc737d988923bb7329a7ec711badd82";
+ name = "dysnomia-0.3preccaebdfad11bc34850b24f1c2cb5ee6c8f0b7fe2";
src = fetchurl {
- url = http://hydra.nixos.org/build/11407191/download/1/dysnomia-0.3pre09cc08f5ffc737d988923bb7329a7ec711badd82.tar.gz;
- sha256 = "1i7yb299bq1z7cy4sk83m5faahj8inh73xn5bi6jcv492zv3kgwz";
+ url = http://hydra.nixos.org/build/14156365/download/1/dysnomia-0.3preccaebdfad11bc34850b24f1c2cb5ee6c8f0b7fe2.tar.gz;
+ sha256 = "0l88vcpnicw86cn6jwrgmg3fs6i3sw3qc9r6lycfkjf5qrnzd1yi";
};
preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else "";
diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix
index 01dea9c35e3..8ef32dab95a 100644
--- a/pkgs/tools/package-management/dpkg/default.nix
+++ b/pkgs/tools/package-management/dpkg/default.nix
@@ -43,6 +43,6 @@ stdenv.mkDerivation {
description = "The Debian package manager";
homepage = http://wiki.debian.org/Teams/Dpkg;
platforms = platforms.linux;
- maintainers = maintainers.mornfall;
+ maintainers = [ maintainers.mornfall ];
};
}
diff --git a/pkgs/tools/package-management/gem-nix/default.nix b/pkgs/tools/package-management/gem-nix/default.nix
new file mode 100644
index 00000000000..e048122b287
--- /dev/null
+++ b/pkgs/tools/package-management/gem-nix/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, rubygems, rubyLibs, ruby, makeWrapper }:
+
+stdenv.mkDerivation rec {
+ name = "gem-nix";
+
+ buildInputs = [ ruby rubygems rubyLibs.nix makeWrapper ];
+
+ phases = ["installPhase"];
+
+ installPhase = ''
+ mkdir -p $out/bin
+ echo 'exec ${rubygems}/bin/gem nix "$@"' >> $out/bin/gem-nix
+ chmod +x $out/bin/gem-nix
+ wrapProgram $out/bin/gem-nix \
+ --set GEM_PATH $GEM_PATH
+ '';
+
+ meta = with stdenv.lib; {
+ description = "gem nix command in a nice wrapper";
+ platforms = platforms.unix;
+ maintainers = [ maintainers.iElectric ];
+ };
+}
diff --git a/pkgs/tools/package-management/koji/default.nix b/pkgs/tools/package-management/koji/default.nix
new file mode 100644
index 00000000000..7f03ed1625e
--- /dev/null
+++ b/pkgs/tools/package-management/koji/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, pythonPackages, python }:
+
+stdenv.mkDerivation rec {
+ name = "koji-1.8";
+
+ src = fetchurl {
+ url = "https://fedorahosted.org/released/koji/koji-1.8.0.tar.bz2";
+ sha256 = "10dph209h4jgajb5jmbjhqy4z4hd22i7s2d93vm3ikdf01i8iwf1";
+ };
+
+ propagatedBuildInputs = [ pythonPackages.pycurl python ];
+
+ makeFlags = "DESTDIR=$(out)";
+
+ postInstall = ''
+ cp -R $out/nix/store/*/* $out/
+ rm -rf $out/nix
+ '';
+
+ meta.maintainers = [ stdenv.lib.maintainers.mornfall ];
+}
diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix
index bba53b0002f..a9f87c8ccf3 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -5,11 +5,11 @@
}:
stdenv.mkDerivation rec {
- name = "nix-1.8pre3766_809ca33";
+ name = "nix-1.8pre3843_3f8576";
src = fetchurl {
- url = "http://hydra.nixos.org/build/13584170/download/5/${name}.tar.xz";
- sha256 = "e6d91e73aabf8e8912f9701bf87b66089c197c5b8c8fbcc1707b888c88b96dfd";
+ url = "http://hydra.nixos.org/build/15588665/download/4/${name}.tar.xz";
+ sha256 = "23befe1b5ecff38cc1088b98f221893f87d47e3335b381090ce13e9dd6c6eb87";
};
nativeBuildInputs = [ perl pkgconfig ];
diff --git a/pkgs/tools/package-management/nox/default.nix b/pkgs/tools/package-management/nox/default.nix
index 93c671287d6..a25ef6e9580 100644
--- a/pkgs/tools/package-management/nox/default.nix
+++ b/pkgs/tools/package-management/nox/default.nix
@@ -6,16 +6,18 @@ pythonPackages.buildPythonPackage rec {
src = fetchgit {
url = "git://github.com/madjar/nox.git";
- rev = "49e4bb7de473ac5e446a76c292bdaefa7e20a1c6";
- sha256 = "1w1b2g44lj6nbs7f2j5dz5pijhfah3fyldspfb34zcv17j2nlv0b";
+ rev = "088249aa766c9fa929aa08a60f1a7eb41008da40";
+ sha256 = "0dscnmhm1va2h0jz7hh60nvjwxv5a92n5pp8c0g7hz76g67mi5xs";
leaveDotGit = true; # required by pbr
};
buildInputs = [ git pythonPackages.pbr makeWrapper ];
- pythonPath =
- [ pythonPackages.dogpile_cache
- pythonPackages.click
+ pythonPath = with pythonPackages; [
+ dogpile_cache
+ click
+ requests2
+ characteristic
];
postInstall = "wrapProgram $out/bin/nox --prefix PATH : ${nix}/bin";
diff --git a/pkgs/tools/package-management/python2nix/default.nix b/pkgs/tools/package-management/python2nix/default.nix
new file mode 100644
index 00000000000..1e84a81e524
--- /dev/null
+++ b/pkgs/tools/package-management/python2nix/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchFromGitHub, pythonPackages }:
+
+pythonPackages.buildPythonPackage rec {
+ name = "python2nix-20140927";
+
+ src = fetchFromGitHub {
+ owner = "proger";
+ repo = "python2nix";
+ rev = "84e3a5bbe82e5d9d694d6db8dabf73def4ac917b";
+ sha256 = "022gr0gw6azfi3iq4ggb3fhkw2jljs6n5rncn45hb5liwakigj8i";
+ };
+
+ propagatedBuildInputs = with pythonPackages; [ requests pip setuptools ];
+
+ meta = with stdenv.lib; {
+ maintainers = [ maintainers.iElectric ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/tools/security/aespipe/default.nix b/pkgs/tools/security/aespipe/default.nix
index dbbdb8e57a6..2fad2fe29e6 100644
--- a/pkgs/tools/security/aespipe/default.nix
+++ b/pkgs/tools/security/aespipe/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
description = "AES encrypting or decrypting pipe";
homepage = http://loop-aes.sourceforge.net/aespipe.README;
license = stdenv.lib.licenses.gpl2;
- maintainers = stdenv.lib.maintainers.goibhniu;
+ maintainers = [ stdenv.lib.maintainers.goibhniu ];
platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix
index 42af2e0b57e..c9a261ba97a 100644
--- a/pkgs/tools/security/ccid/default.nix
+++ b/pkgs/tools/security/ccid/default.nix
@@ -1,11 +1,12 @@
{ stdenv, fetchurl, pcsclite, pkgconfig, libusb1, perl }:
+
stdenv.mkDerivation rec {
- version = "1.4.16";
+ version = "1.4.18";
name = "ccid-${version}";
src = fetchurl {
url = "http://ftp.de.debian.org/debian/pool/main/c/ccid/ccid_${version}.orig.tar.bz2";
- sha256 = "0a0e6aa38863c79e38673c085254fa94fd0aa040b9622304a8d6d4222b7e7ea0";
+ sha256 = "1aj14lkmfaxkhk5swqfgn2x18j7fijxs0jnxnx9cdc9f5mxaknsz";
};
patchPhase = ''
@@ -18,11 +19,11 @@ stdenv.mkDerivation rec {
buildInputs = [ pcsclite pkgconfig libusb1 ];
- meta = {
+ meta = with stdenv.lib; {
description = "ccid drivers for pcsclite";
homepage = http://pcsclite.alioth.debian.org/;
- license = stdenv.lib.licenses.gpl2Plus;
- maintainers = with stdenv.lib.maintainers; [viric];
- platforms = with stdenv.lib.platforms; linux;
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ viric wkennington ];
+ platforms = with platforms; linux;
};
}
diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix
index fc43f01b344..7dc13b3d11b 100644
--- a/pkgs/tools/security/clamav/default.nix
+++ b/pkgs/tools/security/clamav/default.nix
@@ -1,26 +1,30 @@
-{ stdenv, fetchurl, zlib, bzip2, libiconv }:
+{ stdenv, fetchurl, zlib, bzip2, libiconv, libxml2, openssl, ncurses, curl }:
stdenv.mkDerivation rec {
name = "clamav-${version}";
- version = "0.98.1";
+ version = "0.98.4";
src = fetchurl {
url = "mirror://sourceforge/clamav/clamav-${version}.tar.gz";
- sha256 = "1p13n8g3b88cxwxj07if9z1d2cav1ib94v6cq4r4bpacfd6yix9m";
+ sha256 = "071yzamalj3rf7kl2jvc35ipnk1imdkq5ylbb8whyxfgmd3nf06k";
};
- buildInputs = [ zlib bzip2 libiconv ];
+ buildInputs = [ zlib bzip2 libiconv libxml2 openssl ncurses curl ];
configureFlags = [
"--with-zlib=${zlib}"
"--with-libbz2-prefix=${bzip2}"
"--with-iconv-dir=${libiconv}"
+ "--with-xml=${libxml2}"
+ "--with-openssl=${openssl}"
+ "--with-libncurses-prefix=${ncurses}"
+ "--with-libcurl=${curl}"
"--disable-clamav" ];
meta = with stdenv.lib; {
homepage = http://www.clamav.net;
description = "Antivirus engine designed for detecting Trojans, viruses, malware and other malicious threats";
license = licenses.gpl2;
- maintainers = [ maintainers.phreedom ];
+ maintainers = [ maintainers.phreedom maintainers.robberer ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/tools/security/gnupg/default.nix b/pkgs/tools/security/gnupg/default.nix
index 64e2be90d30..45a25d7e242 100644
--- a/pkgs/tools/security/gnupg/default.nix
+++ b/pkgs/tools/security/gnupg/default.nix
@@ -1,17 +1,10 @@
-# Remember to install Pinentry and
-# 'echo "pinentry-program `which pinentry-gtk-2`" >> ~/.gnupg/gpg-agent.conf'.
-
{ fetchurl, stdenv, readline, zlib, libgpgerror, pth, libgcrypt, libassuan
, libksba, coreutils, libiconvOrEmpty
-, useLdap ? true, openldap ? null, useBzip2 ? true, bzip2 ? null
-, useUsb ? true, libusb ? null, useCurl ? true, curl ? null
+# Each of the dependencies below are optional.
+# Gnupg can be built without them at the cost of reduced functionality.
+, pinentry ? null, openldap ? null, bzip2 ? null, libusb ? null, curl ? null
}:
-assert useLdap -> (openldap != null);
-assert useBzip2 -> (bzip2 != null);
-assert useUsb -> (libusb != null);
-assert useCurl -> (curl != null);
-
stdenv.mkDerivation rec {
name = "gnupg-2.0.26";
@@ -21,18 +14,18 @@ stdenv.mkDerivation rec {
};
buildInputs
- = [ readline zlib libgpgerror libgcrypt libassuan libksba pth ]
- ++ libiconvOrEmpty
- ++ stdenv.lib.optional useLdap openldap
- ++ stdenv.lib.optional useBzip2 bzip2
- ++ stdenv.lib.optional useUsb libusb
- ++ stdenv.lib.optional useCurl curl;
+ = [ readline zlib libgpgerror libgcrypt libassuan libksba pth
+ openldap bzip2 libusb curl ]
+ ++ libiconvOrEmpty;
patchPhase = ''
find tests -type f | xargs sed -e 's@/bin/pwd@${coreutils}&@g' -i
- find . -name pcsc-wrapper.c | xargs sed -i 's/typedef unsinged int pcsc_dword_t/typedef unsigned int pcsc_dword_t/'
'';
+ configureFlags =
+ if pinentry != null then "--with-pinentry-pgm=${pinentry}/bin/pinentry"
+ else "";
+
checkPhase="GNUPGHOME=`pwd` ./agent/gpg-agent --daemon make check";
doCheck = true;
@@ -54,7 +47,7 @@ stdenv.mkDerivation rec {
S/MIME.
'';
- maintainers = with stdenv.lib.maintainers; [ urkud ];
+ maintainers = with stdenv.lib.maintainers; [ roconnor urkud ];
platforms = stdenv.lib.platforms.all;
};
}
diff --git a/pkgs/tools/security/gnupg/git.nix b/pkgs/tools/security/gnupg/git.nix
deleted file mode 100644
index 69a0a68319f..00000000000
--- a/pkgs/tools/security/gnupg/git.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-# Remember to install Pinentry and
-# 'echo "pinentry-program `which pinentry-gtk-2`" >> ~/.gnupg/gpg-agent.conf'.
-
-{ fetchgit, stdenv, readline, zlib, libgpgerror, npth, libgcrypt, libassuan
-, libksba, coreutils, autoconf, automake, transfig, ghostscript, texinfo
-, useLdap ? true, openldap ? null, useBzip2 ? true, bzip2 ? null, useUsb ? true
-, libusb ? null, useCurl ? true, curl ? null
-}:
-
-assert useLdap -> (openldap != null);
-assert useBzip2 -> (bzip2 != null);
-assert useUsb -> (libusb != null);
-assert useCurl -> (curl != null);
-
-stdenv.mkDerivation rec {
- name = "gnupg-2.1pre-git20120407";
-
- src = fetchgit {
- url = "git://git.gnupg.org/gnupg.git";
- rev = "f1e1387bee286c7434f0462185048872bcdb4484";
- sha256 = "8f5a14587beccdd3752f9e430e56c6ea2d393dddb7843bfc17029e1a309045bb";
- };
-
- buildInputs = [ readline zlib libgpgerror npth libgcrypt libassuan libksba
- autoconf automake transfig ghostscript texinfo ]
- ++ stdenv.lib.optional useLdap openldap
- ++ stdenv.lib.optional useBzip2 bzip2
- ++ stdenv.lib.optional useUsb libusb
- ++ stdenv.lib.optional useCurl curl;
-
- patchPhase = ''
- find tests -type f | xargs sed -e 's@/bin/pwd@${coreutils}&@g' -i
- '';
-
- preConfigure = "autoreconf -v";
- configureFlags = "--enable-maintainer-mode";
-
- meta = {
- description = "GNU Privacy Guard (GnuPG), GNU Project's implementation of the OpenPGP standard";
-
- longDescription = ''
- GnuPG is the GNU project's complete and free implementation of
- the OpenPGP standard as defined by RFC4880. GnuPG allows to
- encrypt and sign your data and communication, features a
- versatile key managment system as well as access modules for all
- kind of public key directories. GnuPG, also known as GPG, is a
- command line tool with features for easy integration with other
- applications. A wealth of frontend applications and libraries
- are available. Version 2 of GnuPG also provides support for
- S/MIME.
- '';
-
- homepage = http://gnupg.org/;
-
- license = stdenv.lib.licenses.gpl3Plus;
- };
-}
diff --git a/pkgs/tools/security/haveged/default.nix b/pkgs/tools/security/haveged/default.nix
index 1701d4cb46f..91949cf0893 100644
--- a/pkgs/tools/security/haveged/default.nix
+++ b/pkgs/tools/security/haveged/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
'';
homepage = http://www.issihosts.com/haveged/;
license = stdenv.lib.licenses.gpl3;
- maintainers = stdenv.lib.maintainers.iElectric;
+ maintainers = [ stdenv.lib.maintainers.iElectric ];
platforms = stdenv.lib.platforms.unix;
};
}
diff --git a/pkgs/tools/security/john/default.nix b/pkgs/tools/security/john/default.nix
new file mode 100644
index 00000000000..97f67dfbd71
--- /dev/null
+++ b/pkgs/tools/security/john/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchgit, openssl, nss, nspr, krb5, gmp, zlib, libpcap, re2 }:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+ name = "JohnTheRipper-${version}";
+ version = "8a3e3c1d";
+ buildInputs = [ openssl nss nspr krb5 gmp zlib libpcap re2 ];
+ preConfigure = ''cd src'';
+ installPhase = ''
+ ensureDir $out/share/john/
+ ensureDir $out/bin
+ cp -R ../run/* $out/share/john
+ ln -s $out/share/john/john $out/bin/john
+ '';
+ src = fetchgit {
+ url = https://github.com/magnumripper/JohnTheRipper.git;
+ rev = "93f061bc41652c94ae049b52572aac709d18aa4c";
+ sha256 = "1rnfi09830n34jcqaxmsam54p4zsq9a49ic2ljh44lahcipympvy";
+ };
+ meta = {
+ description = "John the Ripper password cracker";
+ license = licenses.gpl2;
+ homepage = https://github.com/magnumripper/JohnTheRipper/;
+ maintainers = with maintainers; [offline];
+ platforms = with platforms; unix;
+ };
+}
diff --git a/pkgs/tools/security/logkeys/default.nix b/pkgs/tools/security/logkeys/default.nix
new file mode 100644
index 00000000000..ae7fa2316bc
--- /dev/null
+++ b/pkgs/tools/security/logkeys/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchgit, which, procps, kbd }:
+
+stdenv.mkDerivation rec {
+ name = "logkeys-${version}";
+ version = "5ef6b0dcb9e3";
+
+ src = fetchgit {
+ url = "https://code.google.com/p/logkeys/";
+ rev = "5ef6b0dcb9e38e6137ad1579d624ec12107c56c3";
+ sha256 = "02p0l92l0fq069g31ks6xbqavzxa9njj9460vw2jsa7livcn2z9d";
+ };
+
+ buildInputs = [ which procps kbd ];
+
+ postPatch = ''
+ substituteInPlace src/Makefile.in --replace 'root' '$(id -u)'
+ substituteInPlace configure --replace '/dev/input' '/tmp'
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A GNU/Linux keylogger that works!";
+ license = licenses.gpl3;
+ homepage = http://code.google.com/p/logkeys/;
+ maintainers = with maintainers; [offline];
+ platforms = with platforms; linux;
+ };
+}
diff --git a/pkgs/tools/security/meo/default.nix b/pkgs/tools/security/meo/default.nix
index be678b18dda..051b6579f17 100644
--- a/pkgs/tools/security/meo/default.nix
+++ b/pkgs/tools/security/meo/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
buildFlags = "QMAKE=qmake";
- buildInputs = [ openssl pcre qt4 boost pkcs11helper ];
+ buildInputs = [ openssl pcre qt4 boost boost.lib pkcs11helper ];
preConfigure = ''
sed -i s,-mt$,, meo-gui/meo-gui.pro
diff --git a/pkgs/tools/security/mfoc/default.nix b/pkgs/tools/security/mfoc/default.nix
new file mode 100644
index 00000000000..f99db572b6c
--- /dev/null
+++ b/pkgs/tools/security/mfoc/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, pkgconfig, libnfc }:
+
+stdenv.mkDerivation rec {
+ name = "mfoc-${version}";
+ version = "0.10.6";
+
+ src = fetchurl {
+ url = "http://mfoc.googlecode.com/files/${name}.tar.gz";
+ sha1 = "3adce3029dce9124ff3bc7d0fad86fa0c374a9e3";
+ };
+
+ patches = [./mf_mini.patch];
+
+ buildInputs = [ pkgconfig libnfc ];
+
+ meta = with stdenv.lib; {
+ description = "Mifare Classic Offline Cracker";
+ license = licenses.gpl2;
+ homepage = http://code.google.com/p/mfoc/;
+ maintainers = with maintainers; [ offline ];
+ platforms = with platforms; unix;
+ };
+}
diff --git a/pkgs/tools/security/mfoc/mf_mini.patch b/pkgs/tools/security/mfoc/mf_mini.patch
new file mode 100644
index 00000000000..02bd656d602
--- /dev/null
+++ b/pkgs/tools/security/mfoc/mf_mini.patch
@@ -0,0 +1,96 @@
+diff --git a/src/mfoc.c b/src/mfoc.c
+index 0cb917d..195de68 100644
+--- a/src/mfoc.c
++++ b/src/mfoc.c
+@@ -93,8 +93,8 @@ int main(int argc, char *const argv[])
+ {0x58, 0x7e, 0xe5, 0xf9, 0x35, 0x0f},
+ {0xa0, 0x47, 0x8c, 0xc3, 0x90, 0x91},
+ {0x53, 0x3c, 0xb6, 0xc7, 0x23, 0xf6},
+- {0x8f, 0xd0, 0xa4, 0xf2, 0x56, 0xe9}
+-
++ {0x8f, 0xd0, 0xa4, 0xf2, 0x56, 0xe9},
++ {0xb4, 0xc1, 0x32, 0x43, 0x9e, 0xef}
+ };
+
+ mftag t;
+@@ -219,12 +219,31 @@ int main(int argc, char *const argv[])
+ goto error;
+ }
+
+- // Save tag's block size (b4K)
+- t.b4K = (t.nt.nti.nai.abtAtqa[1] == 0x02);
+ t.authuid = (uint32_t) bytes_to_num(t.nt.nti.nai.abtUid + t.nt.nti.nai.szUidLen - 4, 4);
+
+- t.num_blocks = (t.b4K) ? 0xff : 0x3f;
+- t.num_sectors = t.b4K ? NR_TRAILERS_4k : NR_TRAILERS_1k;
++ // Get Mifare Classic type from SAK
++ // see http://www.nxp.com/documents/application_note/AN10833.pdf Section 3.2
++ switch (t.nt.nti.nai.btSak)
++ {
++ case 0x08:
++ printf("Found Mifare Classic 1k tag\n");
++ t.num_sectors = NR_TRAILERS_1k;
++ t.num_blocks = NR_BLOCKS_1k;
++ break;
++ case 0x09:
++ printf("Found Mifare Classic Mini tag\n");
++ t.num_sectors = NR_TRAILERS_MINI;
++ t.num_blocks = NR_BLOCKS_MINI;
++ break;
++ case 0x18:
++ printf("Found Mifare Classic 4k tag\n");
++ t.num_sectors = NR_TRAILERS_4k;
++ t.num_blocks = NR_BLOCKS_4k;
++ break;
++ defaul:
++ ERR("Cannot determine card type from SAK");
++ goto error;
++ }
+
+ t.sectors = (void *) calloc(t.num_sectors, sizeof(sector));
+ if (t.sectors == NULL) {
+@@ -564,7 +583,7 @@ void usage(FILE *stream, int errno)
+ fprintf(stream, " k try the specified key in addition to the default keys\n");
+ // fprintf(stream, " D number of distance probes, default is 20\n");
+ // fprintf(stream, " S number of sets with keystreams, default is 5\n");
+- fprintf(stream, " P number of probes per sector, instead of default of 20\n");
++ fprintf(stream, " P number of probes per sector, instead of default of 150\n");
+ fprintf(stream, " T nonce tolerance half-range, instead of default of 20\n (i.e., 40 for the total range, in both directions)\n");
+ // fprintf(stream, " s specify the list of sectors to crack, for example -s 0,1,3,5\n");
+ fprintf(stream, " O file in which the card contents will be written (REQUIRED)\n");
+diff --git a/src/mfoc.h b/src/mfoc.h
+index b411670..532e834 100644
+--- a/src/mfoc.h
++++ b/src/mfoc.h
+@@ -2,11 +2,21 @@
+ #define TRY_KEYS 50
+
+ // Number of trailers == number of sectors
+-// 16x64b = 16
++// Mifare Classic 1k 16x64b = 16
+ #define NR_TRAILERS_1k (16)
+-// 32x64b + 8*256b = 40
++// Mifare Classic Mini
++#define NR_TRAILERS_MINI (5)
++// Mifare Classic 4k 32x64b + 8*256b = 40
+ #define NR_TRAILERS_4k (40)
+
++// Number of blocks
++// Mifare Classic 1k
++#define NR_BLOCKS_1k 0x3f
++// Mifare Classic Mini
++#define NR_BLOCKS_MINI 0x13
++// Mifare Classic 4k
++#define NR_BLOCKS_4k 0xff
++
+ #define MAX_FRAME_LEN 264
+
+ // Used for counting nonce distances, explore [nd-value, nd+value]
+@@ -46,7 +56,6 @@ typedef struct {
+ uint8_t num_sectors;
+ uint8_t num_blocks;
+ uint32_t authuid;
+- bool b4K;
+ } mftag;
+
+ typedef struct {
diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix
index 2737cc43575..feb16ce13c5 100644
--- a/pkgs/tools/security/pcsclite/default.nix
+++ b/pkgs/tools/security/pcsclite/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, udev, dbus_libs, perl }:
stdenv.mkDerivation rec {
- version = "1.8.11";
+ version = "1.8.12";
name = "pcsclite-${version}";
src = fetchurl {
url = "https://alioth.debian.org/frs/download.php/file/3991/pcsc-lite-${version}.tar.bz2";
- sha256 = "945041c94c53959ae5a767616a4ec5099fe67f549bfd344e8bd0cfe7a3c71ac6";
+ sha256 = "1ihsqyiygkyhid739zcvaizyd7q9qm76lqb7lzjrm5ak9k4l2l4l";
};
# The OS should care on preparing the drivers into this location
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
description = "Middleware to access a smart card using SCard API (PC/SC)";
homepage = http://pcsclite.alioth.debian.org/;
license = licenses.bsd3;
- maintainers = with maintainers; [viric];
+ maintainers = with maintainers; [ viric wkennington ];
platforms = with platforms; linux;
};
}
diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/tools/security/pius/default.nix
index 2a4995f4579..ae9b3be9ee2 100644
--- a/pkgs/tools/security/pius/default.nix
+++ b/pkgs/tools/security/pius/default.nix
@@ -1,13 +1,13 @@
{ fetchurl, stdenv, python, gnupg }:
-let version = "2.0.9"; in
+let version = "2.0.11"; in
stdenv.mkDerivation {
name = "pius-${version}";
namePrefix = "";
src = fetchurl {
url = "mirror://sourceforge/pgpius/pius/${version}/pius-${version}.tar.bz2";
- sha256 = "1g1jly3wl4ks6h8ydkygyl2c4i7v3z91rg42005m6vm70y1d8b3d";
+ sha256 = "0pdbyqz6k0bm182cz81ss7yckmpms5qhrrw0wcr4a1srzcjyzf5f";
};
buildInputs = [ python ];
@@ -41,6 +41,6 @@ stdenv.mkDerivation {
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.gnu;
- maintainers = [ ];
+ maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
};
}
diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix
index ab46af5a1cd..167c369e3bb 100644
--- a/pkgs/tools/security/sudo/default.nix
+++ b/pkgs/tools/security/sudo/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, coreutils, pam, groff }:
+{ stdenv, fetchurl, coreutils, pam, groff
+, sendmailPath ? "/var/setuid-wrappers/sendmail"
+}:
stdenv.mkDerivation rec {
name = "sudo-1.8.10p3";
@@ -17,6 +19,11 @@ stdenv.mkDerivation rec {
"--with-rundir=/var/run"
"--with-vardir=/var/db/sudo"
"--with-logpath=/var/log/sudo.log"
+ "--with-sendmail=${sendmailPath}"
+ ];
+
+ configureFlagsArray = [
+ "--with-passprompt=[sudo] password for %p: " # intentional trailing space
];
postConfigure =
diff --git a/pkgs/tools/security/super/default.nix b/pkgs/tools/security/super/default.nix
index 0d2e34a4125..c88efb23531 100644
--- a/pkgs/tools/security/super/default.nix
+++ b/pkgs/tools/security/super/default.nix
@@ -1,14 +1,20 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, fetchpatch }:
stdenv.mkDerivation rec {
name = "super-3.30.0";
src = fetchurl {
name = "${name}.tar.gz";
- url = "http://ftp.ucolick.org/pub/users/will/${name}-tar.gz";
- sha256 = "1sxgixx1yg7h8g9799v79rk15gb39gn7p7fx032c078wxx38qwq4";
+ url = "http://www.ucolick.org/~will/RUE/super/${name}-tar.gz";
+ sha256 = "0k476f83w7f45y9jpyxwr00ikv1vhjiq0c26fgjch9hnv18icvwy";
};
+ patches = [
+ (fetchpatch { url = http://anonscm.debian.org/cgit/users/robert/super.git/plain/debian/patches/14-Fix-unchecked-setuid-call.patch;
+ sha256 = "08m9hw4kyfjv0kqns1cqha4v5hkgp4s4z0q1rgif1fnk14xh7wqh";
+ })
+ ];
+
NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE";
configureFlags = "--sysconfdir=/etc --localstatedir=/var";
@@ -16,7 +22,7 @@ stdenv.mkDerivation rec {
installFlags = "sysconfdir=$(out)/etc localstatedir=$(TMPDIR)";
meta = {
- homepage = http://ftp.ucolick.org/pub/users/will/;
+ homepage = http://www.ucolick.org/~will/;
description = "Allows users to execute scripts as if they were root";
longDescription =
''
diff --git a/pkgs/tools/security/thc-hydra/default.nix b/pkgs/tools/security/thc-hydra/default.nix
new file mode 100644
index 00000000000..71f7d25155f
--- /dev/null
+++ b/pkgs/tools/security/thc-hydra/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, openssl, libidn, ncurses, pcre, libssh }:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+ name = "hydra-7.5";
+
+ src = fetchurl {
+ url = "http://www.thc.org/releases/${name}.tar.gz";
+ sha256 = "1dhavbn2mcm6c2c1qw29ipbpmczax3vhhlxzwn49c8cq471yg4vj";
+ };
+
+ preConfigure = ''
+ substituteInPlace configure --replace "\$LIBDIRS" "${openssl}/lib ${pcre}/lib ${libssh}/lib"
+ substituteInPlace configure --replace "\$INCDIRS" "${openssl}/include ${pcre}/include ${libssh}/include"
+ '';
+
+ buildInputs = [ openssl libidn ncurses pcre libssh ];
+
+ meta = {
+ description = "A very fast network logon cracker which support many different services";
+ license = licenses.agpl3;
+ homepage = https://www.thc.org/thc-hydra/;
+ maintainers = with maintainers; [offline];
+ platforms = with platforms; unix;
+ };
+}
diff --git a/pkgs/tools/system/ansible/default.nix b/pkgs/tools/system/ansible/default.nix
index b3d40712926..4491bf7e484 100644
--- a/pkgs/tools/system/ansible/default.nix
+++ b/pkgs/tools/system/ansible/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, pythonPackages, python }:
pythonPackages.buildPythonPackage rec {
- version = "1.6.10";
+ version = "1.7.1";
name = "ansible-${version}";
namePrefix = "";
-
+
src = fetchurl {
- url = "https://github.com/ansible/ansible/archive/v${version}.tar.gz";
- sha256 = "0j133353skzb6ydrqqgfkzbkkj1zaibl1x8sgl0arnfma8qky1g1";
+ url = "http://releases.ansible.com/ansible/ansible-${version}.tar.gz";
+ sha1 = "4f4be4d45f28f52e4ab0c063efb66c7b9f482a51";
};
prePatch = ''
@@ -32,6 +32,6 @@ pythonPackages.buildPythonPackage rec {
description = "A simple automation tool";
license = licenses.gpl3;
maintainers = [ maintainers.joamaki ];
- platforms = platforms.linux; # Only tested on Linux
+ platforms = platforms.linux ++ [ "x86_64-darwin" ];
};
}
diff --git a/pkgs/tools/system/at/default.nix b/pkgs/tools/system/at/default.nix
index 2964db34e12..5108174c887 100644
--- a/pkgs/tools/system/at/default.nix
+++ b/pkgs/tools/system/at/default.nix
@@ -1,26 +1,22 @@
-{ fetchurl, stdenv, bison, flex, pam, ssmtp }:
+{ fetchurl, stdenv, bison, flex, pam, sendmailPath ? "/var/setuid-wrappers/sendmail" }:
stdenv.mkDerivation {
- name = "at-3.1.14";
+ name = "at-3.1.15";
src = fetchurl {
# Debian is apparently the last location where it can be found.
- url = mirror://debian/pool/main/a/at/at_3.1.14.orig.tar.gz;
- sha256 = "cd092bf05d29c25b286f55a960ce8b8c3c5beb571d86ed8eb1dfb3b61291b3ae";
+ url = mirror://debian/pool/main/a/at/at_3.1.15.orig.tar.gz;
+ sha256 = "1z7pgglr0zmwapb4sc1bdb3z0hgig1asyzqv4gs5xafmjd94za03";
};
patches = [ ./install.patch ];
buildInputs =
- [ bison flex pam
- # `configure' and `atd' want the `sendmail' command.
- ssmtp
- ];
+ [ bison flex pam ];
preConfigure =
''
- export PATH="${ssmtp}/sbin:$PATH"
-
+ export SENDMAIL=${sendmailPath}
# Purity: force atd.pid to be placed in /var/run regardless of
# whether it exists now.
substituteInPlace ./configure --replace "test -d /var/run" "true"
diff --git a/pkgs/tools/system/dcfldd/default.nix b/pkgs/tools/system/dcfldd/default.nix
new file mode 100644
index 00000000000..27ebbf3518f
--- /dev/null
+++ b/pkgs/tools/system/dcfldd/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ name = "dcfldd-1.3.4-1";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/dcfldd/${name}.tar.gz";
+ sha256 = "1y6mwsvm75f5jzxsjjk0yhf8xnpmz6y8qvcxfandavx59lc3l57m";
+ };
+
+ buildInputs = [ ];
+
+ meta = with stdenv.lib; {
+ description = "an enhanced version of GNU dd";
+
+ homepage = http://dcfldd.sourceforge.net/;
+
+ license = licenses.gpl2;
+
+ platforms = platforms.all;
+ maintainers = with maintainers; [ qknight ];
+ };
+}
diff --git a/pkgs/tools/system/dd_rescue/default.nix b/pkgs/tools/system/dd_rescue/default.nix
index 9c7f0413421..7b3e62a1bc0 100644
--- a/pkgs/tools/system/dd_rescue/default.nix
+++ b/pkgs/tools/system/dd_rescue/default.nix
@@ -1,10 +1,11 @@
{ stdenv, fetchurl, autoconf }:
stdenv.mkDerivation rec {
- name = "dd_rescue-1.42.1";
+ version = "1.46";
+ name = "dd_rescue-${version}";
src = fetchurl {
- sha256 = "0g2d292m1cnp8syy19hh5jvly3zy7lcvcj563wgjnf20ppm2diaq";
+ sha256 = "1fhs4jl5pkyn4aq75fxczrgnsj2m0kz9hfa7dhxy93vp7xcba2cy";
url="http://www.garloff.de/kurt/linux/ddrescue/${name}.tar.gz";
};
@@ -33,5 +34,8 @@ stdenv.mkDerivation rec {
description = "A tool to copy data from a damaged block device";
maintainers = with maintainers; [ raskin iElectric ];
platforms = with platforms; linux;
+ downloadPage = "http://www.garloff.de/kurt/linux/ddrescue/";
+ inherit version;
+ updateWalker = true;
};
}
diff --git a/pkgs/tools/system/dfc/default.nix b/pkgs/tools/system/dfc/default.nix
new file mode 100644
index 00000000000..84150b46837
--- /dev/null
+++ b/pkgs/tools/system/dfc/default.nix
@@ -0,0 +1,21 @@
+{stdenv, fetchurl, cmake, gettext}:
+
+stdenv.mkDerivation rec {
+ name = "dfc-3.0.4";
+
+ src = fetchurl {
+ url = "http://projects.gw-computing.net/attachments/download/79/dfc-3.0.4.tar.gz";
+ sha256 = "0bdc2edb92c7f740a0b7d3fa75eb134adf197ba711bfa589ab51c691fabd617e";
+ };
+
+ buildInputs = [ cmake gettext ];
+
+ meta = {
+ homepage = "http://projects.gw-computing.net/projects/dfc";
+ description = "displays file system space usage using graphs and colors";
+ license="free";
+ maintainers = with stdenv.lib.maintainers; [qknight];
+ platforms = with stdenv.lib.platforms; all;
+ };
+}
+
diff --git a/pkgs/tools/system/di/default.nix b/pkgs/tools/system/di/default.nix
new file mode 100644
index 00000000000..dc15ce13bcc
--- /dev/null
+++ b/pkgs/tools/system/di/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ name = "di-4.35";
+
+ src = fetchurl {
+ url = "http://gentoo.com/di/${name}.tar.gz";
+ sha256 = "1lkiggvdm6wi14xy8845w6mqqr50j2q7g0i2rdcs7qw5gb7gmprc";
+ };
+
+ makeFlags = "INSTALL_DIR=$(out)";
+
+ meta = with stdenv.lib; {
+ description = "A disk information utility, displaying everything (and more) that your 'df' command does";
+ homepage = http://www.gentoo.com/di/;
+ license = licenses.zlib;
+ maintainers = with maintainers; [ manveru ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/tools/system/dog/default.nix b/pkgs/tools/system/dog/default.nix
new file mode 100644
index 00000000000..9c98da6ac85
--- /dev/null
+++ b/pkgs/tools/system/dog/default.nix
@@ -0,0 +1,25 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation rec {
+ name = "dog-1.7";
+
+ src = fetchurl {
+ url = "http://archive.debian.org/debian/pool/main/d/dog/dog_1.7.orig.tar.gz";
+ sha256 = "3ef25907ec5d1dfb0df94c9388c020b593fbe162d7aaa9bd08f35d2a125af056";
+ };
+
+ installPhase = ''
+ mkdir -p $out/bin
+ mkdir -p $out/man/man1
+ cp dog.1 $out/man/man1
+ cp dog $out/bin
+ '';
+
+ meta = {
+ homepage = "http://lwn.net/Articles/421072/";
+ description = "a cat replacement";
+ license="GPLv2+";
+ maintainers = with stdenv.lib.maintainers; [qknight];
+ platforms = with stdenv.lib.platforms; all;
+ };
+}
diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix
index 48562adffeb..8f94b21a771 100644
--- a/pkgs/tools/system/freeipmi/default.nix
+++ b/pkgs/tools/system/freeipmi/default.nix
@@ -1,11 +1,12 @@
{ fetchurl, stdenv, libgcrypt, readline }:
stdenv.mkDerivation rec {
- name = "freeipmi-1.3.4";
+ version = "1.4.5";
+ name = "freeipmi-${version}";
src = fetchurl {
url = "mirror://gnu/freeipmi/${name}.tar.gz";
- sha256 = "0gadf3yj019y3rvgf34pxk502p0p6nrhy6nwldvvir5rknndxh63";
+ sha256 = "033zakrk3kvi4y41kslicr90b3yb2kj052cl6nbja7ybn70y9nkz";
};
buildInputs = [ libgcrypt readline ];
@@ -30,10 +31,14 @@ stdenv.mkDerivation rec {
'';
homepage = http://www.gnu.org/software/freeipmi/;
+ downloadPage = "http://www.gnu.org/software/freeipmi/download.html";
license = stdenv.lib.licenses.gpl3Plus;
maintainers = with stdenv.lib.maintainers; [ raskin ];
platforms = stdenv.lib.platforms.gnu; # arbitrary choice
+
+ updateWalker = true;
+ inherit version;
};
}
diff --git a/pkgs/tools/system/ioping/default.nix b/pkgs/tools/system/ioping/default.nix
index 52d32b4e838..588da0624ce 100644
--- a/pkgs/tools/system/ioping/default.nix
+++ b/pkgs/tools/system/ioping/default.nix
@@ -10,16 +10,15 @@ let
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
baseName="ioping";
- version="0.7";
+ version = "0.8";
name="${baseName}-${version}";
url="http://ioping.googlecode.com/files/${name}.tar.gz";
- hash="1c0k9gsq7rr9fqh6znn3i196l84zsm44nq3pl1b7grsnnbp2hki3";
};
in
rec {
src = a.fetchurl {
url = sourceInfo.url;
- sha256 = sourceInfo.hash;
+ sha256 = "0j7yal61nby1lkg9wnr6lxfljbd7wl3n0z8khqwvc9lf57bxngz2";
};
inherit (sourceInfo) name version;
@@ -40,11 +39,8 @@ rec {
platforms = with a.lib.platforms;
linux;
license = a.lib.licenses.gpl3Plus;
- };
- passthru = {
- updateInfo = {
- downloadPage = "http://code.google.com/p/ioping/downloads/list";
- };
+ downloadPage = "http://code.google.com/p/ioping/downloads/list";
+ inherit version;
};
}) x
diff --git a/pkgs/tools/system/ioping/default.upstream b/pkgs/tools/system/ioping/default.upstream
new file mode 100644
index 00000000000..e51cb487852
--- /dev/null
+++ b/pkgs/tools/system/ioping/default.upstream
@@ -0,0 +1,5 @@
+url http://code.google.com/p/ioping/downloads/list
+version_link '[.]tar[.][a-z0-9]+$'
+process 'code[.]google[.]com//' ''
+
+do_overwrite() { do_overwrite_just_version; }
diff --git a/pkgs/tools/system/ipmiutil/default.nix b/pkgs/tools/system/ipmiutil/default.nix
index c5f33c32359..46c36926c36 100644
--- a/pkgs/tools/system/ipmiutil/default.nix
+++ b/pkgs/tools/system/ipmiutil/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
baseName = "ipmiutil";
- version = "2.9.3";
+ version = "2.9.4";
name = "${baseName}-${version}";
src = fetchurl {
url = "mirror://sourceforge/project/${baseName}/${name}.tar.gz";
- sha256 = "1dwyxp4jn5wxzyahd0x839kj1q7z6xin1wybpx9na4xsgscj6v27";
+ sha256 = "1pmpmpc0wymnw8i2rxnyq3v2y7p8930b2rb8nw5w60x2vf15wlaa";
};
buildInputs = [ openssl ];
@@ -26,11 +26,7 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ raskin ];
platforms = platforms.linux;
license = licenses.bsd3;
- };
-
- passthru = {
- updateInfo = {
- downloadPage = "http://sourceforge.net/projects/ipmiutil/files/ipmiutil/";
- };
+ downloadPage = "http://sourceforge.net/projects/ipmiutil/files/ipmiutil/";
+ inherit version;
};
}
diff --git a/pkgs/tools/system/ipmiutil/default.upstream b/pkgs/tools/system/ipmiutil/default.upstream
new file mode 100644
index 00000000000..9ea779c8cdd
--- /dev/null
+++ b/pkgs/tools/system/ipmiutil/default.upstream
@@ -0,0 +1,4 @@
+url http://sourceforge.net/projects/ipmiutil/files/
+SF_version_tarball
+SF_redirect
+minimize_overwrite
diff --git a/pkgs/tools/system/sleuthkit/default.nix b/pkgs/tools/system/sleuthkit/default.nix
index 0148e3c699e..016e2ccda37 100644
--- a/pkgs/tools/system/sleuthkit/default.nix
+++ b/pkgs/tools/system/sleuthkit/default.nix
@@ -1,11 +1,12 @@
{ stdenv, fetchurl, libewf, afflib, openssl, zlib }:
stdenv.mkDerivation rec {
- name = "sleuthkit-3.2.2";
+ version = "4.1.3";
+ name = "sleuthkit-${version}";
src = fetchurl {
url = "mirror://sourceforge/sleuthkit/${name}.tar.gz";
- sha256 = "02hik5xvbgh1dpisvc3wlhhq1aprnlsk0spbw6h5khpbq9wqnmgj";
+ sha256 = "09q3ky4rpv18jasf5gc2hlivzadzl70jy4nnk23db1483aix5yb7";
};
enableParallelBuilding = true;
@@ -20,5 +21,6 @@ stdenv.mkDerivation rec {
maintainers = [ stdenv.lib.maintainers.raskin ];
platforms = stdenv.lib.platforms.linux;
license = "IBM Public License";
+ inherit version;
};
}
diff --git a/pkgs/tools/system/sleuthkit/default.upstream b/pkgs/tools/system/sleuthkit/default.upstream
new file mode 100644
index 00000000000..f8ffe9352ed
--- /dev/null
+++ b/pkgs/tools/system/sleuthkit/default.upstream
@@ -0,0 +1,5 @@
+url http://sourceforge.net/projects/sleuthkit/files/sleuthkit/
+SF_version_dir
+SF_version_tarball
+SF_redirect
+minimize_overwrite
diff --git a/pkgs/tools/text/dadadodo/default.nix b/pkgs/tools/text/dadadodo/default.nix
index 1485bbcd467..b2ccc090313 100644
--- a/pkgs/tools/text/dadadodo/default.nix
+++ b/pkgs/tools/text/dadadodo/default.nix
@@ -1,32 +1,22 @@
-a :
-let
- fetchurl = a.fetchurl;
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ name = "dadadodo-${version}";
+ version = "1.04";
- version = a.lib.attrByPath ["version"] "1.04" a;
- buildInputs = with a; [
-
- ];
-in
-rec {
src = fetchurl {
- url = "http://www.jwz.org/dadadodo/dadadodo-${version}.tar.gz";
+ url = "http://www.jwz.org/dadadodo/${name}.tar.gz";
sha256 = "1pzwp3mim58afjrc92yx65mmgr1c834s1v6z4f4gyihwjn8bn3if";
};
- inherit buildInputs;
- configureFlags = [];
-
- /* doConfigure should be removed if not needed */
- phaseNames = ["doMake" "doDeploy"];
- installFlags = "PREFIX=$out";
-
- doDeploy = a.fullDepEntry (''
+ installPhase = ''
mkdir -p $out/bin
cp dadadodo $out/bin
- '') [ "minInit" "doMake" "defEnsureDir"];
-
- name = "dadadodo-" + version;
- meta = {
+ '';
+
+ meta = with stdenv.lib; {
description = "Markov chain-based text generator";
+ homepage = http://www.jwz.org/dadadodo;
+ maintainers = with maintainers; [ pSub ];
};
}
diff --git a/pkgs/tools/text/diffstat/default.nix b/pkgs/tools/text/diffstat/default.nix
index e70dfaedddf..62b696715d9 100644
--- a/pkgs/tools/text/diffstat/default.nix
+++ b/pkgs/tools/text/diffstat/default.nix
@@ -1,11 +1,11 @@
{ fetchurl, stdenv }:
stdenv.mkDerivation rec {
- name = "diffstat-1.58";
+ name = "diffstat-1.59";
src = fetchurl {
url = "ftp://invisible-island.net/diffstat/${name}.tgz";
- sha256 = "14rpf5c05ff30f6vn6pn6pzy0k4g4is5im656ahsxff3k58i7mgs";
+ sha256 = "0w7jvfilbnfa9v3h8j8ipirvrj7n2x5gszfanzxvx748p10i8z96";
};
meta = with stdenv.lib; {
diff --git a/pkgs/tools/text/dos2unix/default.nix b/pkgs/tools/text/dos2unix/default.nix
index a87901eb5eb..6851ca89678 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 {
- name = "dos2unix-6.0.5";
+ name = "dos2unix-6.0.6";
src = fetchurl {
- url = http://waterlan.home.xs4all.nl/dos2unix/dos2unix-6.0.5.tar.gz;
- sha256 = "13w5blhv0i473y9lyrxh4axz4niyrxcpj4v2qiq3w5kamyp20czx";
+ url = http://waterlan.home.xs4all.nl/dos2unix/dos2unix-6.0.6.tar.gz;
+ sha256 = "0xnj4gmav1ypkgwmqldnq41b6l3cg08dyngkbygn9vrhlvlx9fwa";
};
configurePhase = ''
diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix
index 9bca0a91d4f..585f501e1fc 100644
--- a/pkgs/tools/text/highlight/default.nix
+++ b/pkgs/tools/text/highlight/default.nix
@@ -1,19 +1,16 @@
-{ stdenv, fetchurl, getopt, lua, boost }:
-
+{ stdenv, fetchurl, getopt, lua, boost, pkgconfig }:
+
stdenv.mkDerivation rec {
- name = "highlight-3.9";
+ name = "highlight-3.18";
src = fetchurl {
url = "http://www.andre-simon.de/zip/${name}.tar.bz2";
- sha256 = "1vysj34zz8gk5yhlzm7g6lbphb8y6zfbd9smfgsgwkyawfargrja";
+ sha256 = "0jsq78qb75sawwggbpx5pdqxk00wgjr1a0la0w8wihmamsjzgijm";
};
- buildInputs = [ getopt lua boost ];
+ buildInputs = [ getopt lua boost pkgconfig ];
- makeFlags = [
- "PREFIX=$(out)"
- "conf_dir=$(out)/etc/highlight/"
- ];
+ preConfigure = ''makeFlags="PREFIX=$out conf_dir=$out/etc/highlight"'';
meta = {
description = "Source code highlighting tool";
diff --git a/pkgs/tools/text/numdiff/default.nix b/pkgs/tools/text/numdiff/default.nix
index d5f8bb9ff35..9cef82e5e53 100644
--- a/pkgs/tools/text/numdiff/default.nix
+++ b/pkgs/tools/text/numdiff/default.nix
@@ -15,9 +15,9 @@ stdenv.mkDerivation {
line by line and field by field, ignoring small numeric differences
or/and different numeric formats.
'';
- homepage = "http://www.nongnu.org/numdiff/";
+ homepage = http://www.nongnu.org/numdiff/;
license = stdenv.lib.licenses.gpl3Plus;
- maintainers = stdenv.lib.maintainers.bbenoist;
+ maintainers = [ stdenv.lib.maintainers.bbenoist ];
platforms = stdenv.lib.platforms.gnu;
};
}
diff --git a/pkgs/tools/text/replace/default.nix b/pkgs/tools/text/replace/default.nix
index 72dbdbf647f..d6d1090652a 100644
--- a/pkgs/tools/text/replace/default.nix
+++ b/pkgs/tools/text/replace/default.nix
@@ -14,6 +14,10 @@ stdenv.mkDerivation {
makeFlags = "TREE=\$(out) MANTREE=\$(TREE)/share/man CC=${stdenv.cross.config}-gcc";
};
+ preBuild = ''
+ sed -e "s@/bin/mv@$(type -P mv)@" -i replace.h
+ '';
+
preInstall = "mkdir -p \$out/share/man";
postInstall = "mv \$out/bin/replace \$out/bin/replace-literal";
diff --git a/pkgs/tools/text/wdiff/default.nix b/pkgs/tools/text/wdiff/default.nix
index c07caad15a3..aeef86331f3 100644
--- a/pkgs/tools/text/wdiff/default.nix
+++ b/pkgs/tools/text/wdiff/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, texinfo }:
stdenv.mkDerivation rec {
- name = "wdiff-1.2.1";
+ name = "wdiff-1.2.2";
src = fetchurl {
url = "mirror://gnu/wdiff/${name}.tar.gz";
- sha256 = "1gb5hpiyikada9bwz63q3g96zs383iskiir0xsqynqnvq1vd4n41";
+ sha256 = "0sxgg0ms5lhi4aqqvz1rj4s77yi9wymfm3l3gbjfd1qchy66kzrl";
};
buildInputs = [ texinfo ];
diff --git a/pkgs/tools/typesetting/biber/default.nix b/pkgs/tools/typesetting/biber/default.nix
index 1769a59520b..efce7d4de81 100644
--- a/pkgs/tools/typesetting/biber/default.nix
+++ b/pkgs/tools/typesetting/biber/default.nix
@@ -6,14 +6,14 @@
, UnicodeLineBreak, URI, XMLLibXMLSimple, XMLLibXSLT, XMLWriter }:
let
- version = "1.8";
+ version = "1.9";
pn = "biblatex-biber";
in
buildPerlPackage {
name = "biber-${version}";
src = fetchurl {
url = "mirror://sourceforge/project/${pn}/${pn}/${version}/${pn}.tar.gz";
- sha256 = "0ffry64pdvg5g487r7qab5b3cs4kq8rq8n3bymxrr1qh3mp79k4n";
+ sha256 = "1a3iq7l9i54f8nfzjmp1qdb6aqm7977q1g4san470010fkfbvjdc";
};
buildInputs = [
diff --git a/pkgs/tools/typesetting/pdfjam/builder.sh b/pkgs/tools/typesetting/pdfjam/builder.sh
index 9fcb80f6866..720ddeae78d 100644
--- a/pkgs/tools/typesetting/pdfjam/builder.sh
+++ b/pkgs/tools/typesetting/pdfjam/builder.sh
@@ -3,7 +3,7 @@ source $stdenv/setup
tar zxvf $src
mkdir -p $out/bin
-cp pdfjam/scripts/* $out/bin
+cp pdfjam/bin/* $out/bin
mkdir -p $out/man/man1
cp pdfjam/man1/* $out/man/man1
diff --git a/pkgs/tools/typesetting/pdfjam/default.nix b/pkgs/tools/typesetting/pdfjam/default.nix
index 426cef3c85d..f8eafb221a3 100644
--- a/pkgs/tools/typesetting/pdfjam/default.nix
+++ b/pkgs/tools/typesetting/pdfjam/default.nix
@@ -1,12 +1,19 @@
-{stdenv, fetchurl}: stdenv.mkDerivation {
- name = "pdfjam-1.20";
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation rec {
+ name = "pdfjam-${version}";
+ version = "2.08";
+ url-version = stdenv.lib.replaceChars ["."] [""] version;
+
builder = ./builder.sh;
+
src = fetchurl {
- url = http://www.warwick.ac.uk/go/pdfjam/pdfjam_1.20.tgz;
- sha256 = "05g3mx7mb6h15ivbv0f53r369xphy8ad8a2xblpnk9mrnlrkaxy9";
+ url = "http://go.warwick.ac.uk/pdfjam/pdfjam_${url-version}.tgz";
+ sha256 = "1wy0xhcy27d7agby598s20ba48s4yg5qkzr6anc6q1xdryccacf7";
};
+
meta = with stdenv.lib; {
platforms = platforms.linux;
- maintainers = maintainers.mornfall;
+ maintainers = [ maintainers.mornfall ];
};
}
diff --git a/pkgs/tools/typesetting/tex/pgf/3.x.nix b/pkgs/tools/typesetting/tex/pgf/3.x.nix
new file mode 100644
index 00000000000..9a03500bb96
--- /dev/null
+++ b/pkgs/tools/typesetting/tex/pgf/3.x.nix
@@ -0,0 +1,26 @@
+{stdenv, fetchurl, unzip}:
+
+stdenv.mkDerivation {
+ name = "pgf-3.00";
+
+ src = fetchurl {
+ url = http://downloads.sourceforge.net/project/pgf/pgf/version%203.0.0/pgf_3.0.0.tds.zip;
+ sha256 = "0kj769hyp4z2zmdv3f8xv443wcfqn5nkkbzxzqgfxjizlz81aav7";
+ };
+
+ buildInputs = [ unzip ];
+
+ # Multiple files problem
+ unpackPhase = ''
+ mkdir pgf
+ cd pgf
+ unzip $src
+ '';
+
+ buildPhase = "true";
+
+ installPhase = "
+ mkdir -p $out/share/texmf-nix
+ cp -prd * $out/share/texmf-nix
+ ";
+}
diff --git a/pkgs/tools/typesetting/tex/texlive/beamer.nix b/pkgs/tools/typesetting/tex/texlive/beamer.nix
index 8b06cbb5a2b..8afaf7b5f3e 100644
--- a/pkgs/tools/typesetting/tex/texlive/beamer.nix
+++ b/pkgs/tools/typesetting/tex/texlive/beamer.nix
@@ -20,6 +20,6 @@ rec {
meta = {
description = "Extra components for TeXLive: beamer class";
- maintainers = stdenv.lib.maintainers.mornfall;
+ maintainers = [ stdenv.lib.maintainers.mornfall ];
};
}
diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index c2840fd843f..beb6a7f3a68 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -5,16 +5,16 @@ rec {
sha256 = "0nh8hfayyf60nm4z8zyclrbc3792c62azgsvrwxnl28iq223200s";
};
- texmfVersion = "2014.20140717";
+ texmfVersion = "2014.20140821";
texmfSrc = fetchurl {
url = "mirror://debian/pool/main/t/texlive-base/texlive-base_${texmfVersion}.orig.tar.xz";
- sha256 = "08vhl6x742r8fl0gags2r6yspz8ynvz26vdjrqb4vyz5h7h3rzc9";
+ sha256 = "02qkzlhb381sybs970fgpc94nhx4jm0l3j5pv8z48l11415lvm9b";
};
- langTexmfVersion = "2014.20140717";
+ langTexmfVersion = "2014.20140821";
langTexmfSrc = fetchurl {
url = "mirror://debian/pool/main/t/texlive-lang/texlive-lang_${langTexmfVersion}.orig.tar.xz";
- sha256 = "1x9aa3v2cg4lcb58lwksnfdsgrhi0sg968pjqsbndmbxhr1msbp7";
+ sha256 = "075avhhhhzw5pbd19q659rn23rws15b5hv7nv0grd93vn3vfwdcy";
};
passthru = { inherit texmfSrc langTexmfSrc; };
diff --git a/pkgs/tools/typesetting/tex/texlive/extra.nix b/pkgs/tools/typesetting/tex/texlive/extra.nix
index 4644ee3e50e..f47fedd927d 100644
--- a/pkgs/tools/typesetting/tex/texlive/extra.nix
+++ b/pkgs/tools/typesetting/tex/texlive/extra.nix
@@ -1,11 +1,11 @@
args: with args;
rec {
name = "texlive-extra-2014";
- version = "2014.20140717";
+ version = "2014.20140821";
src = fetchurl {
url = "mirror://debian/pool/main/t/texlive-extra/texlive-extra_${version}.orig.tar.xz";
- sha256 = "1khxqdq9gagm6z8kbpjbraysfzibfjs2cgbrhjpncbd24sxpw13q";
+ sha256 = "1y3w8bgp85s90ng2y5dw9chrrvvdf7ibb6ynss8kycvgc0y4m6b3";
};
buildInputs = [texLive xz];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 87f65745b77..d41e9330ba1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -167,7 +167,7 @@ let
x11 = xlibsWrapper;
# `xlibs' is the set of X library components. This used to be the
- # old modular X llibraries project (called `xlibs') but now it's just
+ # old modular X libraries project (called `xlibs') but now it's just
# the set of packages in the modular X.org tree (which also includes
# non-library components like the server, drivers, fonts, etc.).
xlibs = xorg // {xlibs = xlibsWrapper;};
@@ -262,9 +262,14 @@ let
};
buildFHSChrootEnv = import ../build-support/build-fhs-chrootenv {
- inherit stdenv glibc glibcLocales gcc coreutils diffutils findutils;
- inherit gnused gnugrep gnutar gzip bzip2 bashInteractive xz shadow gawk;
- inherit less buildEnv;
+ inherit buildEnv system;
+ inherit stdenv glibc glibc_multi glibcLocales;
+ inherit bashInteractive coreutils less shadow su;
+ inherit gawk gcc gcc_multi diffutils findutils gnused gnugrep;
+ inherit gnutar gzip bzip2 xz;
+
+ nixpkgs = pkgs;
+ nixpkgs_i686 = pkgsi686Linux;
};
dotnetenv = import ../build-support/dotnetenv {
@@ -278,6 +283,16 @@ let
vs = vs90wrapper;
};
+ fetchadc = import ../build-support/fetchadc {
+ inherit curl stdenv;
+ adc_user = if config ? adc_user
+ then config.adc_user
+ else throw "You need an adc_user attribute in your config to download files from Apple Developer Connection";
+ adc_pass = if config ? adc_pass
+ then config.adc_pass
+ else throw "You need an adc_pass attribute in your config to download files from Apple Developer Connection";
+ };
+
fetchbower = import ../build-support/fetchbower {
inherit stdenv git;
inherit (nodePackages) fetch-bower;
@@ -418,6 +433,8 @@ let
{ deps = [ pkgs.lcov pkgs.enableGCOVInstrumentation ]; }
../build-support/setup-hooks/make-coverage-analysis-report.sh;
+ # intended to be used like nix-build -E 'with {}; enableDebugging fooPackage'
+ enableDebugging = pkg : pkg.override { stdenv = stdenvAdapters.keepDebugInfo pkg.stdenv; };
### TOOLS
@@ -433,11 +450,12 @@ let
adom = callPackage ../games/adom { };
+ advancecomp = callPackage ../tools/compression/advancecomp {};
+
aefs = callPackage ../tools/filesystems/aefs { };
aegisub = callPackage ../applications/video/aegisub {
wxGTK = wxGTK30;
- lua = lua5_1;
};
aespipe = callPackage ../tools/security/aespipe { };
@@ -448,6 +466,8 @@ let
aircrackng = callPackage ../tools/networking/aircrack-ng { };
+ airfield = callPackage ../tools/networking/airfield { };
+
analog = callPackage ../tools/admin/analog {};
apktool = callPackage ../development/tools/apktool {
@@ -528,7 +548,7 @@ let
pkgs_i686 = pkgsi686Linux;
};
- inherit (androidenv) androidsdk_4_1;
+ inherit (androidenv) androidsdk_4_4 androidndk;
aria2 = callPackage ../tools/networking/aria2 { };
aria = aria2;
@@ -567,6 +587,8 @@ let
barcode = callPackage ../tools/graphics/barcode {};
+ bashmount = callPackage ../tools/filesystems/bashmount {};
+
bc = callPackage ../tools/misc/bc { };
bcache-tools = callPackage ../tools/filesystems/bcache-tools { };
@@ -577,16 +599,32 @@ let
bindfs = callPackage ../tools/filesystems/bindfs { };
+ binwalk = callPackage ../tools/misc/binwalk {
+ python = pythonFull;
+ wrapPython = pythonPackages.wrapPython;
+ curses = pythonPackages.curses;
+ };
+
+ binwalk-full = callPackage ../tools/misc/binwalk {
+ python = pythonFull;
+ wrapPython = pythonPackages.wrapPython;
+ curses = pythonPackages.curses;
+ visualizationSupport = true;
+ pyqtgraph = pythonPackages.pyqtgraph;
+ };
+
bitbucket-cli = pythonPackages.bitbucket-cli;
blockdiag = pythonPackages.blockdiag;
bmon = callPackage ../tools/misc/bmon { };
- bochs = callPackage ../applications/virtualization/bochs { wxSupport = false; };
+ bochs = callPackage ../applications/virtualization/bochs { };
boomerang = callPackage ../development/tools/boomerang { };
+ boost-build = callPackage ../development/tools/boost-build { };
+
bootchart = callPackage ../tools/system/bootchart { };
bro = callPackage ../applications/networking/ids/bro { };
@@ -605,8 +643,11 @@ let
ccnet = callPackage ../tools/networking/ccnet { };
- consul = callPackage ../servers/consul { };
- consul_ui = callPackage ../servers/consul/ui.nix { };
+ consul = callPackage ../servers/consul {
+ inherit ruby rubyLibs;
+ };
+
+ consul_ui = consul.ui;
chntpw = callPackage ../tools/security/chntpw { };
@@ -648,6 +689,8 @@ let
mcrypt = callPackage ../tools/misc/mcrypt { };
+ mstflint = callPackage ../tools/misc/mstflint { };
+
mcelog = callPackage ../os-specific/linux/mcelog { };
apparix = callPackage ../tools/misc/apparix { };
@@ -685,10 +728,6 @@ let
inherit (strategoPackages016) strategoxt sdf;
};
- bittorrent = callPackage ../tools/networking/p2p/bittorrent {
- gui = true;
- };
-
bittornado = callPackage ../tools/networking/p2p/bit-tornado { };
blueman = callPackage ../tools/bluetooth/blueman {
@@ -739,7 +778,9 @@ let
cdrkit = callPackage ../tools/cd-dvd/cdrkit { };
- ceph = callPackage ../tools/filesystems/ceph { };
+ ceph = callPackage ../tools/filesystems/ceph {
+ zfs = linuxPackages.zfs;
+ };
cfdg = builderDefsPackage ../tools/graphics/cfdg {
inherit libpng bison flex ffmpeg;
@@ -753,6 +794,10 @@ let
chkrootkit = callPackage ../tools/security/chkrootkit { };
+ chocolateDoom = callPackage ../games/chocolate-doom { };
+ # master is here because chocolateDoom v2.0 has broken netplay
+ chocolateDoomMaster = callPackage ../games/chocolate-doom/master.nix { };
+
chrony = callPackage ../tools/networking/chrony { };
chunkfs = callPackage ../tools/filesystems/chunkfs { };
@@ -767,6 +812,8 @@ let
ciopfs = callPackage ../tools/filesystems/ciopfs { };
+ cmst = callPackage ../tools/networking/cmst { };
+
colord = callPackage ../tools/misc/colord { };
colord-gtk = callPackage ../tools/misc/colord-gtk { };
@@ -793,6 +840,8 @@ let
cpuminer = callPackage ../tools/misc/cpuminer { };
+ cpuminer-multi = callPackage ../tools/misc/cpuminer-multi { };
+
cuetools = callPackage ../tools/cd-dvd/cuetools { };
unifdef = callPackage ../development/tools/misc/unifdef { };
@@ -801,6 +850,8 @@ let
usb_modeswitch = callPackage ../development/tools/misc/usb-modeswitch { };
+ anthy = callPackage ../tools/inputmethods/anthy { };
+
biosdevname = callPackage ../tools/networking/biosdevname { };
clamav = callPackage ../tools/security/clamav { };
@@ -851,13 +902,15 @@ let
sslSupport = zlibSupport;
};
+ curl_unix_socket = callPackage ../tools/networking/curl-unix-socket rec { };
+
cunit = callPackage ../tools/misc/cunit { };
curlftpfs = callPackage ../tools/filesystems/curlftpfs { };
cutter = callPackage ../tools/networking/cutter { };
- dadadodo = builderDefsPackage (import ../tools/text/dadadodo) { };
+ dadadodo = callPackage ../tools/text/dadadodo { };
daq = callPackage ../applications/networking/ids/daq { };
@@ -869,6 +922,8 @@ let
dcraw = callPackage ../tools/graphics/dcraw { };
+ dcfldd = callPackage ../tools/system/dcfldd { };
+
debian_devscripts = callPackage ../tools/misc/debian-devscripts {
inherit (perlPackages) CryptSSLeay LWP TimeDate DBFile FileDesktopEntry;
};
@@ -889,6 +944,8 @@ let
despotify = callPackage ../development/libraries/despotify { };
+ dfc = callPackage ../tools/system/dfc { };
+
dev86 = callPackage ../development/compilers/dev86 { };
dnsmasq = callPackage ../tools/networking/dnsmasq { };
@@ -899,6 +956,8 @@ let
dhcpcd = callPackage ../tools/networking/dhcpcd { };
+ di = callPackage ../tools/system/di { };
+
diffstat = callPackage ../tools/text/diffstat { };
diffutils = callPackage ../tools/text/diffutils { };
@@ -921,12 +980,17 @@ let
inherit (perlPackages) XMLSAX XMLParser XMLNamespaceSupport;
};
+ dog = callPackage ../tools/system/dog { };
+
dosfstools = callPackage ../tools/filesystems/dosfstools { };
dotnetfx35 = callPackage ../development/libraries/dotnetfx35 { };
dotnetfx40 = callPackage ../development/libraries/dotnetfx40 { };
+ dolphinEmu = callPackage ../misc/emulators/dolphin-emu { };
+ dolphinEmuMaster = callPackage ../misc/emulators/dolphin-emu/master.nix { };
+
dropbear = callPackage ../tools/networking/dropbear { };
dtach = callPackage ../tools/misc/dtach { };
@@ -940,6 +1004,8 @@ let
duply = callPackage ../tools/backup/duply { };
+ dvdisaster = callPackage ../tools/cd-dvd/dvdisaster { };
+
dvdplusrwtools = callPackage ../tools/cd-dvd/dvd+rw-tools { };
dvgrab = callPackage ../tools/video/dvgrab { };
@@ -961,6 +1027,10 @@ let
edk2 = callPackage ../development/compilers/edk2 { };
+ emscripten = callPackage ../development/compilers/emscripten { };
+
+ emscriptenfastcomp = callPackage ../development/compilers/emscripten-fastcomp { };
+
efibootmgr = callPackage ../tools/system/efibootmgr { };
efivar = callPackage ../tools/system/efivar { };
@@ -983,6 +1053,8 @@ let
ethtool = callPackage ../tools/misc/ethtool { };
+ eternity = callPackage ../games/eternity-engine { };
+
ettercap = callPackage ../applications/networking/sniffers/ettercap { };
euca2ools = callPackage ../tools/virtualization/euca2ools { pythonPackages = python26Packages; };
@@ -1019,6 +1091,8 @@ let
fcitx = callPackage ../tools/inputmethods/fcitx { };
+ fcitx-anthy = callPackage ../tools/inputmethods/fcitx/fcitx-anthy.nix { };
+
fcron = callPackage ../tools/system/fcron { };
fdm = callPackage ../tools/networking/fdm {};
@@ -1041,6 +1115,8 @@ let
platformTools = androidenv.platformTools;
};
+ flashrom = callPackage ../tools/misc/flashrom { };
+
flpsed = callPackage ../applications/editors/flpsed { };
flvstreamer = callPackage ../tools/networking/flvstreamer { };
@@ -1163,10 +1239,6 @@ let
gnupg = callPackage ../tools/security/gnupg { libusb = libusb1; };
- gnupg2_1 = lowPrio (callPackage ../tools/security/gnupg/git.nix {
- libassuan = libassuan2_1;
- });
-
gnuplot = callPackage ../tools/graphics/gnuplot { };
gnuplot_qt = gnuplot.override { withQt = true; };
@@ -1186,6 +1258,8 @@ let
gource = callPackage ../applications/version-management/gource {};
+ gparted = callPackage ../tools/misc/gparted { };
+
gpodder = callPackage ../applications/audio/gpodder { };
gptfdisk = callPackage ../tools/system/gptfdisk { };
@@ -1194,14 +1268,24 @@ let
grafx2 = callPackage ../applications/graphics/grafx2 {};
+ grails = callPackage ../development/web/grails {
+ jdkPath = "${openjdk}/lib/openjdk";
+ };
+
graphviz = callPackage ../tools/graphics/graphviz { };
/* Readded by Michael Raskin. There are programs in the wild
* that do want 2.0 but not 2.22. Please give a day's notice for
- * objections before removal.
+ * objections before removal. The feature is integer coordinates
*/
graphviz_2_0 = callPackage ../tools/graphics/graphviz/2.0.nix { };
+ /* Readded by Michael Raskin. There are programs in the wild
+ * that do want 2.32 but not 2.0 or 2.36. Please give a day's notice for
+ * objections before removal. The feature is libgraph.
+ */
+ graphviz_2_32 = callPackage ../tools/graphics/graphviz/2.32.nix { };
+
grive = callPackage ../tools/filesystems/grive {
json_c = json-c-0-11; # won't configure with 0.12; others are vulnerable
};
@@ -1214,9 +1298,15 @@ let
buggyBiosCDSupport = config.grub.buggyBiosCDSupport or true;
};
- grub2 = callPackage ../tools/misc/grub/2.0x.nix { libusb = libusb1; flex = flex_2_5_35; };
+ grub2 = callPackage ../tools/misc/grub/2.0x.nix { };
- grub2_efi = grub2.override { EFIsupport = true; };
+ grub2_efi = grub2.override { efiSupport = true; };
+
+ grub2_zfs = grub2.override { zfsSupport = true; };
+
+ gsmartcontrol = callPackage ../tools/misc/gsmartcontrol {
+ inherit (gnome) libglademm;
+ };
gssdp = callPackage ../development/libraries/gssdp {
inherit (gnome) libsoup;
@@ -1225,6 +1315,7 @@ let
gt5 = callPackage ../tools/system/gt5 { };
gtest = callPackage ../development/libraries/gtest {};
+ gmock = callPackage ../development/libraries/gmock {};
gtkdatabox = callPackage ../development/libraries/gtkdatabox {};
@@ -1266,6 +1357,8 @@ let
haveged = callPackage ../tools/security/haveged { };
+ hawkthorne = callPackage ../games/hawkthorne { love = love_0_9; };
+
hardlink = callPackage ../tools/system/hardlink { };
hashcat = callPackage ../tools/security/hashcat { };
@@ -1276,6 +1369,12 @@ let
hdf5 = callPackage ../tools/misc/hdf5 {
szip = null;
+ mpi = null;
+ };
+
+ hdf5-mpi = hdf5.override {
+ szip = null;
+ mpi = pkgs.openmpi;
};
heimdall = callPackage ../tools/misc/heimdall { };
@@ -1294,6 +1393,8 @@ let
httpfs2 = callPackage ../tools/filesystems/httpfs { };
+ httptunnel = callPackage ../tools/networking/httptunnel { };
+
# FIXME: This Hydra snapshot is outdated and depends on the `nixPerl',
# which no longer exists.
#
@@ -1313,6 +1414,11 @@ let
iftop = callPackage ../tools/networking/iftop { };
+ ihaskell = callPackage ../development/tools/haskell/ihaskell/wrapper.nix {
+ inherit (pythonPackages) ipython;
+ inherit (haskellPackages) ihaskell ghc;
+ };
+
imapproxy = callPackage ../tools/networking/imapproxy { };
imapsync = callPackage ../tools/networking/imapsync {
@@ -1327,7 +1433,9 @@ let
iodine = callPackage ../tools/networking/iodine { };
- iperf = callPackage ../tools/networking/iperf { };
+ iperf2 = callPackage ../tools/networking/iperf/2.nix { };
+ iperf3 = callPackage ../tools/networking/iperf/3.nix { };
+ iperf = iperf3;
ipmitool = callPackage ../tools/system/ipmitool {
static = false;
@@ -1360,6 +1468,8 @@ let
jnettop = callPackage ../tools/networking/jnettop { };
+ john = callPackage ../tools/security/john { };
+
jq = callPackage ../development/tools/jq {};
jscoverage = callPackage ../development/tools/misc/jscoverage { };
@@ -1374,6 +1484,8 @@ let
keychain = callPackage ../tools/misc/keychain { };
+ kibana = callPackage ../development/tools/misc/kibana { };
+
kismet = callPackage ../applications/networking/sniffers/kismet { };
less = callPackage ../tools/misc/less { };
@@ -1442,6 +1554,8 @@ let
inherit (perlPackages) mimeConstruct;
};
+ logkeys = callPackage ../tools/security/logkeys { };
+
logrotate = callPackage ../tools/system/logrotate { };
logstalgia = callPackage ../tools/graphics/logstalgia {};
@@ -1512,6 +1626,8 @@ let
mfcuk = callPackage ../tools/security/mfcuk { };
+ mfoc = callPackage ../tools/security/mfoc { };
+
minecraft = callPackage ../games/minecraft { };
minecraft-server = callPackage ../games/minecraft-server { };
@@ -1541,7 +1657,6 @@ let
monit = callPackage ../tools/system/monit { };
mosh = callPackage ../tools/networking/mosh {
- boost = boostHeaders;
inherit (perlPackages) IOTty;
};
@@ -1668,6 +1783,8 @@ let
notbit = callPackage ../applications/networking/notbit { };
+ notify-osd = callPackage ../applications/misc/notify-osd { };
+
nox = callPackage ../tools/package-management/nox {
pythonPackages = python3Packages;
nix = nixUnstable;
@@ -1726,6 +1843,8 @@ let
openjade = callPackage ../tools/text/sgml/openjade { };
+ openntpd = callPackage ../tools/networking/openntpd { };
+
openobex = callPackage ../tools/bluetooth/openobex { };
openopc = callPackage ../tools/misc/openopc {
@@ -1760,6 +1879,8 @@ let
openvpn_learnaddress = callPackage ../tools/networking/openvpn/openvpn_learnaddress.nix { };
+ openvswitch = callPackage ../os-specific/linux/openvswitch { };
+
optipng = callPackage ../tools/graphics/optipng {
libpng = libpng12;
};
@@ -1826,6 +1947,8 @@ let
pdf2djvu = callPackage ../tools/typesetting/pdf2djvu { };
+ pdf2svg = callPackage ../tools/graphics/pdf2svg { };
+
pdfjam = callPackage ../tools/typesetting/pdfjam { };
jbig2enc = callPackage ../tools/graphics/jbig2enc { };
@@ -1941,6 +2064,10 @@ let
qjoypad = callPackage ../tools/misc/qjoypad { };
+ qscintilla = callPackage ../development/libraries/qscintilla {
+ qt = qt4;
+ };
+
qshowdiff = callPackage ../tools/text/qshowdiff { };
quilt = callPackage ../development/tools/quilt { };
@@ -2028,9 +2155,17 @@ let
s3cmd_15_pre_81e3842f7a = lowPrio (callPackage ../tools/networking/s3cmd/git.nix { });
s3sync = callPackage ../tools/networking/s3sync {
- ruby = ruby18;
+ ruby = ruby_1_8;
};
+ s6Dns = callPackage ../tools/networking/s6-dns { };
+
+ s6LinuxUtils = callPackage ../os-specific/linux/s6-linux-utils { };
+
+ s6Networking = callPackage ../tools/networking/s6-networking { };
+
+ s6PortableUtils = callPackage ../tools/misc/s6-portable-utils { };
+
sablotron = callPackage ../tools/text/xml/sablotron { };
safecopy = callPackage ../tools/system/safecopy { };
@@ -2104,6 +2239,8 @@ let
solr = callPackage ../servers/search/solr { };
+ solvespace = callPackage ../applications/graphics/solvespace { };
+
sparsehash = callPackage ../development/libraries/sparsehash { };
spiped = callPackage ../tools/networking/spiped { };
@@ -2147,6 +2284,8 @@ let
ssdeep = callPackage ../tools/security/ssdeep { };
+ sshpass = callPackage ../tools/networking/sshpass { };
+
ssmtp = callPackage ../tools/networking/ssmtp {
tlsSupport = true;
};
@@ -2161,6 +2300,8 @@ let
stunnel = callPackage ../tools/networking/stunnel { };
+ strongswan = callPackage ../tools/networking/strongswan { stdenv = clangStdenv; };
+
su = shadow.su;
surfraw = callPackage ../tools/networking/surfraw { };
@@ -2191,6 +2332,8 @@ let
tboot = callPackage ../tools/security/tboot { };
+ tcl2048 = callPackage ../games/tcl2048 { };
+
tcpdump = callPackage ../tools/networking/tcpdump { };
tcpflow = callPackage ../tools/networking/tcpflow { };
@@ -2212,10 +2355,14 @@ let
texstudio = callPackage ../applications/editors/texstudio { };
+ thc-hydra = callPackage ../tools/security/thc-hydra { };
+
tiled-qt = callPackage ../applications/editors/tiled-qt { qt = qt4; };
tinc = callPackage ../tools/networking/tinc { };
+ tinc_pre = callPackage ../tools/networking/tinc/pre.nix { };
+
tiny8086 = callPackage ../applications/virtualization/8086tiny { };
tmpwatch = callPackage ../tools/misc/tmpwatch { };
@@ -2234,12 +2381,16 @@ let
tpm-tools = callPackage ../tools/security/tpm-tools { };
+ traceroute = callPackage ../tools/networking/traceroute { };
+
trickle = callPackage ../tools/networking/trickle {};
trousers = callPackage ../tools/security/trousers { };
ttf2pt1 = callPackage ../tools/misc/ttf2pt1 { };
+ tty-clock = callPackage ../tools/misc/tty-clock { };
+
ttysnoop = callPackage ../os-specific/linux/ttysnoop {};
twitterBootstrap = callPackage ../development/web/twitter-bootstrap {};
@@ -2375,6 +2526,12 @@ let
ttmkfdir = callPackage ../tools/misc/ttmkfdir { };
+ uim = callPackage ../tools/inputmethods/uim {
+ inherit (pkgs.kde4) kdelibs;
+ };
+
+ uhub = callPackage ../servers/uhub { };
+
unclutter = callPackage ../tools/misc/unclutter { };
unbound = callPackage ../tools/networking/unbound { };
@@ -2383,6 +2540,8 @@ let
unrar = callPackage ../tools/archivers/unrar { };
+ xar = callPackage ../tools/compression/xar { };
+
xarchive = callPackage ../tools/archivers/xarchive { };
xarchiver = callPackage ../tools/archivers/xarchiver { };
@@ -2399,6 +2558,8 @@ let
uptimed = callPackage ../tools/system/uptimed { };
+ urlwatch = callPackage ../tools/networking/urlwatch { };
+
varnish = callPackage ../servers/varnish { };
varnish2 = callPackage ../servers/varnish/2.1.nix { };
@@ -2409,6 +2570,8 @@ let
vlan = callPackage ../tools/networking/vlan { };
+ volumeicon = callPackage ../tools/audio/volumeicon { };
+
wakelan = callPackage ../tools/networking/wakelan { };
wavemon = callPackage ../tools/networking/wavemon { };
@@ -2438,7 +2601,10 @@ let
wicd = callPackage ../tools/networking/wicd { };
- wkhtmltopdf = callPackage ../tools/graphics/wkhtmltopdf { };
+ wkhtmltopdf = callPackage ../tools/graphics/wkhtmltopdf {
+ overrideDerivation = lib.overrideDerivation;
+ inherit (xlibs) libX11 libXext libXrender;
+ };
wv = callPackage ../tools/misc/wv { };
@@ -2549,7 +2715,6 @@ let
bashInteractive = appendToName "interactive" (callPackage ../shells/bash {
interactive = true;
- readline = readline63; # Includes many vi mode fixes
});
bashCompletion = callPackage ../shells/bash-completion { };
@@ -2645,10 +2810,6 @@ let
cython = pythonPackages.cython;
cython3 = python3Packages.cython;
- dylan = callPackage ../development/compilers/gwydion-dylan {
- dylan = callPackage ../development/compilers/gwydion-dylan/binary.nix { };
- };
-
ecl = callPackage ../development/compilers/ecl { };
eql = callPackage ../development/compilers/eql {};
@@ -2656,11 +2817,11 @@ let
adobe_flex_sdk = callPackage ../development/compilers/adobe-flex-sdk { };
fpc = callPackage ../development/compilers/fpc { };
- fpc_2_4_0 = callPackage ../development/compilers/fpc/2.4.0.nix { };
gambit = callPackage ../development/compilers/gambit { };
- gcc = gcc48;
+ gcc = gcc48;
+ gcc_multi = gcc48_multi;
gcc33 = wrapGCC (import ../development/compilers/gcc/3.3 {
inherit fetchurl stdenv noSysDirs;
@@ -2953,6 +3114,8 @@ let
};
gcc-arm-embedded = gcc-arm-embedded-4_8;
+ gforth = callPackage ../development/compilers/gforth {};
+
# Haskell and GHC
# Import Haskell infrastructure.
@@ -3000,12 +3163,12 @@ let
hhvm = callPackage ../development/compilers/hhvm { };
hiphopvm = hhvm; /* Compatibility alias */
- falcon = builderDefsPackage (import ../development/interpreters/falcon) {
- inherit cmake;
- };
+ falcon = callPackage ../development/interpreters/falcon { };
fsharp = callPackage ../development/compilers/fsharp {};
+ gem-nix = callPackage ../tools/package-management/gem-nix { };
+
go_1_0 = callPackage ../development/compilers/go { };
go_1_1 =
@@ -3020,6 +3183,10 @@ let
go = go_1_3;
+ go-repo-root = callPackage ../development/tools/misc/go-repo-root { };
+
+ go-bindata = callPackage ../tools/misc/go-bindata { };
+
gox = callPackage ../development/compilers/go/gox.nix { };
gprolog = callPackage ../development/compilers/gprolog { };
@@ -3105,10 +3272,12 @@ let
juliaGit = callPackage ../development/compilers/julia/git-20131013.nix {
liblapack = liblapack.override {shared = true;};
llvm = llvm_33;
+ openblas = openblas_0_2_2;
};
julia021 = callPackage ../development/compilers/julia/0.2.1.nix {
liblapack = liblapack.override {shared = true;};
llvm = llvm_33;
+ openblas = openblas_0_2_2;
};
julia030 = let
liblapack = liblapack_3_5_0.override {shared = true;};
@@ -3117,10 +3286,10 @@ let
suitesparse = suitesparse.override {
inherit liblapack;
};
- openblas = openblas_0_2_10;
llvm = llvm_34;
+ openblas = openblas_0_2_10;
};
- julia = julia021;
+ julia = julia030;
lazarus = builderDefsPackage (import ../development/compilers/fpc/lazarus.nix) {
inherit makeWrapper gtk glib pango atk gdk_pixbuf;
@@ -3191,22 +3360,39 @@ let
ocaml_4_01_0 = callPackage ../development/compilers/ocaml/4.01.0.nix { };
+ ocaml_4_02_0 = callPackage ../development/compilers/ocaml/4.02.0.nix { };
+
orc = callPackage ../development/compilers/orc { };
metaocaml_3_09 = callPackage ../development/compilers/ocaml/metaocaml-3.09.nix { };
ber_metaocaml_003 = callPackage ../development/compilers/ocaml/ber-metaocaml-003.nix { };
- mkOcamlPackages = ocaml: self: let callPackage = newScope self; in rec {
+ mkOcamlPackages = ocaml: self:
+ let
+ callPackage = newScope self;
+ ocaml_version = (builtins.parseDrvName ocaml.name).version;
+ in rec {
inherit ocaml;
camlidl = callPackage ../development/tools/ocaml/camlidl { };
- camlp5_5_strict = callPackage ../development/tools/ocaml/camlp5/5.15.nix { };
+ camlp4 =
+ if lib.versionOlder "4.02" ocaml_version
+ then callPackage ../development/tools/ocaml/camlp4 { }
+ else null;
- camlp5_5_transitional = callPackage ../development/tools/ocaml/camlp5/5.15.nix {
- transitional = true;
- };
+ camlp5_old_strict =
+ if lib.versionOlder "4.00" ocaml_version
+ then camlp5_6_strict
+ else callPackage ../development/tools/ocaml/camlp5/5.15.nix { };
+
+ camlp5_old_transitional =
+ if lib.versionOlder "4.00" ocaml_version
+ then camlp5_6_transitional
+ else callPackage ../development/tools/ocaml/camlp5/5.15.nix {
+ transitional = true;
+ };
camlp5_6_strict = callPackage ../development/tools/ocaml/camlp5 { };
@@ -3218,6 +3404,8 @@ let
camlp5_transitional = camlp5_6_transitional;
+ calendar = callPackage ../development/ocaml-modules/calendar { };
+
camlzip = callPackage ../development/ocaml-modules/camlzip { };
camomile_0_8_2 = callPackage ../development/ocaml-modules/camomile/0.8.2.nix { };
@@ -3232,6 +3420,8 @@ let
ocaml_cairo = callPackage ../development/ocaml-modules/ocaml-cairo { };
+ cmdliner = callPackage ../development/ocaml-modules/cmdliner { };
+
cppo = callPackage ../development/tools/ocaml/cppo { };
cryptokit = callPackage ../development/ocaml-modules/cryptokit { };
@@ -3242,8 +3432,14 @@ let
easy-format = callPackage ../development/ocaml-modules/easy-format { };
+ eliom = callPackage ../development/ocaml-modules/eliom { };
+
findlib = callPackage ../development/tools/ocaml/findlib { };
+ fix = callPackage ../development/ocaml-modules/fix { };
+
+ functory = callPackage ../development/ocaml-modules/functory { };
+
javalib = callPackage ../development/ocaml-modules/javalib {
extlib = ocaml_extlib_maximal;
};
@@ -3254,8 +3450,13 @@ let
gmetadom = callPackage ../development/ocaml-modules/gmetadom { };
+ js_of_ocaml = callPackage ../development/tools/ocaml/js_of_ocaml { };
+
lablgl = callPackage ../development/ocaml-modules/lablgl { };
+ lablgtk_2_14 = callPackage ../development/ocaml-modules/lablgtk/2.14.0.nix {
+ inherit (gnome) libgnomecanvas libglade gtksourceview;
+ };
lablgtk = callPackage ../development/ocaml-modules/lablgtk {
inherit (gnome) libgnomecanvas libglade gtksourceview;
};
@@ -3264,10 +3465,14 @@ let
gtkmathview = callPackage ../development/libraries/gtkmathview { };
};
+ lambdaTerm = callPackage ../development/ocaml-modules/lambda-term { };
+
menhir = callPackage ../development/ocaml-modules/menhir { };
merlin = callPackage ../development/tools/ocaml/merlin { };
+ mezzo = callPackage ../development/compilers/mezzo { };
+
mldonkey = callPackage ../applications/networking/p2p/mldonkey { };
mlgmp = callPackage ../development/ocaml-modules/mlgmp { };
@@ -3286,6 +3491,8 @@ 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 { };
@@ -3296,6 +3503,8 @@ let
ocaml_oasis = callPackage ../development/tools/ocaml/oasis { };
+ ocaml_optcomp = callPackage ../development/ocaml-modules/optcomp { };
+
ocaml_pcre = callPackage ../development/ocaml-modules/pcre {
inherit pcre;
};
@@ -3308,30 +3517,52 @@ let
ocaml_ssl = callPackage ../development/ocaml-modules/ssl { };
+ ocaml_text = callPackage ../development/ocaml-modules/ocaml-text { };
+
+ ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { };
+
ounit = callPackage ../development/ocaml-modules/ounit { };
+ tyxml = callPackage ../development/ocaml-modules/tyxml { };
+
ulex = callPackage ../development/ocaml-modules/ulex { };
ulex08 = callPackage ../development/ocaml-modules/ulex/0.8 {
camlp5 = camlp5_transitional;
};
- ocaml_typeconv = callPackage ../development/ocaml-modules/typeconv { };
+ 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 { }
+ else if lib.versionOlder "3.12" ocaml_version
+ then typeconv_108_08_00
+ else null;
- ocaml_typeconv_3_0_5 = callPackage ../development/ocaml-modules/typeconv/3.0.5.nix { };
-
- ocaml_sexplib = callPackage ../development/ocaml-modules/sexplib { };
+ 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 { }
+ else if lib.versionOlder "3.12" ocaml_version
+ then sexplib_108_08_00
+ else null;
ocaml_extlib = callPackage ../development/ocaml-modules/extlib { };
ocaml_extlib_maximal = callPackage ../development/ocaml-modules/extlib {
minimal = false;
};
+ pprint = callPackage ../development/ocaml-modules/pprint { };
+
pycaml = callPackage ../development/ocaml-modules/pycaml { };
- opam_1_0_0 = callPackage ../development/tools/ocaml/opam/1.0.0.nix { };
- opam_1_1 = callPackage ../development/tools/ocaml/opam/1.1.nix { };
- opam = opam_1_1;
+ sqlite3EZ = callPackage ../development/ocaml-modules/sqlite3EZ { };
+
+ twt = callPackage ../development/ocaml-modules/twt { };
+
+ utop = callPackage ../development/tools/ocaml/utop { };
sawja = callPackage ../development/ocaml-modules/sawja { };
@@ -3343,20 +3574,34 @@ let
yojson = callPackage ../development/ocaml-modules/yojson { };
zarith = callPackage ../development/ocaml-modules/zarith { };
+
+ zed = callPackage ../development/ocaml-modules/zed { };
+
+ ocsigen_deriving = callPackage ../development/ocaml-modules/ocsigen-deriving { };
+
};
ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0;
- ocamlPackages_3_10_0 = mkOcamlPackages ocaml_3_10_0 pkgs.ocamlPackages_3_10_0;
- ocamlPackages_3_11_2 = mkOcamlPackages ocaml_3_11_2 pkgs.ocamlPackages_3_11_2;
+ ocamlPackages_3_10_0 = (mkOcamlPackages ocaml_3_10_0 pkgs.ocamlPackages_3_10_0)
+ // { lablgtk = ocamlPackages_3_10_0.lablgtk_2_14; };
+ ocamlPackages_3_11_2 = (mkOcamlPackages ocaml_3_11_2 pkgs.ocamlPackages_3_11_2)
+ // { lablgtk = ocamlPackages_3_11_2.lablgtk_2_14; };
ocamlPackages_3_12_1 = mkOcamlPackages ocaml_3_12_1 pkgs.ocamlPackages_3_12_1;
ocamlPackages_4_00_1 = mkOcamlPackages ocaml_4_00_1 pkgs.ocamlPackages_4_00_1;
ocamlPackages_4_01_0 = mkOcamlPackages ocaml_4_01_0 pkgs.ocamlPackages_4_01_0;
- ocamlPackages_latest = ocamlPackages_4_01_0;
+ ocamlPackages_4_02_0 = mkOcamlPackages ocaml_4_02_0 pkgs.ocamlPackages_4_02_0;
+ ocamlPackages_latest = ocamlPackages_4_02_0;
ocaml_make = callPackage ../development/ocaml-modules/ocamlmake { };
opa = let callPackage = newScope pkgs.ocamlPackages_4_00_1; in callPackage ../development/compilers/opa { };
+ opam_1_0_0 = callPackage ../development/tools/ocaml/opam/1.0.0.nix { };
+ opam_1_1 = callPackage ../development/tools/ocaml/opam/1.1.nix {
+ inherit (ocamlPackages_4_01_0) ocaml;
+ };
+ opam = opam_1_1;
+
ocamlnat = let callPackage = newScope pkgs.ocamlPackages_3_12_1; in callPackage ../development/ocaml-modules/ocamlnat { };
qcmm = callPackage ../development/compilers/qcmm {
@@ -3376,6 +3621,10 @@ let
sbcl = callPackage ../development/compilers/sbcl {
clisp = clisp;
};
+ # For ACL2
+ sbcl_1_2_0 = callPackage ../development/compilers/sbcl/1.2.0.nix {
+ clisp = clisp;
+ };
scala_2_9 = callPackage ../development/compilers/scala/2.9.nix { };
scala_2_10 = callPackage ../development/compilers/scala/2.10.nix { };
@@ -3467,11 +3716,13 @@ let
### DEVELOPMENT / INTERPRETERS
acl2 = builderDefsPackage ../development/interpreters/acl2 {
- inherit sbcl;
+ sbcl = sbcl_1_2_0;
};
angelscript = callPackage ../development/interpreters/angelscript {};
+ chibi = callPackage ../development/interpreters/chibi { };
+
clisp = callPackage ../development/interpreters/clisp { };
# compatibility issues in 2.47 - at list 2.44.1 is known good
@@ -3487,8 +3738,11 @@ let
erlangR14 = callPackage ../development/interpreters/erlang/R14.nix { };
erlangR15 = callPackage ../development/interpreters/erlang/R15.nix { };
erlangR16 = callPackage ../development/interpreters/erlang/R16.nix { };
+ erlangR16_odbc = callPackage ../development/interpreters/erlang/R16.nix { odbcSupport = true; };
erlangR17 = callPackage ../development/interpreters/erlang/R17.nix { };
+ erlangR17_odbc = callPackage ../development/interpreters/erlang/R17.nix { odbcSupport = true; };
erlang = erlangR17;
+ erlang_odbc = erlangR17_odbc;
rebar = callPackage ../development/tools/build-managers/rebar { };
@@ -3508,6 +3762,8 @@ let
j = callPackage ../development/interpreters/j {};
+ jimtcl = callPackage ../development/interpreters/jimtcl {};
+
jmeter = callPackage ../applications/networking/jmeter {};
davmail = callPackage ../applications/networking/davmail {};
@@ -3516,10 +3772,12 @@ let
kona = callPackage ../development/interpreters/kona {};
- love = callPackage ../development/interpreters/love {lua=lua5;};
+ love = callPackage ../development/interpreters/love {lua=lua5_1;};
love_luajit = callPackage ../development/interpreters/love {lua=luajit;};
love_0_9 = callPackage ../development/interpreters/love/0.9.nix { };
+ ### LUA MODULES
+
lua4 = callPackage ../development/interpreters/lua-4 { };
lua5_0 = callPackage ../development/interpreters/lua-5/5.0.3.nix { };
lua5_1 = callPackage ../development/interpreters/lua-5/5.1.nix { };
@@ -3527,20 +3785,26 @@ let
lua5_2_compat = callPackage ../development/interpreters/lua-5/5.2.nix {
compat = true;
};
- lua5 = lua5_1;
+ lua5 = lua5_2_compat;
lua = lua5;
- lua5_sockets = callPackage ../development/interpreters/lua-5/sockets.nix {};
- lua5_expat = callPackage ../development/interpreters/lua-5/expat.nix {};
- lua5_filesystem = callPackage ../development/interpreters/lua-5/filesystem.nix {};
- lua5_sec = callPackage ../development/interpreters/lua-5/sec.nix {};
+ lua51Packages = recurseIntoAttrs (callPackage ./lua-packages.nix { lua = lua5_1; });
- luarocks = callPackage ../development/tools/misc/luarocks {
- lua = lua5;
- };
+ lua52Packages = recurseIntoAttrs (callPackage ./lua-packages.nix { lua = lua5_2; });
+
+ luaPackages = lua52Packages;
+
+ lua5_1_sockets = lua51Packages.luasocket;
+
+ lua5_expat = callPackage ../development/interpreters/lua-5/expat.nix {};
+ lua5_sec = callPackage ../development/interpreters/lua-5/sec.nix { };
luajit = callPackage ../development/interpreters/luajit {};
+ luarocks = luaPackages.luarocks;
+
+ ### END OF LUA
+
lush2 = callPackage ../development/interpreters/lush {};
maude = callPackage ../development/interpreters/maude {
@@ -3555,6 +3819,10 @@ let
pythonProtobuf = pythonPackages.protobuf;
};
+ nix-exec = callPackage ../development/interpreters/nix-exec {
+ nix = nixUnstable;
+ };
+
octave = callPackage ../development/interpreters/octave {
fltk = fltk13;
qt = null;
@@ -3565,7 +3833,6 @@ let
suitesparse = null;
openjdk = null;
gnuplot = null;
- readline = readline63;
};
octaveFull = (lowPrio (callPackage ../development/interpreters/octave {
fltk = fltk13;
@@ -3634,7 +3901,7 @@ let
python33 = callPackage ../development/interpreters/python/3.3 { };
python34 = hiPrio (callPackage ../development/interpreters/python/3.4 { });
- pypy = callPackage ../development/interpreters/pypy/2.3 { };
+ pypy = callPackage ../development/interpreters/pypy/2.4 { };
python26Full = callPackage ../development/interpreters/python/wrapper.nix {
extraLibs = [];
@@ -3649,6 +3916,8 @@ let
inherit (python27Packages) recursivePthLoader;
};
+ python2nix = callPackage ../tools/package-management/python2nix { };
+
pythonDocs = recurseIntoAttrs (import ../development/interpreters/python/docs {
inherit stdenv fetchurl lib;
});
@@ -3677,11 +3946,19 @@ let
wrapPython = pythonPackages.wrapPython;
};
- ruby18 = callPackage ../development/interpreters/ruby/ruby-18.nix { };
- ruby19 = callPackage ../development/interpreters/ruby/ruby-19.nix { };
- ruby2 = lowPrio (callPackage ../development/interpreters/ruby/ruby-2.0.nix { });
+ ruby_1_8_7 = callPackage ../development/interpreters/ruby/ruby-1.8.7.nix { };
+ ruby_1_9_3 = callPackage ../development/interpreters/ruby/ruby-1.9.3.nix { };
+ ruby_2_0_0 = lowPrio (callPackage ../development/interpreters/ruby/ruby-2.0.0.nix { });
+ ruby_2_1_0 = lowPrio (callPackage ../development/interpreters/ruby/ruby-2.1.0.nix { });
+ ruby_2_1_1 = lowPrio (callPackage ../development/interpreters/ruby/ruby-2.1.1.nix { });
+ ruby_2_1_2 = lowPrio (callPackage ../development/interpreters/ruby/ruby-2.1.2.nix { });
- ruby = ruby19;
+ # Ruby aliases
+ ruby = ruby_1_9;
+ ruby_1_8 = ruby_1_8_7;
+ ruby_1_9 = ruby_1_9_3;
+ ruby_2_0 = ruby_2_0_0;
+ ruby_2_1 = ruby_2_1_2;
rubyLibs = recurseIntoAttrs (callPackage ../development/interpreters/ruby/libs.nix { });
@@ -3700,6 +3977,8 @@ let
scheme48 = callPackage ../development/interpreters/scheme48 { };
+ self = callPackage_i686 ../development/interpreters/self { };
+
spark = callPackage ../applications/networking/cluster/spark { };
spidermonkey = callPackage ../development/interpreters/spidermonkey { };
@@ -3724,8 +4003,6 @@ let
inherit (pythonPackages) pysqlite;
};
- xulrunner_30 = firefox30Pkgs.xulrunner;
-
### DEVELOPMENT / MISC
@@ -3781,6 +4058,7 @@ let
guile-xcb = callPackage ../development/guile-modules/guile-xcb { };
pharo-vm = callPackage_i686 ../development/pharo/vm { };
+ pharo-launcher = callPackage ../development/pharo/launcher { };
srecord = callPackage ../development/tools/misc/srecord { };
@@ -3832,9 +4110,11 @@ let
bam = callPackage ../development/tools/build-managers/bam {};
- binutils = callPackage ../development/tools/misc/binutils {
- inherit noSysDirs;
- };
+ binutils = if stdenv.isDarwin
+ then stdenv.gcc.binutils
+ else callPackage ../development/tools/misc/binutils {
+ inherit noSysDirs;
+ };
binutils_nogold = lowPrio (callPackage ../development/tools/misc/binutils {
inherit noSysDirs;
@@ -3853,6 +4133,10 @@ let
bison3 = callPackage ../development/tools/parsing/bison/3.x.nix { };
bison = bison3;
+ bossa = callPackage ../development/tools/misc/bossa {
+ wxGTK = wxGTK30;
+ };
+
buildbot = callPackage ../development/tools/build-managers/buildbot {
inherit (pythonPackages) twisted jinja2 sqlalchemy sqlalchemy_migrate;
dateutil = pythonPackages.dateutil_1_5;
@@ -3864,6 +4148,8 @@ let
byacc = callPackage ../development/tools/parsing/byacc { };
+ cargoSnapshot = callPackage ../development/tools/build-managers/cargo/snapshot.nix { };
+
casperjs = callPackage ../development/tools/casperjs { };
cbrowser = callPackage ../development/tools/misc/cbrowser { };
@@ -4085,10 +4371,18 @@ let
lttv = callPackage ../development/tools/misc/lttv { };
+ maven = maven3;
+ maven3 = callPackage ../development/tools/build-managers/apache-maven { jdk = openjdk; };
+
mk = callPackage ../development/tools/build-managers/mk { };
neoload = callPackage ../development/tools/neoload {
licenseAccepted = (config.neoload.accept_license or false);
+ fontsConf = makeFontsConf {
+ fontDirectories = [
+ xorg.fontbhttf
+ ];
+ };
};
ninja = callPackage ../development/tools/build-managers/ninja { };
@@ -4151,6 +4445,15 @@ let
rubyBindings = config.radare.rubyBindings or false;
luaBindings = config.radare.luaBindings or false;
};
+ radare2 = callPackage ../development/tools/analysis/radare2 {
+ inherit (gnome) vte;
+ lua = lua5;
+ useX11 = config.radare.useX11 or false;
+ pythonBindings = config.radare.pythonBindings or false;
+ rubyBindings = config.radare.rubyBindings or false;
+ luaBindings = config.radare.luaBindings or false;
+ };
+
ragel = callPackage ../development/tools/parsing/ragel { };
@@ -4169,7 +4472,8 @@ let
scons = callPackage ../development/tools/build-managers/scons { };
- simpleBuildTool = callPackage ../development/tools/build-managers/simple-build-tool { };
+ sbt = callPackage ../development/tools/build-managers/sbt { };
+ simpleBuildTool = sbt;
sigrok-cli = callPackage ../development/tools/sigrok-cli { };
@@ -4231,15 +4535,17 @@ let
uncrustify = callPackage ../development/tools/misc/uncrustify { };
vagrant = callPackage ../development/tools/vagrant {
- ruby = ruby2;
+ ruby = ruby_2_0_0;
};
gdb = callPackage ../development/tools/misc/gdb {
+ guile = null;
hurd = gnu.hurdCross;
- readline = readline63;
inherit (gnu) mig;
};
+ gdbGuile = lowPrio (gdb.override { inherit guile; });
+
gdbCross = lowPrio (callPackage ../development/tools/misc/gdb {
target = crossSystem;
});
@@ -4305,6 +4611,8 @@ let
bdbSupport = true;
};
+ assimp = callPackage ../development/libraries/assimp { };
+
asio = callPackage ../development/libraries/asio { };
aspell = callPackage ../development/libraries/aspell { };
@@ -4333,8 +4641,6 @@ let
audiofile = callPackage ../development/libraries/audiofile { };
- axis = callPackage ../development/libraries/axis { };
-
babl_0_0_22 = callPackage ../development/libraries/babl/0_0_22.nix { };
babl = callPackage ../development/libraries/babl { };
@@ -4348,10 +4654,9 @@ let
boost144 = callPackage ../development/libraries/boost/1.44.nix { };
boost149 = callPackage ../development/libraries/boost/1.49.nix { };
boost155 = callPackage ../development/libraries/boost/1.55.nix { };
+ boost156 = callPackage ../development/libraries/boost/1.56.nix { };
boost = boost155;
- boostHeaders = callPackage ../development/libraries/boost/header-only-wrapper.nix { };
-
botan = callPackage ../development/libraries/botan { };
botanUnstable = callPackage ../development/libraries/botan/unstable.nix { };
@@ -4370,6 +4675,8 @@ let
capnproto = callPackage ../development/libraries/capnproto { };
+ cimg = callPackage ../development/libraries/cimg { };
+
scmccid = callPackage ../development/libraries/scmccid { };
ccrtp = callPackage ../development/libraries/ccrtp { };
@@ -4453,9 +4760,7 @@ let
cppunit = callPackage ../development/libraries/cppunit { };
- cppnetlib = callPackage ../development/libraries/cppnetlib {
- boost = boostHeaders;
- };
+ cppnetlib = callPackage ../development/libraries/cppnetlib { };
cracklib = callPackage ../development/libraries/cracklib { };
@@ -4480,7 +4785,9 @@ let
dbus_cplusplus = callPackage ../development/libraries/dbus-cplusplus { };
dbus_glib = callPackage ../development/libraries/dbus-glib { };
dbus_java = callPackage ../development/libraries/java/dbus-java { };
- dbus_python = callPackage ../development/python-modules/dbus { };
+ dbus_python = callPackage ../development/python-modules/dbus {
+ isPyPy = python.executable == "pypy";
+ };
# Should we deprecate these? Currently there are many references.
dbus_tools = pkgs.dbus.tools;
@@ -4525,11 +4832,7 @@ let
expat = callPackage ../development/libraries/expat { };
- extremetuxracer = builderDefsPackage (import ../games/extremetuxracer) {
- inherit mesa tcl freeglut SDL SDL_mixer pkgconfig
- gettext intltool;
- inherit (xlibs) libX11 xproto libXi inputproto
- libXmu libXext xextproto libXt libSM libICE;
+ extremetuxracer = callPackage ../games/extremetuxracer {
libpng = libpng12;
};
@@ -4571,6 +4874,8 @@ let
vpxSupport = !stdenv.isMips;
};
+ ffmpeg_2_3 = callPackage ../development/libraries/ffmpeg/2.3.x.nix { };
+
ffmpeg_2 = callPackage ../development/libraries/ffmpeg/2.x.nix { };
ffmpeg = ffmpeg_2;
@@ -4632,6 +4937,8 @@ let
gdbm = callPackage ../development/libraries/gdbm { };
+ gecode = callPackage ../development/libraries/gecode { };
+
gegl = callPackage ../development/libraries/gegl {
# avocodec avformat librsvg
};
@@ -4718,36 +5025,10 @@ let
glibcInfo = callPackage ../development/libraries/glibc/2.19/info.nix { };
- glibc_multi =
- runCommand "${glibc.name}-multi"
- { glibc64 = glibc;
- glibc32 = (import ./all-packages.nix {system = "i686-linux";}).glibc;
- }
- ''
- mkdir -p $out
- ln -s $glibc64/* $out/
-
- rm $out/lib $out/lib64
- mkdir -p $out/lib
- ln -s $glibc64/lib/* $out/lib
- ln -s $glibc32/lib $out/lib/32
- ln -s lib $out/lib64
-
- # fixing ldd RLTDLIST
- rm $out/bin
- cp -rs $glibc64/bin $out
- chmod u+w $out/bin
- rm $out/bin/ldd
- sed -e "s|^RTLDLIST=.*$|RTLDLIST=\"$out/lib/ld-2.19.so $out/lib/32/ld-linux.so.2\"|g" \
- $glibc64/bin/ldd > $out/bin/ldd
- chmod 555 $out/bin/ldd
-
- rm $out/include
- cp -rs $glibc32/include $out
- chmod -R u+w $out/include
- cp -rsf $glibc64/include $out
- '' # */
- ;
+ glibc_multi = callPackage ../development/libraries/glibc/2.19/multi.nix {
+ inherit glibc;
+ glibc32 = (import ./all-packages.nix {system = "i686-linux";}).glibc;
+ };
glm = callPackage ../development/libraries/glm { };
@@ -4829,6 +5110,8 @@ let
qt_gstreamer = callPackage ../development/libraries/gstreamer/legacy/qt-gstreamer {};
+ qt_gstreamer1 = callPackage ../development/libraries/gstreamer/qt-gstreamer {};
+
gnet = callPackage ../development/libraries/gnet { };
gnu-efi = callPackage ../development/libraries/gnu-efi { };
@@ -4937,6 +5220,8 @@ let
gtkspell3 = callPackage ../development/libraries/gtkspell/3.nix { };
+ gtkspellmm = callPackage ../development/libraries/gtkspellmm { };
+
gts = callPackage ../development/libraries/gts { };
gvfs = callPackage ../development/libraries/gvfs { gconf = gnome.GConf; };
@@ -4994,6 +5279,8 @@ let
indilib = callPackage ../development/libraries/indilib { };
+ indilib_0_9_9 = callPackage ../development/libraries/indilib/0_9_9.nix { };
+
iniparser = callPackage ../development/libraries/iniparser { };
intltool = callPackage ../development/tools/misc/intltool { };
@@ -5038,11 +5325,12 @@ let
keybinder3 = callPackage ../development/libraries/keybinder3 {
automake = automake111x;
- lua = lua5_1;
};
krb5 = callPackage ../development/libraries/kerberos/krb5.nix { };
+ LASzip = callPackage ../development/libraries/LASzip { };
+
lcms = lcms1;
lcms1 = callPackage ../development/libraries/lcms { };
@@ -5063,9 +5351,7 @@ let
libpng = libpng12;
};
- lgi = callPackage ../development/libraries/lgi {
- lua = lua5_1;
- };
+ lgi = callPackage ../development/libraries/lgi { };
lib3ds = callPackage ../development/libraries/lib3ds { };
@@ -5124,7 +5410,7 @@ let
inherit (gnome) libsoup;
};
- libchamplain_0_6 = callPackage ../development/libraries/libchamplain/0.6.nix {};
+ libchardet = callPackage ../development/libraries/libchardet { };
libchop = callPackage ../development/libraries/libchop { };
@@ -5197,6 +5483,9 @@ let
libelf = callPackage ../development/libraries/libelf { };
libfm = callPackage ../development/libraries/libfm { };
+ libfm-extra = callPackage ../development/libraries/libfm {
+ extraOnly = true;
+ };
libgadu = callPackage ../development/libraries/libgadu { };
@@ -5217,6 +5506,8 @@ let
libgtop = callPackage ../development/libraries/libgtop {};
+ libLAS = callPackage ../development/libraries/libLAS { };
+
liblo = callPackage ../development/libraries/liblo { };
liblrdf = librdf;
@@ -5224,7 +5515,6 @@ let
liblscp = callPackage ../development/libraries/liblscp { };
libe-book = callPackage ../development/libraries/libe-book {};
- libe-book_00 = callPackage ../development/libraries/libe-book/0.0.nix {};
libev = builderDefsPackage ../development/libraries/libev { };
@@ -5257,6 +5547,8 @@ let
libffi = callPackage ../development/libraries/libffi { };
+ libfreefare = callPackage ../development/libraries/libfreefare { };
+
libftdi = callPackage ../development/libraries/libftdi { };
libftdi1 = callPackage ../development/libraries/libftdi/1.x.nix { };
@@ -5281,6 +5573,12 @@ let
libharu = callPackage ../development/libraries/libharu { };
+ libHX = callPackage ../development/libraries/libHX { };
+
+ libibmad = callPackage ../development/libraries/libibmad { };
+
+ libibumad = callPackage ../development/libraries/libibumad { };
+
libical = callPackage ../development/libraries/libical { };
libicns = callPackage ../development/libraries/libicns { };
@@ -5441,7 +5739,6 @@ let
libmusicbrainz = libmusicbrainz3;
libmwaw = callPackage ../development/libraries/libmwaw { };
- libmwaw_02 = callPackage ../development/libraries/libmwaw/0.2.nix { };
libmx = callPackage ../development/libraries/libmx { };
@@ -5584,8 +5881,10 @@ let
libupnp = callPackage ../development/libraries/pupnp { };
- giflib = callPackage ../development/libraries/giflib { };
+ giflib = giflib_5_0;
giflib_4_1 = callPackage ../development/libraries/giflib/4.1.nix { };
+ giflib_5_0 = callPackage ../development/libraries/giflib/5.0.nix { };
+ giflib_5_1 = callPackage ../development/libraries/giflib/5.1.nix { };
libungif = callPackage ../development/libraries/giflib/libungif.nix { };
@@ -5678,7 +5977,6 @@ let
libyaml = callPackage ../development/libraries/libyaml { };
libyamlcpp = callPackage ../development/libraries/libyaml-cpp { };
- libyamlcpp03 = callPackage ../development/libraries/libyaml-cpp/0.3.x.nix { };
libyubikey = callPackage ../development/libraries/libyubikey {};
@@ -5697,6 +5995,8 @@ let
lirc = callPackage ../development/libraries/lirc { };
+ liquidfun = callPackage ../development/libraries/liquidfun { };
+
liquidwar = builderDefsPackage ../games/liquidwar {
inherit (xlibs) xproto libX11 libXrender;
inherit gmp mesa libjpeg
@@ -5898,7 +6198,11 @@ let
openexr = callPackage ../development/libraries/openexr { };
- openldap = callPackage ../development/libraries/openldap { };
+ openldap = callPackage ../development/libraries/openldap {
+ stdenv = if stdenv.isDarwin
+ then clangStdenv
+ else stdenv;
+ };
openlierox = callPackage ../games/openlierox { };
@@ -5965,7 +6269,7 @@ let
pocketsphinx = callPackage ../development/libraries/pocketsphinx { };
- podofo = callPackage ../development/libraries/podofo { };
+ podofo = callPackage ../development/libraries/podofo { lua5 = lua5_1; };
polkit = callPackage ../development/libraries/polkit {
spidermonkey = spidermonkey_185;
@@ -6017,6 +6321,8 @@ let
qoauth = callPackage ../development/libraries/qoauth { };
+ quazip = callPackage ../development/libraries/quazip { };
+
qt3 = callPackage ../development/libraries/qt-3 {
openglSupport = mesaSupported;
libpng = libpng12;
@@ -6036,24 +6342,24 @@ let
else stdenv;
};
- qt48Full = qt48.override {
+ qt48Full = appendToName "full" (qt48.override {
docs = true;
demos = true;
examples = true;
developerBuild = true;
- };
+ });
qt4SDK = qtcreator.override {
sdkBuild = true;
qtLib = qt48Full;
};
- qt53Full = qt53.override {
+ qt53Full = appendToName "full" (qt53.override {
buildDocs = true;
buildExamples = true;
buildTests = true;
developerBuild = true;
- };
+ });
qt53 = callPackage ../development/libraries/qt-5/qt-5.3.nix {
mesa = mesa_noglu;
@@ -6071,12 +6377,12 @@ let
bison = bison2; # error: too few arguments to function 'int yylex(...
};
- qt5Full = qt5.override {
+ qt5Full = appendToName "full" (qt5.override {
buildDocs = true;
buildExamples = true;
buildTests = true;
developerBuild = true;
- };
+ });
qt5SDK = qtcreator.override {
sdkBuild = true;
@@ -6101,15 +6407,14 @@ let
raul = callPackage ../development/libraries/audio/raul { };
- readline = readline6; # 6.2 works, 6.3 breaks python, parted
+ readline = readline6;
+ readline6 = readline63;
- readline4 = callPackage ../development/libraries/readline/readline4.nix { };
+ readline5 = callPackage ../development/libraries/readline/5.x.nix { };
- readline5 = callPackage ../development/libraries/readline/readline5.nix { };
+ readline62 = callPackage ../development/libraries/readline/6.2.nix { };
- readline6 = callPackage ../development/libraries/readline/readline6.nix { };
-
- readline63 = callPackage ../development/libraries/readline/readline6.3.nix { };
+ readline63 = callPackage ../development/libraries/readline/6.3.nix { };
librdf_raptor = callPackage ../development/libraries/librdf/raptor.nix { };
@@ -6242,6 +6547,8 @@ let
sphinxbase = callPackage ../development/libraries/sphinxbase { };
+ sphinxsearch = callPackage ../servers/search/sphinxsearch { };
+
spice = callPackage ../development/libraries/spice {
celt = celt_0_5_1;
inherit (xlibs) libXrandr libXfixes libXext libXrender libXinerama;
@@ -6507,6 +6814,34 @@ let
zziplib = callPackage ../development/libraries/zziplib { };
+ ### DEVELOPMENT / LIBRARIES / AGDA
+
+ agda = callPackage ../build-support/agda {
+ glibcLocales = if pkgs.stdenv.isLinux then pkgs.glibcLocales else null;
+ extension = self : super : {};
+ Agda = haskellPackages.Agda;
+ inherit writeScriptBin;
+ };
+
+ agdaBase = callPackage ../development/libraries/agda/agda-base {};
+
+ agdaIowaStdlib = callPackage ../development/libraries/agda/agda-iowa-stdlib {};
+
+ agdaPrelude = callPackage ../development/libraries/agda/agda-prelude {};
+
+ AgdaStdlib = callPackage ../development/compilers/agda/stdlib.nix {
+ inherit (haskellPackages) ghc filemanip;
+ };
+
+ AgdaSheaves = callPackage ../development/libraries/agda/AgdaSheaves {};
+
+ bitvector = callPackage ../development/libraries/agda/bitvector {};
+
+ categories = callPackage ../development/libraries/agda/categories {};
+
+ pretty = callPackage ../development/libraries/agda/pretty {};
+
+ TotalParserCombinators = callPackage ../development/libraries/agda/TotalParserCombinators {};
### DEVELOPMENT / LIBRARIES / JAVA
@@ -6514,7 +6849,17 @@ let
stdenv = overrideInStdenv stdenv [gnumake380];
};
- commonsFileUpload = callPackage ../development/libraries/java/jakarta-commons/file-upload { };
+ commonsBcel = callPackage ../development/libraries/java/commons/bcel { };
+
+ commonsCompress = callPackage ../development/libraries/java/commons/compress { };
+
+ commonsFileUpload = callPackage ../development/libraries/java/commons/fileupload { };
+
+ commonsLang = callPackage ../development/libraries/java/commons/lang { };
+
+ commonsIo = callPackage ../development/libraries/java/commons/io { };
+
+ commonsMath = callPackage ../development/libraries/java/commons/math { };
fastjar = callPackage ../development/tools/java/fastjar { };
@@ -6524,12 +6869,6 @@ let
gwtwidgets = callPackage ../development/libraries/java/gwt-widgets { };
- jakartabcel = callPackage ../development/libraries/java/jakarta-bcel {
- regexp = jakartaregexp;
- };
-
- jakartaregexp = callPackage ../development/libraries/java/jakarta-regexp { };
-
javaCup = callPackage ../development/libraries/java/cup { };
javasvn = callPackage ../development/libraries/java/javasvn { };
@@ -6571,7 +6910,9 @@ let
### DEVELOPMENT / LIBRARIES / JAVASCRIPT
- jquery_ui = callPackage ../development/libraries/javascript/jquery-ui { };
+ jquery = callPackage ../development/libraries/javascript/jquery { };
+
+ jquery-ui = callPackage ../development/libraries/javascript/jquery-ui { };
yuicompressor = callPackage ../development/tools/yuicompressor { };
@@ -6621,7 +6962,6 @@ let
planetary_annihilation = callPackage ../games/planetaryannihilation { };
-
### DEVELOPMENT / PYTHON MODULES
# python function with default python interpreter
@@ -6701,7 +7041,7 @@ let
rhpl = callPackage ../development/python-modules/rhpl { };
- sip = callPackage ../development/python-modules/sip { };
+ sip = pythonPackages.sip;
pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix {
stdenv = if stdenv.isDarwin
@@ -6772,6 +7112,12 @@ let
sslSupport = true;
});
+ cassandra = callPackage ../servers/nosql/cassandra { };
+
+ apache-jena = callPackage ../servers/nosql/apache-jena/binary.nix {
+ java = icedtea7_jdk;
+ };
+
apcupsd = callPackage ../servers/apcupsd { };
sabnzbd = callPackage ../servers/sabnzbd { };
@@ -6805,7 +7151,7 @@ let
dictdWordnet = callPackage ../servers/dict/dictd-wordnet.nix {};
- diod = callPackage ../servers/diod { };
+ diod = callPackage ../servers/diod { lua = lua5_1; };
dovecot = dovecot21;
@@ -6902,7 +7248,7 @@ let
nix-binary-cache = callPackage ../servers/http/nix-binary-cache {};
- nsd = callPackage ../servers/dns/nsd { };
+ nsd = callPackage ../servers/dns/nsd (config.nsd or {});
nsq = callPackage ../servers/nsq { };
@@ -6945,7 +7291,9 @@ let
mariadb = callPackage ../servers/sql/mariadb {};
- mongodb = callPackage ../servers/nosql/mongodb { };
+ mongodb = callPackage ../servers/nosql/mongodb {
+ sasl = cyrus_sasl;
+ };
riak = callPackage ../servers/nosql/riak/1.3.1.nix { };
@@ -6994,6 +7342,8 @@ let
postgresql93 = callPackage ../servers/sql/postgresql/9.3.x.nix { };
+ postgresql94 = callPackage ../servers/sql/postgresql/9.4.x.nix { };
+
postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { };
psqlodbc = callPackage ../servers/sql/postgresql/psqlodbc { };
@@ -7067,8 +7417,14 @@ let
tomcat6 = callPackage ../servers/http/tomcat/6.0.nix { };
+ tomcat7 = callPackage ../servers/http/tomcat/7.0.nix { };
+
+ tomcat8 = callPackage ../servers/http/tomcat/8.0.nix { };
+
tomcat_mysql_jdbc = callPackage ../servers/http/tomcat/jdbc/mysql { };
+ torque = callPackage ../servers/computing/torque { };
+
axis2 = callPackage ../servers/http/tomcat/axis2 { };
unifi = callPackage ../servers/unifi { };
@@ -7085,6 +7441,8 @@ let
xinetd = callPackage ../servers/xinetd { };
+ zookeeper = callPackage ../servers/zookeeper { };
+
xquartz = callPackage ../servers/x11/xquartz { };
quartz-wm = callPackage ../servers/x11/quartz-wm { stdenv = clangStdenv; };
@@ -7207,7 +7565,9 @@ let
cramfsswap = callPackage ../os-specific/linux/cramfsswap { };
- darwin = rec {
+ darwin = let
+ cmdline = (callPackage ../os-specific/darwin/command-line-tools {}).pure { inherit xpwn; };
+ in rec {
cctools = forceNativeDrv (callPackage ../os-specific/darwin/cctools-port {
cross = assert crossSystem != null; crossSystem;
inherit maloader;
@@ -7221,6 +7581,14 @@ let
opencflite = callPackage ../os-specific/darwin/opencflite {};
xcode = callPackage ../os-specific/darwin/xcode {};
+
+ osx_sdk = callPackage ../os-specific/darwin/osx-sdk {};
+ osx_private_sdk = callPackage ../os-specific/darwin/osx-private-sdk { inherit osx_sdk; };
+
+ security_tool = callPackage ../os-specific/darwin/security-tool { inherit osx_private_sdk; };
+
+ cmdline_sdk = cmdline.sdk;
+ cmdline_tools = cmdline.tools;
};
devicemapper = lvm2;
@@ -7238,7 +7606,9 @@ let
inherit (xlibs) xproto;
};
- dmraid = callPackage ../os-specific/linux/dmraid { };
+ dmraid = callPackage ../os-specific/linux/dmraid {
+ devicemapper = devicemapper.override {enable_dmeventd = true;};
+ };
drbd = callPackage ../os-specific/linux/drbd { };
@@ -7386,12 +7756,6 @@ let
kernelPatches = [];
};
- linux_3_2_xen = lowPrio (linux_3_2.override {
- extraConfig = ''
- XEN_DOM0 y
- '';
- });
-
linux_3_4 = makeOverridable (import ../os-specific/linux/kernel/linux-3.4.nix) {
inherit fetchurl stdenv perl buildLinux;
kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips")
@@ -7449,6 +7813,15 @@ let
];
};
+ linux_3_17 = makeOverridable (import ../os-specific/linux/kernel/linux-3.17.nix) {
+ inherit fetchurl stdenv perl buildLinux;
+ kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips")
+ [ kernelPatches.mips_fpureg_emu
+ kernelPatches.mips_fpu_sigill
+ kernelPatches.mips_ext3_n32
+ ];
+ };
+
linux_testing = makeOverridable (import ../os-specific/linux/kernel/linux-testing.nix) {
inherit fetchurl stdenv perl buildLinux;
kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips")
@@ -7558,6 +7931,8 @@ let
psmouse_alps = callPackage ../os-specific/linux/psmouse-alps { };
+ seturgent = callPackage ../os-specific/linux/seturgent { };
+
spl = callPackage ../os-specific/linux/spl { };
spl_git = callPackage ../os-specific/linux/spl/git.nix { };
@@ -7584,12 +7959,11 @@ let
linuxPackages = linuxPackages_3_12;
# Update this when adding the newest kernel major version!
- linux_latest = pkgs.linux_3_16;
- linuxPackages_latest = pkgs.linuxPackages_3_16;
+ linux_latest = pkgs.linux_3_17;
+ linuxPackages_latest = pkgs.linuxPackages_3_17;
# Build the kernel modules for the some of the kernels.
linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 linuxPackages_3_2);
- linuxPackages_3_2_xen = linuxPackagesFor pkgs.linux_3_2_xen linuxPackages_3_2_xen;
linuxPackages_3_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4 linuxPackages_3_4);
linuxPackages_3_6_rpi = linuxPackagesFor pkgs.linux_3_6_rpi linuxPackages_3_6_rpi;
linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10 linuxPackages_3_10);
@@ -7598,6 +7972,7 @@ let
linuxPackages_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_14 linuxPackages_3_14);
linuxPackages_3_15 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_15 linuxPackages_3_15);
linuxPackages_3_16 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_16 linuxPackages_3_16);
+ linuxPackages_3_17 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_17 linuxPackages_3_17);
linuxPackages_testing = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing linuxPackages_testing);
# grsecurity flavors
@@ -7714,6 +8089,8 @@ let
pam_login = callPackage ../os-specific/linux/pam_login { };
+ pam_mount = callPackage ../os-specific/linux/pam_mount { };
+
pam_ssh_agent_auth = callPackage ../os-specific/linux/pam_ssh_agent_auth { };
pam_usb = callPackage ../os-specific/linux/pam_usb { };
@@ -7775,6 +8152,8 @@ let
shadow = callPackage ../os-specific/linux/shadow { };
+ smem = callPackage ../os-specific/linux/smem { };
+
statifier = builderDefsPackage (import ../os-specific/linux/statifier) { };
sysdig = callPackage ../os-specific/linux/sysdig {
@@ -7991,12 +8370,16 @@ let
aurulent-sans = callPackage ../data/fonts/aurulent-sans { };
+ baekmuk-ttf = callPackage ../data/fonts/baekmuk-ttf { };
+
bakoma_ttf = callPackage ../data/fonts/bakoma-ttf { };
cacert = callPackage ../data/misc/cacert { };
cantarell_fonts = callPackage ../data/fonts/cantarell-fonts { };
+ comic-neue = callPackage ../data/fonts/comic-neue { };
+
corefonts = callPackage ../data/fonts/corefonts { };
wrapFonts = paths : ((import ../data/fonts/fontWrap) {
@@ -8094,6 +8477,8 @@ let
posix_man_pages = callPackage ../data/documentation/man-pages-posix { };
+ proggyfonts = callPackage ../data/fonts/proggyfonts { };
+
pthreadmanpages = callPackage ../data/documentation/pthread-man-pages { };
shared_mime_info = callPackage ../data/misc/shared-mime-info { };
@@ -8102,6 +8487,8 @@ let
stdmanpages = callPackage ../data/documentation/std-man-pages { };
+ stix-otf = callPackage ../data/fonts/stix-otf { };
+
symbola = callPackage ../data/fonts/symbola { };
iana_etc = callPackage ../data/misc/iana-etc { };
@@ -8195,8 +8582,16 @@ let
aewan = callPackage ../applications/editors/aewan { };
+ afterstep = callPackage ../applications/window-managers/afterstep {
+ inherit (xlibs) libX11 libXext libICE;
+ fltk = fltk13;
+ gtk = gtk2;
+ };
+
alchemy = callPackage ../applications/graphics/alchemy { };
+ alock = callPackage ../misc/screensavers/alock { };
+
ams-lv2 = callPackage ../applications/audio/ams-lv2 { };
amsn = callPackage ../applications/networking/instant-messengers/amsn { };
@@ -8244,17 +8639,22 @@ let
avxsynth = callPackage ../applications/video/avxsynth { };
awesome-3-4 = callPackage ../applications/window-managers/awesome/3.4.nix {
- lua = lua5;
cairo = cairo.override { xcbSupport = true; };
+ lua = lua5_1;
};
awesome-3-5 = callPackage ../applications/window-managers/awesome {
- lua = lua5_1;
cairo = cairo.override { xcbSupport = true; };
};
awesome = awesome-3-5;
inherit (gnome3) baobab;
+ backintime-common = callPackage ../applications/networking/sync/backintime/common.nix { };
+
+ backintime-gnome = callPackage ../applications/networking/sync/backintime/gnome.nix { };
+
+ backintime = backintime-gnome;
+
bar = callPackage ../applications/window-managers/bar { };
baresip = callPackage ../applications/networking/instant-messengers/baresip {
@@ -8263,6 +8663,8 @@ let
batik = callPackage ../applications/graphics/batik { };
+ batti = callPackage ../applications/misc/batti { };
+
bazaar = callPackage ../applications/version-management/bazaar { };
bazaarTools = builderDefsPackage (import ../applications/version-management/bazaar/tools.nix) {
@@ -8276,12 +8678,15 @@ let
bibletime = callPackage ../applications/misc/bibletime { };
- bitcoin = callPackage ../applications/misc/bitcoin { };
+ bitcoin = callPackage ../applications/misc/bitcoin {};
+ bitcoind = callPackage ../applications/misc/bitcoin { gui = false; };
- bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee {
- gnutls = gnutls;
- libotr = libotr_3_2;
- };
+ altcoins = recurseIntoAttrs (
+ (callPackage ../applications/misc/bitcoin/altcoins.nix {}) //
+ (callPackage ../applications/misc/bitcoin/dogecoin.nix {})
+ );
+
+ bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee { };
blender = callPackage ../applications/misc/blender {
python = python34;
@@ -8333,25 +8738,26 @@ let
chatzilla = callPackage ../applications/networking/irc/chatzilla { };
- chromium = lowPrio (callPackage ../applications/networking/browsers/chromium {
+ chromium = callPackage ../applications/networking/browsers/chromium {
channel = "stable";
pulseSupport = config.pulseaudio or true;
enablePepperFlash = config.chromium.enablePepperFlash or false;
enablePepperPDF = config.chromium.enablePepperPDF or false;
- });
+ hiDPISupport = config.chromium.hiDPISupport or false;
+ };
chromiumBeta = lowPrio (chromium.override { channel = "beta"; });
- chromiumBetaWrapper = lowPrio (wrapChromium chromiumBeta);
chromiumDev = lowPrio (chromium.override { channel = "dev"; });
- chromiumDevWrapper = lowPrio (wrapChromium chromiumDev);
-
- chromiumWrapper = wrapChromium chromium;
cinelerra = callPackage ../applications/video/cinelerra { };
clipit = callPackage ../applications/misc/clipit { };
+ cmplayer = callPackage ../applications/video/cmplayer {
+ pulseSupport = config.pulseaudio or false;
+ };
+
cmus = callPackage ../applications/audio/cmus { };
compiz = callPackage ../applications/window-managers/compiz {
@@ -8404,6 +8810,7 @@ let
darcs = with haskellPackages_ghc783; callPackage ../applications/version-management/darcs {
cabal = cabal.override {
extension = self : super : {
+ enableSharedExecutables = false;
isLibrary = false;
configureFlags = "-f-library " + super.configureFlags or "";
};
@@ -8416,6 +8823,10 @@ let
dd-agent = callPackage ../tools/networking/dd-agent { inherit (pythonPackages) tornado; };
+ deadbeef = callPackage ../applications/audio/deadbeef {
+ pulseSupport = config.pulseaudio or true;
+ };
+
dia = callPackage ../applications/graphics/dia {
inherit (pkgs.gnome) libart_lgpl libgnomeui;
};
@@ -8523,9 +8934,9 @@ let
darcsum = callPackage ../applications/editors/emacs-modes/darcsum { };
- # ecb = callPackage ../applications/editors/emacs-modes/ecb { };
+ dash = callPackage ../applications/editors/emacs-modes/dash { };
- jabber = callPackage ../applications/editors/emacs-modes/jabber { };
+ # ecb = callPackage ../applications/editors/emacs-modes/ecb { };
emacsClangCompleteAsync = callPackage ../applications/editors/emacs-modes/emacs-clang-complete-async { };
@@ -8535,6 +8946,8 @@ let
emms = callPackage ../applications/editors/emacs-modes/emms { };
+ ensime = callPackage ../applications/editors/emacs-modes/ensime { };
+
ess = callPackage ../applications/editors/emacs-modes/ess { };
flymakeCursor = callPackage ../applications/editors/emacs-modes/flymake-cursor { };
@@ -8545,32 +8958,22 @@ let
gist = callPackage ../applications/editors/emacs-modes/gist { };
- idris = callPackage ../applications/editors/emacs-modes/idris { };
-
- jade = callPackage ../applications/editors/emacs-modes/jade { };
-
- jdee = callPackage ../applications/editors/emacs-modes/jdee {
- # Requires Emacs 23, for `avl-tree'.
- };
-
- js2 = callPackage ../applications/editors/emacs-modes/js2 { };
-
- stratego = callPackage ../applications/editors/emacs-modes/stratego { };
-
haskellMode = callPackage ../applications/editors/emacs-modes/haskell { };
- ocamlMode = callPackage ../applications/editors/emacs-modes/ocaml { };
-
- structuredHaskellMode = callPackage ../applications/editors/emacs-modes/structured-haskell-mode {
- inherit (haskellPackages) cabal haskellSrcExts;
- };
-
- tuaregMode = callPackage ../applications/editors/emacs-modes/tuareg { };
-
hol_light_mode = callPackage ../applications/editors/emacs-modes/hol_light { };
htmlize = callPackage ../applications/editors/emacs-modes/htmlize { };
+ idris = callPackage ../applications/editors/emacs-modes/idris { };
+
+ jabber = callPackage ../applications/editors/emacs-modes/jabber { };
+
+ jade = callPackage ../applications/editors/emacs-modes/jade { };
+
+ jdee = callPackage ../applications/editors/emacs-modes/jdee { };
+
+ js2 = callPackage ../applications/editors/emacs-modes/js2 { };
+
logito = callPackage ../applications/editors/emacs-modes/logito { };
loremIpsum = callPackage ../applications/editors/emacs-modes/lorem-ipsum { };
@@ -8583,6 +8986,8 @@ let
notmuch = lowPrio (callPackage ../applications/networking/mailreaders/notmuch { });
+ ocamlMode = callPackage ../applications/editors/emacs-modes/ocaml { };
+
offlineimap = callPackage ../applications/editors/emacs-modes/offlineimap {};
# This is usually a newer version of Org-Mode than that found in GNU Emacs, so
@@ -8613,22 +9018,36 @@ let
quack = callPackage ../applications/editors/emacs-modes/quack { };
+ rainbowDelimiters = callPackage ../applications/editors/emacs-modes/rainbow-delimiters { };
+
rectMark = callPackage ../applications/editors/emacs-modes/rect-mark { };
remember = callPackage ../applications/editors/emacs-modes/remember { };
rudel = callPackage ../applications/editors/emacs-modes/rudel { };
+ s = callPackage ../applications/editors/emacs-modes/s { };
+
sbtMode = callPackage ../applications/editors/emacs-modes/sbt-mode { };
scalaMode1 = callPackage ../applications/editors/emacs-modes/scala-mode/v1.nix { };
scalaMode2 = callPackage ../applications/editors/emacs-modes/scala-mode/v2.nix { };
+ stratego = callPackage ../applications/editors/emacs-modes/stratego { };
+
+ structuredHaskellMode = callPackage ../applications/editors/emacs-modes/structured-haskell-mode {
+ inherit (haskellPackages) cabal haskellSrcExts;
+ };
+
sunriseCommander = callPackage ../applications/editors/emacs-modes/sunrise-commander { };
+ tuaregMode = callPackage ../applications/editors/emacs-modes/tuareg { };
+
writeGood = callPackage ../applications/editors/emacs-modes/writegood { };
xmlRpc = callPackage ../applications/editors/emacs-modes/xml-rpc { };
+
+ cask = callPackage ../applications/editors/emacs-modes/cask { };
};
emacs24Packages = recurseIntoAttrs (emacsPackages emacs24 pkgs.emacs24Packages);
@@ -8649,6 +9068,10 @@ let
inherit (gnome) gnomedocutils libgnome libglade libgnomeui scrollkeeper;
};
+ evilvte = callPackage ../applications/misc/evilvte {
+ configH = config.evilvte.config or "";
+ };
+
evopedia = callPackage ../applications/misc/evopedia { };
keepassx = callPackage ../applications/misc/keepassx { };
@@ -8677,6 +9100,8 @@ let
fossil = callPackage ../applications/version-management/fossil { };
+ freewheeling = callPackage ../applications/audio/freewheeling { };
+
fribid = callPackage ../applications/networking/browsers/mozilla-plugins/fribid { };
fvwm = callPackage ../applications/window-managers/fvwm { };
@@ -8731,7 +9156,13 @@ let
wavesurfer = callPackage ../applications/misc/audio/wavesurfer { };
- wireshark = callPackage ../applications/networking/sniffers/wireshark { };
+ wireshark-cli = callPackage ../applications/networking/sniffers/wireshark {
+ withQt = false;
+ withGtk = false;
+ };
+ wireshark-gtk = wireshark-cli.override { withGtk = true; };
+ wireshark-qt = wireshark-cli.override { withQt = true; };
+ wireshark = wireshark-gtk;
wvdial = callPackage ../os-specific/linux/wvdial { };
@@ -8749,12 +9180,6 @@ let
firefox13Wrapper = wrapFirefox { browser = firefox13Pkgs.firefox; };
- firefox30Pkgs = callPackage ../applications/networking/browsers/firefox/30.nix {
- inherit (gnome) libIDL;
- inherit (pythonPackages) pysqlite;
- libpng = libpng_apng;
- };
-
firefox = callPackage ../applications/networking/browsers/firefox {
inherit (gnome) libIDL;
inherit (pythonPackages) pysqlite;
@@ -8777,6 +9202,11 @@ let
fluxbox = callPackage ../applications/window-managers/fluxbox { };
+ fme = callPackage ../applications/misc/fme {
+ inherit (gnome) libglademm;
+ inherit pkgconfig autoconf automake gettext;
+ };
+
freecad = callPackage ../applications/graphics/freecad {
opencascade = opencascade_6_5;
inherit (pythonPackages) matplotlib pycollada;
@@ -8861,16 +9291,20 @@ let
libart = gnome2.libart_lgpl;
}; # latest version: gnome3.goffice
- ideas = recurseIntoAttrs ( (callPackage ../applications/editors/idea { })
- // (callPackage ../applications/editors/idea/pycharm.nix { }));
+ idea = recurseIntoAttrs (callPackage ../applications/editors/idea { });
libquvi = callPackage ../applications/video/quvi/library.nix { };
+ linssid = callPackage ../applications/networking/linssid { };
+
mi2ly = callPackage ../applications/audio/mi2ly {};
praat = callPackage ../applications/audio/praat { };
- quvi = callPackage ../applications/video/quvi/tool.nix { };
+ quvi = callPackage ../applications/video/quvi/tool.nix {
+ lua5_sockets = lua5_1_sockets;
+ lua5 = lua5_1;
+ };
quvi_scripts = callPackage ../applications/video/quvi/scripts.nix { };
@@ -8967,7 +9401,9 @@ let
gpsd = callPackage ../servers/gpsd { };
- guitone = callPackage ../applications/version-management/guitone { };
+ guitone = callPackage ../applications/version-management/guitone {
+ graphviz = graphviz_2_32;
+ };
gv = callPackage ../applications/misc/gv { };
@@ -9014,7 +9450,7 @@ let
ii = callPackage ../applications/networking/irc/ii { };
- ike = callPackage ../applications/ike { };
+ ike = callPackage ../applications/networking/ike { };
ikiwiki = callPackage ../applications/misc/ikiwiki {
inherit (perlPackages) TextMarkdown URI HTMLParser HTMLScrubber
@@ -9090,6 +9526,7 @@ let
k3d = callPackage ../applications/graphics/k3d {
inherit (pkgs.gnome2) gtkglext;
+ boost = boost149;
};
keepnote = callPackage ../applications/office/keepnote {
@@ -9100,10 +9537,16 @@ let
keymon = callPackage ../applications/video/key-mon { };
+ kid3 = callPackage ../applications/audio/kid3 {
+ qt = qt4;
+ };
+
kino = callPackage ../applications/video/kino {
inherit (gnome) libglade;
};
+ koji = callPackage ../tools/package-management/koji { };
+
lame = callPackage ../applications/audio/lame { };
larswm = callPackage ../applications/window-managers/larswm { };
@@ -9138,7 +9581,6 @@ let
inherit (perlPackages) ArchiveZip CompressZlib;
inherit (gnome) GConf ORBit2 gnome_vfs;
zip = zip.override { enableNLS = false; };
- boost = boost155;
jdk = openjdk;
fontsConf = makeFontsConf {
fontDirectories = [
@@ -9189,6 +9631,11 @@ let
handbrake = callPackage ../applications/video/handbrake { };
+ lilyterm = callPackage ../applications/misc/lilyterm {
+ inherit (gnome) vte;
+ gtk = gtk2;
+ };
+
lynx = callPackage ../applications/networking/browsers/lynx { };
lyx = callPackage ../applications/misc/lyx { };
@@ -9248,6 +9695,8 @@ let
moc = callPackage ../applications/audio/moc { };
+ monero = callPackage ../applications/misc/monero { };
+
monkeysAudio = callPackage ../applications/audio/monkeys-audio { };
monodevelop = callPackage ../applications/editors/monodevelop {
@@ -9266,8 +9715,8 @@ let
};
monotoneViz = builderDefsPackage (import ../applications/version-management/monotone-viz/mtn-head.nix) {
- inherit ocaml graphviz pkgconfig autoconf automake libtool glib gtk;
- inherit (ocamlPackages) lablgtk;
+ inherit graphviz pkgconfig autoconf automake libtool glib gtk;
+ inherit (ocamlPackages_4_01_0) lablgtk ocaml;
inherit (gnome) libgnomecanvas;
};
@@ -9325,13 +9774,19 @@ let
mpv = callPackage ../applications/video/mpv {
lua = lua5_1;
- bs2bSupport = true;
- quviSupport = true;
- cacaSupport = true;
+ lua5_sockets = lua5_1_sockets;
+ bs2bSupport = config.mpv.bs2bSupport or true;
+ quviSupport = config.mpv.quviSupport or false;
+ cacaSupport = config.mpv.cacaSupport or true;
+ vaapiSupport = config.mpv.vaapiSupport or false;
};
mrxvt = callPackage ../applications/misc/mrxvt { };
+ mudlet = callPackage ../games/mudlet {
+ inherit (lua51Packages) luafilesystem lrexlib luazip luasqlite3;
+ };
+
multisync = callPackage ../applications/misc/multisync {
inherit (gnome) ORBit2 libbonobo libgnomeui GConf;
};
@@ -9351,12 +9806,17 @@ let
iceSupport = config.murmur.iceSupport or true;
};
+ musescore = callPackage ../applications/audio/musescore { };
+
mutt = callPackage ../applications/networking/mailreaders/mutt { };
+ namecoin = callPackage ../applications/misc/namecoin { };
+ namecoinqt = callPackage ../applications/misc/namecoin/qt.nix { };
+
pcmanfm = callPackage ../applications/misc/pcmanfm { };
ruby_gpgme = callPackage ../development/libraries/ruby_gpgme {
- ruby = ruby19;
+ ruby = ruby_1_9_3;
hoe = rubyLibs.hoe;
};
@@ -9367,7 +9827,7 @@ let
smplayer = callPackage ../applications/video/smplayer { };
sup = with rubyLibs; callPackage ../applications/networking/mailreaders/sup {
- ruby = ruby19.override {
+ ruby = ruby_1_9_3.override {
cursesSupport = true;
};
@@ -9415,6 +9875,8 @@ let
nano = callPackage ../applications/editors/nano { };
+ nanoblogger = callPackage ../applications/misc/nanoblogger { };
+
navipowm = callPackage ../applications/misc/navipowm { };
navit = callPackage ../applications/misc/navit { };
@@ -9463,6 +9925,8 @@ let
openbox = callPackage ../applications/window-managers/openbox { };
+ openbox-menu = callPackage ../applications/misc/openbox-menu { };
+
openimageio = callPackage ../applications/graphics/openimageio { };
openjump = callPackage ../applications/misc/openjump { };
@@ -9485,6 +9949,10 @@ let
panotools = callPackage ../applications/graphics/panotools { };
+ paprefs = callPackage ../applications/audio/paprefs {
+ inherit (gnome) libglademm gconfmm;
+ };
+
pavucontrol = callPackage ../applications/audio/pavucontrol { };
paraview = callPackage ../applications/graphics/paraview { };
@@ -9549,6 +10017,8 @@ let
qiv = callPackage ../applications/graphics/qiv { };
+ processing = callPackage ../applications/graphics/processing { inherit (xorg) libXxf86vm; };
+
# perhaps there are better apps for this task? It's how I had configured my preivous system.
# And I don't want to rewrite all rules
procmail = callPackage ../applications/misc/procmail { };
@@ -9563,7 +10033,7 @@ let
qbittorrent = callPackage ../applications/networking/p2p/qbittorrent { };
- eiskaltdcpp = callPackage ../applications/networking/p2p/eiskaltdcpp { };
+ eiskaltdcpp = callPackage ../applications/networking/p2p/eiskaltdcpp { lua5 = lua5_1; };
qemu = callPackage ../applications/virtualization/qemu { };
@@ -9573,6 +10043,8 @@ let
qsynth = callPackage ../applications/audio/qsynth { };
+ qtox = callPackage ../applications/networking/instant-messengers/qtox { };
+
qtpfsgui = callPackage ../applications/graphics/qtpfsgui { };
qtractor = callPackage ../applications/audio/qtractor { };
@@ -9682,6 +10154,8 @@ let
conf = config.st.conf or null;
};
+ stella = callPackage ../misc/emulators/stella { };
+
linuxstopmotion = callPackage ../applications/video/linuxstopmotion { };
sweethome3d = recurseIntoAttrs ( (callPackage ../applications/misc/sweethome3d { })
@@ -9694,6 +10168,8 @@ let
bittorrentSync = callPackage ../applications/networking/bittorrentsync { };
+ copy-com = callPackage ../applications/networking/copy-com { };
+
dropbox = callPackage ../applications/networking/dropbox { };
dropbox-cli = callPackage ../applications/networking/dropbox-cli { };
@@ -9718,8 +10194,17 @@ let
libpng = libpng12;
};
+
+ smartgithg = callPackage ../applications/version-management/smartgithg { };
+
+ slimThemes = recurseIntoAttrs (import ../applications/display-managers/slim/themes.nix {
+ inherit stdenv fetchurl slim;
+ });
+
smartdeblur = callPackage ../applications/graphics/smartdeblur { };
+ snapper = callPackage ../tools/misc/snapper { };
+
snd = callPackage ../applications/audio/snd { };
shntool = callPackage ../applications/audio/shntool { };
@@ -9835,6 +10320,11 @@ let
inherit (pythonPackages) notify;
};
+ termite = callPackage ../applications/misc/termite {
+ gtk = gtk3;
+ vte = gnome3_12.vte-select-text;
+ };
+
tesseract = callPackage ../applications/graphics/tesseract { };
thinkingRock = callPackage ../applications/misc/thinking-rock { };
@@ -9854,6 +10344,11 @@ let
tig = gitAndTools.tig;
+ tilda = callPackage ../applications/misc/tilda {
+ vte = gnome3.vte;
+ gtk = gtk3;
+ };
+
timidity = callPackage ../tools/misc/timidity { };
tint2 = callPackage ../applications/misc/tint2 { };
@@ -9881,6 +10376,8 @@ let
tree = callPackage ../tools/system/tree {};
+ trezor-bridge = callPackage ../applications/networking/browsers/mozilla-plugins/trezor { };
+
tribler = callPackage ../applications/networking/p2p/tribler { };
twister = callPackage ../applications/networking/p2p/twister { };
@@ -9906,10 +10403,12 @@ let
webkit = webkitgtk2;
};
- uTox = callPackage ../applications/networking/instant-messengers/utox { };
+ utox = callPackage ../applications/networking/instant-messengers/utox { };
vanitygen = callPackage ../applications/misc/vanitygen { };
+ vanubi = callPackage ../applications/editors/vanubi { };
+
vbindiff = callPackage ../applications/editors/vbindiff { };
vcprompt = callPackage ../applications/version-management/vcprompt { };
@@ -9938,7 +10437,7 @@ let
libICE;
features = "huge"; # one of tiny, small, normal, big or huge
- lua = pkgs.lua5;
+ lua = pkgs.lua5_1;
gui = config.vim.gui or "auto";
# optional features by flags
@@ -9987,7 +10486,9 @@ let
inherit (xlibs) libX11;
};
- vlc = callPackage ../applications/video/vlc { };
+ vlc = callPackage ../applications/video/vlc {
+ ffmpeg = ffmpeg_2_3;
+ };
vmpk = callPackage ../applications/audio/vmpk { };
@@ -10042,13 +10543,6 @@ let
wordnet = callPackage ../applications/misc/wordnet { };
- wrapChromium = browser: wrapFirefox {
- inherit browser;
- browserName = browser.packageName;
- desktopName = "Chromium";
- icon = "${browser}/share/icons/hicolor/48x48/apps/${browser.packageName}.png";
- };
-
wrapFirefox =
{ browser, browserName ? "firefox", desktopName ? "Firefox", nameSuffix ? ""
, icon ? "${browser}/lib/${browser.name}/browser/icons/mozicon128.png" }:
@@ -10056,27 +10550,78 @@ let
cfg = stdenv.lib.attrByPath [ browserName ] {} config;
enableAdobeFlash = cfg.enableAdobeFlash or false;
enableGnash = cfg.enableGnash or false;
+ jre = cfg.jre or false;
+ icedtea = cfg.icedtea or false;
in
import ../applications/networking/browsers/firefox/wrapper.nix {
inherit stdenv lib makeWrapper makeDesktopItem browser browserName desktopName nameSuffix icon;
plugins =
assert !(enableGnash && enableAdobeFlash);
+ assert !(jre && icedtea);
([ ]
++ lib.optional enableGnash gnash
++ lib.optional enableAdobeFlash flashplayer
++ lib.optional (cfg.enableDjvu or false) (djview4)
++ lib.optional (cfg.enableMPlayer or false) (MPlayerPlugin browser)
++ lib.optional (cfg.enableGeckoMediaPlayer or false) gecko_mediaplayer
- ++ lib.optional (supportsJDK && cfg.jre or false && jrePlugin ? mozillaPlugin) jrePlugin
+ ++ lib.optional (supportsJDK && jre && jrePlugin ? mozillaPlugin) jrePlugin
+ ++ lib.optional icedtea icedtea7_web
++ lib.optional (cfg.enableGoogleTalkPlugin or false) google_talk_plugin
++ lib.optional (cfg.enableFriBIDPlugin or false) fribid
++ lib.optional (cfg.enableGnomeExtensions or false) gnome3.gnome_shell
+ ++ lib.optional (cfg.enableTrezor or false) trezor-bridge
);
libs = [ gstreamer gst_plugins_base ] ++ lib.optionals (cfg.enableQuakeLive or false)
(with xlibs; [ stdenv.gcc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]);
gtk_modules = [ libcanberra ];
};
+ retroArchCores =
+ let
+ cfg = config.retroarch or {};
+ inherit (lib) optional;
+ in with libretro;
+ ([ ]
+ ++ optional (cfg.enable4do or false) _4do
+ ++ optional (cfg.enableBsnesMercury or false) bsnes-mercury
+ ++ optional (cfg.enableDesmume or false) desmume
+ ++ optional (cfg.enableFBA or false) fba
+ ++ optional (cfg.enableFceumm or false) fceumm
+ ++ optional (cfg.enableGambatte or false) gambatte
+ ++ optional (cfg.enableGenesisPlusGX or false) genesis-plus-gx
+ ++ optional (cfg.enableMupen64Plus or false) mupen64plus
+ ++ optional (cfg.enablePicodrive or false) picodrive
+ ++ optional (cfg.enablePrboom or false) prboom
+ ++ optional (cfg.enablePPSSPP or false) ppsspp
+ ++ optional (cfg.enableScummVM or false) scummvm
+ ++ optional (cfg.enableSnes9xNext or false) snes9x-next
+ ++ optional (cfg.enableStella or false) stella
+ ++ optional (cfg.enableVbaNext or false) vba-next
+ );
+
+ wrapRetroArch = { retroarch }: import ../misc/emulators/retroarch/wrapper.nix {
+ inherit stdenv lib makeWrapper retroarch;
+ cores = retroArchCores;
+ };
+
+ wrapXBMC = { xbmc }: import ../applications/video/xbmc/wrapper.nix {
+ inherit stdenv lib makeWrapper xbmc;
+ plugins = let inherit (lib) optional; in with xbmcPlugins;
+ ([]
+ ++ optional (config.xbmc.enableAdvancedLauncher or false) advanced-launcher
+ ++ optional (config.xbmc.enableSVTPlay or false) svtplay
+ );
+ };
+
+ wxhexeditor = callPackage ../applications/editors/wxhexeditor { };
+
+ wxcam = callPackage ../applications/video/wxcam {
+ inherit (gnome) libglade;
+ inherit intltool;
+ wxGTK = wxGTK28;
+ gtk = gtk2;
+ };
+
x11vnc = callPackage ../tools/X11/x11vnc { };
x2vnc = callPackage ../tools/X11/x2vnc { };
@@ -10093,10 +10638,23 @@ let
xbindkeys = callPackage ../tools/X11/xbindkeys { };
- xbmc = callPackage ../applications/video/xbmc {
+ xbmcPlain = callPackage ../applications/video/xbmc {
ffmpeg = ffmpeg_1;
};
+ xbmcPlugins = recurseIntoAttrs (callPackage ../applications/video/xbmc/plugins.nix {
+ xbmc = xbmcPlain;
+ });
+
+ xbmc = wrapXBMC {
+ xbmc = xbmcPlain;
+ };
+
+ xbmc-retroarch-advanced-launchers =
+ callPackage ../misc/emulators/retroarch/xbmc-advanced-launchers.nix {
+ cores = retroArchCores;
+ };
+
xca = callPackage ../applications/misc/xca { };
xcalib = callPackage ../tools/X11/xcalib { };
@@ -10143,6 +10701,13 @@ let
inherit (gnome) libglade GConf;
};
+ xiphos = callPackage ../applications/misc/xiphos {
+ gconf = gnome2.GConf;
+ inherit (gnome2) gtkhtml libgtkhtml libglade scrollkeeper;
+ python = python27;
+ webkitgtk = webkitgtk2;
+ };
+
xournal = callPackage ../applications/graphics/xournal {
inherit (gnome) libgnomeprint libgnomeprintui libgnomecanvas;
};
@@ -10170,6 +10735,11 @@ let
finalterm = callPackage ../applications/misc/finalterm { };
+ roxterm = callPackage ../applications/misc/roxterm {
+ inherit (pythonPackages) lockfile;
+ inherit (gnome3) vte gsettings_desktop_schemas;
+ };
+
xtrace = callPackage ../tools/X11/xtrace { };
xlaunch = callPackage ../tools/X11/xlaunch { };
@@ -10180,10 +10750,7 @@ let
xmp = callPackage ../applications/audio/xmp { };
- xnee = callPackage ../tools/X11/xnee {
- # Work around "missing separator" error.
- stdenv = overrideInStdenv stdenv [ gnumake381 ];
- };
+ xnee = callPackage ../tools/X11/xnee { };
xvidcap = callPackage ../applications/video/xvidcap {
inherit (gnome) scrollkeeper libglade;
@@ -10193,7 +10760,7 @@ let
inherit (gnome3) yelp;
- qgis = callPackage ../applications/misc/qgis {};
+ qgis = callPackage ../applications/gis/qgis {};
qtbitcointrader = callPackage ../applications/misc/qtbitcointrader { };
@@ -10222,12 +10789,13 @@ let
zgrviewer = callPackage ../applications/graphics/zgrviewer {};
- zotero = callPackage ../applications/office/zotero {
- xulrunner = xulrunner_30;
+ zim = callPackage ../applications/office/zim {
+ pygtk = pyGtkGlade;
};
- zynaddsubfx = callPackage ../applications/audio/zynaddsubfx { };
+ zotero = callPackage ../applications/office/zotero { };
+ zynaddsubfx = callPackage ../applications/audio/zynaddsubfx { };
### GAMES
@@ -10238,7 +10806,7 @@ let
anki = callPackage ../games/anki { };
asc = callPackage ../games/asc {
- lua = lua5;
+ lua = lua5_1;
libsigcxx = libsigcxx12;
};
@@ -10353,12 +10921,6 @@ let
gnugo = callPackage ../games/gnugo { };
- gparted = callPackage ../tools/misc/gparted { };
-
- gsmartcontrol = callPackage ../tools/misc/gsmartcontrol {
- inherit (gnome) libglademm;
- };
-
gtypist = callPackage ../games/gtypist { };
hexen = callPackage ../games/hexen { };
@@ -10397,7 +10959,7 @@ let
oilrush = callPackage ../games/oilrush { };
- openra = callPackage ../games/openra { };
+ openra = callPackage ../games/openra { lua = lua5_1; };
openttd = callPackage ../games/openttd {
zlib = zlibStatic;
@@ -10442,6 +11004,8 @@ let
rogue = callPackage ../games/rogue { };
+ saga = callPackage ../applications/gis/saga { };
+
samplv1 = callPackage ../applications/audio/samplv1 { };
sauerbraten = callPackage ../games/sauerbraten {};
@@ -10472,11 +11036,9 @@ let
stardust = callPackage ../games/stardust {};
- steam = callPackage_i686 ../games/steam {};
+ steam = callPackage ../games/steam {};
- steamChrootEnv = callPackage_i686 ../games/steam/chrootenv.nix {
- zenity = gnome2.zenity;
- };
+ steamChrootEnv = callPackage ../games/steam/chrootenv.nix { };
stuntrally = callPackage ../games/stuntrally { };
@@ -10494,7 +11056,7 @@ let
tennix = callPackage ../games/tennix { };
- tibia = callPackage ../games/tibia { };
+ tibia = callPackage_i686 ../games/tibia { };
tintin = callPackage ../games/tintin { };
@@ -10534,6 +11096,8 @@ let
urbanterror = callPackage ../games/urbanterror { };
+ ue4demos = recurseIntoAttrs (callPackage ../games/ue4demos { });
+
ut2004demo = callPackage ../games/ut2004demo { };
vdrift = callPackage ../games/vdrift { };
@@ -10618,6 +11182,11 @@ let
import ../desktops/e18 { inherit callPackage pkgs; }
);
+ e19 = recurseIntoAttrs (
+ let callPackage = newScope pkgs.e19; in
+ import ../desktops/e19 { inherit callPackage pkgs; }
+ );
+
gnome2 = callPackage ../desktops/gnome-2 {
callPackage = pkgs.newScope pkgs.gnome2;
self = pkgs.gnome2;
@@ -10643,7 +11212,7 @@ let
kde4 = recurseIntoAttrs pkgs.kde412;
- kde4_next = recurseIntoAttrs( lib.lowPrioSet pkgs.kde412 );
+ kde4_next = recurseIntoAttrs( lib.lowPrioSet pkgs.kde414 );
kde412 = kdePackagesFor (pkgs.kde412 // {
eigen = eigen2;
@@ -10651,6 +11220,11 @@ let
libcanberra = libcanberra_kde;
}) ../desktops/kde-4.12;
+ kde414 = kdePackagesFor (pkgs.kde414 // {
+ libusb = libusb1;
+ libcanberra = libcanberra_kde;
+ }) ../desktops/kde-4.14;
+
kdePackagesFor = self: dir:
let callPackageOrig = callPackage; in
let
@@ -10708,6 +11282,8 @@ let
kdiff3 = callPackage ../tools/text/kdiff3 { };
+ kgraphviewer = callPackage ../applications/graphics/kgraphviewer { };
+
kile = callPackage ../applications/editors/kile { };
kmplayer = callPackage ../applications/video/kmplayer { };
@@ -10742,6 +11318,8 @@ let
libnm-qt = callPackage ../development/libraries/libnm-qt { };
+ massif-visualizer = callPackage ../development/tools/analysis/massif-visualizer { };
+
networkmanagement = callPackage ../tools/networking/networkmanagement { };
partitionManager = callPackage ../tools/misc/partition-manager { };
@@ -10805,7 +11383,11 @@ let
geoclue = geoclue2;
};
- oxygen_gtk = callPackage ../misc/themes/gtk2/oxygen-gtk { };
+ oxygen-gtk2 = callPackage ../misc/themes/gtk2/oxygen-gtk { };
+
+ oxygen-gtk3 = callPackage ../misc/themes/gtk3/oxygen-gtk3 { };
+
+ oxygen_gtk = oxygen-gtk2; # backwards compatibility
gtk_engines = callPackage ../misc/themes/gtk2/gtk-engines { };
@@ -10894,12 +11476,19 @@ let
liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { };
- openblas = callPackage ../development/libraries/science/math/openblas { };
- openblas_0_2_10 = callPackage ../development/libraries/science/math/openblas/0.2.10.nix {
+ # julia is pinned to specific versions of openblas, so keep old versions
+ # until they aren't needed. The un-versioned attribute may continue to track
+ # upstream development.
+ openblas = callPackage ../development/libraries/science/math/openblas {
liblapack = liblapack_3_5_0;
};
+ openblas_0_2_10 = callPackage ../development/libraries/science/math/openblas/0.2.10.nix {
+ liblapack = liblapack_3_5_0;
+ };
+ openblas_0_2_2 = callPackage ../development/libraries/science/math/openblas/0.2.2.nix { };
mathematica = callPackage ../applications/science/math/mathematica { };
+ mathematica9 = callPackage ../applications/science/math/mathematica/9.nix { };
sage = callPackage ../applications/science/math/sage { };
@@ -10925,8 +11514,8 @@ let
alt-ergo = callPackage ../applications/science/logic/alt-ergo {};
coq = callPackage ../applications/science/logic/coq {
- inherit (ocamlPackages) findlib lablgtk;
- camlp5 = ocamlPackages.camlp5_transitional;
+ inherit (ocamlPackages_4_01_0) ocaml findlib lablgtk;
+ camlp5 = ocamlPackages_4_01_0.camlp5_transitional;
};
coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix {
@@ -10935,10 +11524,23 @@ let
};
coq_8_3 = callPackage ../applications/science/logic/coq/8.3.nix {
- inherit (ocamlPackages) findlib lablgtk;
- camlp5 = ocamlPackages.camlp5_transitional;
+ inherit (ocamlPackages_3_12_1) ocaml findlib;
+ camlp5 = ocamlPackages_3_12_1.camlp5_transitional;
+ lablgtk = ocamlPackages_3_12_1.lablgtk_2_14;
};
+ mkCoqPackages_8_4 = self: let callPackage = newScope self; in {
+
+ containers = callPackage ../development/coq-modules/containers {};
+
+ mathcomp = callPackage ../development/coq-modules/mathcomp {};
+
+ ssreflect = callPackage ../development/coq-modules/ssreflect {};
+
+ };
+
+ coqPackages = recurseIntoAttrs (mkCoqPackages_8_4 coqPackages);
+
cvc3 = callPackage ../applications/science/logic/cvc3 {};
ekrhyper = callPackage ../applications/science/logic/ekrhyper {};
@@ -10963,6 +11565,7 @@ let
isabelle = import ../applications/science/logic/isabelle {
inherit (pkgs) stdenv fetchurl nettools perl polyml;
inherit (pkgs.emacs24Packages) proofgeneral;
+ java = if stdenv.isLinux then jre else jdk;
};
iprover = callPackage ../applications/science/logic/iprover {};
@@ -10977,7 +11580,7 @@ let
ocaml = ocaml_3_11_2;
inherit (ocamlPackages_3_11_2) findlib lablgtk ocaml_expat gmetadom ocaml_http
lablgtkmathview ocaml_mysql ocaml_sqlite3 ocamlnet camlzip ocaml_pcre;
- ulex08 = ocamlPackages_3_11_2.ulex08.override { camlp5 = ocamlPackages_3_11_2.camlp5_5_transitional; };
+ ulex08 = ocamlPackages_3_11_2.ulex08.override { camlp5 = ocamlPackages_3_11_2.camlp5_old_transitional; };
};
matita_130312 = lowPrio (callPackage ../applications/science/logic/matita/130312.nix {
@@ -10989,13 +11592,17 @@ let
opensmt = callPackage ../applications/science/logic/opensmt { };
+ ott = callPackage ../applications/science/logic/ott {
+ camlp5 = ocamlPackages.camlp5_transitional;
+ };
+
otter = callPackage ../applications/science/logic/otter {};
picosat = callPackage ../applications/science/logic/picosat {};
prooftree = callPackage ../applications/science/logic/prooftree {
- inherit (ocamlPackages) findlib lablgtk;
- camlp5 = ocamlPackages.camlp5_transitional;
+ inherit (ocamlPackages_4_01_0) ocaml findlib lablgtk;
+ camlp5 = ocamlPackages_4_01_0.camlp5_transitional;
};
prover9 = callPackage ../applications/science/logic/prover9 { };
@@ -11004,10 +11611,6 @@ let
spass = callPackage ../applications/science/logic/spass {};
- ssreflect = callPackage ../applications/science/logic/ssreflect {
- camlp5 = ocamlPackages.camlp5_transitional;
- };
-
tptp = callPackage ../applications/science/logic/tptp {};
twelf = callPackage ../applications/science/logic/twelf {
@@ -11067,6 +11670,8 @@ let
pari = callPackage ../applications/science/math/pari {};
+ pcalc = callPackage ../applications/science/math/pcalc { };
+
pspp = callPackage ../applications/science/math/pssp {
inherit (gnome) libglade gtksourceview;
};
@@ -11131,6 +11736,40 @@ let
xplanet = callPackage ../applications/science/astronomy/xplanet { };
+ ### SCIENCE / PHYSICS
+
+ geant4 = callPackage ../development/libraries/physics/geant4 {
+ enableMultiThreading = true;
+ enableG3toG4 = false;
+ enableInventor = false;
+ enableGDML = false;
+ enableQT = false;
+ enableXM = false;
+ enableOpenGLX11 = true;
+ enableRaytracerX11 = false;
+
+ # Optional system packages, otherwise internal GEANT4 packages are used.
+ clhep = null;
+ expat = expat;
+ zlib = null;
+
+ # For enableGDML.
+ xercesc = null;
+
+ # For enableQT.
+ qt = null; # qt4SDK or qt5SDK
+
+ # For enableXM.
+ motif = null; # motif or lesstif
+
+ # For enableQT, enableXM, enableOpenGLX11, enableRaytracerX11.
+ mesa = mesa;
+ x11 = x11;
+ inherit (xlibs) libXmu;
+ };
+
+ g4py = callPackage ../development/libraries/physics/geant4/g4py { };
+
### MISC
atari800 = callPackage ../misc/emulators/atari800 { };
@@ -11224,9 +11863,6 @@ let
martyr = callPackage ../development/libraries/martyr { };
- maven = maven3;
- maven3 = callPackage ../misc/maven { jdk = openjdk; };
-
mess = callPackage ../misc/emulators/mess {
inherit (pkgs.gnome) GConf;
};
@@ -11282,7 +11918,7 @@ let
lkproof = callPackage ../tools/typesetting/tex/lkproof { };
mysqlWorkbench = newScope gnome ../applications/misc/mysql-workbench {
- lua = lua5;
+ lua = lua5_1;
inherit (pythonPackages) pexpect paramiko;
};
@@ -11300,8 +11936,12 @@ let
pgf2 = callPackage ../tools/typesetting/tex/pgf/2.x.nix { };
+ pgf3 = callPackage ../tools/typesetting/tex/pgf/3.x.nix { };
+
pgfplots = callPackage ../tools/typesetting/tex/pgfplots { };
+ phabricator = callPackage ../misc/phabricator { };
+
pjsip = callPackage ../applications/networking/pjsip { };
polytable = callPackage ../tools/typesetting/tex/polytable { };
@@ -11312,7 +11952,15 @@ let
putty = callPackage ../applications/networking/remote/putty { };
- retroarch = callPackage ../misc/emulators/retroarch { };
+ retroarchBare = callPackage ../misc/emulators/retroarch { };
+
+ retroarchBareMaster = callPackage ../misc/emulators/retroarch/master.nix { };
+
+ retroarch = wrapRetroArch { retroarch = retroarchBareMaster; };
+
+ libretro = recurseIntoAttrs (callPackage ../misc/emulators/retroarch/cores.nix {
+ retroarch = retroarchBareMaster;
+ });
rssglx = callPackage ../misc/screensavers/rss-glx { };
@@ -11349,6 +11997,8 @@ let
slock = callPackage ../misc/screensavers/slock { };
+ soundOfSorting = callPackage ../misc/sound-of-sorting { };
+
sourceAndTags = import ../misc/source-and-tags {
inherit pkgs stdenv unzip lib ctags;
hasktags = haskellPackages.hasktags;
@@ -11541,6 +12191,11 @@ let
snes9x-gtk = callPackage ../misc/emulators/snes9x-gtk { };
+ higan = callPackage ../misc/emulators/higan {
+ profile = config.higan.profile or "performance";
+ guiToolkit = config.higan.guiToolkit or "gtk";
+ };
+
misc = import ../misc/misc.nix { inherit pkgs stdenv; };
bullet = callPackage ../development/libraries/bullet {};
@@ -11557,6 +12212,7 @@ let
asciidocFull = asciidoc-full; # added 2014-06-22
lttngTools = lttng-tools; # added 2014-07-31
lttngUst = lttng-ust; # added 2014-07-31
+ jquery_ui = jquery-ui; # added 2014-09-07
}; in self; in pkgs
diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index 16879a174dd..bb3a8b3b6d1 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -141,6 +141,7 @@
network = super.network_2_2_1_7.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
OpenGLRaw = self.OpenGLRaw_1_3_0_0;
OpenGL = self.OpenGL_2_6_0_1;
+ parsec = super.parsec.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
QuickCheck = super.QuickCheck.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
stm = self.stm_2_4_2.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
systemFilepath = super.systemFilepath.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
@@ -366,7 +367,7 @@
};
extension = self: super: {
buildLocalCabalWithArgs = args: super.buildLocalCabalWithArgs (args // {
- cabal2nix = packages_ghc783.cabal2nix;
+ nativePkgs = packages_ghc783;
});
};
};
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index dab33b3d1ab..9f656cd0deb 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -190,8 +190,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
async_2_0_1_3 = callPackage ../development/libraries/haskell/async/2.0.1.3.nix {};
async_2_0_1_4 = callPackage ../development/libraries/haskell/async/2.0.1.4.nix {};
- async_2_0_1_5 = callPackage ../development/libraries/haskell/async/2.0.1.5.nix {};
- async = self.async_2_0_1_5;
+ async_2_0_1_6 = callPackage ../development/libraries/haskell/async/2.0.1.6.nix {};
+ async = self.async_2_0_1_6;
atomicPrimops = callPackage ../development/libraries/haskell/atomic-primops {};
@@ -202,8 +202,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
attoparsec_0_10_4_0 = callPackage ../development/libraries/haskell/attoparsec/0.10.4.0.nix {};
attoparsec_0_11_3_1 = callPackage ../development/libraries/haskell/attoparsec/0.11.3.1.nix {};
attoparsec_0_11_3_4 = callPackage ../development/libraries/haskell/attoparsec/0.11.3.4.nix {};
- attoparsec_0_12_1_1 = callPackage ../development/libraries/haskell/attoparsec/0.12.1.1.nix {};
- attoparsec = self.attoparsec_0_12_1_1;
+ attoparsec_0_12_1_2 = callPackage ../development/libraries/haskell/attoparsec/0.12.1.2.nix {};
+ attoparsec = self.attoparsec_0_12_1_2;
attoparsecBinary = callPackage ../development/libraries/haskell/attoparsec-binary {};
@@ -273,6 +273,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
bktrees = callPackage ../development/libraries/haskell/bktrees {};
+ blankCanvas = callPackage ../development/libraries/haskell/blank-canvas {};
+
blazeBuilder = callPackage ../development/libraries/haskell/blaze-builder {};
blazeBuilderConduit = callPackage ../development/libraries/haskell/blaze-builder-conduit {};
@@ -293,17 +295,13 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
bloomfilter = callPackage ../development/libraries/haskell/bloomfilter {};
- bmp = callPackage ../development/libraries/haskell/bmp {
- binary = self.binary_0_7_2_1;
- };
+ bmp = callPackage ../development/libraries/haskell/bmp {};
Boolean = callPackage ../development/libraries/haskell/Boolean {};
boolExtras = callPackage ../development/libraries/haskell/bool-extras {};
- boundingboxes_0_1_1 = callPackage ../development/libraries/haskell/boundingboxes/0.1.1.nix {};
- boundingboxes_0_2 = callPackage ../development/libraries/haskell/boundingboxes/0.2.nix {};
- boundingboxes = self.boundingboxes_0_2;
+ boundingboxes = callPackage ../development/libraries/haskell/boundingboxes {};
BoundedChan = callPackage ../development/libraries/haskell/BoundedChan {};
@@ -372,8 +370,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
caseInsensitive_1_0_0_1 = callPackage ../development/libraries/haskell/case-insensitive/1.0.0.1.nix {};
caseInsensitive_1_1_0_3 = callPackage ../development/libraries/haskell/case-insensitive/1.1.0.3.nix {};
- caseInsensitive_1_2_0_0 = callPackage ../development/libraries/haskell/case-insensitive/1.2.0.0.nix {};
- caseInsensitive = self.caseInsensitive_1_2_0_0;
+ caseInsensitive_1_2_0_1 = callPackage ../development/libraries/haskell/case-insensitive/1.2.0.1.nix {};
+ caseInsensitive = self.caseInsensitive_1_2_0_1;
cautiousFile = callPackage ../development/libraries/haskell/cautious-file {};
@@ -391,7 +389,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
cgi_3001_1_7_4 = callPackage ../development/libraries/haskell/cgi/3001.1.7.4.nix {};
cgi_3001_1_7_5 = callPackage ../development/libraries/haskell/cgi/3001.1.7.5.nix {};
cgi_3001_1_8_5 = callPackage ../development/libraries/haskell/cgi/3001.1.8.5.nix {};
- cgi = self.cgi_3001_1_8_5;
+ cgi_3001_2_0_0 = callPackage ../development/libraries/haskell/cgi/3001.2.0.0.nix {};
+ cgi = self.cgi_3001_2_0_0;
cgrep = callPackage ../development/libraries/haskell/cgrep {};
@@ -406,7 +405,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
cheapskate = callPackage ../development/libraries/haskell/cheapskate {};
- checkers = callPackage ../development/libraries/haskell/checkers { QuickCheck = self.QuickCheck_2_6; };
+ checkers = callPackage ../development/libraries/haskell/checkers {};
chell = callPackage ../development/libraries/haskell/chell {};
@@ -468,6 +467,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
then callPackage ../development/libraries/haskell/compdata {}
else null;
+ compdataParam = callPackage ../development/libraries/haskell/compdata-param {};
+
composition = callPackage ../development/libraries/haskell/composition {};
compressed = callPackage ../development/libraries/haskell/compressed {};
@@ -640,8 +641,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
diagramsCairo = callPackage ../development/libraries/haskell/diagrams/cairo.nix {};
diagramsCore = callPackage ../development/libraries/haskell/diagrams/core.nix {};
diagramsContrib = callPackage ../development/libraries/haskell/diagrams/contrib.nix {};
+ diagramsGtk = callPackage ../development/libraries/haskell/diagrams/gtk.nix {};
diagramsLib = callPackage ../development/libraries/haskell/diagrams/lib.nix {};
diagramsPostscript = callPackage ../development/libraries/haskell/diagrams/postscript.nix {};
+ diagramsRasterific = callPackage ../development/libraries/haskell/diagrams/rasterific.nix {};
diagramsSvg = callPackage ../development/libraries/haskell/diagrams/svg.nix {};
Diff = callPackage ../development/libraries/haskell/Diff {};
@@ -668,6 +671,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
directSqlite = callPackage ../development/libraries/haskell/direct-sqlite {};
+ directoryLayout = callPackage ../development/libraries/haskell/directory-layout {};
+
directoryTree = callPackage ../development/libraries/haskell/directory-tree {};
distributedStatic = callPackage ../development/libraries/haskell/distributed-static {};
@@ -771,7 +776,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
eventList = callPackage ../development/libraries/haskell/event-list {};
- exPool = callPackage ../development/libraries/haskell/ex-pool { };
+ exPool = callPackage ../development/libraries/haskell/ex-pool {};
exceptionMtl = callPackage ../development/libraries/haskell/exception-mtl {};
@@ -853,6 +858,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
folds = callPackage ../development/libraries/haskell/folds {};
+ FontyFruity = callPackage ../development/libraries/haskell/FontyFruity {};
+
forceLayout = callPackage ../development/libraries/haskell/force-layout {};
formatting = callPackage ../development/libraries/haskell/formatting {};
@@ -867,6 +874,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
fuzzcheck = callPackage ../development/libraries/haskell/fuzzcheck {};
+ functorInfix = callPackage ../development/libraries/haskell/functor-infix {};
+
gamma = callPackage ../development/libraries/haskell/gamma {};
geniplate = callPackage ../development/libraries/haskell/geniplate {};
@@ -895,6 +904,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
cabal = self.cabal.override { enableLibraryProfiling = false; }; # pkg cannot be built with profiling enabled
};
+ ghcServer = callPackage ../development/libraries/haskell/ghc-server {};
+
ghcjs = callPackage ../development/tools/haskell/ghcjs {
Cabal = self.Cabal_1_18_1_3;
};
@@ -903,14 +914,14 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
ghcjsCodemirror = callPackage ../development/libraries/haskell/ghcjs-codemirror {};
- ghcMod_4_1_6 = callPackage ../development/libraries/haskell/ghc-mod/4.1.6.nix { inherit (pkgs) emacs; };
- ghcMod_5_0_1_1 = callPackage ../development/libraries/haskell/ghc-mod/5.0.1.1.nix { inherit (pkgs) emacs; };
- ghcMod = self.ghcMod_4_1_6;
+ ghcMod = callPackage ../development/libraries/haskell/ghc-mod { inherit (pkgs) emacs; };
ghcMtl = callPackage ../development/libraries/haskell/ghc-mtl {};
ghcPaths = callPackage ../development/libraries/haskell/ghc-paths {};
+ ghcParser = callPackage ../development/libraries/haskell/ghc-parser {};
+
ghcSyb = callPackage ../development/libraries/haskell/ghc-syb {};
ghcSybUtils = callPackage ../development/libraries/haskell/ghc-syb-utils {};
@@ -1017,6 +1028,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
Graphalyze = callPackage ../development/libraries/haskell/Graphalyze {};
+ graphmod = callPackage ../development/tools/haskell/graphmod {};
+
graphviz = callPackage ../development/libraries/haskell/graphviz {};
graphSCC = callPackage ../development/libraries/haskell/graphscc {};
@@ -1102,6 +1115,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
heredoc = callPackage ../development/libraries/haskell/heredoc {};
+ here = callPackage ../development/libraries/haskell/here {};
+
hexpat = callPackage ../development/libraries/haskell/hexpat {};
hex = callPackage ../development/libraries/haskell/hex {};
@@ -1152,7 +1167,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
haxl = callPackage ../development/libraries/haskell/haxl {};
- haxr = callPackage ../development/libraries/haskell/haxr {};
+ haxr = callPackage ../development/libraries/haskell/haxr {
+ HTTP = self.HTTP.override { network = self.network_2_6_0_2; };
+ };
haxr_th = callPackage ../development/libraries/haskell/haxr-th {};
@@ -1186,6 +1203,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
hi = callPackage ../development/libraries/haskell/hi {};
+ hindent = callPackage ../development/libraries/haskell/hindent {};
+
hint = callPackage ../development/libraries/haskell/hint {};
hit = callPackage ../development/libraries/haskell/hit {};
@@ -1225,9 +1244,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
hoodleTypes = callPackage ../development/libraries/haskell/hoodle-types {};
hoogle = callPackage ../development/libraries/haskell/hoogle {};
- hoogleLocal = callPackage ../development/libraries/haskell/hoogle/local.nix {
- parallel = pkgs.parallel;
- };
+ hoogleLocal = callPackage ../development/libraries/haskell/hoogle/local.nix {};
hopenssl = callPackage ../development/libraries/haskell/hopenssl {};
@@ -1342,9 +1359,13 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
ieee754 = callPackage ../development/libraries/haskell/ieee754 {};
+ ihaskell = callPackage ../development/tools/haskell/ihaskell {};
+
imm = callPackage ../development/libraries/haskell/imm {};
- implicit = callPackage ../development/libraries/haskell/implicit {};
+ implicit = callPackage ../development/libraries/haskell/implicit {
+ optparseApplicative = self.optparseApplicative_0_9_1_1;
+ };
indents = callPackage ../development/libraries/haskell/indents {};
@@ -1419,8 +1440,12 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
JuicyPixelsUtil = callPackage ../development/libraries/haskell/JuicyPixels-util {};
+ jwt = callPackage ../development/libraries/haskell/jwt {};
+
kanExtensions = callPackage ../development/libraries/haskell/kan-extensions {};
+ kansasComet = callPackage ../development/libraries/haskell/kansas-comet {};
+
kansasLava = callPackage ../development/libraries/haskell/kansas-lava {};
keys = callPackage ../development/libraries/haskell/keys {};
@@ -1437,7 +1462,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
languageGlsl = callPackage ../development/libraries/haskell/language-glsl {};
- languageJava = callPackage ../development/libraries/haskell/language-java {};
+ languageJava_0_2_6 = callPackage ../development/libraries/haskell/language-java/0.2.6.nix {};
+ languageJava_0_2_7 = callPackage ../development/libraries/haskell/language-java/0.2.7.nix {};
+ languageJava = self.languageJava_0_2_7;
languageJavascript = callPackage ../development/libraries/haskell/language-javascript {};
@@ -1469,6 +1496,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
lensFamilyCore = callPackage ../development/libraries/haskell/lens-family-core {};
+ lensFamily = callPackage ../development/libraries/haskell/lens-family {};
+
+ lensFamilyTh = callPackage ../development/libraries/haskell/lens-family-th {};
+
lenses = callPackage ../development/libraries/haskell/lenses {};
leveldbHaskell = callPackage ../development/libraries/haskell/leveldb-haskell {};
@@ -1479,7 +1510,11 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
libjenkins = callPackage ../development/libraries/haskell/libjenkins {};
- libmpd = callPackage ../development/libraries/haskell/libmpd {};
+ libmpd_0_8_0_5 = callPackage ../development/libraries/haskell/libmpd/0.8.0.5.nix {};
+
+ libmpd_0_9_0_1 = callPackage ../development/libraries/haskell/libmpd/0.9.0.1.nix {};
+
+ libmpd = self.libmpd_0_9_0_1;
liblastfm = callPackage ../development/libraries/haskell/liblastfm {};
@@ -1512,14 +1547,14 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
llvmConfig = pkgs.llvm_33;
llvmGeneralPure = self.llvmGeneralPure_3_3_8_2;
};
- llvmGeneral_3_4_2_2 = callPackage ../development/libraries/haskell/llvm-general/3.4.2.2.nix {
+ llvmGeneral_3_4_4_0 = callPackage ../development/libraries/haskell/llvm-general/3.4.4.0.nix {
llvmConfig = pkgs.llvm;
};
- llvmGeneral = self.llvmGeneral_3_4_2_2;
+ llvmGeneral = self.llvmGeneral_3_4_4_0;
- llvmGeneralPure_3_3_8_2 = callPackage ../development/libraries/haskell/llvm-general-pure/3.3.8.2.nix { };
- llvmGeneralPure_3_4_2_2 = callPackage ../development/libraries/haskell/llvm-general-pure/3.4.2.2.nix {};
- llvmGeneralPure = self.llvmGeneralPure_3_4_2_2;
+ llvmGeneralPure_3_3_8_2 = callPackage ../development/libraries/haskell/llvm-general-pure/3.3.8.2.nix {};
+ llvmGeneralPure_3_4_4_0 = callPackage ../development/libraries/haskell/llvm-general-pure/3.4.4.0.nix {};
+ llvmGeneralPure = self.llvmGeneralPure_3_4_4_0;
lrucache = callPackage ../development/libraries/haskell/lrucache {};
@@ -1543,6 +1578,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
machines = callPackage ../development/libraries/haskell/machines {};
+ managed = callPackage ../development/libraries/haskell/managed {};
+
+ markdown = callPackage ../development/libraries/haskell/markdown {};
+
markdownUnlit = callPackage ../development/libraries/haskell/markdown-unlit {};
mathFunctions = callPackage ../development/libraries/haskell/math-functions {};
@@ -1557,8 +1596,12 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
MaybeT = callPackage ../development/libraries/haskell/MaybeT {};
+ meep = callPackage ../development/libraries/haskell/meep {};
+
MemoTrie = callPackage ../development/libraries/haskell/MemoTrie {};
+ mersenneRandom = callPackage ../development/libraries/haskell/mersenne-random {};
+
mersenneRandomPure64 = callPackage ../development/libraries/haskell/mersenne-random-pure64 {};
MFlow = callPackage ../development/libraries/haskell/MFlow {};
@@ -1715,8 +1758,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
network_2_3_1_0 = callPackage ../development/libraries/haskell/network/2.3.1.0.nix {};
network_2_4_1_2 = callPackage ../development/libraries/haskell/network/2.4.1.2.nix {};
network_2_5_0_0 = callPackage ../development/libraries/haskell/network/2.5.0.0.nix {};
- network_2_6_0_1 = callPackage ../development/libraries/haskell/network/2.6.0.1.nix {};
- network = self.network_2_5_0_0; # the latest version break HTTP on all platforms
+ network_2_6_0_2 = callPackage ../development/libraries/haskell/network/2.6.0.2.nix {};
+ network = self.network_2_5_0_0;
networkCarbon = callPackage ../development/libraries/haskell/network-carbon {};
@@ -1733,7 +1776,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
networkProtocolXmpp = callPackage ../development/libraries/haskell/network-protocol-xmpp {};
- networkSimple = callPackage ../development/libraries/haskell/network-simple { };
+ networkSimple = callPackage ../development/libraries/haskell/network-simple {};
networkTransport = callPackage ../development/libraries/haskell/network-transport {};
@@ -1789,7 +1832,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
options = callPackage ../development/libraries/haskell/options {};
- optparseApplicative = callPackage ../development/libraries/haskell/optparse-applicative {};
+ optparseApplicative_0_9_1_1 = callPackage ../development/libraries/haskell/optparse-applicative/0.9.1.1.nix {};
+ optparseApplicative_0_10_0 = callPackage ../development/libraries/haskell/optparse-applicative/0.10.0.nix {};
+ optparseApplicative = self.optparseApplicative_0_10_0;
pathPieces = callPackage ../development/libraries/haskell/path-pieces {};
@@ -1822,8 +1867,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
parsec_3_1_1 = callPackage ../development/libraries/haskell/parsec/3.1.1.nix {};
parsec_3_1_2 = callPackage ../development/libraries/haskell/parsec/3.1.2.nix {};
parsec_3_1_3 = callPackage ../development/libraries/haskell/parsec/3.1.3.nix {};
- parsec_3_1_5 = callPackage ../development/libraries/haskell/parsec/3.1.5.nix {};
- parsec = self.parsec_3_1_5;
+ parsec_3_1_6 = callPackage ../development/libraries/haskell/parsec/3.1.6.nix {};
+ parsec = self.parsec_3_1_6;
parsers = callPackage ../development/libraries/haskell/parsers {};
@@ -1843,6 +1888,12 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
pcreLight = callPackage ../development/libraries/haskell/pcre-light {};
+ pdfToolboxContent = callPackage ../development/libraries/haskell/pdf-toolbox-content {};
+
+ pdfToolboxCore = callPackage ../development/libraries/haskell/pdf-toolbox-core {};
+
+ pdfToolboxDocument = callPackage ../development/libraries/haskell/pdf-toolbox-document {};
+
pem = callPackage ../development/libraries/haskell/pem {};
permutation = callPackage ../development/libraries/haskell/permutation {};
@@ -1935,6 +1986,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
presburger = callPackage ../development/libraries/haskell/presburger {};
+ present = callPackage ../development/libraries/haskell/present {};
+
prettyclass = callPackage ../development/libraries/haskell/prettyclass {};
prettyShow = callPackage ../development/libraries/haskell/pretty-show {};
@@ -2018,6 +2071,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
ranges = callPackage ../development/libraries/haskell/ranges {};
+ Rasterific = callPackage ../development/libraries/haskell/Rasterific {};
+
reserve = callPackage ../development/libraries/haskell/reserve {};
rvar = callPackage ../development/libraries/haskell/rvar {};
@@ -2057,6 +2112,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
regexCompatTdfa = callPackage ../development/libraries/haskell/regex-compat-tdfa {};
+ regexPcreBuiltin = callPackage ../development/libraries/haskell/regex-pcre-builtin {};
+
regexPosix_0_72_0_3 = callPackage ../development/libraries/haskell/regex-posix/0.72.0.3.nix {};
regexPosix_0_94_1 = callPackage ../development/libraries/haskell/regex-posix/0.94.1.nix {};
regexPosix_0_94_2 = callPackage ../development/libraries/haskell/regex-posix/0.94.2.nix {};
@@ -2122,10 +2179,14 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
robotsTxt = callPackage ../development/libraries/haskell/robots-txt {};
+ rope = callPackage ../development/libraries/haskell/rope {};
+
rosezipper = callPackage ../development/libraries/haskell/rosezipper {};
RSA = callPackage ../development/libraries/haskell/RSA {};
+ saltine = callPackage ../development/libraries/haskell/saltine {};
+
sampleFrame = callPackage ../development/libraries/haskell/sample-frame {};
safe = callPackage ../development/libraries/haskell/safe {};
@@ -2137,8 +2198,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
sbv = callPackage ../development/libraries/haskell/sbv {};
scientific_0_2_0_2 = callPackage ../development/libraries/haskell/scientific/0.2.0.2.nix {};
- scientific_0_3_3_0 = callPackage ../development/libraries/haskell/scientific/0.3.3.0.nix {};
- scientific = self.scientific_0_3_3_0;
+ scientific_0_3_3_1 = callPackage ../development/libraries/haskell/scientific/0.3.3.1.nix {};
+ scientific = self.scientific_0_3_3_1;
scotty = callPackage ../development/libraries/haskell/scotty {};
@@ -2156,11 +2217,20 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
semigroupoidExtras = callPackage ../development/libraries/haskell/semigroupoid-extras {};
+ servant = callPackage ../development/libraries/haskell/servant {};
+
+ servantPool = callPackage ../development/libraries/haskell/servant-pool {};
+
+ servantPostgresql = callPackage ../development/libraries/haskell/servant-postgresql {};
+
+ servantResponse = callPackage ../development/libraries/haskell/servant-response {};
+
+ servantScotty = callPackage ../development/libraries/haskell/servant-scotty {};
+
setenv = callPackage ../development/libraries/haskell/setenv {};
setlocale = callPackage ../development/libraries/haskell/setlocale {};
-
shellish = callPackage ../development/libraries/haskell/shellish {};
shellmate = callPackage ../development/libraries/haskell/shellmate {};
@@ -2169,6 +2239,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
shelly_1_5_3_1 = callPackage ../development/libraries/haskell/shelly {};
shelly = self.shelly_1_5_3_1;
+ shell-conduit = callPackage ../development/libraries/haskell/shell-conduit {};
+
simpleConduit = callPackage ../development/libraries/haskell/simple-conduit {};
simpleReflect = callPackage ../development/libraries/haskell/simple-reflect {};
@@ -2295,6 +2367,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
inherit (pkgs) SDL;
};
+ sdl2 = callPackage ../development/libraries/haskell/sdl2 {
+ inherit (pkgs) SDL2;
+ };
+
SHA = callPackage ../development/libraries/haskell/SHA {};
SHA2 = callPackage ../development/libraries/haskell/SHA2 {};
@@ -2373,6 +2449,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
symbol = callPackage ../development/libraries/haskell/symbol {};
+ systemArgv0 = callPackage ../development/libraries/haskell/system-argv0 {};
+
systemFilepath = callPackage ../development/libraries/haskell/system-filepath {};
systemFileio = callPackage ../development/libraries/haskell/system-fileio {};
@@ -2389,6 +2467,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
tagged = callPackage ../development/libraries/haskell/tagged {};
+ taggedTransformer = callPackage ../development/libraries/haskell/tagged-transformer {};
+
taggy = callPackage ../development/libraries/haskell/taggy {};
taggyLens = callPackage ../development/libraries/haskell/taggy-lens {};
@@ -2409,6 +2489,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
tastyHunit = callPackage ../development/libraries/haskell/tasty-hunit {};
+ tastyProgram = callPackage ../development/libraries/haskell/tasty-program {};
+
tastyQuickcheck = callPackage ../development/libraries/haskell/tasty-quickcheck {};
tastyRerun = callPackage ../development/libraries/haskell/tasty-rerun {};
@@ -2506,7 +2588,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
threepennyGui = callPackage ../development/libraries/haskell/threepenny-gui {};
time_1_1_2_4 = callPackage ../development/libraries/haskell/time/1.1.2.4.nix {};
- time_1_4_2 = callPackage ../development/libraries/haskell/time/1.4.2.nix {};
+ time_1_5 = callPackage ../development/libraries/haskell/time/1.5.nix {};
time = null; # core package since ghc >= 6.12.x
timerep = callPackage ../development/libraries/haskell/timerep {};
@@ -2521,13 +2603,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
timeCompat = callPackage ../development/libraries/haskell/time-compat {};
- tls_1_1_5 = callPackage ../development/libraries/haskell/tls/1.1.5.nix {};
- tls_1_2_8 = callPackage ../development/libraries/haskell/tls/1.2.8.nix {};
- tls = self.tls_1_2_8;
-
- tlsExtra = callPackage ../development/libraries/haskell/tls-extra {
- tls = self.tls_1_1_5;
- };
+ tls = callPackage ../development/libraries/haskell/tls {};
tostring = callPackage ../development/libraries/haskell/tostring {};
@@ -2672,8 +2748,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
void = callPackage ../development/libraries/haskell/void {};
vty_4_7_5 = callPackage ../development/libraries/haskell/vty/4.7.5.nix {};
- vty_5_2_1 = callPackage ../development/libraries/haskell/vty/5.2.1.nix {};
- vty = self.vty_5_2_1;
+ vty_5_2_3 = callPackage ../development/libraries/haskell/vty/5.2.3.nix {};
+ vty = self.vty_5_2_3;
vtyUi = callPackage ../development/libraries/haskell/vty-ui {
vty = self.vty_4_7_5;
@@ -2715,10 +2791,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
webRoutesBoomerang = callPackage ../development/libraries/haskell/web-routes-boomerang {};
- websockets = callPackage ../development/libraries/haskell/websockets {
- testFrameworkQuickcheck2 = self.testFrameworkQuickcheck2.override { QuickCheck = self.QuickCheck_2_6; };
- QuickCheck = self.QuickCheck_2_6;
- };
+ websockets = callPackage ../development/libraries/haskell/websockets {};
websocketsSnap = callPackage ../development/libraries/haskell/websockets-snap {};
@@ -2736,6 +2809,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
word8 = callPackage ../development/libraries/haskell/word8 {};
+ wordexp = callPackage ../development/libraries/haskell/wordexp {};
+
Workflow = callPackage ../development/libraries/haskell/Workflow {};
wreq = callPackage ../development/libraries/haskell/wreq {};
@@ -2869,7 +2944,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
# Compilers.
Agda = callPackage ../development/compilers/agda {};
- AgdaStdlib = callPackage ../development/compilers/agda/stdlib.nix {};
uhc = callPackage ../development/compilers/uhc {};
@@ -2891,7 +2965,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
BNFC = callPackage ../development/tools/haskell/BNFC {};
- cake3 = callPackage ../development/tools/haskell/cake3 {};
+ cake3 = callPackage ../development/tools/haskell/cake3 {
+ optparseApplicative = self.optparseApplicative_0_9_1_1;
+ };
oldTime_1_1_0_2 = callPackage ../development/libraries/haskell/old-time/1.1.0.2.nix {};
oldTime = null; # By default, use the built-in old-time library
@@ -2909,7 +2985,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
haddock_2_13_2 = callPackage ../development/tools/documentation/haddock/2.13.2.nix {};
haddock_2_14_2 = callPackage ../development/tools/documentation/haddock/2.14.2.nix {};
haddock_2_14_3 = callPackage ../development/tools/documentation/haddock/2.14.3.nix {};
- haddock = self.haddock_2_14_3;
+ haddock_2_15_0 = callPackage ../development/tools/documentation/haddock/2.15.0.nix {};
+ haddock = self.haddock_2_15_0;
+
+ haddockApi = callPackage ../development/libraries/haskell/haddock-api {};
haddockLibrary = callPackage ../development/libraries/haskell/haddock-library {};
@@ -2956,7 +3035,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
pointful = callPackage ../development/tools/haskell/pointful {};
- ShellCheck = callPackage ../development/tools/misc/ShellCheck { };
+ ShellCheck = callPackage ../development/tools/misc/ShellCheck {};
SourceGraph = callPackage ../development/tools/haskell/SourceGraph {};
@@ -2975,6 +3054,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
idris_plain = callPackage ../development/compilers/idris {
llvmGeneral = self.llvmGeneral_3_3_8_2;
llvmGeneralPure = self.llvmGeneralPure_3_3_8_2;
+ languageJava = self.languageJava_0_2_6;
};
idris = callPackage ../development/compilers/idris/wrapper.nix {};
@@ -2993,7 +3073,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
xlsx = callPackage ../development/libraries/haskell/xlsx {};
- xmobar = callPackage ../applications/misc/xmobar {};
+ xmobar = callPackage ../applications/misc/xmobar {
+ libmpd = self.libmpd_0_8_0_5;
+ };
xmonad = callPackage ../applications/window-managers/xmonad {};
@@ -3008,12 +3090,19 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
cabal2nix = callPackage ../development/tools/haskell/cabal2nix {};
# Build a cabal package given a local .cabal file
- buildLocalCabalWithArgs = { src, name, args ? {}, cabalDrvArgs ? { jailbreak = true; }, cabal2nix ? self.cabal2nix }: let
- cabalExpr = pkgs.stdenv.mkDerivation ({
+ buildLocalCabalWithArgs = { src
+ , name
+ , args ? {}
+ , cabalDrvArgs ? { jailbreak = true; }
+ # for import-from-derivation, want to use current system
+ , nativePkgs ? import pkgs.path {}
+ }: let
+ cabalExpr = nativePkgs.stdenv.mkDerivation ({
name = "${name}.nix";
buildCommand = ''
- ${cabal2nix}/bin/cabal2nix ${src + "/${name}.cabal"} --sha256=FILTERME \
+ export HOME="$TMPDIR"
+ ${nativePkgs.haskellPackages.cabal2nix}/bin/cabal2nix ${src + "/${name}.cabal"} --sha256=FILTERME \
| grep -v FILTERME | sed \
-e 's/licenses.proprietary/licenses.unfree/' \
-e 's/{ cabal/{ cabal, cabalInstall, cabalDrvArgs ? {}, src/' \
@@ -3022,9 +3111,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
-e 's/pname = \([^\n]*\)/pname = \1\n inherit src;\n/' > $out
'';
- } // pkgs.lib.optionalAttrs pkgs.stdenv.isLinux {
+ } // pkgs.lib.optionalAttrs nativePkgs.stdenv.isLinux {
LANG = "en_US.UTF-8";
- LOCALE_ARCHIVE = "${pkgs.glibcLocales}/lib/locale/locale-archive";
+ LOCALE_ARCHIVE = "${nativePkgs.glibcLocales}/lib/locale/locale-archive";
});
in callPackage cabalExpr ({ inherit src cabalDrvArgs; } // args);
@@ -3045,6 +3134,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
cabalGhci = callPackage ../development/tools/haskell/cabal-ghci {};
+ cabalg = callPackage ../development/libraries/haskell/cabalg {};
+
cabalInstall_0_6_2 = callPackage ../tools/package-management/cabal-install/0.6.2.nix {};
cabalInstall_0_8_0 = callPackage ../tools/package-management/cabal-install/0.8.0.nix {};
cabalInstall_0_8_2 = callPackage ../tools/package-management/cabal-install/0.8.2.nix {};
@@ -3072,7 +3163,14 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
commandQq = callPackage ../development/libraries/haskell/command-qq {};
- gitAnnex = callPackage ../applications/version-management/git-and-tools/git-annex {};
+ escoger = callPackage ../tools/misc/escoger { };
+
+ gitAnnex = callPackage ../applications/version-management/git-and-tools/git-annex {
+ cabal = self.cabal.override { extension = self : super : { enableSharedExecutables = false; }; };
+ dbus = if pkgs.stdenv.isLinux then self.dbus else null;
+ fdoNotify = if pkgs.stdenv.isLinux then self.fdoNotify else null;
+ hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify;
+ };
githubBackup = callPackage ../applications/version-management/git-and-tools/github-backup {};
diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
new file mode 100644
index 00000000000..8a44a997c07
--- /dev/null
+++ b/pkgs/top-level/lua-packages.nix
@@ -0,0 +1,145 @@
+/* This file defines the composition for Lua packages. It has
+ been factored out of all-packages.nix because there are many of
+ them. Also, because most Nix expressions for Lua packages are
+ trivial, most are actually defined here. I.e. there's no function
+ for each package in a separate file: the call to the function would
+ be almost as must code as the function itself. */
+
+{ fetchurl, stdenv, lua, callPackage, unzip, zziplib,
+pcre, oniguruma, gnulib, tre, glibc,
+sqlite }:
+
+let
+ isLua51 = lua.luaversion == "5.1";
+ isLua52 = lua.luaversion == "5.2";
+ self = _self;
+ _self = with self; {
+ inherit (stdenv.lib) maintainers;
+
+ #define build lua package function
+ buildLuaPackage = callPackage ../development/lua-modules/generic lua;
+
+ luarocks = callPackage ../development/tools/misc/luarocks {
+ inherit lua;
+ };
+
+ luafilesystem = buildLuaPackage {
+ name = "filesystem-1.6.2";
+ src = fetchurl {
+ url = "https://github.com/keplerproject/luafilesystem/archive/v1_6_2.tar.gz";
+ sha256 = "1n8qdwa20ypbrny99vhkmx8q04zd2jjycdb5196xdhgvqzk10abz";
+ };
+ meta = {
+ homepage = "https://github.com/keplerproject/luafilesystem";
+ hydraPlatforms = stdenv.lib.platforms.linux;
+ maintainers = with maintainers; [ flosse ];
+ };
+ };
+
+ luasocket = buildLuaPackage rec {
+ name = "socket-${version}";
+ version = "2.0.2";
+ src = fetchurl {
+ url = "http://files.luaforge.net/releases/luasocket/luasocket/luasocket-${version}/luasocket-${version}.tar.gz";
+ sha256 = "19ichkbc4rxv00ggz8gyf29jibvc2wq9pqjik0ll326rrxswgnag";
+ };
+ disabled = isLua52;
+ patchPhase = ''
+ sed -e "s,^INSTALL_TOP_SHARE.*,INSTALL_TOP_SHARE=$out/share/lua/${lua.luaversion}," \
+ -e "s,^INSTALL_TOP_LIB.*,INSTALL_TOP_LIB=$out/lib/lua/${lua.luaversion}," \
+ -i config
+ '';
+ meta = {
+ homepage = "http://w3.impa.br/~diego/software/luasocket/";
+ hydraPlatforms = stdenv.lib.platforms.linux;
+ maintainers = with maintainers; [ mornfall ];
+ };
+ };
+
+ luazip = buildLuaPackage rec {
+ name = "zip-${version}";
+ version = "1.2.3";
+ src = fetchurl {
+ url = "https://github.com/luaforge/luazip/archive/0b8f5c958e170b1b49f05bc267bc0351ad4dfc44.zip";
+ sha256 = "beb9260d606fdd5304aa958d95f0d3c20be7ca0a2cff44e7b75281c138a76a50";
+ };
+ buildInputs = [ unzip zziplib ];
+ patches = [ ../development/lua-modules/zip.patch ];
+ # does not currently work under lua 5.2
+ disabled = isLua52;
+ meta = {
+ homepage = "https://github.com/luaforge/luazip";
+ hydraPlatforms = stdenv.lib.platforms.linux;
+ license = stdenv.lib.licenses.mit;
+ };
+ };
+
+ luastdlib = buildLuaPackage {
+ name = "stdlib";
+ src = fetchurl {
+ url = "https://github.com/lua-stdlib/lua-stdlib/archive/release.zip";
+ sha256 = "1v3158g5050sdqfrqi6d2bjh0lmi1v01a6m2nwqpr527a2dqcf0c";
+ };
+ buildInputs = [ unzip ];
+ meta = {
+ homepage = "https://github.com/lua-stdlib/lua-stdlib/";
+ hydraPlatforms = stdenv.lib.platforms.linux;
+ license = stdenv.lib.licenses.mit;
+ };
+ };
+
+ lrexlib = buildLuaPackage rec {
+ name = "lrexlib-${version}";
+ version = "2.7.2";
+ src = fetchurl {
+ url = "https://github.com/rrthomas/lrexlib/archive/150c251be57c4e569da0f48bf6b01fbca97179fe.zip";
+ sha256 = "0i5brqbykc2nalp8snlq1r0wmf8y2wqp6drzr2xmq5phvj8913xh";
+ };
+ buildInputs = [ unzip luastdlib pcre luarocks oniguruma gnulib tre glibc ];
+
+ buildPhase = let
+ luaVariable = "LUA_PATH=${luastdlib}/share/lua/${lua.luaversion}/?.lua";
+
+ pcreVariable = "PCRE_DIR=${pcre}";
+ onigVariable = "ONIG_DIR=${oniguruma}";
+ gnuVariable = "GNU_INCDIR=${gnulib}/lib";
+ treVariable = "TRE_DIR=${tre}";
+ posixVariable = "POSIX_DIR=${glibc}";
+ in ''
+ sed -e 's@$(LUAROCKS) $(LUAROCKS_COMMAND) $$i;@$(LUAROCKS) $(LUAROCKS_COMMAND) $$i ${pcreVariable} ${onigVariable} ${gnuVariable} ${treVariable} ${posixVariable};@' \
+ -i Makefile
+ ${luaVariable} make
+ '';
+
+ installPhase = ''
+ mkdir -pv $out;
+ cp -r luarocks/lib $out;
+ '';
+
+ meta = {
+ homepage = "https://github.com/lua-stdlib/lua-stdlib/";
+ hydraPlatforms = stdenv.lib.platforms.linux;
+ license = stdenv.lib.licenses.mit;
+ };
+ };
+
+ luasqlite3 = buildLuaPackage rec {
+ name = "sqlite3-${version}";
+ version = "2.1.1";
+ src = fetchurl {
+ url = "https://github.com/LuaDist/luasql-sqlite3/archive/2acdb6cb256e63e5b5a0ddd72c4639d8c0feb52d.zip";
+ sha256 = "1yy1n1l1801j48rlf3bhxpxqfgx46ixrs8jxhhbf7x1hn1j4axlv";
+ };
+
+ buildInputs = [ unzip sqlite ];
+
+ patches = [ ../development/lua-modules/luasql.patch ];
+
+ meta = {
+ homepage = "https://github.com/LuaDist/luasql-sqlite3";
+ hydraPlatforms = stdenv.lib.platforms.linux;
+ license = stdenv.lib.licenses.mit;
+ };
+ };
+
+}; in self
diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index fb12a10e5df..7e4a0fbc455 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -4,7 +4,8 @@
by-spec."Base64"."~0.2.0" =
self.by-version."Base64"."0.2.1";
by-version."Base64"."0.2.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-Base64-0.2.1";
+ name = "Base64-0.2.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/Base64/-/Base64-0.2.1.tgz";
@@ -14,8 +15,8 @@
];
buildInputs =
(self.nativeDeps."Base64" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "Base64" ];
@@ -23,7 +24,8 @@
by-spec."JSONStream"."~0.7.1" =
self.by-version."JSONStream"."0.7.4";
by-version."JSONStream"."0.7.4" = lib.makeOverridable self.buildNodePackage {
- name = "node-JSONStream-0.7.4";
+ name = "JSONStream-0.7.4";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/JSONStream/-/JSONStream-0.7.4.tgz";
@@ -33,10 +35,10 @@
];
buildInputs =
(self.nativeDeps."JSONStream" or []);
- deps = [
- self.by-version."jsonparse"."0.0.5"
- self.by-version."through"."2.3.4"
- ];
+ deps = {
+ "jsonparse-0.0.5" = self.by-version."jsonparse"."0.0.5";
+ "through-2.3.6" = self.by-version."through"."2.3.6";
+ };
peerDependencies = [
];
passthru.names = [ "JSONStream" ];
@@ -45,6 +47,7 @@
self.by-version."JSONStream"."0.8.4";
by-version."JSONStream"."0.8.4" = lib.makeOverridable self.buildNodePackage {
name = "JSONStream-0.8.4";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz";
@@ -54,10 +57,10 @@
];
buildInputs =
(self.nativeDeps."JSONStream" or []);
- deps = [
- self.by-version."jsonparse"."0.0.5"
- self.by-version."through"."2.3.4"
- ];
+ deps = {
+ "jsonparse-0.0.5" = self.by-version."jsonparse"."0.0.5";
+ "through-2.3.6" = self.by-version."through"."2.3.6";
+ };
peerDependencies = [
];
passthru.names = [ "JSONStream" ];
@@ -67,7 +70,8 @@
by-spec."StringScanner"."~0.0.3" =
self.by-version."StringScanner"."0.0.3";
by-version."StringScanner"."0.0.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-StringScanner-0.0.3";
+ name = "StringScanner-0.0.3";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/StringScanner/-/StringScanner-0.0.3.tgz";
@@ -77,8 +81,8 @@
];
buildInputs =
(self.nativeDeps."StringScanner" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "StringScanner" ];
@@ -86,7 +90,8 @@
by-spec."abbrev"."1" =
self.by-version."abbrev"."1.0.5";
by-version."abbrev"."1.0.5" = lib.makeOverridable self.buildNodePackage {
- name = "node-abbrev-1.0.5";
+ name = "abbrev-1.0.5";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz";
@@ -96,8 +101,8 @@
];
buildInputs =
(self.nativeDeps."abbrev" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "abbrev" ];
@@ -109,7 +114,8 @@
by-spec."accepts"."1.0.0" =
self.by-version."accepts"."1.0.0";
by-version."accepts"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-accepts-1.0.0";
+ name = "accepts-1.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/accepts/-/accepts-1.0.0.tgz";
@@ -119,18 +125,19 @@
];
buildInputs =
(self.nativeDeps."accepts" or []);
- deps = [
- self.by-version."mime"."1.2.11"
- self.by-version."negotiator"."0.3.0"
- ];
+ deps = {
+ "mime-1.2.11" = self.by-version."mime"."1.2.11";
+ "negotiator-0.3.0" = self.by-version."negotiator"."0.3.0";
+ };
peerDependencies = [
];
passthru.names = [ "accepts" ];
};
- by-spec."accepts"."~1.0.0" =
+ by-spec."accepts"."~1.0.7" =
self.by-version."accepts"."1.0.7";
by-version."accepts"."1.0.7" = lib.makeOverridable self.buildNodePackage {
- name = "node-accepts-1.0.7";
+ name = "accepts-1.0.7";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/accepts/-/accepts-1.0.7.tgz";
@@ -140,24 +147,41 @@
];
buildInputs =
(self.nativeDeps."accepts" or []);
- deps = [
- self.by-version."mime-types"."1.0.2"
- self.by-version."negotiator"."0.4.7"
- ];
+ deps = {
+ "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2";
+ "negotiator-0.4.7" = self.by-version."negotiator"."0.4.7";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "accepts" ];
+ };
+ by-spec."accepts"."~1.1.0" =
+ self.by-version."accepts"."1.1.1";
+ by-version."accepts"."1.1.1" = lib.makeOverridable self.buildNodePackage {
+ name = "accepts-1.1.1";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/accepts/-/accepts-1.1.1.tgz";
+ name = "accepts-1.1.1.tgz";
+ sha1 = "3b40bf6abc3fe3bc004534f4672ae1efd0063a96";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."accepts" or []);
+ deps = {
+ "mime-types-2.0.2" = self.by-version."mime-types"."2.0.2";
+ "negotiator-0.4.8" = self.by-version."negotiator"."0.4.8";
+ };
peerDependencies = [
];
passthru.names = [ "accepts" ];
};
- by-spec."accepts"."~1.0.4" =
- self.by-version."accepts"."1.0.7";
- by-spec."accepts"."~1.0.5" =
- self.by-version."accepts"."1.0.7";
- by-spec."accepts"."~1.0.7" =
- self.by-version."accepts"."1.0.7";
by-spec."active-x-obfuscator"."0.0.1" =
self.by-version."active-x-obfuscator"."0.0.1";
by-version."active-x-obfuscator"."0.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-active-x-obfuscator-0.0.1";
+ name = "active-x-obfuscator-0.0.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/active-x-obfuscator/-/active-x-obfuscator-0.0.1.tgz";
@@ -167,9 +191,9 @@
];
buildInputs =
(self.nativeDeps."active-x-obfuscator" or []);
- deps = [
- self.by-version."zeparser"."0.0.5"
- ];
+ deps = {
+ "zeparser-0.0.5" = self.by-version."zeparser"."0.0.5";
+ };
peerDependencies = [
];
passthru.names = [ "active-x-obfuscator" ];
@@ -177,7 +201,8 @@
by-spec."addressparser"."~0.2.1" =
self.by-version."addressparser"."0.2.1";
by-version."addressparser"."0.2.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-addressparser-0.2.1";
+ name = "addressparser-0.2.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/addressparser/-/addressparser-0.2.1.tgz";
@@ -187,35 +212,17 @@
];
buildInputs =
(self.nativeDeps."addressparser" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "addressparser" ];
};
- by-spec."adm-zip"."0.2.1" =
- self.by-version."adm-zip"."0.2.1";
- by-version."adm-zip"."0.2.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-adm-zip-0.2.1";
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/adm-zip/-/adm-zip-0.2.1.tgz";
- name = "adm-zip-0.2.1.tgz";
- sha1 = "e801cedeb5bd9a4e98d699c5c0f4239e2731dcbf";
- })
- ];
- buildInputs =
- (self.nativeDeps."adm-zip" or []);
- deps = [
- ];
- peerDependencies = [
- ];
- passthru.names = [ "adm-zip" ];
- };
- by-spec."adm-zip"."~0.4.3" =
+ by-spec."adm-zip"."0.4.4" =
self.by-version."adm-zip"."0.4.4";
by-version."adm-zip"."0.4.4" = lib.makeOverridable self.buildNodePackage {
- name = "node-adm-zip-0.4.4";
+ name = "adm-zip-0.4.4";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/adm-zip/-/adm-zip-0.4.4.tgz";
@@ -225,36 +232,40 @@
];
buildInputs =
(self.nativeDeps."adm-zip" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "adm-zip" ];
};
+ by-spec."adm-zip"."~0.4.3" =
+ self.by-version."adm-zip"."0.4.4";
by-spec."almond"."*" =
- self.by-version."almond"."0.2.9";
- by-version."almond"."0.2.9" = lib.makeOverridable self.buildNodePackage {
- name = "node-almond-0.2.9";
+ self.by-version."almond"."0.3.0";
+ by-version."almond"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+ name = "almond-0.3.0";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/almond/-/almond-0.2.9.tgz";
- name = "almond-0.2.9.tgz";
- sha1 = "ee4543d653a2306d682091c11050d441034f5ed8";
+ url = "http://registry.npmjs.org/almond/-/almond-0.3.0.tgz";
+ name = "almond-0.3.0.tgz";
+ sha1 = "701510c31038354f85ea31410b89ff3392058014";
})
];
buildInputs =
(self.nativeDeps."almond" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "almond" ];
};
- "almond" = self.by-version."almond"."0.2.9";
+ "almond" = self.by-version."almond"."0.3.0";
by-spec."amdefine"."*" =
self.by-version."amdefine"."0.1.0";
by-version."amdefine"."0.1.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-amdefine-0.1.0";
+ name = "amdefine-0.1.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz";
@@ -264,8 +275,8 @@
];
buildInputs =
(self.nativeDeps."amdefine" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "amdefine" ];
@@ -276,7 +287,8 @@
by-spec."ansi"."~0.3.0" =
self.by-version."ansi"."0.3.0";
by-version."ansi"."0.3.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-ansi-0.3.0";
+ name = "ansi-0.3.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz";
@@ -286,35 +298,17 @@
];
buildInputs =
(self.nativeDeps."ansi" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "ansi" ];
};
- by-spec."ansi-regex"."^0.1.0" =
- self.by-version."ansi-regex"."0.1.0";
- by-version."ansi-regex"."0.1.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-ansi-regex-0.1.0";
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-0.1.0.tgz";
- name = "ansi-regex-0.1.0.tgz";
- sha1 = "55ca60db6900857c423ae9297980026f941ed903";
- })
- ];
- buildInputs =
- (self.nativeDeps."ansi-regex" or []);
- deps = [
- ];
- peerDependencies = [
- ];
- passthru.names = [ "ansi-regex" ];
- };
by-spec."ansi-regex"."^0.2.0" =
self.by-version."ansi-regex"."0.2.1";
by-version."ansi-regex"."0.2.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-ansi-regex-0.2.1";
+ name = "ansi-regex-0.2.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz";
@@ -324,8 +318,8 @@
];
buildInputs =
(self.nativeDeps."ansi-regex" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "ansi-regex" ];
@@ -335,7 +329,8 @@
by-spec."ansi-remover"."*" =
self.by-version."ansi-remover"."0.0.2";
by-version."ansi-remover"."0.0.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-ansi-remover-0.0.2";
+ name = "ansi-remover-0.0.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/ansi-remover/-/ansi-remover-0.0.2.tgz";
@@ -345,8 +340,8 @@
];
buildInputs =
(self.nativeDeps."ansi-remover" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "ansi-remover" ];
@@ -355,7 +350,8 @@
by-spec."ansi-styles"."^1.1.0" =
self.by-version."ansi-styles"."1.1.0";
by-version."ansi-styles"."1.1.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-ansi-styles-1.1.0";
+ name = "ansi-styles-1.1.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz";
@@ -365,8 +361,8 @@
];
buildInputs =
(self.nativeDeps."ansi-styles" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "ansi-styles" ];
@@ -374,7 +370,8 @@
by-spec."ansi-styles"."~1.0.0" =
self.by-version."ansi-styles"."1.0.0";
by-version."ansi-styles"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-ansi-styles-1.0.0";
+ name = "ansi-styles-1.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz";
@@ -384,8 +381,8 @@
];
buildInputs =
(self.nativeDeps."ansi-styles" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "ansi-styles" ];
@@ -393,7 +390,8 @@
by-spec."ansicolors"."~0.3.2" =
self.by-version."ansicolors"."0.3.2";
by-version."ansicolors"."0.3.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-ansicolors-0.3.2";
+ name = "ansicolors-0.3.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/ansicolors/-/ansicolors-0.3.2.tgz";
@@ -403,8 +401,8 @@
];
buildInputs =
(self.nativeDeps."ansicolors" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "ansicolors" ];
@@ -412,7 +410,8 @@
by-spec."ansistyles"."~0.1.3" =
self.by-version."ansistyles"."0.1.3";
by-version."ansistyles"."0.1.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-ansistyles-0.1.3";
+ name = "ansistyles-0.1.3";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/ansistyles/-/ansistyles-0.1.3.tgz";
@@ -422,8 +421,8 @@
];
buildInputs =
(self.nativeDeps."ansistyles" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "ansistyles" ];
@@ -431,7 +430,8 @@
by-spec."apparatus".">= 0.0.6" =
self.by-version."apparatus"."0.0.8";
by-version."apparatus"."0.0.8" = lib.makeOverridable self.buildNodePackage {
- name = "node-apparatus-0.0.8";
+ name = "apparatus-0.0.8";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/apparatus/-/apparatus-0.0.8.tgz";
@@ -441,35 +441,37 @@
];
buildInputs =
(self.nativeDeps."apparatus" or []);
- deps = [
- self.by-version."sylvester"."0.0.21"
- ];
+ deps = {
+ "sylvester-0.0.21" = self.by-version."sylvester"."0.0.21";
+ };
peerDependencies = [
];
passthru.names = [ "apparatus" ];
};
- by-spec."archiver"."~0.10.0" =
- self.by-version."archiver"."0.10.1";
- by-version."archiver"."0.10.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-archiver-0.10.1";
+ by-spec."archiver"."~0.11.0" =
+ self.by-version."archiver"."0.11.0";
+ by-version."archiver"."0.11.0" = lib.makeOverridable self.buildNodePackage {
+ name = "archiver-0.11.0";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/archiver/-/archiver-0.10.1.tgz";
- name = "archiver-0.10.1.tgz";
- sha1 = "c88a50fe114f744d059a07dfc4690f3a204146e4";
+ url = "http://registry.npmjs.org/archiver/-/archiver-0.11.0.tgz";
+ name = "archiver-0.11.0.tgz";
+ sha1 = "98177da7a6c0192b7f2798f30cd6eab8abd76690";
})
];
buildInputs =
(self.nativeDeps."archiver" or []);
- deps = [
- self.by-version."buffer-crc32"."0.2.3"
- self.by-version."readable-stream"."1.0.31"
- self.by-version."tar-stream"."0.4.5"
- self.by-version."zip-stream"."0.3.7"
- self.by-version."lazystream"."0.1.0"
- self.by-version."file-utils"."0.2.0"
- self.by-version."lodash"."2.4.1"
- ];
+ deps = {
+ "async-0.9.0" = self.by-version."async"."0.9.0";
+ "buffer-crc32-0.2.3" = self.by-version."buffer-crc32"."0.2.3";
+ "glob-3.2.11" = self.by-version."glob"."3.2.11";
+ "lazystream-0.1.0" = self.by-version."lazystream"."0.1.0";
+ "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
+ "readable-stream-1.0.32" = self.by-version."readable-stream"."1.0.32";
+ "tar-stream-0.4.7" = self.by-version."tar-stream"."0.4.7";
+ "zip-stream-0.4.1" = self.by-version."zip-stream"."0.4.1";
+ };
peerDependencies = [
];
passthru.names = [ "archiver" ];
@@ -477,7 +479,8 @@
by-spec."archy"."0" =
self.by-version."archy"."0.0.2";
by-version."archy"."0.0.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-archy-0.0.2";
+ name = "archy-0.0.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/archy/-/archy-0.0.2.tgz";
@@ -487,16 +490,19 @@
];
buildInputs =
(self.nativeDeps."archy" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "archy" ];
};
+ by-spec."archy"."^0.0.2" =
+ self.by-version."archy"."0.0.2";
by-spec."argparse"."0.1.15" =
self.by-version."argparse"."0.1.15";
by-version."argparse"."0.1.15" = lib.makeOverridable self.buildNodePackage {
- name = "node-argparse-0.1.15";
+ name = "argparse-0.1.15";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/argparse/-/argparse-0.1.15.tgz";
@@ -506,10 +512,10 @@
];
buildInputs =
(self.nativeDeps."argparse" or []);
- deps = [
- self.by-version."underscore"."1.4.4"
- self.by-version."underscore.string"."2.3.3"
- ];
+ deps = {
+ "underscore-1.4.4" = self.by-version."underscore"."1.4.4";
+ "underscore.string-2.3.3" = self.by-version."underscore.string"."2.3.3";
+ };
peerDependencies = [
];
passthru.names = [ "argparse" ];
@@ -519,7 +525,8 @@
by-spec."asap"."^1.0.0" =
self.by-version."asap"."1.0.0";
by-version."asap"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-asap-1.0.0";
+ name = "asap-1.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/asap/-/asap-1.0.0.tgz";
@@ -529,8 +536,8 @@
];
buildInputs =
(self.nativeDeps."asap" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "asap" ];
@@ -538,7 +545,8 @@
by-spec."ascii-json"."~0.2" =
self.by-version."ascii-json"."0.2.0";
by-version."ascii-json"."0.2.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-ascii-json-0.2.0";
+ name = "ascii-json-0.2.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/ascii-json/-/ascii-json-0.2.0.tgz";
@@ -548,8 +556,8 @@
];
buildInputs =
(self.nativeDeps."ascii-json" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "ascii-json" ];
@@ -557,7 +565,8 @@
by-spec."asn1"."0.1.11" =
self.by-version."asn1"."0.1.11";
by-version."asn1"."0.1.11" = lib.makeOverridable self.buildNodePackage {
- name = "node-asn1-0.1.11";
+ name = "asn1-0.1.11";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz";
@@ -567,39 +576,41 @@
];
buildInputs =
(self.nativeDeps."asn1" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "asn1" ];
};
by-spec."assert"."*" =
- self.by-version."assert"."1.1.1";
- by-version."assert"."1.1.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-assert-1.1.1";
+ self.by-version."assert"."1.1.2";
+ by-version."assert"."1.1.2" = lib.makeOverridable self.buildNodePackage {
+ name = "assert-1.1.2";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/assert/-/assert-1.1.1.tgz";
- name = "assert-1.1.1.tgz";
- sha1 = "766549ef4a6014b1e19c7c53f9816eabda440760";
+ url = "http://registry.npmjs.org/assert/-/assert-1.1.2.tgz";
+ name = "assert-1.1.2.tgz";
+ sha1 = "adaa04c46bb58c6dd1f294da3eb26e6228eb6e44";
})
];
buildInputs =
(self.nativeDeps."assert" or []);
- deps = [
- self.by-version."util"."0.10.2"
- ];
+ deps = {
+ "util-0.10.3" = self.by-version."util"."0.10.3";
+ };
peerDependencies = [
];
passthru.names = [ "assert" ];
};
- "assert" = self.by-version."assert"."1.1.1";
+ "assert" = self.by-version."assert"."1.1.2";
by-spec."assert"."~1.1.0" =
- self.by-version."assert"."1.1.1";
+ self.by-version."assert"."1.1.2";
by-spec."assert-plus"."0.1.2" =
self.by-version."assert-plus"."0.1.2";
by-version."assert-plus"."0.1.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-assert-plus-0.1.2";
+ name = "assert-plus-0.1.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz";
@@ -609,8 +620,8 @@
];
buildInputs =
(self.nativeDeps."assert-plus" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "assert-plus" ];
@@ -618,7 +629,8 @@
by-spec."assert-plus"."0.1.3" =
self.by-version."assert-plus"."0.1.3";
by-version."assert-plus"."0.1.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-assert-plus-0.1.3";
+ name = "assert-plus-0.1.3";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.3.tgz";
@@ -628,8 +640,8 @@
];
buildInputs =
(self.nativeDeps."assert-plus" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "assert-plus" ];
@@ -637,7 +649,8 @@
by-spec."assertion-error"."1.0.0" =
self.by-version."assertion-error"."1.0.0";
by-version."assertion-error"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-assertion-error-1.0.0";
+ name = "assertion-error-1.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/assertion-error/-/assertion-error-1.0.0.tgz";
@@ -647,8 +660,8 @@
];
buildInputs =
(self.nativeDeps."assertion-error" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "assertion-error" ];
@@ -656,7 +669,8 @@
by-spec."astw"."~1.1.0" =
self.by-version."astw"."1.1.0";
by-version."astw"."1.1.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-astw-1.1.0";
+ name = "astw-1.1.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/astw/-/astw-1.1.0.tgz";
@@ -666,9 +680,9 @@
];
buildInputs =
(self.nativeDeps."astw" or []);
- deps = [
- self.by-version."esprima-fb"."3001.1.0-dev-harmony-fb"
- ];
+ deps = {
+ "esprima-fb-3001.1.0-dev-harmony-fb" = self.by-version."esprima-fb"."3001.1.0-dev-harmony-fb";
+ };
peerDependencies = [
];
passthru.names = [ "astw" ];
@@ -676,7 +690,8 @@
by-spec."async"."*" =
self.by-version."async"."0.9.0";
by-version."async"."0.9.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-async-0.9.0";
+ name = "async-0.9.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/async/-/async-0.9.0.tgz";
@@ -686,36 +701,18 @@
];
buildInputs =
(self.nativeDeps."async" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "async" ];
};
"async" = self.by-version."async"."0.9.0";
- by-spec."async"."0.1.15" =
- self.by-version."async"."0.1.15";
- by-version."async"."0.1.15" = lib.makeOverridable self.buildNodePackage {
- name = "node-async-0.1.15";
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/async/-/async-0.1.15.tgz";
- name = "async-0.1.15.tgz";
- sha1 = "2180eaca2cf2a6ca5280d41c0585bec9b3e49bd3";
- })
- ];
- buildInputs =
- (self.nativeDeps."async" or []);
- deps = [
- ];
- peerDependencies = [
- ];
- passthru.names = [ "async" ];
- };
by-spec."async"."0.1.22" =
self.by-version."async"."0.1.22";
by-version."async"."0.1.22" = lib.makeOverridable self.buildNodePackage {
- name = "node-async-0.1.22";
+ name = "async-0.1.22";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/async/-/async-0.1.22.tgz";
@@ -725,8 +722,8 @@
];
buildInputs =
(self.nativeDeps."async" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "async" ];
@@ -736,7 +733,8 @@
by-spec."async"."0.2.9" =
self.by-version."async"."0.2.9";
by-version."async"."0.2.9" = lib.makeOverridable self.buildNodePackage {
- name = "node-async-0.2.9";
+ name = "async-0.2.9";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/async/-/async-0.2.9.tgz";
@@ -746,8 +744,8 @@
];
buildInputs =
(self.nativeDeps."async" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "async" ];
@@ -755,7 +753,8 @@
by-spec."async"."0.2.x" =
self.by-version."async"."0.2.10";
by-version."async"."0.2.10" = lib.makeOverridable self.buildNodePackage {
- name = "node-async-0.2.10";
+ name = "async-0.2.10";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/async/-/async-0.2.10.tgz";
@@ -765,8 +764,8 @@
];
buildInputs =
(self.nativeDeps."async" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "async" ];
@@ -777,6 +776,8 @@
self.by-version."async"."0.2.10";
by-spec."async"."~0.1.22" =
self.by-version."async"."0.1.22";
+ by-spec."async"."~0.2.0" =
+ self.by-version."async"."0.2.10";
by-spec."async"."~0.2.6" =
self.by-version."async"."0.2.10";
by-spec."async"."~0.2.7" =
@@ -786,7 +787,8 @@
by-spec."async"."~0.7.0" =
self.by-version."async"."0.7.0";
by-version."async"."0.7.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-async-0.7.0";
+ name = "async-0.7.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/async/-/async-0.7.0.tgz";
@@ -796,8 +798,8 @@
];
buildInputs =
(self.nativeDeps."async" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "async" ];
@@ -805,7 +807,8 @@
by-spec."async"."~0.8" =
self.by-version."async"."0.8.0";
by-version."async"."0.8.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-async-0.8.0";
+ name = "async-0.8.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/async/-/async-0.8.0.tgz";
@@ -815,18 +818,19 @@
];
buildInputs =
(self.nativeDeps."async" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "async" ];
};
by-spec."async"."~0.9.0" =
self.by-version."async"."0.9.0";
- by-spec."async-some"."~1.0.0" =
+ by-spec."async-some"."~1.0.1" =
self.by-version."async-some"."1.0.1";
by-version."async-some"."1.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-async-some-1.0.1";
+ name = "async-some-1.0.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/async-some/-/async-some-1.0.1.tgz";
@@ -836,40 +840,42 @@
];
buildInputs =
(self.nativeDeps."async-some" or []);
- deps = [
- self.by-version."dezalgo"."1.0.0"
- ];
+ deps = {
+ "dezalgo-1.0.1" = self.by-version."dezalgo"."1.0.1";
+ };
peerDependencies = [
];
passthru.names = [ "async-some" ];
};
by-spec."aws-sdk"."*" =
- self.by-version."aws-sdk"."2.0.14";
- by-version."aws-sdk"."2.0.14" = lib.makeOverridable self.buildNodePackage {
- name = "node-aws-sdk-2.0.14";
+ self.by-version."aws-sdk"."2.0.18";
+ by-version."aws-sdk"."2.0.18" = lib.makeOverridable self.buildNodePackage {
+ name = "aws-sdk-2.0.18";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-2.0.14.tgz";
- name = "aws-sdk-2.0.14.tgz";
- sha1 = "ee6668b97d62924b3d27d577658411c06ad7f2ad";
+ url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-2.0.18.tgz";
+ name = "aws-sdk-2.0.18.tgz";
+ sha1 = "aea83ffff08de9dd167f785d04b463025078c790";
})
];
buildInputs =
(self.nativeDeps."aws-sdk" or []);
- deps = [
- self.by-version."aws-sdk-apis"."3.1.6"
- self.by-version."xml2js"."0.2.6"
- self.by-version."xmlbuilder"."0.4.2"
- ];
+ deps = {
+ "aws-sdk-apis-3.1.9" = self.by-version."aws-sdk-apis"."3.1.9";
+ "xml2js-0.2.6" = self.by-version."xml2js"."0.2.6";
+ "xmlbuilder-0.4.2" = self.by-version."xmlbuilder"."0.4.2";
+ };
peerDependencies = [
];
passthru.names = [ "aws-sdk" ];
};
- "aws-sdk" = self.by-version."aws-sdk"."2.0.14";
+ "aws-sdk" = self.by-version."aws-sdk"."2.0.18";
by-spec."aws-sdk".">=1.2.0 <2" =
self.by-version."aws-sdk"."1.18.0";
by-version."aws-sdk"."1.18.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-aws-sdk-1.18.0";
+ name = "aws-sdk-1.18.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.18.0.tgz";
@@ -879,29 +885,30 @@
];
buildInputs =
(self.nativeDeps."aws-sdk" or []);
- deps = [
- self.by-version."xml2js"."0.2.4"
- self.by-version."xmlbuilder"."0.4.2"
- ];
+ deps = {
+ "xml2js-0.2.4" = self.by-version."xml2js"."0.2.4";
+ "xmlbuilder-0.4.2" = self.by-version."xmlbuilder"."0.4.2";
+ };
peerDependencies = [
];
passthru.names = [ "aws-sdk" ];
};
by-spec."aws-sdk-apis".">=3.1.0 <4.0.0" =
- self.by-version."aws-sdk-apis"."3.1.6";
- by-version."aws-sdk-apis"."3.1.6" = lib.makeOverridable self.buildNodePackage {
- name = "node-aws-sdk-apis-3.1.6";
+ self.by-version."aws-sdk-apis"."3.1.9";
+ by-version."aws-sdk-apis"."3.1.9" = lib.makeOverridable self.buildNodePackage {
+ name = "aws-sdk-apis-3.1.9";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/aws-sdk-apis/-/aws-sdk-apis-3.1.6.tgz";
- name = "aws-sdk-apis-3.1.6.tgz";
- sha1 = "1831a16ef8d5dd7d7278c749aff3d33ee7b1dacb";
+ url = "http://registry.npmjs.org/aws-sdk-apis/-/aws-sdk-apis-3.1.9.tgz";
+ name = "aws-sdk-apis-3.1.9.tgz";
+ sha1 = "abd017548bb9eab0472d3c729d512aba3fc16a67";
})
];
buildInputs =
(self.nativeDeps."aws-sdk-apis" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "aws-sdk-apis" ];
@@ -909,7 +916,8 @@
by-spec."aws-sign"."~0.2.0" =
self.by-version."aws-sign"."0.2.0";
by-version."aws-sign"."0.2.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-aws-sign-0.2.0";
+ name = "aws-sign-0.2.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/aws-sign/-/aws-sign-0.2.0.tgz";
@@ -919,8 +927,8 @@
];
buildInputs =
(self.nativeDeps."aws-sign" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "aws-sign" ];
@@ -928,7 +936,8 @@
by-spec."aws-sign"."~0.3.0" =
self.by-version."aws-sign"."0.3.0";
by-version."aws-sign"."0.3.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-aws-sign-0.3.0";
+ name = "aws-sign-0.3.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/aws-sign/-/aws-sign-0.3.0.tgz";
@@ -938,8 +947,8 @@
];
buildInputs =
(self.nativeDeps."aws-sign" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "aws-sign" ];
@@ -947,7 +956,8 @@
by-spec."aws-sign2"."~0.5.0" =
self.by-version."aws-sign2"."0.5.0";
by-version."aws-sign2"."0.5.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-aws-sign2-0.5.0";
+ name = "aws-sign2-0.5.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz";
@@ -957,8 +967,8 @@
];
buildInputs =
(self.nativeDeps."aws-sign2" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "aws-sign2" ];
@@ -966,7 +976,8 @@
by-spec."backbone"."*" =
self.by-version."backbone"."1.1.2";
by-version."backbone"."1.1.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-backbone-1.1.2";
+ name = "backbone-1.1.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/backbone/-/backbone-1.1.2.tgz";
@@ -976,9 +987,9 @@
];
buildInputs =
(self.nativeDeps."backbone" or []);
- deps = [
- self.by-version."underscore"."1.6.0"
- ];
+ deps = {
+ "underscore-1.7.0" = self.by-version."underscore"."1.7.0";
+ };
peerDependencies = [
];
passthru.names = [ "backbone" ];
@@ -987,7 +998,8 @@
by-spec."backoff"."2.1.0" =
self.by-version."backoff"."2.1.0";
by-version."backoff"."2.1.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-backoff-2.1.0";
+ name = "backoff-2.1.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/backoff/-/backoff-2.1.0.tgz";
@@ -997,8 +1009,8 @@
];
buildInputs =
(self.nativeDeps."backoff" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "backoff" ];
@@ -1006,7 +1018,8 @@
by-spec."base62"."0.1.1" =
self.by-version."base62"."0.1.1";
by-version."base62"."0.1.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-base62-0.1.1";
+ name = "base62-0.1.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/base62/-/base62-0.1.1.tgz";
@@ -1016,16 +1029,17 @@
];
buildInputs =
(self.nativeDeps."base62" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "base62" ];
};
- by-spec."base64-js"."~0.0.4" =
+ by-spec."base64-js"."0.0.7" =
self.by-version."base64-js"."0.0.7";
by-version."base64-js"."0.0.7" = lib.makeOverridable self.buildNodePackage {
- name = "node-base64-js-0.0.7";
+ name = "base64-js-0.0.7";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/base64-js/-/base64-js-0.0.7.tgz";
@@ -1035,8 +1049,8 @@
];
buildInputs =
(self.nativeDeps."base64-js" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "base64-js" ];
@@ -1044,7 +1058,8 @@
by-spec."base64-url"."1" =
self.by-version."base64-url"."1.0.0";
by-version."base64-url"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-base64-url-1.0.0";
+ name = "base64-url-1.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/base64-url/-/base64-url-1.0.0.tgz";
@@ -1054,16 +1069,19 @@
];
buildInputs =
(self.nativeDeps."base64-url" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "base64-url" ];
};
+ by-spec."base64-url"."1.0.0" =
+ self.by-version."base64-url"."1.0.0";
by-spec."base64id"."0.1.0" =
self.by-version."base64id"."0.1.0";
by-version."base64id"."0.1.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-base64id-0.1.0";
+ name = "base64id-0.1.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz";
@@ -1073,8 +1091,8 @@
];
buildInputs =
(self.nativeDeps."base64id" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "base64id" ];
@@ -1082,7 +1100,8 @@
by-spec."basic-auth"."1.0.0" =
self.by-version."basic-auth"."1.0.0";
by-version."basic-auth"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-basic-auth-1.0.0";
+ name = "basic-auth-1.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/basic-auth/-/basic-auth-1.0.0.tgz";
@@ -1092,8 +1111,8 @@
];
buildInputs =
(self.nativeDeps."basic-auth" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "basic-auth" ];
@@ -1101,7 +1120,8 @@
by-spec."basic-auth-connect"."1.0.0" =
self.by-version."basic-auth-connect"."1.0.0";
by-version."basic-auth-connect"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-basic-auth-connect-1.0.0";
+ name = "basic-auth-connect-1.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz";
@@ -1111,8 +1131,8 @@
];
buildInputs =
(self.nativeDeps."basic-auth-connect" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "basic-auth-connect" ];
@@ -1120,7 +1140,8 @@
by-spec."batch"."0.5.0" =
self.by-version."batch"."0.5.0";
by-version."batch"."0.5.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-batch-0.5.0";
+ name = "batch-0.5.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/batch/-/batch-0.5.0.tgz";
@@ -1130,8 +1151,8 @@
];
buildInputs =
(self.nativeDeps."batch" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "batch" ];
@@ -1139,7 +1160,8 @@
by-spec."batch"."0.5.1" =
self.by-version."batch"."0.5.1";
by-version."batch"."0.5.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-batch-0.5.1";
+ name = "batch-0.5.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/batch/-/batch-0.5.1.tgz";
@@ -1149,8 +1171,8 @@
];
buildInputs =
(self.nativeDeps."batch" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "batch" ];
@@ -1158,7 +1180,8 @@
by-spec."bcrypt"."*" =
self.by-version."bcrypt"."0.8.0";
by-version."bcrypt"."0.8.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-bcrypt-0.8.0";
+ name = "bcrypt-0.8.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/bcrypt/-/bcrypt-0.8.0.tgz";
@@ -1168,10 +1191,10 @@
];
buildInputs =
(self.nativeDeps."bcrypt" or []);
- deps = [
- self.by-version."bindings"."1.0.0"
- self.by-version."nan"."1.3.0"
- ];
+ deps = {
+ "bindings-1.0.0" = self.by-version."bindings"."1.0.0";
+ "nan-1.3.0" = self.by-version."nan"."1.3.0";
+ };
peerDependencies = [
];
passthru.names = [ "bcrypt" ];
@@ -1180,7 +1203,8 @@
by-spec."bindings"."*" =
self.by-version."bindings"."1.2.1";
by-version."bindings"."1.2.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-bindings-1.2.1";
+ name = "bindings-1.2.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz";
@@ -1190,8 +1214,8 @@
];
buildInputs =
(self.nativeDeps."bindings" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "bindings" ];
@@ -1199,7 +1223,8 @@
by-spec."bindings"."1.0.0" =
self.by-version."bindings"."1.0.0";
by-version."bindings"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-bindings-1.0.0";
+ name = "bindings-1.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/bindings/-/bindings-1.0.0.tgz";
@@ -1209,8 +1234,8 @@
];
buildInputs =
(self.nativeDeps."bindings" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "bindings" ];
@@ -1218,7 +1243,8 @@
by-spec."bindings"."1.1.1" =
self.by-version."bindings"."1.1.1";
by-version."bindings"."1.1.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-bindings-1.1.1";
+ name = "bindings-1.1.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/bindings/-/bindings-1.1.1.tgz";
@@ -1228,8 +1254,8 @@
];
buildInputs =
(self.nativeDeps."bindings" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "bindings" ];
@@ -1239,29 +1265,33 @@
by-spec."bindings"."~1.2.1" =
self.by-version."bindings"."1.2.1";
by-spec."bl"."^0.9.0" =
- self.by-version."bl"."0.9.1";
- by-version."bl"."0.9.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-bl-0.9.1";
+ self.by-version."bl"."0.9.3";
+ by-version."bl"."0.9.3" = lib.makeOverridable self.buildNodePackage {
+ name = "bl-0.9.3";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/bl/-/bl-0.9.1.tgz";
- name = "bl-0.9.1.tgz";
- sha1 = "d262c5b83aa5cf4386cea1d998c82b36d7ae2942";
+ url = "http://registry.npmjs.org/bl/-/bl-0.9.3.tgz";
+ name = "bl-0.9.3.tgz";
+ sha1 = "c41eff3e7cb31bde107c8f10076d274eff7f7d44";
})
];
buildInputs =
(self.nativeDeps."bl" or []);
- deps = [
- self.by-version."readable-stream"."1.0.31"
- ];
+ deps = {
+ "readable-stream-1.0.32" = self.by-version."readable-stream"."1.0.32";
+ };
peerDependencies = [
];
passthru.names = [ "bl" ];
};
+ by-spec."bl"."~0.9.0" =
+ self.by-version."bl"."0.9.3";
by-spec."block-stream"."*" =
self.by-version."block-stream"."0.0.7";
by-version."block-stream"."0.0.7" = lib.makeOverridable self.buildNodePackage {
- name = "node-block-stream-0.0.7";
+ name = "block-stream-0.0.7";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz";
@@ -1271,9 +1301,9 @@
];
buildInputs =
(self.nativeDeps."block-stream" or []);
- deps = [
- self.by-version."inherits"."2.0.1"
- ];
+ deps = {
+ "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+ };
peerDependencies = [
];
passthru.names = [ "block-stream" ];
@@ -1281,20 +1311,21 @@
by-spec."block-stream"."0.0.7" =
self.by-version."block-stream"."0.0.7";
by-spec."bluebird".">= 1.2.1" =
- self.by-version."bluebird"."2.3.0";
- by-version."bluebird"."2.3.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-bluebird-2.3.0";
+ self.by-version."bluebird"."2.3.4";
+ by-version."bluebird"."2.3.4" = lib.makeOverridable self.buildNodePackage {
+ name = "bluebird-2.3.4";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/bluebird/-/bluebird-2.3.0.tgz";
- name = "bluebird-2.3.0.tgz";
- sha1 = "0d9260735ca30c8a28b3427a291fe2b9287da0f8";
+ url = "http://registry.npmjs.org/bluebird/-/bluebird-2.3.4.tgz";
+ name = "bluebird-2.3.4.tgz";
+ sha1 = "9f6c0d1e41d9862bdf4b6af0a4c0a7714602cb85";
})
];
buildInputs =
(self.nativeDeps."bluebird" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "bluebird" ];
@@ -1302,7 +1333,8 @@
by-spec."blueimp-md5"."~1.1.0" =
self.by-version."blueimp-md5"."1.1.0";
by-version."blueimp-md5"."1.1.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-blueimp-md5-1.1.0";
+ name = "blueimp-md5-1.1.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/blueimp-md5/-/blueimp-md5-1.1.0.tgz";
@@ -1312,61 +1344,64 @@
];
buildInputs =
(self.nativeDeps."blueimp-md5" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "blueimp-md5" ];
};
- by-spec."body-parser"."~1.4.3" =
- self.by-version."body-parser"."1.4.3";
- by-version."body-parser"."1.4.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-body-parser-1.4.3";
+ by-spec."body-parser"."~1.6.5" =
+ self.by-version."body-parser"."1.6.7";
+ by-version."body-parser"."1.6.7" = lib.makeOverridable self.buildNodePackage {
+ name = "body-parser-1.6.7";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/body-parser/-/body-parser-1.4.3.tgz";
- name = "body-parser-1.4.3.tgz";
- sha1 = "4727952cff4af0773eefa4b226c2f4122f5e234d";
+ url = "http://registry.npmjs.org/body-parser/-/body-parser-1.6.7.tgz";
+ name = "body-parser-1.6.7.tgz";
+ sha1 = "82306becadf44543e826b3907eae93f0237c4e5c";
})
];
buildInputs =
(self.nativeDeps."body-parser" or []);
- deps = [
- self.by-version."bytes"."1.0.0"
- self.by-version."depd"."0.3.0"
- self.by-version."iconv-lite"."0.4.3"
- self.by-version."media-typer"."0.2.0"
- self.by-version."qs"."0.6.6"
- self.by-version."raw-body"."1.2.2"
- self.by-version."type-is"."1.3.1"
- ];
+ deps = {
+ "bytes-1.0.0" = self.by-version."bytes"."1.0.0";
+ "depd-0.4.4" = self.by-version."depd"."0.4.4";
+ "iconv-lite-0.4.4" = self.by-version."iconv-lite"."0.4.4";
+ "media-typer-0.2.0" = self.by-version."media-typer"."0.2.0";
+ "on-finished-2.1.0" = self.by-version."on-finished"."2.1.0";
+ "qs-2.2.2" = self.by-version."qs"."2.2.2";
+ "raw-body-1.3.0" = self.by-version."raw-body"."1.3.0";
+ "type-is-1.3.2" = self.by-version."type-is"."1.3.2";
+ };
peerDependencies = [
];
passthru.names = [ "body-parser" ];
};
- by-spec."body-parser"."~1.6.5" =
- self.by-version."body-parser"."1.6.5";
- by-version."body-parser"."1.6.5" = lib.makeOverridable self.buildNodePackage {
- name = "node-body-parser-1.6.5";
+ by-spec."body-parser"."~1.8.4" =
+ self.by-version."body-parser"."1.8.4";
+ by-version."body-parser"."1.8.4" = lib.makeOverridable self.buildNodePackage {
+ name = "body-parser-1.8.4";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/body-parser/-/body-parser-1.6.5.tgz";
- name = "body-parser-1.6.5.tgz";
- sha1 = "536f01e08ee2b6df6a941d6c8c9647ee99ee4de7";
+ url = "http://registry.npmjs.org/body-parser/-/body-parser-1.8.4.tgz";
+ name = "body-parser-1.8.4.tgz";
+ sha1 = "d497e04bc13b3f9a8bd8c70bb0cdc16f2e028898";
})
];
buildInputs =
(self.nativeDeps."body-parser" or []);
- deps = [
- self.by-version."bytes"."1.0.0"
- self.by-version."depd"."0.4.4"
- self.by-version."iconv-lite"."0.4.4"
- self.by-version."media-typer"."0.2.0"
- self.by-version."on-finished"."2.1.0"
- self.by-version."qs"."1.2.2"
- self.by-version."raw-body"."1.3.0"
- self.by-version."type-is"."1.3.2"
- ];
+ deps = {
+ "bytes-1.0.0" = self.by-version."bytes"."1.0.0";
+ "depd-0.4.5" = self.by-version."depd"."0.4.5";
+ "iconv-lite-0.4.4" = self.by-version."iconv-lite"."0.4.4";
+ "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0";
+ "on-finished-2.1.0" = self.by-version."on-finished"."2.1.0";
+ "qs-2.2.4" = self.by-version."qs"."2.2.4";
+ "raw-body-1.3.0" = self.by-version."raw-body"."1.3.0";
+ "type-is-1.5.2" = self.by-version."type-is"."1.5.2";
+ };
peerDependencies = [
];
passthru.names = [ "body-parser" ];
@@ -1374,7 +1409,8 @@
by-spec."boom"."0.3.x" =
self.by-version."boom"."0.3.8";
by-version."boom"."0.3.8" = lib.makeOverridable self.buildNodePackage {
- name = "node-boom-0.3.8";
+ name = "boom-0.3.8";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/boom/-/boom-0.3.8.tgz";
@@ -1384,9 +1420,9 @@
];
buildInputs =
(self.nativeDeps."boom" or []);
- deps = [
- self.by-version."hoek"."0.7.6"
- ];
+ deps = {
+ "hoek-0.7.6" = self.by-version."hoek"."0.7.6";
+ };
peerDependencies = [
];
passthru.names = [ "boom" ];
@@ -1394,7 +1430,8 @@
by-spec."boom"."0.4.x" =
self.by-version."boom"."0.4.2";
by-version."boom"."0.4.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-boom-0.4.2";
+ name = "boom-0.4.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/boom/-/boom-0.4.2.tgz";
@@ -1404,9 +1441,9 @@
];
buildInputs =
(self.nativeDeps."boom" or []);
- deps = [
- self.by-version."hoek"."0.9.1"
- ];
+ deps = {
+ "hoek-0.9.1" = self.by-version."hoek"."0.9.1";
+ };
peerDependencies = [
];
passthru.names = [ "boom" ];
@@ -1414,7 +1451,8 @@
by-spec."broadway"."0.2.9" =
self.by-version."broadway"."0.2.9";
by-version."broadway"."0.2.9" = lib.makeOverridable self.buildNodePackage {
- name = "node-broadway-0.2.9";
+ name = "broadway-0.2.9";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/broadway/-/broadway-0.2.9.tgz";
@@ -1424,23 +1462,72 @@
];
buildInputs =
(self.nativeDeps."broadway" or []);
- deps = [
- self.by-version."cliff"."0.1.8"
- self.by-version."eventemitter2"."0.4.12"
- self.by-version."nconf"."0.6.9"
- self.by-version."winston"."0.7.2"
- self.by-version."utile"."0.2.1"
- ];
+ deps = {
+ "cliff-0.1.8" = self.by-version."cliff"."0.1.8";
+ "eventemitter2-0.4.12" = self.by-version."eventemitter2"."0.4.12";
+ "nconf-0.6.9" = self.by-version."nconf"."0.6.9";
+ "winston-0.7.2" = self.by-version."winston"."0.7.2";
+ "utile-0.2.1" = self.by-version."utile"."0.2.1";
+ };
peerDependencies = [
];
passthru.names = [ "broadway" ];
};
by-spec."broadway"."0.2.x" =
- self.by-version."broadway"."0.2.9";
+ self.by-version."broadway"."0.2.10";
+ by-version."broadway"."0.2.10" = lib.makeOverridable self.buildNodePackage {
+ name = "broadway-0.2.10";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/broadway/-/broadway-0.2.10.tgz";
+ name = "broadway-0.2.10.tgz";
+ sha1 = "0f58532be140426e9000e49a93e242a0d1263238";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."broadway" or []);
+ deps = {
+ "cliff-0.1.8" = self.by-version."cliff"."0.1.8";
+ "eventemitter2-0.4.14" = self.by-version."eventemitter2"."0.4.14";
+ "nconf-0.6.9" = self.by-version."nconf"."0.6.9";
+ "winston-0.7.2" = self.by-version."winston"."0.7.2";
+ "utile-0.2.1" = self.by-version."utile"."0.2.1";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "broadway" ];
+ };
+ by-spec."broadway"."~0.3.2" =
+ self.by-version."broadway"."0.3.6";
+ by-version."broadway"."0.3.6" = lib.makeOverridable self.buildNodePackage {
+ name = "broadway-0.3.6";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/broadway/-/broadway-0.3.6.tgz";
+ name = "broadway-0.3.6.tgz";
+ sha1 = "7dbef068b954b7907925fd544963b578a902ba7a";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."broadway" or []);
+ deps = {
+ "cliff-0.1.9" = self.by-version."cliff"."0.1.9";
+ "eventemitter2-0.4.14" = self.by-version."eventemitter2"."0.4.14";
+ "nconf-0.6.9" = self.by-version."nconf"."0.6.9";
+ "winston-0.8.0" = self.by-version."winston"."0.8.0";
+ "utile-0.2.1" = self.by-version."utile"."0.2.1";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "broadway" ];
+ };
by-spec."browser-pack"."^3.0.0" =
self.by-version."browser-pack"."3.1.1";
by-version."browser-pack"."3.1.1" = lib.makeOverridable self.buildNodePackage {
name = "browser-pack-3.1.1";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/browser-pack/-/browser-pack-3.1.1.tgz";
@@ -1450,13 +1537,13 @@
];
buildInputs =
(self.nativeDeps."browser-pack" or []);
- deps = [
- self.by-version."JSONStream"."0.8.4"
- self.by-version."combine-source-map"."0.3.0"
- self.by-version."concat-stream"."1.4.6"
- self.by-version."through2"."0.5.1"
- self.by-version."umd"."2.1.0"
- ];
+ deps = {
+ "JSONStream-0.8.4" = self.by-version."JSONStream"."0.8.4";
+ "combine-source-map-0.3.0" = self.by-version."combine-source-map"."0.3.0";
+ "concat-stream-1.4.6" = self.by-version."concat-stream"."1.4.6";
+ "through2-0.5.1" = self.by-version."through2"."0.5.1";
+ "umd-2.1.0" = self.by-version."umd"."2.1.0";
+ };
peerDependencies = [
];
passthru.names = [ "browser-pack" ];
@@ -1464,7 +1551,8 @@
by-spec."browser-resolve"."^1.3.0" =
self.by-version."browser-resolve"."1.3.2";
by-version."browser-resolve"."1.3.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-browser-resolve-1.3.2";
+ name = "browser-resolve-1.3.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/browser-resolve/-/browser-resolve-1.3.2.tgz";
@@ -1474,9 +1562,9 @@
];
buildInputs =
(self.nativeDeps."browser-resolve" or []);
- deps = [
- self.by-version."resolve"."0.7.4"
- ];
+ deps = {
+ "resolve-0.7.4" = self.by-version."resolve"."0.7.4";
+ };
peerDependencies = [
];
passthru.names = [ "browser-resolve" ];
@@ -1486,7 +1574,8 @@
by-spec."browserchannel"."*" =
self.by-version."browserchannel"."2.0.0";
by-version."browserchannel"."2.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-browserchannel-2.0.0";
+ name = "browserchannel-2.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/browserchannel/-/browserchannel-2.0.0.tgz";
@@ -1496,91 +1585,93 @@
];
buildInputs =
(self.nativeDeps."browserchannel" or []);
- deps = [
- self.by-version."hat"."0.0.3"
- self.by-version."connect"."2.25.7"
- self.by-version."request"."2.40.0"
- self.by-version."ascii-json"."0.2.0"
- ];
+ deps = {
+ "hat-0.0.3" = self.by-version."hat"."0.0.3";
+ "connect-2.26.4" = self.by-version."connect"."2.26.4";
+ "request-2.44.0" = self.by-version."request"."2.44.0";
+ "ascii-json-0.2.0" = self.by-version."ascii-json"."0.2.0";
+ };
peerDependencies = [
];
passthru.names = [ "browserchannel" ];
};
"browserchannel" = self.by-version."browserchannel"."2.0.0";
by-spec."browserify"."*" =
- self.by-version."browserify"."5.10.1";
- by-version."browserify"."5.10.1" = lib.makeOverridable self.buildNodePackage {
- name = "browserify-5.10.1";
+ self.by-version."browserify"."5.12.1";
+ by-version."browserify"."5.12.1" = lib.makeOverridable self.buildNodePackage {
+ name = "browserify-5.12.1";
+ bin = true;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/browserify/-/browserify-5.10.1.tgz";
- name = "browserify-5.10.1.tgz";
- sha1 = "a79cc8b647d6bfe25f96434ff8ecaeb5c01f6bae";
+ url = "http://registry.npmjs.org/browserify/-/browserify-5.12.1.tgz";
+ name = "browserify-5.12.1.tgz";
+ sha1 = "54181cf6e777ad59e0fc62a62e2c7867d31603fb";
})
];
buildInputs =
(self.nativeDeps."browserify" or []);
- deps = [
- self.by-version."JSONStream"."0.8.4"
- self.by-version."assert"."1.1.1"
- self.by-version."browser-pack"."3.1.1"
- self.by-version."browser-resolve"."1.3.2"
- self.by-version."browserify-zlib"."0.1.4"
- self.by-version."buffer"."2.5.0"
- self.by-version."builtins"."0.0.5"
- self.by-version."commondir"."0.0.1"
- self.by-version."concat-stream"."1.4.6"
- self.by-version."console-browserify"."1.1.0"
- self.by-version."constants-browserify"."0.0.1"
- self.by-version."crypto-browserify"."3.0.1"
- self.by-version."deep-equal"."0.2.1"
- self.by-version."defined"."0.0.0"
- self.by-version."deps-sort"."1.3.5"
- self.by-version."domain-browser"."1.1.2"
- self.by-version."duplexer2"."0.0.2"
- self.by-version."events"."1.0.1"
- self.by-version."glob"."4.0.5"
- self.by-version."http-browserify"."1.5.0"
- self.by-version."https-browserify"."0.0.0"
- self.by-version."inherits"."2.0.1"
- self.by-version."insert-module-globals"."6.1.0"
- self.by-version."isarray"."0.0.1"
- self.by-version."labeled-stream-splicer"."1.0.0"
- self.by-version."module-deps"."3.5.5"
- self.by-version."os-browserify"."0.1.2"
- self.by-version."parents"."0.0.3"
- self.by-version."path-browserify"."0.0.0"
- self.by-version."process"."0.7.0"
- self.by-version."punycode"."1.2.4"
- self.by-version."querystring-es3"."0.2.1-0"
- self.by-version."readable-stream"."1.1.13"
- self.by-version."resolve"."0.7.4"
- self.by-version."shallow-copy"."0.0.1"
- self.by-version."shasum"."1.0.0"
- self.by-version."shell-quote"."0.0.1"
- self.by-version."stream-browserify"."1.0.0"
- self.by-version."stream-combiner"."0.0.4"
- self.by-version."string_decoder"."0.0.1"
- self.by-version."subarg"."0.0.1"
- self.by-version."syntax-error"."1.1.1"
- self.by-version."through2"."1.1.1"
- self.by-version."timers-browserify"."1.0.3"
- self.by-version."tty-browserify"."0.0.0"
- self.by-version."umd"."2.1.0"
- self.by-version."url"."0.10.1"
- self.by-version."util"."0.10.3"
- self.by-version."vm-browserify"."0.0.4"
- self.by-version."xtend"."3.0.0"
- ];
+ deps = {
+ "JSONStream-0.8.4" = self.by-version."JSONStream"."0.8.4";
+ "assert-1.1.2" = self.by-version."assert"."1.1.2";
+ "browser-pack-3.1.1" = self.by-version."browser-pack"."3.1.1";
+ "browser-resolve-1.3.2" = self.by-version."browser-resolve"."1.3.2";
+ "browserify-zlib-0.1.4" = self.by-version."browserify-zlib"."0.1.4";
+ "buffer-2.7.0" = self.by-version."buffer"."2.7.0";
+ "builtins-0.0.7" = self.by-version."builtins"."0.0.7";
+ "commondir-0.0.1" = self.by-version."commondir"."0.0.1";
+ "concat-stream-1.4.6" = self.by-version."concat-stream"."1.4.6";
+ "console-browserify-1.1.0" = self.by-version."console-browserify"."1.1.0";
+ "constants-browserify-0.0.1" = self.by-version."constants-browserify"."0.0.1";
+ "crypto-browserify-3.2.5" = self.by-version."crypto-browserify"."3.2.5";
+ "deep-equal-0.2.1" = self.by-version."deep-equal"."0.2.1";
+ "defined-0.0.0" = self.by-version."defined"."0.0.0";
+ "deps-sort-1.3.5" = self.by-version."deps-sort"."1.3.5";
+ "domain-browser-1.1.2" = self.by-version."domain-browser"."1.1.2";
+ "duplexer2-0.0.2" = self.by-version."duplexer2"."0.0.2";
+ "events-1.0.2" = self.by-version."events"."1.0.2";
+ "glob-4.0.6" = self.by-version."glob"."4.0.6";
+ "http-browserify-1.7.0" = self.by-version."http-browserify"."1.7.0";
+ "https-browserify-0.0.0" = self.by-version."https-browserify"."0.0.0";
+ "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+ "insert-module-globals-6.1.0" = self.by-version."insert-module-globals"."6.1.0";
+ "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
+ "labeled-stream-splicer-1.0.0" = self.by-version."labeled-stream-splicer"."1.0.0";
+ "module-deps-3.5.6" = self.by-version."module-deps"."3.5.6";
+ "os-browserify-0.1.2" = self.by-version."os-browserify"."0.1.2";
+ "parents-0.0.3" = self.by-version."parents"."0.0.3";
+ "path-browserify-0.0.0" = self.by-version."path-browserify"."0.0.0";
+ "process-0.7.0" = self.by-version."process"."0.7.0";
+ "punycode-1.2.4" = self.by-version."punycode"."1.2.4";
+ "querystring-es3-0.2.1-0" = self.by-version."querystring-es3"."0.2.1-0";
+ "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+ "resolve-0.7.4" = self.by-version."resolve"."0.7.4";
+ "shallow-copy-0.0.1" = self.by-version."shallow-copy"."0.0.1";
+ "shasum-1.0.0" = self.by-version."shasum"."1.0.0";
+ "shell-quote-0.0.1" = self.by-version."shell-quote"."0.0.1";
+ "stream-browserify-1.0.0" = self.by-version."stream-browserify"."1.0.0";
+ "stream-combiner-0.0.4" = self.by-version."stream-combiner"."0.0.4";
+ "string_decoder-0.0.1" = self.by-version."string_decoder"."0.0.1";
+ "subarg-0.0.1" = self.by-version."subarg"."0.0.1";
+ "syntax-error-1.1.1" = self.by-version."syntax-error"."1.1.1";
+ "through2-1.1.1" = self.by-version."through2"."1.1.1";
+ "timers-browserify-1.1.0" = self.by-version."timers-browserify"."1.1.0";
+ "tty-browserify-0.0.0" = self.by-version."tty-browserify"."0.0.0";
+ "umd-2.1.0" = self.by-version."umd"."2.1.0";
+ "url-0.10.1" = self.by-version."url"."0.10.1";
+ "util-0.10.3" = self.by-version."util"."0.10.3";
+ "vm-browserify-0.0.4" = self.by-version."vm-browserify"."0.0.4";
+ "xtend-3.0.0" = self.by-version."xtend"."3.0.0";
+ };
peerDependencies = [
];
passthru.names = [ "browserify" ];
};
- "browserify" = self.by-version."browserify"."5.10.1";
+ "browserify" = self.by-version."browserify"."5.12.1";
by-spec."browserify-zlib"."^0.1.4" =
self.by-version."browserify-zlib"."0.1.4";
by-version."browserify-zlib"."0.1.4" = lib.makeOverridable self.buildNodePackage {
- name = "node-browserify-zlib-0.1.4";
+ name = "browserify-zlib-0.1.4";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz";
@@ -1590,9 +1681,9 @@
];
buildInputs =
(self.nativeDeps."browserify-zlib" or []);
- deps = [
- self.by-version."pako"."0.2.5"
- ];
+ deps = {
+ "pako-0.2.5" = self.by-version."pako"."0.2.5";
+ };
peerDependencies = [
];
passthru.names = [ "browserify-zlib" ];
@@ -1602,7 +1693,8 @@
by-spec."bson"."0.1.8" =
self.by-version."bson"."0.1.8";
by-version."bson"."0.1.8" = lib.makeOverridable self.buildNodePackage {
- name = "node-bson-0.1.8";
+ name = "bson-0.1.8";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/bson/-/bson-0.1.8.tgz";
@@ -1612,28 +1704,29 @@
];
buildInputs =
(self.nativeDeps."bson" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "bson" ];
};
- by-spec."bson"."0.2.11" =
- self.by-version."bson"."0.2.11";
- by-version."bson"."0.2.11" = lib.makeOverridable self.buildNodePackage {
- name = "node-bson-0.2.11";
+ by-spec."bson"."0.2.12" =
+ self.by-version."bson"."0.2.12";
+ by-version."bson"."0.2.12" = lib.makeOverridable self.buildNodePackage {
+ name = "bson-0.2.12";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/bson/-/bson-0.2.11.tgz";
- name = "bson-0.2.11.tgz";
- sha1 = "7a1b9df70b36a247ada83d795e566a049f78bbb8";
+ url = "http://registry.npmjs.org/bson/-/bson-0.2.12.tgz";
+ name = "bson-0.2.12.tgz";
+ sha1 = "78bedbef1fd1f629b1c3b8d2f2d1fd87b8d64dd2";
})
];
buildInputs =
(self.nativeDeps."bson" or []);
- deps = [
- self.by-version."nan"."1.2.0"
- ];
+ deps = {
+ "nan-1.2.0" = self.by-version."nan"."1.2.0";
+ };
peerDependencies = [
];
passthru.names = [ "bson" ];
@@ -1641,7 +1734,8 @@
by-spec."bson"."0.2.2" =
self.by-version."bson"."0.2.2";
by-version."bson"."0.2.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-bson-0.2.2";
+ name = "bson-0.2.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/bson/-/bson-0.2.2.tgz";
@@ -1651,8 +1745,8 @@
];
buildInputs =
(self.nativeDeps."bson" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "bson" ];
@@ -1660,7 +1754,8 @@
by-spec."bson"."0.2.5" =
self.by-version."bson"."0.2.5";
by-version."bson"."0.2.5" = lib.makeOverridable self.buildNodePackage {
- name = "node-bson-0.2.5";
+ name = "bson-0.2.5";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/bson/-/bson-0.2.5.tgz";
@@ -1670,70 +1765,52 @@
];
buildInputs =
(self.nativeDeps."bson" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "bson" ];
};
- by-spec."bson"."0.2.9" =
- self.by-version."bson"."0.2.9";
- by-version."bson"."0.2.9" = lib.makeOverridable self.buildNodePackage {
- name = "node-bson-0.2.9";
+ by-spec."bson"."~0.2" =
+ self.by-version."bson"."0.2.15";
+ by-version."bson"."0.2.15" = lib.makeOverridable self.buildNodePackage {
+ name = "bson-0.2.15";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/bson/-/bson-0.2.9.tgz";
- name = "bson-0.2.9.tgz";
- sha1 = "ee3716a52c985ff3074b6ece3257c75ee12f3a05";
+ url = "http://registry.npmjs.org/bson/-/bson-0.2.15.tgz";
+ name = "bson-0.2.15.tgz";
+ sha1 = "556402c74bf33d8008122cc3091dc8b3b90e330c";
})
];
buildInputs =
(self.nativeDeps."bson" or []);
- deps = [
- self.by-version."nan"."1.0.0"
- ];
+ deps = {
+ "nan-1.3.0" = self.by-version."nan"."1.3.0";
+ };
peerDependencies = [
];
passthru.names = [ "bson" ];
};
by-spec."buffer"."^2.3.0" =
- self.by-version."buffer"."2.5.0";
- by-version."buffer"."2.5.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-buffer-2.5.0";
+ self.by-version."buffer"."2.7.0";
+ by-version."buffer"."2.7.0" = lib.makeOverridable self.buildNodePackage {
+ name = "buffer-2.7.0";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/buffer/-/buffer-2.5.0.tgz";
- name = "buffer-2.5.0.tgz";
- sha1 = "ee451ce8cd122dc922027674338dcef9e0eadd9a";
+ url = "http://registry.npmjs.org/buffer/-/buffer-2.7.0.tgz";
+ name = "buffer-2.7.0.tgz";
+ sha1 = "02dfe9655c097f63e03c1b1714ca6e3d83d87bb2";
})
];
buildInputs =
(self.nativeDeps."buffer" or []);
- deps = [
- self.by-version."base64-js"."0.0.7"
- self.by-version."ieee754"."1.1.3"
- ];
- peerDependencies = [
- ];
- passthru.names = [ "buffer" ];
- };
- by-spec."buffer"."~2.3.2" =
- self.by-version."buffer"."2.3.4";
- by-version."buffer"."2.3.4" = lib.makeOverridable self.buildNodePackage {
- name = "node-buffer-2.3.4";
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/buffer/-/buffer-2.3.4.tgz";
- name = "buffer-2.3.4.tgz";
- sha1 = "7e4af5a23c15e13fcbfd5c5a1ec974cb61668a4c";
- })
- ];
- buildInputs =
- (self.nativeDeps."buffer" or []);
- deps = [
- self.by-version."base64-js"."0.0.7"
- self.by-version."ieee754"."1.1.3"
- ];
+ deps = {
+ "base64-js-0.0.7" = self.by-version."base64-js"."0.0.7";
+ "ieee754-1.1.4" = self.by-version."ieee754"."1.1.4";
+ "is-array-1.0.1" = self.by-version."is-array"."1.0.1";
+ };
peerDependencies = [
];
passthru.names = [ "buffer" ];
@@ -1741,7 +1818,8 @@
by-spec."buffer-crc32"."0.1.1" =
self.by-version."buffer-crc32"."0.1.1";
by-version."buffer-crc32"."0.1.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-buffer-crc32-0.1.1";
+ name = "buffer-crc32-0.1.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.1.1.tgz";
@@ -1751,8 +1829,8 @@
];
buildInputs =
(self.nativeDeps."buffer-crc32" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "buffer-crc32" ];
@@ -1760,7 +1838,8 @@
by-spec."buffer-crc32"."0.2.1" =
self.by-version."buffer-crc32"."0.2.1";
by-version."buffer-crc32"."0.2.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-buffer-crc32-0.2.1";
+ name = "buffer-crc32-0.2.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.1.tgz";
@@ -1770,8 +1849,8 @@
];
buildInputs =
(self.nativeDeps."buffer-crc32" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "buffer-crc32" ];
@@ -1779,7 +1858,8 @@
by-spec."buffer-crc32"."0.2.3" =
self.by-version."buffer-crc32"."0.2.3";
by-version."buffer-crc32"."0.2.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-buffer-crc32-0.2.3";
+ name = "buffer-crc32-0.2.3";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.3.tgz";
@@ -1789,8 +1869,8 @@
];
buildInputs =
(self.nativeDeps."buffer-crc32" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "buffer-crc32" ];
@@ -1800,7 +1880,8 @@
by-spec."buffertools"."*" =
self.by-version."buffertools"."2.1.2";
by-version."buffertools"."2.1.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-buffertools-2.1.2";
+ name = "buffertools-2.1.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/buffertools/-/buffertools-2.1.2.tgz";
@@ -1810,8 +1891,8 @@
];
buildInputs =
(self.nativeDeps."buffertools" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "buffertools" ];
@@ -1820,7 +1901,8 @@
by-spec."buffertools".">=1.1.1 <2.0.0" =
self.by-version."buffertools"."1.1.1";
by-version."buffertools"."1.1.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-buffertools-1.1.1";
+ name = "buffertools-1.1.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/buffertools/-/buffertools-1.1.1.tgz";
@@ -1830,27 +1912,28 @@
];
buildInputs =
(self.nativeDeps."buffertools" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "buffertools" ];
};
by-spec."builtins"."~0.0.3" =
- self.by-version."builtins"."0.0.5";
- by-version."builtins"."0.0.5" = lib.makeOverridable self.buildNodePackage {
- name = "node-builtins-0.0.5";
+ self.by-version."builtins"."0.0.7";
+ by-version."builtins"."0.0.7" = lib.makeOverridable self.buildNodePackage {
+ name = "builtins-0.0.7";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/builtins/-/builtins-0.0.5.tgz";
- name = "builtins-0.0.5.tgz";
- sha1 = "86dd881f9862856e62fd7ed7767b438c4d79b7ab";
+ url = "http://registry.npmjs.org/builtins/-/builtins-0.0.7.tgz";
+ name = "builtins-0.0.7.tgz";
+ sha1 = "355219cd6cf18dbe7c01cc7fd2dce765cfdc549a";
})
];
buildInputs =
(self.nativeDeps."builtins" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "builtins" ];
@@ -1859,6 +1942,7 @@
self.by-version."bunyan"."0.21.1";
by-version."bunyan"."0.21.1" = lib.makeOverridable self.buildNodePackage {
name = "bunyan-0.21.1";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/bunyan/-/bunyan-0.21.1.tgz";
@@ -1868,10 +1952,10 @@
];
buildInputs =
(self.nativeDeps."bunyan" or []);
- deps = [
- self.by-version."mv"."0.0.5"
- self.by-version."dtrace-provider"."0.2.8"
- ];
+ deps = {
+ "mv-0.0.5" = self.by-version."mv"."0.0.5";
+ "dtrace-provider-0.2.8" = self.by-version."dtrace-provider"."0.2.8";
+ };
peerDependencies = [
];
passthru.names = [ "bunyan" ];
@@ -1879,7 +1963,8 @@
by-spec."bytes"."0.1.0" =
self.by-version."bytes"."0.1.0";
by-version."bytes"."0.1.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-bytes-0.1.0";
+ name = "bytes-0.1.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/bytes/-/bytes-0.1.0.tgz";
@@ -1889,8 +1974,8 @@
];
buildInputs =
(self.nativeDeps."bytes" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "bytes" ];
@@ -1898,7 +1983,8 @@
by-spec."bytes"."0.2.0" =
self.by-version."bytes"."0.2.0";
by-version."bytes"."0.2.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-bytes-0.2.0";
+ name = "bytes-0.2.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/bytes/-/bytes-0.2.0.tgz";
@@ -1908,8 +1994,8 @@
];
buildInputs =
(self.nativeDeps."bytes" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "bytes" ];
@@ -1917,7 +2003,8 @@
by-spec."bytes"."0.2.1" =
self.by-version."bytes"."0.2.1";
by-version."bytes"."0.2.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-bytes-0.2.1";
+ name = "bytes-0.2.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/bytes/-/bytes-0.2.1.tgz";
@@ -1927,8 +2014,8 @@
];
buildInputs =
(self.nativeDeps."bytes" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "bytes" ];
@@ -1936,7 +2023,8 @@
by-spec."bytes"."1" =
self.by-version."bytes"."1.0.0";
by-version."bytes"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-bytes-1.0.0";
+ name = "bytes-1.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz";
@@ -1946,8 +2034,8 @@
];
buildInputs =
(self.nativeDeps."bytes" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "bytes" ];
@@ -1959,7 +2047,8 @@
by-spec."callsite"."~1.0.0" =
self.by-version."callsite"."1.0.0";
by-version."callsite"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-callsite-1.0.0";
+ name = "callsite-1.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz";
@@ -1969,38 +2058,60 @@
];
buildInputs =
(self.nativeDeps."callsite" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "callsite" ];
};
- by-spec."chai"."*" =
- self.by-version."chai"."1.9.1";
- by-version."chai"."1.9.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-chai-1.9.1";
+ by-spec."caseless"."~0.6.0" =
+ self.by-version."caseless"."0.6.0";
+ by-version."caseless"."0.6.0" = lib.makeOverridable self.buildNodePackage {
+ name = "caseless-0.6.0";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/chai/-/chai-1.9.1.tgz";
- name = "chai-1.9.1.tgz";
- sha1 = "3711bb6706e1568f34c0b36098bf8f19455c81ae";
+ url = "http://registry.npmjs.org/caseless/-/caseless-0.6.0.tgz";
+ name = "caseless-0.6.0.tgz";
+ sha1 = "8167c1ab8397fb5bb95f96d28e5a81c50f247ac4";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."caseless" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "caseless" ];
+ };
+ by-spec."chai"."*" =
+ self.by-version."chai"."1.9.2";
+ by-version."chai"."1.9.2" = lib.makeOverridable self.buildNodePackage {
+ name = "chai-1.9.2";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/chai/-/chai-1.9.2.tgz";
+ name = "chai-1.9.2.tgz";
+ sha1 = "3f1a20f82b0b9d7437577d24d6f12b1a69d3b590";
})
];
buildInputs =
(self.nativeDeps."chai" or []);
- deps = [
- self.by-version."assertion-error"."1.0.0"
- self.by-version."deep-eql"."0.1.3"
- ];
+ deps = {
+ "assertion-error-1.0.0" = self.by-version."assertion-error"."1.0.0";
+ "deep-eql-0.1.3" = self.by-version."deep-eql"."0.1.3";
+ };
peerDependencies = [
];
passthru.names = [ "chai" ];
};
- "chai" = self.by-version."chai"."1.9.1";
+ "chai" = self.by-version."chai"."1.9.2";
by-spec."chalk"."^0.4.0" =
self.by-version."chalk"."0.4.0";
by-version."chalk"."0.4.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-chalk-0.4.0";
+ name = "chalk-0.4.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz";
@@ -2010,11 +2121,11 @@
];
buildInputs =
(self.nativeDeps."chalk" or []);
- deps = [
- self.by-version."has-color"."0.1.7"
- self.by-version."ansi-styles"."1.0.0"
- self.by-version."strip-ansi"."0.1.1"
- ];
+ deps = {
+ "has-color-0.1.7" = self.by-version."has-color"."0.1.7";
+ "ansi-styles-1.0.0" = self.by-version."ansi-styles"."1.0.0";
+ "strip-ansi-0.1.1" = self.by-version."strip-ansi"."0.1.1";
+ };
peerDependencies = [
];
passthru.names = [ "chalk" ];
@@ -2022,7 +2133,8 @@
by-spec."chalk"."^0.5.0" =
self.by-version."chalk"."0.5.1";
by-version."chalk"."0.5.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-chalk-0.5.1";
+ name = "chalk-0.5.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz";
@@ -2032,13 +2144,13 @@
];
buildInputs =
(self.nativeDeps."chalk" or []);
- deps = [
- self.by-version."ansi-styles"."1.1.0"
- self.by-version."escape-string-regexp"."1.0.1"
- self.by-version."has-ansi"."0.1.0"
- self.by-version."strip-ansi"."0.3.0"
- self.by-version."supports-color"."0.2.0"
- ];
+ deps = {
+ "ansi-styles-1.1.0" = self.by-version."ansi-styles"."1.1.0";
+ "escape-string-regexp-1.0.2" = self.by-version."escape-string-regexp"."1.0.2";
+ "has-ansi-0.1.0" = self.by-version."has-ansi"."0.1.0";
+ "strip-ansi-0.3.0" = self.by-version."strip-ansi"."0.3.0";
+ "supports-color-0.2.0" = self.by-version."supports-color"."0.2.0";
+ };
peerDependencies = [
];
passthru.names = [ "chalk" ];
@@ -2050,7 +2162,8 @@
by-spec."char-spinner"."~1.0.1" =
self.by-version."char-spinner"."1.0.1";
by-version."char-spinner"."1.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-char-spinner-1.0.1";
+ name = "char-spinner-1.0.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/char-spinner/-/char-spinner-1.0.1.tgz";
@@ -2060,8 +2173,8 @@
];
buildInputs =
(self.nativeDeps."char-spinner" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "char-spinner" ];
@@ -2069,7 +2182,8 @@
by-spec."character-parser"."1.2.0" =
self.by-version."character-parser"."1.2.0";
by-version."character-parser"."1.2.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-character-parser-1.2.0";
+ name = "character-parser-1.2.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/character-parser/-/character-parser-1.2.0.tgz";
@@ -2079,8 +2193,8 @@
];
buildInputs =
(self.nativeDeps."character-parser" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "character-parser" ];
@@ -2088,7 +2202,8 @@
by-spec."child-process-close"."~0.1.1" =
self.by-version."child-process-close"."0.1.1";
by-version."child-process-close"."0.1.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-child-process-close-0.1.1";
+ name = "child-process-close-0.1.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/child-process-close/-/child-process-close-0.1.1.tgz";
@@ -2098,8 +2213,8 @@
];
buildInputs =
(self.nativeDeps."child-process-close" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "child-process-close" ];
@@ -2107,7 +2222,8 @@
by-spec."chmodr"."~0.1.0" =
self.by-version."chmodr"."0.1.0";
by-version."chmodr"."0.1.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-chmodr-0.1.0";
+ name = "chmodr-0.1.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/chmodr/-/chmodr-0.1.0.tgz";
@@ -2117,29 +2233,30 @@
];
buildInputs =
(self.nativeDeps."chmodr" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "chmodr" ];
};
by-spec."chokidar".">=0.8.2" =
- self.by-version."chokidar"."0.8.4";
- by-version."chokidar"."0.8.4" = lib.makeOverridable self.buildNodePackage {
- name = "node-chokidar-0.8.4";
+ self.by-version."chokidar"."0.9.0";
+ by-version."chokidar"."0.9.0" = lib.makeOverridable self.buildNodePackage {
+ name = "chokidar-0.9.0";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/chokidar/-/chokidar-0.8.4.tgz";
- name = "chokidar-0.8.4.tgz";
- sha1 = "3b2b5066817086534ba81a092bdcf4be25b8bee0";
+ url = "http://registry.npmjs.org/chokidar/-/chokidar-0.9.0.tgz";
+ name = "chokidar-0.9.0.tgz";
+ sha1 = "c1ae41561dbdb89dd5fac615453d20b48a946c2f";
})
];
buildInputs =
(self.nativeDeps."chokidar" or []);
- deps = [
- self.by-version."fsevents"."0.2.1"
- self.by-version."recursive-readdir"."0.0.2"
- ];
+ deps = {
+ "fsevents-0.3.0" = self.by-version."fsevents"."0.3.0";
+ "recursive-readdir-0.0.2" = self.by-version."recursive-readdir"."0.0.2";
+ };
peerDependencies = [
];
passthru.names = [ "chokidar" ];
@@ -2147,7 +2264,8 @@
by-spec."chownr"."0" =
self.by-version."chownr"."0.0.1";
by-version."chownr"."0.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-chownr-0.0.1";
+ name = "chownr-0.0.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/chownr/-/chownr-0.0.1.tgz";
@@ -2157,69 +2275,53 @@
];
buildInputs =
(self.nativeDeps."chownr" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "chownr" ];
};
- by-spec."clean-css"."2.1.x" =
- self.by-version."clean-css"."2.1.8";
- by-version."clean-css"."2.1.8" = lib.makeOverridable self.buildNodePackage {
- name = "clean-css-2.1.8";
+ by-spec."clean-css"."2.2.x" =
+ self.by-version."clean-css"."2.2.16";
+ by-version."clean-css"."2.2.16" = lib.makeOverridable self.buildNodePackage {
+ name = "clean-css-2.2.16";
+ bin = true;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/clean-css/-/clean-css-2.1.8.tgz";
- name = "clean-css-2.1.8.tgz";
- sha1 = "2b4b2fd60f32441096216ae25a21faa74580dc83";
+ url = "http://registry.npmjs.org/clean-css/-/clean-css-2.2.16.tgz";
+ name = "clean-css-2.2.16.tgz";
+ sha1 = "a79f4fbd6bb8652c4d1668b44406172f180d0283";
})
];
buildInputs =
(self.nativeDeps."clean-css" or []);
- deps = [
- self.by-version."commander"."2.1.0"
- ];
+ deps = {
+ "commander-2.2.0" = self.by-version."commander"."2.2.0";
+ };
peerDependencies = [
];
passthru.names = [ "clean-css" ];
};
by-spec."clean-css"."~2.2.0" =
- self.by-version."clean-css"."2.2.13";
- by-version."clean-css"."2.2.13" = lib.makeOverridable self.buildNodePackage {
- name = "clean-css-2.2.13";
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/clean-css/-/clean-css-2.2.13.tgz";
- name = "clean-css-2.2.13.tgz";
- sha1 = "c63aba2723a410f79ed7b34ff163aaa627bc2362";
- })
- ];
- buildInputs =
- (self.nativeDeps."clean-css" or []);
- deps = [
- self.by-version."commander"."2.2.0"
- ];
- peerDependencies = [
- ];
- passthru.names = [ "clean-css" ];
- };
+ self.by-version."clean-css"."2.2.16";
by-spec."cli"."0.6.x" =
- self.by-version."cli"."0.6.3";
- by-version."cli"."0.6.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-cli-0.6.3";
+ self.by-version."cli"."0.6.4";
+ by-version."cli"."0.6.4" = lib.makeOverridable self.buildNodePackage {
+ name = "cli-0.6.4";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/cli/-/cli-0.6.3.tgz";
- name = "cli-0.6.3.tgz";
- sha1 = "31418ed08d60a1b02cf180c6d6fee3204bfe65cd";
+ url = "http://registry.npmjs.org/cli/-/cli-0.6.4.tgz";
+ name = "cli-0.6.4.tgz";
+ sha1 = "105c4e9b29ecdbc1ee0c8e418276f62d8351f88e";
})
];
buildInputs =
(self.nativeDeps."cli" or []);
- deps = [
- self.by-version."glob"."3.2.11"
- self.by-version."exit"."0.1.2"
- ];
+ deps = {
+ "glob-3.2.11" = self.by-version."glob"."3.2.11";
+ "exit-0.1.2" = self.by-version."exit"."0.1.2";
+ };
peerDependencies = [
];
passthru.names = [ "cli" ];
@@ -2227,7 +2329,8 @@
by-spec."cliff"."0.1.8" =
self.by-version."cliff"."0.1.8";
by-version."cliff"."0.1.8" = lib.makeOverridable self.buildNodePackage {
- name = "node-cliff-0.1.8";
+ name = "cliff-0.1.8";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/cliff/-/cliff-0.1.8.tgz";
@@ -2237,11 +2340,34 @@
];
buildInputs =
(self.nativeDeps."cliff" or []);
- deps = [
- self.by-version."colors"."0.6.2"
- self.by-version."eyes"."0.1.8"
- self.by-version."winston"."0.6.2"
+ deps = {
+ "colors-0.6.2" = self.by-version."colors"."0.6.2";
+ "eyes-0.1.8" = self.by-version."eyes"."0.1.8";
+ "winston-0.6.2" = self.by-version."winston"."0.6.2";
+ };
+ peerDependencies = [
];
+ passthru.names = [ "cliff" ];
+ };
+ by-spec."cliff"."0.1.9" =
+ self.by-version."cliff"."0.1.9";
+ by-version."cliff"."0.1.9" = lib.makeOverridable self.buildNodePackage {
+ name = "cliff-0.1.9";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/cliff/-/cliff-0.1.9.tgz";
+ name = "cliff-0.1.9.tgz";
+ sha1 = "a211e09c6a3de3ba1af27d049d301250d18812bc";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."cliff" or []);
+ deps = {
+ "colors-0.6.2" = self.by-version."colors"."0.6.2";
+ "eyes-0.1.8" = self.by-version."eyes"."0.1.8";
+ "winston-0.8.0" = self.by-version."winston"."0.8.0";
+ };
peerDependencies = [
];
passthru.names = [ "cliff" ];
@@ -2249,7 +2375,8 @@
by-spec."clone"."0.1.5" =
self.by-version."clone"."0.1.5";
by-version."clone"."0.1.5" = lib.makeOverridable self.buildNodePackage {
- name = "node-clone-0.1.5";
+ name = "clone-0.1.5";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/clone/-/clone-0.1.5.tgz";
@@ -2259,8 +2386,8 @@
];
buildInputs =
(self.nativeDeps."clone" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "clone" ];
@@ -2268,7 +2395,8 @@
by-spec."clone"."0.1.6" =
self.by-version."clone"."0.1.6";
by-version."clone"."0.1.6" = lib.makeOverridable self.buildNodePackage {
- name = "node-clone-0.1.6";
+ name = "clone-0.1.6";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/clone/-/clone-0.1.6.tgz";
@@ -2278,16 +2406,37 @@
];
buildInputs =
(self.nativeDeps."clone" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "clone" ];
};
- by-spec."clone-stats"."~0.0.1" =
+ by-spec."clone"."~0.1.5" =
+ self.by-version."clone"."0.1.18";
+ by-version."clone"."0.1.18" = lib.makeOverridable self.buildNodePackage {
+ name = "clone-0.1.18";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/clone/-/clone-0.1.18.tgz";
+ name = "clone-0.1.18.tgz";
+ sha1 = "64a0d5d57eaa85a1a8af380cd1db8c7b3a895f66";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."clone" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "clone" ];
+ };
+ by-spec."clone-stats"."^0.0.1" =
self.by-version."clone-stats"."0.0.1";
by-version."clone-stats"."0.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-clone-stats-0.0.1";
+ name = "clone-stats-0.0.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz";
@@ -2297,29 +2446,32 @@
];
buildInputs =
(self.nativeDeps."clone-stats" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "clone-stats" ];
};
- by-spec."cmd-shim"."~1.1.1" =
- self.by-version."cmd-shim"."1.1.2";
- by-version."cmd-shim"."1.1.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-cmd-shim-1.1.2";
+ by-spec."clone-stats"."~0.0.1" =
+ self.by-version."clone-stats"."0.0.1";
+ by-spec."cmd-shim"."~2.0.1" =
+ self.by-version."cmd-shim"."2.0.1";
+ by-version."cmd-shim"."2.0.1" = lib.makeOverridable self.buildNodePackage {
+ name = "cmd-shim-2.0.1";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/cmd-shim/-/cmd-shim-1.1.2.tgz";
- name = "cmd-shim-1.1.2.tgz";
- sha1 = "e4f9198802e361e8eb43b591959ef4dc6cdb6754";
+ url = "http://registry.npmjs.org/cmd-shim/-/cmd-shim-2.0.1.tgz";
+ name = "cmd-shim-2.0.1.tgz";
+ sha1 = "4512a373d2391679aec51ad1d4733559e9b85d4a";
})
];
buildInputs =
(self.nativeDeps."cmd-shim" or []);
- deps = [
- self.by-version."mkdirp"."0.5.0"
- self.by-version."graceful-fs"."2.0.3"
- ];
+ deps = {
+ "graceful-fs-3.0.2" = self.by-version."graceful-fs"."3.0.2";
+ "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
+ };
peerDependencies = [
];
passthru.names = [ "cmd-shim" ];
@@ -2327,7 +2479,8 @@
by-spec."cmdln"."1.3.2" =
self.by-version."cmdln"."1.3.2";
by-version."cmdln"."1.3.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-cmdln-1.3.2";
+ name = "cmdln-1.3.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/cmdln/-/cmdln-1.3.2.tgz";
@@ -2337,60 +2490,43 @@
];
buildInputs =
(self.nativeDeps."cmdln" or []);
- deps = [
- self.by-version."assert-plus"."0.1.3"
- self.by-version."extsprintf"."1.0.2"
- self.by-version."verror"."1.3.6"
- self.by-version."dashdash"."1.3.2"
- ];
+ deps = {
+ "assert-plus-0.1.3" = self.by-version."assert-plus"."0.1.3";
+ "extsprintf-1.0.2" = self.by-version."extsprintf"."1.0.2";
+ "verror-1.3.6" = self.by-version."verror"."1.3.6";
+ "dashdash-1.3.2" = self.by-version."dashdash"."1.3.2";
+ };
peerDependencies = [
];
passthru.names = [ "cmdln" ];
};
- by-spec."co"."~3.1.0" =
- self.by-version."co"."3.1.0";
- by-version."co"."3.1.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-co-3.1.0";
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/co/-/co-3.1.0.tgz";
- name = "co-3.1.0.tgz";
- sha1 = "4ea54ea5a08938153185e15210c68d9092bc1b78";
- })
- ];
- buildInputs =
- (self.nativeDeps."co" or []);
- deps = [
- ];
- peerDependencies = [
- ];
- passthru.names = [ "co" ];
- };
by-spec."coffee-script"."*" =
- self.by-version."coffee-script"."1.7.1";
- by-version."coffee-script"."1.7.1" = lib.makeOverridable self.buildNodePackage {
- name = "coffee-script-1.7.1";
+ self.by-version."coffee-script"."1.8.0";
+ by-version."coffee-script"."1.8.0" = lib.makeOverridable self.buildNodePackage {
+ name = "coffee-script-1.8.0";
+ bin = true;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.7.1.tgz";
- name = "coffee-script-1.7.1.tgz";
- sha1 = "62996a861780c75e6d5069d13822723b73404bfc";
+ url = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.8.0.tgz";
+ name = "coffee-script-1.8.0.tgz";
+ sha1 = "9c9f1d2b4a52a000ded15b659791703648263c1d";
})
];
buildInputs =
(self.nativeDeps."coffee-script" or []);
- deps = [
- self.by-version."mkdirp"."0.3.5"
- ];
+ deps = {
+ "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
+ };
peerDependencies = [
];
passthru.names = [ "coffee-script" ];
};
- "coffee-script" = self.by-version."coffee-script"."1.7.1";
+ "coffee-script" = self.by-version."coffee-script"."1.8.0";
by-spec."coffee-script"."1.6.3" =
self.by-version."coffee-script"."1.6.3";
by-version."coffee-script"."1.6.3" = lib.makeOverridable self.buildNodePackage {
name = "coffee-script-1.6.3";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.6.3.tgz";
@@ -2400,20 +2536,21 @@
];
buildInputs =
(self.nativeDeps."coffee-script" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "coffee-script" ];
};
by-spec."coffee-script".">= 0.0.1" =
- self.by-version."coffee-script"."1.7.1";
+ self.by-version."coffee-script"."1.8.0";
by-spec."coffee-script".">=1.2.0" =
- self.by-version."coffee-script"."1.7.1";
+ self.by-version."coffee-script"."1.8.0";
by-spec."coffee-script"."~1.3.3" =
self.by-version."coffee-script"."1.3.3";
by-version."coffee-script"."1.3.3" = lib.makeOverridable self.buildNodePackage {
name = "coffee-script-1.3.3";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.3.3.tgz";
@@ -2423,8 +2560,8 @@
];
buildInputs =
(self.nativeDeps."coffee-script" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "coffee-script" ];
@@ -2433,6 +2570,7 @@
self.by-version."coffee-script-redux"."2.0.0-beta8";
by-version."coffee-script-redux"."2.0.0-beta8" = lib.makeOverridable self.buildNodePackage {
name = "coffee-script-redux-2.0.0-beta8";
+ bin = true;
src = [
(self.patchSource fetchurl {
url = "http://registry.npmjs.org/coffee-script-redux/-/coffee-script-redux-2.0.0-beta8.tgz";
@@ -2442,14 +2580,14 @@
];
buildInputs =
(self.nativeDeps."coffee-script-redux" or []);
- deps = [
- self.by-version."StringScanner"."0.0.3"
- self.by-version."nopt"."2.1.2"
- self.by-version."esmangle"."0.0.17"
- self.by-version."source-map"."0.1.11"
- self.by-version."escodegen"."0.0.28"
- self.by-version."cscodegen"."0.1.0"
- ];
+ deps = {
+ "StringScanner-0.0.3" = self.by-version."StringScanner"."0.0.3";
+ "nopt-2.1.2" = self.by-version."nopt"."2.1.2";
+ "esmangle-0.0.17" = self.by-version."esmangle"."0.0.17";
+ "source-map-0.1.11" = self.by-version."source-map"."0.1.11";
+ "escodegen-0.0.28" = self.by-version."escodegen"."0.0.28";
+ "cscodegen-0.1.0" = self.by-version."cscodegen"."0.1.0";
+ };
peerDependencies = [
];
passthru.names = [ "coffee-script-redux" ];
@@ -2457,7 +2595,8 @@
by-spec."collections".">=2.0.1 <3.0.0" =
self.by-version."collections"."2.0.1";
by-version."collections"."2.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-collections-2.0.1";
+ name = "collections-2.0.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/collections/-/collections-2.0.1.tgz";
@@ -2467,69 +2606,72 @@
];
buildInputs =
(self.nativeDeps."collections" or []);
- deps = [
- self.by-version."weak-map"."1.0.5"
- ];
+ deps = {
+ "weak-map-1.0.5" = self.by-version."weak-map"."1.0.5";
+ };
peerDependencies = [
];
passthru.names = [ "collections" ];
};
- by-spec."color"."~0.6.0" =
- self.by-version."color"."0.6.0";
- by-version."color"."0.6.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-color-0.6.0";
+ by-spec."color"."~0.7.1" =
+ self.by-version."color"."0.7.1";
+ by-version."color"."0.7.1" = lib.makeOverridable self.buildNodePackage {
+ name = "color-0.7.1";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/color/-/color-0.6.0.tgz";
- name = "color-0.6.0.tgz";
- sha1 = "53f4b27698e1fe42a19423dc092dd8ee529b4267";
+ url = "http://registry.npmjs.org/color/-/color-0.7.1.tgz";
+ name = "color-0.7.1.tgz";
+ sha1 = "a2676f19c6ccb708b7586dc98b5c6e37dc9a199c";
})
];
buildInputs =
(self.nativeDeps."color" or []);
- deps = [
- self.by-version."color-convert"."0.2.1"
- self.by-version."color-string"."0.1.3"
- ];
+ deps = {
+ "color-convert-0.5.0" = self.by-version."color-convert"."0.5.0";
+ "color-string-0.2.1" = self.by-version."color-string"."0.2.1";
+ };
peerDependencies = [
];
passthru.names = [ "color" ];
};
- by-spec."color-convert"."0.2.x" =
- self.by-version."color-convert"."0.2.1";
- by-version."color-convert"."0.2.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-color-convert-0.2.1";
+ by-spec."color-convert"."0.5.x" =
+ self.by-version."color-convert"."0.5.0";
+ by-version."color-convert"."0.5.0" = lib.makeOverridable self.buildNodePackage {
+ name = "color-convert-0.5.0";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/color-convert/-/color-convert-0.2.1.tgz";
- name = "color-convert-0.2.1.tgz";
- sha1 = "363cab23c94b31a0d64db71048b8c6a940f8c68c";
+ url = "http://registry.npmjs.org/color-convert/-/color-convert-0.5.0.tgz";
+ name = "color-convert-0.5.0.tgz";
+ sha1 = "4032cab2128c81670c7b394d77b6783f49caaaf7";
})
];
buildInputs =
(self.nativeDeps."color-convert" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "color-convert" ];
};
- by-spec."color-string"."0.1.x" =
- self.by-version."color-string"."0.1.3";
- by-version."color-string"."0.1.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-color-string-0.1.3";
+ by-spec."color-string"."0.2.x" =
+ self.by-version."color-string"."0.2.1";
+ by-version."color-string"."0.2.1" = lib.makeOverridable self.buildNodePackage {
+ name = "color-string-0.2.1";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/color-string/-/color-string-0.1.3.tgz";
- name = "color-string-0.1.3.tgz";
- sha1 = "e865d2e3e59f665c3af0de14383f6bf0705685f3";
+ url = "http://registry.npmjs.org/color-string/-/color-string-0.2.1.tgz";
+ name = "color-string-0.2.1.tgz";
+ sha1 = "2f3c1e6c1d04ddf751633b28db7fbc152055d34e";
})
];
buildInputs =
(self.nativeDeps."color-string" or []);
- deps = [
- self.by-version."color-convert"."0.2.1"
- ];
+ deps = {
+ "color-convert-0.5.0" = self.by-version."color-convert"."0.5.0";
+ };
peerDependencies = [
];
passthru.names = [ "color-string" ];
@@ -2537,7 +2679,8 @@
by-spec."colors"."0.5.x" =
self.by-version."colors"."0.5.1";
by-version."colors"."0.5.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-colors-0.5.1";
+ name = "colors-0.5.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/colors/-/colors-0.5.1.tgz";
@@ -2547,8 +2690,8 @@
];
buildInputs =
(self.nativeDeps."colors" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "colors" ];
@@ -2556,7 +2699,8 @@
by-spec."colors"."0.6.x" =
self.by-version."colors"."0.6.2";
by-version."colors"."0.6.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-colors-0.6.2";
+ name = "colors-0.6.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/colors/-/colors-0.6.2.tgz";
@@ -2566,8 +2710,8 @@
];
buildInputs =
(self.nativeDeps."colors" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "colors" ];
@@ -2576,23 +2720,24 @@
self.by-version."colors"."0.6.2";
by-spec."colors"."~0.6.2" =
self.by-version."colors"."0.6.2";
- by-spec."columnify"."~1.1.0" =
- self.by-version."columnify"."1.1.0";
- by-version."columnify"."1.1.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-columnify-1.1.0";
+ by-spec."columnify"."~1.2.1" =
+ self.by-version."columnify"."1.2.1";
+ by-version."columnify"."1.2.1" = lib.makeOverridable self.buildNodePackage {
+ name = "columnify-1.2.1";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/columnify/-/columnify-1.1.0.tgz";
- name = "columnify-1.1.0.tgz";
- sha1 = "0b908e6d4f1c80194358a1933aaf9dc49271c679";
+ url = "http://registry.npmjs.org/columnify/-/columnify-1.2.1.tgz";
+ name = "columnify-1.2.1.tgz";
+ sha1 = "921ec51c178f4126d3c07e9acecd67a55c7953e4";
})
];
buildInputs =
(self.nativeDeps."columnify" or []);
- deps = [
- self.by-version."strip-ansi"."0.2.2"
- self.by-version."wcwidth.js"."0.0.4"
- ];
+ deps = {
+ "strip-ansi-1.0.0" = self.by-version."strip-ansi"."1.0.0";
+ "wcwidth-1.0.0" = self.by-version."wcwidth"."1.0.0";
+ };
peerDependencies = [
];
passthru.names = [ "columnify" ];
@@ -2600,7 +2745,8 @@
by-spec."combine-source-map"."~0.3.0" =
self.by-version."combine-source-map"."0.3.0";
by-version."combine-source-map"."0.3.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-combine-source-map-0.3.0";
+ name = "combine-source-map-0.3.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/combine-source-map/-/combine-source-map-0.3.0.tgz";
@@ -2610,11 +2756,11 @@
];
buildInputs =
(self.nativeDeps."combine-source-map" or []);
- deps = [
- self.by-version."inline-source-map"."0.3.0"
- self.by-version."convert-source-map"."0.3.5"
- self.by-version."source-map"."0.1.38"
- ];
+ deps = {
+ "inline-source-map-0.3.0" = self.by-version."inline-source-map"."0.3.0";
+ "convert-source-map-0.3.5" = self.by-version."convert-source-map"."0.3.5";
+ "source-map-0.1.40" = self.by-version."source-map"."0.1.40";
+ };
peerDependencies = [
];
passthru.names = [ "combine-source-map" ];
@@ -2622,7 +2768,8 @@
by-spec."combined-stream"."~0.0.4" =
self.by-version."combined-stream"."0.0.5";
by-version."combined-stream"."0.0.5" = lib.makeOverridable self.buildNodePackage {
- name = "node-combined-stream-0.0.5";
+ name = "combined-stream-0.0.5";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.5.tgz";
@@ -2632,9 +2779,9 @@
];
buildInputs =
(self.nativeDeps."combined-stream" or []);
- deps = [
- self.by-version."delayed-stream"."0.0.5"
- ];
+ deps = {
+ "delayed-stream-0.0.5" = self.by-version."delayed-stream"."0.0.5";
+ };
peerDependencies = [
];
passthru.names = [ "combined-stream" ];
@@ -2642,7 +2789,8 @@
by-spec."commander"."0.6.1" =
self.by-version."commander"."0.6.1";
by-version."commander"."0.6.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-commander-0.6.1";
+ name = "commander-0.6.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/commander/-/commander-0.6.1.tgz";
@@ -2652,8 +2800,8 @@
];
buildInputs =
(self.nativeDeps."commander" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "commander" ];
@@ -2661,7 +2809,8 @@
by-spec."commander"."1.3.1" =
self.by-version."commander"."1.3.1";
by-version."commander"."1.3.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-commander-1.3.1";
+ name = "commander-1.3.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/commander/-/commander-1.3.1.tgz";
@@ -2671,9 +2820,9 @@
];
buildInputs =
(self.nativeDeps."commander" or []);
- deps = [
- self.by-version."keypress"."0.1.0"
- ];
+ deps = {
+ "keypress-0.1.0" = self.by-version."keypress"."0.1.0";
+ };
peerDependencies = [
];
passthru.names = [ "commander" ];
@@ -2681,7 +2830,8 @@
by-spec."commander"."1.3.2" =
self.by-version."commander"."1.3.2";
by-version."commander"."1.3.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-commander-1.3.2";
+ name = "commander-1.3.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/commander/-/commander-1.3.2.tgz";
@@ -2691,9 +2841,9 @@
];
buildInputs =
(self.nativeDeps."commander" or []);
- deps = [
- self.by-version."keypress"."0.1.0"
- ];
+ deps = {
+ "keypress-0.1.0" = self.by-version."keypress"."0.1.0";
+ };
peerDependencies = [
];
passthru.names = [ "commander" ];
@@ -2701,7 +2851,8 @@
by-spec."commander"."2.0.0" =
self.by-version."commander"."2.0.0";
by-version."commander"."2.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-commander-2.0.0";
+ name = "commander-2.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/commander/-/commander-2.0.0.tgz";
@@ -2711,8 +2862,8 @@
];
buildInputs =
(self.nativeDeps."commander" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "commander" ];
@@ -2720,7 +2871,8 @@
by-spec."commander"."2.1.0" =
self.by-version."commander"."2.1.0";
by-version."commander"."2.1.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-commander-2.1.0";
+ name = "commander-2.1.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/commander/-/commander-2.1.0.tgz";
@@ -2730,18 +2882,17 @@
];
buildInputs =
(self.nativeDeps."commander" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "commander" ];
};
- by-spec."commander"."2.1.x" =
- self.by-version."commander"."2.1.0";
by-spec."commander"."2.2.x" =
self.by-version."commander"."2.2.0";
by-version."commander"."2.2.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-commander-2.2.0";
+ name = "commander-2.2.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/commander/-/commander-2.2.0.tgz";
@@ -2751,8 +2902,8 @@
];
buildInputs =
(self.nativeDeps."commander" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "commander" ];
@@ -2760,7 +2911,8 @@
by-spec."commander"."2.x" =
self.by-version."commander"."2.3.0";
by-version."commander"."2.3.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-commander-2.3.0";
+ name = "commander-2.3.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/commander/-/commander-2.3.0.tgz";
@@ -2770,8 +2922,8 @@
];
buildInputs =
(self.nativeDeps."commander" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "commander" ];
@@ -2783,7 +2935,8 @@
by-spec."commondir"."0.0.1" =
self.by-version."commondir"."0.0.1";
by-version."commondir"."0.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-commondir-0.0.1";
+ name = "commondir-0.0.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/commondir/-/commondir-0.0.1.tgz";
@@ -2793,8 +2946,8 @@
];
buildInputs =
(self.nativeDeps."commondir" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "commondir" ];
@@ -2802,7 +2955,8 @@
by-spec."component-emitter"."1.1.2" =
self.by-version."component-emitter"."1.1.2";
by-version."component-emitter"."1.1.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-component-emitter-1.1.2";
+ name = "component-emitter-1.1.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz";
@@ -2812,52 +2966,78 @@
];
buildInputs =
(self.nativeDeps."component-emitter" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "component-emitter" ];
};
- by-spec."compressible"."~1.1.1" =
- self.by-version."compressible"."1.1.1";
- by-version."compressible"."1.1.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-compressible-1.1.1";
+ by-spec."compress-commons"."~0.1.0" =
+ self.by-version."compress-commons"."0.1.6";
+ by-version."compress-commons"."0.1.6" = lib.makeOverridable self.buildNodePackage {
+ name = "compress-commons-0.1.6";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/compressible/-/compressible-1.1.1.tgz";
- name = "compressible-1.1.1.tgz";
- sha1 = "23b71ea90ea6c6a66289701a918182c24d0729ef";
+ url = "http://registry.npmjs.org/compress-commons/-/compress-commons-0.1.6.tgz";
+ name = "compress-commons-0.1.6.tgz";
+ sha1 = "0c740870fde58cba516f0ac0c822e33a0b85dfa3";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."compress-commons" or []);
+ deps = {
+ "buffer-crc32-0.2.3" = self.by-version."buffer-crc32"."0.2.3";
+ "crc32-stream-0.3.1" = self.by-version."crc32-stream"."0.3.1";
+ "readable-stream-1.0.32" = self.by-version."readable-stream"."1.0.32";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "compress-commons" ];
+ };
+ by-spec."compressible"."~2.0.0" =
+ self.by-version."compressible"."2.0.0";
+ by-version."compressible"."2.0.0" = lib.makeOverridable self.buildNodePackage {
+ name = "compressible-2.0.0";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/compressible/-/compressible-2.0.0.tgz";
+ name = "compressible-2.0.0.tgz";
+ sha1 = "90086ce57102e9e2427ee945a5fb2a98dd51dfb4";
})
];
buildInputs =
(self.nativeDeps."compressible" or []);
- deps = [
- ];
+ deps = {
+ "mime-db-1.0.3" = self.by-version."mime-db"."1.0.3";
+ };
peerDependencies = [
];
passthru.names = [ "compressible" ];
};
- by-spec."compression"."~1.0.11" =
- self.by-version."compression"."1.0.11";
- by-version."compression"."1.0.11" = lib.makeOverridable self.buildNodePackage {
- name = "node-compression-1.0.11";
+ by-spec."compression"."~1.1.0" =
+ self.by-version."compression"."1.1.0";
+ by-version."compression"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+ name = "compression-1.1.0";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/compression/-/compression-1.0.11.tgz";
- name = "compression-1.0.11.tgz";
- sha1 = "69700cf1ee8963454356ac192a6e5e91e232bffb";
+ url = "http://registry.npmjs.org/compression/-/compression-1.1.0.tgz";
+ name = "compression-1.1.0.tgz";
+ sha1 = "58243eded272fc531d7c744d8e8daa7cc0b99215";
})
];
buildInputs =
(self.nativeDeps."compression" or []);
- deps = [
- self.by-version."accepts"."1.0.7"
- self.by-version."bytes"."1.0.0"
- self.by-version."compressible"."1.1.1"
- self.by-version."debug"."1.0.4"
- self.by-version."on-headers"."1.0.0"
- self.by-version."vary"."1.0.0"
- ];
+ deps = {
+ "accepts-1.1.1" = self.by-version."accepts"."1.1.1";
+ "bytes-1.0.0" = self.by-version."bytes"."1.0.0";
+ "compressible-2.0.0" = self.by-version."compressible"."2.0.0";
+ "debug-2.0.0" = self.by-version."debug"."2.0.0";
+ "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0";
+ "vary-1.0.0" = self.by-version."vary"."1.0.0";
+ };
peerDependencies = [
];
passthru.names = [ "compression" ];
@@ -2865,7 +3045,8 @@
by-spec."concat-stream"."^1.4.1" =
self.by-version."concat-stream"."1.4.6";
by-version."concat-stream"."1.4.6" = lib.makeOverridable self.buildNodePackage {
- name = "node-concat-stream-1.4.6";
+ name = "concat-stream-1.4.6";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/concat-stream/-/concat-stream-1.4.6.tgz";
@@ -2875,11 +3056,11 @@
];
buildInputs =
(self.nativeDeps."concat-stream" or []);
- deps = [
- self.by-version."inherits"."2.0.1"
- self.by-version."typedarray"."0.0.6"
- self.by-version."readable-stream"."1.1.13"
- ];
+ deps = {
+ "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+ "typedarray-0.0.6" = self.by-version."typedarray"."0.0.6";
+ "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+ };
peerDependencies = [
];
passthru.names = [ "concat-stream" ];
@@ -2891,7 +3072,8 @@
by-spec."config"."0.4.15" =
self.by-version."config"."0.4.15";
by-version."config"."0.4.15" = lib.makeOverridable self.buildNodePackage {
- name = "node-config-0.4.15";
+ name = "config-0.4.15";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/config/-/config-0.4.15.tgz";
@@ -2901,11 +3083,11 @@
];
buildInputs =
(self.nativeDeps."config" or []);
- deps = [
- self.by-version."js-yaml"."0.3.7"
- self.by-version."coffee-script"."1.7.1"
- self.by-version."vows"."0.7.0"
- ];
+ deps = {
+ "js-yaml-0.3.7" = self.by-version."js-yaml"."0.3.7";
+ "coffee-script-1.8.0" = self.by-version."coffee-script"."1.8.0";
+ "vows-0.7.0" = self.by-version."vows"."0.7.0";
+ };
peerDependencies = [
];
passthru.names = [ "config" ];
@@ -2913,7 +3095,8 @@
by-spec."config-chain"."~1.1.1" =
self.by-version."config-chain"."1.1.8";
by-version."config-chain"."1.1.8" = lib.makeOverridable self.buildNodePackage {
- name = "node-config-chain-1.1.8";
+ name = "config-chain-1.1.8";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/config-chain/-/config-chain-1.1.8.tgz";
@@ -2923,10 +3106,10 @@
];
buildInputs =
(self.nativeDeps."config-chain" or []);
- deps = [
- self.by-version."proto-list"."1.2.3"
- self.by-version."ini"."1.2.1"
- ];
+ deps = {
+ "proto-list-1.2.3" = self.by-version."proto-list"."1.2.3";
+ "ini-1.3.0" = self.by-version."ini"."1.3.0";
+ };
peerDependencies = [
];
passthru.names = [ "config-chain" ];
@@ -2936,7 +3119,8 @@
by-spec."configstore"."^0.3.0" =
self.by-version."configstore"."0.3.1";
by-version."configstore"."0.3.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-configstore-0.3.1";
+ name = "configstore-0.3.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/configstore/-/configstore-0.3.1.tgz";
@@ -2946,45 +3130,23 @@
];
buildInputs =
(self.nativeDeps."configstore" or []);
- deps = [
- self.by-version."graceful-fs"."3.0.2"
- self.by-version."js-yaml"."3.0.2"
- self.by-version."mkdirp"."0.5.0"
- self.by-version."object-assign"."0.3.1"
- self.by-version."osenv"."0.1.0"
- self.by-version."uuid"."1.4.1"
- ];
+ deps = {
+ "graceful-fs-3.0.2" = self.by-version."graceful-fs"."3.0.2";
+ "js-yaml-3.0.2" = self.by-version."js-yaml"."3.0.2";
+ "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
+ "object-assign-0.3.1" = self.by-version."object-assign"."0.3.1";
+ "osenv-0.1.0" = self.by-version."osenv"."0.1.0";
+ "uuid-1.4.2" = self.by-version."uuid"."1.4.2";
+ };
peerDependencies = [
];
passthru.names = [ "configstore" ];
};
- by-spec."connect"."*" =
- self.by-version."connect"."3.1.1";
- by-version."connect"."3.1.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-connect-3.1.1";
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/connect/-/connect-3.1.1.tgz";
- name = "connect-3.1.1.tgz";
- sha1 = "a73e2449c3efc2dfd1661865977a09184d120196";
- })
- ];
- buildInputs =
- (self.nativeDeps."connect" or []);
- deps = [
- self.by-version."debug"."1.0.4"
- self.by-version."finalhandler"."0.1.0"
- self.by-version."parseurl"."1.3.0"
- self.by-version."utils-merge"."1.0.0"
- ];
- peerDependencies = [
- ];
- passthru.names = [ "connect" ];
- };
by-spec."connect"."1.x" =
self.by-version."connect"."1.9.2";
by-version."connect"."1.9.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-connect-1.9.2";
+ name = "connect-1.9.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/connect/-/connect-1.9.2.tgz";
@@ -2994,11 +3156,11 @@
];
buildInputs =
(self.nativeDeps."connect" or []);
- deps = [
- self.by-version."qs"."1.2.2"
- self.by-version."mime"."1.2.11"
- self.by-version."formidable"."1.0.15"
- ];
+ deps = {
+ "qs-2.2.4" = self.by-version."qs"."2.2.4";
+ "mime-1.2.11" = self.by-version."mime"."1.2.11";
+ "formidable-1.0.15" = self.by-version."formidable"."1.0.15";
+ };
peerDependencies = [
];
passthru.names = [ "connect" ];
@@ -3006,7 +3168,8 @@
by-spec."connect"."2.11.0" =
self.by-version."connect"."2.11.0";
by-version."connect"."2.11.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-connect-2.11.0";
+ name = "connect-2.11.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/connect/-/connect-2.11.0.tgz";
@@ -3016,70 +3179,71 @@
];
buildInputs =
(self.nativeDeps."connect" or []);
- deps = [
- self.by-version."qs"."0.6.5"
- self.by-version."cookie-signature"."1.0.1"
- self.by-version."buffer-crc32"."0.2.1"
- self.by-version."cookie"."0.1.0"
- self.by-version."send"."0.1.4"
- self.by-version."bytes"."0.2.1"
- self.by-version."fresh"."0.2.0"
- self.by-version."pause"."0.0.1"
- self.by-version."uid2"."0.0.3"
- self.by-version."debug"."1.0.4"
- self.by-version."methods"."0.0.1"
- self.by-version."raw-body"."0.0.3"
- self.by-version."negotiator"."0.3.0"
- self.by-version."multiparty"."2.2.0"
- ];
+ deps = {
+ "qs-0.6.5" = self.by-version."qs"."0.6.5";
+ "cookie-signature-1.0.1" = self.by-version."cookie-signature"."1.0.1";
+ "buffer-crc32-0.2.1" = self.by-version."buffer-crc32"."0.2.1";
+ "cookie-0.1.0" = self.by-version."cookie"."0.1.0";
+ "send-0.1.4" = self.by-version."send"."0.1.4";
+ "bytes-0.2.1" = self.by-version."bytes"."0.2.1";
+ "fresh-0.2.0" = self.by-version."fresh"."0.2.0";
+ "pause-0.0.1" = self.by-version."pause"."0.0.1";
+ "uid2-0.0.3" = self.by-version."uid2"."0.0.3";
+ "debug-2.0.0" = self.by-version."debug"."2.0.0";
+ "methods-0.0.1" = self.by-version."methods"."0.0.1";
+ "raw-body-0.0.3" = self.by-version."raw-body"."0.0.3";
+ "negotiator-0.3.0" = self.by-version."negotiator"."0.3.0";
+ "multiparty-2.2.0" = self.by-version."multiparty"."2.2.0";
+ };
peerDependencies = [
];
passthru.names = [ "connect" ];
};
- by-spec."connect"."2.25.7" =
- self.by-version."connect"."2.25.7";
- by-version."connect"."2.25.7" = lib.makeOverridable self.buildNodePackage {
- name = "node-connect-2.25.7";
+ by-spec."connect"."2.26.4" =
+ self.by-version."connect"."2.26.4";
+ by-version."connect"."2.26.4" = lib.makeOverridable self.buildNodePackage {
+ name = "connect-2.26.4";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/connect/-/connect-2.25.7.tgz";
- name = "connect-2.25.7.tgz";
- sha1 = "22a29ebf710c6379ca0e20f0974c268a15ec4d29";
+ url = "http://registry.npmjs.org/connect/-/connect-2.26.4.tgz";
+ name = "connect-2.26.4.tgz";
+ sha1 = "1ad3477cb90e590f1778ac17b51475af376bece0";
})
];
buildInputs =
(self.nativeDeps."connect" or []);
- deps = [
- self.by-version."basic-auth-connect"."1.0.0"
- self.by-version."body-parser"."1.6.5"
- self.by-version."bytes"."1.0.0"
- self.by-version."cookie"."0.1.2"
- self.by-version."cookie-parser"."1.3.2"
- self.by-version."cookie-signature"."1.0.4"
- self.by-version."compression"."1.0.11"
- self.by-version."connect-timeout"."1.2.2"
- self.by-version."csurf"."1.4.0"
- self.by-version."debug"."1.0.4"
- self.by-version."depd"."0.4.4"
- self.by-version."errorhandler"."1.1.1"
- self.by-version."express-session"."1.7.6"
- self.by-version."finalhandler"."0.1.0"
- self.by-version."fresh"."0.2.2"
- self.by-version."media-typer"."0.2.0"
- self.by-version."method-override"."2.1.3"
- self.by-version."morgan"."1.2.3"
- self.by-version."multiparty"."3.3.2"
- self.by-version."on-headers"."1.0.0"
- self.by-version."parseurl"."1.3.0"
- self.by-version."qs"."1.2.2"
- self.by-version."response-time"."2.0.1"
- self.by-version."serve-favicon"."2.0.1"
- self.by-version."serve-index"."1.1.6"
- self.by-version."serve-static"."1.5.3"
- self.by-version."type-is"."1.3.2"
- self.by-version."vhost"."2.0.0"
- self.by-version."pause"."0.0.1"
- ];
+ deps = {
+ "basic-auth-connect-1.0.0" = self.by-version."basic-auth-connect"."1.0.0";
+ "body-parser-1.8.4" = self.by-version."body-parser"."1.8.4";
+ "bytes-1.0.0" = self.by-version."bytes"."1.0.0";
+ "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
+ "cookie-parser-1.3.3" = self.by-version."cookie-parser"."1.3.3";
+ "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5";
+ "compression-1.1.0" = self.by-version."compression"."1.1.0";
+ "connect-timeout-1.3.0" = self.by-version."connect-timeout"."1.3.0";
+ "csurf-1.6.1" = self.by-version."csurf"."1.6.1";
+ "debug-2.0.0" = self.by-version."debug"."2.0.0";
+ "depd-0.4.5" = self.by-version."depd"."0.4.5";
+ "errorhandler-1.2.0" = self.by-version."errorhandler"."1.2.0";
+ "express-session-1.8.2" = self.by-version."express-session"."1.8.2";
+ "finalhandler-0.2.0" = self.by-version."finalhandler"."0.2.0";
+ "fresh-0.2.4" = self.by-version."fresh"."0.2.4";
+ "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0";
+ "method-override-2.2.0" = self.by-version."method-override"."2.2.0";
+ "morgan-1.3.2" = self.by-version."morgan"."1.3.2";
+ "multiparty-3.3.2" = self.by-version."multiparty"."3.3.2";
+ "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0";
+ "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
+ "qs-2.2.4" = self.by-version."qs"."2.2.4";
+ "response-time-2.0.1" = self.by-version."response-time"."2.0.1";
+ "serve-favicon-2.1.5" = self.by-version."serve-favicon"."2.1.5";
+ "serve-index-1.2.1" = self.by-version."serve-index"."1.2.1";
+ "serve-static-1.6.3" = self.by-version."serve-static"."1.6.3";
+ "type-is-1.5.2" = self.by-version."type-is"."1.5.2";
+ "vhost-3.0.0" = self.by-version."vhost"."3.0.0";
+ "pause-0.0.1" = self.by-version."pause"."0.0.1";
+ };
peerDependencies = [
];
passthru.names = [ "connect" ];
@@ -3087,7 +3251,8 @@
by-spec."connect"."2.3.x" =
self.by-version."connect"."2.3.9";
by-version."connect"."2.3.9" = lib.makeOverridable self.buildNodePackage {
- name = "node-connect-2.3.9";
+ name = "connect-2.3.9";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/connect/-/connect-2.3.9.tgz";
@@ -3097,16 +3262,16 @@
];
buildInputs =
(self.nativeDeps."connect" or []);
- deps = [
- self.by-version."qs"."0.4.2"
- self.by-version."formidable"."1.0.11"
- self.by-version."crc"."0.2.0"
- self.by-version."cookie"."0.0.4"
- self.by-version."bytes"."0.1.0"
- self.by-version."send"."0.0.3"
- self.by-version."fresh"."0.1.0"
- self.by-version."debug"."1.0.4"
- ];
+ deps = {
+ "qs-0.4.2" = self.by-version."qs"."0.4.2";
+ "formidable-1.0.11" = self.by-version."formidable"."1.0.11";
+ "crc-0.2.0" = self.by-version."crc"."0.2.0";
+ "cookie-0.0.4" = self.by-version."cookie"."0.0.4";
+ "bytes-0.1.0" = self.by-version."bytes"."0.1.0";
+ "send-0.0.3" = self.by-version."send"."0.0.3";
+ "fresh-0.1.0" = self.by-version."fresh"."0.1.0";
+ "debug-2.0.0" = self.by-version."debug"."2.0.0";
+ };
peerDependencies = [
];
passthru.names = [ "connect" ];
@@ -3114,7 +3279,8 @@
by-spec."connect"."2.7.5" =
self.by-version."connect"."2.7.5";
by-version."connect"."2.7.5" = lib.makeOverridable self.buildNodePackage {
- name = "node-connect-2.7.5";
+ name = "connect-2.7.5";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/connect/-/connect-2.7.5.tgz";
@@ -3124,18 +3290,18 @@
];
buildInputs =
(self.nativeDeps."connect" or []);
- deps = [
- self.by-version."qs"."0.5.1"
- self.by-version."formidable"."1.0.11"
- self.by-version."cookie-signature"."1.0.0"
- self.by-version."buffer-crc32"."0.1.1"
- self.by-version."cookie"."0.0.5"
- self.by-version."send"."0.1.0"
- self.by-version."bytes"."0.2.0"
- self.by-version."fresh"."0.1.0"
- self.by-version."pause"."0.0.1"
- self.by-version."debug"."1.0.4"
- ];
+ deps = {
+ "qs-0.5.1" = self.by-version."qs"."0.5.1";
+ "formidable-1.0.11" = self.by-version."formidable"."1.0.11";
+ "cookie-signature-1.0.0" = self.by-version."cookie-signature"."1.0.0";
+ "buffer-crc32-0.1.1" = self.by-version."buffer-crc32"."0.1.1";
+ "cookie-0.0.5" = self.by-version."cookie"."0.0.5";
+ "send-0.1.0" = self.by-version."send"."0.1.0";
+ "bytes-0.2.0" = self.by-version."bytes"."0.2.0";
+ "fresh-0.1.0" = self.by-version."fresh"."0.1.0";
+ "pause-0.0.1" = self.by-version."pause"."0.0.1";
+ "debug-2.0.0" = self.by-version."debug"."2.0.0";
+ };
peerDependencies = [
];
passthru.names = [ "connect" ];
@@ -3143,7 +3309,8 @@
by-spec."connect"."2.7.6" =
self.by-version."connect"."2.7.6";
by-version."connect"."2.7.6" = lib.makeOverridable self.buildNodePackage {
- name = "node-connect-2.7.6";
+ name = "connect-2.7.6";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/connect/-/connect-2.7.6.tgz";
@@ -3153,28 +3320,29 @@
];
buildInputs =
(self.nativeDeps."connect" or []);
- deps = [
- self.by-version."qs"."0.5.1"
- self.by-version."formidable"."1.0.11"
- self.by-version."cookie-signature"."1.0.1"
- self.by-version."buffer-crc32"."0.1.1"
- self.by-version."cookie"."0.0.5"
- self.by-version."send"."0.1.0"
- self.by-version."bytes"."0.2.0"
- self.by-version."fresh"."0.1.0"
- self.by-version."pause"."0.0.1"
- self.by-version."debug"."1.0.4"
- ];
+ deps = {
+ "qs-0.5.1" = self.by-version."qs"."0.5.1";
+ "formidable-1.0.11" = self.by-version."formidable"."1.0.11";
+ "cookie-signature-1.0.1" = self.by-version."cookie-signature"."1.0.1";
+ "buffer-crc32-0.1.1" = self.by-version."buffer-crc32"."0.1.1";
+ "cookie-0.0.5" = self.by-version."cookie"."0.0.5";
+ "send-0.1.0" = self.by-version."send"."0.1.0";
+ "bytes-0.2.0" = self.by-version."bytes"."0.2.0";
+ "fresh-0.1.0" = self.by-version."fresh"."0.1.0";
+ "pause-0.0.1" = self.by-version."pause"."0.0.1";
+ "debug-2.0.0" = self.by-version."debug"."2.0.0";
+ };
peerDependencies = [
];
passthru.names = [ "connect" ];
};
by-spec."connect"."~2" =
- self.by-version."connect"."2.25.7";
+ self.by-version."connect"."2.26.4";
by-spec."connect"."~2.12.0" =
self.by-version."connect"."2.12.0";
by-version."connect"."2.12.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-connect-2.12.0";
+ name = "connect-2.12.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/connect/-/connect-2.12.0.tgz";
@@ -3184,23 +3352,23 @@
];
buildInputs =
(self.nativeDeps."connect" or []);
- deps = [
- self.by-version."batch"."0.5.0"
- self.by-version."qs"."0.6.6"
- self.by-version."cookie-signature"."1.0.1"
- self.by-version."buffer-crc32"."0.2.1"
- self.by-version."cookie"."0.1.0"
- self.by-version."send"."0.1.4"
- self.by-version."bytes"."0.2.1"
- self.by-version."fresh"."0.2.0"
- self.by-version."pause"."0.0.1"
- self.by-version."uid2"."0.0.3"
- self.by-version."debug"."0.8.1"
- self.by-version."methods"."0.1.0"
- self.by-version."raw-body"."1.1.2"
- self.by-version."negotiator"."0.3.0"
- self.by-version."multiparty"."2.2.0"
- ];
+ deps = {
+ "batch-0.5.0" = self.by-version."batch"."0.5.0";
+ "qs-0.6.6" = self.by-version."qs"."0.6.6";
+ "cookie-signature-1.0.1" = self.by-version."cookie-signature"."1.0.1";
+ "buffer-crc32-0.2.1" = self.by-version."buffer-crc32"."0.2.1";
+ "cookie-0.1.0" = self.by-version."cookie"."0.1.0";
+ "send-0.1.4" = self.by-version."send"."0.1.4";
+ "bytes-0.2.1" = self.by-version."bytes"."0.2.1";
+ "fresh-0.2.0" = self.by-version."fresh"."0.2.0";
+ "pause-0.0.1" = self.by-version."pause"."0.0.1";
+ "uid2-0.0.3" = self.by-version."uid2"."0.0.3";
+ "debug-0.8.1" = self.by-version."debug"."0.8.1";
+ "methods-0.1.0" = self.by-version."methods"."0.1.0";
+ "raw-body-1.1.2" = self.by-version."raw-body"."1.1.2";
+ "negotiator-0.3.0" = self.by-version."negotiator"."0.3.0";
+ "multiparty-2.2.0" = self.by-version."multiparty"."2.2.0";
+ };
peerDependencies = [
];
passthru.names = [ "connect" ];
@@ -3208,7 +3376,8 @@
by-spec."connect-flash"."*" =
self.by-version."connect-flash"."0.1.1";
by-version."connect-flash"."0.1.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-connect-flash-0.1.1";
+ name = "connect-flash-0.1.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/connect-flash/-/connect-flash-0.1.1.tgz";
@@ -3218,8 +3387,8 @@
];
buildInputs =
(self.nativeDeps."connect-flash" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "connect-flash" ];
@@ -3228,7 +3397,8 @@
by-spec."connect-flash"."0.1.0" =
self.by-version."connect-flash"."0.1.0";
by-version."connect-flash"."0.1.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-connect-flash-0.1.0";
+ name = "connect-flash-0.1.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/connect-flash/-/connect-flash-0.1.0.tgz";
@@ -3238,8 +3408,8 @@
];
buildInputs =
(self.nativeDeps."connect-flash" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "connect-flash" ];
@@ -3247,7 +3417,8 @@
by-spec."connect-jade-static"."*" =
self.by-version."connect-jade-static"."0.1.3";
by-version."connect-jade-static"."0.1.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-connect-jade-static-0.1.3";
+ name = "connect-jade-static-0.1.3";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/connect-jade-static/-/connect-jade-static-0.1.3.tgz";
@@ -3257,9 +3428,9 @@
];
buildInputs =
(self.nativeDeps."connect-jade-static" or []);
- deps = [
- self.by-version."jade"."1.5.0"
- ];
+ deps = {
+ "jade-1.7.0" = self.by-version."jade"."1.7.0";
+ };
peerDependencies = [
];
passthru.names = [ "connect-jade-static" ];
@@ -3268,7 +3439,8 @@
by-spec."connect-mongo"."*" =
self.by-version."connect-mongo"."0.4.1";
by-version."connect-mongo"."0.4.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-connect-mongo-0.4.1";
+ name = "connect-mongo-0.4.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/connect-mongo/-/connect-mongo-0.4.1.tgz";
@@ -3278,32 +3450,33 @@
];
buildInputs =
(self.nativeDeps."connect-mongo" or []);
- deps = [
- self.by-version."mongodb"."1.3.23"
- ];
+ deps = {
+ "mongodb-1.3.23" = self.by-version."mongodb"."1.3.23";
+ };
peerDependencies = [
];
passthru.names = [ "connect-mongo" ];
};
"connect-mongo" = self.by-version."connect-mongo"."0.4.1";
- by-spec."connect-timeout"."~1.2.2" =
- self.by-version."connect-timeout"."1.2.2";
- by-version."connect-timeout"."1.2.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-connect-timeout-1.2.2";
+ by-spec."connect-timeout"."~1.3.0" =
+ self.by-version."connect-timeout"."1.3.0";
+ by-version."connect-timeout"."1.3.0" = lib.makeOverridable self.buildNodePackage {
+ name = "connect-timeout-1.3.0";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/connect-timeout/-/connect-timeout-1.2.2.tgz";
- name = "connect-timeout-1.2.2.tgz";
- sha1 = "5953602bb66abfd5fa21ae911a7221c5e825a1c0";
+ url = "http://registry.npmjs.org/connect-timeout/-/connect-timeout-1.3.0.tgz";
+ name = "connect-timeout-1.3.0.tgz";
+ sha1 = "d9d1d2df2900d490ed54190809f37e6b4508a1ec";
})
];
buildInputs =
(self.nativeDeps."connect-timeout" or []);
- deps = [
- self.by-version."debug"."1.0.4"
- self.by-version."ms"."0.6.2"
- self.by-version."on-headers"."1.0.0"
- ];
+ deps = {
+ "debug-2.0.0" = self.by-version."debug"."2.0.0";
+ "ms-0.6.2" = self.by-version."ms"."0.6.2";
+ "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0";
+ };
peerDependencies = [
];
passthru.names = [ "connect-timeout" ];
@@ -3311,7 +3484,8 @@
by-spec."connection-parse"."0.0.x" =
self.by-version."connection-parse"."0.0.7";
by-version."connection-parse"."0.0.7" = lib.makeOverridable self.buildNodePackage {
- name = "node-connection-parse-0.0.7";
+ name = "connection-parse-0.0.7";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/connection-parse/-/connection-parse-0.0.7.tgz";
@@ -3321,8 +3495,8 @@
];
buildInputs =
(self.nativeDeps."connection-parse" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "connection-parse" ];
@@ -3330,7 +3504,8 @@
by-spec."console-browserify"."1.1.x" =
self.by-version."console-browserify"."1.1.0";
by-version."console-browserify"."1.1.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-console-browserify-1.1.0";
+ name = "console-browserify-1.1.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz";
@@ -3340,9 +3515,9 @@
];
buildInputs =
(self.nativeDeps."console-browserify" or []);
- deps = [
- self.by-version."date-now"."0.1.4"
- ];
+ deps = {
+ "date-now-0.1.4" = self.by-version."date-now"."0.1.4";
+ };
peerDependencies = [
];
passthru.names = [ "console-browserify" ];
@@ -3352,7 +3527,8 @@
by-spec."constantinople"."~1.0.1" =
self.by-version."constantinople"."1.0.2";
by-version."constantinople"."1.0.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-constantinople-1.0.2";
+ name = "constantinople-1.0.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/constantinople/-/constantinople-1.0.2.tgz";
@@ -3362,9 +3538,9 @@
];
buildInputs =
(self.nativeDeps."constantinople" or []);
- deps = [
- self.by-version."uglify-js"."2.4.15"
- ];
+ deps = {
+ "uglify-js-2.4.15" = self.by-version."uglify-js"."2.4.15";
+ };
peerDependencies = [
];
passthru.names = [ "constantinople" ];
@@ -3374,7 +3550,8 @@
by-spec."constantinople"."~2.0.0" =
self.by-version."constantinople"."2.0.1";
by-version."constantinople"."2.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-constantinople-2.0.1";
+ name = "constantinople-2.0.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/constantinople/-/constantinople-2.0.1.tgz";
@@ -3384,9 +3561,9 @@
];
buildInputs =
(self.nativeDeps."constantinople" or []);
- deps = [
- self.by-version."uglify-js"."2.4.15"
- ];
+ deps = {
+ "uglify-js-2.4.15" = self.by-version."uglify-js"."2.4.15";
+ };
peerDependencies = [
];
passthru.names = [ "constantinople" ];
@@ -3394,7 +3571,8 @@
by-spec."constants-browserify"."~0.0.1" =
self.by-version."constants-browserify"."0.0.1";
by-version."constants-browserify"."0.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-constants-browserify-0.0.1";
+ name = "constants-browserify-0.0.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/constants-browserify/-/constants-browserify-0.0.1.tgz";
@@ -3404,8 +3582,8 @@
];
buildInputs =
(self.nativeDeps."constants-browserify" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "constants-browserify" ];
@@ -3413,7 +3591,8 @@
by-spec."convert-source-map"."~0.3.0" =
self.by-version."convert-source-map"."0.3.5";
by-version."convert-source-map"."0.3.5" = lib.makeOverridable self.buildNodePackage {
- name = "node-convert-source-map-0.3.5";
+ name = "convert-source-map-0.3.5";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz";
@@ -3423,8 +3602,8 @@
];
buildInputs =
(self.nativeDeps."convert-source-map" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "convert-source-map" ];
@@ -3432,7 +3611,8 @@
by-spec."cookie"."0.0.4" =
self.by-version."cookie"."0.0.4";
by-version."cookie"."0.0.4" = lib.makeOverridable self.buildNodePackage {
- name = "node-cookie-0.0.4";
+ name = "cookie-0.0.4";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/cookie/-/cookie-0.0.4.tgz";
@@ -3442,8 +3622,8 @@
];
buildInputs =
(self.nativeDeps."cookie" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "cookie" ];
@@ -3451,7 +3631,8 @@
by-spec."cookie"."0.0.5" =
self.by-version."cookie"."0.0.5";
by-version."cookie"."0.0.5" = lib.makeOverridable self.buildNodePackage {
- name = "node-cookie-0.0.5";
+ name = "cookie-0.0.5";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/cookie/-/cookie-0.0.5.tgz";
@@ -3461,8 +3642,8 @@
];
buildInputs =
(self.nativeDeps."cookie" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "cookie" ];
@@ -3470,7 +3651,8 @@
by-spec."cookie"."0.1.0" =
self.by-version."cookie"."0.1.0";
by-version."cookie"."0.1.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-cookie-0.1.0";
+ name = "cookie-0.1.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/cookie/-/cookie-0.1.0.tgz";
@@ -3480,8 +3662,8 @@
];
buildInputs =
(self.nativeDeps."cookie" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "cookie" ];
@@ -3489,7 +3671,8 @@
by-spec."cookie"."0.1.2" =
self.by-version."cookie"."0.1.2";
by-version."cookie"."0.1.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-cookie-0.1.2";
+ name = "cookie-0.1.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz";
@@ -3499,8 +3682,8 @@
];
buildInputs =
(self.nativeDeps."cookie" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "cookie" ];
@@ -3508,7 +3691,8 @@
by-spec."cookie-jar"."~0.2.0" =
self.by-version."cookie-jar"."0.2.0";
by-version."cookie-jar"."0.2.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-cookie-jar-0.2.0";
+ name = "cookie-jar-0.2.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/cookie-jar/-/cookie-jar-0.2.0.tgz";
@@ -3518,8 +3702,8 @@
];
buildInputs =
(self.nativeDeps."cookie-jar" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "cookie-jar" ];
@@ -3527,7 +3711,8 @@
by-spec."cookie-jar"."~0.3.0" =
self.by-version."cookie-jar"."0.3.0";
by-version."cookie-jar"."0.3.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-cookie-jar-0.3.0";
+ name = "cookie-jar-0.3.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/cookie-jar/-/cookie-jar-0.3.0.tgz";
@@ -3537,39 +3722,41 @@
];
buildInputs =
(self.nativeDeps."cookie-jar" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "cookie-jar" ];
};
- by-spec."cookie-parser"."1.3.2" =
- self.by-version."cookie-parser"."1.3.2";
- by-version."cookie-parser"."1.3.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-cookie-parser-1.3.2";
+ by-spec."cookie-parser"."~1.3.2" =
+ self.by-version."cookie-parser"."1.3.3";
+ by-version."cookie-parser"."1.3.3" = lib.makeOverridable self.buildNodePackage {
+ name = "cookie-parser-1.3.3";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/cookie-parser/-/cookie-parser-1.3.2.tgz";
- name = "cookie-parser-1.3.2.tgz";
- sha1 = "52211cc82c955d79ff0c088954407724e19cf562";
+ url = "http://registry.npmjs.org/cookie-parser/-/cookie-parser-1.3.3.tgz";
+ name = "cookie-parser-1.3.3.tgz";
+ sha1 = "7e3a2c745f4b460d5a340e578a0baa5d7725fe37";
})
];
buildInputs =
(self.nativeDeps."cookie-parser" or []);
- deps = [
- self.by-version."cookie"."0.1.2"
- self.by-version."cookie-signature"."1.0.4"
- ];
+ deps = {
+ "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
+ "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5";
+ };
peerDependencies = [
];
passthru.names = [ "cookie-parser" ];
};
- by-spec."cookie-parser"."~1.3.2" =
- self.by-version."cookie-parser"."1.3.2";
+ by-spec."cookie-parser"."~1.3.3" =
+ self.by-version."cookie-parser"."1.3.3";
by-spec."cookie-signature"."1.0.0" =
self.by-version."cookie-signature"."1.0.0";
by-version."cookie-signature"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-cookie-signature-1.0.0";
+ name = "cookie-signature-1.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.0.tgz";
@@ -3579,8 +3766,8 @@
];
buildInputs =
(self.nativeDeps."cookie-signature" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "cookie-signature" ];
@@ -3588,7 +3775,8 @@
by-spec."cookie-signature"."1.0.1" =
self.by-version."cookie-signature"."1.0.1";
by-version."cookie-signature"."1.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-cookie-signature-1.0.1";
+ name = "cookie-signature-1.0.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.1.tgz";
@@ -3598,8 +3786,8 @@
];
buildInputs =
(self.nativeDeps."cookie-signature" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "cookie-signature" ];
@@ -3607,7 +3795,8 @@
by-spec."cookie-signature"."1.0.3" =
self.by-version."cookie-signature"."1.0.3";
by-version."cookie-signature"."1.0.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-cookie-signature-1.0.3";
+ name = "cookie-signature-1.0.3";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.3.tgz";
@@ -3617,8 +3806,8 @@
];
buildInputs =
(self.nativeDeps."cookie-signature" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "cookie-signature" ];
@@ -3626,7 +3815,8 @@
by-spec."cookie-signature"."1.0.4" =
self.by-version."cookie-signature"."1.0.4";
by-version."cookie-signature"."1.0.4" = lib.makeOverridable self.buildNodePackage {
- name = "node-cookie-signature-1.0.4";
+ name = "cookie-signature-1.0.4";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.4.tgz";
@@ -3636,8 +3826,28 @@
];
buildInputs =
(self.nativeDeps."cookie-signature" or []);
- deps = [
+ deps = {
+ };
+ peerDependencies = [
];
+ passthru.names = [ "cookie-signature" ];
+ };
+ by-spec."cookie-signature"."1.0.5" =
+ self.by-version."cookie-signature"."1.0.5";
+ by-version."cookie-signature"."1.0.5" = lib.makeOverridable self.buildNodePackage {
+ name = "cookie-signature-1.0.5";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.5.tgz";
+ name = "cookie-signature-1.0.5.tgz";
+ sha1 = "a122e3f1503eca0f5355795b0711bb2368d450f9";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."cookie-signature" or []);
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "cookie-signature" ];
@@ -3645,7 +3855,8 @@
by-spec."cookiejar"."1.3.0" =
self.by-version."cookiejar"."1.3.0";
by-version."cookiejar"."1.3.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-cookiejar-1.3.0";
+ name = "cookiejar-1.3.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/cookiejar/-/cookiejar-1.3.0.tgz";
@@ -3655,27 +3866,8 @@
];
buildInputs =
(self.nativeDeps."cookiejar" or []);
- deps = [
- ];
- peerDependencies = [
- ];
- passthru.names = [ "cookiejar" ];
- };
- by-spec."cookiejar"."1.3.2" =
- self.by-version."cookiejar"."1.3.2";
- by-version."cookiejar"."1.3.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-cookiejar-1.3.2";
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/cookiejar/-/cookiejar-1.3.2.tgz";
- name = "cookiejar-1.3.2.tgz";
- sha1 = "61d3229e2da20c859032233502958a9b7df58249";
- })
- ];
- buildInputs =
- (self.nativeDeps."cookiejar" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "cookiejar" ];
@@ -3683,7 +3875,8 @@
by-spec."cookiejar"."2.0.1" =
self.by-version."cookiejar"."2.0.1";
by-version."cookiejar"."2.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-cookiejar-2.0.1";
+ name = "cookiejar-2.0.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/cookiejar/-/cookiejar-2.0.1.tgz";
@@ -3693,8 +3886,8 @@
];
buildInputs =
(self.nativeDeps."cookiejar" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "cookiejar" ];
@@ -3702,7 +3895,8 @@
by-spec."cookies".">= 0.2.2" =
self.by-version."cookies"."0.5.0";
by-version."cookies"."0.5.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-cookies-0.5.0";
+ name = "cookies-0.5.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/cookies/-/cookies-0.5.0.tgz";
@@ -3712,19 +3906,18 @@
];
buildInputs =
(self.nativeDeps."cookies" or []);
- deps = [
- self.by-version."keygrip"."1.0.1"
- ];
+ deps = {
+ "keygrip-1.0.1" = self.by-version."keygrip"."1.0.1";
+ };
peerDependencies = [
];
passthru.names = [ "cookies" ];
};
- by-spec."cookies"."~0.5.0" =
- self.by-version."cookies"."0.5.0";
by-spec."core-util-is"."~1.0.0" =
self.by-version."core-util-is"."1.0.1";
by-version."core-util-is"."1.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-core-util-is-1.0.1";
+ name = "core-util-is-1.0.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz";
@@ -3734,8 +3927,8 @@
];
buildInputs =
(self.nativeDeps."core-util-is" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "core-util-is" ];
@@ -3743,7 +3936,8 @@
by-spec."couch-login"."~0.1.15" =
self.by-version."couch-login"."0.1.20";
by-version."couch-login"."0.1.20" = lib.makeOverridable self.buildNodePackage {
- name = "node-couch-login-0.1.20";
+ name = "couch-login-0.1.20";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/couch-login/-/couch-login-0.1.20.tgz";
@@ -3753,41 +3947,43 @@
];
buildInputs =
(self.nativeDeps."couch-login" or []);
- deps = [
- self.by-version."request"."2.40.0"
- ];
+ deps = {
+ "request-2.44.0" = self.by-version."request"."2.44.0";
+ };
peerDependencies = [
];
passthru.names = [ "couch-login" ];
};
by-spec."coveralls"."*" =
- self.by-version."coveralls"."2.11.1";
- by-version."coveralls"."2.11.1" = lib.makeOverridable self.buildNodePackage {
- name = "coveralls-2.11.1";
+ self.by-version."coveralls"."2.11.2";
+ by-version."coveralls"."2.11.2" = lib.makeOverridable self.buildNodePackage {
+ name = "coveralls-2.11.2";
+ bin = true;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/coveralls/-/coveralls-2.11.1.tgz";
- name = "coveralls-2.11.1.tgz";
- sha1 = "fedc951296207cc5eb545476923e64f20cf7854d";
+ url = "http://registry.npmjs.org/coveralls/-/coveralls-2.11.2.tgz";
+ name = "coveralls-2.11.2.tgz";
+ sha1 = "d4d982016cb2f9da89d77ab204d86a8537e6a12d";
})
];
buildInputs =
(self.nativeDeps."coveralls" or []);
- deps = [
- self.by-version."js-yaml"."3.0.1"
- self.by-version."lcov-parse"."0.0.6"
- self.by-version."log-driver"."1.2.4"
- self.by-version."request"."2.36.0"
- ];
+ deps = {
+ "js-yaml-3.0.1" = self.by-version."js-yaml"."3.0.1";
+ "lcov-parse-0.0.6" = self.by-version."lcov-parse"."0.0.6";
+ "log-driver-1.2.4" = self.by-version."log-driver"."1.2.4";
+ "request-2.40.0" = self.by-version."request"."2.40.0";
+ };
peerDependencies = [
];
passthru.names = [ "coveralls" ];
};
- "coveralls" = self.by-version."coveralls"."2.11.1";
+ "coveralls" = self.by-version."coveralls"."2.11.2";
by-spec."crc"."0.2.0" =
self.by-version."crc"."0.2.0";
by-version."crc"."0.2.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-crc-0.2.0";
+ name = "crc-0.2.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/crc/-/crc-0.2.0.tgz";
@@ -3797,29 +3993,50 @@
];
buildInputs =
(self.nativeDeps."crc" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "crc" ];
};
- by-spec."crc32-stream"."~0.2.0" =
- self.by-version."crc32-stream"."0.2.0";
- by-version."crc32-stream"."0.2.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-crc32-stream-0.2.0";
+ by-spec."crc"."3.0.0" =
+ self.by-version."crc"."3.0.0";
+ by-version."crc"."3.0.0" = lib.makeOverridable self.buildNodePackage {
+ name = "crc-3.0.0";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/crc32-stream/-/crc32-stream-0.2.0.tgz";
- name = "crc32-stream-0.2.0.tgz";
- sha1 = "5c80d480c8682f904b6f15530dbbe0b8c063dbbe";
+ url = "http://registry.npmjs.org/crc/-/crc-3.0.0.tgz";
+ name = "crc-3.0.0.tgz";
+ sha1 = "d11e97ec44a844e5eb15a74fa2c7875d0aac4b22";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."crc" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "crc" ];
+ };
+ by-spec."crc32-stream"."~0.3.1" =
+ self.by-version."crc32-stream"."0.3.1";
+ by-version."crc32-stream"."0.3.1" = lib.makeOverridable self.buildNodePackage {
+ name = "crc32-stream-0.3.1";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/crc32-stream/-/crc32-stream-0.3.1.tgz";
+ name = "crc32-stream-0.3.1.tgz";
+ sha1 = "615fcf05ed08342a3d1e938041aed84430ce7837";
})
];
buildInputs =
(self.nativeDeps."crc32-stream" or []);
- deps = [
- self.by-version."readable-stream"."1.0.31"
- self.by-version."buffer-crc32"."0.2.3"
- ];
+ deps = {
+ "readable-stream-1.0.32" = self.by-version."readable-stream"."1.0.32";
+ "buffer-crc32-0.2.3" = self.by-version."buffer-crc32"."0.2.3";
+ };
peerDependencies = [
];
passthru.names = [ "crc32-stream" ];
@@ -3827,7 +4044,8 @@
by-spec."crossroads"."~0.12.0" =
self.by-version."crossroads"."0.12.0";
by-version."crossroads"."0.12.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-crossroads-0.12.0";
+ name = "crossroads-0.12.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/crossroads/-/crossroads-0.12.0.tgz";
@@ -3837,9 +4055,9 @@
];
buildInputs =
(self.nativeDeps."crossroads" or []);
- deps = [
- self.by-version."signals"."1.0.0"
- ];
+ deps = {
+ "signals-1.0.0" = self.by-version."signals"."1.0.0";
+ };
peerDependencies = [
];
passthru.names = [ "crossroads" ];
@@ -3847,7 +4065,8 @@
by-spec."cryptiles"."0.1.x" =
self.by-version."cryptiles"."0.1.3";
by-version."cryptiles"."0.1.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-cryptiles-0.1.3";
+ name = "cryptiles-0.1.3";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.1.3.tgz";
@@ -3857,9 +4076,9 @@
];
buildInputs =
(self.nativeDeps."cryptiles" or []);
- deps = [
- self.by-version."boom"."0.3.8"
- ];
+ deps = {
+ "boom-0.3.8" = self.by-version."boom"."0.3.8";
+ };
peerDependencies = [
];
passthru.names = [ "cryptiles" ];
@@ -3867,7 +4086,8 @@
by-spec."cryptiles"."0.2.x" =
self.by-version."cryptiles"."0.2.2";
by-version."cryptiles"."0.2.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-cryptiles-0.2.2";
+ name = "cryptiles-0.2.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz";
@@ -3877,9 +4097,9 @@
];
buildInputs =
(self.nativeDeps."cryptiles" or []);
- deps = [
- self.by-version."boom"."0.4.2"
- ];
+ deps = {
+ "boom-0.4.2" = self.by-version."boom"."0.4.2";
+ };
peerDependencies = [
];
passthru.names = [ "cryptiles" ];
@@ -3887,7 +4107,8 @@
by-spec."crypto"."0.0.3" =
self.by-version."crypto"."0.0.3";
by-version."crypto"."0.0.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-crypto-0.0.3";
+ name = "crypto-0.0.3";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/crypto/-/crypto-0.0.3.tgz";
@@ -3897,29 +4118,31 @@
];
buildInputs =
(self.nativeDeps."crypto" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "crypto" ];
};
by-spec."crypto-browserify"."^3.0.0" =
- self.by-version."crypto-browserify"."3.0.1";
- by-version."crypto-browserify"."3.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-crypto-browserify-3.0.1";
+ self.by-version."crypto-browserify"."3.2.5";
+ by-version."crypto-browserify"."3.2.5" = lib.makeOverridable self.buildNodePackage {
+ name = "crypto-browserify-3.2.5";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.0.1.tgz";
- name = "crypto-browserify-3.0.1.tgz";
- sha1 = "770fd68e8422f9b1e53d6812f1c2ce2ea7ab917c";
+ url = "http://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.2.5.tgz";
+ name = "crypto-browserify-3.2.5.tgz";
+ sha1 = "26c92bba20c8bfa7c50aa71ca95972b353ebbec2";
})
];
buildInputs =
(self.nativeDeps."crypto-browserify" or []);
- deps = [
- self.by-version."ripemd160"."0.2.0"
- self.by-version."sha.js"."2.1.7"
- ];
+ deps = {
+ "pbkdf2-compat-2.0.1" = self.by-version."pbkdf2-compat"."2.0.1";
+ "ripemd160-0.2.0" = self.by-version."ripemd160"."0.2.0";
+ "sha.js-2.2.6" = self.by-version."sha.js"."2.2.6";
+ };
peerDependencies = [
];
passthru.names = [ "crypto-browserify" ];
@@ -3928,6 +4151,7 @@
self.by-version."cscodegen"."0.1.0";
by-version."cscodegen"."0.1.0" = lib.makeOverridable self.buildNodePackage {
name = "cscodegen-0.1.0";
+ bin = true;
src = [
(fetchgit {
url = "git://github.com/michaelficarra/cscodegen.git";
@@ -3937,39 +4161,41 @@
];
buildInputs =
(self.nativeDeps."cscodegen" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "cscodegen" ];
};
- by-spec."csrf-tokens"."~2.0.0" =
- self.by-version."csrf-tokens"."2.0.0";
- by-version."csrf-tokens"."2.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-csrf-tokens-2.0.0";
+ by-spec."csrf"."~2.0.1" =
+ self.by-version."csrf"."2.0.1";
+ by-version."csrf"."2.0.1" = lib.makeOverridable self.buildNodePackage {
+ name = "csrf-2.0.1";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/csrf-tokens/-/csrf-tokens-2.0.0.tgz";
- name = "csrf-tokens-2.0.0.tgz";
- sha1 = "c821003fb8b6ad17bc977d6fd1a84bedc3ed619b";
+ url = "http://registry.npmjs.org/csrf/-/csrf-2.0.1.tgz";
+ name = "csrf-2.0.1.tgz";
+ sha1 = "d673a2efb4db7d0e6805dadd838c57e30ae0ee73";
})
];
buildInputs =
- (self.nativeDeps."csrf-tokens" or []);
- deps = [
- self.by-version."rndm"."1.0.0"
- self.by-version."scmp"."0.0.3"
- self.by-version."uid-safe"."1.0.1"
- self.by-version."base64-url"."1.0.0"
- ];
+ (self.nativeDeps."csrf" or []);
+ deps = {
+ "rndm-1.0.0" = self.by-version."rndm"."1.0.0";
+ "scmp-0.0.3" = self.by-version."scmp"."0.0.3";
+ "uid-safe-1.0.1" = self.by-version."uid-safe"."1.0.1";
+ "base64-url-1.0.0" = self.by-version."base64-url"."1.0.0";
+ };
peerDependencies = [
];
- passthru.names = [ "csrf-tokens" ];
+ passthru.names = [ "csrf" ];
};
by-spec."css"."~1.0.8" =
self.by-version."css"."1.0.8";
by-version."css"."1.0.8" = lib.makeOverridable self.buildNodePackage {
- name = "node-css-1.0.8";
+ name = "css-1.0.8";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/css/-/css-1.0.8.tgz";
@@ -3979,10 +4205,10 @@
];
buildInputs =
(self.nativeDeps."css" or []);
- deps = [
- self.by-version."css-parse"."1.0.4"
- self.by-version."css-stringify"."1.0.5"
- ];
+ deps = {
+ "css-parse-1.0.4" = self.by-version."css-parse"."1.0.4";
+ "css-stringify-1.0.5" = self.by-version."css-stringify"."1.0.5";
+ };
peerDependencies = [
];
passthru.names = [ "css" ];
@@ -3990,7 +4216,8 @@
by-spec."css-parse"."1.0.4" =
self.by-version."css-parse"."1.0.4";
by-version."css-parse"."1.0.4" = lib.makeOverridable self.buildNodePackage {
- name = "node-css-parse-1.0.4";
+ name = "css-parse-1.0.4";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/css-parse/-/css-parse-1.0.4.tgz";
@@ -4000,8 +4227,8 @@
];
buildInputs =
(self.nativeDeps."css-parse" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "css-parse" ];
@@ -4009,7 +4236,8 @@
by-spec."css-parse"."1.7.x" =
self.by-version."css-parse"."1.7.0";
by-version."css-parse"."1.7.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-css-parse-1.7.0";
+ name = "css-parse-1.7.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/css-parse/-/css-parse-1.7.0.tgz";
@@ -4019,8 +4247,8 @@
];
buildInputs =
(self.nativeDeps."css-parse" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "css-parse" ];
@@ -4028,7 +4256,8 @@
by-spec."css-stringify"."1.0.5" =
self.by-version."css-stringify"."1.0.5";
by-version."css-stringify"."1.0.5" = lib.makeOverridable self.buildNodePackage {
- name = "node-css-stringify-1.0.5";
+ name = "css-stringify-1.0.5";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/css-stringify/-/css-stringify-1.0.5.tgz";
@@ -4038,30 +4267,31 @@
];
buildInputs =
(self.nativeDeps."css-stringify" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "css-stringify" ];
};
- by-spec."csurf"."~1.4.0" =
- self.by-version."csurf"."1.4.0";
- by-version."csurf"."1.4.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-csurf-1.4.0";
+ by-spec."csurf"."~1.6.1" =
+ self.by-version."csurf"."1.6.1";
+ by-version."csurf"."1.6.1" = lib.makeOverridable self.buildNodePackage {
+ name = "csurf-1.6.1";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/csurf/-/csurf-1.4.0.tgz";
- name = "csurf-1.4.0.tgz";
- sha1 = "035628ab6644d7709ac9d1adc78ef05a2d576efe";
+ url = "http://registry.npmjs.org/csurf/-/csurf-1.6.1.tgz";
+ name = "csurf-1.6.1.tgz";
+ sha1 = "78da376f016bcaa48275d553d133585e478f4054";
})
];
buildInputs =
(self.nativeDeps."csurf" or []);
- deps = [
- self.by-version."cookie"."0.1.2"
- self.by-version."cookie-signature"."1.0.4"
- self.by-version."csrf-tokens"."2.0.0"
- ];
+ deps = {
+ "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
+ "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5";
+ "csrf-2.0.1" = self.by-version."csrf"."2.0.1";
+ };
peerDependencies = [
];
passthru.names = [ "csurf" ];
@@ -4069,7 +4299,8 @@
by-spec."ctype"."0.5.0" =
self.by-version."ctype"."0.5.0";
by-version."ctype"."0.5.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-ctype-0.5.0";
+ name = "ctype-0.5.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/ctype/-/ctype-0.5.0.tgz";
@@ -4079,8 +4310,8 @@
];
buildInputs =
(self.nativeDeps."ctype" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "ctype" ];
@@ -4088,7 +4319,8 @@
by-spec."ctype"."0.5.2" =
self.by-version."ctype"."0.5.2";
by-version."ctype"."0.5.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-ctype-0.5.2";
+ name = "ctype-0.5.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz";
@@ -4098,8 +4330,8 @@
];
buildInputs =
(self.nativeDeps."ctype" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "ctype" ];
@@ -4107,7 +4339,8 @@
by-spec."cycle"."1.0.x" =
self.by-version."cycle"."1.0.3";
by-version."cycle"."1.0.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-cycle-1.0.3";
+ name = "cycle-1.0.3";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz";
@@ -4117,8 +4350,8 @@
];
buildInputs =
(self.nativeDeps."cycle" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "cycle" ];
@@ -4126,7 +4359,8 @@
by-spec."dashdash"."1.3.2" =
self.by-version."dashdash"."1.3.2";
by-version."dashdash"."1.3.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-dashdash-1.3.2";
+ name = "dashdash-1.3.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/dashdash/-/dashdash-1.3.2.tgz";
@@ -4136,9 +4370,9 @@
];
buildInputs =
(self.nativeDeps."dashdash" or []);
- deps = [
- self.by-version."assert-plus"."0.1.2"
- ];
+ deps = {
+ "assert-plus-0.1.2" = self.by-version."assert-plus"."0.1.2";
+ };
peerDependencies = [
];
passthru.names = [ "dashdash" ];
@@ -4146,7 +4380,8 @@
by-spec."dashdash"."1.5.0" =
self.by-version."dashdash"."1.5.0";
by-version."dashdash"."1.5.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-dashdash-1.5.0";
+ name = "dashdash-1.5.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/dashdash/-/dashdash-1.5.0.tgz";
@@ -4156,9 +4391,9 @@
];
buildInputs =
(self.nativeDeps."dashdash" or []);
- deps = [
- self.by-version."assert-plus"."0.1.2"
- ];
+ deps = {
+ "assert-plus-0.1.2" = self.by-version."assert-plus"."0.1.2";
+ };
peerDependencies = [
];
passthru.names = [ "dashdash" ];
@@ -4166,7 +4401,8 @@
by-spec."date-now"."^0.1.4" =
self.by-version."date-now"."0.1.4";
by-version."date-now"."0.1.4" = lib.makeOverridable self.buildNodePackage {
- name = "node-date-now-0.1.4";
+ name = "date-now-0.1.4";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz";
@@ -4176,8 +4412,8 @@
];
buildInputs =
(self.nativeDeps."date-now" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "date-now" ];
@@ -4185,7 +4421,8 @@
by-spec."dateformat"."1.0.2-1.2.3" =
self.by-version."dateformat"."1.0.2-1.2.3";
by-version."dateformat"."1.0.2-1.2.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-dateformat-1.0.2-1.2.3";
+ name = "dateformat-1.0.2-1.2.3";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/dateformat/-/dateformat-1.0.2-1.2.3.tgz";
@@ -4195,47 +4432,51 @@
];
buildInputs =
(self.nativeDeps."dateformat" or []);
- deps = [
+ deps = {
+ };
+ peerDependencies = [
];
+ passthru.names = [ "dateformat" ];
+ };
+ by-spec."dateformat"."^1.0.7-1.2.3" =
+ self.by-version."dateformat"."1.0.8";
+ by-version."dateformat"."1.0.8" = lib.makeOverridable self.buildNodePackage {
+ name = "dateformat-1.0.8";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/dateformat/-/dateformat-1.0.8.tgz";
+ name = "dateformat-1.0.8.tgz";
+ sha1 = "87799a3de21bffbf028bdd7ad044981327ac0a26";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."dateformat" or []);
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "dateformat" ];
};
by-spec."dateformat"."~1.0.6" =
- self.by-version."dateformat"."1.0.8-1.2.3";
- by-version."dateformat"."1.0.8-1.2.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-dateformat-1.0.8-1.2.3";
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/dateformat/-/dateformat-1.0.8-1.2.3.tgz";
- name = "dateformat-1.0.8-1.2.3.tgz";
- sha1 = "5d60c5d574dc778a7f98139156c6cfc9d851d1e7";
- })
- ];
- buildInputs =
- (self.nativeDeps."dateformat" or []);
- deps = [
- ];
- peerDependencies = [
- ];
- passthru.names = [ "dateformat" ];
- };
+ self.by-version."dateformat"."1.0.8";
by-spec."debug"."*" =
- self.by-version."debug"."1.0.4";
- by-version."debug"."1.0.4" = lib.makeOverridable self.buildNodePackage {
- name = "node-debug-1.0.4";
+ self.by-version."debug"."2.0.0";
+ by-version."debug"."2.0.0" = lib.makeOverridable self.buildNodePackage {
+ name = "debug-2.0.0";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/debug/-/debug-1.0.4.tgz";
- name = "debug-1.0.4.tgz";
- sha1 = "5b9c256bd54b6ec02283176fa8a0ede6d154cbf8";
+ url = "http://registry.npmjs.org/debug/-/debug-2.0.0.tgz";
+ name = "debug-2.0.0.tgz";
+ sha1 = "89bd9df6732b51256bc6705342bba02ed12131ef";
})
];
buildInputs =
(self.nativeDeps."debug" or []);
- deps = [
- self.by-version."ms"."0.6.2"
- ];
+ deps = {
+ "ms-0.6.2" = self.by-version."ms"."0.6.2";
+ };
peerDependencies = [
];
passthru.names = [ "debug" ];
@@ -4243,7 +4484,8 @@
by-spec."debug"."0.5.0" =
self.by-version."debug"."0.5.0";
by-version."debug"."0.5.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-debug-0.5.0";
+ name = "debug-0.5.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/debug/-/debug-0.5.0.tgz";
@@ -4253,8 +4495,8 @@
];
buildInputs =
(self.nativeDeps."debug" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "debug" ];
@@ -4262,7 +4504,8 @@
by-spec."debug"."0.7.4" =
self.by-version."debug"."0.7.4";
by-version."debug"."0.7.4" = lib.makeOverridable self.buildNodePackage {
- name = "node-debug-0.7.4";
+ name = "debug-0.7.4";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/debug/-/debug-0.7.4.tgz";
@@ -4272,58 +4515,38 @@
];
buildInputs =
(self.nativeDeps."debug" or []);
- deps = [
- ];
- peerDependencies = [
- ];
- passthru.names = [ "debug" ];
- };
- by-spec."debug"."1.0.2" =
- self.by-version."debug"."1.0.2";
- by-version."debug"."1.0.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-debug-1.0.2";
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/debug/-/debug-1.0.2.tgz";
- name = "debug-1.0.2.tgz";
- sha1 = "3849591c10cce648476c3c7c2e2e3416db5963c4";
- })
- ];
- buildInputs =
- (self.nativeDeps."debug" or []);
- deps = [
- self.by-version."ms"."0.6.2"
- ];
- peerDependencies = [
- ];
- passthru.names = [ "debug" ];
- };
- by-spec."debug"."1.0.3" =
- self.by-version."debug"."1.0.3";
- by-version."debug"."1.0.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-debug-1.0.3";
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/debug/-/debug-1.0.3.tgz";
- name = "debug-1.0.3.tgz";
- sha1 = "fc8c6b2d6002804b4081c0208e0f6460ba1fa3e4";
- })
- ];
- buildInputs =
- (self.nativeDeps."debug" or []);
- deps = [
- self.by-version."ms"."0.6.2"
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "debug" ];
};
by-spec."debug"."1.0.4" =
self.by-version."debug"."1.0.4";
+ by-version."debug"."1.0.4" = lib.makeOverridable self.buildNodePackage {
+ name = "debug-1.0.4";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/debug/-/debug-1.0.4.tgz";
+ name = "debug-1.0.4.tgz";
+ sha1 = "5b9c256bd54b6ec02283176fa8a0ede6d154cbf8";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."debug" or []);
+ deps = {
+ "ms-0.6.2" = self.by-version."ms"."0.6.2";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "debug" ];
+ };
by-spec."debug".">= 0.7.3 < 1" =
self.by-version."debug"."0.8.1";
by-version."debug"."0.8.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-debug-0.8.1";
+ name = "debug-0.8.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/debug/-/debug-0.8.1.tgz";
@@ -4333,26 +4556,45 @@
];
buildInputs =
(self.nativeDeps."debug" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "debug" ];
};
by-spec."debug"."^1.0.2" =
self.by-version."debug"."1.0.4";
- by-spec."debug"."~0.7.2" =
- self.by-version."debug"."0.7.4";
by-spec."debug"."~0.8" =
self.by-version."debug"."0.8.1";
by-spec."debug"."~1.0.1" =
self.by-version."debug"."1.0.4";
- by-spec."debug"."~1.0.2" =
- self.by-version."debug"."1.0.4";
+ by-spec."debug"."~2.0.0" =
+ self.by-version."debug"."2.0.0";
+ by-spec."debuglog"."^1.0.1" =
+ self.by-version."debuglog"."1.0.1";
+ by-version."debuglog"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+ name = "debuglog-1.0.1";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz";
+ name = "debuglog-1.0.1.tgz";
+ sha1 = "aa24ffb9ac3df9a2351837cfb2d279360cd78492";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."debuglog" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "debuglog" ];
+ };
by-spec."deep-eql"."0.1.3" =
self.by-version."deep-eql"."0.1.3";
by-version."deep-eql"."0.1.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-deep-eql-0.1.3";
+ name = "deep-eql-0.1.3";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz";
@@ -4362,9 +4604,9 @@
];
buildInputs =
(self.nativeDeps."deep-eql" or []);
- deps = [
- self.by-version."type-detect"."0.1.1"
- ];
+ deps = {
+ "type-detect-0.1.1" = self.by-version."type-detect"."0.1.1";
+ };
peerDependencies = [
];
passthru.names = [ "deep-eql" ];
@@ -4372,7 +4614,8 @@
by-spec."deep-equal"."*" =
self.by-version."deep-equal"."0.2.1";
by-version."deep-equal"."0.2.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-deep-equal-0.2.1";
+ name = "deep-equal-0.2.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.2.1.tgz";
@@ -4382,8 +4625,8 @@
];
buildInputs =
(self.nativeDeps."deep-equal" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "deep-equal" ];
@@ -4391,7 +4634,8 @@
by-spec."deep-equal"."0.0.0" =
self.by-version."deep-equal"."0.0.0";
by-version."deep-equal"."0.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-deep-equal-0.0.0";
+ name = "deep-equal-0.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.0.0.tgz";
@@ -4401,8 +4645,8 @@
];
buildInputs =
(self.nativeDeps."deep-equal" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "deep-equal" ];
@@ -4411,10 +4655,11 @@
self.by-version."deep-equal"."0.0.0";
by-spec."deep-equal"."~0.2.1" =
self.by-version."deep-equal"."0.2.1";
- by-spec."deep-extend"."~0.2.10" =
+ by-spec."deep-extend"."~0.2.11" =
self.by-version."deep-extend"."0.2.11";
by-version."deep-extend"."0.2.11" = lib.makeOverridable self.buildNodePackage {
- name = "node-deep-extend-0.2.11";
+ name = "deep-extend-0.2.11";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/deep-extend/-/deep-extend-0.2.11.tgz";
@@ -4424,8 +4669,8 @@
];
buildInputs =
(self.nativeDeps."deep-extend" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "deep-extend" ];
@@ -4435,7 +4680,8 @@
by-spec."deepmerge"."*" =
self.by-version."deepmerge"."0.2.7";
by-version."deepmerge"."0.2.7" = lib.makeOverridable self.buildNodePackage {
- name = "node-deepmerge-0.2.7";
+ name = "deepmerge-0.2.7";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/deepmerge/-/deepmerge-0.2.7.tgz";
@@ -4445,17 +4691,39 @@
];
buildInputs =
(self.nativeDeps."deepmerge" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "deepmerge" ];
};
"deepmerge" = self.by-version."deepmerge"."0.2.7";
+ by-spec."defaults"."^1.0.0" =
+ self.by-version."defaults"."1.0.0";
+ by-version."defaults"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+ name = "defaults-1.0.0";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/defaults/-/defaults-1.0.0.tgz";
+ name = "defaults-1.0.0.tgz";
+ sha1 = "3ae25f44416c6c01f9809a25fcdd285912d2a6b1";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."defaults" or []);
+ deps = {
+ "clone-0.1.18" = self.by-version."clone"."0.1.18";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "defaults" ];
+ };
by-spec."defined"."~0.0.0" =
self.by-version."defined"."0.0.0";
by-version."defined"."0.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-defined-0.0.0";
+ name = "defined-0.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/defined/-/defined-0.0.0.tgz";
@@ -4465,36 +4733,17 @@
];
buildInputs =
(self.nativeDeps."defined" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "defined" ];
};
- by-spec."deflate-crc32-stream"."~0.1.0" =
- self.by-version."deflate-crc32-stream"."0.1.1";
- by-version."deflate-crc32-stream"."0.1.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-deflate-crc32-stream-0.1.1";
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/deflate-crc32-stream/-/deflate-crc32-stream-0.1.1.tgz";
- name = "deflate-crc32-stream-0.1.1.tgz";
- sha1 = "5df9e343174f56e7d6056e8ba1f91e5576c02160";
- })
- ];
- buildInputs =
- (self.nativeDeps."deflate-crc32-stream" or []);
- deps = [
- self.by-version."buffer-crc32"."0.2.3"
- ];
- peerDependencies = [
- ];
- passthru.names = [ "deflate-crc32-stream" ];
- };
by-spec."delayed-stream"."0.0.5" =
self.by-version."delayed-stream"."0.0.5";
by-version."delayed-stream"."0.0.5" = lib.makeOverridable self.buildNodePackage {
- name = "node-delayed-stream-0.0.5";
+ name = "delayed-stream-0.0.5";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz";
@@ -4504,54 +4753,17 @@
];
buildInputs =
(self.nativeDeps."delayed-stream" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "delayed-stream" ];
};
- by-spec."delegates"."0.0.3" =
- self.by-version."delegates"."0.0.3";
- by-version."delegates"."0.0.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-delegates-0.0.3";
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/delegates/-/delegates-0.0.3.tgz";
- name = "delegates-0.0.3.tgz";
- sha1 = "4f25cbf8e1c061967f834e003f3bd18ded4baeea";
- })
- ];
- buildInputs =
- (self.nativeDeps."delegates" or []);
- deps = [
- ];
- peerDependencies = [
- ];
- passthru.names = [ "delegates" ];
- };
- by-spec."depd"."0.3.0" =
- self.by-version."depd"."0.3.0";
- by-version."depd"."0.3.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-depd-0.3.0";
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/depd/-/depd-0.3.0.tgz";
- name = "depd-0.3.0.tgz";
- sha1 = "11c9bc28e425325fbd8b38940beff69fa5326883";
- })
- ];
- buildInputs =
- (self.nativeDeps."depd" or []);
- deps = [
- ];
- peerDependencies = [
- ];
- passthru.names = [ "depd" ];
- };
by-spec."depd"."0.4.4" =
self.by-version."depd"."0.4.4";
by-version."depd"."0.4.4" = lib.makeOverridable self.buildNodePackage {
- name = "node-depd-0.4.4";
+ name = "depd-0.4.4";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/depd/-/depd-0.4.4.tgz";
@@ -4561,16 +4773,57 @@
];
buildInputs =
(self.nativeDeps."depd" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "depd" ];
};
+ by-spec."depd"."0.4.5" =
+ self.by-version."depd"."0.4.5";
+ by-version."depd"."0.4.5" = lib.makeOverridable self.buildNodePackage {
+ name = "depd-0.4.5";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/depd/-/depd-0.4.5.tgz";
+ name = "depd-0.4.5.tgz";
+ sha1 = "1a664b53388b4a6573e8ae67b5f767c693ca97f1";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."depd" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "depd" ];
+ };
+ by-spec."deprecated"."^0.0.1" =
+ self.by-version."deprecated"."0.0.1";
+ by-version."deprecated"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+ name = "deprecated-0.0.1";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz";
+ name = "deprecated-0.0.1.tgz";
+ sha1 = "f9c9af5464afa1e7a971458a8bdef2aa94d5bb19";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."deprecated" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "deprecated" ];
+ };
by-spec."deps-sort"."^1.3.5" =
self.by-version."deps-sort"."1.3.5";
by-version."deps-sort"."1.3.5" = lib.makeOverridable self.buildNodePackage {
name = "deps-sort-1.3.5";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/deps-sort/-/deps-sort-1.3.5.tgz";
@@ -4580,13 +4833,13 @@
];
buildInputs =
(self.nativeDeps."deps-sort" or []);
- deps = [
- self.by-version."JSONStream"."0.8.4"
- self.by-version."isarray"."0.0.1"
- self.by-version."minimist"."0.2.0"
- self.by-version."shasum"."1.0.0"
- self.by-version."through2"."0.5.1"
- ];
+ deps = {
+ "JSONStream-0.8.4" = self.by-version."JSONStream"."0.8.4";
+ "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
+ "minimist-0.2.0" = self.by-version."minimist"."0.2.0";
+ "shasum-1.0.0" = self.by-version."shasum"."1.0.0";
+ "through2-0.5.1" = self.by-version."through2"."0.5.1";
+ };
peerDependencies = [
];
passthru.names = [ "deps-sort" ];
@@ -4594,7 +4847,8 @@
by-spec."destroy"."1.0.3" =
self.by-version."destroy"."1.0.3";
by-version."destroy"."1.0.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-destroy-1.0.3";
+ name = "destroy-1.0.3";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz";
@@ -4604,8 +4858,8 @@
];
buildInputs =
(self.nativeDeps."destroy" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "destroy" ];
@@ -4613,7 +4867,8 @@
by-spec."detective"."^3.1.0" =
self.by-version."detective"."3.1.0";
by-version."detective"."3.1.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-detective-3.1.0";
+ name = "detective-3.1.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/detective/-/detective-3.1.0.tgz";
@@ -4623,57 +4878,45 @@
];
buildInputs =
(self.nativeDeps."detective" or []);
- deps = [
- self.by-version."escodegen"."1.1.0"
- self.by-version."esprima-fb"."3001.1.0-dev-harmony-fb"
- ];
+ deps = {
+ "escodegen-1.1.0" = self.by-version."escodegen"."1.1.0";
+ "esprima-fb-3001.1.0-dev-harmony-fb" = self.by-version."esprima-fb"."3001.1.0-dev-harmony-fb";
+ };
peerDependencies = [
];
passthru.names = [ "detective" ];
};
- by-spec."dethroy"."~1.0.0" =
- self.by-version."dethroy"."1.0.2";
- by-version."dethroy"."1.0.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-dethroy-1.0.2";
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/dethroy/-/dethroy-1.0.2.tgz";
- name = "dethroy-1.0.2.tgz";
- sha1 = "c82003317693dcbcda3f752b0182e3bf16dd4421";
- })
- ];
- buildInputs =
- (self.nativeDeps."dethroy" or []);
- deps = [
- ];
- peerDependencies = [
- ];
- passthru.names = [ "dethroy" ];
- };
by-spec."dezalgo"."^1.0.0" =
- self.by-version."dezalgo"."1.0.0";
- by-version."dezalgo"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-dezalgo-1.0.0";
+ self.by-version."dezalgo"."1.0.1";
+ by-version."dezalgo"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+ name = "dezalgo-1.0.1";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/dezalgo/-/dezalgo-1.0.0.tgz";
- name = "dezalgo-1.0.0.tgz";
- sha1 = "050bb723f18b5617b309f26c2dc8fe6f2573b6fc";
+ url = "http://registry.npmjs.org/dezalgo/-/dezalgo-1.0.1.tgz";
+ name = "dezalgo-1.0.1.tgz";
+ sha1 = "12bde135060807900d5a7aebb607c2abb7c76937";
})
];
buildInputs =
(self.nativeDeps."dezalgo" or []);
- deps = [
- self.by-version."asap"."1.0.0"
- ];
+ deps = {
+ "asap-1.0.0" = self.by-version."asap"."1.0.0";
+ "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1";
+ };
peerDependencies = [
];
passthru.names = [ "dezalgo" ];
};
+ by-spec."dezalgo"."^1.0.1" =
+ self.by-version."dezalgo"."1.0.1";
+ by-spec."dezalgo"."~1.0.1" =
+ self.by-version."dezalgo"."1.0.1";
by-spec."di"."~0.0.1" =
self.by-version."di"."0.0.1";
by-version."di"."0.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-di-0.0.1";
+ name = "di-0.0.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/di/-/di-0.0.1.tgz";
@@ -4683,8 +4926,8 @@
];
buildInputs =
(self.nativeDeps."di" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "di" ];
@@ -4692,7 +4935,8 @@
by-spec."diff"."1.0.7" =
self.by-version."diff"."1.0.7";
by-version."diff"."1.0.7" = lib.makeOverridable self.buildNodePackage {
- name = "node-diff-1.0.7";
+ name = "diff-1.0.7";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/diff/-/diff-1.0.7.tgz";
@@ -4702,8 +4946,8 @@
];
buildInputs =
(self.nativeDeps."diff" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "diff" ];
@@ -4711,7 +4955,8 @@
by-spec."diff"."~1.0.3" =
self.by-version."diff"."1.0.8";
by-version."diff"."1.0.8" = lib.makeOverridable self.buildNodePackage {
- name = "node-diff-1.0.8";
+ name = "diff-1.0.8";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/diff/-/diff-1.0.8.tgz";
@@ -4721,8 +4966,8 @@
];
buildInputs =
(self.nativeDeps."diff" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "diff" ];
@@ -4732,7 +4977,8 @@
by-spec."director"."1.1.10" =
self.by-version."director"."1.1.10";
by-version."director"."1.1.10" = lib.makeOverridable self.buildNodePackage {
- name = "node-director-1.1.10";
+ name = "director-1.1.10";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/director/-/director-1.1.10.tgz";
@@ -4742,8 +4988,28 @@
];
buildInputs =
(self.nativeDeps."director" or []);
- deps = [
+ deps = {
+ };
+ peerDependencies = [
];
+ passthru.names = [ "director" ];
+ };
+ by-spec."director"."1.2.3" =
+ self.by-version."director"."1.2.3";
+ by-version."director"."1.2.3" = lib.makeOverridable self.buildNodePackage {
+ name = "director-1.2.3";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/director/-/director-1.2.3.tgz";
+ name = "director-1.2.3.tgz";
+ sha1 = "ba68a09312751bb77c52acc75e1f9fd9d3cb15bf";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."director" or []);
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "director" ];
@@ -4751,7 +5017,8 @@
by-spec."dkim-signer"."~0.1.1" =
self.by-version."dkim-signer"."0.1.2";
by-version."dkim-signer"."0.1.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-dkim-signer-0.1.2";
+ name = "dkim-signer-0.1.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/dkim-signer/-/dkim-signer-0.1.2.tgz";
@@ -4761,10 +5028,10 @@
];
buildInputs =
(self.nativeDeps."dkim-signer" or []);
- deps = [
- self.by-version."punycode"."1.2.4"
- self.by-version."mimelib"."0.2.17"
- ];
+ deps = {
+ "punycode-1.2.4" = self.by-version."punycode"."1.2.4";
+ "mimelib-0.2.17" = self.by-version."mimelib"."0.2.17";
+ };
peerDependencies = [
];
passthru.names = [ "dkim-signer" ];
@@ -4772,7 +5039,8 @@
by-spec."domain-browser"."~1.1.0" =
self.by-version."domain-browser"."1.1.2";
by-version."domain-browser"."1.1.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-domain-browser-1.1.2";
+ name = "domain-browser-1.1.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/domain-browser/-/domain-browser-1.1.2.tgz";
@@ -4782,8 +5050,8 @@
];
buildInputs =
(self.nativeDeps."domain-browser" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "domain-browser" ];
@@ -4791,7 +5059,8 @@
by-spec."domelementtype"."1" =
self.by-version."domelementtype"."1.1.1";
by-version."domelementtype"."1.1.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-domelementtype-1.1.1";
+ name = "domelementtype-1.1.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/domelementtype/-/domelementtype-1.1.1.tgz";
@@ -4801,8 +5070,8 @@
];
buildInputs =
(self.nativeDeps."domelementtype" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "domelementtype" ];
@@ -4810,7 +5079,8 @@
by-spec."domhandler"."2.2" =
self.by-version."domhandler"."2.2.0";
by-version."domhandler"."2.2.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-domhandler-2.2.0";
+ name = "domhandler-2.2.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/domhandler/-/domhandler-2.2.0.tgz";
@@ -4820,9 +5090,9 @@
];
buildInputs =
(self.nativeDeps."domhandler" or []);
- deps = [
- self.by-version."domelementtype"."1.1.1"
- ];
+ deps = {
+ "domelementtype-1.1.1" = self.by-version."domelementtype"."1.1.1";
+ };
peerDependencies = [
];
passthru.names = [ "domhandler" ];
@@ -4830,7 +5100,8 @@
by-spec."domutils"."1.5" =
self.by-version."domutils"."1.5.0";
by-version."domutils"."1.5.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-domutils-1.5.0";
+ name = "domutils-1.5.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/domutils/-/domutils-1.5.0.tgz";
@@ -4840,9 +5111,9 @@
];
buildInputs =
(self.nativeDeps."domutils" or []);
- deps = [
- self.by-version."domelementtype"."1.1.1"
- ];
+ deps = {
+ "domelementtype-1.1.1" = self.by-version."domelementtype"."1.1.1";
+ };
peerDependencies = [
];
passthru.names = [ "domutils" ];
@@ -4851,6 +5122,7 @@
self.by-version."dox"."0.4.6";
by-version."dox"."0.4.6" = lib.makeOverridable self.buildNodePackage {
name = "dox-0.4.6";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/dox/-/dox-0.4.6.tgz";
@@ -4860,10 +5132,10 @@
];
buildInputs =
(self.nativeDeps."dox" or []);
- deps = [
- self.by-version."marked"."0.3.2"
- self.by-version."commander"."0.6.1"
- ];
+ deps = {
+ "marked-0.3.2" = self.by-version."marked"."0.3.2";
+ "commander-0.6.1" = self.by-version."commander"."0.6.1";
+ };
peerDependencies = [
];
passthru.names = [ "dox" ];
@@ -4871,7 +5143,8 @@
by-spec."dtrace-provider"."0.2.8" =
self.by-version."dtrace-provider"."0.2.8";
by-version."dtrace-provider"."0.2.8" = lib.makeOverridable self.buildNodePackage {
- name = "node-dtrace-provider-0.2.8";
+ name = "dtrace-provider-0.2.8";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.2.8.tgz";
@@ -4881,8 +5154,8 @@
];
buildInputs =
(self.nativeDeps."dtrace-provider" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "dtrace-provider" ];
@@ -4890,7 +5163,8 @@
by-spec."duplexer"."~0.1.1" =
self.by-version."duplexer"."0.1.1";
by-version."duplexer"."0.1.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-duplexer-0.1.1";
+ name = "duplexer-0.1.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz";
@@ -4900,8 +5174,8 @@
];
buildInputs =
(self.nativeDeps."duplexer" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "duplexer" ];
@@ -4909,7 +5183,8 @@
by-spec."duplexer2"."0.0.2" =
self.by-version."duplexer2"."0.0.2";
by-version."duplexer2"."0.0.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-duplexer2-0.0.2";
+ name = "duplexer2-0.0.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz";
@@ -4919,9 +5194,9 @@
];
buildInputs =
(self.nativeDeps."duplexer2" or []);
- deps = [
- self.by-version."readable-stream"."1.1.13"
- ];
+ deps = {
+ "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+ };
peerDependencies = [
];
passthru.names = [ "duplexer2" ];
@@ -4931,7 +5206,8 @@
by-spec."editor"."~0.1.0" =
self.by-version."editor"."0.1.0";
by-version."editor"."0.1.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-editor-0.1.0";
+ name = "editor-0.1.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/editor/-/editor-0.1.0.tgz";
@@ -4941,35 +5217,17 @@
];
buildInputs =
(self.nativeDeps."editor" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "editor" ];
};
- by-spec."ee-first"."1.0.3" =
- self.by-version."ee-first"."1.0.3";
- by-version."ee-first"."1.0.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-ee-first-1.0.3";
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/ee-first/-/ee-first-1.0.3.tgz";
- name = "ee-first-1.0.3.tgz";
- sha1 = "6c98c4089abecb5a7b85c1ac449aa603d3b3dabe";
- })
- ];
- buildInputs =
- (self.nativeDeps."ee-first" or []);
- deps = [
- ];
- peerDependencies = [
- ];
- passthru.names = [ "ee-first" ];
- };
by-spec."ee-first"."1.0.5" =
self.by-version."ee-first"."1.0.5";
by-version."ee-first"."1.0.5" = lib.makeOverridable self.buildNodePackage {
- name = "node-ee-first-1.0.5";
+ name = "ee-first-1.0.5";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/ee-first/-/ee-first-1.0.5.tgz";
@@ -4979,8 +5237,8 @@
];
buildInputs =
(self.nativeDeps."ee-first" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "ee-first" ];
@@ -4988,7 +5246,8 @@
by-spec."ejs"."0.8.3" =
self.by-version."ejs"."0.8.3";
by-version."ejs"."0.8.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-ejs-0.8.3";
+ name = "ejs-0.8.3";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/ejs/-/ejs-0.8.3.tgz";
@@ -4998,8 +5257,8 @@
];
buildInputs =
(self.nativeDeps."ejs" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "ejs" ];
@@ -5007,7 +5266,8 @@
by-spec."emitter-component"."0.0.6" =
self.by-version."emitter-component"."0.0.6";
by-version."emitter-component"."0.0.6" = lib.makeOverridable self.buildNodePackage {
- name = "node-emitter-component-0.0.6";
+ name = "emitter-component-0.0.6";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/emitter-component/-/emitter-component-0.0.6.tgz";
@@ -5017,8 +5277,8 @@
];
buildInputs =
(self.nativeDeps."emitter-component" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "emitter-component" ];
@@ -5026,7 +5286,8 @@
by-spec."encoding"."~0.1.7" =
self.by-version."encoding"."0.1.8";
by-version."encoding"."0.1.8" = lib.makeOverridable self.buildNodePackage {
- name = "node-encoding-0.1.8";
+ name = "encoding-0.1.8";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/encoding/-/encoding-0.1.8.tgz";
@@ -5036,29 +5297,51 @@
];
buildInputs =
(self.nativeDeps."encoding" or []);
- deps = [
- self.by-version."iconv-lite"."0.4.4"
- ];
+ deps = {
+ "iconv-lite-0.4.4" = self.by-version."iconv-lite"."0.4.4";
+ };
peerDependencies = [
];
passthru.names = [ "encoding" ];
};
by-spec."end-of-stream"."^1.0.0" =
- self.by-version."end-of-stream"."1.0.0";
- by-version."end-of-stream"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-end-of-stream-1.0.0";
+ self.by-version."end-of-stream"."1.1.0";
+ by-version."end-of-stream"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+ name = "end-of-stream-1.1.0";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/end-of-stream/-/end-of-stream-1.0.0.tgz";
- name = "end-of-stream-1.0.0.tgz";
- sha1 = "d4596e702734a93e40e9af864319eabd99ff2f0e";
+ url = "http://registry.npmjs.org/end-of-stream/-/end-of-stream-1.1.0.tgz";
+ name = "end-of-stream-1.1.0.tgz";
+ sha1 = "e9353258baa9108965efc41cb0ef8ade2f3cfb07";
})
];
buildInputs =
(self.nativeDeps."end-of-stream" or []);
- deps = [
- self.by-version."once"."1.3.0"
+ deps = {
+ "once-1.3.1" = self.by-version."once"."1.3.1";
+ };
+ peerDependencies = [
];
+ passthru.names = [ "end-of-stream" ];
+ };
+ by-spec."end-of-stream"."~0.1.5" =
+ self.by-version."end-of-stream"."0.1.5";
+ by-version."end-of-stream"."0.1.5" = lib.makeOverridable self.buildNodePackage {
+ name = "end-of-stream-0.1.5";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz";
+ name = "end-of-stream-0.1.5.tgz";
+ sha1 = "8e177206c3c80837d85632e8b9359dfe8b2f6eaf";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."end-of-stream" or []);
+ deps = {
+ "once-1.3.1" = self.by-version."once"."1.3.1";
+ };
peerDependencies = [
];
passthru.names = [ "end-of-stream" ];
@@ -5066,7 +5349,8 @@
by-spec."entities"."1.0" =
self.by-version."entities"."1.0.0";
by-version."entities"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-entities-1.0.0";
+ name = "entities-1.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/entities/-/entities-1.0.0.tgz";
@@ -5076,8 +5360,8 @@
];
buildInputs =
(self.nativeDeps."entities" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "entities" ];
@@ -5086,6 +5370,7 @@
self.by-version."envify"."2.0.1";
by-version."envify"."2.0.1" = lib.makeOverridable self.buildNodePackage {
name = "envify-2.0.1";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/envify/-/envify-2.0.1.tgz";
@@ -5095,52 +5380,34 @@
];
buildInputs =
(self.nativeDeps."envify" or []);
- deps = [
- self.by-version."xtend"."2.1.2"
- self.by-version."through"."2.3.4"
- self.by-version."esprima-fb"."3001.1.0-dev-harmony-fb"
- self.by-version."jstransform"."3.0.0"
- ];
+ deps = {
+ "xtend-2.1.2" = self.by-version."xtend"."2.1.2";
+ "through-2.3.6" = self.by-version."through"."2.3.6";
+ "esprima-fb-3001.1.0-dev-harmony-fb" = self.by-version."esprima-fb"."3001.1.0-dev-harmony-fb";
+ "jstransform-3.0.0" = self.by-version."jstransform"."3.0.0";
+ };
peerDependencies = [
];
passthru.names = [ "envify" ];
};
- by-spec."error-inject"."~1.0.0" =
- self.by-version."error-inject"."1.0.0";
- by-version."error-inject"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-error-inject-1.0.0";
+ by-spec."errorhandler"."~1.2.0" =
+ self.by-version."errorhandler"."1.2.0";
+ by-version."errorhandler"."1.2.0" = lib.makeOverridable self.buildNodePackage {
+ name = "errorhandler-1.2.0";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/error-inject/-/error-inject-1.0.0.tgz";
- name = "error-inject-1.0.0.tgz";
- sha1 = "e2b3d91b54aed672f309d950d154850fa11d4f37";
- })
- ];
- buildInputs =
- (self.nativeDeps."error-inject" or []);
- deps = [
- ];
- peerDependencies = [
- ];
- passthru.names = [ "error-inject" ];
- };
- by-spec."errorhandler"."1.1.1" =
- self.by-version."errorhandler"."1.1.1";
- by-version."errorhandler"."1.1.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-errorhandler-1.1.1";
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/errorhandler/-/errorhandler-1.1.1.tgz";
- name = "errorhandler-1.1.1.tgz";
- sha1 = "18defd436d8ca2efe0a2d886c5c4d6ee6d76d691";
+ url = "http://registry.npmjs.org/errorhandler/-/errorhandler-1.2.0.tgz";
+ name = "errorhandler-1.2.0.tgz";
+ sha1 = "2f89db72c150580c65e8dd5180504f5b8a398bd9";
})
];
buildInputs =
(self.nativeDeps."errorhandler" or []);
- deps = [
- self.by-version."accepts"."1.0.7"
- self.by-version."escape-html"."1.0.1"
- ];
+ deps = {
+ "accepts-1.1.1" = self.by-version."accepts"."1.1.1";
+ "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
+ };
peerDependencies = [
];
passthru.names = [ "errorhandler" ];
@@ -5148,7 +5415,8 @@
by-spec."escape-html"."*" =
self.by-version."escape-html"."1.0.1";
by-version."escape-html"."1.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-escape-html-1.0.1";
+ name = "escape-html-1.0.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz";
@@ -5158,8 +5426,8 @@
];
buildInputs =
(self.nativeDeps."escape-html" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "escape-html" ];
@@ -5167,23 +5435,22 @@
"escape-html" = self.by-version."escape-html"."1.0.1";
by-spec."escape-html"."1.0.1" =
self.by-version."escape-html"."1.0.1";
- by-spec."escape-html"."~1.0.1" =
- self.by-version."escape-html"."1.0.1";
by-spec."escape-string-regexp"."^1.0.0" =
- self.by-version."escape-string-regexp"."1.0.1";
- by-version."escape-string-regexp"."1.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-escape-string-regexp-1.0.1";
+ self.by-version."escape-string-regexp"."1.0.2";
+ by-version."escape-string-regexp"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+ name = "escape-string-regexp-1.0.2";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.1.tgz";
- name = "escape-string-regexp-1.0.1.tgz";
- sha1 = "78c76393afb84f102230d949a6125c7f3cf65904";
+ url = "http://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz";
+ name = "escape-string-regexp-1.0.2.tgz";
+ sha1 = "4dbc2fe674e71949caf3fb2695ce7f2dc1d9a8d1";
})
];
buildInputs =
(self.nativeDeps."escape-string-regexp" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "escape-string-regexp" ];
@@ -5192,6 +5459,7 @@
self.by-version."escodegen"."1.3.3";
by-version."escodegen"."1.3.3" = lib.makeOverridable self.buildNodePackage {
name = "escodegen-1.3.3";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/escodegen/-/escodegen-1.3.3.tgz";
@@ -5201,12 +5469,12 @@
];
buildInputs =
(self.nativeDeps."escodegen" or []);
- deps = [
- self.by-version."esutils"."1.0.0"
- self.by-version."estraverse"."1.5.1"
- self.by-version."esprima"."1.1.1"
- self.by-version."source-map"."0.1.38"
- ];
+ deps = {
+ "esutils-1.0.0" = self.by-version."esutils"."1.0.0";
+ "estraverse-1.5.1" = self.by-version."estraverse"."1.5.1";
+ "esprima-1.1.1" = self.by-version."esprima"."1.1.1";
+ "source-map-0.1.40" = self.by-version."source-map"."0.1.40";
+ };
peerDependencies = [
];
passthru.names = [ "escodegen" ];
@@ -5215,6 +5483,7 @@
self.by-version."escodegen"."0.0.28";
by-version."escodegen"."0.0.28" = lib.makeOverridable self.buildNodePackage {
name = "escodegen-0.0.28";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/escodegen/-/escodegen-0.0.28.tgz";
@@ -5224,11 +5493,11 @@
];
buildInputs =
(self.nativeDeps."escodegen" or []);
- deps = [
- self.by-version."esprima"."1.0.4"
- self.by-version."estraverse"."1.3.2"
- self.by-version."source-map"."0.1.38"
- ];
+ deps = {
+ "esprima-1.0.4" = self.by-version."esprima"."1.0.4";
+ "estraverse-1.3.2" = self.by-version."estraverse"."1.3.2";
+ "source-map-0.1.40" = self.by-version."source-map"."0.1.40";
+ };
peerDependencies = [
];
passthru.names = [ "escodegen" ];
@@ -5239,6 +5508,7 @@
self.by-version."escodegen"."1.1.0";
by-version."escodegen"."1.1.0" = lib.makeOverridable self.buildNodePackage {
name = "escodegen-1.1.0";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/escodegen/-/escodegen-1.1.0.tgz";
@@ -5248,12 +5518,12 @@
];
buildInputs =
(self.nativeDeps."escodegen" or []);
- deps = [
- self.by-version."esprima"."1.0.4"
- self.by-version."estraverse"."1.5.1"
- self.by-version."esutils"."1.0.0"
- self.by-version."source-map"."0.1.38"
- ];
+ deps = {
+ "esprima-1.0.4" = self.by-version."esprima"."1.0.4";
+ "estraverse-1.5.1" = self.by-version."estraverse"."1.5.1";
+ "esutils-1.0.0" = self.by-version."esutils"."1.0.0";
+ "source-map-0.1.40" = self.by-version."source-map"."0.1.40";
+ };
peerDependencies = [
];
passthru.names = [ "escodegen" ];
@@ -5261,7 +5531,8 @@
by-spec."escope"."~ 1.0.0" =
self.by-version."escope"."1.0.1";
by-version."escope"."1.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-escope-1.0.1";
+ name = "escope-1.0.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/escope/-/escope-1.0.1.tgz";
@@ -5271,9 +5542,9 @@
];
buildInputs =
(self.nativeDeps."escope" or []);
- deps = [
- self.by-version."estraverse"."1.5.1"
- ];
+ deps = {
+ "estraverse-1.5.1" = self.by-version."estraverse"."1.5.1";
+ };
peerDependencies = [
];
passthru.names = [ "escope" ];
@@ -5282,6 +5553,7 @@
self.by-version."esmangle"."0.0.17";
by-version."esmangle"."0.0.17" = lib.makeOverridable self.buildNodePackage {
name = "esmangle-0.0.17";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/esmangle/-/esmangle-0.0.17.tgz";
@@ -5291,15 +5563,15 @@
];
buildInputs =
(self.nativeDeps."esmangle" or []);
- deps = [
- self.by-version."esprima"."1.0.4"
- self.by-version."escope"."1.0.1"
- self.by-version."escodegen"."0.0.28"
- self.by-version."estraverse"."1.3.2"
- self.by-version."source-map"."0.1.38"
- self.by-version."esshorten"."0.0.2"
- self.by-version."optimist"."0.6.1"
- ];
+ deps = {
+ "esprima-1.0.4" = self.by-version."esprima"."1.0.4";
+ "escope-1.0.1" = self.by-version."escope"."1.0.1";
+ "escodegen-0.0.28" = self.by-version."escodegen"."0.0.28";
+ "estraverse-1.3.2" = self.by-version."estraverse"."1.3.2";
+ "source-map-0.1.40" = self.by-version."source-map"."0.1.40";
+ "esshorten-0.0.2" = self.by-version."esshorten"."0.0.2";
+ "optimist-0.6.1" = self.by-version."optimist"."0.6.1";
+ };
peerDependencies = [
];
passthru.names = [ "esmangle" ];
@@ -5308,6 +5580,7 @@
self.by-version."esprima"."1.2.2";
by-version."esprima"."1.2.2" = lib.makeOverridable self.buildNodePackage {
name = "esprima-1.2.2";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/esprima/-/esprima-1.2.2.tgz";
@@ -5317,8 +5590,8 @@
];
buildInputs =
(self.nativeDeps."esprima" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "esprima" ];
@@ -5327,6 +5600,7 @@
self.by-version."esprima"."1.0.4";
by-version."esprima"."1.0.4" = lib.makeOverridable self.buildNodePackage {
name = "esprima-1.0.4";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz";
@@ -5336,8 +5610,8 @@
];
buildInputs =
(self.nativeDeps."esprima" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "esprima" ];
@@ -5350,6 +5624,7 @@
self.by-version."esprima"."1.1.1";
by-version."esprima"."1.1.1" = lib.makeOverridable self.buildNodePackage {
name = "esprima-1.1.1";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/esprima/-/esprima-1.1.1.tgz";
@@ -5359,8 +5634,8 @@
];
buildInputs =
(self.nativeDeps."esprima" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "esprima" ];
@@ -5369,6 +5644,7 @@
self.by-version."esprima-fb"."3001.1.0-dev-harmony-fb";
by-version."esprima-fb"."3001.1.0-dev-harmony-fb" = lib.makeOverridable self.buildNodePackage {
name = "esprima-fb-3001.1.0-dev-harmony-fb";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/esprima-fb/-/esprima-fb-3001.0001.0000-dev-harmony-fb.tgz";
@@ -5378,8 +5654,8 @@
];
buildInputs =
(self.nativeDeps."esprima-fb" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "esprima-fb" ];
@@ -5389,7 +5665,8 @@
by-spec."esshorten"."~ 0.0.2" =
self.by-version."esshorten"."0.0.2";
by-version."esshorten"."0.0.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-esshorten-0.0.2";
+ name = "esshorten-0.0.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/esshorten/-/esshorten-0.0.2.tgz";
@@ -5399,10 +5676,10 @@
];
buildInputs =
(self.nativeDeps."esshorten" or []);
- deps = [
- self.by-version."escope"."1.0.1"
- self.by-version."estraverse"."1.2.0"
- ];
+ deps = {
+ "escope-1.0.1" = self.by-version."escope"."1.0.1";
+ "estraverse-1.2.0" = self.by-version."estraverse"."1.2.0";
+ };
peerDependencies = [
];
passthru.names = [ "esshorten" ];
@@ -5410,7 +5687,8 @@
by-spec."estraverse".">= 0.0.2" =
self.by-version."estraverse"."1.5.1";
by-version."estraverse"."1.5.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-estraverse-1.5.1";
+ name = "estraverse-1.5.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz";
@@ -5420,8 +5698,8 @@
];
buildInputs =
(self.nativeDeps."estraverse" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "estraverse" ];
@@ -5429,7 +5707,8 @@
by-spec."estraverse"."~ 1.2.0" =
self.by-version."estraverse"."1.2.0";
by-version."estraverse"."1.2.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-estraverse-1.2.0";
+ name = "estraverse-1.2.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/estraverse/-/estraverse-1.2.0.tgz";
@@ -5439,8 +5718,8 @@
];
buildInputs =
(self.nativeDeps."estraverse" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "estraverse" ];
@@ -5448,7 +5727,8 @@
by-spec."estraverse"."~ 1.3.2" =
self.by-version."estraverse"."1.3.2";
by-version."estraverse"."1.3.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-estraverse-1.3.2";
+ name = "estraverse-1.3.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/estraverse/-/estraverse-1.3.2.tgz";
@@ -5458,8 +5738,8 @@
];
buildInputs =
(self.nativeDeps."estraverse" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "estraverse" ];
@@ -5471,7 +5751,8 @@
by-spec."esutils"."~1.0.0" =
self.by-version."esutils"."1.0.0";
by-version."esutils"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-esutils-1.0.0";
+ name = "esutils-1.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz";
@@ -5481,16 +5762,38 @@
];
buildInputs =
(self.nativeDeps."esutils" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "esutils" ];
};
+ by-spec."etag"."~1.4.0" =
+ self.by-version."etag"."1.4.0";
+ by-version."etag"."1.4.0" = lib.makeOverridable self.buildNodePackage {
+ name = "etag-1.4.0";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/etag/-/etag-1.4.0.tgz";
+ name = "etag-1.4.0.tgz";
+ sha1 = "3050991615857707c04119d075ba2088e0701225";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."etag" or []);
+ deps = {
+ "crc-3.0.0" = self.by-version."crc"."3.0.0";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "etag" ];
+ };
by-spec."event-stream"."~0.5" =
self.by-version."event-stream"."0.5.3";
by-version."event-stream"."0.5.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-event-stream-0.5.3";
+ name = "event-stream-0.5.3";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/event-stream/-/event-stream-0.5.3.tgz";
@@ -5500,9 +5803,9 @@
];
buildInputs =
(self.nativeDeps."event-stream" or []);
- deps = [
- self.by-version."optimist"."0.2.8"
- ];
+ deps = {
+ "optimist-0.2.8" = self.by-version."optimist"."0.2.8";
+ };
peerDependencies = [
];
passthru.names = [ "event-stream" ];
@@ -5510,7 +5813,8 @@
by-spec."eventemitter2"."0.4.12" =
self.by-version."eventemitter2"."0.4.12";
by-version."eventemitter2"."0.4.12" = lib.makeOverridable self.buildNodePackage {
- name = "node-eventemitter2-0.4.12";
+ name = "eventemitter2-0.4.12";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.12.tgz";
@@ -5520,16 +5824,17 @@
];
buildInputs =
(self.nativeDeps."eventemitter2" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "eventemitter2" ];
};
- by-spec."eventemitter2"."~0.4.11" =
+ by-spec."eventemitter2"."0.4.14" =
self.by-version."eventemitter2"."0.4.14";
by-version."eventemitter2"."0.4.14" = lib.makeOverridable self.buildNodePackage {
- name = "node-eventemitter2-0.4.14";
+ name = "eventemitter2-0.4.14";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz";
@@ -5539,48 +5844,52 @@
];
buildInputs =
(self.nativeDeps."eventemitter2" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "eventemitter2" ];
};
+ by-spec."eventemitter2"."~0.4.11" =
+ self.by-version."eventemitter2"."0.4.14";
by-spec."eventemitter2"."~0.4.13" =
self.by-version."eventemitter2"."0.4.14";
by-spec."eventemitter3"."*" =
- self.by-version."eventemitter3"."0.1.4";
- by-version."eventemitter3"."0.1.4" = lib.makeOverridable self.buildNodePackage {
- name = "node-eventemitter3-0.1.4";
+ self.by-version."eventemitter3"."0.1.5";
+ by-version."eventemitter3"."0.1.5" = lib.makeOverridable self.buildNodePackage {
+ name = "eventemitter3-0.1.5";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/eventemitter3/-/eventemitter3-0.1.4.tgz";
- name = "eventemitter3-0.1.4.tgz";
- sha1 = "da2be74b7a1a4760272e1390f975503be5cb7e24";
+ url = "http://registry.npmjs.org/eventemitter3/-/eventemitter3-0.1.5.tgz";
+ name = "eventemitter3-0.1.5.tgz";
+ sha1 = "fbb0655172b87911ba782bb7175409c801e5059f";
})
];
buildInputs =
(self.nativeDeps."eventemitter3" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "eventemitter3" ];
};
by-spec."events"."~1.0.0" =
- self.by-version."events"."1.0.1";
- by-version."events"."1.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-events-1.0.1";
+ self.by-version."events"."1.0.2";
+ by-version."events"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+ name = "events-1.0.2";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/events/-/events-1.0.1.tgz";
- name = "events-1.0.1.tgz";
- sha1 = "386f6471cbb609e7925e7bfe7468634b9e069ac2";
+ url = "http://registry.npmjs.org/events/-/events-1.0.2.tgz";
+ name = "events-1.0.2.tgz";
+ sha1 = "75849dcfe93d10fb057c30055afdbd51d06a8e24";
})
];
buildInputs =
(self.nativeDeps."events" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "events" ];
@@ -5588,7 +5897,8 @@
by-spec."events.node".">= 0.4.0" =
self.by-version."events.node"."0.4.9";
by-version."events.node"."0.4.9" = lib.makeOverridable self.buildNodePackage {
- name = "node-events.node-0.4.9";
+ name = "events.node-0.4.9";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/events.node/-/events.node-0.4.9.tgz";
@@ -5598,8 +5908,8 @@
];
buildInputs =
(self.nativeDeps."events.node" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "events.node" ];
@@ -5607,7 +5917,8 @@
by-spec."everyauth"."0.4.5" =
self.by-version."everyauth"."0.4.5";
by-version."everyauth"."0.4.5" = lib.makeOverridable self.buildNodePackage {
- name = "node-everyauth-0.4.5";
+ name = "everyauth-0.4.5";
+ bin = false;
src = [
(self.patchSource fetchurl {
url = "http://registry.npmjs.org/everyauth/-/everyauth-0.4.5.tgz";
@@ -5617,17 +5928,17 @@
];
buildInputs =
(self.nativeDeps."everyauth" or []);
- deps = [
- self.by-version."oauth"."0.9.11"
- self.by-version."request"."2.9.203"
- self.by-version."connect"."2.3.9"
- self.by-version."openid"."0.5.9"
- self.by-version."xml2js"."0.4.4"
- self.by-version."node-swt"."0.1.1"
- self.by-version."node-wsfederation"."0.1.1"
- self.by-version."debug"."0.5.0"
- self.by-version."express"."3.16.7"
- ];
+ deps = {
+ "oauth-0.9.11" = self.by-version."oauth"."0.9.11";
+ "request-2.9.203" = self.by-version."request"."2.9.203";
+ "connect-2.3.9" = self.by-version."connect"."2.3.9";
+ "openid-0.5.9" = self.by-version."openid"."0.5.9";
+ "xml2js-0.4.4" = self.by-version."xml2js"."0.4.4";
+ "node-swt-0.1.1" = self.by-version."node-swt"."0.1.1";
+ "node-wsfederation-0.1.1" = self.by-version."node-wsfederation"."0.1.1";
+ "debug-0.5.0" = self.by-version."debug"."0.5.0";
+ "express-3.17.6" = self.by-version."express"."3.17.6";
+ };
peerDependencies = [
];
passthru.names = [ "everyauth" ];
@@ -5635,7 +5946,8 @@
by-spec."exit"."0.1.2" =
self.by-version."exit"."0.1.2";
by-version."exit"."0.1.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-exit-0.1.2";
+ name = "exit-0.1.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/exit/-/exit-0.1.2.tgz";
@@ -5645,8 +5957,8 @@
];
buildInputs =
(self.nativeDeps."exit" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "exit" ];
@@ -5656,51 +5968,54 @@
by-spec."exit"."~0.1.1" =
self.by-version."exit"."0.1.2";
by-spec."express"."*" =
- self.by-version."express"."4.8.5";
- by-version."express"."4.8.5" = lib.makeOverridable self.buildNodePackage {
- name = "node-express-4.8.5";
+ self.by-version."express"."4.9.5";
+ by-version."express"."4.9.5" = lib.makeOverridable self.buildNodePackage {
+ name = "express-4.9.5";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/express/-/express-4.8.5.tgz";
- name = "express-4.8.5.tgz";
- sha1 = "59cf7666c29bf7cb8545a1acd43dd81a52cb26d9";
+ url = "http://registry.npmjs.org/express/-/express-4.9.5.tgz";
+ name = "express-4.9.5.tgz";
+ sha1 = "7f62aa84ac8f5e96acfb98e2944dde0bf1cf8688";
})
];
buildInputs =
(self.nativeDeps."express" or []);
- deps = [
- self.by-version."accepts"."1.0.7"
- self.by-version."buffer-crc32"."0.2.3"
- self.by-version."debug"."1.0.4"
- self.by-version."depd"."0.4.4"
- self.by-version."escape-html"."1.0.1"
- self.by-version."finalhandler"."0.1.0"
- self.by-version."media-typer"."0.2.0"
- self.by-version."methods"."1.1.0"
- self.by-version."parseurl"."1.3.0"
- self.by-version."path-to-regexp"."0.1.3"
- self.by-version."proxy-addr"."1.0.1"
- self.by-version."qs"."1.2.2"
- self.by-version."range-parser"."1.0.0"
- self.by-version."send"."0.8.3"
- self.by-version."serve-static"."1.5.3"
- self.by-version."type-is"."1.3.2"
- self.by-version."vary"."0.1.0"
- self.by-version."cookie"."0.1.2"
- self.by-version."fresh"."0.2.2"
- self.by-version."cookie-signature"."1.0.4"
- self.by-version."merge-descriptors"."0.0.2"
- self.by-version."utils-merge"."1.0.0"
- ];
+ deps = {
+ "accepts-1.1.1" = self.by-version."accepts"."1.1.1";
+ "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5";
+ "debug-2.0.0" = self.by-version."debug"."2.0.0";
+ "depd-0.4.5" = self.by-version."depd"."0.4.5";
+ "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
+ "etag-1.4.0" = self.by-version."etag"."1.4.0";
+ "finalhandler-0.2.0" = self.by-version."finalhandler"."0.2.0";
+ "fresh-0.2.4" = self.by-version."fresh"."0.2.4";
+ "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0";
+ "methods-1.1.0" = self.by-version."methods"."1.1.0";
+ "on-finished-2.1.0" = self.by-version."on-finished"."2.1.0";
+ "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
+ "path-to-regexp-0.1.3" = self.by-version."path-to-regexp"."0.1.3";
+ "proxy-addr-1.0.3" = self.by-version."proxy-addr"."1.0.3";
+ "qs-2.2.4" = self.by-version."qs"."2.2.4";
+ "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
+ "send-0.9.3" = self.by-version."send"."0.9.3";
+ "serve-static-1.6.3" = self.by-version."serve-static"."1.6.3";
+ "type-is-1.5.2" = self.by-version."type-is"."1.5.2";
+ "vary-1.0.0" = self.by-version."vary"."1.0.0";
+ "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
+ "merge-descriptors-0.0.2" = self.by-version."merge-descriptors"."0.0.2";
+ "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
+ };
peerDependencies = [
];
passthru.names = [ "express" ];
};
- "express" = self.by-version."express"."4.8.5";
+ "express" = self.by-version."express"."4.9.5";
by-spec."express"."2.5.11" =
self.by-version."express"."2.5.11";
by-version."express"."2.5.11" = lib.makeOverridable self.buildNodePackage {
name = "express-2.5.11";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/express/-/express-2.5.11.tgz";
@@ -5710,12 +6025,12 @@
];
buildInputs =
(self.nativeDeps."express" or []);
- deps = [
- self.by-version."connect"."1.9.2"
- self.by-version."mime"."1.2.4"
- self.by-version."qs"."0.4.2"
- self.by-version."mkdirp"."0.3.0"
- ];
+ deps = {
+ "connect-1.9.2" = self.by-version."connect"."1.9.2";
+ "mime-1.2.4" = self.by-version."mime"."1.2.4";
+ "qs-0.4.2" = self.by-version."qs"."0.4.2";
+ "mkdirp-0.3.0" = self.by-version."mkdirp"."0.3.0";
+ };
peerDependencies = [
];
passthru.names = [ "express" ];
@@ -5724,6 +6039,7 @@
self.by-version."express"."3.2.0";
by-version."express"."3.2.0" = lib.makeOverridable self.buildNodePackage {
name = "express-3.2.0";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/express/-/express-3.2.0.tgz";
@@ -5733,19 +6049,19 @@
];
buildInputs =
(self.nativeDeps."express" or []);
- deps = [
- self.by-version."connect"."2.7.6"
- self.by-version."commander"."0.6.1"
- self.by-version."range-parser"."0.0.4"
- self.by-version."mkdirp"."0.3.5"
- self.by-version."cookie"."0.0.5"
- self.by-version."buffer-crc32"."0.2.3"
- self.by-version."fresh"."0.1.0"
- self.by-version."methods"."0.0.1"
- self.by-version."send"."0.1.0"
- self.by-version."cookie-signature"."1.0.1"
- self.by-version."debug"."1.0.4"
- ];
+ deps = {
+ "connect-2.7.6" = self.by-version."connect"."2.7.6";
+ "commander-0.6.1" = self.by-version."commander"."0.6.1";
+ "range-parser-0.0.4" = self.by-version."range-parser"."0.0.4";
+ "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
+ "cookie-0.0.5" = self.by-version."cookie"."0.0.5";
+ "buffer-crc32-0.2.3" = self.by-version."buffer-crc32"."0.2.3";
+ "fresh-0.1.0" = self.by-version."fresh"."0.1.0";
+ "methods-0.0.1" = self.by-version."methods"."0.0.1";
+ "send-0.1.0" = self.by-version."send"."0.1.0";
+ "cookie-signature-1.0.1" = self.by-version."cookie-signature"."1.0.1";
+ "debug-2.0.0" = self.by-version."debug"."2.0.0";
+ };
peerDependencies = [
];
passthru.names = [ "express" ];
@@ -5754,6 +6070,7 @@
self.by-version."express"."3.4.4";
by-version."express"."3.4.4" = lib.makeOverridable self.buildNodePackage {
name = "express-3.4.4";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/express/-/express-3.4.4.tgz";
@@ -5763,67 +6080,69 @@
];
buildInputs =
(self.nativeDeps."express" or []);
- deps = [
- self.by-version."connect"."2.11.0"
- self.by-version."commander"."1.3.2"
- self.by-version."range-parser"."0.0.4"
- self.by-version."mkdirp"."0.3.5"
- self.by-version."cookie"."0.1.0"
- self.by-version."buffer-crc32"."0.2.1"
- self.by-version."fresh"."0.2.0"
- self.by-version."methods"."0.1.0"
- self.by-version."send"."0.1.4"
- self.by-version."cookie-signature"."1.0.1"
- self.by-version."debug"."1.0.4"
- ];
+ deps = {
+ "connect-2.11.0" = self.by-version."connect"."2.11.0";
+ "commander-1.3.2" = self.by-version."commander"."1.3.2";
+ "range-parser-0.0.4" = self.by-version."range-parser"."0.0.4";
+ "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
+ "cookie-0.1.0" = self.by-version."cookie"."0.1.0";
+ "buffer-crc32-0.2.1" = self.by-version."buffer-crc32"."0.2.1";
+ "fresh-0.2.0" = self.by-version."fresh"."0.2.0";
+ "methods-0.1.0" = self.by-version."methods"."0.1.0";
+ "send-0.1.4" = self.by-version."send"."0.1.4";
+ "cookie-signature-1.0.1" = self.by-version."cookie-signature"."1.0.1";
+ "debug-2.0.0" = self.by-version."debug"."2.0.0";
+ };
peerDependencies = [
];
passthru.names = [ "express" ];
};
by-spec."express"."3.x" =
- self.by-version."express"."3.16.7";
- by-version."express"."3.16.7" = lib.makeOverridable self.buildNodePackage {
- name = "express-3.16.7";
+ self.by-version."express"."3.17.6";
+ by-version."express"."3.17.6" = lib.makeOverridable self.buildNodePackage {
+ name = "express-3.17.6";
+ bin = true;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/express/-/express-3.16.7.tgz";
- name = "express-3.16.7.tgz";
- sha1 = "788aab5d66e85060211d6fea08eb2986f2f2631c";
+ url = "http://registry.npmjs.org/express/-/express-3.17.6.tgz";
+ name = "express-3.17.6.tgz";
+ sha1 = "e2f9a6a48b85233afc4f7b6c5cd6799c53f5f46f";
})
];
buildInputs =
(self.nativeDeps."express" or []);
- deps = [
- self.by-version."basic-auth"."1.0.0"
- self.by-version."buffer-crc32"."0.2.3"
- self.by-version."connect"."2.25.7"
- self.by-version."commander"."1.3.2"
- self.by-version."debug"."1.0.4"
- self.by-version."depd"."0.4.4"
- self.by-version."escape-html"."1.0.1"
- self.by-version."media-typer"."0.2.0"
- self.by-version."methods"."1.1.0"
- self.by-version."mkdirp"."0.5.0"
- self.by-version."parseurl"."1.3.0"
- self.by-version."proxy-addr"."1.0.1"
- self.by-version."range-parser"."1.0.0"
- self.by-version."send"."0.8.3"
- self.by-version."vary"."0.1.0"
- self.by-version."cookie"."0.1.2"
- self.by-version."fresh"."0.2.2"
- self.by-version."cookie-signature"."1.0.4"
- self.by-version."merge-descriptors"."0.0.2"
- ];
+ deps = {
+ "basic-auth-1.0.0" = self.by-version."basic-auth"."1.0.0";
+ "connect-2.26.4" = self.by-version."connect"."2.26.4";
+ "commander-1.3.2" = self.by-version."commander"."1.3.2";
+ "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5";
+ "crc-3.0.0" = self.by-version."crc"."3.0.0";
+ "debug-2.0.0" = self.by-version."debug"."2.0.0";
+ "depd-0.4.5" = self.by-version."depd"."0.4.5";
+ "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
+ "fresh-0.2.4" = self.by-version."fresh"."0.2.4";
+ "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0";
+ "methods-1.1.0" = self.by-version."methods"."1.1.0";
+ "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
+ "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
+ "proxy-addr-1.0.3" = self.by-version."proxy-addr"."1.0.3";
+ "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
+ "send-0.9.3" = self.by-version."send"."0.9.3";
+ "vary-1.0.0" = self.by-version."vary"."1.0.0";
+ "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
+ "merge-descriptors-0.0.2" = self.by-version."merge-descriptors"."0.0.2";
+ };
peerDependencies = [
];
passthru.names = [ "express" ];
};
by-spec."express".">=3.0.0" =
- self.by-version."express"."4.8.5";
+ self.by-version."express"."4.9.5";
by-spec."express"."~3.1.1" =
self.by-version."express"."3.1.2";
by-version."express"."3.1.2" = lib.makeOverridable self.buildNodePackage {
name = "express-3.1.2";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/express/-/express-3.1.2.tgz";
@@ -5833,19 +6152,19 @@
];
buildInputs =
(self.nativeDeps."express" or []);
- deps = [
- self.by-version."connect"."2.7.5"
- self.by-version."commander"."0.6.1"
- self.by-version."range-parser"."0.0.4"
- self.by-version."mkdirp"."0.3.5"
- self.by-version."cookie"."0.0.5"
- self.by-version."buffer-crc32"."0.2.3"
- self.by-version."fresh"."0.1.0"
- self.by-version."methods"."0.0.1"
- self.by-version."send"."0.1.0"
- self.by-version."cookie-signature"."1.0.0"
- self.by-version."debug"."1.0.4"
- ];
+ deps = {
+ "connect-2.7.5" = self.by-version."connect"."2.7.5";
+ "commander-0.6.1" = self.by-version."commander"."0.6.1";
+ "range-parser-0.0.4" = self.by-version."range-parser"."0.0.4";
+ "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
+ "cookie-0.0.5" = self.by-version."cookie"."0.0.5";
+ "buffer-crc32-0.2.3" = self.by-version."buffer-crc32"."0.2.3";
+ "fresh-0.1.0" = self.by-version."fresh"."0.1.0";
+ "methods-0.0.1" = self.by-version."methods"."0.0.1";
+ "send-0.1.0" = self.by-version."send"."0.1.0";
+ "cookie-signature-1.0.0" = self.by-version."cookie-signature"."1.0.0";
+ "debug-2.0.0" = self.by-version."debug"."2.0.0";
+ };
peerDependencies = [
];
passthru.names = [ "express" ];
@@ -5853,7 +6172,8 @@
by-spec."express"."~4.0" =
self.by-version."express"."4.0.0";
by-version."express"."4.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-express-4.0.0";
+ name = "express-4.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/express/-/express-4.0.0.tgz";
@@ -5863,63 +6183,67 @@
];
buildInputs =
(self.nativeDeps."express" or []);
- deps = [
- self.by-version."parseurl"."1.0.1"
- self.by-version."accepts"."1.0.0"
- self.by-version."type-is"."1.0.0"
- self.by-version."range-parser"."1.0.0"
- self.by-version."cookie"."0.1.0"
- self.by-version."buffer-crc32"."0.2.1"
- self.by-version."fresh"."0.2.2"
- self.by-version."methods"."0.1.0"
- self.by-version."send"."0.2.0"
- self.by-version."cookie-signature"."1.0.3"
- self.by-version."merge-descriptors"."0.0.2"
- self.by-version."utils-merge"."1.0.0"
- self.by-version."escape-html"."1.0.1"
- self.by-version."qs"."0.6.6"
- self.by-version."serve-static"."1.0.1"
- self.by-version."path-to-regexp"."0.1.2"
- self.by-version."debug"."0.8.1"
- ];
+ deps = {
+ "parseurl-1.0.1" = self.by-version."parseurl"."1.0.1";
+ "accepts-1.0.0" = self.by-version."accepts"."1.0.0";
+ "type-is-1.0.0" = self.by-version."type-is"."1.0.0";
+ "range-parser-1.0.0" = self.by-version."range-parser"."1.0.0";
+ "cookie-0.1.0" = self.by-version."cookie"."0.1.0";
+ "buffer-crc32-0.2.1" = self.by-version."buffer-crc32"."0.2.1";
+ "fresh-0.2.2" = self.by-version."fresh"."0.2.2";
+ "methods-0.1.0" = self.by-version."methods"."0.1.0";
+ "send-0.2.0" = self.by-version."send"."0.2.0";
+ "cookie-signature-1.0.3" = self.by-version."cookie-signature"."1.0.3";
+ "merge-descriptors-0.0.2" = self.by-version."merge-descriptors"."0.0.2";
+ "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
+ "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
+ "qs-0.6.6" = self.by-version."qs"."0.6.6";
+ "serve-static-1.0.1" = self.by-version."serve-static"."1.0.1";
+ "path-to-regexp-0.1.2" = self.by-version."path-to-regexp"."0.1.2";
+ "debug-0.8.1" = self.by-version."debug"."0.8.1";
+ };
peerDependencies = [
];
passthru.names = [ "express" ];
};
- by-spec."express"."~4.4.5" =
- self.by-version."express"."4.4.5";
- by-version."express"."4.4.5" = lib.makeOverridable self.buildNodePackage {
- name = "node-express-4.4.5";
+ by-spec."express"."~4.8.5" =
+ self.by-version."express"."4.8.8";
+ by-version."express"."4.8.8" = lib.makeOverridable self.buildNodePackage {
+ name = "express-4.8.8";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/express/-/express-4.4.5.tgz";
- name = "express-4.4.5.tgz";
- sha1 = "5f2f302f277187abd721c3a36e44d86c5e3f03eb";
+ url = "http://registry.npmjs.org/express/-/express-4.8.8.tgz";
+ name = "express-4.8.8.tgz";
+ sha1 = "6aba348ccdfa87608040b12ca0010107a0aac28e";
})
];
buildInputs =
(self.nativeDeps."express" or []);
- deps = [
- self.by-version."accepts"."1.0.7"
- self.by-version."buffer-crc32"."0.2.3"
- self.by-version."debug"."1.0.2"
- self.by-version."escape-html"."1.0.1"
- self.by-version."methods"."1.0.1"
- self.by-version."parseurl"."1.0.1"
- self.by-version."proxy-addr"."1.0.1"
- self.by-version."range-parser"."1.0.0"
- self.by-version."send"."0.4.3"
- self.by-version."serve-static"."1.2.3"
- self.by-version."type-is"."1.2.1"
- self.by-version."vary"."0.1.0"
- self.by-version."cookie"."0.1.2"
- self.by-version."fresh"."0.2.2"
- self.by-version."cookie-signature"."1.0.4"
- self.by-version."merge-descriptors"."0.0.2"
- self.by-version."utils-merge"."1.0.0"
- self.by-version."qs"."0.6.6"
- self.by-version."path-to-regexp"."0.1.2"
- ];
+ deps = {
+ "accepts-1.0.7" = self.by-version."accepts"."1.0.7";
+ "buffer-crc32-0.2.3" = self.by-version."buffer-crc32"."0.2.3";
+ "debug-1.0.4" = self.by-version."debug"."1.0.4";
+ "depd-0.4.4" = self.by-version."depd"."0.4.4";
+ "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
+ "finalhandler-0.1.0" = self.by-version."finalhandler"."0.1.0";
+ "media-typer-0.2.0" = self.by-version."media-typer"."0.2.0";
+ "methods-1.1.0" = self.by-version."methods"."1.1.0";
+ "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
+ "path-to-regexp-0.1.3" = self.by-version."path-to-regexp"."0.1.3";
+ "proxy-addr-1.0.1" = self.by-version."proxy-addr"."1.0.1";
+ "qs-2.2.2" = self.by-version."qs"."2.2.2";
+ "range-parser-1.0.0" = self.by-version."range-parser"."1.0.0";
+ "send-0.8.5" = self.by-version."send"."0.8.5";
+ "serve-static-1.5.4" = self.by-version."serve-static"."1.5.4";
+ "type-is-1.3.2" = self.by-version."type-is"."1.3.2";
+ "vary-0.1.0" = self.by-version."vary"."0.1.0";
+ "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
+ "fresh-0.2.2" = self.by-version."fresh"."0.2.2";
+ "cookie-signature-1.0.4" = self.by-version."cookie-signature"."1.0.4";
+ "merge-descriptors-0.0.2" = self.by-version."merge-descriptors"."0.0.2";
+ "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
+ };
peerDependencies = [
];
passthru.names = [ "express" ];
@@ -5927,7 +6251,8 @@
by-spec."express-form"."*" =
self.by-version."express-form"."0.12.3";
by-version."express-form"."0.12.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-express-form-0.12.3";
+ name = "express-form-0.12.3";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/express-form/-/express-form-0.12.3.tgz";
@@ -5937,13 +6262,13 @@
];
buildInputs =
(self.nativeDeps."express-form" or []);
- deps = [
- self.by-version."validator"."0.4.28"
- self.by-version."object-additions"."0.5.1"
- self.by-version."async"."0.7.0"
- ];
+ deps = {
+ "validator-0.4.28" = self.by-version."validator"."0.4.28";
+ "object-additions-0.5.1" = self.by-version."object-additions"."0.5.1";
+ "async-0.7.0" = self.by-version."async"."0.7.0";
+ };
peerDependencies = [
- self.by-version."express"."4.8.5"
+ self.by-version."express"."4.9.5"
];
passthru.names = [ "express-form" ];
};
@@ -5951,7 +6276,8 @@
by-spec."express-partials"."0.0.6" =
self.by-version."express-partials"."0.0.6";
by-version."express-partials"."0.0.6" = lib.makeOverridable self.buildNodePackage {
- name = "node-express-partials-0.0.6";
+ name = "express-partials-0.0.6";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/express-partials/-/express-partials-0.0.6.tgz";
@@ -5961,43 +6287,17 @@
];
buildInputs =
(self.nativeDeps."express-partials" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "express-partials" ];
};
- by-spec."express-session"."~1.6.1" =
- self.by-version."express-session"."1.6.5";
- by-version."express-session"."1.6.5" = lib.makeOverridable self.buildNodePackage {
- name = "node-express-session-1.6.5";
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/express-session/-/express-session-1.6.5.tgz";
- name = "express-session-1.6.5.tgz";
- sha1 = "c4ca7740025fe4561f88041157931071f91e957b";
- })
- ];
- buildInputs =
- (self.nativeDeps."express-session" or []);
- deps = [
- self.by-version."buffer-crc32"."0.2.3"
- self.by-version."cookie"."0.1.2"
- self.by-version."cookie-signature"."1.0.4"
- self.by-version."debug"."1.0.3"
- self.by-version."depd"."0.3.0"
- self.by-version."on-headers"."0.0.0"
- self.by-version."uid-safe"."1.0.1"
- self.by-version."utils-merge"."1.0.0"
- ];
- peerDependencies = [
- ];
- passthru.names = [ "express-session" ];
- };
by-spec."express-session"."~1.7.6" =
self.by-version."express-session"."1.7.6";
by-version."express-session"."1.7.6" = lib.makeOverridable self.buildNodePackage {
- name = "node-express-session-1.7.6";
+ name = "express-session-1.7.6";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/express-session/-/express-session-1.7.6.tgz";
@@ -6007,45 +6307,76 @@
];
buildInputs =
(self.nativeDeps."express-session" or []);
- deps = [
- self.by-version."buffer-crc32"."0.2.3"
- self.by-version."cookie"."0.1.2"
- self.by-version."cookie-signature"."1.0.4"
- self.by-version."debug"."1.0.4"
- self.by-version."depd"."0.4.4"
- self.by-version."on-headers"."1.0.0"
- self.by-version."parseurl"."1.3.0"
- self.by-version."uid-safe"."1.0.1"
- self.by-version."utils-merge"."1.0.0"
+ deps = {
+ "buffer-crc32-0.2.3" = self.by-version."buffer-crc32"."0.2.3";
+ "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
+ "cookie-signature-1.0.4" = self.by-version."cookie-signature"."1.0.4";
+ "debug-1.0.4" = self.by-version."debug"."1.0.4";
+ "depd-0.4.4" = self.by-version."depd"."0.4.4";
+ "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0";
+ "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
+ "uid-safe-1.0.1" = self.by-version."uid-safe"."1.0.1";
+ "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
+ };
+ peerDependencies = [
];
+ passthru.names = [ "express-session" ];
+ };
+ by-spec."express-session"."~1.8.2" =
+ self.by-version."express-session"."1.8.2";
+ by-version."express-session"."1.8.2" = lib.makeOverridable self.buildNodePackage {
+ name = "express-session-1.8.2";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/express-session/-/express-session-1.8.2.tgz";
+ name = "express-session-1.8.2.tgz";
+ sha1 = "c4011e728a2349b3c18f117a5409908985e83483";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."express-session" or []);
+ deps = {
+ "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
+ "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5";
+ "crc-3.0.0" = self.by-version."crc"."3.0.0";
+ "debug-2.0.0" = self.by-version."debug"."2.0.0";
+ "depd-0.4.5" = self.by-version."depd"."0.4.5";
+ "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0";
+ "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
+ "uid-safe-1.0.1" = self.by-version."uid-safe"."1.0.1";
+ "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
+ };
peerDependencies = [
];
passthru.names = [ "express-session" ];
};
by-spec."extend"."*" =
- self.by-version."extend"."1.3.0";
- by-version."extend"."1.3.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-extend-1.3.0";
+ self.by-version."extend"."2.0.0";
+ by-version."extend"."2.0.0" = lib.makeOverridable self.buildNodePackage {
+ name = "extend-2.0.0";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/extend/-/extend-1.3.0.tgz";
- name = "extend-1.3.0.tgz";
- sha1 = "d1516fb0ff5624d2ebf9123ea1dac5a1994004f8";
+ url = "http://registry.npmjs.org/extend/-/extend-2.0.0.tgz";
+ name = "extend-2.0.0.tgz";
+ sha1 = "cc3c1e238521df4c28e3f30868b7324bb5898a5c";
})
];
buildInputs =
(self.nativeDeps."extend" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "extend" ];
};
- "extend" = self.by-version."extend"."1.3.0";
+ "extend" = self.by-version."extend"."2.0.0";
by-spec."extend"."~1.2.1" =
self.by-version."extend"."1.2.1";
by-version."extend"."1.2.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-extend-1.2.1";
+ name = "extend-1.2.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/extend/-/extend-1.2.1.tgz";
@@ -6055,8 +6386,28 @@
];
buildInputs =
(self.nativeDeps."extend" or []);
- deps = [
+ deps = {
+ };
+ peerDependencies = [
];
+ passthru.names = [ "extend" ];
+ };
+ by-spec."extend"."~1.3.0" =
+ self.by-version."extend"."1.3.0";
+ by-version."extend"."1.3.0" = lib.makeOverridable self.buildNodePackage {
+ name = "extend-1.3.0";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/extend/-/extend-1.3.0.tgz";
+ name = "extend-1.3.0.tgz";
+ sha1 = "d1516fb0ff5624d2ebf9123ea1dac5a1994004f8";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."extend" or []);
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "extend" ];
@@ -6064,7 +6415,8 @@
by-spec."extract-opts"."~2.2.0" =
self.by-version."extract-opts"."2.2.0";
by-version."extract-opts"."2.2.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-extract-opts-2.2.0";
+ name = "extract-opts-2.2.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/extract-opts/-/extract-opts-2.2.0.tgz";
@@ -6074,9 +6426,9 @@
];
buildInputs =
(self.nativeDeps."extract-opts" or []);
- deps = [
- self.by-version."typechecker"."2.0.8"
- ];
+ deps = {
+ "typechecker-2.0.8" = self.by-version."typechecker"."2.0.8";
+ };
peerDependencies = [
];
passthru.names = [ "extract-opts" ];
@@ -6084,7 +6436,8 @@
by-spec."extsprintf"."1.0.0" =
self.by-version."extsprintf"."1.0.0";
by-version."extsprintf"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-extsprintf-1.0.0";
+ name = "extsprintf-1.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/extsprintf/-/extsprintf-1.0.0.tgz";
@@ -6094,8 +6447,8 @@
];
buildInputs =
(self.nativeDeps."extsprintf" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "extsprintf" ];
@@ -6103,7 +6456,8 @@
by-spec."extsprintf"."1.0.2" =
self.by-version."extsprintf"."1.0.2";
by-version."extsprintf"."1.0.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-extsprintf-1.0.2";
+ name = "extsprintf-1.0.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz";
@@ -6113,8 +6467,8 @@
];
buildInputs =
(self.nativeDeps."extsprintf" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "extsprintf" ];
@@ -6122,7 +6476,8 @@
by-spec."eyes"."0.1.x" =
self.by-version."eyes"."0.1.8";
by-version."eyes"."0.1.8" = lib.makeOverridable self.buildNodePackage {
- name = "node-eyes-0.1.8";
+ name = "eyes-0.1.8";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz";
@@ -6132,8 +6487,8 @@
];
buildInputs =
(self.nativeDeps."eyes" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "eyes" ];
@@ -6143,7 +6498,8 @@
by-spec."faye-websocket"."*" =
self.by-version."faye-websocket"."0.7.2";
by-version."faye-websocket"."0.7.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-faye-websocket-0.7.2";
+ name = "faye-websocket-0.7.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.7.2.tgz";
@@ -6153,9 +6509,9 @@
];
buildInputs =
(self.nativeDeps."faye-websocket" or []);
- deps = [
- self.by-version."websocket-driver"."0.3.5"
- ];
+ deps = {
+ "websocket-driver-0.3.5" = self.by-version."websocket-driver"."0.3.5";
+ };
peerDependencies = [
];
passthru.names = [ "faye-websocket" ];
@@ -6164,76 +6520,53 @@
by-spec."faye-websocket"."0.7.2" =
self.by-version."faye-websocket"."0.7.2";
by-spec."fields"."~0.1.11" =
- self.by-version."fields"."0.1.12";
- by-version."fields"."0.1.12" = lib.makeOverridable self.buildNodePackage {
- name = "node-fields-0.1.12";
+ self.by-version."fields"."0.1.16";
+ by-version."fields"."0.1.16" = lib.makeOverridable self.buildNodePackage {
+ name = "fields-0.1.16";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/fields/-/fields-0.1.12.tgz";
- name = "fields-0.1.12.tgz";
- sha1 = "ded2dfe1e0aad3576aed554bfb8f65a7e7404bc1";
+ url = "http://registry.npmjs.org/fields/-/fields-0.1.16.tgz";
+ name = "fields-0.1.16.tgz";
+ sha1 = "a6d127f93636050c7407bd7a5e26265f82f58c22";
})
];
buildInputs =
(self.nativeDeps."fields" or []);
- deps = [
- self.by-version."colors"."0.6.2"
- self.by-version."keypress"."0.1.0"
- self.by-version."sprintf"."0.1.4"
- ];
+ deps = {
+ "colors-0.6.2" = self.by-version."colors"."0.6.2";
+ "keypress-0.2.1" = self.by-version."keypress"."0.2.1";
+ "sprintf-0.1.4" = self.by-version."sprintf"."0.1.4";
+ };
peerDependencies = [
];
passthru.names = [ "fields" ];
};
by-spec."figures"."^1.0.1" =
- self.by-version."figures"."1.3.2";
- by-version."figures"."1.3.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-figures-1.3.2";
+ self.by-version."figures"."1.3.3";
+ by-version."figures"."1.3.3" = lib.makeOverridable self.buildNodePackage {
+ name = "figures-1.3.3";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/figures/-/figures-1.3.2.tgz";
- name = "figures-1.3.2.tgz";
- sha1 = "3ea3915639485d960acff99810086c161db82051";
+ url = "http://registry.npmjs.org/figures/-/figures-1.3.3.tgz";
+ name = "figures-1.3.3.tgz";
+ sha1 = "a0952f9ba076e6be3dd5e2bad8e6a013c00d3d36";
})
];
buildInputs =
(self.nativeDeps."figures" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "figures" ];
};
- by-spec."file-utils"."~0.2.0" =
- self.by-version."file-utils"."0.2.0";
- by-version."file-utils"."0.2.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-file-utils-0.2.0";
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/file-utils/-/file-utils-0.2.0.tgz";
- name = "file-utils-0.2.0.tgz";
- sha1 = "0372c89b19bd96fc9a02a180c91fad29e4dbacaa";
- })
- ];
- buildInputs =
- (self.nativeDeps."file-utils" or []);
- deps = [
- self.by-version."lodash"."2.4.1"
- self.by-version."iconv-lite"."0.2.11"
- self.by-version."rimraf"."2.2.8"
- self.by-version."glob"."3.2.11"
- self.by-version."minimatch"."0.2.14"
- self.by-version."findup-sync"."0.1.3"
- self.by-version."isbinaryfile"."2.0.1"
- ];
- peerDependencies = [
- ];
- passthru.names = [ "file-utils" ];
- };
by-spec."fileset"."0.1.x" =
self.by-version."fileset"."0.1.5";
by-version."fileset"."0.1.5" = lib.makeOverridable self.buildNodePackage {
- name = "node-fileset-0.1.5";
+ name = "fileset-0.1.5";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/fileset/-/fileset-0.1.5.tgz";
@@ -6243,10 +6576,10 @@
];
buildInputs =
(self.nativeDeps."fileset" or []);
- deps = [
- self.by-version."minimatch"."0.4.0"
- self.by-version."glob"."3.2.11"
- ];
+ deps = {
+ "minimatch-0.4.0" = self.by-version."minimatch"."0.4.0";
+ "glob-3.2.11" = self.by-version."glob"."3.2.11";
+ };
peerDependencies = [
];
passthru.names = [ "fileset" ];
@@ -6254,7 +6587,8 @@
by-spec."finalhandler"."0.1.0" =
self.by-version."finalhandler"."0.1.0";
by-version."finalhandler"."0.1.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-finalhandler-0.1.0";
+ name = "finalhandler-0.1.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.1.0.tgz";
@@ -6264,10 +6598,32 @@
];
buildInputs =
(self.nativeDeps."finalhandler" or []);
- deps = [
- self.by-version."debug"."1.0.4"
- self.by-version."escape-html"."1.0.1"
+ deps = {
+ "debug-1.0.4" = self.by-version."debug"."1.0.4";
+ "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
+ };
+ peerDependencies = [
];
+ passthru.names = [ "finalhandler" ];
+ };
+ by-spec."finalhandler"."0.2.0" =
+ self.by-version."finalhandler"."0.2.0";
+ by-version."finalhandler"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+ name = "finalhandler-0.2.0";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz";
+ name = "finalhandler-0.2.0.tgz";
+ sha1 = "794082424b17f6a4b2a0eda39f9db6948ee4be8d";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."finalhandler" or []);
+ deps = {
+ "debug-2.0.0" = self.by-version."debug"."2.0.0";
+ "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
+ };
peerDependencies = [
];
passthru.names = [ "finalhandler" ];
@@ -6275,7 +6631,8 @@
by-spec."findit".">=1.1.0 <2.0.0" =
self.by-version."findit"."1.2.0";
by-version."findit"."1.2.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-findit-1.2.0";
+ name = "findit-1.2.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/findit/-/findit-1.2.0.tgz";
@@ -6285,8 +6642,8 @@
];
buildInputs =
(self.nativeDeps."findit" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "findit" ];
@@ -6294,7 +6651,8 @@
by-spec."findup-sync"."~0.1.0" =
self.by-version."findup-sync"."0.1.3";
by-version."findup-sync"."0.1.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-findup-sync-0.1.3";
+ name = "findup-sync-0.1.3";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz";
@@ -6304,61 +6662,66 @@
];
buildInputs =
(self.nativeDeps."findup-sync" or []);
- deps = [
- self.by-version."glob"."3.2.11"
- self.by-version."lodash"."2.4.1"
- ];
+ deps = {
+ "glob-3.2.11" = self.by-version."glob"."3.2.11";
+ "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
+ };
peerDependencies = [
];
passthru.names = [ "findup-sync" ];
};
by-spec."findup-sync"."~0.1.2" =
self.by-version."findup-sync"."0.1.3";
- by-spec."finished"."1.2.2" =
- self.by-version."finished"."1.2.2";
- by-version."finished"."1.2.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-finished-1.2.2";
+ by-spec."first-chunk-stream"."^1.0.0" =
+ self.by-version."first-chunk-stream"."1.0.0";
+ by-version."first-chunk-stream"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+ name = "first-chunk-stream-1.0.0";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/finished/-/finished-1.2.2.tgz";
- name = "finished-1.2.2.tgz";
- sha1 = "41608eafadfd65683b46a1220bc4b1ec3daedcd8";
- })
- ];
- buildInputs =
- (self.nativeDeps."finished" or []);
- deps = [
- self.by-version."ee-first"."1.0.3"
- ];
- peerDependencies = [
- ];
- passthru.names = [ "finished" ];
- };
- by-spec."finished"."~1.2.0" =
- self.by-version."finished"."1.2.2";
- by-spec."first-chunk-stream"."^0.1.0" =
- self.by-version."first-chunk-stream"."0.1.0";
- by-version."first-chunk-stream"."0.1.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-first-chunk-stream-0.1.0";
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-0.1.0.tgz";
- name = "first-chunk-stream-0.1.0.tgz";
- sha1 = "755d3ec14d49a86e3d2fcc08beead5c0ca2b9c0a";
+ url = "http://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz";
+ name = "first-chunk-stream-1.0.0.tgz";
+ sha1 = "59bfb50cd905f60d7c394cd3d9acaab4e6ad934e";
})
];
buildInputs =
(self.nativeDeps."first-chunk-stream" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "first-chunk-stream" ];
};
by-spec."flatiron"."*" =
+ self.by-version."flatiron"."0.4.2";
+ by-version."flatiron"."0.4.2" = lib.makeOverridable self.buildNodePackage {
+ name = "flatiron-0.4.2";
+ bin = true;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/flatiron/-/flatiron-0.4.2.tgz";
+ name = "flatiron-0.4.2.tgz";
+ sha1 = "cffae218dae8229d6668c34453eefd9a44c0e418";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."flatiron" or []);
+ deps = {
+ "broadway-0.3.6" = self.by-version."broadway"."0.3.6";
+ "optimist-0.6.0" = self.by-version."optimist"."0.6.0";
+ "prompt-0.2.14" = self.by-version."prompt"."0.2.14";
+ "director-1.2.3" = self.by-version."director"."1.2.3";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "flatiron" ];
+ };
+ "flatiron" = self.by-version."flatiron"."0.4.2";
+ by-spec."flatiron"."~0.3.11" =
self.by-version."flatiron"."0.3.11";
by-version."flatiron"."0.3.11" = lib.makeOverridable self.buildNodePackage {
name = "flatiron-0.3.11";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/flatiron/-/flatiron-0.3.11.tgz";
@@ -6368,23 +6731,21 @@
];
buildInputs =
(self.nativeDeps."flatiron" or []);
- deps = [
- self.by-version."broadway"."0.2.9"
- self.by-version."optimist"."0.6.0"
- self.by-version."prompt"."0.2.11"
- self.by-version."director"."1.1.10"
- ];
+ deps = {
+ "broadway-0.2.9" = self.by-version."broadway"."0.2.9";
+ "optimist-0.6.0" = self.by-version."optimist"."0.6.0";
+ "prompt-0.2.11" = self.by-version."prompt"."0.2.11";
+ "director-1.1.10" = self.by-version."director"."1.1.10";
+ };
peerDependencies = [
];
passthru.names = [ "flatiron" ];
};
- "flatiron" = self.by-version."flatiron"."0.3.11";
- by-spec."flatiron"."~0.3.11" =
- self.by-version."flatiron"."0.3.11";
by-spec."follow-redirects"."0.0.3" =
self.by-version."follow-redirects"."0.0.3";
by-version."follow-redirects"."0.0.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-follow-redirects-0.0.3";
+ name = "follow-redirects-0.0.3";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/follow-redirects/-/follow-redirects-0.0.3.tgz";
@@ -6394,9 +6755,9 @@
];
buildInputs =
(self.nativeDeps."follow-redirects" or []);
- deps = [
- self.by-version."underscore"."1.6.0"
- ];
+ deps = {
+ "underscore-1.7.0" = self.by-version."underscore"."1.7.0";
+ };
peerDependencies = [
];
passthru.names = [ "follow-redirects" ];
@@ -6404,7 +6765,8 @@
by-spec."forEachAsync"."~2.2" =
self.by-version."forEachAsync"."2.2.1";
by-version."forEachAsync"."2.2.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-forEachAsync-2.2.1";
+ name = "forEachAsync-2.2.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/forEachAsync/-/forEachAsync-2.2.1.tgz";
@@ -6414,9 +6776,9 @@
];
buildInputs =
(self.nativeDeps."forEachAsync" or []);
- deps = [
- self.by-version."sequence"."2.2.1"
- ];
+ deps = {
+ "sequence-2.2.1" = self.by-version."sequence"."2.2.1";
+ };
peerDependencies = [
];
passthru.names = [ "forEachAsync" ];
@@ -6424,7 +6786,8 @@
by-spec."foreachasync"."3.x" =
self.by-version."foreachasync"."3.0.0";
by-version."foreachasync"."3.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-foreachasync-3.0.0";
+ name = "foreachasync-3.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/foreachasync/-/foreachasync-3.0.0.tgz";
@@ -6434,8 +6797,8 @@
];
buildInputs =
(self.nativeDeps."foreachasync" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "foreachasync" ];
@@ -6444,6 +6807,7 @@
self.by-version."forever"."0.11.1";
by-version."forever"."0.11.1" = lib.makeOverridable self.buildNodePackage {
name = "forever-0.11.1";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/forever/-/forever-0.11.1.tgz";
@@ -6453,20 +6817,20 @@
];
buildInputs =
(self.nativeDeps."forever" or []);
- deps = [
- self.by-version."colors"."0.6.2"
- self.by-version."cliff"."0.1.8"
- self.by-version."flatiron"."0.3.11"
- self.by-version."forever-monitor"."1.2.3"
- self.by-version."nconf"."0.6.9"
- self.by-version."nssocket"."0.5.1"
- self.by-version."optimist"."0.6.1"
- self.by-version."pkginfo"."0.3.0"
- self.by-version."timespan"."2.3.0"
- self.by-version."watch"."0.8.0"
- self.by-version."utile"."0.2.1"
- self.by-version."winston"."0.7.3"
- ];
+ deps = {
+ "colors-0.6.2" = self.by-version."colors"."0.6.2";
+ "cliff-0.1.8" = self.by-version."cliff"."0.1.8";
+ "flatiron-0.3.11" = self.by-version."flatiron"."0.3.11";
+ "forever-monitor-1.2.3" = self.by-version."forever-monitor"."1.2.3";
+ "nconf-0.6.9" = self.by-version."nconf"."0.6.9";
+ "nssocket-0.5.1" = self.by-version."nssocket"."0.5.1";
+ "optimist-0.6.1" = self.by-version."optimist"."0.6.1";
+ "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0";
+ "timespan-2.3.0" = self.by-version."timespan"."2.3.0";
+ "watch-0.8.0" = self.by-version."watch"."0.8.0";
+ "utile-0.2.1" = self.by-version."utile"."0.2.1";
+ "winston-0.7.3" = self.by-version."winston"."0.7.3";
+ };
peerDependencies = [
];
passthru.names = [ "forever" ];
@@ -6475,7 +6839,8 @@
by-spec."forever-agent"."~0.2.0" =
self.by-version."forever-agent"."0.2.0";
by-version."forever-agent"."0.2.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-forever-agent-0.2.0";
+ name = "forever-agent-0.2.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.2.0.tgz";
@@ -6485,8 +6850,8 @@
];
buildInputs =
(self.nativeDeps."forever-agent" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "forever-agent" ];
@@ -6494,7 +6859,8 @@
by-spec."forever-agent"."~0.5.0" =
self.by-version."forever-agent"."0.5.2";
by-version."forever-agent"."0.5.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-forever-agent-0.5.2";
+ name = "forever-agent-0.5.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz";
@@ -6504,8 +6870,8 @@
];
buildInputs =
(self.nativeDeps."forever-agent" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "forever-agent" ];
@@ -6513,7 +6879,8 @@
by-spec."forever-monitor"."*" =
self.by-version."forever-monitor"."1.3.0";
by-version."forever-monitor"."1.3.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-forever-monitor-1.3.0";
+ name = "forever-monitor-1.3.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/forever-monitor/-/forever-monitor-1.3.0.tgz";
@@ -6523,14 +6890,14 @@
];
buildInputs =
(self.nativeDeps."forever-monitor" or []);
- deps = [
- self.by-version."broadway"."0.2.9"
- self.by-version."minimatch"."0.2.14"
- self.by-version."pkginfo"."0.3.0"
- self.by-version."ps-tree"."0.0.3"
- self.by-version."watch"."0.5.1"
- self.by-version."utile"."0.1.7"
- ];
+ deps = {
+ "broadway-0.2.10" = self.by-version."broadway"."0.2.10";
+ "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14";
+ "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0";
+ "ps-tree-0.0.3" = self.by-version."ps-tree"."0.0.3";
+ "watch-0.5.1" = self.by-version."watch"."0.5.1";
+ "utile-0.1.7" = self.by-version."utile"."0.1.7";
+ };
peerDependencies = [
];
passthru.names = [ "forever-monitor" ];
@@ -6539,7 +6906,8 @@
by-spec."forever-monitor"."1.1.0" =
self.by-version."forever-monitor"."1.1.0";
by-version."forever-monitor"."1.1.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-forever-monitor-1.1.0";
+ name = "forever-monitor-1.1.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/forever-monitor/-/forever-monitor-1.1.0.tgz";
@@ -6549,14 +6917,14 @@
];
buildInputs =
(self.nativeDeps."forever-monitor" or []);
- deps = [
- self.by-version."broadway"."0.2.9"
- self.by-version."minimatch"."0.0.5"
- self.by-version."pkginfo"."0.3.0"
- self.by-version."ps-tree"."0.0.3"
- self.by-version."watch"."0.5.1"
- self.by-version."utile"."0.1.7"
- ];
+ deps = {
+ "broadway-0.2.10" = self.by-version."broadway"."0.2.10";
+ "minimatch-0.0.5" = self.by-version."minimatch"."0.0.5";
+ "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0";
+ "ps-tree-0.0.3" = self.by-version."ps-tree"."0.0.3";
+ "watch-0.5.1" = self.by-version."watch"."0.5.1";
+ "utile-0.1.7" = self.by-version."utile"."0.1.7";
+ };
peerDependencies = [
];
passthru.names = [ "forever-monitor" ];
@@ -6564,7 +6932,8 @@
by-spec."forever-monitor"."1.2.3" =
self.by-version."forever-monitor"."1.2.3";
by-version."forever-monitor"."1.2.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-forever-monitor-1.2.3";
+ name = "forever-monitor-1.2.3";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/forever-monitor/-/forever-monitor-1.2.3.tgz";
@@ -6574,44 +6943,23 @@
];
buildInputs =
(self.nativeDeps."forever-monitor" or []);
- deps = [
- self.by-version."broadway"."0.2.9"
- self.by-version."minimatch"."0.2.14"
- self.by-version."pkginfo"."0.3.0"
- self.by-version."ps-tree"."0.0.3"
- self.by-version."watch"."0.5.1"
- self.by-version."utile"."0.1.7"
- ];
+ deps = {
+ "broadway-0.2.10" = self.by-version."broadway"."0.2.10";
+ "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14";
+ "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0";
+ "ps-tree-0.0.3" = self.by-version."ps-tree"."0.0.3";
+ "watch-0.5.1" = self.by-version."watch"."0.5.1";
+ "utile-0.1.7" = self.by-version."utile"."0.1.7";
+ };
peerDependencies = [
];
passthru.names = [ "forever-monitor" ];
};
- by-spec."form-data"."0.1.2" =
- self.by-version."form-data"."0.1.2";
- by-version."form-data"."0.1.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-form-data-0.1.2";
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/form-data/-/form-data-0.1.2.tgz";
- name = "form-data-0.1.2.tgz";
- sha1 = "1143c21357911a78dd7913b189b4bab5d5d57445";
- })
- ];
- buildInputs =
- (self.nativeDeps."form-data" or []);
- deps = [
- self.by-version."combined-stream"."0.0.5"
- self.by-version."mime"."1.2.11"
- self.by-version."async"."0.2.10"
- ];
- peerDependencies = [
- ];
- passthru.names = [ "form-data" ];
- };
by-spec."form-data"."0.1.3" =
self.by-version."form-data"."0.1.3";
by-version."form-data"."0.1.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-form-data-0.1.3";
+ name = "form-data-0.1.3";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/form-data/-/form-data-0.1.3.tgz";
@@ -6621,11 +6969,11 @@
];
buildInputs =
(self.nativeDeps."form-data" or []);
- deps = [
- self.by-version."combined-stream"."0.0.5"
- self.by-version."mime"."1.2.11"
- self.by-version."async"."0.9.0"
- ];
+ deps = {
+ "combined-stream-0.0.5" = self.by-version."combined-stream"."0.0.5";
+ "mime-1.2.11" = self.by-version."mime"."1.2.11";
+ "async-0.9.0" = self.by-version."async"."0.9.0";
+ };
peerDependencies = [
];
passthru.names = [ "form-data" ];
@@ -6633,7 +6981,8 @@
by-spec."form-data"."~0.0.3" =
self.by-version."form-data"."0.0.10";
by-version."form-data"."0.0.10" = lib.makeOverridable self.buildNodePackage {
- name = "node-form-data-0.0.10";
+ name = "form-data-0.0.10";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/form-data/-/form-data-0.0.10.tgz";
@@ -6643,11 +6992,11 @@
];
buildInputs =
(self.nativeDeps."form-data" or []);
- deps = [
- self.by-version."combined-stream"."0.0.5"
- self.by-version."mime"."1.2.11"
- self.by-version."async"."0.2.10"
- ];
+ deps = {
+ "combined-stream-0.0.5" = self.by-version."combined-stream"."0.0.5";
+ "mime-1.2.11" = self.by-version."mime"."1.2.11";
+ "async-0.2.10" = self.by-version."async"."0.2.10";
+ };
peerDependencies = [
];
passthru.names = [ "form-data" ];
@@ -6655,7 +7004,8 @@
by-spec."form-data"."~0.1.0" =
self.by-version."form-data"."0.1.4";
by-version."form-data"."0.1.4" = lib.makeOverridable self.buildNodePackage {
- name = "node-form-data-0.1.4";
+ name = "form-data-0.1.4";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz";
@@ -6665,11 +7015,11 @@
];
buildInputs =
(self.nativeDeps."form-data" or []);
- deps = [
- self.by-version."combined-stream"."0.0.5"
- self.by-version."mime"."1.2.11"
- self.by-version."async"."0.9.0"
- ];
+ deps = {
+ "combined-stream-0.0.5" = self.by-version."combined-stream"."0.0.5";
+ "mime-1.2.11" = self.by-version."mime"."1.2.11";
+ "async-0.9.0" = self.by-version."async"."0.9.0";
+ };
peerDependencies = [
];
passthru.names = [ "form-data" ];
@@ -6677,7 +7027,8 @@
by-spec."formatio"."~1.0" =
self.by-version."formatio"."1.0.2";
by-version."formatio"."1.0.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-formatio-1.0.2";
+ name = "formatio-1.0.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/formatio/-/formatio-1.0.2.tgz";
@@ -6687,9 +7038,9 @@
];
buildInputs =
(self.nativeDeps."formatio" or []);
- deps = [
- self.by-version."samsam"."1.1.1"
- ];
+ deps = {
+ "samsam-1.1.1" = self.by-version."samsam"."1.1.1";
+ };
peerDependencies = [
];
passthru.names = [ "formatio" ];
@@ -6697,7 +7048,8 @@
by-spec."formidable"."1.0.11" =
self.by-version."formidable"."1.0.11";
by-version."formidable"."1.0.11" = lib.makeOverridable self.buildNodePackage {
- name = "node-formidable-1.0.11";
+ name = "formidable-1.0.11";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/formidable/-/formidable-1.0.11.tgz";
@@ -6707,8 +7059,8 @@
];
buildInputs =
(self.nativeDeps."formidable" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "formidable" ];
@@ -6716,7 +7068,8 @@
by-spec."formidable"."1.0.13" =
self.by-version."formidable"."1.0.13";
by-version."formidable"."1.0.13" = lib.makeOverridable self.buildNodePackage {
- name = "node-formidable-1.0.13";
+ name = "formidable-1.0.13";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/formidable/-/formidable-1.0.13.tgz";
@@ -6726,8 +7079,8 @@
];
buildInputs =
(self.nativeDeps."formidable" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "formidable" ];
@@ -6735,7 +7088,8 @@
by-spec."formidable"."1.0.14" =
self.by-version."formidable"."1.0.14";
by-version."formidable"."1.0.14" = lib.makeOverridable self.buildNodePackage {
- name = "node-formidable-1.0.14";
+ name = "formidable-1.0.14";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/formidable/-/formidable-1.0.14.tgz";
@@ -6745,8 +7099,8 @@
];
buildInputs =
(self.nativeDeps."formidable" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "formidable" ];
@@ -6754,7 +7108,8 @@
by-spec."formidable"."1.0.9" =
self.by-version."formidable"."1.0.9";
by-version."formidable"."1.0.9" = lib.makeOverridable self.buildNodePackage {
- name = "node-formidable-1.0.9";
+ name = "formidable-1.0.9";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/formidable/-/formidable-1.0.9.tgz";
@@ -6764,8 +7119,8 @@
];
buildInputs =
(self.nativeDeps."formidable" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "formidable" ];
@@ -6773,7 +7128,8 @@
by-spec."formidable"."1.0.x" =
self.by-version."formidable"."1.0.15";
by-version."formidable"."1.0.15" = lib.makeOverridable self.buildNodePackage {
- name = "node-formidable-1.0.15";
+ name = "formidable-1.0.15";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/formidable/-/formidable-1.0.15.tgz";
@@ -6783,16 +7139,37 @@
];
buildInputs =
(self.nativeDeps."formidable" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "formidable" ];
};
+ by-spec."forwarded"."~0.1.0" =
+ self.by-version."forwarded"."0.1.0";
+ by-version."forwarded"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+ name = "forwarded-0.1.0";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz";
+ name = "forwarded-0.1.0.tgz";
+ sha1 = "19ef9874c4ae1c297bcf078fde63a09b66a84363";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."forwarded" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "forwarded" ];
+ };
by-spec."fresh"."0.1.0" =
self.by-version."fresh"."0.1.0";
by-version."fresh"."0.1.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-fresh-0.1.0";
+ name = "fresh-0.1.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/fresh/-/fresh-0.1.0.tgz";
@@ -6802,8 +7179,8 @@
];
buildInputs =
(self.nativeDeps."fresh" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "fresh" ];
@@ -6811,7 +7188,8 @@
by-spec."fresh"."0.2.0" =
self.by-version."fresh"."0.2.0";
by-version."fresh"."0.2.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-fresh-0.2.0";
+ name = "fresh-0.2.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/fresh/-/fresh-0.2.0.tgz";
@@ -6821,8 +7199,8 @@
];
buildInputs =
(self.nativeDeps."fresh" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "fresh" ];
@@ -6830,7 +7208,8 @@
by-spec."fresh"."0.2.2" =
self.by-version."fresh"."0.2.2";
by-version."fresh"."0.2.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-fresh-0.2.2";
+ name = "fresh-0.2.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/fresh/-/fresh-0.2.2.tgz";
@@ -6840,18 +7219,39 @@
];
buildInputs =
(self.nativeDeps."fresh" or []);
- deps = [
+ deps = {
+ };
+ peerDependencies = [
];
+ passthru.names = [ "fresh" ];
+ };
+ by-spec."fresh"."0.2.4" =
+ self.by-version."fresh"."0.2.4";
+ by-version."fresh"."0.2.4" = lib.makeOverridable self.buildNodePackage {
+ name = "fresh-0.2.4";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz";
+ name = "fresh-0.2.4.tgz";
+ sha1 = "3582499206c9723714190edd74b4604feb4a614c";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."fresh" or []);
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "fresh" ];
};
by-spec."fresh"."~0.2.1" =
- self.by-version."fresh"."0.2.2";
+ self.by-version."fresh"."0.2.4";
by-spec."fs-extra"."~0.6.1" =
self.by-version."fs-extra"."0.6.4";
by-version."fs-extra"."0.6.4" = lib.makeOverridable self.buildNodePackage {
- name = "node-fs-extra-0.6.4";
+ name = "fs-extra-0.6.4";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/fs-extra/-/fs-extra-0.6.4.tgz";
@@ -6861,12 +7261,12 @@
];
buildInputs =
(self.nativeDeps."fs-extra" or []);
- deps = [
- self.by-version."ncp"."0.4.2"
- self.by-version."mkdirp"."0.3.5"
- self.by-version."jsonfile"."1.0.1"
- self.by-version."rimraf"."2.2.8"
- ];
+ deps = {
+ "ncp-0.4.2" = self.by-version."ncp"."0.4.2";
+ "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
+ "jsonfile-1.0.1" = self.by-version."jsonfile"."1.0.1";
+ "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
+ };
peerDependencies = [
];
passthru.names = [ "fs-extra" ];
@@ -6874,7 +7274,8 @@
by-spec."fs-vacuum"."~1.2.1" =
self.by-version."fs-vacuum"."1.2.1";
by-version."fs-vacuum"."1.2.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-fs-vacuum-1.2.1";
+ name = "fs-vacuum-1.2.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/fs-vacuum/-/fs-vacuum-1.2.1.tgz";
@@ -6884,10 +7285,10 @@
];
buildInputs =
(self.nativeDeps."fs-vacuum" or []);
- deps = [
- self.by-version."graceful-fs"."3.0.2"
- self.by-version."rimraf"."2.2.8"
- ];
+ deps = {
+ "graceful-fs-3.0.2" = self.by-version."graceful-fs"."3.0.2";
+ "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
+ };
peerDependencies = [
];
passthru.names = [ "fs-vacuum" ];
@@ -6895,7 +7296,8 @@
by-spec."fs-walk"."*" =
self.by-version."fs-walk"."0.0.1";
by-version."fs-walk"."0.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-fs-walk-0.0.1";
+ name = "fs-walk-0.0.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/fs-walk/-/fs-walk-0.0.1.tgz";
@@ -6905,18 +7307,40 @@
];
buildInputs =
(self.nativeDeps."fs-walk" or []);
- deps = [
- self.by-version."async"."0.9.0"
- ];
+ deps = {
+ "async-0.9.0" = self.by-version."async"."0.9.0";
+ };
peerDependencies = [
];
passthru.names = [ "fs-walk" ];
};
"fs-walk" = self.by-version."fs-walk"."0.0.1";
+ by-spec."fs-write-stream-atomic"."~1.0.2" =
+ self.by-version."fs-write-stream-atomic"."1.0.2";
+ by-version."fs-write-stream-atomic"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+ name = "fs-write-stream-atomic-1.0.2";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.2.tgz";
+ name = "fs-write-stream-atomic-1.0.2.tgz";
+ sha1 = "fe0c6cec75256072b2fef8180d97e309fe3f5efb";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."fs-write-stream-atomic" or []);
+ deps = {
+ "graceful-fs-3.0.2" = self.by-version."graceful-fs"."3.0.2";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "fs-write-stream-atomic" ];
+ };
by-spec."fs.extra".">=1.2.0 <2.0.0" =
self.by-version."fs.extra"."1.2.1";
by-version."fs.extra"."1.2.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-fs.extra-1.2.1";
+ name = "fs.extra-1.2.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/fs.extra/-/fs.extra-1.2.1.tgz";
@@ -6926,62 +7350,41 @@
];
buildInputs =
(self.nativeDeps."fs.extra" or []);
- deps = [
- self.by-version."mkdirp"."0.3.5"
- self.by-version."fs-extra"."0.6.4"
- self.by-version."walk"."2.2.1"
- ];
+ deps = {
+ "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
+ "fs-extra-0.6.4" = self.by-version."fs-extra"."0.6.4";
+ "walk-2.2.1" = self.by-version."walk"."2.2.1";
+ };
peerDependencies = [
];
passthru.names = [ "fs.extra" ];
};
- by-spec."fsevents"."pipobscure/fsevents#7dcdf9fa3f8956610fd6f69f72c67bace2de7138" =
- self.by-version."fsevents"."0.2.1";
- by-version."fsevents"."0.2.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-fsevents-0.2.1";
+ by-spec."fsevents"."0.3.0" =
+ self.by-version."fsevents"."0.3.0";
+ by-version."fsevents"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+ name = "fsevents-0.3.0";
+ bin = false;
src = [
- (fetchgit {
- url = "git://github.com/pipobscure/fsevents.git";
- rev = "7dcdf9fa3f8956610fd6f69f72c67bace2de7138";
- sha256 = "cc89ed7e31ee7e387326c4f9a3668306bdb98ff9cbaff9d7f29e258e56584bfb";
+ (fetchurl {
+ url = "http://registry.npmjs.org/fsevents/-/fsevents-0.3.0.tgz";
+ name = "fsevents-0.3.0.tgz";
+ sha1 = "90723a3d0bbab877b62d0a78db633ef2688d8a81";
})
];
buildInputs =
(self.nativeDeps."fsevents" or []);
- deps = [
- self.by-version."nan"."0.8.0"
- ];
+ deps = {
+ "nan-1.2.0" = self.by-version."nan"."1.2.0";
+ };
peerDependencies = [
];
passthru.names = [ "fsevents" ];
};
- by-spec."fstream"."0" =
- self.by-version."fstream"."0.1.31";
- by-version."fstream"."0.1.31" = lib.makeOverridable self.buildNodePackage {
- name = "node-fstream-0.1.31";
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz";
- name = "fstream-0.1.31.tgz";
- sha1 = "7337f058fbbbbefa8c9f561a28cab0849202c988";
- })
- ];
- buildInputs =
- (self.nativeDeps."fstream" or []);
- deps = [
- self.by-version."graceful-fs"."3.0.2"
- self.by-version."inherits"."2.0.1"
- self.by-version."mkdirp"."0.5.0"
- self.by-version."rimraf"."2.2.8"
- ];
- peerDependencies = [
- ];
- passthru.names = [ "fstream" ];
- };
by-spec."fstream"."^1.0.0" =
self.by-version."fstream"."1.0.2";
by-version."fstream"."1.0.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-fstream-1.0.2";
+ name = "fstream-1.0.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/fstream/-/fstream-1.0.2.tgz";
@@ -6991,28 +7394,49 @@
];
buildInputs =
(self.nativeDeps."fstream" or []);
- deps = [
- self.by-version."graceful-fs"."3.0.2"
- self.by-version."inherits"."2.0.1"
- self.by-version."mkdirp"."0.5.0"
- self.by-version."rimraf"."2.2.8"
- ];
+ deps = {
+ "graceful-fs-3.0.2" = self.by-version."graceful-fs"."3.0.2";
+ "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+ "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
+ "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
+ };
peerDependencies = [
];
passthru.names = [ "fstream" ];
};
by-spec."fstream"."^1.0.2" =
self.by-version."fstream"."1.0.2";
- by-spec."fstream"."~0.1.28" =
- self.by-version."fstream"."0.1.31";
- by-spec."fstream"."~0.1.29" =
- self.by-version."fstream"."0.1.31";
by-spec."fstream"."~0.1.8" =
self.by-version."fstream"."0.1.31";
+ by-version."fstream"."0.1.31" = lib.makeOverridable self.buildNodePackage {
+ name = "fstream-0.1.31";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz";
+ name = "fstream-0.1.31.tgz";
+ sha1 = "7337f058fbbbbefa8c9f561a28cab0849202c988";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."fstream" or []);
+ deps = {
+ "graceful-fs-3.0.2" = self.by-version."graceful-fs"."3.0.2";
+ "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+ "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
+ "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "fstream" ];
+ };
+ by-spec."fstream"."~1.0.2" =
+ self.by-version."fstream"."1.0.2";
by-spec."fstream-ignore"."^1.0.0" =
self.by-version."fstream-ignore"."1.0.1";
by-version."fstream-ignore"."1.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-fstream-ignore-1.0.1";
+ name = "fstream-ignore-1.0.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.1.tgz";
@@ -7022,32 +7446,33 @@
];
buildInputs =
(self.nativeDeps."fstream-ignore" or []);
- deps = [
- self.by-version."fstream"."1.0.2"
- self.by-version."inherits"."2.0.1"
- self.by-version."minimatch"."1.0.0"
- ];
+ deps = {
+ "fstream-1.0.2" = self.by-version."fstream"."1.0.2";
+ "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+ "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0";
+ };
peerDependencies = [
];
passthru.names = [ "fstream-ignore" ];
};
- by-spec."fstream-npm"."~0.1.7" =
- self.by-version."fstream-npm"."0.1.8";
- by-version."fstream-npm"."0.1.8" = lib.makeOverridable self.buildNodePackage {
- name = "node-fstream-npm-0.1.8";
+ by-spec."fstream-npm"."~1.0.0" =
+ self.by-version."fstream-npm"."1.0.0";
+ by-version."fstream-npm"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+ name = "fstream-npm-1.0.0";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/fstream-npm/-/fstream-npm-0.1.8.tgz";
- name = "fstream-npm-0.1.8.tgz";
- sha1 = "38a70fdeb510a443e1a5378d90413403fc724fa8";
+ url = "http://registry.npmjs.org/fstream-npm/-/fstream-npm-1.0.0.tgz";
+ name = "fstream-npm-1.0.0.tgz";
+ sha1 = "0262c95c771d393e7cf59fcfeabce621703f3d27";
})
];
buildInputs =
(self.nativeDeps."fstream-npm" or []);
- deps = [
- self.by-version."fstream-ignore"."1.0.1"
- self.by-version."inherits"."2.0.1"
- ];
+ deps = {
+ "fstream-ignore-1.0.1" = self.by-version."fstream-ignore"."1.0.1";
+ "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+ };
peerDependencies = [
];
passthru.names = [ "fstream-npm" ];
@@ -7055,7 +7480,8 @@
by-spec."gaze"."^0.5.1" =
self.by-version."gaze"."0.5.1";
by-version."gaze"."0.5.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-gaze-0.5.1";
+ name = "gaze-0.5.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/gaze/-/gaze-0.5.1.tgz";
@@ -7065,17 +7491,38 @@
];
buildInputs =
(self.nativeDeps."gaze" or []);
- deps = [
- self.by-version."globule"."0.1.0"
- ];
+ deps = {
+ "globule-0.1.0" = self.by-version."globule"."0.1.0";
+ };
peerDependencies = [
];
passthru.names = [ "gaze" ];
};
+ by-spec."get-stdin"."^1.0.0" =
+ self.by-version."get-stdin"."1.0.0";
+ by-version."get-stdin"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+ name = "get-stdin-1.0.0";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/get-stdin/-/get-stdin-1.0.0.tgz";
+ name = "get-stdin-1.0.0.tgz";
+ sha1 = "00bd5a494c81c372f5629bea103bbffe7a1da3ce";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."get-stdin" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "get-stdin" ];
+ };
by-spec."getmac"."~1.0.6" =
self.by-version."getmac"."1.0.6";
by-version."getmac"."1.0.6" = lib.makeOverridable self.buildNodePackage {
name = "getmac-1.0.6";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/getmac/-/getmac-1.0.6.tgz";
@@ -7085,9 +7532,9 @@
];
buildInputs =
(self.nativeDeps."getmac" or []);
- deps = [
- self.by-version."extract-opts"."2.2.0"
- ];
+ deps = {
+ "extract-opts-2.2.0" = self.by-version."extract-opts"."2.2.0";
+ };
peerDependencies = [
];
passthru.names = [ "getmac" ];
@@ -7095,7 +7542,8 @@
by-spec."getobject"."~0.1.0" =
self.by-version."getobject"."0.1.0";
by-version."getobject"."0.1.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-getobject-0.1.0";
+ name = "getobject-0.1.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/getobject/-/getobject-0.1.0.tgz";
@@ -7105,130 +7553,101 @@
];
buildInputs =
(self.nativeDeps."getobject" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "getobject" ];
};
+ by-spec."git-run"."*" =
+ self.by-version."git-run"."0.2.0";
+ by-version."git-run"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+ name = "git-run-0.2.0";
+ bin = true;
+ src = [
+ (self.patchSource fetchurl {
+ url = "http://registry.npmjs.org/git-run/-/git-run-0.2.0.tgz";
+ name = "git-run-0.2.0.tgz";
+ sha1 = "9aa3b203edbb7fcfbc06604c43454d47627d8ac0";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."git-run" or []);
+ deps = {
+ "minilog-2.0.6" = self.by-version."minilog"."2.0.6";
+ "tabtab-0.0.2" = self.by-version."tabtab"."0.0.2";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "git-run" ];
+ };
+ "git-run" = self.by-version."git-run"."0.2.0";
by-spec."github-url-from-git"."^1.3.0" =
- self.by-version."github-url-from-git"."1.3.0";
- by-version."github-url-from-git"."1.3.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-github-url-from-git-1.3.0";
+ self.by-version."github-url-from-git"."1.4.0";
+ by-version."github-url-from-git"."1.4.0" = lib.makeOverridable self.buildNodePackage {
+ name = "github-url-from-git-1.4.0";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.3.0.tgz";
- name = "github-url-from-git-1.3.0.tgz";
- sha1 = "6e79d9779632ca78aa645c67bb419f70e51d69f7";
+ url = "http://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.4.0.tgz";
+ name = "github-url-from-git-1.4.0.tgz";
+ sha1 = "285e6b520819001bde128674704379e4ff03e0de";
})
];
buildInputs =
(self.nativeDeps."github-url-from-git" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "github-url-from-git" ];
};
- by-spec."github-url-from-git"."~1.1.1" =
- self.by-version."github-url-from-git"."1.1.1";
- by-version."github-url-from-git"."1.1.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-github-url-from-git-1.1.1";
+ by-spec."github-url-from-git"."~1.4.0" =
+ self.by-version."github-url-from-git"."1.4.0";
+ by-spec."github-url-from-username-repo"."^1.0.0" =
+ self.by-version."github-url-from-username-repo"."1.0.2";
+ by-version."github-url-from-username-repo"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+ name = "github-url-from-username-repo-1.0.2";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.1.1.tgz";
- name = "github-url-from-git-1.1.1.tgz";
- sha1 = "1f89623453123ef9623956e264c60bf4c3cf5ccf";
- })
- ];
- buildInputs =
- (self.nativeDeps."github-url-from-git" or []);
- deps = [
- ];
- peerDependencies = [
- ];
- passthru.names = [ "github-url-from-git" ];
- };
- by-spec."github-url-from-git"."~1.2.0" =
- self.by-version."github-url-from-git"."1.2.0";
- by-version."github-url-from-git"."1.2.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-github-url-from-git-1.2.0";
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.2.0.tgz";
- name = "github-url-from-git-1.2.0.tgz";
- sha1 = "7ace1fc6920f790d2967faed61688902320c37d2";
- })
- ];
- buildInputs =
- (self.nativeDeps."github-url-from-git" or []);
- deps = [
- ];
- peerDependencies = [
- ];
- passthru.names = [ "github-url-from-git" ];
- };
- by-spec."github-url-from-username-repo"."^0.2.0" =
- self.by-version."github-url-from-username-repo"."0.2.0";
- by-version."github-url-from-username-repo"."0.2.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-github-url-from-username-repo-0.2.0";
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/github-url-from-username-repo/-/github-url-from-username-repo-0.2.0.tgz";
- name = "github-url-from-username-repo-0.2.0.tgz";
- sha1 = "7590b4fa605b7a6cbb7e06ffcd9d253210f9dbe1";
+ url = "http://registry.npmjs.org/github-url-from-username-repo/-/github-url-from-username-repo-1.0.2.tgz";
+ name = "github-url-from-username-repo-1.0.2.tgz";
+ sha1 = "7dd79330d2abe69c10c2cef79714c97215791dfa";
})
];
buildInputs =
(self.nativeDeps."github-url-from-username-repo" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "github-url-from-username-repo" ];
};
- by-spec."github-url-from-username-repo"."~0.2.0" =
- self.by-version."github-url-from-username-repo"."0.2.0";
- by-spec."glob"."3" =
- self.by-version."glob"."3.2.11";
- by-version."glob"."3.2.11" = lib.makeOverridable self.buildNodePackage {
- name = "node-glob-3.2.11";
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/glob/-/glob-3.2.11.tgz";
- name = "glob-3.2.11.tgz";
- sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d";
- })
- ];
- buildInputs =
- (self.nativeDeps."glob" or []);
- deps = [
- self.by-version."inherits"."2.0.1"
- self.by-version."minimatch"."0.3.0"
- ];
- peerDependencies = [
- ];
- passthru.names = [ "glob" ];
- };
+ by-spec."github-url-from-username-repo"."~1.0.0" =
+ self.by-version."github-url-from-username-repo"."1.0.2";
+ by-spec."github-url-from-username-repo"."~1.0.2" =
+ self.by-version."github-url-from-username-repo"."1.0.2";
by-spec."glob"."3 || 4" =
- self.by-version."glob"."4.0.5";
- by-version."glob"."4.0.5" = lib.makeOverridable self.buildNodePackage {
- name = "node-glob-4.0.5";
+ self.by-version."glob"."4.0.6";
+ by-version."glob"."4.0.6" = lib.makeOverridable self.buildNodePackage {
+ name = "glob-4.0.6";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/glob/-/glob-4.0.5.tgz";
- name = "glob-4.0.5.tgz";
- sha1 = "95e42c9efdb3ab1f4788fd7793dfded4a3378063";
+ url = "http://registry.npmjs.org/glob/-/glob-4.0.6.tgz";
+ name = "glob-4.0.6.tgz";
+ sha1 = "695c50bdd4e2fb5c5d370b091f388d3707e291a7";
})
];
buildInputs =
(self.nativeDeps."glob" or []);
- deps = [
- self.by-version."inherits"."2.0.1"
- self.by-version."minimatch"."1.0.0"
- self.by-version."once"."1.3.0"
- self.by-version."graceful-fs"."3.0.2"
- ];
+ deps = {
+ "graceful-fs-3.0.2" = self.by-version."graceful-fs"."3.0.2";
+ "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+ "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0";
+ "once-1.3.1" = self.by-version."once"."1.3.1";
+ };
peerDependencies = [
];
passthru.names = [ "glob" ];
@@ -7236,7 +7655,8 @@
by-spec."glob"."3.2.3" =
self.by-version."glob"."3.2.3";
by-version."glob"."3.2.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-glob-3.2.3";
+ name = "glob-3.2.3";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/glob/-/glob-3.2.3.tgz";
@@ -7246,33 +7666,54 @@
];
buildInputs =
(self.nativeDeps."glob" or []);
- deps = [
- self.by-version."minimatch"."0.2.14"
- self.by-version."graceful-fs"."2.0.3"
- self.by-version."inherits"."2.0.1"
- ];
+ deps = {
+ "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14";
+ "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3";
+ "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+ };
peerDependencies = [
];
passthru.names = [ "glob" ];
};
by-spec."glob"."3.2.x" =
self.by-version."glob"."3.2.11";
+ by-version."glob"."3.2.11" = lib.makeOverridable self.buildNodePackage {
+ name = "glob-3.2.11";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/glob/-/glob-3.2.11.tgz";
+ name = "glob-3.2.11.tgz";
+ sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."glob" or []);
+ deps = {
+ "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+ "minimatch-0.3.0" = self.by-version."minimatch"."0.3.0";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "glob" ];
+ };
by-spec."glob"."3.x" =
self.by-version."glob"."3.2.11";
by-spec."glob"."4.x" =
- self.by-version."glob"."4.0.5";
+ self.by-version."glob"."4.0.6";
by-spec."glob"."^4.0.0" =
- self.by-version."glob"."4.0.5";
+ self.by-version."glob"."4.0.6";
by-spec."glob"."^4.0.2" =
- self.by-version."glob"."4.0.5";
+ self.by-version."glob"."4.0.6";
by-spec."glob"."^4.0.5" =
- self.by-version."glob"."4.0.5";
+ self.by-version."glob"."4.0.6";
by-spec."glob"."~ 3.2.1" =
self.by-version."glob"."3.2.11";
by-spec."glob"."~3.1.21" =
self.by-version."glob"."3.1.21";
by-version."glob"."3.1.21" = lib.makeOverridable self.buildNodePackage {
- name = "node-glob-3.1.21";
+ name = "glob-3.1.21";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/glob/-/glob-3.1.21.tgz";
@@ -7282,11 +7723,11 @@
];
buildInputs =
(self.nativeDeps."glob" or []);
- deps = [
- self.by-version."minimatch"."0.2.14"
- self.by-version."graceful-fs"."1.2.3"
- self.by-version."inherits"."1.0.0"
- ];
+ deps = {
+ "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14";
+ "graceful-fs-1.2.3" = self.by-version."graceful-fs"."1.2.3";
+ "inherits-1.0.0" = self.by-version."inherits"."1.0.0";
+ };
peerDependencies = [
];
passthru.names = [ "glob" ];
@@ -7299,12 +7740,13 @@
self.by-version."glob"."3.2.11";
by-spec."glob"."~3.2.9" =
self.by-version."glob"."3.2.11";
- by-spec."glob"."~4.0.3" =
- self.by-version."glob"."4.0.5";
+ by-spec."glob"."~4.0.5" =
+ self.by-version."glob"."4.0.6";
by-spec."glob-stream"."^3.1.5" =
self.by-version."glob-stream"."3.1.15";
by-version."glob-stream"."3.1.15" = lib.makeOverridable self.buildNodePackage {
- name = "node-glob-stream-3.1.15";
+ name = "glob-stream-3.1.15";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/glob-stream/-/glob-stream-3.1.15.tgz";
@@ -7314,14 +7756,14 @@
];
buildInputs =
(self.nativeDeps."glob-stream" or []);
- deps = [
- self.by-version."glob"."4.0.5"
- self.by-version."minimatch"."1.0.0"
- self.by-version."ordered-read-streams"."0.0.8"
- self.by-version."glob2base"."0.0.11"
- self.by-version."unique-stream"."1.0.0"
- self.by-version."through2"."0.6.1"
- ];
+ deps = {
+ "glob-4.0.6" = self.by-version."glob"."4.0.6";
+ "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0";
+ "ordered-read-streams-0.0.8" = self.by-version."ordered-read-streams"."0.0.8";
+ "glob2base-0.0.11" = self.by-version."glob2base"."0.0.11";
+ "unique-stream-1.0.0" = self.by-version."unique-stream"."1.0.0";
+ "through2-0.6.2" = self.by-version."through2"."0.6.2";
+ };
peerDependencies = [
];
passthru.names = [ "glob-stream" ];
@@ -7329,7 +7771,8 @@
by-spec."glob-watcher"."^0.0.6" =
self.by-version."glob-watcher"."0.0.6";
by-version."glob-watcher"."0.0.6" = lib.makeOverridable self.buildNodePackage {
- name = "node-glob-watcher-0.0.6";
+ name = "glob-watcher-0.0.6";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz";
@@ -7339,9 +7782,9 @@
];
buildInputs =
(self.nativeDeps."glob-watcher" or []);
- deps = [
- self.by-version."gaze"."0.5.1"
- ];
+ deps = {
+ "gaze-0.5.1" = self.by-version."gaze"."0.5.1";
+ };
peerDependencies = [
];
passthru.names = [ "glob-watcher" ];
@@ -7349,7 +7792,8 @@
by-spec."glob2base"."^0.0.11" =
self.by-version."glob2base"."0.0.11";
by-version."glob2base"."0.0.11" = lib.makeOverridable self.buildNodePackage {
- name = "node-glob2base-0.0.11";
+ name = "glob2base-0.0.11";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/glob2base/-/glob2base-0.0.11.tgz";
@@ -7359,9 +7803,9 @@
];
buildInputs =
(self.nativeDeps."glob2base" or []);
- deps = [
- self.by-version."lodash"."2.4.1"
- ];
+ deps = {
+ "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
+ };
peerDependencies = [
];
passthru.names = [ "glob2base" ];
@@ -7369,7 +7813,8 @@
by-spec."globule"."~0.1.0" =
self.by-version."globule"."0.1.0";
by-version."globule"."0.1.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-globule-0.1.0";
+ name = "globule-0.1.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/globule/-/globule-0.1.0.tgz";
@@ -7379,38 +7824,20 @@
];
buildInputs =
(self.nativeDeps."globule" or []);
- deps = [
- self.by-version."lodash"."1.0.1"
- self.by-version."glob"."3.1.21"
- self.by-version."minimatch"."0.2.14"
- ];
+ deps = {
+ "lodash-1.0.1" = self.by-version."lodash"."1.0.1";
+ "glob-3.1.21" = self.by-version."glob"."3.1.21";
+ "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14";
+ };
peerDependencies = [
];
passthru.names = [ "globule" ];
};
- by-spec."graceful-fs"."2" =
- self.by-version."graceful-fs"."2.0.3";
- by-version."graceful-fs"."2.0.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-graceful-fs-2.0.3";
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz";
- name = "graceful-fs-2.0.3.tgz";
- sha1 = "7cd2cdb228a4a3f36e95efa6cc142de7d1a136d0";
- })
- ];
- buildInputs =
- (self.nativeDeps."graceful-fs" or []);
- deps = [
- ];
- peerDependencies = [
- ];
- passthru.names = [ "graceful-fs" ];
- };
by-spec."graceful-fs"."2 || 3" =
self.by-version."graceful-fs"."3.0.2";
by-version."graceful-fs"."3.0.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-graceful-fs-3.0.2";
+ name = "graceful-fs-3.0.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.2.tgz";
@@ -7420,14 +7847,16 @@
];
buildInputs =
(self.nativeDeps."graceful-fs" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "graceful-fs" ];
};
by-spec."graceful-fs"."3" =
self.by-version."graceful-fs"."3.0.2";
+ by-spec."graceful-fs".">3.0.1 <4.0.0-0" =
+ self.by-version."graceful-fs"."3.0.2";
by-spec."graceful-fs"."^3.0.0" =
self.by-version."graceful-fs"."3.0.2";
by-spec."graceful-fs"."^3.0.2" =
@@ -7435,7 +7864,8 @@
by-spec."graceful-fs"."~1" =
self.by-version."graceful-fs"."1.2.3";
by-version."graceful-fs"."1.2.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-graceful-fs-1.2.3";
+ name = "graceful-fs-1.2.3";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz";
@@ -7445,8 +7875,8 @@
];
buildInputs =
(self.nativeDeps."graceful-fs" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "graceful-fs" ];
@@ -7455,10 +7885,26 @@
self.by-version."graceful-fs"."1.2.3";
by-spec."graceful-fs"."~2.0.0" =
self.by-version."graceful-fs"."2.0.3";
+ by-version."graceful-fs"."2.0.3" = lib.makeOverridable self.buildNodePackage {
+ name = "graceful-fs-2.0.3";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz";
+ name = "graceful-fs-2.0.3.tgz";
+ sha1 = "7cd2cdb228a4a3f36e95efa6cc142de7d1a136d0";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."graceful-fs" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "graceful-fs" ];
+ };
by-spec."graceful-fs"."~2.0.1" =
self.by-version."graceful-fs"."2.0.3";
- by-spec."graceful-fs"."~2.0.3" =
- self.by-version."graceful-fs"."2.0.3";
by-spec."graceful-fs"."~3.0.0" =
self.by-version."graceful-fs"."3.0.2";
by-spec."graceful-fs"."~3.0.1" =
@@ -7468,7 +7914,8 @@
by-spec."gridfs-stream"."*" =
self.by-version."gridfs-stream"."0.5.1";
by-version."gridfs-stream"."0.5.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-gridfs-stream-0.5.1";
+ name = "gridfs-stream-0.5.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/gridfs-stream/-/gridfs-stream-0.5.1.tgz";
@@ -7478,8 +7925,8 @@
];
buildInputs =
(self.nativeDeps."gridfs-stream" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "gridfs-stream" ];
@@ -7488,7 +7935,8 @@
by-spec."growl"."1.7.x" =
self.by-version."growl"."1.7.0";
by-version."growl"."1.7.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-growl-1.7.0";
+ name = "growl-1.7.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/growl/-/growl-1.7.0.tgz";
@@ -7498,8 +7946,8 @@
];
buildInputs =
(self.nativeDeps."growl" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "growl" ];
@@ -7507,7 +7955,8 @@
by-spec."growl"."1.8.x" =
self.by-version."growl"."1.8.1";
by-version."growl"."1.8.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-growl-1.8.1";
+ name = "growl-1.8.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/growl/-/growl-1.8.1.tgz";
@@ -7517,8 +7966,8 @@
];
buildInputs =
(self.nativeDeps."growl" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "growl" ];
@@ -7526,7 +7975,8 @@
by-spec."grunt"."0.4.x" =
self.by-version."grunt"."0.4.5";
by-version."grunt"."0.4.5" = lib.makeOverridable self.buildNodePackage {
- name = "node-grunt-0.4.5";
+ name = "grunt-0.4.5";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/grunt/-/grunt-0.4.5.tgz";
@@ -7536,28 +7986,28 @@
];
buildInputs =
(self.nativeDeps."grunt" or []);
- deps = [
- self.by-version."async"."0.1.22"
- self.by-version."coffee-script"."1.3.3"
- self.by-version."colors"."0.6.2"
- self.by-version."dateformat"."1.0.2-1.2.3"
- self.by-version."eventemitter2"."0.4.14"
- self.by-version."findup-sync"."0.1.3"
- self.by-version."glob"."3.1.21"
- self.by-version."hooker"."0.2.3"
- self.by-version."iconv-lite"."0.2.11"
- self.by-version."minimatch"."0.2.14"
- self.by-version."nopt"."1.0.10"
- self.by-version."rimraf"."2.2.8"
- self.by-version."lodash"."0.9.2"
- self.by-version."underscore.string"."2.2.1"
- self.by-version."which"."1.0.5"
- self.by-version."js-yaml"."2.0.5"
- self.by-version."exit"."0.1.2"
- self.by-version."getobject"."0.1.0"
- self.by-version."grunt-legacy-util"."0.2.0"
- self.by-version."grunt-legacy-log"."0.1.1"
- ];
+ deps = {
+ "async-0.1.22" = self.by-version."async"."0.1.22";
+ "coffee-script-1.3.3" = self.by-version."coffee-script"."1.3.3";
+ "colors-0.6.2" = self.by-version."colors"."0.6.2";
+ "dateformat-1.0.2-1.2.3" = self.by-version."dateformat"."1.0.2-1.2.3";
+ "eventemitter2-0.4.14" = self.by-version."eventemitter2"."0.4.14";
+ "findup-sync-0.1.3" = self.by-version."findup-sync"."0.1.3";
+ "glob-3.1.21" = self.by-version."glob"."3.1.21";
+ "hooker-0.2.3" = self.by-version."hooker"."0.2.3";
+ "iconv-lite-0.2.11" = self.by-version."iconv-lite"."0.2.11";
+ "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14";
+ "nopt-1.0.10" = self.by-version."nopt"."1.0.10";
+ "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
+ "lodash-0.9.2" = self.by-version."lodash"."0.9.2";
+ "underscore.string-2.2.1" = self.by-version."underscore.string"."2.2.1";
+ "which-1.0.5" = self.by-version."which"."1.0.5";
+ "js-yaml-2.0.5" = self.by-version."js-yaml"."2.0.5";
+ "exit-0.1.2" = self.by-version."exit"."0.1.2";
+ "getobject-0.1.0" = self.by-version."getobject"."0.1.0";
+ "grunt-legacy-util-0.2.0" = self.by-version."grunt-legacy-util"."0.2.0";
+ "grunt-legacy-log-0.1.1" = self.by-version."grunt-legacy-log"."0.1.1";
+ };
peerDependencies = [
];
passthru.names = [ "grunt" ];
@@ -7572,6 +8022,7 @@
self.by-version."grunt-cli"."0.1.13";
by-version."grunt-cli"."0.1.13" = lib.makeOverridable self.buildNodePackage {
name = "grunt-cli-0.1.13";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/grunt-cli/-/grunt-cli-0.1.13.tgz";
@@ -7581,11 +8032,11 @@
];
buildInputs =
(self.nativeDeps."grunt-cli" or []);
- deps = [
- self.by-version."nopt"."1.0.10"
- self.by-version."findup-sync"."0.1.3"
- self.by-version."resolve"."0.3.1"
- ];
+ deps = {
+ "nopt-1.0.10" = self.by-version."nopt"."1.0.10";
+ "findup-sync-0.1.3" = self.by-version."findup-sync"."0.1.3";
+ "resolve-0.3.1" = self.by-version."resolve"."0.3.1";
+ };
peerDependencies = [
];
passthru.names = [ "grunt-cli" ];
@@ -7594,7 +8045,8 @@
by-spec."grunt-contrib-cssmin"."*" =
self.by-version."grunt-contrib-cssmin"."0.10.0";
by-version."grunt-contrib-cssmin"."0.10.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-grunt-contrib-cssmin-0.10.0";
+ name = "grunt-contrib-cssmin-0.10.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-0.10.0.tgz";
@@ -7604,11 +8056,11 @@
];
buildInputs =
(self.nativeDeps."grunt-contrib-cssmin" or []);
- deps = [
- self.by-version."chalk"."0.4.0"
- self.by-version."clean-css"."2.2.13"
- self.by-version."maxmin"."0.2.2"
- ];
+ deps = {
+ "chalk-0.4.0" = self.by-version."chalk"."0.4.0";
+ "clean-css-2.2.16" = self.by-version."clean-css"."2.2.16";
+ "maxmin-0.2.2" = self.by-version."maxmin"."0.2.2";
+ };
peerDependencies = [
self.by-version."grunt"."0.4.5"
];
@@ -7618,7 +8070,8 @@
by-spec."grunt-contrib-jshint"."*" =
self.by-version."grunt-contrib-jshint"."0.10.0";
by-version."grunt-contrib-jshint"."0.10.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-grunt-contrib-jshint-0.10.0";
+ name = "grunt-contrib-jshint-0.10.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/grunt-contrib-jshint/-/grunt-contrib-jshint-0.10.0.tgz";
@@ -7628,10 +8081,10 @@
];
buildInputs =
(self.nativeDeps."grunt-contrib-jshint" or []);
- deps = [
- self.by-version."jshint"."2.5.4"
- self.by-version."hooker"."0.2.3"
- ];
+ deps = {
+ "jshint-2.5.6" = self.by-version."jshint"."2.5.6";
+ "hooker-0.2.3" = self.by-version."hooker"."0.2.3";
+ };
peerDependencies = [
self.by-version."grunt"."0.4.5"
];
@@ -7641,7 +8094,8 @@
by-spec."grunt-contrib-less"."*" =
self.by-version."grunt-contrib-less"."0.11.4";
by-version."grunt-contrib-less"."0.11.4" = lib.makeOverridable self.buildNodePackage {
- name = "node-grunt-contrib-less-0.11.4";
+ name = "grunt-contrib-less-0.11.4";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-0.11.4.tgz";
@@ -7651,13 +8105,13 @@
];
buildInputs =
(self.nativeDeps."grunt-contrib-less" or []);
- deps = [
- self.by-version."async"."0.2.10"
- self.by-version."chalk"."0.5.1"
- self.by-version."less"."1.7.4"
- self.by-version."lodash"."2.4.1"
- self.by-version."maxmin"."0.1.0"
- ];
+ deps = {
+ "async-0.2.10" = self.by-version."async"."0.2.10";
+ "chalk-0.5.1" = self.by-version."chalk"."0.5.1";
+ "less-1.7.5" = self.by-version."less"."1.7.5";
+ "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
+ "maxmin-0.1.0" = self.by-version."maxmin"."0.1.0";
+ };
peerDependencies = [
self.by-version."grunt"."0.4.5"
];
@@ -7667,7 +8121,8 @@
by-spec."grunt-contrib-requirejs"."*" =
self.by-version."grunt-contrib-requirejs"."0.4.4";
by-version."grunt-contrib-requirejs"."0.4.4" = lib.makeOverridable self.buildNodePackage {
- name = "node-grunt-contrib-requirejs-0.4.4";
+ name = "grunt-contrib-requirejs-0.4.4";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/grunt-contrib-requirejs/-/grunt-contrib-requirejs-0.4.4.tgz";
@@ -7677,9 +8132,9 @@
];
buildInputs =
(self.nativeDeps."grunt-contrib-requirejs" or []);
- deps = [
- self.by-version."requirejs"."2.1.14"
- ];
+ deps = {
+ "requirejs-2.1.15" = self.by-version."requirejs"."2.1.15";
+ };
peerDependencies = [
self.by-version."grunt"."0.4.5"
];
@@ -7687,57 +8142,61 @@
};
"grunt-contrib-requirejs" = self.by-version."grunt-contrib-requirejs"."0.4.4";
by-spec."grunt-contrib-uglify"."*" =
- self.by-version."grunt-contrib-uglify"."0.5.1";
- by-version."grunt-contrib-uglify"."0.5.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-grunt-contrib-uglify-0.5.1";
+ self.by-version."grunt-contrib-uglify"."0.6.0";
+ by-version."grunt-contrib-uglify"."0.6.0" = lib.makeOverridable self.buildNodePackage {
+ name = "grunt-contrib-uglify-0.6.0";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-0.5.1.tgz";
- name = "grunt-contrib-uglify-0.5.1.tgz";
- sha1 = "15f0aa5e8e8ba421aea980879ee505bc712b6cde";
+ url = "http://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-0.6.0.tgz";
+ name = "grunt-contrib-uglify-0.6.0.tgz";
+ sha1 = "3a271d4dc4daba64691d0d0d08550ec54a7ec0ab";
})
];
buildInputs =
(self.nativeDeps."grunt-contrib-uglify" or []);
- deps = [
- self.by-version."chalk"."0.5.1"
- self.by-version."lodash"."2.4.1"
- self.by-version."maxmin"."0.2.2"
- self.by-version."uglify-js"."2.4.15"
- ];
+ deps = {
+ "chalk-0.5.1" = self.by-version."chalk"."0.5.1";
+ "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
+ "maxmin-1.0.0" = self.by-version."maxmin"."1.0.0";
+ "uglify-js-2.4.15" = self.by-version."uglify-js"."2.4.15";
+ "uri-path-0.0.2" = self.by-version."uri-path"."0.0.2";
+ };
peerDependencies = [
self.by-version."grunt"."0.4.5"
];
passthru.names = [ "grunt-contrib-uglify" ];
};
- "grunt-contrib-uglify" = self.by-version."grunt-contrib-uglify"."0.5.1";
+ "grunt-contrib-uglify" = self.by-version."grunt-contrib-uglify"."0.6.0";
by-spec."grunt-karma"."*" =
- self.by-version."grunt-karma"."0.8.3";
- by-version."grunt-karma"."0.8.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-grunt-karma-0.8.3";
+ self.by-version."grunt-karma"."0.9.0";
+ by-version."grunt-karma"."0.9.0" = lib.makeOverridable self.buildNodePackage {
+ name = "grunt-karma-0.9.0";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/grunt-karma/-/grunt-karma-0.8.3.tgz";
- name = "grunt-karma-0.8.3.tgz";
- sha1 = "e9ecf718153af1914aa53602a37f85de04310e7f";
+ url = "http://registry.npmjs.org/grunt-karma/-/grunt-karma-0.9.0.tgz";
+ name = "grunt-karma-0.9.0.tgz";
+ sha1 = "de3d6ac478ffca350e729f3457457d5b0910e96b";
})
];
buildInputs =
(self.nativeDeps."grunt-karma" or []);
- deps = [
- self.by-version."lodash"."2.4.1"
- ];
+ deps = {
+ "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
+ };
peerDependencies = [
self.by-version."grunt"."0.4.5"
- self.by-version."karma"."0.12.22"
+ self.by-version."karma"."0.12.24"
];
passthru.names = [ "grunt-karma" ];
};
- "grunt-karma" = self.by-version."grunt-karma"."0.8.3";
+ "grunt-karma" = self.by-version."grunt-karma"."0.9.0";
by-spec."grunt-legacy-log"."~0.1.0" =
self.by-version."grunt-legacy-log"."0.1.1";
by-version."grunt-legacy-log"."0.1.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-grunt-legacy-log-0.1.1";
+ name = "grunt-legacy-log-0.1.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-0.1.1.tgz";
@@ -7747,12 +8206,12 @@
];
buildInputs =
(self.nativeDeps."grunt-legacy-log" or []);
- deps = [
- self.by-version."hooker"."0.2.3"
- self.by-version."lodash"."2.4.1"
- self.by-version."underscore.string"."2.3.3"
- self.by-version."colors"."0.6.2"
- ];
+ deps = {
+ "hooker-0.2.3" = self.by-version."hooker"."0.2.3";
+ "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
+ "underscore.string-2.3.3" = self.by-version."underscore.string"."2.3.3";
+ "colors-0.6.2" = self.by-version."colors"."0.6.2";
+ };
peerDependencies = [
];
passthru.names = [ "grunt-legacy-log" ];
@@ -7760,7 +8219,8 @@
by-spec."grunt-legacy-util"."~0.2.0" =
self.by-version."grunt-legacy-util"."0.2.0";
by-version."grunt-legacy-util"."0.2.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-grunt-legacy-util-0.2.0";
+ name = "grunt-legacy-util-0.2.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-0.2.0.tgz";
@@ -7770,15 +8230,15 @@
];
buildInputs =
(self.nativeDeps."grunt-legacy-util" or []);
- deps = [
- self.by-version."hooker"."0.2.3"
- self.by-version."async"."0.1.22"
- self.by-version."lodash"."0.9.2"
- self.by-version."exit"."0.1.2"
- self.by-version."underscore.string"."2.2.1"
- self.by-version."getobject"."0.1.0"
- self.by-version."which"."1.0.5"
- ];
+ deps = {
+ "hooker-0.2.3" = self.by-version."hooker"."0.2.3";
+ "async-0.1.22" = self.by-version."async"."0.1.22";
+ "lodash-0.9.2" = self.by-version."lodash"."0.9.2";
+ "exit-0.1.2" = self.by-version."exit"."0.1.2";
+ "underscore.string-2.2.1" = self.by-version."underscore.string"."2.2.1";
+ "getobject-0.1.0" = self.by-version."getobject"."0.1.0";
+ "which-1.0.5" = self.by-version."which"."1.0.5";
+ };
peerDependencies = [
];
passthru.names = [ "grunt-legacy-util" ];
@@ -7786,7 +8246,8 @@
by-spec."grunt-sed"."*" =
self.by-version."grunt-sed"."0.1.1";
by-version."grunt-sed"."0.1.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-grunt-sed-0.1.1";
+ name = "grunt-sed-0.1.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/grunt-sed/-/grunt-sed-0.1.1.tgz";
@@ -7796,9 +8257,9 @@
];
buildInputs =
(self.nativeDeps."grunt-sed" or []);
- deps = [
- self.by-version."replace"."0.2.9"
- ];
+ deps = {
+ "replace-0.2.10" = self.by-version."replace"."0.2.10";
+ };
peerDependencies = [
self.by-version."grunt"."0.4.5"
];
@@ -7809,6 +8270,7 @@
self.by-version."guifi-earth"."0.2.1";
by-version."guifi-earth"."0.2.1" = lib.makeOverridable self.buildNodePackage {
name = "guifi-earth-0.2.1";
+ bin = true;
src = [
(fetchurl {
url = "https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854";
@@ -7818,22 +8280,85 @@
];
buildInputs =
(self.nativeDeps."guifi-earth" or []);
- deps = [
- self.by-version."coffee-script"."1.7.1"
- self.by-version."jade"."1.5.0"
- self.by-version."q"."2.0.2"
- self.by-version."xml2js"."0.4.4"
- self.by-version."msgpack"."0.2.4"
- ];
+ deps = {
+ "coffee-script-1.8.0" = self.by-version."coffee-script"."1.8.0";
+ "jade-1.7.0" = self.by-version."jade"."1.7.0";
+ "q-2.0.2" = self.by-version."q"."2.0.2";
+ "xml2js-0.4.4" = self.by-version."xml2js"."0.4.4";
+ "msgpack-0.2.4" = self.by-version."msgpack"."0.2.4";
+ };
peerDependencies = [
];
passthru.names = [ "guifi-earth" ];
};
"guifi-earth" = self.by-version."guifi-earth"."0.2.1";
+ by-spec."gulp"."*" =
+ self.by-version."gulp"."3.8.8";
+ by-version."gulp"."3.8.8" = lib.makeOverridable self.buildNodePackage {
+ name = "gulp-3.8.8";
+ bin = true;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/gulp/-/gulp-3.8.8.tgz";
+ name = "gulp-3.8.8.tgz";
+ sha1 = "0b0473e7cdfd04c785184513938397d4552cfe96";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."gulp" or []);
+ deps = {
+ "archy-0.0.2" = self.by-version."archy"."0.0.2";
+ "chalk-0.5.1" = self.by-version."chalk"."0.5.1";
+ "deprecated-0.0.1" = self.by-version."deprecated"."0.0.1";
+ "gulp-util-3.0.1" = self.by-version."gulp-util"."3.0.1";
+ "interpret-0.3.7" = self.by-version."interpret"."0.3.7";
+ "liftoff-0.12.1" = self.by-version."liftoff"."0.12.1";
+ "minimist-1.1.0" = self.by-version."minimist"."1.1.0";
+ "orchestrator-0.3.7" = self.by-version."orchestrator"."0.3.7";
+ "pretty-hrtime-0.2.2" = self.by-version."pretty-hrtime"."0.2.2";
+ "semver-3.0.1" = self.by-version."semver"."3.0.1";
+ "tildify-1.0.0" = self.by-version."tildify"."1.0.0";
+ "vinyl-fs-0.3.8" = self.by-version."vinyl-fs"."0.3.8";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "gulp" ];
+ };
+ "gulp" = self.by-version."gulp"."3.8.8";
+ by-spec."gulp-util"."^3.0.0" =
+ self.by-version."gulp-util"."3.0.1";
+ by-version."gulp-util"."3.0.1" = lib.makeOverridable self.buildNodePackage {
+ name = "gulp-util-3.0.1";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/gulp-util/-/gulp-util-3.0.1.tgz";
+ name = "gulp-util-3.0.1.tgz";
+ sha1 = "8214894d05c2bb6cc7f5544918a51ddf88180f00";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."gulp-util" or []);
+ deps = {
+ "chalk-0.5.1" = self.by-version."chalk"."0.5.1";
+ "dateformat-1.0.8" = self.by-version."dateformat"."1.0.8";
+ "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
+ "lodash._reinterpolate-2.4.1" = self.by-version."lodash._reinterpolate"."2.4.1";
+ "lodash.template-2.4.1" = self.by-version."lodash.template"."2.4.1";
+ "minimist-1.1.0" = self.by-version."minimist"."1.1.0";
+ "multipipe-0.1.1" = self.by-version."multipipe"."0.1.1";
+ "through2-0.6.2" = self.by-version."through2"."0.6.2";
+ "vinyl-0.4.3" = self.by-version."vinyl"."0.4.3";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "gulp-util" ];
+ };
by-spec."gzip-size"."^0.1.0" =
self.by-version."gzip-size"."0.1.1";
by-version."gzip-size"."0.1.1" = lib.makeOverridable self.buildNodePackage {
name = "gzip-size-0.1.1";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/gzip-size/-/gzip-size-0.1.1.tgz";
@@ -7843,10 +8368,10 @@
];
buildInputs =
(self.nativeDeps."gzip-size" or []);
- deps = [
- self.by-version."concat-stream"."1.4.6"
- self.by-version."zlib-browserify"."0.0.3"
- ];
+ deps = {
+ "concat-stream-1.4.6" = self.by-version."concat-stream"."1.4.6";
+ "zlib-browserify-0.0.3" = self.by-version."zlib-browserify"."0.0.3";
+ };
peerDependencies = [
];
passthru.names = [ "gzip-size" ];
@@ -7855,6 +8380,7 @@
self.by-version."gzip-size"."0.2.0";
by-version."gzip-size"."0.2.0" = lib.makeOverridable self.buildNodePackage {
name = "gzip-size-0.2.0";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/gzip-size/-/gzip-size-0.2.0.tgz";
@@ -7864,10 +8390,32 @@
];
buildInputs =
(self.nativeDeps."gzip-size" or []);
- deps = [
- self.by-version."concat-stream"."1.4.6"
- self.by-version."browserify-zlib"."0.1.4"
+ deps = {
+ "concat-stream-1.4.6" = self.by-version."concat-stream"."1.4.6";
+ "browserify-zlib-0.1.4" = self.by-version."browserify-zlib"."0.1.4";
+ };
+ peerDependencies = [
];
+ passthru.names = [ "gzip-size" ];
+ };
+ by-spec."gzip-size"."^1.0.0" =
+ self.by-version."gzip-size"."1.0.0";
+ by-version."gzip-size"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+ name = "gzip-size-1.0.0";
+ bin = true;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/gzip-size/-/gzip-size-1.0.0.tgz";
+ name = "gzip-size-1.0.0.tgz";
+ sha1 = "66cf8b101047227b95bace6ea1da0c177ed5c22f";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."gzip-size" or []);
+ deps = {
+ "concat-stream-1.4.6" = self.by-version."concat-stream"."1.4.6";
+ "browserify-zlib-0.1.4" = self.by-version."browserify-zlib"."0.1.4";
+ };
peerDependencies = [
];
passthru.names = [ "gzip-size" ];
@@ -7875,7 +8423,8 @@
by-spec."gzippo"."*" =
self.by-version."gzippo"."0.2.0";
by-version."gzippo"."0.2.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-gzippo-0.2.0";
+ name = "gzippo-0.2.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/gzippo/-/gzippo-0.2.0.tgz";
@@ -7885,9 +8434,9 @@
];
buildInputs =
(self.nativeDeps."gzippo" or []);
- deps = [
- self.by-version."send"."0.8.3"
- ];
+ deps = {
+ "send-0.9.3" = self.by-version."send"."0.9.3";
+ };
peerDependencies = [
];
passthru.names = [ "gzippo" ];
@@ -7897,6 +8446,7 @@
self.by-version."handlebars"."1.3.0";
by-version."handlebars"."1.3.0" = lib.makeOverridable self.buildNodePackage {
name = "handlebars-1.3.0";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/handlebars/-/handlebars-1.3.0.tgz";
@@ -7906,10 +8456,10 @@
];
buildInputs =
(self.nativeDeps."handlebars" or []);
- deps = [
- self.by-version."optimist"."0.3.7"
- self.by-version."uglify-js"."2.3.6"
- ];
+ deps = {
+ "optimist-0.3.7" = self.by-version."optimist"."0.3.7";
+ "uglify-js-2.3.6" = self.by-version."uglify-js"."2.3.6";
+ };
peerDependencies = [
];
passthru.names = [ "handlebars" ];
@@ -7918,6 +8468,7 @@
self.by-version."has-ansi"."0.1.0";
by-version."has-ansi"."0.1.0" = lib.makeOverridable self.buildNodePackage {
name = "has-ansi-0.1.0";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz";
@@ -7927,9 +8478,9 @@
];
buildInputs =
(self.nativeDeps."has-ansi" or []);
- deps = [
- self.by-version."ansi-regex"."0.2.1"
- ];
+ deps = {
+ "ansi-regex-0.2.1" = self.by-version."ansi-regex"."0.2.1";
+ };
peerDependencies = [
];
passthru.names = [ "has-ansi" ];
@@ -7937,7 +8488,8 @@
by-spec."has-color"."~0.1.0" =
self.by-version."has-color"."0.1.7";
by-version."has-color"."0.1.7" = lib.makeOverridable self.buildNodePackage {
- name = "node-has-color-0.1.7";
+ name = "has-color-0.1.7";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz";
@@ -7947,8 +8499,8 @@
];
buildInputs =
(self.nativeDeps."has-color" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "has-color" ];
@@ -7956,7 +8508,8 @@
by-spec."hasher"."~1.2.0" =
self.by-version."hasher"."1.2.0";
by-version."hasher"."1.2.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-hasher-1.2.0";
+ name = "hasher-1.2.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/hasher/-/hasher-1.2.0.tgz";
@@ -7966,9 +8519,9 @@
];
buildInputs =
(self.nativeDeps."hasher" or []);
- deps = [
- self.by-version."signals"."1.0.0"
- ];
+ deps = {
+ "signals-1.0.0" = self.by-version."signals"."1.0.0";
+ };
peerDependencies = [
];
passthru.names = [ "hasher" ];
@@ -7976,7 +8529,8 @@
by-spec."hashring"."1.0.1" =
self.by-version."hashring"."1.0.1";
by-version."hashring"."1.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-hashring-1.0.1";
+ name = "hashring-1.0.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/hashring/-/hashring-1.0.1.tgz";
@@ -7986,10 +8540,10 @@
];
buildInputs =
(self.nativeDeps."hashring" or []);
- deps = [
- self.by-version."connection-parse"."0.0.7"
- self.by-version."simple-lru-cache"."0.0.1"
- ];
+ deps = {
+ "connection-parse-0.0.7" = self.by-version."connection-parse"."0.0.7";
+ "simple-lru-cache-0.0.1" = self.by-version."simple-lru-cache"."0.0.1";
+ };
peerDependencies = [
];
passthru.names = [ "hashring" ];
@@ -7997,7 +8551,8 @@
by-spec."hat"."*" =
self.by-version."hat"."0.0.3";
by-version."hat"."0.0.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-hat-0.0.3";
+ name = "hat-0.0.3";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/hat/-/hat-0.0.3.tgz";
@@ -8007,8 +8562,8 @@
];
buildInputs =
(self.nativeDeps."hat" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "hat" ];
@@ -8016,7 +8571,8 @@
by-spec."hawk"."1.1.1" =
self.by-version."hawk"."1.1.1";
by-version."hawk"."1.1.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-hawk-1.1.1";
+ name = "hawk-1.1.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz";
@@ -8026,12 +8582,12 @@
];
buildInputs =
(self.nativeDeps."hawk" or []);
- deps = [
- self.by-version."hoek"."0.9.1"
- self.by-version."boom"."0.4.2"
- self.by-version."cryptiles"."0.2.2"
- self.by-version."sntp"."0.2.4"
- ];
+ deps = {
+ "hoek-0.9.1" = self.by-version."hoek"."0.9.1";
+ "boom-0.4.2" = self.by-version."boom"."0.4.2";
+ "cryptiles-0.2.2" = self.by-version."cryptiles"."0.2.2";
+ "sntp-0.2.4" = self.by-version."sntp"."0.2.4";
+ };
peerDependencies = [
];
passthru.names = [ "hawk" ];
@@ -8039,7 +8595,8 @@
by-spec."hawk"."~0.10.2" =
self.by-version."hawk"."0.10.2";
by-version."hawk"."0.10.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-hawk-0.10.2";
+ name = "hawk-0.10.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/hawk/-/hawk-0.10.2.tgz";
@@ -8049,12 +8606,12 @@
];
buildInputs =
(self.nativeDeps."hawk" or []);
- deps = [
- self.by-version."hoek"."0.7.6"
- self.by-version."boom"."0.3.8"
- self.by-version."cryptiles"."0.1.3"
- self.by-version."sntp"."0.1.4"
- ];
+ deps = {
+ "hoek-0.7.6" = self.by-version."hoek"."0.7.6";
+ "boom-0.3.8" = self.by-version."boom"."0.3.8";
+ "cryptiles-0.1.3" = self.by-version."cryptiles"."0.1.3";
+ "sntp-0.1.4" = self.by-version."sntp"."0.1.4";
+ };
peerDependencies = [
];
passthru.names = [ "hawk" ];
@@ -8062,7 +8619,8 @@
by-spec."hawk"."~1.0.0" =
self.by-version."hawk"."1.0.0";
by-version."hawk"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-hawk-1.0.0";
+ name = "hawk-1.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz";
@@ -8072,12 +8630,12 @@
];
buildInputs =
(self.nativeDeps."hawk" or []);
- deps = [
- self.by-version."hoek"."0.9.1"
- self.by-version."boom"."0.4.2"
- self.by-version."cryptiles"."0.2.2"
- self.by-version."sntp"."0.2.4"
- ];
+ deps = {
+ "hoek-0.9.1" = self.by-version."hoek"."0.9.1";
+ "boom-0.4.2" = self.by-version."boom"."0.4.2";
+ "cryptiles-0.2.2" = self.by-version."cryptiles"."0.2.2";
+ "sntp-0.2.4" = self.by-version."sntp"."0.2.4";
+ };
peerDependencies = [
];
passthru.names = [ "hawk" ];
@@ -8086,6 +8644,7 @@
self.by-version."he"."0.3.6";
by-version."he"."0.3.6" = lib.makeOverridable self.buildNodePackage {
name = "he-0.3.6";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/he/-/he-0.3.6.tgz";
@@ -8095,8 +8654,8 @@
];
buildInputs =
(self.nativeDeps."he" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "he" ];
@@ -8105,6 +8664,7 @@
self.by-version."hipache"."0.3.1";
by-version."hipache"."0.3.1" = lib.makeOverridable self.buildNodePackage {
name = "hipache-0.3.1";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/hipache/-/hipache-0.3.1.tgz";
@@ -8114,12 +8674,12 @@
];
buildInputs =
(self.nativeDeps."hipache" or []);
- deps = [
- self.by-version."http-proxy"."1.0.2"
- self.by-version."redis"."0.10.3"
- self.by-version."lru-cache"."2.5.0"
- self.by-version."minimist"."0.0.8"
- ];
+ deps = {
+ "http-proxy-1.0.2" = self.by-version."http-proxy"."1.0.2";
+ "redis-0.10.3" = self.by-version."redis"."0.10.3";
+ "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0";
+ "minimist-0.0.8" = self.by-version."minimist"."0.0.8";
+ };
peerDependencies = [
];
passthru.names = [ "hipache" ];
@@ -8128,7 +8688,8 @@
by-spec."hiredis"."*" =
self.by-version."hiredis"."0.1.17";
by-version."hiredis"."0.1.17" = lib.makeOverridable self.buildNodePackage {
- name = "node-hiredis-0.1.17";
+ name = "hiredis-0.1.17";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/hiredis/-/hiredis-0.1.17.tgz";
@@ -8138,10 +8699,10 @@
];
buildInputs =
(self.nativeDeps."hiredis" or []);
- deps = [
- self.by-version."bindings"."1.2.1"
- self.by-version."nan"."1.1.2"
- ];
+ deps = {
+ "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
+ "nan-1.1.2" = self.by-version."nan"."1.1.2";
+ };
peerDependencies = [
];
passthru.names = [ "hiredis" ];
@@ -8149,7 +8710,8 @@
by-spec."hoek"."0.7.x" =
self.by-version."hoek"."0.7.6";
by-version."hoek"."0.7.6" = lib.makeOverridable self.buildNodePackage {
- name = "node-hoek-0.7.6";
+ name = "hoek-0.7.6";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/hoek/-/hoek-0.7.6.tgz";
@@ -8159,8 +8721,8 @@
];
buildInputs =
(self.nativeDeps."hoek" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "hoek" ];
@@ -8168,7 +8730,8 @@
by-spec."hoek"."0.9.x" =
self.by-version."hoek"."0.9.1";
by-version."hoek"."0.9.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-hoek-0.9.1";
+ name = "hoek-0.9.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz";
@@ -8178,8 +8741,8 @@
];
buildInputs =
(self.nativeDeps."hoek" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "hoek" ];
@@ -8187,7 +8750,8 @@
by-spec."hooker"."~0.2.3" =
self.by-version."hooker"."0.2.3";
by-version."hooker"."0.2.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-hooker-0.2.3";
+ name = "hooker-0.2.3";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz";
@@ -8197,8 +8761,8 @@
];
buildInputs =
(self.nativeDeps."hooker" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "hooker" ];
@@ -8206,7 +8770,8 @@
by-spec."hooks"."0.2.1" =
self.by-version."hooks"."0.2.1";
by-version."hooks"."0.2.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-hooks-0.2.1";
+ name = "hooks-0.2.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/hooks/-/hooks-0.2.1.tgz";
@@ -8216,8 +8781,8 @@
];
buildInputs =
(self.nativeDeps."hooks" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "hooks" ];
@@ -8225,7 +8790,8 @@
by-spec."htmlparser2"."3.7.x" =
self.by-version."htmlparser2"."3.7.3";
by-version."htmlparser2"."3.7.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-htmlparser2-3.7.3";
+ name = "htmlparser2-3.7.3";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.7.3.tgz";
@@ -8235,13 +8801,13 @@
];
buildInputs =
(self.nativeDeps."htmlparser2" or []);
- deps = [
- self.by-version."domhandler"."2.2.0"
- self.by-version."domutils"."1.5.0"
- self.by-version."domelementtype"."1.1.1"
- self.by-version."readable-stream"."1.1.13"
- self.by-version."entities"."1.0.0"
- ];
+ deps = {
+ "domhandler-2.2.0" = self.by-version."domhandler"."2.2.0";
+ "domutils-1.5.0" = self.by-version."domutils"."1.5.0";
+ "domelementtype-1.1.1" = self.by-version."domelementtype"."1.1.1";
+ "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+ "entities-1.0.0" = self.by-version."entities"."1.0.0";
+ };
peerDependencies = [
];
passthru.names = [ "htmlparser2" ];
@@ -8249,7 +8815,8 @@
by-spec."http-auth"."2.0.7" =
self.by-version."http-auth"."2.0.7";
by-version."http-auth"."2.0.7" = lib.makeOverridable self.buildNodePackage {
- name = "node-http-auth-2.0.7";
+ name = "http-auth-2.0.7";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/http-auth/-/http-auth-2.0.7.tgz";
@@ -8259,31 +8826,32 @@
];
buildInputs =
(self.nativeDeps."http-auth" or []);
- deps = [
- self.by-version."coffee-script"."1.6.3"
- self.by-version."node-uuid"."1.4.1"
- ];
+ deps = {
+ "coffee-script-1.6.3" = self.by-version."coffee-script"."1.6.3";
+ "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1";
+ };
peerDependencies = [
];
passthru.names = [ "http-auth" ];
};
by-spec."http-browserify"."^1.4.0" =
- self.by-version."http-browserify"."1.5.0";
- by-version."http-browserify"."1.5.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-http-browserify-1.5.0";
+ self.by-version."http-browserify"."1.7.0";
+ by-version."http-browserify"."1.7.0" = lib.makeOverridable self.buildNodePackage {
+ name = "http-browserify-1.7.0";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/http-browserify/-/http-browserify-1.5.0.tgz";
- name = "http-browserify-1.5.0.tgz";
- sha1 = "9ecc18daa92289793fed28f9f14b0a0ce6f98040";
+ url = "http://registry.npmjs.org/http-browserify/-/http-browserify-1.7.0.tgz";
+ name = "http-browserify-1.7.0.tgz";
+ sha1 = "33795ade72df88acfbfd36773cefeda764735b20";
})
];
buildInputs =
(self.nativeDeps."http-browserify" or []);
- deps = [
- self.by-version."Base64"."0.2.1"
- self.by-version."inherits"."2.0.1"
- ];
+ deps = {
+ "Base64-0.2.1" = self.by-version."Base64"."0.2.1";
+ "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+ };
peerDependencies = [
];
passthru.names = [ "http-browserify" ];
@@ -8291,7 +8859,8 @@
by-spec."http-proxy"."1.0.2" =
self.by-version."http-proxy"."1.0.2";
by-version."http-proxy"."1.0.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-http-proxy-1.0.2";
+ name = "http-proxy-1.0.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/http-proxy/-/http-proxy-1.0.2.tgz";
@@ -8301,9 +8870,9 @@
];
buildInputs =
(self.nativeDeps."http-proxy" or []);
- deps = [
- self.by-version."eventemitter3"."0.1.4"
- ];
+ deps = {
+ "eventemitter3-0.1.5" = self.by-version."eventemitter3"."0.1.5";
+ };
peerDependencies = [
];
passthru.names = [ "http-proxy" ];
@@ -8312,6 +8881,7 @@
self.by-version."http-proxy"."0.10.4";
by-version."http-proxy"."0.10.4" = lib.makeOverridable self.buildNodePackage {
name = "http-proxy-0.10.4";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/http-proxy/-/http-proxy-0.10.4.tgz";
@@ -8321,12 +8891,12 @@
];
buildInputs =
(self.nativeDeps."http-proxy" or []);
- deps = [
- self.by-version."colors"."0.6.2"
- self.by-version."optimist"."0.6.1"
- self.by-version."pkginfo"."0.3.0"
- self.by-version."utile"."0.2.1"
- ];
+ deps = {
+ "colors-0.6.2" = self.by-version."colors"."0.6.2";
+ "optimist-0.6.1" = self.by-version."optimist"."0.6.1";
+ "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0";
+ "utile-0.2.1" = self.by-version."utile"."0.2.1";
+ };
peerDependencies = [
];
passthru.names = [ "http-proxy" ];
@@ -8334,7 +8904,8 @@
by-spec."http-signature"."0.9.11" =
self.by-version."http-signature"."0.9.11";
by-version."http-signature"."0.9.11" = lib.makeOverridable self.buildNodePackage {
- name = "node-http-signature-0.9.11";
+ name = "http-signature-0.9.11";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/http-signature/-/http-signature-0.9.11.tgz";
@@ -8344,11 +8915,11 @@
];
buildInputs =
(self.nativeDeps."http-signature" or []);
- deps = [
- self.by-version."assert-plus"."0.1.2"
- self.by-version."asn1"."0.1.11"
- self.by-version."ctype"."0.5.2"
- ];
+ deps = {
+ "assert-plus-0.1.2" = self.by-version."assert-plus"."0.1.2";
+ "asn1-0.1.11" = self.by-version."asn1"."0.1.11";
+ "ctype-0.5.2" = self.by-version."ctype"."0.5.2";
+ };
peerDependencies = [
];
passthru.names = [ "http-signature" ];
@@ -8356,7 +8927,8 @@
by-spec."http-signature"."~0.10.0" =
self.by-version."http-signature"."0.10.0";
by-version."http-signature"."0.10.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-http-signature-0.10.0";
+ name = "http-signature-0.10.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/http-signature/-/http-signature-0.10.0.tgz";
@@ -8366,11 +8938,11 @@
];
buildInputs =
(self.nativeDeps."http-signature" or []);
- deps = [
- self.by-version."assert-plus"."0.1.2"
- self.by-version."asn1"."0.1.11"
- self.by-version."ctype"."0.5.2"
- ];
+ deps = {
+ "assert-plus-0.1.2" = self.by-version."assert-plus"."0.1.2";
+ "asn1-0.1.11" = self.by-version."asn1"."0.1.11";
+ "ctype-0.5.2" = self.by-version."ctype"."0.5.2";
+ };
peerDependencies = [
];
passthru.names = [ "http-signature" ];
@@ -8378,7 +8950,8 @@
by-spec."https-browserify"."~0.0.0" =
self.by-version."https-browserify"."0.0.0";
by-version."https-browserify"."0.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-https-browserify-0.0.0";
+ name = "https-browserify-0.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/https-browserify/-/https-browserify-0.0.0.tgz";
@@ -8388,8 +8961,8 @@
];
buildInputs =
(self.nativeDeps."https-browserify" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "https-browserify" ];
@@ -8397,7 +8970,8 @@
by-spec."humanize"."~0.0.9" =
self.by-version."humanize"."0.0.9";
by-version."humanize"."0.0.9" = lib.makeOverridable self.buildNodePackage {
- name = "node-humanize-0.0.9";
+ name = "humanize-0.0.9";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/humanize/-/humanize-0.0.9.tgz";
@@ -8407,8 +8981,8 @@
];
buildInputs =
(self.nativeDeps."humanize" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "humanize" ];
@@ -8416,7 +8990,8 @@
by-spec."i"."0.3.x" =
self.by-version."i"."0.3.2";
by-version."i"."0.3.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-i-0.3.2";
+ name = "i-0.3.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/i/-/i-0.3.2.tgz";
@@ -8426,8 +9001,8 @@
];
buildInputs =
(self.nativeDeps."i" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "i" ];
@@ -8435,7 +9010,8 @@
by-spec."i18next"."*" =
self.by-version."i18next"."1.7.4";
by-version."i18next"."1.7.4" = lib.makeOverridable self.buildNodePackage {
- name = "node-i18next-1.7.4";
+ name = "i18next-1.7.4";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/i18next/-/i18next-1.7.4.tgz";
@@ -8445,9 +9021,9 @@
];
buildInputs =
(self.nativeDeps."i18next" or []);
- deps = [
- self.by-version."cookies"."0.5.0"
- ];
+ deps = {
+ "cookies-0.5.0" = self.by-version."cookies"."0.5.0";
+ };
peerDependencies = [
];
passthru.names = [ "i18next" ];
@@ -8457,6 +9033,7 @@
self.by-version."ibrik"."1.1.1";
by-version."ibrik"."1.1.1" = lib.makeOverridable self.buildNodePackage {
name = "ibrik-1.1.1";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/ibrik/-/ibrik-1.1.1.tgz";
@@ -8466,43 +9043,25 @@
];
buildInputs =
(self.nativeDeps."ibrik" or []);
- deps = [
- self.by-version."lodash"."2.4.1"
- self.by-version."coffee-script-redux"."2.0.0-beta8"
- self.by-version."istanbul"."0.2.16"
- self.by-version."estraverse"."1.5.1"
- self.by-version."escodegen"."1.1.0"
- self.by-version."which"."1.0.5"
- self.by-version."mkdirp"."0.3.5"
- self.by-version."optimist"."0.6.1"
- ];
+ deps = {
+ "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
+ "coffee-script-redux-2.0.0-beta8" = self.by-version."coffee-script-redux"."2.0.0-beta8";
+ "istanbul-0.2.16" = self.by-version."istanbul"."0.2.16";
+ "estraverse-1.5.1" = self.by-version."estraverse"."1.5.1";
+ "escodegen-1.1.0" = self.by-version."escodegen"."1.1.0";
+ "which-1.0.5" = self.by-version."which"."1.0.5";
+ "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
+ "optimist-0.6.1" = self.by-version."optimist"."0.6.1";
+ };
peerDependencies = [
];
passthru.names = [ "ibrik" ];
};
- by-spec."iconv-lite"."0.4.3" =
- self.by-version."iconv-lite"."0.4.3";
- by-version."iconv-lite"."0.4.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-iconv-lite-0.4.3";
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.3.tgz";
- name = "iconv-lite-0.4.3.tgz";
- sha1 = "9e7887793b769cc695eb22d2546a4fd2d79b7a1e";
- })
- ];
- buildInputs =
- (self.nativeDeps."iconv-lite" or []);
- deps = [
- ];
- peerDependencies = [
- ];
- passthru.names = [ "iconv-lite" ];
- };
by-spec."iconv-lite"."0.4.4" =
self.by-version."iconv-lite"."0.4.4";
by-version."iconv-lite"."0.4.4" = lib.makeOverridable self.buildNodePackage {
- name = "node-iconv-lite-0.4.4";
+ name = "iconv-lite-0.4.4";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.4.tgz";
@@ -8512,8 +9071,8 @@
];
buildInputs =
(self.nativeDeps."iconv-lite" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "iconv-lite" ];
@@ -8521,7 +9080,8 @@
by-spec."iconv-lite"."~0.2.11" =
self.by-version."iconv-lite"."0.2.11";
by-version."iconv-lite"."0.2.11" = lib.makeOverridable self.buildNodePackage {
- name = "node-iconv-lite-0.2.11";
+ name = "iconv-lite-0.2.11";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz";
@@ -8531,29 +9091,30 @@
];
buildInputs =
(self.nativeDeps."iconv-lite" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "iconv-lite" ];
};
by-spec."iconv-lite"."~0.4.3" =
self.by-version."iconv-lite"."0.4.4";
- by-spec."ieee754"."~1.1.1" =
- self.by-version."ieee754"."1.1.3";
- by-version."ieee754"."1.1.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-ieee754-1.1.3";
+ by-spec."ieee754"."^1.1.4" =
+ self.by-version."ieee754"."1.1.4";
+ by-version."ieee754"."1.1.4" = lib.makeOverridable self.buildNodePackage {
+ name = "ieee754-1.1.4";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/ieee754/-/ieee754-1.1.3.tgz";
- name = "ieee754-1.1.3.tgz";
- sha1 = "1d4baae872e15ba69f6ab7588a965e09d485ec50";
+ url = "http://registry.npmjs.org/ieee754/-/ieee754-1.1.4.tgz";
+ name = "ieee754-1.1.4.tgz";
+ sha1 = "e3ec65200d4ad531d359aabdb6d3ec812699a30b";
})
];
buildInputs =
(self.nativeDeps."ieee754" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "ieee754" ];
@@ -8561,7 +9122,8 @@
by-spec."indexof"."0.0.1" =
self.by-version."indexof"."0.0.1";
by-version."indexof"."0.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-indexof-0.0.1";
+ name = "indexof-0.0.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz";
@@ -8571,28 +9133,30 @@
];
buildInputs =
(self.nativeDeps."indexof" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "indexof" ];
};
- by-spec."inflight"."~1.0.1" =
- self.by-version."inflight"."1.0.1";
- by-version."inflight"."1.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-inflight-1.0.1";
+ by-spec."inflight"."~1.0.3" =
+ self.by-version."inflight"."1.0.4";
+ by-version."inflight"."1.0.4" = lib.makeOverridable self.buildNodePackage {
+ name = "inflight-1.0.4";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/inflight/-/inflight-1.0.1.tgz";
- name = "inflight-1.0.1.tgz";
- sha1 = "01f6911821535243c790ac0f998f54e9023ffb6f";
+ url = "http://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz";
+ name = "inflight-1.0.4.tgz";
+ sha1 = "6cbb4521ebd51ce0ec0a936bfd7657ef7e9b172a";
})
];
buildInputs =
(self.nativeDeps."inflight" or []);
- deps = [
- self.by-version."once"."1.3.0"
- ];
+ deps = {
+ "once-1.3.1" = self.by-version."once"."1.3.1";
+ "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1";
+ };
peerDependencies = [
];
passthru.names = [ "inflight" ];
@@ -8600,7 +9164,8 @@
by-spec."inherits"."1" =
self.by-version."inherits"."1.0.0";
by-version."inherits"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-inherits-1.0.0";
+ name = "inherits-1.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz";
@@ -8610,8 +9175,8 @@
];
buildInputs =
(self.nativeDeps."inherits" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "inherits" ];
@@ -8621,7 +9186,8 @@
by-spec."inherits"."2" =
self.by-version."inherits"."2.0.1";
by-version."inherits"."2.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-inherits-2.0.1";
+ name = "inherits-2.0.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz";
@@ -8631,8 +9197,8 @@
];
buildInputs =
(self.nativeDeps."inherits" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "inherits" ];
@@ -8648,32 +9214,34 @@
by-spec."inherits"."~2.0.1" =
self.by-version."inherits"."2.0.1";
by-spec."ini"."1" =
- self.by-version."ini"."1.2.1";
- by-version."ini"."1.2.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-ini-1.2.1";
+ self.by-version."ini"."1.3.0";
+ by-version."ini"."1.3.0" = lib.makeOverridable self.buildNodePackage {
+ name = "ini-1.3.0";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/ini/-/ini-1.2.1.tgz";
- name = "ini-1.2.1.tgz";
- sha1 = "7f774e2f22752cd1dacbf9c63323df2a164ebca3";
+ url = "http://registry.npmjs.org/ini/-/ini-1.3.0.tgz";
+ name = "ini-1.3.0.tgz";
+ sha1 = "625483e56c643a7721014c76604d3353f44bd429";
})
];
buildInputs =
(self.nativeDeps."ini" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "ini" ];
};
by-spec."ini"."1.x.x" =
- self.by-version."ini"."1.2.1";
+ self.by-version."ini"."1.3.0";
by-spec."ini"."^1.2.0" =
- self.by-version."ini"."1.2.1";
+ self.by-version."ini"."1.3.0";
by-spec."ini"."~1.1.0" =
self.by-version."ini"."1.1.0";
by-version."ini"."1.1.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-ini-1.1.0";
+ name = "ini-1.1.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/ini/-/ini-1.1.0.tgz";
@@ -8683,34 +9251,53 @@
];
buildInputs =
(self.nativeDeps."ini" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "ini" ];
};
by-spec."ini"."~1.2.0" =
self.by-version."ini"."1.2.1";
- by-spec."init-package-json"."~0.1.1" =
- self.by-version."init-package-json"."0.1.2";
- by-version."init-package-json"."0.1.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-init-package-json-0.1.2";
+ by-version."ini"."1.2.1" = lib.makeOverridable self.buildNodePackage {
+ name = "ini-1.2.1";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/init-package-json/-/init-package-json-0.1.2.tgz";
- name = "init-package-json-0.1.2.tgz";
- sha1 = "9e232ccae0d5cf712cd7773b0f1fcd59b7edc2da";
+ url = "http://registry.npmjs.org/ini/-/ini-1.2.1.tgz";
+ name = "ini-1.2.1.tgz";
+ sha1 = "7f774e2f22752cd1dacbf9c63323df2a164ebca3";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."ini" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "ini" ];
+ };
+ by-spec."init-package-json"."~1.1.0" =
+ self.by-version."init-package-json"."1.1.0";
+ by-version."init-package-json"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+ name = "init-package-json-1.1.0";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/init-package-json/-/init-package-json-1.1.0.tgz";
+ name = "init-package-json-1.1.0.tgz";
+ sha1 = "fea80c641974421ddd4c6169c3a911118b116d5c";
})
];
buildInputs =
(self.nativeDeps."init-package-json" or []);
- deps = [
- self.by-version."glob"."4.0.5"
- self.by-version."promzard"."0.2.2"
- self.by-version."read"."1.0.5"
- self.by-version."read-package-json"."1.2.6"
- self.by-version."semver"."3.0.1"
- ];
+ deps = {
+ "glob-4.0.6" = self.by-version."glob"."4.0.6";
+ "promzard-0.2.2" = self.by-version."promzard"."0.2.2";
+ "read-1.0.5" = self.by-version."read"."1.0.5";
+ "read-package-json-1.2.7" = self.by-version."read-package-json"."1.2.7";
+ "semver-4.0.3" = self.by-version."semver"."4.0.3";
+ };
peerDependencies = [
];
passthru.names = [ "init-package-json" ];
@@ -8718,7 +9305,8 @@
by-spec."inline-source-map"."~0.3.0" =
self.by-version."inline-source-map"."0.3.0";
by-version."inline-source-map"."0.3.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-inline-source-map-0.3.0";
+ name = "inline-source-map-0.3.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/inline-source-map/-/inline-source-map-0.3.0.tgz";
@@ -8728,9 +9316,9 @@
];
buildInputs =
(self.nativeDeps."inline-source-map" or []);
- deps = [
- self.by-version."source-map"."0.1.38"
- ];
+ deps = {
+ "source-map-0.1.40" = self.by-version."source-map"."0.1.40";
+ };
peerDependencies = [
];
passthru.names = [ "inline-source-map" ];
@@ -8739,6 +9327,7 @@
self.by-version."insert-module-globals"."6.1.0";
by-version."insert-module-globals"."6.1.0" = lib.makeOverridable self.buildNodePackage {
name = "insert-module-globals-6.1.0";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/insert-module-globals/-/insert-module-globals-6.1.0.tgz";
@@ -8748,22 +9337,43 @@
];
buildInputs =
(self.nativeDeps."insert-module-globals" or []);
- deps = [
- self.by-version."JSONStream"."0.7.4"
- self.by-version."concat-stream"."1.4.6"
- self.by-version."lexical-scope"."1.1.0"
- self.by-version."process"."0.6.0"
- self.by-version."through"."2.3.4"
- self.by-version."xtend"."3.0.0"
- ];
+ deps = {
+ "JSONStream-0.7.4" = self.by-version."JSONStream"."0.7.4";
+ "concat-stream-1.4.6" = self.by-version."concat-stream"."1.4.6";
+ "lexical-scope-1.1.0" = self.by-version."lexical-scope"."1.1.0";
+ "process-0.6.0" = self.by-version."process"."0.6.0";
+ "through-2.3.6" = self.by-version."through"."2.3.6";
+ "xtend-3.0.0" = self.by-version."xtend"."3.0.0";
+ };
peerDependencies = [
];
passthru.names = [ "insert-module-globals" ];
};
+ by-spec."interpret"."^0.3.2" =
+ self.by-version."interpret"."0.3.7";
+ by-version."interpret"."0.3.7" = lib.makeOverridable self.buildNodePackage {
+ name = "interpret-0.3.7";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/interpret/-/interpret-0.3.7.tgz";
+ name = "interpret-0.3.7.tgz";
+ sha1 = "18727eda04d50632ffa4b5eafb342b7ff398b36e";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."interpret" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "interpret" ];
+ };
by-spec."ipaddr.js"."0.1.2" =
self.by-version."ipaddr.js"."0.1.2";
by-version."ipaddr.js"."0.1.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-ipaddr.js-0.1.2";
+ name = "ipaddr.js-0.1.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.2.tgz";
@@ -8773,8 +9383,28 @@
];
buildInputs =
(self.nativeDeps."ipaddr.js" or []);
- deps = [
+ deps = {
+ };
+ peerDependencies = [
];
+ passthru.names = [ "ipaddr.js" ];
+ };
+ by-spec."ipaddr.js"."0.1.3" =
+ self.by-version."ipaddr.js"."0.1.3";
+ by-version."ipaddr.js"."0.1.3" = lib.makeOverridable self.buildNodePackage {
+ name = "ipaddr.js-0.1.3";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.3.tgz";
+ name = "ipaddr.js-0.1.3.tgz";
+ sha1 = "27a9ca37f148d2102b0ef191ccbf2c51a8f025c6";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."ipaddr.js" or []);
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "ipaddr.js" ];
@@ -8782,7 +9412,8 @@
by-spec."ironhorse"."*" =
self.by-version."ironhorse"."0.0.10";
by-version."ironhorse"."0.0.10" = lib.makeOverridable self.buildNodePackage {
- name = "node-ironhorse-0.0.10";
+ name = "ironhorse-0.0.10";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/ironhorse/-/ironhorse-0.0.10.tgz";
@@ -8792,33 +9423,54 @@
];
buildInputs =
(self.nativeDeps."ironhorse" or []);
- deps = [
- self.by-version."underscore"."1.5.2"
- self.by-version."winston"."0.7.3"
- self.by-version."nconf"."0.6.9"
- self.by-version."fs-walk"."0.0.1"
- self.by-version."async"."0.9.0"
- self.by-version."express"."4.8.5"
- self.by-version."jade"."1.5.0"
- self.by-version."passport"."0.2.0"
- self.by-version."passport-http"."0.2.2"
- self.by-version."js-yaml"."3.1.0"
- self.by-version."mongoose"."3.8.15"
- self.by-version."gridfs-stream"."0.5.1"
- self.by-version."temp"."0.8.1"
- self.by-version."kue"."0.8.5"
- self.by-version."redis"."0.12.1"
- self.by-version."hiredis"."0.1.17"
- ];
+ deps = {
+ "underscore-1.5.2" = self.by-version."underscore"."1.5.2";
+ "winston-0.8.0" = self.by-version."winston"."0.8.0";
+ "nconf-0.6.9" = self.by-version."nconf"."0.6.9";
+ "fs-walk-0.0.1" = self.by-version."fs-walk"."0.0.1";
+ "async-0.9.0" = self.by-version."async"."0.9.0";
+ "express-4.9.5" = self.by-version."express"."4.9.5";
+ "jade-1.7.0" = self.by-version."jade"."1.7.0";
+ "passport-0.2.1" = self.by-version."passport"."0.2.1";
+ "passport-http-0.2.2" = self.by-version."passport-http"."0.2.2";
+ "js-yaml-3.2.2" = self.by-version."js-yaml"."3.2.2";
+ "mongoose-3.8.17" = self.by-version."mongoose"."3.8.17";
+ "gridfs-stream-0.5.1" = self.by-version."gridfs-stream"."0.5.1";
+ "temp-0.8.1" = self.by-version."temp"."0.8.1";
+ "kue-0.8.9" = self.by-version."kue"."0.8.9";
+ "redis-0.12.1" = self.by-version."redis"."0.12.1";
+ "hiredis-0.1.17" = self.by-version."hiredis"."0.1.17";
+ };
peerDependencies = [
];
passthru.names = [ "ironhorse" ];
};
"ironhorse" = self.by-version."ironhorse"."0.0.10";
+ by-spec."is-array"."^1.0.1" =
+ self.by-version."is-array"."1.0.1";
+ by-version."is-array"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+ name = "is-array-1.0.1";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/is-array/-/is-array-1.0.1.tgz";
+ name = "is-array-1.0.1.tgz";
+ sha1 = "e9850cc2cc860c3bc0977e84ccf0dd464584279a";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."is-array" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "is-array" ];
+ };
by-spec."is-promise"."~1" =
self.by-version."is-promise"."1.0.1";
by-version."is-promise"."1.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-is-promise-1.0.1";
+ name = "is-promise-1.0.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/is-promise/-/is-promise-1.0.1.tgz";
@@ -8828,8 +9480,8 @@
];
buildInputs =
(self.nativeDeps."is-promise" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "is-promise" ];
@@ -8837,7 +9489,8 @@
by-spec."is-utf8"."^0.2.0" =
self.by-version."is-utf8"."0.2.0";
by-version."is-utf8"."0.2.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-is-utf8-0.2.0";
+ name = "is-utf8-0.2.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz";
@@ -8847,8 +9500,8 @@
];
buildInputs =
(self.nativeDeps."is-utf8" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "is-utf8" ];
@@ -8856,7 +9509,8 @@
by-spec."isarray"."0.0.1" =
self.by-version."isarray"."0.0.1";
by-version."isarray"."0.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-isarray-0.0.1";
+ name = "isarray-0.0.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz";
@@ -8866,70 +9520,53 @@
];
buildInputs =
(self.nativeDeps."isarray" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "isarray" ];
};
by-spec."isarray"."~0.0.1" =
self.by-version."isarray"."0.0.1";
- by-spec."isbinaryfile"."~2.0.0" =
- self.by-version."isbinaryfile"."2.0.1";
- by-version."isbinaryfile"."2.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-isbinaryfile-2.0.1";
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/isbinaryfile/-/isbinaryfile-2.0.1.tgz";
- name = "isbinaryfile-2.0.1.tgz";
- sha1 = "b92369bfdaf616027133e077c5ba145f36699d55";
- })
- ];
- buildInputs =
- (self.nativeDeps."isbinaryfile" or []);
- deps = [
- ];
- peerDependencies = [
- ];
- passthru.names = [ "isbinaryfile" ];
- };
by-spec."istanbul"."*" =
- self.by-version."istanbul"."0.3.0";
- by-version."istanbul"."0.3.0" = lib.makeOverridable self.buildNodePackage {
- name = "istanbul-0.3.0";
+ self.by-version."istanbul"."0.3.2";
+ by-version."istanbul"."0.3.2" = lib.makeOverridable self.buildNodePackage {
+ name = "istanbul-0.3.2";
+ bin = true;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/istanbul/-/istanbul-0.3.0.tgz";
- name = "istanbul-0.3.0.tgz";
- sha1 = "5b7179104942adbb0ec3e140d5e3d071db55abbd";
+ url = "http://registry.npmjs.org/istanbul/-/istanbul-0.3.2.tgz";
+ name = "istanbul-0.3.2.tgz";
+ sha1 = "e1ce9a9ec80d51dcbbeca82149f3befdc21d6835";
})
];
buildInputs =
(self.nativeDeps."istanbul" or []);
- deps = [
- self.by-version."esprima"."1.2.2"
- self.by-version."escodegen"."1.3.3"
- self.by-version."handlebars"."1.3.0"
- self.by-version."mkdirp"."0.5.0"
- self.by-version."nopt"."3.0.1"
- self.by-version."fileset"."0.1.5"
- self.by-version."which"."1.0.5"
- self.by-version."async"."0.9.0"
- self.by-version."abbrev"."1.0.5"
- self.by-version."wordwrap"."0.0.2"
- self.by-version."resolve"."0.7.4"
- self.by-version."js-yaml"."3.1.0"
- self.by-version."once"."1.3.0"
- ];
+ deps = {
+ "esprima-1.2.2" = self.by-version."esprima"."1.2.2";
+ "escodegen-1.3.3" = self.by-version."escodegen"."1.3.3";
+ "handlebars-1.3.0" = self.by-version."handlebars"."1.3.0";
+ "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
+ "nopt-3.0.1" = self.by-version."nopt"."3.0.1";
+ "fileset-0.1.5" = self.by-version."fileset"."0.1.5";
+ "which-1.0.5" = self.by-version."which"."1.0.5";
+ "async-0.9.0" = self.by-version."async"."0.9.0";
+ "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5";
+ "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2";
+ "resolve-0.7.4" = self.by-version."resolve"."0.7.4";
+ "js-yaml-3.2.2" = self.by-version."js-yaml"."3.2.2";
+ "once-1.3.1" = self.by-version."once"."1.3.1";
+ };
peerDependencies = [
];
passthru.names = [ "istanbul" ];
};
- "istanbul" = self.by-version."istanbul"."0.3.0";
+ "istanbul" = self.by-version."istanbul"."0.3.2";
by-spec."istanbul"."~0.2.4" =
self.by-version."istanbul"."0.2.16";
by-version."istanbul"."0.2.16" = lib.makeOverridable self.buildNodePackage {
name = "istanbul-0.2.16";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/istanbul/-/istanbul-0.2.16.tgz";
@@ -8939,57 +9576,60 @@
];
buildInputs =
(self.nativeDeps."istanbul" or []);
- deps = [
- self.by-version."esprima"."1.2.2"
- self.by-version."escodegen"."1.3.3"
- self.by-version."handlebars"."1.3.0"
- self.by-version."mkdirp"."0.5.0"
- self.by-version."nopt"."3.0.1"
- self.by-version."fileset"."0.1.5"
- self.by-version."which"."1.0.5"
- self.by-version."async"."0.9.0"
- self.by-version."abbrev"."1.0.5"
- self.by-version."wordwrap"."0.0.2"
- self.by-version."resolve"."0.7.4"
- self.by-version."js-yaml"."3.1.0"
- ];
+ deps = {
+ "esprima-1.2.2" = self.by-version."esprima"."1.2.2";
+ "escodegen-1.3.3" = self.by-version."escodegen"."1.3.3";
+ "handlebars-1.3.0" = self.by-version."handlebars"."1.3.0";
+ "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
+ "nopt-3.0.1" = self.by-version."nopt"."3.0.1";
+ "fileset-0.1.5" = self.by-version."fileset"."0.1.5";
+ "which-1.0.5" = self.by-version."which"."1.0.5";
+ "async-0.9.0" = self.by-version."async"."0.9.0";
+ "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5";
+ "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2";
+ "resolve-0.7.4" = self.by-version."resolve"."0.7.4";
+ "js-yaml-3.2.2" = self.by-version."js-yaml"."3.2.2";
+ };
peerDependencies = [
];
passthru.names = [ "istanbul" ];
};
by-spec."istanbul"."~0.3.0" =
- self.by-version."istanbul"."0.3.0";
+ self.by-version."istanbul"."0.3.2";
by-spec."jade"."*" =
- self.by-version."jade"."1.5.0";
- by-version."jade"."1.5.0" = lib.makeOverridable self.buildNodePackage {
- name = "jade-1.5.0";
+ self.by-version."jade"."1.7.0";
+ by-version."jade"."1.7.0" = lib.makeOverridable self.buildNodePackage {
+ name = "jade-1.7.0";
+ bin = true;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/jade/-/jade-1.5.0.tgz";
- name = "jade-1.5.0.tgz";
- sha1 = "74a93a5a290e11296c8b919b7a4d72301739b27e";
+ url = "http://registry.npmjs.org/jade/-/jade-1.7.0.tgz";
+ name = "jade-1.7.0.tgz";
+ sha1 = "fa0251e9536cd363034ea88f61e99c7e98991524";
})
];
buildInputs =
(self.nativeDeps."jade" or []);
- deps = [
- self.by-version."commander"."2.1.0"
- self.by-version."mkdirp"."0.5.0"
- self.by-version."transformers"."2.1.0"
- self.by-version."character-parser"."1.2.0"
- self.by-version."monocle"."1.1.51"
- self.by-version."with"."3.0.1"
- self.by-version."constantinople"."2.0.1"
- ];
+ deps = {
+ "character-parser-1.2.0" = self.by-version."character-parser"."1.2.0";
+ "commander-2.1.0" = self.by-version."commander"."2.1.0";
+ "constantinople-2.0.1" = self.by-version."constantinople"."2.0.1";
+ "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
+ "monocle-1.1.51" = self.by-version."monocle"."1.1.51";
+ "transformers-2.1.0" = self.by-version."transformers"."2.1.0";
+ "void-elements-1.0.0" = self.by-version."void-elements"."1.0.0";
+ "with-3.0.1" = self.by-version."with"."3.0.1";
+ };
peerDependencies = [
];
passthru.names = [ "jade" ];
};
- "jade" = self.by-version."jade"."1.5.0";
+ "jade" = self.by-version."jade"."1.7.0";
by-spec."jade"."0.26.3" =
self.by-version."jade"."0.26.3";
by-version."jade"."0.26.3" = lib.makeOverridable self.buildNodePackage {
name = "jade-0.26.3";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/jade/-/jade-0.26.3.tgz";
@@ -8999,10 +9639,10 @@
];
buildInputs =
(self.nativeDeps."jade" or []);
- deps = [
- self.by-version."commander"."0.6.1"
- self.by-version."mkdirp"."0.3.0"
- ];
+ deps = {
+ "commander-0.6.1" = self.by-version."commander"."0.6.1";
+ "mkdirp-0.3.0" = self.by-version."mkdirp"."0.3.0";
+ };
peerDependencies = [
];
passthru.names = [ "jade" ];
@@ -9011,6 +9651,7 @@
self.by-version."jade"."0.27.0";
by-version."jade"."0.27.0" = lib.makeOverridable self.buildNodePackage {
name = "jade-0.27.0";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/jade/-/jade-0.27.0.tgz";
@@ -9020,10 +9661,10 @@
];
buildInputs =
(self.nativeDeps."jade" or []);
- deps = [
- self.by-version."commander"."0.6.1"
- self.by-version."mkdirp"."0.3.0"
- ];
+ deps = {
+ "commander-0.6.1" = self.by-version."commander"."0.6.1";
+ "mkdirp-0.3.0" = self.by-version."mkdirp"."0.3.0";
+ };
peerDependencies = [
];
passthru.names = [ "jade" ];
@@ -9032,6 +9673,7 @@
self.by-version."jade"."1.1.5";
by-version."jade"."1.1.5" = lib.makeOverridable self.buildNodePackage {
name = "jade-1.1.5";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/jade/-/jade-1.1.5.tgz";
@@ -9041,25 +9683,26 @@
];
buildInputs =
(self.nativeDeps."jade" or []);
- deps = [
- self.by-version."commander"."2.1.0"
- self.by-version."mkdirp"."0.3.5"
- self.by-version."transformers"."2.1.0"
- self.by-version."character-parser"."1.2.0"
- self.by-version."monocle"."1.1.51"
- self.by-version."with"."2.0.0"
- self.by-version."constantinople"."1.0.2"
- ];
+ deps = {
+ "commander-2.1.0" = self.by-version."commander"."2.1.0";
+ "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
+ "transformers-2.1.0" = self.by-version."transformers"."2.1.0";
+ "character-parser-1.2.0" = self.by-version."character-parser"."1.2.0";
+ "monocle-1.1.51" = self.by-version."monocle"."1.1.51";
+ "with-2.0.0" = self.by-version."with"."2.0.0";
+ "constantinople-1.0.2" = self.by-version."constantinople"."1.0.2";
+ };
peerDependencies = [
];
passthru.names = [ "jade" ];
};
by-spec."jade".">= 0.0.1" =
- self.by-version."jade"."1.5.0";
+ self.by-version."jade"."1.7.0";
by-spec."jade"."~0.35.0" =
self.by-version."jade"."0.35.0";
by-version."jade"."0.35.0" = lib.makeOverridable self.buildNodePackage {
name = "jade-0.35.0";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/jade/-/jade-0.35.0.tgz";
@@ -9069,66 +9712,69 @@
];
buildInputs =
(self.nativeDeps."jade" or []);
- deps = [
- self.by-version."commander"."2.0.0"
- self.by-version."mkdirp"."0.3.5"
- self.by-version."transformers"."2.1.0"
- self.by-version."character-parser"."1.2.0"
- self.by-version."monocle"."1.1.50"
- self.by-version."with"."1.1.1"
- self.by-version."constantinople"."1.0.2"
- ];
+ deps = {
+ "commander-2.0.0" = self.by-version."commander"."2.0.0";
+ "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
+ "transformers-2.1.0" = self.by-version."transformers"."2.1.0";
+ "character-parser-1.2.0" = self.by-version."character-parser"."1.2.0";
+ "monocle-1.1.50" = self.by-version."monocle"."1.1.50";
+ "with-1.1.1" = self.by-version."with"."1.1.1";
+ "constantinople-1.0.2" = self.by-version."constantinople"."1.0.2";
+ };
peerDependencies = [
];
passthru.names = [ "jade" ];
};
by-spec."jayschema"."*" =
- self.by-version."jayschema"."0.2.8";
- by-version."jayschema"."0.2.8" = lib.makeOverridable self.buildNodePackage {
- name = "jayschema-0.2.8";
+ self.by-version."jayschema"."0.3.1";
+ by-version."jayschema"."0.3.1" = lib.makeOverridable self.buildNodePackage {
+ name = "jayschema-0.3.1";
+ bin = true;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/jayschema/-/jayschema-0.2.8.tgz";
- name = "jayschema-0.2.8.tgz";
- sha1 = "ea7883f501a4cdc7b91f48889f5774ea43159f17";
+ url = "http://registry.npmjs.org/jayschema/-/jayschema-0.3.1.tgz";
+ name = "jayschema-0.3.1.tgz";
+ sha1 = "76f4769f9b172ef7d5dcde4875b49cb736179b58";
})
];
buildInputs =
(self.nativeDeps."jayschema" or []);
- deps = [
- self.by-version."when"."3.1.0"
- ];
+ deps = {
+ "when-3.4.6" = self.by-version."when"."3.4.6";
+ };
peerDependencies = [
];
passthru.names = [ "jayschema" ];
};
- "jayschema" = self.by-version."jayschema"."0.2.8";
+ "jayschema" = self.by-version."jayschema"."0.3.1";
by-spec."js-yaml"."*" =
- self.by-version."js-yaml"."3.1.0";
- by-version."js-yaml"."3.1.0" = lib.makeOverridable self.buildNodePackage {
- name = "js-yaml-3.1.0";
+ self.by-version."js-yaml"."3.2.2";
+ by-version."js-yaml"."3.2.2" = lib.makeOverridable self.buildNodePackage {
+ name = "js-yaml-3.2.2";
+ bin = true;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/js-yaml/-/js-yaml-3.1.0.tgz";
- name = "js-yaml-3.1.0.tgz";
- sha1 = "36ba02e618c50748e772dd352428904cbbadcf44";
+ url = "http://registry.npmjs.org/js-yaml/-/js-yaml-3.2.2.tgz";
+ name = "js-yaml-3.2.2.tgz";
+ sha1 = "a34e77fe8d5e10270e225d21d07790fa17fd2927";
})
];
buildInputs =
(self.nativeDeps."js-yaml" or []);
- deps = [
- self.by-version."argparse"."0.1.15"
- self.by-version."esprima"."1.0.4"
- ];
+ deps = {
+ "argparse-0.1.15" = self.by-version."argparse"."0.1.15";
+ "esprima-1.0.4" = self.by-version."esprima"."1.0.4";
+ };
peerDependencies = [
];
passthru.names = [ "js-yaml" ];
};
- "js-yaml" = self.by-version."js-yaml"."3.1.0";
+ "js-yaml" = self.by-version."js-yaml"."3.2.2";
by-spec."js-yaml"."0.3.x" =
self.by-version."js-yaml"."0.3.7";
by-version."js-yaml"."0.3.7" = lib.makeOverridable self.buildNodePackage {
- name = "node-js-yaml-0.3.7";
+ name = "js-yaml-0.3.7";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/js-yaml/-/js-yaml-0.3.7.tgz";
@@ -9138,8 +9784,8 @@
];
buildInputs =
(self.nativeDeps."js-yaml" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "js-yaml" ];
@@ -9148,6 +9794,7 @@
self.by-version."js-yaml"."2.1.0";
by-version."js-yaml"."2.1.0" = lib.makeOverridable self.buildNodePackage {
name = "js-yaml-2.1.0";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/js-yaml/-/js-yaml-2.1.0.tgz";
@@ -9157,10 +9804,10 @@
];
buildInputs =
(self.nativeDeps."js-yaml" or []);
- deps = [
- self.by-version."argparse"."0.1.15"
- self.by-version."esprima"."1.0.4"
- ];
+ deps = {
+ "argparse-0.1.15" = self.by-version."argparse"."0.1.15";
+ "esprima-1.0.4" = self.by-version."esprima"."1.0.4";
+ };
peerDependencies = [
];
passthru.names = [ "js-yaml" ];
@@ -9169,6 +9816,7 @@
self.by-version."js-yaml"."3.0.1";
by-version."js-yaml"."3.0.1" = lib.makeOverridable self.buildNodePackage {
name = "js-yaml-3.0.1";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/js-yaml/-/js-yaml-3.0.1.tgz";
@@ -9178,20 +9826,21 @@
];
buildInputs =
(self.nativeDeps."js-yaml" or []);
- deps = [
- self.by-version."argparse"."0.1.15"
- self.by-version."esprima"."1.0.4"
- ];
+ deps = {
+ "argparse-0.1.15" = self.by-version."argparse"."0.1.15";
+ "esprima-1.0.4" = self.by-version."esprima"."1.0.4";
+ };
peerDependencies = [
];
passthru.names = [ "js-yaml" ];
};
by-spec."js-yaml"."3.x" =
- self.by-version."js-yaml"."3.1.0";
+ self.by-version."js-yaml"."3.2.2";
by-spec."js-yaml"."~2.0.5" =
self.by-version."js-yaml"."2.0.5";
by-version."js-yaml"."2.0.5" = lib.makeOverridable self.buildNodePackage {
name = "js-yaml-2.0.5";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/js-yaml/-/js-yaml-2.0.5.tgz";
@@ -9201,10 +9850,10 @@
];
buildInputs =
(self.nativeDeps."js-yaml" or []);
- deps = [
- self.by-version."argparse"."0.1.15"
- self.by-version."esprima"."1.0.4"
- ];
+ deps = {
+ "argparse-0.1.15" = self.by-version."argparse"."0.1.15";
+ "esprima-1.0.4" = self.by-version."esprima"."1.0.4";
+ };
peerDependencies = [
];
passthru.names = [ "js-yaml" ];
@@ -9213,6 +9862,7 @@
self.by-version."js-yaml"."3.0.2";
by-version."js-yaml"."3.0.2" = lib.makeOverridable self.buildNodePackage {
name = "js-yaml-3.0.2";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/js-yaml/-/js-yaml-3.0.2.tgz";
@@ -9222,10 +9872,10 @@
];
buildInputs =
(self.nativeDeps."js-yaml" or []);
- deps = [
- self.by-version."argparse"."0.1.15"
- self.by-version."esprima"."1.0.4"
- ];
+ deps = {
+ "argparse-0.1.15" = self.by-version."argparse"."0.1.15";
+ "esprima-1.0.4" = self.by-version."esprima"."1.0.4";
+ };
peerDependencies = [
];
passthru.names = [ "js-yaml" ];
@@ -9234,6 +9884,7 @@
self.by-version."jsesc"."0.4.3";
by-version."jsesc"."0.4.3" = lib.makeOverridable self.buildNodePackage {
name = "jsesc-0.4.3";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/jsesc/-/jsesc-0.4.3.tgz";
@@ -9243,8 +9894,8 @@
];
buildInputs =
(self.nativeDeps."jsesc" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "jsesc" ];
@@ -9252,39 +9903,41 @@
by-spec."jsesc"."~0.4.3" =
self.by-version."jsesc"."0.4.3";
by-spec."jshint"."*" =
- self.by-version."jshint"."2.5.4";
- by-version."jshint"."2.5.4" = lib.makeOverridable self.buildNodePackage {
- name = "jshint-2.5.4";
+ self.by-version."jshint"."2.5.6";
+ by-version."jshint"."2.5.6" = lib.makeOverridable self.buildNodePackage {
+ name = "jshint-2.5.6";
+ bin = true;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/jshint/-/jshint-2.5.4.tgz";
- name = "jshint-2.5.4.tgz";
- sha1 = "3dc82cb37b381b65f0e95ec7a616d39b4e95faef";
+ url = "http://registry.npmjs.org/jshint/-/jshint-2.5.6.tgz";
+ name = "jshint-2.5.6.tgz";
+ sha1 = "1685ce1f9e1c74832375d83fe89728589bd9d8c7";
})
];
buildInputs =
(self.nativeDeps."jshint" or []);
- deps = [
- self.by-version."shelljs"."0.3.0"
- self.by-version."underscore"."1.6.0"
- self.by-version."cli"."0.6.3"
- self.by-version."minimatch"."0.4.0"
- self.by-version."htmlparser2"."3.7.3"
- self.by-version."console-browserify"."1.1.0"
- self.by-version."exit"."0.1.2"
- self.by-version."strip-json-comments"."0.1.3"
- ];
+ deps = {
+ "shelljs-0.3.0" = self.by-version."shelljs"."0.3.0";
+ "underscore-1.6.0" = self.by-version."underscore"."1.6.0";
+ "cli-0.6.4" = self.by-version."cli"."0.6.4";
+ "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0";
+ "htmlparser2-3.7.3" = self.by-version."htmlparser2"."3.7.3";
+ "console-browserify-1.1.0" = self.by-version."console-browserify"."1.1.0";
+ "exit-0.1.2" = self.by-version."exit"."0.1.2";
+ "strip-json-comments-1.0.1" = self.by-version."strip-json-comments"."1.0.1";
+ };
peerDependencies = [
];
passthru.names = [ "jshint" ];
};
- "jshint" = self.by-version."jshint"."2.5.4";
+ "jshint" = self.by-version."jshint"."2.5.6";
by-spec."jshint"."~2.5.0" =
- self.by-version."jshint"."2.5.4";
+ self.by-version."jshint"."2.5.6";
by-spec."json-schema"."0.2.2" =
self.by-version."json-schema"."0.2.2";
by-version."json-schema"."0.2.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-json-schema-0.2.2";
+ name = "json-schema-0.2.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz";
@@ -9294,8 +9947,8 @@
];
buildInputs =
(self.nativeDeps."json-schema" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "json-schema" ];
@@ -9303,7 +9956,8 @@
by-spec."json-stable-stringify"."~0.0.0" =
self.by-version."json-stable-stringify"."0.0.1";
by-version."json-stable-stringify"."0.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-json-stable-stringify-0.0.1";
+ name = "json-stable-stringify-0.0.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz";
@@ -9313,9 +9967,9 @@
];
buildInputs =
(self.nativeDeps."json-stable-stringify" or []);
- deps = [
- self.by-version."jsonify"."0.0.0"
- ];
+ deps = {
+ "jsonify-0.0.0" = self.by-version."jsonify"."0.0.0";
+ };
peerDependencies = [
];
passthru.names = [ "json-stable-stringify" ];
@@ -9323,7 +9977,8 @@
by-spec."json-stringify-safe"."~3.0.0" =
self.by-version."json-stringify-safe"."3.0.0";
by-version."json-stringify-safe"."3.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-json-stringify-safe-3.0.0";
+ name = "json-stringify-safe-3.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-3.0.0.tgz";
@@ -9333,8 +9988,8 @@
];
buildInputs =
(self.nativeDeps."json-stringify-safe" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "json-stringify-safe" ];
@@ -9342,7 +9997,8 @@
by-spec."json-stringify-safe"."~5.0.0" =
self.by-version."json-stringify-safe"."5.0.0";
by-version."json-stringify-safe"."5.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-json-stringify-safe-5.0.0";
+ name = "json-stringify-safe-5.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz";
@@ -9352,8 +10008,8 @@
];
buildInputs =
(self.nativeDeps."json-stringify-safe" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "json-stringify-safe" ];
@@ -9361,7 +10017,8 @@
by-spec."jsonfile"."~1.0.1" =
self.by-version."jsonfile"."1.0.1";
by-version."jsonfile"."1.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-jsonfile-1.0.1";
+ name = "jsonfile-1.0.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/jsonfile/-/jsonfile-1.0.1.tgz";
@@ -9371,8 +10028,8 @@
];
buildInputs =
(self.nativeDeps."jsonfile" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "jsonfile" ];
@@ -9380,7 +10037,8 @@
by-spec."jsonify"."~0.0.0" =
self.by-version."jsonify"."0.0.0";
by-version."jsonify"."0.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-jsonify-0.0.0";
+ name = "jsonify-0.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz";
@@ -9390,8 +10048,8 @@
];
buildInputs =
(self.nativeDeps."jsonify" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "jsonify" ];
@@ -9399,7 +10057,8 @@
by-spec."jsonparse"."0.0.5" =
self.by-version."jsonparse"."0.0.5";
by-version."jsonparse"."0.0.5" = lib.makeOverridable self.buildNodePackage {
- name = "node-jsonparse-0.0.5";
+ name = "jsonparse-0.0.5";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/jsonparse/-/jsonparse-0.0.5.tgz";
@@ -9409,8 +10068,8 @@
];
buildInputs =
(self.nativeDeps."jsonparse" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "jsonparse" ];
@@ -9419,6 +10078,7 @@
self.by-version."jsontool"."7.0.2";
by-version."jsontool"."7.0.2" = lib.makeOverridable self.buildNodePackage {
name = "jsontool-7.0.2";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/jsontool/-/jsontool-7.0.2.tgz";
@@ -9428,8 +10088,8 @@
];
buildInputs =
(self.nativeDeps."jsontool" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "jsontool" ];
@@ -9438,7 +10098,8 @@
by-spec."jsprim"."0.3.0" =
self.by-version."jsprim"."0.3.0";
by-version."jsprim"."0.3.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-jsprim-0.3.0";
+ name = "jsprim-0.3.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/jsprim/-/jsprim-0.3.0.tgz";
@@ -9448,11 +10109,11 @@
];
buildInputs =
(self.nativeDeps."jsprim" or []);
- deps = [
- self.by-version."extsprintf"."1.0.0"
- self.by-version."json-schema"."0.2.2"
- self.by-version."verror"."1.3.3"
- ];
+ deps = {
+ "extsprintf-1.0.0" = self.by-version."extsprintf"."1.0.0";
+ "json-schema-0.2.2" = self.by-version."json-schema"."0.2.2";
+ "verror-1.3.3" = self.by-version."verror"."1.3.3";
+ };
peerDependencies = [
];
passthru.names = [ "jsprim" ];
@@ -9460,7 +10121,8 @@
by-spec."jstransform"."~3.0.0" =
self.by-version."jstransform"."3.0.0";
by-version."jstransform"."3.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-jstransform-3.0.0";
+ name = "jstransform-3.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/jstransform/-/jstransform-3.0.0.tgz";
@@ -9470,87 +10132,90 @@
];
buildInputs =
(self.nativeDeps."jstransform" or []);
- deps = [
- self.by-version."base62"."0.1.1"
- self.by-version."esprima-fb"."3001.1.0-dev-harmony-fb"
- self.by-version."source-map"."0.1.31"
- ];
+ deps = {
+ "base62-0.1.1" = self.by-version."base62"."0.1.1";
+ "esprima-fb-3001.1.0-dev-harmony-fb" = self.by-version."esprima-fb"."3001.1.0-dev-harmony-fb";
+ "source-map-0.1.31" = self.by-version."source-map"."0.1.31";
+ };
peerDependencies = [
];
passthru.names = [ "jstransform" ];
};
by-spec."karma"."*" =
- self.by-version."karma"."0.12.22";
- by-version."karma"."0.12.22" = lib.makeOverridable self.buildNodePackage {
- name = "karma-0.12.22";
+ self.by-version."karma"."0.12.24";
+ by-version."karma"."0.12.24" = lib.makeOverridable self.buildNodePackage {
+ name = "karma-0.12.24";
+ bin = true;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/karma/-/karma-0.12.22.tgz";
- name = "karma-0.12.22.tgz";
- sha1 = "05073db2a1ba0638f15cb76a515563be34460dc7";
+ url = "http://registry.npmjs.org/karma/-/karma-0.12.24.tgz";
+ name = "karma-0.12.24.tgz";
+ sha1 = "edd66dd4698acb2227b2b3797467a477d951379d";
})
];
buildInputs =
(self.nativeDeps."karma" or []);
- deps = [
- self.by-version."di"."0.0.1"
- self.by-version."socket.io"."0.9.17"
- self.by-version."chokidar"."0.8.4"
- self.by-version."glob"."3.2.11"
- self.by-version."minimatch"."0.2.14"
- self.by-version."http-proxy"."0.10.4"
- self.by-version."optimist"."0.6.1"
- self.by-version."rimraf"."2.2.8"
- self.by-version."q"."0.9.7"
- self.by-version."colors"."0.6.2"
- self.by-version."lodash"."2.4.1"
- self.by-version."mime"."1.2.11"
- self.by-version."log4js"."0.6.18"
- self.by-version."useragent"."2.0.9"
- self.by-version."graceful-fs"."2.0.3"
- self.by-version."connect"."2.12.0"
- self.by-version."source-map"."0.1.38"
- ];
+ deps = {
+ "di-0.0.1" = self.by-version."di"."0.0.1";
+ "socket.io-0.9.17" = self.by-version."socket.io"."0.9.17";
+ "chokidar-0.9.0" = self.by-version."chokidar"."0.9.0";
+ "glob-3.2.11" = self.by-version."glob"."3.2.11";
+ "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14";
+ "http-proxy-0.10.4" = self.by-version."http-proxy"."0.10.4";
+ "optimist-0.6.1" = self.by-version."optimist"."0.6.1";
+ "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
+ "q-0.9.7" = self.by-version."q"."0.9.7";
+ "colors-0.6.2" = self.by-version."colors"."0.6.2";
+ "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
+ "mime-1.2.11" = self.by-version."mime"."1.2.11";
+ "log4js-0.6.21" = self.by-version."log4js"."0.6.21";
+ "useragent-2.0.10" = self.by-version."useragent"."2.0.10";
+ "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3";
+ "connect-2.12.0" = self.by-version."connect"."2.12.0";
+ "source-map-0.1.40" = self.by-version."source-map"."0.1.40";
+ };
peerDependencies = [
];
passthru.names = [ "karma" ];
};
- "karma" = self.by-version."karma"."0.12.22";
+ "karma" = self.by-version."karma"."0.12.24";
by-spec."karma".">=0.11.11" =
- self.by-version."karma"."0.12.22";
+ self.by-version."karma"."0.12.24";
by-spec."karma".">=0.12.8" =
- self.by-version."karma"."0.12.22";
+ self.by-version."karma"."0.12.24";
by-spec."karma".">=0.9" =
- self.by-version."karma"."0.12.22";
+ self.by-version."karma"."0.12.24";
by-spec."karma".">=0.9.3" =
- self.by-version."karma"."0.12.22";
+ self.by-version."karma"."0.12.24";
by-spec."karma"."~0.12.0" =
- self.by-version."karma"."0.12.22";
+ self.by-version."karma"."0.12.24";
by-spec."karma-chrome-launcher"."*" =
- self.by-version."karma-chrome-launcher"."0.1.4";
- by-version."karma-chrome-launcher"."0.1.4" = lib.makeOverridable self.buildNodePackage {
- name = "node-karma-chrome-launcher-0.1.4";
+ self.by-version."karma-chrome-launcher"."0.1.5";
+ by-version."karma-chrome-launcher"."0.1.5" = lib.makeOverridable self.buildNodePackage {
+ name = "karma-chrome-launcher-0.1.5";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-0.1.4.tgz";
- name = "karma-chrome-launcher-0.1.4.tgz";
- sha1 = "492f6b8ceed3dacb829b147514c9106660f1b185";
+ url = "http://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-0.1.5.tgz";
+ name = "karma-chrome-launcher-0.1.5.tgz";
+ sha1 = "70e95dca5c4d7a15884850daa3ab60d648dbfe8b";
})
];
buildInputs =
(self.nativeDeps."karma-chrome-launcher" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
- self.by-version."karma"."0.12.22"
+ self.by-version."karma"."0.12.24"
];
passthru.names = [ "karma-chrome-launcher" ];
};
- "karma-chrome-launcher" = self.by-version."karma-chrome-launcher"."0.1.4";
+ "karma-chrome-launcher" = self.by-version."karma-chrome-launcher"."0.1.5";
by-spec."karma-coverage"."*" =
self.by-version."karma-coverage"."0.2.6";
by-version."karma-coverage"."0.2.6" = lib.makeOverridable self.buildNodePackage {
- name = "node-karma-coverage-0.2.6";
+ name = "karma-coverage-0.2.6";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/karma-coverage/-/karma-coverage-0.2.6.tgz";
@@ -9560,14 +10225,14 @@
];
buildInputs =
(self.nativeDeps."karma-coverage" or []);
- deps = [
- self.by-version."istanbul"."0.3.0"
- self.by-version."ibrik"."1.1.1"
- self.by-version."dateformat"."1.0.8-1.2.3"
- self.by-version."minimatch"."0.3.0"
- ];
+ deps = {
+ "istanbul-0.3.2" = self.by-version."istanbul"."0.3.2";
+ "ibrik-1.1.1" = self.by-version."ibrik"."1.1.1";
+ "dateformat-1.0.8" = self.by-version."dateformat"."1.0.8";
+ "minimatch-0.3.0" = self.by-version."minimatch"."0.3.0";
+ };
peerDependencies = [
- self.by-version."karma"."0.12.22"
+ self.by-version."karma"."0.12.24"
];
passthru.names = [ "karma-coverage" ];
};
@@ -9575,7 +10240,8 @@
by-spec."karma-junit-reporter"."*" =
self.by-version."karma-junit-reporter"."0.2.2";
by-version."karma-junit-reporter"."0.2.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-karma-junit-reporter-0.2.2";
+ name = "karma-junit-reporter-0.2.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/karma-junit-reporter/-/karma-junit-reporter-0.2.2.tgz";
@@ -9585,41 +10251,43 @@
];
buildInputs =
(self.nativeDeps."karma-junit-reporter" or []);
- deps = [
- self.by-version."xmlbuilder"."0.4.2"
- ];
+ deps = {
+ "xmlbuilder-0.4.2" = self.by-version."xmlbuilder"."0.4.2";
+ };
peerDependencies = [
- self.by-version."karma"."0.12.22"
+ self.by-version."karma"."0.12.24"
];
passthru.names = [ "karma-junit-reporter" ];
};
"karma-junit-reporter" = self.by-version."karma-junit-reporter"."0.2.2";
by-spec."karma-mocha"."*" =
- self.by-version."karma-mocha"."0.1.8";
- by-version."karma-mocha"."0.1.8" = lib.makeOverridable self.buildNodePackage {
- name = "node-karma-mocha-0.1.8";
+ self.by-version."karma-mocha"."0.1.9";
+ by-version."karma-mocha"."0.1.9" = lib.makeOverridable self.buildNodePackage {
+ name = "karma-mocha-0.1.9";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/karma-mocha/-/karma-mocha-0.1.8.tgz";
- name = "karma-mocha-0.1.8.tgz";
- sha1 = "7f086bd06ab6151cbd5b0cf1614c15344963fdf6";
+ url = "http://registry.npmjs.org/karma-mocha/-/karma-mocha-0.1.9.tgz";
+ name = "karma-mocha-0.1.9.tgz";
+ sha1 = "d777a98d655e08330f7893e833c369f82bd10191";
})
];
buildInputs =
(self.nativeDeps."karma-mocha" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
- self.by-version."karma"."0.12.22"
+ self.by-version."karma"."0.12.24"
self.by-version."mocha"."1.21.4"
];
passthru.names = [ "karma-mocha" ];
};
- "karma-mocha" = self.by-version."karma-mocha"."0.1.8";
+ "karma-mocha" = self.by-version."karma-mocha"."0.1.9";
by-spec."karma-requirejs"."*" =
self.by-version."karma-requirejs"."0.2.2";
by-version."karma-requirejs"."0.2.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-karma-requirejs-0.2.2";
+ name = "karma-requirejs-0.2.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/karma-requirejs/-/karma-requirejs-0.2.2.tgz";
@@ -9629,11 +10297,11 @@
];
buildInputs =
(self.nativeDeps."karma-requirejs" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
- self.by-version."karma"."0.12.22"
- self.by-version."requirejs"."2.1.14"
+ self.by-version."karma"."0.12.24"
+ self.by-version."requirejs"."2.1.15"
];
passthru.names = [ "karma-requirejs" ];
};
@@ -9641,7 +10309,8 @@
by-spec."karma-sauce-launcher"."*" =
self.by-version."karma-sauce-launcher"."0.2.10";
by-version."karma-sauce-launcher"."0.2.10" = lib.makeOverridable self.buildNodePackage {
- name = "node-karma-sauce-launcher-0.2.10";
+ name = "karma-sauce-launcher-0.2.10";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/karma-sauce-launcher/-/karma-sauce-launcher-0.2.10.tgz";
@@ -9651,14 +10320,14 @@
];
buildInputs =
(self.nativeDeps."karma-sauce-launcher" or []);
- deps = [
- self.by-version."wd"."0.3.4"
- self.by-version."sauce-connect-launcher"."0.6.1"
- self.by-version."q"."0.9.7"
- self.by-version."saucelabs"."0.1.1"
- ];
+ deps = {
+ "wd-0.3.8" = self.by-version."wd"."0.3.8";
+ "sauce-connect-launcher-0.6.1" = self.by-version."sauce-connect-launcher"."0.6.1";
+ "q-0.9.7" = self.by-version."q"."0.9.7";
+ "saucelabs-0.1.1" = self.by-version."saucelabs"."0.1.1";
+ };
peerDependencies = [
- self.by-version."karma"."0.12.22"
+ self.by-version."karma"."0.12.24"
];
passthru.names = [ "karma-sauce-launcher" ];
};
@@ -9666,7 +10335,8 @@
by-spec."keen.io"."~0.1.2" =
self.by-version."keen.io"."0.1.2";
by-version."keen.io"."0.1.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-keen.io-0.1.2";
+ name = "keen.io-0.1.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/keen.io/-/keen.io-0.1.2.tgz";
@@ -9676,10 +10346,10 @@
];
buildInputs =
(self.nativeDeps."keen.io" or []);
- deps = [
- self.by-version."superagent"."0.13.0"
- self.by-version."underscore"."1.5.2"
- ];
+ deps = {
+ "superagent-0.13.0" = self.by-version."superagent"."0.13.0";
+ "underscore-1.5.2" = self.by-version."underscore"."1.5.2";
+ };
peerDependencies = [
];
passthru.names = [ "keen.io" ];
@@ -9687,7 +10357,8 @@
by-spec."keep-alive-agent"."0.0.1" =
self.by-version."keep-alive-agent"."0.0.1";
by-version."keep-alive-agent"."0.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-keep-alive-agent-0.0.1";
+ name = "keep-alive-agent-0.0.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/keep-alive-agent/-/keep-alive-agent-0.0.1.tgz";
@@ -9697,8 +10368,8 @@
];
buildInputs =
(self.nativeDeps."keep-alive-agent" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "keep-alive-agent" ];
@@ -9706,7 +10377,8 @@
by-spec."kerberos"."0.0.3" =
self.by-version."kerberos"."0.0.3";
by-version."kerberos"."0.0.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-kerberos-0.0.3";
+ name = "kerberos-0.0.3";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/kerberos/-/kerberos-0.0.3.tgz";
@@ -9716,16 +10388,58 @@
];
buildInputs =
(self.nativeDeps."kerberos" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "kerberos" ];
};
+ by-spec."kerberos"."0.0.5" =
+ self.by-version."kerberos"."0.0.5";
+ by-version."kerberos"."0.0.5" = lib.makeOverridable self.buildNodePackage {
+ name = "kerberos-0.0.5";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/kerberos/-/kerberos-0.0.5.tgz";
+ name = "kerberos-0.0.5.tgz";
+ sha1 = "48170d7f75bc1570044aa46c501af1c87b1e7cf0";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."kerberos" or []);
+ deps = {
+ "nan-1.3.0" = self.by-version."nan"."1.3.0";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "kerberos" ];
+ };
+ by-spec."kew"."0.4.0" =
+ self.by-version."kew"."0.4.0";
+ by-version."kew"."0.4.0" = lib.makeOverridable self.buildNodePackage {
+ name = "kew-0.4.0";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/kew/-/kew-0.4.0.tgz";
+ name = "kew-0.4.0.tgz";
+ sha1 = "da97484f1b06502146f3c60cec05ac6012cd993f";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."kew" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "kew" ];
+ };
by-spec."kew"."~0.1.7" =
self.by-version."kew"."0.1.7";
by-version."kew"."0.1.7" = lib.makeOverridable self.buildNodePackage {
- name = "node-kew-0.1.7";
+ name = "kew-0.1.7";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/kew/-/kew-0.1.7.tgz";
@@ -9735,8 +10449,8 @@
];
buildInputs =
(self.nativeDeps."kew" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "kew" ];
@@ -9744,7 +10458,8 @@
by-spec."keygrip"."~1.0.0" =
self.by-version."keygrip"."1.0.1";
by-version."keygrip"."1.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-keygrip-1.0.1";
+ name = "keygrip-1.0.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/keygrip/-/keygrip-1.0.1.tgz";
@@ -9754,8 +10469,8 @@
];
buildInputs =
(self.nativeDeps."keygrip" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "keygrip" ];
@@ -9763,7 +10478,8 @@
by-spec."keypress"."0.1.x" =
self.by-version."keypress"."0.1.0";
by-version."keypress"."0.1.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-keypress-0.1.0";
+ name = "keypress-0.1.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz";
@@ -9773,166 +10489,112 @@
];
buildInputs =
(self.nativeDeps."keypress" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "keypress" ];
};
- by-spec."keypress"."~0.1.0" =
- self.by-version."keypress"."0.1.0";
- by-spec."knockout"."~3.1.0" =
- self.by-version."knockout"."3.1.0";
- by-version."knockout"."3.1.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-knockout-3.1.0";
+ by-spec."keypress"."~0.2.1" =
+ self.by-version."keypress"."0.2.1";
+ by-version."keypress"."0.2.1" = lib.makeOverridable self.buildNodePackage {
+ name = "keypress-0.2.1";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/knockout/-/knockout-3.1.0.tgz";
- name = "knockout-3.1.0.tgz";
- sha1 = "8960ecfafa20e1d5795badfbf6256693f17b7bf5";
+ url = "http://registry.npmjs.org/keypress/-/keypress-0.2.1.tgz";
+ name = "keypress-0.2.1.tgz";
+ sha1 = "1e80454250018dbad4c3fe94497d6e67b6269c77";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."keypress" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "keypress" ];
+ };
+ by-spec."knockout"."~3.2.0" =
+ self.by-version."knockout"."3.2.0";
+ by-version."knockout"."3.2.0" = lib.makeOverridable self.buildNodePackage {
+ name = "knockout-3.2.0";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/knockout/-/knockout-3.2.0.tgz";
+ name = "knockout-3.2.0.tgz";
+ sha1 = "3f394eb67d721bea115e2d0d7be082256ca46a11";
})
];
buildInputs =
(self.nativeDeps."knockout" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "knockout" ];
};
by-spec."knox"."*" =
- self.by-version."knox"."0.9.0";
- by-version."knox"."0.9.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-knox-0.9.0";
+ self.by-version."knox"."0.9.1";
+ by-version."knox"."0.9.1" = lib.makeOverridable self.buildNodePackage {
+ name = "knox-0.9.1";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/knox/-/knox-0.9.0.tgz";
- name = "knox-0.9.0.tgz";
- sha1 = "8810e1dfe4332db505a796f5c9a11aee8b393e2c";
+ url = "http://registry.npmjs.org/knox/-/knox-0.9.1.tgz";
+ name = "knox-0.9.1.tgz";
+ sha1 = "3e53398e3d2307d27822abdcd74cd6aa32dc1ccf";
})
];
buildInputs =
(self.nativeDeps."knox" or []);
- deps = [
- self.by-version."mime"."1.2.11"
- self.by-version."xml2js"."0.4.4"
- self.by-version."debug"."1.0.4"
- self.by-version."stream-counter"."1.0.0"
- self.by-version."once"."1.3.0"
- ];
+ deps = {
+ "mime-1.2.11" = self.by-version."mime"."1.2.11";
+ "xml2js-0.4.4" = self.by-version."xml2js"."0.4.4";
+ "debug-1.0.4" = self.by-version."debug"."1.0.4";
+ "stream-counter-1.0.0" = self.by-version."stream-counter"."1.0.0";
+ "once-1.3.1" = self.by-version."once"."1.3.1";
+ };
peerDependencies = [
];
passthru.names = [ "knox" ];
};
- "knox" = self.by-version."knox"."0.9.0";
- by-spec."koa"."*" =
- self.by-version."koa"."0.10.0";
- by-version."koa"."0.10.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-koa-0.10.0";
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/koa/-/koa-0.10.0.tgz";
- name = "koa-0.10.0.tgz";
- sha1 = "876f6ab92ee19b89c7157a108d3c046d48377146";
- })
- ];
- buildInputs =
- (self.nativeDeps."koa" or []);
- deps = [
- self.by-version."escape-html"."1.0.1"
- self.by-version."statuses"."1.0.4"
- self.by-version."accepts"."1.0.7"
- self.by-version."type-is"."1.3.2"
- self.by-version."mime-types"."1.0.2"
- self.by-version."media-typer"."0.2.0"
- self.by-version."finished"."1.2.2"
- self.by-version."co"."3.1.0"
- self.by-version."debug"."1.0.4"
- self.by-version."fresh"."0.2.2"
- self.by-version."koa-compose"."2.3.0"
- self.by-version."koa-is-json"."1.0.0"
- self.by-version."cookies"."0.5.0"
- self.by-version."delegates"."0.0.3"
- self.by-version."dethroy"."1.0.2"
- self.by-version."error-inject"."1.0.0"
- self.by-version."vary"."0.1.0"
- self.by-version."parseurl"."1.2.0"
- self.by-version."only"."0.0.2"
- ];
- peerDependencies = [
- ];
- passthru.names = [ "koa" ];
- };
- by-spec."koa-compose"."~2.3.0" =
- self.by-version."koa-compose"."2.3.0";
- by-version."koa-compose"."2.3.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-koa-compose-2.3.0";
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/koa-compose/-/koa-compose-2.3.0.tgz";
- name = "koa-compose-2.3.0.tgz";
- sha1 = "4617fa832a16412a56967334304efd797d6ed35c";
- })
- ];
- buildInputs =
- (self.nativeDeps."koa-compose" or []);
- deps = [
- ];
- peerDependencies = [
- ];
- passthru.names = [ "koa-compose" ];
- };
- by-spec."koa-is-json"."~1.0.0" =
- self.by-version."koa-is-json"."1.0.0";
- by-version."koa-is-json"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-koa-is-json-1.0.0";
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/koa-is-json/-/koa-is-json-1.0.0.tgz";
- name = "koa-is-json-1.0.0.tgz";
- sha1 = "273c07edcdcb8df6a2c1ab7d59ee76491451ec14";
- })
- ];
- buildInputs =
- (self.nativeDeps."koa-is-json" or []);
- deps = [
- ];
- peerDependencies = [
- ];
- passthru.names = [ "koa-is-json" ];
- };
+ "knox" = self.by-version."knox"."0.9.1";
by-spec."kue"."*" =
- self.by-version."kue"."0.8.5";
- by-version."kue"."0.8.5" = lib.makeOverridable self.buildNodePackage {
- name = "node-kue-0.8.5";
+ self.by-version."kue"."0.8.9";
+ by-version."kue"."0.8.9" = lib.makeOverridable self.buildNodePackage {
+ name = "kue-0.8.9";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/kue/-/kue-0.8.5.tgz";
- name = "kue-0.8.5.tgz";
- sha1 = "253d7a9a0bdd086100e48bbcce6c7dfad3381ed4";
+ url = "http://registry.npmjs.org/kue/-/kue-0.8.9.tgz";
+ name = "kue-0.8.9.tgz";
+ sha1 = "6fb2c7d4014f26a64ebf76c092085fe9db16fdcb";
})
];
buildInputs =
(self.nativeDeps."kue" or []);
- deps = [
- self.by-version."redis"."0.10.3"
- self.by-version."express"."3.1.2"
- self.by-version."jade"."1.1.5"
- self.by-version."stylus"."0.42.2"
- self.by-version."lodash"."2.4.1"
- self.by-version."lodash-deep"."1.2.1"
- self.by-version."nib"."0.5.0"
- self.by-version."reds"."0.2.4"
- ];
+ deps = {
+ "redis-0.10.3" = self.by-version."redis"."0.10.3";
+ "express-3.1.2" = self.by-version."express"."3.1.2";
+ "jade-1.1.5" = self.by-version."jade"."1.1.5";
+ "stylus-0.42.2" = self.by-version."stylus"."0.42.2";
+ "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
+ "lodash-deep-1.4.2" = self.by-version."lodash-deep"."1.4.2";
+ "nib-0.5.0" = self.by-version."nib"."0.5.0";
+ "reds-0.2.4" = self.by-version."reds"."0.2.4";
+ };
peerDependencies = [
];
passthru.names = [ "kue" ];
};
- "kue" = self.by-version."kue"."0.8.5";
+ "kue" = self.by-version."kue"."0.8.9";
by-spec."labeled-stream-splicer"."^1.0.0" =
self.by-version."labeled-stream-splicer"."1.0.0";
by-version."labeled-stream-splicer"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-labeled-stream-splicer-1.0.0";
+ name = "labeled-stream-splicer-1.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-1.0.0.tgz";
@@ -9942,11 +10604,11 @@
];
buildInputs =
(self.nativeDeps."labeled-stream-splicer" or []);
- deps = [
- self.by-version."inherits"."2.0.1"
- self.by-version."isarray"."0.0.1"
- self.by-version."stream-splicer"."1.3.0"
- ];
+ deps = {
+ "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+ "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
+ "stream-splicer-1.3.1" = self.by-version."stream-splicer"."1.3.1";
+ };
peerDependencies = [
];
passthru.names = [ "labeled-stream-splicer" ];
@@ -9954,7 +10616,8 @@
by-spec."lazy"."~1.0.11" =
self.by-version."lazy"."1.0.11";
by-version."lazy"."1.0.11" = lib.makeOverridable self.buildNodePackage {
- name = "node-lazy-1.0.11";
+ name = "lazy-1.0.11";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/lazy/-/lazy-1.0.11.tgz";
@@ -9964,8 +10627,8 @@
];
buildInputs =
(self.nativeDeps."lazy" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "lazy" ];
@@ -9973,7 +10636,8 @@
by-spec."lazystream"."~0.1.0" =
self.by-version."lazystream"."0.1.0";
by-version."lazystream"."0.1.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-lazystream-0.1.0";
+ name = "lazystream-0.1.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz";
@@ -9983,9 +10647,9 @@
];
buildInputs =
(self.nativeDeps."lazystream" or []);
- deps = [
- self.by-version."readable-stream"."1.0.31"
- ];
+ deps = {
+ "readable-stream-1.0.32" = self.by-version."readable-stream"."1.0.32";
+ };
peerDependencies = [
];
passthru.names = [ "lazystream" ];
@@ -9993,7 +10657,8 @@
by-spec."lcov-parse"."0.0.6" =
self.by-version."lcov-parse"."0.0.6";
by-version."lcov-parse"."0.0.6" = lib.makeOverridable self.buildNodePackage {
- name = "node-lcov-parse-0.0.6";
+ name = "lcov-parse-0.0.6";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/lcov-parse/-/lcov-parse-0.0.6.tgz";
@@ -10003,8 +10668,8 @@
];
buildInputs =
(self.nativeDeps."lcov-parse" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "lcov-parse" ];
@@ -10013,6 +10678,7 @@
self.by-version."lcov-result-merger"."1.0.0";
by-version."lcov-result-merger"."1.0.0" = lib.makeOverridable self.buildNodePackage {
name = "lcov-result-merger-1.0.0";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/lcov-result-merger/-/lcov-result-merger-1.0.0.tgz";
@@ -10022,48 +10688,50 @@
];
buildInputs =
(self.nativeDeps."lcov-result-merger" or []);
- deps = [
- self.by-version."through2"."0.5.1"
- self.by-version."vinyl"."0.2.3"
- self.by-version."vinyl-fs"."0.3.6"
- ];
+ deps = {
+ "through2-0.5.1" = self.by-version."through2"."0.5.1";
+ "vinyl-0.2.3" = self.by-version."vinyl"."0.2.3";
+ "vinyl-fs-0.3.8" = self.by-version."vinyl-fs"."0.3.8";
+ };
peerDependencies = [
];
passthru.names = [ "lcov-result-merger" ];
};
"lcov-result-merger" = self.by-version."lcov-result-merger"."1.0.0";
by-spec."less"."*" =
- self.by-version."less"."1.7.4";
- by-version."less"."1.7.4" = lib.makeOverridable self.buildNodePackage {
- name = "less-1.7.4";
+ self.by-version."less"."1.7.5";
+ by-version."less"."1.7.5" = lib.makeOverridable self.buildNodePackage {
+ name = "less-1.7.5";
+ bin = true;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/less/-/less-1.7.4.tgz";
- name = "less-1.7.4.tgz";
- sha1 = "1db03afd0d1b848d898d10d2690d79ee3834026d";
+ url = "http://registry.npmjs.org/less/-/less-1.7.5.tgz";
+ name = "less-1.7.5.tgz";
+ sha1 = "4f220cf7288a27eaca739df6e4808a2d4c0d5756";
})
];
buildInputs =
(self.nativeDeps."less" or []);
- deps = [
- self.by-version."graceful-fs"."2.0.3"
- self.by-version."mime"."1.2.11"
- self.by-version."request"."2.34.0"
- self.by-version."mkdirp"."0.3.5"
- self.by-version."clean-css"."2.1.8"
- self.by-version."source-map"."0.1.38"
- ];
+ deps = {
+ "graceful-fs-3.0.2" = self.by-version."graceful-fs"."3.0.2";
+ "mime-1.2.11" = self.by-version."mime"."1.2.11";
+ "request-2.40.0" = self.by-version."request"."2.40.0";
+ "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
+ "clean-css-2.2.16" = self.by-version."clean-css"."2.2.16";
+ "source-map-0.1.40" = self.by-version."source-map"."0.1.40";
+ };
peerDependencies = [
];
passthru.names = [ "less" ];
};
- "less" = self.by-version."less"."1.7.4";
+ "less" = self.by-version."less"."1.7.5";
by-spec."less"."^1.7.2" =
- self.by-version."less"."1.7.4";
+ self.by-version."less"."1.7.5";
by-spec."lexical-scope"."~1.1.0" =
self.by-version."lexical-scope"."1.1.0";
by-version."lexical-scope"."1.1.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-lexical-scope-1.1.0";
+ name = "lexical-scope-1.1.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/lexical-scope/-/lexical-scope-1.1.0.tgz";
@@ -10073,9 +10741,9 @@
];
buildInputs =
(self.nativeDeps."lexical-scope" or []);
- deps = [
- self.by-version."astw"."1.1.0"
- ];
+ deps = {
+ "astw-1.1.0" = self.by-version."astw"."1.1.0";
+ };
peerDependencies = [
];
passthru.names = [ "lexical-scope" ];
@@ -10083,7 +10751,8 @@
by-spec."libxmljs"."~0.10.0" =
self.by-version."libxmljs"."0.10.0";
by-version."libxmljs"."0.10.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-libxmljs-0.10.0";
+ name = "libxmljs-0.10.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/libxmljs/-/libxmljs-0.10.0.tgz";
@@ -10093,49 +10762,75 @@
];
buildInputs =
(self.nativeDeps."libxmljs" or []);
- deps = [
- self.by-version."bindings"."1.1.1"
- self.by-version."nan"."1.1.2"
- ];
+ deps = {
+ "bindings-1.1.1" = self.by-version."bindings"."1.1.1";
+ "nan-1.1.2" = self.by-version."nan"."1.1.2";
+ };
peerDependencies = [
];
passthru.names = [ "libxmljs" ];
};
by-spec."libyaml"."*" =
- self.by-version."libyaml"."0.2.4";
- by-version."libyaml"."0.2.4" = lib.makeOverridable self.buildNodePackage {
- name = "node-libyaml-0.2.4";
+ self.by-version."libyaml"."0.2.5";
+ by-version."libyaml"."0.2.5" = lib.makeOverridable self.buildNodePackage {
+ name = "libyaml-0.2.5";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/libyaml/-/libyaml-0.2.4.tgz";
- name = "libyaml-0.2.4.tgz";
- sha1 = "46b6abe00ef0bc0ac60ca599c0e7c80ff920e959";
+ url = "http://registry.npmjs.org/libyaml/-/libyaml-0.2.5.tgz";
+ name = "libyaml-0.2.5.tgz";
+ sha1 = "f34a920b728d8c1eddea56a6fa8698c28ceab6df";
})
];
buildInputs =
(self.nativeDeps."libyaml" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "libyaml" ];
};
- "libyaml" = self.by-version."libyaml"."0.2.4";
- by-spec."lockfile"."~0.4.0" =
- self.by-version."lockfile"."0.4.3";
- by-version."lockfile"."0.4.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-lockfile-0.4.3";
+ "libyaml" = self.by-version."libyaml"."0.2.5";
+ by-spec."liftoff"."^0.12.0" =
+ self.by-version."liftoff"."0.12.1";
+ by-version."liftoff"."0.12.1" = lib.makeOverridable self.buildNodePackage {
+ name = "liftoff-0.12.1";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/lockfile/-/lockfile-0.4.3.tgz";
- name = "lockfile-0.4.3.tgz";
- sha1 = "79b965ee9b32d9dd24b59cf81205e6dcb6d3b224";
+ url = "http://registry.npmjs.org/liftoff/-/liftoff-0.12.1.tgz";
+ name = "liftoff-0.12.1.tgz";
+ sha1 = "bcaa49759c68396b83b984ad0b2d8cc226f9526d";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."liftoff" or []);
+ deps = {
+ "findup-sync-0.1.3" = self.by-version."findup-sync"."0.1.3";
+ "resolve-0.7.4" = self.by-version."resolve"."0.7.4";
+ "minimist-0.2.0" = self.by-version."minimist"."0.2.0";
+ "extend-1.3.0" = self.by-version."extend"."1.3.0";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "liftoff" ];
+ };
+ by-spec."lockfile"."~1.0.0" =
+ self.by-version."lockfile"."1.0.0";
+ by-version."lockfile"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+ name = "lockfile-1.0.0";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/lockfile/-/lockfile-1.0.0.tgz";
+ name = "lockfile-1.0.0.tgz";
+ sha1 = "b3a7609dda6012060083bacb0ab0ecbca58e9203";
})
];
buildInputs =
(self.nativeDeps."lockfile" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "lockfile" ];
@@ -10143,7 +10838,8 @@
by-spec."lodash"."2.4.1" =
self.by-version."lodash"."2.4.1";
by-version."lodash"."2.4.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-lodash-2.4.1";
+ name = "lodash-2.4.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz";
@@ -10153,8 +10849,8 @@
];
buildInputs =
(self.nativeDeps."lodash" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "lodash" ];
@@ -10166,7 +10862,8 @@
by-spec."lodash"."~0.9.2" =
self.by-version."lodash"."0.9.2";
by-version."lodash"."0.9.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-lodash-0.9.2";
+ name = "lodash-0.9.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/lodash/-/lodash-0.9.2.tgz";
@@ -10176,8 +10873,8 @@
];
buildInputs =
(self.nativeDeps."lodash" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "lodash" ];
@@ -10185,7 +10882,8 @@
by-spec."lodash"."~1.0.1" =
self.by-version."lodash"."1.0.1";
by-version."lodash"."1.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-lodash-1.0.1";
+ name = "lodash-1.0.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/lodash/-/lodash-1.0.1.tgz";
@@ -10195,8 +10893,8 @@
];
buildInputs =
(self.nativeDeps."lodash" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "lodash" ];
@@ -10204,21 +10902,22 @@
by-spec."lodash"."~2.4.1" =
self.by-version."lodash"."2.4.1";
by-spec."lodash-deep"."^1.1.0" =
- self.by-version."lodash-deep"."1.2.1";
- by-version."lodash-deep"."1.2.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-lodash-deep-1.2.1";
+ self.by-version."lodash-deep"."1.4.2";
+ by-version."lodash-deep"."1.4.2" = lib.makeOverridable self.buildNodePackage {
+ name = "lodash-deep-1.4.2";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/lodash-deep/-/lodash-deep-1.2.1.tgz";
- name = "lodash-deep-1.2.1.tgz";
- sha1 = "04ea62f43112151388de983f7e07c3e6ded07225";
+ url = "http://registry.npmjs.org/lodash-deep/-/lodash-deep-1.4.2.tgz";
+ name = "lodash-deep-1.4.2.tgz";
+ sha1 = "451704eb282c2ad3d6602e9602b7cd25db52e37d";
})
];
buildInputs =
(self.nativeDeps."lodash-deep" or []);
- deps = [
- self.by-version."lodash"."2.4.1"
- ];
+ deps = {
+ "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
+ };
peerDependencies = [
];
passthru.names = [ "lodash-deep" ];
@@ -10226,7 +10925,8 @@
by-spec."lodash-node"."~2.4.1" =
self.by-version."lodash-node"."2.4.1";
by-version."lodash-node"."2.4.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-lodash-node-2.4.1";
+ name = "lodash-node-2.4.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/lodash-node/-/lodash-node-2.4.1.tgz";
@@ -10236,16 +10936,342 @@
];
buildInputs =
(self.nativeDeps."lodash-node" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "lodash-node" ];
};
+ by-spec."lodash._escapehtmlchar"."~2.4.1" =
+ self.by-version."lodash._escapehtmlchar"."2.4.1";
+ by-version."lodash._escapehtmlchar"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+ name = "lodash._escapehtmlchar-2.4.1";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/lodash._escapehtmlchar/-/lodash._escapehtmlchar-2.4.1.tgz";
+ name = "lodash._escapehtmlchar-2.4.1.tgz";
+ sha1 = "df67c3bb6b7e8e1e831ab48bfa0795b92afe899d";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."lodash._escapehtmlchar" or []);
+ deps = {
+ "lodash._htmlescapes-2.4.1" = self.by-version."lodash._htmlescapes"."2.4.1";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "lodash._escapehtmlchar" ];
+ };
+ by-spec."lodash._escapestringchar"."~2.4.1" =
+ self.by-version."lodash._escapestringchar"."2.4.1";
+ by-version."lodash._escapestringchar"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+ name = "lodash._escapestringchar-2.4.1";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/lodash._escapestringchar/-/lodash._escapestringchar-2.4.1.tgz";
+ name = "lodash._escapestringchar-2.4.1.tgz";
+ sha1 = "ecfe22618a2ade50bfeea43937e51df66f0edb72";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."lodash._escapestringchar" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "lodash._escapestringchar" ];
+ };
+ by-spec."lodash._htmlescapes"."~2.4.1" =
+ self.by-version."lodash._htmlescapes"."2.4.1";
+ by-version."lodash._htmlescapes"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+ name = "lodash._htmlescapes-2.4.1";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz";
+ name = "lodash._htmlescapes-2.4.1.tgz";
+ sha1 = "32d14bf0844b6de6f8b62a051b4f67c228b624cb";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."lodash._htmlescapes" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "lodash._htmlescapes" ];
+ };
+ by-spec."lodash._isnative"."~2.4.1" =
+ self.by-version."lodash._isnative"."2.4.1";
+ by-version."lodash._isnative"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+ name = "lodash._isnative-2.4.1";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz";
+ name = "lodash._isnative-2.4.1.tgz";
+ sha1 = "3ea6404b784a7be836c7b57580e1cdf79b14832c";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."lodash._isnative" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "lodash._isnative" ];
+ };
+ by-spec."lodash._objecttypes"."~2.4.1" =
+ self.by-version."lodash._objecttypes"."2.4.1";
+ by-version."lodash._objecttypes"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+ name = "lodash._objecttypes-2.4.1";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz";
+ name = "lodash._objecttypes-2.4.1.tgz";
+ sha1 = "7c0b7f69d98a1f76529f890b0cdb1b4dfec11c11";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."lodash._objecttypes" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "lodash._objecttypes" ];
+ };
+ by-spec."lodash._reinterpolate"."^2.4.1" =
+ self.by-version."lodash._reinterpolate"."2.4.1";
+ by-version."lodash._reinterpolate"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+ name = "lodash._reinterpolate-2.4.1";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-2.4.1.tgz";
+ name = "lodash._reinterpolate-2.4.1.tgz";
+ sha1 = "4f1227aa5a8711fc632f5b07a1f4607aab8b3222";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."lodash._reinterpolate" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "lodash._reinterpolate" ];
+ };
+ by-spec."lodash._reinterpolate"."~2.4.1" =
+ self.by-version."lodash._reinterpolate"."2.4.1";
+ by-spec."lodash._reunescapedhtml"."~2.4.1" =
+ self.by-version."lodash._reunescapedhtml"."2.4.1";
+ by-version."lodash._reunescapedhtml"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+ name = "lodash._reunescapedhtml-2.4.1";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/lodash._reunescapedhtml/-/lodash._reunescapedhtml-2.4.1.tgz";
+ name = "lodash._reunescapedhtml-2.4.1.tgz";
+ sha1 = "747c4fc40103eb3bb8a0976e571f7a2659e93ba7";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."lodash._reunescapedhtml" or []);
+ deps = {
+ "lodash._htmlescapes-2.4.1" = self.by-version."lodash._htmlescapes"."2.4.1";
+ "lodash.keys-2.4.1" = self.by-version."lodash.keys"."2.4.1";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "lodash._reunescapedhtml" ];
+ };
+ by-spec."lodash._shimkeys"."~2.4.1" =
+ self.by-version."lodash._shimkeys"."2.4.1";
+ by-version."lodash._shimkeys"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+ name = "lodash._shimkeys-2.4.1";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz";
+ name = "lodash._shimkeys-2.4.1.tgz";
+ sha1 = "6e9cc9666ff081f0b5a6c978b83e242e6949d203";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."lodash._shimkeys" or []);
+ deps = {
+ "lodash._objecttypes-2.4.1" = self.by-version."lodash._objecttypes"."2.4.1";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "lodash._shimkeys" ];
+ };
+ by-spec."lodash.defaults"."~2.4.1" =
+ self.by-version."lodash.defaults"."2.4.1";
+ by-version."lodash.defaults"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+ name = "lodash.defaults-2.4.1";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz";
+ name = "lodash.defaults-2.4.1.tgz";
+ sha1 = "a7e8885f05e68851144b6e12a8f3678026bc4c54";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."lodash.defaults" or []);
+ deps = {
+ "lodash.keys-2.4.1" = self.by-version."lodash.keys"."2.4.1";
+ "lodash._objecttypes-2.4.1" = self.by-version."lodash._objecttypes"."2.4.1";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "lodash.defaults" ];
+ };
+ by-spec."lodash.escape"."~2.4.1" =
+ self.by-version."lodash.escape"."2.4.1";
+ by-version."lodash.escape"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+ name = "lodash.escape-2.4.1";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/lodash.escape/-/lodash.escape-2.4.1.tgz";
+ name = "lodash.escape-2.4.1.tgz";
+ sha1 = "2ce12c5e084db0a57dda5e5d1eeeb9f5d175a3b4";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."lodash.escape" or []);
+ deps = {
+ "lodash._escapehtmlchar-2.4.1" = self.by-version."lodash._escapehtmlchar"."2.4.1";
+ "lodash.keys-2.4.1" = self.by-version."lodash.keys"."2.4.1";
+ "lodash._reunescapedhtml-2.4.1" = self.by-version."lodash._reunescapedhtml"."2.4.1";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "lodash.escape" ];
+ };
+ by-spec."lodash.isobject"."~2.4.1" =
+ self.by-version."lodash.isobject"."2.4.1";
+ by-version."lodash.isobject"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+ name = "lodash.isobject-2.4.1";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz";
+ name = "lodash.isobject-2.4.1.tgz";
+ sha1 = "5a2e47fe69953f1ee631a7eba1fe64d2d06558f5";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."lodash.isobject" or []);
+ deps = {
+ "lodash._objecttypes-2.4.1" = self.by-version."lodash._objecttypes"."2.4.1";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "lodash.isobject" ];
+ };
+ by-spec."lodash.keys"."~2.4.1" =
+ self.by-version."lodash.keys"."2.4.1";
+ by-version."lodash.keys"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+ name = "lodash.keys-2.4.1";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz";
+ name = "lodash.keys-2.4.1.tgz";
+ sha1 = "48dea46df8ff7632b10d706b8acb26591e2b3727";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."lodash.keys" or []);
+ deps = {
+ "lodash._isnative-2.4.1" = self.by-version."lodash._isnative"."2.4.1";
+ "lodash.isobject-2.4.1" = self.by-version."lodash.isobject"."2.4.1";
+ "lodash._shimkeys-2.4.1" = self.by-version."lodash._shimkeys"."2.4.1";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "lodash.keys" ];
+ };
+ by-spec."lodash.template"."^2.4.1" =
+ self.by-version."lodash.template"."2.4.1";
+ by-version."lodash.template"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+ name = "lodash.template-2.4.1";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/lodash.template/-/lodash.template-2.4.1.tgz";
+ name = "lodash.template-2.4.1.tgz";
+ sha1 = "9e611007edf629129a974ab3c48b817b3e1cf20d";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."lodash.template" or []);
+ deps = {
+ "lodash.defaults-2.4.1" = self.by-version."lodash.defaults"."2.4.1";
+ "lodash.escape-2.4.1" = self.by-version."lodash.escape"."2.4.1";
+ "lodash._escapestringchar-2.4.1" = self.by-version."lodash._escapestringchar"."2.4.1";
+ "lodash.keys-2.4.1" = self.by-version."lodash.keys"."2.4.1";
+ "lodash._reinterpolate-2.4.1" = self.by-version."lodash._reinterpolate"."2.4.1";
+ "lodash.templatesettings-2.4.1" = self.by-version."lodash.templatesettings"."2.4.1";
+ "lodash.values-2.4.1" = self.by-version."lodash.values"."2.4.1";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "lodash.template" ];
+ };
+ by-spec."lodash.templatesettings"."~2.4.1" =
+ self.by-version."lodash.templatesettings"."2.4.1";
+ by-version."lodash.templatesettings"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+ name = "lodash.templatesettings-2.4.1";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-2.4.1.tgz";
+ name = "lodash.templatesettings-2.4.1.tgz";
+ sha1 = "ea76c75d11eb86d4dbe89a83893bb861929ac699";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."lodash.templatesettings" or []);
+ deps = {
+ "lodash.escape-2.4.1" = self.by-version."lodash.escape"."2.4.1";
+ "lodash._reinterpolate-2.4.1" = self.by-version."lodash._reinterpolate"."2.4.1";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "lodash.templatesettings" ];
+ };
+ by-spec."lodash.values"."~2.4.1" =
+ self.by-version."lodash.values"."2.4.1";
+ by-version."lodash.values"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+ name = "lodash.values-2.4.1";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/lodash.values/-/lodash.values-2.4.1.tgz";
+ name = "lodash.values-2.4.1.tgz";
+ sha1 = "abf514436b3cb705001627978cbcf30b1280eea4";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."lodash.values" or []);
+ deps = {
+ "lodash.keys-2.4.1" = self.by-version."lodash.keys"."2.4.1";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "lodash.values" ];
+ };
by-spec."log-driver"."1.2.4" =
self.by-version."log-driver"."1.2.4";
by-version."log-driver"."1.2.4" = lib.makeOverridable self.buildNodePackage {
- name = "node-log-driver-1.2.4";
+ name = "log-driver-1.2.4";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/log-driver/-/log-driver-1.2.4.tgz";
@@ -10255,30 +11281,31 @@
];
buildInputs =
(self.nativeDeps."log-driver" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "log-driver" ];
};
by-spec."log4js"."~0.6.3" =
- self.by-version."log4js"."0.6.18";
- by-version."log4js"."0.6.18" = lib.makeOverridable self.buildNodePackage {
- name = "node-log4js-0.6.18";
+ self.by-version."log4js"."0.6.21";
+ by-version."log4js"."0.6.21" = lib.makeOverridable self.buildNodePackage {
+ name = "log4js-0.6.21";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/log4js/-/log4js-0.6.18.tgz";
- name = "log4js-0.6.18.tgz";
- sha1 = "b362d629b02e111434839502b5a24b3201f5d805";
+ url = "http://registry.npmjs.org/log4js/-/log4js-0.6.21.tgz";
+ name = "log4js-0.6.21.tgz";
+ sha1 = "674ed09ef0ffe913c2a35074f697bd047bb53b5f";
})
];
buildInputs =
(self.nativeDeps."log4js" or []);
- deps = [
- self.by-version."async"."0.1.15"
- self.by-version."semver"."1.1.4"
- self.by-version."readable-stream"."1.0.31"
- ];
+ deps = {
+ "async-0.2.10" = self.by-version."async"."0.2.10";
+ "readable-stream-1.0.32" = self.by-version."readable-stream"."1.0.32";
+ "semver-1.1.4" = self.by-version."semver"."1.1.4";
+ };
peerDependencies = [
];
passthru.names = [ "log4js" ];
@@ -10286,7 +11313,8 @@
by-spec."longjohn"."~0.2.2" =
self.by-version."longjohn"."0.2.4";
by-version."longjohn"."0.2.4" = lib.makeOverridable self.buildNodePackage {
- name = "node-longjohn-0.2.4";
+ name = "longjohn-0.2.4";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/longjohn/-/longjohn-0.2.4.tgz";
@@ -10296,8 +11324,8 @@
];
buildInputs =
(self.nativeDeps."longjohn" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "longjohn" ];
@@ -10305,7 +11333,8 @@
by-spec."lru-cache"."2" =
self.by-version."lru-cache"."2.5.0";
by-version."lru-cache"."2.5.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-lru-cache-2.5.0";
+ name = "lru-cache-2.5.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz";
@@ -10315,8 +11344,8 @@
];
buildInputs =
(self.nativeDeps."lru-cache" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "lru-cache" ];
@@ -10324,7 +11353,8 @@
by-spec."lru-cache"."2.2.0" =
self.by-version."lru-cache"."2.2.0";
by-version."lru-cache"."2.2.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-lru-cache-2.2.0";
+ name = "lru-cache-2.2.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.2.0.tgz";
@@ -10334,8 +11364,8 @@
];
buildInputs =
(self.nativeDeps."lru-cache" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "lru-cache" ];
@@ -10343,7 +11373,8 @@
by-spec."lru-cache"."2.2.x" =
self.by-version."lru-cache"."2.2.4";
by-version."lru-cache"."2.2.4" = lib.makeOverridable self.buildNodePackage {
- name = "node-lru-cache-2.2.4";
+ name = "lru-cache-2.2.4";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz";
@@ -10353,8 +11384,8 @@
];
buildInputs =
(self.nativeDeps."lru-cache" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "lru-cache" ];
@@ -10362,7 +11393,8 @@
by-spec."lru-cache"."2.3.0" =
self.by-version."lru-cache"."2.3.0";
by-version."lru-cache"."2.3.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-lru-cache-2.3.0";
+ name = "lru-cache-2.3.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.3.0.tgz";
@@ -10372,8 +11404,8 @@
];
buildInputs =
(self.nativeDeps."lru-cache" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "lru-cache" ];
@@ -10383,7 +11415,8 @@
by-spec."lru-cache"."~1.0.2" =
self.by-version."lru-cache"."1.0.6";
by-version."lru-cache"."1.0.6" = lib.makeOverridable self.buildNodePackage {
- name = "node-lru-cache-1.0.6";
+ name = "lru-cache-1.0.6";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/lru-cache/-/lru-cache-1.0.6.tgz";
@@ -10393,8 +11426,8 @@
];
buildInputs =
(self.nativeDeps."lru-cache" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "lru-cache" ];
@@ -10404,7 +11437,8 @@
by-spec."lsmod"."~0.0.3" =
self.by-version."lsmod"."0.0.3";
by-version."lsmod"."0.0.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-lsmod-0.0.3";
+ name = "lsmod-0.0.3";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/lsmod/-/lsmod-0.0.3.tgz";
@@ -10414,8 +11448,8 @@
];
buildInputs =
(self.nativeDeps."lsmod" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "lsmod" ];
@@ -10423,7 +11457,8 @@
by-spec."mailcomposer".">= 0.1.27" =
self.by-version."mailcomposer"."0.2.12";
by-version."mailcomposer"."0.2.12" = lib.makeOverridable self.buildNodePackage {
- name = "node-mailcomposer-0.2.12";
+ name = "mailcomposer-0.2.12";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/mailcomposer/-/mailcomposer-0.2.12.tgz";
@@ -10433,13 +11468,13 @@
];
buildInputs =
(self.nativeDeps."mailcomposer" or []);
- deps = [
- self.by-version."mimelib"."0.2.17"
- self.by-version."mime"."1.2.11"
- self.by-version."he"."0.3.6"
- self.by-version."follow-redirects"."0.0.3"
- self.by-version."dkim-signer"."0.1.2"
- ];
+ deps = {
+ "mimelib-0.2.17" = self.by-version."mimelib"."0.2.17";
+ "mime-1.2.11" = self.by-version."mime"."1.2.11";
+ "he-0.3.6" = self.by-version."he"."0.3.6";
+ "follow-redirects-0.0.3" = self.by-version."follow-redirects"."0.0.3";
+ "dkim-signer-0.1.2" = self.by-version."dkim-signer"."0.1.2";
+ };
peerDependencies = [
];
passthru.names = [ "mailcomposer" ];
@@ -10448,6 +11483,7 @@
self.by-version."marked"."0.3.2";
by-version."marked"."0.3.2" = lib.makeOverridable self.buildNodePackage {
name = "marked-0.3.2";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/marked/-/marked-0.3.2.tgz";
@@ -10457,8 +11493,8 @@
];
buildInputs =
(self.nativeDeps."marked" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "marked" ];
@@ -10469,7 +11505,8 @@
by-spec."maxmin"."^0.1.0" =
self.by-version."maxmin"."0.1.0";
by-version."maxmin"."0.1.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-maxmin-0.1.0";
+ name = "maxmin-0.1.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/maxmin/-/maxmin-0.1.0.tgz";
@@ -10479,19 +11516,44 @@
];
buildInputs =
(self.nativeDeps."maxmin" or []);
- deps = [
- self.by-version."gzip-size"."0.1.1"
- self.by-version."pretty-bytes"."0.1.2"
- self.by-version."chalk"."0.4.0"
- ];
+ deps = {
+ "gzip-size-0.1.1" = self.by-version."gzip-size"."0.1.1";
+ "pretty-bytes-0.1.2" = self.by-version."pretty-bytes"."0.1.2";
+ "chalk-0.4.0" = self.by-version."chalk"."0.4.0";
+ };
peerDependencies = [
];
passthru.names = [ "maxmin" ];
};
- by-spec."maxmin"."^0.2.0" =
+ by-spec."maxmin"."^1.0.0" =
+ self.by-version."maxmin"."1.0.0";
+ by-version."maxmin"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+ name = "maxmin-1.0.0";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/maxmin/-/maxmin-1.0.0.tgz";
+ name = "maxmin-1.0.0.tgz";
+ sha1 = "040b7a15ba5c6f3b08581cbf201df0bdd64e19f0";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."maxmin" or []);
+ deps = {
+ "chalk-0.5.1" = self.by-version."chalk"."0.5.1";
+ "figures-1.3.3" = self.by-version."figures"."1.3.3";
+ "gzip-size-1.0.0" = self.by-version."gzip-size"."1.0.0";
+ "pretty-bytes-1.0.1" = self.by-version."pretty-bytes"."1.0.1";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "maxmin" ];
+ };
+ by-spec."maxmin"."~0.2.0" =
self.by-version."maxmin"."0.2.2";
by-version."maxmin"."0.2.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-maxmin-0.2.2";
+ name = "maxmin-0.2.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/maxmin/-/maxmin-0.2.2.tgz";
@@ -10501,22 +11563,21 @@
];
buildInputs =
(self.nativeDeps."maxmin" or []);
- deps = [
- self.by-version."chalk"."0.5.1"
- self.by-version."figures"."1.3.2"
- self.by-version."gzip-size"."0.2.0"
- self.by-version."pretty-bytes"."0.1.2"
- ];
+ deps = {
+ "chalk-0.5.1" = self.by-version."chalk"."0.5.1";
+ "figures-1.3.3" = self.by-version."figures"."1.3.3";
+ "gzip-size-0.2.0" = self.by-version."gzip-size"."0.2.0";
+ "pretty-bytes-0.1.2" = self.by-version."pretty-bytes"."0.1.2";
+ };
peerDependencies = [
];
passthru.names = [ "maxmin" ];
};
- by-spec."maxmin"."~0.2.0" =
- self.by-version."maxmin"."0.2.2";
by-spec."meat"."*" =
self.by-version."meat"."0.2.5";
by-version."meat"."0.2.5" = lib.makeOverridable self.buildNodePackage {
name = "meat-0.2.5";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/meat/-/meat-0.2.5.tgz";
@@ -10526,14 +11587,14 @@
];
buildInputs =
(self.nativeDeps."meat" or []);
- deps = [
- self.by-version."express"."2.5.11"
- self.by-version."jade"."0.27.0"
- self.by-version."open"."0.0.2"
- self.by-version."winston"."0.6.2"
- self.by-version."mkdirp"."0.3.0"
- self.by-version."node.extend"."1.0.0"
- ];
+ deps = {
+ "express-2.5.11" = self.by-version."express"."2.5.11";
+ "jade-0.27.0" = self.by-version."jade"."0.27.0";
+ "open-0.0.2" = self.by-version."open"."0.0.2";
+ "winston-0.6.2" = self.by-version."winston"."0.6.2";
+ "mkdirp-0.3.0" = self.by-version."mkdirp"."0.3.0";
+ "node.extend-1.0.0" = self.by-version."node.extend"."1.0.0";
+ };
peerDependencies = [
];
passthru.names = [ "meat" ];
@@ -10542,7 +11603,8 @@
by-spec."media-typer"."0.2.0" =
self.by-version."media-typer"."0.2.0";
by-version."media-typer"."0.2.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-media-typer-0.2.0";
+ name = "media-typer-0.2.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/media-typer/-/media-typer-0.2.0.tgz";
@@ -10552,18 +11614,37 @@
];
buildInputs =
(self.nativeDeps."media-typer" or []);
- deps = [
- ];
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "media-typer" ];
+ };
+ by-spec."media-typer"."0.3.0" =
+ self.by-version."media-typer"."0.3.0";
+ by-version."media-typer"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+ name = "media-typer-0.3.0";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz";
+ name = "media-typer-0.3.0.tgz";
+ sha1 = "8710d7af0aa626f8fffa1ce00168545263255748";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."media-typer" or []);
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "media-typer" ];
};
- by-spec."media-typer"."~0.2.0" =
- self.by-version."media-typer"."0.2.0";
by-spec."merge-descriptors"."0.0.2" =
self.by-version."merge-descriptors"."0.0.2";
by-version."merge-descriptors"."0.0.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-merge-descriptors-0.0.2";
+ name = "merge-descriptors-0.0.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/merge-descriptors/-/merge-descriptors-0.0.2.tgz";
@@ -10573,31 +11654,32 @@
];
buildInputs =
(self.nativeDeps."merge-descriptors" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "merge-descriptors" ];
};
- by-spec."method-override"."~2.1.3" =
- self.by-version."method-override"."2.1.3";
- by-version."method-override"."2.1.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-method-override-2.1.3";
+ by-spec."method-override"."~2.2.0" =
+ self.by-version."method-override"."2.2.0";
+ by-version."method-override"."2.2.0" = lib.makeOverridable self.buildNodePackage {
+ name = "method-override-2.2.0";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/method-override/-/method-override-2.1.3.tgz";
- name = "method-override-2.1.3.tgz";
- sha1 = "511f41c4fb1dccdb6ab1844da5dc6ea81b7c1135";
+ url = "http://registry.npmjs.org/method-override/-/method-override-2.2.0.tgz";
+ name = "method-override-2.2.0.tgz";
+ sha1 = "177e852b6add3b4f9177033a9446b01e7801a0c0";
})
];
buildInputs =
(self.nativeDeps."method-override" or []);
- deps = [
- self.by-version."debug"."1.0.4"
- self.by-version."methods"."1.1.0"
- self.by-version."parseurl"."1.3.0"
- self.by-version."vary"."1.0.0"
- ];
+ deps = {
+ "debug-2.0.0" = self.by-version."debug"."2.0.0";
+ "methods-1.1.0" = self.by-version."methods"."1.1.0";
+ "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
+ "vary-1.0.0" = self.by-version."vary"."1.0.0";
+ };
peerDependencies = [
];
passthru.names = [ "method-override" ];
@@ -10605,7 +11687,8 @@
by-spec."methods"."0.0.1" =
self.by-version."methods"."0.0.1";
by-version."methods"."0.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-methods-0.0.1";
+ name = "methods-0.0.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/methods/-/methods-0.0.1.tgz";
@@ -10615,8 +11698,8 @@
];
buildInputs =
(self.nativeDeps."methods" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "methods" ];
@@ -10624,7 +11707,8 @@
by-spec."methods"."0.1.0" =
self.by-version."methods"."0.1.0";
by-version."methods"."0.1.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-methods-0.1.0";
+ name = "methods-0.1.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/methods/-/methods-0.1.0.tgz";
@@ -10634,27 +11718,8 @@
];
buildInputs =
(self.nativeDeps."methods" or []);
- deps = [
- ];
- peerDependencies = [
- ];
- passthru.names = [ "methods" ];
- };
- by-spec."methods"."1.0.0" =
- self.by-version."methods"."1.0.0";
- by-version."methods"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-methods-1.0.0";
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/methods/-/methods-1.0.0.tgz";
- name = "methods-1.0.0.tgz";
- sha1 = "9a73d86375dfcef26ef61ca3e4b8a2e2538a80e3";
- })
- ];
- buildInputs =
- (self.nativeDeps."methods" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "methods" ];
@@ -10662,7 +11727,8 @@
by-spec."methods"."1.0.1" =
self.by-version."methods"."1.0.1";
by-version."methods"."1.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-methods-1.0.1";
+ name = "methods-1.0.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/methods/-/methods-1.0.1.tgz";
@@ -10672,8 +11738,8 @@
];
buildInputs =
(self.nativeDeps."methods" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "methods" ];
@@ -10681,7 +11747,8 @@
by-spec."methods"."1.1.0" =
self.by-version."methods"."1.1.0";
by-version."methods"."1.1.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-methods-1.1.0";
+ name = "methods-1.1.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/methods/-/methods-1.1.0.tgz";
@@ -10691,16 +11758,37 @@
];
buildInputs =
(self.nativeDeps."methods" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "methods" ];
};
+ by-spec."microee"."0.0.2" =
+ self.by-version."microee"."0.0.2";
+ by-version."microee"."0.0.2" = lib.makeOverridable self.buildNodePackage {
+ name = "microee-0.0.2";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/microee/-/microee-0.0.2.tgz";
+ name = "microee-0.0.2.tgz";
+ sha1 = "72e80d477075e5e799470f5defea96d1dd121587";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."microee" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "microee" ];
+ };
by-spec."mime"."*" =
self.by-version."mime"."1.2.11";
by-version."mime"."1.2.11" = lib.makeOverridable self.buildNodePackage {
- name = "node-mime-1.2.11";
+ name = "mime-1.2.11";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz";
@@ -10710,8 +11798,8 @@
];
buildInputs =
(self.nativeDeps."mime" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "mime" ];
@@ -10721,7 +11809,8 @@
by-spec."mime"."1.2.4" =
self.by-version."mime"."1.2.4";
by-version."mime"."1.2.4" = lib.makeOverridable self.buildNodePackage {
- name = "node-mime-1.2.4";
+ name = "mime-1.2.4";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/mime/-/mime-1.2.4.tgz";
@@ -10731,8 +11820,8 @@
];
buildInputs =
(self.nativeDeps."mime" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "mime" ];
@@ -10740,7 +11829,8 @@
by-spec."mime"."1.2.5" =
self.by-version."mime"."1.2.5";
by-version."mime"."1.2.5" = lib.makeOverridable self.buildNodePackage {
- name = "node-mime-1.2.5";
+ name = "mime-1.2.5";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/mime/-/mime-1.2.5.tgz";
@@ -10750,8 +11840,8 @@
];
buildInputs =
(self.nativeDeps."mime" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "mime" ];
@@ -10759,7 +11849,8 @@
by-spec."mime"."1.2.6" =
self.by-version."mime"."1.2.6";
by-version."mime"."1.2.6" = lib.makeOverridable self.buildNodePackage {
- name = "node-mime-1.2.6";
+ name = "mime-1.2.6";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/mime/-/mime-1.2.6.tgz";
@@ -10769,8 +11860,8 @@
];
buildInputs =
(self.nativeDeps."mime" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "mime" ];
@@ -10778,7 +11869,8 @@
by-spec."mime"."1.2.9" =
self.by-version."mime"."1.2.9";
by-version."mime"."1.2.9" = lib.makeOverridable self.buildNodePackage {
- name = "node-mime-1.2.9";
+ name = "mime-1.2.9";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/mime/-/mime-1.2.9.tgz";
@@ -10788,8 +11880,8 @@
];
buildInputs =
(self.nativeDeps."mime" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "mime" ];
@@ -10804,29 +11896,51 @@
self.by-version."mime"."1.2.11";
by-spec."mime"."~1.2.9" =
self.by-version."mime"."1.2.11";
- by-spec."mime-types"."1.0.0" =
- self.by-version."mime-types"."1.0.0";
- by-version."mime-types"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-mime-types-1.0.0";
+ by-spec."mime-db"."~1.0.1" =
+ self.by-version."mime-db"."1.0.3";
+ by-version."mime-db"."1.0.3" = lib.makeOverridable self.buildNodePackage {
+ name = "mime-db-1.0.3";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/mime-types/-/mime-types-1.0.0.tgz";
- name = "mime-types-1.0.0.tgz";
- sha1 = "6a7b4a6af2e7d92f97afe03f047c7801e8f001d2";
+ url = "http://registry.npmjs.org/mime-db/-/mime-db-1.0.3.tgz";
+ name = "mime-db-1.0.3.tgz";
+ sha1 = "5680b12300b3cecea5620f20f269ee80f2632d81";
})
];
buildInputs =
- (self.nativeDeps."mime-types" or []);
- deps = [
- ];
+ (self.nativeDeps."mime-db" or []);
+ deps = {
+ };
peerDependencies = [
];
- passthru.names = [ "mime-types" ];
+ passthru.names = [ "mime-db" ];
+ };
+ by-spec."mime-db"."~1.1.0" =
+ self.by-version."mime-db"."1.1.0";
+ by-version."mime-db"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+ name = "mime-db-1.1.0";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/mime-db/-/mime-db-1.1.0.tgz";
+ name = "mime-db-1.1.0.tgz";
+ sha1 = "4613f418ab995450bf4bda240cd0ab38016a07a9";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."mime-db" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "mime-db" ];
};
by-spec."mime-types"."~1.0.0" =
self.by-version."mime-types"."1.0.2";
by-version."mime-types"."1.0.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-mime-types-1.0.2";
+ name = "mime-types-1.0.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz";
@@ -10836,18 +11950,40 @@
];
buildInputs =
(self.nativeDeps."mime-types" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "mime-types" ];
};
by-spec."mime-types"."~1.0.1" =
self.by-version."mime-types"."1.0.2";
+ by-spec."mime-types"."~2.0.2" =
+ self.by-version."mime-types"."2.0.2";
+ by-version."mime-types"."2.0.2" = lib.makeOverridable self.buildNodePackage {
+ name = "mime-types-2.0.2";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.2.tgz";
+ name = "mime-types-2.0.2.tgz";
+ sha1 = "c74b779f2896c367888622bd537aaaad4c0a2c08";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."mime-types" or []);
+ deps = {
+ "mime-db-1.1.0" = self.by-version."mime-db"."1.1.0";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "mime-types" ];
+ };
by-spec."mimelib"."~0.2.15" =
self.by-version."mimelib"."0.2.17";
by-version."mimelib"."0.2.17" = lib.makeOverridable self.buildNodePackage {
- name = "node-mimelib-0.2.17";
+ name = "mimelib-0.2.17";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/mimelib/-/mimelib-0.2.17.tgz";
@@ -10857,39 +11993,40 @@
];
buildInputs =
(self.nativeDeps."mimelib" or []);
- deps = [
- self.by-version."encoding"."0.1.8"
- self.by-version."addressparser"."0.2.1"
- ];
+ deps = {
+ "encoding-0.1.8" = self.by-version."encoding"."0.1.8";
+ "addressparser-0.2.1" = self.by-version."addressparser"."0.2.1";
+ };
peerDependencies = [
];
passthru.names = [ "mimelib" ];
};
- by-spec."minimatch"."0" =
- self.by-version."minimatch"."0.4.0";
- by-version."minimatch"."0.4.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-minimatch-0.4.0";
+ by-spec."minilog"."~2.0.2" =
+ self.by-version."minilog"."2.0.6";
+ by-version."minilog"."2.0.6" = lib.makeOverridable self.buildNodePackage {
+ name = "minilog-2.0.6";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/minimatch/-/minimatch-0.4.0.tgz";
- name = "minimatch-0.4.0.tgz";
- sha1 = "bd2c7d060d2c8c8fd7cde7f1f2ed2d5b270fdb1b";
+ url = "http://registry.npmjs.org/minilog/-/minilog-2.0.6.tgz";
+ name = "minilog-2.0.6.tgz";
+ sha1 = "665601f32a08bda58406c0e933b08713b3a50ad4";
})
];
buildInputs =
- (self.nativeDeps."minimatch" or []);
- deps = [
- self.by-version."lru-cache"."2.5.0"
- self.by-version."sigmund"."1.0.0"
- ];
+ (self.nativeDeps."minilog" or []);
+ deps = {
+ "microee-0.0.2" = self.by-version."microee"."0.0.2";
+ };
peerDependencies = [
];
- passthru.names = [ "minimatch" ];
+ passthru.names = [ "minilog" ];
};
by-spec."minimatch"."0.0.x" =
self.by-version."minimatch"."0.0.5";
by-version."minimatch"."0.0.5" = lib.makeOverridable self.buildNodePackage {
- name = "node-minimatch-0.0.5";
+ name = "minimatch-0.0.5";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/minimatch/-/minimatch-0.0.5.tgz";
@@ -10899,9 +12036,9 @@
];
buildInputs =
(self.nativeDeps."minimatch" or []);
- deps = [
- self.by-version."lru-cache"."1.0.6"
- ];
+ deps = {
+ "lru-cache-1.0.6" = self.by-version."lru-cache"."1.0.6";
+ };
peerDependencies = [
];
passthru.names = [ "minimatch" ];
@@ -10909,7 +12046,8 @@
by-spec."minimatch"."0.2.x" =
self.by-version."minimatch"."0.2.14";
by-version."minimatch"."0.2.14" = lib.makeOverridable self.buildNodePackage {
- name = "node-minimatch-0.2.14";
+ name = "minimatch-0.2.14";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz";
@@ -10919,10 +12057,10 @@
];
buildInputs =
(self.nativeDeps."minimatch" or []);
- deps = [
- self.by-version."lru-cache"."2.5.0"
- self.by-version."sigmund"."1.0.0"
- ];
+ deps = {
+ "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0";
+ "sigmund-1.0.0" = self.by-version."sigmund"."1.0.0";
+ };
peerDependencies = [
];
passthru.names = [ "minimatch" ];
@@ -10930,7 +12068,8 @@
by-spec."minimatch"."0.3" =
self.by-version."minimatch"."0.3.0";
by-version."minimatch"."0.3.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-minimatch-0.3.0";
+ name = "minimatch-0.3.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz";
@@ -10940,22 +12079,41 @@
];
buildInputs =
(self.nativeDeps."minimatch" or []);
- deps = [
- self.by-version."lru-cache"."2.5.0"
- self.by-version."sigmund"."1.0.0"
- ];
+ deps = {
+ "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0";
+ "sigmund-1.0.0" = self.by-version."sigmund"."1.0.0";
+ };
peerDependencies = [
];
passthru.names = [ "minimatch" ];
};
by-spec."minimatch"."0.x" =
self.by-version."minimatch"."0.4.0";
- by-spec."minimatch"."0.x.x" =
- self.by-version."minimatch"."0.4.0";
+ by-version."minimatch"."0.4.0" = lib.makeOverridable self.buildNodePackage {
+ name = "minimatch-0.4.0";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/minimatch/-/minimatch-0.4.0.tgz";
+ name = "minimatch-0.4.0.tgz";
+ sha1 = "bd2c7d060d2c8c8fd7cde7f1f2ed2d5b270fdb1b";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."minimatch" or []);
+ deps = {
+ "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0";
+ "sigmund-1.0.0" = self.by-version."sigmund"."1.0.0";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "minimatch" ];
+ };
by-spec."minimatch"."1" =
self.by-version."minimatch"."1.0.0";
by-version."minimatch"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-minimatch-1.0.0";
+ name = "minimatch-1.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz";
@@ -10965,14 +12123,16 @@
];
buildInputs =
(self.nativeDeps."minimatch" or []);
- deps = [
- self.by-version."lru-cache"."2.5.0"
- self.by-version."sigmund"."1.0.0"
- ];
+ deps = {
+ "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0";
+ "sigmund-1.0.0" = self.by-version."sigmund"."1.0.0";
+ };
peerDependencies = [
];
passthru.names = [ "minimatch" ];
};
+ by-spec."minimatch"."1.0.x" =
+ self.by-version."minimatch"."1.0.0";
by-spec."minimatch".">=0.2.4" =
self.by-version."minimatch"."1.0.0";
by-spec."minimatch"."^1.0.0" =
@@ -10987,10 +12147,13 @@
self.by-version."minimatch"."0.2.14";
by-spec."minimatch"."~0.3.0" =
self.by-version."minimatch"."0.3.0";
+ by-spec."minimatch"."~1.0.0" =
+ self.by-version."minimatch"."1.0.0";
by-spec."minimist"."0.0.8" =
self.by-version."minimist"."0.0.8";
by-version."minimist"."0.0.8" = lib.makeOverridable self.buildNodePackage {
- name = "node-minimist-0.0.8";
+ name = "minimist-0.0.8";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
@@ -11000,8 +12163,8 @@
];
buildInputs =
(self.nativeDeps."minimist" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "minimist" ];
@@ -11009,7 +12172,8 @@
by-spec."minimist"."^0.1.0" =
self.by-version."minimist"."0.1.0";
by-version."minimist"."0.1.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-minimist-0.1.0";
+ name = "minimist-0.1.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/minimist/-/minimist-0.1.0.tgz";
@@ -11019,8 +12183,28 @@
];
buildInputs =
(self.nativeDeps."minimist" or []);
- deps = [
+ deps = {
+ };
+ peerDependencies = [
];
+ passthru.names = [ "minimist" ];
+ };
+ by-spec."minimist"."^1.1.0" =
+ self.by-version."minimist"."1.1.0";
+ by-version."minimist"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+ name = "minimist-1.1.0";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/minimist/-/minimist-1.1.0.tgz";
+ name = "minimist-1.1.0.tgz";
+ sha1 = "cdf225e8898f840a258ded44fc91776770afdc93";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."minimist" or []);
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "minimist" ];
@@ -11028,7 +12212,8 @@
by-spec."minimist"."~0.0.1" =
self.by-version."minimist"."0.0.10";
by-version."minimist"."0.0.10" = lib.makeOverridable self.buildNodePackage {
- name = "node-minimist-0.0.10";
+ name = "minimist-0.0.10";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz";
@@ -11038,8 +12223,8 @@
];
buildInputs =
(self.nativeDeps."minimist" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "minimist" ];
@@ -11049,7 +12234,8 @@
by-spec."minimist"."~0.2.0" =
self.by-version."minimist"."0.2.0";
by-version."minimist"."0.2.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-minimist-0.2.0";
+ name = "minimist-0.2.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz";
@@ -11059,8 +12245,8 @@
];
buildInputs =
(self.nativeDeps."minimist" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "minimist" ];
@@ -11068,7 +12254,8 @@
by-spec."ministyle"."~0.1.3" =
self.by-version."ministyle"."0.1.4";
by-version."ministyle"."0.1.4" = lib.makeOverridable self.buildNodePackage {
- name = "node-ministyle-0.1.4";
+ name = "ministyle-0.1.4";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/ministyle/-/ministyle-0.1.4.tgz";
@@ -11078,8 +12265,8 @@
];
buildInputs =
(self.nativeDeps."ministyle" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "ministyle" ];
@@ -11087,7 +12274,8 @@
by-spec."miniwrite"."~0.1.3" =
self.by-version."miniwrite"."0.1.3";
by-version."miniwrite"."0.1.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-miniwrite-0.1.3";
+ name = "miniwrite-0.1.3";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/miniwrite/-/miniwrite-0.1.3.tgz";
@@ -11097,9 +12285,9 @@
];
buildInputs =
(self.nativeDeps."miniwrite" or []);
- deps = [
- self.by-version."mkdirp"."0.3.5"
- ];
+ deps = {
+ "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
+ };
peerDependencies = [
];
passthru.names = [ "miniwrite" ];
@@ -11108,6 +12296,7 @@
self.by-version."mkdirp"."0.5.0";
by-version."mkdirp"."0.5.0" = lib.makeOverridable self.buildNodePackage {
name = "mkdirp-0.5.0";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz";
@@ -11117,20 +12306,19 @@
];
buildInputs =
(self.nativeDeps."mkdirp" or []);
- deps = [
- self.by-version."minimist"."0.0.8"
- ];
+ deps = {
+ "minimist-0.0.8" = self.by-version."minimist"."0.0.8";
+ };
peerDependencies = [
];
passthru.names = [ "mkdirp" ];
};
"mkdirp" = self.by-version."mkdirp"."0.5.0";
- by-spec."mkdirp"."0" =
- self.by-version."mkdirp"."0.5.0";
by-spec."mkdirp"."0.3.0" =
self.by-version."mkdirp"."0.3.0";
by-version."mkdirp"."0.3.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-mkdirp-0.3.0";
+ name = "mkdirp-0.3.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz";
@@ -11140,8 +12328,8 @@
];
buildInputs =
(self.nativeDeps."mkdirp" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "mkdirp" ];
@@ -11149,7 +12337,8 @@
by-spec."mkdirp"."0.3.5" =
self.by-version."mkdirp"."0.3.5";
by-version."mkdirp"."0.3.5" = lib.makeOverridable self.buildNodePackage {
- name = "node-mkdirp-0.3.5";
+ name = "mkdirp-0.3.5";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz";
@@ -11159,8 +12348,8 @@
];
buildInputs =
(self.nativeDeps."mkdirp" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "mkdirp" ];
@@ -11191,6 +12380,7 @@
self.by-version."mocha"."1.21.4";
by-version."mocha"."1.21.4" = lib.makeOverridable self.buildNodePackage {
name = "mocha-1.21.4";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/mocha/-/mocha-1.21.4.tgz";
@@ -11200,15 +12390,15 @@
];
buildInputs =
(self.nativeDeps."mocha" or []);
- deps = [
- self.by-version."commander"."2.0.0"
- self.by-version."growl"."1.8.1"
- self.by-version."jade"."0.26.3"
- self.by-version."diff"."1.0.7"
- self.by-version."debug"."1.0.4"
- self.by-version."mkdirp"."0.3.5"
- self.by-version."glob"."3.2.3"
- ];
+ deps = {
+ "commander-2.0.0" = self.by-version."commander"."2.0.0";
+ "growl-1.8.1" = self.by-version."growl"."1.8.1";
+ "jade-0.26.3" = self.by-version."jade"."0.26.3";
+ "diff-1.0.7" = self.by-version."diff"."1.0.7";
+ "debug-2.0.0" = self.by-version."debug"."2.0.0";
+ "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
+ "glob-3.2.3" = self.by-version."glob"."3.2.3";
+ };
peerDependencies = [
];
passthru.names = [ "mocha" ];
@@ -11218,6 +12408,7 @@
self.by-version."mocha"."1.20.1";
by-version."mocha"."1.20.1" = lib.makeOverridable self.buildNodePackage {
name = "mocha-1.20.1";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/mocha/-/mocha-1.20.1.tgz";
@@ -11227,15 +12418,15 @@
];
buildInputs =
(self.nativeDeps."mocha" or []);
- deps = [
- self.by-version."commander"."2.0.0"
- self.by-version."growl"."1.7.0"
- self.by-version."jade"."0.26.3"
- self.by-version."diff"."1.0.7"
- self.by-version."debug"."1.0.4"
- self.by-version."mkdirp"."0.3.5"
- self.by-version."glob"."3.2.3"
- ];
+ deps = {
+ "commander-2.0.0" = self.by-version."commander"."2.0.0";
+ "growl-1.7.0" = self.by-version."growl"."1.7.0";
+ "jade-0.26.3" = self.by-version."jade"."0.26.3";
+ "diff-1.0.7" = self.by-version."diff"."1.0.7";
+ "debug-2.0.0" = self.by-version."debug"."2.0.0";
+ "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
+ "glob-3.2.3" = self.by-version."glob"."3.2.3";
+ };
peerDependencies = [
];
passthru.names = [ "mocha" ];
@@ -11244,6 +12435,7 @@
self.by-version."mocha-phantomjs"."3.5.0";
by-version."mocha-phantomjs"."3.5.0" = lib.makeOverridable self.buildNodePackage {
name = "mocha-phantomjs-3.5.0";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/mocha-phantomjs/-/mocha-phantomjs-3.5.0.tgz";
@@ -11253,12 +12445,12 @@
];
buildInputs =
(self.nativeDeps."mocha-phantomjs" or []);
- deps = [
- self.by-version."mocha"."1.20.1"
- self.by-version."commander"."2.0.0"
- ];
+ deps = {
+ "mocha-1.20.1" = self.by-version."mocha"."1.20.1";
+ "commander-2.0.0" = self.by-version."commander"."2.0.0";
+ };
peerDependencies = [
- self.by-version."phantomjs"."1.9.7-15"
+ self.by-version."phantomjs"."1.9.10"
];
passthru.names = [ "mocha-phantomjs" ];
};
@@ -11266,7 +12458,8 @@
by-spec."mocha-unfunk-reporter"."*" =
self.by-version."mocha-unfunk-reporter"."0.4.0";
by-version."mocha-unfunk-reporter"."0.4.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-mocha-unfunk-reporter-0.4.0";
+ name = "mocha-unfunk-reporter-0.4.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/mocha-unfunk-reporter/-/mocha-unfunk-reporter-0.4.0.tgz";
@@ -11276,46 +12469,47 @@
];
buildInputs =
(self.nativeDeps."mocha-unfunk-reporter" or []);
- deps = [
- self.by-version."jsesc"."0.4.3"
- self.by-version."unfunk-diff"."0.0.2"
- self.by-version."miniwrite"."0.1.3"
- self.by-version."ministyle"."0.1.4"
- ];
+ deps = {
+ "jsesc-0.4.3" = self.by-version."jsesc"."0.4.3";
+ "unfunk-diff-0.0.2" = self.by-version."unfunk-diff"."0.0.2";
+ "miniwrite-0.1.3" = self.by-version."miniwrite"."0.1.3";
+ "ministyle-0.1.4" = self.by-version."ministyle"."0.1.4";
+ };
peerDependencies = [
];
passthru.names = [ "mocha-unfunk-reporter" ];
};
"mocha-unfunk-reporter" = self.by-version."mocha-unfunk-reporter"."0.4.0";
by-spec."module-deps"."^3.5.0" =
- self.by-version."module-deps"."3.5.5";
- by-version."module-deps"."3.5.5" = lib.makeOverridable self.buildNodePackage {
- name = "module-deps-3.5.5";
+ self.by-version."module-deps"."3.5.6";
+ by-version."module-deps"."3.5.6" = lib.makeOverridable self.buildNodePackage {
+ name = "module-deps-3.5.6";
+ bin = true;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/module-deps/-/module-deps-3.5.5.tgz";
- name = "module-deps-3.5.5.tgz";
- sha1 = "08e52113552fe72a6f912b1bbe58e9e84ff1ac4a";
+ url = "http://registry.npmjs.org/module-deps/-/module-deps-3.5.6.tgz";
+ name = "module-deps-3.5.6.tgz";
+ sha1 = "3853bb0be43b0d6632d25d96e4099abdfdf989d9";
})
];
buildInputs =
(self.nativeDeps."module-deps" or []);
- deps = [
- self.by-version."JSONStream"."0.7.4"
- self.by-version."browser-resolve"."1.3.2"
- self.by-version."concat-stream"."1.4.6"
- self.by-version."detective"."3.1.0"
- self.by-version."duplexer2"."0.0.2"
- self.by-version."inherits"."2.0.1"
- self.by-version."minimist"."0.2.0"
- self.by-version."parents"."1.0.0"
- self.by-version."readable-stream"."1.1.13"
- self.by-version."resolve"."0.7.4"
- self.by-version."shallow-copy"."0.0.1"
- self.by-version."stream-combiner2"."1.0.1"
- self.by-version."subarg"."0.0.1"
- self.by-version."through2"."0.4.2"
- ];
+ deps = {
+ "JSONStream-0.7.4" = self.by-version."JSONStream"."0.7.4";
+ "browser-resolve-1.3.2" = self.by-version."browser-resolve"."1.3.2";
+ "concat-stream-1.4.6" = self.by-version."concat-stream"."1.4.6";
+ "detective-3.1.0" = self.by-version."detective"."3.1.0";
+ "duplexer2-0.0.2" = self.by-version."duplexer2"."0.0.2";
+ "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+ "minimist-0.2.0" = self.by-version."minimist"."0.2.0";
+ "parents-1.0.0" = self.by-version."parents"."1.0.0";
+ "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+ "resolve-0.7.4" = self.by-version."resolve"."0.7.4";
+ "shallow-copy-0.0.1" = self.by-version."shallow-copy"."0.0.1";
+ "stream-combiner2-1.0.2" = self.by-version."stream-combiner2"."1.0.2";
+ "subarg-0.0.1" = self.by-version."subarg"."0.0.1";
+ "through2-0.4.2" = self.by-version."through2"."0.4.2";
+ };
peerDependencies = [
];
passthru.names = [ "module-deps" ];
@@ -11323,7 +12517,8 @@
by-spec."moment"."2.1.0" =
self.by-version."moment"."2.1.0";
by-version."moment"."2.1.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-moment-2.1.0";
+ name = "moment-2.1.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/moment/-/moment-2.1.0.tgz";
@@ -11333,8 +12528,8 @@
];
buildInputs =
(self.nativeDeps."moment" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "moment" ];
@@ -11342,7 +12537,8 @@
by-spec."moment"."~2.4.0" =
self.by-version."moment"."2.4.0";
by-version."moment"."2.4.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-moment-2.4.0";
+ name = "moment-2.4.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/moment/-/moment-2.4.0.tgz";
@@ -11352,58 +12548,60 @@
];
buildInputs =
(self.nativeDeps."moment" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "moment" ];
};
- by-spec."moment"."~2.7.0" =
- self.by-version."moment"."2.7.0";
- by-version."moment"."2.7.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-moment-2.7.0";
+ by-spec."moment"."~2.8.2" =
+ self.by-version."moment"."2.8.3";
+ by-version."moment"."2.8.3" = lib.makeOverridable self.buildNodePackage {
+ name = "moment-2.8.3";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/moment/-/moment-2.7.0.tgz";
- name = "moment-2.7.0.tgz";
- sha1 = "359a19ec634cda3c706c8709adda54c0329aaec4";
+ url = "http://registry.npmjs.org/moment/-/moment-2.8.3.tgz";
+ name = "moment-2.8.3.tgz";
+ sha1 = "a01427bf8910f014fc4baa1b8d96f17f7e3f29a2";
})
];
buildInputs =
(self.nativeDeps."moment" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "moment" ];
};
by-spec."mongodb"."*" =
- self.by-version."mongodb"."1.4.8";
- by-version."mongodb"."1.4.8" = lib.makeOverridable self.buildNodePackage {
- name = "node-mongodb-1.4.8";
+ self.by-version."mongodb"."2.0.0-alpha2";
+ by-version."mongodb"."2.0.0-alpha2" = lib.makeOverridable self.buildNodePackage {
+ name = "mongodb-2.0.0-alpha2";
+ bin = false;
src = [
- (self.patchSource fetchurl {
- url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.8.tgz";
- name = "mongodb-1.4.8.tgz";
- sha1 = "808802e296f78e5062ef46a87a90abd68031552f";
+ (fetchurl {
+ url = "http://registry.npmjs.org/mongodb/-/mongodb-2.0.0-alpha2.tgz";
+ name = "mongodb-2.0.0-alpha2.tgz";
+ sha1 = "04541787b29a7db6a03ca4e44e593dd726d03d91";
})
];
buildInputs =
(self.nativeDeps."mongodb" or []);
- deps = [
- self.by-version."bson"."0.2.11"
- self.by-version."kerberos"."0.0.3"
- self.by-version."readable-stream"."1.1.13"
- ];
+ deps = {
+ "mongodb-core-1.0.0-alpha9" = self.by-version."mongodb-core"."1.0.0-alpha9";
+ "readable-stream-1.0.31" = self.by-version."readable-stream"."1.0.31";
+ };
peerDependencies = [
];
passthru.names = [ "mongodb" ];
};
- "mongodb" = self.by-version."mongodb"."1.4.8";
+ "mongodb" = self.by-version."mongodb"."2.0.0-alpha2";
by-spec."mongodb"."1.2.14" =
self.by-version."mongodb"."1.2.14";
by-version."mongodb"."1.2.14" = lib.makeOverridable self.buildNodePackage {
- name = "node-mongodb-1.2.14";
+ name = "mongodb-1.2.14";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/mongodb/-/mongodb-1.2.14.tgz";
@@ -11413,9 +12611,9 @@
];
buildInputs =
(self.nativeDeps."mongodb" or []);
- deps = [
- self.by-version."bson"."0.1.8"
- ];
+ deps = {
+ "bson-0.1.8" = self.by-version."bson"."0.1.8";
+ };
peerDependencies = [
];
passthru.names = [ "mongodb" ];
@@ -11423,7 +12621,8 @@
by-spec."mongodb"."1.3.19" =
self.by-version."mongodb"."1.3.19";
by-version."mongodb"."1.3.19" = lib.makeOverridable self.buildNodePackage {
- name = "node-mongodb-1.3.19";
+ name = "mongodb-1.3.19";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/mongodb/-/mongodb-1.3.19.tgz";
@@ -11433,10 +12632,10 @@
];
buildInputs =
(self.nativeDeps."mongodb" or []);
- deps = [
- self.by-version."bson"."0.2.2"
- self.by-version."kerberos"."0.0.3"
- ];
+ deps = {
+ "bson-0.2.2" = self.by-version."bson"."0.2.2";
+ "kerberos-0.0.3" = self.by-version."kerberos"."0.0.3";
+ };
peerDependencies = [
];
passthru.names = [ "mongodb" ];
@@ -11444,7 +12643,8 @@
by-spec."mongodb"."1.3.x" =
self.by-version."mongodb"."1.3.23";
by-version."mongodb"."1.3.23" = lib.makeOverridable self.buildNodePackage {
- name = "node-mongodb-1.3.23";
+ name = "mongodb-1.3.23";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/mongodb/-/mongodb-1.3.23.tgz";
@@ -11454,40 +12654,66 @@
];
buildInputs =
(self.nativeDeps."mongodb" or []);
- deps = [
- self.by-version."bson"."0.2.5"
- self.by-version."kerberos"."0.0.3"
- ];
+ deps = {
+ "bson-0.2.5" = self.by-version."bson"."0.2.5";
+ "kerberos-0.0.3" = self.by-version."kerberos"."0.0.3";
+ };
peerDependencies = [
];
passthru.names = [ "mongodb" ];
};
- by-spec."mongodb"."1.4.7" =
- self.by-version."mongodb"."1.4.7";
- by-version."mongodb"."1.4.7" = lib.makeOverridable self.buildNodePackage {
- name = "node-mongodb-1.4.7";
+ by-spec."mongodb"."1.4.9" =
+ self.by-version."mongodb"."1.4.9";
+ by-version."mongodb"."1.4.9" = lib.makeOverridable self.buildNodePackage {
+ name = "mongodb-1.4.9";
+ bin = false;
src = [
(self.patchSource fetchurl {
- url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.7.tgz";
- name = "mongodb-1.4.7.tgz";
- sha1 = "f605b5d43c6c018c7d56d2fb53984dd60a7be128";
+ url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.9.tgz";
+ name = "mongodb-1.4.9.tgz";
+ sha1 = "c30b9724248be471d30235e2d542646d3b869bc2";
})
];
buildInputs =
(self.nativeDeps."mongodb" or []);
- deps = [
- self.by-version."bson"."0.2.9"
- self.by-version."kerberos"."0.0.3"
- self.by-version."readable-stream"."1.1.13"
- ];
+ deps = {
+ "bson-0.2.12" = self.by-version."bson"."0.2.12";
+ "kerberos-0.0.3" = self.by-version."kerberos"."0.0.3";
+ "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+ };
peerDependencies = [
];
passthru.names = [ "mongodb" ];
};
+ by-spec."mongodb-core"."~1.0" =
+ self.by-version."mongodb-core"."1.0.0-alpha9";
+ by-version."mongodb-core"."1.0.0-alpha9" = lib.makeOverridable self.buildNodePackage {
+ name = "mongodb-core-1.0.0-alpha9";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/mongodb-core/-/mongodb-core-1.0.0-alpha9.tgz";
+ name = "mongodb-core-1.0.0-alpha9.tgz";
+ sha1 = "895cf88ad00d20462c417cc2f59d261ec15f0c23";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."mongodb-core" or []);
+ deps = {
+ "bson-0.2.15" = self.by-version."bson"."0.2.15";
+ "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
+ "rimraf-2.2.6" = self.by-version."rimraf"."2.2.6";
+ "kerberos-0.0.5" = self.by-version."kerberos"."0.0.5";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "mongodb-core" ];
+ };
by-spec."mongoose"."3.6.7" =
self.by-version."mongoose"."3.6.7";
by-version."mongoose"."3.6.7" = lib.makeOverridable self.buildNodePackage {
- name = "node-mongoose-3.6.7";
+ name = "mongoose-3.6.7";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/mongoose/-/mongoose-3.6.7.tgz";
@@ -11497,15 +12723,15 @@
];
buildInputs =
(self.nativeDeps."mongoose" or []);
- deps = [
- self.by-version."hooks"."0.2.1"
- self.by-version."mongodb"."1.2.14"
- self.by-version."ms"."0.1.0"
- self.by-version."sliced"."0.0.3"
- self.by-version."muri"."0.3.1"
- self.by-version."mpromise"."0.2.1"
- self.by-version."mpath"."0.1.1"
- ];
+ deps = {
+ "hooks-0.2.1" = self.by-version."hooks"."0.2.1";
+ "mongodb-1.2.14" = self.by-version."mongodb"."1.2.14";
+ "ms-0.1.0" = self.by-version."ms"."0.1.0";
+ "sliced-0.0.3" = self.by-version."sliced"."0.0.3";
+ "muri-0.3.1" = self.by-version."muri"."0.3.1";
+ "mpromise-0.2.1" = self.by-version."mpromise"."0.2.1";
+ "mpath-0.1.1" = self.by-version."mpath"."0.1.1";
+ };
peerDependencies = [
];
passthru.names = [ "mongoose" ];
@@ -11513,7 +12739,8 @@
by-spec."mongoose"."3.6.x" =
self.by-version."mongoose"."3.6.20";
by-version."mongoose"."3.6.20" = lib.makeOverridable self.buildNodePackage {
- name = "node-mongoose-3.6.20";
+ name = "mongoose-3.6.20";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/mongoose/-/mongoose-3.6.20.tgz";
@@ -11523,45 +12750,46 @@
];
buildInputs =
(self.nativeDeps."mongoose" or []);
- deps = [
- self.by-version."hooks"."0.2.1"
- self.by-version."mongodb"."1.3.19"
- self.by-version."ms"."0.1.0"
- self.by-version."sliced"."0.0.5"
- self.by-version."muri"."0.3.1"
- self.by-version."mpromise"."0.2.1"
- self.by-version."mpath"."0.1.1"
- self.by-version."regexp-clone"."0.0.1"
- ];
+ deps = {
+ "hooks-0.2.1" = self.by-version."hooks"."0.2.1";
+ "mongodb-1.3.19" = self.by-version."mongodb"."1.3.19";
+ "ms-0.1.0" = self.by-version."ms"."0.1.0";
+ "sliced-0.0.5" = self.by-version."sliced"."0.0.5";
+ "muri-0.3.1" = self.by-version."muri"."0.3.1";
+ "mpromise-0.2.1" = self.by-version."mpromise"."0.2.1";
+ "mpath-0.1.1" = self.by-version."mpath"."0.1.1";
+ "regexp-clone-0.0.1" = self.by-version."regexp-clone"."0.0.1";
+ };
peerDependencies = [
];
passthru.names = [ "mongoose" ];
};
"mongoose" = self.by-version."mongoose"."3.6.20";
by-spec."mongoose"."3.8.x" =
- self.by-version."mongoose"."3.8.15";
- by-version."mongoose"."3.8.15" = lib.makeOverridable self.buildNodePackage {
- name = "node-mongoose-3.8.15";
+ self.by-version."mongoose"."3.8.17";
+ by-version."mongoose"."3.8.17" = lib.makeOverridable self.buildNodePackage {
+ name = "mongoose-3.8.17";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/mongoose/-/mongoose-3.8.15.tgz";
- name = "mongoose-3.8.15.tgz";
- sha1 = "2bc089d011f9e4e662e3aa2aab00771ef43847c1";
+ url = "http://registry.npmjs.org/mongoose/-/mongoose-3.8.17.tgz";
+ name = "mongoose-3.8.17.tgz";
+ sha1 = "23426b3aea84255623dca28823de64a8fcd53da8";
})
];
buildInputs =
(self.nativeDeps."mongoose" or []);
- deps = [
- self.by-version."mongodb"."1.4.7"
- self.by-version."hooks"."0.2.1"
- self.by-version."ms"."0.1.0"
- self.by-version."sliced"."0.0.5"
- self.by-version."muri"."0.3.1"
- self.by-version."mpromise"."0.4.3"
- self.by-version."mpath"."0.1.1"
- self.by-version."regexp-clone"."0.0.1"
- self.by-version."mquery"."0.8.0"
- ];
+ deps = {
+ "mongodb-1.4.9" = self.by-version."mongodb"."1.4.9";
+ "hooks-0.2.1" = self.by-version."hooks"."0.2.1";
+ "ms-0.1.0" = self.by-version."ms"."0.1.0";
+ "sliced-0.0.5" = self.by-version."sliced"."0.0.5";
+ "muri-0.3.1" = self.by-version."muri"."0.3.1";
+ "mpromise-0.4.3" = self.by-version."mpromise"."0.4.3";
+ "mpath-0.1.1" = self.by-version."mpath"."0.1.1";
+ "regexp-clone-0.0.1" = self.by-version."regexp-clone"."0.0.1";
+ "mquery-0.8.0" = self.by-version."mquery"."0.8.0";
+ };
peerDependencies = [
];
passthru.names = [ "mongoose" ];
@@ -11569,7 +12797,8 @@
by-spec."mongoose-lifecycle"."1.0.0" =
self.by-version."mongoose-lifecycle"."1.0.0";
by-version."mongoose-lifecycle"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-mongoose-lifecycle-1.0.0";
+ name = "mongoose-lifecycle-1.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/mongoose-lifecycle/-/mongoose-lifecycle-1.0.0.tgz";
@@ -11579,8 +12808,8 @@
];
buildInputs =
(self.nativeDeps."mongoose-lifecycle" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "mongoose-lifecycle" ];
@@ -11588,7 +12817,8 @@
by-spec."mongoose-schema-extend"."*" =
self.by-version."mongoose-schema-extend"."0.1.7";
by-version."mongoose-schema-extend"."0.1.7" = lib.makeOverridable self.buildNodePackage {
- name = "node-mongoose-schema-extend-0.1.7";
+ name = "mongoose-schema-extend-0.1.7";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/mongoose-schema-extend/-/mongoose-schema-extend-0.1.7.tgz";
@@ -11598,9 +12828,9 @@
];
buildInputs =
(self.nativeDeps."mongoose-schema-extend" or []);
- deps = [
- self.by-version."owl-deepcopy"."0.0.4"
- ];
+ deps = {
+ "owl-deepcopy-0.0.4" = self.by-version."owl-deepcopy"."0.0.4";
+ };
peerDependencies = [
];
passthru.names = [ "mongoose-schema-extend" ];
@@ -11609,7 +12839,8 @@
by-spec."monocle"."1.1.50" =
self.by-version."monocle"."1.1.50";
by-version."monocle"."1.1.50" = lib.makeOverridable self.buildNodePackage {
- name = "node-monocle-1.1.50";
+ name = "monocle-1.1.50";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/monocle/-/monocle-1.1.50.tgz";
@@ -11619,9 +12850,9 @@
];
buildInputs =
(self.nativeDeps."monocle" or []);
- deps = [
- self.by-version."readdirp"."0.2.5"
- ];
+ deps = {
+ "readdirp-0.2.5" = self.by-version."readdirp"."0.2.5";
+ };
peerDependencies = [
];
passthru.names = [ "monocle" ];
@@ -11629,7 +12860,8 @@
by-spec."monocle"."1.1.51" =
self.by-version."monocle"."1.1.51";
by-version."monocle"."1.1.51" = lib.makeOverridable self.buildNodePackage {
- name = "node-monocle-1.1.51";
+ name = "monocle-1.1.51";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/monocle/-/monocle-1.1.51.tgz";
@@ -11639,32 +12871,32 @@
];
buildInputs =
(self.nativeDeps."monocle" or []);
- deps = [
- self.by-version."readdirp"."0.2.5"
- ];
+ deps = {
+ "readdirp-0.2.5" = self.by-version."readdirp"."0.2.5";
+ };
peerDependencies = [
];
passthru.names = [ "monocle" ];
};
- by-spec."morgan"."~1.2.3" =
- self.by-version."morgan"."1.2.3";
- by-version."morgan"."1.2.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-morgan-1.2.3";
+ by-spec."morgan"."~1.3.2" =
+ self.by-version."morgan"."1.3.2";
+ by-version."morgan"."1.3.2" = lib.makeOverridable self.buildNodePackage {
+ name = "morgan-1.3.2";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/morgan/-/morgan-1.2.3.tgz";
- name = "morgan-1.2.3.tgz";
- sha1 = "3b0f1704df90255a542591abacd797891a8c40a1";
+ url = "http://registry.npmjs.org/morgan/-/morgan-1.3.2.tgz";
+ name = "morgan-1.3.2.tgz";
+ sha1 = "ac41aa15221ee4e5f2ac843896b6918139a18efd";
})
];
buildInputs =
(self.nativeDeps."morgan" or []);
- deps = [
- self.by-version."basic-auth"."1.0.0"
- self.by-version."bytes"."1.0.0"
- self.by-version."depd"."0.4.4"
- self.by-version."on-finished"."2.1.0"
- ];
+ deps = {
+ "basic-auth-1.0.0" = self.by-version."basic-auth"."1.0.0";
+ "depd-0.4.5" = self.by-version."depd"."0.4.5";
+ "on-finished-2.1.0" = self.by-version."on-finished"."2.1.0";
+ };
peerDependencies = [
];
passthru.names = [ "morgan" ];
@@ -11672,7 +12904,8 @@
by-spec."mpath"."0.1.1" =
self.by-version."mpath"."0.1.1";
by-version."mpath"."0.1.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-mpath-0.1.1";
+ name = "mpath-0.1.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/mpath/-/mpath-0.1.1.tgz";
@@ -11682,8 +12915,8 @@
];
buildInputs =
(self.nativeDeps."mpath" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "mpath" ];
@@ -11691,7 +12924,8 @@
by-spec."mpromise"."0.2.1" =
self.by-version."mpromise"."0.2.1";
by-version."mpromise"."0.2.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-mpromise-0.2.1";
+ name = "mpromise-0.2.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/mpromise/-/mpromise-0.2.1.tgz";
@@ -11701,9 +12935,9 @@
];
buildInputs =
(self.nativeDeps."mpromise" or []);
- deps = [
- self.by-version."sliced"."0.0.4"
- ];
+ deps = {
+ "sliced-0.0.4" = self.by-version."sliced"."0.0.4";
+ };
peerDependencies = [
];
passthru.names = [ "mpromise" ];
@@ -11711,7 +12945,8 @@
by-spec."mpromise"."0.4.3" =
self.by-version."mpromise"."0.4.3";
by-version."mpromise"."0.4.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-mpromise-0.4.3";
+ name = "mpromise-0.4.3";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/mpromise/-/mpromise-0.4.3.tgz";
@@ -11721,8 +12956,8 @@
];
buildInputs =
(self.nativeDeps."mpromise" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "mpromise" ];
@@ -11730,7 +12965,8 @@
by-spec."mquery"."0.8.0" =
self.by-version."mquery"."0.8.0";
by-version."mquery"."0.8.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-mquery-0.8.0";
+ name = "mquery-0.8.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/mquery/-/mquery-0.8.0.tgz";
@@ -11740,11 +12976,11 @@
];
buildInputs =
(self.nativeDeps."mquery" or []);
- deps = [
- self.by-version."sliced"."0.0.5"
- self.by-version."debug"."0.7.4"
- self.by-version."regexp-clone"."0.0.1"
- ];
+ deps = {
+ "sliced-0.0.5" = self.by-version."sliced"."0.0.5";
+ "debug-0.7.4" = self.by-version."debug"."0.7.4";
+ "regexp-clone-0.0.1" = self.by-version."regexp-clone"."0.0.1";
+ };
peerDependencies = [
];
passthru.names = [ "mquery" ];
@@ -11752,7 +12988,8 @@
by-spec."ms"."0.1.0" =
self.by-version."ms"."0.1.0";
by-version."ms"."0.1.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-ms-0.1.0";
+ name = "ms-0.1.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/ms/-/ms-0.1.0.tgz";
@@ -11762,8 +12999,8 @@
];
buildInputs =
(self.nativeDeps."ms" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "ms" ];
@@ -11771,7 +13008,8 @@
by-spec."ms"."0.6.2" =
self.by-version."ms"."0.6.2";
by-version."ms"."0.6.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-ms-0.6.2";
+ name = "ms-0.6.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/ms/-/ms-0.6.2.tgz";
@@ -11781,8 +13019,8 @@
];
buildInputs =
(self.nativeDeps."ms" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "ms" ];
@@ -11791,6 +13029,7 @@
self.by-version."msgpack"."0.2.4";
by-version."msgpack"."0.2.4" = lib.makeOverridable self.buildNodePackage {
name = "msgpack-0.2.4";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/msgpack/-/msgpack-0.2.4.tgz";
@@ -11800,9 +13039,9 @@
];
buildInputs =
(self.nativeDeps."msgpack" or []);
- deps = [
- self.by-version."nan"."1.0.0"
- ];
+ deps = {
+ "nan-1.0.0" = self.by-version."nan"."1.0.0";
+ };
peerDependencies = [
];
passthru.names = [ "msgpack" ];
@@ -11810,7 +13049,8 @@
by-spec."multiparty"."2.2.0" =
self.by-version."multiparty"."2.2.0";
by-version."multiparty"."2.2.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-multiparty-2.2.0";
+ name = "multiparty-2.2.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/multiparty/-/multiparty-2.2.0.tgz";
@@ -11820,10 +13060,10 @@
];
buildInputs =
(self.nativeDeps."multiparty" or []);
- deps = [
- self.by-version."readable-stream"."1.1.13"
- self.by-version."stream-counter"."0.2.0"
- ];
+ deps = {
+ "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+ "stream-counter-0.2.0" = self.by-version."stream-counter"."0.2.0";
+ };
peerDependencies = [
];
passthru.names = [ "multiparty" ];
@@ -11831,7 +13071,8 @@
by-spec."multiparty"."3.3.2" =
self.by-version."multiparty"."3.3.2";
by-version."multiparty"."3.3.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-multiparty-3.3.2";
+ name = "multiparty-3.3.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/multiparty/-/multiparty-3.3.2.tgz";
@@ -11841,18 +13082,40 @@
];
buildInputs =
(self.nativeDeps."multiparty" or []);
- deps = [
- self.by-version."readable-stream"."1.1.13"
- self.by-version."stream-counter"."0.2.0"
- ];
+ deps = {
+ "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+ "stream-counter-0.2.0" = self.by-version."stream-counter"."0.2.0";
+ };
peerDependencies = [
];
passthru.names = [ "multiparty" ];
};
+ by-spec."multipipe"."^0.1.0" =
+ self.by-version."multipipe"."0.1.1";
+ by-version."multipipe"."0.1.1" = lib.makeOverridable self.buildNodePackage {
+ name = "multipipe-0.1.1";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/multipipe/-/multipipe-0.1.1.tgz";
+ name = "multipipe-0.1.1.tgz";
+ sha1 = "bc271fbb2bf3a5ed3e43cc6ba3d7dbc1c4eb07fb";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."multipipe" or []);
+ deps = {
+ "duplexer2-0.0.2" = self.by-version."duplexer2"."0.0.2";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "multipipe" ];
+ };
by-spec."muri"."0.3.1" =
self.by-version."muri"."0.3.1";
by-version."muri"."0.3.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-muri-0.3.1";
+ name = "muri-0.3.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/muri/-/muri-0.3.1.tgz";
@@ -11862,8 +13125,8 @@
];
buildInputs =
(self.nativeDeps."muri" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "muri" ];
@@ -11871,7 +13134,8 @@
by-spec."mute-stream"."~0.0.4" =
self.by-version."mute-stream"."0.0.4";
by-version."mute-stream"."0.0.4" = lib.makeOverridable self.buildNodePackage {
- name = "node-mute-stream-0.0.4";
+ name = "mute-stream-0.0.4";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz";
@@ -11881,8 +13145,8 @@
];
buildInputs =
(self.nativeDeps."mute-stream" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "mute-stream" ];
@@ -11890,7 +13154,8 @@
by-spec."mv"."0.0.5" =
self.by-version."mv"."0.0.5";
by-version."mv"."0.0.5" = lib.makeOverridable self.buildNodePackage {
- name = "node-mv-0.0.5";
+ name = "mv-0.0.5";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/mv/-/mv-0.0.5.tgz";
@@ -11900,8 +13165,8 @@
];
buildInputs =
(self.nativeDeps."mv" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "mv" ];
@@ -11909,7 +13174,8 @@
by-spec."mz"."1" =
self.by-version."mz"."1.0.1";
by-version."mz"."1.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-mz-1.0.1";
+ name = "mz-1.0.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/mz/-/mz-1.0.1.tgz";
@@ -11919,9 +13185,9 @@
];
buildInputs =
(self.nativeDeps."mz" or []);
- deps = [
- self.by-version."native-or-bluebird"."1.0.0"
- ];
+ deps = {
+ "native-or-bluebird-1.1.1" = self.by-version."native-or-bluebird"."1.1.1";
+ };
peerDependencies = [
];
passthru.names = [ "mz" ];
@@ -11929,7 +13195,8 @@
by-spec."nan"."1.1.2" =
self.by-version."nan"."1.1.2";
by-version."nan"."1.1.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-nan-1.1.2";
+ name = "nan-1.1.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/nan/-/nan-1.1.2.tgz";
@@ -11939,8 +13206,8 @@
];
buildInputs =
(self.nativeDeps."nan" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "nan" ];
@@ -11948,7 +13215,8 @@
by-spec."nan"."1.2.0" =
self.by-version."nan"."1.2.0";
by-version."nan"."1.2.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-nan-1.2.0";
+ name = "nan-1.2.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/nan/-/nan-1.2.0.tgz";
@@ -11958,8 +13226,8 @@
];
buildInputs =
(self.nativeDeps."nan" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "nan" ];
@@ -11967,7 +13235,8 @@
by-spec."nan"."1.3.0" =
self.by-version."nan"."1.3.0";
by-version."nan"."1.3.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-nan-1.3.0";
+ name = "nan-1.3.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/nan/-/nan-1.3.0.tgz";
@@ -11977,37 +13246,21 @@
];
buildInputs =
(self.nativeDeps."nan" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "nan" ];
};
- by-spec."nan".">=1.1.0" =
+ by-spec."nan".">=1.3.0" =
+ self.by-version."nan"."1.3.0";
+ by-spec."nan"."^1.3.0" =
self.by-version."nan"."1.3.0";
- by-spec."nan"."~0.8.0" =
- self.by-version."nan"."0.8.0";
- by-version."nan"."0.8.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-nan-0.8.0";
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/nan/-/nan-0.8.0.tgz";
- name = "nan-0.8.0.tgz";
- sha1 = "022a8fa5e9fe8420964ac1fb3dc94e17f449f5fd";
- })
- ];
- buildInputs =
- (self.nativeDeps."nan" or []);
- deps = [
- ];
- peerDependencies = [
- ];
- passthru.names = [ "nan" ];
- };
by-spec."nan"."~1.0.0" =
self.by-version."nan"."1.0.0";
by-version."nan"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-nan-1.0.0";
+ name = "nan-1.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/nan/-/nan-1.0.0.tgz";
@@ -12017,8 +13270,8 @@
];
buildInputs =
(self.nativeDeps."nan" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "nan" ];
@@ -12028,20 +13281,21 @@
by-spec."nan"."~1.2.0" =
self.by-version."nan"."1.2.0";
by-spec."native-or-bluebird"."1" =
- self.by-version."native-or-bluebird"."1.0.0";
- by-version."native-or-bluebird"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-native-or-bluebird-1.0.0";
+ self.by-version."native-or-bluebird"."1.1.1";
+ by-version."native-or-bluebird"."1.1.1" = lib.makeOverridable self.buildNodePackage {
+ name = "native-or-bluebird-1.1.1";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/native-or-bluebird/-/native-or-bluebird-1.0.0.tgz";
- name = "native-or-bluebird-1.0.0.tgz";
- sha1 = "2259f00d3b8621a9e6389f0d99badfcc2d8fccfe";
+ url = "http://registry.npmjs.org/native-or-bluebird/-/native-or-bluebird-1.1.1.tgz";
+ name = "native-or-bluebird-1.1.1.tgz";
+ sha1 = "9131a6d6532afdfb5635f9703734cc6652c905ee";
})
];
buildInputs =
(self.nativeDeps."native-or-bluebird" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "native-or-bluebird" ];
@@ -12049,7 +13303,8 @@
by-spec."natural"."0.1.17" =
self.by-version."natural"."0.1.17";
by-version."natural"."0.1.17" = lib.makeOverridable self.buildNodePackage {
- name = "node-natural-0.1.17";
+ name = "natural-0.1.17";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/natural/-/natural-0.1.17.tgz";
@@ -12059,11 +13314,11 @@
];
buildInputs =
(self.nativeDeps."natural" or []);
- deps = [
- self.by-version."sylvester"."0.0.21"
- self.by-version."apparatus"."0.0.8"
- self.by-version."underscore"."1.6.0"
- ];
+ deps = {
+ "sylvester-0.0.21" = self.by-version."sylvester"."0.0.21";
+ "apparatus-0.0.8" = self.by-version."apparatus"."0.0.8";
+ "underscore-1.7.0" = self.by-version."underscore"."1.7.0";
+ };
peerDependencies = [
];
passthru.names = [ "natural" ];
@@ -12071,7 +13326,8 @@
by-spec."nconf"."*" =
self.by-version."nconf"."0.6.9";
by-version."nconf"."0.6.9" = lib.makeOverridable self.buildNodePackage {
- name = "node-nconf-0.6.9";
+ name = "nconf-0.6.9";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/nconf/-/nconf-0.6.9.tgz";
@@ -12081,11 +13337,11 @@
];
buildInputs =
(self.nativeDeps."nconf" or []);
- deps = [
- self.by-version."async"."0.2.9"
- self.by-version."ini"."1.2.1"
- self.by-version."optimist"."0.6.0"
- ];
+ deps = {
+ "async-0.2.9" = self.by-version."async"."0.2.9";
+ "ini-1.3.0" = self.by-version."ini"."1.3.0";
+ "optimist-0.6.0" = self.by-version."optimist"."0.6.0";
+ };
peerDependencies = [
];
passthru.names = [ "nconf" ];
@@ -12099,6 +13355,7 @@
self.by-version."ncp"."0.2.7";
by-version."ncp"."0.2.7" = lib.makeOverridable self.buildNodePackage {
name = "ncp-0.2.7";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/ncp/-/ncp-0.2.7.tgz";
@@ -12108,16 +13365,17 @@
];
buildInputs =
(self.nativeDeps."ncp" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "ncp" ];
};
- by-spec."ncp"."0.4.2" =
+ by-spec."ncp"."0.4.x" =
self.by-version."ncp"."0.4.2";
by-version."ncp"."0.4.2" = lib.makeOverridable self.buildNodePackage {
name = "ncp-0.4.2";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz";
@@ -12127,20 +13385,39 @@
];
buildInputs =
(self.nativeDeps."ncp" or []);
- deps = [
- ];
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "ncp" ];
+ };
+ by-spec."ncp"."0.6.0" =
+ self.by-version."ncp"."0.6.0";
+ by-version."ncp"."0.6.0" = lib.makeOverridable self.buildNodePackage {
+ name = "ncp-0.6.0";
+ bin = true;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/ncp/-/ncp-0.6.0.tgz";
+ name = "ncp-0.6.0.tgz";
+ sha1 = "df8ce021e262be21b52feb3d3e5cfaab12491f0d";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."ncp" or []);
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "ncp" ];
};
- by-spec."ncp"."0.4.x" =
- self.by-version."ncp"."0.4.2";
by-spec."ncp"."~0.4.2" =
self.by-version."ncp"."0.4.2";
by-spec."negotiator"."0.2.5" =
self.by-version."negotiator"."0.2.5";
by-version."negotiator"."0.2.5" = lib.makeOverridable self.buildNodePackage {
- name = "node-negotiator-0.2.5";
+ name = "negotiator-0.2.5";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/negotiator/-/negotiator-0.2.5.tgz";
@@ -12150,8 +13427,8 @@
];
buildInputs =
(self.nativeDeps."negotiator" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "negotiator" ];
@@ -12159,7 +13436,8 @@
by-spec."negotiator"."0.3.0" =
self.by-version."negotiator"."0.3.0";
by-version."negotiator"."0.3.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-negotiator-0.3.0";
+ name = "negotiator-0.3.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/negotiator/-/negotiator-0.3.0.tgz";
@@ -12169,8 +13447,8 @@
];
buildInputs =
(self.nativeDeps."negotiator" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "negotiator" ];
@@ -12178,7 +13456,8 @@
by-spec."negotiator"."0.4.7" =
self.by-version."negotiator"."0.4.7";
by-version."negotiator"."0.4.7" = lib.makeOverridable self.buildNodePackage {
- name = "node-negotiator-0.4.7";
+ name = "negotiator-0.4.7";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/negotiator/-/negotiator-0.4.7.tgz";
@@ -12188,8 +13467,28 @@
];
buildInputs =
(self.nativeDeps."negotiator" or []);
- deps = [
+ deps = {
+ };
+ peerDependencies = [
];
+ passthru.names = [ "negotiator" ];
+ };
+ by-spec."negotiator"."0.4.8" =
+ self.by-version."negotiator"."0.4.8";
+ by-version."negotiator"."0.4.8" = lib.makeOverridable self.buildNodePackage {
+ name = "negotiator-0.4.8";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/negotiator/-/negotiator-0.4.8.tgz";
+ name = "negotiator-0.4.8.tgz";
+ sha1 = "96010b23b63c387f47a4bed96762a831cda39eab";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."negotiator" or []);
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "negotiator" ];
@@ -12199,7 +13498,8 @@
by-spec."net-ping"."1.1.7" =
self.by-version."net-ping"."1.1.7";
by-version."net-ping"."1.1.7" = lib.makeOverridable self.buildNodePackage {
- name = "node-net-ping-1.1.7";
+ name = "net-ping-1.1.7";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/net-ping/-/net-ping-1.1.7.tgz";
@@ -12209,9 +13509,9 @@
];
buildInputs =
(self.nativeDeps."net-ping" or []);
- deps = [
- self.by-version."raw-socket"."1.2.2"
- ];
+ deps = {
+ "raw-socket-1.2.2" = self.by-version."raw-socket"."1.2.2";
+ };
peerDependencies = [
];
passthru.names = [ "net-ping" ];
@@ -12219,7 +13519,8 @@
by-spec."nib"."0.5.0" =
self.by-version."nib"."0.5.0";
by-version."nib"."0.5.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-nib-0.5.0";
+ name = "nib-0.5.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/nib/-/nib-0.5.0.tgz";
@@ -12229,64 +13530,66 @@
];
buildInputs =
(self.nativeDeps."nib" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "nib" ];
};
by-spec."nijs"."*" =
- self.by-version."nijs"."0.0.14";
- by-version."nijs"."0.0.14" = lib.makeOverridable self.buildNodePackage {
- name = "nijs-0.0.14";
+ self.by-version."nijs"."0.0.18";
+ by-version."nijs"."0.0.18" = lib.makeOverridable self.buildNodePackage {
+ name = "nijs-0.0.18";
+ bin = true;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/nijs/-/nijs-0.0.14.tgz";
- name = "nijs-0.0.14.tgz";
- sha1 = "e4851865ee94567e33c7c7e6d7d92c031e8f1eab";
+ url = "http://registry.npmjs.org/nijs/-/nijs-0.0.18.tgz";
+ name = "nijs-0.0.18.tgz";
+ sha1 = "bfdf140350d2bb3edae6b094dbc31035d6c7bec8";
})
];
buildInputs =
(self.nativeDeps."nijs" or []);
- deps = [
- self.by-version."optparse"."1.0.5"
- self.by-version."slasp"."0.0.3"
- ];
+ deps = {
+ "optparse-1.0.5" = self.by-version."optparse"."1.0.5";
+ "slasp-0.0.4" = self.by-version."slasp"."0.0.4";
+ };
peerDependencies = [
];
passthru.names = [ "nijs" ];
};
- "nijs" = self.by-version."nijs"."0.0.14";
- by-spec."node-appc"."0.2.0" =
- self.by-version."node-appc"."0.2.0";
- by-version."node-appc"."0.2.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-node-appc-0.2.0";
+ "nijs" = self.by-version."nijs"."0.0.18";
+ by-spec."node-appc"."0.2.14" =
+ self.by-version."node-appc"."0.2.14";
+ by-version."node-appc"."0.2.14" = lib.makeOverridable self.buildNodePackage {
+ name = "node-appc-0.2.14";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/node-appc/-/node-appc-0.2.0.tgz";
- name = "node-appc-0.2.0.tgz";
- sha1 = "7bc7ec2a9c65e2e0b55a42669fae383329d51609";
+ url = "http://registry.npmjs.org/node-appc/-/node-appc-0.2.14.tgz";
+ name = "node-appc-0.2.14.tgz";
+ sha1 = "74f20eca49ebf940799fac44bcb224321582cf98";
})
];
buildInputs =
(self.nativeDeps."node-appc" or []);
- deps = [
- self.by-version."adm-zip"."0.4.4"
- self.by-version."async"."0.2.10"
- self.by-version."colors"."0.6.2"
- self.by-version."diff"."1.0.8"
- self.by-version."dox"."0.4.6"
- self.by-version."jade"."0.35.0"
- self.by-version."node-uuid"."1.4.1"
- self.by-version."optimist"."0.6.1"
- self.by-version."request"."2.27.0"
- self.by-version."semver"."2.1.0"
- self.by-version."sprintf"."0.1.4"
- self.by-version."temp"."0.6.0"
- self.by-version."wrench"."1.5.8"
- self.by-version."uglify-js"."2.3.6"
- self.by-version."xmldom"."0.1.19"
- ];
+ deps = {
+ "adm-zip-0.4.4" = self.by-version."adm-zip"."0.4.4";
+ "async-0.2.10" = self.by-version."async"."0.2.10";
+ "colors-0.6.2" = self.by-version."colors"."0.6.2";
+ "diff-1.0.8" = self.by-version."diff"."1.0.8";
+ "dox-0.4.6" = self.by-version."dox"."0.4.6";
+ "jade-0.35.0" = self.by-version."jade"."0.35.0";
+ "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1";
+ "optimist-0.6.1" = self.by-version."optimist"."0.6.1";
+ "request-2.27.0" = self.by-version."request"."2.27.0";
+ "semver-2.1.0" = self.by-version."semver"."2.1.0";
+ "sprintf-0.1.4" = self.by-version."sprintf"."0.1.4";
+ "temp-0.6.0" = self.by-version."temp"."0.6.0";
+ "wrench-1.5.8" = self.by-version."wrench"."1.5.8";
+ "uglify-js-2.3.6" = self.by-version."uglify-js"."2.3.6";
+ "xmldom-0.1.19" = self.by-version."xmldom"."0.1.19";
+ };
peerDependencies = [
];
passthru.names = [ "node-appc" ];
@@ -12294,7 +13597,8 @@
by-spec."node-expat"."*" =
self.by-version."node-expat"."2.3.1";
by-version."node-expat"."2.3.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-node-expat-2.3.1";
+ name = "node-expat-2.3.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/node-expat/-/node-expat-2.3.1.tgz";
@@ -12304,84 +13608,56 @@
];
buildInputs =
(self.nativeDeps."node-expat" or []);
- deps = [
- self.by-version."bindings"."1.2.1"
- self.by-version."nan"."1.2.0"
- ];
+ deps = {
+ "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
+ "nan-1.2.0" = self.by-version."nan"."1.2.0";
+ };
peerDependencies = [
];
passthru.names = [ "node-expat" ];
};
"node-expat" = self.by-version."node-expat"."2.3.1";
by-spec."node-gyp"."*" =
- self.by-version."node-gyp"."1.0.1";
- by-version."node-gyp"."1.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-gyp-1.0.1";
+ self.by-version."node-gyp"."1.0.2";
+ by-version."node-gyp"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+ name = "node-gyp-1.0.2";
+ bin = true;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/node-gyp/-/node-gyp-1.0.1.tgz";
- name = "node-gyp-1.0.1.tgz";
- sha1 = "d5e364145ff10b259be9986855c83b5a76a2d975";
+ url = "http://registry.npmjs.org/node-gyp/-/node-gyp-1.0.2.tgz";
+ name = "node-gyp-1.0.2.tgz";
+ sha1 = "b0bb6d2d762271408dd904853e7aa3000ed2eb57";
})
];
buildInputs =
(self.nativeDeps."node-gyp" or []);
- deps = [
- self.by-version."fstream"."1.0.2"
- self.by-version."glob"."4.0.5"
- self.by-version."graceful-fs"."3.0.2"
- self.by-version."minimatch"."1.0.0"
- self.by-version."mkdirp"."0.5.0"
- self.by-version."nopt"."3.0.1"
- self.by-version."npmlog"."0.1.1"
- self.by-version."osenv"."0.1.0"
- self.by-version."request"."2.40.0"
- self.by-version."rimraf"."2.2.8"
- self.by-version."semver"."3.0.1"
- self.by-version."tar"."1.0.1"
- self.by-version."which"."1.0.5"
- ];
- peerDependencies = [
- ];
- passthru.names = [ "node-gyp" ];
- };
- "node-gyp" = self.by-version."node-gyp"."1.0.1";
- by-spec."node-gyp"."~0.13.0" =
- self.by-version."node-gyp"."0.13.1";
- by-version."node-gyp"."0.13.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-gyp-0.13.1";
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.13.1.tgz";
- name = "node-gyp-0.13.1.tgz";
- sha1 = "5a484dd2dc13d5b894a8fe781a250c07eae7bffa";
- })
- ];
- buildInputs =
- (self.nativeDeps."node-gyp" or []);
- deps = [
- self.by-version."glob"."3.2.11"
- self.by-version."graceful-fs"."2.0.3"
- self.by-version."fstream"."0.1.31"
- self.by-version."minimatch"."0.4.0"
- self.by-version."mkdirp"."0.5.0"
- self.by-version."nopt"."2.2.1"
- self.by-version."npmlog"."0.1.1"
- self.by-version."osenv"."0.1.0"
- self.by-version."request"."2.40.0"
- self.by-version."rimraf"."2.2.8"
- self.by-version."semver"."2.2.1"
- self.by-version."tar"."0.1.20"
- self.by-version."which"."1.0.5"
- ];
+ deps = {
+ "fstream-1.0.2" = self.by-version."fstream"."1.0.2";
+ "glob-4.0.6" = self.by-version."glob"."4.0.6";
+ "graceful-fs-3.0.2" = self.by-version."graceful-fs"."3.0.2";
+ "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0";
+ "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
+ "nopt-3.0.1" = self.by-version."nopt"."3.0.1";
+ "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1";
+ "osenv-0.1.0" = self.by-version."osenv"."0.1.0";
+ "request-2.44.0" = self.by-version."request"."2.44.0";
+ "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
+ "semver-4.0.3" = self.by-version."semver"."4.0.3";
+ "tar-1.0.1" = self.by-version."tar"."1.0.1";
+ "which-1.0.5" = self.by-version."which"."1.0.5";
+ };
peerDependencies = [
];
passthru.names = [ "node-gyp" ];
};
+ "node-gyp" = self.by-version."node-gyp"."1.0.2";
+ by-spec."node-gyp"."~1.0.1" =
+ self.by-version."node-gyp"."1.0.2";
by-spec."node-inspector"."*" =
self.by-version."node-inspector"."0.7.4";
by-version."node-inspector"."0.7.4" = lib.makeOverridable self.buildNodePackage {
name = "node-inspector-0.7.4";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/node-inspector/-/node-inspector-0.7.4.tgz";
@@ -12391,49 +13667,51 @@
];
buildInputs =
(self.nativeDeps."node-inspector" or []);
- deps = [
- self.by-version."express"."4.0.0"
- self.by-version."async"."0.8.0"
- self.by-version."glob"."3.2.11"
- self.by-version."rc"."0.3.5"
- self.by-version."strong-data-uri"."0.1.1"
- self.by-version."debug"."0.8.1"
- self.by-version."ws"."0.4.32"
- self.by-version."opener"."1.3.0"
- self.by-version."yargs"."1.2.6"
- self.by-version."which"."1.0.5"
- ];
+ deps = {
+ "express-4.0.0" = self.by-version."express"."4.0.0";
+ "async-0.8.0" = self.by-version."async"."0.8.0";
+ "glob-3.2.11" = self.by-version."glob"."3.2.11";
+ "rc-0.3.5" = self.by-version."rc"."0.3.5";
+ "strong-data-uri-0.1.1" = self.by-version."strong-data-uri"."0.1.1";
+ "debug-0.8.1" = self.by-version."debug"."0.8.1";
+ "ws-0.4.32" = self.by-version."ws"."0.4.32";
+ "opener-1.3.0" = self.by-version."opener"."1.3.0";
+ "yargs-1.2.6" = self.by-version."yargs"."1.2.6";
+ "which-1.0.5" = self.by-version."which"."1.0.5";
+ };
peerDependencies = [
];
passthru.names = [ "node-inspector" ];
};
"node-inspector" = self.by-version."node-inspector"."0.7.4";
by-spec."node-protobuf"."*" =
- self.by-version."node-protobuf"."1.2.0";
- by-version."node-protobuf"."1.2.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-node-protobuf-1.2.0";
+ self.by-version."node-protobuf"."1.2.1";
+ by-version."node-protobuf"."1.2.1" = lib.makeOverridable self.buildNodePackage {
+ name = "node-protobuf-1.2.1";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/node-protobuf/-/node-protobuf-1.2.0.tgz";
- name = "node-protobuf-1.2.0.tgz";
- sha1 = "c69ca29f149431b6b6ec8079ec2ee01aa0590bcc";
+ url = "http://registry.npmjs.org/node-protobuf/-/node-protobuf-1.2.1.tgz";
+ name = "node-protobuf-1.2.1.tgz";
+ sha1 = "d517eb4cdcfac002390ace6b8f0b865322eef049";
})
];
buildInputs =
(self.nativeDeps."node-protobuf" or []);
- deps = [
- self.by-version."bindings"."1.2.1"
- self.by-version."nan"."1.3.0"
- ];
+ deps = {
+ "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
+ "nan-1.3.0" = self.by-version."nan"."1.3.0";
+ };
peerDependencies = [
];
passthru.names = [ "node-protobuf" ];
};
- "node-protobuf" = self.by-version."node-protobuf"."1.2.0";
+ "node-protobuf" = self.by-version."node-protobuf"."1.2.1";
by-spec."node-swt".">=0.1.1" =
self.by-version."node-swt"."0.1.1";
by-version."node-swt"."0.1.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-node-swt-0.1.1";
+ name = "node-swt-0.1.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/node-swt/-/node-swt-0.1.1.tgz";
@@ -12443,8 +13721,8 @@
];
buildInputs =
(self.nativeDeps."node-swt" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "node-swt" ];
@@ -12452,7 +13730,8 @@
by-spec."node-syslog"."1.1.7" =
self.by-version."node-syslog"."1.1.7";
by-version."node-syslog"."1.1.7" = lib.makeOverridable self.buildNodePackage {
- name = "node-node-syslog-1.1.7";
+ name = "node-syslog-1.1.7";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/node-syslog/-/node-syslog-1.1.7.tgz";
@@ -12462,8 +13741,8 @@
];
buildInputs =
(self.nativeDeps."node-syslog" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "node-syslog" ];
@@ -12471,7 +13750,8 @@
by-spec."node-uptime"."https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7" =
self.by-version."node-uptime"."3.2.0";
by-version."node-uptime"."3.2.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-node-uptime-3.2.0";
+ name = "node-uptime-3.2.0";
+ bin = false;
src = [
(fetchurl {
url = "https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7";
@@ -12481,22 +13761,22 @@
];
buildInputs =
(self.nativeDeps."node-uptime" or []);
- deps = [
- self.by-version."mongoose"."3.6.7"
- self.by-version."mongoose-lifecycle"."1.0.0"
- self.by-version."express"."3.2.0"
- self.by-version."express-partials"."0.0.6"
- self.by-version."connect-flash"."0.1.0"
- self.by-version."ejs"."0.8.3"
- self.by-version."config"."0.4.15"
- self.by-version."async"."0.1.22"
- self.by-version."socket.io"."0.9.14"
- self.by-version."semver"."1.1.0"
- self.by-version."moment"."2.1.0"
- self.by-version."nodemailer"."0.3.35"
- self.by-version."net-ping"."1.1.7"
- self.by-version."js-yaml"."2.1.0"
- ];
+ deps = {
+ "mongoose-3.6.7" = self.by-version."mongoose"."3.6.7";
+ "mongoose-lifecycle-1.0.0" = self.by-version."mongoose-lifecycle"."1.0.0";
+ "express-3.2.0" = self.by-version."express"."3.2.0";
+ "express-partials-0.0.6" = self.by-version."express-partials"."0.0.6";
+ "connect-flash-0.1.0" = self.by-version."connect-flash"."0.1.0";
+ "ejs-0.8.3" = self.by-version."ejs"."0.8.3";
+ "config-0.4.15" = self.by-version."config"."0.4.15";
+ "async-0.1.22" = self.by-version."async"."0.1.22";
+ "socket.io-0.9.14" = self.by-version."socket.io"."0.9.14";
+ "semver-1.1.0" = self.by-version."semver"."1.1.0";
+ "moment-2.1.0" = self.by-version."moment"."2.1.0";
+ "nodemailer-0.3.35" = self.by-version."nodemailer"."0.3.35";
+ "net-ping-1.1.7" = self.by-version."net-ping"."1.1.7";
+ "js-yaml-2.1.0" = self.by-version."js-yaml"."2.1.0";
+ };
peerDependencies = [
];
passthru.names = [ "node-uptime" ];
@@ -12505,7 +13785,8 @@
by-spec."node-uuid"."*" =
self.by-version."node-uuid"."1.4.1";
by-version."node-uuid"."1.4.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-node-uuid-1.4.1";
+ name = "node-uuid-1.4.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz";
@@ -12515,8 +13796,8 @@
];
buildInputs =
(self.nativeDeps."node-uuid" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "node-uuid" ];
@@ -12525,7 +13806,8 @@
by-spec."node-uuid"."1.3.3" =
self.by-version."node-uuid"."1.3.3";
by-version."node-uuid"."1.3.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-node-uuid-1.3.3";
+ name = "node-uuid-1.3.3";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.3.3.tgz";
@@ -12535,8 +13817,8 @@
];
buildInputs =
(self.nativeDeps."node-uuid" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "node-uuid" ];
@@ -12544,7 +13826,8 @@
by-spec."node-uuid"."1.4.0" =
self.by-version."node-uuid"."1.4.0";
by-version."node-uuid"."1.4.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-node-uuid-1.4.0";
+ name = "node-uuid-1.4.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.0.tgz";
@@ -12554,8 +13837,8 @@
];
buildInputs =
(self.nativeDeps."node-uuid" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "node-uuid" ];
@@ -12569,7 +13852,8 @@
by-spec."node-wsfederation".">=0.1.1" =
self.by-version."node-wsfederation"."0.1.1";
by-version."node-wsfederation"."0.1.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-node-wsfederation-0.1.1";
+ name = "node-wsfederation-0.1.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/node-wsfederation/-/node-wsfederation-0.1.1.tgz";
@@ -12579,9 +13863,9 @@
];
buildInputs =
(self.nativeDeps."node-wsfederation" or []);
- deps = [
- self.by-version."xml2js"."0.4.4"
- ];
+ deps = {
+ "xml2js-0.4.4" = self.by-version."xml2js"."0.4.4";
+ };
peerDependencies = [
];
passthru.names = [ "node-wsfederation" ];
@@ -12589,7 +13873,8 @@
by-spec."node.extend"."1.0.0" =
self.by-version."node.extend"."1.0.0";
by-version."node.extend"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-node.extend-1.0.0";
+ name = "node.extend-1.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/node.extend/-/node.extend-1.0.0.tgz";
@@ -12599,8 +13884,8 @@
];
buildInputs =
(self.nativeDeps."node.extend" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "node.extend" ];
@@ -12609,6 +13894,7 @@
self.by-version."nodemailer"."0.3.35";
by-version."nodemailer"."0.3.35" = lib.makeOverridable self.buildNodePackage {
name = "nodemailer-0.3.35";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/nodemailer/-/nodemailer-0.3.35.tgz";
@@ -12618,11 +13904,11 @@
];
buildInputs =
(self.nativeDeps."nodemailer" or []);
- deps = [
- self.by-version."mailcomposer"."0.2.12"
- self.by-version."simplesmtp"."0.3.32"
- self.by-version."optimist"."0.6.1"
- ];
+ deps = {
+ "mailcomposer-0.2.12" = self.by-version."mailcomposer"."0.2.12";
+ "simplesmtp-0.3.33" = self.by-version."simplesmtp"."0.3.33";
+ "optimist-0.6.1" = self.by-version."optimist"."0.6.1";
+ };
peerDependencies = [
];
passthru.names = [ "nodemailer" ];
@@ -12631,6 +13917,7 @@
self.by-version."nodemon"."1.2.1";
by-version."nodemon"."1.2.1" = lib.makeOverridable self.buildNodePackage {
name = "nodemon-1.2.1";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/nodemon/-/nodemon-1.2.1.tgz";
@@ -12640,11 +13927,11 @@
];
buildInputs =
(self.nativeDeps."nodemon" or []);
- deps = [
- self.by-version."update-notifier"."0.1.10"
- self.by-version."minimatch"."0.3.0"
- self.by-version."ps-tree"."0.0.3"
- ];
+ deps = {
+ "update-notifier-0.1.10" = self.by-version."update-notifier"."0.1.10";
+ "minimatch-0.3.0" = self.by-version."minimatch"."0.3.0";
+ "ps-tree-0.0.3" = self.by-version."ps-tree"."0.0.3";
+ };
peerDependencies = [
];
passthru.names = [ "nodemon" ];
@@ -12653,7 +13940,8 @@
by-spec."nomnom"."1.6.x" =
self.by-version."nomnom"."1.6.2";
by-version."nomnom"."1.6.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-nomnom-1.6.2";
+ name = "nomnom-1.6.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/nomnom/-/nomnom-1.6.2.tgz";
@@ -12663,10 +13951,10 @@
];
buildInputs =
(self.nativeDeps."nomnom" or []);
- deps = [
- self.by-version."colors"."0.5.1"
- self.by-version."underscore"."1.4.4"
- ];
+ deps = {
+ "colors-0.5.1" = self.by-version."colors"."0.5.1";
+ "underscore-1.4.4" = self.by-version."underscore"."1.4.4";
+ };
peerDependencies = [
];
passthru.names = [ "nomnom" ];
@@ -12675,6 +13963,7 @@
self.by-version."nopt"."2.2.1";
by-version."nopt"."2.2.1" = lib.makeOverridable self.buildNodePackage {
name = "nopt-2.2.1";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz";
@@ -12684,9 +13973,9 @@
];
buildInputs =
(self.nativeDeps."nopt" or []);
- deps = [
- self.by-version."abbrev"."1.0.5"
- ];
+ deps = {
+ "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5";
+ };
peerDependencies = [
];
passthru.names = [ "nopt" ];
@@ -12695,6 +13984,7 @@
self.by-version."nopt"."3.0.1";
by-version."nopt"."3.0.1" = lib.makeOverridable self.buildNodePackage {
name = "nopt-3.0.1";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/nopt/-/nopt-3.0.1.tgz";
@@ -12704,9 +13994,9 @@
];
buildInputs =
(self.nativeDeps."nopt" or []);
- deps = [
- self.by-version."abbrev"."1.0.5"
- ];
+ deps = {
+ "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5";
+ };
peerDependencies = [
];
passthru.names = [ "nopt" ];
@@ -12715,6 +14005,7 @@
self.by-version."nopt"."2.0.0";
by-version."nopt"."2.0.0" = lib.makeOverridable self.buildNodePackage {
name = "nopt-2.0.0";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz";
@@ -12724,9 +14015,9 @@
];
buildInputs =
(self.nativeDeps."nopt" or []);
- deps = [
- self.by-version."abbrev"."1.0.5"
- ];
+ deps = {
+ "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5";
+ };
peerDependencies = [
];
passthru.names = [ "nopt" ];
@@ -12737,6 +14028,7 @@
self.by-version."nopt"."1.0.10";
by-version."nopt"."1.0.10" = lib.makeOverridable self.buildNodePackage {
name = "nopt-1.0.10";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz";
@@ -12746,9 +14038,9 @@
];
buildInputs =
(self.nativeDeps."nopt" or []);
- deps = [
- self.by-version."abbrev"."1.0.5"
- ];
+ deps = {
+ "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5";
+ };
peerDependencies = [
];
passthru.names = [ "nopt" ];
@@ -12757,6 +14049,7 @@
self.by-version."nopt"."2.1.2";
by-version."nopt"."2.1.2" = lib.makeOverridable self.buildNodePackage {
name = "nopt-2.1.2";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/nopt/-/nopt-2.1.2.tgz";
@@ -12766,138 +14059,131 @@
];
buildInputs =
(self.nativeDeps."nopt" or []);
- deps = [
- self.by-version."abbrev"."1.0.5"
- ];
+ deps = {
+ "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5";
+ };
peerDependencies = [
];
passthru.names = [ "nopt" ];
};
by-spec."nopt"."~3.0.1" =
self.by-version."nopt"."3.0.1";
- by-spec."normalize-package-data"."0.4" =
- self.by-version."normalize-package-data"."0.4.2";
- by-version."normalize-package-data"."0.4.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-normalize-package-data-0.4.2";
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-0.4.2.tgz";
- name = "normalize-package-data-0.4.2.tgz";
- sha1 = "166dc052a74e2f5ac1d3d23903ab3f2e2b7dd8e6";
- })
- ];
- buildInputs =
- (self.nativeDeps."normalize-package-data" or []);
- deps = [
- self.by-version."github-url-from-git"."1.1.1"
- self.by-version."github-url-from-username-repo"."0.2.0"
- self.by-version."semver"."3.0.1"
- ];
- peerDependencies = [
- ];
- passthru.names = [ "normalize-package-data" ];
- };
by-spec."normalize-package-data"."^1.0.0" =
- self.by-version."normalize-package-data"."1.0.0";
- by-version."normalize-package-data"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-normalize-package-data-1.0.0";
+ self.by-version."normalize-package-data"."1.0.3";
+ by-version."normalize-package-data"."1.0.3" = lib.makeOverridable self.buildNodePackage {
+ name = "normalize-package-data-1.0.3";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-1.0.0.tgz";
- name = "normalize-package-data-1.0.0.tgz";
- sha1 = "5239d9921791a8ad027607f580a74c76166623c8";
+ url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-1.0.3.tgz";
+ name = "normalize-package-data-1.0.3.tgz";
+ sha1 = "8be955b8907af975f1a4584ea8bb9b41492312f5";
})
];
buildInputs =
(self.nativeDeps."normalize-package-data" or []);
- deps = [
- self.by-version."github-url-from-git"."1.3.0"
- self.by-version."github-url-from-username-repo"."0.2.0"
- self.by-version."semver"."3.0.1"
- ];
+ deps = {
+ "github-url-from-git-1.4.0" = self.by-version."github-url-from-git"."1.4.0";
+ "github-url-from-username-repo-1.0.2" = self.by-version."github-url-from-username-repo"."1.0.2";
+ "semver-4.0.3" = self.by-version."semver"."4.0.3";
+ };
peerDependencies = [
];
passthru.names = [ "normalize-package-data" ];
};
+ by-spec."normalize-package-data"."~1.0.1" =
+ self.by-version."normalize-package-data"."1.0.3";
+ by-spec."normalize-package-data"."~1.0.3" =
+ self.by-version."normalize-package-data"."1.0.3";
by-spec."npm"."*" =
- self.by-version."npm"."2.0.0-alpha-5";
- by-version."npm"."2.0.0-alpha-5" = lib.makeOverridable self.buildNodePackage {
- name = "npm-2.0.0-alpha-5";
+ self.by-version."npm"."2.1.3";
+ by-version."npm"."2.1.3" = lib.makeOverridable self.buildNodePackage {
+ name = "npm-2.1.3";
+ bin = true;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/npm/-/npm-2.0.0-alpha-5.tgz";
- name = "npm-2.0.0-alpha-5.tgz";
- sha1 = "5135b111cb6b8e56ab1bdc4e486b87c295862ca8";
+ url = "http://registry.npmjs.org/npm/-/npm-2.1.3.tgz";
+ name = "npm-2.1.3.tgz";
+ sha1 = "f6dfc9d4bdaefe712a50bb75ae5c8bbdf2cd3a3b";
})
];
buildInputs =
(self.nativeDeps."npm" or []);
- deps = [
- self.by-version."abbrev"."1.0.5"
- self.by-version."ansi"."0.3.0"
- self.by-version."ansicolors"."0.3.2"
- self.by-version."ansistyles"."0.1.3"
- self.by-version."archy"."0.0.2"
- self.by-version."async-some"."1.0.1"
- self.by-version."block-stream"."0.0.7"
- self.by-version."char-spinner"."1.0.1"
- self.by-version."child-process-close"."0.1.1"
- self.by-version."chmodr"."0.1.0"
- self.by-version."chownr"."0.0.1"
- self.by-version."cmd-shim"."1.1.2"
- self.by-version."columnify"."1.1.0"
- self.by-version."editor"."0.1.0"
- self.by-version."fs-vacuum"."1.2.1"
- self.by-version."fstream"."0.1.31"
- self.by-version."fstream-npm"."0.1.8"
- self.by-version."github-url-from-git"."1.2.0"
- self.by-version."github-url-from-username-repo"."0.2.0"
- self.by-version."glob"."4.0.5"
- self.by-version."graceful-fs"."3.0.2"
- self.by-version."inflight"."1.0.1"
- self.by-version."ini"."1.2.1"
- self.by-version."init-package-json"."0.1.2"
- self.by-version."lockfile"."0.4.3"
- self.by-version."lru-cache"."2.5.0"
- self.by-version."minimatch"."0.3.0"
- self.by-version."mkdirp"."0.5.0"
- self.by-version."node-gyp"."0.13.1"
- self.by-version."nopt"."3.0.1"
- self.by-version."npm-cache-filename"."1.0.1"
- self.by-version."npm-install-checks"."1.0.3"
- self.by-version."npm-package-arg"."2.0.2"
- self.by-version."npm-registry-client"."3.0.6"
- self.by-version."npm-user-validate"."0.1.0"
- self.by-version."npmconf"."2.0.5"
- self.by-version."npmlog"."0.1.1"
- self.by-version."once"."1.3.0"
- self.by-version."opener"."1.3.0"
- self.by-version."osenv"."0.1.0"
- self.by-version."path-is-inside"."1.0.1"
- self.by-version."read"."1.0.5"
- self.by-version."read-installed"."2.0.7"
- self.by-version."read-package-json"."1.2.6"
- self.by-version."request"."2.30.0"
- self.by-version."retry"."0.6.1"
- self.by-version."rimraf"."2.2.8"
- self.by-version."semver"."2.3.2"
- self.by-version."sha"."1.2.4"
- self.by-version."slide"."1.1.5"
- self.by-version."sorted-object"."1.0.0"
- self.by-version."tar"."0.1.20"
- self.by-version."text-table"."0.2.0"
- self.by-version."uid-number"."0.0.5"
- self.by-version."which"."1.0.5"
- ];
+ deps = {
+ "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5";
+ "ansi-0.3.0" = self.by-version."ansi"."0.3.0";
+ "ansicolors-0.3.2" = self.by-version."ansicolors"."0.3.2";
+ "ansistyles-0.1.3" = self.by-version."ansistyles"."0.1.3";
+ "archy-0.0.2" = self.by-version."archy"."0.0.2";
+ "async-some-1.0.1" = self.by-version."async-some"."1.0.1";
+ "block-stream-0.0.7" = self.by-version."block-stream"."0.0.7";
+ "char-spinner-1.0.1" = self.by-version."char-spinner"."1.0.1";
+ "child-process-close-0.1.1" = self.by-version."child-process-close"."0.1.1";
+ "chmodr-0.1.0" = self.by-version."chmodr"."0.1.0";
+ "chownr-0.0.1" = self.by-version."chownr"."0.0.1";
+ "cmd-shim-2.0.1" = self.by-version."cmd-shim"."2.0.1";
+ "columnify-1.2.1" = self.by-version."columnify"."1.2.1";
+ "dezalgo-1.0.1" = self.by-version."dezalgo"."1.0.1";
+ "editor-0.1.0" = self.by-version."editor"."0.1.0";
+ "fs-vacuum-1.2.1" = self.by-version."fs-vacuum"."1.2.1";
+ "fs-write-stream-atomic-1.0.2" = self.by-version."fs-write-stream-atomic"."1.0.2";
+ "fstream-1.0.2" = self.by-version."fstream"."1.0.2";
+ "fstream-npm-1.0.0" = self.by-version."fstream-npm"."1.0.0";
+ "github-url-from-git-1.4.0" = self.by-version."github-url-from-git"."1.4.0";
+ "github-url-from-username-repo-1.0.2" = self.by-version."github-url-from-username-repo"."1.0.2";
+ "glob-4.0.6" = self.by-version."glob"."4.0.6";
+ "graceful-fs-3.0.2" = self.by-version."graceful-fs"."3.0.2";
+ "inflight-1.0.4" = self.by-version."inflight"."1.0.4";
+ "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+ "ini-1.2.1" = self.by-version."ini"."1.2.1";
+ "init-package-json-1.1.0" = self.by-version."init-package-json"."1.1.0";
+ "lockfile-1.0.0" = self.by-version."lockfile"."1.0.0";
+ "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0";
+ "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0";
+ "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
+ "node-gyp-1.0.2" = self.by-version."node-gyp"."1.0.2";
+ "nopt-3.0.1" = self.by-version."nopt"."3.0.1";
+ "normalize-package-data-1.0.3" = self.by-version."normalize-package-data"."1.0.3";
+ "npm-cache-filename-1.0.1" = self.by-version."npm-cache-filename"."1.0.1";
+ "npm-install-checks-1.0.4" = self.by-version."npm-install-checks"."1.0.4";
+ "npm-package-arg-2.1.3" = self.by-version."npm-package-arg"."2.1.3";
+ "npm-registry-client-3.2.2" = self.by-version."npm-registry-client"."3.2.2";
+ "npm-user-validate-0.1.0" = self.by-version."npm-user-validate"."0.1.0";
+ "npmconf-2.1.0" = self.by-version."npmconf"."2.1.0";
+ "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1";
+ "once-1.3.1" = self.by-version."once"."1.3.1";
+ "opener-1.3.0" = self.by-version."opener"."1.3.0";
+ "osenv-0.1.0" = self.by-version."osenv"."0.1.0";
+ "path-is-inside-1.0.1" = self.by-version."path-is-inside"."1.0.1";
+ "read-1.0.5" = self.by-version."read"."1.0.5";
+ "read-installed-3.1.3" = self.by-version."read-installed"."3.1.3";
+ "read-package-json-1.2.7" = self.by-version."read-package-json"."1.2.7";
+ "readable-stream-1.0.32" = self.by-version."readable-stream"."1.0.32";
+ "realize-package-specifier-1.1.0" = self.by-version."realize-package-specifier"."1.1.0";
+ "request-2.44.0" = self.by-version."request"."2.44.0";
+ "retry-0.6.1" = self.by-version."retry"."0.6.1";
+ "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
+ "semver-4.0.3" = self.by-version."semver"."4.0.3";
+ "sha-1.2.4" = self.by-version."sha"."1.2.4";
+ "slide-1.1.6" = self.by-version."slide"."1.1.6";
+ "sorted-object-1.0.0" = self.by-version."sorted-object"."1.0.0";
+ "tar-1.0.1" = self.by-version."tar"."1.0.1";
+ "text-table-0.2.0" = self.by-version."text-table"."0.2.0";
+ "uid-number-0.0.5" = self.by-version."uid-number"."0.0.5";
+ "which-1.0.5" = self.by-version."which"."1.0.5";
+ "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1";
+ "write-file-atomic-1.1.0" = self.by-version."write-file-atomic"."1.1.0";
+ };
peerDependencies = [
];
passthru.names = [ "npm" ];
};
- "npm" = self.by-version."npm"."2.0.0-alpha-5";
+ "npm" = self.by-version."npm"."2.1.3";
by-spec."npm-cache-filename"."^1.0.0" =
self.by-version."npm-cache-filename"."1.0.1";
by-version."npm-cache-filename"."1.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-npm-cache-filename-1.0.1";
+ name = "npm-cache-filename-1.0.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/npm-cache-filename/-/npm-cache-filename-1.0.1.tgz";
@@ -12907,8 +14193,8 @@
];
buildInputs =
(self.nativeDeps."npm-cache-filename" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "npm-cache-filename" ];
@@ -12916,50 +14202,55 @@
by-spec."npm-cache-filename"."~1.0.1" =
self.by-version."npm-cache-filename"."1.0.1";
by-spec."npm-install-checks"."~1.0.2" =
- self.by-version."npm-install-checks"."1.0.3";
- by-version."npm-install-checks"."1.0.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-npm-install-checks-1.0.3";
+ self.by-version."npm-install-checks"."1.0.4";
+ by-version."npm-install-checks"."1.0.4" = lib.makeOverridable self.buildNodePackage {
+ name = "npm-install-checks-1.0.4";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/npm-install-checks/-/npm-install-checks-1.0.3.tgz";
- name = "npm-install-checks-1.0.3.tgz";
- sha1 = "9301006141a8f1454ae6bfe9a2f89da91316de02";
+ url = "http://registry.npmjs.org/npm-install-checks/-/npm-install-checks-1.0.4.tgz";
+ name = "npm-install-checks-1.0.4.tgz";
+ sha1 = "9757c6f9d4d493c2489465da6d07a8ed416d44c8";
})
];
buildInputs =
(self.nativeDeps."npm-install-checks" or []);
- deps = [
- self.by-version."npmlog"."0.1.1"
- self.by-version."semver"."3.0.1"
- ];
+ deps = {
+ "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1";
+ "semver-4.0.3" = self.by-version."semver"."4.0.3";
+ };
peerDependencies = [
];
passthru.names = [ "npm-install-checks" ];
};
- by-spec."npm-package-arg"."~2.0.0" =
- self.by-version."npm-package-arg"."2.0.2";
- by-version."npm-package-arg"."2.0.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-npm-package-arg-2.0.2";
+ by-spec."npm-package-arg"."^2.1.3" =
+ self.by-version."npm-package-arg"."2.1.3";
+ by-version."npm-package-arg"."2.1.3" = lib.makeOverridable self.buildNodePackage {
+ name = "npm-package-arg-2.1.3";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/npm-package-arg/-/npm-package-arg-2.0.2.tgz";
- name = "npm-package-arg-2.0.2.tgz";
- sha1 = "e4f660c683068eccba9b27b4075cc00c0ccc6037";
+ url = "http://registry.npmjs.org/npm-package-arg/-/npm-package-arg-2.1.3.tgz";
+ name = "npm-package-arg-2.1.3.tgz";
+ sha1 = "dfba34bd82dd327c10cb43a65c8db6ef0b812bf7";
})
];
buildInputs =
(self.nativeDeps."npm-package-arg" or []);
- deps = [
- self.by-version."semver"."3.0.1"
- ];
+ deps = {
+ "semver-4.0.3" = self.by-version."semver"."4.0.3";
+ };
peerDependencies = [
];
passthru.names = [ "npm-package-arg" ];
};
+ by-spec."npm-package-arg"."~2.1.3" =
+ self.by-version."npm-package-arg"."2.1.3";
by-spec."npm-registry-client"."0.2.27" =
self.by-version."npm-registry-client"."0.2.27";
by-version."npm-registry-client"."0.2.27" = lib.makeOverridable self.buildNodePackage {
- name = "node-npm-registry-client-0.2.27";
+ name = "npm-registry-client-0.2.27";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.2.27.tgz";
@@ -12969,58 +14260,92 @@
];
buildInputs =
(self.nativeDeps."npm-registry-client" or []);
- deps = [
- self.by-version."request"."2.40.0"
- self.by-version."graceful-fs"."2.0.3"
- self.by-version."semver"."2.0.11"
- self.by-version."slide"."1.1.5"
- self.by-version."chownr"."0.0.1"
- self.by-version."mkdirp"."0.3.5"
- self.by-version."rimraf"."2.2.8"
- self.by-version."retry"."0.6.0"
- self.by-version."couch-login"."0.1.20"
- self.by-version."npmlog"."0.1.1"
- ];
+ deps = {
+ "request-2.44.0" = self.by-version."request"."2.44.0";
+ "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3";
+ "semver-2.0.11" = self.by-version."semver"."2.0.11";
+ "slide-1.1.6" = self.by-version."slide"."1.1.6";
+ "chownr-0.0.1" = self.by-version."chownr"."0.0.1";
+ "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
+ "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
+ "retry-0.6.0" = self.by-version."retry"."0.6.0";
+ "couch-login-0.1.20" = self.by-version."couch-login"."0.1.20";
+ "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1";
+ };
peerDependencies = [
];
passthru.names = [ "npm-registry-client" ];
};
- by-spec."npm-registry-client"."~3.0.0" =
- self.by-version."npm-registry-client"."3.0.6";
- by-version."npm-registry-client"."3.0.6" = lib.makeOverridable self.buildNodePackage {
- name = "node-npm-registry-client-3.0.6";
+ by-spec."npm-registry-client"."~3.1.4" =
+ self.by-version."npm-registry-client"."3.1.8";
+ by-version."npm-registry-client"."3.1.8" = lib.makeOverridable self.buildNodePackage {
+ name = "npm-registry-client-3.1.8";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-3.0.6.tgz";
- name = "npm-registry-client-3.0.6.tgz";
- sha1 = "14a17d9a60ed2a80b04edcbc596dbce0d96540ee";
+ url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-3.1.8.tgz";
+ name = "npm-registry-client-3.1.8.tgz";
+ sha1 = "8cc5e0e6523683a95ba0735e53fddb5819372033";
})
];
buildInputs =
(self.nativeDeps."npm-registry-client" or []);
- deps = [
- self.by-version."chownr"."0.0.1"
- self.by-version."graceful-fs"."3.0.2"
- self.by-version."mkdirp"."0.5.0"
- self.by-version."normalize-package-data"."0.4.2"
- self.by-version."npm-cache-filename"."1.0.1"
- self.by-version."request"."2.40.0"
- self.by-version."retry"."0.6.0"
- self.by-version."rimraf"."2.2.8"
- self.by-version."semver"."3.0.1"
- self.by-version."slide"."1.1.5"
- self.by-version."npmlog"."0.1.1"
- ];
+ deps = {
+ "chownr-0.0.1" = self.by-version."chownr"."0.0.1";
+ "graceful-fs-3.0.2" = self.by-version."graceful-fs"."3.0.2";
+ "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
+ "normalize-package-data-1.0.3" = self.by-version."normalize-package-data"."1.0.3";
+ "npm-cache-filename-1.0.1" = self.by-version."npm-cache-filename"."1.0.1";
+ "once-1.3.1" = self.by-version."once"."1.3.1";
+ "request-2.44.0" = self.by-version."request"."2.44.0";
+ "retry-0.6.0" = self.by-version."retry"."0.6.0";
+ "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
+ "semver-4.0.3" = self.by-version."semver"."4.0.3";
+ "slide-1.1.6" = self.by-version."slide"."1.1.6";
+ "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1";
+ };
peerDependencies = [
];
passthru.names = [ "npm-registry-client" ];
};
- by-spec."npm-registry-client"."~3.0.2" =
- self.by-version."npm-registry-client"."3.0.6";
+ by-spec."npm-registry-client"."~3.2.2" =
+ self.by-version."npm-registry-client"."3.2.2";
+ by-version."npm-registry-client"."3.2.2" = lib.makeOverridable self.buildNodePackage {
+ name = "npm-registry-client-3.2.2";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-3.2.2.tgz";
+ name = "npm-registry-client-3.2.2.tgz";
+ sha1 = "7c4ef979cf61b411d15421a24ac2b3b846f8bd53";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."npm-registry-client" or []);
+ deps = {
+ "chownr-0.0.1" = self.by-version."chownr"."0.0.1";
+ "graceful-fs-3.0.2" = self.by-version."graceful-fs"."3.0.2";
+ "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
+ "normalize-package-data-1.0.3" = self.by-version."normalize-package-data"."1.0.3";
+ "npm-cache-filename-1.0.1" = self.by-version."npm-cache-filename"."1.0.1";
+ "once-1.3.1" = self.by-version."once"."1.3.1";
+ "request-2.44.0" = self.by-version."request"."2.44.0";
+ "retry-0.6.0" = self.by-version."retry"."0.6.0";
+ "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
+ "semver-4.0.3" = self.by-version."semver"."4.0.3";
+ "slide-1.1.6" = self.by-version."slide"."1.1.6";
+ "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1";
+ };
+ peerDependencies = [
+ self.by-version."npmconf"."2.1.0"
+ ];
+ passthru.names = [ "npm-registry-client" ];
+ };
by-spec."npm-user-validate"."~0.1.0" =
self.by-version."npm-user-validate"."0.1.0";
by-version."npm-user-validate"."0.1.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-npm-user-validate-0.1.0";
+ name = "npm-user-validate-0.1.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.1.0.tgz";
@@ -13030,71 +14355,46 @@
];
buildInputs =
(self.nativeDeps."npm-user-validate" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "npm-user-validate" ];
};
by-spec."npm2nix"."*" =
- self.by-version."npm2nix"."5.7.0";
- by-version."npm2nix"."5.7.0" = lib.makeOverridable self.buildNodePackage {
- name = "npm2nix-5.7.0";
+ self.by-version."npm2nix"."5.8.1";
+ by-version."npm2nix"."5.8.1" = lib.makeOverridable self.buildNodePackage {
+ name = "npm2nix-5.8.1";
+ bin = true;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/npm2nix/-/npm2nix-5.7.0.tgz";
- name = "npm2nix-5.7.0.tgz";
- sha1 = "ac4547c4ee35fd19fd8dfcf1b1f47eccfb6b6dfa";
+ url = "http://registry.npmjs.org/npm2nix/-/npm2nix-5.8.1.tgz";
+ name = "npm2nix-5.8.1.tgz";
+ sha1 = "0d8356b458caaa677b4a1225fea4900f2995982f";
})
];
buildInputs =
(self.nativeDeps."npm2nix" or []);
- deps = [
- self.by-version."semver"."2.3.2"
- self.by-version."argparse"."0.1.15"
- self.by-version."npm-registry-client"."0.2.27"
- self.by-version."npmconf"."0.1.1"
- self.by-version."tar"."0.1.17"
- self.by-version."temp"."0.6.0"
- self.by-version."fs.extra"."1.2.1"
- self.by-version."findit"."1.2.0"
- ];
+ deps = {
+ "semver-2.3.2" = self.by-version."semver"."2.3.2";
+ "argparse-0.1.15" = self.by-version."argparse"."0.1.15";
+ "npm-registry-client-0.2.27" = self.by-version."npm-registry-client"."0.2.27";
+ "npmconf-0.1.1" = self.by-version."npmconf"."0.1.1";
+ "tar-0.1.17" = self.by-version."tar"."0.1.17";
+ "temp-0.6.0" = self.by-version."temp"."0.6.0";
+ "fs.extra-1.2.1" = self.by-version."fs.extra"."1.2.1";
+ "findit-1.2.0" = self.by-version."findit"."1.2.0";
+ };
peerDependencies = [
];
passthru.names = [ "npm2nix" ];
};
- "npm2nix" = self.by-version."npm2nix"."5.7.0";
- by-spec."npmconf"."0.0.24" =
- self.by-version."npmconf"."0.0.24";
- by-version."npmconf"."0.0.24" = lib.makeOverridable self.buildNodePackage {
- name = "node-npmconf-0.0.24";
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/npmconf/-/npmconf-0.0.24.tgz";
- name = "npmconf-0.0.24.tgz";
- sha1 = "b78875b088ccc3c0afa3eceb3ce3244b1b52390c";
- })
- ];
- buildInputs =
- (self.nativeDeps."npmconf" or []);
- deps = [
- self.by-version."config-chain"."1.1.8"
- self.by-version."inherits"."1.0.0"
- self.by-version."once"."1.1.1"
- self.by-version."mkdirp"."0.3.5"
- self.by-version."osenv"."0.0.3"
- self.by-version."nopt"."2.2.1"
- self.by-version."semver"."1.1.4"
- self.by-version."ini"."1.1.0"
- ];
- peerDependencies = [
- ];
- passthru.names = [ "npmconf" ];
- };
+ "npm2nix" = self.by-version."npm2nix"."5.8.1";
by-spec."npmconf"."0.1.1" =
self.by-version."npmconf"."0.1.1";
by-version."npmconf"."0.1.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-npmconf-0.1.1";
+ name = "npmconf-0.1.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.1.tgz";
@@ -13104,24 +14404,85 @@
];
buildInputs =
(self.nativeDeps."npmconf" or []);
- deps = [
- self.by-version."config-chain"."1.1.8"
- self.by-version."inherits"."1.0.0"
- self.by-version."once"."1.1.1"
- self.by-version."mkdirp"."0.3.5"
- self.by-version."osenv"."0.0.3"
- self.by-version."nopt"."2.2.1"
- self.by-version."semver"."2.3.2"
- self.by-version."ini"."1.1.0"
- ];
+ deps = {
+ "config-chain-1.1.8" = self.by-version."config-chain"."1.1.8";
+ "inherits-1.0.0" = self.by-version."inherits"."1.0.0";
+ "once-1.1.1" = self.by-version."once"."1.1.1";
+ "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
+ "osenv-0.0.3" = self.by-version."osenv"."0.0.3";
+ "nopt-2.2.1" = self.by-version."nopt"."2.2.1";
+ "semver-2.3.2" = self.by-version."semver"."2.3.2";
+ "ini-1.1.0" = self.by-version."ini"."1.1.0";
+ };
peerDependencies = [
];
passthru.names = [ "npmconf" ];
};
+ by-spec."npmconf"."2.0.9" =
+ self.by-version."npmconf"."2.0.9";
+ by-version."npmconf"."2.0.9" = lib.makeOverridable self.buildNodePackage {
+ name = "npmconf-2.0.9";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/npmconf/-/npmconf-2.0.9.tgz";
+ name = "npmconf-2.0.9.tgz";
+ sha1 = "5c87e5fb308104eceeca781e3d9115d216351ef2";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."npmconf" or []);
+ deps = {
+ "config-chain-1.1.8" = self.by-version."config-chain"."1.1.8";
+ "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+ "ini-1.3.0" = self.by-version."ini"."1.3.0";
+ "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
+ "nopt-3.0.1" = self.by-version."nopt"."3.0.1";
+ "once-1.3.1" = self.by-version."once"."1.3.1";
+ "osenv-0.1.0" = self.by-version."osenv"."0.1.0";
+ "semver-4.0.3" = self.by-version."semver"."4.0.3";
+ "uid-number-0.0.5" = self.by-version."uid-number"."0.0.5";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "npmconf" ];
+ };
+ by-spec."npmconf".">=2.1.0-0 >=2.1.0-0 <2.2.0-0" =
+ self.by-version."npmconf"."2.1.0";
+ by-version."npmconf"."2.1.0" = lib.makeOverridable self.buildNodePackage {
+ name = "npmconf-2.1.0";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/npmconf/-/npmconf-2.1.0.tgz";
+ name = "npmconf-2.1.0.tgz";
+ sha1 = "6dcdbd1fe3d7373b78ec74ab69e919d4954f76b0";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."npmconf" or []);
+ deps = {
+ "config-chain-1.1.8" = self.by-version."config-chain"."1.1.8";
+ "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+ "ini-1.3.0" = self.by-version."ini"."1.3.0";
+ "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
+ "nopt-3.0.1" = self.by-version."nopt"."3.0.1";
+ "once-1.3.1" = self.by-version."once"."1.3.1";
+ "osenv-0.1.0" = self.by-version."osenv"."0.1.0";
+ "semver-4.0.3" = self.by-version."semver"."4.0.3";
+ "uid-number-0.0.5" = self.by-version."uid-number"."0.0.5";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "npmconf" ];
+ };
+ by-spec."npmconf"."^2.1.0" =
+ self.by-version."npmconf"."2.1.0";
by-spec."npmconf"."~0.1.2" =
self.by-version."npmconf"."0.1.16";
by-version."npmconf"."0.1.16" = lib.makeOverridable self.buildNodePackage {
- name = "node-npmconf-0.1.16";
+ name = "npmconf-0.1.16";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.16.tgz";
@@ -13131,54 +14492,29 @@
];
buildInputs =
(self.nativeDeps."npmconf" or []);
- deps = [
- self.by-version."config-chain"."1.1.8"
- self.by-version."inherits"."2.0.1"
- self.by-version."once"."1.3.0"
- self.by-version."mkdirp"."0.3.5"
- self.by-version."osenv"."0.0.3"
- self.by-version."nopt"."2.2.1"
- self.by-version."semver"."2.3.2"
- self.by-version."ini"."1.1.0"
- ];
+ deps = {
+ "config-chain-1.1.8" = self.by-version."config-chain"."1.1.8";
+ "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+ "once-1.3.1" = self.by-version."once"."1.3.1";
+ "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
+ "osenv-0.0.3" = self.by-version."osenv"."0.0.3";
+ "nopt-2.2.1" = self.by-version."nopt"."2.2.1";
+ "semver-2.3.2" = self.by-version."semver"."2.3.2";
+ "ini-1.1.0" = self.by-version."ini"."1.1.0";
+ };
peerDependencies = [
];
passthru.names = [ "npmconf" ];
};
- by-spec."npmconf"."~2.0.1" =
- self.by-version."npmconf"."2.0.5";
- by-version."npmconf"."2.0.5" = lib.makeOverridable self.buildNodePackage {
- name = "node-npmconf-2.0.5";
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/npmconf/-/npmconf-2.0.5.tgz";
- name = "npmconf-2.0.5.tgz";
- sha1 = "70ad9975cd8d855e198a2deec8df6d04d932035c";
- })
- ];
- buildInputs =
- (self.nativeDeps."npmconf" or []);
- deps = [
- self.by-version."config-chain"."1.1.8"
- self.by-version."inherits"."2.0.1"
- self.by-version."ini"."1.2.1"
- self.by-version."mkdirp"."0.5.0"
- self.by-version."nopt"."3.0.1"
- self.by-version."once"."1.3.0"
- self.by-version."osenv"."0.1.0"
- self.by-version."semver"."3.0.1"
- self.by-version."uid-number"."0.0.5"
- ];
- peerDependencies = [
- ];
- passthru.names = [ "npmconf" ];
- };
- by-spec."npmconf"."~2.0.3" =
- self.by-version."npmconf"."2.0.5";
+ by-spec."npmconf"."~2.0.5" =
+ self.by-version."npmconf"."2.0.9";
+ by-spec."npmconf"."~2.1.0" =
+ self.by-version."npmconf"."2.1.0";
by-spec."npmlog"."*" =
self.by-version."npmlog"."0.1.1";
by-version."npmlog"."0.1.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-npmlog-0.1.1";
+ name = "npmlog-0.1.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/npmlog/-/npmlog-0.1.1.tgz";
@@ -13188,9 +14524,9 @@
];
buildInputs =
(self.nativeDeps."npmlog" or []);
- deps = [
- self.by-version."ansi"."0.3.0"
- ];
+ deps = {
+ "ansi-0.3.0" = self.by-version."ansi"."0.3.0";
+ };
peerDependencies = [
];
passthru.names = [ "npmlog" ];
@@ -13204,7 +14540,8 @@
by-spec."nssocket"."~0.5.1" =
self.by-version."nssocket"."0.5.1";
by-version."nssocket"."0.5.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-nssocket-0.5.1";
+ name = "nssocket-0.5.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/nssocket/-/nssocket-0.5.1.tgz";
@@ -13214,10 +14551,10 @@
];
buildInputs =
(self.nativeDeps."nssocket" or []);
- deps = [
- self.by-version."eventemitter2"."0.4.14"
- self.by-version."lazy"."1.0.11"
- ];
+ deps = {
+ "eventemitter2-0.4.14" = self.by-version."eventemitter2"."0.4.14";
+ "lazy-1.0.11" = self.by-version."lazy"."1.0.11";
+ };
peerDependencies = [
];
passthru.names = [ "nssocket" ];
@@ -13225,7 +14562,8 @@
by-spec."oauth"."https://github.com/ciaranj/node-oauth/tarball/master" =
self.by-version."oauth"."0.9.11";
by-version."oauth"."0.9.11" = lib.makeOverridable self.buildNodePackage {
- name = "node-oauth-0.9.11";
+ name = "oauth-0.9.11";
+ bin = false;
src = [
(fetchurl {
url = "https://github.com/ciaranj/node-oauth/tarball/master";
@@ -13235,8 +14573,8 @@
];
buildInputs =
(self.nativeDeps."oauth" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "oauth" ];
@@ -13244,7 +14582,8 @@
by-spec."oauth-sign"."~0.2.0" =
self.by-version."oauth-sign"."0.2.0";
by-version."oauth-sign"."0.2.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-oauth-sign-0.2.0";
+ name = "oauth-sign-0.2.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.2.0.tgz";
@@ -13254,8 +14593,8 @@
];
buildInputs =
(self.nativeDeps."oauth-sign" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "oauth-sign" ];
@@ -13263,7 +14602,8 @@
by-spec."oauth-sign"."~0.3.0" =
self.by-version."oauth-sign"."0.3.0";
by-version."oauth-sign"."0.3.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-oauth-sign-0.3.0";
+ name = "oauth-sign-0.3.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz";
@@ -13273,8 +14613,28 @@
];
buildInputs =
(self.nativeDeps."oauth-sign" or []);
- deps = [
+ deps = {
+ };
+ peerDependencies = [
];
+ passthru.names = [ "oauth-sign" ];
+ };
+ by-spec."oauth-sign"."~0.4.0" =
+ self.by-version."oauth-sign"."0.4.0";
+ by-version."oauth-sign"."0.4.0" = lib.makeOverridable self.buildNodePackage {
+ name = "oauth-sign-0.4.0";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.4.0.tgz";
+ name = "oauth-sign-0.4.0.tgz";
+ sha1 = "f22956f31ea7151a821e5f2fb32c113cad8b9f69";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."oauth-sign" or []);
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "oauth-sign" ];
@@ -13282,7 +14642,8 @@
by-spec."object-additions".">= 0.5.0" =
self.by-version."object-additions"."0.5.1";
by-version."object-additions"."0.5.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-object-additions-0.5.1";
+ name = "object-additions-0.5.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/object-additions/-/object-additions-0.5.1.tgz";
@@ -13292,8 +14653,8 @@
];
buildInputs =
(self.nativeDeps."object-additions" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "object-additions" ];
@@ -13301,7 +14662,8 @@
by-spec."object-assign"."~0.3.1" =
self.by-version."object-assign"."0.3.1";
by-version."object-assign"."0.3.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-object-assign-0.3.1";
+ name = "object-assign-0.3.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/object-assign/-/object-assign-0.3.1.tgz";
@@ -13311,8 +14673,8 @@
];
buildInputs =
(self.nativeDeps."object-assign" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "object-assign" ];
@@ -13320,7 +14682,8 @@
by-spec."object-keys"."~0.4.0" =
self.by-version."object-keys"."0.4.0";
by-version."object-keys"."0.4.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-object-keys-0.4.0";
+ name = "object-keys-0.4.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz";
@@ -13330,8 +14693,8 @@
];
buildInputs =
(self.nativeDeps."object-keys" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "object-keys" ];
@@ -13339,7 +14702,8 @@
by-spec."on-finished"."2.1.0" =
self.by-version."on-finished"."2.1.0";
by-version."on-finished"."2.1.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-on-finished-2.1.0";
+ name = "on-finished-2.1.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/on-finished/-/on-finished-2.1.0.tgz";
@@ -13349,36 +14713,20 @@
];
buildInputs =
(self.nativeDeps."on-finished" or []);
- deps = [
- self.by-version."ee-first"."1.0.5"
- ];
+ deps = {
+ "ee-first-1.0.5" = self.by-version."ee-first"."1.0.5";
+ };
peerDependencies = [
];
passthru.names = [ "on-finished" ];
};
- by-spec."on-headers"."0.0.0" =
- self.by-version."on-headers"."0.0.0";
- by-version."on-headers"."0.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-on-headers-0.0.0";
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/on-headers/-/on-headers-0.0.0.tgz";
- name = "on-headers-0.0.0.tgz";
- sha1 = "ee2817f8344325785cd9c2df2b242bbc17caf4c4";
- })
- ];
- buildInputs =
- (self.nativeDeps."on-headers" or []);
- deps = [
- ];
- peerDependencies = [
- ];
- passthru.names = [ "on-headers" ];
- };
+ by-spec."on-finished"."~2.1.0" =
+ self.by-version."on-finished"."2.1.0";
by-spec."on-headers"."~1.0.0" =
self.by-version."on-headers"."1.0.0";
by-version."on-headers"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-on-headers-1.0.0";
+ name = "on-headers-1.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/on-headers/-/on-headers-1.0.0.tgz";
@@ -13388,8 +14736,8 @@
];
buildInputs =
(self.nativeDeps."on-headers" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "on-headers" ];
@@ -13397,7 +14745,8 @@
by-spec."once"."1.1.1" =
self.by-version."once"."1.1.1";
by-version."once"."1.1.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-once-1.1.1";
+ name = "once-1.1.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/once/-/once-1.1.1.tgz";
@@ -13407,60 +14756,44 @@
];
buildInputs =
(self.nativeDeps."once" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "once" ];
};
by-spec."once"."1.x" =
- self.by-version."once"."1.3.0";
- by-version."once"."1.3.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-once-1.3.0";
+ self.by-version."once"."1.3.1";
+ by-version."once"."1.3.1" = lib.makeOverridable self.buildNodePackage {
+ name = "once-1.3.1";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/once/-/once-1.3.0.tgz";
- name = "once-1.3.0.tgz";
- sha1 = "151af86bfc1f08c4b9f07d06ab250ffcbeb56581";
+ url = "http://registry.npmjs.org/once/-/once-1.3.1.tgz";
+ name = "once-1.3.1.tgz";
+ sha1 = "f3f3e4da5b7d27b5c732969ee3e67e729457b31f";
})
];
buildInputs =
(self.nativeDeps."once" or []);
- deps = [
- ];
+ deps = {
+ "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1";
+ };
peerDependencies = [
];
passthru.names = [ "once" ];
};
by-spec."once"."^1.3.0" =
- self.by-version."once"."1.3.0";
+ self.by-version."once"."1.3.1";
by-spec."once"."~1.1.1" =
self.by-version."once"."1.1.1";
by-spec."once"."~1.3.0" =
- self.by-version."once"."1.3.0";
- by-spec."only"."0.0.2" =
- self.by-version."only"."0.0.2";
- by-version."only"."0.0.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-only-0.0.2";
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/only/-/only-0.0.2.tgz";
- name = "only-0.0.2.tgz";
- sha1 = "2afde84d03e50b9a8edc444e30610a70295edfb4";
- })
- ];
- buildInputs =
- (self.nativeDeps."only" or []);
- deps = [
- ];
- peerDependencies = [
- ];
- passthru.names = [ "only" ];
- };
+ self.by-version."once"."1.3.1";
by-spec."open"."0.0.2" =
self.by-version."open"."0.0.2";
by-version."open"."0.0.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-open-0.0.2";
+ name = "open-0.0.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/open/-/open-0.0.2.tgz";
@@ -13470,8 +14803,8 @@
];
buildInputs =
(self.nativeDeps."open" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "open" ];
@@ -13479,7 +14812,8 @@
by-spec."open"."~0.0.5" =
self.by-version."open"."0.0.5";
by-version."open"."0.0.5" = lib.makeOverridable self.buildNodePackage {
- name = "node-open-0.0.5";
+ name = "open-0.0.5";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/open/-/open-0.0.5.tgz";
@@ -13489,8 +14823,8 @@
];
buildInputs =
(self.nativeDeps."open" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "open" ];
@@ -13499,6 +14833,7 @@
self.by-version."opener"."1.3.0";
by-version."opener"."1.3.0" = lib.makeOverridable self.buildNodePackage {
name = "opener-1.3.0";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/opener/-/opener-1.3.0.tgz";
@@ -13508,8 +14843,8 @@
];
buildInputs =
(self.nativeDeps."opener" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "opener" ];
@@ -13517,7 +14852,8 @@
by-spec."openid".">=0.2.0" =
self.by-version."openid"."0.5.9";
by-version."openid"."0.5.9" = lib.makeOverridable self.buildNodePackage {
- name = "node-openid-0.5.9";
+ name = "openid-0.5.9";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/openid/-/openid-0.5.9.tgz";
@@ -13527,8 +14863,8 @@
];
buildInputs =
(self.nativeDeps."openid" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "openid" ];
@@ -13536,7 +14872,8 @@
by-spec."optimist"."*" =
self.by-version."optimist"."0.6.1";
by-version."optimist"."0.6.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-optimist-0.6.1";
+ name = "optimist-0.6.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz";
@@ -13546,10 +14883,10 @@
];
buildInputs =
(self.nativeDeps."optimist" or []);
- deps = [
- self.by-version."wordwrap"."0.0.2"
- self.by-version."minimist"."0.0.10"
- ];
+ deps = {
+ "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2";
+ "minimist-0.0.10" = self.by-version."minimist"."0.0.10";
+ };
peerDependencies = [
];
passthru.names = [ "optimist" ];
@@ -13558,7 +14895,8 @@
by-spec."optimist"."0.2" =
self.by-version."optimist"."0.2.8";
by-version."optimist"."0.2.8" = lib.makeOverridable self.buildNodePackage {
- name = "node-optimist-0.2.8";
+ name = "optimist-0.2.8";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/optimist/-/optimist-0.2.8.tgz";
@@ -13568,9 +14906,9 @@
];
buildInputs =
(self.nativeDeps."optimist" or []);
- deps = [
- self.by-version."wordwrap"."0.0.2"
- ];
+ deps = {
+ "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2";
+ };
peerDependencies = [
];
passthru.names = [ "optimist" ];
@@ -13578,7 +14916,8 @@
by-spec."optimist"."0.6.0" =
self.by-version."optimist"."0.6.0";
by-version."optimist"."0.6.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-optimist-0.6.0";
+ name = "optimist-0.6.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz";
@@ -13588,10 +14927,10 @@
];
buildInputs =
(self.nativeDeps."optimist" or []);
- deps = [
- self.by-version."wordwrap"."0.0.2"
- self.by-version."minimist"."0.0.10"
- ];
+ deps = {
+ "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2";
+ "minimist-0.0.10" = self.by-version."minimist"."0.0.10";
+ };
peerDependencies = [
];
passthru.names = [ "optimist" ];
@@ -13601,7 +14940,8 @@
by-spec."optimist"."~0.3" =
self.by-version."optimist"."0.3.7";
by-version."optimist"."0.3.7" = lib.makeOverridable self.buildNodePackage {
- name = "node-optimist-0.3.7";
+ name = "optimist-0.3.7";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz";
@@ -13611,9 +14951,9 @@
];
buildInputs =
(self.nativeDeps."optimist" or []);
- deps = [
- self.by-version."wordwrap"."0.0.2"
- ];
+ deps = {
+ "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2";
+ };
peerDependencies = [
];
passthru.names = [ "optimist" ];
@@ -13627,7 +14967,8 @@
by-spec."options".">=0.0.5" =
self.by-version."options"."0.0.5";
by-version."options"."0.0.5" = lib.makeOverridable self.buildNodePackage {
- name = "node-options-0.0.5";
+ name = "options-0.0.5";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/options/-/options-0.0.5.tgz";
@@ -13637,8 +14978,8 @@
];
buildInputs =
(self.nativeDeps."options" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "options" ];
@@ -13646,7 +14987,8 @@
by-spec."optparse"."*" =
self.by-version."optparse"."1.0.5";
by-version."optparse"."1.0.5" = lib.makeOverridable self.buildNodePackage {
- name = "node-optparse-1.0.5";
+ name = "optparse-1.0.5";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/optparse/-/optparse-1.0.5.tgz";
@@ -13656,8 +14998,8 @@
];
buildInputs =
(self.nativeDeps."optparse" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "optparse" ];
@@ -13665,10 +15007,34 @@
"optparse" = self.by-version."optparse"."1.0.5";
by-spec."optparse".">= 1.0.3" =
self.by-version."optparse"."1.0.5";
+ by-spec."orchestrator"."^0.3.0" =
+ self.by-version."orchestrator"."0.3.7";
+ by-version."orchestrator"."0.3.7" = lib.makeOverridable self.buildNodePackage {
+ name = "orchestrator-0.3.7";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/orchestrator/-/orchestrator-0.3.7.tgz";
+ name = "orchestrator-0.3.7.tgz";
+ sha1 = "c45064e22c5a2a7b99734f409a95ffedc7d3c3df";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."orchestrator" or []);
+ deps = {
+ "end-of-stream-0.1.5" = self.by-version."end-of-stream"."0.1.5";
+ "sequencify-0.0.7" = self.by-version."sequencify"."0.0.7";
+ "stream-consume-0.1.0" = self.by-version."stream-consume"."0.1.0";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "orchestrator" ];
+ };
by-spec."ordered-read-streams"."0.0.8" =
self.by-version."ordered-read-streams"."0.0.8";
by-version."ordered-read-streams"."0.0.8" = lib.makeOverridable self.buildNodePackage {
- name = "node-ordered-read-streams-0.0.8";
+ name = "ordered-read-streams-0.0.8";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.0.8.tgz";
@@ -13678,8 +15044,8 @@
];
buildInputs =
(self.nativeDeps."ordered-read-streams" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "ordered-read-streams" ];
@@ -13687,7 +15053,8 @@
by-spec."os-browserify"."~0.1.1" =
self.by-version."os-browserify"."0.1.2";
by-version."os-browserify"."0.1.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-os-browserify-0.1.2";
+ name = "os-browserify-0.1.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/os-browserify/-/os-browserify-0.1.2.tgz";
@@ -13697,8 +15064,8 @@
];
buildInputs =
(self.nativeDeps."os-browserify" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "os-browserify" ];
@@ -13706,7 +15073,8 @@
by-spec."osenv"."0" =
self.by-version."osenv"."0.1.0";
by-version."osenv"."0.1.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-osenv-0.1.0";
+ name = "osenv-0.1.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/osenv/-/osenv-0.1.0.tgz";
@@ -13716,8 +15084,8 @@
];
buildInputs =
(self.nativeDeps."osenv" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "osenv" ];
@@ -13725,7 +15093,8 @@
by-spec."osenv"."0.0.3" =
self.by-version."osenv"."0.0.3";
by-version."osenv"."0.0.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-osenv-0.0.3";
+ name = "osenv-0.0.3";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/osenv/-/osenv-0.0.3.tgz";
@@ -13735,8 +15104,8 @@
];
buildInputs =
(self.nativeDeps."osenv" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "osenv" ];
@@ -13748,7 +15117,8 @@
by-spec."owl-deepcopy"."*" =
self.by-version."owl-deepcopy"."0.0.4";
by-version."owl-deepcopy"."0.0.4" = lib.makeOverridable self.buildNodePackage {
- name = "node-owl-deepcopy-0.0.4";
+ name = "owl-deepcopy-0.0.4";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/owl-deepcopy/-/owl-deepcopy-0.0.4.tgz";
@@ -13758,8 +15128,8 @@
];
buildInputs =
(self.nativeDeps."owl-deepcopy" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "owl-deepcopy" ];
@@ -13770,7 +15140,8 @@
by-spec."pako"."~0.2.0" =
self.by-version."pako"."0.2.5";
by-version."pako"."0.2.5" = lib.makeOverridable self.buildNodePackage {
- name = "node-pako-0.2.5";
+ name = "pako-0.2.5";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/pako/-/pako-0.2.5.tgz";
@@ -13780,8 +15151,8 @@
];
buildInputs =
(self.nativeDeps."pako" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "pako" ];
@@ -13790,6 +15161,7 @@
self.by-version."parents"."1.0.0";
by-version."parents"."1.0.0" = lib.makeOverridable self.buildNodePackage {
name = "parents-1.0.0";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/parents/-/parents-1.0.0.tgz";
@@ -13799,9 +15171,9 @@
];
buildInputs =
(self.nativeDeps."parents" or []);
- deps = [
- self.by-version."path-platform"."0.0.1"
- ];
+ deps = {
+ "path-platform-0.0.1" = self.by-version."path-platform"."0.0.1";
+ };
peerDependencies = [
];
passthru.names = [ "parents" ];
@@ -13810,6 +15182,7 @@
self.by-version."parents"."0.0.3";
by-version."parents"."0.0.3" = lib.makeOverridable self.buildNodePackage {
name = "parents-0.0.3";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/parents/-/parents-0.0.3.tgz";
@@ -13819,9 +15192,9 @@
];
buildInputs =
(self.nativeDeps."parents" or []);
- deps = [
- self.by-version."path-platform"."0.0.1"
- ];
+ deps = {
+ "path-platform-0.0.1" = self.by-version."path-platform"."0.0.1";
+ };
peerDependencies = [
];
passthru.names = [ "parents" ];
@@ -13829,7 +15202,8 @@
by-spec."parseurl"."1.0.1" =
self.by-version."parseurl"."1.0.1";
by-version."parseurl"."1.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-parseurl-1.0.1";
+ name = "parseurl-1.0.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/parseurl/-/parseurl-1.0.1.tgz";
@@ -13839,46 +15213,8 @@
];
buildInputs =
(self.nativeDeps."parseurl" or []);
- deps = [
- ];
- peerDependencies = [
- ];
- passthru.names = [ "parseurl" ];
- };
- by-spec."parseurl"."~1.1.3" =
- self.by-version."parseurl"."1.1.3";
- by-version."parseurl"."1.1.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-parseurl-1.1.3";
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/parseurl/-/parseurl-1.1.3.tgz";
- name = "parseurl-1.1.3.tgz";
- sha1 = "1f005738ac71b417bc2d0845cbdfa2a8b63ea639";
- })
- ];
- buildInputs =
- (self.nativeDeps."parseurl" or []);
- deps = [
- ];
- peerDependencies = [
- ];
- passthru.names = [ "parseurl" ];
- };
- by-spec."parseurl"."~1.2.0" =
- self.by-version."parseurl"."1.2.0";
- by-version."parseurl"."1.2.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-parseurl-1.2.0";
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/parseurl/-/parseurl-1.2.0.tgz";
- name = "parseurl-1.2.0.tgz";
- sha1 = "be7df2d698eb49ffb10ea62939693e152991c008";
- })
- ];
- buildInputs =
- (self.nativeDeps."parseurl" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "parseurl" ];
@@ -13886,7 +15222,8 @@
by-spec."parseurl"."~1.3.0" =
self.by-version."parseurl"."1.3.0";
by-version."parseurl"."1.3.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-parseurl-1.3.0";
+ name = "parseurl-1.3.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz";
@@ -13896,38 +15233,40 @@
];
buildInputs =
(self.nativeDeps."parseurl" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "parseurl" ];
};
by-spec."passport"."*" =
- self.by-version."passport"."0.2.0";
- by-version."passport"."0.2.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-passport-0.2.0";
+ self.by-version."passport"."0.2.1";
+ by-version."passport"."0.2.1" = lib.makeOverridable self.buildNodePackage {
+ name = "passport-0.2.1";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/passport/-/passport-0.2.0.tgz";
- name = "passport-0.2.0.tgz";
- sha1 = "ae5ebc5611300d51fdc44032c7ca442a548dbca5";
+ url = "http://registry.npmjs.org/passport/-/passport-0.2.1.tgz";
+ name = "passport-0.2.1.tgz";
+ sha1 = "a7d34c07b30fb605be885edbc8c93e5142e38574";
})
];
buildInputs =
(self.nativeDeps."passport" or []);
- deps = [
- self.by-version."passport-strategy"."1.0.0"
- self.by-version."pause"."0.0.1"
- ];
+ deps = {
+ "passport-strategy-1.0.0" = self.by-version."passport-strategy"."1.0.0";
+ "pause-0.0.1" = self.by-version."pause"."0.0.1";
+ };
peerDependencies = [
];
passthru.names = [ "passport" ];
};
- "passport" = self.by-version."passport"."0.2.0";
+ "passport" = self.by-version."passport"."0.2.1";
by-spec."passport"."~0.1.3" =
self.by-version."passport"."0.1.18";
by-version."passport"."0.1.18" = lib.makeOverridable self.buildNodePackage {
- name = "node-passport-0.1.18";
+ name = "passport-0.1.18";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/passport/-/passport-0.1.18.tgz";
@@ -13937,20 +15276,21 @@
];
buildInputs =
(self.nativeDeps."passport" or []);
- deps = [
- self.by-version."pkginfo"."0.2.3"
- self.by-version."pause"."0.0.1"
- ];
+ deps = {
+ "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
+ "pause-0.0.1" = self.by-version."pause"."0.0.1";
+ };
peerDependencies = [
];
passthru.names = [ "passport" ];
};
by-spec."passport"."~0.2.0" =
- self.by-version."passport"."0.2.0";
+ self.by-version."passport"."0.2.1";
by-spec."passport-http"."*" =
self.by-version."passport-http"."0.2.2";
by-version."passport-http"."0.2.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-passport-http-0.2.2";
+ name = "passport-http-0.2.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/passport-http/-/passport-http-0.2.2.tgz";
@@ -13960,10 +15300,10 @@
];
buildInputs =
(self.nativeDeps."passport-http" or []);
- deps = [
- self.by-version."pkginfo"."0.2.3"
- self.by-version."passport"."0.1.18"
- ];
+ deps = {
+ "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
+ "passport-0.1.18" = self.by-version."passport"."0.1.18";
+ };
peerDependencies = [
];
passthru.names = [ "passport-http" ];
@@ -13972,7 +15312,8 @@
by-spec."passport-local"."*" =
self.by-version."passport-local"."1.0.0";
by-version."passport-local"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-passport-local-1.0.0";
+ name = "passport-local-1.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/passport-local/-/passport-local-1.0.0.tgz";
@@ -13982,9 +15323,9 @@
];
buildInputs =
(self.nativeDeps."passport-local" or []);
- deps = [
- self.by-version."passport-strategy"."1.0.0"
- ];
+ deps = {
+ "passport-strategy-1.0.0" = self.by-version."passport-strategy"."1.0.0";
+ };
peerDependencies = [
];
passthru.names = [ "passport-local" ];
@@ -13995,7 +15336,8 @@
by-spec."passport-strategy"."1.x.x" =
self.by-version."passport-strategy"."1.0.0";
by-version."passport-strategy"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-passport-strategy-1.0.0";
+ name = "passport-strategy-1.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz";
@@ -14005,8 +15347,8 @@
];
buildInputs =
(self.nativeDeps."passport-strategy" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "passport-strategy" ];
@@ -14014,7 +15356,8 @@
by-spec."path-browserify"."~0.0.0" =
self.by-version."path-browserify"."0.0.0";
by-version."path-browserify"."0.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-path-browserify-0.0.0";
+ name = "path-browserify-0.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz";
@@ -14024,8 +15367,8 @@
];
buildInputs =
(self.nativeDeps."path-browserify" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "path-browserify" ];
@@ -14033,7 +15376,8 @@
by-spec."path-is-inside"."~1.0.0" =
self.by-version."path-is-inside"."1.0.1";
by-version."path-is-inside"."1.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-path-is-inside-1.0.1";
+ name = "path-is-inside-1.0.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.1.tgz";
@@ -14043,8 +15387,8 @@
];
buildInputs =
(self.nativeDeps."path-is-inside" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "path-is-inside" ];
@@ -14052,7 +15396,8 @@
by-spec."path-platform"."^0.0.1" =
self.by-version."path-platform"."0.0.1";
by-version."path-platform"."0.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-path-platform-0.0.1";
+ name = "path-platform-0.0.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/path-platform/-/path-platform-0.0.1.tgz";
@@ -14062,8 +15407,8 @@
];
buildInputs =
(self.nativeDeps."path-platform" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "path-platform" ];
@@ -14071,7 +15416,8 @@
by-spec."path-to-regexp"."0.1.2" =
self.by-version."path-to-regexp"."0.1.2";
by-version."path-to-regexp"."0.1.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-path-to-regexp-0.1.2";
+ name = "path-to-regexp-0.1.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.2.tgz";
@@ -14081,8 +15427,8 @@
];
buildInputs =
(self.nativeDeps."path-to-regexp" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "path-to-regexp" ];
@@ -14090,7 +15436,8 @@
by-spec."path-to-regexp"."0.1.3" =
self.by-version."path-to-regexp"."0.1.3";
by-version."path-to-regexp"."0.1.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-path-to-regexp-0.1.3";
+ name = "path-to-regexp-0.1.3";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.3.tgz";
@@ -14100,8 +15447,8 @@
];
buildInputs =
(self.nativeDeps."path-to-regexp" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "path-to-regexp" ];
@@ -14109,7 +15456,8 @@
by-spec."pause"."0.0.1" =
self.by-version."pause"."0.0.1";
by-version."pause"."0.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-pause-0.0.1";
+ name = "pause-0.0.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/pause/-/pause-0.0.1.tgz";
@@ -14119,50 +15467,72 @@
];
buildInputs =
(self.nativeDeps."pause" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "pause" ];
};
- by-spec."phantomjs"."*" =
- self.by-version."phantomjs"."1.9.7-15";
- by-version."phantomjs"."1.9.7-15" = lib.makeOverridable self.buildNodePackage {
- name = "phantomjs-1.9.7-15";
+ by-spec."pbkdf2-compat"."2.0.1" =
+ self.by-version."pbkdf2-compat"."2.0.1";
+ by-version."pbkdf2-compat"."2.0.1" = lib.makeOverridable self.buildNodePackage {
+ name = "pbkdf2-compat-2.0.1";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.7-15.tgz";
- name = "phantomjs-1.9.7-15.tgz";
- sha1 = "0b3a7ce630486a83be91ff4e832eee20e971115b";
+ url = "http://registry.npmjs.org/pbkdf2-compat/-/pbkdf2-compat-2.0.1.tgz";
+ name = "pbkdf2-compat-2.0.1.tgz";
+ sha1 = "b6e0c8fa99494d94e0511575802a59a5c142f288";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."pbkdf2-compat" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "pbkdf2-compat" ];
+ };
+ by-spec."phantomjs"."*" =
+ self.by-version."phantomjs"."1.9.10";
+ by-version."phantomjs"."1.9.10" = lib.makeOverridable self.buildNodePackage {
+ name = "phantomjs-1.9.10";
+ bin = true;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.10.tgz";
+ name = "phantomjs-1.9.10.tgz";
+ sha1 = "be174e20b03f42c39beaaf84cc153fb65b225a4a";
})
];
buildInputs =
(self.nativeDeps."phantomjs" or []);
- deps = [
- self.by-version."adm-zip"."0.2.1"
- self.by-version."kew"."0.1.7"
- self.by-version."ncp"."0.4.2"
- self.by-version."npmconf"."0.0.24"
- self.by-version."mkdirp"."0.3.5"
- self.by-version."progress"."1.1.8"
- self.by-version."request"."2.36.0"
- self.by-version."request-progress"."0.3.1"
- self.by-version."rimraf"."2.2.8"
- self.by-version."which"."1.0.5"
- ];
+ deps = {
+ "adm-zip-0.4.4" = self.by-version."adm-zip"."0.4.4";
+ "kew-0.4.0" = self.by-version."kew"."0.4.0";
+ "ncp-0.6.0" = self.by-version."ncp"."0.6.0";
+ "npmconf-2.0.9" = self.by-version."npmconf"."2.0.9";
+ "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
+ "progress-1.1.8" = self.by-version."progress"."1.1.8";
+ "request-2.42.0" = self.by-version."request"."2.42.0";
+ "request-progress-0.3.1" = self.by-version."request-progress"."0.3.1";
+ "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
+ "which-1.0.5" = self.by-version."which"."1.0.5";
+ };
peerDependencies = [
];
passthru.names = [ "phantomjs" ];
};
- "phantomjs" = self.by-version."phantomjs"."1.9.7-15";
+ "phantomjs" = self.by-version."phantomjs"."1.9.10";
by-spec."phantomjs"."~1.9.1" =
- self.by-version."phantomjs"."1.9.7-15";
- by-spec."phantomjs"."~1.9.7" =
- self.by-version."phantomjs"."1.9.7-15";
+ self.by-version."phantomjs"."1.9.10";
+ by-spec."phantomjs"."~1.9.10" =
+ self.by-version."phantomjs"."1.9.10";
by-spec."pkginfo"."0.2.x" =
self.by-version."pkginfo"."0.2.3";
by-version."pkginfo"."0.2.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-pkginfo-0.2.3";
+ name = "pkginfo-0.2.3";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz";
@@ -14172,8 +15542,8 @@
];
buildInputs =
(self.nativeDeps."pkginfo" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "pkginfo" ];
@@ -14181,7 +15551,8 @@
by-spec."pkginfo"."0.3.0" =
self.by-version."pkginfo"."0.3.0";
by-version."pkginfo"."0.3.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-pkginfo-0.3.0";
+ name = "pkginfo-0.3.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz";
@@ -14191,8 +15562,8 @@
];
buildInputs =
(self.nativeDeps."pkginfo" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "pkginfo" ];
@@ -14204,7 +15575,8 @@
by-spec."plist-native"."*" =
self.by-version."plist-native"."0.3.1";
by-version."plist-native"."0.3.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-plist-native-0.3.1";
+ name = "plist-native-0.3.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/plist-native/-/plist-native-0.3.1.tgz";
@@ -14214,9 +15586,9 @@
];
buildInputs =
(self.nativeDeps."plist-native" or []);
- deps = [
- self.by-version."libxmljs"."0.10.0"
- ];
+ deps = {
+ "libxmljs-0.10.0" = self.by-version."libxmljs"."0.10.0";
+ };
peerDependencies = [
];
passthru.names = [ "plist-native" ];
@@ -14225,7 +15597,8 @@
by-spec."policyfile"."0.0.4" =
self.by-version."policyfile"."0.0.4";
by-version."policyfile"."0.0.4" = lib.makeOverridable self.buildNodePackage {
- name = "node-policyfile-0.0.4";
+ name = "policyfile-0.0.4";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/policyfile/-/policyfile-0.0.4.tgz";
@@ -14235,8 +15608,8 @@
];
buildInputs =
(self.nativeDeps."policyfile" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "policyfile" ];
@@ -14244,7 +15617,8 @@
by-spec."posix"."*" =
self.by-version."posix"."1.0.3";
by-version."posix"."1.0.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-posix-1.0.3";
+ name = "posix-1.0.3";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/posix/-/posix-1.0.3.tgz";
@@ -14254,8 +15628,8 @@
];
buildInputs =
(self.nativeDeps."posix" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "posix" ];
@@ -14264,7 +15638,8 @@
by-spec."posix-getopt"."1.0.0" =
self.by-version."posix-getopt"."1.0.0";
by-version."posix-getopt"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-posix-getopt-1.0.0";
+ name = "posix-getopt-1.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/posix-getopt/-/posix-getopt-1.0.0.tgz";
@@ -14274,8 +15649,8 @@
];
buildInputs =
(self.nativeDeps."posix-getopt" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "posix-getopt" ];
@@ -14284,6 +15659,7 @@
self.by-version."pretty-bytes"."0.1.2";
by-version."pretty-bytes"."0.1.2" = lib.makeOverridable self.buildNodePackage {
name = "pretty-bytes-0.1.2";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/pretty-bytes/-/pretty-bytes-0.1.2.tgz";
@@ -14293,16 +15669,58 @@
];
buildInputs =
(self.nativeDeps."pretty-bytes" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "pretty-bytes" ];
};
+ by-spec."pretty-bytes"."^1.0.0" =
+ self.by-version."pretty-bytes"."1.0.1";
+ by-version."pretty-bytes"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+ name = "pretty-bytes-1.0.1";
+ bin = true;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.1.tgz";
+ name = "pretty-bytes-1.0.1.tgz";
+ sha1 = "afd0b459da61834ac36617b05f9daa0beb043e3e";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."pretty-bytes" or []);
+ deps = {
+ "get-stdin-1.0.0" = self.by-version."get-stdin"."1.0.0";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "pretty-bytes" ];
+ };
+ by-spec."pretty-hrtime"."^0.2.0" =
+ self.by-version."pretty-hrtime"."0.2.2";
+ by-version."pretty-hrtime"."0.2.2" = lib.makeOverridable self.buildNodePackage {
+ name = "pretty-hrtime-0.2.2";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-0.2.2.tgz";
+ name = "pretty-hrtime-0.2.2.tgz";
+ sha1 = "d4fd88351e3a4741f8173af7d6a4b846f9895c00";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."pretty-hrtime" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "pretty-hrtime" ];
+ };
by-spec."process"."^0.7.0" =
self.by-version."process"."0.7.0";
by-version."process"."0.7.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-process-0.7.0";
+ name = "process-0.7.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/process/-/process-0.7.0.tgz";
@@ -14312,8 +15730,8 @@
];
buildInputs =
(self.nativeDeps."process" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "process" ];
@@ -14321,7 +15739,8 @@
by-spec."process"."~0.5.1" =
self.by-version."process"."0.5.2";
by-version."process"."0.5.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-process-0.5.2";
+ name = "process-0.5.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/process/-/process-0.5.2.tgz";
@@ -14331,8 +15750,8 @@
];
buildInputs =
(self.nativeDeps."process" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "process" ];
@@ -14340,7 +15759,8 @@
by-spec."process"."~0.6.0" =
self.by-version."process"."0.6.0";
by-version."process"."0.6.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-process-0.6.0";
+ name = "process-0.6.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/process/-/process-0.6.0.tgz";
@@ -14350,16 +15770,17 @@
];
buildInputs =
(self.nativeDeps."process" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "process" ];
};
- by-spec."progress"."^1.1.5" =
+ by-spec."progress"."1.1.8" =
self.by-version."progress"."1.1.8";
by-version."progress"."1.1.8" = lib.makeOverridable self.buildNodePackage {
- name = "node-progress-1.1.8";
+ name = "progress-1.1.8";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/progress/-/progress-1.1.8.tgz";
@@ -14369,8 +15790,8 @@
];
buildInputs =
(self.nativeDeps."progress" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "progress" ];
@@ -14378,7 +15799,8 @@
by-spec."promise"."~2.0" =
self.by-version."promise"."2.0.0";
by-version."promise"."2.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-promise-2.0.0";
+ name = "promise-2.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/promise/-/promise-2.0.0.tgz";
@@ -14388,9 +15810,9 @@
];
buildInputs =
(self.nativeDeps."promise" or []);
- deps = [
- self.by-version."is-promise"."1.0.1"
- ];
+ deps = {
+ "is-promise-1.0.1" = self.by-version."is-promise"."1.0.1";
+ };
peerDependencies = [
];
passthru.names = [ "promise" ];
@@ -14398,7 +15820,8 @@
by-spec."prompt"."0.2.11" =
self.by-version."prompt"."0.2.11";
by-version."prompt"."0.2.11" = lib.makeOverridable self.buildNodePackage {
- name = "node-prompt-0.2.11";
+ name = "prompt-0.2.11";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/prompt/-/prompt-0.2.11.tgz";
@@ -14408,13 +15831,38 @@
];
buildInputs =
(self.nativeDeps."prompt" or []);
- deps = [
- self.by-version."pkginfo"."0.3.0"
- self.by-version."read"."1.0.5"
- self.by-version."revalidator"."0.1.8"
- self.by-version."utile"."0.2.1"
- self.by-version."winston"."0.6.2"
+ deps = {
+ "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0";
+ "read-1.0.5" = self.by-version."read"."1.0.5";
+ "revalidator-0.1.8" = self.by-version."revalidator"."0.1.8";
+ "utile-0.2.1" = self.by-version."utile"."0.2.1";
+ "winston-0.6.2" = self.by-version."winston"."0.6.2";
+ };
+ peerDependencies = [
];
+ passthru.names = [ "prompt" ];
+ };
+ by-spec."prompt"."0.2.14" =
+ self.by-version."prompt"."0.2.14";
+ by-version."prompt"."0.2.14" = lib.makeOverridable self.buildNodePackage {
+ name = "prompt-0.2.14";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/prompt/-/prompt-0.2.14.tgz";
+ name = "prompt-0.2.14.tgz";
+ sha1 = "57754f64f543fd7b0845707c818ece618f05ffdc";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."prompt" or []);
+ deps = {
+ "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0";
+ "read-1.0.5" = self.by-version."read"."1.0.5";
+ "revalidator-0.1.8" = self.by-version."revalidator"."0.1.8";
+ "utile-0.2.1" = self.by-version."utile"."0.2.1";
+ "winston-0.8.0" = self.by-version."winston"."0.8.0";
+ };
peerDependencies = [
];
passthru.names = [ "prompt" ];
@@ -14422,7 +15870,8 @@
by-spec."promzard"."~0.2.0" =
self.by-version."promzard"."0.2.2";
by-version."promzard"."0.2.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-promzard-0.2.2";
+ name = "promzard-0.2.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/promzard/-/promzard-0.2.2.tgz";
@@ -14432,9 +15881,9 @@
];
buildInputs =
(self.nativeDeps."promzard" or []);
- deps = [
- self.by-version."read"."1.0.5"
- ];
+ deps = {
+ "read-1.0.5" = self.by-version."read"."1.0.5";
+ };
peerDependencies = [
];
passthru.names = [ "promzard" ];
@@ -14442,7 +15891,8 @@
by-spec."proto-list"."~1.2.1" =
self.by-version."proto-list"."1.2.3";
by-version."proto-list"."1.2.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-proto-list-1.2.3";
+ name = "proto-list-1.2.3";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/proto-list/-/proto-list-1.2.3.tgz";
@@ -14452,8 +15902,8 @@
];
buildInputs =
(self.nativeDeps."proto-list" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "proto-list" ];
@@ -14461,7 +15911,8 @@
by-spec."proxy-addr"."1.0.1" =
self.by-version."proxy-addr"."1.0.1";
by-version."proxy-addr"."1.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-proxy-addr-1.0.1";
+ name = "proxy-addr-1.0.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.1.tgz";
@@ -14471,9 +15922,31 @@
];
buildInputs =
(self.nativeDeps."proxy-addr" or []);
- deps = [
- self.by-version."ipaddr.js"."0.1.2"
+ deps = {
+ "ipaddr.js-0.1.2" = self.by-version."ipaddr.js"."0.1.2";
+ };
+ peerDependencies = [
];
+ passthru.names = [ "proxy-addr" ];
+ };
+ by-spec."proxy-addr"."~1.0.3" =
+ self.by-version."proxy-addr"."1.0.3";
+ by-version."proxy-addr"."1.0.3" = lib.makeOverridable self.buildNodePackage {
+ name = "proxy-addr-1.0.3";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.3.tgz";
+ name = "proxy-addr-1.0.3.tgz";
+ sha1 = "17d824aac844707441249da6d1ea5e889007cdd6";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."proxy-addr" or []);
+ deps = {
+ "forwarded-0.1.0" = self.by-version."forwarded"."0.1.0";
+ "ipaddr.js-0.1.3" = self.by-version."ipaddr.js"."0.1.3";
+ };
peerDependencies = [
];
passthru.names = [ "proxy-addr" ];
@@ -14481,7 +15954,8 @@
by-spec."ps-tree"."0.0.x" =
self.by-version."ps-tree"."0.0.3";
by-version."ps-tree"."0.0.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-ps-tree-0.0.3";
+ name = "ps-tree-0.0.3";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/ps-tree/-/ps-tree-0.0.3.tgz";
@@ -14491,9 +15965,9 @@
];
buildInputs =
(self.nativeDeps."ps-tree" or []);
- deps = [
- self.by-version."event-stream"."0.5.3"
- ];
+ deps = {
+ "event-stream-0.5.3" = self.by-version."event-stream"."0.5.3";
+ };
peerDependencies = [
];
passthru.names = [ "ps-tree" ];
@@ -14503,7 +15977,8 @@
by-spec."punycode"."1.2.4" =
self.by-version."punycode"."1.2.4";
by-version."punycode"."1.2.4" = lib.makeOverridable self.buildNodePackage {
- name = "node-punycode-1.2.4";
+ name = "punycode-1.2.4";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/punycode/-/punycode-1.2.4.tgz";
@@ -14513,8 +15988,8 @@
];
buildInputs =
(self.nativeDeps."punycode" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "punycode" ];
@@ -14522,7 +15997,8 @@
by-spec."punycode".">=0.2.0" =
self.by-version."punycode"."1.3.1";
by-version."punycode"."1.3.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-punycode-1.3.1";
+ name = "punycode-1.3.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/punycode/-/punycode-1.3.1.tgz";
@@ -14532,8 +16008,8 @@
];
buildInputs =
(self.nativeDeps."punycode" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "punycode" ];
@@ -14545,7 +16021,8 @@
by-spec."pure-css"."git://github.com/yui/pure.git#v0.5.0-rc-1" =
self.by-version."pure-css"."0.5.0-rc-1";
by-version."pure-css"."0.5.0-rc-1" = lib.makeOverridable self.buildNodePackage {
- name = "node-pure-0.5.0-rc-1";
+ name = "pure-0.5.0-rc-1";
+ bin = false;
src = [
(fetchgit {
url = "git://github.com/yui/pure.git";
@@ -14555,8 +16032,8 @@
];
buildInputs =
(self.nativeDeps."pure" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "pure" ];
@@ -14565,7 +16042,8 @@
by-spec."q".">= 0.0.1" =
self.by-version."q"."2.0.2";
by-version."q"."2.0.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-q-2.0.2";
+ name = "q-2.0.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/q/-/q-2.0.2.tgz";
@@ -14575,10 +16053,10 @@
];
buildInputs =
(self.nativeDeps."q" or []);
- deps = [
- self.by-version."asap"."1.0.0"
- self.by-version."collections"."2.0.1"
- ];
+ deps = {
+ "asap-1.0.0" = self.by-version."asap"."1.0.0";
+ "collections-2.0.1" = self.by-version."collections"."2.0.1";
+ };
peerDependencies = [
];
passthru.names = [ "q" ];
@@ -14586,7 +16064,8 @@
by-spec."q"."~0.9.6" =
self.by-version."q"."0.9.7";
by-version."q"."0.9.7" = lib.makeOverridable self.buildNodePackage {
- name = "node-q-0.9.7";
+ name = "q-0.9.7";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/q/-/q-0.9.7.tgz";
@@ -14596,8 +16075,8 @@
];
buildInputs =
(self.nativeDeps."q" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "q" ];
@@ -14607,7 +16086,8 @@
by-spec."q"."~1.0.1" =
self.by-version."q"."1.0.1";
by-version."q"."1.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-q-1.0.1";
+ name = "q-1.0.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/q/-/q-1.0.1.tgz";
@@ -14617,8 +16097,8 @@
];
buildInputs =
(self.nativeDeps."q" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "q" ];
@@ -14626,7 +16106,8 @@
by-spec."qs"."0.4.2" =
self.by-version."qs"."0.4.2";
by-version."qs"."0.4.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-qs-0.4.2";
+ name = "qs-0.4.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/qs/-/qs-0.4.2.tgz";
@@ -14636,8 +16117,8 @@
];
buildInputs =
(self.nativeDeps."qs" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "qs" ];
@@ -14647,7 +16128,8 @@
by-spec."qs"."0.5.1" =
self.by-version."qs"."0.5.1";
by-version."qs"."0.5.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-qs-0.5.1";
+ name = "qs-0.5.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/qs/-/qs-0.5.1.tgz";
@@ -14657,8 +16139,8 @@
];
buildInputs =
(self.nativeDeps."qs" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "qs" ];
@@ -14666,7 +16148,8 @@
by-spec."qs"."0.5.2" =
self.by-version."qs"."0.5.2";
by-version."qs"."0.5.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-qs-0.5.2";
+ name = "qs-0.5.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/qs/-/qs-0.5.2.tgz";
@@ -14676,8 +16159,8 @@
];
buildInputs =
(self.nativeDeps."qs" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "qs" ];
@@ -14685,7 +16168,8 @@
by-spec."qs"."0.5.5" =
self.by-version."qs"."0.5.5";
by-version."qs"."0.5.5" = lib.makeOverridable self.buildNodePackage {
- name = "node-qs-0.5.5";
+ name = "qs-0.5.5";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/qs/-/qs-0.5.5.tgz";
@@ -14695,8 +16179,8 @@
];
buildInputs =
(self.nativeDeps."qs" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "qs" ];
@@ -14704,7 +16188,8 @@
by-spec."qs"."0.6.5" =
self.by-version."qs"."0.6.5";
by-version."qs"."0.6.5" = lib.makeOverridable self.buildNodePackage {
- name = "node-qs-0.6.5";
+ name = "qs-0.6.5";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/qs/-/qs-0.6.5.tgz";
@@ -14714,8 +16199,8 @@
];
buildInputs =
(self.nativeDeps."qs" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "qs" ];
@@ -14723,7 +16208,8 @@
by-spec."qs"."0.6.6" =
self.by-version."qs"."0.6.6";
by-version."qs"."0.6.6" = lib.makeOverridable self.buildNodePackage {
- name = "node-qs-0.6.6";
+ name = "qs-0.6.6";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/qs/-/qs-0.6.6.tgz";
@@ -14733,37 +16219,79 @@
];
buildInputs =
(self.nativeDeps."qs" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "qs" ];
};
- by-spec."qs"."1.2.2" =
- self.by-version."qs"."1.2.2";
- by-version."qs"."1.2.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-qs-1.2.2";
+ by-spec."qs"."1.2.0" =
+ self.by-version."qs"."1.2.0";
+ by-version."qs"."1.2.0" = lib.makeOverridable self.buildNodePackage {
+ name = "qs-1.2.0";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/qs/-/qs-1.2.2.tgz";
- name = "qs-1.2.2.tgz";
- sha1 = "19b57ff24dc2a99ce1f8bdf6afcda59f8ef61f88";
+ url = "http://registry.npmjs.org/qs/-/qs-1.2.0.tgz";
+ name = "qs-1.2.0.tgz";
+ sha1 = "ed079be28682147e6fd9a34cc2b0c1e0ec6453ee";
})
];
buildInputs =
(self.nativeDeps."qs" or []);
- deps = [
+ deps = {
+ };
+ peerDependencies = [
];
+ passthru.names = [ "qs" ];
+ };
+ by-spec."qs"."2.2.2" =
+ self.by-version."qs"."2.2.2";
+ by-version."qs"."2.2.2" = lib.makeOverridable self.buildNodePackage {
+ name = "qs-2.2.2";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/qs/-/qs-2.2.2.tgz";
+ name = "qs-2.2.2.tgz";
+ sha1 = "dfe783f1854b1ac2b3ade92775ad03e27e03218c";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."qs" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "qs" ];
+ };
+ by-spec."qs"."2.2.4" =
+ self.by-version."qs"."2.2.4";
+ by-version."qs"."2.2.4" = lib.makeOverridable self.buildNodePackage {
+ name = "qs-2.2.4";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/qs/-/qs-2.2.4.tgz";
+ name = "qs-2.2.4.tgz";
+ sha1 = "2e9fbcd34b540e3421c924ecd01e90aa975319c8";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."qs" or []);
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "qs" ];
};
by-spec."qs".">= 0.4.0" =
- self.by-version."qs"."1.2.2";
+ self.by-version."qs"."2.2.4";
by-spec."qs"."~0.5.4" =
self.by-version."qs"."0.5.6";
by-version."qs"."0.5.6" = lib.makeOverridable self.buildNodePackage {
- name = "node-qs-0.5.6";
+ name = "qs-0.5.6";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/qs/-/qs-0.5.6.tgz";
@@ -14773,8 +16301,8 @@
];
buildInputs =
(self.nativeDeps."qs" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "qs" ];
@@ -14784,7 +16312,8 @@
by-spec."qs"."~1.0.0" =
self.by-version."qs"."1.0.2";
by-version."qs"."1.0.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-qs-1.0.2";
+ name = "qs-1.0.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/qs/-/qs-1.0.2.tgz";
@@ -14794,8 +16323,28 @@
];
buildInputs =
(self.nativeDeps."qs" or []);
- deps = [
+ deps = {
+ };
+ peerDependencies = [
];
+ passthru.names = [ "qs" ];
+ };
+ by-spec."qs"."~1.2.0" =
+ self.by-version."qs"."1.2.2";
+ by-version."qs"."1.2.2" = lib.makeOverridable self.buildNodePackage {
+ name = "qs-1.2.2";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/qs/-/qs-1.2.2.tgz";
+ name = "qs-1.2.2.tgz";
+ sha1 = "19b57ff24dc2a99ce1f8bdf6afcda59f8ef61f88";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."qs" or []);
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "qs" ];
@@ -14803,7 +16352,8 @@
by-spec."querystring-es3"."~0.2.0" =
self.by-version."querystring-es3"."0.2.1-0";
by-version."querystring-es3"."0.2.1-0" = lib.makeOverridable self.buildNodePackage {
- name = "node-querystring-es3-0.2.1-0";
+ name = "querystring-es3-0.2.1-0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1-0.tgz";
@@ -14813,8 +16363,8 @@
];
buildInputs =
(self.nativeDeps."querystring-es3" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "querystring-es3" ];
@@ -14822,7 +16372,8 @@
by-spec."rai"."~0.1.11" =
self.by-version."rai"."0.1.11";
by-version."rai"."0.1.11" = lib.makeOverridable self.buildNodePackage {
- name = "node-rai-0.1.11";
+ name = "rai-0.1.11";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/rai/-/rai-0.1.11.tgz";
@@ -14832,8 +16383,8 @@
];
buildInputs =
(self.nativeDeps."rai" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "rai" ];
@@ -14841,7 +16392,8 @@
by-spec."range-parser"."0.0.4" =
self.by-version."range-parser"."0.0.4";
by-version."range-parser"."0.0.4" = lib.makeOverridable self.buildNodePackage {
- name = "node-range-parser-0.0.4";
+ name = "range-parser-0.0.4";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/range-parser/-/range-parser-0.0.4.tgz";
@@ -14851,8 +16403,8 @@
];
buildInputs =
(self.nativeDeps."range-parser" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "range-parser" ];
@@ -14860,7 +16412,8 @@
by-spec."range-parser"."1.0.0" =
self.by-version."range-parser"."1.0.0";
by-version."range-parser"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-range-parser-1.0.0";
+ name = "range-parser-1.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/range-parser/-/range-parser-1.0.0.tgz";
@@ -14870,36 +16423,54 @@
];
buildInputs =
(self.nativeDeps."range-parser" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "range-parser" ];
};
by-spec."range-parser"."~1.0.0" =
- self.by-version."range-parser"."1.0.0";
- by-spec."raven"."~0.7.0" =
- self.by-version."raven"."0.7.0";
- by-version."raven"."0.7.0" = lib.makeOverridable self.buildNodePackage {
- name = "raven-0.7.0";
+ self.by-version."range-parser"."1.0.2";
+ by-version."range-parser"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+ name = "range-parser-1.0.2";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/raven/-/raven-0.7.0.tgz";
- name = "raven-0.7.0.tgz";
- sha1 = "ec7fea6c0b87c59b252a9491c93d5bcf8d0c7ba0";
+ url = "http://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz";
+ name = "range-parser-1.0.2.tgz";
+ sha1 = "06a12a42e5131ba8e457cd892044867f2344e549";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."range-parser" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "range-parser" ];
+ };
+ by-spec."range-parser"."~1.0.2" =
+ self.by-version."range-parser"."1.0.2";
+ by-spec."raven"."~0.7.0" =
+ self.by-version."raven"."0.7.2";
+ by-version."raven"."0.7.2" = lib.makeOverridable self.buildNodePackage {
+ name = "raven-0.7.2";
+ bin = true;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/raven/-/raven-0.7.2.tgz";
+ name = "raven-0.7.2.tgz";
+ sha1 = "51c1268e5d947e45c53fdb2e0a88b829c24a02a7";
})
];
buildInputs =
(self.nativeDeps."raven" or []);
- deps = [
- self.by-version."cookie"."0.1.0"
- self.by-version."lsmod"."0.0.3"
- self.by-version."node-uuid"."1.4.1"
- self.by-version."stack-trace"."0.0.7"
- self.by-version."connect"."3.1.1"
- self.by-version."express"."4.8.5"
- self.by-version."koa"."0.10.0"
- ];
+ deps = {
+ "cookie-0.1.0" = self.by-version."cookie"."0.1.0";
+ "lsmod-0.0.3" = self.by-version."lsmod"."0.0.3";
+ "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1";
+ "stack-trace-0.0.7" = self.by-version."stack-trace"."0.0.7";
+ };
peerDependencies = [
];
passthru.names = [ "raven" ];
@@ -14907,7 +16478,8 @@
by-spec."raw-body"."0.0.3" =
self.by-version."raw-body"."0.0.3";
by-version."raw-body"."0.0.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-raw-body-0.0.3";
+ name = "raw-body-0.0.3";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/raw-body/-/raw-body-0.0.3.tgz";
@@ -14917,8 +16489,8 @@
];
buildInputs =
(self.nativeDeps."raw-body" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "raw-body" ];
@@ -14926,7 +16498,8 @@
by-spec."raw-body"."1.1.2" =
self.by-version."raw-body"."1.1.2";
by-version."raw-body"."1.1.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-raw-body-1.1.2";
+ name = "raw-body-1.1.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/raw-body/-/raw-body-1.1.2.tgz";
@@ -14936,30 +16509,9 @@
];
buildInputs =
(self.nativeDeps."raw-body" or []);
- deps = [
- self.by-version."bytes"."0.2.1"
- ];
- peerDependencies = [
- ];
- passthru.names = [ "raw-body" ];
- };
- by-spec."raw-body"."1.2.2" =
- self.by-version."raw-body"."1.2.2";
- by-version."raw-body"."1.2.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-raw-body-1.2.2";
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/raw-body/-/raw-body-1.2.2.tgz";
- name = "raw-body-1.2.2.tgz";
- sha1 = "0c68e1ee28cfed7dba4822234aec6078461cbc1f";
- })
- ];
- buildInputs =
- (self.nativeDeps."raw-body" or []);
- deps = [
- self.by-version."bytes"."1.0.0"
- self.by-version."iconv-lite"."0.4.3"
- ];
+ deps = {
+ "bytes-0.2.1" = self.by-version."bytes"."0.2.1";
+ };
peerDependencies = [
];
passthru.names = [ "raw-body" ];
@@ -14967,7 +16519,8 @@
by-spec."raw-body"."1.3.0" =
self.by-version."raw-body"."1.3.0";
by-version."raw-body"."1.3.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-raw-body-1.3.0";
+ name = "raw-body-1.3.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/raw-body/-/raw-body-1.3.0.tgz";
@@ -14977,10 +16530,10 @@
];
buildInputs =
(self.nativeDeps."raw-body" or []);
- deps = [
- self.by-version."bytes"."1.0.0"
- self.by-version."iconv-lite"."0.4.4"
- ];
+ deps = {
+ "bytes-1.0.0" = self.by-version."bytes"."1.0.0";
+ "iconv-lite-0.4.4" = self.by-version."iconv-lite"."0.4.4";
+ };
peerDependencies = [
];
passthru.names = [ "raw-body" ];
@@ -14988,7 +16541,8 @@
by-spec."raw-socket"."*" =
self.by-version."raw-socket"."1.2.2";
by-version."raw-socket"."1.2.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-raw-socket-1.2.2";
+ name = "raw-socket-1.2.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/raw-socket/-/raw-socket-1.2.2.tgz";
@@ -14998,8 +16552,8 @@
];
buildInputs =
(self.nativeDeps."raw-socket" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "raw-socket" ];
@@ -15007,7 +16561,8 @@
by-spec."rbytes"."*" =
self.by-version."rbytes"."1.1.0";
by-version."rbytes"."1.1.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-rbytes-1.1.0";
+ name = "rbytes-1.1.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/rbytes/-/rbytes-1.1.0.tgz";
@@ -15017,8 +16572,8 @@
];
buildInputs =
(self.nativeDeps."rbytes" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "rbytes" ];
@@ -15028,6 +16583,7 @@
self.by-version."rc"."0.3.5";
by-version."rc"."0.3.5" = lib.makeOverridable self.buildNodePackage {
name = "rc-0.3.5";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/rc/-/rc-0.3.5.tgz";
@@ -15037,63 +16593,66 @@
];
buildInputs =
(self.nativeDeps."rc" or []);
- deps = [
- self.by-version."minimist"."0.0.10"
- self.by-version."deep-extend"."0.2.11"
- self.by-version."ini"."1.1.0"
- ];
+ deps = {
+ "minimist-0.0.10" = self.by-version."minimist"."0.0.10";
+ "deep-extend-0.2.11" = self.by-version."deep-extend"."0.2.11";
+ "ini-1.1.0" = self.by-version."ini"."1.1.0";
+ };
peerDependencies = [
];
passthru.names = [ "rc" ];
};
- by-spec."rc"."~0.4.0" =
- self.by-version."rc"."0.4.0";
- by-version."rc"."0.4.0" = lib.makeOverridable self.buildNodePackage {
- name = "rc-0.4.0";
+ by-spec."rc"."~0.5.0" =
+ self.by-version."rc"."0.5.1";
+ by-version."rc"."0.5.1" = lib.makeOverridable self.buildNodePackage {
+ name = "rc-0.5.1";
+ bin = true;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/rc/-/rc-0.4.0.tgz";
- name = "rc-0.4.0.tgz";
- sha1 = "ce24a2029ad94c3a40d09604a87227027d7210d3";
+ url = "http://registry.npmjs.org/rc/-/rc-0.5.1.tgz";
+ name = "rc-0.5.1.tgz";
+ sha1 = "b88ef9421a08151352a659e0c3a58c4b82eb7576";
})
];
buildInputs =
(self.nativeDeps."rc" or []);
- deps = [
- self.by-version."minimist"."0.0.10"
- self.by-version."deep-extend"."0.2.11"
- self.by-version."strip-json-comments"."0.1.3"
- self.by-version."ini"."1.1.0"
- ];
+ deps = {
+ "minimist-0.0.10" = self.by-version."minimist"."0.0.10";
+ "deep-extend-0.2.11" = self.by-version."deep-extend"."0.2.11";
+ "strip-json-comments-0.1.3" = self.by-version."strip-json-comments"."0.1.3";
+ "ini-1.1.0" = self.by-version."ini"."1.1.0";
+ };
peerDependencies = [
];
passthru.names = [ "rc" ];
};
by-spec."react"."*" =
- self.by-version."react"."0.11.1";
- by-version."react"."0.11.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-react-0.11.1";
+ self.by-version."react"."0.11.2";
+ by-version."react"."0.11.2" = lib.makeOverridable self.buildNodePackage {
+ name = "react-0.11.2";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/react/-/react-0.11.1.tgz";
- name = "react-0.11.1.tgz";
- sha1 = "201190712f69bc451e2c83946653384d7448aaff";
+ url = "http://registry.npmjs.org/react/-/react-0.11.2.tgz";
+ name = "react-0.11.2.tgz";
+ sha1 = "eaeb787e9b1e266a3540c07c06f4ea80fe1e3766";
})
];
buildInputs =
(self.nativeDeps."react" or []);
- deps = [
- self.by-version."envify"."2.0.1"
- ];
+ deps = {
+ "envify-2.0.1" = self.by-version."envify"."2.0.1";
+ };
peerDependencies = [
];
passthru.names = [ "react" ];
};
- "react" = self.by-version."react"."0.11.1";
+ "react" = self.by-version."react"."0.11.2";
by-spec."read"."1" =
self.by-version."read"."1.0.5";
by-version."read"."1.0.5" = lib.makeOverridable self.buildNodePackage {
- name = "node-read-1.0.5";
+ name = "read-1.0.5";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/read/-/read-1.0.5.tgz";
@@ -15103,9 +16662,9 @@
];
buildInputs =
(self.nativeDeps."read" or []);
- deps = [
- self.by-version."mute-stream"."0.0.4"
- ];
+ deps = {
+ "mute-stream-0.0.4" = self.by-version."mute-stream"."0.0.4";
+ };
peerDependencies = [
];
passthru.names = [ "read" ];
@@ -15116,60 +16675,66 @@
self.by-version."read"."1.0.5";
by-spec."read"."~1.0.4" =
self.by-version."read"."1.0.5";
- by-spec."read-installed"."~2.0.5" =
- self.by-version."read-installed"."2.0.7";
- by-version."read-installed"."2.0.7" = lib.makeOverridable self.buildNodePackage {
- name = "node-read-installed-2.0.7";
+ by-spec."read-installed"."~3.1.2" =
+ self.by-version."read-installed"."3.1.3";
+ by-version."read-installed"."3.1.3" = lib.makeOverridable self.buildNodePackage {
+ name = "read-installed-3.1.3";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/read-installed/-/read-installed-2.0.7.tgz";
- name = "read-installed-2.0.7.tgz";
- sha1 = "a82157a5e273576c57f230ecec3702ab215a6d6c";
+ url = "http://registry.npmjs.org/read-installed/-/read-installed-3.1.3.tgz";
+ name = "read-installed-3.1.3.tgz";
+ sha1 = "c09092a13c2117f22842cad16804f3b059129d11";
})
];
buildInputs =
(self.nativeDeps."read-installed" or []);
- deps = [
- self.by-version."read-package-json"."1.2.6"
- self.by-version."semver"."3.0.1"
- self.by-version."slide"."1.1.5"
- self.by-version."util-extend"."1.0.1"
- self.by-version."graceful-fs"."3.0.2"
- ];
+ deps = {
+ "debuglog-1.0.1" = self.by-version."debuglog"."1.0.1";
+ "read-package-json-1.2.7" = self.by-version."read-package-json"."1.2.7";
+ "readdir-scoped-modules-1.0.0" = self.by-version."readdir-scoped-modules"."1.0.0";
+ "semver-4.0.3" = self.by-version."semver"."4.0.3";
+ "slide-1.1.6" = self.by-version."slide"."1.1.6";
+ "util-extend-1.0.1" = self.by-version."util-extend"."1.0.1";
+ "graceful-fs-3.0.2" = self.by-version."graceful-fs"."3.0.2";
+ };
peerDependencies = [
];
passthru.names = [ "read-installed" ];
};
by-spec."read-package-json"."1" =
- self.by-version."read-package-json"."1.2.6";
- by-version."read-package-json"."1.2.6" = lib.makeOverridable self.buildNodePackage {
- name = "node-read-package-json-1.2.6";
+ self.by-version."read-package-json"."1.2.7";
+ by-version."read-package-json"."1.2.7" = lib.makeOverridable self.buildNodePackage {
+ name = "read-package-json-1.2.7";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.2.6.tgz";
- name = "read-package-json-1.2.6.tgz";
- sha1 = "eedcc11ba25a94f80e5941fdbccff4a21d8ab13a";
+ url = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.2.7.tgz";
+ name = "read-package-json-1.2.7.tgz";
+ sha1 = "f0b440c461a218f4dbf48b094e80fc65c5248502";
})
];
buildInputs =
(self.nativeDeps."read-package-json" or []);
- deps = [
- self.by-version."github-url-from-git"."1.3.0"
- self.by-version."glob"."4.0.5"
- self.by-version."lru-cache"."2.5.0"
- self.by-version."normalize-package-data"."1.0.0"
- self.by-version."graceful-fs"."3.0.2"
- ];
+ deps = {
+ "github-url-from-git-1.4.0" = self.by-version."github-url-from-git"."1.4.0";
+ "github-url-from-username-repo-1.0.2" = self.by-version."github-url-from-username-repo"."1.0.2";
+ "glob-4.0.6" = self.by-version."glob"."4.0.6";
+ "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0";
+ "normalize-package-data-1.0.3" = self.by-version."normalize-package-data"."1.0.3";
+ "graceful-fs-3.0.2" = self.by-version."graceful-fs"."3.0.2";
+ };
peerDependencies = [
];
passthru.names = [ "read-package-json" ];
};
- by-spec."read-package-json"."~1.2.3" =
- self.by-version."read-package-json"."1.2.6";
+ by-spec."read-package-json"."~1.2.7" =
+ self.by-version."read-package-json"."1.2.7";
by-spec."readable-stream"."*" =
self.by-version."readable-stream"."1.1.13";
by-version."readable-stream"."1.1.13" = lib.makeOverridable self.buildNodePackage {
- name = "node-readable-stream-1.1.13";
+ name = "readable-stream-1.1.13";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz";
@@ -15179,35 +16744,36 @@
];
buildInputs =
(self.nativeDeps."readable-stream" or []);
- deps = [
- self.by-version."core-util-is"."1.0.1"
- self.by-version."isarray"."0.0.1"
- self.by-version."string_decoder"."0.10.25"
- self.by-version."inherits"."2.0.1"
- ];
+ deps = {
+ "core-util-is-1.0.1" = self.by-version."core-util-is"."1.0.1";
+ "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
+ "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31";
+ "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+ };
peerDependencies = [
];
passthru.names = [ "readable-stream" ];
};
by-spec."readable-stream"."1.0" =
- self.by-version."readable-stream"."1.0.31";
- by-version."readable-stream"."1.0.31" = lib.makeOverridable self.buildNodePackage {
- name = "node-readable-stream-1.0.31";
+ self.by-version."readable-stream"."1.0.32";
+ by-version."readable-stream"."1.0.32" = lib.makeOverridable self.buildNodePackage {
+ name = "readable-stream-1.0.32";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.31.tgz";
- name = "readable-stream-1.0.31.tgz";
- sha1 = "8f2502e0bc9e3b0da1b94520aabb4e2603ecafae";
+ url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.32.tgz";
+ name = "readable-stream-1.0.32.tgz";
+ sha1 = "6b44a88ba984cd0ec0834ae7d59a47c39aef48ec";
})
];
buildInputs =
(self.nativeDeps."readable-stream" or []);
- deps = [
- self.by-version."core-util-is"."1.0.1"
- self.by-version."isarray"."0.0.1"
- self.by-version."string_decoder"."0.10.25"
- self.by-version."inherits"."2.0.1"
- ];
+ deps = {
+ "core-util-is-1.0.1" = self.by-version."core-util-is"."1.0.1";
+ "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
+ "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31";
+ "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+ };
peerDependencies = [
];
passthru.names = [ "readable-stream" ];
@@ -15215,7 +16781,8 @@
by-spec."readable-stream"."1.0.27-1" =
self.by-version."readable-stream"."1.0.27-1";
by-version."readable-stream"."1.0.27-1" = lib.makeOverridable self.buildNodePackage {
- name = "node-readable-stream-1.0.27-1";
+ name = "readable-stream-1.0.27-1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz";
@@ -15225,20 +16792,44 @@
];
buildInputs =
(self.nativeDeps."readable-stream" or []);
- deps = [
- self.by-version."core-util-is"."1.0.1"
- self.by-version."isarray"."0.0.1"
- self.by-version."string_decoder"."0.10.25"
- self.by-version."inherits"."2.0.1"
+ deps = {
+ "core-util-is-1.0.1" = self.by-version."core-util-is"."1.0.1";
+ "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
+ "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31";
+ "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+ };
+ peerDependencies = [
];
+ passthru.names = [ "readable-stream" ];
+ };
+ by-spec."readable-stream"."1.0.31" =
+ self.by-version."readable-stream"."1.0.31";
+ by-version."readable-stream"."1.0.31" = lib.makeOverridable self.buildNodePackage {
+ name = "readable-stream-1.0.31";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.31.tgz";
+ name = "readable-stream-1.0.31.tgz";
+ sha1 = "8f2502e0bc9e3b0da1b94520aabb4e2603ecafae";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."readable-stream" or []);
+ deps = {
+ "core-util-is-1.0.1" = self.by-version."core-util-is"."1.0.1";
+ "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
+ "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31";
+ "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+ };
peerDependencies = [
];
passthru.names = [ "readable-stream" ];
};
by-spec."readable-stream"."1.1" =
self.by-version."readable-stream"."1.1.13";
- by-spec."readable-stream".">=1.0.27-1 <1.1.0-0" =
- self.by-version."readable-stream"."1.0.31";
+ by-spec."readable-stream".">=1.0.28 <1.1.0-0" =
+ self.by-version."readable-stream"."1.0.32";
by-spec."readable-stream".">=1.1.13-1 <1.2.0-0" =
self.by-version."readable-stream"."1.1.13";
by-spec."readable-stream"."^1.0.27-1" =
@@ -15246,13 +16837,15 @@
by-spec."readable-stream"."^1.1.13-1" =
self.by-version."readable-stream"."1.1.13";
by-spec."readable-stream"."~1.0.17" =
- self.by-version."readable-stream"."1.0.31";
+ self.by-version."readable-stream"."1.0.32";
by-spec."readable-stream"."~1.0.2" =
- self.by-version."readable-stream"."1.0.31";
+ self.by-version."readable-stream"."1.0.32";
by-spec."readable-stream"."~1.0.24" =
- self.by-version."readable-stream"."1.0.31";
+ self.by-version."readable-stream"."1.0.32";
by-spec."readable-stream"."~1.0.26" =
- self.by-version."readable-stream"."1.0.31";
+ self.by-version."readable-stream"."1.0.32";
+ by-spec."readable-stream"."~1.0.32" =
+ self.by-version."readable-stream"."1.0.32";
by-spec."readable-stream"."~1.1.8" =
self.by-version."readable-stream"."1.1.13";
by-spec."readable-stream"."~1.1.9" =
@@ -15260,7 +16853,8 @@
by-spec."readable-wrap"."^1.0.0" =
self.by-version."readable-wrap"."1.0.0";
by-version."readable-wrap"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-readable-wrap-1.0.0";
+ name = "readable-wrap-1.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/readable-wrap/-/readable-wrap-1.0.0.tgz";
@@ -15270,17 +16864,41 @@
];
buildInputs =
(self.nativeDeps."readable-wrap" or []);
- deps = [
- self.by-version."readable-stream"."1.1.13"
- ];
+ deps = {
+ "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+ };
peerDependencies = [
];
passthru.names = [ "readable-wrap" ];
};
+ by-spec."readdir-scoped-modules"."^1.0.0" =
+ self.by-version."readdir-scoped-modules"."1.0.0";
+ by-version."readdir-scoped-modules"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+ name = "readdir-scoped-modules-1.0.0";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.0.0.tgz";
+ name = "readdir-scoped-modules-1.0.0.tgz";
+ sha1 = "e939de969b38b3e7dfaa14fbcfe7a2fd15a4ea37";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."readdir-scoped-modules" or []);
+ deps = {
+ "debuglog-1.0.1" = self.by-version."debuglog"."1.0.1";
+ "dezalgo-1.0.1" = self.by-version."dezalgo"."1.0.1";
+ "once-1.3.1" = self.by-version."once"."1.3.1";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "readdir-scoped-modules" ];
+ };
by-spec."readdirp"."~0.2.3" =
self.by-version."readdirp"."0.2.5";
by-version."readdirp"."0.2.5" = lib.makeOverridable self.buildNodePackage {
- name = "node-readdirp-0.2.5";
+ name = "readdirp-0.2.5";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/readdirp/-/readdirp-0.2.5.tgz";
@@ -15290,17 +16908,40 @@
];
buildInputs =
(self.nativeDeps."readdirp" or []);
- deps = [
- self.by-version."minimatch"."1.0.0"
- ];
+ deps = {
+ "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0";
+ };
peerDependencies = [
];
passthru.names = [ "readdirp" ];
};
+ by-spec."realize-package-specifier"."~1.1.0" =
+ self.by-version."realize-package-specifier"."1.1.0";
+ by-version."realize-package-specifier"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+ name = "realize-package-specifier-1.1.0";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/realize-package-specifier/-/realize-package-specifier-1.1.0.tgz";
+ name = "realize-package-specifier-1.1.0.tgz";
+ sha1 = "b6922638b7224186ae9278bdebbb63cba23a0160";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."realize-package-specifier" or []);
+ deps = {
+ "dezalgo-1.0.1" = self.by-version."dezalgo"."1.0.1";
+ "npm-package-arg-2.1.3" = self.by-version."npm-package-arg"."2.1.3";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "realize-package-specifier" ];
+ };
by-spec."recursive-readdir"."0.0.2" =
self.by-version."recursive-readdir"."0.0.2";
by-version."recursive-readdir"."0.0.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-recursive-readdir-0.0.2";
+ name = "recursive-readdir-0.0.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/recursive-readdir/-/recursive-readdir-0.0.2.tgz";
@@ -15310,8 +16951,8 @@
];
buildInputs =
(self.nativeDeps."recursive-readdir" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "recursive-readdir" ];
@@ -15319,7 +16960,8 @@
by-spec."redis"."*" =
self.by-version."redis"."0.12.1";
by-version."redis"."0.12.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-redis-0.12.1";
+ name = "redis-0.12.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/redis/-/redis-0.12.1.tgz";
@@ -15329,8 +16971,8 @@
];
buildInputs =
(self.nativeDeps."redis" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "redis" ];
@@ -15339,7 +16981,8 @@
by-spec."redis"."0.10.x" =
self.by-version."redis"."0.10.3";
by-version."redis"."0.10.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-redis-0.10.3";
+ name = "redis-0.10.3";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/redis/-/redis-0.10.3.tgz";
@@ -15349,8 +16992,8 @@
];
buildInputs =
(self.nativeDeps."redis" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "redis" ];
@@ -15358,7 +17001,8 @@
by-spec."redis"."0.7.2" =
self.by-version."redis"."0.7.2";
by-version."redis"."0.7.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-redis-0.7.2";
+ name = "redis-0.7.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/redis/-/redis-0.7.2.tgz";
@@ -15368,9 +17012,9 @@
];
buildInputs =
(self.nativeDeps."redis" or []);
- deps = [
- self.by-version."hiredis"."0.1.17"
- ];
+ deps = {
+ "hiredis-0.1.17" = self.by-version."hiredis"."0.1.17";
+ };
peerDependencies = [
];
passthru.names = [ "redis" ];
@@ -15378,7 +17022,8 @@
by-spec."redis"."0.7.3" =
self.by-version."redis"."0.7.3";
by-version."redis"."0.7.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-redis-0.7.3";
+ name = "redis-0.7.3";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/redis/-/redis-0.7.3.tgz";
@@ -15388,8 +17033,8 @@
];
buildInputs =
(self.nativeDeps."redis" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "redis" ];
@@ -15399,7 +17044,8 @@
by-spec."reds"."~0.2.4" =
self.by-version."reds"."0.2.4";
by-version."reds"."0.2.4" = lib.makeOverridable self.buildNodePackage {
- name = "node-reds-0.2.4";
+ name = "reds-0.2.4";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/reds/-/reds-0.2.4.tgz";
@@ -15409,10 +17055,10 @@
];
buildInputs =
(self.nativeDeps."reds" or []);
- deps = [
- self.by-version."natural"."0.1.17"
- self.by-version."redis"."0.7.2"
- ];
+ deps = {
+ "natural-0.1.17" = self.by-version."natural"."0.1.17";
+ "redis-0.7.2" = self.by-version."redis"."0.7.2";
+ };
peerDependencies = [
];
passthru.names = [ "reds" ];
@@ -15420,7 +17066,8 @@
by-spec."reduce-component"."1.0.1" =
self.by-version."reduce-component"."1.0.1";
by-version."reduce-component"."1.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-reduce-component-1.0.1";
+ name = "reduce-component-1.0.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/reduce-component/-/reduce-component-1.0.1.tgz";
@@ -15430,8 +17077,8 @@
];
buildInputs =
(self.nativeDeps."reduce-component" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "reduce-component" ];
@@ -15439,7 +17086,8 @@
by-spec."regexp-clone"."0.0.1" =
self.by-version."regexp-clone"."0.0.1";
by-version."regexp-clone"."0.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-regexp-clone-0.0.1";
+ name = "regexp-clone-0.0.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/regexp-clone/-/regexp-clone-0.0.1.tgz";
@@ -15449,74 +17097,79 @@
];
buildInputs =
(self.nativeDeps."regexp-clone" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "regexp-clone" ];
};
by-spec."replace"."~0.2.4" =
- self.by-version."replace"."0.2.9";
- by-version."replace"."0.2.9" = lib.makeOverridable self.buildNodePackage {
- name = "replace-0.2.9";
+ self.by-version."replace"."0.2.10";
+ by-version."replace"."0.2.10" = lib.makeOverridable self.buildNodePackage {
+ name = "replace-0.2.10";
+ bin = true;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/replace/-/replace-0.2.9.tgz";
- name = "replace-0.2.9.tgz";
- sha1 = "64428de4451717e8cc34965d2d133dd86dace404";
+ url = "http://registry.npmjs.org/replace/-/replace-0.2.10.tgz";
+ name = "replace-0.2.10.tgz";
+ sha1 = "1123397e995b3bfef9985fc63cddcf79a014fd64";
})
];
buildInputs =
(self.nativeDeps."replace" or []);
- deps = [
- self.by-version."nomnom"."1.6.2"
- self.by-version."colors"."0.5.1"
- self.by-version."minimatch"."0.2.14"
- ];
+ deps = {
+ "nomnom-1.6.2" = self.by-version."nomnom"."1.6.2";
+ "colors-0.5.1" = self.by-version."colors"."0.5.1";
+ "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14";
+ };
peerDependencies = [
];
passthru.names = [ "replace" ];
};
by-spec."request"."2" =
- self.by-version."request"."2.40.0";
- by-version."request"."2.40.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-request-2.40.0";
+ self.by-version."request"."2.44.0";
+ by-version."request"."2.44.0" = lib.makeOverridable self.buildNodePackage {
+ name = "request-2.44.0";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/request/-/request-2.40.0.tgz";
- name = "request-2.40.0.tgz";
- sha1 = "4dd670f696f1e6e842e66b4b5e839301ab9beb67";
+ url = "http://registry.npmjs.org/request/-/request-2.44.0.tgz";
+ name = "request-2.44.0.tgz";
+ sha1 = "78d62454d68853cadfb07ad31f58b9ec98072ea8";
})
];
buildInputs =
(self.nativeDeps."request" or []);
- deps = [
- self.by-version."qs"."1.0.2"
- self.by-version."json-stringify-safe"."5.0.0"
- self.by-version."mime-types"."1.0.2"
- self.by-version."forever-agent"."0.5.2"
- self.by-version."node-uuid"."1.4.1"
- self.by-version."tough-cookie"."0.12.1"
- self.by-version."form-data"."0.1.4"
- self.by-version."tunnel-agent"."0.4.0"
- self.by-version."http-signature"."0.10.0"
- self.by-version."oauth-sign"."0.3.0"
- self.by-version."hawk"."1.1.1"
- self.by-version."aws-sign2"."0.5.0"
- self.by-version."stringstream"."0.0.4"
- ];
+ deps = {
+ "bl-0.9.3" = self.by-version."bl"."0.9.3";
+ "caseless-0.6.0" = self.by-version."caseless"."0.6.0";
+ "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
+ "qs-1.2.2" = self.by-version."qs"."1.2.2";
+ "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0";
+ "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2";
+ "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1";
+ "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0";
+ "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1";
+ "form-data-0.1.4" = self.by-version."form-data"."0.1.4";
+ "http-signature-0.10.0" = self.by-version."http-signature"."0.10.0";
+ "oauth-sign-0.4.0" = self.by-version."oauth-sign"."0.4.0";
+ "hawk-1.1.1" = self.by-version."hawk"."1.1.1";
+ "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
+ "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4";
+ };
peerDependencies = [
];
passthru.names = [ "request" ];
};
by-spec."request"."2 >=2.20.0" =
- self.by-version."request"."2.40.0";
+ self.by-version."request"."2.44.0";
by-spec."request"."2 >=2.25.0" =
- self.by-version."request"."2.40.0";
+ self.by-version."request"."2.44.0";
by-spec."request"."2.16.x" =
self.by-version."request"."2.16.6";
by-version."request"."2.16.6" = lib.makeOverridable self.buildNodePackage {
- name = "node-request-2.16.6";
+ name = "request-2.16.6";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/request/-/request-2.16.6.tgz";
@@ -15526,50 +17179,87 @@
];
buildInputs =
(self.nativeDeps."request" or []);
- deps = [
- self.by-version."form-data"."0.0.10"
- self.by-version."mime"."1.2.11"
- self.by-version."hawk"."0.10.2"
- self.by-version."node-uuid"."1.4.1"
- self.by-version."cookie-jar"."0.2.0"
- self.by-version."aws-sign"."0.2.0"
- self.by-version."oauth-sign"."0.2.0"
- self.by-version."forever-agent"."0.2.0"
- self.by-version."tunnel-agent"."0.2.0"
- self.by-version."json-stringify-safe"."3.0.0"
- self.by-version."qs"."0.5.6"
- ];
+ deps = {
+ "form-data-0.0.10" = self.by-version."form-data"."0.0.10";
+ "mime-1.2.11" = self.by-version."mime"."1.2.11";
+ "hawk-0.10.2" = self.by-version."hawk"."0.10.2";
+ "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1";
+ "cookie-jar-0.2.0" = self.by-version."cookie-jar"."0.2.0";
+ "aws-sign-0.2.0" = self.by-version."aws-sign"."0.2.0";
+ "oauth-sign-0.2.0" = self.by-version."oauth-sign"."0.2.0";
+ "forever-agent-0.2.0" = self.by-version."forever-agent"."0.2.0";
+ "tunnel-agent-0.2.0" = self.by-version."tunnel-agent"."0.2.0";
+ "json-stringify-safe-3.0.0" = self.by-version."json-stringify-safe"."3.0.0";
+ "qs-0.5.6" = self.by-version."qs"."0.5.6";
+ };
peerDependencies = [
];
passthru.names = [ "request" ];
};
- by-spec."request"."2.36.0" =
- self.by-version."request"."2.36.0";
- by-version."request"."2.36.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-request-2.36.0";
+ by-spec."request"."2.40.0" =
+ self.by-version."request"."2.40.0";
+ by-version."request"."2.40.0" = lib.makeOverridable self.buildNodePackage {
+ name = "request-2.40.0";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/request/-/request-2.36.0.tgz";
- name = "request-2.36.0.tgz";
- sha1 = "28c6c04262c7b9ffdd21b9255374517ee6d943f5";
+ url = "http://registry.npmjs.org/request/-/request-2.40.0.tgz";
+ name = "request-2.40.0.tgz";
+ sha1 = "4dd670f696f1e6e842e66b4b5e839301ab9beb67";
})
];
buildInputs =
(self.nativeDeps."request" or []);
- deps = [
- self.by-version."qs"."0.6.6"
- self.by-version."json-stringify-safe"."5.0.0"
- self.by-version."mime"."1.2.11"
- self.by-version."forever-agent"."0.5.2"
- self.by-version."node-uuid"."1.4.1"
- self.by-version."tough-cookie"."0.12.1"
- self.by-version."form-data"."0.1.4"
- self.by-version."tunnel-agent"."0.4.0"
- self.by-version."http-signature"."0.10.0"
- self.by-version."oauth-sign"."0.3.0"
- self.by-version."hawk"."1.0.0"
- self.by-version."aws-sign2"."0.5.0"
+ deps = {
+ "qs-1.0.2" = self.by-version."qs"."1.0.2";
+ "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0";
+ "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2";
+ "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
+ "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1";
+ "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1";
+ "form-data-0.1.4" = self.by-version."form-data"."0.1.4";
+ "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0";
+ "http-signature-0.10.0" = self.by-version."http-signature"."0.10.0";
+ "oauth-sign-0.3.0" = self.by-version."oauth-sign"."0.3.0";
+ "hawk-1.1.1" = self.by-version."hawk"."1.1.1";
+ "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
+ "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4";
+ };
+ peerDependencies = [
];
+ passthru.names = [ "request" ];
+ };
+ by-spec."request"."2.42.0" =
+ self.by-version."request"."2.42.0";
+ by-version."request"."2.42.0" = lib.makeOverridable self.buildNodePackage {
+ name = "request-2.42.0";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/request/-/request-2.42.0.tgz";
+ name = "request-2.42.0.tgz";
+ sha1 = "572bd0148938564040ac7ab148b96423a063304a";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."request" or []);
+ deps = {
+ "bl-0.9.3" = self.by-version."bl"."0.9.3";
+ "caseless-0.6.0" = self.by-version."caseless"."0.6.0";
+ "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
+ "qs-1.2.2" = self.by-version."qs"."1.2.2";
+ "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0";
+ "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2";
+ "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1";
+ "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0";
+ "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1";
+ "form-data-0.1.4" = self.by-version."form-data"."0.1.4";
+ "http-signature-0.10.0" = self.by-version."http-signature"."0.10.0";
+ "oauth-sign-0.4.0" = self.by-version."oauth-sign"."0.4.0";
+ "hawk-1.1.1" = self.by-version."hawk"."1.1.1";
+ "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
+ "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4";
+ };
peerDependencies = [
];
passthru.names = [ "request" ];
@@ -15577,7 +17267,8 @@
by-spec."request"."2.9.x" =
self.by-version."request"."2.9.203";
by-version."request"."2.9.203" = lib.makeOverridable self.buildNodePackage {
- name = "node-request-2.9.203";
+ name = "request-2.9.203";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/request/-/request-2.9.203.tgz";
@@ -15587,20 +17278,21 @@
];
buildInputs =
(self.nativeDeps."request" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "request" ];
};
by-spec."request"."^2.36.0" =
- self.by-version."request"."2.40.0";
+ self.by-version."request"."2.44.0";
by-spec."request"."~2" =
- self.by-version."request"."2.40.0";
+ self.by-version."request"."2.44.0";
by-spec."request"."~2.27.0" =
self.by-version."request"."2.27.0";
by-version."request"."2.27.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-request-2.27.0";
+ name = "request-2.27.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/request/-/request-2.27.0.tgz";
@@ -15610,121 +17302,35 @@
];
buildInputs =
(self.nativeDeps."request" or []);
- deps = [
- self.by-version."qs"."0.6.6"
- self.by-version."json-stringify-safe"."5.0.0"
- self.by-version."forever-agent"."0.5.2"
- self.by-version."tunnel-agent"."0.3.0"
- self.by-version."http-signature"."0.10.0"
- self.by-version."hawk"."1.0.0"
- self.by-version."aws-sign"."0.3.0"
- self.by-version."oauth-sign"."0.3.0"
- self.by-version."cookie-jar"."0.3.0"
- self.by-version."node-uuid"."1.4.1"
- self.by-version."mime"."1.2.11"
- self.by-version."form-data"."0.1.4"
- ];
+ deps = {
+ "qs-0.6.6" = self.by-version."qs"."0.6.6";
+ "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0";
+ "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
+ "tunnel-agent-0.3.0" = self.by-version."tunnel-agent"."0.3.0";
+ "http-signature-0.10.0" = self.by-version."http-signature"."0.10.0";
+ "hawk-1.0.0" = self.by-version."hawk"."1.0.0";
+ "aws-sign-0.3.0" = self.by-version."aws-sign"."0.3.0";
+ "oauth-sign-0.3.0" = self.by-version."oauth-sign"."0.3.0";
+ "cookie-jar-0.3.0" = self.by-version."cookie-jar"."0.3.0";
+ "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1";
+ "mime-1.2.11" = self.by-version."mime"."1.2.11";
+ "form-data-0.1.4" = self.by-version."form-data"."0.1.4";
+ };
peerDependencies = [
];
passthru.names = [ "request" ];
};
- by-spec."request"."~2.30.0" =
- self.by-version."request"."2.30.0";
- by-version."request"."2.30.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-request-2.30.0";
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/request/-/request-2.30.0.tgz";
- name = "request-2.30.0.tgz";
- sha1 = "8e0d36f0806e8911524b072b64c5ee535a09d861";
- })
- ];
- buildInputs =
- (self.nativeDeps."request" or []);
- deps = [
- self.by-version."qs"."0.6.6"
- self.by-version."json-stringify-safe"."5.0.0"
- self.by-version."forever-agent"."0.5.2"
- self.by-version."node-uuid"."1.4.1"
- self.by-version."mime"."1.2.11"
- self.by-version."tough-cookie"."0.9.15"
- self.by-version."form-data"."0.1.4"
- self.by-version."tunnel-agent"."0.3.0"
- self.by-version."http-signature"."0.10.0"
- self.by-version."oauth-sign"."0.3.0"
- self.by-version."hawk"."1.0.0"
- self.by-version."aws-sign2"."0.5.0"
- ];
- peerDependencies = [
- ];
- passthru.names = [ "request" ];
- };
- by-spec."request"."~2.34.0" =
- self.by-version."request"."2.34.0";
- by-version."request"."2.34.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-request-2.34.0";
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/request/-/request-2.34.0.tgz";
- name = "request-2.34.0.tgz";
- sha1 = "b5d8b9526add4a2d4629f4d417124573996445ae";
- })
- ];
- buildInputs =
- (self.nativeDeps."request" or []);
- deps = [
- self.by-version."qs"."0.6.6"
- self.by-version."json-stringify-safe"."5.0.0"
- self.by-version."forever-agent"."0.5.2"
- self.by-version."node-uuid"."1.4.1"
- self.by-version."mime"."1.2.11"
- self.by-version."tough-cookie"."0.12.1"
- self.by-version."form-data"."0.1.4"
- self.by-version."tunnel-agent"."0.3.0"
- self.by-version."http-signature"."0.10.0"
- self.by-version."oauth-sign"."0.3.0"
- self.by-version."hawk"."1.0.0"
- self.by-version."aws-sign2"."0.5.0"
- ];
- peerDependencies = [
- ];
- passthru.names = [ "request" ];
- };
- by-spec."request"."~2.37.0" =
- self.by-version."request"."2.37.0";
- by-version."request"."2.37.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-request-2.37.0";
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/request/-/request-2.37.0.tgz";
- name = "request-2.37.0.tgz";
- sha1 = "6c04c1f0f34af0c8b7408f1c1e30d4d6bd852d46";
- })
- ];
- buildInputs =
- (self.nativeDeps."request" or []);
- deps = [
- self.by-version."qs"."0.6.6"
- self.by-version."json-stringify-safe"."5.0.0"
- self.by-version."mime-types"."1.0.2"
- self.by-version."forever-agent"."0.5.2"
- self.by-version."node-uuid"."1.4.1"
- self.by-version."tough-cookie"."0.12.1"
- self.by-version."form-data"."0.1.4"
- self.by-version."tunnel-agent"."0.4.0"
- self.by-version."http-signature"."0.10.0"
- self.by-version."oauth-sign"."0.3.0"
- self.by-version."hawk"."1.1.1"
- self.by-version."aws-sign2"."0.5.0"
- ];
- peerDependencies = [
- ];
- passthru.names = [ "request" ];
- };
- by-spec."request-progress"."^0.3.1" =
+ by-spec."request"."~2.40.0" =
+ self.by-version."request"."2.40.0";
+ by-spec."request"."~2.42.0" =
+ self.by-version."request"."2.42.0";
+ by-spec."request"."~2.44.0" =
+ self.by-version."request"."2.44.0";
+ by-spec."request-progress"."0.3.1" =
self.by-version."request-progress"."0.3.1";
by-version."request-progress"."0.3.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-request-progress-0.3.1";
+ name = "request-progress-0.3.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/request-progress/-/request-progress-0.3.1.tgz";
@@ -15734,38 +17340,40 @@
];
buildInputs =
(self.nativeDeps."request-progress" or []);
- deps = [
- self.by-version."throttleit"."0.0.2"
- ];
+ deps = {
+ "throttleit-0.0.2" = self.by-version."throttleit"."0.0.2";
+ };
peerDependencies = [
];
passthru.names = [ "request-progress" ];
};
by-spec."requirejs"."~2.1" =
- self.by-version."requirejs"."2.1.14";
- by-version."requirejs"."2.1.14" = lib.makeOverridable self.buildNodePackage {
- name = "requirejs-2.1.14";
+ self.by-version."requirejs"."2.1.15";
+ by-version."requirejs"."2.1.15" = lib.makeOverridable self.buildNodePackage {
+ name = "requirejs-2.1.15";
+ bin = true;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/requirejs/-/requirejs-2.1.14.tgz";
- name = "requirejs-2.1.14.tgz";
- sha1 = "de00290aa526192ff8df4dc0ba9370ce399a76b0";
+ url = "http://registry.npmjs.org/requirejs/-/requirejs-2.1.15.tgz";
+ name = "requirejs-2.1.15.tgz";
+ sha1 = "cbcfce55d584ae5983c00a20daa8eade37d18892";
})
];
buildInputs =
(self.nativeDeps."requirejs" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "requirejs" ];
};
by-spec."requirejs"."~2.1.0" =
- self.by-version."requirejs"."2.1.14";
+ self.by-version."requirejs"."2.1.15";
by-spec."resolve"."0.7.4" =
self.by-version."resolve"."0.7.4";
by-version."resolve"."0.7.4" = lib.makeOverridable self.buildNodePackage {
- name = "node-resolve-0.7.4";
+ name = "resolve-0.7.4";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/resolve/-/resolve-0.7.4.tgz";
@@ -15775,8 +17383,8 @@
];
buildInputs =
(self.nativeDeps."resolve" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "resolve" ];
@@ -15786,7 +17394,8 @@
by-spec."resolve"."~0.3.0" =
self.by-version."resolve"."0.3.1";
by-version."resolve"."0.3.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-resolve-0.3.1";
+ name = "resolve-0.3.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/resolve/-/resolve-0.3.1.tgz";
@@ -15796,14 +17405,16 @@
];
buildInputs =
(self.nativeDeps."resolve" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "resolve" ];
};
by-spec."resolve"."~0.3.1" =
self.by-version."resolve"."0.3.1";
+ by-spec."resolve"."~0.7.0" =
+ self.by-version."resolve"."0.7.4";
by-spec."resolve"."~0.7.1" =
self.by-version."resolve"."0.7.4";
by-spec."resolve"."~0.7.2" =
@@ -15811,7 +17422,8 @@
by-spec."response-time"."~2.0.1" =
self.by-version."response-time"."2.0.1";
by-version."response-time"."2.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-response-time-2.0.1";
+ name = "response-time-2.0.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/response-time/-/response-time-2.0.1.tgz";
@@ -15821,9 +17433,9 @@
];
buildInputs =
(self.nativeDeps."response-time" or []);
- deps = [
- self.by-version."on-headers"."1.0.0"
- ];
+ deps = {
+ "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0";
+ };
peerDependencies = [
];
passthru.names = [ "response-time" ];
@@ -15832,6 +17444,7 @@
self.by-version."restify"."2.4.1";
by-version."restify"."2.4.1" = lib.makeOverridable self.buildNodePackage {
name = "restify-2.4.1";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/restify/-/restify-2.4.1.tgz";
@@ -15841,54 +17454,56 @@
];
buildInputs =
(self.nativeDeps."restify" or []);
- deps = [
- self.by-version."assert-plus"."0.1.2"
- self.by-version."backoff"."2.1.0"
- self.by-version."bunyan"."0.21.1"
- self.by-version."deep-equal"."0.0.0"
- self.by-version."formidable"."1.0.13"
- self.by-version."http-signature"."0.9.11"
- self.by-version."keep-alive-agent"."0.0.1"
- self.by-version."lru-cache"."2.3.0"
- self.by-version."mime"."1.2.9"
- self.by-version."negotiator"."0.2.5"
- self.by-version."node-uuid"."1.4.0"
- self.by-version."once"."1.1.1"
- self.by-version."qs"."0.5.5"
- self.by-version."semver"."1.1.4"
- self.by-version."spdy"."1.7.1"
- self.by-version."verror"."1.3.6"
- self.by-version."dtrace-provider"."0.2.8"
- ];
+ deps = {
+ "assert-plus-0.1.2" = self.by-version."assert-plus"."0.1.2";
+ "backoff-2.1.0" = self.by-version."backoff"."2.1.0";
+ "bunyan-0.21.1" = self.by-version."bunyan"."0.21.1";
+ "deep-equal-0.0.0" = self.by-version."deep-equal"."0.0.0";
+ "formidable-1.0.13" = self.by-version."formidable"."1.0.13";
+ "http-signature-0.9.11" = self.by-version."http-signature"."0.9.11";
+ "keep-alive-agent-0.0.1" = self.by-version."keep-alive-agent"."0.0.1";
+ "lru-cache-2.3.0" = self.by-version."lru-cache"."2.3.0";
+ "mime-1.2.9" = self.by-version."mime"."1.2.9";
+ "negotiator-0.2.5" = self.by-version."negotiator"."0.2.5";
+ "node-uuid-1.4.0" = self.by-version."node-uuid"."1.4.0";
+ "once-1.1.1" = self.by-version."once"."1.1.1";
+ "qs-0.5.5" = self.by-version."qs"."0.5.5";
+ "semver-1.1.4" = self.by-version."semver"."1.1.4";
+ "spdy-1.7.1" = self.by-version."spdy"."1.7.1";
+ "verror-1.3.6" = self.by-version."verror"."1.3.6";
+ "dtrace-provider-0.2.8" = self.by-version."dtrace-provider"."0.2.8";
+ };
peerDependencies = [
];
passthru.names = [ "restify" ];
};
by-spec."rethinkdb"."*" =
- self.by-version."rethinkdb"."1.13.0-3";
- by-version."rethinkdb"."1.13.0-3" = lib.makeOverridable self.buildNodePackage {
- name = "node-rethinkdb-1.13.0-3";
+ self.by-version."rethinkdb"."1.15.0-0";
+ by-version."rethinkdb"."1.15.0-0" = lib.makeOverridable self.buildNodePackage {
+ name = "rethinkdb-1.15.0-0";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/rethinkdb/-/rethinkdb-1.13.0-3.tgz";
- name = "rethinkdb-1.13.0-3.tgz";
- sha1 = "67db23e23ac3ff40fd4738414fc14d1935e6009e";
+ url = "http://registry.npmjs.org/rethinkdb/-/rethinkdb-1.15.0-0.tgz";
+ name = "rethinkdb-1.15.0-0.tgz";
+ sha1 = "7b2efb0d3f51a66ab661dfdf43905de77dfb5a94";
})
];
buildInputs =
(self.nativeDeps."rethinkdb" or []);
- deps = [
- self.by-version."bluebird"."2.3.0"
- ];
+ deps = {
+ "bluebird-2.3.4" = self.by-version."bluebird"."2.3.4";
+ };
peerDependencies = [
];
passthru.names = [ "rethinkdb" ];
};
- "rethinkdb" = self.by-version."rethinkdb"."1.13.0-3";
+ "rethinkdb" = self.by-version."rethinkdb"."1.15.0-0";
by-spec."retry"."0.6.0" =
self.by-version."retry"."0.6.0";
by-version."retry"."0.6.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-retry-0.6.0";
+ name = "retry-0.6.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/retry/-/retry-0.6.0.tgz";
@@ -15898,8 +17513,8 @@
];
buildInputs =
(self.nativeDeps."retry" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "retry" ];
@@ -15907,7 +17522,8 @@
by-spec."retry"."~0.6.0" =
self.by-version."retry"."0.6.1";
by-version."retry"."0.6.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-retry-0.6.1";
+ name = "retry-0.6.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/retry/-/retry-0.6.1.tgz";
@@ -15917,8 +17533,8 @@
];
buildInputs =
(self.nativeDeps."retry" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "retry" ];
@@ -15926,7 +17542,8 @@
by-spec."revalidator"."0.1.x" =
self.by-version."revalidator"."0.1.8";
by-version."revalidator"."0.1.8" = lib.makeOverridable self.buildNodePackage {
- name = "node-revalidator-0.1.8";
+ name = "revalidator-0.1.8";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz";
@@ -15936,8 +17553,8 @@
];
buildInputs =
(self.nativeDeps."revalidator" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "revalidator" ];
@@ -15945,7 +17562,8 @@
by-spec."rfile"."~1.0" =
self.by-version."rfile"."1.0.0";
by-version."rfile"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-rfile-1.0.0";
+ name = "rfile-1.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/rfile/-/rfile-1.0.0.tgz";
@@ -15955,10 +17573,10 @@
];
buildInputs =
(self.nativeDeps."rfile" or []);
- deps = [
- self.by-version."callsite"."1.0.0"
- self.by-version."resolve"."0.3.1"
- ];
+ deps = {
+ "callsite-1.0.0" = self.by-version."callsite"."1.0.0";
+ "resolve-0.3.1" = self.by-version."resolve"."0.3.1";
+ };
peerDependencies = [
];
passthru.names = [ "rfile" ];
@@ -15968,7 +17586,8 @@
by-spec."rimraf"."1.x.x" =
self.by-version."rimraf"."1.0.9";
by-version."rimraf"."1.0.9" = lib.makeOverridable self.buildNodePackage {
- name = "node-rimraf-1.0.9";
+ name = "rimraf-1.0.9";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/rimraf/-/rimraf-1.0.9.tgz";
@@ -15978,8 +17597,8 @@
];
buildInputs =
(self.nativeDeps."rimraf" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "rimraf" ];
@@ -15988,6 +17607,7 @@
self.by-version."rimraf"."2.2.8";
by-version."rimraf"."2.2.8" = lib.makeOverridable self.buildNodePackage {
name = "rimraf-2.2.8";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz";
@@ -15997,8 +17617,28 @@
];
buildInputs =
(self.nativeDeps."rimraf" or []);
- deps = [
+ deps = {
+ };
+ peerDependencies = [
];
+ passthru.names = [ "rimraf" ];
+ };
+ by-spec."rimraf"."2.2.6" =
+ self.by-version."rimraf"."2.2.6";
+ by-version."rimraf"."2.2.6" = lib.makeOverridable self.buildNodePackage {
+ name = "rimraf-2.2.6";
+ bin = true;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.6.tgz";
+ name = "rimraf-2.2.6.tgz";
+ sha1 = "c59597569b14d956ad29cacc42bdddf5f0ea4f4c";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."rimraf" or []);
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "rimraf" ];
@@ -16012,7 +17652,8 @@
by-spec."rimraf"."~2.1.4" =
self.by-version."rimraf"."2.1.4";
by-version."rimraf"."2.1.4" = lib.makeOverridable self.buildNodePackage {
- name = "node-rimraf-2.1.4";
+ name = "rimraf-2.1.4";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/rimraf/-/rimraf-2.1.4.tgz";
@@ -16022,9 +17663,9 @@
];
buildInputs =
(self.nativeDeps."rimraf" or []);
- deps = [
- self.by-version."graceful-fs"."1.2.3"
- ];
+ deps = {
+ "graceful-fs-1.2.3" = self.by-version."graceful-fs"."1.2.3";
+ };
peerDependencies = [
];
passthru.names = [ "rimraf" ];
@@ -16042,7 +17683,8 @@
by-spec."ripemd160"."0.2.0" =
self.by-version."ripemd160"."0.2.0";
by-version."ripemd160"."0.2.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-ripemd160-0.2.0";
+ name = "ripemd160-0.2.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/ripemd160/-/ripemd160-0.2.0.tgz";
@@ -16052,16 +17694,17 @@
];
buildInputs =
(self.nativeDeps."ripemd160" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "ripemd160" ];
};
- by-spec."rndm"."1" =
+ by-spec."rndm"."~1.0.0" =
self.by-version."rndm"."1.0.0";
by-version."rndm"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-rndm-1.0.0";
+ name = "rndm-1.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/rndm/-/rndm-1.0.0.tgz";
@@ -16071,8 +17714,8 @@
];
buildInputs =
(self.nativeDeps."rndm" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "rndm" ];
@@ -16080,7 +17723,8 @@
by-spec."ruglify"."~1.0.0" =
self.by-version."ruglify"."1.0.0";
by-version."ruglify"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-ruglify-1.0.0";
+ name = "ruglify-1.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/ruglify/-/ruglify-1.0.0.tgz";
@@ -16090,10 +17734,10 @@
];
buildInputs =
(self.nativeDeps."ruglify" or []);
- deps = [
- self.by-version."rfile"."1.0.0"
- self.by-version."uglify-js"."2.2.5"
- ];
+ deps = {
+ "rfile-1.0.0" = self.by-version."rfile"."1.0.0";
+ "uglify-js-2.2.5" = self.by-version."uglify-js"."2.2.5";
+ };
peerDependencies = [
];
passthru.names = [ "ruglify" ];
@@ -16102,6 +17746,7 @@
self.by-version."s3http"."0.0.5";
by-version."s3http"."0.0.5" = lib.makeOverridable self.buildNodePackage {
name = "s3http-0.0.5";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/s3http/-/s3http-0.0.5.tgz";
@@ -16111,16 +17756,16 @@
];
buildInputs =
(self.nativeDeps."s3http" or []);
- deps = [
- self.by-version."aws-sdk"."1.18.0"
- self.by-version."commander"."2.0.0"
- self.by-version."http-auth"."2.0.7"
- self.by-version."express"."3.4.4"
- self.by-version."everyauth"."0.4.5"
- self.by-version."string"."1.6.1"
- self.by-version."util"."0.4.9"
- self.by-version."crypto"."0.0.3"
- ];
+ deps = {
+ "aws-sdk-1.18.0" = self.by-version."aws-sdk"."1.18.0";
+ "commander-2.0.0" = self.by-version."commander"."2.0.0";
+ "http-auth-2.0.7" = self.by-version."http-auth"."2.0.7";
+ "express-3.4.4" = self.by-version."express"."3.4.4";
+ "everyauth-0.4.5" = self.by-version."everyauth"."0.4.5";
+ "string-1.6.1" = self.by-version."string"."1.6.1";
+ "util-0.4.9" = self.by-version."util"."0.4.9";
+ "crypto-0.0.3" = self.by-version."crypto"."0.0.3";
+ };
peerDependencies = [
];
passthru.names = [ "s3http" ];
@@ -16129,7 +17774,8 @@
by-spec."samsam"."~1.1" =
self.by-version."samsam"."1.1.1";
by-version."samsam"."1.1.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-samsam-1.1.1";
+ name = "samsam-1.1.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/samsam/-/samsam-1.1.1.tgz";
@@ -16139,8 +17785,8 @@
];
buildInputs =
(self.nativeDeps."samsam" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "samsam" ];
@@ -16148,7 +17794,8 @@
by-spec."sauce-connect-launcher"."~0.6.0" =
self.by-version."sauce-connect-launcher"."0.6.1";
by-version."sauce-connect-launcher"."0.6.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-sauce-connect-launcher-0.6.1";
+ name = "sauce-connect-launcher-0.6.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/sauce-connect-launcher/-/sauce-connect-launcher-0.6.1.tgz";
@@ -16158,12 +17805,12 @@
];
buildInputs =
(self.nativeDeps."sauce-connect-launcher" or []);
- deps = [
- self.by-version."lodash"."2.4.1"
- self.by-version."async"."0.9.0"
- self.by-version."adm-zip"."0.4.4"
- self.by-version."rimraf"."2.2.8"
- ];
+ deps = {
+ "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
+ "async-0.9.0" = self.by-version."async"."0.9.0";
+ "adm-zip-0.4.4" = self.by-version."adm-zip"."0.4.4";
+ "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
+ };
peerDependencies = [
];
passthru.names = [ "sauce-connect-launcher" ];
@@ -16171,7 +17818,8 @@
by-spec."saucelabs"."~0.1.0" =
self.by-version."saucelabs"."0.1.1";
by-version."saucelabs"."0.1.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-saucelabs-0.1.1";
+ name = "saucelabs-0.1.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/saucelabs/-/saucelabs-0.1.1.tgz";
@@ -16181,8 +17829,8 @@
];
buildInputs =
(self.nativeDeps."saucelabs" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "saucelabs" ];
@@ -16190,7 +17838,8 @@
by-spec."sax"."0.4.2" =
self.by-version."sax"."0.4.2";
by-version."sax"."0.4.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-sax-0.4.2";
+ name = "sax-0.4.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/sax/-/sax-0.4.2.tgz";
@@ -16200,8 +17849,8 @@
];
buildInputs =
(self.nativeDeps."sax" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "sax" ];
@@ -16209,7 +17858,8 @@
by-spec."sax"."0.5.x" =
self.by-version."sax"."0.5.8";
by-version."sax"."0.5.8" = lib.makeOverridable self.buildNodePackage {
- name = "node-sax-0.5.8";
+ name = "sax-0.5.8";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/sax/-/sax-0.5.8.tgz";
@@ -16219,8 +17869,8 @@
];
buildInputs =
(self.nativeDeps."sax" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "sax" ];
@@ -16228,7 +17878,8 @@
by-spec."sax"."0.6.x" =
self.by-version."sax"."0.6.0";
by-version."sax"."0.6.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-sax-0.6.0";
+ name = "sax-0.6.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/sax/-/sax-0.6.0.tgz";
@@ -16238,18 +17889,19 @@
];
buildInputs =
(self.nativeDeps."sax" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "sax" ];
};
by-spec."sax".">=0.4.2" =
self.by-version."sax"."0.6.0";
- by-spec."scmp"."~0.0.3" =
+ by-spec."scmp"."0.0.3" =
self.by-version."scmp"."0.0.3";
by-version."scmp"."0.0.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-scmp-0.0.3";
+ name = "scmp-0.0.3";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/scmp/-/scmp-0.0.3.tgz";
@@ -16259,56 +17911,62 @@
];
buildInputs =
(self.nativeDeps."scmp" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "scmp" ];
};
by-spec."selenium-webdriver"."*" =
- self.by-version."selenium-webdriver"."2.42.1";
- by-version."selenium-webdriver"."2.42.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-selenium-webdriver-2.42.1";
+ self.by-version."selenium-webdriver"."2.43.5";
+ by-version."selenium-webdriver"."2.43.5" = lib.makeOverridable self.buildNodePackage {
+ name = "selenium-webdriver-2.43.5";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.42.1.tgz";
- name = "selenium-webdriver-2.42.1.tgz";
- sha1 = "61984d1583b89c80a9f3bf31623d00bcc82a8d0e";
+ url = "http://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.43.5.tgz";
+ name = "selenium-webdriver-2.43.5.tgz";
+ sha1 = "6ac04302e3e81dfe59956454a19f90eeadfe5573";
})
];
buildInputs =
(self.nativeDeps."selenium-webdriver" or []);
- deps = [
- ];
+ deps = {
+ "adm-zip-0.4.4" = self.by-version."adm-zip"."0.4.4";
+ "tmp-0.0.24" = self.by-version."tmp"."0.0.24";
+ "xml2js-0.4.4" = self.by-version."xml2js"."0.4.4";
+ };
peerDependencies = [
];
passthru.names = [ "selenium-webdriver" ];
};
- "selenium-webdriver" = self.by-version."selenium-webdriver"."2.42.1";
+ "selenium-webdriver" = self.by-version."selenium-webdriver"."2.43.5";
by-spec."semver"."*" =
- self.by-version."semver"."3.0.1";
- by-version."semver"."3.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "semver-3.0.1";
+ self.by-version."semver"."4.0.3";
+ by-version."semver"."4.0.3" = lib.makeOverridable self.buildNodePackage {
+ name = "semver-4.0.3";
+ bin = true;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/semver/-/semver-3.0.1.tgz";
- name = "semver-3.0.1.tgz";
- sha1 = "720ac012515a252f91fb0dd2e99a56a70d6cf078";
+ url = "http://registry.npmjs.org/semver/-/semver-4.0.3.tgz";
+ name = "semver-4.0.3.tgz";
+ sha1 = "f79c9ba670efccc029d98a5017def64b0ce1644e";
})
];
buildInputs =
(self.nativeDeps."semver" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "semver" ];
};
- "semver" = self.by-version."semver"."3.0.1";
+ "semver" = self.by-version."semver"."4.0.3";
by-spec."semver"."1.1.0" =
self.by-version."semver"."1.1.0";
by-version."semver"."1.1.0" = lib.makeOverridable self.buildNodePackage {
name = "semver-1.1.0";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/semver/-/semver-1.1.0.tgz";
@@ -16318,8 +17976,8 @@
];
buildInputs =
(self.nativeDeps."semver" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "semver" ];
@@ -16328,6 +17986,7 @@
self.by-version."semver"."1.1.4";
by-version."semver"."1.1.4" = lib.makeOverridable self.buildNodePackage {
name = "semver-1.1.4";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/semver/-/semver-1.1.4.tgz";
@@ -16337,8 +17996,8 @@
];
buildInputs =
(self.nativeDeps."semver" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "semver" ];
@@ -16347,6 +18006,7 @@
self.by-version."semver"."2.3.2";
by-version."semver"."2.3.2" = lib.makeOverridable self.buildNodePackage {
name = "semver-2.3.2";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/semver/-/semver-2.3.2.tgz";
@@ -16356,34 +18016,55 @@
];
buildInputs =
(self.nativeDeps."semver" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "semver" ];
};
- by-spec."semver"."2 >=2.2.1 || 3.x" =
- self.by-version."semver"."3.0.1";
- by-spec."semver"."2 || 3" =
- self.by-version."semver"."3.0.1";
+ by-spec."semver"."2 >=2.2.1 || 3.x || 4" =
+ self.by-version."semver"."4.0.3";
+ by-spec."semver"."2 || 3 || 4" =
+ self.by-version."semver"."4.0.3";
by-spec."semver"."2.x" =
self.by-version."semver"."2.3.2";
- by-spec."semver"."2.x || 3.x" =
- self.by-version."semver"."3.0.1";
+ by-spec."semver"."2.x || 3.x || 4" =
+ self.by-version."semver"."4.0.3";
+ by-spec."semver"."4" =
+ self.by-version."semver"."4.0.3";
by-spec."semver".">=2.0.10 <3.0.0" =
self.by-version."semver"."2.3.2";
by-spec."semver"."^2.3.0" =
self.by-version."semver"."2.3.2";
- by-spec."semver"."^2.3.0 || 3.x" =
+ by-spec."semver"."^2.3.0 || 3.x || 4" =
+ self.by-version."semver"."4.0.3";
+ by-spec."semver"."^3.0.1" =
self.by-version."semver"."3.0.1";
- by-spec."semver"."~1.1.0" =
- self.by-version."semver"."1.1.4";
+ by-version."semver"."3.0.1" = lib.makeOverridable self.buildNodePackage {
+ name = "semver-3.0.1";
+ bin = true;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/semver/-/semver-3.0.1.tgz";
+ name = "semver-3.0.1.tgz";
+ sha1 = "720ac012515a252f91fb0dd2e99a56a70d6cf078";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."semver" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "semver" ];
+ };
by-spec."semver"."~1.1.4" =
self.by-version."semver"."1.1.4";
by-spec."semver"."~2.0.5" =
self.by-version."semver"."2.0.11";
by-version."semver"."2.0.11" = lib.makeOverridable self.buildNodePackage {
name = "semver-2.0.11";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/semver/-/semver-2.0.11.tgz";
@@ -16393,8 +18074,8 @@
];
buildInputs =
(self.nativeDeps."semver" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "semver" ];
@@ -16403,6 +18084,7 @@
self.by-version."semver"."2.1.0";
by-version."semver"."2.1.0" = lib.makeOverridable self.buildNodePackage {
name = "semver-2.1.0";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/semver/-/semver-2.1.0.tgz";
@@ -16412,8 +18094,8 @@
];
buildInputs =
(self.nativeDeps."semver" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "semver" ];
@@ -16422,6 +18104,7 @@
self.by-version."semver"."2.2.1";
by-version."semver"."2.2.1" = lib.makeOverridable self.buildNodePackage {
name = "semver-2.2.1";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/semver/-/semver-2.2.1.tgz";
@@ -16431,40 +18114,42 @@
];
buildInputs =
(self.nativeDeps."semver" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "semver" ];
};
- by-spec."semver"."~2.3.0" =
- self.by-version."semver"."2.3.2";
- by-spec."semver"."~2.3.1" =
- self.by-version."semver"."2.3.2";
+ by-spec."semver"."~3.0.1" =
+ self.by-version."semver"."3.0.1";
+ by-spec."semver"."~4.0.0" =
+ self.by-version."semver"."4.0.3";
by-spec."send"."*" =
- self.by-version."send"."0.8.3";
- by-version."send"."0.8.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-send-0.8.3";
+ self.by-version."send"."0.9.3";
+ by-version."send"."0.9.3" = lib.makeOverridable self.buildNodePackage {
+ name = "send-0.9.3";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/send/-/send-0.8.3.tgz";
- name = "send-0.8.3.tgz";
- sha1 = "593886004fcb968a1b5727814a32b388b3b99083";
+ url = "http://registry.npmjs.org/send/-/send-0.9.3.tgz";
+ name = "send-0.9.3.tgz";
+ sha1 = "b43a7414cd089b7fbec9b755246f7c37b7b85cc0";
})
];
buildInputs =
(self.nativeDeps."send" or []);
- deps = [
- self.by-version."debug"."1.0.4"
- self.by-version."depd"."0.4.4"
- self.by-version."destroy"."1.0.3"
- self.by-version."escape-html"."1.0.1"
- self.by-version."fresh"."0.2.2"
- self.by-version."mime"."1.2.11"
- self.by-version."ms"."0.6.2"
- self.by-version."on-finished"."2.1.0"
- self.by-version."range-parser"."1.0.0"
- ];
+ deps = {
+ "debug-2.0.0" = self.by-version."debug"."2.0.0";
+ "depd-0.4.5" = self.by-version."depd"."0.4.5";
+ "destroy-1.0.3" = self.by-version."destroy"."1.0.3";
+ "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
+ "etag-1.4.0" = self.by-version."etag"."1.4.0";
+ "fresh-0.2.4" = self.by-version."fresh"."0.2.4";
+ "mime-1.2.11" = self.by-version."mime"."1.2.11";
+ "ms-0.6.2" = self.by-version."ms"."0.6.2";
+ "on-finished-2.1.0" = self.by-version."on-finished"."2.1.0";
+ "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
+ };
peerDependencies = [
];
passthru.names = [ "send" ];
@@ -16472,7 +18157,8 @@
by-spec."send"."0.0.3" =
self.by-version."send"."0.0.3";
by-version."send"."0.0.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-send-0.0.3";
+ name = "send-0.0.3";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/send/-/send-0.0.3.tgz";
@@ -16482,12 +18168,12 @@
];
buildInputs =
(self.nativeDeps."send" or []);
- deps = [
- self.by-version."debug"."1.0.4"
- self.by-version."mime"."1.2.6"
- self.by-version."fresh"."0.1.0"
- self.by-version."range-parser"."0.0.4"
- ];
+ deps = {
+ "debug-2.0.0" = self.by-version."debug"."2.0.0";
+ "mime-1.2.6" = self.by-version."mime"."1.2.6";
+ "fresh-0.1.0" = self.by-version."fresh"."0.1.0";
+ "range-parser-0.0.4" = self.by-version."range-parser"."0.0.4";
+ };
peerDependencies = [
];
passthru.names = [ "send" ];
@@ -16495,7 +18181,8 @@
by-spec."send"."0.1.0" =
self.by-version."send"."0.1.0";
by-version."send"."0.1.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-send-0.1.0";
+ name = "send-0.1.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/send/-/send-0.1.0.tgz";
@@ -16505,12 +18192,12 @@
];
buildInputs =
(self.nativeDeps."send" or []);
- deps = [
- self.by-version."debug"."1.0.4"
- self.by-version."mime"."1.2.6"
- self.by-version."fresh"."0.1.0"
- self.by-version."range-parser"."0.0.4"
- ];
+ deps = {
+ "debug-2.0.0" = self.by-version."debug"."2.0.0";
+ "mime-1.2.6" = self.by-version."mime"."1.2.6";
+ "fresh-0.1.0" = self.by-version."fresh"."0.1.0";
+ "range-parser-0.0.4" = self.by-version."range-parser"."0.0.4";
+ };
peerDependencies = [
];
passthru.names = [ "send" ];
@@ -16518,7 +18205,8 @@
by-spec."send"."0.1.4" =
self.by-version."send"."0.1.4";
by-version."send"."0.1.4" = lib.makeOverridable self.buildNodePackage {
- name = "node-send-0.1.4";
+ name = "send-0.1.4";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/send/-/send-0.1.4.tgz";
@@ -16528,12 +18216,12 @@
];
buildInputs =
(self.nativeDeps."send" or []);
- deps = [
- self.by-version."debug"."1.0.4"
- self.by-version."mime"."1.2.11"
- self.by-version."fresh"."0.2.0"
- self.by-version."range-parser"."0.0.4"
- ];
+ deps = {
+ "debug-2.0.0" = self.by-version."debug"."2.0.0";
+ "mime-1.2.11" = self.by-version."mime"."1.2.11";
+ "fresh-0.2.0" = self.by-version."fresh"."0.2.0";
+ "range-parser-0.0.4" = self.by-version."range-parser"."0.0.4";
+ };
peerDependencies = [
];
passthru.names = [ "send" ];
@@ -16541,7 +18229,8 @@
by-spec."send"."0.2.0" =
self.by-version."send"."0.2.0";
by-version."send"."0.2.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-send-0.2.0";
+ name = "send-0.2.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/send/-/send-0.2.0.tgz";
@@ -16551,74 +18240,52 @@
];
buildInputs =
(self.nativeDeps."send" or []);
- deps = [
- self.by-version."debug"."1.0.4"
- self.by-version."mime"."1.2.11"
- self.by-version."fresh"."0.2.2"
- self.by-version."range-parser"."1.0.0"
- ];
+ deps = {
+ "debug-2.0.0" = self.by-version."debug"."2.0.0";
+ "mime-1.2.11" = self.by-version."mime"."1.2.11";
+ "fresh-0.2.4" = self.by-version."fresh"."0.2.4";
+ "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
+ };
peerDependencies = [
];
passthru.names = [ "send" ];
};
- by-spec."send"."0.4.3" =
- self.by-version."send"."0.4.3";
- by-version."send"."0.4.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-send-0.4.3";
+ by-spec."send"."0.8.5" =
+ self.by-version."send"."0.8.5";
+ by-version."send"."0.8.5" = lib.makeOverridable self.buildNodePackage {
+ name = "send-0.8.5";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/send/-/send-0.4.3.tgz";
- name = "send-0.4.3.tgz";
- sha1 = "9627b23b7707fbf6373831cac5793330b594b640";
+ url = "http://registry.npmjs.org/send/-/send-0.8.5.tgz";
+ name = "send-0.8.5.tgz";
+ sha1 = "37f708216e6f50c175e74c69fec53484e2fd82c7";
})
];
buildInputs =
(self.nativeDeps."send" or []);
- deps = [
- self.by-version."debug"."1.0.2"
- self.by-version."escape-html"."1.0.1"
- self.by-version."finished"."1.2.2"
- self.by-version."fresh"."0.2.2"
- self.by-version."mime"."1.2.11"
- self.by-version."range-parser"."1.0.0"
- ];
+ deps = {
+ "debug-1.0.4" = self.by-version."debug"."1.0.4";
+ "depd-0.4.4" = self.by-version."depd"."0.4.4";
+ "destroy-1.0.3" = self.by-version."destroy"."1.0.3";
+ "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
+ "fresh-0.2.2" = self.by-version."fresh"."0.2.2";
+ "mime-1.2.11" = self.by-version."mime"."1.2.11";
+ "ms-0.6.2" = self.by-version."ms"."0.6.2";
+ "on-finished-2.1.0" = self.by-version."on-finished"."2.1.0";
+ "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
+ };
peerDependencies = [
];
passthru.names = [ "send" ];
};
- by-spec."send"."0.6.0" =
- self.by-version."send"."0.6.0";
- by-version."send"."0.6.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-send-0.6.0";
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/send/-/send-0.6.0.tgz";
- name = "send-0.6.0.tgz";
- sha1 = "a59da9265db7c35141e1079cf1f368ee0d59b3ab";
- })
- ];
- buildInputs =
- (self.nativeDeps."send" or []);
- deps = [
- self.by-version."debug"."1.0.3"
- self.by-version."depd"."0.3.0"
- self.by-version."escape-html"."1.0.1"
- self.by-version."finished"."1.2.2"
- self.by-version."fresh"."0.2.2"
- self.by-version."mime"."1.2.11"
- self.by-version."ms"."0.6.2"
- self.by-version."range-parser"."1.0.0"
- ];
- peerDependencies = [
- ];
- passthru.names = [ "send" ];
- };
- by-spec."send"."0.8.3" =
- self.by-version."send"."0.8.3";
+ by-spec."send"."0.9.3" =
+ self.by-version."send"."0.9.3";
by-spec."sequence"."2.2.1" =
self.by-version."sequence"."2.2.1";
by-version."sequence"."2.2.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-sequence-2.2.1";
+ name = "sequence-2.2.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/sequence/-/sequence-2.2.1.tgz";
@@ -16628,52 +18295,77 @@
];
buildInputs =
(self.nativeDeps."sequence" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "sequence" ];
};
by-spec."sequence"."2.x" =
self.by-version."sequence"."2.2.1";
- by-spec."serve-favicon"."2.0.1" =
- self.by-version."serve-favicon"."2.0.1";
- by-version."serve-favicon"."2.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-serve-favicon-2.0.1";
+ by-spec."sequencify"."~0.0.7" =
+ self.by-version."sequencify"."0.0.7";
+ by-version."sequencify"."0.0.7" = lib.makeOverridable self.buildNodePackage {
+ name = "sequencify-0.0.7";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/serve-favicon/-/serve-favicon-2.0.1.tgz";
- name = "serve-favicon-2.0.1.tgz";
- sha1 = "4826975d9f173ca3a4158e9698161f75dec7afec";
+ url = "http://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz";
+ name = "sequencify-0.0.7.tgz";
+ sha1 = "90cff19d02e07027fd767f5ead3e7b95d1e7380c";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."sequencify" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "sequencify" ];
+ };
+ by-spec."serve-favicon"."~2.1.5" =
+ self.by-version."serve-favicon"."2.1.5";
+ by-version."serve-favicon"."2.1.5" = lib.makeOverridable self.buildNodePackage {
+ name = "serve-favicon-2.1.5";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/serve-favicon/-/serve-favicon-2.1.5.tgz";
+ name = "serve-favicon-2.1.5.tgz";
+ sha1 = "8eba1830890bddbbf042e8d5c6456c7d004f6175";
})
];
buildInputs =
(self.nativeDeps."serve-favicon" or []);
- deps = [
- self.by-version."fresh"."0.2.2"
- ];
+ deps = {
+ "etag-1.4.0" = self.by-version."etag"."1.4.0";
+ "fresh-0.2.4" = self.by-version."fresh"."0.2.4";
+ "ms-0.6.2" = self.by-version."ms"."0.6.2";
+ };
peerDependencies = [
];
passthru.names = [ "serve-favicon" ];
};
- by-spec."serve-index"."~1.1.6" =
- self.by-version."serve-index"."1.1.6";
- by-version."serve-index"."1.1.6" = lib.makeOverridable self.buildNodePackage {
- name = "node-serve-index-1.1.6";
+ by-spec."serve-index"."~1.2.1" =
+ self.by-version."serve-index"."1.2.1";
+ by-version."serve-index"."1.2.1" = lib.makeOverridable self.buildNodePackage {
+ name = "serve-index-1.2.1";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/serve-index/-/serve-index-1.1.6.tgz";
- name = "serve-index-1.1.6.tgz";
- sha1 = "b758318fe781628383f66ac80dd447712ea7781f";
+ url = "http://registry.npmjs.org/serve-index/-/serve-index-1.2.1.tgz";
+ name = "serve-index-1.2.1.tgz";
+ sha1 = "854daef00ac9ff2f5bfda1c019b78fb0ed6d2e6f";
})
];
buildInputs =
(self.nativeDeps."serve-index" or []);
- deps = [
- self.by-version."accepts"."1.0.7"
- self.by-version."batch"."0.5.1"
- self.by-version."parseurl"."1.3.0"
- ];
+ deps = {
+ "accepts-1.1.1" = self.by-version."accepts"."1.1.1";
+ "batch-0.5.1" = self.by-version."batch"."0.5.1";
+ "debug-2.0.0" = self.by-version."debug"."2.0.0";
+ "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
+ };
peerDependencies = [
];
passthru.names = [ "serve-index" ];
@@ -16681,7 +18373,8 @@
by-spec."serve-static"."1.0.1" =
self.by-version."serve-static"."1.0.1";
by-version."serve-static"."1.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-serve-static-1.0.1";
+ name = "serve-static-1.0.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/serve-static/-/serve-static-1.0.1.tgz";
@@ -16691,76 +18384,59 @@
];
buildInputs =
(self.nativeDeps."serve-static" or []);
- deps = [
- self.by-version."send"."0.1.4"
- ];
- peerDependencies = [
- ];
- passthru.names = [ "serve-static" ];
- };
- by-spec."serve-static"."1.2.3" =
- self.by-version."serve-static"."1.2.3";
- by-version."serve-static"."1.2.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-serve-static-1.2.3";
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/serve-static/-/serve-static-1.2.3.tgz";
- name = "serve-static-1.2.3.tgz";
- sha1 = "93cecbc340f079ecb8589281d1dc31c26c0cd158";
- })
- ];
- buildInputs =
- (self.nativeDeps."serve-static" or []);
- deps = [
- self.by-version."escape-html"."1.0.1"
- self.by-version."parseurl"."1.0.1"
- self.by-version."send"."0.4.3"
- ];
- peerDependencies = [
- ];
- passthru.names = [ "serve-static" ];
- };
- by-spec."serve-static"."~1.3.0" =
- self.by-version."serve-static"."1.3.2";
- by-version."serve-static"."1.3.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-serve-static-1.3.2";
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/serve-static/-/serve-static-1.3.2.tgz";
- name = "serve-static-1.3.2.tgz";
- sha1 = "d904a6cbf55f511c78138f6f45ee6e69d9d105ca";
- })
- ];
- buildInputs =
- (self.nativeDeps."serve-static" or []);
- deps = [
- self.by-version."escape-html"."1.0.1"
- self.by-version."parseurl"."1.1.3"
- self.by-version."send"."0.6.0"
- ];
+ deps = {
+ "send-0.1.4" = self.by-version."send"."0.1.4";
+ };
peerDependencies = [
];
passthru.names = [ "serve-static" ];
};
by-spec."serve-static"."~1.5.3" =
- self.by-version."serve-static"."1.5.3";
- by-version."serve-static"."1.5.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-serve-static-1.5.3";
+ self.by-version."serve-static"."1.5.4";
+ by-version."serve-static"."1.5.4" = lib.makeOverridable self.buildNodePackage {
+ name = "serve-static-1.5.4";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/serve-static/-/serve-static-1.5.3.tgz";
- name = "serve-static-1.5.3.tgz";
- sha1 = "2e28efa5899686fd3ccdb97a80aa464002244581";
+ url = "http://registry.npmjs.org/serve-static/-/serve-static-1.5.4.tgz";
+ name = "serve-static-1.5.4.tgz";
+ sha1 = "819fb37ae46bd02dd520b77fcf7fd8f5112f9782";
})
];
buildInputs =
(self.nativeDeps."serve-static" or []);
- deps = [
- self.by-version."escape-html"."1.0.1"
- self.by-version."parseurl"."1.3.0"
- self.by-version."send"."0.8.3"
- self.by-version."utils-merge"."1.0.0"
+ deps = {
+ "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
+ "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
+ "send-0.8.5" = self.by-version."send"."0.8.5";
+ "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
+ };
+ peerDependencies = [
];
+ passthru.names = [ "serve-static" ];
+ };
+ by-spec."serve-static"."~1.5.4" =
+ self.by-version."serve-static"."1.5.4";
+ by-spec."serve-static"."~1.6.3" =
+ self.by-version."serve-static"."1.6.3";
+ by-version."serve-static"."1.6.3" = lib.makeOverridable self.buildNodePackage {
+ name = "serve-static-1.6.3";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/serve-static/-/serve-static-1.6.3.tgz";
+ name = "serve-static-1.6.3.tgz";
+ sha1 = "b214235d4d4516db050ea9f7b429b46212e79132";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."serve-static" or []);
+ deps = {
+ "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
+ "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
+ "send-0.9.3" = self.by-version."send"."0.9.3";
+ "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
+ };
peerDependencies = [
];
passthru.names = [ "serve-static" ];
@@ -16768,7 +18444,8 @@
by-spec."sha"."~1.2.1" =
self.by-version."sha"."1.2.4";
by-version."sha"."1.2.4" = lib.makeOverridable self.buildNodePackage {
- name = "node-sha-1.2.4";
+ name = "sha-1.2.4";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/sha/-/sha-1.2.4.tgz";
@@ -16778,30 +18455,30 @@
];
buildInputs =
(self.nativeDeps."sha" or []);
- deps = [
- self.by-version."graceful-fs"."3.0.2"
- self.by-version."readable-stream"."1.0.31"
- ];
+ deps = {
+ "graceful-fs-3.0.2" = self.by-version."graceful-fs"."3.0.2";
+ "readable-stream-1.0.32" = self.by-version."readable-stream"."1.0.32";
+ };
peerDependencies = [
];
passthru.names = [ "sha" ];
};
- by-spec."sha.js"."2.1.7" =
- self.by-version."sha.js"."2.1.7";
- by-version."sha.js"."2.1.7" = lib.makeOverridable self.buildNodePackage {
- name = "sha.js-2.1.7";
+ by-spec."sha.js"."2.2.6" =
+ self.by-version."sha.js"."2.2.6";
+ by-version."sha.js"."2.2.6" = lib.makeOverridable self.buildNodePackage {
+ name = "sha.js-2.2.6";
+ bin = true;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/sha.js/-/sha.js-2.1.7.tgz";
- name = "sha.js-2.1.7.tgz";
- sha1 = "4ab5d386d5c1a26183e61bcc446a9370a3eb8859";
+ url = "http://registry.npmjs.org/sha.js/-/sha.js-2.2.6.tgz";
+ name = "sha.js-2.2.6.tgz";
+ sha1 = "17ddeddc5f722fb66501658895461977867315ba";
})
];
buildInputs =
(self.nativeDeps."sha.js" or []);
- deps = [
- self.by-version."buffer"."2.3.4"
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "sha.js" ];
@@ -16809,7 +18486,8 @@
by-spec."shallow-copy"."0.0.1" =
self.by-version."shallow-copy"."0.0.1";
by-version."shallow-copy"."0.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-shallow-copy-0.0.1";
+ name = "shallow-copy-0.0.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/shallow-copy/-/shallow-copy-0.0.1.tgz";
@@ -16819,8 +18497,8 @@
];
buildInputs =
(self.nativeDeps."shallow-copy" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "shallow-copy" ];
@@ -16828,7 +18506,8 @@
by-spec."shasum"."^1.0.0" =
self.by-version."shasum"."1.0.0";
by-version."shasum"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-shasum-1.0.0";
+ name = "shasum-1.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/shasum/-/shasum-1.0.0.tgz";
@@ -16838,9 +18517,9 @@
];
buildInputs =
(self.nativeDeps."shasum" or []);
- deps = [
- self.by-version."json-stable-stringify"."0.0.1"
- ];
+ deps = {
+ "json-stable-stringify-0.0.1" = self.by-version."json-stable-stringify"."0.0.1";
+ };
peerDependencies = [
];
passthru.names = [ "shasum" ];
@@ -16848,7 +18527,8 @@
by-spec."shell-quote"."~0.0.1" =
self.by-version."shell-quote"."0.0.1";
by-version."shell-quote"."0.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-shell-quote-0.0.1";
+ name = "shell-quote-0.0.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/shell-quote/-/shell-quote-0.0.1.tgz";
@@ -16858,8 +18538,8 @@
];
buildInputs =
(self.nativeDeps."shell-quote" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "shell-quote" ];
@@ -16868,6 +18548,7 @@
self.by-version."shelljs"."0.3.0";
by-version."shelljs"."0.3.0" = lib.makeOverridable self.buildNodePackage {
name = "shelljs-0.3.0";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz";
@@ -16877,8 +18558,8 @@
];
buildInputs =
(self.nativeDeps."shelljs" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "shelljs" ];
@@ -16889,7 +18570,8 @@
by-spec."should"."*" =
self.by-version."should"."4.0.4";
by-version."should"."4.0.4" = lib.makeOverridable self.buildNodePackage {
- name = "node-should-4.0.4";
+ name = "should-4.0.4";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/should/-/should-4.0.4.tgz";
@@ -16899,8 +18581,8 @@
];
buildInputs =
(self.nativeDeps."should" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "should" ];
@@ -16909,7 +18591,8 @@
by-spec."sigmund"."~1.0.0" =
self.by-version."sigmund"."1.0.0";
by-version."sigmund"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-sigmund-1.0.0";
+ name = "sigmund-1.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz";
@@ -16919,8 +18602,8 @@
];
buildInputs =
(self.nativeDeps."sigmund" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "sigmund" ];
@@ -16928,7 +18611,8 @@
by-spec."signals"."<2.0" =
self.by-version."signals"."1.0.0";
by-version."signals"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-signals-1.0.0";
+ name = "signals-1.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/signals/-/signals-1.0.0.tgz";
@@ -16938,8 +18622,8 @@
];
buildInputs =
(self.nativeDeps."signals" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "signals" ];
@@ -16951,7 +18635,8 @@
by-spec."simple-lru-cache"."0.0.x" =
self.by-version."simple-lru-cache"."0.0.1";
by-version."simple-lru-cache"."0.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-simple-lru-cache-0.0.1";
+ name = "simple-lru-cache-0.0.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.1.tgz";
@@ -16961,29 +18646,30 @@
];
buildInputs =
(self.nativeDeps."simple-lru-cache" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "simple-lru-cache" ];
};
by-spec."simplesmtp".">= 0.1.22" =
- self.by-version."simplesmtp"."0.3.32";
- by-version."simplesmtp"."0.3.32" = lib.makeOverridable self.buildNodePackage {
- name = "node-simplesmtp-0.3.32";
+ self.by-version."simplesmtp"."0.3.33";
+ by-version."simplesmtp"."0.3.33" = lib.makeOverridable self.buildNodePackage {
+ name = "simplesmtp-0.3.33";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.32.tgz";
- name = "simplesmtp-0.3.32.tgz";
- sha1 = "b3589b4cbf90624e712ab0ec1a7480ec14fd1c12";
+ url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.33.tgz";
+ name = "simplesmtp-0.3.33.tgz";
+ sha1 = "f25e12431d8c6363755c106595b998f5f965aad9";
})
];
buildInputs =
(self.nativeDeps."simplesmtp" or []);
- deps = [
- self.by-version."rai"."0.1.11"
- self.by-version."xoauth2"."0.1.8"
- ];
+ deps = {
+ "rai-0.1.11" = self.by-version."rai"."0.1.11";
+ "xoauth2-0.1.8" = self.by-version."xoauth2"."0.1.8";
+ };
peerDependencies = [
];
passthru.names = [ "simplesmtp" ];
@@ -16991,7 +18677,8 @@
by-spec."sinon"."*" =
self.by-version."sinon"."1.10.3";
by-version."sinon"."1.10.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-sinon-1.10.3";
+ name = "sinon-1.10.3";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/sinon/-/sinon-1.10.3.tgz";
@@ -17001,41 +18688,43 @@
];
buildInputs =
(self.nativeDeps."sinon" or []);
- deps = [
- self.by-version."formatio"."1.0.2"
- self.by-version."util"."0.10.3"
- ];
+ deps = {
+ "formatio-1.0.2" = self.by-version."formatio"."1.0.2";
+ "util-0.10.3" = self.by-version."util"."0.10.3";
+ };
peerDependencies = [
];
passthru.names = [ "sinon" ];
};
"sinon" = self.by-version."sinon"."1.10.3";
by-spec."slasp"."*" =
- self.by-version."slasp"."0.0.3";
- by-version."slasp"."0.0.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-slasp-0.0.3";
+ self.by-version."slasp"."0.0.4";
+ by-version."slasp"."0.0.4" = lib.makeOverridable self.buildNodePackage {
+ name = "slasp-0.0.4";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/slasp/-/slasp-0.0.3.tgz";
- name = "slasp-0.0.3.tgz";
- sha1 = "fb9aba74f30fc2f012d0ff2d34d4b5c678c11f9f";
+ url = "http://registry.npmjs.org/slasp/-/slasp-0.0.4.tgz";
+ name = "slasp-0.0.4.tgz";
+ sha1 = "9adc26ee729a0f95095851a5489f87a5258d57a9";
})
];
buildInputs =
(self.nativeDeps."slasp" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "slasp" ];
};
- "slasp" = self.by-version."slasp"."0.0.3";
- by-spec."slasp"."0.0.3" =
- self.by-version."slasp"."0.0.3";
+ "slasp" = self.by-version."slasp"."0.0.4";
+ by-spec."slasp"."0.0.4" =
+ self.by-version."slasp"."0.0.4";
by-spec."sliced"."0.0.3" =
self.by-version."sliced"."0.0.3";
by-version."sliced"."0.0.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-sliced-0.0.3";
+ name = "sliced-0.0.3";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/sliced/-/sliced-0.0.3.tgz";
@@ -17045,8 +18734,8 @@
];
buildInputs =
(self.nativeDeps."sliced" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "sliced" ];
@@ -17054,7 +18743,8 @@
by-spec."sliced"."0.0.4" =
self.by-version."sliced"."0.0.4";
by-version."sliced"."0.0.4" = lib.makeOverridable self.buildNodePackage {
- name = "node-sliced-0.0.4";
+ name = "sliced-0.0.4";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/sliced/-/sliced-0.0.4.tgz";
@@ -17064,8 +18754,8 @@
];
buildInputs =
(self.nativeDeps."sliced" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "sliced" ];
@@ -17073,7 +18763,8 @@
by-spec."sliced"."0.0.5" =
self.by-version."sliced"."0.0.5";
by-version."sliced"."0.0.5" = lib.makeOverridable self.buildNodePackage {
- name = "node-sliced-0.0.5";
+ name = "sliced-0.0.5";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/sliced/-/sliced-0.0.5.tgz";
@@ -17083,39 +18774,43 @@
];
buildInputs =
(self.nativeDeps."sliced" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "sliced" ];
};
by-spec."slide"."^1.1.3" =
- self.by-version."slide"."1.1.5";
- by-version."slide"."1.1.5" = lib.makeOverridable self.buildNodePackage {
- name = "node-slide-1.1.5";
+ self.by-version."slide"."1.1.6";
+ by-version."slide"."1.1.6" = lib.makeOverridable self.buildNodePackage {
+ name = "slide-1.1.6";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/slide/-/slide-1.1.5.tgz";
- name = "slide-1.1.5.tgz";
- sha1 = "31732adeae78f1d2d60a29b63baf6a032df7c25d";
+ url = "http://registry.npmjs.org/slide/-/slide-1.1.6.tgz";
+ name = "slide-1.1.6.tgz";
+ sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707";
})
];
buildInputs =
(self.nativeDeps."slide" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "slide" ];
};
+ by-spec."slide"."^1.1.5" =
+ self.by-version."slide"."1.1.6";
by-spec."slide"."~1.1.3" =
- self.by-version."slide"."1.1.5";
- by-spec."slide"."~1.1.5" =
- self.by-version."slide"."1.1.5";
+ self.by-version."slide"."1.1.6";
+ by-spec."slide"."~1.1.6" =
+ self.by-version."slide"."1.1.6";
by-spec."smartdc"."*" =
self.by-version."smartdc"."7.3.0";
by-version."smartdc"."7.3.0" = lib.makeOverridable self.buildNodePackage {
name = "smartdc-7.3.0";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/smartdc/-/smartdc-7.3.0.tgz";
@@ -17125,18 +18820,18 @@
];
buildInputs =
(self.nativeDeps."smartdc" or []);
- deps = [
- self.by-version."assert-plus"."0.1.2"
- self.by-version."lru-cache"."2.2.0"
- self.by-version."nopt"."2.0.0"
- self.by-version."restify"."2.4.1"
- self.by-version."bunyan"."0.21.1"
- self.by-version."clone"."0.1.6"
- self.by-version."smartdc-auth"."1.0.1"
- self.by-version."cmdln"."1.3.2"
- self.by-version."dashdash"."1.5.0"
- self.by-version."vasync"."1.4.3"
- ];
+ deps = {
+ "assert-plus-0.1.2" = self.by-version."assert-plus"."0.1.2";
+ "lru-cache-2.2.0" = self.by-version."lru-cache"."2.2.0";
+ "nopt-2.0.0" = self.by-version."nopt"."2.0.0";
+ "restify-2.4.1" = self.by-version."restify"."2.4.1";
+ "bunyan-0.21.1" = self.by-version."bunyan"."0.21.1";
+ "clone-0.1.6" = self.by-version."clone"."0.1.6";
+ "smartdc-auth-1.0.1" = self.by-version."smartdc-auth"."1.0.1";
+ "cmdln-1.3.2" = self.by-version."cmdln"."1.3.2";
+ "dashdash-1.5.0" = self.by-version."dashdash"."1.5.0";
+ "vasync-1.4.3" = self.by-version."vasync"."1.4.3";
+ };
peerDependencies = [
];
passthru.names = [ "smartdc" ];
@@ -17145,7 +18840,8 @@
by-spec."smartdc-auth"."1.0.1" =
self.by-version."smartdc-auth"."1.0.1";
by-version."smartdc-auth"."1.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-smartdc-auth-1.0.1";
+ name = "smartdc-auth-1.0.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/smartdc-auth/-/smartdc-auth-1.0.1.tgz";
@@ -17155,13 +18851,13 @@
];
buildInputs =
(self.nativeDeps."smartdc-auth" or []);
- deps = [
- self.by-version."assert-plus"."0.1.2"
- self.by-version."clone"."0.1.5"
- self.by-version."ssh-agent"."0.2.1"
- self.by-version."once"."1.1.1"
- self.by-version."vasync"."1.3.3"
- ];
+ deps = {
+ "assert-plus-0.1.2" = self.by-version."assert-plus"."0.1.2";
+ "clone-0.1.5" = self.by-version."clone"."0.1.5";
+ "ssh-agent-0.2.1" = self.by-version."ssh-agent"."0.2.1";
+ "once-1.1.1" = self.by-version."once"."1.1.1";
+ "vasync-1.3.3" = self.by-version."vasync"."1.3.3";
+ };
peerDependencies = [
];
passthru.names = [ "smartdc-auth" ];
@@ -17169,7 +18865,8 @@
by-spec."sntp"."0.1.x" =
self.by-version."sntp"."0.1.4";
by-version."sntp"."0.1.4" = lib.makeOverridable self.buildNodePackage {
- name = "node-sntp-0.1.4";
+ name = "sntp-0.1.4";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/sntp/-/sntp-0.1.4.tgz";
@@ -17179,9 +18876,9 @@
];
buildInputs =
(self.nativeDeps."sntp" or []);
- deps = [
- self.by-version."hoek"."0.7.6"
- ];
+ deps = {
+ "hoek-0.7.6" = self.by-version."hoek"."0.7.6";
+ };
peerDependencies = [
];
passthru.names = [ "sntp" ];
@@ -17189,7 +18886,8 @@
by-spec."sntp"."0.2.x" =
self.by-version."sntp"."0.2.4";
by-version."sntp"."0.2.4" = lib.makeOverridable self.buildNodePackage {
- name = "node-sntp-0.2.4";
+ name = "sntp-0.2.4";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz";
@@ -17199,9 +18897,9 @@
];
buildInputs =
(self.nativeDeps."sntp" or []);
- deps = [
- self.by-version."hoek"."0.9.1"
- ];
+ deps = {
+ "hoek-0.9.1" = self.by-version."hoek"."0.9.1";
+ };
peerDependencies = [
];
passthru.names = [ "sntp" ];
@@ -17209,7 +18907,8 @@
by-spec."socket.io"."0.9.14" =
self.by-version."socket.io"."0.9.14";
by-version."socket.io"."0.9.14" = lib.makeOverridable self.buildNodePackage {
- name = "node-socket.io-0.9.14";
+ name = "socket.io-0.9.14";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/socket.io/-/socket.io-0.9.14.tgz";
@@ -17219,12 +18918,12 @@
];
buildInputs =
(self.nativeDeps."socket.io" or []);
- deps = [
- self.by-version."socket.io-client"."0.9.11"
- self.by-version."policyfile"."0.0.4"
- self.by-version."base64id"."0.1.0"
- self.by-version."redis"."0.7.3"
- ];
+ deps = {
+ "socket.io-client-0.9.11" = self.by-version."socket.io-client"."0.9.11";
+ "policyfile-0.0.4" = self.by-version."policyfile"."0.0.4";
+ "base64id-0.1.0" = self.by-version."base64id"."0.1.0";
+ "redis-0.7.3" = self.by-version."redis"."0.7.3";
+ };
peerDependencies = [
];
passthru.names = [ "socket.io" ];
@@ -17232,7 +18931,8 @@
by-spec."socket.io"."~0.9.13" =
self.by-version."socket.io"."0.9.17";
by-version."socket.io"."0.9.17" = lib.makeOverridable self.buildNodePackage {
- name = "node-socket.io-0.9.17";
+ name = "socket.io-0.9.17";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/socket.io/-/socket.io-0.9.17.tgz";
@@ -17242,12 +18942,12 @@
];
buildInputs =
(self.nativeDeps."socket.io" or []);
- deps = [
- self.by-version."socket.io-client"."0.9.16"
- self.by-version."policyfile"."0.0.4"
- self.by-version."base64id"."0.1.0"
- self.by-version."redis"."0.7.3"
- ];
+ deps = {
+ "socket.io-client-0.9.16" = self.by-version."socket.io-client"."0.9.16";
+ "policyfile-0.0.4" = self.by-version."policyfile"."0.0.4";
+ "base64id-0.1.0" = self.by-version."base64id"."0.1.0";
+ "redis-0.7.3" = self.by-version."redis"."0.7.3";
+ };
peerDependencies = [
];
passthru.names = [ "socket.io" ];
@@ -17257,7 +18957,8 @@
by-spec."socket.io-client"."0.9.11" =
self.by-version."socket.io-client"."0.9.11";
by-version."socket.io-client"."0.9.11" = lib.makeOverridable self.buildNodePackage {
- name = "node-socket.io-client-0.9.11";
+ name = "socket.io-client-0.9.11";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/socket.io-client/-/socket.io-client-0.9.11.tgz";
@@ -17267,12 +18968,12 @@
];
buildInputs =
(self.nativeDeps."socket.io-client" or []);
- deps = [
- self.by-version."uglify-js"."1.2.5"
- self.by-version."ws"."0.4.32"
- self.by-version."xmlhttprequest"."1.4.2"
- self.by-version."active-x-obfuscator"."0.0.1"
- ];
+ deps = {
+ "uglify-js-1.2.5" = self.by-version."uglify-js"."1.2.5";
+ "ws-0.4.32" = self.by-version."ws"."0.4.32";
+ "xmlhttprequest-1.4.2" = self.by-version."xmlhttprequest"."1.4.2";
+ "active-x-obfuscator-0.0.1" = self.by-version."active-x-obfuscator"."0.0.1";
+ };
peerDependencies = [
];
passthru.names = [ "socket.io-client" ];
@@ -17280,7 +18981,8 @@
by-spec."socket.io-client"."0.9.16" =
self.by-version."socket.io-client"."0.9.16";
by-version."socket.io-client"."0.9.16" = lib.makeOverridable self.buildNodePackage {
- name = "node-socket.io-client-0.9.16";
+ name = "socket.io-client-0.9.16";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/socket.io-client/-/socket.io-client-0.9.16.tgz";
@@ -17290,12 +18992,12 @@
];
buildInputs =
(self.nativeDeps."socket.io-client" or []);
- deps = [
- self.by-version."uglify-js"."1.2.5"
- self.by-version."ws"."0.4.32"
- self.by-version."xmlhttprequest"."1.4.2"
- self.by-version."active-x-obfuscator"."0.0.1"
- ];
+ deps = {
+ "uglify-js-1.2.5" = self.by-version."uglify-js"."1.2.5";
+ "ws-0.4.32" = self.by-version."ws"."0.4.32";
+ "xmlhttprequest-1.4.2" = self.by-version."xmlhttprequest"."1.4.2";
+ "active-x-obfuscator-0.0.1" = self.by-version."active-x-obfuscator"."0.0.1";
+ };
peerDependencies = [
];
passthru.names = [ "socket.io-client" ];
@@ -17303,7 +19005,8 @@
by-spec."sockjs"."*" =
self.by-version."sockjs"."0.3.9";
by-version."sockjs"."0.3.9" = lib.makeOverridable self.buildNodePackage {
- name = "node-sockjs-0.3.9";
+ name = "sockjs-0.3.9";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/sockjs/-/sockjs-0.3.9.tgz";
@@ -17313,10 +19016,10 @@
];
buildInputs =
(self.nativeDeps."sockjs" or []);
- deps = [
- self.by-version."node-uuid"."1.3.3"
- self.by-version."faye-websocket"."0.7.2"
- ];
+ deps = {
+ "node-uuid-1.3.3" = self.by-version."node-uuid"."1.3.3";
+ "faye-websocket-0.7.2" = self.by-version."faye-websocket"."0.7.2";
+ };
peerDependencies = [
];
passthru.names = [ "sockjs" ];
@@ -17325,7 +19028,8 @@
by-spec."sorted-object"."~1.0.0" =
self.by-version."sorted-object"."1.0.0";
by-version."sorted-object"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-sorted-object-1.0.0";
+ name = "sorted-object-1.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/sorted-object/-/sorted-object-1.0.0.tgz";
@@ -17335,37 +19039,39 @@
];
buildInputs =
(self.nativeDeps."sorted-object" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "sorted-object" ];
};
by-spec."source-map"."*" =
- self.by-version."source-map"."0.1.38";
- by-version."source-map"."0.1.38" = lib.makeOverridable self.buildNodePackage {
- name = "node-source-map-0.1.38";
+ self.by-version."source-map"."0.1.40";
+ by-version."source-map"."0.1.40" = lib.makeOverridable self.buildNodePackage {
+ name = "source-map-0.1.40";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/source-map/-/source-map-0.1.38.tgz";
- name = "source-map-0.1.38.tgz";
- sha1 = "f93a6f9d96a5b9cf5494c043497d9542f9fa6b33";
+ url = "http://registry.npmjs.org/source-map/-/source-map-0.1.40.tgz";
+ name = "source-map-0.1.40.tgz";
+ sha1 = "7e0ee49ec0452aa9ac2b93ad5ae54ef33e82b37f";
})
];
buildInputs =
(self.nativeDeps."source-map" or []);
- deps = [
- self.by-version."amdefine"."0.1.0"
- ];
+ deps = {
+ "amdefine-0.1.0" = self.by-version."amdefine"."0.1.0";
+ };
peerDependencies = [
];
passthru.names = [ "source-map" ];
};
- "source-map" = self.by-version."source-map"."0.1.38";
+ "source-map" = self.by-version."source-map"."0.1.40";
by-spec."source-map"."0.1.11" =
self.by-version."source-map"."0.1.11";
by-version."source-map"."0.1.11" = lib.makeOverridable self.buildNodePackage {
- name = "node-source-map-0.1.11";
+ name = "source-map-0.1.11";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/source-map/-/source-map-0.1.11.tgz";
@@ -17375,9 +19081,9 @@
];
buildInputs =
(self.nativeDeps."source-map" or []);
- deps = [
- self.by-version."amdefine"."0.1.0"
- ];
+ deps = {
+ "amdefine-0.1.0" = self.by-version."amdefine"."0.1.0";
+ };
peerDependencies = [
];
passthru.names = [ "source-map" ];
@@ -17385,7 +19091,8 @@
by-spec."source-map"."0.1.31" =
self.by-version."source-map"."0.1.31";
by-version."source-map"."0.1.31" = lib.makeOverridable self.buildNodePackage {
- name = "node-source-map-0.1.31";
+ name = "source-map-0.1.31";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/source-map/-/source-map-0.1.31.tgz";
@@ -17395,9 +19102,9 @@
];
buildInputs =
(self.nativeDeps."source-map" or []);
- deps = [
- self.by-version."amdefine"."0.1.0"
- ];
+ deps = {
+ "amdefine-0.1.0" = self.by-version."amdefine"."0.1.0";
+ };
peerDependencies = [
];
passthru.names = [ "source-map" ];
@@ -17405,7 +19112,8 @@
by-spec."source-map"."0.1.34" =
self.by-version."source-map"."0.1.34";
by-version."source-map"."0.1.34" = lib.makeOverridable self.buildNodePackage {
- name = "node-source-map-0.1.34";
+ name = "source-map-0.1.34";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz";
@@ -17415,31 +19123,32 @@
];
buildInputs =
(self.nativeDeps."source-map" or []);
- deps = [
- self.by-version."amdefine"."0.1.0"
- ];
+ deps = {
+ "amdefine-0.1.0" = self.by-version."amdefine"."0.1.0";
+ };
peerDependencies = [
];
passthru.names = [ "source-map" ];
};
by-spec."source-map"."0.1.x" =
- self.by-version."source-map"."0.1.38";
+ self.by-version."source-map"."0.1.40";
by-spec."source-map".">= 0.1.2" =
- self.by-version."source-map"."0.1.38";
+ self.by-version."source-map"."0.1.40";
by-spec."source-map"."~ 0.1.8" =
- self.by-version."source-map"."0.1.38";
+ self.by-version."source-map"."0.1.40";
by-spec."source-map"."~0.1.30" =
- self.by-version."source-map"."0.1.38";
+ self.by-version."source-map"."0.1.40";
by-spec."source-map"."~0.1.31" =
- self.by-version."source-map"."0.1.38";
+ self.by-version."source-map"."0.1.40";
by-spec."source-map"."~0.1.33" =
- self.by-version."source-map"."0.1.38";
+ self.by-version."source-map"."0.1.40";
by-spec."source-map"."~0.1.7" =
- self.by-version."source-map"."0.1.38";
+ self.by-version."source-map"."0.1.40";
by-spec."spdy"."1.7.1" =
self.by-version."spdy"."1.7.1";
by-version."spdy"."1.7.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-spdy-1.7.1";
+ name = "spdy-1.7.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/spdy/-/spdy-1.7.1.tgz";
@@ -17449,8 +19158,8 @@
];
buildInputs =
(self.nativeDeps."spdy" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "spdy" ];
@@ -17458,7 +19167,8 @@
by-spec."sprintf"."~0.1.2" =
self.by-version."sprintf"."0.1.4";
by-version."sprintf"."0.1.4" = lib.makeOverridable self.buildNodePackage {
- name = "node-sprintf-0.1.4";
+ name = "sprintf-0.1.4";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/sprintf/-/sprintf-0.1.4.tgz";
@@ -17468,18 +19178,21 @@
];
buildInputs =
(self.nativeDeps."sprintf" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "sprintf" ];
};
by-spec."sprintf"."~0.1.3" =
self.by-version."sprintf"."0.1.4";
+ by-spec."sprintf"."~0.1.4" =
+ self.by-version."sprintf"."0.1.4";
by-spec."ssh-agent"."0.2.1" =
self.by-version."ssh-agent"."0.2.1";
by-version."ssh-agent"."0.2.1" = lib.makeOverridable self.buildNodePackage {
name = "ssh-agent-0.2.1";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/ssh-agent/-/ssh-agent-0.2.1.tgz";
@@ -17489,10 +19202,10 @@
];
buildInputs =
(self.nativeDeps."ssh-agent" or []);
- deps = [
- self.by-version."ctype"."0.5.0"
- self.by-version."posix-getopt"."1.0.0"
- ];
+ deps = {
+ "ctype-0.5.0" = self.by-version."ctype"."0.5.0";
+ "posix-getopt-1.0.0" = self.by-version."posix-getopt"."1.0.0";
+ };
peerDependencies = [
];
passthru.names = [ "ssh-agent" ];
@@ -17500,7 +19213,8 @@
by-spec."stack-trace"."0.0.7" =
self.by-version."stack-trace"."0.0.7";
by-version."stack-trace"."0.0.7" = lib.makeOverridable self.buildNodePackage {
- name = "node-stack-trace-0.0.7";
+ name = "stack-trace-0.0.7";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/stack-trace/-/stack-trace-0.0.7.tgz";
@@ -17510,8 +19224,8 @@
];
buildInputs =
(self.nativeDeps."stack-trace" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "stack-trace" ];
@@ -17519,7 +19233,8 @@
by-spec."stack-trace"."0.0.x" =
self.by-version."stack-trace"."0.0.9";
by-version."stack-trace"."0.0.9" = lib.makeOverridable self.buildNodePackage {
- name = "node-stack-trace-0.0.9";
+ name = "stack-trace-0.0.9";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz";
@@ -17529,8 +19244,8 @@
];
buildInputs =
(self.nativeDeps."stack-trace" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "stack-trace" ];
@@ -17538,7 +19253,8 @@
by-spec."stackdriver-statsd-backend"."*" =
self.by-version."stackdriver-statsd-backend"."0.2.2";
by-version."stackdriver-statsd-backend"."0.2.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-stackdriver-statsd-backend-0.2.2";
+ name = "stackdriver-statsd-backend-0.2.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/stackdriver-statsd-backend/-/stackdriver-statsd-backend-0.2.2.tgz";
@@ -17548,40 +19264,63 @@
];
buildInputs =
(self.nativeDeps."stackdriver-statsd-backend" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "stackdriver-statsd-backend" ];
};
"stackdriver-statsd-backend" = self.by-version."stackdriver-statsd-backend"."0.2.2";
by-spec."statsd"."*" =
- self.by-version."statsd"."0.7.1";
- by-version."statsd"."0.7.1" = lib.makeOverridable self.buildNodePackage {
- name = "statsd-0.7.1";
+ self.by-version."statsd"."0.7.2";
+ by-version."statsd"."0.7.2" = lib.makeOverridable self.buildNodePackage {
+ name = "statsd-0.7.2";
+ bin = true;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/statsd/-/statsd-0.7.1.tgz";
- name = "statsd-0.7.1.tgz";
- sha1 = "b3a5124948ea5558e59eb26536ccfdedb9ba2a70";
+ url = "http://registry.npmjs.org/statsd/-/statsd-0.7.2.tgz";
+ name = "statsd-0.7.2.tgz";
+ sha1 = "88901c5f30fa51da5fa3520468c94d7992ef576e";
})
];
buildInputs =
(self.nativeDeps."statsd" or []);
- deps = [
- self.by-version."node-syslog"."1.1.7"
- self.by-version."hashring"."1.0.1"
- self.by-version."winser"."0.1.6"
- ];
+ deps = {
+ "node-syslog-1.1.7" = self.by-version."node-syslog"."1.1.7";
+ "hashring-1.0.1" = self.by-version."hashring"."1.0.1";
+ "winser-0.1.6" = self.by-version."winser"."0.1.6";
+ };
peerDependencies = [
];
passthru.names = [ "statsd" ];
};
- "statsd" = self.by-version."statsd"."0.7.1";
+ "statsd" = self.by-version."statsd"."0.7.2";
+ by-spec."statsd-influxdb-backend"."*" =
+ self.by-version."statsd-influxdb-backend"."0.3.0";
+ by-version."statsd-influxdb-backend"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+ name = "statsd-influxdb-backend-0.3.0";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/statsd-influxdb-backend/-/statsd-influxdb-backend-0.3.0.tgz";
+ name = "statsd-influxdb-backend-0.3.0.tgz";
+ sha1 = "f66197570545c04743c8637af1fbbc914096ec44";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."statsd-influxdb-backend" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "statsd-influxdb-backend" ];
+ };
+ "statsd-influxdb-backend" = self.by-version."statsd-influxdb-backend"."0.3.0";
by-spec."statsd-librato-backend"."*" =
self.by-version."statsd-librato-backend"."0.1.3";
by-version."statsd-librato-backend"."0.1.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-statsd-librato-backend-0.1.3";
+ name = "statsd-librato-backend-0.1.3";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/statsd-librato-backend/-/statsd-librato-backend-0.1.3.tgz";
@@ -17591,36 +19330,18 @@
];
buildInputs =
(self.nativeDeps."statsd-librato-backend" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "statsd-librato-backend" ];
};
"statsd-librato-backend" = self.by-version."statsd-librato-backend"."0.1.3";
- by-spec."statuses"."~1.0.1" =
- self.by-version."statuses"."1.0.4";
- by-version."statuses"."1.0.4" = lib.makeOverridable self.buildNodePackage {
- name = "node-statuses-1.0.4";
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/statuses/-/statuses-1.0.4.tgz";
- name = "statuses-1.0.4.tgz";
- sha1 = "a8b203f645cf475a66426f6be690205c85f3ebdd";
- })
- ];
- buildInputs =
- (self.nativeDeps."statuses" or []);
- deps = [
- ];
- peerDependencies = [
- ];
- passthru.names = [ "statuses" ];
- };
by-spec."stream-browserify"."^1.0.0" =
self.by-version."stream-browserify"."1.0.0";
by-version."stream-browserify"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-stream-browserify-1.0.0";
+ name = "stream-browserify-1.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/stream-browserify/-/stream-browserify-1.0.0.tgz";
@@ -17630,10 +19351,10 @@
];
buildInputs =
(self.nativeDeps."stream-browserify" or []);
- deps = [
- self.by-version."inherits"."2.0.1"
- self.by-version."readable-stream"."1.1.13"
- ];
+ deps = {
+ "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+ "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+ };
peerDependencies = [
];
passthru.names = [ "stream-browserify" ];
@@ -17641,7 +19362,8 @@
by-spec."stream-combiner"."~0.0.2" =
self.by-version."stream-combiner"."0.0.4";
by-version."stream-combiner"."0.0.4" = lib.makeOverridable self.buildNodePackage {
- name = "node-stream-combiner-0.0.4";
+ name = "stream-combiner-0.0.4";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz";
@@ -17651,38 +19373,60 @@
];
buildInputs =
(self.nativeDeps."stream-combiner" or []);
- deps = [
- self.by-version."duplexer"."0.1.1"
- ];
+ deps = {
+ "duplexer-0.1.1" = self.by-version."duplexer"."0.1.1";
+ };
peerDependencies = [
];
passthru.names = [ "stream-combiner" ];
};
by-spec."stream-combiner2"."~1.0.0" =
- self.by-version."stream-combiner2"."1.0.1";
- by-version."stream-combiner2"."1.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-stream-combiner2-1.0.1";
+ self.by-version."stream-combiner2"."1.0.2";
+ by-version."stream-combiner2"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+ name = "stream-combiner2-1.0.2";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.0.1.tgz";
- name = "stream-combiner2-1.0.1.tgz";
- sha1 = "e992881737c754a999431134f4f3f5b45ca0a97a";
+ url = "http://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.0.2.tgz";
+ name = "stream-combiner2-1.0.2.tgz";
+ sha1 = "ba72a6b50cbfabfa950fc8bc87604bd01eb60671";
})
];
buildInputs =
(self.nativeDeps."stream-combiner2" or []);
- deps = [
- self.by-version."duplexer2"."0.0.2"
- self.by-version."through2"."0.5.1"
- ];
+ deps = {
+ "duplexer2-0.0.2" = self.by-version."duplexer2"."0.0.2";
+ "through2-0.5.1" = self.by-version."through2"."0.5.1";
+ };
peerDependencies = [
];
passthru.names = [ "stream-combiner2" ];
};
+ by-spec."stream-consume"."~0.1.0" =
+ self.by-version."stream-consume"."0.1.0";
+ by-version."stream-consume"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+ name = "stream-consume-0.1.0";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz";
+ name = "stream-consume-0.1.0.tgz";
+ sha1 = "a41ead1a6d6081ceb79f65b061901b6d8f3d1d0f";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."stream-consume" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "stream-consume" ];
+ };
by-spec."stream-counter"."^1.0.0" =
self.by-version."stream-counter"."1.0.0";
by-version."stream-counter"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-stream-counter-1.0.0";
+ name = "stream-counter-1.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/stream-counter/-/stream-counter-1.0.0.tgz";
@@ -17692,8 +19436,8 @@
];
buildInputs =
(self.nativeDeps."stream-counter" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "stream-counter" ];
@@ -17701,7 +19445,8 @@
by-spec."stream-counter"."~0.2.0" =
self.by-version."stream-counter"."0.2.0";
by-version."stream-counter"."0.2.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-stream-counter-0.2.0";
+ name = "stream-counter-0.2.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/stream-counter/-/stream-counter-0.2.0.tgz";
@@ -17711,34 +19456,35 @@
];
buildInputs =
(self.nativeDeps."stream-counter" or []);
- deps = [
- self.by-version."readable-stream"."1.1.13"
- ];
+ deps = {
+ "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+ };
peerDependencies = [
];
passthru.names = [ "stream-counter" ];
};
by-spec."stream-splicer"."^1.1.0" =
- self.by-version."stream-splicer"."1.3.0";
- by-version."stream-splicer"."1.3.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-stream-splicer-1.3.0";
+ self.by-version."stream-splicer"."1.3.1";
+ by-version."stream-splicer"."1.3.1" = lib.makeOverridable self.buildNodePackage {
+ name = "stream-splicer-1.3.1";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/stream-splicer/-/stream-splicer-1.3.0.tgz";
- name = "stream-splicer-1.3.0.tgz";
- sha1 = "4839f2f03c4137b3896d064a4d927807a3b95b21";
+ url = "http://registry.npmjs.org/stream-splicer/-/stream-splicer-1.3.1.tgz";
+ name = "stream-splicer-1.3.1.tgz";
+ sha1 = "87737a08777aa00d6a27d92562e7bc88070c081d";
})
];
buildInputs =
(self.nativeDeps."stream-splicer" or []);
- deps = [
- self.by-version."inherits"."2.0.1"
- self.by-version."isarray"."0.0.1"
- self.by-version."readable-stream"."1.1.13"
- self.by-version."readable-wrap"."1.0.0"
- self.by-version."through2"."1.1.1"
- self.by-version."indexof"."0.0.1"
- ];
+ deps = {
+ "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+ "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
+ "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+ "readable-wrap-1.0.0" = self.by-version."readable-wrap"."1.0.0";
+ "through2-1.1.1" = self.by-version."through2"."1.1.1";
+ "indexof-0.0.1" = self.by-version."indexof"."0.0.1";
+ };
peerDependencies = [
];
passthru.names = [ "stream-splicer" ];
@@ -17746,7 +19492,8 @@
by-spec."stream-splitter-transform"."*" =
self.by-version."stream-splitter-transform"."0.0.4";
by-version."stream-splitter-transform"."0.0.4" = lib.makeOverridable self.buildNodePackage {
- name = "node-stream-splitter-transform-0.0.4";
+ name = "stream-splitter-transform-0.0.4";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/stream-splitter-transform/-/stream-splitter-transform-0.0.4.tgz";
@@ -17756,9 +19503,9 @@
];
buildInputs =
(self.nativeDeps."stream-splitter-transform" or []);
- deps = [
- self.by-version."buffertools"."1.1.1"
- ];
+ deps = {
+ "buffertools-1.1.1" = self.by-version."buffertools"."1.1.1";
+ };
peerDependencies = [
];
passthru.names = [ "stream-splitter-transform" ];
@@ -17767,7 +19514,8 @@
by-spec."string"."1.6.1" =
self.by-version."string"."1.6.1";
by-version."string"."1.6.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-string-1.6.1";
+ name = "string-1.6.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/string/-/string-1.6.1.tgz";
@@ -17777,8 +19525,8 @@
];
buildInputs =
(self.nativeDeps."string" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "string" ];
@@ -17786,7 +19534,8 @@
by-spec."string_decoder"."~0.0.0" =
self.by-version."string_decoder"."0.0.1";
by-version."string_decoder"."0.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-string_decoder-0.0.1";
+ name = "string_decoder-0.0.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/string_decoder/-/string_decoder-0.0.1.tgz";
@@ -17796,27 +19545,28 @@
];
buildInputs =
(self.nativeDeps."string_decoder" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "string_decoder" ];
};
by-spec."string_decoder"."~0.10.x" =
- self.by-version."string_decoder"."0.10.25";
- by-version."string_decoder"."0.10.25" = lib.makeOverridable self.buildNodePackage {
- name = "node-string_decoder-0.10.25";
+ self.by-version."string_decoder"."0.10.31";
+ by-version."string_decoder"."0.10.31" = lib.makeOverridable self.buildNodePackage {
+ name = "string_decoder-0.10.31";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.25.tgz";
- name = "string_decoder-0.10.25.tgz";
- sha1 = "668c9da4f8efbdc937a4a6b6bf1cfbec4e9a82e2";
+ url = "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz";
+ name = "string_decoder-0.10.31.tgz";
+ sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94";
})
];
buildInputs =
(self.nativeDeps."string_decoder" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "string_decoder" ];
@@ -17824,7 +19574,8 @@
by-spec."stringstream"."~0.0.4" =
self.by-version."stringstream"."0.0.4";
by-version."stringstream"."0.0.4" = lib.makeOverridable self.buildNodePackage {
- name = "node-stringstream-0.0.4";
+ name = "stringstream-0.0.4";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz";
@@ -17834,36 +19585,17 @@
];
buildInputs =
(self.nativeDeps."stringstream" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "stringstream" ];
};
- by-spec."strip-ansi"."^0.2.1" =
- self.by-version."strip-ansi"."0.2.2";
- by-version."strip-ansi"."0.2.2" = lib.makeOverridable self.buildNodePackage {
- name = "strip-ansi-0.2.2";
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-0.2.2.tgz";
- name = "strip-ansi-0.2.2.tgz";
- sha1 = "854d290c981525fc8c397a910b025ae2d54ffc08";
- })
- ];
- buildInputs =
- (self.nativeDeps."strip-ansi" or []);
- deps = [
- self.by-version."ansi-regex"."0.1.0"
- ];
- peerDependencies = [
- ];
- passthru.names = [ "strip-ansi" ];
- };
by-spec."strip-ansi"."^0.3.0" =
self.by-version."strip-ansi"."0.3.0";
by-version."strip-ansi"."0.3.0" = lib.makeOverridable self.buildNodePackage {
name = "strip-ansi-0.3.0";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz";
@@ -17873,9 +19605,30 @@
];
buildInputs =
(self.nativeDeps."strip-ansi" or []);
- deps = [
- self.by-version."ansi-regex"."0.2.1"
+ deps = {
+ "ansi-regex-0.2.1" = self.by-version."ansi-regex"."0.2.1";
+ };
+ peerDependencies = [
];
+ passthru.names = [ "strip-ansi" ];
+ };
+ by-spec."strip-ansi"."^1.0.0" =
+ self.by-version."strip-ansi"."1.0.0";
+ by-version."strip-ansi"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+ name = "strip-ansi-1.0.0";
+ bin = true;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-1.0.0.tgz";
+ name = "strip-ansi-1.0.0.tgz";
+ sha1 = "6c021321d6ece161a3c608fbab268c7328901c73";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."strip-ansi" or []);
+ deps = {
+ "ansi-regex-0.2.1" = self.by-version."ansi-regex"."0.2.1";
+ };
peerDependencies = [
];
passthru.names = [ "strip-ansi" ];
@@ -17884,6 +19637,7 @@
self.by-version."strip-ansi"."0.1.1";
by-version."strip-ansi"."0.1.1" = lib.makeOverridable self.buildNodePackage {
name = "strip-ansi-0.1.1";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz";
@@ -17893,29 +19647,30 @@
];
buildInputs =
(self.nativeDeps."strip-ansi" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "strip-ansi" ];
};
- by-spec."strip-bom"."^0.3.0" =
- self.by-version."strip-bom"."0.3.1";
- by-version."strip-bom"."0.3.1" = lib.makeOverridable self.buildNodePackage {
- name = "strip-bom-0.3.1";
+ by-spec."strip-bom"."^1.0.0" =
+ self.by-version."strip-bom"."1.0.0";
+ by-version."strip-bom"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+ name = "strip-bom-1.0.0";
+ bin = true;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/strip-bom/-/strip-bom-0.3.1.tgz";
- name = "strip-bom-0.3.1.tgz";
- sha1 = "9e8a39eff456ff9abc2f059f5f2225bb0f3f7ca5";
+ url = "http://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz";
+ name = "strip-bom-1.0.0.tgz";
+ sha1 = "85b8862f3844b5a6d5ec8467a93598173a36f794";
})
];
buildInputs =
(self.nativeDeps."strip-bom" or []);
- deps = [
- self.by-version."first-chunk-stream"."0.1.0"
- self.by-version."is-utf8"."0.2.0"
- ];
+ deps = {
+ "first-chunk-stream-1.0.0" = self.by-version."first-chunk-stream"."1.0.0";
+ "is-utf8-0.2.0" = self.by-version."is-utf8"."0.2.0";
+ };
peerDependencies = [
];
passthru.names = [ "strip-bom" ];
@@ -17924,6 +19679,7 @@
self.by-version."strip-json-comments"."0.1.3";
by-version."strip-json-comments"."0.1.3" = lib.makeOverridable self.buildNodePackage {
name = "strip-json-comments-0.1.3";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/strip-json-comments/-/strip-json-comments-0.1.3.tgz";
@@ -17933,8 +19689,28 @@
];
buildInputs =
(self.nativeDeps."strip-json-comments" or []);
- deps = [
+ deps = {
+ };
+ peerDependencies = [
];
+ passthru.names = [ "strip-json-comments" ];
+ };
+ by-spec."strip-json-comments"."1.0.x" =
+ self.by-version."strip-json-comments"."1.0.1";
+ by-version."strip-json-comments"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+ name = "strip-json-comments-1.0.1";
+ bin = true;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.1.tgz";
+ name = "strip-json-comments-1.0.1.tgz";
+ sha1 = "a91252d95ddee4ff38a66135cd6c78de5709f374";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."strip-json-comments" or []);
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "strip-json-comments" ];
@@ -17942,7 +19718,8 @@
by-spec."strong-data-uri"."~0.1.0" =
self.by-version."strong-data-uri"."0.1.1";
by-version."strong-data-uri"."0.1.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-strong-data-uri-0.1.1";
+ name = "strong-data-uri-0.1.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/strong-data-uri/-/strong-data-uri-0.1.1.tgz";
@@ -17952,43 +19729,45 @@
];
buildInputs =
(self.nativeDeps."strong-data-uri" or []);
- deps = [
- self.by-version."truncate"."1.0.2"
- ];
+ deps = {
+ "truncate-1.0.2" = self.by-version."truncate"."1.0.2";
+ };
peerDependencies = [
];
passthru.names = [ "strong-data-uri" ];
};
by-spec."stylus"."*" =
- self.by-version."stylus"."0.48.0";
- by-version."stylus"."0.48.0" = lib.makeOverridable self.buildNodePackage {
- name = "stylus-0.48.0";
+ self.by-version."stylus"."0.49.1";
+ by-version."stylus"."0.49.1" = lib.makeOverridable self.buildNodePackage {
+ name = "stylus-0.49.1";
+ bin = true;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/stylus/-/stylus-0.48.0.tgz";
- name = "stylus-0.48.0.tgz";
- sha1 = "a8de8341b1cd89efb9161050bf87a72d65485795";
+ url = "http://registry.npmjs.org/stylus/-/stylus-0.49.1.tgz";
+ name = "stylus-0.49.1.tgz";
+ sha1 = "c915495675ca77847a7d4285dd6d6572bae34448";
})
];
buildInputs =
(self.nativeDeps."stylus" or []);
- deps = [
- self.by-version."css-parse"."1.7.0"
- self.by-version."mkdirp"."0.3.5"
- self.by-version."debug"."1.0.4"
- self.by-version."sax"."0.5.8"
- self.by-version."glob"."3.2.11"
- self.by-version."source-map"."0.1.38"
- ];
+ deps = {
+ "css-parse-1.7.0" = self.by-version."css-parse"."1.7.0";
+ "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
+ "debug-2.0.0" = self.by-version."debug"."2.0.0";
+ "sax-0.5.8" = self.by-version."sax"."0.5.8";
+ "glob-3.2.11" = self.by-version."glob"."3.2.11";
+ "source-map-0.1.40" = self.by-version."source-map"."0.1.40";
+ };
peerDependencies = [
];
passthru.names = [ "stylus" ];
};
- "stylus" = self.by-version."stylus"."0.48.0";
+ "stylus" = self.by-version."stylus"."0.49.1";
by-spec."stylus"."0.42.2" =
self.by-version."stylus"."0.42.2";
by-version."stylus"."0.42.2" = lib.makeOverridable self.buildNodePackage {
name = "stylus-0.42.2";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/stylus/-/stylus-0.42.2.tgz";
@@ -17998,13 +19777,13 @@
];
buildInputs =
(self.nativeDeps."stylus" or []);
- deps = [
- self.by-version."css-parse"."1.7.0"
- self.by-version."mkdirp"."0.3.5"
- self.by-version."debug"."1.0.4"
- self.by-version."sax"."0.5.8"
- self.by-version."glob"."3.2.11"
- ];
+ deps = {
+ "css-parse-1.7.0" = self.by-version."css-parse"."1.7.0";
+ "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
+ "debug-2.0.0" = self.by-version."debug"."2.0.0";
+ "sax-0.5.8" = self.by-version."sax"."0.5.8";
+ "glob-3.2.11" = self.by-version."glob"."3.2.11";
+ };
peerDependencies = [
];
passthru.names = [ "stylus" ];
@@ -18012,7 +19791,8 @@
by-spec."subarg"."0.0.1" =
self.by-version."subarg"."0.0.1";
by-version."subarg"."0.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-subarg-0.0.1";
+ name = "subarg-0.0.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/subarg/-/subarg-0.0.1.tgz";
@@ -18022,39 +19802,40 @@
];
buildInputs =
(self.nativeDeps."subarg" or []);
- deps = [
- self.by-version."minimist"."0.0.10"
- ];
+ deps = {
+ "minimist-0.0.10" = self.by-version."minimist"."0.0.10";
+ };
peerDependencies = [
];
passthru.names = [ "subarg" ];
};
- by-spec."superagent"."0.18.0" =
- self.by-version."superagent"."0.18.0";
- by-version."superagent"."0.18.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-superagent-0.18.0";
+ by-spec."superagent"."0.19.0" =
+ self.by-version."superagent"."0.19.0";
+ by-version."superagent"."0.19.0" = lib.makeOverridable self.buildNodePackage {
+ name = "superagent-0.19.0";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/superagent/-/superagent-0.18.0.tgz";
- name = "superagent-0.18.0.tgz";
- sha1 = "9d4375a3ae2c4fbd55fd20d5b12a2470d2fc8f62";
+ url = "http://registry.npmjs.org/superagent/-/superagent-0.19.0.tgz";
+ name = "superagent-0.19.0.tgz";
+ sha1 = "e3f0fe5c07a429779a4e201c3e7b15b6577e4fbb";
})
];
buildInputs =
(self.nativeDeps."superagent" or []);
- deps = [
- self.by-version."qs"."0.6.6"
- self.by-version."formidable"."1.0.14"
- self.by-version."mime"."1.2.5"
- self.by-version."component-emitter"."1.1.2"
- self.by-version."methods"."0.0.1"
- self.by-version."cookiejar"."1.3.2"
- self.by-version."debug"."0.7.4"
- self.by-version."reduce-component"."1.0.1"
- self.by-version."extend"."1.2.1"
- self.by-version."form-data"."0.1.2"
- self.by-version."readable-stream"."1.0.27-1"
- ];
+ deps = {
+ "qs-1.2.0" = self.by-version."qs"."1.2.0";
+ "formidable-1.0.14" = self.by-version."formidable"."1.0.14";
+ "mime-1.2.11" = self.by-version."mime"."1.2.11";
+ "component-emitter-1.1.2" = self.by-version."component-emitter"."1.1.2";
+ "methods-1.0.1" = self.by-version."methods"."1.0.1";
+ "cookiejar-2.0.1" = self.by-version."cookiejar"."2.0.1";
+ "debug-1.0.4" = self.by-version."debug"."1.0.4";
+ "reduce-component-1.0.1" = self.by-version."reduce-component"."1.0.1";
+ "extend-1.2.1" = self.by-version."extend"."1.2.1";
+ "form-data-0.1.3" = self.by-version."form-data"."0.1.3";
+ "readable-stream-1.0.27-1" = self.by-version."readable-stream"."1.0.27-1";
+ };
peerDependencies = [
];
passthru.names = [ "superagent" ];
@@ -18062,7 +19843,8 @@
by-spec."superagent"."~0.13.0" =
self.by-version."superagent"."0.13.0";
by-version."superagent"."0.13.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-superagent-0.13.0";
+ name = "superagent-0.13.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/superagent/-/superagent-0.13.0.tgz";
@@ -18072,22 +19854,23 @@
];
buildInputs =
(self.nativeDeps."superagent" or []);
- deps = [
- self.by-version."qs"."0.5.2"
- self.by-version."formidable"."1.0.9"
- self.by-version."mime"."1.2.5"
- self.by-version."emitter-component"."0.0.6"
- self.by-version."methods"."0.0.1"
- self.by-version."cookiejar"."1.3.0"
- ];
+ deps = {
+ "qs-0.5.2" = self.by-version."qs"."0.5.2";
+ "formidable-1.0.9" = self.by-version."formidable"."1.0.9";
+ "mime-1.2.5" = self.by-version."mime"."1.2.5";
+ "emitter-component-0.0.6" = self.by-version."emitter-component"."0.0.6";
+ "methods-0.0.1" = self.by-version."methods"."0.0.1";
+ "cookiejar-1.3.0" = self.by-version."cookiejar"."1.3.0";
+ };
peerDependencies = [
];
passthru.names = [ "superagent" ];
};
- by-spec."superagent"."~0.18.0" =
+ by-spec."superagent"."~0.18.2" =
self.by-version."superagent"."0.18.2";
by-version."superagent"."0.18.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-superagent-0.18.2";
+ name = "superagent-0.18.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/superagent/-/superagent-0.18.2.tgz";
@@ -18097,49 +19880,51 @@
];
buildInputs =
(self.nativeDeps."superagent" or []);
- deps = [
- self.by-version."qs"."0.6.6"
- self.by-version."formidable"."1.0.14"
- self.by-version."mime"."1.2.11"
- self.by-version."component-emitter"."1.1.2"
- self.by-version."methods"."1.0.1"
- self.by-version."cookiejar"."2.0.1"
- self.by-version."debug"."1.0.4"
- self.by-version."reduce-component"."1.0.1"
- self.by-version."extend"."1.2.1"
- self.by-version."form-data"."0.1.3"
- self.by-version."readable-stream"."1.0.27-1"
- ];
+ deps = {
+ "qs-0.6.6" = self.by-version."qs"."0.6.6";
+ "formidable-1.0.14" = self.by-version."formidable"."1.0.14";
+ "mime-1.2.11" = self.by-version."mime"."1.2.11";
+ "component-emitter-1.1.2" = self.by-version."component-emitter"."1.1.2";
+ "methods-1.0.1" = self.by-version."methods"."1.0.1";
+ "cookiejar-2.0.1" = self.by-version."cookiejar"."2.0.1";
+ "debug-1.0.4" = self.by-version."debug"."1.0.4";
+ "reduce-component-1.0.1" = self.by-version."reduce-component"."1.0.1";
+ "extend-1.2.1" = self.by-version."extend"."1.2.1";
+ "form-data-0.1.3" = self.by-version."form-data"."0.1.3";
+ "readable-stream-1.0.27-1" = self.by-version."readable-stream"."1.0.27-1";
+ };
peerDependencies = [
];
passthru.names = [ "superagent" ];
};
by-spec."supertest"."*" =
- self.by-version."supertest"."0.13.0";
- by-version."supertest"."0.13.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-supertest-0.13.0";
+ self.by-version."supertest"."0.14.0";
+ by-version."supertest"."0.14.0" = lib.makeOverridable self.buildNodePackage {
+ name = "supertest-0.14.0";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/supertest/-/supertest-0.13.0.tgz";
- name = "supertest-0.13.0.tgz";
- sha1 = "4892bafd9beaa9bbcc95fd5a9f04949aef1ce06f";
+ url = "http://registry.npmjs.org/supertest/-/supertest-0.14.0.tgz";
+ name = "supertest-0.14.0.tgz";
+ sha1 = "d385a8ebced95350de8bde26460d848917dee305";
})
];
buildInputs =
(self.nativeDeps."supertest" or []);
- deps = [
- self.by-version."superagent"."0.18.0"
- self.by-version."methods"."1.0.0"
- ];
+ deps = {
+ "superagent-0.19.0" = self.by-version."superagent"."0.19.0";
+ "methods-1.1.0" = self.by-version."methods"."1.1.0";
+ };
peerDependencies = [
];
passthru.names = [ "supertest" ];
};
- "supertest" = self.by-version."supertest"."0.13.0";
+ "supertest" = self.by-version."supertest"."0.14.0";
by-spec."supports-color"."^0.2.0" =
self.by-version."supports-color"."0.2.0";
by-version."supports-color"."0.2.0" = lib.makeOverridable self.buildNodePackage {
name = "supports-color-0.2.0";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz";
@@ -18149,8 +19934,8 @@
];
buildInputs =
(self.nativeDeps."supports-color" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "supports-color" ];
@@ -18158,7 +19943,8 @@
by-spec."swig"."0.14.x" =
self.by-version."swig"."0.14.0";
by-version."swig"."0.14.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-swig-0.14.0";
+ name = "swig-0.14.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/swig/-/swig-0.14.0.tgz";
@@ -18168,9 +19954,9 @@
];
buildInputs =
(self.nativeDeps."swig" or []);
- deps = [
- self.by-version."underscore"."1.6.0"
- ];
+ deps = {
+ "underscore-1.7.0" = self.by-version."underscore"."1.7.0";
+ };
peerDependencies = [
];
passthru.names = [ "swig" ];
@@ -18179,7 +19965,8 @@
by-spec."sylvester".">= 0.0.12" =
self.by-version."sylvester"."0.0.21";
by-version."sylvester"."0.0.21" = lib.makeOverridable self.buildNodePackage {
- name = "node-sylvester-0.0.21";
+ name = "sylvester-0.0.21";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/sylvester/-/sylvester-0.0.21.tgz";
@@ -18189,8 +19976,8 @@
];
buildInputs =
(self.nativeDeps."sylvester" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "sylvester" ];
@@ -18200,7 +19987,8 @@
by-spec."syntax-error"."^1.1.1" =
self.by-version."syntax-error"."1.1.1";
by-version."syntax-error"."1.1.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-syntax-error-1.1.1";
+ name = "syntax-error-1.1.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/syntax-error/-/syntax-error-1.1.1.tgz";
@@ -18210,17 +19998,38 @@
];
buildInputs =
(self.nativeDeps."syntax-error" or []);
- deps = [
- self.by-version."esprima-fb"."3001.1.0-dev-harmony-fb"
- ];
+ deps = {
+ "esprima-fb-3001.1.0-dev-harmony-fb" = self.by-version."esprima-fb"."3001.1.0-dev-harmony-fb";
+ };
peerDependencies = [
];
passthru.names = [ "syntax-error" ];
};
+ by-spec."tabtab"."git+https://github.com/mixu/node-tabtab.git" =
+ self.by-version."tabtab"."0.0.2";
+ by-version."tabtab"."0.0.2" = lib.makeOverridable self.buildNodePackage {
+ name = "tabtab-0.0.2";
+ bin = false;
+ src = [
+ (fetchgit {
+ url = "https://github.com/mixu/node-tabtab.git";
+ rev = "94af2b878b174527b6636aec88acd46979247755";
+ sha256 = "7be2daa2fe7893478d38d90b213de359c9a662a7ef06ad9cbfaac11ad399a149";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."tabtab" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "tabtab" ];
+ };
by-spec."tape"."~0.2.2" =
self.by-version."tape"."0.2.2";
by-version."tape"."0.2.2" = lib.makeOverridable self.buildNodePackage {
name = "tape-0.2.2";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/tape/-/tape-0.2.2.tgz";
@@ -18230,11 +20039,11 @@
];
buildInputs =
(self.nativeDeps."tape" or []);
- deps = [
- self.by-version."jsonify"."0.0.0"
- self.by-version."deep-equal"."0.0.0"
- self.by-version."defined"."0.0.0"
- ];
+ deps = {
+ "jsonify-0.0.0" = self.by-version."jsonify"."0.0.0";
+ "deep-equal-0.0.0" = self.by-version."deep-equal"."0.0.0";
+ "defined-0.0.0" = self.by-version."defined"."0.0.0";
+ };
peerDependencies = [
];
passthru.names = [ "tape" ];
@@ -18242,7 +20051,8 @@
by-spec."tar"."*" =
self.by-version."tar"."1.0.1";
by-version."tar"."1.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-tar-1.0.1";
+ name = "tar-1.0.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/tar/-/tar-1.0.1.tgz";
@@ -18252,42 +20062,21 @@
];
buildInputs =
(self.nativeDeps."tar" or []);
- deps = [
- self.by-version."block-stream"."0.0.7"
- self.by-version."fstream"."1.0.2"
- self.by-version."inherits"."2.0.1"
- ];
+ deps = {
+ "block-stream-0.0.7" = self.by-version."block-stream"."0.0.7";
+ "fstream-1.0.2" = self.by-version."fstream"."1.0.2";
+ "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+ };
peerDependencies = [
];
passthru.names = [ "tar" ];
};
"tar" = self.by-version."tar"."1.0.1";
- by-spec."tar"."0" =
- self.by-version."tar"."0.1.20";
- by-version."tar"."0.1.20" = lib.makeOverridable self.buildNodePackage {
- name = "node-tar-0.1.20";
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/tar/-/tar-0.1.20.tgz";
- name = "tar-0.1.20.tgz";
- sha1 = "42940bae5b5f22c74483699126f9f3f27449cb13";
- })
- ];
- buildInputs =
- (self.nativeDeps."tar" or []);
- deps = [
- self.by-version."block-stream"."0.0.7"
- self.by-version."fstream"."0.1.31"
- self.by-version."inherits"."2.0.1"
- ];
- peerDependencies = [
- ];
- passthru.names = [ "tar" ];
- };
by-spec."tar"."0.1.17" =
self.by-version."tar"."0.1.17";
by-version."tar"."0.1.17" = lib.makeOverridable self.buildNodePackage {
- name = "node-tar-0.1.17";
+ name = "tar-0.1.17";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/tar/-/tar-0.1.17.tgz";
@@ -18297,38 +20086,39 @@
];
buildInputs =
(self.nativeDeps."tar" or []);
- deps = [
- self.by-version."inherits"."1.0.0"
- self.by-version."block-stream"."0.0.7"
- self.by-version."fstream"."0.1.31"
- ];
+ deps = {
+ "inherits-1.0.0" = self.by-version."inherits"."1.0.0";
+ "block-stream-0.0.7" = self.by-version."block-stream"."0.0.7";
+ "fstream-0.1.31" = self.by-version."fstream"."0.1.31";
+ };
peerDependencies = [
];
passthru.names = [ "tar" ];
};
by-spec."tar"."^1.0.0" =
self.by-version."tar"."1.0.1";
- by-spec."tar"."~0.1.20" =
- self.by-version."tar"."0.1.20";
+ by-spec."tar"."~1.0.1" =
+ self.by-version."tar"."1.0.1";
by-spec."tar-stream"."~0.4.0" =
- self.by-version."tar-stream"."0.4.5";
- by-version."tar-stream"."0.4.5" = lib.makeOverridable self.buildNodePackage {
- name = "node-tar-stream-0.4.5";
+ self.by-version."tar-stream"."0.4.7";
+ by-version."tar-stream"."0.4.7" = lib.makeOverridable self.buildNodePackage {
+ name = "tar-stream-0.4.7";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/tar-stream/-/tar-stream-0.4.5.tgz";
- name = "tar-stream-0.4.5.tgz";
- sha1 = "a5e0a7521f57974c919b2b99fdae55589aeefa46";
+ url = "http://registry.npmjs.org/tar-stream/-/tar-stream-0.4.7.tgz";
+ name = "tar-stream-0.4.7.tgz";
+ sha1 = "1f1d2ce9ebc7b42765243ca0e8f1b7bfda0aadcd";
})
];
buildInputs =
(self.nativeDeps."tar-stream" or []);
- deps = [
- self.by-version."bl"."0.9.1"
- self.by-version."end-of-stream"."1.0.0"
- self.by-version."readable-stream"."1.1.13"
- self.by-version."xtend"."4.0.0"
- ];
+ deps = {
+ "bl-0.9.3" = self.by-version."bl"."0.9.3";
+ "end-of-stream-1.1.0" = self.by-version."end-of-stream"."1.1.0";
+ "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+ "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
+ };
peerDependencies = [
];
passthru.names = [ "tar-stream" ];
@@ -18336,7 +20126,8 @@
by-spec."temp"."*" =
self.by-version."temp"."0.8.1";
by-version."temp"."0.8.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-temp-0.8.1";
+ name = "temp-0.8.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/temp/-/temp-0.8.1.tgz";
@@ -18346,9 +20137,9 @@
];
buildInputs =
(self.nativeDeps."temp" or []);
- deps = [
- self.by-version."rimraf"."2.2.8"
- ];
+ deps = {
+ "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
+ };
peerDependencies = [
];
passthru.names = [ "temp" ];
@@ -18357,7 +20148,8 @@
by-spec."temp"."0.6.0" =
self.by-version."temp"."0.6.0";
by-version."temp"."0.6.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-temp-0.6.0";
+ name = "temp-0.6.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/temp/-/temp-0.6.0.tgz";
@@ -18367,22 +20159,23 @@
];
buildInputs =
(self.nativeDeps."temp" or []);
- deps = [
- self.by-version."rimraf"."2.1.4"
- self.by-version."osenv"."0.0.3"
- ];
+ deps = {
+ "rimraf-2.1.4" = self.by-version."rimraf"."2.1.4";
+ "osenv-0.0.3" = self.by-version."osenv"."0.0.3";
+ };
peerDependencies = [
];
passthru.names = [ "temp" ];
};
by-spec."temp"."~0.6.0" =
self.by-version."temp"."0.6.0";
- by-spec."temp"."~0.8.0" =
+ by-spec."temp"."~0.8.1" =
self.by-version."temp"."0.8.1";
by-spec."text-table"."~0.2.0" =
self.by-version."text-table"."0.2.0";
by-version."text-table"."0.2.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-text-table-0.2.0";
+ name = "text-table-0.2.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz";
@@ -18392,8 +20185,8 @@
];
buildInputs =
(self.nativeDeps."text-table" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "text-table" ];
@@ -18401,7 +20194,8 @@
by-spec."throttleit"."~0.0.2" =
self.by-version."throttleit"."0.0.2";
by-version."throttleit"."0.0.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-throttleit-0.0.2";
+ name = "throttleit-0.0.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz";
@@ -18411,37 +20205,39 @@
];
buildInputs =
(self.nativeDeps."throttleit" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "throttleit" ];
};
by-spec."through".">=2.2.7 <3" =
- self.by-version."through"."2.3.4";
- by-version."through"."2.3.4" = lib.makeOverridable self.buildNodePackage {
- name = "node-through-2.3.4";
+ self.by-version."through"."2.3.6";
+ by-version."through"."2.3.6" = lib.makeOverridable self.buildNodePackage {
+ name = "through-2.3.6";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/through/-/through-2.3.4.tgz";
- name = "through-2.3.4.tgz";
- sha1 = "495e40e8d8a8eaebc7c275ea88c2b8fc14c56455";
+ url = "http://registry.npmjs.org/through/-/through-2.3.6.tgz";
+ name = "through-2.3.6.tgz";
+ sha1 = "26681c0f524671021d4e29df7c36bce2d0ecf2e8";
})
];
buildInputs =
(self.nativeDeps."through" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "through" ];
};
by-spec."through"."~2.3.4" =
- self.by-version."through"."2.3.4";
+ self.by-version."through"."2.3.6";
by-spec."through2"."^0.5.1" =
self.by-version."through2"."0.5.1";
by-version."through2"."0.5.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-through2-0.5.1";
+ name = "through2-0.5.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/through2/-/through2-0.5.1.tgz";
@@ -18451,31 +20247,32 @@
];
buildInputs =
(self.nativeDeps."through2" or []);
- deps = [
- self.by-version."readable-stream"."1.0.31"
- self.by-version."xtend"."3.0.0"
- ];
+ deps = {
+ "readable-stream-1.0.32" = self.by-version."readable-stream"."1.0.32";
+ "xtend-3.0.0" = self.by-version."xtend"."3.0.0";
+ };
peerDependencies = [
];
passthru.names = [ "through2" ];
};
by-spec."through2"."^0.6.1" =
- self.by-version."through2"."0.6.1";
- by-version."through2"."0.6.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-through2-0.6.1";
+ self.by-version."through2"."0.6.2";
+ by-version."through2"."0.6.2" = lib.makeOverridable self.buildNodePackage {
+ name = "through2-0.6.2";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/through2/-/through2-0.6.1.tgz";
- name = "through2-0.6.1.tgz";
- sha1 = "f742b32893e8bd26146e789e4fd2ccb2c07a717e";
+ url = "http://registry.npmjs.org/through2/-/through2-0.6.2.tgz";
+ name = "through2-0.6.2.tgz";
+ sha1 = "53265824c555e7fcdc4111dcdc52c7de64636c75";
})
];
buildInputs =
(self.nativeDeps."through2" or []);
- deps = [
- self.by-version."readable-stream"."1.0.31"
- self.by-version."xtend"."4.0.0"
- ];
+ deps = {
+ "readable-stream-1.0.32" = self.by-version."readable-stream"."1.0.32";
+ "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
+ };
peerDependencies = [
];
passthru.names = [ "through2" ];
@@ -18483,7 +20280,8 @@
by-spec."through2"."^1.0.0" =
self.by-version."through2"."1.1.1";
by-version."through2"."1.1.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-through2-1.1.1";
+ name = "through2-1.1.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/through2/-/through2-1.1.1.tgz";
@@ -18493,10 +20291,10 @@
];
buildInputs =
(self.nativeDeps."through2" or []);
- deps = [
- self.by-version."readable-stream"."1.1.13"
- self.by-version."xtend"."4.0.0"
- ];
+ deps = {
+ "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+ "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
+ };
peerDependencies = [
];
passthru.names = [ "through2" ];
@@ -18504,7 +20302,8 @@
by-spec."through2"."~0.4.1" =
self.by-version."through2"."0.4.2";
by-version."through2"."0.4.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-through2-0.4.2";
+ name = "through2-0.4.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/through2/-/through2-0.4.2.tgz";
@@ -18514,32 +20313,54 @@
];
buildInputs =
(self.nativeDeps."through2" or []);
- deps = [
- self.by-version."readable-stream"."1.0.31"
- self.by-version."xtend"."2.1.2"
- ];
+ deps = {
+ "readable-stream-1.0.32" = self.by-version."readable-stream"."1.0.32";
+ "xtend-2.1.2" = self.by-version."xtend"."2.1.2";
+ };
peerDependencies = [
];
passthru.names = [ "through2" ];
};
by-spec."through2"."~0.5.1" =
self.by-version."through2"."0.5.1";
- by-spec."timers-browserify"."^1.0.1" =
- self.by-version."timers-browserify"."1.0.3";
- by-version."timers-browserify"."1.0.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-timers-browserify-1.0.3";
+ by-spec."tildify"."^1.0.0" =
+ self.by-version."tildify"."1.0.0";
+ by-version."tildify"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+ name = "tildify-1.0.0";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/timers-browserify/-/timers-browserify-1.0.3.tgz";
- name = "timers-browserify-1.0.3.tgz";
- sha1 = "ffba70c9c12eed916fd67318e629ac6f32295551";
+ url = "http://registry.npmjs.org/tildify/-/tildify-1.0.0.tgz";
+ name = "tildify-1.0.0.tgz";
+ sha1 = "2a021db5e8fbde0a8f8b4df37adaa8fb1d39d7dd";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."tildify" or []);
+ deps = {
+ "user-home-1.0.0" = self.by-version."user-home"."1.0.0";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "tildify" ];
+ };
+ by-spec."timers-browserify"."^1.0.1" =
+ self.by-version."timers-browserify"."1.1.0";
+ by-version."timers-browserify"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+ name = "timers-browserify-1.1.0";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/timers-browserify/-/timers-browserify-1.1.0.tgz";
+ name = "timers-browserify-1.1.0.tgz";
+ sha1 = "bffd11af00fe82b089b015e8de4dc6a911b7ec3e";
})
];
buildInputs =
(self.nativeDeps."timers-browserify" or []);
- deps = [
- self.by-version."process"."0.5.2"
- ];
+ deps = {
+ "process-0.5.2" = self.by-version."process"."0.5.2";
+ };
peerDependencies = [
];
passthru.names = [ "timers-browserify" ];
@@ -18547,7 +20368,8 @@
by-spec."timespan"."~2.3.0" =
self.by-version."timespan"."2.3.0";
by-version."timespan"."2.3.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-timespan-2.3.0";
+ name = "timespan-2.3.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/timespan/-/timespan-2.3.0.tgz";
@@ -18557,8 +20379,8 @@
];
buildInputs =
(self.nativeDeps."timespan" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "timespan" ];
@@ -18566,7 +20388,8 @@
by-spec."timezone"."*" =
self.by-version."timezone"."0.0.34";
by-version."timezone"."0.0.34" = lib.makeOverridable self.buildNodePackage {
- name = "node-timezone-0.0.34";
+ name = "timezone-0.0.34";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/timezone/-/timezone-0.0.34.tgz";
@@ -18576,8 +20399,8 @@
];
buildInputs =
(self.nativeDeps."timezone" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "timezone" ];
@@ -18586,7 +20409,8 @@
by-spec."tinycolor"."0.x" =
self.by-version."tinycolor"."0.0.1";
by-version."tinycolor"."0.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-tinycolor-0.0.1";
+ name = "tinycolor-0.0.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz";
@@ -18596,51 +20420,53 @@
];
buildInputs =
(self.nativeDeps."tinycolor" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "tinycolor" ];
};
- by-spec."titanium"."3.2.1" =
- self.by-version."titanium"."3.2.1";
- by-version."titanium"."3.2.1" = lib.makeOverridable self.buildNodePackage {
- name = "titanium-3.2.1";
+ by-spec."titanium"."*" =
+ self.by-version."titanium"."3.4.0";
+ by-version."titanium"."3.4.0" = lib.makeOverridable self.buildNodePackage {
+ name = "titanium-3.4.0";
+ bin = true;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/titanium/-/titanium-3.2.1.tgz";
- name = "titanium-3.2.1.tgz";
- sha1 = "b1d432c6c853c22096fb3ed03626e8263b27e39e";
+ url = "http://registry.npmjs.org/titanium/-/titanium-3.4.0.tgz";
+ name = "titanium-3.4.0.tgz";
+ sha1 = "5b4fca5cd15fadd187725dd46f7469eed9405683";
})
];
buildInputs =
(self.nativeDeps."titanium" or []);
- deps = [
- self.by-version."async"."0.2.10"
- self.by-version."colors"."0.6.2"
- self.by-version."fields"."0.1.12"
- self.by-version."humanize"."0.0.9"
- self.by-version."jade"."0.35.0"
- self.by-version."longjohn"."0.2.4"
- self.by-version."moment"."2.4.0"
- self.by-version."node-appc"."0.2.0"
- self.by-version."optimist"."0.6.1"
- self.by-version."request"."2.27.0"
- self.by-version."semver"."2.2.1"
- self.by-version."sprintf"."0.1.4"
- self.by-version."temp"."0.6.0"
- self.by-version."winston"."0.6.2"
- self.by-version."wrench"."1.5.8"
- ];
+ deps = {
+ "async-0.2.10" = self.by-version."async"."0.2.10";
+ "colors-0.6.2" = self.by-version."colors"."0.6.2";
+ "fields-0.1.16" = self.by-version."fields"."0.1.16";
+ "humanize-0.0.9" = self.by-version."humanize"."0.0.9";
+ "jade-0.35.0" = self.by-version."jade"."0.35.0";
+ "longjohn-0.2.4" = self.by-version."longjohn"."0.2.4";
+ "moment-2.4.0" = self.by-version."moment"."2.4.0";
+ "node-appc-0.2.14" = self.by-version."node-appc"."0.2.14";
+ "optimist-0.6.1" = self.by-version."optimist"."0.6.1";
+ "request-2.27.0" = self.by-version."request"."2.27.0";
+ "semver-2.2.1" = self.by-version."semver"."2.2.1";
+ "sprintf-0.1.4" = self.by-version."sprintf"."0.1.4";
+ "temp-0.6.0" = self.by-version."temp"."0.6.0";
+ "winston-0.6.2" = self.by-version."winston"."0.6.2";
+ "wrench-1.5.8" = self.by-version."wrench"."1.5.8";
+ };
peerDependencies = [
];
passthru.names = [ "titanium" ];
};
- "titanium" = self.by-version."titanium"."3.2.1";
- by-spec."tmp"."~0.0.20" =
+ "titanium" = self.by-version."titanium"."3.4.0";
+ by-spec."tmp"."0.0.24" =
self.by-version."tmp"."0.0.24";
by-version."tmp"."0.0.24" = lib.makeOverridable self.buildNodePackage {
- name = "node-tmp-0.0.24";
+ name = "tmp-0.0.24";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/tmp/-/tmp-0.0.24.tgz";
@@ -18650,16 +20476,19 @@
];
buildInputs =
(self.nativeDeps."tmp" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "tmp" ];
};
+ by-spec."tmp"."~0.0.20" =
+ self.by-version."tmp"."0.0.24";
by-spec."tough-cookie".">=0.12.0" =
self.by-version."tough-cookie"."0.12.1";
by-version."tough-cookie"."0.12.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-tough-cookie-0.12.1";
+ name = "tough-cookie-0.12.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz";
@@ -18669,29 +20498,9 @@
];
buildInputs =
(self.nativeDeps."tough-cookie" or []);
- deps = [
- self.by-version."punycode"."1.3.1"
- ];
- peerDependencies = [
- ];
- passthru.names = [ "tough-cookie" ];
- };
- by-spec."tough-cookie"."~0.9.15" =
- self.by-version."tough-cookie"."0.9.15";
- by-version."tough-cookie"."0.9.15" = lib.makeOverridable self.buildNodePackage {
- name = "node-tough-cookie-0.9.15";
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-0.9.15.tgz";
- name = "tough-cookie-0.9.15.tgz";
- sha1 = "75617ac347e3659052b0350131885829677399f6";
- })
- ];
- buildInputs =
- (self.nativeDeps."tough-cookie" or []);
- deps = [
- self.by-version."punycode"."1.3.1"
- ];
+ deps = {
+ "punycode-1.3.1" = self.by-version."punycode"."1.3.1";
+ };
peerDependencies = [
];
passthru.names = [ "tough-cookie" ];
@@ -18700,6 +20509,7 @@
self.by-version."traceur"."0.0.55";
by-version."traceur"."0.0.55" = lib.makeOverridable self.buildNodePackage {
name = "traceur-0.0.55";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/traceur/-/traceur-0.0.55.tgz";
@@ -18709,11 +20519,11 @@
];
buildInputs =
(self.nativeDeps."traceur" or []);
- deps = [
- self.by-version."commander"."2.3.0"
- self.by-version."glob"."4.0.5"
- self.by-version."semver"."2.3.2"
- ];
+ deps = {
+ "commander-2.3.0" = self.by-version."commander"."2.3.0";
+ "glob-4.0.6" = self.by-version."glob"."4.0.6";
+ "semver-2.3.2" = self.by-version."semver"."2.3.2";
+ };
peerDependencies = [
];
passthru.names = [ "traceur" ];
@@ -18721,7 +20531,8 @@
by-spec."transformers"."2.1.0" =
self.by-version."transformers"."2.1.0";
by-version."transformers"."2.1.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-transformers-2.1.0";
+ name = "transformers-2.1.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/transformers/-/transformers-2.1.0.tgz";
@@ -18731,11 +20542,11 @@
];
buildInputs =
(self.nativeDeps."transformers" or []);
- deps = [
- self.by-version."promise"."2.0.0"
- self.by-version."css"."1.0.8"
- self.by-version."uglify-js"."2.2.5"
- ];
+ deps = {
+ "promise-2.0.0" = self.by-version."promise"."2.0.0";
+ "css-1.0.8" = self.by-version."css"."1.0.8";
+ "uglify-js-2.2.5" = self.by-version."uglify-js"."2.2.5";
+ };
peerDependencies = [
];
passthru.names = [ "transformers" ];
@@ -18743,7 +20554,8 @@
by-spec."truncate"."~1.0.2" =
self.by-version."truncate"."1.0.2";
by-version."truncate"."1.0.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-truncate-1.0.2";
+ name = "truncate-1.0.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/truncate/-/truncate-1.0.2.tgz";
@@ -18753,8 +20565,8 @@
];
buildInputs =
(self.nativeDeps."truncate" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "truncate" ];
@@ -18762,7 +20574,8 @@
by-spec."tty-browserify"."~0.0.0" =
self.by-version."tty-browserify"."0.0.0";
by-version."tty-browserify"."0.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-tty-browserify-0.0.0";
+ name = "tty-browserify-0.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz";
@@ -18772,8 +20585,8 @@
];
buildInputs =
(self.nativeDeps."tty-browserify" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "tty-browserify" ];
@@ -18781,7 +20594,8 @@
by-spec."tunnel-agent"."~0.2.0" =
self.by-version."tunnel-agent"."0.2.0";
by-version."tunnel-agent"."0.2.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-tunnel-agent-0.2.0";
+ name = "tunnel-agent-0.2.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.2.0.tgz";
@@ -18791,8 +20605,8 @@
];
buildInputs =
(self.nativeDeps."tunnel-agent" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "tunnel-agent" ];
@@ -18800,7 +20614,8 @@
by-spec."tunnel-agent"."~0.3.0" =
self.by-version."tunnel-agent"."0.3.0";
by-version."tunnel-agent"."0.3.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-tunnel-agent-0.3.0";
+ name = "tunnel-agent-0.3.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz";
@@ -18810,8 +20625,8 @@
];
buildInputs =
(self.nativeDeps."tunnel-agent" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "tunnel-agent" ];
@@ -18819,7 +20634,8 @@
by-spec."tunnel-agent"."~0.4.0" =
self.by-version."tunnel-agent"."0.4.0";
by-version."tunnel-agent"."0.4.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-tunnel-agent-0.4.0";
+ name = "tunnel-agent-0.4.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz";
@@ -18829,8 +20645,8 @@
];
buildInputs =
(self.nativeDeps."tunnel-agent" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "tunnel-agent" ];
@@ -18838,7 +20654,8 @@
by-spec."type-detect"."0.1.1" =
self.by-version."type-detect"."0.1.1";
by-version."type-detect"."0.1.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-type-detect-0.1.1";
+ name = "type-detect-0.1.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/type-detect/-/type-detect-0.1.1.tgz";
@@ -18848,8 +20665,8 @@
];
buildInputs =
(self.nativeDeps."type-detect" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "type-detect" ];
@@ -18857,7 +20674,8 @@
by-spec."type-is"."1.0.0" =
self.by-version."type-is"."1.0.0";
by-version."type-is"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-type-is-1.0.0";
+ name = "type-is-1.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/type-is/-/type-is-1.0.0.tgz";
@@ -18867,58 +20685,18 @@
];
buildInputs =
(self.nativeDeps."type-is" or []);
- deps = [
- self.by-version."mime"."1.2.11"
- ];
+ deps = {
+ "mime-1.2.11" = self.by-version."mime"."1.2.11";
+ };
peerDependencies = [
];
passthru.names = [ "type-is" ];
};
- by-spec."type-is"."1.2.1" =
- self.by-version."type-is"."1.2.1";
- by-version."type-is"."1.2.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-type-is-1.2.1";
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/type-is/-/type-is-1.2.1.tgz";
- name = "type-is-1.2.1.tgz";
- sha1 = "73d448080a4f1dd18acb1eefff62968c5b5d54a2";
- })
- ];
- buildInputs =
- (self.nativeDeps."type-is" or []);
- deps = [
- self.by-version."mime-types"."1.0.0"
- ];
- peerDependencies = [
- ];
- passthru.names = [ "type-is" ];
- };
- by-spec."type-is"."1.3.1" =
- self.by-version."type-is"."1.3.1";
- by-version."type-is"."1.3.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-type-is-1.3.1";
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/type-is/-/type-is-1.3.1.tgz";
- name = "type-is-1.3.1.tgz";
- sha1 = "a6789b5a52138289ade1ef8f6d9f2874ffd70b6b";
- })
- ];
- buildInputs =
- (self.nativeDeps."type-is" or []);
- deps = [
- self.by-version."media-typer"."0.2.0"
- self.by-version."mime-types"."1.0.0"
- ];
- peerDependencies = [
- ];
- passthru.names = [ "type-is" ];
- };
- by-spec."type-is"."~1.3.1" =
+ by-spec."type-is"."~1.3.2" =
self.by-version."type-is"."1.3.2";
by-version."type-is"."1.3.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-type-is-1.3.2";
+ name = "type-is-1.3.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/type-is/-/type-is-1.3.2.tgz";
@@ -18928,20 +20706,43 @@
];
buildInputs =
(self.nativeDeps."type-is" or []);
- deps = [
- self.by-version."media-typer"."0.2.0"
- self.by-version."mime-types"."1.0.2"
- ];
+ deps = {
+ "media-typer-0.2.0" = self.by-version."media-typer"."0.2.0";
+ "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2";
+ };
peerDependencies = [
];
passthru.names = [ "type-is" ];
};
- by-spec."type-is"."~1.3.2" =
- self.by-version."type-is"."1.3.2";
+ by-spec."type-is"."~1.5.1" =
+ self.by-version."type-is"."1.5.2";
+ by-version."type-is"."1.5.2" = lib.makeOverridable self.buildNodePackage {
+ name = "type-is-1.5.2";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/type-is/-/type-is-1.5.2.tgz";
+ name = "type-is-1.5.2.tgz";
+ sha1 = "8291bbe845a904acfaffd05a41fdeb234bfa9e5f";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."type-is" or []);
+ deps = {
+ "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0";
+ "mime-types-2.0.2" = self.by-version."mime-types"."2.0.2";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "type-is" ];
+ };
+ by-spec."type-is"."~1.5.2" =
+ self.by-version."type-is"."1.5.2";
by-spec."typechecker"."~2.0.1" =
self.by-version."typechecker"."2.0.8";
by-version."typechecker"."2.0.8" = lib.makeOverridable self.buildNodePackage {
- name = "node-typechecker-2.0.8";
+ name = "typechecker-2.0.8";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/typechecker/-/typechecker-2.0.8.tgz";
@@ -18951,8 +20752,8 @@
];
buildInputs =
(self.nativeDeps."typechecker" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "typechecker" ];
@@ -18960,7 +20761,8 @@
by-spec."typedarray"."~0.0.5" =
self.by-version."typedarray"."0.0.6";
by-version."typedarray"."0.0.6" = lib.makeOverridable self.buildNodePackage {
- name = "node-typedarray-0.0.6";
+ name = "typedarray-0.0.6";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz";
@@ -18970,8 +20772,8 @@
];
buildInputs =
(self.nativeDeps."typedarray" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "typedarray" ];
@@ -18980,6 +20782,7 @@
self.by-version."typescript"."1.0.1";
by-version."typescript"."1.0.1" = lib.makeOverridable self.buildNodePackage {
name = "typescript-1.0.1";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/typescript/-/typescript-1.0.1.tgz";
@@ -18989,8 +20792,8 @@
];
buildInputs =
(self.nativeDeps."typescript" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "typescript" ];
@@ -19000,6 +20803,7 @@
self.by-version."uglify-js"."2.4.15";
by-version."uglify-js"."2.4.15" = lib.makeOverridable self.buildNodePackage {
name = "uglify-js-2.4.15";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.15.tgz";
@@ -19009,12 +20813,12 @@
];
buildInputs =
(self.nativeDeps."uglify-js" or []);
- deps = [
- self.by-version."async"."0.2.10"
- self.by-version."source-map"."0.1.34"
- self.by-version."optimist"."0.3.7"
- self.by-version."uglify-to-browserify"."1.0.2"
- ];
+ deps = {
+ "async-0.2.10" = self.by-version."async"."0.2.10";
+ "source-map-0.1.34" = self.by-version."source-map"."0.1.34";
+ "optimist-0.3.7" = self.by-version."optimist"."0.3.7";
+ "uglify-to-browserify-1.0.2" = self.by-version."uglify-to-browserify"."1.0.2";
+ };
peerDependencies = [
];
passthru.names = [ "uglify-js" ];
@@ -19024,6 +20828,7 @@
self.by-version."uglify-js"."1.2.5";
by-version."uglify-js"."1.2.5" = lib.makeOverridable self.buildNodePackage {
name = "uglify-js-1.2.5";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/uglify-js/-/uglify-js-1.2.5.tgz";
@@ -19033,8 +20838,8 @@
];
buildInputs =
(self.nativeDeps."uglify-js" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "uglify-js" ];
@@ -19043,6 +20848,7 @@
self.by-version."uglify-js"."2.4.0";
by-version."uglify-js"."2.4.0" = lib.makeOverridable self.buildNodePackage {
name = "uglify-js-2.4.0";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.0.tgz";
@@ -19052,12 +20858,12 @@
];
buildInputs =
(self.nativeDeps."uglify-js" or []);
- deps = [
- self.by-version."async"."0.2.10"
- self.by-version."source-map"."0.1.38"
- self.by-version."optimist"."0.3.7"
- self.by-version."uglify-to-browserify"."1.0.2"
- ];
+ deps = {
+ "async-0.2.10" = self.by-version."async"."0.2.10";
+ "source-map-0.1.40" = self.by-version."source-map"."0.1.40";
+ "optimist-0.3.7" = self.by-version."optimist"."0.3.7";
+ "uglify-to-browserify-1.0.2" = self.by-version."uglify-to-browserify"."1.0.2";
+ };
peerDependencies = [
];
passthru.names = [ "uglify-js" ];
@@ -19068,6 +20874,7 @@
self.by-version."uglify-js"."2.2.5";
by-version."uglify-js"."2.2.5" = lib.makeOverridable self.buildNodePackage {
name = "uglify-js-2.2.5";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.2.5.tgz";
@@ -19077,10 +20884,10 @@
];
buildInputs =
(self.nativeDeps."uglify-js" or []);
- deps = [
- self.by-version."source-map"."0.1.38"
- self.by-version."optimist"."0.3.7"
- ];
+ deps = {
+ "source-map-0.1.40" = self.by-version."source-map"."0.1.40";
+ "optimist-0.3.7" = self.by-version."optimist"."0.3.7";
+ };
peerDependencies = [
];
passthru.names = [ "uglify-js" ];
@@ -19091,6 +20898,7 @@
self.by-version."uglify-js"."2.3.6";
by-version."uglify-js"."2.3.6" = lib.makeOverridable self.buildNodePackage {
name = "uglify-js-2.3.6";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz";
@@ -19100,11 +20908,11 @@
];
buildInputs =
(self.nativeDeps."uglify-js" or []);
- deps = [
- self.by-version."async"."0.2.10"
- self.by-version."source-map"."0.1.38"
- self.by-version."optimist"."0.3.7"
- ];
+ deps = {
+ "async-0.2.10" = self.by-version."async"."0.2.10";
+ "source-map-0.1.40" = self.by-version."source-map"."0.1.40";
+ "optimist-0.3.7" = self.by-version."optimist"."0.3.7";
+ };
peerDependencies = [
];
passthru.names = [ "uglify-js" ];
@@ -19118,7 +20926,8 @@
by-spec."uglify-to-browserify"."~1.0.0" =
self.by-version."uglify-to-browserify"."1.0.2";
by-version."uglify-to-browserify"."1.0.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-uglify-to-browserify-1.0.2";
+ name = "uglify-to-browserify-1.0.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz";
@@ -19128,8 +20937,8 @@
];
buildInputs =
(self.nativeDeps."uglify-to-browserify" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "uglify-to-browserify" ];
@@ -19137,7 +20946,8 @@
by-spec."uid-number"."0.0.5" =
self.by-version."uid-number"."0.0.5";
by-version."uid-number"."0.0.5" = lib.makeOverridable self.buildNodePackage {
- name = "node-uid-number-0.0.5";
+ name = "uid-number-0.0.5";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/uid-number/-/uid-number-0.0.5.tgz";
@@ -19147,16 +20957,17 @@
];
buildInputs =
(self.nativeDeps."uid-number" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "uid-number" ];
};
- by-spec."uid-safe"."1" =
+ by-spec."uid-safe"."1.0.1" =
self.by-version."uid-safe"."1.0.1";
by-version."uid-safe"."1.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-uid-safe-1.0.1";
+ name = "uid-safe-1.0.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/uid-safe/-/uid-safe-1.0.1.tgz";
@@ -19166,20 +20977,21 @@
];
buildInputs =
(self.nativeDeps."uid-safe" or []);
- deps = [
- self.by-version."mz"."1.0.1"
- self.by-version."base64-url"."1.0.0"
- ];
+ deps = {
+ "mz-1.0.1" = self.by-version."mz"."1.0.1";
+ "base64-url-1.0.0" = self.by-version."base64-url"."1.0.0";
+ };
peerDependencies = [
];
passthru.names = [ "uid-safe" ];
};
- by-spec."uid-safe"."1.0.1" =
+ by-spec."uid-safe"."~1.0.1" =
self.by-version."uid-safe"."1.0.1";
by-spec."uid2"."0.0.3" =
self.by-version."uid2"."0.0.3";
by-version."uid2"."0.0.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-uid2-0.0.3";
+ name = "uid2-0.0.3";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/uid2/-/uid2-0.0.3.tgz";
@@ -19189,8 +21001,8 @@
];
buildInputs =
(self.nativeDeps."uid2" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "uid2" ];
@@ -19199,6 +21011,7 @@
self.by-version."umd"."2.1.0";
by-version."umd"."2.1.0" = lib.makeOverridable self.buildNodePackage {
name = "umd-2.1.0";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/umd/-/umd-2.1.0.tgz";
@@ -19208,12 +21021,12 @@
];
buildInputs =
(self.nativeDeps."umd" or []);
- deps = [
- self.by-version."rfile"."1.0.0"
- self.by-version."ruglify"."1.0.0"
- self.by-version."through"."2.3.4"
- self.by-version."uglify-js"."2.4.15"
- ];
+ deps = {
+ "rfile-1.0.0" = self.by-version."rfile"."1.0.0";
+ "ruglify-1.0.0" = self.by-version."ruglify"."1.0.0";
+ "through-2.3.6" = self.by-version."through"."2.3.6";
+ "uglify-js-2.4.15" = self.by-version."uglify-js"."2.4.15";
+ };
peerDependencies = [
];
passthru.names = [ "umd" ];
@@ -19221,9 +21034,31 @@
by-spec."umd"."~2.1.0" =
self.by-version."umd"."2.1.0";
by-spec."underscore"."*" =
+ self.by-version."underscore"."1.7.0";
+ by-version."underscore"."1.7.0" = lib.makeOverridable self.buildNodePackage {
+ name = "underscore-1.7.0";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz";
+ name = "underscore-1.7.0.tgz";
+ sha1 = "6bbaf0877500d36be34ecaa584e0db9fef035209";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."underscore" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "underscore" ];
+ };
+ "underscore" = self.by-version."underscore"."1.7.0";
+ by-spec."underscore"."1.6.x" =
self.by-version."underscore"."1.6.0";
by-version."underscore"."1.6.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-underscore-1.6.0";
+ name = "underscore-1.6.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz";
@@ -19233,27 +21068,23 @@
];
buildInputs =
(self.nativeDeps."underscore" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "underscore" ];
};
- "underscore" = self.by-version."underscore"."1.6.0";
- by-spec."underscore"."1.6.x" =
- self.by-version."underscore"."1.6.0";
- by-spec."underscore".">= 1.3.0" =
- self.by-version."underscore"."1.6.0";
by-spec."underscore".">=1.1.7" =
- self.by-version."underscore"."1.6.0";
+ self.by-version."underscore"."1.7.0";
by-spec."underscore".">=1.3.1" =
- self.by-version."underscore"."1.6.0";
+ self.by-version."underscore"."1.7.0";
by-spec."underscore".">=1.5.0" =
- self.by-version."underscore"."1.6.0";
+ self.by-version."underscore"."1.7.0";
by-spec."underscore"."~1.4.3" =
self.by-version."underscore"."1.4.4";
by-version."underscore"."1.4.4" = lib.makeOverridable self.buildNodePackage {
- name = "node-underscore-1.4.4";
+ name = "underscore-1.4.4";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz";
@@ -19263,8 +21094,8 @@
];
buildInputs =
(self.nativeDeps."underscore" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "underscore" ];
@@ -19274,7 +21105,8 @@
by-spec."underscore"."~1.5.2" =
self.by-version."underscore"."1.5.2";
by-version."underscore"."1.5.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-underscore-1.5.2";
+ name = "underscore-1.5.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/underscore/-/underscore-1.5.2.tgz";
@@ -19284,8 +21116,8 @@
];
buildInputs =
(self.nativeDeps."underscore" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "underscore" ];
@@ -19293,7 +21125,8 @@
by-spec."underscore.string"."~2.2.1" =
self.by-version."underscore.string"."2.2.1";
by-version."underscore.string"."2.2.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-underscore.string-2.2.1";
+ name = "underscore.string-2.2.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.2.1.tgz";
@@ -19303,8 +21136,8 @@
];
buildInputs =
(self.nativeDeps."underscore.string" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "underscore.string" ];
@@ -19312,7 +21145,8 @@
by-spec."underscore.string"."~2.3.1" =
self.by-version."underscore.string"."2.3.3";
by-version."underscore.string"."2.3.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-underscore.string-2.3.3";
+ name = "underscore.string-2.3.3";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz";
@@ -19322,8 +21156,8 @@
];
buildInputs =
(self.nativeDeps."underscore.string" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "underscore.string" ];
@@ -19333,7 +21167,8 @@
by-spec."unfunk-diff"."~0.0.1" =
self.by-version."unfunk-diff"."0.0.2";
by-version."unfunk-diff"."0.0.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-unfunk-diff-0.0.2";
+ name = "unfunk-diff-0.0.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/unfunk-diff/-/unfunk-diff-0.0.2.tgz";
@@ -19343,72 +21178,74 @@
];
buildInputs =
(self.nativeDeps."unfunk-diff" or []);
- deps = [
- self.by-version."diff"."1.0.8"
- self.by-version."jsesc"."0.4.3"
- self.by-version."ministyle"."0.1.4"
- ];
+ deps = {
+ "diff-1.0.8" = self.by-version."diff"."1.0.8";
+ "jsesc-0.4.3" = self.by-version."jsesc"."0.4.3";
+ "ministyle-0.1.4" = self.by-version."ministyle"."0.1.4";
+ };
peerDependencies = [
];
passthru.names = [ "unfunk-diff" ];
};
by-spec."ungit"."*" =
- self.by-version."ungit"."0.8.2";
- by-version."ungit"."0.8.2" = lib.makeOverridable self.buildNodePackage {
- name = "ungit-0.8.2";
+ self.by-version."ungit"."0.8.3";
+ by-version."ungit"."0.8.3" = lib.makeOverridable self.buildNodePackage {
+ name = "ungit-0.8.3";
+ bin = true;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/ungit/-/ungit-0.8.2.tgz";
- name = "ungit-0.8.2.tgz";
- sha1 = "11fe51329ab2aaafaccd155eb0c911a90036b27f";
+ url = "http://registry.npmjs.org/ungit/-/ungit-0.8.3.tgz";
+ name = "ungit-0.8.3.tgz";
+ sha1 = "93ea5734cb8408ef9ba3406102fa5254abfeaa4b";
})
];
buildInputs =
(self.nativeDeps."ungit" or []);
- deps = [
- self.by-version."express"."4.4.5"
- self.by-version."superagent"."0.18.2"
- self.by-version."lodash"."2.4.1"
- self.by-version."temp"."0.8.1"
- self.by-version."socket.io"."0.9.17"
- self.by-version."moment"."2.7.0"
- self.by-version."async"."0.9.0"
- self.by-version."rc"."0.4.0"
- self.by-version."uuid"."1.4.1"
- self.by-version."winston"."0.7.3"
- self.by-version."passport"."0.2.0"
- self.by-version."passport-local"."1.0.0"
- self.by-version."semver"."2.3.2"
- self.by-version."forever-monitor"."1.1.0"
- self.by-version."open"."0.0.5"
- self.by-version."optimist"."0.6.1"
- self.by-version."crossroads"."0.12.0"
- self.by-version."signals"."1.0.0"
- self.by-version."hasher"."1.2.0"
- self.by-version."blueimp-md5"."1.1.0"
- self.by-version."color"."0.6.0"
- self.by-version."keen.io"."0.1.2"
- self.by-version."getmac"."1.0.6"
- self.by-version."deep-extend"."0.2.11"
- self.by-version."raven"."0.7.0"
- self.by-version."knockout"."3.1.0"
- self.by-version."npm-registry-client"."3.0.6"
- self.by-version."npmconf"."2.0.5"
- self.by-version."mkdirp"."0.5.0"
- self.by-version."body-parser"."1.4.3"
- self.by-version."cookie-parser"."1.3.2"
- self.by-version."express-session"."1.6.5"
- self.by-version."serve-static"."1.3.2"
- ];
+ deps = {
+ "express-4.8.8" = self.by-version."express"."4.8.8";
+ "superagent-0.18.2" = self.by-version."superagent"."0.18.2";
+ "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
+ "temp-0.8.1" = self.by-version."temp"."0.8.1";
+ "socket.io-0.9.17" = self.by-version."socket.io"."0.9.17";
+ "moment-2.8.3" = self.by-version."moment"."2.8.3";
+ "async-0.9.0" = self.by-version."async"."0.9.0";
+ "rc-0.5.1" = self.by-version."rc"."0.5.1";
+ "uuid-1.4.1" = self.by-version."uuid"."1.4.1";
+ "winston-0.7.3" = self.by-version."winston"."0.7.3";
+ "passport-0.2.1" = self.by-version."passport"."0.2.1";
+ "passport-local-1.0.0" = self.by-version."passport-local"."1.0.0";
+ "semver-3.0.1" = self.by-version."semver"."3.0.1";
+ "forever-monitor-1.1.0" = self.by-version."forever-monitor"."1.1.0";
+ "open-0.0.5" = self.by-version."open"."0.0.5";
+ "optimist-0.6.1" = self.by-version."optimist"."0.6.1";
+ "crossroads-0.12.0" = self.by-version."crossroads"."0.12.0";
+ "signals-1.0.0" = self.by-version."signals"."1.0.0";
+ "hasher-1.2.0" = self.by-version."hasher"."1.2.0";
+ "blueimp-md5-1.1.0" = self.by-version."blueimp-md5"."1.1.0";
+ "color-0.7.1" = self.by-version."color"."0.7.1";
+ "keen.io-0.1.2" = self.by-version."keen.io"."0.1.2";
+ "getmac-1.0.6" = self.by-version."getmac"."1.0.6";
+ "deep-extend-0.2.11" = self.by-version."deep-extend"."0.2.11";
+ "raven-0.7.2" = self.by-version."raven"."0.7.2";
+ "knockout-3.2.0" = self.by-version."knockout"."3.2.0";
+ "npm-registry-client-3.1.8" = self.by-version."npm-registry-client"."3.1.8";
+ "npmconf-2.0.9" = self.by-version."npmconf"."2.0.9";
+ "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
+ "body-parser-1.6.7" = self.by-version."body-parser"."1.6.7";
+ "cookie-parser-1.3.3" = self.by-version."cookie-parser"."1.3.3";
+ "express-session-1.7.6" = self.by-version."express-session"."1.7.6";
+ "serve-static-1.5.4" = self.by-version."serve-static"."1.5.4";
+ };
peerDependencies = [
];
passthru.names = [ "ungit" ];
};
- "ungit" = self.by-version."ungit"."0.8.2";
+ "ungit" = self.by-version."ungit"."0.8.3";
by-spec."unique-stream"."^1.0.0" =
self.by-version."unique-stream"."1.0.0";
by-version."unique-stream"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-unique-stream-1.0.0";
+ name = "unique-stream-1.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz";
@@ -19418,8 +21255,8 @@
];
buildInputs =
(self.nativeDeps."unique-stream" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "unique-stream" ];
@@ -19427,7 +21264,8 @@
by-spec."update-notifier"."~0.1.8" =
self.by-version."update-notifier"."0.1.10";
by-version."update-notifier"."0.1.10" = lib.makeOverridable self.buildNodePackage {
- name = "node-update-notifier-0.1.10";
+ name = "update-notifier-0.1.10";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/update-notifier/-/update-notifier-0.1.10.tgz";
@@ -19437,20 +21275,41 @@
];
buildInputs =
(self.nativeDeps."update-notifier" or []);
- deps = [
- self.by-version."chalk"."0.4.0"
- self.by-version."configstore"."0.3.1"
- self.by-version."request"."2.40.0"
- self.by-version."semver"."2.3.2"
- ];
+ deps = {
+ "chalk-0.4.0" = self.by-version."chalk"."0.4.0";
+ "configstore-0.3.1" = self.by-version."configstore"."0.3.1";
+ "request-2.44.0" = self.by-version."request"."2.44.0";
+ "semver-2.3.2" = self.by-version."semver"."2.3.2";
+ };
peerDependencies = [
];
passthru.names = [ "update-notifier" ];
};
+ by-spec."uri-path"."0.0.2" =
+ self.by-version."uri-path"."0.0.2";
+ by-version."uri-path"."0.0.2" = lib.makeOverridable self.buildNodePackage {
+ name = "uri-path-0.0.2";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/uri-path/-/uri-path-0.0.2.tgz";
+ name = "uri-path-0.0.2.tgz";
+ sha1 = "803eb01f2feb17927dcce0f6187e72b75f53f554";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."uri-path" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "uri-path" ];
+ };
by-spec."url"."~0.10.1" =
self.by-version."url"."0.10.1";
by-version."url"."0.10.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-url-0.10.1";
+ name = "url-0.10.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/url/-/url-0.10.1.tgz";
@@ -19460,77 +21319,59 @@
];
buildInputs =
(self.nativeDeps."url" or []);
- deps = [
- self.by-version."punycode"."1.2.4"
- ];
+ deps = {
+ "punycode-1.2.4" = self.by-version."punycode"."1.2.4";
+ };
peerDependencies = [
];
passthru.names = [ "url" ];
};
- by-spec."useragent"."~2.0.4" =
- self.by-version."useragent"."2.0.9";
- by-version."useragent"."2.0.9" = lib.makeOverridable self.buildNodePackage {
- name = "node-useragent-2.0.9";
+ by-spec."user-home"."^1.0.0" =
+ self.by-version."user-home"."1.0.0";
+ by-version."user-home"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+ name = "user-home-1.0.0";
+ bin = true;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/useragent/-/useragent-2.0.9.tgz";
- name = "useragent-2.0.9.tgz";
- sha1 = "98c53e8b1c0191a3e4d0ad9d8153f19a5d453ac5";
+ url = "http://registry.npmjs.org/user-home/-/user-home-1.0.0.tgz";
+ name = "user-home-1.0.0.tgz";
+ sha1 = "54ecb631e0fa420e9b0a6b946b158d137825b38b";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."user-home" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "user-home" ];
+ };
+ by-spec."useragent"."~2.0.4" =
+ self.by-version."useragent"."2.0.10";
+ by-version."useragent"."2.0.10" = lib.makeOverridable self.buildNodePackage {
+ name = "useragent-2.0.10";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/useragent/-/useragent-2.0.10.tgz";
+ name = "useragent-2.0.10.tgz";
+ sha1 = "af2c1cc641159361e4d830866eb716ba4679de33";
})
];
buildInputs =
(self.nativeDeps."useragent" or []);
- deps = [
- self.by-version."lru-cache"."2.2.4"
- ];
+ deps = {
+ "lru-cache-2.2.4" = self.by-version."lru-cache"."2.2.4";
+ };
peerDependencies = [
];
passthru.names = [ "useragent" ];
};
- by-spec."util"."0.10.2" =
- self.by-version."util"."0.10.2";
- by-version."util"."0.10.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-util-0.10.2";
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/util/-/util-0.10.2.tgz";
- name = "util-0.10.2.tgz";
- sha1 = "8180519cf690fb88bc56480fe55087531f446304";
- })
- ];
- buildInputs =
- (self.nativeDeps."util" or []);
- deps = [
- self.by-version."inherits"."2.0.1"
- ];
- peerDependencies = [
- ];
- passthru.names = [ "util" ];
- };
- by-spec."util"."0.4.9" =
- self.by-version."util"."0.4.9";
- by-version."util"."0.4.9" = lib.makeOverridable self.buildNodePackage {
- name = "node-util-0.4.9";
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/util/-/util-0.4.9.tgz";
- name = "util-0.4.9.tgz";
- sha1 = "d95d5830d2328ec17dee3c80bfc50c33562b75a3";
- })
- ];
- buildInputs =
- (self.nativeDeps."util" or []);
- deps = [
- self.by-version."events.node"."0.4.9"
- ];
- peerDependencies = [
- ];
- passthru.names = [ "util" ];
- };
- by-spec."util".">=0.10.3 <1" =
+ by-spec."util"."0.10.3" =
self.by-version."util"."0.10.3";
by-version."util"."0.10.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-util-0.10.3";
+ name = "util-0.10.3";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/util/-/util-0.10.3.tgz";
@@ -19540,19 +21381,43 @@
];
buildInputs =
(self.nativeDeps."util" or []);
- deps = [
- self.by-version."inherits"."2.0.1"
- ];
+ deps = {
+ "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+ };
peerDependencies = [
];
passthru.names = [ "util" ];
};
+ by-spec."util"."0.4.9" =
+ self.by-version."util"."0.4.9";
+ by-version."util"."0.4.9" = lib.makeOverridable self.buildNodePackage {
+ name = "util-0.4.9";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/util/-/util-0.4.9.tgz";
+ name = "util-0.4.9.tgz";
+ sha1 = "d95d5830d2328ec17dee3c80bfc50c33562b75a3";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."util" or []);
+ deps = {
+ "events.node-0.4.9" = self.by-version."events.node"."0.4.9";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "util" ];
+ };
+ by-spec."util".">=0.10.3 <1" =
+ self.by-version."util"."0.10.3";
by-spec."util"."~0.10.1" =
self.by-version."util"."0.10.3";
by-spec."util-extend"."^1.0.1" =
self.by-version."util-extend"."1.0.1";
by-version."util-extend"."1.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-util-extend-1.0.1";
+ name = "util-extend-1.0.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/util-extend/-/util-extend-1.0.1.tgz";
@@ -19562,8 +21427,8 @@
];
buildInputs =
(self.nativeDeps."util-extend" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "util-extend" ];
@@ -19571,7 +21436,8 @@
by-spec."utile"."0.1.x" =
self.by-version."utile"."0.1.7";
by-version."utile"."0.1.7" = lib.makeOverridable self.buildNodePackage {
- name = "node-utile-0.1.7";
+ name = "utile-0.1.7";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/utile/-/utile-0.1.7.tgz";
@@ -19581,14 +21447,14 @@
];
buildInputs =
(self.nativeDeps."utile" or []);
- deps = [
- self.by-version."async"."0.1.22"
- self.by-version."deep-equal"."0.2.1"
- self.by-version."i"."0.3.2"
- self.by-version."mkdirp"."0.5.0"
- self.by-version."ncp"."0.2.7"
- self.by-version."rimraf"."1.0.9"
- ];
+ deps = {
+ "async-0.1.22" = self.by-version."async"."0.1.22";
+ "deep-equal-0.2.1" = self.by-version."deep-equal"."0.2.1";
+ "i-0.3.2" = self.by-version."i"."0.3.2";
+ "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
+ "ncp-0.2.7" = self.by-version."ncp"."0.2.7";
+ "rimraf-1.0.9" = self.by-version."rimraf"."1.0.9";
+ };
peerDependencies = [
];
passthru.names = [ "utile" ];
@@ -19596,7 +21462,8 @@
by-spec."utile"."0.2.1" =
self.by-version."utile"."0.2.1";
by-version."utile"."0.2.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-utile-0.2.1";
+ name = "utile-0.2.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/utile/-/utile-0.2.1.tgz";
@@ -19606,14 +21473,14 @@
];
buildInputs =
(self.nativeDeps."utile" or []);
- deps = [
- self.by-version."async"."0.2.10"
- self.by-version."deep-equal"."0.2.1"
- self.by-version."i"."0.3.2"
- self.by-version."mkdirp"."0.5.0"
- self.by-version."ncp"."0.4.2"
- self.by-version."rimraf"."2.2.8"
- ];
+ deps = {
+ "async-0.2.10" = self.by-version."async"."0.2.10";
+ "deep-equal-0.2.1" = self.by-version."deep-equal"."0.2.1";
+ "i-0.3.2" = self.by-version."i"."0.3.2";
+ "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
+ "ncp-0.4.2" = self.by-version."ncp"."0.4.2";
+ "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
+ };
peerDependencies = [
];
passthru.names = [ "utile" ];
@@ -19625,7 +21492,8 @@
by-spec."utils-merge"."1.0.0" =
self.by-version."utils-merge"."1.0.0";
by-version."utils-merge"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-utils-merge-1.0.0";
+ name = "utils-merge-1.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz";
@@ -19635,8 +21503,8 @@
];
buildInputs =
(self.nativeDeps."utils-merge" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "utils-merge" ];
@@ -19644,7 +21512,8 @@
by-spec."uuid"."1.4.1" =
self.by-version."uuid"."1.4.1";
by-version."uuid"."1.4.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-uuid-1.4.1";
+ name = "uuid-1.4.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/uuid/-/uuid-1.4.1.tgz";
@@ -19654,18 +21523,37 @@
];
buildInputs =
(self.nativeDeps."uuid" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "uuid" ];
};
by-spec."uuid"."~1.4.1" =
- self.by-version."uuid"."1.4.1";
+ self.by-version."uuid"."1.4.2";
+ by-version."uuid"."1.4.2" = lib.makeOverridable self.buildNodePackage {
+ name = "uuid-1.4.2";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/uuid/-/uuid-1.4.2.tgz";
+ name = "uuid-1.4.2.tgz";
+ sha1 = "453019f686966a6df83cdc5244e7c990ecc332fc";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."uuid" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "uuid" ];
+ };
by-spec."validator"."0.4.x" =
self.by-version."validator"."0.4.28";
by-version."validator"."0.4.28" = lib.makeOverridable self.buildNodePackage {
- name = "node-validator-0.4.28";
+ name = "validator-0.4.28";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/validator/-/validator-0.4.28.tgz";
@@ -19675,8 +21563,8 @@
];
buildInputs =
(self.nativeDeps."validator" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "validator" ];
@@ -19684,7 +21572,8 @@
by-spec."vargs"."~0.1.0" =
self.by-version."vargs"."0.1.0";
by-version."vargs"."0.1.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-vargs-0.1.0";
+ name = "vargs-0.1.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/vargs/-/vargs-0.1.0.tgz";
@@ -19694,8 +21583,8 @@
];
buildInputs =
(self.nativeDeps."vargs" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "vargs" ];
@@ -19703,7 +21592,8 @@
by-spec."vary"."0.1.0" =
self.by-version."vary"."0.1.0";
by-version."vary"."0.1.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-vary-0.1.0";
+ name = "vary-0.1.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/vary/-/vary-0.1.0.tgz";
@@ -19713,18 +21603,17 @@
];
buildInputs =
(self.nativeDeps."vary" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "vary" ];
};
- by-spec."vary"."~0.1.0" =
- self.by-version."vary"."0.1.0";
by-spec."vary"."~1.0.0" =
self.by-version."vary"."1.0.0";
by-version."vary"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-vary-1.0.0";
+ name = "vary-1.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/vary/-/vary-1.0.0.tgz";
@@ -19734,8 +21623,8 @@
];
buildInputs =
(self.nativeDeps."vary" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "vary" ];
@@ -19743,7 +21632,8 @@
by-spec."vasync"."1.3.3" =
self.by-version."vasync"."1.3.3";
by-version."vasync"."1.3.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-vasync-1.3.3";
+ name = "vasync-1.3.3";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/vasync/-/vasync-1.3.3.tgz";
@@ -19753,10 +21643,10 @@
];
buildInputs =
(self.nativeDeps."vasync" or []);
- deps = [
- self.by-version."jsprim"."0.3.0"
- self.by-version."verror"."1.1.0"
- ];
+ deps = {
+ "jsprim-0.3.0" = self.by-version."jsprim"."0.3.0";
+ "verror-1.1.0" = self.by-version."verror"."1.1.0";
+ };
peerDependencies = [
];
passthru.names = [ "vasync" ];
@@ -19764,7 +21654,8 @@
by-spec."vasync"."1.4.3" =
self.by-version."vasync"."1.4.3";
by-version."vasync"."1.4.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-vasync-1.4.3";
+ name = "vasync-1.4.3";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/vasync/-/vasync-1.4.3.tgz";
@@ -19774,10 +21665,10 @@
];
buildInputs =
(self.nativeDeps."vasync" or []);
- deps = [
- self.by-version."jsprim"."0.3.0"
- self.by-version."verror"."1.1.0"
- ];
+ deps = {
+ "jsprim-0.3.0" = self.by-version."jsprim"."0.3.0";
+ "verror-1.1.0" = self.by-version."verror"."1.1.0";
+ };
peerDependencies = [
];
passthru.names = [ "vasync" ];
@@ -19785,7 +21676,8 @@
by-spec."verror"."1.1.0" =
self.by-version."verror"."1.1.0";
by-version."verror"."1.1.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-verror-1.1.0";
+ name = "verror-1.1.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/verror/-/verror-1.1.0.tgz";
@@ -19795,9 +21687,9 @@
];
buildInputs =
(self.nativeDeps."verror" or []);
- deps = [
- self.by-version."extsprintf"."1.0.0"
- ];
+ deps = {
+ "extsprintf-1.0.0" = self.by-version."extsprintf"."1.0.0";
+ };
peerDependencies = [
];
passthru.names = [ "verror" ];
@@ -19805,7 +21697,8 @@
by-spec."verror"."1.3.3" =
self.by-version."verror"."1.3.3";
by-version."verror"."1.3.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-verror-1.3.3";
+ name = "verror-1.3.3";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/verror/-/verror-1.3.3.tgz";
@@ -19815,9 +21708,9 @@
];
buildInputs =
(self.nativeDeps."verror" or []);
- deps = [
- self.by-version."extsprintf"."1.0.0"
- ];
+ deps = {
+ "extsprintf-1.0.0" = self.by-version."extsprintf"."1.0.0";
+ };
peerDependencies = [
];
passthru.names = [ "verror" ];
@@ -19825,7 +21718,8 @@
by-spec."verror"."1.3.6" =
self.by-version."verror"."1.3.6";
by-version."verror"."1.3.6" = lib.makeOverridable self.buildNodePackage {
- name = "node-verror-1.3.6";
+ name = "verror-1.3.6";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/verror/-/verror-1.3.6.tgz";
@@ -19835,28 +21729,29 @@
];
buildInputs =
(self.nativeDeps."verror" or []);
- deps = [
- self.by-version."extsprintf"."1.0.2"
- ];
+ deps = {
+ "extsprintf-1.0.2" = self.by-version."extsprintf"."1.0.2";
+ };
peerDependencies = [
];
passthru.names = [ "verror" ];
};
- by-spec."vhost"."2.0.0" =
- self.by-version."vhost"."2.0.0";
- by-version."vhost"."2.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-vhost-2.0.0";
+ by-spec."vhost"."~3.0.0" =
+ self.by-version."vhost"."3.0.0";
+ by-version."vhost"."3.0.0" = lib.makeOverridable self.buildNodePackage {
+ name = "vhost-3.0.0";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/vhost/-/vhost-2.0.0.tgz";
- name = "vhost-2.0.0.tgz";
- sha1 = "1e26770bd0fce86c40945591e6f284c6891791e2";
+ url = "http://registry.npmjs.org/vhost/-/vhost-3.0.0.tgz";
+ name = "vhost-3.0.0.tgz";
+ sha1 = "2d0ec59a3e012278b65adbe17c1717a5a5023045";
})
];
buildInputs =
(self.nativeDeps."vhost" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "vhost" ];
@@ -19864,7 +21759,8 @@
by-spec."view-helpers"."*" =
self.by-version."view-helpers"."0.1.5";
by-version."view-helpers"."0.1.5" = lib.makeOverridable self.buildNodePackage {
- name = "node-view-helpers-0.1.5";
+ name = "view-helpers-0.1.5";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/view-helpers/-/view-helpers-0.1.5.tgz";
@@ -19874,8 +21770,8 @@
];
buildInputs =
(self.nativeDeps."view-helpers" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "view-helpers" ];
@@ -19884,7 +21780,8 @@
by-spec."vinyl"."^0.2.3" =
self.by-version."vinyl"."0.2.3";
by-version."vinyl"."0.2.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-vinyl-0.2.3";
+ name = "vinyl-0.2.3";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/vinyl/-/vinyl-0.2.3.tgz";
@@ -19894,65 +21791,70 @@
];
buildInputs =
(self.nativeDeps."vinyl" or []);
- deps = [
- self.by-version."clone-stats"."0.0.1"
- ];
+ deps = {
+ "clone-stats-0.0.1" = self.by-version."clone-stats"."0.0.1";
+ };
peerDependencies = [
];
passthru.names = [ "vinyl" ];
};
- by-spec."vinyl"."^0.3.2" =
- self.by-version."vinyl"."0.3.2";
- by-version."vinyl"."0.3.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-vinyl-0.3.2";
+ by-spec."vinyl"."^0.4.0" =
+ self.by-version."vinyl"."0.4.3";
+ by-version."vinyl"."0.4.3" = lib.makeOverridable self.buildNodePackage {
+ name = "vinyl-0.4.3";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/vinyl/-/vinyl-0.3.2.tgz";
- name = "vinyl-0.3.2.tgz";
- sha1 = "2b422d7c5ff0abc0d22d90ed2275e409dab5e174";
+ url = "http://registry.npmjs.org/vinyl/-/vinyl-0.4.3.tgz";
+ name = "vinyl-0.4.3.tgz";
+ sha1 = "19f61a1b28e72b4c50697889dbe91d7503943ecf";
})
];
buildInputs =
(self.nativeDeps."vinyl" or []);
- deps = [
- self.by-version."clone-stats"."0.0.1"
- self.by-version."lodash"."2.4.1"
- ];
+ deps = {
+ "clone-stats-0.0.1" = self.by-version."clone-stats"."0.0.1";
+ "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
+ };
peerDependencies = [
];
passthru.names = [ "vinyl" ];
};
- by-spec."vinyl-fs"."^0.3.3" =
- self.by-version."vinyl-fs"."0.3.6";
- by-version."vinyl-fs"."0.3.6" = lib.makeOverridable self.buildNodePackage {
- name = "node-vinyl-fs-0.3.6";
+ by-spec."vinyl-fs"."^0.3.0" =
+ self.by-version."vinyl-fs"."0.3.8";
+ by-version."vinyl-fs"."0.3.8" = lib.makeOverridable self.buildNodePackage {
+ name = "vinyl-fs-0.3.8";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.6.tgz";
- name = "vinyl-fs-0.3.6.tgz";
- sha1 = "c96985527cd53eb4a3eeb8ffb3180bda3084ecfc";
+ url = "http://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.8.tgz";
+ name = "vinyl-fs-0.3.8.tgz";
+ sha1 = "bea09db28e558e5e903a51a5363fcdb59e5aabe4";
})
];
buildInputs =
(self.nativeDeps."vinyl-fs" or []);
- deps = [
- self.by-version."glob-stream"."3.1.15"
- self.by-version."glob-watcher"."0.0.6"
- self.by-version."graceful-fs"."3.0.2"
- self.by-version."lodash"."2.4.1"
- self.by-version."mkdirp"."0.5.0"
- self.by-version."strip-bom"."0.3.1"
- self.by-version."through2"."0.5.1"
- self.by-version."vinyl"."0.3.2"
- ];
+ deps = {
+ "glob-stream-3.1.15" = self.by-version."glob-stream"."3.1.15";
+ "glob-watcher-0.0.6" = self.by-version."glob-watcher"."0.0.6";
+ "graceful-fs-3.0.2" = self.by-version."graceful-fs"."3.0.2";
+ "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
+ "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
+ "strip-bom-1.0.0" = self.by-version."strip-bom"."1.0.0";
+ "through2-0.6.2" = self.by-version."through2"."0.6.2";
+ "vinyl-0.4.3" = self.by-version."vinyl"."0.4.3";
+ };
peerDependencies = [
];
passthru.names = [ "vinyl-fs" ];
};
+ by-spec."vinyl-fs"."^0.3.3" =
+ self.by-version."vinyl-fs"."0.3.8";
by-spec."vm-browserify"."~0.0.1" =
self.by-version."vm-browserify"."0.0.4";
by-version."vm-browserify"."0.0.4" = lib.makeOverridable self.buildNodePackage {
- name = "node-vm-browserify-0.0.4";
+ name = "vm-browserify-0.0.4";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz";
@@ -19962,17 +21864,38 @@
];
buildInputs =
(self.nativeDeps."vm-browserify" or []);
- deps = [
- self.by-version."indexof"."0.0.1"
- ];
+ deps = {
+ "indexof-0.0.1" = self.by-version."indexof"."0.0.1";
+ };
peerDependencies = [
];
passthru.names = [ "vm-browserify" ];
};
+ by-spec."void-elements"."~1.0.0" =
+ self.by-version."void-elements"."1.0.0";
+ by-version."void-elements"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+ name = "void-elements-1.0.0";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/void-elements/-/void-elements-1.0.0.tgz";
+ name = "void-elements-1.0.0.tgz";
+ sha1 = "6e5db1e35d591f5ac690ce1a340f793a817b2c2a";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."void-elements" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "void-elements" ];
+ };
by-spec."vows".">=0.5.13" =
self.by-version."vows"."0.7.0";
by-version."vows"."0.7.0" = lib.makeOverridable self.buildNodePackage {
name = "vows-0.7.0";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/vows/-/vows-0.7.0.tgz";
@@ -19982,39 +21905,41 @@
];
buildInputs =
(self.nativeDeps."vows" or []);
- deps = [
- self.by-version."eyes"."0.1.8"
- self.by-version."diff"."1.0.8"
- ];
+ deps = {
+ "eyes-0.1.8" = self.by-version."eyes"."0.1.8";
+ "diff-1.0.8" = self.by-version."diff"."1.0.8";
+ };
peerDependencies = [
];
passthru.names = [ "vows" ];
};
by-spec."walk"."*" =
- self.by-version."walk"."2.3.3";
- by-version."walk"."2.3.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-walk-2.3.3";
+ self.by-version."walk"."2.3.4";
+ by-version."walk"."2.3.4" = lib.makeOverridable self.buildNodePackage {
+ name = "walk-2.3.4";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/walk/-/walk-2.3.3.tgz";
- name = "walk-2.3.3.tgz";
- sha1 = "b4c0e8c42464c16dbbe1d71666765eac07819e5f";
+ url = "http://registry.npmjs.org/walk/-/walk-2.3.4.tgz";
+ name = "walk-2.3.4.tgz";
+ sha1 = "06ce1541535313e8acc28e92eb425e9b64f4c500";
})
];
buildInputs =
(self.nativeDeps."walk" or []);
- deps = [
- self.by-version."foreachasync"."3.0.0"
- ];
+ deps = {
+ "foreachasync-3.0.0" = self.by-version."foreachasync"."3.0.0";
+ };
peerDependencies = [
];
passthru.names = [ "walk" ];
};
- "walk" = self.by-version."walk"."2.3.3";
+ "walk" = self.by-version."walk"."2.3.4";
by-spec."walk"."~2.2.1" =
self.by-version."walk"."2.2.1";
by-version."walk"."2.2.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-walk-2.2.1";
+ name = "walk-2.2.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/walk/-/walk-2.2.1.tgz";
@@ -20024,9 +21949,9 @@
];
buildInputs =
(self.nativeDeps."walk" or []);
- deps = [
- self.by-version."forEachAsync"."2.2.1"
- ];
+ deps = {
+ "forEachAsync-2.2.1" = self.by-version."forEachAsync"."2.2.1";
+ };
peerDependencies = [
];
passthru.names = [ "walk" ];
@@ -20034,7 +21959,8 @@
by-spec."watch"."0.5.x" =
self.by-version."watch"."0.5.1";
by-version."watch"."0.5.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-watch-0.5.1";
+ name = "watch-0.5.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/watch/-/watch-0.5.1.tgz";
@@ -20044,8 +21970,8 @@
];
buildInputs =
(self.nativeDeps."watch" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "watch" ];
@@ -20053,7 +21979,8 @@
by-spec."watch"."~0.8.0" =
self.by-version."watch"."0.8.0";
by-version."watch"."0.8.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-watch-0.8.0";
+ name = "watch-0.8.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/watch/-/watch-0.8.0.tgz";
@@ -20063,55 +21990,57 @@
];
buildInputs =
(self.nativeDeps."watch" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "watch" ];
};
- by-spec."wcwidth.js"."~0.0.4" =
- self.by-version."wcwidth.js"."0.0.4";
- by-version."wcwidth.js"."0.0.4" = lib.makeOverridable self.buildNodePackage {
- name = "node-wcwidth.js-0.0.4";
+ by-spec."wcwidth"."^1.0.0" =
+ self.by-version."wcwidth"."1.0.0";
+ by-version."wcwidth"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+ name = "wcwidth-1.0.0";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/wcwidth.js/-/wcwidth.js-0.0.4.tgz";
- name = "wcwidth.js-0.0.4.tgz";
- sha1 = "44298a7c899c17501990fdaddd76ef6bd081be75";
+ url = "http://registry.npmjs.org/wcwidth/-/wcwidth-1.0.0.tgz";
+ name = "wcwidth-1.0.0.tgz";
+ sha1 = "02d059ff7a8fc741e0f6b5da1e69b2b40daeca6f";
})
];
buildInputs =
- (self.nativeDeps."wcwidth.js" or []);
- deps = [
- self.by-version."underscore"."1.6.0"
- ];
+ (self.nativeDeps."wcwidth" or []);
+ deps = {
+ "defaults-1.0.0" = self.by-version."defaults"."1.0.0";
+ };
peerDependencies = [
];
- passthru.names = [ "wcwidth.js" ];
+ passthru.names = [ "wcwidth" ];
};
by-spec."wd"."~0.3.4" =
- self.by-version."wd"."0.3.4";
- by-version."wd"."0.3.4" = lib.makeOverridable self.buildNodePackage {
- name = "wd-0.3.4";
+ self.by-version."wd"."0.3.8";
+ by-version."wd"."0.3.8" = lib.makeOverridable self.buildNodePackage {
+ name = "wd-0.3.8";
+ bin = true;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/wd/-/wd-0.3.4.tgz";
- name = "wd-0.3.4.tgz";
- sha1 = "da95a0998eb8acfd297e3a9baf28f610b6345543";
+ url = "http://registry.npmjs.org/wd/-/wd-0.3.8.tgz";
+ name = "wd-0.3.8.tgz";
+ sha1 = "68c4371561ac32b986dd93f42f89072746c09c84";
})
];
buildInputs =
(self.nativeDeps."wd" or []);
- deps = [
- self.by-version."archiver"."0.10.1"
- self.by-version."async"."0.9.0"
- self.by-version."colors"."0.6.2"
- self.by-version."lodash"."2.4.1"
- self.by-version."q"."1.0.1"
- self.by-version."request"."2.37.0"
- self.by-version."underscore.string"."2.3.3"
- self.by-version."vargs"."0.1.0"
- ];
+ deps = {
+ "archiver-0.11.0" = self.by-version."archiver"."0.11.0";
+ "async-0.9.0" = self.by-version."async"."0.9.0";
+ "colors-0.6.2" = self.by-version."colors"."0.6.2";
+ "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
+ "q-1.0.1" = self.by-version."q"."1.0.1";
+ "request-2.42.0" = self.by-version."request"."2.42.0";
+ "underscore.string-2.3.3" = self.by-version."underscore.string"."2.3.3";
+ "vargs-0.1.0" = self.by-version."vargs"."0.1.0";
+ };
peerDependencies = [
];
passthru.names = [ "wd" ];
@@ -20119,7 +22048,8 @@
by-spec."weak-map"."^1.0.4" =
self.by-version."weak-map"."1.0.5";
by-version."weak-map"."1.0.5" = lib.makeOverridable self.buildNodePackage {
- name = "node-weak-map-1.0.5";
+ name = "weak-map-1.0.5";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/weak-map/-/weak-map-1.0.5.tgz";
@@ -20129,43 +22059,45 @@
];
buildInputs =
(self.nativeDeps."weak-map" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "weak-map" ];
};
by-spec."webdrvr"."*" =
- self.by-version."webdrvr"."2.41.0-0";
- by-version."webdrvr"."2.41.0-0" = lib.makeOverridable self.buildNodePackage {
- name = "webdrvr-2.41.0-0";
+ self.by-version."webdrvr"."2.43.0-0";
+ by-version."webdrvr"."2.43.0-0" = lib.makeOverridable self.buildNodePackage {
+ name = "webdrvr-2.43.0-0";
+ bin = true;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/webdrvr/-/webdrvr-2.41.0-0.tgz";
- name = "webdrvr-2.41.0-0.tgz";
- sha1 = "c74f22b27f0778d0c2b7e5cbda1edd113d782884";
+ url = "http://registry.npmjs.org/webdrvr/-/webdrvr-2.43.0-0.tgz";
+ name = "webdrvr-2.43.0-0.tgz";
+ sha1 = "b022266b1d5fba25e22d923337c55587048c2953";
})
];
buildInputs =
(self.nativeDeps."webdrvr" or []);
- deps = [
- self.by-version."adm-zip"."0.4.4"
- self.by-version."kew"."0.1.7"
- self.by-version."mkdirp"."0.3.5"
- self.by-version."npmconf"."0.1.16"
- self.by-version."phantomjs"."1.9.7-15"
- self.by-version."tmp"."0.0.24"
- self.by-version."follow-redirects"."0.0.3"
- ];
+ deps = {
+ "adm-zip-0.4.4" = self.by-version."adm-zip"."0.4.4";
+ "kew-0.1.7" = self.by-version."kew"."0.1.7";
+ "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
+ "npmconf-0.1.16" = self.by-version."npmconf"."0.1.16";
+ "phantomjs-1.9.10" = self.by-version."phantomjs"."1.9.10";
+ "tmp-0.0.24" = self.by-version."tmp"."0.0.24";
+ "follow-redirects-0.0.3" = self.by-version."follow-redirects"."0.0.3";
+ };
peerDependencies = [
];
passthru.names = [ "webdrvr" ];
};
- "webdrvr" = self.by-version."webdrvr"."2.41.0-0";
+ "webdrvr" = self.by-version."webdrvr"."2.43.0-0";
by-spec."websocket-driver".">=0.3.1" =
self.by-version."websocket-driver"."0.3.5";
by-version."websocket-driver"."0.3.5" = lib.makeOverridable self.buildNodePackage {
- name = "node-websocket-driver-0.3.5";
+ name = "websocket-driver-0.3.5";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/websocket-driver/-/websocket-driver-0.3.5.tgz";
@@ -20175,27 +22107,28 @@
];
buildInputs =
(self.nativeDeps."websocket-driver" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "websocket-driver" ];
};
- by-spec."when"."~3.1.0" =
- self.by-version."when"."3.1.0";
- by-version."when"."3.1.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-when-3.1.0";
+ by-spec."when"."~3.4.6" =
+ self.by-version."when"."3.4.6";
+ by-version."when"."3.4.6" = lib.makeOverridable self.buildNodePackage {
+ name = "when-3.4.6";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/when/-/when-3.1.0.tgz";
- name = "when-3.1.0.tgz";
- sha1 = "a2479659ca15f725541ecf52ebae091b781ee134";
+ url = "http://registry.npmjs.org/when/-/when-3.4.6.tgz";
+ name = "when-3.4.6.tgz";
+ sha1 = "8fbcb7cc1439d2c3a68c431f1516e6dcce9ad28c";
})
];
buildInputs =
(self.nativeDeps."when" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "when" ];
@@ -20204,6 +22137,7 @@
self.by-version."which"."1.0.5";
by-version."which"."1.0.5" = lib.makeOverridable self.buildNodePackage {
name = "which-1.0.5";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/which/-/which-1.0.5.tgz";
@@ -20213,8 +22147,8 @@
];
buildInputs =
(self.nativeDeps."which" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "which" ];
@@ -20227,6 +22161,7 @@
self.by-version."winser"."0.1.6";
by-version."winser"."0.1.6" = lib.makeOverridable self.buildNodePackage {
name = "winser-0.1.6";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/winser/-/winser-0.1.6.tgz";
@@ -20236,45 +22171,46 @@
];
buildInputs =
(self.nativeDeps."winser" or []);
- deps = [
- self.by-version."sequence"."2.2.1"
- self.by-version."commander"."1.3.1"
- ];
+ deps = {
+ "sequence-2.2.1" = self.by-version."sequence"."2.2.1";
+ "commander-1.3.1" = self.by-version."commander"."1.3.1";
+ };
peerDependencies = [
];
passthru.names = [ "winser" ];
};
by-spec."winston"."*" =
- self.by-version."winston"."0.7.3";
- by-version."winston"."0.7.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-winston-0.7.3";
+ self.by-version."winston"."0.8.0";
+ by-version."winston"."0.8.0" = lib.makeOverridable self.buildNodePackage {
+ name = "winston-0.8.0";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/winston/-/winston-0.7.3.tgz";
- name = "winston-0.7.3.tgz";
- sha1 = "7ae313ba73fcdc2ecb4aa2f9cd446e8298677266";
+ url = "http://registry.npmjs.org/winston/-/winston-0.8.0.tgz";
+ name = "winston-0.8.0.tgz";
+ sha1 = "61d0830fa699706212206b0a2b5ca69a93043668";
})
];
buildInputs =
(self.nativeDeps."winston" or []);
- deps = [
- self.by-version."async"."0.2.10"
- self.by-version."colors"."0.6.2"
- self.by-version."cycle"."1.0.3"
- self.by-version."eyes"."0.1.8"
- self.by-version."pkginfo"."0.3.0"
- self.by-version."request"."2.16.6"
- self.by-version."stack-trace"."0.0.9"
- ];
+ deps = {
+ "async-0.2.10" = self.by-version."async"."0.2.10";
+ "colors-0.6.2" = self.by-version."colors"."0.6.2";
+ "cycle-1.0.3" = self.by-version."cycle"."1.0.3";
+ "eyes-0.1.8" = self.by-version."eyes"."0.1.8";
+ "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0";
+ "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9";
+ };
peerDependencies = [
];
passthru.names = [ "winston" ];
};
- "winston" = self.by-version."winston"."0.7.3";
+ "winston" = self.by-version."winston"."0.8.0";
by-spec."winston"."0.6.2" =
self.by-version."winston"."0.6.2";
by-version."winston"."0.6.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-winston-0.6.2";
+ name = "winston-0.6.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/winston/-/winston-0.6.2.tgz";
@@ -20284,15 +22220,15 @@
];
buildInputs =
(self.nativeDeps."winston" or []);
- deps = [
- self.by-version."async"."0.1.22"
- self.by-version."colors"."0.6.2"
- self.by-version."cycle"."1.0.3"
- self.by-version."eyes"."0.1.8"
- self.by-version."pkginfo"."0.2.3"
- self.by-version."request"."2.9.203"
- self.by-version."stack-trace"."0.0.9"
- ];
+ deps = {
+ "async-0.1.22" = self.by-version."async"."0.1.22";
+ "colors-0.6.2" = self.by-version."colors"."0.6.2";
+ "cycle-1.0.3" = self.by-version."cycle"."1.0.3";
+ "eyes-0.1.8" = self.by-version."eyes"."0.1.8";
+ "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
+ "request-2.9.203" = self.by-version."request"."2.9.203";
+ "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9";
+ };
peerDependencies = [
];
passthru.names = [ "winston" ];
@@ -20302,7 +22238,8 @@
by-spec."winston"."0.7.2" =
self.by-version."winston"."0.7.2";
by-version."winston"."0.7.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-winston-0.7.2";
+ name = "winston-0.7.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/winston/-/winston-0.7.2.tgz";
@@ -20312,27 +22249,57 @@
];
buildInputs =
(self.nativeDeps."winston" or []);
- deps = [
- self.by-version."async"."0.2.10"
- self.by-version."colors"."0.6.2"
- self.by-version."cycle"."1.0.3"
- self.by-version."eyes"."0.1.8"
- self.by-version."pkginfo"."0.3.0"
- self.by-version."request"."2.16.6"
- self.by-version."stack-trace"."0.0.9"
- ];
+ deps = {
+ "async-0.2.10" = self.by-version."async"."0.2.10";
+ "colors-0.6.2" = self.by-version."colors"."0.6.2";
+ "cycle-1.0.3" = self.by-version."cycle"."1.0.3";
+ "eyes-0.1.8" = self.by-version."eyes"."0.1.8";
+ "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0";
+ "request-2.16.6" = self.by-version."request"."2.16.6";
+ "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9";
+ };
peerDependencies = [
];
passthru.names = [ "winston" ];
};
+ by-spec."winston"."0.8.0" =
+ self.by-version."winston"."0.8.0";
+ by-spec."winston"."0.8.x" =
+ self.by-version."winston"."0.8.0";
by-spec."winston"."~0.7.2" =
self.by-version."winston"."0.7.3";
+ by-version."winston"."0.7.3" = lib.makeOverridable self.buildNodePackage {
+ name = "winston-0.7.3";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/winston/-/winston-0.7.3.tgz";
+ name = "winston-0.7.3.tgz";
+ sha1 = "7ae313ba73fcdc2ecb4aa2f9cd446e8298677266";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."winston" or []);
+ deps = {
+ "async-0.2.10" = self.by-version."async"."0.2.10";
+ "colors-0.6.2" = self.by-version."colors"."0.6.2";
+ "cycle-1.0.3" = self.by-version."cycle"."1.0.3";
+ "eyes-0.1.8" = self.by-version."eyes"."0.1.8";
+ "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0";
+ "request-2.16.6" = self.by-version."request"."2.16.6";
+ "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "winston" ];
+ };
by-spec."winston"."~0.7.3" =
self.by-version."winston"."0.7.3";
by-spec."with"."~1.1.0" =
self.by-version."with"."1.1.1";
by-version."with"."1.1.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-with-1.1.1";
+ name = "with-1.1.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/with/-/with-1.1.1.tgz";
@@ -20342,9 +22309,9 @@
];
buildInputs =
(self.nativeDeps."with" or []);
- deps = [
- self.by-version."uglify-js"."2.4.0"
- ];
+ deps = {
+ "uglify-js-2.4.0" = self.by-version."uglify-js"."2.4.0";
+ };
peerDependencies = [
];
passthru.names = [ "with" ];
@@ -20352,7 +22319,8 @@
by-spec."with"."~2.0.0" =
self.by-version."with"."2.0.0";
by-version."with"."2.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-with-2.0.0";
+ name = "with-2.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/with/-/with-2.0.0.tgz";
@@ -20362,9 +22330,9 @@
];
buildInputs =
(self.nativeDeps."with" or []);
- deps = [
- self.by-version."uglify-js"."2.4.0"
- ];
+ deps = {
+ "uglify-js-2.4.0" = self.by-version."uglify-js"."2.4.0";
+ };
peerDependencies = [
];
passthru.names = [ "with" ];
@@ -20372,7 +22340,8 @@
by-spec."with"."~3.0.0" =
self.by-version."with"."3.0.1";
by-version."with"."3.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "node-with-3.0.1";
+ name = "with-3.0.1";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/with/-/with-3.0.1.tgz";
@@ -20382,9 +22351,9 @@
];
buildInputs =
(self.nativeDeps."with" or []);
- deps = [
- self.by-version."uglify-js"."2.4.15"
- ];
+ deps = {
+ "uglify-js-2.4.15" = self.by-version."uglify-js"."2.4.15";
+ };
peerDependencies = [
];
passthru.names = [ "with" ];
@@ -20392,7 +22361,8 @@
by-spec."wordwrap"."0.0.x" =
self.by-version."wordwrap"."0.0.2";
by-version."wordwrap"."0.0.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-wordwrap-0.0.2";
+ name = "wordwrap-0.0.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz";
@@ -20402,8 +22372,8 @@
];
buildInputs =
(self.nativeDeps."wordwrap" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "wordwrap" ];
@@ -20412,10 +22382,33 @@
self.by-version."wordwrap"."0.0.2";
by-spec."wordwrap"."~0.0.2" =
self.by-version."wordwrap"."0.0.2";
+ by-spec."wrappy"."1" =
+ self.by-version."wrappy"."1.0.1";
+ by-version."wrappy"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+ name = "wrappy-1.0.1";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz";
+ name = "wrappy-1.0.1.tgz";
+ sha1 = "1e65969965ccbc2db4548c6b84a6f2c5aedd4739";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."wrappy" or []);
+ deps = {
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "wrappy" ];
+ };
+ by-spec."wrappy"."~1.0.1" =
+ self.by-version."wrappy"."1.0.1";
by-spec."wrench"."~1.5.0" =
self.by-version."wrench"."1.5.8";
by-version."wrench"."1.5.8" = lib.makeOverridable self.buildNodePackage {
- name = "node-wrench-1.5.8";
+ name = "wrench-1.5.8";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/wrench/-/wrench-1.5.8.tgz";
@@ -20425,18 +22418,41 @@
];
buildInputs =
(self.nativeDeps."wrench" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "wrench" ];
};
by-spec."wrench"."~1.5.4" =
self.by-version."wrench"."1.5.8";
+ by-spec."write-file-atomic"."~1.1.0" =
+ self.by-version."write-file-atomic"."1.1.0";
+ by-version."write-file-atomic"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+ name = "write-file-atomic-1.1.0";
+ bin = false;
+ src = [
+ (fetchurl {
+ url = "http://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.1.0.tgz";
+ name = "write-file-atomic-1.1.0.tgz";
+ sha1 = "e114cfb8f82188353f98217c5945451c9b4dc060";
+ })
+ ];
+ buildInputs =
+ (self.nativeDeps."write-file-atomic" or []);
+ deps = {
+ "graceful-fs-3.0.2" = self.by-version."graceful-fs"."3.0.2";
+ "slide-1.1.6" = self.by-version."slide"."1.1.6";
+ };
+ peerDependencies = [
+ ];
+ passthru.names = [ "write-file-atomic" ];
+ };
by-spec."ws"."0.4.x" =
self.by-version."ws"."0.4.32";
by-version."ws"."0.4.32" = lib.makeOverridable self.buildNodePackage {
name = "ws-0.4.32";
+ bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/ws/-/ws-0.4.32.tgz";
@@ -20446,12 +22462,12 @@
];
buildInputs =
(self.nativeDeps."ws" or []);
- deps = [
- self.by-version."commander"."2.1.0"
- self.by-version."nan"."1.0.0"
- self.by-version."tinycolor"."0.0.1"
- self.by-version."options"."0.0.5"
- ];
+ deps = {
+ "commander-2.1.0" = self.by-version."commander"."2.1.0";
+ "nan-1.0.0" = self.by-version."nan"."1.0.0";
+ "tinycolor-0.0.1" = self.by-version."tinycolor"."0.0.1";
+ "options-0.0.5" = self.by-version."options"."0.0.5";
+ };
peerDependencies = [
];
passthru.names = [ "ws" ];
@@ -20461,7 +22477,8 @@
by-spec."wu"."*" =
self.by-version."wu"."2.0.0";
by-version."wu"."2.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-wu-2.0.0";
+ name = "wu-2.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/wu/-/wu-2.0.0.tgz";
@@ -20471,38 +22488,41 @@
];
buildInputs =
(self.nativeDeps."wu" or []);
- deps = [
- self.by-version."traceur"."0.0.55"
- ];
+ deps = {
+ "traceur-0.0.55" = self.by-version."traceur"."0.0.55";
+ };
peerDependencies = [
];
passthru.names = [ "wu" ];
};
"wu" = self.by-version."wu"."2.0.0";
by-spec."x509"."*" =
- self.by-version."x509"."0.0.7";
- by-version."x509"."0.0.7" = lib.makeOverridable self.buildNodePackage {
- name = "node-x509-0.0.7";
+ self.by-version."x509"."0.1.4";
+ by-version."x509"."0.1.4" = lib.makeOverridable self.buildNodePackage {
+ name = "x509-0.1.4";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/x509/-/x509-0.0.7.tgz";
- name = "x509-0.0.7.tgz";
- sha1 = "198a57a9691649b030a383e0e5f89e635d6e99e7";
+ url = "http://registry.npmjs.org/x509/-/x509-0.1.4.tgz";
+ name = "x509-0.1.4.tgz";
+ sha1 = "08d016ed165db0c68a192edeb1cdca0f5d43cb22";
})
];
buildInputs =
(self.nativeDeps."x509" or []);
- deps = [
- ];
+ deps = {
+ "nan-1.3.0" = self.by-version."nan"."1.3.0";
+ };
peerDependencies = [
];
passthru.names = [ "x509" ];
};
- "x509" = self.by-version."x509"."0.0.7";
+ "x509" = self.by-version."x509"."0.1.4";
by-spec."xml2js"."0.2.4" =
self.by-version."xml2js"."0.2.4";
by-version."xml2js"."0.2.4" = lib.makeOverridable self.buildNodePackage {
- name = "node-xml2js-0.2.4";
+ name = "xml2js-0.2.4";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/xml2js/-/xml2js-0.2.4.tgz";
@@ -20512,9 +22532,9 @@
];
buildInputs =
(self.nativeDeps."xml2js" or []);
- deps = [
- self.by-version."sax"."0.6.0"
- ];
+ deps = {
+ "sax-0.6.0" = self.by-version."sax"."0.6.0";
+ };
peerDependencies = [
];
passthru.names = [ "xml2js" ];
@@ -20522,7 +22542,8 @@
by-spec."xml2js"."0.2.6" =
self.by-version."xml2js"."0.2.6";
by-version."xml2js"."0.2.6" = lib.makeOverridable self.buildNodePackage {
- name = "node-xml2js-0.2.6";
+ name = "xml2js-0.2.6";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/xml2js/-/xml2js-0.2.6.tgz";
@@ -20532,17 +22553,18 @@
];
buildInputs =
(self.nativeDeps."xml2js" or []);
- deps = [
- self.by-version."sax"."0.4.2"
- ];
+ deps = {
+ "sax-0.4.2" = self.by-version."sax"."0.4.2";
+ };
peerDependencies = [
];
passthru.names = [ "xml2js" ];
};
- by-spec."xml2js".">= 0.0.1" =
+ by-spec."xml2js"."0.4.4" =
self.by-version."xml2js"."0.4.4";
by-version."xml2js"."0.4.4" = lib.makeOverridable self.buildNodePackage {
- name = "node-xml2js-0.4.4";
+ name = "xml2js-0.4.4";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz";
@@ -20552,14 +22574,16 @@
];
buildInputs =
(self.nativeDeps."xml2js" or []);
- deps = [
- self.by-version."sax"."0.6.0"
- self.by-version."xmlbuilder"."2.4.3"
- ];
+ deps = {
+ "sax-0.6.0" = self.by-version."sax"."0.6.0";
+ "xmlbuilder-2.4.4" = self.by-version."xmlbuilder"."2.4.4";
+ };
peerDependencies = [
];
passthru.names = [ "xml2js" ];
};
+ by-spec."xml2js".">= 0.0.1" =
+ self.by-version."xml2js"."0.4.4";
by-spec."xml2js".">=0.1.7" =
self.by-version."xml2js"."0.4.4";
by-spec."xml2js"."^0.4.4" =
@@ -20567,7 +22591,8 @@
by-spec."xmlbuilder"."0.4.2" =
self.by-version."xmlbuilder"."0.4.2";
by-version."xmlbuilder"."0.4.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-xmlbuilder-0.4.2";
+ name = "xmlbuilder-0.4.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.2.tgz";
@@ -20577,28 +22602,29 @@
];
buildInputs =
(self.nativeDeps."xmlbuilder" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "xmlbuilder" ];
};
by-spec."xmlbuilder".">=1.0.0" =
- self.by-version."xmlbuilder"."2.4.3";
- by-version."xmlbuilder"."2.4.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-xmlbuilder-2.4.3";
+ self.by-version."xmlbuilder"."2.4.4";
+ by-version."xmlbuilder"."2.4.4" = lib.makeOverridable self.buildNodePackage {
+ name = "xmlbuilder-2.4.4";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.4.3.tgz";
- name = "xmlbuilder-2.4.3.tgz";
- sha1 = "0589eeee0986adf0af605e878f24ff6557d7697f";
+ url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.4.4.tgz";
+ name = "xmlbuilder-2.4.4.tgz";
+ sha1 = "6e2a84da5df79e11abb0a05bad2f0acc12e33893";
})
];
buildInputs =
(self.nativeDeps."xmlbuilder" or []);
- deps = [
- self.by-version."lodash-node"."2.4.1"
- ];
+ deps = {
+ "lodash-node-2.4.1" = self.by-version."lodash-node"."2.4.1";
+ };
peerDependencies = [
];
passthru.names = [ "xmlbuilder" ];
@@ -20606,7 +22632,8 @@
by-spec."xmldom"."~0.1.16" =
self.by-version."xmldom"."0.1.19";
by-version."xmldom"."0.1.19" = lib.makeOverridable self.buildNodePackage {
- name = "node-xmldom-0.1.19";
+ name = "xmldom-0.1.19";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/xmldom/-/xmldom-0.1.19.tgz";
@@ -20616,8 +22643,8 @@
];
buildInputs =
(self.nativeDeps."xmldom" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "xmldom" ];
@@ -20625,7 +22652,8 @@
by-spec."xmlhttprequest"."1.4.2" =
self.by-version."xmlhttprequest"."1.4.2";
by-version."xmlhttprequest"."1.4.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-xmlhttprequest-1.4.2";
+ name = "xmlhttprequest-1.4.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.4.2.tgz";
@@ -20635,8 +22663,8 @@
];
buildInputs =
(self.nativeDeps."xmlhttprequest" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "xmlhttprequest" ];
@@ -20644,7 +22672,8 @@
by-spec."xoauth2"."~0.1.8" =
self.by-version."xoauth2"."0.1.8";
by-version."xoauth2"."0.1.8" = lib.makeOverridable self.buildNodePackage {
- name = "node-xoauth2-0.1.8";
+ name = "xoauth2-0.1.8";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/xoauth2/-/xoauth2-0.1.8.tgz";
@@ -20654,8 +22683,8 @@
];
buildInputs =
(self.nativeDeps."xoauth2" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "xoauth2" ];
@@ -20663,7 +22692,8 @@
by-spec."xtend".">=4.0.0 <4.1.0-0" =
self.by-version."xtend"."4.0.0";
by-version."xtend"."4.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-xtend-4.0.0";
+ name = "xtend-4.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz";
@@ -20673,8 +22703,8 @@
];
buildInputs =
(self.nativeDeps."xtend" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "xtend" ];
@@ -20682,7 +22712,8 @@
by-spec."xtend"."^3.0.0" =
self.by-version."xtend"."3.0.0";
by-version."xtend"."3.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "node-xtend-3.0.0";
+ name = "xtend-3.0.0";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz";
@@ -20692,8 +22723,8 @@
];
buildInputs =
(self.nativeDeps."xtend" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "xtend" ];
@@ -20703,7 +22734,8 @@
by-spec."xtend"."~2.1.1" =
self.by-version."xtend"."2.1.2";
by-version."xtend"."2.1.2" = lib.makeOverridable self.buildNodePackage {
- name = "node-xtend-2.1.2";
+ name = "xtend-2.1.2";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz";
@@ -20713,9 +22745,9 @@
];
buildInputs =
(self.nativeDeps."xtend" or []);
- deps = [
- self.by-version."object-keys"."0.4.0"
- ];
+ deps = {
+ "object-keys-0.4.0" = self.by-version."object-keys"."0.4.0";
+ };
peerDependencies = [
];
passthru.names = [ "xtend" ];
@@ -20727,7 +22759,8 @@
by-spec."yargs"."~1.2.1" =
self.by-version."yargs"."1.2.6";
by-version."yargs"."1.2.6" = lib.makeOverridable self.buildNodePackage {
- name = "node-yargs-1.2.6";
+ name = "yargs-1.2.6";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/yargs/-/yargs-1.2.6.tgz";
@@ -20737,9 +22770,9 @@
];
buildInputs =
(self.nativeDeps."yargs" or []);
- deps = [
- self.by-version."minimist"."0.1.0"
- ];
+ deps = {
+ "minimist-0.1.0" = self.by-version."minimist"."0.1.0";
+ };
peerDependencies = [
];
passthru.names = [ "yargs" ];
@@ -20747,7 +22780,8 @@
by-spec."zeparser"."0.0.5" =
self.by-version."zeparser"."0.0.5";
by-version."zeparser"."0.0.5" = lib.makeOverridable self.buildNodePackage {
- name = "node-zeparser-0.0.5";
+ name = "zeparser-0.0.5";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/zeparser/-/zeparser-0.0.5.tgz";
@@ -20757,33 +22791,31 @@
];
buildInputs =
(self.nativeDeps."zeparser" or []);
- deps = [
- ];
+ deps = {
+ };
peerDependencies = [
];
passthru.names = [ "zeparser" ];
};
- by-spec."zip-stream"."~0.3.0" =
- self.by-version."zip-stream"."0.3.7";
- by-version."zip-stream"."0.3.7" = lib.makeOverridable self.buildNodePackage {
- name = "node-zip-stream-0.3.7";
+ by-spec."zip-stream"."~0.4.0" =
+ self.by-version."zip-stream"."0.4.1";
+ by-version."zip-stream"."0.4.1" = lib.makeOverridable self.buildNodePackage {
+ name = "zip-stream-0.4.1";
+ bin = false;
src = [
(fetchurl {
- url = "http://registry.npmjs.org/zip-stream/-/zip-stream-0.3.7.tgz";
- name = "zip-stream-0.3.7.tgz";
- sha1 = "c84d057eb0bcc0139747bd3c6c97280bcf5f2bb2";
+ url = "http://registry.npmjs.org/zip-stream/-/zip-stream-0.4.1.tgz";
+ name = "zip-stream-0.4.1.tgz";
+ sha1 = "4ea795a8ce19e9fab49a31d1d0877214159f03a3";
})
];
buildInputs =
(self.nativeDeps."zip-stream" or []);
- deps = [
- self.by-version."buffer-crc32"."0.2.3"
- self.by-version."crc32-stream"."0.2.0"
- self.by-version."debug"."1.0.4"
- self.by-version."deflate-crc32-stream"."0.1.1"
- self.by-version."lodash"."2.4.1"
- self.by-version."readable-stream"."1.0.31"
- ];
+ deps = {
+ "compress-commons-0.1.6" = self.by-version."compress-commons"."0.1.6";
+ "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
+ "readable-stream-1.0.32" = self.by-version."readable-stream"."1.0.32";
+ };
peerDependencies = [
];
passthru.names = [ "zip-stream" ];
@@ -20791,7 +22823,8 @@
by-spec."zlib-browserify"."^0.0.3" =
self.by-version."zlib-browserify"."0.0.3";
by-version."zlib-browserify"."0.0.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-zlib-browserify-0.0.3";
+ name = "zlib-browserify-0.0.3";
+ bin = false;
src = [
(fetchurl {
url = "http://registry.npmjs.org/zlib-browserify/-/zlib-browserify-0.0.3.tgz";
@@ -20801,9 +22834,9 @@
];
buildInputs =
(self.nativeDeps."zlib-browserify" or []);
- deps = [
- self.by-version."tape"."0.2.2"
- ];
+ deps = {
+ "tape-0.2.2" = self.by-version."tape"."0.2.2";
+ };
peerDependencies = [
];
passthru.names = [ "zlib-browserify" ];
diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json
index fec7884eb25..0550048a13e 100644
--- a/pkgs/top-level/node-packages.json
+++ b/pkgs/top-level/node-packages.json
@@ -72,6 +72,7 @@
, "statsd"
, "statsd-librato-backend"
, "stackdriver-statsd-backend"
+, "statsd-influxdb-backend"
, "ungit"
, { "node-uptime": "https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7" }
, { "guifi-earth": "https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " }
@@ -83,6 +84,7 @@
, "grunt-contrib-uglify"
, "grunt-karma"
, "grunt-sed"
+, "gulp"
, "karma"
, "karma-mocha"
, "karma-coverage"
@@ -109,7 +111,7 @@
, "posix"
, "node-protobuf"
, "rethinkdb"
-, { "titanium": "3.2.1" }
+, "titanium"
, "deepmerge"
, "slasp"
, "react"
@@ -123,4 +125,5 @@
, "sinon"
, "shelljs"
, "typescript"
+, "git-run"
]
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index a74cd8f2d8f..452144e0087 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -25,10 +25,10 @@ let self = _self // overrides; _self = with self; {
ack = buildPerlPackage rec {
- name = "ack-2.12";
+ name = "ack-2.14";
src = fetchurl {
url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz";
- sha256 = "0avxpgg1fvib4354d9a9710j63sgxpb5j07if5qr83apq9xx7wjj";
+ sha256 = "0gqv30666vlclnwylhk9i64s7raa70x4ncy6bg48s5gcxwrshjc5";
};
# use gnused so that the preCheck command passes
buildInputs = stdenv.lib.optional stdenv.isDarwin [ gnused ];
@@ -301,7 +301,7 @@ let self = _self // overrides; _self = with self; {
and produces an XML document in Dia format (or images via graphviz
and vcg). Its goal is to be a UML / DB Schema diagram autocreation
package. The diagrams its creates are standard UML diagrams showing
- dependancies, superclasses, packages, classes and inheritances, as
+ dependencies, superclasses, packages, classes and inheritances, as
well as the methods, etc of each class.
AutoDia supports any language that a Handler has been written for,
@@ -480,6 +480,7 @@ let self = _self // overrides; _self = with self; {
sha256 = "14s75bsm5irisp8wkbwl3ycw160srr1rks7x9jcbvcxh79wr6gbh";
};
propagatedBuildInputs = [ DigestSHA1 Error IPCShareLite ];
+ doCheck = false; # randomly fails
};
CacheFastMmap = buildPerlPackage rec {
@@ -1784,10 +1785,10 @@ let self = _self // overrides; _self = with self; {
};
CryptRandPasswd = buildPerlPackage {
- name = "Crypt-RandPasswd-0.05";
+ name = "Crypt-RandPasswd-0.06";
src = fetchurl {
- url = mirror://cpan/authors/id/N/NE/NEILB/Crypt-RandPasswd-0.05.tar.gz;
- sha256 = "0djcjzk0wmlf02gx9935m7c1dhpmdwx3hjal8x80aa92baavwf2s";
+ url = mirror://cpan/authors/id/N/NE/NEILB/Crypt-RandPasswd-0.06.tar.gz;
+ sha256 = "0ca8544371wp4vvqsa19lnhl02hczpkbwkgsgm65ziwwim3r1gdi";
};
};
@@ -3132,10 +3133,10 @@ let self = _self // overrides; _self = with self; {
};
EmailSender = buildPerlPackage {
- name = "Email-Sender-0.120002";
+ name = "Email-Sender-1.300014";
src = fetchurl {
- url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Sender-0.120002.tar.gz;
- sha256 = "1cp735ndmh76xzijsm1hd0yh0m9yj34jc8akjhidkn677h2021dc";
+ url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Sender-1.300014.tar.gz;
+ sha256 = "0yxqk0fjxasd7q62m65dl2n6xm4xcvfb6i1lajvwibygd9ckifw6";
};
propagatedBuildInputs = [ CaptureTiny EmailAbstract EmailAddress EmailSimple ListMoreUtils Moose Throwable TryTiny ];
meta = {
@@ -3784,10 +3785,10 @@ let self = _self // overrides; _self = with self; {
};
FinanceQuote = buildPerlPackage rec {
- name = "Finance-Quote-1.29";
+ name = "Finance-Quote-1.35";
src = fetchurl {
url = "mirror://cpan/authors/id/E/EC/ECOCODE/${name}.tar.gz";
- sha256 = "0rx8whixbhwq2imd3ffx3vcqdgfbjj6y1s01m38b52x3bjn9hw0f";
+ sha256 = "0mxfhi1ndckj4w7fw20rwy6ymalg2yncnp9xn0v2bnk5ibqj439w";
};
propagatedBuildInputs = [ CryptSSLeay HTMLTableExtract HTMLTree HTTPMessage LWP DateCalc JSON ];
meta = {
@@ -4246,6 +4247,7 @@ let self = _self // overrides; _self = with self; {
url = mirror://cpan/authors/id/C/CF/CFRANKS/HTML-Widget-1.11.tar.gz;
sha256 = "02w21rd30cza094m5xs9clzw8ayigbhg2ddzl6jycp4jam0dyhmy";
};
+ doCheck = false;
propagatedBuildInputs = [
TestNoWarnings ClassAccessor ClassAccessorChained
ClassDataAccessor ModulePluggableFast HTMLTree
@@ -4889,7 +4891,7 @@ let self = _self // overrides; _self = with self; {
platforms = stdenv.lib.platforms.unix;
};
};
-
+
ListBinarySearch = pkgs.buildPerlPackage {
name = "List-BinarySearch-0.20";
src = pkgs.fetchurl {
@@ -5721,6 +5723,15 @@ let self = _self // overrides; _self = with self; {
};
};
+ MooXTypesMooseLike = buildPerlPackage rec {
+ name = "MooX-Types-MooseLike-0.27";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/M/MA/MATEU/${name}.tar.gz";
+ sha256 = "1489almsam2zcrs5039sh0y88gjicwna8kws8j2jgfs8bpcf4dgf";
+ };
+ propagatedBuildInputs = [ Moo TestFatal ];
+ };
+
MooseAutobox = buildPerlPackage {
name = "Moose-Autobox-0.15";
src = fetchurl {
@@ -6449,6 +6460,7 @@ let self = _self // overrides; _self = with self; {
meta = {
description = "Use the Amazon S3 - Simple Storage Service";
license = "perl";
+ platforms = stdenv.lib.platforms.linux;
};
};
@@ -6467,12 +6479,13 @@ let self = _self // overrides; _self = with self; {
};
};
- NetAMQP = buildPerlPackage {
+ NetAMQP = buildPerlModule {
name = "Net-AMQP-0.06";
src = fetchurl {
url = mirror://cpan/authors/id/C/CH/CHIPS/Net-AMQP-0.06.tar.gz;
sha256 = "0b2ba7de2cd7ddd5fe102a2e2ae7aeba21eaab1078bf3bfd3c5a722937256380";
};
+ doCheck = false; # failures on 32bit
buildInputs = [ TestDeep ];
propagatedBuildInputs = [ ClassAccessor ClassDataInheritable XMLLibXML ];
meta = {
@@ -6481,13 +6494,6 @@ let self = _self // overrides; _self = with self; {
maintainers = with maintainers; [ ocharles ];
platforms = stdenv.lib.platforms.unix;
};
- preConfigure =
- ''
- substituteInPlace META.json \
- '"Module::Build" : "0.40"' '"Module::Build" : "0.39"'
- substituteInPlace META.yml \
- 'Module::Build: 0.40' 'Module::Build: 0.39'
- '';
};
NetCoverArtArchive = buildPerlPackage {
@@ -6981,10 +6987,10 @@ let self = _self // overrides; _self = with self; {
};
Plack = buildPerlPackage {
- name = "Plack-1.0030";
+ name = "Plack-1.0031";
src = fetchurl {
- url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-1.0030.tar.gz;
- sha256 = "0bb9aqb0h9q4qjgkw756gf695h4qg6vim54s6f2icgsazdi63zq7";
+ url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-1.0031.tar.gz;
+ sha256 = "0vvppxs36729lggrx4s1gn37lzsm794wfkm3k386bwhkmk7sr31i";
};
buildInputs = [ FileShareDirInstall TestRequires ];
propagatedBuildInputs = [ ApacheLogFormatCompiler DevelStackTrace DevelStackTraceAsHTML FileShareDir FilesysNotifySimple HTTPBody HTTPMessage HashMultiValue LWP StreamBuffered TestTCP TryTiny URI ];
@@ -8168,6 +8174,7 @@ let self = _self // overrides; _self = with self; {
CatalystPluginSession CatalystPluginAuthentication
CatalystAuthenticationStoreDBIxClass
CatalystPluginAuthorizationRoles
+ CatalystPluginSessionStateCookie
CatalystPluginAuthorizationACL
CatalystPluginHTMLWidget
CatalystPluginSessionStoreFastMmap
@@ -9317,12 +9324,12 @@ let self = _self // overrides; _self = with self; {
};
Throwable = buildPerlPackage rec {
- name = "Throwable-0.102080";
+ name = "Throwable-0.200010";
src = fetchurl {
url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz";
- sha256 = "0vjzlh23rpmgr5h8qfh9pb3kqw0j8sxn2bpbc1p2306dwqwbymm5";
+ sha256 = "0qhq1f5bvgf5kjhmdg45vadq8dbc9gfms81hply5c6a71nmkv8yp";
};
- propagatedBuildInputs = [ DevelStackTrace Moose ];
+ propagatedBuildInputs = [ DevelStackTrace Moose Moo MooXTypesMooseLike ];
};
TieCycle = buildPerlPackage {
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 1225021ad37..700547450ec 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -39,6 +39,12 @@ let self = with self; {
sha256 = "1gcsh9iar5qa1yzpjki9bb5rivcb6yjp45lmjmp98wlyf83vmy2y";
};
+ zendopcache = buildPecl {
+ name = "zendopcache-7.0.3";
+
+ sha256 = "0qpfbkfy4wlnsfq4vc4q5wvaia83l89ky33s08gqrcfp3p1adn88";
+ };
+
zmq = buildPecl {
name = "zmq-1.1.2";
diff --git a/pkgs/top-level/python-packages-generated.nix b/pkgs/top-level/python-packages-generated.nix
index 2cf742156a3..bb6be68fa9a 100644
--- a/pkgs/top-level/python-packages-generated.nix
+++ b/pkgs/top-level/python-packages-generated.nix
@@ -3670,7 +3670,7 @@ in
md5 = "d5d886088e78b1bdbfd66d328fc2d0bc";
};
doCheck = false;
- buildInputs = [ ];
+ buildInputs = [ pkgs.libxml2 pkgs.libxslt ];
propagatedBuildInputs = [ ];
installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
meta = {
@@ -5242,6 +5242,7 @@ in
doCheck = true;
buildInputs = [ self."nose-1.3.3" self."unittest2-0.5.1" self."pyquery-1.2.8" self."WSGIProxy2-0.4.1" self."PasteDeploy-1.5.2" self."mock-1.0.1" self."coverage-3.7.1" pkgs.unzip ];
propagatedBuildInputs = [ self."beautifulsoup4-4.3.2" self."six-1.6.1" self."waitress-0.8.9" self."WebOb-1.4" ];
+ preConfigure = ''substituteInPlace setup.py --replace "nose<1.3.0" "nose"'';
installCommand = ''easy_install --always-unzip --prefix="$out" .'';
meta = {
description = ''
diff --git a/pkgs/top-level/python-packages.json b/pkgs/top-level/python-packages.json
index 74e092d309a..7ef83ef9072 100644
--- a/pkgs/top-level/python-packages.json
+++ b/pkgs/top-level/python-packages.json
@@ -89,6 +89,10 @@
"Products.DCWorkflow": {
"propagatedBuildInputs": [ "eggtestinfo" ]
},
+ "lxml": {
+ "buildInputs": [ "pkgs.libxml2", "pkgs.libxslt" ],
+ "doCheck": false
+ },
"Products.CMFDefault": {
"propagatedBuildInputs": [ "eggtestinfo" ]
},
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 112f655f5fa..9613fe5f83f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1,5 +1,6 @@
{ pkgs, python }:
- with pkgs.lib;
+
+with pkgs.lib;
let
isPy26 = python.majorVersion == "2.6";
@@ -17,28 +18,37 @@ let
if isPy34 then "python34" else
if isPyPy then "pypy" else "";
- modules = python.modules or { readline = null; sqlite3 = null; curses = null; curses_panel = null; ssl = null; crypt = null; };
-
-pythonPackages = modules // import ./python-packages-generated.nix {
- inherit pkgs python;
- inherit (pkgs) stdenv fetchurl;
- self = pythonPackages;
-} //
+ modules = python.modules or {
+ readline = null;
+ sqlite3 = null;
+ curses = null;
+ curses_panel = null;
+ ssl = null;
+ crypt = null;
+ };
+ pythonPackages = modules // import ./python-packages-generated.nix {
+ inherit pkgs python;
+ inherit (pkgs) stdenv fetchurl;
+ self = pythonPackages;
+ }
# Python packages for all python versions
-rec {
+// rec {
inherit python isPy26 isPy27 isPy33 isPy34 isPyPy isPy3k pythonName;
inherit (pkgs) fetchurl fetchsvn fetchgit stdenv unzip;
# helpers
- callPackage = callPackageWith (pkgs // pythonPackages);
+ # glibcLocales doesn't build on Darwin
+ localePath = optionalString (! stdenv.isDarwin) "${pkgs.glibcLocales}/lib/locale/locale-archive";
+
+ callPackage = pkgs.newScope pythonPackages;
# global distutils config used by buildPythonPackage
distutils-cfg = callPackage ../development/python-modules/distutils-cfg { };
- buildPythonPackage = callPackage ../development/python-modules/generic { };
+ buildPythonPackage = makeOverridable (callPackage ../development/python-modules/generic { });
wrapPython = pkgs.makeSetupHook
{ deps = pkgs.makeWrapper;
@@ -49,23 +59,16 @@ rec {
# specials
- recursivePthLoader = import ../development/python-modules/recursive-pth-loader {
- inherit (pkgs) stdenv;
- inherit python;
- };
+ recursivePthLoader = callPackage ../development/python-modules/recursive-pth-loader { };
- setuptools = import ../development/python-modules/setuptools {
- inherit (pkgs) stdenv fetchurl;
- inherit python wrapPython distutils-cfg;
- };
+ setuptools = callPackage ../development/python-modules/setuptools { };
# packages defined elsewhere
blivet = callPackage ../development/python-modules/blivet { };
- dbus = import ../development/python-modules/dbus {
- inherit (pkgs) stdenv fetchurl pkgconfig dbus dbus_glib dbus_tools;
- inherit python;
+ dbus = callPackage ../development/python-modules/dbus {
+ dbus = pkgs.dbus;
};
discid = buildPythonPackage rec {
@@ -90,96 +93,70 @@ rec {
'';
};
- ipython = import ../shells/ipython {
- inherit (pkgs) stdenv fetchurl sip pyqt4;
- inherit buildPythonPackage pythonPackages;
+ h5py = callPackage ../development/python-modules/h5py {
+ hdf5 = pkgs.hdf5.override { mpi = null; };
+ };
+
+ h5py-mpi = h5py.override {
+ mpiSupport = true;
+ mpi = pkgs.openmpi;
+ hdf5 = pkgs.hdf5.override { mpi = pkgs.openmpi; enableShared = true; };
+ inherit mpi4py;
+ };
+
+ ipython = callPackage ../shells/ipython {
qtconsoleSupport = !pkgs.stdenv.isDarwin; # qt is not supported on darwin
pylabQtSupport = !pkgs.stdenv.isDarwin;
pylabSupport = !pkgs.stdenv.isDarwin; # cups is not supported on darwin
};
- ipythonLight = lowPrio (import ../shells/ipython {
- inherit (pkgs) stdenv fetchurl;
- inherit buildPythonPackage pythonPackages;
+ ipythonLight = lowPrio (ipython.override {
qtconsoleSupport = false;
pylabSupport = false;
pylabQtSupport = false;
});
+ mpi4py = callPackage ../development/python-modules/mpi4py {
+ mpi = pkgs.openmpi;
+ };
+
nixpart = callPackage ../tools/filesystems/nixpart { };
# This is used for NixOps to make sure we won't break it with the next major
# version of nixpart.
nixpart0 = nixpart;
- pitz = import ../applications/misc/pitz {
- inherit (pkgs) stdenv fetchurl;
- inherit buildPythonPackage tempita jinja2 pyyaml clepy mock nose decorator docutils;
+ pitz = callPackage ../applications/misc/pitz { };
+
+ pycairo = callPackage ../development/python-modules/pycairo {
};
- pycairo = import ../development/python-modules/pycairo {
- inherit (pkgs) stdenv fetchurl fetchpatch pkgconfig cairo x11;
- inherit python;
+ pycrypto = callPackage ../development/python-modules/pycrypto { };
+
+ pygobject = callPackage ../development/python-modules/pygobject { };
+
+ pygobject3 = callPackage ../development/python-modules/pygobject/3.nix { };
+
+ pygtk = callPackage ../development/python-modules/pygtk { libglade = null; };
+
+ pyGtkGlade = pygtk.override {
+ libglade = pkgs.gnome.libglade;
};
- pycrypto = import ../development/python-modules/pycrypto {
- inherit (pkgs) fetchurl stdenv gmp;
- inherit python buildPythonPackage;
- };
-
- pygobject = import ../development/python-modules/pygobject {
- inherit (pkgs) stdenv fetchurl pkgconfig glib;
- inherit python;
- };
-
- pygobject3 = import ../development/python-modules/pygobject/3.nix {
- inherit (pkgs) stdenv fetchurl pkgconfig glib gobjectIntrospection cairo;
- inherit python pycairo;
- };
-
- pygtk = import ../development/python-modules/pygtk {
- inherit (pkgs) fetchurl stdenv pkgconfig gtk;
- inherit python buildPythonPackage pygobject pycairo;
- };
-
- # XXX: how can we get an override here?
- #pyGtkGlade = pygtk.override {
- # inherit (pkgs.gnome) libglade;
- #};
- pyGtkGlade = import ../development/python-modules/pygtk {
- inherit (pkgs) fetchurl stdenv pkgconfig gtk;
- inherit (pkgs.gnome) libglade;
- inherit python buildPythonPackage pygobject pycairo;
- };
-
- pyqt4 = import ../development/python-modules/pyqt/4.x.nix {
- inherit (pkgs) stdenv fetchurl pkgconfig qt4 makeWrapper;
- inherit (pkgs.xorg) lndir;
- inherit python sip;
+ pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix {
pythonDBus = dbus;
};
- pyqt5 = import ../development/python-modules/pyqt/5.x.nix {
- inherit (pkgs) stdenv fetchurl pkgconfig qt5 makeWrapper;
- inherit (pkgs.xorg) lndir;
- inherit python;
+ pyqt5 = callPackage ../development/python-modules/pyqt/5.x.nix {
sip = sip_4_16;
pythonDBus = dbus;
};
- sip = import ../development/python-modules/sip {
- inherit (pkgs) stdenv fetchurl;
- inherit python;
- };
+ sip = callPackage ../development/python-modules/sip { };
- sip_4_16 = import ../development/python-modules/sip/4.16.nix {
- inherit (pkgs) stdenv fetchurl;
- inherit python;
- };
+ sip_4_16 = callPackage ../development/python-modules/sip/4.16.nix { };
- tables = import ../development/python-modules/tables {
- inherit (pkgs) stdenv fetchurl bzip2 lzo;
- inherit python buildPythonPackage cython numpy numexpr;
+ tables = callPackage ../development/python-modules/tables {
hdf5 = pkgs.hdf5.override { zlib = pkgs.zlib; };
};
@@ -421,6 +398,7 @@ rec {
apsw = buildPythonPackage rec {
name = "apsw-3.7.6.2-r1";
+ disabled = isPyPy;
src = fetchurl {
url = "http://apsw.googlecode.com/files/${name}.zip";
@@ -458,12 +436,11 @@ rec {
area53 = buildPythonPackage (rec {
- name = "area53-b2c9cdcabd";
+ name = "Area53-0.94";
- src = fetchgit {
- url = git://github.com/bigmlcom/Area53.git;
- rev = "b2c9cdcabd";
- sha256 = "b0c12b8c48ed9180c7475fab18de50d63e1b517cfb46da4d2c66fc406fe902bc";
+ src = fetchurl {
+ url = "https://pypi.python.org/packages/source/A/Area53/${name}.tar.gz";
+ sha256 = "0v9b7f8b6v21y410anx5sr52k2ac8jrzdf19q6m6p0zsdsf9vr42";
};
# error: invalid command 'test'
@@ -473,9 +450,27 @@ rec {
});
+ arrow = buildPythonPackage rec {
+ name = "arrow-${version}";
+ version = "0.4.4";
+
+ src = fetchurl {
+ url = "https://pypi.python.org/packages/source/a/arrow/${name}.tar.gz";
+ sha256 = "1sdr4gyjgvz86yr0ll0i11mgy8l1slndr7f0ngam87rpy78gp052";
+ };
+
+ doCheck = false;
+
+ meta = {
+ description = "Twitter API library";
+ license = "apache";
+ maintainers = [ maintainers.thoughtpolice ];
+ };
+ };
async = buildPythonPackage rec {
name = "async-0.6.1";
+ disabled = isPy3k;
meta.maintainers = [ stdenv.lib.maintainers.mornfall ];
buildInputs = [ pkgs.zlib ];
@@ -552,7 +547,7 @@ rec {
name = "avro-1.7.6";
disabled = isPy3k;
-
+
src = fetchurl {
url = "https://pypi.python.org/packages/source/a/avro/${name}.tar.gz";
md5 = "7f4893205e5ad69ac86f6b44efb7df72";
@@ -566,9 +561,9 @@ rec {
avro3k = pkgs.lowPrio (buildPythonPackage (rec {
name = "avro3k-1.7.7-SNAPSHOT";
-
+
disabled = (!isPy3k);
-
+
src = fetchurl {
url = "https://pypi.python.org/packages/source/a/avro3k/${name}.tar.gz";
sha256 = "15ahl0irwwj558s964abdxg4vp6iwlabri7klsm2am6q5r0ngsky";
@@ -596,6 +591,24 @@ rec {
};
};
+ batinfo = buildPythonPackage rec {
+ version = "0.1.9";
+ name = "batinfo-${version}";
+
+ src = fetchurl {
+ url = "https://pypi.python.org/packages/source/b/batinfo/${name}.tar.gz";
+ sha256 = "0ppzbh8lii16xfq5piczn82hwps1fnbq9rbwwl3rdpdx0n86l560";
+ };
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/nicolargo/batinfo;
+ description = "A simple Python lib to retreive battery information";
+ license = licenses.lgpl3;
+ platforms = platforms.all;
+ maintainers = [ maintainers.koral ];
+ };
+ };
+
bcdoc = buildPythonPackage rec {
name = "bcdoc-0.12.1";
@@ -637,7 +650,7 @@ rec {
src = fetchurl {
url = "http://pypi.python.org/packages/source/b/beautifulsoup4/${name}.tar.gz";
- md5 = "c012adc06217b8532c446d181cc56586";
+ md5 = "f1481ed77336de77a2d8e5b061b6ad62";
};
# invalid command 'test'
@@ -654,7 +667,7 @@ rec {
beaker = buildPythonPackage rec {
name = "Beaker-1.6.4";
-
+
disabled = isPy3k;
src = fetchurl {
@@ -693,7 +706,8 @@ rec {
};
buildInputs = [ pkgs.btrfsProgs ];
- propagatedBuildInputs = with pkgs; [ contextlib2 sqlalchemy8 pyxdg pycparser cffi alembic ];
+ propagatedBuildInputs = with pkgs; [ contextlib2 sqlalchemy9 pyxdg pycparser alembic ]
+ ++ optionals (!isPyPy) [ cffi ];
meta = {
description = "Deduplication for Btrfs";
@@ -735,9 +749,9 @@ rec {
modules.sqlite3
modules.readline
];
-
+
buildInputs = with pythonPackages; [ mock pyechonest six responses nose ];
-
+
# 10 tests are failing
doCheck = false;
@@ -748,12 +762,12 @@ rec {
maintainers = [ stdenv.lib.maintainers.iElectric ];
};
};
-
+
responses = pythonPackages.buildPythonPackage rec {
name = "responses-0.2.2";
propagatedBuildInputs = with pythonPackages; [ requests mock six pytest flake8 ];
-
+
doCheck = false;
src = fetchurl {
@@ -762,7 +776,7 @@ rec {
};
};
-
+
rarfile = pythonPackages.buildPythonPackage rec {
name = "rarfile-2.6";
@@ -778,7 +792,7 @@ rec {
homepage = https://github.com/markokr/rarfile;
};
};
-
+
pyechonest = pythonPackages.buildPythonPackage rec {
name = "pyechonest-8.0.2";
@@ -853,6 +867,23 @@ rec {
};
+ blinker = buildPythonPackage rec {
+ name = "blinker-${version}";
+ version = "1.3";
+
+ src = fetchurl {
+ url = "https://pypi.python.org/packages/source/b/blinker/${name}.tar.gz";
+ md5 = "66e9688f2d287593a0e698cd8a5fbc57";
+ };
+
+ meta = with stdenv.lib; {
+ homepage = http://pythonhosted.org/blinker/;
+ description = "Fast, simple object-to-object and broadcast signaling";
+ license = licenses.mit;
+ };
+ };
+
+
blockdiag = buildPythonPackage rec {
name = "blockdiag-1.3.2";
@@ -900,33 +931,6 @@ rec {
};
- # euca2ools (and maybe Nova) needs boto 1.9, 2.0 doesn't work.
- boto_1_9 = buildPythonPackage (rec {
- name = "boto-1.9b";
-
- src = fetchurl {
- url = "http://boto.googlecode.com/files/${name}.tar.gz";
- sha1 = "00a033b0a593c3ca82927867950f73d88b831155";
- };
-
- patches = [ ../development/python-modules/boto-1.9-python-2.7.patch ];
-
- meta = {
- homepage = http://code.google.com/p/boto/;
-
- license = "bsd";
-
- description = "Python interface to Amazon Web Services";
-
- longDescription = ''
- The boto module is an integrated interface to current and
- future infrastructural services offered by Amazon Web
- Services. This includes S3, SQS, EC2, among others.
- '';
- };
- });
-
-
boto = buildPythonPackage rec {
name = "boto-${version}";
version = "2.32.0";
@@ -980,6 +984,26 @@ rec {
};
};
+ bottle = buildPythonPackage rec {
+ version = "0.12.7";
+ name = "bottle-${version}";
+
+ src = fetchurl {
+ url = "https://pypi.python.org/packages/source/b/bottle/${name}.tar.gz";
+ sha256 = "0wr0gfz0bqlzhxk691x0xnf80b8v5pnl3jpnbgs1m9bcy28j3sp3";
+ };
+
+ propagatedBuildInputs = [ setuptools ];
+
+ meta = with stdenv.lib; {
+ homepage = http://bottlepy.org;
+ description = "A fast and simple micro-framework for small web-applications";
+ license = licenses.mit;
+ platforms = platforms.all;
+ maintainers = [ maintainers.koral ];
+ };
+ };
+
# bugz = buildPythonPackage (rec {
# name = "bugz-0.9.3";
@@ -1024,10 +1048,10 @@ rec {
maintainers = [ stdenv.lib.maintainers.garbas ];
};
};
-
+
zc_buildout171 = buildPythonPackage rec {
name = "zc.buildout-1.7.1";
-
+
disabled = isPy3k;
src = fetchurl {
@@ -1042,10 +1066,10 @@ rec {
maintainers = [ stdenv.lib.maintainers.garbas ];
};
};
-
+
zc_buildout152 = buildPythonPackage rec {
name = "zc.buildout-1.5.2";
-
+
disabled = isPy3k;
src = fetchurl {
@@ -1102,6 +1126,24 @@ rec {
});
+ cairocffi = buildPythonPackage rec {
+ name = "cairocffi-0.5.4";
+
+ src = fetchurl {
+ url = "https://pypi.python.org/packages/source/c/cairocffi/${name}.tar.gz";
+ md5 = "e3fa4002583bfaa88b156e1af9c75bde";
+ };
+
+ propagatedBuildInputs = [ cffi ];
+
+ meta = {
+ homepage = https://github.com/SimonSapin/cairocffi;
+ license = "bsd";
+ description = "cffi-based cairo bindings for Python";
+ };
+ };
+
+
carrot = buildPythonPackage rec {
name = "carrot-0.10.7";
@@ -1125,6 +1167,38 @@ rec {
};
};
+ certifi = buildPythonPackage rec {
+ name = "certifi-${version}";
+ version = "14.05.14";
+
+ src = fetchurl {
+ url = "https://pypi.python.org/packages/source/c/certifi/${name}.tar.gz";
+ sha256 = "0s8vxzfz6s4m6fvxc7z25k9j35w0rh6jkw3wwcd1az1mssncn6qy";
+ };
+
+ meta = with stdenv.lib; {
+ homepage = http://certifi.io/;
+ description = "Python package for providing Mozilla's CA Bundle.";
+ license = licenses.isc;
+ maintainers = [ maintainers.koral ];
+ };
+ };
+
+ characteristic = buildPythonPackage rec {
+ name = "characteristic-14.1.0";
+ src = fetchurl {
+ url = "https://pypi.python.org/packages/source/c/characteristic/${name}.tar.gz";
+ md5 = "68ea7e28997fc57d3631791ec0567a05";
+ };
+
+ buildInputs = [ pythonPackages.pytest ];
+
+ meta = {
+ description = "Python attributes without boilerplate";
+ homepage = https://characteristic.readthedocs.org;
+ };
+ };
+
cheetah = buildPythonPackage rec {
version = "2.4.4";
@@ -1197,6 +1271,7 @@ rec {
clientform = buildPythonPackage (rec {
name = "clientform-0.2.10";
+ disabled = isPy3k;
src = fetchurl {
url = "http://pypi.python.org/packages/source/C/ClientForm/ClientForm-0.2.10.tar.gz";
@@ -1312,7 +1387,7 @@ rec {
};
buildInputs = [ unittest2 ];
- propagatedBuildInputs = [ colander sqlalchemy8 ];
+ propagatedBuildInputs = [ colander sqlalchemy9 ];
# string: argument name cannot be overridden via info kwarg.
doCheck = false;
@@ -1326,16 +1401,18 @@ rec {
configobj = buildPythonPackage (rec {
- name = "configobj-4.7.2";
+ name = "configobj-5.0.6";
src = fetchurl {
url = "http://pypi.python.org/packages/source/c/configobj/${name}.tar.gz";
- md5 = "201dbaa732a9049c839f9bb6c27fc7b5";
+ md5 = "e472a3a1c2a67bb0ec9b5d54c13a47d6";
};
# error: invalid command 'test'
doCheck = false;
+ propagatedBuildInputs = [ six ];
+
meta = {
description = "Config file reading, writing and validation.";
homepage = http://pypi.python.org/pypi/configobj;
@@ -1502,7 +1579,7 @@ rec {
md5 = "c5df008669d17dd6eeb5e2042d5e136f";
};
- buildInputs = [ cffi pycparser mock pytest py ];
+ buildInputs = [ pycparser mock pytest py ] ++ optionals (!isPyPy) [ cffi ];
meta = {
maintainers = [ stdenv.lib.maintainers.iElectric ];
@@ -1517,7 +1594,7 @@ rec {
md5 = "d329f5cb2053fd31dafc02e2c9ef0299";
};
- buildInputs = [ pkgs.libffi pycparser ];
+ propagatedBuildInputs = [ pkgs.libffi pycparser ];
meta = {
maintainers = [ stdenv.lib.maintainers.iElectric ];
@@ -1565,22 +1642,16 @@ rec {
};
pytest = buildPythonPackage rec {
- name = "pytest-2.5.1";
+ name = "pytest-2.6.2";
src = fetchurl {
url = "http://pypi.python.org/packages/source/p/pytest/${name}.tar.gz";
- md5 = "4e155a0134e6757b37cc6698c20f3e9f";
+ md5 = "0a1735fb1d481ef3864f34678607ba85";
};
preCheck = ''
- # broken on python3, fixed in master, remove in next release
- rm doc/en/plugins_index/test_plugins_index.py
-
# don't test bash builtins
rm testing/test_argcomplete.py
-
- # yaml test are failing
- rm doc/en/example/nonpython/test_simple.yml
'';
propagatedBuildInputs = [ py ]
@@ -1590,7 +1661,7 @@ rec {
pythonPackages.selenium;
meta = with stdenv.lib; {
- maintainers = with maintainers; [ iElectric lovek323 ];
+ maintainers = with maintainers; [ iElectric lovek323 madjar ];
platforms = platforms.unix;
};
};
@@ -1646,6 +1717,7 @@ rec {
darcsver = buildPythonPackage (rec {
name = "darcsver-1.7.4";
+ disabled = isPy3k;
src = fetchurl {
url = "http://pypi.python.org/packages/source/d/darcsver/${name}.tar.gz";
@@ -1751,7 +1823,7 @@ rec {
platforms = stdenv.lib.platforms.all;
};
};
-
+
deform2 = buildPythonPackage rec {
name = "deform-2.0a2";
@@ -1841,6 +1913,27 @@ rec {
};
};
+ docker = buildPythonPackage rec {
+ name = "docker-py-0.4.0";
+
+ src = fetchurl {
+ url = "https://pypi.python.org/packages/source/d/docker-py/${name}.tar.gz";
+ md5 = "21ab8fd729105487e6423b654d6c0860";
+ };
+
+ propagatedBuildInputs = [ six requests websocket_client ];
+
+ # Version conflict
+ doCheck = false;
+
+ meta = {
+ description = "An API client for docker written in Python";
+ homepage = https://github.com/docker/docker-py;
+ license = licenses.asl20;
+ };
+ };
+
+
dogpile_cache = buildPythonPackage rec {
name = "dogpile.cache-0.5.4";
@@ -1877,8 +1970,26 @@ rec {
};
};
+ dotfiles = buildPythonPackage rec {
+ name = "dotfiles-0.6.3";
+
+ src = fetchurl {
+ url = "https://pypi.python.org/packages/source/d/dotfiles/${name}.tar.gz";
+ md5 = "95a0792eb92a8fc0db8a7e59389470fe";
+ };
+
+ doCheck = true;
+
+ meta = {
+ description = "Easily manage your dotfiles";
+ homepage = https://github.com/jbernard/dotfiles;
+ license = licenses.isc;
+ };
+ };
+
dpkt = buildPythonPackage rec {
name = "dpkt-1.8";
+ disabled = isPy3k;
src = fetchurl {
url = "https://dpkt.googlecode.com/files/${name}.tar.gz";
@@ -1925,6 +2036,7 @@ rec {
dropbox = buildPythonPackage rec {
name = "dropbox-2.0.0";
+ doCheck = !isPy3k; # failures with hash randomization
src = fetchurl {
url = "https://pypi.python.org/packages/source/d/dropbox/${name}.zip";
@@ -1942,12 +2054,13 @@ rec {
evdev = buildPythonPackage rec {
- version = "0.3.2";
+ version = "0.4.5";
name = "evdev-${version}";
+ disabled = isPy34; # see http://bugs.python.org/issue21121
src = fetchurl {
url = "https://pypi.python.org/packages/source/e/evdev/${name}.tar.gz";
- sha256 = "07gmynz764sln2sq18aafx13yawkv5nkqrkk06rj71sq71fsr9h9";
+ sha256 = "0w8ib3ab4mpfc1rvd335l8xkd41qbh3iyb0vfiiapgcfvqk74aq7";
};
buildInputs = [ pkgs.linuxHeaders ];
@@ -1967,12 +2080,13 @@ rec {
eyeD3 = buildPythonPackage rec {
- version = "0.7.2";
+ version = "0.7.4";
name = "eyeD3-${version}";
+ disabled = isPyPy;
src = fetchurl {
- url = http://eyed3.nicfit.net/releases/eyeD3-0.7.2.tgz;
- sha256 = "1r0vxdflrj83s8jc5f2qg4p00k37pskn3djym0w73bvq167vkxar";
+ url = "http://eyed3.nicfit.net/releases/${name}.tgz";
+ sha256 = "001hzgqqnf2ig432mq78jsxidpky2rl2ilm28xwjp32vzphycf51";
};
buildInputs = [ paver ];
@@ -2008,6 +2122,8 @@ rec {
md5 = "be885ccd9612966bb81839670d2da099";
};
+ doCheck = !isPy3k; # failures..
+
meta = {
description = "rapid multi-Python deployment";
license = stdenv.lib.licenses.gpl2;
@@ -2016,7 +2132,7 @@ rec {
facebook-sdk = buildPythonPackage rec {
name = "facebook-sdk-0.4.0";
-
+
disabled = isPy3k;
src = fetchurl {
@@ -2033,6 +2149,7 @@ rec {
faker = buildPythonPackage rec {
name = "faker-0.0.4";
+ disabled = isPy3k;
src = fetchurl {
url = https://pypi.python.org/packages/source/F/Faker/Faker-0.0.4.tar.gz;
sha256 = "09q5jna3j8di0gw5yjx0dvlndkrk2x9vvqzwyfsvg3nlp8h38js1";
@@ -2070,6 +2187,7 @@ rec {
sha256 = "103mzf0l15kyvw5nmf7bsdrqg6y3wpyxmkyl2h9lk7jxb5gdc9s1";
};
disabled = isPy3k;
+ doCheck = (!isPyPy); # https://github.com/fabric/fabric/issues/11891
propagatedBuildInputs = [ paramiko pycrypto ];
buildInputs = [ fudge nose ];
};
@@ -2130,6 +2248,21 @@ rec {
};
};
+ singledispatch = buildPythonPackage rec {
+ name = "singledispatch-3.4.0.3";
+
+ propagatedBuildInputs = [ six ];
+
+ src = fetchurl {
+ url = "https://pypi.python.org/packages/source/s/singledispatch/${name}.tar.gz";
+ md5 = "af2fc6a3d6cc5a02d0bf54d909785fcb";
+ };
+
+ meta = with stdenv.lib; {
+ homepage = http://docs.python.org/3/library/functools.html;
+ };
+ };
+
gcutil = buildPythonPackage rec {
name = "gcutil-1.15.0";
meta.maintainers = [ stdenv.lib.maintainers.phreedom ];
@@ -2139,6 +2272,10 @@ rec {
sha256 = "12c98ivhjr01iz6lkga574xm8p0bsil6arydvpblyw8sjkgim5sq";
};
+ patchPhase = ''
+ substituteInPlace setup.py --replace "httplib2==0.8" "httplib2"
+ '';
+
propagatedBuildInputs = [ gflags iso8601_0_1_4 ipaddr httplib2 google_apputils google_api_python_client ];
};
@@ -2171,6 +2308,7 @@ rec {
googlecl = buildPythonPackage rec {
version = "0.9.14";
name = "googlecl-${version}";
+ disabled = isPy3k;
src = fetchurl {
url = "https://googlecl.googlecode.com/files/${name}.tar.gz";
@@ -2190,20 +2328,35 @@ rec {
gtimelog = buildPythonPackage rec {
name = "gtimelog-${version}";
- version = "0.8.1";
+ version = "0.9.1";
+
+ disabled = isPy26;
src = fetchurl {
url = "https://github.com/gtimelog/gtimelog/archive/${version}.tar.gz";
- sha256 = "0nwpfv284b26q97mfpagqkqb4n2ilw46cx777qsyi3plnywk1xa0";
+ sha256 = "0qk8fv8cszzqpdi3wl9vvkym1jil502ycn6sic4jrxckw5s9jsfj";
};
- propagatedBuildInputs = [ pygtk ];
+ preBuild = ''
+ export LOCALE_ARCHIVE=${localePath}
+ export LC_ALL="en_US.UTF-8"
+ '';
+
+ # TODO: AppIndicator
+ propagatedBuildInputs = [ pkgs.gobjectIntrospection pygobject3 pkgs.makeWrapper pkgs.gtk3 ];
checkPhase = ''
- patchShebangs ./runtests
+ substituteInPlace runtests --replace "/usr/bin/env python" "${python}/bin/${python.executable}"
./runtests
'';
+ preFixup = ''
+ wrapProgram $out/bin/gtimelog \
+ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+ --prefix LD_LIBRARY_PATH ":" "${pkgs.gtk3}/lib" \
+
+ '';
+
meta = with stdenv.lib; {
description = "A small Gtk+ app for keeping track of your time. It's main goal is to be as unintrusive as possible";
homepage = http://mg.pov.lt/gtimelog/;
@@ -2227,23 +2380,33 @@ rec {
};
};
- # TODO: this shouldn't use a buildPythonPackage
- koji = buildPythonPackage (rec {
- name = "koji-1.8";
- meta.maintainers = [ stdenv.lib.maintainers.mornfall ];
+ jsonwatch = buildPythonPackage rec {
+ name = "jsonwatch-0.2.0";
+
+ disabled = isPyPy; # doesn't find setuptools
src = fetchurl {
- url = "https://fedorahosted.org/released/koji/koji-1.8.0.tar.bz2";
- sha256 = "10dph209h4jgajb5jmbjhqy4z4hd22i7s2d93vm3ikdf01i8iwf1";
+ url = "https://github.com/dbohdan/jsonwatch/archive/v0.2.0.tar.gz";
+ sha256 = "04b616ef97b9d8c3887004995420e52b72a4e0480a92dbf60aa6c50317261e06";
};
- configurePhase = ":";
- buildPhase = ":";
- installPhase = "make install DESTDIR=$out/ && cp -R $out/nix/store/*/* $out/ && rm -rf $out/nix";
- doCheck = false;
- propagatedBuildInputs = [ pythonPackages.pycurl ];
+ propagatedBuildInputs = [ six ];
- });
+ meta = {
+ description = "Like watch -d but for JSON";
+ longDescription = ''
+ jsonwatch is a command line utility with which you can track changes in
+ JSON data delivered by a shell command or a web (HTTP/HTTPS) API.
+ jsonwatch requests data from the designated source repeatedly at a set
+ interval and displays the differences when the data changes. It is
+ similar in its behavior to how watch(1) with the -d switch works
+ for plain-text data.
+ '';
+ homepage = "https://github.com/dbohdan/jsonwatch";
+ license = stdenv.lib.licenses.mit;
+ platforms = stdenv.lib.platforms.all;
+ };
+ };
logilab_astng = buildPythonPackage rec {
name = "logilab-astng-0.24.3";
@@ -2352,7 +2515,7 @@ rec {
url = "http://pypi.python.org/packages/source/p/pyramid/${name}.tar.gz";
md5 = "8a1ab3b773d8e22437828f7df22852c1";
};
-
+
preCheck = ''
# test is failing, see https://github.com/Pylons/pyramid/issues/1405
rm pyramid/tests/test_response.py
@@ -2532,11 +2695,11 @@ rec {
radicale = buildPythonPackage rec {
name = "radicale-${version}";
namePrefix = "";
- version = "0.9b1";
+ version = "0.9";
src = fetchurl {
url = "http://pypi.python.org/packages/source/R/Radicale/Radicale-${version}.tar.gz";
- sha256 = "3a8451909de849f173f577ddec0a085f19040dbb6aa13d5256208a0f8e11d88d";
+ sha256 = "77bf813fd26f0d359c1a7b7bcce9b842b4503c5516989a4a0a4f648e299e41f7";
};
propagatedBuildInputs = with pythonPackages; [
@@ -2549,6 +2712,7 @@ rec {
meta = {
homepage = "http://www.radicale.org/";
+ description = "CalDAV CardDAV server";
longDescription = ''
The Radicale Project is a complete CalDAV (calendar) and CardDAV
(contact) server solution. Calendars and address books are available for
@@ -2634,7 +2798,7 @@ rec {
url = "http://pypi.python.org/packages/source/p/pyramid_zodbconn/${name}.tar.gz";
md5 = "3c7746a227fbcda3e138ab8bfab7700b";
};
-
+
# should be fixed in next release
doCheck = false;
@@ -2715,7 +2879,7 @@ rec {
maintainers = [ stdenv.lib.maintainers.iElectric ];
};
};
-
+
ZEO = pythonPackages.buildPythonPackage rec {
name = "ZEO-4.0.0";
@@ -2730,10 +2894,12 @@ rec {
homepage = https://pypi.python.org/pypi/ZEO;
};
};
-
+
random2 = pythonPackages.buildPythonPackage rec {
name = "random2-1.0.1";
+ doCheck = !isPyPy;
+
src = fetchurl {
url = "https://pypi.python.org/packages/source/r/random2/${name}.zip";
md5 = "48a0a86fe00e447212d0095de8cf3e21";
@@ -2840,7 +3006,16 @@ rec {
};
};
+ zope_tales = buildPythonPackage rec {
+ name = "zope.tales-4.0.2";
+ propagatedBuildInputs = [ zope_interface six zope_testrunner ];
+
+ src = fetchurl {
+ url = "https://pypi.python.org/packages/source/z/zope.tales/${name}.zip";
+ md5 = "902b03a5f9774f6e2decf3f06d18a09d";
+ };
+ };
zope_deprecation = buildPythonPackage rec {
@@ -2921,11 +3096,11 @@ rec {
};
deluge = buildPythonPackage rec {
- name = "deluge-1.3.6";
+ name = "deluge-1.3.7";
src = fetchurl {
- url = "http://download.deluge-torrent.org/source/${name}.tar.gz";
- md5 = "33557678bf2f320de670ddaefaea009d";
+ url = "http://download.deluge-torrent.org/source/${name}.tar.bz2";
+ sha256 = "07m5lgkqymlh0810bk2f5l0k83n51xb3gszj11sr509jgbnxjnmm";
};
propagatedBuildInputs = with pkgs; [
@@ -3057,12 +3232,12 @@ rec {
django_evolution = buildPythonPackage rec {
- name = "django_evolution-0.7.3";
+ name = "django_evolution-0.6.9";
disabled = isPy3k;
src = fetchurl {
- url = "http://downloads.reviewboard.org/releases/django-evolution/0.7/${name}.tar.gz";
- md5 = "c51895b6501dd58b0e5dc8f5a5fb6f68";
+ url = "http://downloads.reviewboard.org/releases/django-evolution/${name}.tar.gz";
+ md5 = "c0d7d10bc41898c88b14d434c48766ff";
};
propagatedBuildInputs = [ django_1_5 ];
@@ -3112,39 +3287,41 @@ rec {
dulwich = buildPythonPackage rec {
- name = "dulwich-0.8.7";
+ name = "dulwich-${version}";
+ version = "0.9.7";
src = fetchurl {
- url = "http://samba.org/~jelmer/dulwich/${name}.tar.gz";
- sha256 = "041qp5v2x8fbwkmws6hwwiny74lavkz723dj8gwbm40b2383d8vv";
+ url = "https://pypi.python.org/packages/source/d/dulwich/${name}.tar.gz";
+ sha256 = "1wq083g9b1xsk89kb0wwpi4mxy63x6760vn9x5sk1fx36h27prqj";
};
- buildPhase = "make build";
+ # Only test dependencies
+ buildInputs = [ pkgs.git gevent geventhttpclient mock fastimport ];
- # For some reason "python setup.py test" doesn't work with Python 2.6.
- # pretty sure that is about import behaviour.
- doCheck = python.majorVersion != "2.6";
-
- meta = {
+ meta = with stdenv.lib; {
description = "Simple Python implementation of the Git file formats and protocols.";
homepage = http://samba.org/~jelmer/dulwich/;
+ license = licenses.gpl2Plus;
+ maintainers = [ maintainers.koral ];
};
};
- hggit = buildPythonPackage rec {
- name = "hg-git-0.3.1";
+ hg-git = buildPythonPackage rec {
+ name = "hg-git-${version}";
+ version = "0.6.1";
src = fetchurl {
url = "http://pypi.python.org/packages/source/h/hg-git/${name}.tar.gz";
- md5 = "4b15867a07abb0be985177581ce64cee";
+ sha256 = "136kz4w377ldcjdg865azi8aym0xnxzxl3rycnflgay26ar1309s";
};
- propagatedBuildInputs = [ dulwich ];
+ propagatedBuildInputs = [ pkgs.mercurial dulwich ];
- meta = {
+ meta = with stdenv.lib; {
description = "Push and pull from a Git server using Mercurial.";
homepage = http://hg-git.github.com/;
+ maintainers = [ maintainers.koral ];
};
};
@@ -3239,12 +3416,15 @@ rec {
enum = buildPythonPackage rec {
name = "enum-0.4.4";
+ disabled = isPy3k;
src = fetchurl {
url = "http://pypi.python.org/packages/source/e/enum/${name}.tar.gz";
md5 = "ce75c7c3c86741175a84456cc5bd531e";
};
+ doCheck = !isPyPy;
+
buildInputs = [ ];
propagatedBuildInputs = [ ];
@@ -3292,7 +3472,7 @@ rec {
buildInputs = [ nose httplib2 ];
- propagatedBuildInputs = [ greenlet ];
+ propagatedBuildInputs = optionals (!isPyPy) [ greenlet ];
PYTHON_EGG_CACHE = "`pwd`/.egg-cache";
@@ -3304,6 +3484,43 @@ rec {
};
};
+ fastimport = buildPythonPackage rec {
+ name = "fastimport-${version}";
+ version = "0.9.4";
+
+ src = fetchurl {
+ url = "https://pypi.python.org/packages/source/f/fastimport/${name}.tar.gz";
+ sha256 = "0k8x7552ypx9rc14vbsvg2lc6z0r8pv9laah28pdwyynbq10825d";
+ };
+
+ meta = with stdenv.lib; {
+ homepage = https://launchpad.net/python-fastimport;
+ description = "VCS fastimport/fastexport parser";
+ maintainers = [ maintainers.koral ];
+ license = licenses.gpl2Plus;
+ };
+ };
+
+ feedgenerator = buildPythonPackage (rec {
+ name = "feedgenerator-1.7";
+
+ src = fetchurl {
+ url = "https://pypi.python.org/packages/source/f/feedgenerator/${name}.tar.gz";
+ md5 = "92978492871342ad64e8ae0ccfcf200c";
+ };
+
+ preConfigure = ''
+ export LOCALE_ARCHIVE=${pkgs.glibcLocales}/lib/locale/locale-archive
+ export LC_ALL="en_US.UTF-8"
+ '';
+
+ propagatedBuildInputs = [ six pytz ];
+
+ meta = {
+ homepage = https://github.com/dmdm/feedgenerator-py3k.git;
+ description = "Standalone version of django.utils.feedgenerator, compatible with Py3k";
+ };
+ });
feedparser = buildPythonPackage (rec {
name = "feedparser-5.1.3";
@@ -3362,8 +3579,26 @@ rec {
};
};
+ flask_cache = buildPythonPackage rec {
+ name = "Flask-Cache-0.13.1";
+
+ src = fetchurl {
+ url = "https://pypi.python.org/packages/source/F/Flask-Cache/${name}.tar.gz";
+ md5 = "ab82a9cd0844891ccdb54fbb93fd6c59";
+ };
+
+ propagatedBuildInputs = [ werkzeug flask ];
+
+ meta = {
+ homepage = https://github.com/thadeusb/flask-cache;
+ description = "Adds cache support to your Flask application";
+ license = "BSD";
+ };
+ };
+
flexget = buildPythonPackage rec {
name = "FlexGet-1.2.161";
+ disabled = isPy3k;
src = fetchurl {
url = "https://pypi.python.org/packages/source/F/FlexGet/${name}.tar.gz";
@@ -3371,7 +3606,7 @@ rec {
};
buildInputs = [ nose ];
- # dateutil dependancy: requirement is dateutil !=2.0 and != 2.2,
+ # dateutil dependency: requirement is dateutil !=2.0 and != 2.2,
# dateutil_1_5 is used as it's supported, but a newer version could be used
propagatedBuildInputs = [ paver feedparser sqlalchemy pyyaml rpyc
beautifulsoup4 html5lib pyrss2gen pynzb progressbar jinja2 flask
@@ -3421,7 +3656,7 @@ rec {
};
buildInputs = [ nose mock ];
-
+
patchPhase = ''
substituteInPlace jsonschema/tests/test_jsonschema_test_suite.py --replace "python" "${python}/bin/${python.executable}"
'';
@@ -3440,6 +3675,7 @@ rec {
flup = buildPythonPackage (rec {
name = "flup-1.0.2";
+ disabled = isPy3k;
src = fetchurl {
url = "http://www.saddi.com/software/flup/dist/${name}.tar.gz";
@@ -3506,6 +3742,7 @@ rec {
baseName = "fuse";
version = "0.2.1";
name = "${baseName}-${version}";
+ disabled = isPy3k;
src = fetchurl {
url = "mirror://sourceforge/fuse/fuse-python-${version}.tar.gz";
@@ -3580,15 +3817,15 @@ rec {
gevent = buildPythonPackage rec {
name = "gevent-1.0.1";
- disabled = isPy3k;
-
+ disabled = isPy3k || isPyPy; # see https://github.com/surfly/gevent/issues/248
+
src = fetchurl {
url = "https://pypi.python.org/packages/source/g/gevent/${name}.tar.gz";
sha256 = "0hyzfb0gcx9pm5c2igan8y57hqy2wixrwvdjwsaivxsqs0ay49s6";
};
buildInputs = [ pkgs.libev ];
- propagatedBuildInputs = [ greenlet ];
+ propagatedBuildInputs = optionals (!isPyPy) [ greenlet ];
meta = with stdenv.lib; {
description = "Coroutine-based networking library";
@@ -3599,6 +3836,24 @@ rec {
};
};
+ geventhttpclient = buildPythonPackage rec {
+ name = "geventhttpclient-${version}";
+ version = "1.1.0";
+
+ src = fetchurl {
+ url = "https://pypi.python.org/packages/source/g/geventhttpclient/${name}.tar.gz";
+ sha256 = "1k7s4dnkmcfqqkmbqi0vvb2ns53r9cl2652mq20bgg65zj26j2l6";
+ };
+
+ propagatedBuildInputs = [ gevent certifi backports_ssl_match_hostname_3_4_0_2 ];
+
+ meta = with stdenv.lib; {
+ homepage = http://github.com/gwik/geventhttpclient;
+ description = "HTTP client library for gevent";
+ license = licenses.mit;
+ maintainers = [ maintainers.koral ];
+ };
+ };
gevent-socketio = buildPythonPackage rec {
name = "gevent-socketio-0.3.6";
@@ -3681,25 +3936,27 @@ rec {
};
glances = buildPythonPackage rec {
- name = "glances-${meta.version}";
+ name = "glances-${version}";
+ version = "2.1";
+ disabled = isPyPy;
- src = fetchurl {
- url = "https://github.com/nicolargo/glances/archive/v${meta.version}.tar.gz";
- sha256 = "19pin04whc1z4gmwv2rqa7mh08d6007r8dyrhihnxj0v35ghp5i0";
+ src = pkgs.fetchFromGitHub {
+ owner = "nicolargo";
+ repo = "glances";
+ rev = "v${version}";
+ sha256 = "1bgr7lif0bpnz39arcdrsfdy7ra4c3ay2pxz1lvh4fqxyxwp3gm6";
};
- buildInputs = [ pkgs.hddtemp ];
-
- propagatedBuildInputs = [ psutil jinja2 modules.curses modules.curses_panel];
-
doCheck = false;
+ buildInputs = [ unittest2 ];
+ propagatedBuildInputs = [ modules.curses modules.curses_panel psutil setuptools bottle batinfo pkgs.hddtemp pysnmp ];
+
preConfigure = ''
- sed -i -r -e '/data_files.append[(][(](conf|etc)_path/ietc_path="etc/glances"; conf_path="etc/glances"' setup.py;
+ sed -i 's/data_files\.append((conf_path/data_files.append(("etc\/glances"/' setup.py;
'';
meta = {
- version = "1.7.4";
homepage = "http://nicolargo.github.io/glances/";
description = "Cross-platform curses-based monitoring tool";
};
@@ -3707,12 +3964,15 @@ rec {
goobook = buildPythonPackage rec {
name = "goobook-1.5";
+ disabled = isPy3k;
src = fetchurl {
url = "https://pypi.python.org/packages/source/g/goobook/${name}.tar.gz";
sha256 = "05vpriy391l5i05ckl5ja5bswqyvl3rwrbmks9pi46w1813j7p5z";
};
+ buildInputs = [ six ];
+
preConfigure = ''
sed -i '/distribute/d' setup.py
'';
@@ -3748,6 +4008,7 @@ rec {
google_apputils = buildPythonPackage rec {
name = "google-apputils-0.4.0";
+ disabled = isPy3k;
src = fetchurl {
url = http://pypi.python.org/packages/source/g/google-apputils/google-apputils-0.4.0.tar.gz;
@@ -3764,6 +4025,7 @@ rec {
greenlet = buildPythonPackage rec {
name = "greenlet-0.4.3";
+ disabled = isPyPy; # builtin for pypy
src = fetchurl {
url = "http://pypi.python.org/packages/source/g/greenlet/${name}.zip";
@@ -3778,13 +4040,13 @@ rec {
gyp = buildPythonPackage rec {
- rev = "1944";
+ rev = "1977";
name = "gyp-r${rev}";
src = fetchsvn {
url = "http://gyp.googlecode.com/svn/trunk";
inherit rev;
- sha256 = "15k3ivk3jyhx4rwdf1mn6qpyrwixvy01jpkir8d14c4g9hax1dx1";
+ sha256 = "0vnr75yd3bidysiwl9lljvf1dv6v9m9xqdnx0hdgyl92w689n9j8";
};
patches = optionals pkgs.stdenv.isDarwin [
@@ -3815,13 +4077,20 @@ rec {
};
hcs_utils = buildPythonPackage rec {
- name = "hcs_utils-1.3";
+ name = "hcs_utils-1.5";
src = fetchurl {
- url = "https://pypi.python.org/packages/source/h/hcs_utils/hcs_utils-1.3.tar.gz";
- sha256 = "0mcjfc0ssil86i74dg323z7mikkw1xazqyr92347x1y33zyffgxh";
+ url = "https://pypi.python.org/packages/source/h/hcs_utils/${name}.tar.gz";
+ sha256 = "1d2za9crkgzildx610w3zif2i8phcqhh6n8nzg3yvy2mg0s18mkl";
};
+ preBuild = ''
+ export LOCALE_ARCHIVE=${localePath}
+ export LC_ALL="en_US.UTF-8"
+ '';
+
+ buildInputs = [ six ];
+
meta = with stdenv.lib; {
description = "Library collecting some useful snippets";
homepage = https://pypi.python.org/pypi/hcs_utils/1.3;
@@ -3834,12 +4103,12 @@ rec {
hetzner = buildPythonPackage rec {
name = "hetzner-${version}";
- version = "0.7.0";
+ version = "0.7.2";
src = fetchurl {
url = "https://github.com/RedMoonStudios/hetzner/archive/"
+ "v${version}.tar.gz";
- sha256 = "1ldbhwy6yk18frv6n9znvdsrqfnpch4mfvc70jrpq3f9fw236src";
+ sha256 = "07jnrgy9fkh1hwgsa8491ljz9spazmifqsg92m3xnamja1536qfl";
};
# not there yet, but coming soon.
@@ -3894,6 +4163,7 @@ rec {
http_signature = buildPythonPackage (rec {
name = "http_signature-0.1.4";
+ disabled = isPy3k;
src = fetchurl {
url = "http://pypi.python.org/packages/source/h/http_signature/${name}.tar.gz";
@@ -3946,6 +4216,8 @@ rec {
httpretty = buildPythonPackage rec {
name = "httpretty-${version}";
version = "0.8.3";
+ disabled = isPy3k;
+ doCheck = !isPyPy;
src = fetchurl {
url = "http://pypi.python.org/packages/source/h/httpretty/${name}.tar.gz";
@@ -3984,6 +4256,25 @@ rec {
doCheck = false;
}) else null;
+ influxdb = buildPythonPackage rec {
+ name = "influxdb-0.1.12";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/i/influxdb/${name}.tar.gz";
+ md5 = "6c975058ccc4df41dad8d8234c52d754";
+ };
+
+ # ImportError: No module named tests
+ doCheck = false;
+ propagatedBuildInputs = [ requests ];
+
+ meta = {
+ description = "Python client for InfluxDB";
+ homepage = https://github.com/influxdb/influxdb-python;
+ license = licenses.mit;
+ };
+ };
+
iptools = buildPythonPackage rec {
version = "0.6.1";
name = "iptools-${version}";
@@ -3992,7 +4283,7 @@ rec {
url = "http://pypi.python.org/packages/source/i/iptools/iptools-${version}.tar.gz";
md5 = "aed4045638fd40c16f8d9bb04606f700";
};
-
+
buildInputs = [ nose ];
meta = {
@@ -4021,10 +4312,12 @@ rec {
};
- ipaddr = buildPythonPackage {
+ ipaddr = buildPythonPackage rec {
name = "ipaddr-2.1.10";
+ disabled = isPy3k;
+
src = fetchurl {
- url = "http://ipaddr-py.googlecode.com/files/ipaddr-2.1.10.tar.gz";
+ url = "http://pypi.python.org/packages/source/i/ipaddr/${name}.tar.gz";
sha256 = "18ycwkfk3ypb1yd09wg20r7j7zq2a73d7j6j10qpgra7a7abzhyj";
};
@@ -4035,11 +4328,12 @@ rec {
};
};
- ipdb = buildPythonPackage {
- name = "ipdb-0.7";
+ ipdb = buildPythonPackage rec {
+ name = "ipdb-0.8";
+ disabled = isPyPy; # setupterm: could not find terminfo database
src = fetchurl {
- url = "http://pypi.python.org/packages/source/i/ipdb/ipdb-0.7.tar.gz";
- md5 = "d879f9b2b0f26e0e999809585dcaec61";
+ url = "http://pypi.python.org/packages/source/i/ipdb/${name}.zip";
+ md5 = "96dca0712efa01aa5eaf6b22071dd3ed";
};
propagatedBuildInputs = [ pythonPackages.ipythonLight ];
};
@@ -4131,6 +4425,9 @@ rec {
sha256 = "1flccphpyrb8y8dra2fq2s2v3fg615d77kjjmzl0gmiidabkkdqf";
};
+ buildInputs =
+ [ fs gdata python_keyczar mock pyasn1 pycrypto pytest six ];
+
meta = with stdenv.lib; {
description = "Store and access your passwords safely";
homepage = "https://pypi.python.org/pypi/keyring";
@@ -4138,13 +4435,12 @@ rec {
maintainers = with maintainers; [ lovek323 ];
platforms = platforms.unix;
};
-
- buildInputs =
- [ fs gdata python_keyczar mock pyasn1 pycrypto pytest ];
};
kitchen = buildPythonPackage (rec {
name = "kitchen-1.1.1";
+ disabled = isPy3k;
+
meta.maintainers = [ stdenv.lib.maintainers.mornfall ];
src = fetchurl {
@@ -4219,6 +4515,26 @@ rec {
});
+ linode = buildPythonPackage rec {
+ name = "linode-${version}";
+ version = "0.4";
+
+ src = fetchurl {
+ url = "https://pypi.python.org/packages/source/l/linode/linode-${version}.tar.gz";
+ md5 = "03a306575cf274719b3206ecee0bda9e";
+ };
+
+ propagatedBuildInputs = [ requests2 ];
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/ghickman/linode";
+ description = "A thin python wrapper around Linode's API";
+ license = licenses.mit;
+ maintainers = [ maintainers.nslqqq ];
+ };
+ };
+
+
lockfile = buildPythonPackage rec {
name = "lockfile-0.9.1";
@@ -4247,29 +4563,12 @@ rec {
propagatedBuildInputs = [ unittest2 ];
};
- "lxml-2.3.6" = buildPythonPackage rec {
- name = "lxml-2.3.6";
- src = fetchurl {
- url = "http://pypi.python.org/packages/source/l/lxml/lxml-2.3.6.tar.gz";
- md5 = "d5d886088e78b1bdbfd66d328fc2d0bc";
- };
- buildInputs = [ pkgs.libxml2 pkgs.libxslt ];
- propagatedBuildInputs = [ ];
- doCheck = false;
-
- meta = {
- description = "Pythonic binding for the libxml2 and libxslt libraries";
- homepage = http://codespeak.net/lxml/index.html;
- license = "BSD";
- };
- };
-
lxml = buildPythonPackage ( rec {
- name = "lxml-3.0.2";
+ name = "lxml-3.3.6";
src = fetchurl {
url = "http://pypi.python.org/packages/source/l/lxml/${name}.tar.gz";
- md5 = "38b15b0dd5e9292cf98be800e84a3ce4";
+ md5 = "a804b36864c483fe7abdd7f493a0c379";
};
buildInputs = [ pkgs.libxml2 pkgs.libxslt ];
@@ -4295,7 +4594,7 @@ rec {
patchPhase = ''
substituteInPlace magic.py --replace "ctypes.CDLL(dll)" "ctypes.CDLL('${pkgs.file}/lib/libmagic.so')"
'';
-
+
doCheck = false;
# TODO: tests are failing
@@ -4465,6 +4764,7 @@ rec {
mechanize = buildPythonPackage (rec {
name = "mechanize-0.1.11";
+ disabled = isPy3k;
src = fetchurl {
url = "http://wwwsearch.sourceforge.net/mechanize/src/${name}.tar.gz";
@@ -4500,7 +4800,6 @@ rec {
};
};
-
memcached = buildPythonPackage rec {
name = "memcached-1.51";
@@ -4555,6 +4854,35 @@ rec {
};
};
+ rainbowstream = buildPythonPackage rec {
+ name = "rainbowstream-${version}";
+ version = "0.9.5";
+
+ src = fetchurl {
+ url = "https://pypi.python.org/packages/source/r/rainbowstream/${name}.tar.gz";
+ sha256 = "0v79xiihgsfjipxkzzi92l8y1f8vxxachpv71gyzyhxdsl2zfj57";
+ };
+
+ doCheck = false;
+
+ preBuild = ''
+ export LOCALE_ARCHIVE=${localePath}
+ export LC_ALL="en_US.UTF-8"
+ '';
+
+ buildInputs = [
+ pkgs.libjpeg pkgs.freetype pkgs.zlib
+ pillow twitter pyfiglet requests arrow dateutil modules.readline
+ ];
+
+ meta = {
+ description = "Streaming command-line twitter client";
+ homepage = "http://www.rainbowstream.org/";
+ license = licenses.mit;
+ maintainers = [ maintainers.thoughtpolice ];
+ };
+ };
+
mitmproxy = buildPythonPackage rec {
baseName = "mitmproxy";
name = "${baseName}-${meta.version}";
@@ -4604,8 +4932,10 @@ rec {
};
});
- moinmoin = let ver="1.9.7"; in buildPythonPackage (rec {
+ moinmoin = buildPythonPackage (rec {
name = "moinmoin-${ver}";
+ disabled = isPy3k;
+ ver = "1.9.7";
src = fetchurl {
url = "http://static.moinmo.in/files/moin-${ver}.tar.gz";
@@ -4621,6 +4951,25 @@ rec {
};
});
+ moretools = buildPythonPackage rec {
+ name = "moretools-0.1a41";
+
+ src = fetchurl {
+ url = "https://pypi.python.org/packages/source/m/moretools/${name}.tar.gz";
+ sha256 = "1n442wprbl3cmg08233m1sr3g4z0i8hv9g6bhch7kzdmbl21399f";
+ };
+
+ buildInputs = [ six pathpy setuptools ];
+ propagatedBuildInputs = [ decorator ];
+
+ meta = with stdenv.lib; {
+ 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;
+ platforms = platforms.linux;
+ };
+ };
+
mox = buildPythonPackage rec {
name = "mox-0.5.3";
@@ -4665,7 +5014,7 @@ rec {
name = "python-mpd-0.3.0";
disabled = isPy3k;
-
+
src = fetchurl {
url = "https://pypi.python.org/packages/source/p/python-mpd/python-mpd-0.3.0.tar.gz";
md5 = "5b3849b131e2fb12f251434597d65635";
@@ -4689,7 +5038,7 @@ rec {
# some files in tests dir include unicode names
preBuild = ''
- export LOCALE_ARCHIVE=${pkgs.glibcLocales}/lib/locale/locale-archive
+ export LOCALE_ARCHIVE=${localePath}
export LC_ALL="en_US.UTF-8"
'';
@@ -4730,9 +5079,9 @@ rec {
url = "http://pypi.python.org/packages/source/m/musicbrainzngs/${name}.tar.gz";
md5 = "9e17a181af72d04a291c9a960bc73d44";
};
-
+
preCheck = ''
- export LOCALE_ARCHIVE=${pkgs.glibcLocales}/lib/locale/locale-archive
+ export LOCALE_ARCHIVE=${localePath}
export LC_ALL="en_US.UTF-8"
'';
@@ -4752,7 +5101,7 @@ rec {
url = "http://pypi.python.org/packages/source/m/mutagen/${name}.tar.gz";
sha256 = "12f70aaf5ggdzll76bhhkn64b27xy9s1acx417dbsaqnnbis8s76";
};
-
+
# one unicode test fails
doCheck = false;
@@ -4766,6 +5115,7 @@ rec {
muttils = buildPythonPackage (rec {
name = "muttils-1.3";
+ disabled = isPy3k;
src = fetchurl {
url = http://www.blacktrash.org/hg/muttils/archive/8bb26094df06.tar.bz2;
@@ -4786,6 +5136,8 @@ rec {
MySQL_python = buildPythonPackage {
name = "MySQL-python-1.2.3";
+ disabled = isPy3k;
+
# plenty of failing tests
doCheck = false;
@@ -4826,6 +5178,7 @@ rec {
namebench = buildPythonPackage (rec {
name = "namebench-1.0.5";
+ disabled = isPy3k;
src = fetchurl {
url = "http://namebench.googlecode.com/files/${name}.tgz";
@@ -4894,12 +5247,12 @@ rec {
};
netifaces = buildPythonPackage rec {
- version = "0.8";
+ version = "0.10.4";
name = "netifaces-${version}";
src = fetchurl {
- url = "http://alastairs-place.net/projects/netifaces/${name}.tar.gz";
- sha256 = "1v5i39kx4yz1pwgjfbzi63w55l2z318zgmi9f77ybmmkil1i39sk";
+ url = "http://pypi.python.org/packages/source/n/netifaces/${name}.tar.gz";
+ sha256 = "1plw237a4zib4z8s62g0mrs8gm3kjfrp5sxh6bbk9nl3rdls2mln";
};
meta = {
@@ -4975,17 +5328,17 @@ rec {
});
nose = buildPythonPackage rec {
- version = "1.3.3";
+ version = "1.3.4";
name = "nose-${version}";
src = fetchurl {
url = "http://pypi.python.org/packages/source/n/nose/${name}.tar.gz";
- sha256 = "09h3a74hzw1cfx4ic19ibxq8kg6sl1n64px2mmb57f5yd3r2y35l";
+ sha256 = "00qymfgwg4iam4xi0w9bnv7lcb3fypq1hzfafzgs1rfmwaj67g3n";
};
buildInputs = [ coverage ];
- doCheck = ! stdenv.isDarwin;
+ doCheck = false; # lot's of transient errors, too much hassle
checkPhase = if python.is_py3k or false then ''
${python}/bin/${python.executable} setup.py build_tests
'' else "" + ''
@@ -5040,6 +5393,7 @@ rec {
nose-cprof = buildPythonPackage rec {
name = "nose-cprof-0.1-0";
+ disabled = isPy3k;
src = fetchurl {
url = "https://pypi.python.org/packages/source/n/nose-cprof/${name}.tar.gz";
@@ -5139,13 +5493,15 @@ rec {
};
numpy = buildPythonPackage ( rec {
- name = "numpy-1.7.1";
+ name = "numpy-1.8.2";
src = fetchurl {
url = "mirror://sourceforge/numpy/${name}.tar.gz";
- sha256 = "0jh832j439jj2b7m1z5a4rv5cpdn1yiw1r6gwrhdihw562d029am";
+ sha256 = "1gcxlk3mf43pzpxvbw8kcfg173g4105j9szsfc1kxwablail6myf";
};
+ disabled = isPyPy; # WIP
+
preConfigure = ''
sed -i 's/-faltivec//' numpy/distutils/system_info.py
sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py
@@ -5194,17 +5550,18 @@ rec {
};
};
- livestreamer = if isPy34 then null else (buildPythonPackage rec {
- version = "1.8.2";
+ livestreamer = buildPythonPackage rec {
+ version = "1.10.2";
name = "livestreamer-${version}";
+ disabled = isPyPy;
src = fetchurl {
url = "https://github.com/chrippa/livestreamer/archive/v${version}.tar.gz";
- sha256 = "130h97qdb7qx8xg0gz54p5a6cb2zbffi5hsi305xf0ah9nf4rbrc";
+ sha256 = "0f1m51wax4q17ida4h0ckyakmlchf36kbhfa9qs6bpxc6xqqbry0";
};
buildInputs = [ pkgs.makeWrapper ];
- propagatedBuildInputs = [ requests pkgs.rtmpdump pycrypto ];
+ propagatedBuildInputs = [ requests2 pkgs.rtmpdump pycrypto singledispatch futures ];
postInstall = ''
wrapProgram $out/bin/livestreamer --prefix PATH : ${pkgs.rtmpdump}/bin
'';
@@ -5217,10 +5574,11 @@ rec {
'';
license = "bsd";
};
- });
+ };
oauth2 = buildPythonPackage (rec {
name = "oauth2-1.5.211";
+ disabled = isPy3k;
src = fetchurl {
url = "http://pypi.python.org/packages/source/o/oauth2/oauth2-1.5.211.tar.gz";
@@ -5356,6 +5714,7 @@ rec {
osc = buildPythonPackage (rec {
name = "osc-0.133+git";
+ disabled = isPy3k;
src = fetchgit {
url = git://gitorious.org/opensuse/osc.git;
@@ -5363,7 +5722,7 @@ rec {
sha256 = "a39ce0e321e40e9758bf7b9128d316c71b35b80eabc84f13df492083bb6f1cc6";
};
- buildPhase = "python setup.py build";
+ buildPhase = "${python}/bin/${python.executable} setup.py build";
doCheck = false;
postInstall = "ln -s $out/bin/osc-wrapper.py $out/bin/osc";
@@ -5406,7 +5765,7 @@ rec {
# tests failures since 1.14.0 release..
doCheck = false;
-
+
checkPhase = "${python}/bin/${python.executable} test.py";
meta = {
@@ -5427,6 +5786,7 @@ rec {
paste = buildPythonPackage rec {
name = "paste-1.7.5.1";
+ disabled = isPy3k;
src = fetchurl {
url = http://pypi.python.org/packages/source/P/Paste/Paste-1.7.5.1.tar.gz;
@@ -5445,12 +5805,12 @@ rec {
paste_deploy = buildPythonPackage rec {
- version = "1.5.0";
+ version = "1.5.2";
name = "paste-deploy-${version}";
src = fetchurl {
url = "http://pypi.python.org/packages/source/P/PasteDeploy/PasteDeploy-${version}.tar.gz";
- md5 = "f1a068a0b680493b6eaff3dd7690690f";
+ md5 = "352b7205c78c8de4987578d19431af3b";
};
buildInputs = [ nose ];
@@ -5462,6 +5822,22 @@ rec {
};
};
+ pathpy = buildPythonPackage rec {
+ name = "path.py-5.2";
+
+ src = fetchurl {
+ url = "https://pypi.python.org/packages/source/p/path.py/${name}.zip";
+ sha256 = "0n1kpbbm1dg5f484yzxr7gb3ak6vjp92j70nw3bgjzsj9fh26afq";
+ };
+
+ meta = with stdenv.lib; {
+ description = "A module wrapper for os.path";
+ homepage = http://github.com/jaraco/path.py;
+ license = licenses.mit;
+ platforms = platforms.linux;
+ };
+ };
+
paypalrestsdk = buildPythonPackage rec {
name = "paypalrestsdk-0.7.0";
@@ -5501,6 +5877,34 @@ rec {
};
};
+ pelican = buildPythonPackage rec {
+ name = "pelican-${version}";
+ version = "3.4.0";
+
+ src = fetchurl {
+ url = "https://pypi.python.org/packages/source/p/pelican/${name}.tar.gz";
+ md5 = "8e57bdd075503903125b14621b1e533d";
+ };
+
+ preConfigure = ''
+ export LOCALE_ARCHIVE=${pkgs.glibcLocales}/lib/locale/locale-archive
+ export LC_ALL="en_US.UTF-8"
+ '';
+
+ # Test data not provided
+ #buildInputs = [nose mock];
+ doCheck = false;
+
+ propagatedBuildInputs = [jinja2 pygments docutils pytz unidecode six dateutil feedgenerator blinker pillow beautifulsoup4];
+
+ meta = {
+ homepage = http://getpelican.com/;
+ description = "A tool to generate a static blog from reStructuredText or Markdown input files";
+ license = licenses.agpl3;
+ maintainers = [ stdenv.lib.maintainers.offline ];
+ };
+ };
+
pep8 = buildPythonPackage rec {
name = "pep8-${version}";
version = "1.5.7";
@@ -5586,6 +5990,7 @@ rec {
pika = buildPythonPackage {
name = "pika-0.9.12";
+ disabled = isPy3k;
src = fetchurl {
url = https://pypi.python.org/packages/source/p/pika/pika-0.9.12.tar.gz;
md5 = "7174fc7cc5570314fa3cfaa729106482";
@@ -5594,37 +5999,33 @@ rec {
propagatedBuildInputs = [ unittest2 ];
};
-
+
pil = buildPythonPackage rec {
name = "PIL-${version}";
version = "1.1.7";
-
+
src = fetchurl {
url = "http://effbot.org/downloads/Imaging-${version}.tar.gz";
sha256 = "04aj80jhfbmxqzvmq40zfi4z3cw6vi01m3wkk6diz3lc971cfnw9";
};
-
+
buildInputs = [ python pkgs.libjpeg pkgs.zlib pkgs.freetype ];
-
+
disabled = isPy3k;
-
doCheck = true;
-
+
+ postInstall = "ln -s $out/lib/${python.libPrefix}/site-packages $out/lib/${python.libPrefix}/site-packages/PIL";
+
preConfigure = ''
sed -i "setup.py" \
-e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = libinclude("${pkgs.freetype}")|g ;
s|^JPEG_ROOT =.*$|JPEG_ROOT = libinclude("${pkgs.libjpeg}")|g ;
s|^ZLIB_ROOT =.*$|ZLIB_ROOT = libinclude("${pkgs.zlib}")|g ;'
'';
-
- checkPhase = "${python}/bin/${python.executable} selftest.py";
- buildPhase = "${python}/bin/${python.executable} setup.py build_ext -i";
-
- postInstall = ''
- cd "$out"/lib/python*/site-packages
- ln -s $PWD PIL
- '';
-
+
+ checkPhase = "${python}/bin/${python.executable} selftest.py";
+ buildPhase = "${python}/bin/${python.executable} setup.py build_ext -i";
+
meta = {
homepage = http://www.pythonware.com/products/pil/;
description = "The Python Imaging Library (PIL)";
@@ -5760,6 +6161,11 @@ rec {
sha1 = "ad346a18d92c1d95f2295397c7a8a4f489e48851";
};
+ preCheck = ''
+ export LANG="en_US.UTF-8"
+ export LOCALE_ARCHIVE=${localePath}
+ '';
+
meta = {
description = "Simple Python library for easily displaying tabular data in a visually appealing ASCII table format";
homepage = http://code.google.com/p/prettytable/;
@@ -5770,9 +6176,10 @@ rec {
protobuf = buildPythonPackage rec {
inherit (pkgs.protobuf) name src;
- propagatedBuildInputs = [ pkgs.protobuf setuptools ];
+ propagatedBuildInputs = [ pkgs.protobuf google_apputils ];
sourceRoot = "${name}/python";
+
meta = {
description = "Protocol Buffers are Google's data interchange format.";
homepage = http://code.google.com/p/protobuf/;
@@ -5781,11 +6188,12 @@ rec {
psutil = buildPythonPackage rec {
- name = "psutil-1.0.1";
+ name = "psutil-${version}";
+ version = "2.1.1";
src = fetchurl {
- url = "http://psutil.googlecode.com/files/${name}.tar.gz";
- sha256 = "1zrzh7hi0f79sf9axwrw3c2kl86qs72kvx8xbbrdwlp39rfa1i1f";
+ url = "https://pypi.python.org/packages/source/p/psutil/${name}.tar.gz";
+ sha256 = "14smqj57yjrm6hjz5n2annkgv0kmxckdhqvfx784f4d4lr52m0dz";
};
# failed tests: https://code.google.com/p/psutil/issues/detail?id=434
@@ -5800,6 +6208,7 @@ rec {
psycopg2 = buildPythonPackage rec {
name = "psycopg2-2.5.3";
+ disabled = isPyPy;
# error: invalid command 'test'
doCheck = false;
@@ -5836,11 +6245,11 @@ rec {
py = buildPythonPackage rec {
- name = "py-1.4.20";
+ name = "py-1.4.24";
src = fetchurl {
url = "https://pypi.python.org/packages/source/p/py/${name}.tar.gz";
- md5 = "5f1708be5482f3ff6711dfd6cafd45e0";
+ md5 = "8f32ee0cd1e01472a255fe1d28d81217";
};
};
@@ -5890,18 +6299,24 @@ rec {
pygit2 = buildPythonPackage rec {
- name = "pygit2-0.20.0";
+ name = "pygit2-0.21.2";
src = fetchurl {
url = "https://pypi.python.org/packages/source/p/pygit2/${name}.tar.gz";
- sha256 = "04132q7bn8k7q7ky7nj3bkza8r9xkzkdpfv462b6rgjsd1x6h340";
+ sha256 = "0lya4v91d4y5fwrb55n8m8avgmz0l81jml2spvx6r7j1czcx3zic";
};
preConfigure = ( if stdenv.isDarwin then ''
export DYLD_LIBRARY_PATH="${pkgs.libgit2}/lib"
'' else "" );
- propagatedBuildInputs = [ pkgs.libgit2 ];
+ propagatedBuildInputs = [ pkgs.libgit2 ] ++ optionals (!isPyPy) [ cffi ];
+
+ preCheck = ''
+ # disable tests that require networking
+ rm test/test_repository.py
+ rm test/test_credentials.py
+ '';
meta = {
homepage = https://pypi.python.org/pypi/pygit2;
@@ -5986,6 +6401,7 @@ rec {
pycryptopp = buildPythonPackage (rec {
name = "pycryptopp-0.6.0.1206569328141510525648634803928199668821045408958";
+ disabled = isPy3k || isPyPy; # see https://bitbucket.org/pypy/pypy/issue/1190/
src = fetchurl {
url = "http://pypi.python.org/packages/source/p/pycryptopp/${name}.tar.gz";
@@ -6013,6 +6429,7 @@ rec {
pycurl = buildPythonPackage (rec {
name = "pycurl-7.19.5";
+ disabled = isPyPy; # https://github.com/pycurl/pycurl/issues/208
src = fetchurl {
url = "http://pycurl.sourceforge.net/download/${name}.tar.gz";
@@ -6039,6 +6456,7 @@ rec {
pycurl2 = buildPythonPackage (rec {
name = "pycurl2-7.20.0";
+ disabled = isPy3k;
src = fetchgit {
url = "https://github.com/Lispython/pycurl.git";
@@ -6061,6 +6479,7 @@ rec {
pydot = buildPythonPackage rec {
name = "pydot-1.0.2";
+ disabled = isPy3k;
src = fetchurl {
url = "http://pypi.python.org/packages/source/p/pydot/${name}.tar.gz";
@@ -6091,6 +6510,24 @@ rec {
};
};
+ pyfiglet = buildPythonPackage rec {
+ name = "pyfiglet-${version}";
+ version = "0.7.1";
+
+ src = fetchurl {
+ url = "https://pypi.python.org/packages/source/p/pyfiglet/${name}.tar.gz";
+ sha256 = "14lgwg47gnnad7sfkmmwhknwysbfmr74c9b2a6d9wgjmydycc6ka";
+ };
+
+ doCheck = false;
+
+ meta = {
+ description = "FIGlet in pure Python";
+ license = licenses.gpl2Plus;
+ maintainers = [ maintainers.thoughtpolice ];
+ };
+ };
+
pyflakes = buildPythonPackage rec {
name = "pyflakes-0.8.1";
@@ -6101,6 +6538,8 @@ rec {
buildInputs = [ unittest2 ];
+ doCheck = !isPyPy;
+
meta = {
homepage = "https://launchpad.net/pyflakes";
description = "A simple program which checks Python source files for errors.";
@@ -6150,6 +6589,7 @@ rec {
pygpgme = buildPythonPackage rec {
version = "0.3";
name = "pygpgme-${version}";
+ disabled = isPyPy;
src = fetchurl {
url = "https://launchpad.net/pygpgme/trunk/${version}/+download/${name}.tar.gz";
@@ -6226,6 +6666,7 @@ rec {
pyodbc = buildPythonPackage rec {
name = "pyodbc-3.0.7";
+ disabled = isPyPy; # use pypypdbc instead
src = fetchurl {
url = "https://pyodbc.googlecode.com/files/${name}.zip";
@@ -6265,6 +6706,7 @@ rec {
pyparted = buildPythonPackage rec {
name = "pyparted-${version}";
version = "3.10";
+ disabled = isPyPy;
src = fetchurl {
url = "https://fedorahosted.org/releases/p/y/pyparted/${name}.tar.gz";
@@ -6317,8 +6759,29 @@ rec {
};
});
+ pyqtgraph = buildPythonPackage rec {
+ name = "pyqtgraph-${version}";
+ version = "0.9.8";
+
+ src = fetchurl {
+ url = "https://pypi.python.org/packages/source/p/pyqtgraph/${name}.tar.gz";
+ sha256 = "1fnhj26d9qrqqmjx092m1qspclh3mia3vag7rji5wciw0plpszi5";
+ };
+
+ propagatedBuildInputs = [ scipy numpy pyqt4 pyopengl ];
+
+ meta = with stdenv.lib; {
+ description = "Scientific Graphics and GUI Library for Python";
+ homepage = http://www.pyqtgraph.org/;
+ license = licenses.mit;
+ platforms = platforms.unix;
+ maintainers = [ maintainers.koral ];
+ };
+ };
+
pyro3 = buildPythonPackage (rec {
name = "Pyro-3.16";
+ disabled = isPy3k;
src = fetchurl {
url = "http://pypi.python.org/packages/source/P/Pyro/${name}.tar.gz";
@@ -6350,6 +6813,26 @@ rec {
};
});
+ pysnmp = buildPythonPackage rec {
+ version = "4.2.5";
+ name = "pysnmp-${version}";
+
+ src = fetchurl {
+ url = "https://pypi.python.org/packages/source/p/pysnmp/${name}.tar.gz";
+ sha256 = "0zq7yx8732ad9dxpxqgpqyixj7kfwbvf402q7l5njkv0kbcnavn4";
+ };
+
+ propagatedBuildInputs = [ pyasn1 pycrypto ];
+
+ meta = with stdenv.lib; {
+ homepage = http://pysnmp.sf.net;
+ description = "A pure-Python SNMPv1/v2c/v3 library";
+ license = licenses.bsd2;
+ platforms = platforms.all;
+ maintainers = [ maintainers.koral ];
+ };
+ };
+
python_fedora = buildPythonPackage (rec {
name = "python-fedora-0.3.33";
meta.maintainers = [ stdenv.lib.maintainers.mornfall ];
@@ -6444,6 +6927,7 @@ rec {
ldap = buildPythonPackage rec {
name = "ldap-2.4.15";
+ disabled = isPy3k;
src = fetchurl {
url = "http://pypi.python.org/packages/source/p/python-ldap/python-${name}.tar.gz";
@@ -6568,6 +7052,7 @@ rec {
pyreport = buildPythonPackage (rec {
name = "pyreport-0.3.4c";
+ disabled = isPy3k;
src = fetchurl {
url = "http://pypi.python.org/packages/source/p/pyreport/${name}.tar.gz";
@@ -6619,6 +7104,7 @@ rec {
pysqlite = buildPythonPackage (rec {
name = "pysqlite-2.6.3";
+ disabled = isPy3k;
src = fetchurl {
url = "https://pypi.python.org/packages/source/p/pysqlite/${name}.tar.gz";
@@ -6843,11 +7329,11 @@ rec {
reportlab =
let freetype = overrideDerivation pkgs.freetype (args: { configureFlags = "--enable-static --enable-shared"; });
in buildPythonPackage rec {
- name = "reportlab-2.5";
+ name = "reportlab-3.1.8";
src = fetchurl {
url = "http://pypi.python.org/packages/source/r/reportlab/${name}.tar.gz";
- md5 = "cdf8b87a6cf1501de1b0a8d341a217d3";
+ md5 = "820a9fda647078503597b85cdba7ed7f";
};
buildInputs = [freetype];
@@ -6863,11 +7349,11 @@ rec {
requests = buildPythonPackage rec {
- name = "requests-1.2.0";
+ name = "requests-1.2.3";
src = fetchurl {
url = "http://pypi.python.org/packages/source/r/requests/${name}.tar.gz";
- md5 = "22af2682233770e5468a986f451c51c0";
+ md5 = "adbd3f18445f7fe5e77f65c502e264fb";
};
meta = {
@@ -6933,7 +7419,7 @@ rec {
};
propagatedBuildInputs = [ numpy scipy matplotlib pkgs.pyqt4
- pkgs.cython ];
+ cython ];
buildInputs = with pkgs; [ gcc qt4 blas ] ++ [ nose ];
@@ -6989,6 +7475,27 @@ rec {
};
+ restview = buildPythonPackage rec {
+ name = "restview-${version}";
+ version = "2.1.1";
+
+ src = fetchurl {
+ url = "https://pypi.python.org/packages/source/r/restview/${name}.tar.gz";
+ sha256 = "07scf80hhr9rijrbfrplyi3gwkx74knnzfhvlg6yf1cd0x2yiy8v";
+ };
+
+ propagatedBuildInputs = [ docutils mock pygments ];
+
+ meta = with stdenv.lib; {
+ description = "ReStructuredText viewer";
+ homepage = http://mg.pov.lt/restview/;
+ license = licenses.gpl2;
+ platforms = platforms.all;
+ maintainers = [ maintainers.koral ];
+ };
+ };
+
+
reviewboard = buildPythonPackage rec {
name = "ReviewBoard-1.6.16";
@@ -6998,30 +7505,46 @@ rec {
};
propagatedBuildInputs =
- [ recaptcha_client pytz memcached dateutil_1_5 paramiko flup pygments
- djblets django_1_3 django_evolution pycrypto modules.sqlite3
+ [ django_1_3 recaptcha_client pytz memcached dateutil_1_5 paramiko flup pygments
+ djblets django_evolution pycrypto modules.sqlite3
pysvn pil psycopg2
];
};
rdflib = buildPythonPackage (rec {
- name = "rdflib-3.0.0";
+ name = "rdflib-4.1.2";
src = fetchurl {
- url = "http://www.rdflib.net/${name}.tar.gz";
- sha256 = "1c7ipk5vwqnln83rmai5jzyxkjdajdzbk5cgy1z83nyr5hbkgkqr";
+ url = "https://pypi.python.org/packages/source/r/rdflib/${name}.tar.gz";
+ sha256 = "0kvaf332cqbi47rqzlpdx4mbkvw12mkrzkj8n9l19wk713d4py9w";
};
# error: invalid command 'test'
doCheck = false;
+ propagatedBuildInputs = [ isodate ];
+
meta = {
description = "RDFLib is a Python library for working with RDF, a simple yet powerful language for representing information.";
homepage = http://www.rdflib.net/;
};
});
+ isodate = buildPythonPackage rec {
+ name = "isodate-0.5.0";
+
+ src = fetchurl {
+ url = "https://pypi.python.org/packages/source/i/isodate/${name}.tar.gz";
+ md5 = "9a267e9327feb3d021cae26002ba6e0e";
+ };
+
+ meta = with stdenv.lib; {
+ description = "ISO 8601 date/time parser";
+ homepage = http://cheeseshop.python.org/pypi/isodate;
+ };
+ };
+
robotframework = buildPythonPackage rec {
version = "2.8.5";
@@ -7068,6 +7591,26 @@ rec {
};
+ robotframework-tools = buildPythonPackage rec {
+ version = "0.1a115";
+ name = "robotframework-tools-${version}";
+
+ src = fetchurl {
+ url = "https://pypi.python.org/packages/source/r/robotframework-tools/${name}.tar.gz";
+ sha256 = "04gkn1zpf3rsvbqdxrrjqqi8sa0md9gqwh6n5w2m03fdwjg4lc7q";
+ };
+
+ propagatedBuildInputs = [ robotframework moretools pathpy six setuptools ];
+
+ meta = with stdenv.lib; {
+ description = "Python Tools for Robot Framework and Test Libraries";
+ homepage = http://bitbucket.org/userzimmermann/robotframework-tools;
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ };
+ };
+
+
robotsuite = buildPythonPackage rec {
version = "1.4.2";
name = "robotsuite-${version}";
@@ -7094,6 +7637,7 @@ rec {
robotframework-ride = buildPythonPackage rec {
version = "1.2.3";
name = "robotframework-ride-${version}";
+ disabled = isPy3k;
src = fetchurl {
url = "https://robotframework-ride.googlecode.com/files/${name}.tar.gz";
@@ -7123,14 +7667,14 @@ rec {
rope = buildPythonPackage rec {
- version = "0.9.4";
+ version = "0.10.2";
name = "rope-${version}";
-
+
disabled = isPy3k;
src = fetchurl {
url = "http://pypi.python.org/packages/source/r/rope/${name}.tar.gz";
- sha256 = "1fm6ahff50b10mlnc0ar4x1fv9sxmcp1g651myyqy7c50hk39h1d";
+ sha256 = "0rdlvp8h74qs49wz1hx6qy8mgp2ddwlfs7z13h9139ynq04a3z7z";
};
meta = with stdenv.lib; {
@@ -7210,7 +7754,7 @@ rec {
# buildPhase = "python setup.py build";
# doCheck = false;
- propagatedBuildInputs = [ pycurl koji GitPython pkgs.git
+ propagatedBuildInputs = [ pycurl pkgs.koji GitPython pkgs.git
pkgs.rpm pkgs.pyopenssl ];
});
@@ -7294,11 +7838,11 @@ rec {
scipy = buildPythonPackage rec {
- name = "scipy-0.12.0";
+ name = "scipy-0.14.0";
src = fetchurl {
url = "http://pypi.python.org/packages/source/s/scipy/${name}.tar.gz";
- md5 = "8fb4da324649f655e8557ea92b998786";
+ md5 = "d7c7f4ccf8b07b08d6fe49d5cd51f85d";
};
buildInputs = [pkgs.gfortran];
@@ -7438,11 +7982,11 @@ rec {
});
sigal = buildPythonPackage rec {
- name = "sigal-0.5.0";
+ name = "sigal-0.7.0";
src = fetchurl {
url = "http://pypi.python.org/packages/source/s/sigal/${name}.tar.gz";
- md5 = "93c93725674c0702583a638f5a09c9e4";
+ md5 = "d2386706ac8543378aebde1ea4edeba4";
};
propagatedBuildInputs = [ jinja2 markdown pillow pilkit clint argh pytest ];
@@ -7455,12 +7999,27 @@ rec {
};
};
+ pgpdump = pythonPackages.buildPythonPackage rec {
+ name = "pgpdump-1.5";
+
+ src = fetchurl {
+ url = "https://pypi.python.org/packages/source/p/pgpdump/pgpdump-1.5.tar.gz";
+ md5 = "040a451c8e63de3e61fc5b66efa7fca5";
+ };
+
+ meta = with stdenv.lib; {
+ description = "Python library for parsing PGP packets";
+ homepage = https://github.com/toofishes/python-pgpdump;
+ license = licenses.bsd3;
+ };
+ };
+
spambayes = buildPythonPackage rec {
- name = "spambayes-1.1a6";
+ name = "spambayes-1.1b1";
src = fetchurl {
url = "mirror://sourceforge/spambayes/${name}.tar.gz";
- sha256 = "0lqhn2v0avgwxmk4dq9lkwr2g39ls2p6x8hqk5w07wd462cjsx8l";
+ sha256 = "0kqvjb89b02wp41p650ydfspi1s8d7akx1igcrw62diidqbxp04n";
};
propagatedBuildInputs = [ pydns lockfile ];
@@ -7483,8 +8042,7 @@ rec {
preConfigure = ''
export LANG="en_US.UTF-8";
- '' + stdenv.lib.optionalString stdenv.isLinux ''
- export LOCALE_ARCHIVE="${pkgs.glibcLocales}/lib/locale/locale-archive";
+ export LOCALE_ARCHIVE=${localePath}
'';
patchPhase = ''
@@ -7532,13 +8090,19 @@ rec {
};
sympy = buildPythonPackage rec {
- name = "sympy-0.7.3";
+ name = "sympy-0.7.4";
+ disabled = isPy34; # some tests fail
src = fetchurl {
url = "https://github.com/sympy/sympy/releases/download/${name}/${name}.tar.gz";
- sha256 = "081g9gs2d1d41ipn8zr034d98cnrxvc4zsmihqmfwzirwzpcii5x";
+ sha256 = "0h1b9mx0snyyybj1x1ga69qssgjzkkgx2rw6nddjhyz1fknf8ywh";
};
+ preCheck = ''
+ export LANG="en_US.UTF-8"
+ export LOCALE_ARCHIVE=${localePath}
+ '';
+
meta = with stdenv.lib; {
description = "A Python library for symbolic mathematics";
homepage = http://www.sympy.org/;
@@ -7599,7 +8163,7 @@ rec {
preCheck = ''
export LANG="en_US.UTF-8"
- export LOCALE_ARCHIVE=${pkgs.glibcLocales}/lib/locale/locale-archive
+ export LOCALE_ARCHIVE=${localePath}
'';
buildInputs = [ pytest py mock ];
@@ -7645,7 +8209,7 @@ rec {
semantic = buildPythonPackage rec {
name = "semantic-1.0.3";
-
+
disabled = isPy3k;
propagatedBuildInputs = [ quantities numpy ];
@@ -7718,6 +8282,7 @@ rec {
skype4py = buildPythonPackage (rec {
name = "Skype4Py-1.0.32.0";
+ disabled = isPy3k || isPyPy;
src = fetchurl {
url = mirror://sourceforge/skype4py/Skype4Py-1.0.32.0.tar.gz;
@@ -7784,7 +8349,7 @@ rec {
supervisor = buildPythonPackage rec {
name = "supervisor-3.1.1";
-
+
disabled = isPy3k;
src = fetchurl {
@@ -7806,6 +8371,7 @@ rec {
subprocess32 = buildPythonPackage rec {
name = "subprocess32-3.2.6";
+ disabled = isPy3k;
src = fetchurl {
url = "https://pypi.python.org/packages/source/s/subprocess32/${name}.tar.gz";
@@ -7879,8 +8445,11 @@ rec {
};
});
- sqlalchemy = pkgs.lib.overrideDerivation sqlalchemy9 (args: rec {
+ sqlalchemy = sqlalchemy9.override rec {
name = "SQLAlchemy-0.7.10";
+ disabled = isPy34;
+ doCheck = !isPyPy;
+
src = fetchurl {
url = "http://pypi.python.org/packages/source/S/SQLAlchemy/${name}.tar.gz";
sha256 = "0rhxgr85xdhjn467qfs0dkyj8x46zxcv6ad3dfx3w14xbkb3kakp";
@@ -7890,16 +8459,24 @@ rec {
# waiting for 0.7.11 release
../development/python-modules/sqlalchemy-0.7.10-test-failures.patch
];
- });
+ preConfigure = optionalString isPy3k ''
+ python3 sa2to3.py --no-diffs -w lib test examples
+ '';
+ };
-
- sqlalchemy8 = pkgs.lib.overrideDerivation sqlalchemy9 (args: rec {
+ sqlalchemy8 = sqlalchemy9.override rec {
name = "SQLAlchemy-0.8.7";
+ disabled = isPy34;
+ doCheck = !isPyPy;
+
src = fetchurl {
url = "https://pypi.python.org/packages/source/S/SQLAlchemy/${name}.tar.gz";
md5 = "4f3377306309e46739696721b1785335";
};
- });
+ preConfigure = optionalString isPy3k ''
+ python3 sa2to3.py --no-diffs -w lib test examples
+ '';
+ };
sqlalchemy9 = buildPythonPackage rec {
name = "SQLAlchemy-0.9.4";
@@ -7926,12 +8503,13 @@ rec {
sqlalchemy_imageattach = buildPythonPackage rec {
name = "SQLAlchemy-ImageAttach-${version}";
- version = "0.8.1";
+ version = "0.8.2";
+ disabled = isPy33;
src = fetchgit {
url = https://github.com/crosspop/sqlalchemy-imageattach.git;
rev = "refs/tags/${version}";
- md5 = "051dd9de0757714d33c3ecd5ab37b97d";
+ md5 = "cffdcde30952176e35fccf385f579dda";
};
buildInputs = [ pytest webob pkgs.imagemagick nose ];
@@ -7944,6 +8522,7 @@ rec {
py.test
cd ..
'';
+ doCheck = !isPyPy; # failures due to sqla version mismatch
meta = {
homepage = https://github.com/crosspop/sqlalchemy-imageattach;
@@ -7980,9 +8559,10 @@ rec {
};
- statd = buildPythonPackage rec {
+ python_statsd = buildPythonPackage rec {
name = "python-statsd-${version}";
version = "1.6.0";
+ disabled = isPy3k; # next release will be py3k compatible
src = fetchurl {
url = "https://pypi.python.org/packages/source/p/python-statsd/${name}.tar.gz";
@@ -8001,6 +8581,7 @@ rec {
stompclient = buildPythonPackage (rec {
name = "stompclient-0.3.2";
+ disabled = isPy3k;
src = fetchurl {
url = "http://pypi.python.org/packages/source/s/stompclient/${name}.tar.gz";
@@ -8042,11 +8623,14 @@ rec {
name = "sure-${version}";
version = "1.2.7";
- # Not picking up from PyPI because it doesn't contain tests.
- src = fetchgit {
- url = "git://github.com/gabrielfalcao/sure.git";
- rev = "86ab9faa97aa9c1720c7d090deac2be385ed3d7a";
- sha256 = "02vffcdgr6vbj80lhl925w7zqy6cqnfvs088i0rbkjs5lxc511b3";
+ preBuild = ''
+ export LOCALE_ARCHIVE=${localePath}
+ export LC_ALL="en_US.UTF-8"
+ '';
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/s/sure/${name}.tar.gz";
+ md5 = "6dbecef27dffc41c8cd8aab8a8b3fdfb";
};
buildInputs = [ nose ];
@@ -8061,6 +8645,22 @@ rec {
};
+ structlog = buildPythonPackage rec {
+ name = "structlog-0.4.2";
+
+ src = fetchurl {
+ url = "https://pypi.python.org/packages/source/s/structlog/${name}.tar.gz";
+ md5 = "062cda36069e8573e00c265f451f899e";
+ };
+
+ meta = {
+ description = "Painless structural logging";
+ homepage = http://www.structlog.org/;
+ license = licenses.asl20;
+ };
+ };
+
+
# XXX: ValueError: ZIP does not support timestamps before 1980
# svneverever = buildPythonPackage rec {
# name = "svneverever-778489a8";
@@ -8099,6 +8699,7 @@ rec {
tarsnapper = buildPythonPackage rec {
name = "tarsnapper-0.2.1";
+ disabled = isPy3k;
src = fetchgit {
url = https://github.com/miracle2k/tarsnapper.git;
@@ -8118,6 +8719,7 @@ rec {
taskcoach = buildPythonPackage rec {
name = "TaskCoach-1.3.22";
+ disabled = isPy3k;
src = fetchurl {
url = "mirror://sourceforge/taskcoach/${name}.tar.gz";
@@ -8152,9 +8754,9 @@ rec {
url = "http://pypi.python.org/packages/source/T/Tempita/Tempita-${version}.tar.gz";
md5 = "4c2f17bb9d481821c41b6fbee904cea1";
};
-
+
disabled = isPy3k;
-
+
buildInputs = [ nose ];
meta = {
@@ -8246,11 +8848,11 @@ rec {
tox = buildPythonPackage rec {
name = "tox-1.7.2";
-
+
propagatedBuildInputs = [ py virtualenv ];
doCheck = false;
-
+
src = fetchurl {
url = "https://pypi.python.org/packages/source/t/tox/${name}.tar.gz";
md5 = "0d9b3acb1a9252659d753b0ae6b9b264";
@@ -8259,6 +8861,7 @@ rec {
smmap = buildPythonPackage rec {
name = "smmap-0.8.2";
+ disabled = isPy3k || isPyPy; # next release will have py3k/pypy support
meta.maintainers = [ stdenv.lib.maintainers.mornfall ];
src = fetchurl {
@@ -8269,6 +8872,7 @@ rec {
trac = buildPythonPackage {
name = "trac-1.0.1";
+ disabled = isPy3k;
src = fetchurl {
url = http://ftp.edgewall.com/pub/trac/Trac-1.0.1.tar.gz;
@@ -8372,6 +8976,7 @@ rec {
tweepy = buildPythonPackage (rec {
name = "tweepy-2.3.0";
+ disabled = isPy3k;
src = fetchurl {
url = "http://pypi.python.org/packages/source/t/tweepy/${name}.tar.gz";
@@ -8387,11 +8992,29 @@ rec {
};
});
+ twitter = buildPythonPackage rec {
+ name = "twitter-${version}";
+ version = "1.14.3";
+
+ src = fetchurl {
+ url = "https://pypi.python.org/packages/source/t/twitter/${name}.tar.gz";
+ sha256 = "1nhhjajbq0jik43q2makpnz094qcziq9p8rj35jxamybd0hwwzs9";
+ };
+
+ doCheck = false;
+
+ meta = {
+ description = "Twitter API library";
+ license = licenses.mit;
+ maintainers = [ maintainers.thoughtpolice ];
+ };
+ };
+
twisted = buildPythonPackage rec {
# NOTE: When updating please check if new versions still cause issues
# to packages like carbon (http://stackoverflow.com/questions/19894708/cant-start-carbon-12-04-python-error-importerror-cannot-import-name-daem)
disabled = isPy3k;
-
+
name = "Twisted-11.1.0";
src = fetchurl {
url = "https://pypi.python.org/packages/source/T/Twisted/${name}.tar.bz2";
@@ -8512,6 +9135,7 @@ rec {
pyuv = buildPythonPackage rec {
name = "pyuv-0.11.5";
+ disabled = isPyPy; # see https://github.com/saghul/pyuv/issues/49
src = fetchurl {
url = "https://github.com/saghul/pyuv/archive/${name}.tar.gz";
@@ -8683,12 +9307,12 @@ rec {
webob = buildPythonPackage rec {
- version = "1.3.1";
+ version = "1.4";
name = "webob-${version}";
src = fetchurl {
url = "http://pypi.python.org/packages/source/W/WebOb/WebOb-${version}.tar.gz";
- md5 = "20918251c5726956ba8fef22d1556177";
+ md5 = "8437607c0cc00c35f658f972516ffb55";
};
propagatedBuildInputs = [ nose modules.ssl ];
@@ -8727,7 +9351,7 @@ rec {
url = "http://pypi.python.org/packages/source/W/WebTest/WebTest-${version}.zip";
md5 = "49314bdba23f4d0bd807facb2a6d3f90";
};
-
+
preConfigure = ''
substituteInPlace setup.py --replace "nose<1.3.0" "nose"
'';
@@ -8758,12 +9382,12 @@ rec {
};
- werkzeug = buildPythonPackage {
- name = "werkzeug-0.9.4";
+ werkzeug = buildPythonPackage rec {
+ name = "Werkzeug-0.9.6";
src = fetchurl {
- url = "http://pypi.python.org/packages/source/W/Werkzeug/Werkzeug-0.9.4.tar.gz";
- md5 = "670fad41f57c13b71a6816765765a3dd";
+ url = "http://pypi.python.org/packages/source/W/Werkzeug/${name}.tar.gz";
+ md5 = "f7afcadc03b0f2267bdc156c34586043";
};
propagatedBuildInputs = [ itsdangerous ];
@@ -8819,15 +9443,11 @@ rec {
wxPython = wxPython28;
- wxPython28 = import ../development/python-modules/wxPython/2.8.nix {
- inherit (pkgs) stdenv fetchurl pkgconfig;
- inherit pythonPackages;
+ wxPython28 = callPackage ../development/python-modules/wxPython/2.8.nix {
wxGTK = pkgs.wxGTK28;
};
- wxPython30 = import ../development/python-modules/wxPython/3.0.nix {
- inherit (pkgs) stdenv fetchurl pkgconfig;
- inherit pythonPackages;
+ wxPython30 = callPackage ../development/python-modules/wxPython/3.0.nix {
wxGTK = pkgs.wxGTK30;
};
@@ -8941,7 +9561,7 @@ rec {
};
propagatedBuildInputs = [ zconfig ];
-
+
# too many deps..
doCheck = false;
@@ -8956,6 +9576,7 @@ rec {
zfec = buildPythonPackage (rec {
name = "zfec-1.4.24";
+ disabled = isPyPy;
src = fetchurl {
url = "http://pypi.python.org/packages/source/z/zfec/${name}.tar.gz";
@@ -8986,6 +9607,7 @@ rec {
zodb3 = buildPythonPackage rec {
name = "zodb3-${version}";
version = "3.11.0";
+ disabled = isPyPy;
src = fetchurl {
url = "http://pypi.python.org/packages/source/Z/ZODB3/ZODB3-${version}.tar.gz";
@@ -9001,9 +9623,11 @@ rec {
maintainers = [ stdenv.lib.maintainers.goibhniu ];
};
};
-
+
zodb = buildPythonPackage rec {
name = "zodb-${version}";
+ disabled = isPyPy;
+
version = "4.0.1";
src = fetchurl {
@@ -9018,7 +9642,7 @@ rec {
# test failure on py3.4
rm src/ZODB/tests/testDB.py
'' else "";
-
+
meta = {
description = "An object-oriented database for Python";
homepage = http://pypi.python.org/pypi/ZODB;
@@ -9026,15 +9650,16 @@ rec {
maintainers = [ stdenv.lib.maintainers.goibhniu ];
};
};
-
+
zodbpickle = pythonPackages.buildPythonPackage rec {
name = "zodbpickle-0.5.2";
+ disabled = isPyPy; # https://github.com/zopefoundation/zodbpickle/issues/10
src = fetchurl {
url = "https://pypi.python.org/packages/source/z/zodbpickle/${name}.tar.gz";
md5 = "d401bd89f99ec8d56c22493e6f8c0443";
};
-
+
# fails..
doCheck = false;
@@ -9043,10 +9668,10 @@ rec {
};
};
-
+
BTrees = pythonPackages.buildPythonPackage rec {
name = "BTrees-4.0.8";
-
+
patches = [ ./../development/python-modules/btrees_interger_overflow.patch ];
propagatedBuildInputs = [ persistent zope_interface transaction ];
@@ -9062,7 +9687,7 @@ rec {
};
};
-
+
persistent = pythonPackages.buildPythonPackage rec {
name = "persistent-4.0.8";
@@ -9079,6 +9704,22 @@ rec {
};
};
+ xdot = buildPythonPackage rec {
+ name = "xdot-0.6";
+
+ src = fetchurl {
+ url = "https://pypi.python.org/packages/source/x/xdot/xdot-0.6.tar.gz";
+ md5 = "a8e5fc5208657b03ad1bd4c46de75724";
+ };
+
+ propagatedBuildInputs = with pythonPackages; [ pygtk pygobject pkgs.graphviz ];
+
+ meta = with stdenv.lib; {
+ description = "xdot.py is an interactive viewer for graphs written in Graphviz's dot";
+ homepage = https://github.com/jrfonseca/xdot.py;
+ license = licenses.lgpl3Plus;
+ };
+ };
zope_broken = buildPythonPackage rec {
name = "zope.broken-3.6.0";
@@ -9097,11 +9738,11 @@ rec {
zope_browser = buildPythonPackage rec {
- name = "zope.browser-1.3";
+ name = "zope.browser-2.0.2";
src = fetchurl {
url = "http://pypi.python.org/packages/source/z/zope.browser/${name}.zip";
- md5 = "4ff0ddbf64c45bfcc3189e35f4214ded";
+ sha256 = "0f9r5rn9lzgi4hvkhgb6vgw8kpz9sv16jsfb9ws4am8gbqcgv2iy";
};
propagatedBuildInputs = [ zope_interface ];
@@ -9111,13 +9752,31 @@ rec {
};
};
+ zope_browserresource = buildPythonPackage rec {
+ name = "zope.browserresource-4.0.1";
- zope_component = buildPythonPackage rec {
- name = "zope.component-4.0.2";
+ propagatedBuildInputs = [
+ zope_component zope_configuration zope_contenttype zope_i18n
+ zope_interface zope_location zope_publisher zope_schema zope_traversing
+ ];
+
+ # all tests fail
+ doCheck = false;
src = fetchurl {
- url = "http://pypi.python.org/packages/source/z/zope.component/zope.component-4.0.2.tar.gz";
- md5 = "8c2fd4414ca23cbbe014dcaf911acebc";
+ url = "https://pypi.python.org/packages/source/z/zope.browserresource/zope.browserresource-4.0.1.zip";
+ md5 = "81bbe92c1f04725561470f89d73222c5";
+ };
+ };
+
+
+
+ zope_component = buildPythonPackage rec {
+ name = "zope.component-4.2.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.component/zope.component-4.2.1.tar.gz";
+ sha256 = "1gzbr0j6c2h0cqnpi2cjss38wrz1bcwx8xahl3vykgz5laid15l6";
};
propagatedBuildInputs = [
@@ -9135,11 +9794,11 @@ rec {
zope_configuration = buildPythonPackage rec {
- name = "zope.configuration-4.0.2";
+ name = "zope.configuration-4.0.3";
src = fetchurl {
- url = "http://pypi.python.org/packages/source/z/zope.configuration/zope.configuration-4.0.2.tar.gz";
- md5 = "40b3c7ad0b748ede532d8cfe2544e44e";
+ url = "http://pypi.python.org/packages/source/z/zope.configuration/zope.configuration-4.0.3.tar.gz";
+ sha256 = "1x9dfqypgympnlm25p9m43xh4qv3p7d75vksv9pzqibrb4cggw5n";
};
propagatedBuildInputs = [ zope_i18nmessageid zope_schema ];
@@ -9151,13 +9810,16 @@ rec {
zope_container = buildPythonPackage rec {
- name = "zope.container-3.11.2";
+ name = "zope.container-4.0.0";
src = fetchurl {
url = "http://pypi.python.org/packages/source/z/zope.container/${name}.tar.gz";
- md5 = "fc66d85a17b8ffb701091c9328983dcc";
+ md5 = "b24d2303ece65a2d9ce23a5bd074c335";
};
+ # a test is failing
+ doCheck = false;
+
propagatedBuildInputs = [
zodb3 zope_broken zope_dottedname zope_publisher
zope_filerepresentation zope_lifecycleevent zope_size
@@ -9171,11 +9833,11 @@ rec {
zope_contenttype = buildPythonPackage rec {
- name = "zope.contenttype-3.5.5";
+ name = "zope.contenttype-4.0.1";
src = fetchurl {
- url = "http://pypi.python.org/packages/source/z/zope.contenttype/${name}.zip";
- md5 = "c6ac80e6887de4108a383f349fbdf332";
+ url = "http://pypi.python.org/packages/source/z/zope.contenttype/${name}.tar.gz";
+ md5 = "171be44753e86742da8c81b3ad008ce0";
};
meta = {
@@ -9199,11 +9861,11 @@ rec {
zope_event = buildPythonPackage rec {
name = "zope.event-${version}";
- version = "4.0.2";
+ version = "4.0.3";
src = fetchurl {
url = "http://pypi.python.org/packages/source/z/zope.event/${name}.tar.gz";
- md5 = "e08dd299d428d77a1cfcbfe841b81872";
+ sha256 = "1w858k9kmgzfj36h65kp27m9slrmykvi5cjq6c119xqnaz5gdzgm";
};
meta = {
@@ -9252,11 +9914,11 @@ rec {
zope_i18n = buildPythonPackage rec {
- name = "zope.i18n-3.7.4";
+ name = "zope.i18n-3.8.0";
src = fetchurl {
url = "http://pypi.python.org/packages/source/z/zope.i18n/${name}.tar.gz";
- md5 = "a6fe9d9ad53dd7e94e87cd58fb67d3b7";
+ sha256 = "045nnimmshibcq71yym2d8yrs6wzzhxq5gl7wxjnkpyjm5y0hfkm";
};
propagatedBuildInputs = [ pytz zope_component ];
@@ -9268,11 +9930,11 @@ rec {
zope_i18nmessageid = buildPythonPackage rec {
- name = "zope.i18nmessageid-4.0.2";
+ name = "zope.i18nmessageid-4.0.3";
src = fetchurl {
- url = "http://pypi.python.org/packages/source/z/zope.i18nmessageid/zope.i18nmessageid-4.0.2.tar.gz";
- md5 = "c4550f7a0b4a736186e6e0fa3b2471f7";
+ url = "http://pypi.python.org/packages/source/z/zope.i18nmessageid/zope.i18nmessageid-4.0.3.tar.gz";
+ sha256 = "1rslyph0klk58dmjjy4j0jxy21k03azksixc3x2xhqbkv97cmzml";
};
meta = {
@@ -9282,11 +9944,11 @@ rec {
zope_lifecycleevent = buildPythonPackage rec {
- name = "zope.lifecycleevent-3.6.2";
+ name = "zope.lifecycleevent-3.7.0";
src = fetchurl {
url = "http://pypi.python.org/packages/source/z/zope.lifecycleevent/${name}.tar.gz";
- md5 = "3ba978f3ba7c0805c81c2c79ea3edb33";
+ sha256 = "0s5brphqzzz89cykg61gy7zcmz0ryq1jj2va7gh2n1b3cccllp95";
};
propagatedBuildInputs = [ zope_event zope_component ];
@@ -9298,11 +9960,11 @@ rec {
zope_location = buildPythonPackage rec {
- name = "zope.location-4.0.0";
+ name = "zope.location-4.0.3";
src = fetchurl {
- url = "http://pypi.python.org/packages/source/z/zope.location/zope.location-4.0.0.tar.gz";
- md5 = "cd0e10d5923c95e352bcde505cc11324";
+ url = "http://pypi.python.org/packages/source/z/zope.location/zope.location-4.0.3.tar.gz";
+ sha256 = "1nj9da4ksiyv3h8n2vpzwd0pb03mdsh7zy87hfpx72b6p2zcwg74";
};
propagatedBuildInputs = [ zope_proxy ];
@@ -9355,11 +10017,11 @@ rec {
zope_schema = buildPythonPackage rec {
- name = "zope.schema-4.2.2";
+ name = "zope.schema-4.4.2";
src = fetchurl {
- url = "http://pypi.python.org/packages/source/z/zope.schema/zope.schema-4.2.2.tar.gz";
- md5 = "e7e581af8193551831560a736a53cf58";
+ url = "http://pypi.python.org/packages/source/z/zope.schema/${name}.tar.gz";
+ sha256 = "1p943jdxb587dh7php4vx04qvn7b2877hr4qs5zyckvp5afhhank";
};
propagatedBuildInputs = [ zope_location zope_event zope_interface zope_testing ] ++ optional isPy26 ordereddict;
@@ -9374,13 +10036,13 @@ rec {
name = "zope.security-4.0.1";
src = fetchurl {
- url = "http://pypi.python.org/packages/source/z/zope.security/zope.security-3.7.4.tar.gz";
- md5 = "072ab8d11adc083eace11262da08630c";
+ url = "http://pypi.python.org/packages/source/z/zope.security/${name}.tar.gz";
+ md5 = "27d1f2873a0ee9c1f485f7b8f22d8e1c";
};
propagatedBuildInputs = [
zope_component zope_configuration zope_i18nmessageid zope_schema
- zope_proxy
+ zope_proxy zope_testrunner
];
meta = {
@@ -9390,11 +10052,11 @@ rec {
zope_size = buildPythonPackage rec {
- name = "zope.size-3.4.1";
+ name = "zope.size-3.5.0";
src = fetchurl {
url = "http://pypi.python.org/packages/source/z/zope.size/${name}.tar.gz";
- md5 = "55d9084dfd9dcbdb5ad2191ceb5ed03d";
+ sha256 = "006xfkhvmypwd3ww9gbba4zly7n9w30bpp1h74d53la7l7fiqk2f";
};
propagatedBuildInputs = [ zope_i18nmessageid zope_interface ];
@@ -9406,15 +10068,17 @@ rec {
zope_sqlalchemy = buildPythonPackage rec {
- name = "zope.sqlalchemy-0.7.3";
+ name = "zope.sqlalchemy-0.7.5";
+
+ doCheck = !isPyPy; # https://github.com/zopefoundation/zope.sqlalchemy/issues/12
src = fetchurl {
url = "http://pypi.python.org/packages/source/z/zope.sqlalchemy/${name}.zip";
- md5 = "8b317b41244fc2e67f2f286890ba59a0";
+ md5 = "0a468bd5b8884cd29fb71acbf7eaa31e";
};
- buildInputs = [ sqlalchemy zope_testing zope_interface setuptools ];
- propagatedBuildInputs = [ sqlalchemy transaction ];
+ buildInputs = [ zope_testing zope_interface ];
+ propagatedBuildInputs = [ sqlalchemy9 transaction ];
meta = {
maintainers = [
@@ -9434,7 +10098,7 @@ rec {
url = "http://pypi.python.org/packages/source/z/zope.testing/${name}.tar.gz";
md5 = "6c73c5b668a67fdc116a25b884058ed9";
};
-
+
doCheck = !(python.isPypy or false);
propagatedBuildInputs = [ zope_interface zope_exceptions zope_location ];
@@ -9450,17 +10114,16 @@ rec {
zope_testrunner = buildPythonPackage rec {
name = "zope.testrunner-${version}";
- version = "4.4.1";
+ version = "4.4.3";
src = fetchurl {
url = "http://pypi.python.org/packages/source/z/zope.testrunner/${name}.zip";
- md5 = "1d689abad000419891494b30dd7d8190";
+ sha256 = "1dwk35kg0bmj2lzp4fd2bgp6dv64q5sda09bf0y8j63y53vqbsw8";
};
propagatedBuildInputs = [ zope_interface zope_exceptions zope_testing six ] ++ optional (!python.is_py3k or false) subunit;
- # a test is failing
- doCheck = false;
+ doCheck = true;
meta = {
description = "A flexible test runner with layer support";
@@ -9472,14 +10135,17 @@ rec {
zope_traversing = buildPythonPackage rec {
- name = "zope.traversing-3.13.2";
+ name = "zope.traversing-4.0.0";
src = fetchurl {
url = "http://pypi.python.org/packages/source/z/zope.traversing/${name}.zip";
- md5 = "eaad8fc7bbef126f9f8616b074ec00aa";
+ md5 = "5cc40c552f953939f7c597ebbedd586f";
};
- propagatedBuildInputs = [ zope_location zope_security zope_publisher ];
+ propagatedBuildInputs = [ zope_location zope_security zope_publisher transaction zope_tales ];
+
+ # circular dependency on zope_browserresource
+ doCheck = false;
meta = {
maintainers = [ stdenv.lib.maintainers.goibhniu ];
@@ -9488,11 +10154,11 @@ rec {
zope_interface = buildPythonPackage rec {
- name = "zope.interface-4.0.3";
+ name = "zope.interface-4.1.1";
src = fetchurl {
url = "http://pypi.python.org/packages/source/z/zope.interface/${name}.tar.gz";
- md5 = "1ddd308f2c83703accd1696158c300eb";
+ md5 = "edcd5f719c5eb2e18894c4d06e29b6c6";
};
propagatedBuildInputs = [ zope_event ];
@@ -9527,6 +10193,7 @@ rec {
cliapp = buildPythonPackage rec {
name = "cliapp-${version}";
version = "1.20140719";
+ disabled = isPy3k;
src = fetchurl rec {
url = "http://code.liw.fi/debian/pool/main/p/python-cliapp/python-cliapp_${version}.orig.tar.gz";
@@ -9577,11 +10244,42 @@ rec {
};
};
+ screenkey = buildPythonPackage rec {
+ version = "0.2-b3634a2c6eb6d6936c3b2c1ef5078bf3a84c40c6";
+ name = "screenkey-${version}";
+
+ propagatedBuildInputs = [ pygtk distutils_extra xlib pkgs.xorg.xmodmap ];
+
+ preConfigure = ''
+ substituteInPlace setup.py --replace "/usr/share" "./share"
+
+ # disable the feature that binds a shortcut to turning on/off
+ # screenkey. This is because keybinder is not packages in Nix as
+ # of today.
+ substituteInPlace Screenkey/screenkey.py \
+ --replace "import keybinder" "" \
+ --replace " keybinder.bind(self.options['hotkey'], self.hotkey_cb, show_item)" ""
+ '';
+
+ src = fetchgit {
+ url = https://github.com/scs3jb/screenkey.git;
+ rev = "b3634a2c6eb6d6936c3b2c1ef5078bf3a84c40c6";
+ sha256 = "eb754917e98e03cb9d528eb5f57a08c88fa7a8172f92325a9fe796b2daf14db0";
+ };
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/scs3jb/screenkey;
+ description = "A screencast tool to show your keys";
+ license = stdenv.lib.licenses.gpl3Plus;
+ maintainers = [ maintainers.DamienCassou ];
+ platforms = platforms.linux;
+ };
+ };
tarman = buildPythonPackage rec {
version = "0.1.3";
name = "tarman-${version}";
-
+
disabled = isPy3k;
src = fetchurl {
@@ -9600,6 +10298,7 @@ rec {
libarchive = buildPythonPackage rec {
version = "3.1.2-1";
name = "libarchive-${version}";
+ disabled = isPy3k;
src = fetchurl {
url = "http://python-libarchive.googlecode.com/files/python-libarchive-${version}.tar.gz";
@@ -9684,6 +10383,7 @@ rec {
ttystatus = buildPythonPackage rec {
name = "ttystatus-${version}";
version = "0.23";
+ disabled = isPy3k;
src = fetchurl rec {
url = "http://code.liw.fi/debian/pool/main/p/python-ttystatus/python-ttystatus_${version}.orig.tar.gz";
@@ -9725,6 +10425,24 @@ rec {
};
+ websocket_client = buildPythonPackage rec {
+ name = "websocket-client-0.17.0";
+
+ src = fetchurl {
+ url = "https://pypi.python.org/packages/source/w/websocket-client/${name}.tar.gz";
+ md5 = "c86591719085eaf4a01c2275e0c834fc";
+ };
+
+ propagatedBuildInputs = [ six backports_ssl_match_hostname_3_4_0_2 unittest2 argparse ];
+
+ meta = {
+ homepage = https://github.com/liris/websocket-client;
+ description = "Websocket client for python";
+ license = licenses.lgpl2;
+ };
+ };
+
+
webhelpers = buildPythonPackage rec {
name = "WebHelpers-1.3";
@@ -9869,6 +10587,7 @@ rec {
versiontools = buildPythonPackage rec {
name = "versiontools-1.9.1";
+ doCheck = (!isPy3k);
src = fetchurl {
url = "https://pypi.python.org/packages/source/v/versiontools/${name}.tar.gz";
@@ -9910,6 +10629,66 @@ rec {
};
};
+ graphite_api = buildPythonPackage rec {
+ name = "graphite-api-1.0.1";
+ disabled = isPyPy;
+
+ src = fetchgit {
+ url = "https://github.com/brutasse/graphite-api.git";
+ rev = "b6f75e8a08fae695c094fece6de611b893fc65fb";
+ sha256 = "41b90d5f35e99a020a6b1b77938690652521d1841b3165574fcfcee807ce4e6a";
+ };
+
+ checkPhase = "nosetests";
+
+ propagatedBuildInputs = [
+ flask
+ flask_cache
+ cairocffi
+ pyparsing
+ pytz
+ pyyaml
+ raven
+ six
+ structlog
+ tzlocal
+ ];
+
+ buildInputs = [
+ nose
+ mock
+ ];
+
+ LD_LIBRARY_PATH = "${pkgs.cairo}/lib";
+
+ meta = {
+ description = "Graphite-web, without the interface. Just the rendering HTTP API.";
+ homepage = https://github.com/brutasse/graphite-api;
+ license = licenses.asl20;
+ };
+ };
+
+ graphite_influxdb = buildPythonPackage rec {
+ name = "graphite-influxdb-0.3";
+
+ src = fetchgit {
+ url = "https://github.com/vimeo/graphite-influxdb.git";
+ rev = "2273d12a24e1d804685a36debfd4224b7416b62f";
+ sha256 = "e386eaf190793d3ad0a42a74b9e137a968a51fc3806f602ff756e09c0c0648a8";
+ };
+
+ propagatedBuildInputs = [ influxdb graphite_api ];
+
+ passthru.moduleName = "graphite_influxdb.InfluxdbFinder";
+
+ meta = {
+ description = "An influxdb backend for Graphite-web and graphite-api";
+ homepage = https://github.com/vimeo/graphite-influxdb;
+ license = licenses.asl20;
+ };
+ };
+
+
pyspotify = buildPythonPackage rec {
name = "pyspotify-${version}";
@@ -10017,15 +10796,19 @@ rec {
IMAPClient = buildPythonPackage rec {
name = "IMAPClient-${version}";
- version = "0.9.2";
+ version = "0.11";
+ disabled = isPy34;
src = fetchurl {
url = "http://freshfoo.com/projects/IMAPClient/${name}.tar.gz";
- sha256 = "10alpj7074djs048xjc4j7ggd1nrqdqpy0fzl7fj9hddp0rbchs9";
+ sha256 = "1w54h8gz25qf6ggazzp6xf7kvsyiadsjfkkk17gm0p6pmzvvccbn";
};
+ buildInputs = [ mock ];
+
preConfigure = ''
sed -i '/distribute_setup/d' setup.py
+ substituteInPlace setup.py --replace "mock==0.8.0" "mock"
'';
meta = {
@@ -10163,22 +10946,44 @@ rec {
};
udiskie = buildPythonPackage rec {
- name = "udiskie-0.8.0";
+ version = "1.1.2";
+ name = "udiskie-${version}";
src = fetchurl {
- url = "https://github.com/coldfix/udiskie/archive/0.8.0.tar.gz";
- sha256 = "0yzrnl7bq0dkcd3wh55kbf41c4dbh7dky0mqx0drvnpxlrvzhvp2";
+ url = "https://github.com/coldfix/udiskie/archive/${version}.tar.gz";
+ sha256 = "07fyvwp4rga47ayfsmb79p2784sqrih0sglwnd9c4x6g63xgljvb";
};
- propagatedBuildInputs = with pythonPackages; [ pygtk pyyaml dbus notify pkgs.udisks2 ];
+ propagatedBuildInputs = with pythonPackages; [ pygtk pyyaml pygobject dbus notify pkgs.udisks2 pkgs.gettext ];
# tests require dbusmock
doCheck = false;
meta = with stdenv.lib; {
- description = "Removable disk automounter for udisks.";
+ description = "Removable disk automounter for udisks";
license = licenses.mit;
homepage = https://github.com/coldfix/udiskie;
+ maintainers = [ maintainers.AndersonTorres ];
+ };
+ };
+
+ pythonefl_1_11 = buildPythonPackage rec {
+ name = "python-efl-${version}";
+ version = "1.11.0";
+ src = fetchurl {
+ url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.xz";
+ sha256 = "1d4hj39alg6j7ah1bc8wvlka9d13i8iy3fxxraik2f60w6811i48";
+ };
+ preConfigure = ''
+ export NIX_CFLAGS_COMPILE="-I${pkgs.e19.efl}/include/eo-1 -I${pkgs.e19.efl}/include/eina-1 -I${pkgs.e19.efl}/include/eina-1/eina -I${pkgs.e19.efl}/include/evas-1 -I${dbus}/include/dbus-1.0 -I${pkgs.e19.efl}/include/efl-1 -I${pkgs.e19.efl}/include/eet-1 -I${pkgs.e19.efl}/include/ecore-1 -I${pkgs.e19.efl}/include/ecore-evas-1 -I${pkgs.e19.efl}/include/ecore-file-1 -I${pkgs.e19.efl}/include/ecore-input-1 -I${pkgs.e19.efl}/include/ecore-imf-1 -I${pkgs.e19.efl}/include/ecore-con-1 -I${pkgs.e19.efl}/include/edje-1 -I${pkgs.e19.efl}/include/eldbus-1 -I${pkgs.e19.efl}/include/efreet-1 -I${pkgs.e19.efl}/include/ethumb-client-1 -I${pkgs.e19.efl}/include/ethumb-1 -I${pkgs.e19.efl}/include/ecore-x-1 $NIX_CFLAGS_COMPILE"
+ '';
+ buildInputs = [ pkgs.pkgconfig pkgs.e19.efl pkgs.e19.elementary ];
+ meta = {
+ description = "Python bindings for EFL and Elementary.";
+ homepage = http://enlightenment.org/;
+ maintainers = [ stdenv.lib.maintainers.matejc ];
+ platforms = stdenv.lib.platforms.linux;
+ license = stdenv.lib.licenses.gpl3;
};
};
@@ -10202,6 +11007,51 @@ rec {
};
};
+ snapperGUI = buildPythonPackage rec {
+ name = "Snapper-GUI";
+
+ src = fetchgit {
+ url = "https://github.com/ricardomv/snapper-gui";
+ rev = "11d98586b122180c75a86fccda45c4d7e3137591";
+ sha256 = "7a9f86fc17dbf130526e70c3e925eac30e2c74d6b932efbf7e7cd9fbba6dc4b1";
+ };
+
+ # no tests available
+ doCheck = false;
+
+ propagatedBuildInputs = with pythonPackages; [ pygobject3 dbus ];
+
+ meta = {
+ homepage = https://github.com/ricardomv/snapper-gui;
+ description = "Graphical frontend for snapper";
+ license = licenses.gpl2;
+ maintainers = [ stdenv.lib.maintainers.tstrobel ];
+ };
+ };
+
+
+ redNotebook = buildPythonPackage rec {
+ name = "rednotebook-1.8.1";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/rednotebook/${name}.tar.gz";
+ sha256 = "00b7s4xpqpxsbzjvjx9qsx5d84m9pvn383c5di1nsfh35pig0rzn";
+ };
+
+ # no tests available
+ doCheck = false;
+
+ propagatedBuildInputs = with pythonPackages; [ pygtk pywebkitgtk pyyaml chardet ];
+
+ meta = {
+ 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 ];
+ };
+ };
+
+
# python2.7 specific packages
} // optionalAttrs isPy27 (
@@ -10302,6 +11152,23 @@ rec {
};
};
+ weboob = buildPythonPackage rec {
+ name = "weboob-0.j";
+ src = fetchurl {
+ url = "https://symlink.me/attachments/download/271/${name}.tar.gz";
+ md5 = "9e11b1f376ccb87d35995ec87bba5b38";
+ };
+ setupPyBuildFlags = ["--qt" "--xdg"];
+
+ propagatedBuildInputs = [ pillow prettytable pyyaml dateutil gdata requests2 mechanize feedparser lxml pkgs.gnupg pyqt4 pkgs.libyaml simplejson cssselect ];
+
+ 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 ];
+ };
+ };
}); in pythonPackages
diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix
index e2f5309ced3..0a8e7165d66 100644
--- a/pkgs/top-level/release-lib.nix
+++ b/pkgs/top-level/release-lib.nix
@@ -123,6 +123,8 @@ rec {
packagesWithMetaPlatform attrSet
else if attrSet.recurseForRelease or false then
packagesWithMetaPlatform attrSet
+ else if attrSet.meta.broken or false then
+ []
else
attrSet.meta.hydraPlatforms or (attrSet.meta.platforms or []);
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 9970c2789ac..71f51554719 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -48,39 +48,25 @@ let
} // (mapTestOn ((packagesWithMetaPlatform pkgs) // rec {
abcde = linux;
- alsaUtils = linux;
apacheHttpd = linux;
aspell = all;
at = linux;
atlas = linux;
- audacious = linux;
autoconf = all;
automake = all;
- avahi = allBut cygwin; # Cygwin builds fail
bash = all;
bashInteractive = all;
bazaar = linux; # first let sqlite3 work on darwin
- bc = all;
binutils = linux;
bind = linux;
- bitlbee = linux;
- bittorrent = linux;
- blender = linux;
- bsdiff = all;
- btrfsProgs = linux;
bvi = all;
- bzip2 = all;
- cabextract = all;
castle_combat = linux;
cdrkit = linux;
- chatzilla = linux;
cksfv = all;
classpath = linux;
coreutils = all;
- cpio = all;
cron = linux;
cvs = linux;
- db4 = all;
ddrescue = linux;
dhcp = linux;
dico = linux;
@@ -97,22 +83,15 @@ let
dosbox = linux;
dovecot = linux;
doxygen = linux;
- dpkg = linux;
drgeo = linux;
ejabberd = linux;
elinks = linux;
- enscript = all;
eprover = linux;
- evince = linux;
expect = linux;
exult = linux;
- fbterm = linux;
- feh = linux;
- file = all;
findutils = all;
flex = all;
fontforge = linux;
- fuse = linux;
gajim = linux;
gawk = all;
gcc = linux;
@@ -120,53 +99,34 @@ let
gcc34 = linux;
gcc44 = linux;
gcj = linux;
- ghdl = linux;
ghostscript = linux;
ghostscriptX = linux;
- gimp_2_8 = linux;
git = linux;
gitFull = linux;
glibc = linux;
glibcLocales = linux;
glxinfo = linux;
- gnash = linux;
- gnat = linux;
- gnugrep = all;
gnum4 = all;
- gnumake = all;
- gnupatch = all;
gnupg = linux;
gnuplot = allBut cygwin;
- gnused = all;
- gnutar = all;
gnutls = linux;
gogoclient = linux;
gphoto2 = linux;
gpm = linux;
- gprolog = linux;
gpscorrelate = linux;
- gpsd = linux;
gqview = gtkSupported;
graphviz = all;
grub = linux;
- grub2 = linux;
gsl = linux;
guile = linux; # tests fail on Cygwin
- gv = linux;
gzip = all;
hddtemp = linux;
- hello = all;
host = linux;
htmlTidy = all;
- hugin = linux;
iana_etc = linux;
icewm = linux;
- idutils = all;
ifplugd = linux;
- impressive = linux;
- inetutils = linux;
inkscape = linux;
- iputils = linux;
irssi = linux;
jfsutils = linux;
jfsrec = linux;
@@ -175,19 +135,14 @@ let
kbd = linux;
keen4 = ["i686-linux"];
# klibc = linux;
- kvm = linux;
- qemu = linux;
- qemu_kvm = linux;
less = all;
lftp = all;
libarchive = linux;
- libsmbios = linux;
libtool = all;
libtool_2 = all;
lout = linux;
lsof = linux;
ltrace = linux;
- lvm2 = linux;
lynx = linux;
lzma = linux;
man = linux;
@@ -200,14 +155,11 @@ let
mercurial = unix;
mercurialFull = linux;
mesa = mesaPlatforms;
- midori = linux;
mingetty = linux;
mk = linux;
mktemp = all;
mod_python = linux;
module_init_tools = linux;
- mono = linux;
- mpg321 = linux;
mupen64plus = linux;
mutt = linux;
mysql = linux;
@@ -216,71 +168,53 @@ let
nano = allBut cygwin;
ncat = linux;
netcat = all;
- nfsUtils = linux;
- nmap = linux;
nss_ldap = linux;
nssmdns = linux;
- ntfs3g = linux;
- ntp = linux;
ocaml = linux;
- octave = linux;
- openssl = all;
pam_console = linux;
pam_login = linux;
pan = gtkSupported;
par2cmdline = all;
- pavucontrol = linux;
pciutils = linux;
pdf2xml = all;
perl = all;
php = linux;
- pidgin = linux;
pinentry = linux;
pltScheme = linux;
pmccabe = linux;
portmap = linux;
postgresql = all;
- postfix = linux;
ppl = all;
procps = linux;
pthreadmanpages = linux;
pygtk = linux;
- pyqt4 = linux;
python = allBut cygwin;
pythonFull = linux;
sbcl = linux;
qt3 = linux;
quake3demo = linux;
- readline = all;
reiserfsprogs = linux;
rlwrap = all;
rogue = all;
rpm = linux;
rsync = linux;
rubber = allBut cygwin;
- ruby = all;
rxvt_unicode = linux;
screen = linux ++ darwin;
scrot = linux;
sdparm = linux;
seccure = linux;
sgtpuzzles = linux;
- sharutils = all;
- slim = linux;
sloccount = allBut cygwin;
- smartmontools = linux;
spidermonkey = linux;
- sqlite = allBut cygwin;
squid = linux;
ssmtp = linux;
stdenv = prio 175 all;
stlport = linux;
- strace = linux;
su = linux;
sudo = linux;
superTuxKart = linux;
swig = linux;
- sylpheed = linux;
sysklogd = linux;
syslinux = ["i686-linux"];
sysvinit = linux;
@@ -298,29 +232,23 @@ let
time = linux;
tinycc = linux;
uae = linux;
- udev = linux;
unrar = linux;
upstart = linux;
usbutils = linux;
utillinux = linux;
utillinuxCurses = linux;
- uzbl = linux;
viking = linux;
vice = linux;
vim = linux;
vimHugeX = linux;
vncrec = linux;
vorbisTools = linux;
- vpnc = linux;
vsftpd = linux;
w3m = all;
- webkit = linux;
weechat = linux;
- wget = all;
which = all;
wicd = linux;
wine = ["i686-linux"];
- wireshark = linux;
wirelesstools = linux;
wxGTK = linux;
x11_ssh_askpass = linux;
@@ -334,10 +262,7 @@ let
xscreensaver = linux;
xsel = linux;
xterm = linux;
- xxdiff = linux;
zdelta = linux;
- zile = linux;
- zip = all;
zsh = linux;
zsnes = ["i686-linux"];
@@ -440,6 +365,14 @@ let
xfwm4 = linux;
};
+ linuxPackages_testing = { };
+ linuxPackages_grsec_stable_desktop = { };
+ linuxPackages_grsec_stable_server = { };
+ linuxPackages_grsec_stable_server_xen = { };
+ linuxPackages_grsec_testing_desktop = { };
+ linuxPackages_grsec_testing_server = { };
+ linuxPackages_grsec_testing_server_xen = { };
+
} ));
in jobs