diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md
index 298920ce166..93eb5af0f2c 100644
--- a/doc/languages-frameworks/python.section.md
+++ b/doc/languages-frameworks/python.section.md
@@ -424,7 +424,7 @@ available.
At some point you'll likely have multiple packages which you would
like to be able to use in different projects. In order to minimise unnecessary
-duplication we now look at how you can maintain yourself a repository with your
+duplication we now look at how you can maintain a repository with your
own packages. The important functions here are `import` and `callPackage`.
### Including a derivation using `callPackage`
@@ -647,7 +647,7 @@ in python.withPackages(ps: [ps.blaze])).env
The `buildPythonApplication` function is practically the same as `buildPythonPackage`.
The difference is that `buildPythonPackage` by default prefixes the names of the packages with the version of the interpreter.
-Because with an application we're not interested in multiple version the prefix is dropped.
+Because this is irrelevant for applications, the prefix is omitted.
#### `toPythonApplication` function
@@ -1006,14 +1006,14 @@ folder and not downloaded again.
If you need to change a package's attribute(s) from `configuration.nix` you could do:
```nix
- nixpkgs.config.packageOverrides = superP: {
- pythonPackages = superP.pythonPackages.override {
- overrides = self: super: {
- bepasty-server = super.bepasty-server.overrideAttrs ( oldAttrs: {
- src = pkgs.fetchgit {
- url = "https://github.com/bepasty/bepasty-server";
- sha256 = "9ziqshmsf0rjvdhhca55sm0x8jz76fsf2q4rwh4m6lpcf8wr0nps";
- rev = "e2516e8cf4f2afb5185337073607eb9e84a61d2d";
+ nixpkgs.config.packageOverrides = super: {
+ python = super.python.override {
+ packageOverrides = python-self: python-super: {
+ zerobin = python-super.zerobin.overrideAttrs (oldAttrs: {
+ src = super.fetchgit {
+ url = "https://github.com/sametmax/0bin";
+ rev = "a344dbb18fe7a855d0742b9a1cede7ce423b34ec";
+ sha256 = "16d769kmnrpbdr0ph0whyf4yff5df6zi4kmwx7sz1d3r6c8p6xji";
};
});
};
@@ -1021,27 +1021,39 @@ If you need to change a package's attribute(s) from `configuration.nix` you coul
};
```
-If you are using the `bepasty-server` package somewhere, for example in `systemPackages` or indirectly from `services.bepasty`, then a `nixos-rebuild switch` will rebuild the system but with the `bepasty-server` package using a different `src` attribute. This way one can modify `python` based software/libraries easily. Using `self` and `super` one can also alter dependencies (`buildInputs`) between the old state (`self`) and new state (`super`).
+`pythonPackages.zerobin` is now globally overridden. All packages and also the
+`zerobin` NixOS service use the new definition.
+Note that `python-super` refers to the old package set and `python-self`
+to the new, overridden version.
+
+To modify only a Python package set instead of a whole Python derivation, use this snippet:
+
+```nix
+ myPythonPackages = pythonPackages.override {
+ overrides = self: super: {
+ zerobin = ...;
+ };
+ }
+```
### How to override a Python package using overlays?
-To alter a python package using overlays, you would use the following approach:
+Use the following overlay template:
```nix
self: super:
{
python = super.python.override {
packageOverrides = python-self: python-super: {
- bepasty-server = python-super.bepasty-server.overrideAttrs ( oldAttrs: {
- src = self.pkgs.fetchgit {
- url = "https://github.com/bepasty/bepasty-server";
- sha256 = "9ziqshmsf0rjvdhhca55sm0x8jz76fsf2q4rwh4m6lpcf8wr0nps";
- rev = "e2516e8cf4f2afb5185337073607eb9e84a61d2d";
+ zerobin = python-super.zerobin.overrideAttrs (oldAttrs: {
+ src = super.fetchgit {
+ url = "https://github.com/sametmax/0bin";
+ rev = "a344dbb18fe7a855d0742b9a1cede7ce423b34ec";
+ sha256 = "16d769kmnrpbdr0ph0whyf4yff5df6zi4kmwx7sz1d3r6c8p6xji";
};
});
};
};
- pythonPackages = self.python.pkgs;
}
```
diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix
index c0c283469fe..0c70f2a7cd5 100644
--- a/lib/systems/inspect.nix
+++ b/lib/systems/inspect.nix
@@ -16,6 +16,7 @@ rec {
isAarch64 = { cpu = { family = "arm"; bits = 64; }; };
isMips = { cpu = { family = "mips"; }; };
isRiscV = { cpu = { family = "riscv"; }; };
+ isSparc = { cpu = { family = "sparc"; }; };
isWasm = { cpu = { family = "wasm"; }; };
is32bit = { cpu = { bits = 32; }; };
diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index d79947ad3de..47841a9eba5 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -93,6 +93,9 @@ rec {
riscv32 = { bits = 32; significantByte = littleEndian; family = "riscv"; };
riscv64 = { bits = 64; significantByte = littleEndian; family = "riscv"; };
+ sparc = { bits = 32; significantByte = bigEndian; family = "sparc"; };
+ sparc64 = { bits = 64; significantByte = bigEndian; family = "sparc"; };
+
wasm32 = { bits = 32; significantByte = littleEndian; family = "wasm"; };
wasm64 = { bits = 64; significantByte = littleEndian; family = "wasm"; };
};
diff --git a/lib/trivial.nix b/lib/trivial.nix
index fac0718a9e7..b75e81eb735 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -1,43 +1,9 @@
{ lib }:
-let
- zipIntBits = f: x: y:
- let
- # (intToBits 6) -> [ 0 1 1 ]
- intToBits = x:
- if x == 0 || x == -1 then
- []
- else
- let
- headbit = if (x / 2) * 2 != x then 1 else 0; # x & 1
- tailbits = if x < 0 then ((x + 1) / 2) - 1 else x / 2; # x >> 1
- in
- [headbit] ++ (intToBits tailbits);
- # (bitsToInt [ 0 1 1 ] 0) -> 6
- # (bitsToInt [ 0 1 0 ] 1) -> -6
- bitsToInt = l: signum:
- if l == [] then
- (if signum == 0 then 0 else -1)
- else
- (builtins.head l) + (2 * (bitsToInt (builtins.tail l) signum));
-
- xsignum = if x < 0 then 1 else 0;
- ysignum = if y < 0 then 1 else 0;
- zipListsWith' = fst: snd:
- if fst==[] && snd==[] then
- []
- else if fst==[] then
- [(f xsignum (builtins.head snd))] ++ (zipListsWith' [] (builtins.tail snd))
- else if snd==[] then
- [(f (builtins.head fst) ysignum )] ++ (zipListsWith' (builtins.tail fst) [] )
- else
- [(f (builtins.head fst) (builtins.head snd))] ++ (zipListsWith' (builtins.tail fst) (builtins.tail snd));
- in
- assert (builtins.isInt x) && (builtins.isInt y);
- bitsToInt (zipListsWith' (intToBits x) (intToBits y)) (f xsignum ysignum);
-in
rec {
+ ## Simple (higher order) functions
+
/* The identity function
For when you need a function that does “nothing”.
@@ -59,7 +25,7 @@ rec {
## Named versions corresponding to some builtin operators.
- /* Concat two strings */
+ /* Concatenate two lists */
concat = x: y: x ++ y;
/* boolean “or” */
@@ -69,13 +35,19 @@ rec {
and = x: y: x && y;
/* bitwise “and” */
- bitAnd = builtins.bitAnd or zipIntBits (a: b: if a==1 && b==1 then 1 else 0);
+ bitAnd = builtins.bitAnd
+ or import ./zip-int-bits.nix
+ (a: b: if a==1 && b==1 then 1 else 0);
/* bitwise “or” */
- bitOr = builtins.bitOr or zipIntBits (a: b: if a==1 || b==1 then 1 else 0);
+ bitOr = builtins.bitOr
+ or import ./zip-int-bits.nix
+ (a: b: if a==1 || b==1 then 1 else 0);
/* bitwise “xor” */
- bitXor = builtins.bitXor or zipIntBits (a: b: if a!=b then 1 else 0);
+ bitXor = builtins.bitXor
+ or import ./zip-int-bits.nix
+ (a: b: if a!=b then 1 else 0);
/* bitwise “not” */
bitNot = builtins.sub (-1);
@@ -93,10 +65,22 @@ rec {
*/
mergeAttrs = x: y: x // y;
- # Flip the order of the arguments of a binary function.
+ /* Flip the order of the arguments of a binary function.
+
+ Example:
+ flip concat [1] [2]
+ => [ 2 1 ]
+ */
flip = f: a: b: f b a;
- # Apply function if argument is non-null
+ /* Apply function if argument is non-null.
+
+ Example:
+ mapNullable (x: x+1) null
+ => null
+ mapNullable (x: x+1) 22
+ => 23
+ */
mapNullable = f: a: if isNull a then a else f a;
# Pull in some builtins not included elsewhere.
@@ -105,20 +89,30 @@ rec {
isInt isFloat add sub lessThan
seq deepSeq genericClosure;
- inherit (lib.strings) fileContents;
- release = fileContents ../.version;
- versionSuffix = let suffixFile = ../.version-suffix; in
- if pathExists suffixFile then fileContents suffixFile else "pre-git";
+ ## nixpks version strings
- # Return the Nixpkgs version number.
+ # The current full nixpkgs version number.
version = release + versionSuffix;
+ # The current nixpkgs version number as string.
+ release = lib.strings.fileContents ../.version;
+
+ # The current nixpkgs version suffix as string.
+ versionSuffix =
+ let suffixFile = ../.version-suffix;
+ in if pathExists suffixFile
+ then lib.strings.fileContents suffixFile
+ else "pre-git";
+
nixpkgsVersion = builtins.trace "`lib.nixpkgsVersion` is deprecated, use `lib.version` instead!" version;
# Whether we're being called by nix-shell.
inNixShell = builtins.getEnv "IN_NIX_SHELL" != "";
+
+ ## Integer operations
+
# Return minimum/maximum of two numbers.
min = x: y: if x < y then x else y;
max = x: y: if x > y then x else y;
@@ -133,6 +127,9 @@ rec {
*/
mod = base: int: base - (int * (builtins.div base int));
+
+ ## Comparisons
+
/* C-style comparisons
a < b, compare a b => -1
@@ -162,17 +159,20 @@ rec {
cmp "fooa" "a" => -1
# while
compare "fooa" "a" => 1
-
*/
splitByAndCompare = p: yes: no: a: b:
if p a
then if p b then yes a b else -1
else if p b then 1 else no a b;
+
/* Reads a JSON file. */
importJSON = path:
builtins.fromJSON (builtins.readFile path);
+
+ ## Warnings and asserts
+
/* See https://github.com/NixOS/nix/issues/749. Eventually we'd like these
to expand to Nix builtins that carry metadata so that Nix can filter out
the INFO messages without parsing the message string.
@@ -188,28 +188,36 @@ rec {
warn = msg: builtins.trace "WARNING: ${msg}";
info = msg: builtins.trace "INFO: ${msg}";
- # | Add metadata about expected function arguments to a function.
- # The metadata should match the format given by
- # builtins.functionArgs, i.e. a set from expected argument to a bool
- # representing whether that argument has a default or not.
- # setFunctionArgs : (a → b) → Map String Bool → (a → b)
- #
- # This function is necessary because you can't dynamically create a
- # function of the { a, b ? foo, ... }: format, but some facilities
- # like callPackage expect to be able to query expected arguments.
+
+ ## Function annotations
+
+ /* Add metadata about expected function arguments to a function.
+ The metadata should match the format given by
+ builtins.functionArgs, i.e. a set from expected argument to a bool
+ representing whether that argument has a default or not.
+ setFunctionArgs : (a → b) → Map String Bool → (a → b)
+
+ This function is necessary because you can't dynamically create a
+ function of the { a, b ? foo, ... }: format, but some facilities
+ like callPackage expect to be able to query expected arguments.
+ */
setFunctionArgs = f: args:
{ # TODO: Should we add call-time "type" checking like built in?
__functor = self: f;
__functionArgs = args;
};
- # | Extract the expected function arguments from a function.
- # This works both with nix-native { a, b ? foo, ... }: style
- # functions and functions with args set with 'setFunctionArgs'. It
- # has the same return type and semantics as builtins.functionArgs.
- # setFunctionArgs : (a → b) → Map String Bool.
+ /* Extract the expected function arguments from a function.
+ This works both with nix-native { a, b ? foo, ... }: style
+ functions and functions with args set with 'setFunctionArgs'. It
+ has the same return type and semantics as builtins.functionArgs.
+ setFunctionArgs : (a → b) → Map String Bool.
+ */
functionArgs = f: f.__functionArgs or (builtins.functionArgs f);
+ /* Check whether something is a function or something
+ annotated with function args.
+ */
isFunction = f: builtins.isFunction f ||
(f ? __functor && isFunction (f.__functor f));
}
diff --git a/lib/zip-int-bits.nix b/lib/zip-int-bits.nix
new file mode 100644
index 00000000000..edbcdfe1e68
--- /dev/null
+++ b/lib/zip-int-bits.nix
@@ -0,0 +1,39 @@
+/* Helper function to implement a fallback for the bit operators
+ `bitAnd`, `bitOr` and `bitXOr` on older nix version.
+ See ./trivial.nix
+*/
+f: x: y:
+ let
+ # (intToBits 6) -> [ 0 1 1 ]
+ intToBits = x:
+ if x == 0 || x == -1 then
+ []
+ else
+ let
+ headbit = if (x / 2) * 2 != x then 1 else 0; # x & 1
+ tailbits = if x < 0 then ((x + 1) / 2) - 1 else x / 2; # x >> 1
+ in
+ [headbit] ++ (intToBits tailbits);
+
+ # (bitsToInt [ 0 1 1 ] 0) -> 6
+ # (bitsToInt [ 0 1 0 ] 1) -> -6
+ bitsToInt = l: signum:
+ if l == [] then
+ (if signum == 0 then 0 else -1)
+ else
+ (builtins.head l) + (2 * (bitsToInt (builtins.tail l) signum));
+
+ xsignum = if x < 0 then 1 else 0;
+ ysignum = if y < 0 then 1 else 0;
+ zipListsWith' = fst: snd:
+ if fst==[] && snd==[] then
+ []
+ else if fst==[] then
+ [(f xsignum (builtins.head snd))] ++ (zipListsWith' [] (builtins.tail snd))
+ else if snd==[] then
+ [(f (builtins.head fst) ysignum )] ++ (zipListsWith' (builtins.tail fst) [] )
+ else
+ [(f (builtins.head fst) (builtins.head snd))] ++ (zipListsWith' (builtins.tail fst) (builtins.tail snd));
+ in
+ assert (builtins.isInt x) && (builtins.isInt y);
+ bitsToInt (zipListsWith' (intToBits x) (intToBits y)) (f xsignum ysignum)
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 5abce1fcfe9..ad5671ac8b7 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -589,6 +589,11 @@
github = "c0bw3b";
name = "Renaud";
};
+ c0deaddict = {
+ email = "josvanbakel@protonmail.com";
+ github = "c0deaddict";
+ name = "Jos van Bakel";
+ };
c0dehero = {
email = "codehero@nerdpol.ch";
name = "CodeHero";
@@ -862,6 +867,11 @@
github = "danharaj";
name = "Dan Haraj";
};
+ danieldk = {
+ email = "me@danieldk.eu";
+ github = "danieldk";
+ name = "Daniël de Kok";
+ };
danielfullmer = {
email = "danielrf12@gmail.com";
github = "danielfullmer";
@@ -2732,6 +2742,11 @@
github = "neeasade";
name = "Nathan Isom";
};
+ neonfuz = {
+ email = "neonfuz@gmail.com";
+ github = "neonfuz";
+ name = "Sage Raflik";
+ };
nequissimus = {
email = "tim@nequissimus.com";
github = "nequissimus";
diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml
index 7fd6483bca1..f03b1eab619 100644
--- a/nixos/doc/manual/release-notes/rl-1809.xml
+++ b/nixos/doc/manual/release-notes/rl-1809.xml
@@ -362,6 +362,15 @@ inherit (pkgs.nixos {
The module now uses WPA2 by default.
+
+
+ s6Dns, s6Networking,
+ s6LinuxUtils and s6PortableUtils
+ renamed to
+ s6-dns, s6-networking,
+ s6-linux-utils and s6-portable-utils respectively.
+
+
diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh
index 9461144fad5..790cc6cbc53 100755
--- a/nixos/maintainers/scripts/ec2/create-amis.sh
+++ b/nixos/maintainers/scripts/ec2/create-amis.sh
@@ -10,7 +10,7 @@ version=$(nix-instantiate --eval --strict '' -A lib.version | sed s/'"'
major=${version:0:5}
echo "NixOS version is $version ($major)"
-stateDir=/var/tmp/ec2-image-$version
+stateDir=/home/deploy/amis/ec2-image-$version
echo "keeping state in $stateDir"
mkdir -p $stateDir
@@ -161,6 +161,7 @@ for type in $types; do
# Create a snapshot.
if [ -z "$snapId" ]; then
echo "creating snapshot..."
+ # FIXME: this can fail with InvalidVolume.NotFound. Eventual consistency yay.
snapId=$(aws ec2 create-snapshot --volume-id "$volId" --region "$region" --description "$description" | jq -r .SnapshotId)
if [ "$snapId" = null ]; then exit 1; fi
echo -n "$snapId" > $stateDir/$region.$type.snap-id
diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix
index 48c3b41bc09..1ef5313d3fd 100644
--- a/nixos/modules/config/networking.nix
+++ b/nixos/modules/config/networking.nix
@@ -9,7 +9,9 @@ let
cfg = config.networking;
dnsmasqResolve = config.services.dnsmasq.enable &&
config.services.dnsmasq.resolveLocalQueries;
- hasLocalResolver = config.services.bind.enable || dnsmasqResolve;
+ hasLocalResolver = config.services.bind.enable ||
+ config.services.unbound.enable ||
+ dnsmasqResolve;
resolvconfOptions = cfg.resolvconfOptions
++ optional cfg.dnsSingleRequest "single-request"
diff --git a/nixos/modules/virtualisation/ec2-amis.nix b/nixos/modules/virtualisation/ec2-amis.nix
index baffad79b00..76facac39fc 100644
--- a/nixos/modules/virtualisation/ec2-amis.nix
+++ b/nixos/modules/virtualisation/ec2-amis.nix
@@ -240,22 +240,22 @@ let self = {
"17.09".sa-east-1.hvm-ebs = "ami-4762202b";
"17.09".ap-south-1.hvm-ebs = "ami-4e376021";
- # 18.03.131792.becbe4dbe16
- "18.03".eu-west-1.hvm-ebs = "ami-cda4fab4";
- "18.03".eu-west-2.hvm-ebs = "ami-d96786be";
- "18.03".eu-west-3.hvm-ebs = "ami-6b0cba16";
- "18.03".eu-central-1.hvm-ebs = "ami-5e2b75b5";
- "18.03".us-east-1.hvm-ebs = "ami-d464cba9";
- "18.03".us-east-2.hvm-ebs = "ami-fd221298";
- "18.03".us-west-1.hvm-ebs = "ami-ff0d1d9f";
- "18.03".us-west-2.hvm-ebs = "ami-c05c3bb8";
- "18.03".ca-central-1.hvm-ebs = "ami-cc72f4a8";
- "18.03".ap-southeast-1.hvm-ebs = "ami-b61633ca";
- "18.03".ap-southeast-2.hvm-ebs = "ami-530fc131";
- "18.03".ap-northeast-1.hvm-ebs = "ami-90d6c0ec";
- "18.03".ap-northeast-2.hvm-ebs = "ami-a1248bcf";
- "18.03".sa-east-1.hvm-ebs = "ami-b090c6dc";
- "18.03".ap-south-1.hvm-ebs = "ami-32c9ec5d";
+ # 18.03.132946.1caae7247b8
+ "18.03".eu-west-1.hvm-ebs = "ami-065c46ec";
+ "18.03".eu-west-2.hvm-ebs = "ami-64f31903";
+ "18.03".eu-west-3.hvm-ebs = "ami-5a8d3d27";
+ "18.03".eu-central-1.hvm-ebs = "ami-09faf9e2";
+ "18.03".us-east-1.hvm-ebs = "ami-8b3538f4";
+ "18.03".us-east-2.hvm-ebs = "ami-150b3170";
+ "18.03".us-west-1.hvm-ebs = "ami-ce06ebad";
+ "18.03".us-west-2.hvm-ebs = "ami-586c3520";
+ "18.03".ca-central-1.hvm-ebs = "ami-aca72ac8";
+ "18.03".ap-southeast-1.hvm-ebs = "ami-aa0b4d40";
+ "18.03".ap-southeast-2.hvm-ebs = "ami-d0f254b2";
+ "18.03".ap-northeast-1.hvm-ebs = "ami-456511a8";
+ "18.03".ap-northeast-2.hvm-ebs = "ami-3366d15d";
+ "18.03".sa-east-1.hvm-ebs = "ami-163e1f7a";
+ "18.03".ap-south-1.hvm-ebs = "ami-6a390b05";
latest = self."18.03";
}; in self
diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index 8b03d93d183..84371d15249 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -555,12 +555,12 @@ rec {
spotbugs = buildEclipseUpdateSite rec {
name = "spotbugs-${version}";
- version = "3.1.5";
+ version = "3.1.6";
src = fetchzip {
stripRoot = false;
url = "https://github.com/spotbugs/spotbugs/releases/download/${version}/eclipsePlugin.zip";
- sha256 = "0fxdirz6ik9rqykm2lcr720apsaqgngr4c7q793rjb9b3bn30c85";
+ sha256 = "1qsams12n64slp00nfc9v943sy9bzffzm7anqqaz2hjw64iia7fh";
};
meta = with stdenv.lib; {
diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix
index ad04cab62f5..da15081173d 100644
--- a/pkgs/applications/editors/vim/configurable.nix
+++ b/pkgs/applications/editors/vim/configurable.nix
@@ -1,7 +1,7 @@
# TODO tidy up eg The patchelf code is patching gvim even if you don't build it..
# but I have gvim with python support now :) - Marc
args@{ source ? "default", callPackage, fetchurl, stdenv, ncurses, pkgconfig, gettext
-, composableDerivation, writeText, lib, config, glib, gtk2, gtk3, python, perl, tcl, ruby
+, writeText, lib, config, glib, gtk2, gtk3, python, perl, tcl, ruby
, libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu
, libICE
, vimPlugins
@@ -10,13 +10,27 @@ args@{ source ? "default", callPackage, fetchurl, stdenv, ncurses, pkgconfig, ge
# apple frameworks
, CoreServices, CoreData, Cocoa, Foundation, libobjc, cf-private
-, wrapPythonDrv ? false
-
+, features ? "huge" # One of tiny, small, normal, big or huge
+, wrapPythonDrv ? false
+, guiSupport ? config.vim.gui or "auto"
+, luaSupport ? config.vim.lua or true
+, perlSupport ? config.vim.perl or false # Perl interpreter
+, pythonSupport ? config.vim.python or true # Python interpreter
+, rubySupport ? config.vim.ruby or true # Ruby interpreter
+, nlsSupport ? config.vim.nls or false # Enable NLS (gettext())
+, tclSupport ? config.vim.tcl or false # Include Tcl interpreter
+, multibyteSupport ? config.vim.multibyte or false # Enable multibyte editing support
+, cscopeSupport ? config.vim.cscope or true # Enable cscope interface
+, netbeansSupport ? config.netbeans or true # Enable NetBeans integration support.
+, ximSupport ? config.vim.xim or true # less than 15KB, needed for deadkeys
+# By default, compile with darwin support if we're compiling on darwin, but
+# allow this to be disabled by setting config.vim.darwin to false
+, darwinSupport ? stdenv.isDarwin && (config.vim.darwin or true) # Enable Darwin support
+, ftNixSupport ? config.vim.ftNix or true # Add .nix filetype detection and minimal syntax highlighting support
, ... }: with args;
let
- inherit (args.composableDerivation) composableDerivation edf;
nixosRuntimepath = writeText "nixos-vimrc" ''
set nocompatible
syntax on
@@ -48,148 +62,113 @@ let
'';
common = callPackage ./common.nix {};
-in
-composableDerivation {
-} (fix: rec {
- name = "vim_configurable-${version}";
+ isPython3 = python.isPy3 or false;
- inherit (common) version postPatch hardeningDisable enableParallelBuilding meta;
+in stdenv.mkDerivation rec {
- src = builtins.getAttr source {
- "default" = common.src; # latest release
+ name = "vim_configurable-${version}";
- "vim-nox" =
- {
- # vim nox branch: client-server without X by uing sockets
- # REGION AUTO UPDATE: { name="vim-nox"; type="hg"; url="https://code.google.com/r/yukihironakadaira-vim-cmdsrv-nox/"; branch="cmdsrv-nox"; }
- src = (fetchurl { url = "http://mawercer.de/~nix/repos/vim-nox-hg-2082fc3.tar.bz2"; sha256 = "293164ca1df752b7f975fd3b44766f5a1db752de6c7385753f083499651bd13a"; });
- name = "vim-nox-hg-2082fc3";
- # END
- }.src;
- };
+ inherit (common) version postPatch hardeningDisable enableParallelBuilding meta;
- patches = [ ./cflags-prune.diff ];
+ src = builtins.getAttr source {
+ "default" = common.src; # latest release
- configureFlags
- = [ "--enable-gui=${args.gui}" "--with-features=${args.features}" ];
-
- nativeBuildInputs = [ pkgconfig ];
-
- buildInputs
- = [ ncurses libX11 libXext libSM libXpm libXt libXaw libXau
- libXmu glib libICE ] ++ (if args.gui == "gtk3" then [gtk3] else [gtk2]);
-
- # most interpreters aren't tested yet.. (see python for example how to do it)
- flags = {
- ftNix = {
- patches = [ ./ft-nix-support.patch ];
- preConfigure = ''
- cp ${vimPlugins.vim-nix.src}/ftplugin/nix.vim runtime/ftplugin/nix.vim
- cp ${vimPlugins.vim-nix.src}/indent/nix.vim runtime/indent/nix.vim
- cp ${vimPlugins.vim-nix.src}/syntax/nix.vim runtime/syntax/nix.vim
- '';
- };
- }
- // edf {
- name = "darwin";
- enable = {
- buildInputs = [ CoreServices CoreData Cocoa Foundation libobjc cf-private ];
- NIX_LDFLAGS = stdenv.lib.optional stdenv.isDarwin
- "/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation";
- };
- } #Disable Darwin (macOS) support.
- // edf { name = "xsmp"; } #Disable XSMP session management
- // edf { name = "xsmp_interact"; } #Disable XSMP interaction
- // edf { name = "mzscheme"; feat = "mzschemeinterp";} #Include MzScheme interpreter.
- // edf { name = "perl"; feat = "perlinterp"; enable = { nativeBuildInputs = [perl]; };} #Include Perl interpreter.
-
- // edf {
- name = "python";
- feat = "python${if python ? isPy3 then "3" else ""}interp";
- enable = {
- buildInputs = [ python ];
- } // lib.optionalAttrs wrapPythonDrv {
- nativeBuildInputs = [ makeWrapper ];
- postInstall = ''
- wrapProgram "$out/bin/vim" --prefix PATH : "${python}/bin"
- '';
- } // lib.optionalAttrs stdenv.isDarwin {
- configureFlags
- = [ "--enable-python${if python ? isPy3 then "3" else ""}interp=yes"
- "--with-python${if python ? isPy3 then "3" else ""}-config-dir=${python}/lib"
- "--disable-python${if python ? isPy3 then "" else "3"}interp" ];
- };
- }
-
- // edf { name = "tcl"; feat = "tclinterp"; enable = { buildInputs = [tcl]; }; } #Include Tcl interpreter.
- // edf { name = "ruby"; feat = "rubyinterp"; enable = { buildInputs = [ruby]; };} #Include Ruby interpreter.
- // edf {
- name = "lua";
- feat = "luainterp";
- enable = {
- buildInputs = [lua];
- configureFlags = [
- "--with-lua-prefix=${args.lua}"
- "--enable-luainterp"
- ];
- };
- }
- // edf { name = "cscope"; } #Include cscope interface.
- // edf { name = "workshop"; } #Include Sun Visual Workshop support.
- // edf { name = "netbeans"; } #Disable NetBeans integration support.
- // edf { name = "sniff"; feat = "sniff" ; } #Include Sniff interface.
- // edf { name = "multibyte"; } #Include multibyte editing support.
- // edf { name = "hangulinput"; feat = "hangulinput" ;} #Include Hangul input support.
- // edf { name = "xim"; } #Include XIM input support.
- // edf { name = "fontset"; } #Include X fontset output support.
- // edf { name = "acl"; } #Don't check for ACL support.
- // edf { name = "gpm"; } #Don't use gpm (Linux mouse daemon).
- // edf { name = "nls"; enable = {nativeBuildInputs = [gettext];}; } #Don't support NLS (gettext()).
- ;
-
- cfg = {
- luaSupport = config.vim.lua or true;
- pythonSupport = config.vim.python or true;
- rubySupport = config.vim.ruby or true;
- nlsSupport = config.vim.nls or false;
- tclSupport = config.vim.tcl or false;
- multibyteSupport = config.vim.multibyte or false;
- cscopeSupport = config.vim.cscope or true;
- netbeansSupport = config.netbeans or true; # eg envim is using it
- ximSupport = config.vim.xim or true; # less than 15KB, needed for deadkeys
-
- # by default, compile with darwin support if we're compiling on darwin, but
- # allow this to be disabled by setting config.vim.darwin to false
- darwinSupport = stdenv.isDarwin && (config.vim.darwin or true);
-
- # add .nix filetype detection and minimal syntax highlighting support
- ftNixSupport = config.vim.ftNix or true;
+ "vim-nox" =
+ {
+ # vim nox branch: client-server without X by uing sockets
+ # REGION AUTO UPDATE: { name="vim-nox"; type="hg"; url="https://code.google.com/r/yukihironakadaira-vim-cmdsrv-nox/"; branch="cmdsrv-nox"; }
+ src = (fetchurl { url = "http://mawercer.de/~nix/repos/vim-nox-hg-2082fc3.tar.bz2"; sha256 = "293164ca1df752b7f975fd3b44766f5a1db752de6c7385753f083499651bd13a"; });
+ name = "vim-nox-hg-2082fc3";
+ # END
+ }.src;
};
- #--enable-gui=OPTS X11 GUI default=auto OPTS=auto/no/gtk/gtk2/gtk3/gnome/gnome2/motif/athena/neXtaw/photon/carbon
- /*
- // edf "gtk_check" "gtk_check" { } #If auto-select GUI, check for GTK default=yes
- // edf "gtk2_check" "gtk2_check" { } #If GTK GUI, check for GTK+ 2 default=yes
- // edf "gnome_check" "gnome_check" { } #If GTK GUI, check for GNOME default=no
- // edf "motif_check" "motif_check" { } #If auto-select GUI, check for Motif default=yes
- // edf "athena_check" "athena_check" { } #If auto-select GUI, check for Athena default=yes
- // edf "nextaw_check" "nextaw_check" { } #If auto-select GUI, check for neXtaw default=yes
- // edf "carbon_check" "carbon_check" { } #If auto-select GUI, check for Carbon default=yes
- // edf "gtktest" "gtktest" { } #Do not try to compile and run a test GTK program
- */
+ patches = [ ./cflags-prune.diff ] ++ stdenv.lib.optional ftNixSupport ./ft-nix-support.patch;
- preInstall = ''
- mkdir -p $out/share/applications $out/share/icons/{hicolor,locolor}/{16x16,32x32,48x48}/apps
- '';
+ configureFlags = [
+ "--enable-gui=${guiSupport}"
+ "--with-features=${features}"
+ "--disable-xsmp" # XSMP session management
+ "--disable-xsmp_interact" # XSMP interaction
+ "--disable-workshop" # Sun Visual Workshop support
+ "--disable-sniff" # Sniff interface
+ "--disable-hangulinput" # Hangul input support
+ "--disable-fontset" # X fontset output support
+ "--disable-acl" # ACL support
+ "--disable-gpm" # GPM (Linux mouse daemon)
+ "--disable-mzschemeinterp"
+ "--disable-gtk_check"
+ "--disable-gtk2_check"
+ "--disable-gnome_check"
+ "--disable-motif_check"
+ "--disable-athena_check"
+ "--disable-nextaf_check"
+ "--disable-carbon_check"
+ "--disable-gtktest"
+ ]
+ ++ stdenv.lib.optionals luaSupport [
+ "--with-lua-prefix=${args.lua}"
+ "--enable-luainterp"
+ ]
+ ++ stdenv.lib.optionals pythonSupport [
+ "--enable-python${if isPython3 then "3" else ""}"
+ ]
+ ++ stdenv.lib.optionals (pythonSupport && stdenv.isDarwin) [ # Why only for Darwin?
+ "--enable-python${if isPython3 then "3" else ""}interp=yes" # Duplicate?
+ "--with-python${if isPython3 then "3" else ""}-config-dir=${python}/lib"
+ "--disable-python${if isPython3 then "" else "3"}interp"
+ ]
+ ++ stdenv.lib.optional nlsSupport "--enable-nls"
+ ++ stdenv.lib.optional perlSupport "--enable-perlinterp"
+ ++ stdenv.lib.optional rubySupport "--enable-rubyinterp"
+ ++ stdenv.lib.optional tclSupport "--enable-tclinterp"
+ ++ stdenv.lib.optional multibyteSupport "--enable-multibyte"
+ ++ stdenv.lib.optional cscopeSupport "--enable-cscope"
+ ++ stdenv.lib.optional netbeansSupport "--enable-netbeans"
+ ++ stdenv.lib.optional ximSupport "--enable-xim";
- postInstall = stdenv.lib.optionalString stdenv.isLinux ''
+ nativeBuildInputs = [
+ pkgconfig
+ ]
+ ++ stdenv.lib.optional wrapPythonDrv makeWrapper
+ ++ stdenv.lib.optional nlsSupport gettext
+ ++ stdenv.lib.optional perlSupport perl
+ ;
+
+ buildInputs = [ ncurses libX11 libXext libSM libXpm libXt libXaw libXau
+ libXmu glib libICE ]
+ ++ (if guiSupport == "gtk3" then [gtk3] else [gtk2])
+ ++ stdenv.lib.optionals darwinSupport [ CoreServices CoreData Cocoa Foundation libobjc cf-private ]
+ ++ stdenv.lib.optional luaSupport lua
+ ++ stdenv.lib.optional pythonSupport python
+ ++ stdenv.lib.optional tclSupport tcl
+ ++ stdenv.lib.optional rubySupport ruby;
+
+ preConfigure = ''
+ '' + stdenv.lib.optionalString ftNixSupport ''
+ cp ${vimPlugins.vim-nix.src}/ftplugin/nix.vim runtime/ftplugin/nix.vim
+ cp ${vimPlugins.vim-nix.src}/indent/nix.vim runtime/indent/nix.vim
+ cp ${vimPlugins.vim-nix.src}/syntax/nix.vim runtime/syntax/nix.vim
+ '';
+
+ NIX_LDFLAGS = stdenv.lib.optionalString (darwinSupport && stdenv.isDarwin)
+ "/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation";
+
+ postInstall = ''
+ '' + stdenv.lib.optionalString stdenv.isLinux ''
patchelf --set-rpath \
"$(patchelf --print-rpath $out/bin/vim):${lib.makeLibraryPath buildInputs}" \
"$out"/bin/{vim,gvim}
ln -sfn '${nixosRuntimepath}' "$out"/share/vim/vimrc
+ '' + stdenv.lib.optionalString wrapPythonDrv ''
+ wrapProgram "$out/bin/vim" --prefix PATH : "${python}/bin"
+ '';
+
+ preInstall = ''
+ mkdir -p $out/share/applications $out/share/icons/{hicolor,locolor}/{16x16,32x32,48x48}/apps
'';
dontStrip = 1;
-})
+}
diff --git a/pkgs/applications/editors/vim/qvim.nix b/pkgs/applications/editors/vim/qvim.nix
index c23bf360daf..81948918a11 100644
--- a/pkgs/applications/editors/vim/qvim.nix
+++ b/pkgs/applications/editors/vim/qvim.nix
@@ -1,110 +1,94 @@
args@{ fetchgit, stdenv, ncurses, pkgconfig, gettext
-, composableDerivation, lib, config, python, perl, tcl, ruby, qt4
+, lib, config, python, perl, tcl, ruby, qt4
, libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu
-, libICE, ... }: with args;
+, libICE
+, lua
+, features
+, luaSupport ? config.vim.lua or true
+, perlSupport ? config.vim.perl or false # Perl interpreter
+, pythonSupport ? config.vim.python or true
+, rubySupport ? config.vim.ruby or true
+, nlsSupport ? config.vim.nls or false
+, tclSupport ? config.vim.tcl or false
+, multibyteSupport ? config.vim.multibyte or false
+, cscopeSupport ? config.vim.cscope or false
+, netbeansSupport ? config.netbeans or true # eg envim is using it
+
+# by default, compile with darwin support if we're compiling on darwin, but
+# allow this to be disabled by setting config.vim.darwin to false
+, darwinSupport ? stdenv.isDarwin && (config.vim.darwin or true)
+
+# add .nix filetype detection and minimal syntax highlighting support
+, ftNixSupport ? config.vim.ftNix or true
+
+, ... }: with args;
let tag = "20140827";
sha256 = "0ncgbcm23z25naicxqkblz0mcl1zar2qwgi37y5ar8q8884w9ml2";
-in
+in {
-let inherit (args.composableDerivation) composableDerivation edf; in
-composableDerivation {
-} (fix: {
+ name = "qvim-7.4." + tag;
- name = "qvim-7.4." + tag;
+ enableParallelBuilding = true; # test this
- enableParallelBuilding = true; # test this
-
- src = fetchgit {
- url = https://bitbucket.org/equalsraf/vim-qt.git ;
- rev = "refs/tags/package-" + tag;
- inherit sha256;
- };
-
- # FIXME: adopt Darwin fixes from vim/default.nix, then chage meta.platforms.linux
- # to meta.platforms.unix
- preConfigure = assert (! stdenv.isDarwin); "";
-
- configureFlags = [ "--with-vim-name=qvim" "--enable-gui=qt" "--with-features=${args.features}" ];
-
- nativeBuildInputs
- = [ ncurses pkgconfig libX11 libXext libSM libXpm libXt libXaw libXau
- libXmu libICE qt4];
-
- # most interpreters aren't tested yet.. (see python for example how to do it)
- flags = {
- ftNix = {
- # because we cd to src in the main patch phase, we can't just add this
- # patch to the list, we have to apply it manually
- postPatch = ''
- cd runtime
- patch -p2 < ${./ft-nix-support.patch}
- cd ..
- '';
- };
- }
- // edf { name = "darwin"; } #Disable Darwin (macOS) support.
- // edf { name = "xsmp"; } #Disable XSMP session management
- // edf { name = "xsmp_interact"; } #Disable XSMP interaction
- // edf { name = "mzscheme"; } #Include MzScheme interpreter.
- // edf { name = "perl"; feat = "perlinterp"; enable = { nativeBuildInputs = [perl]; };} #Include Perl interpreter.
-
- // edf {
- name = "python";
- feat = "pythoninterp";
- enable = {
- nativeBuildInputs = [ python ];
- } // lib.optionalAttrs stdenv.isDarwin {
- configureFlags
- = [ "--enable-pythoninterp=yes"
- "--with-python-config-dir=${python}/lib" ];
- };
- }
-
- // edf { name = "tcl"; enable = { nativeBuildInputs = [tcl]; }; } #Include Tcl interpreter.
- // edf { name = "ruby"; feat = "rubyinterp"; enable = { nativeBuildInputs = [ruby]; };} #Include Ruby interpreter.
- // edf {
- name = "lua";
- feat = "luainterp";
- enable = {
- nativeBuildInputs = [lua];
- configureFlags = [
- "--with-lua-prefix=${args.lua}"
- "--enable-luainterp"
- ];
- };
- }
- // edf { name = "cscope"; } #Include cscope interface.
- // edf { name = "workshop"; } #Include Sun Visual Workshop support.
- // edf { name = "netbeans"; } #Disable NetBeans integration support.
- // edf { name = "sniff"; feat = "sniff" ; } #Include Sniff interface.
- // edf { name = "multibyte"; } #Include multibyte editing support.
- // edf { name = "hangulinput"; feat = "hangulinput" ;} #Include Hangul input support.
- // edf { name = "xim"; } #Include XIM input support.
- // edf { name = "fontset"; } #Include X fontset output support.
- // edf { name = "acl"; } #Don't check for ACL support.
- // edf { name = "gpm"; } #Don't use gpm (Linux mouse daemon).
- // edf { name = "nls"; enable = {nativeBuildInputs = [gettext];}; } #Don't support NLS (gettext()).
- ;
-
- cfg = {
- luaSupport = config.vim.lua or true;
- pythonSupport = config.vim.python or true;
- rubySupport = config.vim.ruby or true;
- nlsSupport = config.vim.nls or false;
- tclSupport = config.vim.tcl or false;
- multibyteSupport = config.vim.multibyte or false;
- cscopeSupport = config.vim.cscope or false;
- netbeansSupport = config.netbeans or true; # eg envim is using it
-
- # by default, compile with darwin support if we're compiling on darwin, but
- # allow this to be disabled by setting config.vim.darwin to false
- darwinSupport = stdenv.isDarwin && (config.vim.darwin or true);
-
- # add .nix filetype detection and minimal syntax highlighting support
- ftNixSupport = config.vim.ftNix or true;
+ src = fetchgit {
+ url = https://bitbucket.org/equalsraf/vim-qt.git;
+ rev = "refs/tags/package-" + tag;
+ inherit sha256;
};
+ # FIXME: adopt Darwin fixes from vim/default.nix, then chage meta.platforms.linux
+ # to meta.platforms.unix
+ preConfigure = assert (! stdenv.isDarwin); "";
+
+ configureFlags = [
+ "--with-vim-name=qvim"
+ "--enable-gui=qt"
+ "--with-features=${features}"
+ "--disable-xsmp"
+ "--disable-xsmp_interact"
+ "--disable-workshop" # Sun Visual Workshop support
+ "--disable-sniff" # Sniff interface
+ "--disable-hangulinput" # Hangul input support
+ "--disable-fontset" # X fontset output support
+ "--disable-acl" # ACL support
+ "--disable-gpm" # GPM (Linux mouse daemon)
+ "--disable-mzscheme"
+ ]
+ ++ stdenv.lib.optionals luaSupport [
+ "--with-lua-prefix=${lua}"
+ "--enable-luainterp"
+ ]
+ ++ stdenv.lib.optional pythonSupport "--enable-pythoninterp"
+ ++ stdenv.lib.optional (pythonSupport && stdenv.isDarwin) "--with-python-config-dir=${python}/lib"
+ ++ stdenv.lib.optional nlsSupport "--enable-nls"
+ ++ stdenv.lib.optional perlSupport "--enable-perlinterp"
+ ++ stdenv.lib.optional rubySupport "--enable-rubyinterp"
+ ++ stdenv.lib.optional tclSupport "--enable-tcl"
+ ++ stdenv.lib.optional multibyteSupport "--enable-multibyte"
+ ++ stdenv.lib.optional darwinSupport "--enable-darwin"
+ ++ stdenv.lib.optional cscopeSupport "--enable-cscope";
+
+ nativeBuildInputs = [ ncurses pkgconfig libX11 libXext libSM libXpm libXt libXaw
+ libXau libXmu libICE qt4
+ ]
+ ++ stdenv.lib.optional nlsSupport gettext
+ ++ stdenv.lib.optional perlSupport perl
+ ++ stdenv.lib.optional pythonSupport python
+ ++ stdenv.lib.optional tclSupport tcl
+ ++ stdenv.lib.optional rubySupport ruby
+ ++ stdenv.lib.optional luaSupport lua
+ ;
+
+ postPatch = ''
+ '' + stdenv.lib.optionalString ftNixSupport ''
+ # because we cd to src in the main patch phase, we can't just add this
+ # patch to the list, we have to apply it manually
+ cd runtime
+ patch -p2 < ${./ft-nix-support.patch}
+ cd ..
+ '';
+
postInstall = stdenv.lib.optionalString stdenv.isLinux ''
rpath=`patchelf --print-rpath $out/bin/qvim`;
for i in $nativeBuildInputs; do
@@ -125,5 +109,5 @@ composableDerivation {
maintainers = with maintainers; [ smironov ttuegel ];
platforms = platforms.linux;
};
-})
+}
diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix
index 5c16a02ddb8..be27e28c993 100644
--- a/pkgs/applications/misc/rtv/default.nix
+++ b/pkgs/applications/misc/rtv/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchFromGitHub, pythonPackages }:
+{ stdenv, fetchFromGitHub, python3Packages }:
-with pythonPackages;
+with python3Packages;
buildPythonApplication rec {
version = "1.23.0";
- name = "rtv-${version}";
+ pname = "rtv";
src = fetchFromGitHub {
owner = "michael-lazar";
@@ -19,7 +19,7 @@ buildPythonApplication rec {
py.test
'';
- buildInputs = [
+ checkInputs = [
coverage
coveralls
docopt
@@ -30,18 +30,11 @@ buildPythonApplication rec {
];
propagatedBuildInputs = [
- backports_functools_lru_cache
beautifulsoup4
- configparser
- contextlib2
decorator
kitchen
- mailcap-fix
- mccabe
requests
six
- tornado
- pyyaml
];
meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/cluster/kubetail/default.nix b/pkgs/applications/networking/cluster/kubetail/default.nix
new file mode 100644
index 00000000000..201e3e8b30d
--- /dev/null
+++ b/pkgs/applications/networking/cluster/kubetail/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, lib, ... }:
+
+stdenv.mkDerivation rec {
+ name = "kubetail-${version}";
+ version = "1.6.1";
+
+ src = fetchFromGitHub {
+ owner = "johanhaleby";
+ repo = "kubetail";
+ rev = "${version}";
+ sha256 = "10ql1kdsmyrk73jb6f5saf2q38znm0vdihscj3c9n0qhyhk9blpl";
+ };
+
+ installPhase = ''
+ install -Dm755 kubetail $out/bin/kubetail
+ '';
+
+ meta = with lib; {
+ description = "Bash script to tail Kubernetes logs from multiple pods at the same time";
+ longDescription = ''
+ Bash script that enables you to aggregate (tail/follow) logs from
+ multiple pods into one stream. This is the same as running "kubectl logs
+ -f " but for multiple pods.
+ '';
+ homepage = https://github.com/johanhaleby/kubetail;
+ license = licenses.asl20;
+ maintainers = with maintainers; [ kalbasit ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
index 430357cc666..ec3bb6a463e 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
@@ -77,6 +77,6 @@ let unwrapped = stdenv.mkDerivation rec {
in if plugins == [] then unwrapped
else import ./wrapper.nix {
- inherit stdenv makeWrapper symlinkJoin plugins;
+ inherit makeWrapper symlinkJoin plugins;
pidgin = unwrapped;
}
diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/applications/science/spyder/default.nix
index 0564f3de1b7..71def712db6 100644
--- a/pkgs/applications/science/spyder/default.nix
+++ b/pkgs/applications/science/spyder/default.nix
@@ -1,18 +1,10 @@
-{ stdenv, fetchPypi, buildPythonApplication, makeDesktopItem
-# mandatory
-, numpydoc, qtconsole, qtawesome, jedi, pycodestyle, psutil
-, pyflakes, rope, nbconvert, mccabe, pyopengl, cloudpickle
-# optional
-, numpy ? null, scipy ? null, matplotlib ? null
-# optional
-, pylint ? null
-}:
+{ stdenv, python3, makeDesktopItem }:
-buildPythonApplication rec {
+python3.pkgs.buildPythonApplication rec {
pname = "spyder";
version = "3.2.8";
- src = fetchPypi {
+ src = python3.pkgs.fetchPypi {
inherit pname version;
sha256 = "0iwcby2bxvayz0kp282yh864br55w6gpd8rqcdj1cp3jbn3q6vg5";
};
@@ -22,7 +14,7 @@ buildPythonApplication rec {
sed -i -e '/pyqt5/d' setup.py
'';
- propagatedBuildInputs = [
+ propagatedBuildInputs = with python3.pkgs; [
jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint
numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle
];
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index e3954598cbe..a6f7f55cad7 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -74,21 +74,21 @@ assert drmSupport -> available libdrm;
let
# Purity: Waf is normally downloaded by bootstrap.py, but
# for purity reasons this behavior should be avoided.
- wafVersion = "1.9.15";
+ wafVersion = "2.0.9";
waf = fetchurl {
urls = [ "https://waf.io/waf-${wafVersion}"
"http://www.freehackers.org/~tnagy/release/waf-${wafVersion}" ];
- sha256 = "0qrnlv91cb0v221w8a0fi4wxm99q2hpz10rkyyk4akcsvww6xrw5";
+ sha256 = "0j7sbn3w6bgslvwwh5v9527w3gi2sd08kskrgxamx693y0b0i3ia";
};
in stdenv.mkDerivation rec {
name = "mpv-${version}";
- version = "0.28.2";
+ version = "0.29.0";
src = fetchFromGitHub {
owner = "mpv-player";
repo = "mpv";
rev = "v${version}";
- sha256 = "0bldxhqjz7z9fgvx4k40l49awpay17fscp8ypswb459yicy8npmg";
+ sha256 = "0i2nl65diqsjyz28dj07h6d8gq6ix72ysfm0nhs8514hqccaihs3";
};
postPatch = ''
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix
index 2739537c25d..91f9e7c71e3 100644
--- a/pkgs/build-support/bintools-wrapper/default.nix
+++ b/pkgs/build-support/bintools-wrapper/default.nix
@@ -185,6 +185,8 @@ stdenv.mkDerivation {
"mips64" = "btsmip";
"mips64el" = "ltsmip";
}.${targetPlatform.parsed.cpu.name}
+ else if targetPlatform.isPowerPC then "powerpc"
+ else if targetPlatform.isSparc then "sparc"
else throw "unknown emulation for platform: " + targetPlatform.config;
in targetPlatform.platform.bfdEmulation or (fmt + sep + arch);
diff --git a/pkgs/build-support/build-maven.nix b/pkgs/build-support/build-maven.nix
index 30df3e8e733..b9da06c43c8 100644
--- a/pkgs/build-support/build-maven.nix
+++ b/pkgs/build-support/build-maven.nix
@@ -16,10 +16,11 @@ infoFile: let
script = writeText "build-maven-repository.sh" ''
${lib.concatStrings (map (dep: let
inherit (dep)
- url sha1 groupId artifactId version
- authenticated metadata repository-id;
+ url sha1 groupId artifactId
+ version metadata repository-id;
versionDir = dep.unresolved-version or version;
+ authenticated = dep.authenticated or false;
fetch = (if authenticated then requireFile else fetchurl) {
inherit url sha1;
diff --git a/pkgs/build-support/setup-hooks/remove-pytest-cache.sh b/pkgs/build-support/setup-hooks/remove-pytest-cache.sh
new file mode 100644
index 00000000000..7f3e08bfa67
--- /dev/null
+++ b/pkgs/build-support/setup-hooks/remove-pytest-cache.sh
@@ -0,0 +1 @@
+postFixupHooks+=
diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix
index afba6e15ebd..dd9264514d4 100644
--- a/pkgs/desktops/gnome-2/platform/GConf/default.nix
+++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix
@@ -1,5 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, dbus-glib, glib, ORBit2, libxml2
-, polkit, intltool }:
+{ stdenv, fetchurl, pkgconfig, dbus-glib, glib, ORBit2, libxml2, polkit, python2, intltool }:
stdenv.mkDerivation rec {
name = "gconf-${version}";
@@ -12,7 +11,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "man" ];
- buildInputs = [ ORBit2 libxml2 ]
+ buildInputs = [ ORBit2 libxml2 python2 ]
# polkit requires pam, which requires shadow.h, which is not available on
# darwin
++ stdenv.lib.optional (!stdenv.isDarwin) polkit;
diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix
index 516268e0efd..3dc6c4197bb 100644
--- a/pkgs/development/compilers/closure/default.nix
+++ b/pkgs/development/compilers/closure/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "closure-compiler-${version}";
- version = "20180610";
+ version = "20180716";
src = fetchurl {
url = "https://dl.google.com/closure-compiler/compiler-${version}.tar.gz";
- sha256 = "1qg9a1whmrkrifqrsb9m541cgr3rf1nnkqlv4q7rq30m8bdilvk5";
+ sha256 = "06yc85pbcw1v36j12qwxkk0pbhziglp3zjkv3xza2v68zvyqy6hd";
};
sourceRoot = ".";
diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix
index 36dc8b6f147..be816b37455 100644
--- a/pkgs/development/compilers/ponyc/default.nix
+++ b/pkgs/development/compilers/ponyc/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation ( rec {
name = "ponyc-${version}";
- version = "0.24.0";
+ version = "0.24.2";
src = fetchFromGitHub {
owner = "ponylang";
repo = "ponyc";
rev = version;
- sha256 = "1yq82jj0c9nxrx4vxcb3s6yr154kaj2a3wrk12m6fm3dscsqsqq1";
+ sha256 = "0g32bccbbwad9894zv2wjimbp8bpcj4ldddfdm4p2n8vcw6vi5y3";
};
buildInputs = [ llvm makeWrapper which ];
diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index bb9aaeb00cf..9b6f80e0f83 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -152,6 +152,10 @@ go.stdenv.mkDerivation (
fi
}
+ if (( "''${NIX_DEBUG:-0}" >= 1 )); then
+ buildFlagsArray+=(-x)
+ fi
+
if [ ''${#buildFlagsArray[@]} -ne 0 ]; then
declare -p buildFlagsArray > $TMPDIR/buildFlagsArray
else
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index dcc2cc46791..1ec0adafef8 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -737,9 +737,6 @@ self: super: {
# https://github.com/bos/math-functions/issues/25
math-functions = dontCheck super.math-functions;
- # broken test suite
- servant-server = dontCheck super.servant-server;
-
# build servant docs from the repository
servant =
let
@@ -764,9 +761,6 @@ self: super: {
'';
});
- # Glob == 0.7.x
- servant-auth = doJailbreak super.servant-auth;
-
# https://github.com/pontarius/pontarius-xmpp/issues/105
pontarius-xmpp = dontCheck super.pontarius-xmpp;
@@ -835,9 +829,6 @@ self: super: {
# https://github.com/fizruk/http-api-data/issues/49
http-api-data = dontCheck super.http-api-data;
- # https://github.com/snoyberg/yaml/issues/106
- yaml = disableCabalFlag super.yaml "system-libyaml";
-
# https://github.com/diagrams/diagrams-lib/issues/288
diagrams-lib = overrideCabal super.diagrams-lib (drv: { doCheck = !pkgs.stdenv.isi686; });
@@ -1079,6 +1070,9 @@ self: super: {
# Test suite depends on cabal-install
doctest = dontCheck super.doctest;
+ # https://github.com/haskell-servant/servant-auth/issues/113
+ servant-auth-client = dontCheck super.servant-auth-client;
+
# Over-specified constraint on X11 ==1.8.*.
xmonad = doJailbreak super.xmonad;
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 65886a3960b..4239af45d00 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -43,7 +43,7 @@ core-packages:
default-package-overrides:
# Newer versions require contravariant-1.5.*, which many builds refuse at the moment.
- base-compat-batteries ==0.10.1
- # LTS Haskell 12.1
+ # LTS Haskell 12.2
- abstract-deque ==0.3
- abstract-deque-tests ==0.3
- abstract-par ==0.3.3
@@ -68,10 +68,10 @@ default-package-overrides:
- aeson-picker ==0.1.0.4
- aeson-pretty ==0.8.7
- aeson-qq ==0.8.2
- - aeson-typescript ==0.1.0.6
+ - aeson-typescript ==0.1.1.0
- aeson-utils ==0.3.0.2
- aeson-yak ==0.1.1.3
- - Agda ==2.5.4
+ - Agda ==2.5.4.1
- al ==0.1.4.2
- alarmclock ==0.5.0.2
- alerts ==0.1.0.0
@@ -536,8 +536,8 @@ default-package-overrides:
- data-inttrie ==0.1.4
- data-lens-light ==0.1.2.2
- data-memocombinators ==0.5.1
- - data-msgpack ==0.0.11
- - data-msgpack-types ==0.0.1
+ - data-msgpack ==0.0.12
+ - data-msgpack-types ==0.0.2
- data-or ==1.0.0.5
- data-ordlist ==0.4.7.0
- data-ref ==0.0.1.1
@@ -666,7 +666,7 @@ default-package-overrides:
- equivalence ==0.3.2
- erf ==2.0.0.0
- errors ==2.3.0
- - errors-ext ==0.4.1
+ - errors-ext ==0.4.2
- error-util ==0.0.1.2
- ersatz ==0.4.3
- etc ==0.4.0.3
@@ -1010,12 +1010,12 @@ default-package-overrides:
- HsOpenSSL ==0.11.4.14
- HsOpenSSL-x509-system ==0.1.0.3
- hsp ==0.10.0
- - hspec ==2.5.4
+ - hspec ==2.5.5
- hspec-attoparsec ==0.1.0.2
- hspec-checkers ==0.1.0.2
- hspec-contrib ==0.5.0
- - hspec-core ==2.5.4
- - hspec-discover ==2.5.4
+ - hspec-core ==2.5.5
+ - hspec-discover ==2.5.5
- hspec-expectations ==0.8.2
- hspec-expectations-lifted ==0.10.0
- hspec-expectations-pretty-diff ==0.7.2.4
@@ -1067,7 +1067,7 @@ default-package-overrides:
- hweblib ==0.6.3
- hw-excess ==0.2.0.2
- hw-fingertree-strict ==0.1.1.1
- - hw-hedgehog ==0.1.0.1
+ - hw-hedgehog ==0.1.0.2
- hw-hspec-hedgehog ==0.1.0.5
- hw-int ==0.0.0.3
- hw-ip ==0.1.0.0
@@ -1099,7 +1099,7 @@ default-package-overrides:
- ieee754 ==0.8.0
- if ==0.1.0.0
- iff ==0.0.6
- - ihaskell ==0.9.0.3
+ - ihaskell ==0.9.1.0
- ihs ==0.1.0.2
- ilist ==0.3.1.0
- imagesize-conduit ==1.1
@@ -1142,7 +1142,7 @@ default-package-overrides:
- ip6addr ==1.0.0
- iproute ==1.7.5
- IPv6Addr ==1.1.0
- - ipython-kernel ==0.9.0.2
+ - ipython-kernel ==0.9.1.0
- irc ==0.6.1.0
- irc-client ==1.1.0.4
- irc-conduit ==0.3.0.1
@@ -1444,7 +1444,7 @@ default-package-overrides:
- NoHoed ==0.1.1
- nonce ==1.0.7
- nondeterminism ==1.4
- - non-empty ==0.3
+ - non-empty ==0.3.0.1
- non-empty-sequence ==0.2.0.2
- non-negative ==0.1.2
- nsis ==0.3.2
@@ -1712,8 +1712,8 @@ default-package-overrides:
- regex-tdfa ==1.2.3.1
- regex-tdfa-text ==1.0.0.3
- reinterpret-cast ==0.1.0
- - relational-query ==0.12.0.1
- - relational-query-HDBC ==0.7.0.1
+ - relational-query ==0.12.1.0
+ - relational-query-HDBC ==0.7.1.1
- relational-record ==0.2.2.0
- relational-schemas ==0.1.6.2
- renderable ==0.2.0.1
@@ -1741,7 +1741,7 @@ default-package-overrides:
- roles ==0.2.0.0
- rot13 ==0.2.0.1
- RSA ==2.3.0
- - rss-conduit ==0.4.2.1
+ - rss-conduit ==0.4.2.2
- runmemo ==1.0.0.1
- rvar ==0.2.0.3
- s3-signer ==0.5.0.0
@@ -1824,7 +1824,7 @@ default-package-overrides:
- servant-tracing ==0.1.0.2
- servant-websockets ==1.1.0
- servant-yaml ==0.1.0.0
- - serverless-haskell ==0.6.2
+ - serverless-haskell ==0.6.3
- serversession ==1.0.1
- serversession-frontend-wai ==1.0
- servius ==1.2.1.0
@@ -1851,7 +1851,7 @@ default-package-overrides:
- simple-reflect ==0.3.3
- simple-sendfile ==0.2.27
- simplest-sqlite ==0.1.0.0
- - simple-vec3 ==0.4.0.7
+ - simple-vec3 ==0.4.0.8
- since ==0.0.0
- singleton-bool ==0.1.4
- singleton-nats ==0.4.1
@@ -1950,7 +1950,7 @@ default-package-overrides:
- strive ==5.0.6
- structs ==0.1.1
- stylish-haskell ==0.9.2.0
- - summoner ==1.0.4
+ - summoner ==1.0.5
- sum-type-boilerplate ==0.1.1
- sundown ==0.6
- superbuffer ==0.3.1.1
@@ -2304,9 +2304,9 @@ default-package-overrides:
- xss-sanitize ==0.3.6
- xxhash-ffi ==0.2.0.0
- yaml ==0.8.32
- - yeshql ==4.1.0.0
- - yeshql-core ==4.1.0.0
- - yeshql-hdbc ==4.1.0.0
+ - yeshql ==4.1.0.1
+ - yeshql-core ==4.1.0.1
+ - yeshql-hdbc ==4.1.0.1
- yesod ==1.6.0
- yesod-alerts ==0.1.2.0
- yesod-auth ==1.6.4.1
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 3e4b18d86b9..a6cfef6f45f 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -309,6 +309,9 @@ self: super: builtins.intersectAttrs super {
# https://github.com/bos/pcap/issues/5
pcap = addExtraLibrary super.pcap pkgs.libpcap;
+ # https://github.com/snoyberg/yaml/issues/106
+ yaml = disableCabalFlag super.yaml "system-libyaml";
+
# The cabal files for these libraries do not list the required system dependencies.
miniball = overrideCabal super.miniball (drv: {
librarySystemDepends = [ pkgs.miniball ];
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 2d0d3be2f58..b5da00754b5 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -716,49 +716,6 @@ self: {
}) {};
"Agda" = callPackage
- ({ mkDerivation, alex, array, async, base, binary, blaze-html
- , boxes, bytestring, Cabal, containers, cpphs, data-hash, deepseq
- , directory, EdisonCore, edit-distance, emacs, equivalence
- , filepath, geniplate-mirror, gitrev, happy, hashable, hashtables
- , haskeline, ieee754, mtl, murmur-hash, pretty, process, regex-tdfa
- , stm, strict, template-haskell, text, time, transformers
- , unordered-containers, uri-encode, zlib
- }:
- mkDerivation {
- pname = "Agda";
- version = "2.5.4";
- sha256 = "02cyq1wpnllzcwdb45gk3hq7hha2090ay6m16qg7fq9467ip22dl";
- isLibrary = true;
- isExecutable = true;
- enableSeparateDataOutput = true;
- setupHaskellDepends = [ base Cabal filepath process ];
- libraryHaskellDepends = [
- array async base binary blaze-html boxes bytestring containers
- data-hash deepseq directory EdisonCore edit-distance equivalence
- filepath geniplate-mirror gitrev hashable hashtables haskeline
- ieee754 mtl murmur-hash pretty process regex-tdfa stm strict
- template-haskell text time transformers unordered-containers
- uri-encode zlib
- ];
- libraryToolDepends = [ alex cpphs happy ];
- executableHaskellDepends = [ base directory filepath process ];
- executableToolDepends = [ emacs ];
- postInstall = ''
- files=("$data/share/ghc-"*"/"*"-ghc-"*"/Agda-"*"/lib/prim/Agda/"{Primitive.agda,Builtin"/"*.agda})
- for f in "''${files[@]}" ; do
- $out/bin/agda $f
- done
- for f in "''${files[@]}" ; do
- $out/bin/agda -c --no-main $f
- done
- $out/bin/agda-mode compile
- '';
- description = "A dependently typed functional programming language and proof assistant";
- license = "unknown";
- maintainers = with stdenv.lib.maintainers; [ abbradar ];
- }) {inherit (pkgs) emacs;};
-
- "Agda_2_5_4_1" = callPackage
({ mkDerivation, alex, array, async, base, binary, blaze-html
, boxes, bytestring, Cabal, containers, cpphs, data-hash, deepseq
, directory, EdisonCore, edit-distance, emacs, equivalence
@@ -798,7 +755,6 @@ self: {
'';
description = "A dependently typed functional programming language and proof assistant";
license = "unknown";
- hydraPlatforms = stdenv.lib.platforms.none;
maintainers = with stdenv.lib.maintainers; [ abbradar ];
}) {inherit (pkgs) emacs;};
@@ -11789,8 +11745,8 @@ self: {
({ mkDerivation, base, bytestring, hidapi, mtl }:
mkDerivation {
pname = "MBot";
- version = "0.2.4.0";
- sha256 = "1jzjf1p1ld9xdxqb9jf32nyhzmp29mirpinz24s8blwpscia5v56";
+ version = "0.2.4.1";
+ sha256 = "0yh84vybrxs6bv3z4qx4n9m4xwsb4kw21l35s5v4gg8yllgbb79r";
libraryHaskellDepends = [ base bytestring hidapi mtl ];
description = "Haskell interface for controlling the mBot educational robot";
license = stdenv.lib.licenses.gpl3;
@@ -22070,29 +22026,6 @@ self: {
}) {};
"aeson-typescript" = callPackage
- ({ mkDerivation, aeson, base, bytestring, containers, directory
- , filepath, hspec, interpolate, mtl, process, template-haskell
- , temporary, text, th-abstraction, unordered-containers
- }:
- mkDerivation {
- pname = "aeson-typescript";
- version = "0.1.0.6";
- sha256 = "11q165g6yvd87ahbfvxdpr6w61l0y9znv1x5jmznmj1c9m9s36id";
- libraryHaskellDepends = [
- aeson base containers interpolate mtl template-haskell text
- th-abstraction unordered-containers
- ];
- testHaskellDepends = [
- aeson base bytestring containers directory filepath hspec
- interpolate mtl process template-haskell temporary text
- th-abstraction unordered-containers
- ];
- description = "Generate TypeScript definition files from your ADTs";
- license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- }) {};
-
- "aeson-typescript_0_1_1_0" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, directory
, filepath, hspec, interpolate, mtl, process, template-haskell
, temporary, text, th-abstraction, unordered-containers
@@ -29129,19 +29062,19 @@ self: {
"async-combinators" = callPackage
({ mkDerivation, async, base, hedgehog, HUnit, safe-exceptions
- , tasty, tasty-discover, tasty-hedgehog, tasty-hunit, universum
+ , tasty, tasty-discover, tasty-hedgehog, tasty-hunit, text
, unliftio-core
}:
mkDerivation {
pname = "async-combinators";
- version = "0.0.0";
- sha256 = "1rj9fahpch74ygkx3lv4282lb775cklxi3c5wys544binnya9v7b";
+ version = "0.0.1";
+ sha256 = "0zacn4iryzxwll158dq1xcaww28hlph1jgqrf4vqyfigcvrpf4gv";
libraryHaskellDepends = [
- async base safe-exceptions universum unliftio-core
+ async base safe-exceptions text unliftio-core
];
testHaskellDepends = [
base hedgehog HUnit safe-exceptions tasty tasty-discover
- tasty-hedgehog tasty-hunit universum
+ tasty-hedgehog tasty-hunit
];
testToolDepends = [ tasty-discover ];
description = "Async combinators";
@@ -30740,6 +30673,33 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "avro_0_3_3_0" = callPackage
+ ({ mkDerivation, aeson, array, base, base16-bytestring, binary
+ , bytestring, containers, data-binary-ieee754, directory, entropy
+ , extra, fail, hashable, hspec, lens, lens-aeson, mtl, pure-zlib
+ , QuickCheck, scientific, semigroups, tagged, template-haskell
+ , text, transformers, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "avro";
+ version = "0.3.3.0";
+ sha256 = "0ccf39djb9xac2gh85rdjiszas6308rxzgy3p61i9vc76hmjjwk0";
+ libraryHaskellDepends = [
+ aeson array base base16-bytestring binary bytestring containers
+ data-binary-ieee754 entropy fail hashable mtl pure-zlib scientific
+ semigroups tagged template-haskell text unordered-containers vector
+ ];
+ testHaskellDepends = [
+ aeson array base base16-bytestring binary bytestring containers
+ directory entropy extra fail hashable hspec lens lens-aeson mtl
+ pure-zlib QuickCheck scientific semigroups tagged template-haskell
+ text transformers unordered-containers vector
+ ];
+ description = "Avro serialization support for Haskell";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"avwx" = callPackage
({ mkDerivation, attoparsec, base, HTTP, lens, optparse-applicative
, parsers, pretty-show, text
@@ -54042,10 +54002,8 @@ self: {
}:
mkDerivation {
pname = "cryptoids";
- version = "0.5.0.0";
- sha256 = "05xywzs7waz01c0p3y02qlf4yfhfpmpzpdfs2cmv5rmphf1hzck2";
- revision = "4";
- editedCabalFile = "1lghn17a367cvljsc8kddn11qd30nz6a6dl4128xbc6p0bf41pzj";
+ version = "0.5.1.0";
+ sha256 = "0ai7hg4r944hck9vq2ffwwjsxp3mjfvxwhfr8b8765n1bh86i466";
libraryHaskellDepends = [
base binary bytestring cryptoids-class cryptoids-types cryptonite
directory exceptions filepath memory
@@ -56895,32 +56853,6 @@ self: {
}) {};
"data-msgpack" = callPackage
- ({ mkDerivation, base, binary, bytestring, containers, criterion
- , data-binary-ieee754, data-msgpack-types, deepseq, groom, hashable
- , hspec, QuickCheck, text, unordered-containers, vector, void
- }:
- mkDerivation {
- pname = "data-msgpack";
- version = "0.0.11";
- sha256 = "11dq5s1s6zcjfa7n464amwiz4sfrkqa7bb5x1rfqiivxc6bgq119";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- base binary bytestring data-binary-ieee754 data-msgpack-types text
- ];
- executableHaskellDepends = [ base bytestring groom ];
- testHaskellDepends = [
- base bytestring containers data-msgpack-types hashable hspec
- QuickCheck text unordered-containers vector void
- ];
- benchmarkHaskellDepends = [
- base bytestring criterion deepseq QuickCheck
- ];
- description = "A Haskell implementation of MessagePack";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "data-msgpack_0_0_12" = callPackage
({ mkDerivation, base, binary, bytestring, containers, criterion
, data-binary-ieee754, data-msgpack-types, deepseq, groom, hashable
, hspec, QuickCheck, text, unordered-containers, vector, void
@@ -56944,26 +56876,9 @@ self: {
];
description = "A Haskell implementation of MessagePack";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"data-msgpack-types" = callPackage
- ({ mkDerivation, base, bytestring, containers, deepseq, hashable
- , QuickCheck, text, unordered-containers, vector, void
- }:
- mkDerivation {
- pname = "data-msgpack-types";
- version = "0.0.1";
- sha256 = "1658jhg09gsfb0ajcdfx4k78pwd19inbffg1qr0a4hwn12gi77sj";
- libraryHaskellDepends = [
- base bytestring containers deepseq hashable QuickCheck text
- unordered-containers vector void
- ];
- description = "A Haskell implementation of MessagePack";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "data-msgpack-types_0_0_2" = callPackage
({ mkDerivation, base, bytestring, containers, deepseq, hashable
, hspec, QuickCheck, text, unordered-containers, vector, void
}:
@@ -56978,7 +56893,6 @@ self: {
testHaskellDepends = [ base hspec QuickCheck ];
description = "A Haskell implementation of MessagePack";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"data-named" = callPackage
@@ -59062,8 +58976,8 @@ self: {
({ mkDerivation, base, containers, foldl }:
mkDerivation {
pname = "deferred-folds";
- version = "0.6.3";
- sha256 = "1b020879qdbh08pzgxwj5y7fk31n071crbcs9601j7fxj4a1i0hq";
+ version = "0.6.5.1";
+ sha256 = "1awb8g145jknywiyclq3jhpq94lf0c19n4ns7p4lvgx7fs4xyr9c";
libraryHaskellDepends = [ base containers foldl ];
description = "Abstractions over deferred folds";
license = stdenv.lib.licenses.mit;
@@ -60283,6 +60197,30 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "dhall-json_1_2_2" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, base, bytestring, dhall
+ , insert-ordered-containers, optparse-applicative, text
+ , unordered-containers, yaml
+ }:
+ mkDerivation {
+ pname = "dhall-json";
+ version = "1.2.2";
+ sha256 = "13vap0x53c9i2cyggh3riq8fza46c2d9rqmbxmsjvsawxz2jfm9d";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base dhall insert-ordered-containers optparse-applicative
+ text unordered-containers
+ ];
+ executableHaskellDepends = [
+ aeson aeson-pretty base bytestring dhall optparse-applicative text
+ yaml
+ ];
+ description = "Compile Dhall to JSON or YAML";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"dhall-lex" = callPackage
({ mkDerivation, alex, array, base, bytestring, criterion, deepseq
, hspec, hspec-dirstream, scientific
@@ -61429,20 +61367,20 @@ self: {
"digestive-functors" = callPackage
({ mkDerivation, base, bytestring, containers, HUnit, mtl
- , old-locale, QuickCheck, test-framework, test-framework-hunit
- , test-framework-quickcheck2, text, time
+ , old-locale, QuickCheck, semigroups, test-framework
+ , test-framework-hunit, test-framework-quickcheck2, text, time
}:
mkDerivation {
pname = "digestive-functors";
- version = "0.8.3.0";
- sha256 = "00nnhjd85fwav95k8f2pdsfk96rqmg7pc54zysqva3h2n5drhmp6";
+ version = "0.8.4.0";
+ sha256 = "17l70z0bn5aahjaydg3qcwyip6jk0q4vkar5abhrhls59j5hk6z0";
libraryHaskellDepends = [
- base bytestring containers mtl old-locale text time
+ base bytestring containers mtl old-locale semigroups text time
];
testHaskellDepends = [
base bytestring containers HUnit mtl old-locale QuickCheck
- test-framework test-framework-hunit test-framework-quickcheck2 text
- time
+ semigroups test-framework test-framework-hunit
+ test-framework-quickcheck2 text time
];
description = "A practical formlet library";
license = stdenv.lib.licenses.bsd3;
@@ -61509,8 +61447,8 @@ self: {
}:
mkDerivation {
pname = "digestive-functors-heist";
- version = "0.8.8.0";
- sha256 = "0i9aqabrlk4hj6l3dbc0fl1vwq6bpdwfgc03m2xl4lwlhj14j56w";
+ version = "0.8.8.1";
+ sha256 = "1gfh94c52g6vhny2j7hf61w3gp2vmh3gp9bssmmx6mklwk3lzg3y";
libraryHaskellDepends = [
base blaze-builder digestive-functors heist map-syntax mtl text
xmlhtml
@@ -61570,8 +61508,8 @@ self: {
}:
mkDerivation {
pname = "digestive-functors-snap";
- version = "0.7.0.0";
- sha256 = "17vlrzsb8gkzm8rbk112yf9l4b0c982rwrfzkk4v0filp2xfy2i4";
+ version = "0.7.0.1";
+ sha256 = "14i42q6ngajzg01zl2mp38800j3bzn4389s3kgbpg0am2mn0458z";
libraryHaskellDepends = [
base bytestring containers digestive-functors directory filepath
mtl snap-core text
@@ -63011,8 +62949,8 @@ self: {
}:
mkDerivation {
pname = "distribution-opensuse";
- version = "1.1.0";
- sha256 = "1spqr4ygxhdgmy17cmwx1z4r1czlf85hd6yk9zpwpj9py9v5b0g2";
+ version = "1.1.1";
+ sha256 = "1drjlcakv48djnqyrl50c6l974zrxm1gq3z8cx58xndfb2j0hzq6";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -63716,6 +63654,29 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "doctest-discover_0_2_0_0" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, directory, doctest
+ , filepath
+ }:
+ mkDerivation {
+ pname = "doctest-discover";
+ version = "0.2.0.0";
+ sha256 = "1j4yqkb5jvvm9g2xpnm6gy4brb725cn3hzm7cv3yylkyhd8allx9";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base bytestring directory doctest filepath
+ ];
+ executableHaskellDepends = [
+ aeson base bytestring directory doctest filepath
+ ];
+ testHaskellDepends = [ base doctest ];
+ doHaddock = false;
+ description = "Easy way to run doctests via cabal";
+ license = stdenv.lib.licenses.publicDomain;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"doctest-discover-configurator" = callPackage
({ mkDerivation, base, bytestring, configurator, directory, doctest
, filepath
@@ -68399,8 +68360,8 @@ self: {
}:
mkDerivation {
pname = "erlang";
- version = "0.2.2";
- sha256 = "0wcbygaszniyw0xalgcx643pcdiwg94y5nayb3mb07v267hq0849";
+ version = "0.2.3";
+ sha256 = "1sh4ajq819rki2nc1l6a9kq05z74rnpjmi50grwyrr7652b8wwga";
libraryHaskellDepends = [
base binary bytestring directory filepath MissingH network random
];
@@ -68608,24 +68569,6 @@ self: {
}) {};
"errors-ext" = callPackage
- ({ mkDerivation, base, errors, exceptions, HUnit, monad-control
- , mtl, transformers
- }:
- mkDerivation {
- pname = "errors-ext";
- version = "0.4.1";
- sha256 = "1xly8pgkbqkm4mb1zg9bga08gx5fj4nrmidzj5p8anqdksq7ib5h";
- libraryHaskellDepends = [
- base errors exceptions monad-control mtl transformers
- ];
- testHaskellDepends = [
- base errors exceptions HUnit monad-control mtl transformers
- ];
- description = "`bracket`-like functions for `ExceptT` over `IO` monad";
- license = stdenv.lib.licenses.asl20;
- }) {};
-
- "errors-ext_0_4_2" = callPackage
({ mkDerivation, base, binary-ext, bytestring, conduit, errors
, exceptions, HUnit, monad-control, monad-loops, mtl, transformers
}:
@@ -68642,7 +68585,6 @@ self: {
];
description = "`bracket`-like functions for `ExceptT` over `IO` monad";
license = stdenv.lib.licenses.asl20;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"ersaconcat" = callPackage
@@ -68820,8 +68762,8 @@ self: {
}:
mkDerivation {
pname = "espial";
- version = "0.0.3";
- sha256 = "1j6q97xlk1m1l80qb41jmrqx1mawmrwaq8pby2b4mvmz5ighxx4i";
+ version = "0.0.4";
+ sha256 = "15v0apj7mfb61jmbl806ak92h5a8qbp8cl05g07qnrp8hmh1g9fp";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -97138,6 +97080,35 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "hasql_1_3_0_3" = callPackage
+ ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring
+ , bytestring-strict-builder, contravariant, contravariant-extras
+ , criterion, data-default-class, dlist, hashable, hashtables
+ , loch-th, mtl, placeholders, postgresql-binary, postgresql-libpq
+ , profunctors, QuickCheck, quickcheck-instances, rebase, rerebase
+ , tasty, tasty-hunit, tasty-quickcheck, text, text-builder
+ , transformers, vector
+ }:
+ mkDerivation {
+ pname = "hasql";
+ version = "1.3.0.3";
+ sha256 = "01vl4p67yhcm8cmbmajgyd7ggj3p5f6350f8sky8kv3dn31wg6ji";
+ libraryHaskellDepends = [
+ attoparsec base base-prelude bytestring bytestring-strict-builder
+ contravariant contravariant-extras data-default-class dlist
+ hashable hashtables loch-th mtl placeholders postgresql-binary
+ postgresql-libpq profunctors text text-builder transformers vector
+ ];
+ testHaskellDepends = [
+ bug data-default-class QuickCheck quickcheck-instances rebase
+ rerebase tasty tasty-hunit tasty-quickcheck
+ ];
+ benchmarkHaskellDepends = [ bug criterion rerebase ];
+ description = "An efficient PostgreSQL driver and a flexible mapping API";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hasql-backend" = callPackage
({ mkDerivation, base, base-prelude, bytestring, either, free
, list-t, text, transformers, vector
@@ -108512,7 +108483,7 @@ self: {
pname = "hslua";
version = "0.9.5.2";
sha256 = "1rdvv01p214zfjh6fcqjjgqwi8y42wad6cqzhlcv5gvclzw2ck8f";
- configureFlags = [ "-fsystem-lua" ];
+ configureFlags = [ "-fsystem-lua" "-f-use-pkgconfig" ];
libraryHaskellDepends = [
base bytestring containers exceptions fail mtl text
];
@@ -108926,29 +108897,6 @@ self: {
}) {};
"hspec" = callPackage
- ({ mkDerivation, base, call-stack, directory, hspec-core
- , hspec-discover, hspec-expectations, hspec-meta, HUnit, QuickCheck
- , stringbuilder, transformers
- }:
- mkDerivation {
- pname = "hspec";
- version = "2.5.4";
- sha256 = "19shs06srgq4j3mm0lz09yxqn7hzq4pnyl32wmi9nf2a7s3xwlm8";
- libraryHaskellDepends = [
- base call-stack hspec-core hspec-discover hspec-expectations HUnit
- QuickCheck transformers
- ];
- testHaskellDepends = [
- base call-stack directory hspec-core hspec-discover
- hspec-expectations hspec-meta HUnit QuickCheck stringbuilder
- transformers
- ];
- testToolDepends = [ hspec-discover ];
- description = "A Testing Framework for Haskell";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "hspec_2_5_5" = callPackage
({ mkDerivation, base, call-stack, directory, hspec-core
, hspec-discover, hspec-expectations, hspec-meta, HUnit, QuickCheck
, stringbuilder, transformers
@@ -108969,7 +108917,6 @@ self: {
testToolDepends = [ hspec-discover ];
description = "A Testing Framework for Haskell";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hspec-attoparsec" = callPackage
@@ -109042,32 +108989,6 @@ self: {
}) {};
"hspec-core" = callPackage
- ({ mkDerivation, ansi-terminal, array, base, call-stack, clock
- , deepseq, directory, filepath, hspec-expectations, hspec-meta
- , HUnit, process, QuickCheck, quickcheck-io, random, setenv
- , silently, stm, temporary, tf-random, transformers
- }:
- mkDerivation {
- pname = "hspec-core";
- version = "2.5.4";
- sha256 = "1r9h59nqdl3bx4ka1f7fwp9b6724vs1260aa0a9xn18xkabkm72q";
- libraryHaskellDepends = [
- ansi-terminal array base call-stack clock deepseq directory
- filepath hspec-expectations HUnit QuickCheck quickcheck-io random
- setenv stm tf-random transformers
- ];
- testHaskellDepends = [
- ansi-terminal array base call-stack clock deepseq directory
- filepath hspec-expectations hspec-meta HUnit process QuickCheck
- quickcheck-io random setenv silently stm temporary tf-random
- transformers
- ];
- testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'";
- description = "A Testing Framework for Haskell";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "hspec-core_2_5_5" = callPackage
({ mkDerivation, ansi-terminal, array, base, call-stack, clock
, deepseq, directory, filepath, hspec-expectations, hspec-meta
, HUnit, process, QuickCheck, quickcheck-io, random, setenv
@@ -109091,7 +109012,6 @@ self: {
testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'";
description = "A Testing Framework for Haskell";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hspec-dirstream" = callPackage
@@ -109132,24 +109052,6 @@ self: {
}) {};
"hspec-discover" = callPackage
- ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck
- }:
- mkDerivation {
- pname = "hspec-discover";
- version = "2.5.4";
- sha256 = "1wzf6gf7qfq0n045gq4rpr5vs5g6rnwd3i6c4fmaza0k7pxd9znl";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [ base directory filepath ];
- executableHaskellDepends = [ base directory filepath ];
- testHaskellDepends = [
- base directory filepath hspec-meta QuickCheck
- ];
- description = "Automatically discover and run Hspec tests";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "hspec-discover_2_5_5" = callPackage
({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck
}:
mkDerivation {
@@ -109165,7 +109067,6 @@ self: {
];
description = "Automatically discover and run Hspec tests";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hspec-expectations" = callPackage
@@ -112956,20 +112857,6 @@ self: {
}) {};
"hw-hedgehog" = callPackage
- ({ mkDerivation, base, hedgehog, vector }:
- mkDerivation {
- pname = "hw-hedgehog";
- version = "0.1.0.1";
- sha256 = "0fngvmx60a3z1sl798ghvfzya5dgi1mfln8p1vkqapcgfjh7w5r6";
- revision = "1";
- editedCabalFile = "0a5qlh5dwsnv14ngimbsvpgxx4hf0c0wdi5yfv7afwj9h2afdpfz";
- libraryHaskellDepends = [ base hedgehog vector ];
- testHaskellDepends = [ base ];
- description = "Extra hedgehog functionality";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "hw-hedgehog_0_1_0_2" = callPackage
({ mkDerivation, base, hedgehog, vector }:
mkDerivation {
pname = "hw-hedgehog";
@@ -112979,7 +112866,6 @@ self: {
testHaskellDepends = [ base ];
description = "Extra hedgehog functionality";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hw-hspec-hedgehog" = callPackage
@@ -115442,41 +115328,6 @@ self: {
}) {};
"ihaskell" = callPackage
- ({ mkDerivation, aeson, base, base64-bytestring, bytestring, cereal
- , cmdargs, containers, directory, filepath, ghc, ghc-boot
- , ghc-parser, ghc-paths, haskeline, haskell-src-exts, here, hlint
- , hspec, hspec-contrib, http-client, http-client-tls, HUnit
- , ipython-kernel, mtl, parsec, process, random, setenv, shelly
- , split, stm, strict, system-argv0, text, transformers, unix
- , unordered-containers, utf8-string, uuid, vector
- }:
- mkDerivation {
- pname = "ihaskell";
- version = "0.9.0.3";
- sha256 = "13cblc7wy92gbsvvbmxmp1r9c3fkmzl61adan8v9zxqbgw1w284p";
- isLibrary = true;
- isExecutable = true;
- enableSeparateDataOutput = true;
- libraryHaskellDepends = [
- aeson base base64-bytestring bytestring cereal cmdargs containers
- directory filepath ghc ghc-boot ghc-parser ghc-paths haskeline
- haskell-src-exts hlint http-client http-client-tls ipython-kernel
- mtl parsec process random shelly split stm strict system-argv0 text
- transformers unix unordered-containers utf8-string uuid vector
- ];
- executableHaskellDepends = [
- aeson base bytestring containers directory ghc ipython-kernel
- process strict text transformers unix
- ];
- testHaskellDepends = [
- base directory ghc ghc-paths here hspec hspec-contrib HUnit setenv
- shelly text transformers
- ];
- description = "A Haskell backend kernel for the IPython project";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "ihaskell_0_9_1_0" = callPackage
({ mkDerivation, aeson, base, base64-bytestring, bytestring, cereal
, cmdargs, containers, directory, filepath, ghc, ghc-boot
, ghc-parser, ghc-paths, haskeline, haskell-src-exts, here, hlint
@@ -115509,7 +115360,6 @@ self: {
];
description = "A Haskell backend kernel for the IPython project";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"ihaskell-aeson" = callPackage
@@ -116978,6 +116828,31 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "influxdb_1_6_0_7" = callPackage
+ ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
+ , cabal-doctest, clock, containers, doctest, foldl, http-client
+ , http-types, lens, network, optional-args, QuickCheck, scientific
+ , tagged, template-haskell, text, time, unordered-containers
+ , vector
+ }:
+ mkDerivation {
+ pname = "influxdb";
+ version = "1.6.0.7";
+ sha256 = "1fafcsrwfwxjzlz69qz9bq0pxc5iym12xnr6zv7j34yj6j96xzb2";
+ isLibrary = true;
+ isExecutable = true;
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ aeson attoparsec base bytestring clock containers foldl http-client
+ http-types lens network optional-args scientific tagged text time
+ unordered-containers vector
+ ];
+ testHaskellDepends = [ base doctest QuickCheck template-haskell ];
+ description = "Haskell client library for InfluxDB";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"informative" = callPackage
({ mkDerivation, base, containers, csv, highlighting-kate
, http-conduit, monad-logger, pandoc, persistent
@@ -117411,6 +117286,22 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "instance-map" = callPackage
+ ({ mkDerivation, aeson, base, binary, bytestring, containers, hspec
+ , mtl, template-haskell
+ }:
+ mkDerivation {
+ pname = "instance-map";
+ version = "0.1.0.0";
+ sha256 = "03mzwprhi98jmsr5qg3zm71rg01nbkxf53qqqfjrnar3qw3drk16";
+ libraryHaskellDepends = [ base containers mtl template-haskell ];
+ testHaskellDepends = [
+ aeson base binary bytestring containers hspec mtl template-haskell
+ ];
+ description = "Template haskell utilities for helping with deserialization etc. of existential types";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"instant-aeson" = callPackage
({ mkDerivation, aeson, base, instant-generics, tasty
, tasty-quickcheck
@@ -118755,27 +118646,6 @@ self: {
}) {};
"ipython-kernel" = callPackage
- ({ mkDerivation, aeson, base, bytestring, cereal, containers
- , directory, filepath, mtl, process, SHA, temporary, text
- , transformers, unordered-containers, uuid, zeromq4-haskell
- }:
- mkDerivation {
- pname = "ipython-kernel";
- version = "0.9.0.2";
- sha256 = "01l22myk73igczzjj4b239brp80b3pfamw9w67lw4l4w6n7lc8sr";
- isLibrary = true;
- isExecutable = true;
- enableSeparateDataOutput = true;
- libraryHaskellDepends = [
- aeson base bytestring cereal containers directory filepath mtl
- process SHA temporary text transformers unordered-containers uuid
- zeromq4-haskell
- ];
- description = "A library for creating kernels for IPython frontends";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "ipython-kernel_0_9_1_0" = callPackage
({ mkDerivation, aeson, base, bytestring, cereal, containers
, cryptonite, directory, filepath, memory, mtl, process, temporary
, text, transformers, unordered-containers, uuid, zeromq4-haskell
@@ -118794,7 +118664,6 @@ self: {
];
description = "A library for creating kernels for IPython frontends";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"irc" = callPackage
@@ -128852,19 +128721,19 @@ self: {
"life-sync" = callPackage
({ mkDerivation, ansi-terminal, base-noprelude, bytestring
- , containers, filepath, fmt, hedgehog, microlens-platform
- , optparse-applicative, path, path-io, process, tasty
- , tasty-discover, tasty-hedgehog, text, tomland, universum
+ , containers, exceptions, filepath, fmt, hedgehog
+ , microlens-platform, optparse-applicative, path, path-io, process
+ , relude, tasty, tasty-discover, tasty-hedgehog, text, tomland
}:
mkDerivation {
pname = "life-sync";
- version = "1.0";
- sha256 = "04w83c96zhjl52j5iyy3149gpj3m02jfyfvbvvgg34xxqm0vwzha";
+ version = "1.0.1";
+ sha256 = "1p7vnbk6xsa2963wc77cjjc5bbnrswzh27nw1zra09405yd21yf0";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- ansi-terminal base-noprelude bytestring containers fmt
- microlens-platform path path-io process text tomland universum
+ ansi-terminal base-noprelude bytestring containers exceptions fmt
+ microlens-platform path path-io process relude text tomland
];
executableHaskellDepends = [
base-noprelude containers optparse-applicative path
@@ -147077,22 +146946,6 @@ self: {
}) {nomyx-auth = null;};
"non-empty" = callPackage
- ({ mkDerivation, base, containers, deepseq, QuickCheck, utility-ht
- }:
- mkDerivation {
- pname = "non-empty";
- version = "0.3";
- sha256 = "1q2vplh7pddf8cpjzs3yvy1dn7lqlg32ianr6j5qwwwl9hfnr43p";
- revision = "1";
- editedCabalFile = "0ivvxcfm3qhv7ynb3ql89wrybbda1s2p5nr0viw7nqrybjz5hfzh";
- libraryHaskellDepends = [
- base containers deepseq QuickCheck utility-ht
- ];
- description = "List-like structures with static restrictions on the number of elements";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "non-empty_0_3_0_1" = callPackage
({ mkDerivation, base, containers, deepseq, QuickCheck, utility-ht
}:
mkDerivation {
@@ -147104,7 +146957,6 @@ self: {
];
description = "List-like structures with static restrictions on the number of elements";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"non-empty-containers" = callPackage
@@ -149299,10 +149151,8 @@ self: {
}:
mkDerivation {
pname = "opaleye";
- version = "0.6.7000.0";
- sha256 = "11wj57k7fswln9is47r09yj7h60hbqa6x0lnh6cg2bmg9ynnvmxk";
- revision = "1";
- editedCabalFile = "1g2asrmd4aaw61dcprs9mih1j065q9xipnrhkxablqwcpr8pzz21";
+ version = "0.6.7001.0";
+ sha256 = "0r1hy1p8lcvhqh7p0199dipl7791sbppihl8v1k1vazbr2nkj0l9";
libraryHaskellDepends = [
aeson base base16-bytestring bytestring case-insensitive
contravariant postgresql-simple pretty product-profunctors
@@ -156903,8 +156753,8 @@ self: {
}:
mkDerivation {
pname = "pipes-async";
- version = "0.1.2";
- sha256 = "0gfqjppg660i07y186khqb3wqgl5fchbmmsz1zaaqn5rnp7yj3pc";
+ version = "0.1.3";
+ sha256 = "12gsbfsknqpmf96nd3lh702bb1564wggr7niyqyy55k91wk2v25m";
libraryHaskellDepends = [
base lifted-async lifted-base monad-control pipes pipes-safe stm
transformers-base
@@ -157306,26 +157156,25 @@ self: {
"pipes-files" = callPackage
({ mkDerivation, attoparsec, base, bytestring, directory, doctest
, exceptions, filepath, free, hierarchy, hspec, hspec-expectations
- , mmorph, monad-control, mtl, pipes, pipes-safe, posix-paths
- , process, regex-posix, semigroups, text, time, transformers
- , transformers-base, transformers-compat, unix, unix-compat
+ , logict, mmorph, monad-control, mtl, pipes, pipes-safe
+ , posix-paths, process, regex-posix, semigroups, text, time
+ , transformers, transformers-base, transformers-compat, unix
+ , unix-compat
}:
mkDerivation {
pname = "pipes-files";
- version = "0.1.2";
- sha256 = "0ca53bgb15i6bjyp2dxnb1lbkzcbjdkrznnh2bwj0l4jk04pcxkw";
- revision = "1";
- editedCabalFile = "0bg0ji5w17kx8qnba0aisvyf6md5qf5846gy9kdh8k3vh410sc2r";
+ version = "0.1.3";
+ sha256 = "12y40lfpzcjmqq7cqs5g999ksn4mk3w0ybw0whhv15bflsykqw97";
libraryHaskellDepends = [
attoparsec base bytestring directory exceptions filepath free
- hierarchy mmorph monad-control mtl pipes pipes-safe posix-paths
- regex-posix semigroups text time transformers transformers-base
- transformers-compat unix unix-compat
+ hierarchy logict mmorph monad-control mtl pipes pipes-safe
+ posix-paths regex-posix semigroups text time transformers
+ transformers-base transformers-compat unix unix-compat
];
testHaskellDepends = [
base bytestring directory doctest filepath hierarchy hspec
- hspec-expectations mtl pipes pipes-safe process semigroups text
- transformers unix
+ hspec-expectations logict mtl pipes pipes-safe process semigroups
+ text transformers unix
];
description = "Fast traversal of directory trees using pipes";
license = stdenv.lib.licenses.bsd3;
@@ -163071,16 +162920,15 @@ self: {
"prometheus" = callPackage
({ mkDerivation, atomic-primops, base, bytestring, containers
- , http-client, http-types, lens, proto-lens, proto-lens-protoc
- , text, transformers, wai, warp, wreq
+ , http-client, http-types, text, transformers, wai, warp, wreq
}:
mkDerivation {
pname = "prometheus";
- version = "0.5.0";
- sha256 = "0bfm9frngj0lfpbmrxb0qg5x7bx447wyc8x8x79ah0r9l1l1bfsb";
+ version = "2.0.0";
+ sha256 = "15cp3r42kj3v6a6d67xr9ns69mz96zgh4wsa1jch34idwsxz6wxf";
libraryHaskellDepends = [
atomic-primops base bytestring containers http-client http-types
- lens proto-lens proto-lens-protoc text transformers wai warp wreq
+ text transformers wai warp wreq
];
description = "Prometheus Haskell Client";
license = stdenv.lib.licenses.bsd3;
@@ -164802,8 +164650,8 @@ self: {
}:
mkDerivation {
pname = "pushme";
- version = "2.1.1";
- sha256 = "1adgdbnifilzpxgkzdv0wxd475s7kl0ib8qqpd8ifx1cnm1zggjw";
+ version = "2.1.3";
+ sha256 = "13rc83fqbizcq1pvvmpd90cy5664p21hjg1aw5bjqw19l2g3c153";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -165866,8 +165714,8 @@ self: {
}:
mkDerivation {
pname = "quickcheck-classes";
- version = "0.4.13";
- sha256 = "19kndmc019dhz0b8iajplpiifl1x3ph39zwp2c2n3rp5v41syxrs";
+ version = "0.4.14";
+ sha256 = "010pbdv5dyyf2qkc41gbb86x94m8y1jlw9fa9k99jnw79c8bv3d9";
libraryHaskellDepends = [
aeson base bifunctors containers primitive QuickCheck semigroupoids
semigroups semirings tagged transformers
@@ -168156,28 +168004,25 @@ self: {
"rdf4h" = callPackage
({ mkDerivation, attoparsec, base, binary, bytestring, containers
- , criterion, deepseq, directory, hashable, hgal, HTTP, HUnit, hxt
- , mtl, network, network-uri, parsec, parsers, QuickCheck, safe
- , tasty, tasty-hunit, tasty-quickcheck, text, text-binary
- , unordered-containers, utf8-string
+ , criterion, deepseq, directory, filepath, hashable, hgal, HTTP
+ , HUnit, hxt, mtl, network-uri, parsec, parsers, QuickCheck, safe
+ , tasty, tasty-hunit, tasty-quickcheck, text, unordered-containers
}:
mkDerivation {
pname = "rdf4h";
- version = "3.0.4";
- sha256 = "0jci2d6n157y22ypsjb7kf4pknd53jjh2xj0i6qjsdh13qpwb7xq";
+ version = "3.1.0";
+ sha256 = "1hsa96a11mi8zlhfp9mhg4m13r4iwyhp9rhsgmpcq4g06ff1d6n8";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- attoparsec base binary bytestring containers deepseq directory
- hashable hgal HTTP hxt mtl network network-uri parsec parsers text
- text-binary unordered-containers utf8-string
- ];
- executableHaskellDepends = [
- base containers network network-uri text
+ attoparsec base binary bytestring containers deepseq filepath
+ hashable hgal HTTP hxt mtl network-uri parsec parsers text
+ unordered-containers
];
+ executableHaskellDepends = [ base containers text ];
testHaskellDepends = [
- base bytestring containers directory HUnit network network-uri
- QuickCheck safe tasty tasty-hunit tasty-quickcheck text
+ base containers directory filepath HUnit QuickCheck safe tasty
+ tasty-hunit tasty-quickcheck text
];
benchmarkHaskellDepends = [ base criterion deepseq text ];
description = "A library for RDF processing in Haskell";
@@ -170857,28 +170702,6 @@ self: {
}) {};
"relational-query" = callPackage
- ({ mkDerivation, array, base, bytestring, containers, dlist
- , names-th, persistable-record, product-isomorphic
- , quickcheck-simple, sql-words, template-haskell, text
- , th-reify-compat, time, time-locale-compat, transformers
- }:
- mkDerivation {
- pname = "relational-query";
- version = "0.12.0.1";
- sha256 = "0njmp3209499qvm30dy4k9gc3fpnf00bkkd42f8cif9gi5fhbwhz";
- libraryHaskellDepends = [
- array base bytestring containers dlist names-th persistable-record
- product-isomorphic sql-words template-haskell text th-reify-compat
- time time-locale-compat transformers
- ];
- testHaskellDepends = [
- base containers product-isomorphic quickcheck-simple transformers
- ];
- description = "Typeful, Modular, Relational, algebraic query engine";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "relational-query_0_12_1_0" = callPackage
({ mkDerivation, array, base, bytestring, containers, dlist
, names-th, persistable-record, product-isomorphic
, quickcheck-simple, sql-words, template-haskell, text
@@ -170898,34 +170721,9 @@ self: {
];
description = "Typeful, Modular, Relational, algebraic query engine";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"relational-query-HDBC" = callPackage
- ({ mkDerivation, base, containers, convertible, dlist, HDBC
- , HDBC-session, names-th, persistable-record, product-isomorphic
- , QuickCheck, quickcheck-simple, relational-query
- , relational-schemas, sql-words, template-haskell, th-data-compat
- , transformers
- }:
- mkDerivation {
- pname = "relational-query-HDBC";
- version = "0.7.0.1";
- sha256 = "0dlg4ykjh0yjr2c2vrxhss1z33myc0z86im6am8b7g64rjaxhpm0";
- libraryHaskellDepends = [
- base containers convertible dlist HDBC HDBC-session names-th
- persistable-record product-isomorphic relational-query
- relational-schemas sql-words template-haskell th-data-compat
- transformers
- ];
- testHaskellDepends = [
- base convertible HDBC QuickCheck quickcheck-simple
- ];
- description = "HDBC instance of relational-query and typed query interface for HDBC";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "relational-query-HDBC_0_7_1_1" = callPackage
({ mkDerivation, base, containers, convertible, dlist, HDBC
, HDBC-session, names-th, persistable-record, product-isomorphic
, QuickCheck, quickcheck-simple, relational-query
@@ -170947,7 +170745,6 @@ self: {
];
description = "HDBC instance of relational-query and typed query interface for HDBC";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"relational-record" = callPackage
@@ -174564,6 +174361,24 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "rpmbuild-order" = callPackage
+ ({ mkDerivation, base, Cabal, containers, directory
+ , explicit-exception, fgl, filepath, process, transformers
+ }:
+ mkDerivation {
+ pname = "rpmbuild-order";
+ version = "0.1";
+ sha256 = "13hn4g2yh1llj7c661a9v25y3c5d3llsy3x4pk310ig08rzypvmi";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base Cabal containers directory explicit-exception fgl filepath
+ process transformers
+ ];
+ description = "Order RPM packages by dependencies";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"rsagl" = callPackage
({ mkDerivation, array, arrows, base, containers
, data-memocombinators, deepseq, mtl, old-time, OpenGL, OpenGLRaw
@@ -174658,34 +174473,6 @@ self: {
}) {};
"rss-conduit" = callPackage
- ({ mkDerivation, atom-conduit, base, blaze-builder, bytestring
- , conduit, conduit-combinators, containers, data-default
- , dublincore-xml-conduit, lens-simple, mono-traversable, QuickCheck
- , quickcheck-instances, resourcet, safe, safe-exceptions
- , singletons, tasty, tasty-hunit, tasty-quickcheck, text, time
- , timerep, uri-bytestring, vinyl, xml-conduit, xml-types
- }:
- mkDerivation {
- pname = "rss-conduit";
- version = "0.4.2.1";
- sha256 = "04jpc3zrm9sh1ncqz2n0qr7wgabgpi56vsj24rppqiwrx31jrxdq";
- libraryHaskellDepends = [
- atom-conduit base conduit conduit-combinators containers
- dublincore-xml-conduit lens-simple safe safe-exceptions singletons
- text time timerep uri-bytestring vinyl xml-conduit xml-types
- ];
- testHaskellDepends = [
- atom-conduit base blaze-builder bytestring conduit
- conduit-combinators data-default dublincore-xml-conduit lens-simple
- mono-traversable QuickCheck quickcheck-instances resourcet
- safe-exceptions singletons tasty tasty-hunit tasty-quickcheck text
- time uri-bytestring vinyl xml-conduit xml-types
- ];
- description = "Streaming parser/renderer for the RSS standard";
- license = stdenv.lib.licenses.publicDomain;
- }) {};
-
- "rss-conduit_0_4_2_2" = callPackage
({ mkDerivation, atom-conduit, base, blaze-builder, bytestring
, conduit, conduit-combinators, containers, data-default
, dublincore-xml-conduit, lens-simple, mono-traversable, QuickCheck
@@ -174713,7 +174500,6 @@ self: {
];
description = "Streaming parser/renderer for the RSS standard";
license = stdenv.lib.licenses.publicDomain;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"rss2irc" = callPackage
@@ -178480,8 +178266,8 @@ self: {
}:
mkDerivation {
pname = "semirings";
- version = "0.1.3.0";
- sha256 = "0m2fs5d7w60mfihsyg95r6x923r0lby1g92bkzar0xm8r7kl1g90";
+ version = "0.2.0.0";
+ sha256 = "0w4mgcxdlhh9gqzjri8p7hpzsgjn3dxfjgs10nl1vriw22i1fn6p";
libraryHaskellDepends = [
base containers hashable integer-gmp unordered-containers vector
];
@@ -181036,8 +180822,8 @@ self: {
}:
mkDerivation {
pname = "serverless-haskell";
- version = "0.6.2";
- sha256 = "1nlby06n8wkildflwlszcy9iljji19mdfkaw0fnnll0l7gir14v5";
+ version = "0.6.3";
+ sha256 = "0p7xxzrmg9qn8k0i363yrk91gy506vs3db9ncp8h4vw0sx58g2zq";
libraryHaskellDepends = [
aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis
amazonka-s3 base bytestring case-insensitive http-types iproute
@@ -181055,7 +180841,7 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "serverless-haskell_0_7_2" = callPackage
+ "serverless-haskell_0_7_3" = callPackage
({ mkDerivation, aeson, aeson-casing, aeson-extra, amazonka-core
, amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive
, hspec, hspec-discover, http-types, iproute, lens, raw-strings-qq
@@ -181063,8 +180849,8 @@ self: {
}:
mkDerivation {
pname = "serverless-haskell";
- version = "0.7.2";
- sha256 = "12nkqx8wsbc1l8hka8i0jr84gdf8k1wvsx5m6nabrnp60zxnqjxc";
+ version = "0.7.3";
+ sha256 = "0yzwzkdq4afyfdkrdd19a70x082grgzzzara2zyb08szv1gpmyn2";
libraryHaskellDepends = [
aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis
amazonka-s3 base bytestring case-insensitive http-types iproute
@@ -181276,6 +181062,25 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "servius_1_2_2_0" = callPackage
+ ({ mkDerivation, base, blaze-builder, blaze-html, bytestring
+ , cmark-gfm, http-types, shakespeare, text, wai, wai-app-static
+ }:
+ mkDerivation {
+ pname = "servius";
+ version = "1.2.2.0";
+ sha256 = "14jfnjfdyvc63pi3kmhwxmq2hbrfh17xa3jxp9y2ag6iifycnmf7";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base blaze-builder blaze-html bytestring cmark-gfm http-types
+ shakespeare text wai wai-app-static
+ ];
+ description = "Warp web server with template rendering";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"ses-html" = callPackage
({ mkDerivation, base, base64-bytestring, blaze-html, byteable
, bytestring, cryptohash, HsOpenSSL, http-streams, tagsoup, time
@@ -184092,24 +183897,6 @@ self: {
}) {};
"simple-vec3" = callPackage
- ({ mkDerivation, base, criterion, doctest, doctest-driver-gen
- , QuickCheck, tasty, tasty-quickcheck, vector
- }:
- mkDerivation {
- pname = "simple-vec3";
- version = "0.4.0.7";
- sha256 = "1snhvy9nlwi6ka6lj6qhc3p9wz9q88mj9yr80lir7z0i1qy0yvar";
- libraryHaskellDepends = [ base QuickCheck vector ];
- testHaskellDepends = [
- base doctest doctest-driver-gen tasty tasty-quickcheck
- ];
- benchmarkHaskellDepends = [ base criterion vector ];
- description = "Three-dimensional vectors of doubles with basic operations";
- license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- }) {};
-
- "simple-vec3_0_4_0_8" = callPackage
({ mkDerivation, base, criterion, doctest, doctest-driver-gen
, QuickCheck, tasty, tasty-quickcheck, vector
}:
@@ -185824,8 +185611,8 @@ self: {
}:
mkDerivation {
pname = "smuggler";
- version = "0.0.0";
- sha256 = "06myh42zc4rgis6bhng60i4skvm9kmvd63lasycp7198mjf61jsn";
+ version = "0.0.1";
+ sha256 = "16f2s1gp5ww2ingil60fq5w6ghs3f1cscsl8qn7ibg0jqj0w5q89";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -186137,8 +185924,8 @@ self: {
pname = "snap-loader-static";
version = "1.0.0.0";
sha256 = "04i9fn84101w8ybns8m2830zlw2vvg81pzrs0vmj6s691y3ivxas";
- revision = "1";
- editedCabalFile = "0ghxjdh5hv2nb3m1rax3rlgszxrfv4x1dxb5n4f1h6xaya9ya0hh";
+ revision = "2";
+ editedCabalFile = "1f9dn3x8m53rywlmmn274cfh0ahvaz9vqfc6cwc79bmbz0r7fq1z";
libraryHaskellDepends = [ base template-haskell ];
description = "Snap static loader";
license = stdenv.lib.licenses.bsd3;
@@ -189813,6 +189600,17 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "st2" = callPackage
+ ({ mkDerivation, base, gdp, ghc-prim, primitive }:
+ mkDerivation {
+ pname = "st2";
+ version = "0.1.0.0";
+ sha256 = "0gly0l191cwnahdrmgi1i2rx4430b9d684kl9s5frxa3k1711agj";
+ libraryHaskellDepends = [ base gdp ghc-prim primitive ];
+ description = "shared heap regions between local mutable state threads";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"stable-heap" = callPackage
({ mkDerivation, base, criterion, fingertree, heaps, mwc-random
, pqueue, vector
@@ -192266,8 +192064,8 @@ self: {
({ mkDerivation, base, bytestring, hidapi, mtl }:
mkDerivation {
pname = "streamdeck";
- version = "0.0.1";
- sha256 = "05qdnhhjqjs7cg7yvg9ryzxlw1mw3y5y55z4dy1cf5g98j01s449";
+ version = "0.0.2";
+ sha256 = "0kvzm7995c8wlxgksdhvv612iik944lm6fizvh8wzjbjavgwhwy6";
libraryHaskellDepends = [ base bytestring hidapi mtl ];
description = "Control library for the Elgato Stream Deck";
license = stdenv.lib.licenses.bsd3;
@@ -194095,8 +193893,8 @@ self: {
}:
mkDerivation {
pname = "summoner";
- version = "1.0.4";
- sha256 = "1gwglx6lvg962q7a5m0vx372vqyiw3sf5kxsbwnl53pgrynmjhyn";
+ version = "1.0.5";
+ sha256 = "0sxgg1g2d6pwvmp0rbyny3cizbajd0iq2wdyxspfw3rapkjap5j2";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -194113,27 +193911,25 @@ self: {
license = stdenv.lib.licenses.mpl20;
}) {};
- "summoner_1_0_5" = callPackage
+ "summoner_1_0_6" = callPackage
({ mkDerivation, aeson, ansi-terminal, base, bytestring, directory
, filepath, generic-deriving, hedgehog, neat-interpolation
- , optparse-applicative, process, tasty, tasty-discover
- , tasty-hedgehog, text, time, tomland, universum
+ , optparse-applicative, process, relude, tasty, tasty-discover
+ , tasty-hedgehog, text, time, tomland
}:
mkDerivation {
pname = "summoner";
- version = "1.0.5";
- sha256 = "0sxgg1g2d6pwvmp0rbyny3cizbajd0iq2wdyxspfw3rapkjap5j2";
+ version = "1.0.6";
+ sha256 = "0sb877846l34qp2cjl7gayb517fi5igf9vcmksryasnjxlbhs7vx";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson ansi-terminal base bytestring directory filepath
generic-deriving neat-interpolation optparse-applicative process
- text time tomland universum
- ];
- executableHaskellDepends = [ base universum ];
- testHaskellDepends = [
- base hedgehog tasty tasty-hedgehog universum
+ relude text time tomland
];
+ executableHaskellDepends = [ base relude ];
+ testHaskellDepends = [ base hedgehog relude tasty tasty-hedgehog ];
testToolDepends = [ tasty-discover ];
description = "Tool for creating completely configured production Haskell projects";
license = stdenv.lib.licenses.mpl20;
@@ -194992,6 +194788,32 @@ self: {
license = stdenv.lib.licenses.lgpl21;
}) {};
+ "swish_0_10_0_0" = callPackage
+ ({ mkDerivation, base, containers, directory, filepath, hashable
+ , HUnit, intern, mtl, network-uri, old-locale, polyparse
+ , semigroups, test-framework, test-framework-hunit, text, time
+ }:
+ mkDerivation {
+ pname = "swish";
+ version = "0.10.0.0";
+ sha256 = "1dm388lwfxrpdbqm3fdk9gjr8pp8y8s02wl9aan86av956g2kr4h";
+ isLibrary = true;
+ isExecutable = true;
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ base containers directory filepath hashable intern mtl network-uri
+ old-locale polyparse text time
+ ];
+ executableHaskellDepends = [ base ];
+ testHaskellDepends = [
+ base containers hashable HUnit network-uri old-locale semigroups
+ test-framework test-framework-hunit text time
+ ];
+ description = "A semantic web toolkit";
+ license = stdenv.lib.licenses.lgpl21;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"sws" = callPackage
({ mkDerivation, base, bytestring, cryptonite, directory, filepath
, hourglass, http-types, network, resourcet, transformers, wai
@@ -198948,6 +198770,17 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "termbox-banana" = callPackage
+ ({ mkDerivation, base, reactive-banana, stm, termbox }:
+ mkDerivation {
+ pname = "termbox-banana";
+ version = "0.1.0";
+ sha256 = "0qyr2zykplxdg2x7k4xcg0cnv7lxx60lr55k8fs29556zalkgcgz";
+ libraryHaskellDepends = [ base reactive-banana stm termbox ];
+ description = "reactive-banana + termbox";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"termbox-bindings" = callPackage
({ mkDerivation, base, c2hs }:
mkDerivation {
@@ -218335,8 +218168,8 @@ self: {
}:
mkDerivation {
pname = "wsjtx-udp";
- version = "0.1.0.6";
- sha256 = "04c44jbpnplil3l69s1bvn2dk2jbs4vkf82vlxpfrljnpfckllbc";
+ version = "0.1.3.4";
+ sha256 = "0krn5ams62dh4f0gfyx7ss7ymm438s9bf4m329pqnhj11p2fiazf";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -221704,18 +221537,6 @@ self: {
}) {};
"yeshql" = callPackage
- ({ mkDerivation, base, yeshql-core, yeshql-hdbc }:
- mkDerivation {
- pname = "yeshql";
- version = "4.1.0.0";
- sha256 = "04vi2m9av2dh6jxjlxvxi7j5llxjl2j1ww0cnjhkn7z2bllf77yq";
- libraryHaskellDepends = [ base yeshql-core yeshql-hdbc ];
- description = "YesQL-style SQL database abstraction (legacy compatibility wrapper)";
- license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- }) {};
-
- "yeshql_4_1_0_1" = callPackage
({ mkDerivation, base, yeshql-core, yeshql-hdbc }:
mkDerivation {
pname = "yeshql";
@@ -221728,25 +221549,6 @@ self: {
}) {};
"yeshql-core" = callPackage
- ({ mkDerivation, base, containers, convertible, filepath, parsec
- , stm, tasty, tasty-hunit, tasty-quickcheck, template-haskell
- }:
- mkDerivation {
- pname = "yeshql-core";
- version = "4.1.0.0";
- sha256 = "1zy2si96vm451z5yjmp5hzw94nqlx6v136l35130m82mdih0337w";
- libraryHaskellDepends = [
- base containers convertible filepath parsec template-haskell
- ];
- testHaskellDepends = [
- base containers stm tasty tasty-hunit tasty-quickcheck
- ];
- description = "YesQL-style SQL database abstraction (core)";
- license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- }) {};
-
- "yeshql-core_4_1_0_1" = callPackage
({ mkDerivation, base, containers, convertible, filepath, parsec
, stm, tasty, tasty-hunit, tasty-quickcheck, template-haskell
}:
@@ -221766,27 +221568,6 @@ self: {
}) {};
"yeshql-hdbc" = callPackage
- ({ mkDerivation, base, containers, convertible, filepath, HDBC
- , parsec, stm, tasty, tasty-hunit, tasty-quickcheck
- , template-haskell, yeshql-core
- }:
- mkDerivation {
- pname = "yeshql-hdbc";
- version = "4.1.0.0";
- sha256 = "152a2lw76jka83ywqliwhwijgwlsm6shlxj4qhbpmg8bam62b0k4";
- libraryHaskellDepends = [
- base containers convertible filepath HDBC parsec template-haskell
- yeshql-core
- ];
- testHaskellDepends = [
- base containers HDBC stm tasty tasty-hunit tasty-quickcheck
- ];
- description = "YesQL-style SQL database abstraction (HDBC backend)";
- license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- }) {};
-
- "yeshql-hdbc_4_1_0_1" = callPackage
({ mkDerivation, base, containers, convertible, filepath, HDBC
, parsec, stm, tasty, tasty-hunit, tasty-quickcheck
, template-haskell, yeshql-core
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 6a7b994ee98..7c866911c59 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -1,21 +1,63 @@
# pcre functionality is tested in nixos/tests/php-pcre.nix
-
-{ lib, stdenv, fetchurl, composableDerivation, flex, bison
-, mysql, libxml2, readline, zlib, curl, postgresql, gettext, html-tidy
+{ lib, stdenv, fetchurl, flex, bison
+, mysql, libxml2, readline, zlib, curl, postgresql, gettext
, openssl, pcre, pkgconfig, sqlite, config, libjpeg, libpng, freetype
, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, freetds
-, uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium }:
+, uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium, html-tidy
+}:
+
+with lib;
let
-
+ php7 = versionAtLeast version "7.0";
generic =
- { version, sha256 }:
+ { version
+ , sha256
+ , imapSupport ? config.php.imap or (!stdenv.isDarwin)
+ , ldapSupport ? config.php.ldap or true
+ , mhashSupport ? config.php.mhash or true
+ , mysqlSupport ? (config.php.mysql or true) && (!php7)
+ , mysqlndSupport ? config.php.mysqlnd or false
+ , mysqliSupport ? config.php.mysqli or true
+ , pdo_mysqlSupport ? config.php.pdo_mysql or true
+ , libxml2Support ? config.php.libxml2 or true
+ , apxs2Support ? config.php.apxs2 or (!stdenv.isDarwin)
+ , embedSupport ? config.php.embed or false
+ , bcmathSupport ? config.php.bcmath or true
+ , socketsSupport ? config.php.sockets or true
+ , curlSupport ? config.php.curl or true
+ , curlWrappersSupport ? (config.php.curlWrappers or true) && (!php7)
+ , gettextSupport ? config.php.gettext or true
+ , pcntlSupport ? config.php.pcntl or true
+ , postgresqlSupport ? config.php.postgresql or true
+ , pdo_pgsqlSupport ? config.php.pdo_pgsql or true
+ , readlineSupport ? config.php.readline or true
+ , sqliteSupport ? config.php.sqlite or true
+ , soapSupport ? config.php.soap or true
+ , zlibSupport ? config.php.zlib or true
+ , opensslSupport ? config.php.openssl or true
+ , mbstringSupport ? config.php.mbstring or true
+ , gdSupport ? config.php.gd or true
+ , intlSupport ? config.php.intl or true
+ , exifSupport ? config.php.exif or true
+ , xslSupport ? config.php.xsl or false
+ , mcryptSupport ? config.php.mcrypt or true
+ , bz2Support ? config.php.bz2 or false
+ , zipSupport ? config.php.zip or true
+ , ftpSupport ? config.php.ftp or true
+ , fpmSupport ? config.php.fpm or true
+ , gmpSupport ? config.php.gmp or true
+ , mssqlSupport ? (config.php.mssql or (!stdenv.isDarwin)) && (!php7)
+ , ztsSupport ? config.php.zts or false
+ , calendarSupport ? config.php.calendar or true
+ , sodiumSupport ? (config.php.sodium or true) && (versionAtLeast version "7.2")
+ , tidySupport ? false
+ }:
- let php7 = lib.versionAtLeast version "7.0";
- mysqlndSupport = config.php.mysqlnd or false;
- mysqlBuildInputs = lib.optional (!mysqlndSupport) mysql.connector-c;
-
- in composableDerivation.composableDerivation {} (fixed: {
+ let
+ mysqlBuildInputs = optional (!mysqlndSupport) mysql.connector-c;
+ libmcrypt' = libmcrypt.override { disablePosixThreads = true; };
+ in stdenv.mkDerivation {
inherit version;
@@ -25,258 +67,99 @@ let
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ flex bison pcre ]
- ++ lib.optional stdenv.isLinux systemd;
+ ++ optional stdenv.isLinux systemd
+ ++ optionals imapSupport [ uwimap openssl pam ]
+ ++ optionals curlSupport [ curl openssl ]
+ ++ optionals ldapSupport [ openldap openssl ]
+ ++ optionals gdSupport [ libpng libjpeg freetype ]
+ ++ optionals opensslSupport [ openssl openssl.dev ]
+ ++ optional apxs2Support apacheHttpd
+ ++ optional (ldapSupport && stdenv.isLinux) cyrus_sasl
+ ++ optional mhashSupport libmhash
+ ++ optional zlibSupport zlib
+ ++ optional libxml2Support libxml2
+ ++ optional readlineSupport readline
+ ++ optional sqliteSupport sqlite
+ ++ optional postgresqlSupport postgresql
+ ++ optional pdo_pgsqlSupport postgresql
+ ++ optional pdo_mysqlSupport mysqlBuildInputs
+ ++ optional mysqlSupport mysqlBuildInputs
+ ++ optional mysqliSupport mysqlBuildInputs
+ ++ optional gmpSupport gmp
+ ++ optional gettextSupport gettext
+ ++ optional intlSupport icu
+ ++ optional xslSupport libxslt
+ ++ optional mcryptSupport libmcrypt'
+ ++ optional bz2Support bzip2
+ ++ optional (mssqlSupport && !stdenv.isDarwin) freetds
+ ++ optional sodiumSupport libsodium
+ ++ optional tidySupport html-tidy;
- CXXFLAGS = lib.optional stdenv.cc.isClang "-std=c++11";
+ CXXFLAGS = optional stdenv.cc.isClang "-std=c++11";
- flags = {
- # much left to do here...
+ configureFlags = [
+ "--with-config-file-scan-dir=/etc/php.d"
+ "--with-pcre-regex=${pcre.dev} PCRE_LIBDIR=${pcre}"
+ ]
+ ++ optional stdenv.isDarwin "--with-iconv=${libiconv}"
+ ++ optional stdenv.isLinux "--with-fpm-systemd"
+ ++ optionals imapSupport [
+ "--with-imap=${uwimap}"
+ "--with-imap-ssl"
+ ]
+ ++ optionals ldapSupport [
+ "--with-ldap=/invalid/path"
+ "LDAP_DIR=${openldap.dev}"
+ "LDAP_INCDIR=${openldap.dev}/include"
+ "LDAP_LIBDIR=${openldap.out}/lib"
+ ]
+ ++ optional (ldapSupport && stdenv.isLinux) "--with-ldap-sasl=${cyrus_sasl.dev}"
+ ++ optional apxs2Support "--with-apxs2=${apacheHttpd.dev}/bin/apxs"
+ ++ optional embedSupport "--enable-embed"
+ ++ optional mhashSupport "--with-mhash"
+ ++ optional curlSupport "--with-curl=${curl.dev}"
+ ++ optional curlWrappersSupport "--with-curlwrappers"
+ ++ optional zlibSupport "--with-zlib=${zlib.dev}"
+ ++ optional libxml2Support "--with-libxml-dir=${libxml2.dev}"
+ ++ optional pcntlSupport "--enable-pcntl"
+ ++ optional readlineSupport "--with-readline=${readline.dev}"
+ ++ optional sqliteSupport "--with-pdo-sqlite=${sqlite.dev}"
+ ++ optional postgresqlSupport "--with-pgsql=${postgresql}"
+ ++ optional pdo_pgsqlSupport "--with-pdo-pgsql=${postgresql}"
+ ++ optional pdo_mysqlSupport "--with-pdo-mysql=${if mysqlndSupport then "mysqlnd" else mysql.connector-c}"
+ ++ optional mysqlSupport "--with-mysql${if mysqlndSupport then "=mysqlnd" else ""}"
+ ++ optionals mysqliSupport [
+ "--with-mysqli=${if mysqlndSupport then "mysqlnd" else "${mysql.connector-c}/bin/mysql_config"}"
+ ]
+ ++ optional bcmathSupport "--enable-bcmath"
+ # FIXME: Our own gd package doesn't work, see https://bugs.php.net/bug.php?id=60108.
+ ++ optionals gdSupport [
+ "--with-gd"
+ "--with-freetype-dir=${freetype.dev}"
+ "--with-png-dir=${libpng.dev}"
+ "--with-jpeg-dir=${libjpeg.dev}"
+ ]
+ ++ optional gmpSupport "--with-gmp=${gmp.dev}"
+ ++ optional soapSupport "--enable-soap"
+ ++ optional socketsSupport "--enable-sockets"
+ ++ optional opensslSupport "--with-openssl"
+ ++ optional mbstringSupport "--enable-mbstring"
+ ++ optional gettextSupport "--with-gettext=${gettext}"
+ ++ optional intlSupport "--enable-intl"
+ ++ optional exifSupport "--enable-exif"
+ ++ optional xslSupport "--with-xsl=${libxslt.dev}"
+ ++ optional mcryptSupport "--with-mcrypt=${libmcrypt'}"
+ ++ optional bz2Support "--with-bz2=${bzip2.dev}"
+ ++ optional zipSupport "--enable-zip"
+ ++ optional ftpSupport "--enable-ftp"
+ ++ optional fpmSupport "--enable-fpm"
+ ++ optional (mssqlSupport && !stdenv.isDarwin) "--with-mssql=${freetds}"
+ ++ optional ztsSupport "--enable-maintainer-zts"
+ ++ optional calendarSupport "--enable-calendar"
+ ++ optional sodiumSupport "--with-sodium=${libsodium.dev}"
+ ++ optional tidySupport "--with-tidy=${html-tidy}";
- # SAPI modules:
-
- apxs2 = {
- configureFlags = ["--with-apxs2=${apacheHttpd.dev}/bin/apxs"];
- buildInputs = [apacheHttpd];
- };
-
- embed = {
- configureFlags = ["--enable-embed"];
- };
-
- # Extensions
- imap = {
- configureFlags = [
- "--with-imap=${uwimap}"
- "--with-imap-ssl"
- ];
- buildInputs = [ uwimap openssl pam ];
- };
-
- ldap = {
- configureFlags = [
- "--with-ldap=/invalid/path"
- "LDAP_DIR=${openldap.dev}"
- "LDAP_INCDIR=${openldap.dev}/include"
- "LDAP_LIBDIR=${openldap.out}/lib"
- (lib.optional stdenv.isLinux "--with-ldap-sasl=${cyrus_sasl.dev}")
- ];
- buildInputs = [openldap openssl] ++ lib.optional stdenv.isLinux cyrus_sasl;
- };
-
- mhash = {
- configureFlags = ["--with-mhash"];
- buildInputs = [libmhash];
- };
-
- curl = {
- configureFlags = ["--with-curl=${curl.dev}"];
- buildInputs = [curl openssl];
- };
-
- curlWrappers = {
- configureFlags = ["--with-curlwrappers"];
- };
-
- zlib = {
- configureFlags = ["--with-zlib=${zlib.dev}"];
- buildInputs = [zlib];
- };
-
- libxml2 = {
- configureFlags = [
- "--with-libxml-dir=${libxml2.dev}"
- ];
- buildInputs = [ libxml2 ];
- };
-
- pcntl = {
- configureFlags = [ "--enable-pcntl" ];
- };
-
- readline = {
- configureFlags = ["--with-readline=${readline.dev}"];
- buildInputs = [ readline ];
- };
-
- sqlite = {
- configureFlags = ["--with-pdo-sqlite=${sqlite.dev}"];
- buildInputs = [ sqlite ];
- };
-
- postgresql = {
- configureFlags = ["--with-pgsql=${postgresql}"];
- buildInputs = [ postgresql ];
- };
-
- pdo_pgsql = {
- configureFlags = ["--with-pdo-pgsql=${postgresql}"];
- buildInputs = [ postgresql ];
- };
-
- mysql = {
- configureFlags = ["--with-mysql${if mysqlndSupport then "=mysqlnd" else ""}"];
- buildInputs = mysqlBuildInputs;
- };
-
- mysqli = {
- configureFlags = ["--with-mysqli=${if mysqlndSupport then "mysqlnd" else "${mysql.connector-c}/bin/mysql_config"}"];
- buildInputs = mysqlBuildInputs;
- };
-
- mysqli_embedded = {
- configureFlags = ["--enable-embedded-mysqli"];
- depends = "mysqli";
- assertion = fixed.mysqliSupport;
- };
-
- pdo_mysql = {
- configureFlags = ["--with-pdo-mysql=${if mysqlndSupport then "mysqlnd" else mysql.connector-c}"];
- buildInputs = mysqlBuildInputs;
- };
-
- bcmath = {
- configureFlags = ["--enable-bcmath"];
- };
-
- gd = {
- # FIXME: Our own gd package doesn't work, see https://bugs.php.net/bug.php?id=60108.
- configureFlags = [
- "--with-gd"
- "--with-freetype-dir=${freetype.dev}"
- "--with-png-dir=${libpng.dev}"
- "--with-jpeg-dir=${libjpeg.dev}"
- ];
- buildInputs = [ libpng libjpeg freetype ];
- };
-
- gmp = {
- configureFlags = ["--with-gmp=${gmp.dev}"];
- buildInputs = [ gmp ];
- };
-
- soap = {
- configureFlags = ["--enable-soap"];
- };
-
- sockets = {
- configureFlags = ["--enable-sockets"];
- };
-
- openssl = {
- configureFlags = ["--with-openssl"];
- buildInputs = [openssl openssl.dev];
- };
-
- mbstring = {
- configureFlags = ["--enable-mbstring"];
- };
-
- gettext = {
- configureFlags = ["--with-gettext=${gettext}"];
- buildInputs = [gettext];
- };
-
- intl = {
- configureFlags = ["--enable-intl"];
- buildInputs = [icu];
- };
-
- exif = {
- configureFlags = ["--enable-exif"];
- };
-
- xsl = {
- configureFlags = ["--with-xsl=${libxslt.dev}"];
- buildInputs = [libxslt];
- };
-
- mcrypt = let libmcrypt' = libmcrypt.override { disablePosixThreads = true; }; in {
- configureFlags = ["--with-mcrypt=${libmcrypt'}"];
- buildInputs = [libmcrypt'];
- };
-
- bz2 = {
- configureFlags = ["--with-bz2=${bzip2.dev}"];
- buildInputs = [bzip2];
- };
-
- zip = {
- configureFlags = ["--enable-zip"];
- };
-
- ftp = {
- configureFlags = ["--enable-ftp"];
- };
-
- fpm = {
- configureFlags = ["--enable-fpm"];
- };
-
- mssql = stdenv.lib.optionalAttrs (!stdenv.isDarwin) {
- configureFlags = ["--with-mssql=${freetds}"];
- buildInputs = [freetds];
- };
-
- zts = {
- configureFlags = ["--enable-maintainer-zts"];
- };
-
- calendar = {
- configureFlags = ["--enable-calendar"];
- };
-
- sodium = {
- configureFlags = ["--with-sodium=${libsodium.dev}"];
- buildInputs = [libsodium];
- };
-
- tidy = {
- configureFlags = [ "--with-tidy=${html-tidy}" ];
- buildInputs = [ html-tidy ];
- };
- };
-
- cfg = {
- imapSupport = config.php.imap or (!stdenv.isDarwin);
- ldapSupport = config.php.ldap or true;
- mhashSupport = config.php.mhash or true;
- mysqlSupport = (!php7) && (config.php.mysql or true);
- mysqliSupport = config.php.mysqli or true;
- pdo_mysqlSupport = config.php.pdo_mysql or true;
- libxml2Support = config.php.libxml2 or true;
- apxs2Support = config.php.apxs2 or (!stdenv.isDarwin);
- embedSupport = config.php.embed or false;
- bcmathSupport = config.php.bcmath or true;
- socketsSupport = config.php.sockets or true;
- curlSupport = config.php.curl or true;
- curlWrappersSupport = (!php7) && (config.php.curlWrappers or true);
- gettextSupport = config.php.gettext or true;
- pcntlSupport = config.php.pcntl or true;
- postgresqlSupport = config.php.postgresql or true;
- pdo_pgsqlSupport = config.php.pdo_pgsql or true;
- readlineSupport = config.php.readline or true;
- sqliteSupport = config.php.sqlite or true;
- soapSupport = config.php.soap or true;
- zlibSupport = config.php.zlib or true;
- opensslSupport = config.php.openssl or true;
- mbstringSupport = config.php.mbstring or true;
- gdSupport = config.php.gd or true;
- intlSupport = config.php.intl or true;
- exifSupport = config.php.exif or true;
- xslSupport = config.php.xsl or false;
- mcryptSupport = config.php.mcrypt or true;
- bz2Support = config.php.bz2 or false;
- zipSupport = config.php.zip or true;
- ftpSupport = config.php.ftp or true;
- fpmSupport = config.php.fpm or true;
- gmpSupport = config.php.gmp or true;
- mssqlSupport = (!php7) && (config.php.mssql or (!stdenv.isDarwin));
- ztsSupport = config.php.zts or false;
- calendarSupport = config.php.calendar or true;
- sodiumSupport = (lib.versionAtLeast version "7.2") && config.php.sodium or true;
- tidySupport = php7 && config.php.tidy or true;
- };
hardeningDisable = [ "bindnow" ];
@@ -298,12 +181,6 @@ let
--includedir=$dev/include)
'';
- configureFlags = [
- "--with-config-file-scan-dir=/etc/php.d"
- "--with-pcre-regex=${pcre.dev} PCRE_LIBDIR=${pcre}"
- ] ++ lib.optional stdenv.isDarwin "--with-iconv=${libiconv}"
- ++ lib.optional stdenv.isLinux "--with-fpm-systemd";
-
postInstall = ''
cp php.ini-production $out/etc/php.ini
'';
@@ -332,7 +209,7 @@ let
patches = if !php7 then [ ./fix-paths.patch ] else [ ./fix-paths-php7.patch ];
- postPatch = lib.optional stdenv.isDarwin ''
+ postPatch = optional stdenv.isDarwin ''
substituteInPlace configure --replace "-lstdc++" "-lc++"
'';
@@ -340,7 +217,7 @@ let
outputs = [ "out" "dev" ];
- });
+ };
in {
php56 = generic {
diff --git a/pkgs/development/libraries/audio/libmysofa/default.nix b/pkgs/development/libraries/audio/libmysofa/default.nix
new file mode 100644
index 00000000000..d802d70adf3
--- /dev/null
+++ b/pkgs/development/libraries/audio/libmysofa/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, cmake, zlib }:
+
+stdenv.mkDerivation rec {
+ name = "libmysofa-${version}";
+ version = "0.6";
+
+ src = fetchFromGitHub {
+ owner = "hoene";
+ repo = "libmysofa";
+ rev = "v${version}";
+ sha256 = "160gcmsn6dwaca29bs95nsgjdalwc299lip0h37k3jcbxxkchgsh";
+ };
+
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ zlib ];
+
+ cmakeFlags = [ "-DBUILD_TESTS=OFF" ];
+
+ meta = with stdenv.lib; {
+ description = "Reader for AES SOFA files to get better HRTFs";
+ homepage = https://github.com/hoene/libmysofa;
+ license = licenses.bsd3;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ jfrankenau ];
+ };
+}
diff --git a/pkgs/development/libraries/dbxml/cxx11.patch b/pkgs/development/libraries/dbxml/cxx11.patch
new file mode 100644
index 00000000000..f264515c7d6
--- /dev/null
+++ b/pkgs/development/libraries/dbxml/cxx11.patch
@@ -0,0 +1,59 @@
+diff -urN dbxml-6.1.4.orig/dbxml/src/dbxml/nodeStore/NsUpdate.cpp dbxml-6.1.4/dbxml/src/dbxml/nodeStore/NsUpdate.cpp
+--- dbxml-6.1.4.orig/dbxml/src/dbxml/nodeStore/NsUpdate.cpp 2017-05-01 16:05:29.000000000 +0100
++++ dbxml-6.1.4/dbxml/src/dbxml/nodeStore/NsUpdate.cpp 2017-09-04 11:50:20.000000000 +0100
+@@ -1359,21 +1359,13 @@
+ void NsUpdate::attributeRemoved(const DbXmlNodeImpl &node)
+ {
+ string key = makeKey(node);
+-#if defined(_MSC_VER) && (_MSC_VER>1600)
+ attrMap_.insert(make_pair(key,node.getIndex()));
+-#else
+- attrMap_.insert(make_pair(key,node.getIndex()));
+-#endif
+ }
+
+ void NsUpdate::textRemoved(const DbXmlNodeImpl &node)
+ {
+ string key = makeKey(node);
+-#if defined(_MSC_VER) && (_MSC_VER>1600)
+ textDeleteMap_.insert(make_pair(key,node.getIndex()));
+-#else
+- textDeleteMap_.insert(make_pair(key,node.getIndex()));
+-#endif
+ }
+
+ void NsUpdate::textRemoved(int index, const NsNid &nid,
+@@ -1381,21 +1373,13 @@
+ const std::string &cname)
+ {
+ string key = makeKey(nid, did, cname);
+-#if defined(_MSC_VER) && (_MSC_VER>1600)
+ textDeleteMap_.insert(make_pair(key,index));
+-#else
+- textDeleteMap_.insert(make_pair(key,index));
+-#endif
+ }
+
+ void NsUpdate::textInserted(int index, const DbXmlNodeImpl &node)
+ {
+ string key = makeKey(node);
+-#if defined(_MSC_VER) && (_MSC_VER>1600)
+ textInsertMap_.insert(make_pair(key,index));
+-#else
+- textInsertMap_.insert(make_pair(key,index));
+-#endif
+ }
+
+ void NsUpdate::textInserted(int index, const NsNid &nid,
+@@ -1403,11 +1387,7 @@
+ const std::string &cname)
+ {
+ string key = makeKey(nid, did, cname);
+-#if defined(_MSC_VER) && (_MSC_VER>1600)
+ textInsertMap_.insert(make_pair(key,index));
+-#else
+- textInsertMap_.insert(make_pair(key,index));
+-#endif
+ }
+
+ //
diff --git a/pkgs/development/libraries/dbxml/default.nix b/pkgs/development/libraries/dbxml/default.nix
new file mode 100644
index 00000000000..0bab58b242d
--- /dev/null
+++ b/pkgs/development/libraries/dbxml/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, db62, xercesc, xqilla }:
+
+stdenv.mkDerivation rec {
+ name = "dbxml-${version}";
+ version = "6.1.4";
+
+ src = fetchurl {
+ url = "http://download.oracle.com/berkeley-db/${name}.tar.gz";
+ sha256 = "a8fc8f5e0c3b6e42741fa4dfc3b878c982ff8f5e5f14843f6a7e20d22e64251a";
+ };
+
+ patches = [
+ ./cxx11.patch
+ ./incorrect-optimization.patch
+ ];
+
+ buildInputs = [
+ db62 xercesc xqilla
+ ];
+
+ configureFlags = [
+ "--with-berkeleydb=${db62.out}"
+ "--with-xerces=${xercesc}"
+ "--with-xqilla=${xqilla}"
+ ];
+
+ preConfigure = ''
+ cd dbxml
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://www.oracle.com/database/berkeley-db/xml.html;
+ description = "Embeddable XML database based on Berkeley DB";
+ license = licenses.agpl3;
+ maintainers = with maintainers; [ danieldk ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/development/libraries/dbxml/incorrect-optimization.patch b/pkgs/development/libraries/dbxml/incorrect-optimization.patch
new file mode 100644
index 00000000000..630dc972e18
--- /dev/null
+++ b/pkgs/development/libraries/dbxml/incorrect-optimization.patch
@@ -0,0 +1,34 @@
+Patch provided by Lauren Foutz. See:
+https://community.oracle.com/thread/4093422
+
+--- dbxml-6.1.4-orig/dbxml/src/dbxml/query/ParentOfChildJoinQP.cpp
++++ dbxml-6.1.4/dbxml/src/dbxml/query/ParentOfChildJoinQP.cpp
+@@ -139,28 +139,16 @@ bool ParentOfChildIterator::doJoin(Dynam
+
+ // Invarient 4: When ancestorStack_ is empty we can output the
+ // buffered results_, since any more results will come after them in
+ // document order.
+
+ while(true) {
+ context->testInterrupt();
+
+- /*
+- * If current parent's node level already be larger than
+- * childen's, abandon current parent and move to next one.
+- */
+- if (parents_ != NULL &&
+- parents_->getNodeLevel() > children_->getNodeLevel()) {
+- if(!parents_->next(context)) {
+- delete parents_;
+- parents_ = 0;
+- }
+- }
+-
+ int cmp = parents_ == 0 ? -1 : isDescendantOf(children_, parents_, /*orSelf*/false);
+ if(cmp < 0) {
+ if(!ancestorStack_.empty()) {
+ // We've found the closest ancestor - is it a parent?
+ if(ancestorStack_.back()->getNodeLevel() == (children_->getNodeLevel() - 1)) {
+ // Maintain invarient 3
+ if(results_.empty() || NodeInfo::compare(results_.back(), ancestorStack_.back()) < 0)
+ results_.push_back(ancestorStack_.back());
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index 34c649022cf..e8e177de06a 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -77,6 +77,7 @@
#, libiec61883 ? null, libavc1394 ? null # iec61883 (also uses libraw1394)
#, libmfx ? null # Hardware acceleration vis libmfx
, libmodplug ? null # ModPlug support
+, libmysofa ? null # HRTF support via SOFAlizer
#, libnut ? null # NUT (de)muxer, native (de)muser exists
, libogg ? null # Ogg container used by vorbis & theora
, libopus ? null # Opus de/encoder
@@ -344,6 +345,7 @@ stdenv.mkDerivation rec {
#(enableFeature (if isLinux then libiec61883 != null && libavc1394 != null && libraw1394 != null else false) "libiec61883")
#(enableFeature (libmfx != null) "libmfx")
(enableFeature (libmodplug != null) "libmodplug")
+ (enableFeature (libmysofa != null) "libmysofa")
#(enableFeature (libnut != null) "libnut")
(enableFeature (libopus != null) "libopus")
(enableFeature (libssh != null) "libssh")
@@ -405,7 +407,7 @@ stdenv.mkDerivation rec {
buildInputs = [
bzip2 celt fontconfig freetype frei0r fribidi game-music-emu gnutls gsm
- libjack2 ladspaH lame libass libbluray libbs2b libcaca libdc1394 libmodplug
+ libjack2 ladspaH lame libass libbluray libbs2b libcaca libdc1394 libmodplug libmysofa
libogg libopus libssh libtheora libvdpau libvorbis libvpx libwebp libX11
libxcb libXv lzma openal openjpeg libpulseaudio rtmpdump opencore-amr
samba SDL2 soxr speex vid-stab vo-amrwbenc wavpack x264 x265 xavs xvidcore
diff --git a/pkgs/development/libraries/gcc/libgcc/default.nix b/pkgs/development/libraries/gcc/libgcc/default.nix
new file mode 100644
index 00000000000..0a29ab6927f
--- /dev/null
+++ b/pkgs/development/libraries/gcc/libgcc/default.nix
@@ -0,0 +1,152 @@
+{ stdenvNoLibs, buildPackages, buildPlatform, hostPlatform
+, gcc, glibc
+, libiberty
+}:
+
+stdenvNoLibs.mkDerivation rec {
+ name = "libgcc-${version}";
+ inherit (gcc.cc) src version;
+
+ outputs = [ "out" "dev" ];
+
+ strictDeps = true;
+ depsBuildBuild = [ buildPackages.stdenv.cc ];
+ nativeBuildInputs = [ libiberty ];
+
+ postUnpack = ''
+ mkdir -p ./build
+ buildRoot=$(readlink -e "./build")
+ '';
+
+ postPatch = ''
+ sourceRoot=$(readlink -e "./libgcc")
+ '';
+
+ preConfigure = ''
+ cd "$buildRoot"
+ ''
+
+ # Drop in libiberty, as external builds are not expected
+ + ''
+ (
+ mkdir -p build-${buildPlatform.config}/libiberty/
+ cd build-${buildPlatform.config}/libiberty/
+ ln -s ${buildPackages.libiberty}/lib/libiberty.a ./
+ )
+ ''
+ # A few misc bits of gcc need to be built.
+ #
+ # - We "shift" the tools over to fake platforms perspective from the previous
+ # stage.
+ #
+ # - We define GENERATOR_FILE so nothing bothers looking for GNU GMP.
+ #
+ # - We remove the `libgcc.mvar` deps so that the bootstrap xgcc isn't built.
+ + ''
+ mkdir -p "$buildRoot/gcc"
+ cd "$buildRoot/gcc"
+ (
+ export AS_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$AS_FOR_BUILD
+ export CC_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CC_FOR_BUILD
+ export CPP_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CPP_FOR_BUILD
+ export CXX_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CXX_FOR_BUILD
+ export LD_FOR_BUILD=${buildPackages.stdenv.cc.bintools}/bin/$LD_FOR_BUILD
+
+ export AS=$AS_FOR_BUILD
+ export CC=$CC_FOR_BUILD
+ export CPP=$CPP_FOR_BUILD
+ export CXX=$CXX_FOR_BUILD
+ export LD=$LD_FOR_BUILD
+
+ export AS_FOR_TARGET=${stdenvNoLibs.cc}/bin/$AS
+ export CC_FOR_TARGET=${stdenvNoLibs.cc}/bin/$CC
+ export CPP_FOR_TARGET=${stdenvNoLibs.cc}/bin/$CPP
+ export LD_FOR_TARGET=${stdenvNoLibs.cc.bintools}/bin/$LD
+
+ export NIX_BUILD_CFLAGS_COMPILE+=' -DGENERATOR_FILE=1'
+
+ "$sourceRoot/../gcc/configure" $gccConfigureFlags
+
+ sed -e 's,libgcc.mvars:.*$,libgcc.mvars:,' -i Makefile
+
+ make \
+ config.h \
+ libgcc.mvars \
+ tconfig.h \
+ tm.h \
+ options.h \
+ insn-constants.h \
+ insn-modes.h \
+ gcov-iov.h
+ )
+ mkdir -p "$buildRoot/gcc/include"
+ ''
+ # Preparing to configure + build libgcc itself
+ + ''
+ mkdir -p "$buildRoot/gcc/${hostPlatform.config}/libgcc"
+ cd "$buildRoot/gcc/${hostPlatform.config}/libgcc"
+ configureScript=$sourceRoot/configure
+ chmod +x "$configureScript"
+
+ export AS_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$AS_FOR_BUILD
+ export CC_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CC_FOR_BUILD
+ export CPP_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CPP_FOR_BUILD
+ export CXX_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CXX_FOR_BUILD
+ export LD_FOR_BUILD=${buildPackages.stdenv.cc.bintools}/bin/$LD_FOR_BUILD
+
+ export AS=${stdenvNoLibs.cc}/bin/$AS
+ export CC=${stdenvNoLibs.cc}/bin/$CC
+ export CPP=${stdenvNoLibs.cc}/bin/$CPP
+ export CXX=${stdenvNoLibs.cc}/bin/$CXX
+ export LD=${stdenvNoLibs.cc.bintools}/bin/$LD
+
+ export AS_FOR_TARGET=${stdenvNoLibs.cc}/bin/$AS_FOR_TARGET
+ export CC_FOR_TARGET=${stdenvNoLibs.cc}/bin/$CC_FOR_TARGET
+ export CPP_FOR_TARGET=${stdenvNoLibs.cc}/bin/$CPP_FOR_TARGET
+ export LD_FOR_TARGET=${stdenvNoLibs.cc.bintools}/bin/$LD_FOR_TARGET
+ '';
+
+ gccConfigureFlags = [
+ "--build=${buildPlatform.config}"
+ "--host=${buildPlatform.config}"
+ "--target=${hostPlatform.config}"
+
+ "--disable-bootstrap"
+ "--disable-multilib" "--with-multilib-list="
+ "--enable-languages=c"
+
+ "--disable-fixincludes"
+ "--disable-intl"
+ "--disable-lto"
+ "--disable-libatomic"
+ "--disable-libbacktrace"
+ "--disable-libcpp"
+ "--disable-libssp"
+ "--disable-libquadmath"
+ "--disable-libgomp"
+ "--disable-libvtv"
+ "--disable-vtable-verify"
+
+ "--with-system-zlib"
+ ] ++ stdenvNoLibs.lib.optional (hostPlatform.libc == "glibc")
+ "--with-glibc-version=${glibc.version}";
+
+ configurePlatforms = [ "build" "host" ];
+ configureFlags = [
+ "--disable-dependency-tracking"
+ # $CC cannot link binaries, let alone run then
+ "cross_compiling=true"
+ # Do not have dynamic linker without libc
+ "--enable-static"
+ "--disable-shared"
+ ];
+
+ makeFlags = [ "MULTIBUILDTOP:=../" ];
+
+ postInstall = ''
+ moveToOutput "lib/gcc/${hostPlatform.config}/${version}/include" "$dev"
+ mkdir -p "$out/lib" "$dev/include"
+ ln -s "$out/lib/gcc/${hostPlatform.config}/${version}"/* "$out/lib"
+ ln -s "$dev/lib/gcc/${hostPlatform.config}/${version}/include"/* "$dev/include/"
+ '';
+}
diff --git a/pkgs/development/libraries/libstdc++5/default.nix b/pkgs/development/libraries/gcc/libstdc++/5.nix
similarity index 100%
rename from pkgs/development/libraries/libstdc++5/default.nix
rename to pkgs/development/libraries/gcc/libstdc++/5.nix
diff --git a/pkgs/development/libraries/libstdc++5/no-sys-dirs.patch b/pkgs/development/libraries/gcc/libstdc++/no-sys-dirs.patch
similarity index 100%
rename from pkgs/development/libraries/libstdc++5/no-sys-dirs.patch
rename to pkgs/development/libraries/gcc/libstdc++/no-sys-dirs.patch
diff --git a/pkgs/development/libraries/libstdc++5/struct-ucontext.patch b/pkgs/development/libraries/gcc/libstdc++/struct-ucontext.patch
similarity index 100%
rename from pkgs/development/libraries/libstdc++5/struct-ucontext.patch
rename to pkgs/development/libraries/gcc/libstdc++/struct-ucontext.patch
diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix
index a86cf9b935c..367f1c9aadd 100644
--- a/pkgs/development/libraries/libfilezilla/default.nix
+++ b/pkgs/development/libraries/libfilezilla/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "libfilezilla-${version}";
- version = "0.12.3";
+ version = "0.13.0";
src = fetchurl {
url = "http://download.filezilla-project.org/libfilezilla/${name}.tar.bz2";
- sha256 = "1v606kcz2rdmmlwxrv3xvwh7ia1nh6jfc9bhjw2r4ai3rm16gch5";
+ sha256 = "0sk8kz2zrvf7kp9jrp3l4rpipv4xh0hg8d4h734xyag7vd03rjpz";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/libtensorflow/default.nix b/pkgs/development/libraries/libtensorflow/default.nix
index fce15b121b4..c8b299034fc 100644
--- a/pkgs/development/libraries/libtensorflow/default.nix
+++ b/pkgs/development/libraries/libtensorflow/default.nix
@@ -1,11 +1,50 @@
-{ stdenv, fetchurl, patchelf }:
-stdenv.mkDerivation rec {
+{ stdenv
+, fetchurl
+, patchelf
+, cudaSupport ? false, symlinkJoin, cudatoolkit, cudnn, nvidia_x11
+}:
+with stdenv.lib;
+let
+ tfType = if cudaSupport then "gpu" else "cpu";
+ system =
+ if stdenv.isx86_64
+ then if stdenv.isLinux then "linux-x86_64"
+ else if stdenv.isDarwin then "darwin-x86_64" else unavailable
+ else unavailable;
+ unavailable = throw "libtensorflow is not available for this platform!";
+ cudatoolkit_joined = symlinkJoin {
+ name = "unsplit_cudatoolkit";
+ paths = [ cudatoolkit.out
+ cudatoolkit.lib ];};
+ rpath = makeLibraryPath ([stdenv.cc.libc stdenv.cc.cc.lib] ++
+ optionals cudaSupport [ cudatoolkit_joined cudnn nvidia_x11 ]);
+ patchLibs =
+ if stdenv.isDarwin
+ then ''
+ install_name_tool -id $out/lib/libtensorflow.so $out/lib/libtensorflow.so
+ install_name_tool -id $out/lib/libtensorflow_framework.so $out/lib/libtensorflow_framework.so
+ ''
+ else ''
+ ${patchelf}/bin/patchelf --set-rpath "${rpath}:$out/lib" $out/lib/libtensorflow.so
+ ${patchelf}/bin/patchelf --set-rpath "${rpath}" $out/lib/libtensorflow_framework.so
+ '';
+
+in stdenv.mkDerivation rec {
pname = "libtensorflow";
version = "1.8.0";
name = "${pname}-${version}";
src = fetchurl {
- url = "https://storage.googleapis.com/tensorflow/${pname}/${pname}-cpu-linux-x86_64-${version}.tar.gz";
- sha256 = "0qzy15rc3x961cyi3bqnygrcnw4x69r28xkwhpwrv1r0gi6k73ha";
+ url = "https://storage.googleapis.com/tensorflow/${pname}/${pname}-${tfType}-${system}-${version}.tar.gz";
+ sha256 =
+ if system == "linux-x86_64" then
+ if cudaSupport
+ then "0m1g4sqr9as0jgfx7wlyay2nkad6wgvsyk2gvhfkqkq5sm1vbx85"
+ else "0qzy15rc3x961cyi3bqnygrcnw4x69r28xkwhpwrv1r0gi6k73ha"
+ else if system == "darwin-x86_64" then
+ if cudaSupport
+ then unavailable
+ else "0q8lmyj8l50hl6l48c640ixanvhqf2836bicyl9p2x8sj97b7y8l"
+ else unavailable;
};
# Patch library to use our libc, libstdc++ and others
@@ -15,18 +54,16 @@ stdenv.mkDerivation rec {
tar -C $out -xzf $src
chmod +w $out/lib/libtensorflow.so
chmod +w $out/lib/libtensorflow_framework.so
- ${patchelf}/bin/patchelf --set-rpath "${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib:$out/lib" $out/lib/libtensorflow.so
- ${patchelf}/bin/patchelf --set-rpath "${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/lib/libtensorflow_framework.so
+ ${patchLibs}
chmod -w $out/lib/libtensorflow.so
chmod -w $out/lib/libtensorflow_framework.so
'';
- meta = with stdenv.lib; {
- inherit version;
+ meta = {
description = "C API for TensorFlow";
- license = licenses.asl20;
- maintainers = [maintainers.basvandijk];
- platforms = platforms.linux;
homepage = https://www.tensorflow.org/versions/master/install/install_c;
+ license = licenses.asl20;
+ platforms = with platforms; linux ++ darwin;
+ maintainers = [maintainers.basvandijk];
};
}
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index b28f241d56e..aa78d0d33c0 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -1,9 +1,10 @@
{ stdenv, lib, fetchurl
-, zlib, xz, python2, findXMLCatalogs, libiconv
+, zlib, xz, python2, findXMLCatalogs
, buildPlatform, hostPlatform
, pythonSupport ? buildPlatform == hostPlatform
, icuSupport ? false, icu ? null
-, enableStatic ? false
+, enableShared ? hostPlatform.libc != "msvcrt"
+, enableStatic ? !enableShared,
}:
let
@@ -35,22 +36,14 @@ in stdenv.mkDerivation rec {
lib.optional pythonSupport "--with-python=${python}"
++ lib.optional icuSupport "--with-icu"
++ [ "--exec_prefix=$dev" ]
- ++ lib.optional enableStatic "--enable-static";
+ ++ lib.optional enableStatic "--enable-static"
+ ++ lib.optional (!enableShared) "--disable-shared";
enableParallelBuilding = true;
doCheck = (stdenv.hostPlatform == stdenv.buildPlatform) && !stdenv.isDarwin &&
hostPlatform.libc != "musl";
- crossAttrs = lib.optionalAttrs (hostPlatform.libc == "msvcrt") {
- # creating the DLL is broken ATM
- dontDisableStatic = true;
- configureFlags = configureFlags ++ [ "--disable-shared" ];
-
- # libiconv is a header dependency - propagating is enough
- propagatedBuildInputs = [ findXMLCatalogs libiconv ];
- };
-
preInstall = lib.optionalString pythonSupport
''substituteInPlace python/libxml2mod.la --replace "${python}" "$py"'';
installFlags = lib.optionalString pythonSupport
diff --git a/pkgs/development/libraries/newt/default.nix b/pkgs/development/libraries/newt/default.nix
index cd1e51bd19c..a10f52462a8 100644
--- a/pkgs/development/libraries/newt/default.nix
+++ b/pkgs/development/libraries/newt/default.nix
@@ -22,9 +22,10 @@ stdenv.mkDerivation rec {
unset CPP
'';
- crossAttrs = {
- makeFlags = "CROSS_COMPILE=${stdenv.cc.targetPrefix}";
- };
+ # Use `lib.optionalString` next mass rebuild.
+ makeFlags = if stdenv.buildPlatform == stdenv.hostPlatform
+ then null
+ else "CROSS_COMPILE=${stdenv.cc.targetPrefix}";
meta = with stdenv.lib; {
homepage = https://fedorahosted.org/newt/;
diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix
index 59cc9438a9f..0e9ff5d9105 100644
--- a/pkgs/development/libraries/nlohmann_json/default.nix
+++ b/pkgs/development/libraries/nlohmann_json/default.nix
@@ -15,17 +15,16 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
- doCheck = true;
+ doCheck = stdenv.buildPlatform == stdenv.hostPlatform;
checkTarget = "test";
enableParallelBuilding = true;
- crossAttrs = {
- cmakeFlags = "-DBuildTests=OFF";
- doCheck = false;
- } // stdenv.lib.optionalAttrs (hostPlatform.libc == "msvcrt") {
- cmakeFlags = "-DBuildTests=OFF -DCMAKE_SYSTEM_NAME=Windows";
- };
+ cmakeFlags = [
+ "-DBuildTests=${if doCheck then "ON" else "OFF"}"
+ ] ++ stdenv.lib.optionals (hostPlatform.libc == "msvcrt") [
+ "-DCMAKE_SYSTEM_NAME=Windows"
+ ];
meta = with stdenv.lib; {
description = "Header only C++ library for the JSON file format";
diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix
index 59f674789e4..9fb2e0b7fed 100644
--- a/pkgs/development/libraries/pcl/default.nix
+++ b/pkgs/development/libraries/pcl/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchFromGitHub, cmake, qhull, flann, boost, vtk, eigen, pkgconfig, qtbase
+{ stdenv, fetchFromGitHub, fetchpatch, cmake
+, qhull, flann, boost, vtk, eigen, pkgconfig, qtbase
, libusb1, libpcap, libXt, libpng, Cocoa, AGL, cf-private, OpenGL
}:
@@ -12,6 +13,14 @@ stdenv.mkDerivation rec {
sha256 = "05wvqqi2fyk5innw4mg356r71c1hmc9alc7xkf4g81ds3b3867xq";
};
+ patches = [
+ # boost-1.67 compatibility
+ (fetchpatch {
+ url = "https://github.com/PointCloudLibrary/pcl/commit/2309bdab20fb2a385d374db6a87349199279db18.patch";
+ sha256 = "112p4687xrm0vsm0magmkvsm1hpks9hj42fm0lncy3yy2j1v3r4h";
+ name = "boost167-random.patch";
+ })];
+
enableParallelBuilding = true;
nativeBuildInputs = [ pkgconfig cmake ];
diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix
index 01d0fc510aa..471f11ad107 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -1,5 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, substituteAll
-, hostPlatform
+{ stdenv, lib, fetchurl, fetchpatch, substituteAll
, libXrender, libXinerama, libXcursor, libXv, libXext
, libXfixes, libXrandr, libSM, freetype, fontconfig, zlib, libjpeg, libpng
, libmng, which, libGLSupported, libGLU, openssl, dbus, cups, pkgconfig
@@ -17,8 +16,6 @@
, cf-private, libobjc, ApplicationServices, OpenGL, Cocoa, AGL, libcxx
}:
-with stdenv.lib;
-
let
v_maj = "4.8";
v_min = "7";
@@ -51,12 +48,12 @@ stdenv.mkDerivation rec {
substituteInPlace configure --replace /bin/pwd pwd
substituteInPlace src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls
sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i mkspecs/*/*.conf
- '' + stdenv.lib.optionalString stdenv.isDarwin ''
+ '' + lib.optionalString stdenv.isDarwin ''
# remove impure reference to /usr/lib/libstdc++.6.dylib
# there might be more references, but this is the only one I could find
substituteInPlace tools/macdeployqt/tests/tst_deployment_mac.cpp \
--replace /usr/lib/libstdc++.6.dylib "${stdenv.cc}/lib/libstdc++.6.dylib"
- '' + stdenv.lib.optionalString stdenv.cc.isClang ''
+ '' + lib.optionalString stdenv.cc.isClang ''
substituteInPlace src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp \
--replace 'optionalHeight > 0' 'optionalHeight != NULL'
@@ -65,14 +62,15 @@ stdenv.mkDerivation rec {
'';
patches =
- [ ./glib-2.32.patch
+ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [
+ ./glib-2.32.patch
./libressl.patch
./parallel-configure.patch
./clang-5-darwin.patch
./qt-4.8.7-unixmake-darwin.patch
(substituteAll {
src = ./dlopen-absolute-paths.diff;
- cups = if cups != null then stdenv.lib.getLib cups else null;
+ cups = if cups != null then lib.getLib cups else null;
icu = icu.out;
libXfixes = libXfixes.out;
glibc = stdenv.cc.libc.out;
@@ -89,25 +87,25 @@ stdenv.mkDerivation rec {
sha256 = "07lrva7bjh6i40p7b3ml26a2jlznri8bh7y7iyx5zmvb1gfxmj34";
})
]
- ++ stdenv.lib.optional gtkStyle (substituteAll ({
+ ++ lib.optional gtkStyle (substituteAll ({
src = ./dlopen-gtkstyle.diff;
# substituteAll ignores env vars starting with capital letter
gtk = gtk2.out;
- } // stdenv.lib.optionalAttrs gnomeStyle {
+ } // lib.optionalAttrs gnomeStyle {
gconf = GConf.out;
libgnomeui = libgnomeui.out;
gnome_vfs = gnome_vfs.out;
}))
- ++ stdenv.lib.optional flashplayerFix (substituteAll {
+ ++ lib.optional flashplayerFix (substituteAll {
src = ./dlopen-webkit-nsplugin.diff;
gtk = gtk2.out;
gdk_pixbuf = gdk_pixbuf.out;
})
- ++ stdenv.lib.optional stdenv.isAarch64 (fetchpatch {
+ ++ lib.optional stdenv.isAarch64 (fetchpatch {
url = "https://src.fedoraproject.org/rpms/qt/raw/ecf530486e0fb7fe31bad26805cde61115562b2b/f/qt-aarch64.patch";
sha256 = "1fbjh78nmafqmj7yk67qwjbhl3f6ylkp6x33b1dqxfw9gld8b3gl";
})
- ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [
+ ++ lib.optionals stdenv.hostPlatform.isMusl [
./qt-musl.patch
./qt-musl-iconv-no-bom.patch
./patch-qthread-stacksize.diff
@@ -127,15 +125,27 @@ stdenv.mkDerivation rec {
--jobs=$NIX_BUILD_CORES
"
unset LD # Makefile uses gcc for linking; setting LD interferes
- '' + optionalString stdenv.cc.isClang ''
+ '' + lib.optionalString stdenv.cc.isClang ''
sed -i 's/QMAKE_CC = gcc/QMAKE_CC = clang/' mkspecs/common/g++-base.conf
sed -i 's/QMAKE_CXX = g++/QMAKE_CXX = clang++/' mkspecs/common/g++-base.conf
+ '' + lib.optionalString stdenv.hostPlatform.isWindows ''
+ sed -i -e 's/ g++/ ${stdenv.cc.targetPrefix}g++/' \
+ -e 's/ gcc/ ${stdenv.cc.targetPrefix}gcc/' \
+ -e 's/ ar/ ${stdenv.cc.targetPrefix}ar/' \
+ -e 's/ strip/ ${stdenv.cc.targetPrefix}strip/' \
+ -e 's/ windres/ ${stdenv.cc.targetPrefix}windres/' \
+ mkspecs/win32-g++/qmake.conf
'';
prefixKey = "-prefix ";
- configureFlags =
- ''
+ ${if stdenv.hostPlatform == stdenv.buildPlatform then null else "configurePlatforms"} = [];
+ configureFlags = let
+ platformFlag =
+ if stdenv.hostPlatform != stdenv.buildPlatform
+ then "-xplatform"
+ else "-platform";
+ in (if stdenv.hostPlatform == stdenv.buildPlatform then ''
-v -no-separate-debug-info -release -fast -confirm-license -opensource
-${if stdenv.isFreeBSD then "no-" else ""}opengl -xrender -xrandr -xinerama -xcursor -xinput -xfixes -fontconfig
@@ -152,23 +162,30 @@ stdenv.mkDerivation rec {
-no-phonon ${if buildWebkit then "" else "-no"}-webkit ${if buildMultimedia then "" else "-no"}-multimedia -audio-backend
${if developerBuild then "-developer-build" else ""}
- '' + optionalString stdenv.isDarwin "-platform unsupported/macx-clang-libc++";
+ '' else ''
+ -static -release -confirm-license -opensource
+ -no-opengl -no-phonon
+ -no-svg
+ -make qmake -make libs -nomake tools
+ -nomake demos -nomake examples -nomake docs
+ '') + lib.optionalString stdenv.hostPlatform.isDarwin "${platformFlag} unsupported/macx-clang-libc++"
+ + lib.optionalString stdenv.hostPlatform.isMinGW "${platformFlag} win32-g++-4.6";
propagatedBuildInputs =
[ libXrender libXrandr libXinerama libXcursor libXext libXfixes libXv libXi
libSM zlib libpng openssl dbus freetype fontconfig glib ]
# Qt doesn't directly need GLU (just GL), but many apps use, it's small and doesn't remain a runtime-dep if not used
- ++ optional libGLSupported libGLU
- ++ optional ((buildWebkit || buildMultimedia) && stdenv.isLinux ) alsaLib
- ++ optionals (buildWebkit || buildMultimedia) [ gstreamer gst-plugins-base ];
+ ++ lib.optional libGLSupported libGLU
+ ++ lib.optional ((buildWebkit || buildMultimedia) && stdenv.isLinux ) alsaLib
+ ++ lib.optionals (buildWebkit || buildMultimedia) [ gstreamer gst-plugins-base ];
# The following libraries are only used in plugins
buildInputs =
[ cups # Qt dlopen's libcups instead of linking to it
postgresql sqlite libjpeg libmng libtiff icu ]
- ++ optionals (mysql != null) [ mysql.connector-c ]
- ++ optionals gtkStyle [ gtk2 gdk_pixbuf ]
- ++ optionals stdenv.isDarwin [ cf-private ApplicationServices OpenGL Cocoa AGL libcxx libobjc ];
+ ++ lib.optionals (mysql != null) [ mysql.connector-c ]
+ ++ lib.optionals gtkStyle [ gtk2 gdk_pixbuf ]
+ ++ lib.optionals stdenv.isDarwin [ cf-private ApplicationServices OpenGL Cocoa AGL libcxx libobjc ];
nativeBuildInputs = [ perl pkgconfig which ];
@@ -177,14 +194,14 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE =
# with gcc7 the warnings blow the log over Hydra's limit
[ "-Wno-expansion-to-defined" "-Wno-unused-local-typedefs" ]
- ++ optional stdenv.isLinux "-std=gnu++98" # gnu++ in (Obj)C flags is no good on Darwin
- ++ optionals (stdenv.isFreeBSD || stdenv.isDarwin)
+ ++ lib.optional stdenv.isLinux "-std=gnu++98" # gnu++ in (Obj)C flags is no good on Darwin
+ ++ lib.optionals (stdenv.isFreeBSD || stdenv.isDarwin)
[ "-I${glib.dev}/include/glib-2.0" "-I${glib.out}/lib/glib-2.0/include" ]
- ++ optional stdenv.isDarwin "-I${libcxx}/include/c++/v1";
+ ++ lib.optional stdenv.isDarwin "-I${libcxx}/include/c++/v1";
- NIX_LDFLAGS = optionalString (stdenv.isFreeBSD || stdenv.isDarwin) "-lglib-2.0";
+ NIX_LDFLAGS = lib.optionalString (stdenv.isFreeBSD || stdenv.isDarwin) "-lglib-2.0";
- preBuild = optionalString stdenv.isDarwin ''
+ preBuild = lib.optionalString stdenv.isDarwin ''
# resolve "extra qualification on member" error
sed -i 's/struct ::TabletProximityRec;/struct TabletProximityRec;/' \
src/gui/kernel/qt_cocoa_helpers_mac_p.h
@@ -196,44 +213,19 @@ stdenv.mkDerivation rec {
postInstall = ''
rm -rf $out/tests
+ ''
+ # I don't know why it does not install qmake
+ + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+ cp bin/qmake* $out/bin
'';
- crossAttrs = {
- # I've not tried any case other than i686-pc-mingw32.
- # -nomake tools: it fails linking some asian language symbols
- # -no-svg: it fails to build on mingw64
- configureFlags = ''
- -static -release -confirm-license -opensource
- -no-opengl -no-phonon
- -no-svg
- -make qmake -make libs -nomake tools
- -nomake demos -nomake examples -nomake docs
- '' + optionalString hostPlatform.isMinGW " -xplatform win32-g++-4.6";
- patches = [];
- preConfigure = ''
- sed -i -e 's/ g++/ ${stdenv.cc.targetPrefix}g++/' \
- -e 's/ gcc/ ${stdenv.cc.targetPrefix}gcc/' \
- -e 's/ ar/ ${stdenv.cc.targetPrefix}ar/' \
- -e 's/ strip/ ${stdenv.cc.targetPrefix}strip/' \
- -e 's/ windres/ ${stdenv.cc.targetPrefix}windres/' \
- mkspecs/win32-g++/qmake.conf
- '';
-
- # I don't know why it does not install qmake
- postInstall = ''
- cp bin/qmake* $out/bin
- '';
- configurePlatforms = [];
- dontStrip = true;
- } // optionalAttrs hostPlatform.isMinGW {
- propagatedBuildInputs = [ ];
- };
+ dontStrip = if stdenv.hostPlatform == stdenv.buildPlatform then null else true;
meta = {
homepage = http://qt-project.org/;
description = "A cross-platform application framework for C++";
- license = licenses.lgpl21Plus; # or gpl3
- maintainers = with maintainers; [ orivej lovek323 phreedom sander ];
- platforms = platforms.unix;
+ license = lib.licenses.lgpl21Plus; # or gpl3
+ maintainers = with lib.maintainers; [ orivej lovek323 phreedom sander ];
+ platforms = lib.platforms.unix;
};
}
diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix
index 29cc477a279..6fe88fd7cea 100644
--- a/pkgs/development/libraries/skalibs/default.nix
+++ b/pkgs/development/libraries/skalibs/default.nix
@@ -14,15 +14,18 @@ in stdenv.mkDerivation rec {
sha256 = "0skdv3wff1i78hb0y771apw0cak5rzxbwbh6l922snfm01z9k1ws";
};
+ outputs = [ "lib" "dev" "doc" "out" ];
+
dontDisableStatic = true;
enableParallelBuilding = true;
configureFlags = [
"--enable-force-devr" # assume /dev/random works
- "--libdir=\${prefix}/lib"
- "--includedir=\${prefix}/include"
- "--sysdepdir=\${prefix}/lib/skalibs/sysdeps"
+ "--libdir=\${lib}/lib"
+ "--dynlibdir=\${lib}/lib"
+ "--includedir=\${dev}/include"
+ "--sysdepdir=\${lib}/lib/skalibs/sysdeps"
]
++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ])
# On darwin, the target triplet from -dumpmachine includes version number, but
@@ -32,12 +35,17 @@ in stdenv.mkDerivation rec {
# http://www.skarnet.org/cgi-bin/archive.cgi?1:mss:623:heiodchokfjdkonfhdph
++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}");
+ postInstall = ''
+ mkdir -p $doc/share/doc/skalibs
+ mv doc $doc/share/doc/skalibs/html
+ '';
+
meta = {
homepage = http://skarnet.org/software/skalibs/;
description = "A set of general-purpose C programming libraries";
platforms = stdenv.lib.platforms.all;
license = stdenv.lib.licenses.isc;
- maintainers = with stdenv.lib.maintainers; [ pmahoney ];
+ maintainers = with stdenv.lib.maintainers; [ pmahoney Profpatsch ];
};
}
diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix
index 333a37ba85d..79bebd87dbc 100644
--- a/pkgs/development/libraries/zeromq/4.x.nix
+++ b/pkgs/development/libraries/zeromq/4.x.nix
@@ -2,23 +2,19 @@
stdenv.mkDerivation rec {
name = "zeromq-${version}";
- version = "4.2.3";
+ version = "4.2.5";
src = fetchFromGitHub {
owner = "zeromq";
repo = "libzmq";
rev = "v${version}";
- sha256 = "1yadf4vz4m49lpwwwscxs6wf4v9dgqgxkwgwpby9lvb4pv8qbmaf";
+ sha256 = "18mjmbhvfhr4463dqayl5hdjfy5rx7na1xsq9dsvlaz9qlr5fskw";
};
nativeBuildInputs = [ cmake asciidoc ];
enableParallelBuilding = true;
- postPatch = ''
- sed -i 's,''${PACKAGE_PREFIX_DIR}/,,g' ZeroMQConfig.cmake.in
- '';
-
doCheck = false; # fails all the tests (ctest)
meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/Flask-PyMongo/default.nix b/pkgs/development/python-modules/Flask-PyMongo/default.nix
index 55b059cd7fa..6a14607ad27 100644
--- a/pkgs/development/python-modules/Flask-PyMongo/default.nix
+++ b/pkgs/development/python-modules/Flask-PyMongo/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "Flask-PyMongo";
- version = "0.5.2";
+ version = "2.0.1";
src = fetchPypi {
inherit pname version;
- sha256 = "aab5ddab8f443e8a011e024f618bb89e078bdcc2274597079469fdf5ddc032b5";
+ sha256 = "6a02add52ac245064720c2bb8b02074b9a5a0d9498279510ea2a537512fd3fa5";
};
checkInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/GitPython/default.nix b/pkgs/development/python-modules/GitPython/default.nix
index 89b941c34fc..aef59ba2ab9 100644
--- a/pkgs/development/python-modules/GitPython/default.nix
+++ b/pkgs/development/python-modules/GitPython/default.nix
@@ -1,12 +1,12 @@
{ lib, buildPythonPackage, fetchPypi, git, gitdb2, mock, nose, ddt }:
buildPythonPackage rec {
- version = "2.1.9";
+ version = "2.1.11";
pname = "GitPython";
src = fetchPypi {
inherit pname version;
- sha256 = "0a9in1jfv9ssxhckl6sasw45bhm762y2r5ikgb2pk2g8yqdc6z64";
+ sha256 = "8237dc5bfd6f1366abeee5624111b9d6879393d84745a507de0fda86043b65a8";
};
checkInputs = [ mock nose ddt ];
diff --git a/pkgs/development/python-modules/JPype1/default.nix b/pkgs/development/python-modules/JPype1/default.nix
index 879cdb9bd09..d449ae8bbf6 100644
--- a/pkgs/development/python-modules/JPype1/default.nix
+++ b/pkgs/development/python-modules/JPype1/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, fetchPypi, isPy3k }:
+{ buildPythonPackage, fetchPypi, isPy3k, pytest }:
buildPythonPackage rec {
pname = "JPype1";
@@ -11,8 +11,10 @@ buildPythonPackage rec {
patches = [ ./set-compiler-language.patch ];
- # Test loader complains about non-test module on python3.
- doCheck = !isPy3k;
+ checkInputs = [ pytest ];
+
+ # ImportError: Failed to import test module: test.testlucene
+ doCheck = false;
meta = {
homepage = "https://github.com/originell/jpype/";
diff --git a/pkgs/development/python-modules/WSME/default.nix b/pkgs/development/python-modules/WSME/default.nix
index 8cbbd2c767f..adad2051292 100644
--- a/pkgs/development/python-modules/WSME/default.nix
+++ b/pkgs/development/python-modules/WSME/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "WSME";
- version = "0.9.2";
+ version = "0.9.3";
src = fetchPypi {
inherit pname version;
- sha256 = "e790ac755a7e36eaa796d3966d3878677896dbc7d1c2685cb85c06b744c21976";
+ sha256 = "e24fcff24392a0b176e560ffc6591b1f658342bbc992f84e0e8a3c53fd92580a";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/adal/default.nix b/pkgs/development/python-modules/adal/default.nix
index 2f4c020eb97..ab9839a2103 100644
--- a/pkgs/development/python-modules/adal/default.nix
+++ b/pkgs/development/python-modules/adal/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "adal";
- version = "1.0.1";
+ version = "1.0.2";
src = fetchPypi {
inherit pname version;
- sha256 = "71b0e9b479320f76af4bcd268f7359580ba2e217228e83ff7529f51a9845f393";
+ sha256 = "4c020807b3f3cfd90f59203077dd5e1f59671833f8c3c5028ec029ed5072f9ce";
};
propagatedBuildInputs = [ requests pyjwt dateutil ];
diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix
index 49d0bc6c637..0f2740a90d8 100644
--- a/pkgs/development/python-modules/aioconsole/default.nix
+++ b/pkgs/development/python-modules/aioconsole/default.nix
@@ -10,11 +10,11 @@
# wrapped to be able to find aioconsole and any other packages.
buildPythonPackage rec {
pname = "aioconsole";
- version = "0.1.8";
+ version = "0.1.10";
src = fetchPypi {
inherit pname version;
- sha256 = "5d2c60c0cbf87c663ef3a0b394980ff86f56ebd3c47cc87df6c410e774216c50";
+ sha256 = "3fab07073648d70d8345e0eb745bd81fcd02b5e2b080c4663faea8c8ab281c0a";
};
# hardcodes a test dependency on an old version of pytest-asyncio
diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix
index 7becf1cffc4..cb70d3760c8 100644
--- a/pkgs/development/python-modules/alembic/default.nix
+++ b/pkgs/development/python-modules/alembic/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "alembic";
- version = "0.9.10";
+ version = "1.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1cd32df9a3b8c1749082ef60ffbe05ff16617b6afadfdabc680dcb9344af33d7";
+ sha256 = "52d73b1d750f1414fa90c25a08da47b87de1e4ad883935718a8f36396e19e78e";
};
buildInputs = [ pytest pytestcov mock coverage ];
diff --git a/pkgs/development/python-modules/apipkg/default.nix b/pkgs/development/python-modules/apipkg/default.nix
index 213bc4f1eb9..8e6fc668204 100644
--- a/pkgs/development/python-modules/apipkg/default.nix
+++ b/pkgs/development/python-modules/apipkg/default.nix
@@ -1,16 +1,17 @@
{ stdenv, buildPythonPackage, fetchPypi
-, pytest }:
+, pytest, setuptools_scm }:
buildPythonPackage rec {
pname = "apipkg";
- version = "1.4";
+ version = "1.5";
src = fetchPypi {
inherit pname version;
- sha256 = "2e38399dbe842891fe85392601aab8f40a8f4cc5a9053c326de35a1cc0297ac6";
+ sha256 = "37228cda29411948b422fae072f57e31d3396d2ee1c9783775980ee9c9990af6";
};
- buildInputs = [ pytest ];
+ buildInputs = [ setuptools_scm ];
+ checkInputs = [ pytest ];
checkPhase = ''
py.test
diff --git a/pkgs/development/python-modules/appnope/default.nix b/pkgs/development/python-modules/appnope/default.nix
new file mode 100644
index 00000000000..08f6fa529ca
--- /dev/null
+++ b/pkgs/development/python-modules/appnope/default.nix
@@ -0,0 +1,21 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "appnope";
+ version = "0.1.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "8b995ffe925347a2138d7ac0fe77155e4311a0ea6d6da4f5128fe4b3cbe5ed71";
+ };
+
+ meta = {
+ description = "Disable App Nap on macOS";
+ homepage = https://pypi.python.org/pypi/appnope;
+ platforms = lib.platforms.darwin;
+ license = lib.licenses.bsd3;
+ };
+}
\ No newline at end of file
diff --git a/pkgs/development/python-modules/arpeggio/default.nix b/pkgs/development/python-modules/arpeggio/default.nix
new file mode 100644
index 00000000000..045707aee4d
--- /dev/null
+++ b/pkgs/development/python-modules/arpeggio/default.nix
@@ -0,0 +1,24 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, glibcLocales
+}:
+
+buildPythonPackage rec {
+ pname = "Arpeggio";
+ version = "1.9.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "a5258b84f76661d558492fa87e42db634df143685a0e51802d59cae7daad8732";
+ };
+
+ # Shall not be needed for next release
+ LC_ALL = "en_US.UTF-8";
+ buildInputs = [ glibcLocales ];
+
+ meta = {
+ description = "Packrat parser interpreter";
+ license = lib.licenses.mit;
+ };
+}
diff --git a/pkgs/development/python-modules/astor/default.nix b/pkgs/development/python-modules/astor/default.nix
index 381a4a73314..687808461fe 100644
--- a/pkgs/development/python-modules/astor/default.nix
+++ b/pkgs/development/python-modules/astor/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "astor";
- version = "0.6.2";
+ version = "0.7.1";
src = fetchPypi {
inherit pname version;
- sha256 = "ff6d2e2962d834acb125cc4dcc80c54a8c17c253f4cc9d9c43b5102a560bb75d";
+ sha256 = "95c30d87a6c2cf89aa628b87398466840f0ad8652f88eb173125a6df8533fb8d";
};
# disable tests broken with python3.6: https://github.com/berkerpeksag/astor/issues/89
diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix
index a7e7931d9d9..ea087ce4f5f 100644
--- a/pkgs/development/python-modules/astroid/default.nix
+++ b/pkgs/development/python-modules/astroid/default.nix
@@ -1,32 +1,25 @@
-{ lib, fetchPypi, buildPythonPackage, python, logilab_common, six
-, lazy-object-proxy, wrapt, singledispatch, enum34, pythonOlder
-, backports_functools_lru_cache
+{ lib, fetchPypi, buildPythonPackage, pythonOlder, isPyPy
+, lazy-object-proxy, six, wrapt, typing, typed-ast
+, pytestrunner, pytest
}:
buildPythonPackage rec {
pname = "astroid";
- version = "1.6.5";
+ version = "2.0.1";
+
+ disabled = pythonOlder "3.4";
src = fetchPypi {
inherit pname version;
- sha256 = "fc9b582dba0366e63540982c3944a9230cbc6f303641c51483fa547dcc22393a";
+ sha256 = "218e36cf8d98a42f16214e8670819ce307fa707d1dcf7f9af84c7aede1febc7f";
};
- propagatedBuildInputs = [ logilab_common six lazy-object-proxy wrapt ]
- ++ lib.optionals (pythonOlder "3.4") [ enum34 singledispatch]
- ++ lib.optionals (pythonOlder "3.3") [ backports_functools_lru_cache ];
+ # From astroid/__pkginfo__.py
+ propagatedBuildInputs = [ lazy-object-proxy six wrapt ]
+ ++ lib.optional (pythonOlder "3.5") typing
+ ++ lib.optional (pythonOlder "3.7" && !isPyPy) typed-ast;
- postPatch = ''
- cd astroid/tests
- for i in $(ls unittest*); do mv -v $i test_$i; done
- cd ../..
- rm -vf astroid/tests/test_unittest_inference.py
- rm -vf astroid/tests/test_unittest_manager.py
- '';
-
- checkPhase = ''
- ${python.interpreter} -m unittest discover
- '';
+ checkInputs = [ pytestrunner pytest ];
meta = with lib; {
description = "A abstract syntax tree for Python with inference support";
diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix
index 6308b1a170f..1ac393ff2d7 100644
--- a/pkgs/development/python-modules/asyncssh/default.nix
+++ b/pkgs/development/python-modules/asyncssh/default.nix
@@ -4,12 +4,12 @@
buildPythonPackage rec {
pname = "asyncssh";
- version = "1.13.2";
+ version = "1.13.3";
disabled = pythonOlder "3.4";
src = fetchPypi {
inherit pname version;
- sha256 = "e4c07577d021c68d4c8e6d1897987424cc25b58e0726f31ff72476a34ddb6deb";
+ sha256 = "eb5b190badc5cd2a506a1b6ced3e92f948166974eef7d1abab61acc67aa379e6";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/audiotools/default.nix b/pkgs/development/python-modules/audiotools/default.nix
new file mode 100644
index 00000000000..ee029726d1c
--- /dev/null
+++ b/pkgs/development/python-modules/audiotools/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchurl
+, stdenv
+, darwin
+}:
+
+buildPythonPackage rec {
+ pname = "audiotools";
+ version = "3.1.1";
+
+ buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
+ AudioToolbox
+ AudioUnit
+ CoreServices
+ ]);
+
+ src = fetchurl {
+ url = "https://github.com/tuffy/python-audio-tools/archive/v${version}.tar.gz";
+ sha256 = "0ymlxvqkqhzk4q088qwir3dq0zgwqlrrdfnq7f0iq97g05qshm2c";
+ };
+
+ meta = {
+ description = "Utilities and Python modules for handling audio";
+ homepage = "http://audiotools.sourceforge.net/";
+ license = lib.licenses.gpl2Plus;
+ };
+}
\ No newline at end of file
diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix
new file mode 100644
index 00000000000..7e68265eed8
--- /dev/null
+++ b/pkgs/development/python-modules/av/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, nose
+, pillow
+, numpy
+, ffmpeg_2
+, git
+, libav
+, pkgconfig
+}:
+
+buildPythonPackage rec {
+ pname = "av";
+ version = "0.4.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "bf9a8d113392c6a445f424e16f9e64ac53d1db1548731e6326763d555647c24f";
+ };
+
+ buildInputs = [ nose pillow numpy ffmpeg_2 git libav pkgconfig ];
+
+ # Because of https://github.com/mikeboers/PyAV/issues/152
+ doCheck = false;
+
+ meta = {
+ description = "Pythonic bindings for FFmpeg/Libav";
+ homepage = https://github.com/mikeboers/PyAV/;
+ license = lib.licenses.bsd2;
+ };
+}
\ No newline at end of file
diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix
index d7bdd143b69..64c75b3c092 100644
--- a/pkgs/development/python-modules/aws-sam-translator/default.nix
+++ b/pkgs/development/python-modules/aws-sam-translator/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "aws-sam-translator";
- version = "1.6.0";
+ version = "1.6.1";
src = fetchPypi {
inherit pname version;
- sha256 = "1da15d459150eb631af4f400ca336901da6a564b543fe3d7a75169ca2c9f36cb";
+ sha256 = "23160f717bd65de810fa538b7c145eae4384d10adb460e375d148de7f283bd10";
};
# Tests are not included in the PyPI package
diff --git a/pkgs/development/python-modules/aws-xray-sdk/default.nix b/pkgs/development/python-modules/aws-xray-sdk/default.nix
index 9dbd20cd6ee..a16f6c7415f 100644
--- a/pkgs/development/python-modules/aws-xray-sdk/default.nix
+++ b/pkgs/development/python-modules/aws-xray-sdk/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "aws-xray-sdk";
- version = "1.1.1";
+ version = "1.1.2";
src = fetchPypi {
inherit pname version;
- sha256 = "13470b95a2f55036a5d7b6642250d8f3a519a6c454cd91f55778b1bb4bf5b89d";
+ sha256 = "8ec3c6c82e76c03799ec209ed59642d78f62218db6a430f7e2d20491cac3c5ef";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/backports_lzma/default.nix b/pkgs/development/python-modules/backports_lzma/default.nix
index a0643e82ae0..c650076d4c0 100644
--- a/pkgs/development/python-modules/backports_lzma/default.nix
+++ b/pkgs/development/python-modules/backports_lzma/default.nix
@@ -9,13 +9,13 @@
if !(pythonOlder "3.3") then null else buildPythonPackage rec {
pname = "backports.lzma";
- version = "0.0.9";
+ version = "0.0.13";
disabled = isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "9ba5d94214a79900ee297a594b8e154cd8e4a54d26eb06243c0e2f3ad5286539";
+ sha256 = "50829db66f0445442f6c796bba0ca62d1f87f54760c4682b6d1489e729a43744";
};
buildInputs = [ lzma ];
diff --git a/pkgs/development/python-modules/backports_unittest-mock/default.nix b/pkgs/development/python-modules/backports_unittest-mock/default.nix
index 2125390d671..3baaa871adf 100644
--- a/pkgs/development/python-modules/backports_unittest-mock/default.nix
+++ b/pkgs/development/python-modules/backports_unittest-mock/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "backports.unittest_mock";
- version = "1.3";
+ version = "1.4";
src = fetchPypi {
inherit pname version;
- sha256 = "0xdkx5wf5a2w2zd2pshk7z2cvbv6db64c1x6v9v1a18ja7bn9nf6";
+ sha256 = "73df9093bc7a2cc8e7018d08d6983dc5bcb2a47d7e7e107b9e8d0711f1702ef8";
};
propagatedBuildInputs = [ mock ];
diff --git a/pkgs/development/python-modules/billiard/default.nix b/pkgs/development/python-modules/billiard/default.nix
index 6b21a1492bd..42e38d0babe 100644
--- a/pkgs/development/python-modules/billiard/default.nix
+++ b/pkgs/development/python-modules/billiard/default.nix
@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "billiard";
- version = "3.5.0.3";
+ version = "3.5.0.4";
disabled = isPyPy;
src = fetchPypi {
inherit pname version;
- sha256 = "1d7b22bdc47aa52841120fcd22a74ae4fc8c13e9d3935643098184f5788c3ce6";
+ sha256 = "ed65448da5877b5558f19d2f7f11f8355ea76b3e63e1c0a6059f47cfae5f1c84";
};
buildInputs = [ pytest case ];
diff --git a/pkgs/development/python-modules/biopython/default.nix b/pkgs/development/python-modules/biopython/default.nix
index 8229c1edce8..39be67e6e51 100644
--- a/pkgs/development/python-modules/biopython/default.nix
+++ b/pkgs/development/python-modules/biopython/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "biopython";
- version = "1.71";
+ version = "1.72";
src = fetchPypi {
inherit pname version;
- sha256 = "4f1770a29a5b18fcaca759bbc888083cdde2b301f073439ff640570d4a93e033";
+ sha256 = "ab6b492443adb90c66267b3d24d602ae69a93c68f4b9f135ba01cb06d36ce5a2";
};
propagatedBuildInputs = [ numpy ];
diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix
index 2a9cb2a2cfd..b320db51e3c 100644
--- a/pkgs/development/python-modules/bootstrapped-pip/default.nix
+++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix
@@ -9,20 +9,20 @@ let
};
setuptools_source = fetchPypi {
pname = "setuptools";
- version = "39.2.0";
+ version = "40.0.0";
format = "wheel";
- sha256 = "8fca9275c89964f13da985c3656cb00ba029d7f3916b37990927ffdf264e7926";
+ sha256 = "d68abee4eed409fbe8c302ac4d8429a1ffef912cd047a903b5701c024048dd49";
};
in stdenv.mkDerivation rec {
pname = "pip";
- version = "10.0.1";
+ version = "18.0";
name = "${python.libPrefix}-bootstrapped-${pname}-${version}";
src = fetchPypi {
inherit pname version;
format = "wheel";
- sha256 = "717cdffb2833be8409433a93746744b59505f42146e8d37de6c62b430e25d6d7";
+ sha256 = "070e4bf493c7c2c9f6a08dd797dd3c066d64074c38e9e8a0fb4e6541f266d96c";
};
unpackPhase = ''
diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix
index 70a5af97fda..368db790375 100644
--- a/pkgs/development/python-modules/botocore/default.nix
+++ b/pkgs/development/python-modules/botocore/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "botocore";
- version = "1.10.57";
+ version = "1.10.64";
src = fetchPypi {
inherit pname version;
- sha256 = "0mif7c12643hac6zxq89gv0wjf4r3vqlmm01bm68psljaj40jnpi";
+ sha256 = "977e8ab657747b3e60f4b597b9f732cbe467b12ecc52a9c5b2121c0006d41a63";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/buildout-nix/default.nix b/pkgs/development/python-modules/buildout-nix/default.nix
index 91b310a2179..5a1bc4485b7 100644
--- a/pkgs/development/python-modules/buildout-nix/default.nix
+++ b/pkgs/development/python-modules/buildout-nix/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "zc.buildout";
- version = "2.11.5";
+ version = "2.12.1";
src = fetchPypi {
inherit pname version;
- sha256 = "537a22715d82362cddd811da08d11a31d30d5161ce7994b208bd85ebb348d122";
+ sha256 = "1e180b62fd129a68cb3a9ec8eb0ef457e18921269a93e87ef2cc34519415332d";
};
patches = [ ./nix.patch ];
diff --git a/pkgs/development/python-modules/bumps/default.nix b/pkgs/development/python-modules/bumps/default.nix
index 3f6b2ed3ccd..469b449483a 100644
--- a/pkgs/development/python-modules/bumps/default.nix
+++ b/pkgs/development/python-modules/bumps/default.nix
@@ -2,7 +2,7 @@
buildPythonPackage rec {
pname = "bumps";
- version = "0.7.8";
+ version = "0.7.10";
propagatedBuildInputs = [six];
@@ -12,7 +12,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "57b71855b7659e9c8dc21722a3ed0b33efb2ead2916b22ced3b83339bcdff1a2";
+ sha256 = "07917abf7e598f2a42456ca4f704c6da2a5489eaea0b9a7c61ed8a26506737c8";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/buttersink/default.nix b/pkgs/development/python-modules/buttersink/default.nix
index 29f5ff5dccd..b13251e1ca7 100644
--- a/pkgs/development/python-modules/buttersink/default.nix
+++ b/pkgs/development/python-modules/buttersink/default.nix
@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "buttersink";
- version = "0.6.8";
+ version = "0.6.9";
disabled = isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "04gc63kfcqkw4qba5rijqk01xiphf04yk7hky9180ii64v2ip0j3";
+ sha256 = "c9c05982c44fbb85f17b7ef0e8bee11f375c03d89bcba50cbc2520013512107a";
};
propagatedBuildInputs = [ boto crcmod psutil ];
diff --git a/pkgs/development/python-modules/can/default.nix b/pkgs/development/python-modules/can/default.nix
index f85f80ea239..1072b33bc1b 100644
--- a/pkgs/development/python-modules/can/default.nix
+++ b/pkgs/development/python-modules/can/default.nix
@@ -1,21 +1,30 @@
{ lib
, buildPythonPackage
, fetchPypi
+, wrapt
, pyserial
, nose
-, mock }:
+, mock
+, pytest
+, pytest-timeout }:
buildPythonPackage rec {
pname = "python-can";
- version = "2.1.0";
+ version = "2.2.1";
src = fetchPypi {
inherit pname version;
- sha256 = "4a5c01dd67feeda35f88e6c12ea14ac8cabd426b9be0cc5f9fd083fe90a9dbfc";
+ sha256 = "b5e93b2ee32bdd597d9d908afe5171c402a04c9678ba47b60f33506738b1375b";
};
- propagatedBuildInputs = [ pyserial ];
- checkInputs = [ nose mock ];
+ propagatedBuildInputs = [ wrapt pyserial ];
+ checkInputs = [ nose mock pytest pytest-timeout ];
+
+ checkPhase = ''
+ pytest -k "not test_writer_and_reader \
+ and not test_reader \
+ and not test_socketcan_on_ci_server"
+ '';
meta = with lib; {
homepage = https://github.com/hardbyte/python-can;
diff --git a/pkgs/development/python-modules/cement/default.nix b/pkgs/development/python-modules/cement/default.nix
index 36cc20e027b..9b744957540 100644
--- a/pkgs/development/python-modules/cement/default.nix
+++ b/pkgs/development/python-modules/cement/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "cement";
- version = "2.10.2";
+ version = "2.10.12";
src = fetchPypi {
inherit pname version;
- sha256 = "d50c5980bf3e2456e515178ba097d16e36be0fbcab7811a60589d22f45b64f55";
+ sha256 = "58efb4eacd9ec977ce797a364a13851de6e42392bbde5287d44294f06c5a2f70";
};
# Disable test tests since they depend on a memcached server running on
diff --git a/pkgs/development/python-modules/chainer/default.nix b/pkgs/development/python-modules/chainer/default.nix
index cc75649119b..d332d99cf80 100644
--- a/pkgs/development/python-modules/chainer/default.nix
+++ b/pkgs/development/python-modules/chainer/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "chainer";
- version = "4.1.0";
+ version = "4.3.0";
src = fetchPypi {
inherit pname version;
- sha256 = "49a4a691708626f742cc6fc949fce6b313e3379bd64886eb19e002b1122cc329";
+ sha256 = "a83044256edb1946c47cb9ae687d195c2aa0deaef46ab85a8ffc4a01f7001683";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix
index 7a7d44339ba..d7e6abf3eb6 100644
--- a/pkgs/development/python-modules/cheroot/default.nix
+++ b/pkgs/development/python-modules/cheroot/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "cheroot";
- version = "6.3.2";
+ version = "6.3.3";
src = fetchPypi {
inherit pname version;
- sha256 = "52f915d077ce6201e59c95c4a2ef89617d9b90e6185defb40c03ff3515d2066f";
+ sha256 = "8e3ac15e1efffc81425a693e99b3c09d7ea4bf947255d8d4c38e2cf76f3a4d25";
};
propagatedBuildInputs = [ more-itertools six ];
diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix
index 47aca123998..e9ae4bde8cc 100644
--- a/pkgs/development/python-modules/cherrypy/default.nix
+++ b/pkgs/development/python-modules/cherrypy/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "CherryPy";
- version = "16.0.2";
+ version = "17.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "858fbff27235a392026b1d821ad815b587815c94fbb14312e2e64cc23766b9c3";
+ sha256 = "3cdb5fbae183db49ab1f1a90643d521aa060c93f90001cc99c19d8d15b7a3fb7";
};
propagatedBuildInputs = [ cheroot portend routes six ];
diff --git a/pkgs/development/python-modules/click-log/default.nix b/pkgs/development/python-modules/click-log/default.nix
index 7229488a700..f5626859d06 100644
--- a/pkgs/development/python-modules/click-log/default.nix
+++ b/pkgs/development/python-modules/click-log/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "click-log";
- version = "0.2.1";
+ version = "0.3.2";
src = fetchPypi {
inherit pname version;
- sha256 = "1r1x85023cslb2pwldd089jjk573mk3w78cnashs77wrx7yz8fj9";
+ sha256 = "16fd1ca3fc6b16c98cea63acf1ab474ea8e676849dc669d86afafb0ed7003124";
};
propagatedBuildInputs = [ click ];
diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix
index 967941666c8..1997c2389ab 100644
--- a/pkgs/development/python-modules/cmd2/default.nix
+++ b/pkgs/development/python-modules/cmd2/default.nix
@@ -5,11 +5,11 @@
}:
buildPythonPackage rec {
pname = "cmd2";
- version = "0.9.1";
+ version = "0.9.3";
src = fetchPypi {
inherit pname version;
- sha256 = "1wpw4f9zix30hfncm0hwxjjdx78zq26x3r8s9nvsq9vnxf41xb49";
+ sha256 = "cffc94ad46425f80dfb243f53f456b11cea3f45e683504a60b64618a6d28b417";
};
LC_ALL="en_US.UTF-8";
diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix
index bcf67ab222d..0638ea3a36d 100644
--- a/pkgs/development/python-modules/confluent-kafka/default.nix
+++ b/pkgs/development/python-modules/confluent-kafka/default.nix
@@ -1,12 +1,12 @@
{ stdenv, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro}:
buildPythonPackage rec {
- version = "0.11.4";
+ version = "0.11.5";
pname = "confluent-kafka";
src = fetchPypi {
inherit pname version;
- sha256 = "8cf480199685127c9692b0bf1e15eac82e71ae34b7967a016ab31a318741abb1";
+ sha256 = "bfb5807bfb5effd74f2cfe65e4e3e8564a9e72b25e099f655d8ad0d362a63b9f";
};
buildInputs = [ rdkafka requests ] ++ (if isPy3k then [ avro3k ] else [ avro ]) ;
diff --git a/pkgs/development/python-modules/consul/default.nix b/pkgs/development/python-modules/consul/default.nix
index 888e7a92252..5c9e83b8d20 100644
--- a/pkgs/development/python-modules/consul/default.nix
+++ b/pkgs/development/python-modules/consul/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "python-consul";
- version = "1.0.1";
+ version = "1.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0feb7a14b6869bbfa9eb4868e823f040e3642b84e80c39ffdff3a8b7fd7017c4";
+ sha256 = "168f1fa53948047effe4f14d53fc1dab50192e2a2cf7855703f126f469ea11f4";
};
buildInputs = [ requests six pytest ];
diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix
index 8fe8ccc31a9..2a8736e29de 100644
--- a/pkgs/development/python-modules/cryptography/default.nix
+++ b/pkgs/development/python-modules/cryptography/default.nix
@@ -21,7 +21,7 @@
}:
let
- version = "2.2.2";
+ version = "2.3";
in assert version == cryptography_vectors.version; buildPythonPackage rec {
# also bump cryptography_vectors
pname = "cryptography";
@@ -29,7 +29,7 @@ in assert version == cryptography_vectors.version; buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "9fc295bf69130a342e7a19a39d7bbeb15c0bcaabc7382ec33ef3b2b7d18d2f63";
+ sha256 = "c132bab45d4bd0fff1d3fe294d92b0a6eb8404e93337b3127bdec9f21de117e6";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/python-modules/cryptography_vectors/default.nix b/pkgs/development/python-modules/cryptography_vectors/default.nix
index 6285ac28fce..ba896d29fc5 100644
--- a/pkgs/development/python-modules/cryptography_vectors/default.nix
+++ b/pkgs/development/python-modules/cryptography_vectors/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
# also bump cryptography
pname = "cryptography_vectors";
- version = "2.2.2";
+ version = "2.3";
src = fetchPypi {
inherit pname version;
- sha256 = "28b52c84bae3a564ce51bfb0753cbe360218bd648c64efa2808c886c18505688";
+ sha256 = "356a2ded84ae379e556515eec9b68dd74957651a38465d10605bb9fbae280f15";
};
# No tests included
diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix
index da742b31050..5d9ae10b09a 100644
--- a/pkgs/development/python-modules/cupy/default.nix
+++ b/pkgs/development/python-modules/cupy/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "cupy";
- version = "4.1.0";
+ version = "4.3.0";
src = fetchPypi {
inherit pname version;
- sha256 = "3e714fa21401ab1d278b648543fae56fbce97e389076ebf03b4189f88c2d61e0";
+ sha256 = "ea818ff7f36cf6e5b3d3faef5af36a501c8bdeb78805820afa2999789ed698d5";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/cx_oracle/default.nix b/pkgs/development/python-modules/cx_oracle/default.nix
index 7c0fa32eb99..a4ad178cb34 100644
--- a/pkgs/development/python-modules/cx_oracle/default.nix
+++ b/pkgs/development/python-modules/cx_oracle/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "cx_Oracle";
- version = "6.3.1";
+ version = "6.4.1";
buildInputs = [ odpic ];
src = fetchPypi {
inherit pname version;
- sha256 = "0200j6jh80rpgzxmvgcxmkshaj4zadq32g2i97nlwiq3f7q374l7";
+ sha256 = "3519bf3263c9892aaadc844735aca02d3773ed9b92f97e069cd1726882a7d1b6";
};
preConfigure = ''
diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix
index 0d69edcf9ce..e1572ab5321 100644
--- a/pkgs/development/python-modules/dask/default.nix
+++ b/pkgs/development/python-modules/dask/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "dask";
- version = "0.18.0";
+ version = "0.18.2";
src = fetchPypi {
inherit pname version;
- sha256 = "ebaa0f144b43a00e7b9b3b9cb557e8ebada5fcbb982cdaba1802cd8c4c5720f0";
+ sha256 = "8fba559911788010ecedf58e540004d56d09f7829a1400dd72b74ffedafafabc";
};
checkInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/dbf/default.nix b/pkgs/development/python-modules/dbf/default.nix
index 4ebb9a33690..5a27e2b746f 100644
--- a/pkgs/development/python-modules/dbf/default.nix
+++ b/pkgs/development/python-modules/dbf/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "dbf";
- version = "0.97.7";
+ version = "0.97.11";
src = fetchPypi {
inherit pname version;
- sha256 = "855800d12df87855096eeafc58f34c9092407e8faf197f48073e7bc2b1938de0";
+ sha256 = "8aa5a73d8b140aa3c511a3b5b204a67d391962e90c66b380dd048fcae6ddbb68";
};
propagatedBuildInputs = [ aenum ] ++ stdenv.lib.optional (pythonOlder "3.4") [ enum34 ];
diff --git a/pkgs/development/python-modules/deprecation/default.nix b/pkgs/development/python-modules/deprecation/default.nix
index d1ec7921099..10e0d79dddf 100644
--- a/pkgs/development/python-modules/deprecation/default.nix
+++ b/pkgs/development/python-modules/deprecation/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "deprecation";
- version = "2.0.4";
+ version = "2.0.5";
src = fetchPypi {
inherit pname version;
- sha256 = "2c259bfc0237f16bbe36cb32b6d81addd919b8f4bc7253738576816e82841b96";
+ sha256 = "cbe7d15006bc339709be5e02b14884ecc479639c1a3714a908de3a8ca13b5ca9";
};
propagatedBuildInputs = [ packaging ];
diff --git a/pkgs/development/python-modules/dill/default.nix b/pkgs/development/python-modules/dill/default.nix
index 5473d85b576..3f01d56ac91 100644
--- a/pkgs/development/python-modules/dill/default.nix
+++ b/pkgs/development/python-modules/dill/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "dill";
- version = "0.2.8.1";
+ version = "0.2.8.2";
src = fetchPypi {
inherit pname version;
- sha256 = "53a6d7bf74f737a514cb89f72d0cb8b80dbd44a9cbbffaa14bffb57f4d7c3822";
+ sha256 = "624dc244b94371bb2d6e7f40084228a2edfff02373fe20e018bef1ee92fdd5b3";
};
# Messy test suite. Even when running the tests like tox does, it fails
diff --git a/pkgs/development/python-modules/django-sites/default.nix b/pkgs/development/python-modules/django-sites/default.nix
index 831dbbc4a6c..63c61131261 100644
--- a/pkgs/development/python-modules/django-sites/default.nix
+++ b/pkgs/development/python-modules/django-sites/default.nix
@@ -2,7 +2,7 @@
buildPythonPackage rec {
pname = "django-sites";
- version = "0.9";
+ version = "0.10";
meta = {
description = ''
@@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "05nrydk4a5a99qrxjrcnacs8nbbq5pfjikdpj4w9yn5yfayp057s";
+ sha256 = "f6f9ae55a05288a95567f5844222052b6b997819e174f4bde4e7c23763be6fc3";
};
propagatedBuildInputs = [ django ];
diff --git a/pkgs/development/python-modules/django/2_0.nix b/pkgs/development/python-modules/django/2_0.nix
index 545eba8360a..3c35b74bab6 100644
--- a/pkgs/development/python-modules/django/2_0.nix
+++ b/pkgs/development/python-modules/django/2_0.nix
@@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "Django";
- version = "2.0.6";
+ version = "2.0.7";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "3eb25c99df1523446ec2dc1b00e25eb2ecbdf42c9d8b0b8b32a204a8db9011f8";
+ sha256 = "97886b8a13bbc33bfeba2ff133035d3eca014e2309dff2b6da0bdfc0b8656613";
};
patches = stdenv.lib.optionals withGdal [
diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix
index 0eedf4f01a6..dd4aafe1aa9 100644
--- a/pkgs/development/python-modules/docker/default.nix
+++ b/pkgs/development/python-modules/docker/default.nix
@@ -3,12 +3,12 @@
, ipaddress, backports_ssl_match_hostname, docker_pycreds
}:
buildPythonPackage rec {
- version = "3.4.0";
+ version = "3.4.1";
pname = "docker";
src = fetchPypi {
inherit pname version;
- sha256 = "e9cc39e24905e67ba9e2df14c94488f5cf030fb72ae1c60de505ce5ea90503f7";
+ sha256 = "ad077b49660b711d20f50f344f70cfae014d635ef094bf21b0d7df5f0aeedf99";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/docker_compose/default.nix b/pkgs/development/python-modules/docker_compose/default.nix
index 80a3a6d949c..01a5b4aa8e6 100644
--- a/pkgs/development/python-modules/docker_compose/default.nix
+++ b/pkgs/development/python-modules/docker_compose/default.nix
@@ -6,12 +6,12 @@
, enum34, functools32,
}:
buildPythonApplication rec {
- version = "1.21.2";
+ version = "1.22.0";
pname = "docker-compose";
src = fetchPypi {
inherit pname version;
- sha256 = "0b0wihlyk89y6n0mly2vbljzqai1hhs6yzplskwdah2lfn9p3c38";
+ sha256 = "915cdd0ea7aff349d27a8e0585124ac38695635201770a35612837b25e234677";
};
# lots of networking and other fails
diff --git a/pkgs/development/python-modules/dogpile.cache/default.nix b/pkgs/development/python-modules/dogpile.cache/default.nix
index 88dc6b0fc75..9a840e5112a 100644
--- a/pkgs/development/python-modules/dogpile.cache/default.nix
+++ b/pkgs/development/python-modules/dogpile.cache/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "dogpile.cache";
- version = "0.6.5";
+ version = "0.6.6";
src = fetchPypi {
inherit pname version;
- sha256 = "631197e78b4471bb0e93d0a86264c45736bc9ae43b4205d581dcc34fbe9b5f31";
+ sha256 = "044d4ea0a0abc72491044f3d3df8e1fc9e8fa7a436c6e9a0da5850d23a0d16c1";
};
# Disable concurrency tests that often fail,
diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix
index 8a5f23de899..5d344f18059 100644
--- a/pkgs/development/python-modules/dropbox/default.nix
+++ b/pkgs/development/python-modules/dropbox/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "dropbox";
- version = "8.9.0";
+ version = "9.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "e7eeac47f35e73b34023b7a3089380e74bacd0cce4b57e1e347539dfb53681d2";
+ sha256 = "385c62c2983c3804ba0064762f9e5f4753ea20a132c727b4961d3b68e1372ac8";
};
# Set DROPBOX_TOKEN environment variable to a valid token.
diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix
index 61b1d0d1cd9..2617249b75a 100644
--- a/pkgs/development/python-modules/dulwich/default.nix
+++ b/pkgs/development/python-modules/dulwich/default.nix
@@ -4,12 +4,12 @@
, git, glibcLocales }:
buildPythonPackage rec {
- version = "0.19.3";
+ version = "0.19.5";
pname = "dulwich";
src = fetchPypi {
inherit pname version;
- sha256 = "0d1ab6adf5e8e9bc30cce6e2f924ca06e50241fb1bb17a585fc8d98e3c09c4a4";
+ sha256 = "34f99e575fe1f1e89cca92cec1ddd50b4991199cb00609203b28df9eb83ce259";
};
LC_ALL = "en_US.UTF-8";
diff --git a/pkgs/development/python-modules/face_recognition/default.nix b/pkgs/development/python-modules/face_recognition/default.nix
index d1d8e8535a4..b532c7d19f7 100644
--- a/pkgs/development/python-modules/face_recognition/default.nix
+++ b/pkgs/development/python-modules/face_recognition/default.nix
@@ -1,5 +1,5 @@
{ buildPythonPackage, fetchFromGitHub, pillow, click, dlib, numpy
-, face_recognition_models, stdenv, flake8, tox, pytest, glibcLocales
+, face_recognition_models, stdenv, flake8, pytest, glibcLocales
}:
buildPythonPackage rec {
@@ -19,7 +19,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ pillow click dlib numpy face_recognition_models ];
- checkInputs = [ flake8 tox pytest glibcLocales ];
+ checkInputs = [ flake8 pytest glibcLocales ];
checkPhase = ''
LC_ALL="en_US.UTF-8" py.test
'';
diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix
index 6441db945d7..74ed13da8b4 100644
--- a/pkgs/development/python-modules/faker/default.nix
+++ b/pkgs/development/python-modules/faker/default.nix
@@ -8,11 +8,11 @@ assert pythonOlder "3.3" -> ipaddress != null;
buildPythonPackage rec {
pname = "Faker";
- version = "0.8.16";
+ version = "0.8.17";
src = fetchPypi {
inherit pname version;
- sha256 = "04645d946256b835c675c1cef7c03817a164b0c4e452018fd50b212ddff08c22";
+ sha256 = "0e9a1227a3a0f3297a485715e72ee6eb77081b17b629367042b586e38c03c867";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix
index 642111680b3..e6d347b440d 100644
--- a/pkgs/development/python-modules/fiona/default.nix
+++ b/pkgs/development/python-modules/fiona/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "Fiona";
- version = "1.7.12";
+ version = "1.7.13";
src = fetchPypi {
inherit pname version;
- sha256 = "8b54eb8422d7c502bb7776b184018186bede1a489cf438a7a47f992ade6a0e51";
+ sha256 = "a156129f0904cb7eb24aa0745b6075da54f2c31db168ed3bcac8a4bd716d77b2";
};
buildInputs = [
diff --git a/pkgs/development/python-modules/flake8-import-order/default.nix b/pkgs/development/python-modules/flake8-import-order/default.nix
index 79ad50a63ff..5709b17c524 100644
--- a/pkgs/development/python-modules/flake8-import-order/default.nix
+++ b/pkgs/development/python-modules/flake8-import-order/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "flake8-import-order";
- version = "0.17.1";
+ version = "0.18";
src = fetchPypi {
inherit pname version;
- sha256 = "68d430781a9ef15c85a0121500cf8462f1a4bc7672acb2a32bfdbcab044ae0b7";
+ sha256 = "9be5ca10d791d458eaa833dd6890ab2db37be80384707b0f76286ddd13c16cbf";
};
propagatedBuildInputs = [ pycodestyle ] ++ lib.optional (!isPy3k) enum34;
diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix
index 944c7f7e1fd..9d9d211dbfa 100644
--- a/pkgs/development/python-modules/flake8/default.nix
+++ b/pkgs/development/python-modules/flake8/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pythonOlder
+{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, fetchpatch
, mock, pytest, pytestrunner
, configparser, enum34, mccabe, pycodestyle, pyflakes
}:
@@ -12,6 +12,37 @@ buildPythonPackage rec {
sha256 = "7253265f7abd8b313e3892944044a365e3f4ac3fcdcfb4298f55ee9ddf188ba0";
};
+ # Allow newer version of pycodestyle and pyflakes
+ patches = [
+ (fetchpatch {
+ url = https://gitlab.com/pycqa/flake8/commit/4fcbcccf381ce0987faa297173e4008b0490918f.patch;
+ sha256 = "0lfsg9n92fc8whj29paqsx7ifap2szv7pxj13hy739y87gsps676";
+ excludes = [ "setup.cfg" ];
+ })
+ (fetchpatch {
+ url = https://gitlab.com/pycqa/flake8/commit/0273ca561f0ad03adff41ce5d95a1ec31b10fe5a.patch;
+ sha256 = "1ziy54v1cm7gn7a551qvrl0rs16q8zpzh303xf5gn4rxxz13qnzb";
+ excludes = [ "setup.cfg" ];
+ })
+ (fetchpatch {
+ url = https://gitlab.com/pycqa/flake8/commit/85c503de32f81ed9859d902cbe20eb4d2e4e8d55.patch;
+ sha256 = "0170hjaxkq5ssva9rwkcgm4whb07fnxdb0z12gzmvw5w53hkqxj4";
+ })
+ (fetchpatch {
+ url = https://gitlab.com/pycqa/flake8/commit/68782675b7f00c5d24c24e424efd1fbcb0705224.patch;
+ sha256 = "183lcw7aqv5yzm8pfisrfngq3fchc7h3j7254c5hy2hqq653v98s";
+ })
+ (fetchpatch {
+ url = https://gitlab.com/pycqa/flake8/commit/ef1d5ceefcbfacf5dfe94534c4879ca814b130f0.patch;
+ sha256 = "1j5f0l4xryfhirixwjcl1lzayjhy6vhkizkpm7w87piylim8y26y";
+ })
+ (fetchpatch {
+ url = https://gitlab.com/pycqa/flake8/commit/527af5c214ef0eccfde3dd58d7ea15e09c483bd3.patch;
+ sha256 = "1y51r78770z27d43v64lrg8zvm39ycszzhh15cx8wq8wp3b7iz5x";
+ excludes = [ "setup.cfg" ];
+ })
+ ];
+
buildInputs = [ pytest mock pytestrunner ];
propagatedBuildInputs = [ pyflakes pycodestyle mccabe ]
++ stdenv.lib.optionals (pythonOlder "3.4") [ enum34 ]
diff --git a/pkgs/development/python-modules/flake8/move-pytest-config-to-pytest-ini.patch b/pkgs/development/python-modules/flake8/move-pytest-config-to-pytest-ini.patch
deleted file mode 100644
index d75d8e7bd0a..00000000000
--- a/pkgs/development/python-modules/flake8/move-pytest-config-to-pytest-ini.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -r ad8325924f04 pytest.ini
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/pytest.ini Fri Sep 30 12:28:39 2016 +0200
-@@ -0,0 +1,4 @@
-+[pytest]
-+-norecursedirs = .git .* *.egg* old docs dist build
-+-addopts = -rwv
-+
-diff -r ad8325924f04 setup.cfg
---- a/setup.cfg Fri Sep 30 09:22:39 2016 +0200
-+++ b/setup.cfg Fri Sep 30 12:28:39 2016 +0200
-@@ -12,10 +12,6 @@
- pycodestyle >= 2.0.0, < 2.1.0
- mccabe >= 0.5.0, < 0.6.0
-
--[pytest]
--norecursedirs = .git .* *.egg* old docs dist build
--addopts = -rw
--
- [egg_info]
- tag_build =
- tag_date = 0
diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix
index 1b3ab52c4c3..f9f8198e4ac 100644
--- a/pkgs/development/python-modules/gensim/default.nix
+++ b/pkgs/development/python-modules/gensim/default.nix
@@ -9,10 +9,10 @@
buildPythonPackage rec {
pname = "gensim";
- version = "3.4.0";
+ version = "3.5.0";
src = fetchPypi {
inherit pname version;
- sha256 = "05844c82c7c176449218fd3fc31e55e5d8b3fae460f261b11231f4c8ef2ed5e0";
+ sha256 = "78ed9b6ac35f104542f3bee0386d71ddf9432d74c153065d2ea9f6baf10e5b49";
};
propagatedBuildInputs = [ smart_open numpy six scipy
diff --git a/pkgs/development/python-modules/gevent/default.nix b/pkgs/development/python-modules/gevent/default.nix
index 1169dd3a4a4..cd28a4976a9 100644
--- a/pkgs/development/python-modules/gevent/default.nix
+++ b/pkgs/development/python-modules/gevent/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "gevent";
- version = "1.3.4";
+ version = "1.3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "53c4dc705886d028f5d81e698b1d1479994a421498cd6529cb9711b5e2a84f74";
+ sha256 = "7f15861f3cc92f49663ca88c4774d26d8044783a65fbc28071a2bd1c7bf36ff0";
};
buildInputs = [ libev ];
diff --git a/pkgs/development/python-modules/gitdb2/default.nix b/pkgs/development/python-modules/gitdb2/default.nix
index 1ebbd3de785..f5812c62e13 100644
--- a/pkgs/development/python-modules/gitdb2/default.nix
+++ b/pkgs/development/python-modules/gitdb2/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "gitdb2";
- version = "2.0.3";
+ version = "2.0.4";
src = fetchPypi {
inherit pname version;
- sha256 = "02azg62mr99b7cllyjrly77np3vw32y8nrxpa2xjapiyaga2j3mn";
+ sha256 = "bb4c85b8a58531c51373c89f92163b92f30f81369605a67cd52d1fc21246c044";
};
propagatedBuildInputs = [ smmap2 ];
diff --git a/pkgs/development/python-modules/goocalendar/default.nix b/pkgs/development/python-modules/goocalendar/default.nix
index f6e67ad4392..4324b357f29 100644
--- a/pkgs/development/python-modules/goocalendar/default.nix
+++ b/pkgs/development/python-modules/goocalendar/default.nix
@@ -14,13 +14,13 @@ with stdenv.lib;
buildPythonPackage rec {
pname = "GooCalendar";
- version = "0.3";
+ version = "0.4";
disabled = isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "1p7qbcv06xipg48sgpdlqf72ajl3n1qlypcc0giyi1a72zpyf823";
+ sha256 = "ca3950c2728916d9fb703c886f3940ac9b76739f99ec840b0e1c2c282510e1ab";
};
nativeBuildInputs = [ pkgconfig gobjectIntrospection ];
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix
index 7f71a4ed3ef..c8dd5ea84ae 100644
--- a/pkgs/development/python-modules/google-api-python-client/default.nix
+++ b/pkgs/development/python-modules/google-api-python-client/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "google-api-python-client";
- version = "1.7.3";
+ version = "1.7.4";
src = fetchPypi {
inherit pname version;
- sha256 = "e32d30563b90c4f88ff042d4d891b5e8ed1f6cdca0adab95e9c2ce2603087436";
+ sha256 = "5d5cb02c6f3112c68eed51b74891a49c0e35263380672d662f8bfe85b8114d7c";
};
# No tests included in archive
diff --git a/pkgs/development/python-modules/google_cloud_speech/default.nix b/pkgs/development/python-modules/google_cloud_speech/default.nix
index 8cf3fe5753e..f404c68921d 100644
--- a/pkgs/development/python-modules/google_cloud_speech/default.nix
+++ b/pkgs/development/python-modules/google_cloud_speech/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "google-cloud-speech";
- version = "0.34.0";
+ version = "0.35.0";
src = fetchPypi {
inherit pname version;
- sha256 = "8396646aa9de210bacb144fabd82ab5fe577b3b11708725c879b72c96009d631";
+ sha256 = "5db2d69315b3d95d067c9bffe17994b6ee9252702888cc300d76252b451638e1";
};
propagatedBuildInputs = [ google_api_core ];
diff --git a/pkgs/development/python-modules/greenlet/default.nix b/pkgs/development/python-modules/greenlet/default.nix
index 91b07516301..58b240297cf 100644
--- a/pkgs/development/python-modules/greenlet/default.nix
+++ b/pkgs/development/python-modules/greenlet/default.nix
@@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "greenlet";
- version = "0.4.13";
+ version = "0.4.14";
disabled = isPyPy; # builtin for pypy
src = fetchPypi {
inherit pname version;
- sha256 = "0fef83d43bf87a5196c91e73cb9772f945a4caaff91242766c5916d1dd1381e4";
+ sha256 = "f1cc268a15ade58d9a0c04569fe6613e19b8b0345b64453064e2c3c6d79051af";
};
propagatedBuildInputs = [ six ];
diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix
index 5ceadcc0f91..698da6dc91a 100644
--- a/pkgs/development/python-modules/gssapi/default.nix
+++ b/pkgs/development/python-modules/gssapi/default.nix
@@ -3,11 +3,11 @@ nose, shouldbe, gss, krb5Full, which, darwin }:
buildPythonPackage rec {
pname = "gssapi";
- version = "1.5.0";
+ version = "1.5.1";
src = fetchPypi {
inherit pname version;
- sha256 = "be715cb74ac56db2dd888b016097aaa29ab7d7d34c1f8c706ff63f76b3553f71";
+ sha256 = "76c9fda88a7178f41bf6454a06d64054c56b46f0dcbc73307f2e57bb8c25d8cc";
};
# It's used to locate headers
diff --git a/pkgs/development/python-modules/gunicorn/default.nix b/pkgs/development/python-modules/gunicorn/default.nix
index efc42dedc65..85c5c011dfd 100644
--- a/pkgs/development/python-modules/gunicorn/default.nix
+++ b/pkgs/development/python-modules/gunicorn/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "gunicorn";
- version = "19.8.1";
+ version = "19.9.0";
src = fetchPypi {
inherit pname version;
- sha256 = "bc59005979efb6d2dd7d5ba72d99f8a8422862ad17ff3a16e900684630dd2a10";
+ sha256 = "fa2662097c66f920f53f70621c6c58ca4a3c4d3434205e608e121b5b3b71f4f3";
};
checkInputs = [ pytest mock pytestcov coverage ];
diff --git a/pkgs/development/python-modules/hdbscan/default.nix b/pkgs/development/python-modules/hdbscan/default.nix
index 94b9861daa9..3c86563adac 100644
--- a/pkgs/development/python-modules/hdbscan/default.nix
+++ b/pkgs/development/python-modules/hdbscan/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "hdbscan";
- version = "0.8.13";
+ version = "0.8.15";
src = fetchPypi {
inherit pname version;
- sha256 = "31874db29375816688b5541287a051c9bd768f2499ccf1f6a4d88d266530e2a6";
+ sha256 = "446f98e1ea622a39c1f396d839fa2b1c35db98234e373336de61c3bd6ffaec78";
};
checkInputs = [ nose ];
diff --git a/pkgs/development/python-modules/howdoi/default.nix b/pkgs/development/python-modules/howdoi/default.nix
index a72338143a1..dc9c79781f1 100644
--- a/pkgs/development/python-modules/howdoi/default.nix
+++ b/pkgs/development/python-modules/howdoi/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "howdoi";
- version = "1.1.7";
+ version = "1.1.13";
src = fetchPypi {
inherit pname version;
- sha256 = "1dx9ms0b3z3bx02paj78cyi788d8l6cpd3jqbn3j88w736i4jknz";
+ sha256 = "96f5e057fd45a84379d77e46233165d95211e6b3ea869cb5c0df172aa322b566";
};
propagatedBuildInputs = [ six requests-cache pygments pyquery ];
diff --git a/pkgs/development/python-modules/hvac/default.nix b/pkgs/development/python-modules/hvac/default.nix
index 862d7af91f0..f18d8eadec8 100644
--- a/pkgs/development/python-modules/hvac/default.nix
+++ b/pkgs/development/python-modules/hvac/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "hvac";
- version = "0.6.0";
+ version = "0.6.2";
src = fetchPypi {
inherit pname version;
- sha256 = "e7b8425ce36894cda8b8ed3387a47119edc517302e6a72942602df54a96ee453";
+ sha256 = "4bc80744df5f09882b1cc91755b03b7b62b093fc63c8c4abb26fbfb9c9e878dd";
};
propagatedBuildInputs = [ requests ];
diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix
index 6701c5a5b7e..5694ea92405 100644
--- a/pkgs/development/python-modules/hypothesis/default.nix
+++ b/pkgs/development/python-modules/hypothesis/default.nix
@@ -9,23 +9,24 @@ buildPythonPackage rec {
# pytz fake_factory django numpy pytest
# If you need these, you can just add them to your environment.
- version = "3.45.2";
+ version = "3.66.2";
pname = "hypothesis";
- # Upstream prefers github tarballs
+ # Use github tarballs that includes tests
src = fetchFromGitHub {
owner = "HypothesisWorks";
repo = "hypothesis-python";
- rev = version;
- sha256 = "063sn5m1966gvm3wrlxczdq4vw0r94h3nd9xpr94qxahpg2r4bpb";
+ rev = "hypothesis-python-${version}";
+ sha256 = "17ywbwa76z7f0pgash0003fvm25fsj7hxdrdiprdbv99y3i8bm88";
};
+ postUnpack = "sourceRoot=$sourceRoot/hypothesis-python";
+
propagatedBuildInputs = [ attrs coverage ] ++ lib.optional (!isPy3k) [ enum34 ];
checkInputs = [ pytest pytest_xdist flaky mock ];
inherit doCheck;
- # https://github.com/DRMacIver/hypothesis/issues/300
checkPhase = ''
rm tox.ini # This file changes how py.test runs and breaks it
py.test tests/cover
diff --git a/pkgs/development/python-modules/ibmquantumexperience/default.nix b/pkgs/development/python-modules/ibmquantumexperience/default.nix
index eb4b859c2f6..0fcb2662801 100644
--- a/pkgs/development/python-modules/ibmquantumexperience/default.nix
+++ b/pkgs/development/python-modules/ibmquantumexperience/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "IBMQuantumExperience";
- version = "1.9.6";
+ version = "1.9.8";
src = fetchPypi {
inherit pname version;
- sha256 = "83baa3c88979df67e7be929b147d253cffe45a7f7f5657f87fbe945819e9ce24";
+ sha256 = "78a7d9770fa2884d79d3c8b18f374644866e4d22ec151cf703053f7530bb7b7c";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/idna-ssl/default.nix b/pkgs/development/python-modules/idna-ssl/default.nix
index b324705a152..a8a040d39e2 100644
--- a/pkgs/development/python-modules/idna-ssl/default.nix
+++ b/pkgs/development/python-modules/idna-ssl/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "idna-ssl";
- version = "1.0.1";
+ version = "1.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1293f030bc608e9aa9cdee72aa93c1521bbb9c7698068c61c9ada6772162b979";
+ sha256 = "a933e3bb13da54383f9e8f35dc4f9cb9eb9b3b78c6b36f311254d6d0d92c6c7c";
};
propagatedBuildInputs = [ idna ];
diff --git a/pkgs/development/python-modules/invoke/default.nix b/pkgs/development/python-modules/invoke/default.nix
new file mode 100644
index 00000000000..20d2973ca4f
--- /dev/null
+++ b/pkgs/development/python-modules/invoke/default.nix
@@ -0,0 +1,22 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "invoke";
+ version = "1.1.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0aiy1xvk1f91246zxd1zqrm679vdvd10h843a2na41cqr3cflpi6";
+ };
+
+ # errors with vendored libs
+ doCheck = false;
+
+ meta = {
+ description = "Pythonic task execution";
+ license = lib.licenses.bsd2;
+ };
+}
diff --git a/pkgs/development/python-modules/ipyparallel/default.nix b/pkgs/development/python-modules/ipyparallel/default.nix
index 665d08980dc..a469ad46883 100644
--- a/pkgs/development/python-modules/ipyparallel/default.nix
+++ b/pkgs/development/python-modules/ipyparallel/default.nix
@@ -16,11 +16,11 @@
buildPythonPackage rec {
pname = "ipyparallel";
- version = "6.2.1";
+ version = "6.2.2";
src = fetchPypi {
inherit pname version;
- sha256 = "9afb0001d6fa2eca9340e9daab5da021db05211987868f47ab5b305d701cb12d";
+ sha256 = "02b225966d5c20f12b1fba0b6b10aa5d352a6b492e075f137ff0ff6e95b9358e";
};
buildInputs = [ nose ];
diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix
index 2c0e4aaf4db..24a938b195b 100644
--- a/pkgs/development/python-modules/ipython/default.nix
+++ b/pkgs/development/python-modules/ipython/default.nix
@@ -3,6 +3,7 @@
, buildPythonPackage
, fetchPypi
, pythonOlder
+, fetchpatch
# Build dependencies
, glibcLocales
# Test dependencies
@@ -34,6 +35,12 @@ buildPythonPackage rec {
substituteInPlace setup.py --replace "'gnureadline'" " "
'';
+ # Upgrade to prompt_toolkit 2.0
+ patches = fetchpatch {
+ url = https://github.com/ipython/ipython/commit/8e256bd37373f98580ba1ef1d3fcfd7976802238.patch;
+ sha256 = "1d9qy2z21n4frf15g4aj7xi011d1d3qc31gs27f2v23j0gv69r9h";
+ };
+
buildInputs = [ glibcLocales ];
checkInputs = [ nose pygments ];
diff --git a/pkgs/development/python-modules/ipywidgets/default.nix b/pkgs/development/python-modules/ipywidgets/default.nix
index e65de4ee3ad..9f15a2fc5c2 100644
--- a/pkgs/development/python-modules/ipywidgets/default.nix
+++ b/pkgs/development/python-modules/ipywidgets/default.nix
@@ -14,11 +14,11 @@
buildPythonPackage rec {
pname = "ipywidgets";
- version = "7.2.1";
+ version = "7.3.0";
src = fetchPypi {
inherit pname version;
- sha256 = "ab9869cda5af7ba449d8f707b29b7e97a7db97d6366805d6b733338f51096f54";
+ sha256 = "3ce93db970a94f06f38121da70757cdbcce884ecd14f79a4dd9bc49a47e0f33b";
};
# Tests are not distributed
diff --git a/pkgs/development/python-modules/jaraco_functools/default.nix b/pkgs/development/python-modules/jaraco_functools/default.nix
new file mode 100644
index 00000000000..cbff3f8b45a
--- /dev/null
+++ b/pkgs/development/python-modules/jaraco_functools/default.nix
@@ -0,0 +1,25 @@
+{ lib, buildPythonPackage, fetchPypi
+, setuptools_scm
+, more-itertools, backports_functools_lru_cache }:
+
+buildPythonPackage rec {
+ pname = "jaraco.functools";
+ version = "1.20";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "bad775f06e58bb8de5563bc2a8bf704168919e6779d6e849b1ca58b443e97f3b";
+ };
+
+ propagatedBuildInputs = [ more-itertools backports_functools_lru_cache ];
+
+ doCheck = false;
+
+ buildInputs = [ setuptools_scm ];
+
+ meta = with lib; {
+ description = "Additional functools in the spirit of stdlib's functools";
+ homepage = https://github.com/jaraco/jaraco.functools;
+ license = licenses.mit;
+ };
+}
diff --git a/pkgs/development/python-modules/jdatetime/default.nix b/pkgs/development/python-modules/jdatetime/default.nix
index eed6a8b979b..db79050077f 100644
--- a/pkgs/development/python-modules/jdatetime/default.nix
+++ b/pkgs/development/python-modules/jdatetime/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "jdatetime";
- version = "2.1.0";
+ version = "2.2.1";
src = fetchPypi {
inherit pname version;
- sha256 = "ac5646460defa5bf3d062504d870954c77d6234536365baf52433fb845b620d0";
+ sha256 = "030a47ad3acbde45cb03872e2c6415c675dbb4a82462302971e93076145b5096";
};
propagatedBuildInputs = [ six ];
diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix
index 9522d2099f8..0664a6cc294 100644
--- a/pkgs/development/python-modules/jedi/default.nix
+++ b/pkgs/development/python-modules/jedi/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "jedi";
- version = "0.12.0";
+ version = "0.12.1";
src = fetchPypi {
inherit pname version;
- sha256 = "1bcr7csx4xil1iwmk03d79jis0bkmgi9k0kir3xa4rmwqsagcwhr";
+ sha256 = "b409ed0f6913a701ed474a614a3bb46e6953639033e31f769ca7581da5bd1ec1";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix
index 17896a58469..8b42e6e1ea1 100644
--- a/pkgs/development/python-modules/joblib/default.nix
+++ b/pkgs/development/python-modules/joblib/default.nix
@@ -9,10 +9,10 @@
buildPythonPackage rec {
pname = "joblib";
- version = "0.11";
+ version = "0.12.1";
src = fetchPypi {
inherit pname version;
- sha256 = "7b8fd56df36d9731a83729395ccb85a3b401f62a96255deb1a77220c00ed4085";
+ sha256 = "68e6128e4734196616a39e2d48830ec7d61551c7f5748849e4c91478d2444524";
};
checkInputs = [ sphinx numpydoc pytest ];
diff --git a/pkgs/development/python-modules/jsonrpc-async/default.nix b/pkgs/development/python-modules/jsonrpc-async/default.nix
index 2bdb93dfdf2..758fc0f1dd5 100644
--- a/pkgs/development/python-modules/jsonrpc-async/default.nix
+++ b/pkgs/development/python-modules/jsonrpc-async/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "jsonrpc-async";
- version = "0.6";
+ version = "1.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0f1p3qv56jn4sdyp8gzf915nya6vr0rn2pbzld9x23y9jdjmibzw";
+ sha256 = "6241a221b52e18265fe6bb59c60633acebb6fb5ef8c04de9a076b757aa133b86";
};
propagatedBuildInputs = [ aiohttp jsonrpc-base ];
diff --git a/pkgs/development/python-modules/jsonrpc-base/default.nix b/pkgs/development/python-modules/jsonrpc-base/default.nix
index 8dbe0738288..d68b031d517 100644
--- a/pkgs/development/python-modules/jsonrpc-base/default.nix
+++ b/pkgs/development/python-modules/jsonrpc-base/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "jsonrpc-base";
- version = "1.0";
+ version = "1.0.1";
src = fetchPypi {
inherit pname version;
- sha256 = "1dl55n54ha5kf4x6hap2p1k3s4qa4w7g791wp2656rjg2zxfgywk";
+ sha256 = "21f860c915617f6475aa1ac5a1ec11de03cce6b279741f25ad97d8a4c5b76c3c";
};
propagatedBuildInputs = [ ];
diff --git a/pkgs/development/python-modules/jsonrpc-websocket/default.nix b/pkgs/development/python-modules/jsonrpc-websocket/default.nix
index 0914100b5aa..c753058b093 100644
--- a/pkgs/development/python-modules/jsonrpc-websocket/default.nix
+++ b/pkgs/development/python-modules/jsonrpc-websocket/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "jsonrpc-websocket";
- version = "0.6";
+ version = "1.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "cf349bee4ab96db2e457b6a71a45380e1a9cf3e1ceb08260ecfd9928040ebe71";
+ sha256 = "40949836996c0a8104e7878997d3f68bda4561e9d3af64e5cd178127ec3c2778";
};
propagatedBuildInputs = [ aiohttp jsonrpc-base ];
diff --git a/pkgs/development/python-modules/jupyterlab_launcher/default.nix b/pkgs/development/python-modules/jupyterlab_launcher/default.nix
index f316fe10563..79d22b6b1c9 100644
--- a/pkgs/development/python-modules/jupyterlab_launcher/default.nix
+++ b/pkgs/development/python-modules/jupyterlab_launcher/default.nix
@@ -1,11 +1,11 @@
{ lib, buildPythonPackage, fetchPypi, jsonschema, notebook }:
buildPythonPackage rec {
pname = "jupyterlab_launcher";
- version = "0.10.5";
+ version = "0.11.2";
src = fetchPypi {
inherit pname version;
- sha256 = "1v1ir182zm2dl14lqvqjhx2x40wnp0i32n6rldxnm1allfpld1n7";
+ sha256 = "236a647f4c3f8417413643a918a893a5f662fb5d2fdccce2fd101e3cca2e7fd1";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix
index e773bf7436a..24d1178da37 100644
--- a/pkgs/development/python-modules/keyring/default.nix
+++ b/pkgs/development/python-modules/keyring/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "keyring";
- version = "12.2.1";
+ version = "13.2.1";
src = fetchPypi {
inherit pname version;
- sha256 = "1zhg2a59rqgigl8apm4s39md6yf3f2v1d4bl6s5rmiigwfifm624";
+ sha256 = "6364bb8c233f28538df4928576f4e051229e0451651073ab20b315488da16a58";
};
nativeBuildInputs = [ setuptools_scm ];
diff --git a/pkgs/development/python-modules/ldappool/default.nix b/pkgs/development/python-modules/ldappool/default.nix
index 02d10b832ff..a09fa75ce34 100644
--- a/pkgs/development/python-modules/ldappool/default.nix
+++ b/pkgs/development/python-modules/ldappool/default.nix
@@ -3,12 +3,12 @@
buildPythonPackage rec {
name = "ldappool-${version}";
- version = "2.2.0";
+ version = "2.3.0";
src = fetchPypi {
pname = "ldappool";
inherit version;
- sha256 = "1akmzf51cjfvmd0nvvm562z1w9vq45zsx6fa72kraqgsgxhnrhqz";
+ sha256 = "899d38e891372981166350c813ff5ce2ad8ac383311edccda8102362c1d60952";
};
nativeBuildInputs = [ pbr ];
diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix
index 47eea033f6e..4f6c2a96c56 100644
--- a/pkgs/development/python-modules/ledgerblue/default.nix
+++ b/pkgs/development/python-modules/ledgerblue/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "ledgerblue";
- version = "0.1.17";
+ version = "0.1.19";
src = fetchPypi {
inherit pname version;
- sha256 = "ac403b074337b9b58cae97ea00b3d94fc8efeea1717a80c49e79dc8aad6fc58f";
+ sha256 = "3969b3c375c0f3fb60ff1645621ebf2f39fb697a53851620705f27ed7b283097";
};
buildInputs = [ hidapi pycrypto pillow protobuf future ecpy ];
diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix
index e606d84ede4..20312ed81d3 100644
--- a/pkgs/development/python-modules/libagent/default.nix
+++ b/pkgs/development/python-modules/libagent/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "libagent";
- version = "0.9.8";
+ version = "0.11.3";
src = fetchPypi{
inherit pname version;
- sha256 = "7e7d62cedef9d1291b8e77abc463d50b3d685dfd953611d55a0414c12276aa78";
+ sha256 = "cb6199c3572e1223756465e758fb525e7f406a4808e9d7cfdddf089bec710047";
};
buildInputs = [
diff --git a/pkgs/development/python-modules/libusb1/default.nix b/pkgs/development/python-modules/libusb1/default.nix
index f3b48eaa576..8d74a4d3c46 100644
--- a/pkgs/development/python-modules/libusb1/default.nix
+++ b/pkgs/development/python-modules/libusb1/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "libusb1";
- version = "1.6.4";
+ version = "1.6.5";
src = fetchPypi {
inherit pname version;
- sha256 = "03b7xrz8vqg8w0za5r503jhcmbd1ls5610jcja1rqz833nf0v4wc";
+ sha256 = "4707f81e933a97fed1c5bf7d4957f07bae1139cb8084bdee1f50201a40e3fd7c";
};
postPatch = lib.optionalString stdenv.isLinux ''
diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix
index 4d702f16611..224cea4eebd 100644
--- a/pkgs/development/python-modules/llvmlite/default.nix
+++ b/pkgs/development/python-modules/llvmlite/default.nix
@@ -10,13 +10,13 @@
buildPythonPackage rec {
pname = "llvmlite";
- version = "0.23.2";
+ version = "0.24.0";
disabled = isPyPy;
src = fetchPypi {
inherit pname version;
- sha256 = "1e63f317b8fb3679d3a397920b1e8bade2d5f471f6c60c7e9bf97746f616f79e";
+ sha256 = "320de4c4a1c105b91629305be069d217f3a9d7fbe32cb22bcfb016361895fc07";
};
propagatedBuildInputs = [ llvm ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34;
diff --git a/pkgs/development/python-modules/logilab/common.nix b/pkgs/development/python-modules/logilab/common.nix
index 6d3b81488b9..9f932b81e7a 100644
--- a/pkgs/development/python-modules/logilab/common.nix
+++ b/pkgs/development/python-modules/logilab/common.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "logilab-common";
- version = "1.4.1";
+ version = "1.4.2";
src = fetchPypi {
inherit pname version;
- sha256 = "02in5555iak50gzn35bnnha9s85idmh0wwxaxz13v81z5krn077d";
+ sha256 = "cdda9ed0deca7c68f87f7a404ad742e47aaa1ca5956d12988236a5ec3bda13a0";
};
propagatedBuildInputs = [ unittest2 six ];
diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix
index 8b321b911cc..8589e47be21 100644
--- a/pkgs/development/python-modules/lxml/default.nix
+++ b/pkgs/development/python-modules/lxml/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "lxml";
- version = "4.2.1";
+ version = "4.2.3";
src = fetchPypi {
inherit pname version;
- sha256 = "e2629cdbcad82b83922a3488937632a4983ecc0fed3e5cfbf430d069382eeb9b";
+ sha256 = "622f7e40faef13d232fb52003661f2764ce6cdef3edb0a59af7c1559e4cc36d1";
};
buildInputs = [ libxml2 libxslt ];
diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix
index 823c8681873..4cb7744f3d9 100644
--- a/pkgs/development/python-modules/m2r/default.nix
+++ b/pkgs/development/python-modules/m2r/default.nix
@@ -2,11 +2,11 @@
mistune, docutils } :
buildPythonPackage rec {
pname = "m2r";
- version = "0.1.14";
+ version = "0.1.15";
src = fetchPypi {
inherit pname version;
- sha256 = "a14635cdeedb125f0f85e014eb5898fd634e2da358a160c124818e9c9f851add";
+ sha256 = "1c358d8bf21ff70e569968d604a0e3c9b05fe01b5f362389235e97bc7c0cd542";
};
propagatedBuildInputs = [ mistune docutils ];
diff --git a/pkgs/development/python-modules/marionette-harness/mozinfo.nix b/pkgs/development/python-modules/marionette-harness/mozinfo.nix
index 1515c050a3f..d44dc108ff3 100644
--- a/pkgs/development/python-modules/marionette-harness/mozinfo.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozinfo.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "mozinfo";
- version = "0.9";
+ version = "0.10";
src = fetchPypi {
inherit pname version;
- sha256 = "1jwhnhbj7xipwh33wf7m12pw5g662dpr1chkp6p2fmy0mwpn2y4z";
+ sha256 = "dcd53a1b1793340418e1ae42bf300e3e56d8f12047972378c6f9318b220b1023";
};
disabled = isPy3k;
diff --git a/pkgs/development/python-modules/marionette-harness/mozlog.nix b/pkgs/development/python-modules/marionette-harness/mozlog.nix
index bc4b9e91465..ce24fd48dd4 100644
--- a/pkgs/development/python-modules/marionette-harness/mozlog.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozlog.nix
@@ -10,13 +10,13 @@
buildPythonPackage rec {
pname = "mozlog";
- version = "3.7";
+ version = "3.8";
disabled = isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "414141131c4f5e7242e69a939d2b74f4ed8dbac12bef93eee4e7125cd1a131e9";
+ sha256 = "af3a3252bc58f8642a641601ba59096c22e4aa49cdc1ed4b0df2314f4f027f0d";
};
propagatedBuildInputs = [ blessings mozterm six ];
diff --git a/pkgs/development/python-modules/mozterm/default.nix b/pkgs/development/python-modules/mozterm/default.nix
index 98e8d5b4078..358b21893fa 100644
--- a/pkgs/development/python-modules/mozterm/default.nix
+++ b/pkgs/development/python-modules/mozterm/default.nix
@@ -2,14 +2,14 @@
buildPythonPackage rec {
pname = "mozterm";
- version = "0.1.0";
+ version = "1.0.0";
# name 'unicode' is not defined
disabled = isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "4ebf8bd772d97c0f557184173f0f96cfca0abfc07e1ae975fbcfa76be50b5561";
+ sha256 = "b1e91acec188de07c704dbb7b0100a7be5c1e06567b3beb67f6ea11d00a483a4";
};
meta = with lib; {
diff --git a/pkgs/development/python-modules/msgpack-numpy/default.nix b/pkgs/development/python-modules/msgpack-numpy/default.nix
index cae571fe2f5..e04e9d1e802 100644
--- a/pkgs/development/python-modules/msgpack-numpy/default.nix
+++ b/pkgs/development/python-modules/msgpack-numpy/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "msgpack-numpy";
- version = "0.4.3";
+ version = "0.4.3.1";
src = fetchPypi {
inherit pname version;
- sha256 = "9d6da0bbb04d7cab2bf9f08f78232c954f00ac95cf2384149e779a31ce859126";
+ sha256 = "31fd5dd009bbee7f8b107db8c859e3a0a2793acc196f25ffbbae1e71b4c63ca5";
};
buildInputs = [
diff --git a/pkgs/development/python-modules/mutagen/default.nix b/pkgs/development/python-modules/mutagen/default.nix
index 46658520cb5..054d0247600 100644
--- a/pkgs/development/python-modules/mutagen/default.nix
+++ b/pkgs/development/python-modules/mutagen/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "mutagen";
- version = "1.40.0";
+ version = "1.41.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0ppfmpf60c78p4yp7in3f8y1l1fd34a38vw9swpg2fl6hz7c58mj";
+ sha256 = "dab6038c7f0e17c1b67fb8f56303e8be21e73ac47760f1a8e716856f1bdf5057";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix
index 65cdf79059d..021f3461e53 100644
--- a/pkgs/development/python-modules/mypy/default.nix
+++ b/pkgs/development/python-modules/mypy/default.nix
@@ -2,14 +2,14 @@
buildPythonPackage rec {
pname = "mypy";
- version = "0.610";
+ version = "0.620";
# Tests not included in pip package.
doCheck = false;
src = fetchPypi {
inherit pname version;
- sha256 = "0fc7h7hf9042nlqczdvj2ngz2hc7rcnd35qz5pb840j38x9n8wpl";
+ sha256 = "c770605a579fdd4a014e9f0a34b6c7a36ce69b08100ff728e96e27445cef3b3c";
};
disabled = !isPy3k;
diff --git a/pkgs/development/python-modules/mysqlclient/default.nix b/pkgs/development/python-modules/mysqlclient/default.nix
index 9aabd6d94e2..41e1d4cb10b 100644
--- a/pkgs/development/python-modules/mysqlclient/default.nix
+++ b/pkgs/development/python-modules/mysqlclient/default.nix
@@ -2,7 +2,7 @@
buildPythonPackage rec {
pname = "mysqlclient";
- version = "1.3.12";
+ version = "1.3.13";
buildInputs = [
mysql.connector-c
@@ -13,7 +13,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "2d9ec33de39f4d9c64ad7322ede0521d85829ce36a76f9dd3d6ab76a9c8648e5";
+ sha256 = "ff8ee1be84215e6c30a746b728c41eb0701a46ca76e343af445b35ce6250644f";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/natsort/default.nix b/pkgs/development/python-modules/natsort/default.nix
index e32c712560a..e952129f15d 100644
--- a/pkgs/development/python-modules/natsort/default.nix
+++ b/pkgs/development/python-modules/natsort/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "natsort";
- version = "5.3.2";
+ version = "5.3.3";
checkInputs = [
hypothesis
@@ -31,7 +31,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "94056276c41be501d9fad3ade61d4eb4edf3b37fea53829b3294b75dc1d23708";
+ sha256 = "da930bfddce941526955dea8d35a44243c96adf919ceb758ba7bbd1ba5b0a39a";
};
# testing based on project's tox.ini
diff --git a/pkgs/development/python-modules/ncclient/default.nix b/pkgs/development/python-modules/ncclient/default.nix
index 27fc7d11e75..d8a6499d136 100644
--- a/pkgs/development/python-modules/ncclient/default.nix
+++ b/pkgs/development/python-modules/ncclient/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "ncclient";
- version = "0.5.3";
+ version = "0.6.0";
src = fetchPypi {
inherit pname version;
- sha256 = "fe6b9c16ed5f1b21f5591da74bfdd91a9bdf69eb4e918f1c06b3c8db307bd32b";
+ sha256 = "da7f7dfb8a60711610139e894b41ebcab3cd7103b78439ad5e9e91c2d3cfa423";
};
checkInputs = [ nose rednose ];
diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix
index ccfd35dc646..3785986ad28 100644
--- a/pkgs/development/python-modules/nipype/default.nix
+++ b/pkgs/development/python-modules/nipype/default.nix
@@ -8,6 +8,7 @@
, dateutil
, funcsigs
, future
+, futures
, mock
, networkx
, nibabel
@@ -33,11 +34,11 @@ assert !isPy3k -> configparser != null;
buildPythonPackage rec {
pname = "nipype";
- version = "1.0.4";
+ version = "1.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "4c3c1eb15fc016457525d1f7eb701d1bbe595eb48a036ae8dc2d21b843f9e525";
+ sha256 = "2a5ebbc9244a18e3b2d83a9639da09248e92bc0742b81a86550ef1a18c1fccbc";
};
# see https://github.com/nipy/nipype/issues/2240
@@ -46,6 +47,8 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace nipype/interfaces/base/tests/test_core.py \
--replace "/usr/bin/env bash" "${bash}/bin/bash"
+
+ rm pytest.ini
'';
propagatedBuildInputs = [
@@ -53,6 +56,7 @@ buildPythonPackage rec {
dateutil
funcsigs
future
+ futures
networkx
nibabel
numpy
diff --git a/pkgs/development/python-modules/node-semver/default.nix b/pkgs/development/python-modules/node-semver/default.nix
index 9e4ba35680a..20ae56fdbc7 100644
--- a/pkgs/development/python-modules/node-semver/default.nix
+++ b/pkgs/development/python-modules/node-semver/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchPypi, buildPythonPackage, pytest, tox }:
+{ stdenv, fetchPypi, buildPythonPackage, pytest }:
buildPythonPackage rec {
version = "0.3.0";
pname = "node-semver";
- buildInputs = [ pytest tox ];
+ checkInputs = [ pytest ];
src = fetchPypi {
inherit pname version;
diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix
index 15f93878ab7..8a9a82b2569 100644
--- a/pkgs/development/python-modules/notebook/default.nix
+++ b/pkgs/development/python-modules/notebook/default.nix
@@ -24,11 +24,11 @@
buildPythonPackage rec {
pname = "notebook";
- version = "5.5.0";
+ version = "5.6.0";
src = fetchPypi {
inherit pname version;
- sha256 = "fa915c231e64a30d19cc2c70ccab6444cbaa93e44e92b5f8233dd9147ad0e664";
+ sha256 = "e2c8e931cc19db4f8c63e6a396efbc13a228b2cb5b2919df011b946f28239a08";
};
LC_ALL = "en_US.utf8";
diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix
index 33d044c41aa..48ca5a80add 100644
--- a/pkgs/development/python-modules/numba/default.nix
+++ b/pkgs/development/python-modules/numba/default.nix
@@ -14,12 +14,12 @@
}:
buildPythonPackage rec {
- version = "0.38.1";
+ version = "0.39.0";
pname = "numba";
src = fetchPypi {
inherit pname version;
- sha256 = "48fb76b8dcde868d6426c7c7836b76a0b2b20861547770c27b6307f712c09bc5";
+ sha256 = "07749d1ddac8c4c0ce8b22bf3dec52ef2fd4922174c71447126807f5f8dc2bae";
};
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
diff --git a/pkgs/development/python-modules/numexpr/default.nix b/pkgs/development/python-modules/numexpr/default.nix
index 8ba4e0061fa..09f6c6636c1 100644
--- a/pkgs/development/python-modules/numexpr/default.nix
+++ b/pkgs/development/python-modules/numexpr/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "numexpr";
- version = "2.6.5";
+ version = "2.6.6";
src = fetchPypi {
inherit pname version;
- sha256 = "f8ad8014085628eab91bc82fb9d10cf9ab8e04ede4884e4a1061445d395b36bb";
+ sha256 = "97c1f7fa409439ae933494014cd41d43de84cfe6c98b7f93392f94d54de1b453";
};
propagatedBuildInputs = [ numpy ];
diff --git a/pkgs/development/python-modules/numpy-stl/default.nix b/pkgs/development/python-modules/numpy-stl/default.nix
index 2ec5066e5fc..e4a9aa67dfd 100644
--- a/pkgs/development/python-modules/numpy-stl/default.nix
+++ b/pkgs/development/python-modules/numpy-stl/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "numpy-stl";
- version = "2.4.1";
+ version = "2.7.0";
src = fetchPypi {
inherit pname version;
- sha256 = "33e88013ed2f4f9ec45598f0e0930a0d602ab3c49aa19e92703a867f37ffe520";
+ sha256 = "ede911118cfee5a8fd4c341b418fc55bfcd70a557686febc4efb6693297e3aa2";
};
checkInputs = [ pytest pytestrunner ];
diff --git a/pkgs/development/python-modules/outcome/default.nix b/pkgs/development/python-modules/outcome/default.nix
index e91925c75d5..9525be4cb34 100644
--- a/pkgs/development/python-modules/outcome/default.nix
+++ b/pkgs/development/python-modules/outcome/default.nix
@@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "outcome";
- version = "0.1.0a0";
+ version = "0.1.0";
disabled = pythonOlder "3.4";
src = fetchPypi {
inherit pname version;
- sha256 = "0cqwakzigw0602dxlb7c1882jwr8hn5nrxk1l8iwlmzc9whh48wn";
+ sha256 = "d54e5d469088af53022f64a753b288d6bab0fe42e513eb7146137d560e2e516e";
};
checkInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix
index ef07f2a36e3..a3b2cd5e42f 100644
--- a/pkgs/development/python-modules/pandas/default.nix
+++ b/pkgs/development/python-modules/pandas/default.nix
@@ -28,11 +28,11 @@ let
in buildPythonPackage rec {
pname = "pandas";
- version = "0.23.1";
+ version = "0.23.3";
src = fetchPypi {
inherit pname version;
- sha256 = "50b52af2af2e15f4aeb2fe196da073a8c131fa02e433e105d95ce40016df5690";
+ sha256 = "9cd3614b4e31a0889388ff1bd19ae857ad52658b33f776065793c293a29cf612";
};
LC_ALL = "en_US.UTF-8";
@@ -97,7 +97,8 @@ in buildPythonPackage rec {
chmod a+x pbcopy pbpaste
export PATH=$(pwd):$PATH
'' + ''
- py.test $out/${python.sitePackages}/pandas --skip-slow --skip-network -k "$disabledTests"
+ # pandas no longer seems to distribute datasets for IO tests
+ py.test $out/${python.sitePackages}/pandas --ignore=io --skip-slow --skip-network -k "$disabledTests"
runHook postCheck
'';
diff --git a/pkgs/development/python-modules/paramz/default.nix b/pkgs/development/python-modules/paramz/default.nix
index daca12f66c0..718393b5e1e 100644
--- a/pkgs/development/python-modules/paramz/default.nix
+++ b/pkgs/development/python-modules/paramz/default.nix
@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "paramz";
- version = "0.9.1";
+ version = "0.9.2";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
- sha256 = "8a5a2fe5cdb033eb869c49e81fde2a9d0055fadb53a8af1665a7f48f320179cf";
+ sha256 = "7b38c2487602c423ac402214c3b3fa6bbe22b294e2f9e5f9f3842182e1541599";
};
propagatedBuildInputs = [ numpy scipy six decorator ];
diff --git a/pkgs/development/python-modules/parso/default.nix b/pkgs/development/python-modules/parso/default.nix
index 7f3bc9cf482..c29901b2e99 100644
--- a/pkgs/development/python-modules/parso/default.nix
+++ b/pkgs/development/python-modules/parso/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "parso";
- version = "0.2.1";
+ version = "0.3.1";
src = fetchPypi {
inherit pname version;
- sha256 = "f0604a40b96e062b0fd99cf134cc2d5cdf66939d0902f8267d938b0d5b26707f";
+ sha256 = "35704a43a3c113cce4de228ddb39aab374b8004f4f2407d070b6a2ca784ce8a2";
};
checkInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/parver/default.nix b/pkgs/development/python-modules/parver/default.nix
new file mode 100644
index 00000000000..7918c5bf6fa
--- /dev/null
+++ b/pkgs/development/python-modules/parver/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, six
+, attrs
+, pytest
+, hypothesis
+, pretend
+, arpeggio
+}:
+
+buildPythonPackage rec {
+ pname = "parver";
+ version = "0.1.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "05dsjmk3ckd175ln8smxr1f6l6qsrjyd8s5vfqc5x7fii3vgyjmc";
+ };
+
+ propagatedBuildInputs = [ six attrs arpeggio ];
+ checkInputs = [ pytest hypothesis pretend ];
+
+ meta = {
+ description = "parver allows parsing and manipulation of PEP 440 version numbers.";
+ license = lib.licenses.mit;
+ };
+}
diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix
index 764319a1a0d..666df965f87 100644
--- a/pkgs/development/python-modules/pbr/default.nix
+++ b/pkgs/development/python-modules/pbr/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pbr";
- version = "4.0.4";
+ version = "4.1.1";
src = fetchPypi {
inherit pname version;
- sha256 = "a9c27eb8f0e24e786e544b2dbaedb729c9d8546342b5a6818d8eda098ad4340d";
+ sha256 = "754e766b4f4bad3aa68cfd532456298da1aa39375da8748392dbae90860d5f18";
};
# circular dependencies with fixtures
diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix
index b797e6e76a0..79a5a646ead 100644
--- a/pkgs/development/python-modules/phonenumbers/default.nix
+++ b/pkgs/development/python-modules/phonenumbers/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "phonenumbers";
- version = "8.9.8";
+ version = "8.9.10";
src = fetchPypi {
inherit pname version;
- sha256 = "7813a9d45f0d1386a23552072af20a3ef34fa34f76eeb9033743ff083f9551e1";
+ sha256 = "cbb8194814cc026f476132c38c507adbd459bc8ee99be39f421650ab1b986ed7";
};
meta = {
diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix
index 44399f34bda..22bd2fd8246 100644
--- a/pkgs/development/python-modules/pillow/default.nix
+++ b/pkgs/development/python-modules/pillow/default.nix
@@ -6,11 +6,11 @@
}:
buildPythonPackage rec {
pname = "Pillow";
- version = "5.1.0";
+ version = "5.2.0";
src = fetchPypi {
inherit pname version;
- sha256 = "cee9bc75bff455d317b6947081df0824a8f118de2786dc3d74a3503fd631f4ef";
+ sha256 = "f8b3d413c5a8f84b12cd4c5df1d8e211777c9852c6be3ee9c094b626644d3eab";
};
doCheck = !stdenv.isDarwin && !isPyPy;
diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix
index 20558312f29..f5732d2cb95 100644
--- a/pkgs/development/python-modules/pip/default.nix
+++ b/pkgs/development/python-modules/pip/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "pip";
- version = "10.0.1";
+ version = "18.0";
src = fetchPypi {
inherit pname version;
- sha256 = "f2bd08e0cd1b06e10218feaf6fef299f473ba706582eb3bd9d52203fdbd7ee68";
+ sha256 = "a0e11645ee37c90b40c46d607070c4fd583e2cd46231b1c06e389c5e814eed76";
};
# pip detects that we already have bootstrapped_pip "installed", so we need
diff --git a/pkgs/development/python-modules/plaster-pastedeploy/default.nix b/pkgs/development/python-modules/plaster-pastedeploy/default.nix
index 5675be32397..ac6cdc31f48 100644
--- a/pkgs/development/python-modules/plaster-pastedeploy/default.nix
+++ b/pkgs/development/python-modules/plaster-pastedeploy/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "plaster_pastedeploy";
- version = "0.5";
+ version = "0.6";
src = fetchPypi {
inherit pname version;
- sha256 = "70a3185b2a3336996a26e9987968cf35e84cf13390b7e8a0a9a91eb8f6f85ba9";
+ sha256 = "c231130cb86ae414084008fe1d1797db7e61dc5eaafb5e755de21387c27c6fae";
};
checkPhase = ''
diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix
index 6a1993e1fd1..9d2df2a89eb 100644
--- a/pkgs/development/python-modules/plotly/default.nix
+++ b/pkgs/development/python-modules/plotly/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "plotly";
- version = "2.7.0";
+ version = "3.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "f7305816a423fd899da20919282445703118aeece19a54fb97be4cbf302341f8";
+ sha256 = "015a5b8ca616d19eb96433dd597c3ccccc80e3afba02a23bd526a017ff4fce05";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/preshed/default.nix b/pkgs/development/python-modules/preshed/default.nix
index ba1537a02c8..14baf995e6b 100644
--- a/pkgs/development/python-modules/preshed/default.nix
+++ b/pkgs/development/python-modules/preshed/default.nix
@@ -8,11 +8,11 @@
}:
buildPythonPackage rec {
pname = "preshed";
- version = "1.0.0";
+ version = "1.0.1";
src = fetchPypi {
inherit pname version;
- sha256 = "1pdl4p2d32ficfh18xdkgsj6ajzdxc6mxhhf84z0wq1l8viskcx6";
+ sha256 = "7b99ace606143a922163a7ff7ad4969b296288f5b20b9c9bda328caec3b92f71";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/progressbar/default.nix b/pkgs/development/python-modules/progressbar/default.nix
index 59ef547dba3..a8e8bf07ad5 100644
--- a/pkgs/development/python-modules/progressbar/default.nix
+++ b/pkgs/development/python-modules/progressbar/default.nix
@@ -2,14 +2,14 @@
buildPythonPackage rec {
pname = "progressbar";
- version = "2.3";
+ version = "2.5";
# https://github.com/niltonvolpato/python-progressbar/issues/54
disabled = isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "b2d38a729785149e65323381d2e6fca0a5e9615a6d8bcf10bfa8adedfc481254";
+ sha256 = "5d81cb529da2e223b53962afd6c8ca0f05c6670e40309a7219eacc36af9b6c63";
};
# invalid command 'test'
diff --git a/pkgs/development/python-modules/prometheus_client/default.nix b/pkgs/development/python-modules/prometheus_client/default.nix
index f6b2bfa939c..be014bc0f7e 100644
--- a/pkgs/development/python-modules/prometheus_client/default.nix
+++ b/pkgs/development/python-modules/prometheus_client/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "prometheus_client";
- version = "0.2.0";
+ version = "0.3.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1r3510jq6iryd2a8jln2qpvqy112y5502ncbfkn116xl7gj74r6r";
+ sha256 = "69494dc1ac967c0f626c8193e439755c2b95dd4ed22ef31c277601778a50c7ff";
};
doCheck = false;
diff --git a/pkgs/development/python-modules/ptyprocess/default.nix b/pkgs/development/python-modules/ptyprocess/default.nix
index c1c9ce18c56..5de528ccd40 100644
--- a/pkgs/development/python-modules/ptyprocess/default.nix
+++ b/pkgs/development/python-modules/ptyprocess/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "ptyprocess";
- version = "0.5.2";
+ version = "0.6.0";
src = fetchPypi {
inherit pname version;
- sha256 = "e64193f0047ad603b71f202332ab5527c5e52aa7c8b609704fc28c0dc20c4365";
+ sha256 = "923f299cc5ad920c68f2bc0bc98b75b9f838b93b599941a6b63ddbc2476394c0";
};
meta = {
diff --git a/pkgs/development/python-modules/py/default.nix b/pkgs/development/python-modules/py/default.nix
index 564946c579a..14ffb8e2773 100644
--- a/pkgs/development/python-modules/py/default.nix
+++ b/pkgs/development/python-modules/py/default.nix
@@ -1,16 +1,18 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ stdenv, buildPythonPackage, fetchPypi, setuptools_scm }:
buildPythonPackage rec {
pname = "py";
- version = "1.5.3";
+ version = "1.5.4";
src = fetchPypi {
inherit pname version;
- sha256 = "29c9fab495d7528e80ba1e343b958684f4ace687327e6f789a94bf3d1915f881";
+ sha256 = "3fd59af7435864e1a243790d322d763925431213b6b8529c6ca71081ace3bbf7";
};
# Circular dependency on pytest
doCheck = false;
+ buildInputs = [ setuptools_scm ];
+
meta = with stdenv.lib; {
description = "Library with cross-python path, ini-parsing, io, code, log facilities";
homepage = http://pylib.readthedocs.org/;
diff --git a/pkgs/development/python-modules/py3exiv2/default.nix b/pkgs/development/python-modules/py3exiv2/default.nix
index ab83e54fd82..d8633488102 100644
--- a/pkgs/development/python-modules/py3exiv2/default.nix
+++ b/pkgs/development/python-modules/py3exiv2/default.nix
@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "py3exiv2";
- version = "0.3.0";
+ version = "0.4.0";
disabled = !(isPy3k);
src = fetchPypi {
inherit pname version;
- sha256 = "14626aaa83cae4cd3d54f51646a0fd048e8ee0e3caf205522b33020226da8c0e";
+ sha256 = "4042492db49efbdfc53e0afa89509695826b3fb74fb52444ed04f64c229a65f5";
};
buildInputs = [ exiv2 boost ];
diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix
index b5ac0f7b7b1..e47771d5ca0 100644
--- a/pkgs/development/python-modules/py3status/default.nix
+++ b/pkgs/development/python-modules/py3status/default.nix
@@ -18,10 +18,10 @@
buildPythonPackage rec {
pname = "py3status";
- version = "3.8";
+ version = "3.11";
src = fetchPypi {
inherit pname version;
- sha256 = "1izjpf9q768m3j95y328vbdh7rycglqlslyd777b12c13i6zs6cb";
+ sha256 = "ba6930427d57b79cf344262494fdcbddbf75f6e37794489d445f2ebb8bc53ec5";
};
doCheck = false;
propagatedBuildInputs = [ pytz requests tzlocal ];
diff --git a/pkgs/development/python-modules/pyasn1-modules/default.nix b/pkgs/development/python-modules/pyasn1-modules/default.nix
index 35c0d523300..8c23d2a3f30 100644
--- a/pkgs/development/python-modules/pyasn1-modules/default.nix
+++ b/pkgs/development/python-modules/pyasn1-modules/default.nix
@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "pyasn1-modules";
- version = "0.2.1";
+ version = "0.2.2";
disabled = isPyPy;
src = fetchPypi {
inherit pname version;
- sha256 = "af00ea8f2022b6287dc375b2c70f31ab5af83989fc6fe9eacd4976ce26cd7ccc";
+ sha256 = "a0cf3e1842e7c60fde97cb22d275eb6f9524f5c5250489e292529de841417547";
};
propagatedBuildInputs = [ pyasn1 ];
diff --git a/pkgs/development/python-modules/pyasn1/default.nix b/pkgs/development/python-modules/pyasn1/default.nix
index c1b133a0ab7..d7d266b23ff 100644
--- a/pkgs/development/python-modules/pyasn1/default.nix
+++ b/pkgs/development/python-modules/pyasn1/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pyasn1";
- version = "0.4.3";
+ version = "0.4.4";
src = fetchPypi {
inherit pname version;
- sha256 = "fb81622d8f3509f0026b0683fe90fea27be7284d3826a5f2edf97f69151ab0fc";
+ sha256 = "f58f2a3d12fd754aa123e9fa74fb7345333000a035f3921dbdaa08597aa53137";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/pycodestyle/default.nix b/pkgs/development/python-modules/pycodestyle/default.nix
index 32ef1d547b0..69b8e2bc0d1 100644
--- a/pkgs/development/python-modules/pycodestyle/default.nix
+++ b/pkgs/development/python-modules/pycodestyle/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pycodestyle";
- version = "2.3.1";
+ version = "2.4.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0rk78b66p57ala26mdldl9lafr48blv5s659sah9q50qnfjmc8k8";
+ sha256 = "cbfca99bd594a10f674d0cd97a3d802a1fdef635d4361e1a2658de47ed261e3a";
};
meta = with lib; {
diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix
index 35041f8447b..27ccc7f4687 100644
--- a/pkgs/development/python-modules/pycryptodome/default.nix
+++ b/pkgs/development/python-modules/pycryptodome/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchPypi, buildPythonPackage }:
buildPythonPackage rec {
- version = "3.6.2";
+ version = "3.6.4";
pname = "pycryptodome";
src = fetchPypi {
inherit pname version;
- sha256 = "b19ed0f7752a0b1ec65834c9acb02ba64a812990854e318d32a619c709b14a69";
+ sha256 = "9c7790ffd291c81b934fe0ca8155a67235d33f70d4914bbf7467a447d9dbcb09";
};
meta = {
diff --git a/pkgs/development/python-modules/pycryptodomex/default.nix b/pkgs/development/python-modules/pycryptodomex/default.nix
index aa838bc928e..b5487a24b77 100644
--- a/pkgs/development/python-modules/pycryptodomex/default.nix
+++ b/pkgs/development/python-modules/pycryptodomex/default.nix
@@ -2,7 +2,7 @@
buildPythonPackage rec {
pname = "pycryptodomex";
- version = "3.6.2";
+ version = "3.6.4";
meta = {
description = "A self-contained cryptographic library for Python";
@@ -12,6 +12,6 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "8ed51799f6c060b4f62459e1bd9f3b3855bec6fa68202e76639d628001fdf3b7";
+ sha256 = "4daabe7c0404e673b9029aa43761c779b9b4df2cbe11ccd94daded6a0acd8808";
};
}
diff --git a/pkgs/development/python-modules/pyflakes/default.nix b/pkgs/development/python-modules/pyflakes/default.nix
index 06b027dd59a..d833d9a0f68 100644
--- a/pkgs/development/python-modules/pyflakes/default.nix
+++ b/pkgs/development/python-modules/pyflakes/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pyflakes";
- version = "1.6.0";
+ version = "2.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "8d616a382f243dbf19b54743f280b80198be0bca3a5396f1d2e1fca6223e8805";
+ sha256 = "9a7662ec724d0120012f6e29d6248ae3727d821bba522a0e6b356eff19126a49";
};
buildInputs = [ unittest2 ];
diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix
index b6c9ae5e8ba..8fbd73dfc1f 100644
--- a/pkgs/development/python-modules/pygame/default.nix
+++ b/pkgs/development/python-modules/pygame/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "pygame";
- version = "1.9.3";
+ version = "1.9.4";
src = fetchurl {
url = "mirror://pypi/p/pygame/pygame-${version}.tar.gz";
- sha256 = "1hlydiyygl444bq5m5g8n3jsxsgrdyxlm42ipmfbw36wkf0j243m";
+ sha256 = "700d1781c999af25d11bfd1f3e158ebb660f72ebccb2040ecafe5069d0b2c0b6";
};
buildInputs = [
diff --git a/pkgs/development/python-modules/pyhomematic/default.nix b/pkgs/development/python-modules/pyhomematic/default.nix
index a8946857d88..4ec77ed96c1 100644
--- a/pkgs/development/python-modules/pyhomematic/default.nix
+++ b/pkgs/development/python-modules/pyhomematic/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "pyhomematic";
- version = "0.1.44";
+ version = "0.1.46";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "09f928d33fefd1ef5d18325877d73d01c6811b6177fc97fc1190c20acc5e12a9";
+ sha256 = "0a0ba8de05fc6d60bbb0beec7e808fb231abcb566c3bc17de532f72b18fe2837";
};
# PyPI tarball does not include tests/ directory
diff --git a/pkgs/development/python-modules/pykdtree/default.nix b/pkgs/development/python-modules/pykdtree/default.nix
index 86524b6002d..2dd014821e6 100644
--- a/pkgs/development/python-modules/pykdtree/default.nix
+++ b/pkgs/development/python-modules/pykdtree/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pykdtree";
- version = "1.3.0";
+ version = "1.3.1";
src = fetchPypi {
inherit pname version;
- sha256 = "79351b79087f473f83fb27a5cd552bd1056f2dfa7acec5d4a68f35a7cbea6776";
+ sha256 = "0d49d3bbfa0366dbe29176754ec86df75114a25525b530dcbbb75d3ac4c263e9";
};
buildInputs = [ openmp ];
diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix
index cd112f7c4e9..0156e92738a 100644
--- a/pkgs/development/python-modules/pylint/default.nix
+++ b/pkgs/development/python-modules/pylint/default.nix
@@ -1,29 +1,32 @@
-{ stdenv, buildPythonPackage, fetchPypi, python, astroid, isort,
- pytest, pytestrunner, mccabe, configparser, backports_functools_lru_cache }:
+{ stdenv, buildPythonPackage, fetchPypi, python, pythonOlder, astroid, isort,
+ pytest, pytestrunner, mccabe, pytest_xdist, pyenchant }:
buildPythonPackage rec {
pname = "pylint";
- version = "1.9.2";
+ version = "2.0.1";
+
+ disabled = pythonOlder "3.4";
src = fetchPypi {
inherit pname version;
- sha256 = "fff220bcb996b4f7e2b0f6812fd81507b72ca4d8c4d05daf2655c333800cb9b3";
+ sha256 = "2c90a24bee8fae22ac98061c896e61f45c5b73c2e0511a4bf53f99ba56e90434";
};
- buildInputs = [ pytest pytestrunner mccabe configparser backports_functools_lru_cache ];
+ checkInputs = [ pytest pytestrunner pytest_xdist pyenchant ];
- propagatedBuildInputs = [ astroid configparser isort mccabe ];
+ propagatedBuildInputs = [ astroid isort mccabe ];
postPatch = ''
- # Remove broken darwin tests
- sed -i -e '/test_parallel_execution/,+2d' pylint/test/test_self.py
- sed -i -e '/test_py3k_jobs_option/,+4d' pylint/test/test_self.py
+ # Remove broken darwin test
rm -vf pylint/test/test_functional.py
'';
checkPhase = ''
- cd pylint/test
- ${python.interpreter} -m unittest discover -p "*test*"
+ cat pylint/test/test_self.py
+ # Disable broken darwin tests
+ pytest pylint/test -k "not test_parallel_execution \
+ and not test_py3k_jobs_option \
+ and not test_good_comprehension_checks"
'';
postInstall = ''
diff --git a/pkgs/development/python-modules/pylru/default.nix b/pkgs/development/python-modules/pylru/default.nix
index 79bb6dbd9a2..b0fd4f4003a 100644
--- a/pkgs/development/python-modules/pylru/default.nix
+++ b/pkgs/development/python-modules/pylru/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pylru";
- version = "1.0.9";
+ version = "1.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0b0pq0l7xv83dfsajsc49jcxzc99kb9jfx1a1dlx22hzcy962dvi";
+ sha256 = "e03a3d354eb8fdfa11638698e8a1f06cd3b3a214ebc0a120c603a79290d9ebec";
};
meta = with lib; {
diff --git a/pkgs/development/python-modules/pymc3/default.nix b/pkgs/development/python-modules/pymc3/default.nix
index 5af6ef99228..ebf852c09a4 100644
--- a/pkgs/development/python-modules/pymc3/default.nix
+++ b/pkgs/development/python-modules/pymc3/default.nix
@@ -16,12 +16,12 @@
buildPythonPackage rec {
pname = "pymc3";
- version = "3.4.1";
+ version = "3.5";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "b8fe2a1ca142674f1b5cbed05a0a54ce9dade5998370005ddcea349472e7fe2d";
+ sha256 = "6088e683c6d730bb21350a0f54ee083fa5a28e4d5ef52d57878141c9c20f21ee";
};
# No need for coverage stats in Nix builds
diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix
index 838adeac8a8..9c8bf84e7c5 100644
--- a/pkgs/development/python-modules/pymongo/default.nix
+++ b/pkgs/development/python-modules/pymongo/default.nix
@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "pymongo";
- version = "3.6.1";
+ version = "3.7.1";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
- sha256 = "f7ebcb846962ee40374db2d9014a89bea9c983ae63c1877957c3a0a756974796";
+ sha256 = "f14fb6c4058772a0d74d82874d3b89d7264d89b4ed7fa0413ea0ef8112b268b9";
};
doCheck = false;
diff --git a/pkgs/development/python-modules/pyperclip/default.nix b/pkgs/development/python-modules/pyperclip/default.nix
index 0a972d4864b..0b073799254 100644
--- a/pkgs/development/python-modules/pyperclip/default.nix
+++ b/pkgs/development/python-modules/pyperclip/default.nix
@@ -1,12 +1,12 @@
{ lib, buildPythonPackage, fetchPypi }:
buildPythonPackage rec {
- version = "1.6.2";
+ version = "1.6.4";
pname = "pyperclip";
src = fetchPypi {
inherit pname version;
- sha256 = "43496f0a1f363a5ecfc4cda5eba6a2a3d5056fe6c7ffb9a99fbb1c5a3c7dea05";
+ sha256 = "f70e83d27c445795b6bf98c2bc826bbf2d0d63d4c7f83091c8064439042ba0dc";
};
doCheck = false;
diff --git a/pkgs/development/python-modules/pyserial/default.nix b/pkgs/development/python-modules/pyserial/default.nix
index 508104d3312..c7787a42691 100644
--- a/pkgs/development/python-modules/pyserial/default.nix
+++ b/pkgs/development/python-modules/pyserial/default.nix
@@ -10,7 +10,7 @@ buildPythonPackage rec {
};
checkPhase = "python -m unittest discover -s test";
- doInstallCheck = !hostPlatform.isDarwin; # broken on darwin
+ doCheck = !hostPlatform.isDarwin; # broken on darwin
meta = with lib; {
homepage = "https://github.com/pyserial/pyserial";
diff --git a/pkgs/development/python-modules/pystemmer/default.nix b/pkgs/development/python-modules/pystemmer/default.nix
new file mode 100644
index 00000000000..e569042f729
--- /dev/null
+++ b/pkgs/development/python-modules/pystemmer/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, python, fetchPypi, buildPythonPackage, cython }:
+
+buildPythonPackage rec {
+ pname = "PyStemmer";
+ version = "1.3.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "d1ac14eb64978c1697fcfba76e3ac7ebe24357c9428e775390f634648947cb91";
+ };
+
+ nativeBuildInputs = [ cython ];
+
+ preBuild = ''
+ cython src/Stemmer.pyx
+ '';
+
+ checkPhase = ''
+ ${python.interpreter} runtests.py
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Snowball stemming algorithms, for information retrieval";
+ homepage = http://snowball.tartarus.org/;
+ license = licenses.mit;
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/development/python-modules/pytest-flake8/default.nix b/pkgs/development/python-modules/pytest-flake8/default.nix
index 1d7447293df..2ad44c4e806 100644
--- a/pkgs/development/python-modules/pytest-flake8/default.nix
+++ b/pkgs/development/python-modules/pytest-flake8/default.nix
@@ -19,6 +19,9 @@ buildPythonPackage rec {
pytest . -k "not test_mtime_caching"
'';
+ # https://github.com/tholo/pytest-flake8/issues/49
+ doCheck = false;
+
meta = {
description = "py.test plugin for efficiently checking PEP8 compliance";
homepage = https://github.com/tholo/pytest-flake8;
diff --git a/pkgs/development/python-modules/pytest-server-fixtures/default.nix b/pkgs/development/python-modules/pytest-server-fixtures/default.nix
index c50795a6669..caede4c1809 100644
--- a/pkgs/development/python-modules/pytest-server-fixtures/default.nix
+++ b/pkgs/development/python-modules/pytest-server-fixtures/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "pytest-server-fixtures";
- version = "1.3.0";
+ version = "1.3.1";
src = fetchPypi {
inherit pname version;
- sha256 = "21eef04612ed42f73534c45ddbaef8458c800809354a5f5a96a8fde88b2a97e7";
+ sha256 = "902607675ce2ee09bdc72381b4470f79504fc131afdc15174e49a84d031760df";
};
buildInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/pytest-timeout/default.nix b/pkgs/development/python-modules/pytest-timeout/default.nix
index cca3279482b..012226de053 100644
--- a/pkgs/development/python-modules/pytest-timeout/default.nix
+++ b/pkgs/development/python-modules/pytest-timeout/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "pytest-timeout";
- version = "1.3.0";
+ version = "1.3.1";
src = fetchPypi {
inherit pname version;
- sha256 = "08b550b498b9251901a3747f02aa2624ed53a9c8285ca482551346c85b47d641";
+ sha256 = "4b261bec5782b603c98b4bb803484bc96bf1cdcb5480dae0999d21c7e0423a23";
};
buildInputs = [ pytest ];
checkInputs = [ pytest pexpect ];
diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix
index 84f337e1b83..2e88a765417 100644
--- a/pkgs/development/python-modules/pytest-xdist/default.nix
+++ b/pkgs/development/python-modules/pytest-xdist/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pytest-xdist";
- version = "1.22.2";
+ version = "1.22.3";
src = fetchPypi {
inherit pname version;
- sha256 = "e8f5744acc270b3e7d915bdb4d5f471670f049b6fbd163d4cbd52203b075d30f";
+ sha256 = "48868d1f461122ac8c5fb60487b6da03c0d73dcb06a9d79e06c4eab8ef62a5c3";
};
nativeBuildInputs = [ setuptools_scm ];
diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix
index 1c0ceef8365..5fda0994010 100644
--- a/pkgs/development/python-modules/pytest/default.nix
+++ b/pkgs/development/python-modules/pytest/default.nix
@@ -3,7 +3,7 @@
, atomicwrites, mock, writeText
}:
buildPythonPackage rec {
- version = "3.6.2";
+ version = "3.6.3";
pname = "pytest";
preCheck = ''
@@ -13,7 +13,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "8ea01fc4fcc8e1b1e305252b4bc80a1528019ab99fd3b88666c9dc38d754406c";
+ sha256 = "0453c8676c2bee6feb0434748b068d5510273a916295fd61d306c4f22fbfd752";
};
checkInputs = [ hypothesis mock ];
@@ -27,9 +27,11 @@ buildPythonPackage rec {
runHook postCheck
'';
- # Don't create .pytest-cache when using py.test in a Nix build
+ # Remove .pytest-cache when using py.test in a Nix build
setupHook = writeText "pytest-hook" ''
- export PYTEST_ADDOPTS="-p no:cacheprovider"
+ postFixupHooks+=(
+ 'find $out -name .pytest-cache -type d -exec rm -rf {} +'
+ )
'';
meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/python-axolotl-curve25519/default.nix b/pkgs/development/python-modules/python-axolotl-curve25519/default.nix
index 91def55c5e4..e372913af7d 100644
--- a/pkgs/development/python-modules/python-axolotl-curve25519/default.nix
+++ b/pkgs/development/python-modules/python-axolotl-curve25519/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "python-axolotl-curve25519";
- version = "0.1";
+ version = "0.4.1.post2";
src = fetchPypi {
inherit pname version;
- sha256 = "1h1rsdr7m8lvgxwrwng7qv0xxmyc9k0q7g9nbcr6ks2ipyjzcnf5";
+ sha256 = "0705a66297ebd2f508a60dc94e22881c754301eb81db93963322f6b3bdcb63a3";
};
meta = with lib; {
diff --git a/pkgs/development/python-modules/python-axolotl/default.nix b/pkgs/development/python-modules/python-axolotl/default.nix
index 1fff6bb7608..299a1887199 100644
--- a/pkgs/development/python-modules/python-axolotl/default.nix
+++ b/pkgs/development/python-modules/python-axolotl/default.nix
@@ -1,17 +1,15 @@
-{ lib, buildPythonPackage, fetchPypi, python-axolotl-curve25519, protobuf, pycrypto }:
+{ lib, buildPythonPackage, fetchPypi, cryptography, python-axolotl-curve25519, protobuf }:
buildPythonPackage rec {
pname = "python-axolotl";
- version = "0.1.39";
+ version = "0.1.42";
src = fetchPypi {
inherit pname version;
- sha256 = "09bf5gfip9x2wr0ij43p39ac6z2iqzn7kgpi2jjbwpnhs0vwkycs";
+ sha256 = "ef78c2efabcd4c33741669334bdda04710a3ef0e00b653f00127acff6460a7f0";
};
- propagatedBuildInputs = [ python-axolotl-curve25519 protobuf pycrypto ];
- # IV == 0 in tests is not supported by pycryptodome (our pycrypto drop-in)
- doCheck = false;
+ propagatedBuildInputs = [ cryptography python-axolotl-curve25519 protobuf ];
meta = with lib; {
homepage = https://github.com/tgalal/python-axolotl;
diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix
index d5547217910..5bb20ae8e77 100644
--- a/pkgs/development/python-modules/python-telegram-bot/default.nix
+++ b/pkgs/development/python-modules/python-telegram-bot/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "python-telegram-bot";
- version = "9.0.0";
+ version = "10.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0a5b4wfc6ms7kblynw2h3ygpww98kyz5n8iibqbdyykwx8xj7hzm";
+ sha256 = "ca2f8a44ddef7271477e16f4986647fa90ef4df5b55a7953e53b9c9d2672f639";
};
prePatch = ''
diff --git a/pkgs/development/python-modules/python_fedora/default.nix b/pkgs/development/python-modules/python_fedora/default.nix
index f476d0d4d44..1ff1f651264 100644
--- a/pkgs/development/python-modules/python_fedora/default.nix
+++ b/pkgs/development/python-modules/python_fedora/default.nix
@@ -3,12 +3,12 @@
buildPythonPackage rec {
pname = "python-fedora";
- version = "0.9.0";
+ version = "0.10.0";
name = pname + "-" + version;
src = fetchPypi {
inherit pname version;
- sha256 = "0sf468scw52sw9pzxrnmqs54rix9c4fp1mi2r5k5n7mgjrmf6j0x";
+ sha256 = "5516b8c066bb2eb5d604ae8e84c3d31e27753795c5d84f6a792979363756405c";
};
propagatedBuildInputs = [ kitchen requests bunch paver lockfile
six munch urllib3 beautifulsoup4 openidc-client ];
diff --git a/pkgs/development/python-modules/python_openzwave/default.nix b/pkgs/development/python-modules/python_openzwave/default.nix
index d5cf709104f..d29365c86ba 100644
--- a/pkgs/development/python-modules/python_openzwave/default.nix
+++ b/pkgs/development/python-modules/python_openzwave/default.nix
@@ -5,13 +5,13 @@
buildPythonPackage rec {
pname = "python_openzwave";
- version = "0.4.4";
+ version = "0.4.7";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "17wdgwg212agj1gxb2kih4cvhjb5bprir4x446s8qwx0mz03azk2";
+ sha256 = "b28a3abefc04d1d04dd68ee5a695b091e96ba7ab9a9eaa67db43dd55b61a4664";
extension = "zip";
};
diff --git a/pkgs/development/python-modules/pytools/default.nix b/pkgs/development/python-modules/pytools/default.nix
index 31092705d0f..41eac5d2044 100644
--- a/pkgs/development/python-modules/pytools/default.nix
+++ b/pkgs/development/python-modules/pytools/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "pytools";
- version = "2018.4";
+ version = "2018.5.2";
src = fetchPypi {
inherit pname version;
- sha256 = "f9746ef763ce4d7d59ee8506ee83dd684884e4b520244b67f253095decc8a876";
+ sha256 = "3b3f41e1235b579dc4f4a3d6f5f8ae187841968e72a4f73ac481c6bfe4c1668b";
};
checkInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/pytz/default.nix b/pkgs/development/python-modules/pytz/default.nix
index 734fbbba717..7eb9ada5cae 100644
--- a/pkgs/development/python-modules/pytz/default.nix
+++ b/pkgs/development/python-modules/pytz/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pytz";
- version = "2018.4";
+ version = "2018.5";
src = fetchPypi {
inherit pname version;
- sha256 = "c06425302f2cf668f1bba7a0a03f3c1d34d4ebeef2c72003da308b3947c7f749";
+ sha256 = "ffb9ef1de172603304d9d2819af6f5ece76f2e85ec10692a524dd876e72bf277";
};
checkPhase = ''
diff --git a/pkgs/development/python-modules/pyxattr/default.nix b/pkgs/development/python-modules/pyxattr/default.nix
index 558dc37a394..f667e09892c 100644
--- a/pkgs/development/python-modules/pyxattr/default.nix
+++ b/pkgs/development/python-modules/pyxattr/default.nix
@@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "pyxattr";
- version = "0.6.0";
+ version = "0.6.1";
name = pname + "-" + version;
src = fetchPypi {
inherit pname version;
- sha256 = "1a3fqjlgbzq5hmc3yrnxxxl8nyn3rz2kfn17svbsahaq4gj0xl09";
+ sha256 = "b525843f6b51036198b3b87c4773a5093d6dec57d60c18a1f269dd7059aa16e3";
};
# IOError: [Errno 95] Operation not supported (expected)
diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix
index 4de7777fa8b..26c453e3a09 100644
--- a/pkgs/development/python-modules/pyzmq/default.nix
+++ b/pkgs/development/python-modules/pyzmq/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "pyzmq";
- version = "17.0.0";
+ version = "17.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0145ae59139b41f65e047a3a9ed11bbc36e37d5e96c64382fcdff911c4d8c3f0";
+ sha256 = "2199f753a230e26aec5238b0518b036780708a4c887d4944519681a920b9dee4";
};
checkInputs = [ pytest tornado ];
diff --git a/pkgs/development/python-modules/quantities/default.nix b/pkgs/development/python-modules/quantities/default.nix
index e65329c1b69..a4274317e1b 100644
--- a/pkgs/development/python-modules/quantities/default.nix
+++ b/pkgs/development/python-modules/quantities/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "quantities";
- version = "0.12.1";
+ version = "0.12.2";
src = fetchPypi {
inherit pname version;
- sha256 = "0a03e8511db603c57ca80dee851c43f08d0457f4d592bcac2e154570756cb934";
+ sha256 = "92e8397938516483f4fd1855097ec11953ab10dd0bf3293954559226679f76f0";
};
propagatedBuildInputs = [ numpy ];
diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix
index 660f56e1660..f3e6d1f5e0a 100644
--- a/pkgs/development/python-modules/regex/default.nix
+++ b/pkgs/development/python-modules/regex/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "regex";
- version = "2018.06.21";
+ version = "2018.07.11";
src = fetchPypi {
inherit pname version;
- sha256 = "b172583f0c5f104e059a30dd6a1f9d20693031b156558590a745d6cc3192e283";
+ sha256 = "9308dbce8e5ff4ee06b172a777f6c7f650a5835a5ad41a6080eb501639c27a2f";
};
postCheck = ''
diff --git a/pkgs/development/python-modules/reikna/default.nix b/pkgs/development/python-modules/reikna/default.nix
index e8e18face07..14e8f9f74ce 100644
--- a/pkgs/development/python-modules/reikna/default.nix
+++ b/pkgs/development/python-modules/reikna/default.nix
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "reikna";
- version = "0.6.8";
+ version = "0.7.0";
src = fetchPypi {
inherit pname version;
- sha256 = "34d92786237bef9ab5d37d78f01c155d0dcd1fc24df7782af9498a9f1786890c";
+ sha256 = "e27af9a202b8cdedd07793abbd3282806ec724aba091a27c76d7ba8284cfd8ba";
};
checkInputs = [ sphinx pytestcov pytest ];
diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix
index 0b3e84c3512..6ede1b8937b 100644
--- a/pkgs/development/python-modules/reportlab/default.nix
+++ b/pkgs/development/python-modules/reportlab/default.nix
@@ -11,11 +11,11 @@ let
ft = freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; });
in buildPythonPackage rec {
pname = "reportlab";
- version = "3.4.0";
+ version = "3.5.2";
src = fetchPypi {
inherit pname version;
- sha256 = "5beaf35e59dfd5ebd814fdefd76908292e818c982bd7332b5d347dfd2f01c343";
+ sha256 = "08986267eaf25d62c3802512f0a97dc3426d0c82f52c8beb576689582eb85b7f";
};
checkInputs = [ glibcLocales ];
diff --git a/pkgs/development/python-modules/requests-mock/default.nix b/pkgs/development/python-modules/requests-mock/default.nix
index 2286d9c2dc7..3ea1bf58d8a 100644
--- a/pkgs/development/python-modules/requests-mock/default.nix
+++ b/pkgs/development/python-modules/requests-mock/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "requests-mock";
- version = "1.5.0";
+ version = "1.5.2";
src = fetchPypi {
inherit pname version;
- sha256 = "a029fe6c5244963ef042c6224ff787049bfc5bab958a1b7e5b632ef0bbb05de4";
+ sha256 = "7a5fa99db5e3a2a961b6f20ed40ee6baeff73503cf0a553cc4d679409e6170fb";
};
patchPhase = ''
diff --git a/pkgs/development/python-modules/rfc7464/default.nix b/pkgs/development/python-modules/rfc7464/default.nix
new file mode 100644
index 00000000000..60a5308d718
--- /dev/null
+++ b/pkgs/development/python-modules/rfc7464/default.nix
@@ -0,0 +1,19 @@
+{ buildPythonPackage, fetchPypi, lib }:
+
+buildPythonPackage rec {
+ pname = "rfc7464";
+ version = "17.7.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1hcn6h38qplfcmq392cs58r01k16k202bqyap4br02376pr4ik7a";
+ extension = "zip";
+ };
+
+ meta = with lib; {
+ homepage = https://github.com/moshez/rfc7464;
+ description = "RFC 7464 is a proposed standard for streaming JSON documents.";
+ license = [ licenses.mit ];
+ maintainers = with maintainers; [ shlevy ];
+ };
+}
diff --git a/pkgs/development/python-modules/rlp/default.nix b/pkgs/development/python-modules/rlp/default.nix
index 87a59cf7397..381a784d24a 100644
--- a/pkgs/development/python-modules/rlp/default.nix
+++ b/pkgs/development/python-modules/rlp/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "rlp";
- version = "0.6.0";
+ version = "1.0.1";
src = fetchPypi {
inherit pname version;
- sha256 = "0d3gx4mp8q4z369s5yk1n9c55sgfw9fidbwqxq67d6s7l45rm1w7";
+ sha256 = "492c11b18e89af42f98e96bca7671ffee4ad4cf5e69ea23b4d2221157d81b512";
};
checkInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/salmon-mail/default.nix b/pkgs/development/python-modules/salmon-mail/default.nix
index 592182d8b31..b278d26b5dd 100644
--- a/pkgs/development/python-modules/salmon-mail/default.nix
+++ b/pkgs/development/python-modules/salmon-mail/default.nix
@@ -7,7 +7,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "1p4cv99jaszhfam9qj6parij94n7yzwz4bawfl9qh5syx77wkxg2";
+ sha256 = "e2f5c9cfe95e178813755c2df2f9f7c792246356d7489caa72f06b2553da8cdc";
};
checkInputs = [ nose jinja2 mock ];
diff --git a/pkgs/development/python-modules/sarge/default.nix b/pkgs/development/python-modules/sarge/default.nix
index bbdc4d90b28..cf9e175490d 100644
--- a/pkgs/development/python-modules/sarge/default.nix
+++ b/pkgs/development/python-modules/sarge/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "sarge";
- version = "0.1.4";
+ version = "0.1.5.post0";
src = fetchPypi {
inherit pname version;
- sha256 = "08s8896973bz1gg0pkr592w6g4p6v47bkfvws5i91p9xf8b35yar";
+ sha256 = "da8cc90883f8e5ab4af0d746438f608662f5f2a35da2e858517927edefa134b0";
};
meta = with lib; {
diff --git a/pkgs/development/python-modules/scikitlearn/default.nix b/pkgs/development/python-modules/scikitlearn/default.nix
index 39af29da814..c7b6947b37d 100644
--- a/pkgs/development/python-modules/scikitlearn/default.nix
+++ b/pkgs/development/python-modules/scikitlearn/default.nix
@@ -6,18 +6,16 @@
buildPythonPackage rec {
pname = "scikit-learn";
- version = "0.19.1";
- disabled = stdenv.isi686; # https://github.com/scikit-learn/scikit-learn/issues/5534
+ version = "0.19.2";
+ # UnboundLocalError: local variable 'message' referenced before assignment
+ disabled = true;
+# disabled = stdenv.isi686; # https://github.com/scikit-learn/scikit-learn/issues/5534
src = fetchPypi {
inherit pname version;
- sha256 = "5ca0ad32ee04abe0d4ba02c8d89d501b4e5e0304bdf4d45c2e9875a735b323a0";
+ sha256 = "b276739a5f863ccacb61999a3067d0895ee291c95502929b2ae56ea1f882e888";
};
- # basically https://github.com/scikit-learn/scikit-learn/pull/10723,
- # but rebased onto 0.19.1
- patches = [ ./n_iter-should-be-less-than-max_iter-using-lbgfs.patch ];
-
buildInputs = [ nose pillow gfortran glibcLocales ];
propagatedBuildInputs = [ numpy scipy numpy.blas ];
@@ -29,10 +27,12 @@ buildPythonPackage rec {
HOME=$TMPDIR OMP_NUM_THREADS=1 nosetests --doctest-options=+SKIP $out/${python.sitePackages}/sklearn/
'';
+
+
meta = with stdenv.lib; {
description = "A set of python modules for machine learning and data mining";
homepage = http://scikit-learn.org;
license = licenses.bsd3;
- maintainers = with maintainers; [ fridh ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/development/python-modules/scikitlearn/n_iter-should-be-less-than-max_iter-using-lbgfs.patch b/pkgs/development/python-modules/scikitlearn/n_iter-should-be-less-than-max_iter-using-lbgfs.patch
deleted file mode 100644
index 67309a673d0..00000000000
--- a/pkgs/development/python-modules/scikitlearn/n_iter-should-be-less-than-max_iter-using-lbgfs.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff --git a/sklearn/linear_model/huber.py b/sklearn/linear_model/huber.py
-index e17dc1e..665654d 100644
---- a/sklearn/linear_model/huber.py
-+++ b/sklearn/linear_model/huber.py
-@@ -181,7 +181,11 @@ class HuberRegressor(LinearModel, RegressorMixin, BaseEstimator):
-
- n_iter_ : int
- Number of iterations that fmin_l_bfgs_b has run for.
-- Not available if SciPy version is 0.9 and below.
-+
-+ .. versionchanged:: 0.20
-+
-+ In SciPy <= 1.0.0 the number of lbfgs iterations may exceed
-+ ``max_iter``. ``n_iter_`` will now report at most ``max_iter``.
-
- outliers_ : array, shape (n_samples,)
- A boolean mask which is set to True where the samples are identified
-@@ -272,7 +276,9 @@ class HuberRegressor(LinearModel, RegressorMixin, BaseEstimator):
- raise ValueError("HuberRegressor convergence failed:"
- " l-BFGS-b solver terminated with %s"
- % dict_['task'].decode('ascii'))
-- self.n_iter_ = dict_.get('nit', None)
-+ # In scipy <= 1.0.0, nit may exceed maxiter.
-+ # See https://github.com/scipy/scipy/issues/7854.
-+ self.n_iter_ = min(dict_.get('nit', None), self.max_iter)
- self.scale_ = parameters[-1]
- if self.fit_intercept:
- self.intercept_ = parameters[-2]
-diff --git a/sklearn/linear_model/logistic.py b/sklearn/linear_model/logistic.py
-index 8646c9a..c72a7d9 100644
---- a/sklearn/linear_model/logistic.py
-+++ b/sklearn/linear_model/logistic.py
-@@ -718,7 +718,9 @@ def logistic_regression_path(X, y, pos_class=None, Cs=10, fit_intercept=True,
- warnings.warn("lbfgs failed to converge. Increase the number "
- "of iterations.")
- try:
-- n_iter_i = info['nit'] - 1
-+ # In scipy <= 1.0.0, nit may exceed maxiter.
-+ # See https://github.com/scipy/scipy/issues/7854.
-+ n_iter_i = min(info['nit'], max_iter)
- except:
- n_iter_i = info['funcalls'] - 1
- elif solver == 'newton-cg':
-@@ -1115,6 +1117,11 @@ class LogisticRegression(BaseEstimator, LinearClassifierMixin,
- it returns only 1 element. For liblinear solver, only the maximum
- number of iteration across all classes is given.
-
-+ .. versionchanged:: 0.20
-+
-+ In SciPy <= 1.0.0 the number of lbfgs iterations may exceed
-+ ``max_iter``. ``n_iter_`` will now report at most ``max_iter``.
-+
- See also
- --------
- SGDClassifier : incrementally trained logistic regression (when given
-diff --git a/sklearn/linear_model/tests/test_huber.py b/sklearn/linear_model/tests/test_huber.py
-index 08f4fdf..ca1092f 100644
---- a/sklearn/linear_model/tests/test_huber.py
-+++ b/sklearn/linear_model/tests/test_huber.py
-@@ -42,6 +42,13 @@ def test_huber_equals_lr_for_high_epsilon():
- assert_almost_equal(huber.intercept_, lr.intercept_, 2)
-
-
-+def test_huber_max_iter():
-+ X, y = make_regression_with_outliers()
-+ huber = HuberRegressor(max_iter=1)
-+ huber.fit(X, y)
-+ assert huber.n_iter_ == huber.max_iter
-+
-+
- def test_huber_gradient():
- # Test that the gradient calculated by _huber_loss_and_gradient is correct
- rng = np.random.RandomState(1)
diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix
index 1c03e381bdc..fcac013b6de 100644
--- a/pkgs/development/python-modules/scrapy/default.nix
+++ b/pkgs/development/python-modules/scrapy/default.nix
@@ -2,7 +2,7 @@
testfixtures, pillow, six, twisted, w3lib, lxml, queuelib, pyopenssl,
service-identity, parsel, pydispatcher, cssselect, lib }:
buildPythonPackage rec {
- version = "1.5.0";
+ version = "1.5.1";
pname = "Scrapy";
checkInputs = [ glibcLocales mock pytest botocore testfixtures pillow ];
@@ -26,7 +26,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "31a0bf05d43198afaf3acfb9b4fb0c09c1d7d7ff641e58c66e36117f26c4b755";
+ sha256 = "5a398bf6818f87dcc817c919408a195f19ba46414ae12f259119336cfa862bb6";
};
meta = with lib; {
diff --git a/pkgs/development/python-modules/seaborn/default.nix b/pkgs/development/python-modules/seaborn/default.nix
index cc6fed43a42..d596c640823 100644
--- a/pkgs/development/python-modules/seaborn/default.nix
+++ b/pkgs/development/python-modules/seaborn/default.nix
@@ -8,10 +8,10 @@
buildPythonPackage rec {
pname = "seaborn";
- version = "0.8.1";
+ version = "0.9.0";
src = fetchPypi {
inherit pname version;
- sha256 = "6702978b903d0284446e935916b980dfebae4063c18ad8eb6e8f9e76d0257eae";
+ sha256 = "76c83f794ca320fb6b23a7c6192d5e185a5fcf4758966a0c0a54baee46d41e2f";
};
checkInputs = [ nose ];
diff --git a/pkgs/development/python-modules/seekpath/default.nix b/pkgs/development/python-modules/seekpath/default.nix
index de17e65d2bf..dfca0a5fa2e 100644
--- a/pkgs/development/python-modules/seekpath/default.nix
+++ b/pkgs/development/python-modules/seekpath/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "seekpath";
- version = "1.8.1";
+ version = "1.8.2";
src = fetchPypi {
inherit pname version;
- sha256 = "0bdc0400c96952525b1165894807e4bec90aaedb11cfeb27a57414e6091eb026";
+ sha256 = "8fb22231ed6fc6aa12e2f2cc6c8ca67b82648e16c1c85ddac2e2237ac4553d83";
};
LC_ALL = "en_US.utf-8";
diff --git a/pkgs/development/python-modules/seqdiag/default.nix b/pkgs/development/python-modules/seqdiag/default.nix
index 2ce15521048..d3c6006bc6c 100644
--- a/pkgs/development/python-modules/seqdiag/default.nix
+++ b/pkgs/development/python-modules/seqdiag/default.nix
@@ -4,12 +4,12 @@
buildPythonPackage rec {
pname = "seqdiag";
- version = "0.9.5";
+ version = "0.9.6";
name = pname + "-" + version;
src = fetchurl {
url = "mirror://pypi/s/seqdiag/${name}.tar.gz";
- sha256 = "994402cb19fef77ee113d18810aa397a7290553cda5f900be2bb44e2c7742657";
+ sha256 = "78104e7644c1a4d3a5cacb68de6a7f720793f08dd78561ef0e9e80bed63702bf";
};
buildInputs = [ pep8 nose unittest2 docutils ];
diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix
index ea478109722..b10cdfae5c7 100644
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -8,13 +8,13 @@
# Should use buildPythonPackage here somehow
stdenv.mkDerivation rec {
pname = "setuptools";
- version = "39.2.0";
+ version = "40.0.0";
name = "${python.libPrefix}-${pname}-${version}";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "f7cddbb5f5c640311eb00eab6e849f7701fa70bf6a183fc8a2c33dd1d1672fb2";
+ sha256 = "012adb8e25fbfd64c652e99e7bab58799a3aaf05d39ab38561f69190a909015f";
};
nativeBuildInputs = [ unzip wrapPython ];
diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix
index 52101b3482f..42d82566073 100644
--- a/pkgs/development/python-modules/shapely/default.nix
+++ b/pkgs/development/python-modules/shapely/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "Shapely";
- version = "1.6.4.post1";
+ version = "1.6.4.post2";
src = fetchPypi {
inherit pname version;
- sha256 = "30df7572d311514802df8dc0e229d1660bc4cbdcf027a8281e79c5fc2fcf02f2";
+ sha256 = "c4b87bb61fc3de59fc1f85e71a79b0c709dc68364d9584473697aad4aa13240f";
};
buildInputs = [ geos glibcLocales cython ];
diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix
index b42be465a3b..2099b00ba96 100644
--- a/pkgs/development/python-modules/simplejson/default.nix
+++ b/pkgs/development/python-modules/simplejson/default.nix
@@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "simplejson";
- version = "3.15.0";
+ version = "3.16.0";
doCheck = !stdenv.isDarwin;
src = fetchPypi {
inherit pname version;
- sha256 = "ad332f65d9551ceffc132d0a683f4ffd12e4bc7538681100190d577ced3473fb";
+ sha256 = "b1f329139ba647a9548aa05fb95d046b4a677643070dc2afc05fa2e975d09ca5";
};
meta = {
diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix
index 0503e2ef04f..bfca2a6f698 100644
--- a/pkgs/development/python-modules/sip/default.nix
+++ b/pkgs/development/python-modules/sip/default.nix
@@ -1,13 +1,15 @@
{ lib, fetchurl, buildPythonPackage, python, isPyPy }:
-if isPyPy then throw "sip not supported for interpreter ${python.executable}" else buildPythonPackage rec {
+buildPythonPackage rec {
pname = "sip";
- version = "4.19.6";
+ version = "4.19.8";
format = "other";
+ disabled = isPyPy;
+
src = fetchurl {
url = "mirror://sourceforge/pyqt/sip/${pname}-${version}/${pname}-${version}.tar.gz";
- sha256 = "0nlj0zbvmzliyhhspqwf2bjvcnpq4agx4s47php7ishv32p2gnlx";
+ sha256 = "1g4pq9vj753r2s061jc4y9ydzgb48ibhc9bdvmb8mlyllwp7mbvy";
};
configurePhase = ''
diff --git a/pkgs/development/python-modules/sleekxmpp/default.nix b/pkgs/development/python-modules/sleekxmpp/default.nix
index 7f437ec59c1..37ecc8bbb1c 100644
--- a/pkgs/development/python-modules/sleekxmpp/default.nix
+++ b/pkgs/development/python-modules/sleekxmpp/default.nix
@@ -2,7 +2,7 @@
buildPythonPackage rec {
pname = "sleekxmpp";
- version = "1.3.1";
+ version = "1.3.3";
propagatedBuildInputs = [ dns pyasn1 ];
@@ -12,7 +12,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "1krkhkvj8xw5a6c2xlf7h1rg9xdcm9d8x2niivwjahahpvbl6krr";
+ sha256 = "d213c1de71d92505f95ced0460ee0f84fdc4ddcacb7d7dd343739ed4028e5569";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/smart_open/default.nix b/pkgs/development/python-modules/smart_open/default.nix
index 8c66df80dc5..f1a5bf6ed9f 100644
--- a/pkgs/development/python-modules/smart_open/default.nix
+++ b/pkgs/development/python-modules/smart_open/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "smart_open";
- version = "1.5.7";
+ version = "1.6.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0y1c29pdxxgxkymr7g2n59siqqaq351zbx9vz8433dxvzy4qgd7p";
+ sha256 = "c2c2b44125a03d6e96efdf3e53e28be99e1f548e8a4fa8035f8fab448bbdbbda";
};
# nixpkgs version of moto is >=1.2.0, remove version pin to fix build
diff --git a/pkgs/development/python-modules/smmap2/default.nix b/pkgs/development/python-modules/smmap2/default.nix
index ea0f0859bbd..08264e92e5f 100644
--- a/pkgs/development/python-modules/smmap2/default.nix
+++ b/pkgs/development/python-modules/smmap2/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "smmap2";
- version = "2.0.3";
+ version = "2.0.4";
src = fetchPypi {
inherit pname version;
- sha256 = "1hvn28p3zvxa98sbi9lrqvv2ps4q284j4jq9a619zw0m7yv0sly7";
+ sha256 = "dc216005e529d57007ace27048eb336dcecb7fc413cfb3b2f402bb25972b69c6";
};
checkInputs = [ nosexcover ];
diff --git a/pkgs/development/python-modules/snowballstemmer/default.nix b/pkgs/development/python-modules/snowballstemmer/default.nix
new file mode 100644
index 00000000000..9b7481a62a6
--- /dev/null
+++ b/pkgs/development/python-modules/snowballstemmer/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildPythonPackage, PyStemmer, fetchPypi }:
+
+buildPythonPackage rec {
+ pname = "snowballstemmer";
+ version = "1.2.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "919f26a68b2c17a7634da993d91339e288964f93c274f1343e3bbbe2096e1128";
+ };
+
+ # No tests included
+ doCheck = false;
+
+ propagatedBuildInputs = [ PyStemmer ];
+
+ meta = with stdenv.lib; {
+ description = "16 stemmer algorithms (15 + Poerter English stemmer) generated from Snowball algorithms";
+ homepage = http://sigal.saimon.org/en/latest/index.html;
+ license = licenses.bsd3;
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix
index d2a306356b6..dc0509e226c 100644
--- a/pkgs/development/python-modules/spacy/default.nix
+++ b/pkgs/development/python-modules/spacy/default.nix
@@ -23,11 +23,11 @@
buildPythonPackage rec {
pname = "spacy";
- version = "2.0.9";
+ version = "2.0.12";
src = fetchPypi {
inherit pname version;
- sha256 = "1ihkhflhyz67bp73kfjqfrbcgdxi2msz5asbrh0pkk590c4vmms5";
+ sha256 = "b220ebee412c19613c26b2c1870b60473834bd686cec49553ce5f184164d3359";
};
prePatch = ''
diff --git a/pkgs/development/python-modules/spglib/default.nix b/pkgs/development/python-modules/spglib/default.nix
index 07273d0fa0d..e04589f3dfc 100644
--- a/pkgs/development/python-modules/spglib/default.nix
+++ b/pkgs/development/python-modules/spglib/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "spglib";
- version = "1.10.3.65";
+ version = "1.10.3.75";
src = fetchPypi {
inherit pname version;
- sha256 = "55b49227835396b2bcd6afe724e9f37202ad0f61e273bedebd5bf740bad2e8e3";
+ sha256 = "347fea7c87f7d2162fabb780560665d21a43cbd7a0af08328130ba26e6422143";
};
propagatedBuildInputs = [ numpy ];
diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix
index 0c45592fc21..97f76be15cb 100644
--- a/pkgs/development/python-modules/sphinx/default.nix
+++ b/pkgs/development/python-modules/sphinx/default.nix
@@ -26,10 +26,10 @@
buildPythonPackage rec {
pname = "Sphinx";
- version = "1.7.5";
+ version = "1.7.6";
src = fetchPypi {
inherit pname version;
- sha256 = "d45480a229edf70d84ca9fae3784162b1bc75ee47e480ffe04a4b7f21a95d76d";
+ sha256 = "217ad9ece2156ed9f8af12b5d2c82a499ddf2c70a33c5f81864a08d8c67b9efc";
};
LC_ALL = "en_US.UTF-8";
diff --git a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix
index c2e454d08cd..8a5609c1cd9 100644
--- a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
sha256 = "0ld2bihp9kmf57ykgzrfgxs4j9kxlw79sgdj9sfn47snw3izb2p6";
};
- checkInputs = [ unittest2 scripttest pytz pylint mock testtools testrepository ];
+ checkInputs = [ unittest2 scripttest pytz mock testtools testrepository ];
propagatedBuildInputs = [ pbr tempita decorator sqlalchemy six sqlparse ];
prePatch = ''
diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix
index 50d58877b7e..8c3c6fe2374 100644
--- a/pkgs/development/python-modules/sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "SQLAlchemy";
- version = "1.2.8";
+ version = "1.2.10";
src = fetchPypi {
inherit pname version;
- sha256 = "2d5f08f714a886a1382c18be501e614bce50d362384dc089474019ce0768151c";
+ sha256 = "72325e67fb85f6e9ad304c603d83626d1df684fdf0c7ab1f0352e71feeab69d8";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix
index bc2218f7dee..674d1e66f7e 100644
--- a/pkgs/development/python-modules/sqlmap/default.nix
+++ b/pkgs/development/python-modules/sqlmap/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "sqlmap";
- version = "1.2.6";
+ version = "1.2.7";
src = fetchPypi {
inherit pname version;
- sha256 = "a3649f9b5219b7336b82d3a1bf6e91c8d649171b96747b927a92ac075947d619";
+ sha256 = "9e570fcac05b3231d5e01398e496b88a78601938bba228e381994a1b3fe3bd88";
};
# No tests in archive
diff --git a/pkgs/development/python-modules/stevedore/default.nix b/pkgs/development/python-modules/stevedore/default.nix
index e7745cf8625..6d088d52d7e 100644
--- a/pkgs/development/python-modules/stevedore/default.nix
+++ b/pkgs/development/python-modules/stevedore/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "stevedore";
- version = "1.28.0";
+ version = "1.29.0";
src = fetchPypi {
inherit pname version;
- sha256 = "f1c7518e7b160336040fee272174f1f7b29a46febb3632502a8f2055f973d60b";
+ sha256 = "1e153545aca7a6a49d8337acca4f41c212fbfa60bf864ecd056df0cafb9627e8";
};
doCheck = false;
diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix
index 07849b0f30c..f2e4b946b5d 100644
--- a/pkgs/development/python-modules/stripe/default.nix
+++ b/pkgs/development/python-modules/stripe/default.nix
@@ -3,7 +3,7 @@
buildPythonPackage rec {
pname = "stripe";
- version = "1.82.2";
+ version = "2.0.3";
# Tests require network connectivity and there's no easy way to disable
# them. ~ C.
@@ -11,7 +11,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "9d0443d772d176faba8c8e8a2ddc3a507861dd7d882b4a88cf6062b20fa5f224";
+ sha256 = "17a618541c19a48d5591f4011a282cbcbbe2d05c361109f8f5381aeec05eb270";
};
checkInputs = [ unittest2 mock ];
diff --git a/pkgs/development/python-modules/suseapi/default.nix b/pkgs/development/python-modules/suseapi/default.nix
new file mode 100644
index 00000000000..0e9f4f43656
--- /dev/null
+++ b/pkgs/development/python-modules/suseapi/default.nix
@@ -0,0 +1,39 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, django
+, suds-jurko
+, ldap
+, mechanize
+, beautifulsoup4
+, pyxdg
+, dateutil
+, requests
+, httpretty
+}:
+
+buildPythonPackage rec {
+ pname = "suseapi";
+ version = "0.24-31-g0fcbe96";
+
+ src = fetchFromGitHub {
+ owner = "openSUSE";
+ repo = "python-${pname}";
+ rev = version;
+ sha256 = "0hyzq0h1w8gp0zfvhqh7qsgcg1wp05a14371m6bn5a7gss93rbv4";
+ };
+
+ propagatedBuildInputs = [
+ django suds-jurko ldap mechanize beautifulsoup4 pyxdg dateutil requests
+ ];
+
+ buildInputs = [ httpretty ];
+
+ doCheck = false;
+
+ meta = {
+ homepage = "https://github.com/openSUSE/python-suseapi/";
+ description = "Python module to work with various SUSE services";
+ license = lib.licenses.gpl3Plus;
+ };
+}
\ No newline at end of file
diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix
index 9f8087a305d..1aabffc05d5 100644
--- a/pkgs/development/python-modules/tempora/default.nix
+++ b/pkgs/development/python-modules/tempora/default.nix
@@ -1,19 +1,25 @@
-{ buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
, setuptools_scm
-, six, pytz}:
+, six, pytz, jaraco_functools }:
buildPythonPackage rec {
pname = "tempora";
- version = "1.9";
+ version = "1.13";
src = fetchPypi {
inherit pname version;
- sha256 = "9ea980c63be54f83d2a466fccc6eeef96a409f74c5034764fb328b0d43247e96";
+ sha256 = "4848df474c9d7ad9515fbeaadc88e48843176b4b90393652156ccff613bcaeb1";
};
doCheck = false;
buildInputs = [ setuptools_scm ];
- propagatedBuildInputs = [ six pytz ];
+ propagatedBuildInputs = [ six pytz jaraco_functools ];
+
+ meta = with lib; {
+ description = "Objects and routines pertaining to date and time";
+ homepage = https://github.com/jaraco/tempora;
+ license = licenses.mit;
+ };
}
diff --git a/pkgs/development/python-modules/testresources/default.nix b/pkgs/development/python-modules/testresources/default.nix
new file mode 100644
index 00000000000..fa4fc0b1fed
--- /dev/null
+++ b/pkgs/development/python-modules/testresources/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildPythonPackage, fetchPypi, python
+, pbr, fixtures, testtools }:
+
+buildPythonPackage rec {
+ pname = "testresources";
+ version = "2.0.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "ee9d1982154a1e212d4e4bac6b610800bfb558e4fb853572a827bc14a96e4417";
+ };
+
+ buildInputs = [ pbr ];
+
+ checkInputs = [ fixtures testtools ];
+
+ checkPhase = ''
+ ${python.interpreter} -m testtools.run discover
+ '';
+
+ meta = with lib; {
+ description = "Pyunit extension for managing expensive test resources";
+ homepage = https://launchpad.net/testresources;
+ license = licenses.bsd2;
+ };
+}
diff --git a/pkgs/development/python-modules/textacy/default.nix b/pkgs/development/python-modules/textacy/default.nix
index 9b22ad3e545..fdfa91d292f 100644
--- a/pkgs/development/python-modules/textacy/default.nix
+++ b/pkgs/development/python-modules/textacy/default.nix
@@ -23,11 +23,11 @@
buildPythonPackage rec {
pname = "textacy";
- version = "0.6.1";
+ version = "0.6.2";
src = fetchPypi {
inherit pname version;
- sha256 = "32ffb796f2abf0577af480d482608cca2baf85d366a4e2981ffd3e632ebeb76c";
+ sha256 = "6019f32719c0661f41fa93c2fdd9714504d443119bf4f6426ee690bdda90835b";
};
disabled = isPy27; # 2.7 requires backports.csv
diff --git a/pkgs/development/python-modules/texttable/default.nix b/pkgs/development/python-modules/texttable/default.nix
index 277d70cba6a..fed9a3fd733 100644
--- a/pkgs/development/python-modules/texttable/default.nix
+++ b/pkgs/development/python-modules/texttable/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "texttable";
- version = "1.3.1";
+ version = "1.4.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0f75f5838b775bddc19f72c5bf50eb74be3815eb505ed3084e4666ce2e6c3259";
+ sha256 = "95e8cfe85f8395a7eacdfbc8f09d885b9ef3a6ac6ead0364ea721de1127aa36b";
};
meta = {
diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix
index 6e1baf2f2e9..159051b9a6a 100644
--- a/pkgs/development/python-modules/tifffile/default.nix
+++ b/pkgs/development/python-modules/tifffile/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "tifffile";
- version = "0.14.0";
+ version = "0.15.1";
src = fetchPypi {
inherit pname version;
- sha256 = "eff44f71782dce38c604921a1b29ddad0d007ac9871d66e9c872fd6fc311334e";
+ sha256 = "1fbb2cfd57fd8e42e417bc29001a17f319701f1be00e0b8a0004a52da93f1b08";
};
checkInputs = [ nose ];
diff --git a/pkgs/development/python-modules/tornado/default.nix b/pkgs/development/python-modules/tornado/default.nix
index 37b1c7bcf5c..6d86404e192 100644
--- a/pkgs/development/python-modules/tornado/default.nix
+++ b/pkgs/development/python-modules/tornado/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "tornado";
- version = "5.0.2";
+ version = "5.1";
propagatedBuildInputs = [ backports_abc certifi singledispatch ]
@@ -27,7 +27,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "1b83d5c10550f2653380b4c77331d6f8850f287c4f67d7ce1e1c639d9222fbc7";
+ sha256 = "4f66a2172cb947387193ca4c2c3e19131f1c70fa8be470ddbbd9317fd0801582";
};
meta = {
diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix
index 4ceeb026634..7719687f2ea 100644
--- a/pkgs/development/python-modules/tox/default.nix
+++ b/pkgs/development/python-modules/tox/default.nix
@@ -1,23 +1,31 @@
-{ buildPythonPackage
+{ lib
+, buildPythonPackage
, fetchPypi
-, py
-, virtualenv
+, packaging
, pluggy
-, setuptools_scm
+, py
, six
+, virtualenv
+, setuptools_scm
}:
buildPythonPackage rec {
pname = "tox";
- version = "3.0.0";
+ version = "3.1.2";
buildInputs = [ setuptools_scm ];
- propagatedBuildInputs = [ py virtualenv pluggy six ];
+ propagatedBuildInputs = [ packaging pluggy py six virtualenv ];
doCheck = false;
src = fetchPypi {
inherit pname version;
- sha256 = "96efa09710a3daeeb845561ebbe1497641d9cef2ee0aea30db6969058b2bda2f";
+ sha256 = "9f0cbcc36e08c2c4ae90d02d3d1f9a62231f974bcbc1df85e8045946d8261059";
};
-}
\ No newline at end of file
+
+ meta = with lib; {
+ description = "Virtualenv-based automation of test activities";
+ homepage = https://tox.readthedocs.io/;
+ license = licenses.mit;
+ };
+}
diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix
index 90d8003bb34..f49c7a0d243 100644
--- a/pkgs/development/python-modules/treq/default.nix
+++ b/pkgs/development/python-modules/treq/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "treq";
- version = "17.8.0";
+ version = "18.6.0";
src = fetchPypi {
inherit pname version;
- sha256 = "ef72d2d5e0b24bdf29267b608fa33df0ac401743af8524438b073e1fb2b66f16";
+ sha256 = "91e09ff6b524cc90aa5e934b909c8d0d1a9d36ebd618b6c38e37b17013e69f48";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix
index 0f96b100435..878de187519 100644
--- a/pkgs/development/python-modules/trezor/default.nix
+++ b/pkgs/development/python-modules/trezor/default.nix
@@ -4,13 +4,13 @@
buildPythonPackage rec {
pname = "trezor";
- version = "0.9.1";
+ version = "0.10.2";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "a481191011bade98f1e9f1201e7c72a83945050657bbc90dc4ac32dc8b8b46a4";
+ sha256 = "4dba4d5c53d3ca22884d79fb4aa68905fb8353a5da5f96c734645d8cf537138d";
};
propagatedBuildInputs = [ protobuf hidapi ecdsa mnemonic requests pyblake2 click libusb1 rlp ];
diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix
index 2bd607170fd..c630668386e 100644
--- a/pkgs/development/python-modules/trio/default.nix
+++ b/pkgs/development/python-modules/trio/default.nix
@@ -12,12 +12,12 @@
buildPythonPackage rec {
pname = "trio";
- version = "0.4.0";
+ version = "0.5.0";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "0ib1x47knlad9pljb64ywfiv6m3dfrqqjwka6j1b73hixmszb5h4";
+ sha256 = "ce0b4f59e2f41af0433247f92ce83116bf356a3c2ab5ca5942cf359a1105b4a8";
};
checkInputs = [ pytest pyopenssl trustme ];
diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix
index 14ccac5690b..49e936c1cc1 100644
--- a/pkgs/development/python-modules/twisted/default.nix
+++ b/pkgs/development/python-modules/twisted/default.nix
@@ -7,21 +7,23 @@
, automat
, constantly
, hyperlink
+, pyhamcrest
+, attrs
, pyopenssl
, service-identity
, idna
}:
buildPythonPackage rec {
pname = "Twisted";
- version = "18.4.0";
+ version = "18.7.0";
src = fetchPypi {
inherit pname version;
extension = "tar.bz2";
- sha256 = "a4cc164a781859c74de47f17f0e85f4bce8a3321a9d0892c015c8f80c4158ad9";
+ sha256 = "95ae985716e8107816d8d0df249d558dbaabb677987cc2ace45272c166b267e4";
};
- propagatedBuildInputs = [ zope_interface incremental automat constantly hyperlink ];
+ propagatedBuildInputs = [ zope_interface incremental automat constantly hyperlink pyhamcrest attrs ];
passthru.extras.tls = [ pyopenssl service-identity idna ];
diff --git a/pkgs/development/python-modules/txtorcon/default.nix b/pkgs/development/python-modules/txtorcon/default.nix
index e369e13cb95..2fb7e83c3b1 100644
--- a/pkgs/development/python-modules/txtorcon/default.nix
+++ b/pkgs/development/python-modules/txtorcon/default.nix
@@ -4,7 +4,7 @@
buildPythonPackage rec {
pname = "txtorcon";
- version = "18.0.0";
+ version = "18.0.2";
checkInputs = [ pytest mock lsof GeoIP ];
propagatedBuildInputs = [
@@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "0z2gsyp9msxrzsm7vq2vq8231a678g4g563xni6cnq4xdb4nx3w1";
+ sha256 = "ce50fdd00abb8b490b72809a2c664684f67f3c9467f392642d36f58309395a87";
};
# Skip a failing test until fixed upstream:
diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix
index 611eeba8ae0..a6eb75b53cf 100644
--- a/pkgs/development/python-modules/typeguard/default.nix
+++ b/pkgs/development/python-modules/typeguard/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "typeguard";
- version = "2.1.4";
+ version = "2.2.0";
src = fetchPypi {
inherit pname version;
- sha256 = "40b22d18d2215b76b3ddda2564acfbddfa6e702968637fbd969187c2a6fb99da";
+ sha256 = "e588ff78b7093fc31c3b00c78db09b9b3764157b03b867f25ccd1dd3efd96ffb";
};
buildInputs = [ setuptools_scm ];
diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix
index 45c1428c606..368f787313b 100644
--- a/pkgs/development/python-modules/uproot/default.nix
+++ b/pkgs/development/python-modules/uproot/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "uproot";
- version = "2.8.33";
+ version = "2.9.6";
src = fetchPypi {
inherit pname version;
- sha256 = "42b6482d085b699a534f0a3ec352e96d4653e31c8839855c8a852618f54e27d8";
+ sha256 = "1fb8dd19bd1f1ed376a96e92b32ff44f7d3688bda55eda9055898111fdac8391";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/vcrpy/default.nix b/pkgs/development/python-modules/vcrpy/default.nix
index 805941cab60..e0e842a773d 100644
--- a/pkgs/development/python-modules/vcrpy/default.nix
+++ b/pkgs/development/python-modules/vcrpy/default.nix
@@ -15,11 +15,11 @@
buildPythonPackage rec {
pname = "vcrpy";
- version = "1.12.0";
+ version = "1.13.0";
src = fetchPypi {
inherit pname version;
- sha256 = "13c6a835a6dc1ac96d7e6cae03587525eb260d7a46c6e5dd7a25416655eecb3a";
+ sha256 = "7031f9c78a70b9586d2db4a2ec135c4e04194cabff58695ef0cc95e7cd66bc01";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/vobject/default.nix b/pkgs/development/python-modules/vobject/default.nix
index 3c0b8a1f593..95cf6efaa46 100644
--- a/pkgs/development/python-modules/vobject/default.nix
+++ b/pkgs/development/python-modules/vobject/default.nix
@@ -1,12 +1,12 @@
{ lib, buildPythonPackage, fetchPypi, isPyPy, python, dateutil }:
buildPythonPackage rec {
- version = "0.9.6";
+ version = "0.9.6.1";
pname = "vobject";
src = fetchPypi {
inherit pname version;
- sha256 = "cd9ede4363f83c06ba8d8f1541c736efa5c46f9a431430002b2f84f4f4e674d8";
+ sha256 = "96512aec74b90abb71f6b53898dd7fe47300cc940104c4f79148f0671f790101";
};
disabled = isPyPy;
diff --git a/pkgs/development/python-modules/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix
index 8b2584a16d3..0628b3c869a 100644
--- a/pkgs/development/python-modules/websockets/default.nix
+++ b/pkgs/development/python-modules/websockets/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "websockets";
- version = "5.0.1";
+ version = "6.0";
src = fetchPypi {
inherit pname version;
- sha256 = "a49d315db5a7a19d55422e1678e8a1c3b9661d7296bef3179fa620cf80b12674";
+ sha256 = "8f3b956d11c5b301206382726210dc1d3bee1a9ccf7aadf895aaf31f71c3716c";
};
disabled = pythonOlder "3.3";
diff --git a/pkgs/development/python-modules/widgetsnbextension/default.nix b/pkgs/development/python-modules/widgetsnbextension/default.nix
index 5af9119508a..0f102dda106 100644
--- a/pkgs/development/python-modules/widgetsnbextension/default.nix
+++ b/pkgs/development/python-modules/widgetsnbextension/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "widgetsnbextension";
- version = "3.2.1";
+ version = "3.3.0";
src = fetchPypi {
inherit pname version;
- sha256 = "5417789ee6064ff515fd10be24870660af3561c02d3d48b26f6f44285d0f70cc";
+ sha256 = "c5280a62d293735cdadc7b8884e2affcfb0488420ee09963577f042359726392";
};
propagatedBuildInputs = [ notebook ];
diff --git a/pkgs/development/python-modules/wxPython/4.0.nix b/pkgs/development/python-modules/wxPython/4.0.nix
new file mode 100644
index 00000000000..39e3d7fb3fa
--- /dev/null
+++ b/pkgs/development/python-modules/wxPython/4.0.nix
@@ -0,0 +1,41 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pkgconfig
+, gtk3
+, libjpeg
+, libtiff
+, SDL
+, gst-plugins-base
+, libnotify
+, freeglut
+, xorg
+, which
+}:
+
+buildPythonPackage rec {
+ pname = "wxPython";
+ version = "4.0.3";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "8d0dfc0146c24749ce00d575e35cc2826372e809d5bc4a57bde6c89031b59e75";
+ };
+
+ nativeBuildInputs = [
+ pkgconfig
+ ];
+
+ buildInputs = [
+ gtk3 libjpeg libtiff SDL gst-plugins-base libnotify freeglut xorg.libSM
+ which
+ ];
+
+
+ meta = {
+ description = "Cross platform GUI toolkit for Python, Phoenix version";
+ homepage = http://wxpython.org/;
+ license = lib.licenses.wxWindows;
+ };
+
+}
\ No newline at end of file
diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix
index a9041f9a76f..c443c8fc880 100644
--- a/pkgs/development/python-modules/xarray/default.nix
+++ b/pkgs/development/python-modules/xarray/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "xarray";
- version = "0.10.7";
+ version = "0.10.8";
src = fetchPypi {
inherit pname version;
- sha256 = "d87241580e3eccb961dfc16e804e1b92b3d6a8000ffee82ceb076767934342cc";
+ sha256 = "6a1f2c5dc5f639f8343f70ed08d0afbb477a3867298ef38f0d9bf4aafa0fb750";
};
checkInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix
index 29830adb5ed..291b981bf47 100644
--- a/pkgs/development/python-modules/xml2rfc/default.nix
+++ b/pkgs/development/python-modules/xml2rfc/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "xml2rfc";
- version = "2.9.8";
+ version = "2.10.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1img6941wvwpk71q3vi9526bfjbh949k4lphrvdwlcf4igwy435m";
+ sha256 = "dc62e1d2fea896855ee0681f02bcb7596e3b6b5aa559348b8520a4eb0c793282";
};
propagatedBuildInputs = [ intervaltree pyflakes requests lxml ];
diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix
index e27abba413d..d72b1999030 100644
--- a/pkgs/development/python-modules/yamllint/default.nix
+++ b/pkgs/development/python-modules/yamllint/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "yamllint";
- version = "1.9.0";
+ version = "1.11.1";
src = fetchPypi {
inherit pname version;
- sha256 = "75295a7cbfb3529e02551d4e95c2e3eb85d66292bedcfb463d25d71308065e34";
+ sha256 = "e9b7dec24921ef13180902e5dbcaae9157c773e3e3e2780ef77d3a4dd67d799f";
};
checkInputs = [ nose ];
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index 3c355d08576..9d4f5679e26 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -206,6 +206,13 @@ in
buildFlags = [ "--with-system-v8=true" ];
};
+ libxml-ruby = attrs: {
+ buildFlags = [
+ "--with-xml2-lib=${libxml2.out}/lib"
+ "--with-xml2-include=${libxml2.dev}/include/libxml2"
+ ];
+ };
+
msgpack = attrs: {
buildInputs = [ libmsgpack ];
};
@@ -395,4 +402,8 @@ in
'';
};
+ zookeeper = attrs: {
+ buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.cctools ];
+ };
+
}
diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix
index e77647b2fed..3725760c1d6 100644
--- a/pkgs/development/tools/build-managers/conan/default.nix
+++ b/pkgs/development/tools/build-managers/conan/default.nix
@@ -1,6 +1,6 @@
-{ lib, python }:
+{ lib, python3, fetchpatch, git }:
-let newPython = python.override {
+let newPython = python3.override {
packageOverrides = self: super: {
distro = super.distro.overridePythonAttrs (oldAttrs: rec {
version = "1.1.0";
@@ -16,30 +16,48 @@ let newPython = python.override {
sha256 = "1080pdxrvnkr8i7b7bk0dfx6cwrkkzzfaranl7207q6rdybzqay3";
};
});
+ astroid = super.astroid.overridePythonAttrs (oldAttrs: rec {
+ version = "1.6.5";
+ src = oldAttrs.src.override {
+ inherit version;
+ sha256 = "fc9b582dba0366e63540982c3944a9230cbc6f303641c51483fa547dcc22393a";
+ };
+ });
+ pylint = super.pylint.overridePythonAttrs (oldAttrs: rec {
+ version = "1.8.4";
+ src = oldAttrs.src.override {
+ inherit version;
+ sha256 = "34738a82ab33cbd3bb6cd4cef823dbcabdd2b6b48a4e3a3054a2bbbf0c712be9";
+ };
+
+ });
};
};
in newPython.pkgs.buildPythonApplication rec {
- version = "1.5.2";
+ version = "1.6.0";
pname = "conan";
src = newPython.pkgs.fetchPypi {
inherit pname version;
- sha256 = "0r5ymq27j60py1fb396zshq7z6adda34a857lwrj3k8hqhs0ihpp";
+ sha256 = "386476d3af1fa390e4cd96e737876e7d1f1c0bca09519e51fd44c1bb45990caa";
};
- postPatch = ''
- # Remove pylint constraint
- substituteInPlace conans/requirements.txt --replace ", <1.9.0" ""
- '';
+ # Bump PyYAML to 3.13
+ patches = fetchpatch {
+ url = https://github.com/conan-io/conan/commit/9d3d7a5c6e89b3aa321735557e5ad3397bb80568.patch;
+ sha256 = "1qdy6zj3ypl1bp9872mzaqg1gwigqldxb1glvrkq3p4za62p546k";
+ };
- checkInputs = with newPython.pkgs; [
+ checkInputs = [
+ git
+ ] ++ (with newPython.pkgs; [
nose
parameterized
mock
webtest
codecov
- ];
+ ]);
propagatedBuildInputs = with newPython.pkgs; [
requests fasteners pyyaml pyjwt colorama patch
@@ -47,9 +65,10 @@ in newPython.pkgs.buildPythonApplication rec {
future pygments mccabe deprecation
];
- preCheck = ''
+ checkPhase = ''
export HOME="$TMP/conan-home"
mkdir -p "$HOME"
+ nosetests conans.test
'';
meta = with lib; {
diff --git a/pkgs/development/tools/dep/default.nix b/pkgs/development/tools/dep/default.nix
index 0d4f72fad80..283193a485c 100644
--- a/pkgs/development/tools/dep/default.nix
+++ b/pkgs/development/tools/dep/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "dep-${version}";
- version = "0.4.1";
+ version = "0.5.0";
rev = "v${version}";
goPackagePath = "github.com/golang/dep";
@@ -12,7 +12,7 @@ buildGoPackage rec {
inherit rev;
owner = "golang";
repo = "dep";
- sha256 = "0183xq5l4sinnclynv6xi85vmk69mqpy5wjfsgh8bxwziq3vkd7y";
+ sha256 = "1p35995w2f8rp4cxhcwnhdv26ajx6gxx9pm2ijb5sjy2pwhw5c6j";
};
buildFlagsArray = ("-ldflags=-s -w -X main.commitHash=${rev} -X main.version=${version}");
@@ -22,6 +22,6 @@ buildGoPackage rec {
description = "Go dependency management tool";
license = licenses.bsd3;
platforms = platforms.all;
- maintainers = [ maintainers.carlsverre ];
+ maintainers = with maintainers; [ carlsverre rvolosatovs ];
};
}
diff --git a/pkgs/development/tools/ghp-import/default.nix b/pkgs/development/tools/ghp-import/default.nix
new file mode 100644
index 00000000000..9bad3fc6870
--- /dev/null
+++ b/pkgs/development/tools/ghp-import/default.nix
@@ -0,0 +1,28 @@
+{ python3, glibcLocales, lib }:
+
+with python3.pkgs;
+
+buildPythonApplication rec {
+ version = "0.4.1";
+ pname = "ghp-import";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "6058810e1c46dd3b5b1eee87e203bdfbd566e10cfc77566edda7aa4dbf6a3053";
+ };
+
+ disabled = isPyPy;
+ buildInputs = [ glibcLocales ];
+
+ LC_ALL="en_US.UTF-8";
+
+ # No tests available
+ doCheck = false;
+
+ meta = {
+ description = "Copy your docs directly to the gh-pages branch";
+ homepage = "https://github.com/davisp/ghp-import";
+ license = "Tumbolia Public License";
+ maintainers = with lib.maintainers; [ garbas ];
+ };
+}
diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix
new file mode 100644
index 00000000000..4f9512b2213
--- /dev/null
+++ b/pkgs/development/tools/kustomize/default.nix
@@ -0,0 +1,28 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+ name = "kustomize-${version}";
+ version = "1.0.4";
+
+ goPackagePath = "github.com/kubernetes-sigs/kustomize";
+
+ src = fetchFromGitHub {
+ sha256 = "0lbf94wz34axaf8ps7h79qbj4dpihrpvnqa12zrawcmmgqallwhm";
+ rev = "v${version}";
+ repo = "kustomize";
+ owner = "kubernetes-sigs";
+ };
+
+ meta = with lib; {
+ description = "Customization of kubernetes YAML configurations";
+ longDescription = ''
+ kustomize lets you customize raw, template-free YAML files for
+ multiple purposes, leaving the original YAML untouched and usable
+ as is.
+ '';
+ homepage = https://github.com/kubernetes-sigs/kustomize;
+ license = licenses.asl20;
+ maintainers = [ maintainers.carlosdagos ];
+ };
+}
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 2badd0ed26a..890ff7b64a9 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -26,11 +26,6 @@ stdenv.mkDerivation rec {
});
patches = [
- # Turn on --enable-new-dtags by default to make the linker set
- # RUNPATH instead of RPATH on binaries. This is important because
- # RUNPATH can be overriden using LD_LIBRARY_PATH at runtime.
- ./new-dtags.patch
-
# Since binutils 2.22, DT_NEEDED flags aren't copied for dynamic outputs.
# That requires upstream changes for things to work. So we can patch it to
# get the old behaviour by now.
@@ -117,6 +112,11 @@ stdenv.mkDerivation rec {
"--enable-deterministic-archives"
"--disable-werror"
"--enable-fix-loongson2f-nop"
+
+ # Turn on --enable-new-dtags by default to make the linker set
+ # RUNPATH instead of RPATH on binaries. This is important because
+ # RUNPATH can be overriden using LD_LIBRARY_PATH at runtime.
+ "--enable-new-dtags"
] ++ optionals gold [ "--enable-gold" "--enable-plugins" ];
doCheck = false; # fails
diff --git a/pkgs/development/tools/misc/binutils/new-dtags.patch b/pkgs/development/tools/misc/binutils/new-dtags.patch
deleted file mode 100644
index eea6f8c39d5..00000000000
--- a/pkgs/development/tools/misc/binutils/new-dtags.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- binutils/ld/ldmain.c
-+++ binutils/ld/ldmain.c
-@@ -296,6 +296,7 @@ main (int argc, char **argv)
-
- link_info.allow_undefined_version = TRUE;
- link_info.keep_memory = TRUE;
-+ link_info.new_dtags = TRUE;
- link_info.combreloc = TRUE;
- link_info.strip_discarded = TRUE;
- link_info.callbacks = &link_callbacks;
diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix
index 2ee573e4ba1..af140bfb1d6 100644
--- a/pkgs/development/tools/misc/elfutils/default.nix
+++ b/pkgs/development/tools/misc/elfutils/default.nix
@@ -28,46 +28,40 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- crossAttrs = {
+ # This program does not cross-build fine. So I only cross-build some parts
+ # I need for the linux perf tool.
+ # On the awful cross-building:
+ # http://comments.gmane.org/gmane.comp.sysutils.elfutils.devel/2005
+ #
+ # I wrote this testing for the nanonote.
- /* Having bzip2 will harm, because anything using elfutils
- as buildInput cross-building, will not be able to run 'bzip2' */
- propagatedBuildInputs = [ zlib.crossDrv ];
+ buildPhase = if stdenv.hostPlatform == stdenv.buildPlatform then null else ''
+ pushd libebl
+ make
+ popd
+ pushd libelf
+ make
+ popd
+ pushd libdwfl
+ make
+ popd
+ pushd libdw
+ make
+ popd
+ '';
- # This program does not cross-build fine. So I only cross-build some parts
- # I need for the linux perf tool.
- # On the awful cross-building:
- # http://comments.gmane.org/gmane.comp.sysutils.elfutils.devel/2005
- #
- # I wrote this testing for the nanonote.
- buildPhase = ''
- pushd libebl
- make
- popd
- pushd libelf
- make
- popd
- pushd libdwfl
- make
- popd
- pushd libdw
- make
- popd
- '';
-
- installPhase = ''
- pushd libelf
- make install
- popd
- pushd libdwfl
- make install
- popd
- pushd libdw
- make install
- popd
- cp version.h $out/include
- '';
- };
+ installPhase = if stdenv.hostPlatform == stdenv.buildPlatform then null else ''
+ pushd libelf
+ make install
+ popd
+ pushd libdwfl
+ make install
+ popd
+ pushd libdw
+ make install
+ popd
+ cp version.h $out/include
+ '';
meta = {
homepage = https://sourceware.org/elfutils/;
diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix
index 2eb9b453661..c0e12aa22c4 100644
--- a/pkgs/development/tools/misc/ycmd/default.nix
+++ b/pkgs/development/tools/misc/ycmd/default.nix
@@ -7,12 +7,12 @@
stdenv.mkDerivation rec {
name = "ycmd-${version}";
- version = "2018-06-14";
+ version = "2018-07-24";
src = fetchgit {
url = "https://github.com/Valloric/ycmd.git";
- rev = "29e36f74f749d10b8d6ce285c1453fac26f15a41";
- sha256 = "0s62nf18jmgjihyba7lk7si8xrxsg60whdr430nlb5gjikag8zr5";
+ rev = "f8a8b04892b925efeee24298a957cc6d6a69ad06";
+ sha256 = "1br2sh6bs0fg1axq2hq9f48fz8klkzydi1mf0j0jdsh3zjzkmxbn";
};
nativeBuildInputs = [ cmake ];
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
mkdir -p $out/lib/ycmd/third_party/{gocode,godef,racerd/target/release}
- for p in jedi waitress frozendict bottle python-future requests; do
+ for p in jedi waitress frozendict bottle parso python-future requests; do
cp -r third_party/$p $out/lib/ycmd/third_party
done
diff --git a/pkgs/development/tools/parsing/flex/2.5.35.nix b/pkgs/development/tools/parsing/flex/2.5.35.nix
index 4f78b0c71c1..1062a361413 100644
--- a/pkgs/development/tools/parsing/flex/2.5.35.nix
+++ b/pkgs/development/tools/parsing/flex/2.5.35.nix
@@ -12,12 +12,10 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ m4 ];
- crossAttrs = {
- preConfigure = ''
- export ac_cv_func_malloc_0_nonnull=yes
- export ac_cv_func_realloc_0_nonnull=yes
- '';
- };
+ preConfigure = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+ "ac_cv_func_malloc_0_nonnull=yes"
+ "ac_cv_func_realloc_0_nonnull=yes"
+ ];
meta = {
branch = "2.5.35";
diff --git a/pkgs/development/tools/parsing/flex/2.6.1.nix b/pkgs/development/tools/parsing/flex/2.6.1.nix
index f27fac9bcb5..954c2bbcb24 100644
--- a/pkgs/development/tools/parsing/flex/2.6.1.nix
+++ b/pkgs/development/tools/parsing/flex/2.6.1.nix
@@ -12,22 +12,19 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ m4 ];
+ preConfigure = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+ "ac_cv_func_malloc_0_nonnull=yes"
+ "ac_cv_func_realloc_0_nonnull=yes"
+ ];
+
postConfigure = stdenv.lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) ''
sed -i Makefile -e 's/-no-undefined//;'
'';
- crossAttrs = {
-
- # disable tests which can't run on build machine
- postPatch = ''
- substituteInPlace Makefile.in --replace "tests" " ";
- '';
-
- preConfigure = ''
- export ac_cv_func_malloc_0_nonnull=yes
- export ac_cv_func_realloc_0_nonnull=yes
- '';
- };
+ # disable tests which can't run on build machine
+ postPatch = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+ substituteInPlace Makefile.in --replace "tests" " ";
+ '';
meta = {
homepage = https://github.com/westes/flex;
diff --git a/pkgs/development/tools/pet/default.nix b/pkgs/development/tools/pet/default.nix
new file mode 100644
index 00000000000..da510e5251b
--- /dev/null
+++ b/pkgs/development/tools/pet/default.nix
@@ -0,0 +1,25 @@
+{ buildGoPackage, fetchFromGitHub, lib }:
+
+buildGoPackage rec {
+ name = "pet-${version}";
+ version = "0.3.2";
+
+ goPackagePath = "github.com/knqyf263/pet";
+
+ src = fetchFromGitHub {
+ owner = "knqyf263";
+ repo = "pet";
+ rev = "v${version}";
+ sha256 = "1zv2jfgh5nqd4cwr1ljm5p4rqam7hq3a6asfmhr3lcnp7sz9b8fr";
+ };
+
+ goDeps = ./deps.nix;
+
+ meta = with lib; {
+ description = "Simple command-line snippet manager, written in Go";
+ homepage = https://github.com/knqyf263/pet;
+ license = licenses.mit;
+ maintainers = with maintainers; [ kalbasit ];
+ platforms = platforms.linux ++ platforms.darwin;
+ };
+}
diff --git a/pkgs/development/tools/pet/deps.nix b/pkgs/development/tools/pet/deps.nix
new file mode 100644
index 00000000000..b8a20f58576
--- /dev/null
+++ b/pkgs/development/tools/pet/deps.nix
@@ -0,0 +1,155 @@
+[
+ {
+ goPackagePath = "github.com/BurntSushi/toml";
+ fetch = {
+ type = "git";
+ url = "https://github.com/BurntSushi/toml";
+ rev = "a368813c5e648fee92e5f6c30e3944ff9d5e8895";
+ sha256 = "1sjxs2lwc8jpln80s4rlzp7nprbcljhy5mz4rf9995gq93wqnym5";
+ };
+ }
+ {
+ goPackagePath = "github.com/briandowns/spinner";
+ fetch = {
+ type = "git";
+ url = "https://github.com/briandowns/spinner";
+ rev = "5b875a9171af19dbde37e70a8fcbe2ebd7285e05";
+ sha256 = "0vq78qmg07dm9vnjqz17ca9qml8np7f9vj9igsira7a39xg09ivg";
+ };
+ }
+ {
+ goPackagePath = "github.com/chzyer/readline";
+ fetch = {
+ type = "git";
+ url = "https://github.com/chzyer/readline";
+ rev = "2972be24d48e78746da79ba8e24e8b488c9880de";
+ sha256 = "104q8dazj8yf6b089jjr82fy9h1g80zyyzvp3g8b44a7d8ngjj6r";
+ };
+ }
+ {
+ goPackagePath = "github.com/fatih/color";
+ fetch = {
+ type = "git";
+ url = "https://github.com/fatih/color";
+ rev = "2d684516a8861da43017284349b7e303e809ac21";
+ sha256 = "1fcfmz4wji3gqmmsdx493r7d101s58hwjalqps6hy25nva5pvmfs";
+ };
+ }
+ {
+ goPackagePath = "github.com/google/go-github";
+ fetch = {
+ type = "git";
+ url = "https://github.com/google/go-github";
+ rev = "c0b63e2f9bb198baf328c8abf1ddcbe05ff9427e";
+ sha256 = "1a4skdbzxnyj3irqrmhhj4c9cimga0k5sd0vykjfqj7c8c5bwbd5";
+ };
+ }
+ {
+ goPackagePath = "github.com/google/go-querystring";
+ fetch = {
+ type = "git";
+ url = "https://github.com/google/go-querystring";
+ rev = "53e6ce116135b80d037921a7fdd5138cf32d7a8a";
+ sha256 = "0lkbm067nhmxk66pyjx59d77dbjjzwyi43gdvzyx2f8m1942rq7f";
+ };
+ }
+ {
+ goPackagePath = "github.com/jroimartin/gocui";
+ fetch = {
+ type = "git";
+ url = "https://github.com/jroimartin/gocui";
+ rev = "c055c87ae801372cd74a0839b972db4f7697ae5f";
+ sha256 = "1b1cbjg925l1c5v3ls8amni9716190yzf847cqs9wjnj82z8qa47";
+ };
+ }
+ {
+ goPackagePath = "github.com/mattn/go-runewidth";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/go-runewidth";
+ rev = "ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb";
+ sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g";
+ };
+ }
+ {
+ goPackagePath = "github.com/nsf/termbox-go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/nsf/termbox-go";
+ rev = "5c94acc5e6eb520f1bcd183974e01171cc4c23b3";
+ sha256 = "1fi8imdgwvlsgifw2qfl3ww0lsrgkfsimkzz7bnrq41nar78s0fw";
+ };
+ }
+ {
+ goPackagePath = "github.com/pkg/errors";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pkg/errors";
+ rev = "816c9085562cd7ee03e7f8188a1cfd942858cded";
+ sha256 = "1ws5crb7c70wdicavl6qr4g03nn6m92zd6wwp9n2ygz5c8rmxh8k";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/cobra";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/cobra";
+ rev = "a114f312e075f65bf30d6d9a1430113f857e543b";
+ sha256 = "10lmi5ni06yijxg02fcic5b7ycjkia12yma4a4lz8a56j30wykx1";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/pflag";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/pflag";
+ rev = "3ebe029320b2676d667ae88da602a5f854788a8a";
+ sha256 = "11yxs0wqy70wj106fkz8r923yg4ncnc2mbw33v48zmlg4a1rasgp";
+ };
+ }
+ {
+ goPackagePath = "github.com/xanzy/go-gitlab";
+ fetch = {
+ type = "git";
+ url = "https://github.com/xanzy/go-gitlab";
+ rev = "696e3cf592c0f71a0fce1934ad500376abe2e12d";
+ sha256 = "1wjn991i161z4xqply3lxvvjgnisdrbkiadr0h0n01k40hymdx6h";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/crypto";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/crypto";
+ rev = "a2144134853fc9a27a7b1e3eb4f19f1a76df13c9";
+ sha256 = "0hjjk6k9dq7zllwsw9icdfbli12ii379q2lajd6l7lyw72wy28by";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/net";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/net";
+ rev = "a680a1efc54dd51c040b3b5ce4939ea3cf2ea0d1";
+ sha256 = "018zmn4kmg2mbngcciqal54slc3pl4ry5vlv0bw36fcxvnazxnbp";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/oauth2";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/oauth2";
+ rev = "ef147856a6ddbb60760db74283d2424e98c87bff";
+ sha256 = "1q1vm1z40fx1grlrm7az4rln6v5pj9xi5n1cjqg5xgq4dsk9132y";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/sys";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/sys";
+ rev = "ac767d655b305d4e9612f5f6e33120b9176c4ad4";
+ sha256 = "1ds29n5lh4j21hmzxz7vk7hv1k6sixc7f0zsdc9xqdg0j7d212zm";
+ };
+ }
+]
diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix
index e58cc44884c..297d2c3c666 100644
--- a/pkgs/development/tools/pipenv/default.nix
+++ b/pkgs/development/tools/pipenv/default.nix
@@ -2,16 +2,16 @@
with python3Packages; buildPythonApplication rec {
name = "${pname}-${version}";
pname = "pipenv";
- version = "2018.5.18";
+ version = "2018.7.1";
src = fetchPypi {
inherit pname version;
- sha256 = "1knyknmykjj7gixdpfyns77sv4mizl68addk09ajmw9z5aqaif84";
+ sha256 = "0fpnfxdkymz9an3m6isq5g24ykd6hnkjc8llfnvbmnakz1sd0sxv";
};
LC_ALL = "en_US.UTF-8";
- propagatedBuildInputs = [ pew pip requests flake8 ];
+ propagatedBuildInputs = [ pew pip requests flake8 parver invoke ];
doCheck = false;
diff --git a/pkgs/development/tools/rshell/default.nix b/pkgs/development/tools/rshell/default.nix
new file mode 100644
index 00000000000..b6ba02633ac
--- /dev/null
+++ b/pkgs/development/tools/rshell/default.nix
@@ -0,0 +1,20 @@
+{ lib, buildPythonApplication, fetchPypi, pyserial, pyudev }:
+
+buildPythonApplication rec {
+ pname = "rshell";
+ version = "0.0.14";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "12gh9l13lwnlp330jl3afy3wgfkpjvdxr43flrg9k9kyyhbr191g";
+ };
+
+ propagatedBuildInputs = [ pyserial pyudev ];
+
+ meta = with lib; {
+ homepage = https://github.com/dhylands/rshell;
+ description = "Remote Shell for MicroPython";
+ license = licenses.mit;
+ maintainers = with maintainers; [ c0deaddict ];
+ };
+}
diff --git a/pkgs/games/arena/default.nix b/pkgs/games/arena/default.nix
new file mode 100644
index 00000000000..460fc049c7b
--- /dev/null
+++ b/pkgs/games/arena/default.nix
@@ -0,0 +1,74 @@
+{ stdenv, fetchurl, gtk2-x11, glib, pango, cairo, atk, gdk_pixbuf, libX11 }:
+
+# Arena is free software in the sense of "free beer" but not as in "free
+# speech". We can install it as we please, but we cannot re-distribute it in
+# any way other than the original release tarball, so we cannot include its NAR
+# into the Nixpkgs channel.
+
+let
+
+ inherit (stdenv.lib) makeLibraryPath;
+ libDir = "lib64";
+
+in
+stdenv.mkDerivation rec {
+ name = "arena-1.1";
+
+ src = fetchurl {
+ url = http://www.playwitharena.de/downloads/arenalinux_64bit_1.1.tar.gz;
+ sha256 = "1sh71v5ymzwflq8ycx9j9kl0jhqllgs6z24h4h8j5z8pwdh528v6";
+ };
+
+ # stdenv.cc.cc.lib is in that list to pick up libstdc++.so. Is there a better way?
+ buildInputs = [gtk2-x11 glib pango cairo atk gdk_pixbuf libX11 stdenv.cc.cc.lib];
+
+ unpackPhase = ''
+ # This is is a tar bomb, i.e. it extract a dozen files and directories to
+ # the top-level, so we must create a sub-directory first.
+ mkdir -p $out/lib/${name}
+ tar -C $out/lib/${name} -xf ${src}
+
+ # Remove executable bits from data files. This matters for the find command
+ # we'll use below to find all bundled engines.
+ chmod -x $out/lib/${name}/Engines/*/*.{txt,bin,bmp}
+ '';
+
+ buildPhase = ''
+ # Arena has (at least) two executables plus a couple of bundled chess
+ # engines that we need to patch.
+ exes=( $(find $out -name '*x86_64_linux')
+ $(find $out/lib/${name}/Engines -type f -perm /u+x)
+ )
+ for i in "''${exes[@]}"; do
+ # Arminius is statically linked.
+ if [[ $i =~ "Arminius_2017-01-01" ]]; then echo yo $i; continue; fi
+ echo Fixing interpreter and rpath paths in $i ...
+ patchelf \
+ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+ --set-rpath ${makeLibraryPath buildInputs}:$(cat $NIX_CC/nix-support/orig-cc)/${libDir} \
+ $i
+ done
+ '';
+
+ installPhase = ''
+ mkdir -p $out/bin
+ ln -s $out/lib/${name}/Arena_x86_64_linux $out/bin/arena
+ '';
+
+ dontStrip = true;
+
+ meta = {
+ description = "Chess GUI for analyzing with and playing against various engines";
+ longDescription = ''
+ A free Graphical User Interface (GUI) for chess. Arena assists you in
+ analyzing and playing games as well as in testing chess engines. It runs
+ on Linux or Windows. Arena is compatible to Winboard protocol I, II and
+ UCI protocol I, II. Furthermore, compatible to Chess960, DGT electronic
+ chess board & DGT clocks and much more.
+ '';
+ license = stdenv.lib.licenses.unfree;
+ platforms = ["x86_64-linux"];
+ hydraPlatforms = stdenv.lib.platforms.none;
+ };
+
+}
diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix
index e59181bb0fa..76edc512b0e 100644
--- a/pkgs/games/minecraft/default.nix
+++ b/pkgs/games/minecraft/default.nix
@@ -1,11 +1,6 @@
-{ stdenv, fetchurl, makeDesktopItem
-, jre, libX11, libXext, libXcursor, libXrandr, libXxf86vm
-, openjdk
-, libGLU_combined, openal
-, useAlsa ? false, alsaOss ? null }:
-with stdenv.lib;
-
-assert useAlsa -> alsaOss != null;
+{ stdenv, fetchurl, makeDesktopItem, makeWrapper
+, jdk, jre, libpulseaudio
+}:
let
desktopItem = makeDesktopItem {
@@ -19,41 +14,33 @@ let
};
in stdenv.mkDerivation {
- name = "minecraft-2015.07.24";
+ name = "minecraft-2015-07-24";
src = fetchurl {
url = "https://s3.amazonaws.com/Minecraft.Download/launcher/Minecraft.jar";
sha256 = "04pj4l5q0a64jncm2kk45r7nxnxa2z9n110dcxbbahdi6wk0png8";
};
- phases = "installPhase";
+ nativeBuildInputs = [ makeWrapper ];
+
+ unpackPhase = "${jdk}/bin/jar xf $src favicon.png";
installPhase = ''
- set -x
- mkdir -pv $out/bin
- cp -v $src $out/minecraft.jar
+ mkdir -p $out/bin $out/share/minecraft
- cat > $out/bin/minecraft << EOF
- #!${stdenv.shell}
+ makeWrapper ${jre}/bin/java $out/bin/minecraft \
+ --add-flags "-jar $out/share/minecraft/minecraft.jar" \
+ --suffix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libpulseaudio ]}
- export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libGLU_combined openal ]}
- ${if useAlsa then "${alsaOss}/bin/aoss" else "" } \
- ${jre}/bin/java -jar $out/minecraft.jar
- EOF
-
- chmod +x $out/bin/minecraft
-
- mkdir -p $out/share/applications
- ln -s ${desktopItem}/share/applications/* $out/share/applications/
-
- ${openjdk}/bin/jar xf $out/minecraft.jar favicon.png
+ cp $src $out/share/minecraft/minecraft.jar
+ cp -r ${desktopItem}/share/applications $out/share
install -D favicon.png $out/share/icons/hicolor/32x32/apps/minecraft.png
'';
- meta = {
- description = "A sandbox-building game";
- homepage = http://www.minecraft.net;
- maintainers = with stdenv.lib.maintainers; [ cpages ryantm ];
- license = stdenv.lib.licenses.unfreeRedistributable;
+ meta = with stdenv.lib; {
+ description = "A sandbox-building game";
+ homepage = https://minecraft.net;
+ maintainers = with maintainers; [ cpages ryantm infinisil ];
+ license = licenses.unfreeRedistributable;
};
}
diff --git a/pkgs/games/prboom/default.nix b/pkgs/games/prboom/default.nix
index 4babc1caea5..520f6503edf 100644
--- a/pkgs/games/prboom/default.nix
+++ b/pkgs/games/prboom/default.nix
@@ -1,20 +1,31 @@
-{stdenv, fetchurl, SDL, SDL_mixer, SDL_net, libGLU_combined}:
+{ stdenv, fetchurl, SDL, SDL_mixer, SDL_net
+, libGLU_combined ? assert false; null
+, useOpenGL ? stdenv.hostPlatform == stdenv.buildPlatform
+}:
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
name = "prboom-2.5.0";
src = fetchurl {
url = mirror://sourceforge/prboom/prboom-2.5.0.tar.gz;
sha256 = "1bjb04q8dk232956k30qlpq6q0hxb904yh1nflr87jcc1x3iqv12";
};
- buildInputs = [ SDL SDL_mixer SDL_net libGLU_combined ];
- crossAttrs = {
- propagatedBuildInputs = [ SDL.crossDrv SDL_mixer.crossDrv SDL_net.crossDrv ];
- configureFlags = "--disable-gl --disable-cpu-opt --without-x --disable-sdltest
- ac_cv_type_uid_t=yes ac_cv_type_gid_t=yes";
+ buildInputs = [ SDL SDL_mixer SDL_net ]
+ ++ stdenv.lib.optional useOpenGL libGLU_combined;
- postInstall = ''
- mv $out/games/ $out/bin
- '';
- };
+ doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
+
+ configureFlags = [
+ (stdenv.lib.enableFeature useOpenGL "gl")
+ (stdenv.lib.enableFeature doCheck "sdltest")
+ ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+ "--disable-cpu-opt"
+ "--without-x"
+ "ac_cv_type_uid_t=yes"
+ "ac_cv_type_gid_t=yes"
+ ];
+
+ postInstall = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+ mv $out/games/ $out/bin
+ '';
}
diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix
index f4590081898..b9b95a5fb4d 100644
--- a/pkgs/games/scummvm/default.nix
+++ b/pkgs/games/scummvm/default.nix
@@ -20,22 +20,16 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ configurePlatforms = [ "host" ];
configureFlags = [
"--enable-c++11"
"--enable-release"
];
- crossAttrs = {
- preConfigure = ''
- # Remove the --build flag set by the gcc cross wrapper setup
- # hook
- export configureFlags="--host=${hostPlatform.config}"
- '';
- postConfigure = ''
- # They use 'install -s', that calls the native strip instead of the cross
- sed -i 's/-c -s/-c/' ports.mk;
- '';
- };
+ # They use 'install -s', that calls the native strip instead of the cross
+ postConfigure = ''
+ sed -i "s/-c -s/-c -s --strip-program=''${STRIP@Q}" ports.mk
+ '';
meta = with stdenv.lib; {
description = "Program to run certain classic graphical point-and-click adventure games (such as Monkey Island)";
diff --git a/pkgs/games/stockfish/default.nix b/pkgs/games/stockfish/default.nix
index 159f1faf096..1f99af85f9f 100644
--- a/pkgs/games/stockfish/default.nix
+++ b/pkgs/games/stockfish/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchurl }:
let arch = if stdenv.isx86_64 then "x86-64" else
if stdenv.isi686 then "x86-32" else
@@ -7,14 +7,13 @@ in
stdenv.mkDerivation rec {
- name = "stockfish-8";
+ name = "stockfish-9";
src = fetchurl {
- url = "https://stockfish.s3.amazonaws.com/${name}-src.zip";
- sha256 = "1sachz41kbni88yjxwv5y4vl0gjbnyqvp1kpdm7v56k43zr3dbbv";
+ url = "https://github.com/official-stockfish/Stockfish/archive/sf_9.tar.gz";
+ sha256 = "1i37izc3sq9vr663iaxpfh008lgsw7abzj1ws5l1hf3b6xjkgwyh";
};
- buildInputs = [ unzip ];
postUnpack = "sourceRoot+=/src";
makeFlags = [ "PREFIX=$(out)" "ARCH=${arch}" ];
buildFlags = "build ";
diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index b52e6324199..8a9580d99e1 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -2848,11 +2848,11 @@ let
};
youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation
- name = "youcompleteme-2018-06-20";
+ name = "youcompleteme-2018-07-24";
src = fetchgit {
url = "https://github.com/valloric/youcompleteme";
- rev = "e1ead995c13fe20989ee3d69fd76b20c5fff5d5b";
- sha256 = "01my9m7a5m24zrh6i867fhqz42jxs0ai2pl4pra8wzvyk4ai1p5f";
+ rev = "459b3e620e45191b15c48c66b02ff89f1a0674db";
+ sha256 = "0s4sndx0mm13xcb559agfcqqdwhp2sr7kpp4ksc9gx41k7626rdr";
};
dependencies = [];
buildPhase = ''
@@ -3259,7 +3259,7 @@ let
sha256 = "0hj5bhfhd9am11ixaxad370p982bjig53mbm74fi6slhjpikdrdq";
};
dependencies = [];
- buildInputs = [ python3 ];
+ buildInputs = [ python3 ];
buildPhase = ''
pushd ./rplugin/python3/deoplete/ujson
python3 setup.py build --build-base=$PWD/build --build-lib=$PWD/build
diff --git a/pkgs/misc/vscode-extensions/python/default.nix b/pkgs/misc/vscode-extensions/python/default.nix
index c33359ccbfc..f08181d9068 100644
--- a/pkgs/misc/vscode-extensions/python/default.nix
+++ b/pkgs/misc/vscode-extensions/python/default.nix
@@ -20,8 +20,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "python";
publisher = "ms-python";
- version = "2018.6.0";
- sha256 = "a157399b45b40caa9e0b3432eaf3e7444ee4cb91497c139bcb740d42d61f9ae8";
+ version = "2018.7.0";
+ sha256 = "0ab6ce722b23274a8f70d156f55d02123dd3b686397b11d4eec0831ec69dbec5";
};
postPatch = ''
diff --git a/pkgs/os-specific/darwin/skhd/default.nix b/pkgs/os-specific/darwin/skhd/default.nix
index c51ada10d68..b3bf590bf26 100644
--- a/pkgs/os-specific/darwin/skhd/default.nix
+++ b/pkgs/os-specific/darwin/skhd/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "skhd-${version}";
- version = "0.1.1";
+ version = "0.2.2";
src = fetchFromGitHub {
owner = "koekeishiya";
repo = "skhd";
rev = "v${version}";
- sha256 = "1wh7v90ydh27gbaiwn2r6ncx6yiic4mph3w9vi1282nz2q02zxss";
+ sha256 = "0mn6svz2mqbpwlx510r447vflfcxryykpin6h6429dlz0wjlipa8";
};
buildInputs = [ Carbon ];
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
description = "Simple hotkey daemon for macOS";
homepage = https://github.com/koekeishiya/skhd;
platforms = platforms.darwin;
- maintainers = with maintainers; [ lnl7 ];
+ maintainers = with maintainers; [ lnl7 periklis ];
license = licenses.mit;
};
}
diff --git a/pkgs/os-specific/gnu/hurd/default.nix b/pkgs/os-specific/gnu/hurd/default.nix
index ae1c504fd19..a0c4be0ff45 100644
--- a/pkgs/os-specific/gnu/hurd/default.nix
+++ b/pkgs/os-specific/gnu/hurd/default.nix
@@ -52,7 +52,8 @@ stdenv.mkDerivation ({
done
'';
- crossAttrs.dontPatchShebangs = true;
+ # Not needed after https://github.com/NixOS/nixpkgs/pull/43833
+ dontPatchShebangs = stdenv.hostPlatform != stdenv.buildPlatform;
meta = {
description = "The GNU Hurd, GNU project's replacement for the Unix kernel";
diff --git a/pkgs/os-specific/gnu/mig/default.nix b/pkgs/os-specific/gnu/mig/default.nix
index 2855f5b4240..d138011d595 100644
--- a/pkgs/os-specific/gnu/mig/default.nix
+++ b/pkgs/os-specific/gnu/mig/default.nix
@@ -21,13 +21,11 @@ stdenv.mkDerivation {
doCheck = true;
- crossAttrs = {
- postInstall =
- # Fix the shebang to point to the cross-built shell.
- '' sed -i "$out/bin/mig" \
- -e 's|^#!/.*|#!${bash.crossDrv}/bin/sh|g'
- '';
- };
+ # Fix the shebang to point to the cross-built shell. Won't be needed
+ # after #43833.
+ postInstall = ''
+ sed -i "$out/bin/mig" -e 's|^#!/.*|#!${bash}/bin/sh|g'
+ '';
meta = {
description = "GNU MIG, the Mach interface generator";
diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix
index 594f966c2f4..64484113167 100644
--- a/pkgs/os-specific/linux/fuse/default.nix
+++ b/pkgs/os-specific/linux/fuse/default.nix
@@ -6,12 +6,12 @@ let
};
in {
fuse_2 = mkFuse {
- version = "2.9.7";
- sha256Hash = "1wyjjfb7p4jrkk15zryzv33096a5fmsdyr2p4b00dd819wnly2n2";
+ version = "2.9.8";
+ sha256Hash = "0s04ln4k9zvvbjih8ybaa19fxg8xv7dcsz2yrlbk35psnf3l67af";
};
fuse_3 = mkFuse {
- version = "3.2.4";
- sha256Hash = "1ybgd4s7naiyvaris7j6fzp604cgi5mgrn715x8l4kn5k9d840im";
+ version = "3.2.5";
+ sha256Hash = "0ibf2isbkm8p1gfaqpqblwsg0lm4s1rmcipv1qcg0wc4wwsbnqpx";
};
}
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index 25078b7d753..4af5e80a655 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -105,7 +105,9 @@ let
sed -e '/fflush(stdout);/i\printf("###");' -i scripts/kconfig/conf.c
'';
- inherit (kernel) src patches preUnpack;
+ preUnpack = kernel.preUnpack or "";
+
+ inherit (kernel) src patches;
buildPhase = ''
export buildRoot="''${buildRoot:-build}"
diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index 4a364a824d9..2bff43c93de 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "4.14.57";
+ version = "4.14.58";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "046qvgf44sn51g979whzvc6qrbz31gwxwm9xkka93vmqavr415aa";
+ sha256 = "1zfyrcfsx9410gnjk1hrjs5d4p93qm6k2r9q24i5c1nhfhzf0rgz";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.17.nix b/pkgs/os-specific/linux/kernel/linux-4.17.nix
index 9de96398e3e..2ac619232d4 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.17.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.17.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "4.17.9";
+ version = "4.17.10";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "1frsg1qli4922w172mx96n0l7yzhiw6kirzzw4svsq3qsfnxq57x";
+ sha256 = "1s0vzzdcixy2m3ybd9z1h5b2wiiz2mgnwn09jxvj1v4rwjix457a";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index f654853eca4..d4a2c56a894 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
- version = "4.4.143";
+ version = "4.4.144";
extraMeta.branch = "4.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0n737jdk9ms7v7zkhf45nfdg2jcyap4qpzxm162f4q9zz3sh0dif";
+ sha256 = "11lsf62qd9qm6n6ilxwx0zag3phvfmfjpbdc24j4p2c9gfgqpyss";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index aff61de93be..3fe55b2a6f3 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
- version = "4.9.114";
+ version = "4.9.115";
extraMeta.branch = "4.9";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "1c3j82rcnj03bk5s2i11mhksv5l09hmkfs3rpbj5msnrn123ds76";
+ sha256 = "0fddhw9v5l8k2j31zlfikd2g397ngyynfbwg92z17vp510fxjf20";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index b2171067307..80721c4b401 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -1,4 +1,4 @@
-{ buildPackages, runCommand, nettools, bc, bison, flex, perl, gmp, libmpc, mpfr, openssl
+{ buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl
, libelf
, utillinux
, writeTextFile
@@ -90,9 +90,6 @@ let
inherit src;
- preUnpack = ''
- '';
-
patches = map (p: p.patch) kernelPatches;
prePatch = ''
@@ -111,11 +108,6 @@ let
echo "manual-config configurePhase buildRoot=$buildRoot pwd=$PWD"
- if [[ -z "$buildRoot" || ! -d "$buildRoot" ]]; then
- echo "set $buildRoot to the build folder please"
- exit 1
- fi
-
if [ -f "$buildRoot/.config" ]; then
echo "Could not link $buildRoot/.config : file exists"
exit 1
@@ -127,7 +119,7 @@ let
make $makeFlags "''${makeFlagsArray[@]}" oldconfig
runHook postConfigure
- make $makeFlags prepare
+ make $makeFlags "''${makeFlagsArray[@]}" prepare
actualModDirVersion="$(cat $buildRoot/include/config/kernel.release)"
if [ "$actualModDirVersion" != "${modDirVersion}" ]; then
echo "Error: modDirVersion ${modDirVersion} specified in the Nix expression is wrong, it should be: $actualModDirVersion"
@@ -172,8 +164,14 @@ let
unlink $out/lib/modules/${modDirVersion}/build
unlink $out/lib/modules/${modDirVersion}/source
- mkdir -p $dev/lib/modules/${modDirVersion}/build
- cp -dpR .. $dev/lib/modules/${modDirVersion}/source
+ mkdir -p $dev/lib/modules/${modDirVersion}/{build,source}
+
+ # To save space, exclude a bunch of unneeded stuff when copying.
+ (cd .. && rsync --archive --prune-empty-dirs \
+ --exclude='/build/' \
+ --exclude='/Documentation/' \
+ * $dev/lib/modules/${modDirVersion}/source/)
+
cd $dev/lib/modules/${modDirVersion}/source
cp $buildRoot/{.config,Module.symvers} $dev/lib/modules/${modDirVersion}/build
@@ -259,7 +257,7 @@ stdenv.mkDerivation ((drvAttrs config hostPlatform.platform kernelPatches config
enableParallelBuilding = true;
depsBuildBuild = [ buildPackages.stdenv.cc ];
- nativeBuildInputs = [ perl bc nettools openssl gmp libmpc mpfr ]
+ nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr ]
++ optional (stdenv.hostPlatform.platform.kernelTarget == "uImage") buildPackages.ubootTools
++ optional (stdenv.lib.versionAtLeast version "4.14") libelf
++ optional (stdenv.lib.versionAtLeast version "4.15") utillinux
diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix
index f9be8225570..142c176a15f 100644
--- a/pkgs/os-specific/linux/kmod/default.nix
+++ b/pkgs/os-specific/linux/kmod/default.nix
@@ -15,8 +15,6 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkgconfig libxslt ];
buildInputs = [ xz ];
- # HACK until BUG issue #21191 is addressed
- crossAttrs.preUnpack = ''PATH="${buildPackages.xz}/bin''${PATH:+:}$PATH"'';
configureFlags = [
"--sysconfdir=/etc"
diff --git a/pkgs/os-specific/linux/s6-linux-utils/default.nix b/pkgs/os-specific/linux/s6-linux-utils/default.nix
index f24d8d1f875..dbef7c41c06 100644
--- a/pkgs/os-specific/linux/s6-linux-utils/default.nix
+++ b/pkgs/os-specific/linux/s6-linux-utils/default.nix
@@ -13,23 +13,31 @@ in stdenv.mkDerivation rec {
sha256 = "0245rmk7wfyyfsi4g7f0niprwlvqlwkbyjxflb8kkbvhwfdavqip";
};
+ outputs = [ "bin" "dev" "doc" "out" ];
+
dontDisableStatic = true;
configureFlags = [
"--enable-absolute-paths"
- "--includedir=\${prefix}/include"
- "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
- "--with-include=${skalibs}/include"
- "--with-lib=${skalibs}/lib"
- "--with-dynlib=${skalibs}/lib"
+ "--bindir=\${bin}/bin"
+ "--includedir=\${dev}/include"
+ "--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps"
+ "--with-include=${skalibs.dev}/include"
+ "--with-lib=${skalibs.lib}/lib"
+ "--with-dynlib=${skalibs.lib}/lib"
];
+ postInstall = ''
+ mkdir -p $doc/share/doc/s6-networking/
+ mv doc $doc/share/doc/s6-networking/html
+ '';
+
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;
- maintainers = with stdenv.lib.maintainers; [ pmahoney ];
+ maintainers = with stdenv.lib.maintainers; [ pmahoney Profpatsch ];
};
}
diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix
index 87741d29f8e..d2f75f5875e 100644
--- a/pkgs/os-specific/linux/util-linux/default.nix
+++ b/pkgs/os-specific/linux/util-linux/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkgconfig, zlib, shadow
-, ncurses ? null, perl ? null, pam, systemd, minimal ? false }:
+, ncurses ? null, perl ? null, pam, systemd ? null, minimal ? false }:
let
version = lib.concatStringsSep "." ([ majorVersion ]
@@ -28,12 +28,6 @@ in stdenv.mkDerivation rec {
--replace "/bin/umount" "$out/bin/umount"
'';
- crossAttrs = {
- # Work around use of `AC_RUN_IFELSE'.
- preConfigure = "export scanf_cv_type_modifier=ms" + lib.optionalString (systemd != null)
- "\nconfigureFlags+=\" --with-systemd --with-systemdsystemunitdir=$bin/lib/systemd/system/\"";
- };
-
preConfigure = lib.optionalString (systemd != null) ''
configureFlags+=" --with-systemd --with-systemdsystemunitdir=$bin/lib/systemd/system/"
'';
@@ -49,8 +43,10 @@ in stdenv.mkDerivation rec {
"--disable-use-tty-group"
"--enable-fs-paths-default=/run/wrappers/bin:/var/run/current-system/sw/bin:/sbin"
"--disable-makeinstall-setuid" "--disable-makeinstall-chown"
- ]
- ++ lib.optional (ncurses == null) "--without-ncurses";
+ ] ++ lib.optional (ncurses == null) "--without-ncurses"
+ ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
+ "scanf_cv_type_modifier=ms"
+ ;
makeFlags = "usrbin_execdir=$(bin)/bin usrsbin_execdir=$(bin)/sbin";
diff --git a/pkgs/os-specific/windows/jom/default.nix b/pkgs/os-specific/windows/jom/default.nix
index 8befa51566d..1b64ad74599 100644
--- a/pkgs/os-specific/windows/jom/default.nix
+++ b/pkgs/os-specific/windows/jom/default.nix
@@ -17,13 +17,11 @@ stdenv.mkDerivation {
QTDIR = qt48;
- crossAttrs = {
- # cmakeFlags = "-DWIN32=1 -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_RC_COMPILER=${stdenv.cc.targetPrefix}windres";
- QTDIR = qt48.crossDrv;
- preBuild = ''
- export NIX_CROSS_CFLAGS_COMPILE=-fpermissive
- '';
- };
+ # cmakeFlags = "-DWIN32=1 -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_RC_COMPILER=${stdenv.cc.targetPrefix}windres";
+
+ preBuild = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+ export NIX_CROSS_CFLAGS_COMPILE=-fpermissive
+ '';
meta = {
homepage = http://qt-project.org/wiki/jom;
diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index 217ac3f6d91..4385a4e020c 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -1,7 +1,7 @@
{ lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }:
buildGoPackage rec {
- version = "5.2.1";
+ version = "5.2.2";
name = "grafana-${version}";
goPackagePath = "github.com/grafana/grafana";
@@ -9,12 +9,12 @@ buildGoPackage rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
- sha256 = "0gv7g6ddcmdkjd1xp9dg2kq7askzaw1vkmcii21glqb74k2jfg74";
+ sha256 = "17w8ljq4p1sxcdpsiz4221gwhi3ykggpisnx1wdw22g2160q9sdj";
};
srcStatic = fetchurl {
url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz";
- sha256 = "0j69a9cjvkknq19aa2l634b48zy1lwmv2p676hzc856zgq3h6m9m";
+ sha256 = "1frbk13sww3sw09mpkijii1kf7m19hqg58ps8gvs4dvxg12bbv3l";
};
postPatch = ''
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index 18a9c7f3809..66570cba946 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -53,44 +53,6 @@ rec {
});
};
-
- # Return a modified stdenv that adds a cross compiler to the
- # builds.
- makeStdenvCross = { stdenv
- , cc
- , buildPlatform, hostPlatform, targetPlatform
- , # Prior overrides are surely not valid as packages built
- # with this run on a different platform, so disable by
- # default.
- overrides ? _: _: {}
- } @ overrideArgs: let
- stdenv = overrideArgs.stdenv.override {
- inherit
- buildPlatform hostPlatform targetPlatform
- cc overrides;
-
- allowedRequisites = null;
- extraBuildInputs = [ ]; # Old ones run on wrong platform
- };
- in stdenv // {
- mkDerivation =
- { nativeBuildInputs ? []
- , ...
- } @ args:
-
- stdenv.mkDerivation (args // {
- nativeBuildInputs = nativeBuildInputs
- # without proper `file` command, libtool sometimes fails
- # to recognize 64-bit DLLs
- ++ stdenv.lib.optional (hostPlatform.config == "x86_64-w64-mingw32") pkgs.file
- ++ stdenv.lib.optional
- (hostPlatform.isAarch64 || hostPlatform.isMips || hostPlatform.libc == "musl")
- pkgs.updateAutotoolsGnuConfigScriptsHook
- ;
- } // args.crossAttrs or {});
- };
-
-
/* Modify a stdenv so that the specified attributes are added to
every derivation returned by its mkDerivation function.
diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix
index ab42dd319a6..bc8d772530a 100644
--- a/pkgs/stdenv/cross/default.nix
+++ b/pkgs/stdenv/cross/default.nix
@@ -34,17 +34,32 @@ in lib.init bootStages ++ [
(buildPackages: {
inherit config overlays;
selfBuild = false;
- stdenv = buildPackages.makeStdenvCross {
- inherit (buildPackages) stdenv;
+ stdenv = buildPackages.stdenv.override (old: rec {
buildPlatform = localSystem;
hostPlatform = crossSystem;
targetPlatform = crossSystem;
+
+ # Prior overrides are surely not valid as packages built with this run on
+ # a different platform, and so are disabled.
+ overrides = _: _: {};
+ extraBuildInputs = [ ]; # Old ones run on wrong platform
+ allowedRequisites = null;
+
cc = if crossSystem.useiOSPrebuilt or false
then buildPackages.darwin.iosSdkPkgs.clang
else if crossSystem.useAndroidPrebuilt
then buildPackages.androidenv."androidndkPkgs_${crossSystem.ndkVer}".gcc
else buildPackages.gcc;
- };
+
+ extraNativeBuildInputs = old.extraNativeBuildInputs
+ # without proper `file` command, libtool sometimes fails
+ # to recognize 64-bit DLLs
+ ++ lib.optional (hostPlatform.config == "x86_64-w64-mingw32") buildPackages.file
+ ++ lib.optional
+ (hostPlatform.isAarch64 || hostPlatform.isMips || hostPlatform.libc == "musl")
+ buildPackages.updateAutotoolsGnuConfigScriptsHook
+ ;
+ });
})
]
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index 778f107f71e..48ee68f4c00 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -164,7 +164,7 @@ rec {
derivationArg =
(removeAttrs attrs
- ["meta" "passthru" "crossAttrs" "pos"
+ ["meta" "passthru" "pos"
"doCheck" "doInstallCheck"
"checkInputs" "installCheckInputs"
"__impureHostDeps" "__propagatedImpureHostDeps"
@@ -192,14 +192,14 @@ rec {
depsBuildBuild = lib.elemAt (lib.elemAt dependencies 0) 0;
nativeBuildInputs = lib.elemAt (lib.elemAt dependencies 0) 1;
depsBuildTarget = lib.elemAt (lib.elemAt dependencies 0) 2;
- depsHostBuild = lib.elemAt (lib.elemAt dependencies 1) 0;
+ depsHostHost = lib.elemAt (lib.elemAt dependencies 1) 0;
buildInputs = lib.elemAt (lib.elemAt dependencies 1) 1;
depsTargetTarget = lib.elemAt (lib.elemAt dependencies 2) 0;
depsBuildBuildPropagated = lib.elemAt (lib.elemAt propagatedDependencies 0) 0;
propagatedNativeBuildInputs = lib.elemAt (lib.elemAt propagatedDependencies 0) 1;
depsBuildTargetPropagated = lib.elemAt (lib.elemAt propagatedDependencies 0) 2;
- depsHostBuildPropagated = lib.elemAt (lib.elemAt propagatedDependencies 1) 0;
+ depsHostHostPropagated = lib.elemAt (lib.elemAt propagatedDependencies 1) 0;
propagatedBuildInputs = lib.elemAt (lib.elemAt propagatedDependencies 1) 1;
depsTargetTargetPropagated = lib.elemAt (lib.elemAt propagatedDependencies 2) 0;
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index c5feffcea99..8b98aac1146 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -504,6 +504,10 @@ activatePackage() {
addToSearchPath _PATH "$pkg/bin"
fi
+ if [[ "$hostOffset" -eq 0 && -d "$pkg/bin" ]]; then
+ addToSearchPath HOST_PATH "$pkg/bin"
+ fi
+
if [[ -f "$pkg/nix-support/setup-hook" ]]; then
local oldOpts="$(shopt -po nounset)"
set +u
diff --git a/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix b/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix
new file mode 100644
index 00000000000..33b83bdb558
--- /dev/null
+++ b/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix
@@ -0,0 +1,23 @@
+{ buildGoPackage, fetchFromGitHub, lib, ... }:
+
+buildGoPackage rec {
+ name = "amazon-ecr-credential-helper-${version}";
+ version = "0.1.0";
+
+ goPackagePath = "github.com/awslabs/amazon-ecr-credential-helper";
+
+ src = fetchFromGitHub {
+ owner = "awslabs";
+ repo = "amazon-ecr-credential-helper";
+ rev = "v${version}";
+ sha256 = "0mpwm21fphg117ryxda7696s8bnvi4bbc8rvi4zp2m1rhl04j2yy";
+ };
+
+ meta = with lib; {
+ description = "The Amazon ECR Docker Credential Helper is a credential helper for the Docker daemon that makes it easier to use Amazon Elastic Container Registry";
+ homepage = https://github.com/awslabs/amazon-ecr-credential-helper;
+ license = licenses.asl20 ;
+ maintainers = with maintainers; [ kalbasit ];
+ platforms = platforms.linux ++ platforms.darwin;
+ };
+}
diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/pkgs/tools/archivers/sharutils/default.nix b/pkgs/tools/archivers/sharutils/default.nix
index 02281468942..907ac58d15f 100644
--- a/pkgs/tools/archivers/sharutils/default.nix
+++ b/pkgs/tools/archivers/sharutils/default.nix
@@ -34,10 +34,6 @@ stdenv.mkDerivation rec {
doCheck = true;
- crossAttrs = {
- patches = [ ./sharutils-4.11.1-cross-binary-mode-popen.patch ];
- };
-
meta = with stdenv.lib; {
description = "Tools for remote synchronization and `shell archives'";
longDescription =
diff --git a/pkgs/tools/archivers/sharutils/sharutils-4.11.1-cross-binary-mode-popen.patch b/pkgs/tools/archivers/sharutils/sharutils-4.11.1-cross-binary-mode-popen.patch
deleted file mode 100644
index f05eab251d4..00000000000
--- a/pkgs/tools/archivers/sharutils/sharutils-4.11.1-cross-binary-mode-popen.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -Naur sharutils-4.11.1.orig/configure sharutils-4.11.1/configure
---- sharutils-4.11.1.orig/configure 2011-06-20 11:07:40.000000000 -0400
-+++ sharutils-4.11.1/configure 2011-06-20 11:09:30.000000000 -0400
-@@ -26962,33 +26962,33 @@
- CATALOGS="$new_CATALOGS"
- fi
-
--if test "$cross_compiling" = yes; then :
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run test program while cross compiling
--See \`config.log' for more details" "$LINENO" 5; }
--else
-- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h. */
--
--int
--main ()
--{
-- FILE * fp = popen ("date", "rb");
-- exit (fp == NULL);
-- ;
-- return 0;
--}
--_ACEOF
--if ac_fn_c_try_run "$LINENO"; then :
--
-+#if test "$cross_compiling" = yes; then :
-+# { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+#$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+#as_fn_error $? "cannot run test program while cross compiling
-+#See \`config.log' for more details" "$LINENO" 5; }
-+#else
-+# cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+#/* end confdefs.h. */
-+#
-+#int
-+#main ()
-+#{
-+# FILE * fp = popen ("date", "rb");
-+# exit (fp == NULL);
-+# ;
-+# return 0;
-+#}
-+#_ACEOF
-+#if ac_fn_c_try_run "$LINENO"; then :
-+#
- $as_echo "#define BINARY_MODE_POPEN 1" >>confdefs.h
--
--
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-- conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
-+#
-+#
-+#fi
-+#rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+# conftest.$ac_objext conftest.beam conftest.$ac_ext
-+#fi
-
-
-
diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index b6ff7e5c967..5c7ced40afb 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -97,7 +97,7 @@ let
};
in pythonPackages.buildPythonApplication rec {
- name = "beets-${version}";
+ pname = "beets";
version = "1.4.7";
src = fetchFromGitHub {
@@ -114,7 +114,6 @@ in pythonPackages.buildPythonApplication rec {
pythonPackages.munkres
pythonPackages.musicbrainzngs
pythonPackages.mutagen
- pythonPackages.pathlib
pythonPackages.pyyaml
pythonPackages.unidecode
pythonPackages.gst-python
diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix
index 674bb5b552b..928494667f1 100644
--- a/pkgs/tools/bootloaders/refind/default.nix
+++ b/pkgs/tools/bootloaders/refind/default.nix
@@ -13,12 +13,12 @@ in
stdenv.mkDerivation rec {
name = "refind-${version}";
- version = "0.11.2";
+ version = "0.11.3";
srcName = "refind-src-${version}";
src = fetchurl {
url = "mirror://sourceforge/project/refind/${version}/${srcName}.tar.gz";
- sha256 = "1k0xpm4y0gk1rxqdyprqyqpg5j16xw3l2gm3d9zpi5n9id43jkzn";
+ sha256 = "13q1yap9r4lzm5xjx1zi434gckd3gk5p8n4vh6jav0h3r3ayp633";
};
buildInputs = [ gnu-efi ];
diff --git a/pkgs/tools/filesystems/simg2img/default.nix b/pkgs/tools/filesystems/simg2img/default.nix
new file mode 100644
index 00000000000..94c45ec4689
--- /dev/null
+++ b/pkgs/tools/filesystems/simg2img/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, zlib }:
+
+stdenv.mkDerivation rec {
+ name = "simg2img-${version}";
+ version = "1.1.3";
+
+ src = fetchFromGitHub {
+ owner = "anestisb";
+ repo = "android-simg2img";
+ rev = "${version}";
+ sha256 = "119gl9i61g2wr07hzv6mi1ihql6yd6pwq94ki2pgcpfbamv8f6si";
+ };
+
+ buildInputs = [ zlib ];
+
+ makeFlags = [ "PREFIX=$(out)" ];
+
+ meta = with stdenv.lib; {
+ description = "Tool to convert Android sparse images to raw images";
+ homepage = "https://github.com/anestisb/android-simg2img";
+ license = licenses.asl20;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.dezgeg ];
+ };
+}
diff --git a/pkgs/tools/graphics/appleseed/default.nix b/pkgs/tools/graphics/appleseed/default.nix
index 56091a89e48..0fe6dcfbfd3 100644
--- a/pkgs/tools/graphics/appleseed/default.nix
+++ b/pkgs/tools/graphics/appleseed/default.nix
@@ -3,7 +3,10 @@ eigen3_3, libpng, python, libGLU, qt4, openexr, openimageio,
opencolorio, xercesc, ilmbase, osl, seexpr
}:
-let boost_static = boost165.override { enableStatic = true; };
+let boost_static = boost165.override {
+ enableStatic = true;
+ enablePython = true;
+};
in stdenv.mkDerivation rec {
name = "appleseed-${version}";
@@ -28,9 +31,7 @@ in stdenv.mkDerivation rec {
"-DUSE_EXTERNAL_OSL=ON" "-DWITH_CLI=ON" "-DWITH_STUDIO=ON" "-DWITH_TOOLS=ON"
"-DUSE_EXTERNAL_PNG=ON" "-DUSE_EXTERNAL_ZLIB=ON"
"-DUSE_EXTERNAL_EXR=ON" "-DUSE_EXTERNAL_SEEXPR=ON"
- "-DWITH_PYTHON2_BINDINGS=ON"
- # TODO: Look further into this if someone needs Python 3.x:
- # "-DWITH_PYTHON3_BINDINGS=ON"
+ "-DWITH_PYTHON=ON"
"-DWITH_DISNEY_MATERIAL=ON"
"-DUSE_SSE=ON"
"-DUSE_SSE42=ON"
@@ -44,6 +45,11 @@ in stdenv.mkDerivation rec {
license = licenses.mit;
platforms = platforms.linux;
};
+
+ # Work around a bug in the CMake build:
+ postInstall = ''
+ chmod a+x $out/bin/*
+ '';
}
# TODO: Is the below problematic?
diff --git a/pkgs/tools/graphics/yaxg/default.nix b/pkgs/tools/graphics/yaxg/default.nix
new file mode 100644
index 00000000000..8fbc09a6d82
--- /dev/null
+++ b/pkgs/tools/graphics/yaxg/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub, makeWrapper,
+ maim, slop, ffmpeg, byzanz, libnotify, xdpyinfo }:
+
+stdenv.mkDerivation rec {
+ name = "yaxg-${version}";
+ version = "unstable-2018-05-03";
+
+ src = fetchFromGitHub {
+ owner = "DanielFGray";
+ repo = "yaxg";
+ rev = "9d6af75da2ec25dba4b8d784e431064033d67ad2";
+ sha256 = "01p6ghp1vfrlnrm78bgbl9ppqwsdxh761g0qa172dpvsqg91l1p6";
+ };
+
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ maim slop ffmpeg byzanz libnotify xdpyinfo ];
+
+ installPhase = ''
+ mkdir -p $out/bin/
+ mv yaxg $out/bin/
+ chmod +x $out/bin/yaxg
+ wrapProgram $out/bin/yaxg --prefix PATH : ${ stdenv.lib.makeBinPath [ maim slop ffmpeg byzanz libnotify xdpyinfo ]}
+ '';
+
+ meta = with stdenv.lib; {
+ inherit (src.meta) homepage;
+ description = "Yet Another X Grabber script";
+ longDescription = ''
+ Capture and record your screen with callbacks. Wraps maim, slop, ffmpeg,
+ and byzanz to enable still image, video, or gif recording of part or all
+ of your screen. Similar command-line interface to scrot but is overall
+ more flexible and less buggy.
+ '';
+ platforms = platforms.all;
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ neonfuz ];
+ };
+}
diff --git a/pkgs/tools/misc/eot-utilities/default.nix b/pkgs/tools/misc/eot-utilities/default.nix
index b44159be8ce..b9efead2798 100644
--- a/pkgs/tools/misc/eot-utilities/default.nix
+++ b/pkgs/tools/misc/eot-utilities/default.nix
@@ -17,6 +17,6 @@ stdenv.mkDerivation rec {
description = "Create Embedded Open Type from OpenType or TrueType font";
license = stdenv.lib.licenses.w3c;
maintainers = with stdenv.lib.maintainers; [ leenaars ];
- platforms = with stdenv.lib.platforms; linux;
+ platforms = with stdenv.lib.platforms; unix;
};
}
diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix
index 6a13d289efc..6cd9623ad1c 100644
--- a/pkgs/tools/misc/execline/default.nix
+++ b/pkgs/tools/misc/execline/default.nix
@@ -14,28 +14,38 @@ in stdenv.mkDerivation rec {
sha256 = "1q0izb8ajzxl36fjpy4rn63sz01055r9s33fga99jprdmkkfzz6x";
};
+ outputs = [ "bin" "lib" "dev" "doc" "out" ];
+
dontDisableStatic = true;
enableParallelBuilding = true;
configureFlags = [
"--enable-absolute-paths"
- "--libdir=\${prefix}/lib"
- "--includedir=\${prefix}/include"
- "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
- "--with-include=${skalibs}/include"
- "--with-lib=${skalibs}/lib"
- "--with-dynlib=${skalibs}/lib"
+ "--libdir=\${lib}/lib"
+ "--dynlibdir=\${lib}/lib"
+ "--bindir=\${bin}/bin"
+ "--includedir=\${dev}/include"
+ "--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps"
+ "--with-include=${skalibs.dev}/include"
+ "--with-lib=${skalibs.lib}/lib"
+ "--with-dynlib=${skalibs.lib}/lib"
]
++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ])
++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}");
+ postInstall = ''
+ mkdir -p $doc/share/doc/execline
+ mv doc $doc/share/doc/execline/html
+ mv examples $doc/share/doc/execline/examples
+ '';
+
meta = {
homepage = http://skarnet.org/software/execline/;
description = "A small scripting language, to be used in place of a shell in non-interactive scripts";
platforms = stdenv.lib.platforms.all;
license = stdenv.lib.licenses.isc;
- maintainers = with stdenv.lib.maintainers; [ pmahoney ];
+ maintainers = with stdenv.lib.maintainers; [ pmahoney Profpatsch ];
};
}
diff --git a/pkgs/tools/misc/minicom/default.nix b/pkgs/tools/misc/minicom/default.nix
index 5796f6335c0..326a3b053ed 100644
--- a/pkgs/tools/misc/minicom/default.nix
+++ b/pkgs/tools/misc/minicom/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig
-, ncurses }:
+, ncurses, libiconv }:
stdenv.mkDerivation rec {
name = "minicom-2.7.1";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1wa1l36fa4npd21xa9nz60yrqwkk5cq713fa3p5v0zk7g9mq6bsk";
};
- buildInputs = [ ncurses ];
+ buildInputs = [ ncurses ] ++ stdenv.lib.optional stdenv.isDarwin libiconv;
nativeBuildInputs = [ autoreconfHook pkgconfig ];
@@ -41,6 +41,6 @@ stdenv.mkDerivation rec {
download.
'';
maintainers = with maintainers; [ peterhoeg ];
- platforms = platforms.linux;
+ platforms = platforms.linux ++ platforms.darwin;
};
}
diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index b884a23ca7b..f92f03c4cc7 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -1,11 +1,11 @@
{ fetchurl, stdenv, perl, makeWrapper, procps }:
stdenv.mkDerivation rec {
- name = "parallel-20180622";
+ name = "parallel-20180722";
src = fetchurl {
url = "mirror://gnu/parallel/${name}.tar.bz2";
- sha256 = "1n91dnnl8d8pman20hr03l9qrpc9wm5hw32ph45xjs0bgp1nmk7j";
+ sha256 = "06635p9w4kl0mvqlbgglsndl1zm06f65ckzrjl9p8n4cswf443fg";
};
nativeBuildInputs = [ makeWrapper perl ];
diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix
index 082eb6879c4..014e000eabd 100644
--- a/pkgs/tools/misc/s6-portable-utils/default.nix
+++ b/pkgs/tools/misc/s6-portable-utils/default.nix
@@ -11,14 +11,18 @@ stdenv.mkDerivation rec {
sha256 = "0ca5iiq3n6isj64jb81xpwjzjx1q8jg145nnnn91ra2qqk93kqka";
};
+ outputs = [ "bin" "dev" "doc" "out" ];
+
dontDisableStatic = true;
configureFlags = [
"--enable-absolute-paths"
- "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
- "--with-include=${skalibs}/include"
- "--with-lib=${skalibs}/lib"
- "--with-dynlib=${skalibs}/lib"
+ "--bindir=\${bin}/bin"
+ "--includedir=\${dev}/include"
+ "--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps"
+ "--with-include=${skalibs.dev}/include"
+ "--with-lib=${skalibs.lib}/lib"
+ "--with-dynlib=${skalibs.lib}/lib"
]
# On darwin, the target triplet from -dumpmachine includes version number, but
# skarnet.org software uses the triplet to test binary compatibility.
@@ -27,12 +31,17 @@ stdenv.mkDerivation rec {
# http://www.skarnet.org/cgi-bin/archive.cgi?1:mss:623:heiodchokfjdkonfhdph
++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}");
+ postInstall = ''
+ mkdir -p $doc/share/doc/s6-portable-utils/
+ mv doc $doc/share/doc/s6-portable-utils/html
+ '';
+
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 = platforms.all;
license = licenses.isc;
- maintainers = with maintainers; [ pmahoney ];
+ maintainers = with maintainers; [ pmahoney Profpatsch ];
};
}
diff --git a/pkgs/tools/networking/cntlm/default.nix b/pkgs/tools/networking/cntlm/default.nix
index efd2c17a43e..6267e3a7790 100644
--- a/pkgs/tools/networking/cntlm/default.nix
+++ b/pkgs/tools/networking/cntlm/default.nix
@@ -11,6 +11,11 @@ stdenv.mkDerivation rec {
buildInputs = [ which ];
+ preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
+ substituteInPlace configure --replace "xlc_r gcc" "xlc_r gcc $CC"
+ substitute Makefile Makefile.$CC --replace "CC=gcc" "CC=$CC"
+ '';
+
installPhase = ''
mkdir -p $out/bin; cp cntlm $out/bin/;
mkdir -p $out/share/; cp COPYRIGHT README VERSION doc/cntlm.conf $out/share/;
@@ -21,11 +26,12 @@ stdenv.mkDerivation rec {
description = "NTLM/NTLMv2 authenticating HTTP proxy";
homepage = http://cntlm.sourceforge.net/;
license = licenses.gpl2;
- maintainers =
+ maintainers =
[
maintainers.qknight
maintainers.markWot
+ maintainers.carlosdagos
];
- platforms = platforms.linux;
+ platforms = platforms.linux ++ platforms.darwin;
};
}
diff --git a/pkgs/tools/networking/curl/7_59.nix b/pkgs/tools/networking/curl/7_59.nix
index 5980392267b..71a87a8e9d1 100644
--- a/pkgs/tools/networking/curl/7_59.nix
+++ b/pkgs/tools/networking/curl/7_59.nix
@@ -74,7 +74,10 @@ stdenv.mkDerivation rec {
( if brotliSupport then "--with-brotli" else "--without-brotli" )
]
++ stdenv.lib.optional c-aresSupport "--enable-ares=${c-ares}"
- ++ stdenv.lib.optional gssSupport "--with-gssapi=${kerberos.dev}";
+ ++ stdenv.lib.optional gssSupport "--with-gssapi=${kerberos.dev}"
+ # For the 'urandom', maybe it should be a cross-system option
+ ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
+ "--with-random=/dev/urandom";
CXX = "${stdenv.cc.targetPrefix}c++";
CXXCPP = "${stdenv.cc.targetPrefix}c++ -E";
@@ -90,16 +93,6 @@ stdenv.mkDerivation rec {
ln $out/lib/libcurl.so $out/lib/libcurl-gnutls.so.4.4.0
'';
- crossAttrs = {
- # We should refer to the cross built openssl
- # For the 'urandom', maybe it should be a cross-system option
- configureFlags = [
- ( if sslSupport then "--with-ssl=${openssl.crossDrv}" else "--without-ssl" )
- ( if gnutlsSupport then "--with-gnutls=${gnutls.crossDrv}" else "--without-gnutls" )
- "--with-random /dev/urandom"
- ];
- };
-
passthru = {
inherit sslSupport openssl;
};
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index 06798bdcc28..d15e6084a8b 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -78,7 +78,10 @@ stdenv.mkDerivation rec {
( if brotliSupport then "--with-brotli" else "--without-brotli" )
]
++ stdenv.lib.optional c-aresSupport "--enable-ares=${c-ares}"
- ++ stdenv.lib.optional gssSupport "--with-gssapi=${kerberos.dev}";
+ ++ stdenv.lib.optional gssSupport "--with-gssapi=${kerberos.dev}"
+ # For the 'urandom', maybe it should be a cross-system option
+ ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
+ "--with-random=/dev/urandom";
CXX = "${stdenv.cc.targetPrefix}c++";
CXXCPP = "${stdenv.cc.targetPrefix}c++ -E";
@@ -94,16 +97,6 @@ stdenv.mkDerivation rec {
ln $out/lib/libcurl.so $out/lib/libcurl-gnutls.so.4.4.0
'';
- crossAttrs = {
- # We should refer to the cross built openssl
- # For the 'urandom', maybe it should be a cross-system option
- configureFlags = [
- ( if sslSupport then "--with-ssl=${openssl.crossDrv}" else "--without-ssl" )
- ( if gnutlsSupport then "--with-gnutls=${gnutls.crossDrv}" else "--without-gnutls" )
- "--with-random=/dev/urandom"
- ];
- };
-
passthru = {
inherit sslSupport openssl;
};
diff --git a/pkgs/tools/networking/s6-dns/default.nix b/pkgs/tools/networking/s6-dns/default.nix
index 7134e969fd0..c0163f066aa 100644
--- a/pkgs/tools/networking/s6-dns/default.nix
+++ b/pkgs/tools/networking/s6-dns/default.nix
@@ -14,28 +14,38 @@ in stdenv.mkDerivation rec {
sha256 = "10qvkh608nsx8gqs3pj4pb8aivwpshbmjw2766grgmrb35d31brl";
};
+ outputs = [ "bin" "lib" "dev" "doc" "out" ];
+
dontDisableStatic = true;
enableParallelBuilding = true;
configureFlags = [
"--enable-absolute-paths"
- "--includedir=\${prefix}/include"
- "--libdir=\${prefix}/lib"
- "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
- "--with-include=${skalibs}/include"
- "--with-lib=${skalibs}/lib"
- "--with-dynlib=${skalibs}/lib"
+ "--libdir=\${lib}/lib"
+ "--libexecdir=\${lib}/libexec"
+ "--dynlibdir=\${lib}/lib"
+ "--bindir=\${bin}/bin"
+ "--includedir=\${dev}/include"
+ "--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps"
+ "--with-include=${skalibs.dev}/include"
+ "--with-lib=${skalibs.lib}/lib"
+ "--with-dynlib=${skalibs.lib}/lib"
]
++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ])
++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}");
+ postInstall = ''
+ mkdir -p $doc/share/doc/s6-dns/
+ mv doc $doc/share/doc/s6-dns/html
+ '';
+
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;
- maintainers = with stdenv.lib.maintainers; [ pmahoney ];
+ maintainers = with stdenv.lib.maintainers; [ pmahoney Profpatsch ];
};
}
diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix
index 3239a8f49e6..c70e8273163 100644
--- a/pkgs/tools/networking/s6-networking/default.nix
+++ b/pkgs/tools/networking/s6-networking/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, execline, fetchgit, s6, s6Dns, skalibs }:
+{ stdenv, execline, fetchgit, s6, s6-dns, skalibs }:
let
@@ -14,34 +14,46 @@ in stdenv.mkDerivation rec {
sha256 = "1qrhca8yjaysrqf7nx3yjfyfi9yly3rxpgrd2sqj0a0ckk73rv42";
};
+ outputs = [ "bin" "lib" "dev" "doc" "out" ];
+
dontDisableStatic = true;
enableParallelBuilding = true;
configureFlags = [
"--enable-absolute-paths"
- "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
- "--with-include=${skalibs}/include"
- "--with-include=${execline}/include"
- "--with-include=${s6}/include"
- "--with-include=${s6Dns}/include"
- "--with-lib=${skalibs}/lib"
- "--with-lib=${execline}/lib"
- "--with-lib=${s6}/lib/s6"
- "--with-lib=${s6Dns}/lib"
- "--with-dynlib=${skalibs}/lib"
- "--with-dynlib=${execline}/lib"
- "--with-dynlib=${s6}/lib"
- "--with-dynlib=${s6Dns}/lib"
+ "--libdir=\${lib}/lib"
+ "--libexecdir=\${lib}/libexec"
+ "--dynlibdir=\${lib}/lib"
+ "--bindir=\${bin}/bin"
+ "--includedir=\${dev}/include"
+ "--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps"
+ "--with-include=${skalibs.dev}/include"
+ "--with-include=${execline.dev}/include"
+ "--with-include=${s6.dev}/include"
+ "--with-include=${s6-dns.dev}/include"
+ "--with-lib=${skalibs.lib}/lib"
+ "--with-lib=${execline.lib}/lib"
+ "--with-lib=${s6.out}/lib"
+ "--with-lib=${s6-dns.lib}/lib"
+ "--with-dynlib=${skalibs.lib}/lib"
+ "--with-dynlib=${execline.lib}/lib"
+ "--with-dynlib=${s6.out}/lib"
+ "--with-dynlib=${s6-dns.lib}/lib"
]
++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}");
+ postInstall = ''
+ mkdir -p $doc/share/doc/s6-networking/
+ mv doc $doc/share/doc/s6-networking/html
+ '';
+
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;
- maintainers = with stdenv.lib.maintainers; [ pmahoney ];
+ maintainers = with stdenv.lib.maintainers; [ pmahoney Profpatsch ];
};
}
diff --git a/pkgs/tools/security/cfssl/default.nix b/pkgs/tools/security/cfssl/default.nix
index b3c256ae59b..cce3370aeda 100644
--- a/pkgs/tools/security/cfssl/default.nix
+++ b/pkgs/tools/security/cfssl/default.nix
@@ -2,15 +2,15 @@
buildGoPackage rec {
name = "cfssl-${version}";
- version = "20170527";
+ version = "1.3.2";
goPackagePath = "github.com/cloudflare/cfssl";
src = fetchFromGitHub {
owner = "cloudflare";
repo = "cfssl";
- rev = "114dc9691ec7bf3dac49d5953eccf7d91a0e0904";
- sha256 = "1ijq43mrzrf1gkgj5ssxq7sgy6sd4rl706dzqkq9krqv5f6kwhj1";
+ rev = version;
+ sha256 = "0j2gz2vl2pf7ir7sc7jrwmjnr67hk4qhxw09cjx132jbk337jc9x";
};
meta = with stdenv.lib; {
diff --git a/pkgs/tools/security/passff-host/default.nix b/pkgs/tools/security/passff-host/default.nix
new file mode 100644
index 00000000000..1bb621eab36
--- /dev/null
+++ b/pkgs/tools/security/passff-host/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, python3, pass }:
+
+stdenv.mkDerivation rec {
+ name = "passff-host-${version}";
+ version = "1.0.2";
+
+ src = fetchFromGitHub {
+ owner = "passff";
+ repo = "passff-host";
+ rev = version;
+ sha256 = "1zks34rg9i8vphjrj1h80y5rijadx33z911qxa7pslf7ahmjqdv3";
+ };
+
+ buildInputs = [ python3 ];
+
+ patchPhase = ''
+ sed -i 's#COMMAND = "pass"#COMMAND = "${pass}/bin/pass"#' src/passff.py
+ '';
+
+ preBuild = "cd src";
+ postBuild = "cd ..";
+
+ installPhase = ''
+ install -D bin/testing/passff.py $out/share/passff-host/passff.py
+ cp bin/testing/passff.json $out/share/passff-host/passff.json
+ substituteInPlace $out/share/passff-host/passff.json \
+ --replace PLACEHOLDER $out/share/passff-host/passff.py
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Host app for the WebExtension PassFF";
+ homepage = https://github.com/passff/passff-host;
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ nadrieril ];
+ };
+}
diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/tools/system/bfs/default.nix
index fd7f93d1546..56b7b26c7bd 100644
--- a/pkgs/tools/system/bfs/default.nix
+++ b/pkgs/tools/system/bfs/default.nix
@@ -11,8 +11,6 @@ stdenv.mkDerivation rec {
sha256 = "01vcqanj2sifa5i51wvrkxh55d6hrq6iq7zmnhv4ls221dqmbyyn";
};
- # Disable fstype test, tries to read /etc/mtab
- patches = [ ./tests.patch ];
postPatch = ''
# Patch tests (both shebangs and usage in scripts)
for f in $(find -type f -name '*.sh'); do
diff --git a/pkgs/tools/system/bfs/tests.patch b/pkgs/tools/system/bfs/tests.patch
deleted file mode 100644
index a30291d7095..00000000000
--- a/pkgs/tools/system/bfs/tests.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/tests.sh
-+++ b/tests.sh
-@@ -369,7 +369,6 @@
- test_printf_nul
- test_quit_after_print
- test_quit_before_print
-- test_fstype
- test_not
- test_and
- test_or
diff --git a/pkgs/tools/system/s6-rc/default.nix b/pkgs/tools/system/s6-rc/default.nix
index ed1da8d450d..5436c2f8c70 100644
--- a/pkgs/tools/system/s6-rc/default.nix
+++ b/pkgs/tools/system/s6-rc/default.nix
@@ -14,32 +14,45 @@ in stdenv.mkDerivation rec {
sha256 = "174a3l92nkhxrx8gq36xmb5a7krj40iz1xdiii25nxwjfiw5ynfb";
};
+ outputs = [ "bin" "lib" "dev" "doc" "out" ];
+
dontDisableStatic = true;
enableParallelBuilding = true;
configureFlags = [
"--enable-absolute-paths"
- "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
- "--with-include=${skalibs}/include"
- "--with-include=${execline}/include"
- "--with-include=${s6}/include"
- "--with-lib=${skalibs}/lib"
- "--with-lib=${execline}/lib"
- "--with-lib=${s6}/lib/s6"
- "--with-dynlib=${skalibs}/lib"
- "--with-dynlib=${execline}/lib"
- "--with-dynlib=${s6}/lib"
+ "--libdir=\${lib}/lib"
+ "--libexecdir=\${lib}/libexec"
+ "--dynlibdir=\${lib}/lib"
+ "--bindir=\${bin}/bin"
+ "--includedir=\${dev}/include"
+ "--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps"
+ "--with-include=${skalibs.dev}/include"
+ "--with-include=${execline.dev}/include"
+ "--with-include=${s6.dev}/include"
+ "--with-lib=${skalibs.lib}/lib"
+ "--with-lib=${execline.lib}/lib"
+ "--with-lib=${s6.out}/lib"
+ "--with-dynlib=${skalibs.lib}/lib"
+ "--with-dynlib=${execline.lib}/lib"
+ "--with-dynlib=${s6.out}/lib"
]
++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ])
++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}");
+ postInstall = ''
+ mkdir -p $doc/share/doc/s6-rc/
+ mv doc $doc/share/doc/s6-rc/html
+ mv examples $doc/share/doc/s6-rc/examples
+ '';
+
meta = {
homepage = http://skarnet.org/software/s6-rc/;
description = "A service manager for s6-based systems";
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.isc;
- maintainers = with stdenv.lib.maintainers; [ pmahoney ];
+ maintainers = with stdenv.lib.maintainers; [ pmahoney Profpatsch ];
};
}
diff --git a/pkgs/tools/system/s6/default.nix b/pkgs/tools/system/s6/default.nix
index b8607a98357..05666a7ad67 100644
--- a/pkgs/tools/system/s6/default.nix
+++ b/pkgs/tools/system/s6/default.nix
@@ -14,29 +14,46 @@ in stdenv.mkDerivation rec {
sha256 = "162hng8xcwjp8pr4d78zq3f82lm9c6ldbcfll0mjsmnxdds5hrsg";
};
+ # NOTE lib: cannot split lib from bin at the moment,
+ # since some parts of lib depend on executables in bin.
+ # (the `*_startf` functions in `libs6`)
+
+ outputs = [ /*"bin" "lib"*/ "out" "dev" "doc" ];
+
dontDisableStatic = true;
enableParallelBuilding = true;
configureFlags = [
"--enable-absolute-paths"
- "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
- "--with-include=${skalibs}/include"
- "--with-include=${execline}/include"
- "--with-lib=${skalibs}/lib"
- "--with-lib=${execline}/lib"
- "--with-dynlib=${skalibs}/lib"
- "--with-dynlib=${execline}/lib"
+ "--libdir=\${out}/lib"
+ "--libexecdir=\${out}/libexec"
+ "--dynlibdir=\${out}/lib"
+ "--bindir=\${out}/bin"
+ "--includedir=\${dev}/include"
+ "--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps"
+ "--with-include=${skalibs.dev}/include"
+ "--with-include=${execline.dev}/include"
+ "--with-lib=${skalibs.lib}/lib"
+ "--with-lib=${execline.lib}/lib"
+ "--with-dynlib=${skalibs.lib}/lib"
+ "--with-dynlib=${execline.lib}/lib"
]
++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ])
++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}");
+ postInstall = ''
+ mkdir -p $doc/share/doc/s6/
+ mv doc $doc/share/doc/s6/html
+ mv examples $doc/share/doc/s6/examples
+ '';
+
meta = {
homepage = http://www.skarnet.org/software/s6/;
description = "skarnet.org's small & secure supervision software suite";
platforms = stdenv.lib.platforms.all;
license = stdenv.lib.licenses.isc;
- maintainers = with stdenv.lib.maintainers; [ pmahoney ];
+ maintainers = with stdenv.lib.maintainers; [ pmahoney Profpatsch ];
};
}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index fe77a591876..55251c90451 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -229,6 +229,10 @@ mapAliases ({
ruby_2_5_0 = throw "deprecated 2018-0213: use ruby_2_5 instead";
rubygems = throw "deprecated 2016-03-02: rubygems is now bundled with ruby";
rxvt_unicode_with-plugins = rxvt_unicode-with-plugins; # added 2015-04-02
+ s6Dns = s6-dns; # added 2018-07-23
+ s6Networking = s6-networking; # added 2018-07-23
+ s6LinuxUtils = s6-linux-utils; # added 2018-07-23
+ s6PortableUtils = s6-portable-utils; # added 2018-07-23
sam = deadpixi-sam; # added 2018-04-25
samsungUnifiedLinuxDriver = samsung-unified-linux-driver; # added 2016-01-25
saneBackends = sane-backends; # added 2016-01-02
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5803b87109f..8a1746a21e5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22,6 +22,22 @@ with pkgs;
stdenvNoCC = stdenv.override { cc = null; };
+ stdenvNoLibs = let
+ bintools = stdenv.cc.bintools.override {
+ libc = null;
+ noLibc = true;
+ };
+ in stdenv.override {
+ cc = stdenv.cc.override {
+ libc = null;
+ noLibc = true;
+ extraPackages = [];
+ inherit bintools;
+ };
+ allowedRequisites =
+ lib.mapNullable (rs: rs ++ [ bintools ]) (stdenv.allowedRequisites or null);
+ };
+
# For convenience, allow callers to get the path to Nixpkgs.
path = ../..;
@@ -168,6 +184,8 @@ with pkgs;
packer = callPackage ../development/tools/packer { };
+ pet = callPackage ../development/tools/pet { };
+
mht2htm = callPackage ../tools/misc/mht2htm { };
fetchpatch = callPackage ../build-support/fetchpatch { };
@@ -676,6 +694,8 @@ with pkgs;
browserpass = callPackage ../tools/security/browserpass { };
+ passff-host = callPackage ../tools/security/passff-host { };
+
oracle-instantclient = callPackage ../development/libraries/oracle-instantclient { };
kwakd = callPackage ../servers/kwakd { };
@@ -858,7 +878,12 @@ with pkgs;
tensor = libsForQt5.callPackage ../applications/networking/instant-messengers/tensor { };
- libtensorflow = callPackage ../development/libraries/libtensorflow { };
+ libtensorflow = callPackage ../development/libraries/libtensorflow {
+ cudaSupport = config.cudaSupport or false;
+ inherit (linuxPackages) nvidia_x11;
+ cudatoolkit = cudatoolkit_9_0;
+ cudnn = cudnn_cudatoolkit_9_0;
+ };
blink1-tool = callPackage ../tools/misc/blink1-tool { };
@@ -1417,6 +1442,8 @@ with pkgs;
s2png = callPackage ../tools/graphics/s2png { };
+ simg2img = callPackage ../tools/filesystems/simg2img { };
+
socklog = callPackage ../tools/system/socklog { };
staccato = callPackage ../tools/text/staccato { };
@@ -1549,7 +1576,7 @@ with pkgs;
beegfs = callPackage ../os-specific/linux/beegfs { };
beets = callPackage ../tools/audio/beets {
- pythonPackages = python2Packages;
+ pythonPackages = python3Packages;
};
bepasty = callPackage ../tools/misc/bepasty { };
@@ -4910,7 +4937,7 @@ with pkgs;
rubocop = callPackage ../development/tools/rubocop { };
- runelite = callPackages ../games/runelite { };
+ runelite = callPackage ../games/runelite { };
runningx = callPackage ../tools/X11/runningx { };
@@ -4934,13 +4961,13 @@ with pkgs;
s3gof3r = callPackage ../tools/networking/s3gof3r { };
- s6Dns = callPackage ../tools/networking/s6-dns { };
+ s6-dns = callPackage ../tools/networking/s6-dns { };
- s6LinuxUtils = callPackage ../os-specific/linux/s6-linux-utils { };
+ s6-linux-utils = callPackage ../os-specific/linux/s6-linux-utils { };
- s6Networking = callPackage ../tools/networking/s6-networking { };
+ s6-networking = callPackage ../tools/networking/s6-networking { };
- s6PortableUtils = callPackage ../tools/misc/s6-portable-utils { };
+ s6-portable-utils = callPackage ../tools/misc/s6-portable-utils { };
sablotron = callPackage ../tools/text/xml/sablotron { };
@@ -6329,13 +6356,7 @@ with pkgs;
{ substitutions = { gcc = gcc-unwrapped; }; }
../development/compilers/gcc/libstdc++-hook.sh;
- # Can't just overrideCC, because then the stdenv-cross mkDerivation will be
- # thrown away. TODO: find a better solution for this.
- crossLibcStdenv = buildPackages.makeStdenvCross {
- inherit (buildPackages.buildPackages) stdenv;
- inherit buildPlatform hostPlatform targetPlatform;
- cc = buildPackages.gccCrossStageStatic;
- };
+ crossLibcStdenv = overrideCC stdenv buildPackages.gccCrossStageStatic;
# The GCC used to build libc for the target platform. Normal gccs will be
# built with, and use, that cross-compiled libc.
@@ -8006,7 +8027,9 @@ with pkgs;
librarian-puppet-go = callPackage ../development/tools/librarian-puppet-go { };
- libstdcxx5 = callPackage ../development/libraries/libstdc++5 { };
+ libgcc = callPackage ../development/libraries/gcc/libgcc { };
+
+ libstdcxx5 = callPackage ../development/libraries/gcc/libstdc++/5.nix { };
libsigrok = callPackage ../development/tools/libsigrok { };
# old version:
@@ -8265,6 +8288,8 @@ with pkgs;
kube-aws = callPackage ../development/tools/kube-aws { };
+ kustomize = callPackage ../development/tools/kustomize { };
+
Literate = callPackage ../development/tools/literate-programming/Literate {};
lcov = callPackage ../development/tools/analysis/lcov { };
@@ -8833,7 +8858,11 @@ with pkgs;
c-blosc = callPackage ../development/libraries/c-blosc { };
- cachix = haskell.lib.justStaticExecutables haskellPackages.cachix;
+ cachix = (haskell.lib.justStaticExecutables haskellPackages.cachix).overrideAttrs (drv: {
+ meta = drv.meta // {
+ hydraPlatforms = stdenv.lib.platforms.unix;
+ };
+ });
capnproto = callPackage ../development/libraries/capnproto { };
@@ -8982,6 +9011,8 @@ with pkgs;
db60 = callPackage ../development/libraries/db/db-6.0.nix { };
db62 = callPackage ../development/libraries/db/db-6.2.nix { };
+ dbxml = callPackage ../development/libraries/dbxml { };
+
dbus = callPackage ../development/libraries/dbus { };
dbus_cplusplus = callPackage ../development/libraries/dbus-cplusplus { };
dbus-glib = callPackage ../development/libraries/dbus-glib { };
@@ -9298,6 +9329,8 @@ with pkgs;
givaro_3 = callPackage ../development/libraries/givaro/3.nix {};
givaro_3_7 = callPackage ../development/libraries/givaro/3.7.nix {};
+ ghp-import = callPackage ../development/tools/ghp-import { };
+
icon-lang = callPackage ../development/interpreters/icon-lang { };
libgit2 = callPackage ../development/libraries/git2 {
@@ -10333,6 +10366,8 @@ with pkgs;
libmypaint = callPackage ../development/libraries/libmypaint { };
+ libmysofa = callPackage ../development/libraries/audio/libmysofa { };
+
libmysqlconnectorcpp = callPackage ../development/libraries/libmysqlconnectorcpp {
mysql = mysql57;
};
@@ -11686,6 +11721,8 @@ with pkgs;
ronn = callPackage ../development/tools/ronn { };
+ rshell = python3.pkgs.callPackage ../development/tools/rshell { };
+
rubberband = callPackage ../development/libraries/rubberband {
inherit (vamp) vampSDK;
};
@@ -15636,6 +15673,8 @@ with pkgs;
docker-distribution = callPackage ../applications/virtualization/docker/distribution.nix { };
+ amazon-ecr-credential-helper = callPackage ../tools/admin/amazon-ecr-credential-helper { };
+
docker-credential-gcr = callPackage ../tools/admin/docker-credential-gcr { };
doodle = callPackage ../applications/search/doodle { };
@@ -16939,6 +16978,8 @@ with pkgs;
kubernetes-helm = callPackage ../applications/networking/cluster/helm { };
+ kubetail = callPackage ../applications/networking/cluster/kubetail { } ;
+
kupfer = callPackage ../applications/misc/kupfer { };
lame = callPackage ../development/libraries/lame { };
@@ -18679,12 +18720,6 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Foundation CoreData;
inherit (darwin) libobjc cf-private;
inherit lua;
-
- features = "huge"; # one of tiny, small, normal, big or huge
- gui = config.vim.gui or "auto";
-
- # optional features by flags
- flags = [ "python" "X11" ]; # only flag "X11" by now
});
vimNox = lowPrio (vim_configurable.override {
@@ -19344,6 +19379,8 @@ with pkgs;
armagetronad = callPackage ../games/armagetronad { };
+ arena = callPackage ../games/arena {};
+
arx-libertatis = callPackage ../games/arx-libertatis {
stdenv = overrideCC stdenv gcc6;
};
@@ -19651,9 +19688,7 @@ with pkgs;
megaglest = callPackage ../games/megaglest {};
- minecraft = callPackage ../games/minecraft {
- useAlsa = config.minecraft.alsa or false;
- };
+ minecraft = callPackage ../games/minecraft { };
minecraft-server = callPackage ../games/minecraft-server { };
@@ -20903,7 +20938,7 @@ with pkgs;
simgrid = callPackage ../applications/science/misc/simgrid { };
- spyder = pythonPackages.spyder;
+ spyder = callPackage ../applications/science/spyder { };
openspace = callPackage ../applications/science/astronomy/openspace { };
@@ -21795,6 +21830,8 @@ with pkgs;
yara = callPackage ../tools/security/yara { };
+ yaxg = callPackage ../tools/graphics/yaxg {};
+
zap = callPackage ../tools/networking/zap { };
zdfmediathk = callPackage ../applications/video/zdfmediathk { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3350fad2006..c71082f6a4f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -264,6 +264,10 @@ in {
discordpy = callPackage ../development/python-modules/discordpy { };
+ parver = callPackage ../development/python-modules/parver { };
+ arpeggio = callPackage ../development/python-modules/arpeggio { };
+ invoke = callPackage ../development/python-modules/invoke { };
+
distorm3 = callPackage ../development/python-modules/distorm3 { };
dogtail = callPackage ../development/python-modules/dogtail { };
@@ -569,24 +573,14 @@ in {
appdirs = callPackage ../development/python-modules/appdirs { };
+ appleseed = disabledIf isPy3k
+ (toPythonModule (pkgs.appleseed.override {
+ inherit (self) python;
+ }));
+
application = callPackage ../development/python-modules/application { };
- appnope = buildPythonPackage rec {
- version = "0.1.0";
- name = "appnope-${version}";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/a/appnope/${name}.tar.gz";
- sha256 = "8b995ffe925347a2138d7ac0fe77155e4311a0ea6d6da4f5128fe4b3cbe5ed71";
- };
-
- meta = {
- description = "Disable App Nap on macOS";
- homepage = https://pypi.python.org/pypi/appnope;
- platforms = platforms.darwin;
- license = licenses.bsd3;
- };
- };
+ appnope = callPackage ../development/python-modules/appnope { };
apsw = callPackage ../development/python-modules/apsw {};
@@ -649,51 +643,12 @@ in {
audioread = callPackage ../development/python-modules/audioread { };
- audiotools = buildPythonPackage rec {
- name = "audiotools-${version}";
- version = "3.1.1";
-
- buildInputs = optionals stdenv.isDarwin (with pkgs.darwin.apple_sdk.frameworks; [
- AudioToolbox
- AudioUnit
- CoreServices
- ]);
-
- src = pkgs.fetchurl {
- url = "https://github.com/tuffy/python-audio-tools/archive/v${version}.tar.gz";
- sha256 = "0ymlxvqkqhzk4q088qwir3dq0zgwqlrrdfnq7f0iq97g05qshm2c";
- };
-
- meta = {
- description = "Utilities and Python modules for handling audio";
- homepage = "http://audiotools.sourceforge.net/";
- license = licenses.gpl2Plus;
- };
- };
+ audiotools = callPackage ../development/python-modules/audiotools { };
autopep8 = callPackage ../development/python-modules/autopep8 { };
- av = buildPythonPackage rec {
- name = "av-${version}";
- version = "0.2.4";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/a/av/${name}.tar.gz";
- sha256 = "bdc7e2e213cb9041d9c5c0497e6f8c47e84f89f1f2673a46d891cca0fb0d19a0";
- };
-
- buildInputs
- = (with self; [ nose pillow numpy ])
- ++ (with pkgs; [ ffmpeg_2 git libav pkgconfig ]);
-
- # Because of https://github.com/mikeboers/PyAV/issues/152
- doCheck = false;
-
- meta = {
- description = "Pythonic bindings for FFmpeg/Libav";
- homepage = https://github.com/mikeboers/PyAV/;
- license = licenses.bsd2;
- };
+ av = callPackage ../development/python-modules/av {
+ inherit (pkgs) ffmpeg_2 git libav pkgconfig;
};
avro = callPackage ../development/python-modules/avro {};
@@ -4890,8 +4845,7 @@ in {
sha256 = "01iv8w6lmmq98qjhxmnp8ddjxifmhxcmp612ijd91wc8nv8lk12w";
};
- propagatedBuildInputs = with self; [ django ] ++
- (optionals (pythonOlder "2.7") [ importlib ordereddict ]);
+ propagatedBuildInputs = with self; [ django ];
meta = {
description = "An extension to the Django web framework that provides comprehensive version control facilities";
@@ -6522,17 +6476,6 @@ in {
};
};
- importlib = buildPythonPackage rec {
- name = "importlib-1.0.2";
-
- disabled = isPyPy;
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/i/importlib/importlib-1.0.2.tar.gz";
- sha256 = "131jvp6ahllcqblszjg6fxrzh4k50w8g60sq924b4nb8lxm9dl14";
- };
- };
-
inflection = callPackage ../development/python-modules/inflection { };
influxdb = buildPythonPackage rec {
@@ -9997,22 +9940,6 @@ in {
prompt_toolkit = callPackage ../development/python-modules/prompt_toolkit { };
- prompt_toolkit_52 = self.prompt_toolkit.overridePythonAttrs(oldAttrs: rec {
- name = "${oldAttrs.pname}-${version}";
- version = "0.52";
- src = oldAttrs.src.override {
- inherit version;
- sha256 = "00h9ldqmb33nhg2kpks7paldf3n3023ipp124alwp96yz16s7f1m";
- };
-
- # No tests included in archive
- doCheck = false;
-
- #Only <3.4 expressly supported.
- disabled = isPy35;
-
- });
-
protobuf = callPackage ../development/python-modules/protobuf {
disabled = isPyPy;
doCheck = !isPy3k;
@@ -11016,25 +10943,7 @@ in {
};
};
- PyStemmer = buildPythonPackage (rec {
- name = "PyStemmer-1.3.0";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/P/PyStemmer/${name}.tar.gz";
- sha256 = "d1ac14eb64978c1697fcfba76e3ac7ebe24357c9428e775390f634648947cb91";
- };
-
- checkPhase = ''
- ${python.interpreter} runtests.py
- '';
-
- meta = {
- description = "Snowball stemming algorithms, for information retrieval";
- homepage = http://snowball.tartarus.org/;
- license = licenses.mit;
- platforms = platforms.unix;
- };
- });
+ PyStemmer = callPackage ../development/python-modules/pystemmer {};
Pyro = callPackage ../development/python-modules/pyro { };
@@ -12641,26 +12550,7 @@ in {
};
};
- snowballstemmer = buildPythonPackage rec {
- name = "snowballstemmer-1.2.1";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/s/snowballstemmer/${name}.tar.gz";
- sha256 = "919f26a68b2c17a7634da993d91339e288964f93c274f1343e3bbbe2096e1128";
- };
-
- # No tests included
- doCheck = false;
-
- propagatedBuildInputs = with self; [ PyStemmer ];
-
- meta = {
- description = "16 stemmer algorithms (15 + Poerter English stemmer) generated from Snowball algorithms";
- homepage = http://sigal.saimon.org/en/latest/index.html;
- license = licenses.bsd3;
- platforms = platforms.unix;
- };
- };
+ snowballstemmer = callPackage ../development/python-modules/snowballstemmer { };
spake2 = callPackage ../development/python-modules/spake2 { };
@@ -13480,8 +13370,6 @@ in {
};
});
- spyder = callPackage ../applications/science/spyder { };
-
sqlalchemy = callPackage ../development/python-modules/sqlalchemy { };
SQLAlchemy-ImageAttach = buildPythonPackage rec {
@@ -13875,21 +13763,7 @@ in {
};
};
- testresources = buildPythonPackage rec {
- name = "testresources-${version}";
- version = "0.2.7";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/t/testresources/${name}.tar.gz";
- sha256 = "0cbj3plbllyz42c4b5xxgwaa7mml54lakslrn4kkhinxhdri22md";
- };
-
- meta = {
- description = "Pyunit extension for managing expensive test resources";
- homepage = https://pypi.python.org/pypi/testresources/;
- license = licenses.bsd2;
- };
- };
+ testresources = callPackage ../development/python-modules/testresources { };
testtools = callPackage ../development/python-modules/testtools { };
@@ -16619,29 +16493,6 @@ EOF
'';
};
- ghp-import = buildPythonPackage rec {
- version = "0.4.1";
- name = "ghp-import-${version}";
- src = pkgs.fetchurl {
- url = "mirror://pypi/g/ghp-import/${name}.tar.gz";
- sha256 = "6058810e1c46dd3b5b1eee87e203bdfbd566e10cfc77566edda7aa4dbf6a3053";
- };
- disabled = isPyPy;
- buildInputs = [ pkgs.glibcLocales ];
-
- LC_ALL="en_US.UTF-8";
-
- # No tests available
- doCheck = false;
-
- meta = {
- description = "Copy your docs directly to the gh-pages branch";
- homepage = "https://github.com/davisp/ghp-import";
- license = "Tumbolia Public License";
- maintainers = with maintainers; [ garbas ];
- };
- };
-
typogrify = buildPythonPackage rec {
name = "typogrify-2.0.7";
src = pkgs.fetchurl {
@@ -17598,25 +17449,9 @@ EOF
};
};
- moreItertools = self.more-itertools;
-
more-itertools = callPackage ../development/python-modules/more-itertools { };
- jaraco_functools = buildPythonPackage rec {
- name = "jaraco.functools-${version}";
- version = "1.15.1";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/j/jaraco.functools/${name}.tar.gz";
- sha256 = "1nhl0pjc7acxznhadg9wq1a6ls17ja2np8vf9psq8j66716mk2ya";
- };
-
- propagatedBuildInputs = with self; [ more-itertools backports_functools_lru_cache ];
-
- doCheck = false;
-
- buildInputs = with self; [ setuptools_scm ];
- };
+ jaraco_functools = callPackage ../development/python-modules/jaraco_functools { };
jaraco_classes = buildPythonPackage rec {
name = "jaraco.classes-${version}";
@@ -17743,32 +17578,7 @@ EOF
yarl = callPackage ../development/python-modules/yarl { };
- suseapi = buildPythonPackage rec {
- name = "${pname}-${version}";
- pname = "suseapi";
- version = "0.24-31-g0fcbe96";
-
- src = pkgs.fetchFromGitHub {
- owner = "openSUSE";
- repo = "python-${pname}";
- rev = version;
- sha256 = "0hyzq0h1w8gp0zfvhqh7qsgcg1wp05a14371m6bn5a7gss93rbv4";
- };
-
- propagatedBuildInputs = with self; [
- django suds-jurko ldap mechanize beautifulsoup4 pyxdg dateutil requests
- ];
-
- buildInputs = with self; [ httpretty ];
-
- doCheck = false;
-
- meta = {
- homepage = "https://github.com/openSUSE/python-suseapi/";
- description = "Python module to work with various SUSE services";
- license = licenses.gpl3Plus;
- };
- };
+ suseapi = callPackage ../development/python-modules/suseapi { };
typed-ast = callPackage ../development/python-modules/typed-ast { };
@@ -17918,6 +17728,8 @@ EOF
z3 = (toPythonModule (pkgs.z3.override {
inherit python;
})).python;
+
+ rfc7464 = callPackage ../development/python-modules/rfc7464 { };
});
in fix' (extends overrides packages)