From 3ca311d74db2979185755ad740f6ff7946281e02 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Thu, 25 May 2017 00:33:31 +0200 Subject: [PATCH 01/29] spice-vdagent: systemd-logind integration This change adds systemd as dependency to enable user session integration with systemd-logind --- pkgs/applications/virtualization/spice-vdagent/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/spice-vdagent/default.nix b/pkgs/applications/virtualization/spice-vdagent/default.nix index 7a43a8b8800..5608f4ed359 100644 --- a/pkgs/applications/virtualization/spice-vdagent/default.nix +++ b/pkgs/applications/virtualization/spice-vdagent/default.nix @@ -1,5 +1,6 @@ {stdenv, fetchurl, pkgconfig, alsaLib, spice_protocol, glib, - libpciaccess, libxcb, libXrandr, libXinerama, libXfixes, dbus}: + libpciaccess, libxcb, libXrandr, libXinerama, libXfixes, dbus, + systemd}: stdenv.mkDerivation rec { name = "spice-vdagent-0.17.0"; src = fetchurl { @@ -11,7 +12,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ pkgconfig alsaLib spice_protocol glib libpciaccess libxcb libXrandr libXinerama libXfixes - dbus ] ; + dbus systemd ] ; meta = { description = "Enhanced SPICE integration for linux QEMU guest"; longDescription = '' From 0ea92a3c24f62e7f5006a4bc99152faa74723304 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Mon, 4 Sep 2017 21:07:05 +0200 Subject: [PATCH 02/29] libstdc++: add setup-hook --- pkgs/development/compilers/gcc/libstdc++-hook.sh | 1 + pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 5 insertions(+) create mode 100644 pkgs/development/compilers/gcc/libstdc++-hook.sh diff --git a/pkgs/development/compilers/gcc/libstdc++-hook.sh b/pkgs/development/compilers/gcc/libstdc++-hook.sh new file mode 100644 index 00000000000..c699d5460eb --- /dev/null +++ b/pkgs/development/compilers/gcc/libstdc++-hook.sh @@ -0,0 +1 @@ +export NIX_CXXSTDLIB_COMPILE+="-isystem $(echo -n @gcc@/include/c++/*) -isystem $(echo -n @gcc@/include/c++/*)/$(@gcc@/bin/gcc -dumpmachine)" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 75554d82d95..50ac414acec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5354,6 +5354,10 @@ with pkgs; gccApple = throw "gccApple is no longer supported"; + libstdcxxHook = makeSetupHook + { 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 { From 84ec7ef6c3f616e6cba2d44ee625c28275787049 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 5 Sep 2017 20:21:08 +0200 Subject: [PATCH 03/29] file: 5.31 -> 5.32 for CVE-2017-1000249 --- pkgs/tools/misc/file/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix index 779256046e5..47d67f91ec7 100644 --- a/pkgs/tools/misc/file/default.nix +++ b/pkgs/tools/misc/file/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "file-${version}"; - version = "5.31"; + version = "5.32"; src = fetchurl { urls = [ "ftp://ftp.astron.com/pub/file/${name}.tar.gz" "https://distfiles.macports.org/file/${name}.tar.gz" ]; - sha256 = "1vp4zihaxkhi85chkjgd4r4zdg4k2wa3c6pmajhbmx6gr7d8ii89"; + sha256 = "0l1bfa0icng9vdwya00ff48fhvjazi5610ylbhl35qi13d6xqfc6"; }; buildInputs = [ zlib ]; From 226a20117d7caee746916c54c3b0318215c5ea03 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Tue, 5 Sep 2017 19:01:01 +0200 Subject: [PATCH 04/29] grafana: 4.3.2 -> 4.4.3 --- pkgs/servers/monitoring/grafana/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 56d2f854654..ccf5e7fea0a 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 = "4.3.2"; + version = "4.4.3"; name = "grafana-v${version}"; goPackagePath = "github.com/grafana/grafana"; @@ -9,12 +9,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "0hz323favjm0gz4s2112rl8ygw7dy2pz808yhraplq8nljqh4h11"; + sha256 = "04cm8h7if8yvczcwd83drbfzgr1spfspzg5im8lb540ks9x55dz4"; }; srcStatic = fetchurl { url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-x64.tar.gz"; - sha256 = "0vk668ibayx0hqlam9jns5c7pggdh83yy54hnz5l7fnws4lm50qc"; + sha256 = "1p36hniay2y3mwg300b7n3sl3vv7l5jq5ddcnmpmznwyd8zwbl4h"; }; preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace"; @@ -28,8 +28,8 @@ buildGoPackage rec { meta = with lib; { description = "Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"; license = licenses.asl20; - homepage = http://grafana.org/; - maintainers = with maintainers; [ offline fpletz ]; + homepage = https://grafana.org/; + maintainers = with maintainers; [ offline fpletz willibutz ]; platforms = platforms.linux; }; } From 402e6ac0893d59c3e86c38f86ac82a114881950d Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Mon, 4 Sep 2017 09:23:45 -0400 Subject: [PATCH 05/29] libfpx: fix build with gcc6 --- pkgs/development/libraries/libfpx/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libfpx/default.nix b/pkgs/development/libraries/libfpx/default.nix index 0a7a1d462ee..28e1ad895b4 100644 --- a/pkgs/development/libraries/libfpx/default.nix +++ b/pkgs/development/libraries/libfpx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { name = "libfpx-1.3.1-7"; @@ -11,6 +11,13 @@ stdenv.mkDerivation rec { # Darwin gets misdetected as Windows without this NIX_CFLAGS_COMPILE = if stdenv.isDarwin then "-D__unix" else null; + patches = [ + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/libfpx/files/libfpx-1.3.1_p6-gcc6.patch?id=f28a947813dbc0a1fd1a8d4a712d58a64c48ca01"; + sha256 = "032y8110zgnkdhkdq3745zk53am1x34d912rai8q70k3sskyq22p"; + }) + ]; + # This dead code causes a duplicate symbol error in Clang so just remove it postPatch = if stdenv.cc.isClang then '' substituteInPlace jpeg/ejpeg.h --replace "int No_JPEG_Header_Flag" "" From 907222098acbbf68d3c565c6cbd9bad36e0255a8 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Mon, 4 Sep 2017 21:23:57 +0200 Subject: [PATCH 06/29] clang-stdenv: use libstdcxxHook when targeting linux --- pkgs/development/compilers/gcc/libstdc++-hook.sh | 1 + pkgs/development/compilers/llvm/4/default.nix | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/gcc/libstdc++-hook.sh b/pkgs/development/compilers/gcc/libstdc++-hook.sh index c699d5460eb..2d30c845b5a 100644 --- a/pkgs/development/compilers/gcc/libstdc++-hook.sh +++ b/pkgs/development/compilers/gcc/libstdc++-hook.sh @@ -1 +1,2 @@ export NIX_CXXSTDLIB_COMPILE+="-isystem $(echo -n @gcc@/include/c++/*) -isystem $(echo -n @gcc@/include/c++/*)/$(@gcc@/bin/gcc -dumpmachine)" +export NIX_CXXSTDLIB_LINK=" -stdlib=libstdc++" diff --git a/pkgs/development/compilers/llvm/4/default.nix b/pkgs/development/compilers/llvm/4/default.nix index 9e5bccff355..11a9a46c15e 100644 --- a/pkgs/development/compilers/llvm/4/default.nix +++ b/pkgs/development/compilers/llvm/4/default.nix @@ -1,4 +1,8 @@ -{ lowPrio, newScope, stdenv, cmake, libxml2, python2, isl, fetchurl, overrideCC, wrapCC, darwin, ccWrapperFun }: +{ lowPrio, newScope, stdenv, targetPlatform, cmake, libstdcxxHook +, libxml2, python2, isl, fetchurl, overrideCC, wrapCC, ccWrapperFun +, darwin +}: + let callPackage = newScope (self // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; }); @@ -46,7 +50,12 @@ let extraPackages = [ self.libcxx self.libcxxabi ]; }; - stdenv = overrideCC stdenv self.clang; + stdenv = stdenv.override (drv: { + allowedRequisites = null; + cc = self.clang; + # Use the gcc libstdc++ when targeting linux. + extraBuildInputs = if stdenv.cc.isGNU then [ libstdcxxHook ] else drv.extraBuildInputs; + }); libcxxStdenv = overrideCC stdenv self.libcxxClang; @@ -58,4 +67,5 @@ let libcxxabi = callPackage ./libc++abi.nix {}; }; + in self From 5059db823af5f1c4438df3f478e786bfeb35d200 Mon Sep 17 00:00:00 2001 From: yesbox Date: Tue, 5 Sep 2017 21:51:45 +0200 Subject: [PATCH 07/29] sonarr: 2.0.0.4928 -> 2.0.0.4949 --- pkgs/servers/sonarr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix index 20fb74924d3..8fe4b8df1ab 100644 --- a/pkgs/servers/sonarr/default.nix +++ b/pkgs/servers/sonarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sonarr-${version}"; - version = "2.0.0.4928"; + version = "2.0.0.4949"; src = fetchurl { url = "http://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz"; - sha256 = "0wggh8z5dmkkcgbb1hzikia55djdqmbqz2dpzx1iyvgys7y5n8xm"; + sha256 = "7e4e3a3668ee7485d0ee4009bcd1f2a7c3e8c25da7d9170272ef275a19c76ac4"; }; buildInputs = [ From 8706664ff69444ed1d576250901a4d45cb17c690 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Tue, 5 Sep 2017 21:59:43 +0200 Subject: [PATCH 08/29] afl: use clangStdenv Fixes #28712 --- pkgs/tools/security/afl/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix index 4c3dfe4d07c..5b96e513fd4 100644 --- a/pkgs/tools/security/afl/default.nix +++ b/pkgs/tools/security/afl/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, bash, callPackage, makeWrapper -, clang, llvm, which, libcgroup }: +, clang, llvm, which, libcgroup +}: let afl-qemu = callPackage ./qemu.nix {}; @@ -7,6 +8,7 @@ let else if stdenv.system == "i686-linux" then "qemu-i386" else throw "afl: no support for ${stdenv.system}!"; in + stdenv.mkDerivation rec { name = "afl-${version}"; version = "2.48b"; @@ -23,7 +25,7 @@ stdenv.mkDerivation rec { buildPhase = '' make PREFIX=$out cd llvm_mode - make PREFIX=$out CC=${clang}/bin/clang CXX=${clang}/bin/clang++ + make PREFIX=$out cd .. ''; installPhase = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1aa06ccfa11..848850b2f4d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -396,7 +396,9 @@ with pkgs; afio = callPackage ../tools/archivers/afio { }; - afl = callPackage ../tools/security/afl { }; + afl = callPackage ../tools/security/afl { + stdenv = clangStdenv; + }; afpfs-ng = callPackage ../tools/filesystems/afpfs-ng/default.nix { }; From 14c3ce919bc2a96d0592bcfb3426c6d3d1c3e483 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Tue, 5 Sep 2017 22:08:03 +0200 Subject: [PATCH 09/29] rustup: 1.2.0 -> 1.3.0 --- pkgs/development/tools/rust/rustup/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix index b9e6a0e2d81..59cdf443f4a 100644 --- a/pkgs/development/tools/rust/rustup/default.nix +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -4,15 +4,15 @@ rustPlatform.buildRustPackage rec { name = "rustup-${version}"; - version = "1.2.0"; + version = "1.3.0"; - depsSha256 = "06bfz5kyj3k0yxv55dq0s1arx34sy1jjfrpgd83rf99026vcm5x2"; + depsSha256 = "078hssgffgpakv735p1xg60kic151r2dvpdr9sipb63lwqr4dxfb"; src = fetchFromGitHub { owner = "rust-lang-nursery"; repo = "rustup.rs"; rev = version; - sha256 = "0qwl27wh7j03h511bd8fq5fif5xcmkiyy9rm3hri7czjqr01mw0v"; + sha256 = "199jlqqidzak7nxmv2nzjzv7zfzy9z7hw6h8d8wf1rbfdwd9l6hs"; }; nativeBuildInputs = [ pkgconfig ]; From 3189b016470f68ccae2b76d0a15a5ccd4c60b523 Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Tue, 5 Sep 2017 16:24:41 -0400 Subject: [PATCH 10/29] go: init 1.9 (and set as default) --- pkgs/development/compilers/go/1.9.nix | 181 ++++++++++++++++++ .../compilers/go/remove-test-pie-1.9.patch | 26 +++ .../compilers/go/remove-tools-1.9.patch | 35 ++++ .../compilers/go/ssl-cert-file-1.9.patch | 80 ++++++++ pkgs/top-level/all-packages.nix | 6 +- 5 files changed, 327 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/go/1.9.nix create mode 100644 pkgs/development/compilers/go/remove-test-pie-1.9.patch create mode 100644 pkgs/development/compilers/go/remove-tools-1.9.patch create mode 100644 pkgs/development/compilers/go/ssl-cert-file-1.9.patch diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix new file mode 100644 index 00000000000..1a148447c6b --- /dev/null +++ b/pkgs/development/compilers/go/1.9.nix @@ -0,0 +1,181 @@ +{ stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin +, perl, which, pkgconfig, patch, fetchpatch +, pcre, cacert, llvm +, Security, Foundation, bash +, makeWrapper, git, subversion, mercurial, bazaar }: + +let + + inherit (stdenv.lib) optional optionals optionalString; + + clangHack = writeScriptBin "clang" '' + #!${stdenv.shell} + exec ${stdenv.cc}/bin/clang "$@" 2> >(sed '/ld: warning:.*ignoring unexpected dylib file/ d' 1>&2) + ''; + + goBootstrap = runCommand "go-bootstrap" {} '' + mkdir $out + cp -rf ${go_bootstrap}/* $out/ + chmod -R u+w $out + find $out -name "*.c" -delete + cp -rf $out/bin/* $out/share/go/bin/ + ''; + +in + +stdenv.mkDerivation rec { + name = "go-${version}"; + version = "1.9"; + + src = fetchFromGitHub { + owner = "golang"; + repo = "go"; + rev = "go${version}"; + sha256 = "06k66x387r93m7d3bd5yzwdm8f8xc43cdjfamqldfc1v8ngak0y9"; + }; + + # perl is used for testing go vet + nativeBuildInputs = [ perl which pkgconfig patch makeWrapper ]; + buildInputs = [ pcre ] + ++ optionals stdenv.isLinux [ stdenv.glibc.out stdenv.glibc.static ]; + propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ]; + + hardeningDisable = [ "all" ]; + + prePatch = '' + patchShebangs ./ # replace /bin/bash + + # This source produces shell script at run time, + # and thus it is not corrected by patchShebangs. + substituteInPlace misc/cgo/testcarchive/carchive_test.go \ + --replace '#!/usr/bin/env bash' '#!${stdenv.shell}' + + # Disabling the 'os/http/net' tests (they want files not available in + # chroot builds) + rm src/net/{listen,parse}_test.go + rm src/syscall/exec_linux_test.go + + # !!! substituteInPlace does not seems to be effective. + # The os test wants to read files in an existing path. Just don't let it be /usr/bin. + sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go + sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go + # Disable the unix socket test + sed -i '/TestShutdownUnix/areturn' src/net/net_test.go + # Disable the hostname test + sed -i '/TestHostname/areturn' src/os/os_test.go + # ParseInLocation fails the test + sed -i '/TestParseInSydney/areturn' src/time/format_test.go + # Remove the api check as it never worked + sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go + # Remove the coverage test as we have removed this utility + sed -i '/TestCoverageWithCgo/areturn' src/cmd/go/go_test.go + # Remove the timezone naming test + sed -i '/TestLoadFixed/areturn' src/time/time_test.go + # Remove disable setgid test + sed -i '/TestRespectSetgidDir/areturn' src/cmd/go/internal/work/build_test.go + # Remove cert tests that conflict with NixOS's cert resolution + sed -i '/TestEnvVars/areturn' src/crypto/x509/root_unix_test.go + + sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go + sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go + + # Disable cgo lookup tests not works, they depend on resolver + rm src/net/cgo_unix_test.go + + '' + optionalString stdenv.isLinux '' + sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go + '' + optionalString stdenv.isArm '' + sed -i '/TestCurrent/areturn' src/os/user/user_test.go + echo '#!/usr/bin/env bash' > misc/cgo/testplugin/test.bash + '' + optionalString stdenv.isDarwin '' + substituteInPlace src/race.bash --replace \ + "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true + sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go + sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go + sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go + + sed -i '/TestChdirAndGetwd/areturn' src/os/os_test.go + sed -i '/TestRead0/areturn' src/os/os_test.go + sed -i '/TestNohup/areturn' src/os/signal/signal_test.go + sed -i '/TestCurrent/areturn' src/os/user/user_test.go + sed -i '/TestSystemRoots/areturn' src/crypto/x509/root_darwin_test.go + + sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/areturn' src/cmd/go/go_test.go + sed -i '/TestBuildDashIInstallsDependencies/areturn' src/cmd/go/go_test.go + + sed -i '/TestDisasmExtld/areturn' src/cmd/objdump/objdump_test.go + + sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go + sed -i 's/unrecognized/unknown/' src/cmd/go/build.go + + touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd + + sed -i '1 a\exit 0' misc/cgo/errors/test.bash + ''; + + patches = + [ ./remove-tools-1.9.patch + ./ssl-cert-file-1.9.patch + ./creds-test.patch + ./remove-test-pie-1.9.patch + ]; + + postPatch = optionalString stdenv.isDarwin '' + echo "substitute hardcoded dsymutil with ${llvm}/bin/llvm-dsymutil" + substituteInPlace "src/cmd/link/internal/ld/lib.go" --replace dsymutil ${llvm}/bin/llvm-dsymutil + ''; + + NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + + GOOS = if stdenv.isDarwin then "darwin" else "linux"; + GOARCH = if stdenv.isDarwin then "amd64" + else if stdenv.system == "i686-linux" then "386" + else if stdenv.system == "x86_64-linux" then "amd64" + else if stdenv.isArm then "arm" + else throw "Unsupported system"; + GOARM = optionalString (stdenv.system == "armv5tel-linux") "5"; + GO386 = 387; # from Arch: don't assume sse2 on i686 + CGO_ENABLED = 1; + GOROOT_BOOTSTRAP = "${goBootstrap}/share/go"; + + # The go build actually checks for CC=*/clang and does something different, so we don't + # just want the generic `cc` here. + CC = if stdenv.isDarwin then "clang" else "cc"; + + configurePhase = '' + mkdir -p $out/share/go/bin + export GOROOT=$out/share/go + export GOBIN=$GOROOT/bin + export PATH=$GOBIN:$PATH + ''; + + postConfigure = optionalString stdenv.isDarwin '' + export PATH=${clangHack}/bin:$PATH + ''; + + installPhase = '' + cp -r . $GOROOT + ( cd $GOROOT/src && ./all.bash ) + + # (https://github.com/golang/go/wiki/GoGetTools) + wrapProgram $out/share/go/bin/go --prefix PATH ":" "${stdenv.lib.makeBinPath [ git subversion mercurial bazaar ]}" + ''; + + preFixup = '' + rm -r $out/share/go/pkg/bootstrap + ln -s $out/share/go/bin $out/bin + ''; + + setupHook = ./setup-hook.sh; + + disallowedReferences = [ go_bootstrap ]; + + meta = with stdenv.lib; { + branch = "1.8"; + homepage = http://golang.org/; + description = "The Go Programming language"; + license = licenses.bsd3; + maintainers = with maintainers; [ cstrahan wkennington ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/development/compilers/go/remove-test-pie-1.9.patch b/pkgs/development/compilers/go/remove-test-pie-1.9.patch new file mode 100644 index 00000000000..46f94f29df2 --- /dev/null +++ b/pkgs/development/compilers/go/remove-test-pie-1.9.patch @@ -0,0 +1,26 @@ +diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go +index 73432d31ea..3310f5298d 100644 +--- a/src/cmd/dist/test.go ++++ b/src/cmd/dist/test.go +@@ -510,21 +510,6 @@ func (t *tester) registerTests() { + }) + } + +- // Test internal linking of PIE binaries where it is supported. +- if t.goos == "linux" && t.goarch == "amd64" && !isAlpineLinux() { +- // Issue 18243: We don't have a way to set the default +- // dynamic linker used in internal linking mode. So +- // this test is skipped on Alpine. +- t.tests = append(t.tests, distTest{ +- name: "pie_internal", +- heading: "internal linking of -buildmode=pie", +- fn: func(dt *distTest) error { +- t.addCmd(dt, "src", "go", "test", "reflect", "-short", "-buildmode=pie", "-ldflags=-linkmode=internal", t.timeout(60), t.tags(), t.runFlag("")) +- return nil +- }, +- }) +- } +- + // sync tests + t.tests = append(t.tests, distTest{ + name: "sync_cpu", diff --git a/pkgs/development/compilers/go/remove-tools-1.9.patch b/pkgs/development/compilers/go/remove-tools-1.9.patch new file mode 100644 index 00000000000..e76ed61693a --- /dev/null +++ b/pkgs/development/compilers/go/remove-tools-1.9.patch @@ -0,0 +1,35 @@ +diff --git a/src/go/build/build.go b/src/go/build/build.go +index d8163d0172..dd80a70473 100644 +--- a/src/go/build/build.go ++++ b/src/go/build/build.go +@@ -1592,7 +1592,7 @@ func init() { + } + + // ToolDir is the directory containing build tools. +-var ToolDir = filepath.Join(runtime.GOROOT(), "pkg/tool/"+runtime.GOOS+"_"+runtime.GOARCH) ++var ToolDir = runtime.GOTOOLDIR() + + // IsLocalImport reports whether the import path is + // a local import path, like ".", "..", "./foo", or "../foo". +diff --git a/src/runtime/extern.go b/src/runtime/extern.go +index 6e6c674d96..e9f62f96dc 100644 +--- a/src/runtime/extern.go ++++ b/src/runtime/extern.go +@@ -223,6 +223,17 @@ func GOROOT() string { + return sys.DefaultGoroot + } + ++// GOTOOLDIR returns the root of the Go tree. ++// It uses the GOTOOLDIR environment variable, if set, ++// or else the root used during the Go build. ++func GOTOOLDIR() string { ++ s := gogetenv("GOTOOLDIR") ++ if s != "" { ++ return s ++ } ++ return GOROOT() + "/pkg/tool/" + GOOS + "_" + GOARCH ++} ++ + // Version returns the Go tree's version string. + // It is either the commit hash and date at the time of the build or, + // when possible, a release tag like "go1.3". diff --git a/pkgs/development/compilers/go/ssl-cert-file-1.9.patch b/pkgs/development/compilers/go/ssl-cert-file-1.9.patch new file mode 100644 index 00000000000..3f27bc138c1 --- /dev/null +++ b/pkgs/development/compilers/go/ssl-cert-file-1.9.patch @@ -0,0 +1,80 @@ +diff --git a/src/crypto/x509/root_cgo_darwin.go b/src/crypto/x509/root_cgo_darwin.go +index 8e80533590..31c0c666ec 100644 +--- a/src/crypto/x509/root_cgo_darwin.go ++++ b/src/crypto/x509/root_cgo_darwin.go +@@ -201,11 +201,20 @@ int FetchPEMRoots(CFDataRef *pemRoots, CFDataRef *untrustedPemRoots) { + import "C" + import ( + "errors" ++ "io/ioutil" ++ "os" + "unsafe" + ) + + func loadSystemRoots() (*CertPool, error) { + roots := NewCertPool() ++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { ++ data, err := ioutil.ReadFile(file) ++ if err == nil { ++ roots.AppendCertsFromPEM(data) ++ return roots, nil ++ } ++ } + + var data C.CFDataRef = nil + var untrustedData C.CFDataRef = nil +diff --git a/src/crypto/x509/root_darwin.go b/src/crypto/x509/root_darwin.go +index bc35a1cf21..21e52bec51 100644 +--- a/src/crypto/x509/root_darwin.go ++++ b/src/crypto/x509/root_darwin.go +@@ -81,18 +81,26 @@ func execSecurityRoots() (*CertPool, error) { + ) + } + +- cmd := exec.Command("/usr/bin/security", args...) +- data, err := cmd.Output() +- if err != nil { +- return nil, err +- } +- + var ( + mu sync.Mutex + roots = NewCertPool() + numVerified int // number of execs of 'security verify-cert', for debug stats + ) + ++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { ++ data, err := ioutil.ReadFile(file) ++ if err == nil { ++ roots.AppendCertsFromPEM(data) ++ return roots, nil ++ } ++ } ++ ++ cmd := exec.Command("/usr/bin/security", args...) ++ data, err := cmd.Output() ++ if err != nil { ++ return nil, err ++ } ++ + blockCh := make(chan *pem.Block) + var wg sync.WaitGroup + +diff --git a/src/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go +index 65b5a5fdbc..c9c7ac6a74 100644 +--- a/src/crypto/x509/root_unix.go ++++ b/src/crypto/x509/root_unix.go +@@ -37,6 +37,13 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate + + func loadSystemRoots() (*CertPool, error) { + roots := NewCertPool() ++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { ++ data, err := ioutil.ReadFile(file) ++ if err == nil { ++ roots.AppendCertsFromPEM(data) ++ return roots, nil ++ } ++ } + + files := certFiles + if f := os.Getenv(certFileEnv); f != "" { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 848850b2f4d..175b3a98df1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5699,7 +5699,11 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security Foundation; }; - go = go_1_8; + go_1_9 = callPackage ../development/compilers/go/1.9.nix { + inherit (darwin.apple_sdk.frameworks) Security Foundation; + }; + + go = go_1_9; go-repo-root = callPackage ../development/tools/go-repo-root { }; From d0d905668c010b65795b57afdf7f0360aac6245b Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Tue, 5 Sep 2017 22:56:09 +0200 Subject: [PATCH 11/29] haskell-hscolour: fix darwin build --- pkgs/development/haskell-modules/configuration-nix.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index c1813cad7a9..0f2fd37f5bd 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -499,6 +499,7 @@ self: super: builtins.intersectAttrs super { # Disable separate bin outputs for these specific packages that break with it. H = hasNoBinOutput super.H; cryptol = hasNoBinOutput super.cryptol; + hscolour = hasNoBinOutput super.hscolour; sproxy = hasNoBinOutput super.sproxy; sproxy2 = hasNoBinOutput super.sproxy2; sproxy-web = hasNoBinOutput super.sproxy-web; From 02d715d29b02ca02a0fa2ef296cb54c261f29e4f Mon Sep 17 00:00:00 2001 From: Eric Litak Date: Tue, 5 Sep 2017 13:39:10 -0700 Subject: [PATCH 12/29] factorio: refactored the arch+version abstraction --- pkgs/games/factorio/default.nix | 68 +++++++++++++++++++-------------- 1 file changed, 40 insertions(+), 28 deletions(-) diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index fca28b17223..af3d30a2715 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -6,36 +6,46 @@ , username ? "" , password ? "" }: -assert releaseType == "alpha" || releaseType == "headless" || releaseType == "demo"; +assert releaseType == "alpha" + || releaseType == "headless" + || releaseType == "demo"; -with stdenv.lib; let - version = if releaseType != "demo" then "0.15.33" else "0.15.33"; - arch = if stdenv.system == "x86_64-linux" then { - inUrl = "linux64"; - inTar = "x64"; - } else if stdenv.system == "i686-linux" then { - inUrl = "linux32"; - inTar = "i386"; - } else abort "Unsupported platform"; - - authenticatedFetch = callPackage ./fetch.nix { inherit username password; }; - - fetch = rec { - url = "https://www.factorio.com/get-download/${version}/${releaseType}/${arch.inUrl}"; - name = "factorio_${releaseType}_${arch.inTar}-${version}.tar.xz"; - x64 = { - headless = fetchurl { inherit name url; sha256 = "17x0dlmfd7jwmpmn5i8wag28rl01iysqz3ri6g6msxjnvj5l6byn"; }; - alpha = authenticatedFetch { inherit name url; sha256 = "1m2r0n99ngqq47s9fzr09d347i15an6x9v1qlij8yf8w7lyrdy4z"; }; - demo = fetchurl { inherit name url; sha256 = "03nwn4838yhqq0r76pf2m4wxi32rsq0knsxmq3qq4ycji89q1dyc"; }; + # NB If you nix-prefetch-url any of these, be sure to add a --name arg, + # where the ultimate "_" (before the version) is changed to a "-". + binDists = { + x86_64-linux = let bdist = bdistForArch { inUrl = "linux64"; inTar = "x64"; }; in { + alpha = bdist { sha256 = "1m2r0n99ngqq47s9fzr09d347i15an6x9v1qlij8yf8w7lyrdy4z"; fetcher = authenticatedFetch; }; + headless = bdist { sha256 = "17x0dlmfd7jwmpmn5i8wag28rl01iysqz3ri6g6msxjnvj5l6byn"; }; + demo = bdist { sha256 = "03nwn4838yhqq0r76pf2m4wxi32rsq0knsxmq3qq4ycji89q1dyc"; }; }; - i386 = { - headless = abort "Factorio 32-bit headless binaries are not available for download."; - alpha = abort "Factorio 32-bit client is not available for this version."; - demo = abort "Factorio 32-bit demo binaries are not available for download."; + i686-linux = let bdist = bdistForArch { inUrl = "linux32"; inTar = "i386"; }; in { + alpha = bdist { sha256 = "0nnfkxxqnywx1z05xnndgh71gp4izmwdk026nnjih74m2k5j086l"; version = "0.14.23"; nameMut = asGz; }; + headless = bdist { }; + demo = bdist { }; }; }; + actual = binDists.${stdenv.system}.${releaseType}; + + bdistForArch = arch: { sha256 ? null + , version ? "0.15.33" + , fetcher ? fetchurl + , nameMut ? x: x + }: + if sha256 == null then + abort "Factorio ${releaseType}-${arch.inTar} binaries are not (and were never?) available to download" + else { + inherit version arch; + src = fetcher { + inherit sha256; + url = "https://www.factorio.com/get-download/${version}/${releaseType}/${arch.inUrl}"; + name = nameMut "factorio_${releaseType}_${arch.inTar}-${version}.tar.xz"; + }; + }; + authenticatedFetch = callPackage ./fetch.nix { inherit username password; }; + asGz = builtins.replaceStrings [".xz"] [".gz"]; + configBaseCfg = '' use-system-read-write-data-directories=false @@ -59,10 +69,10 @@ let modDir = factorio-utils.mkModDirDrv mods; - base = { + base = with actual; { name = "factorio-${releaseType}-${version}"; - src = fetch.${arch.inTar}.${releaseType}; + inherit src; preferLocalBuild = true; dontBuild = true; @@ -117,8 +127,9 @@ let wrapProgram $out/bin/factorio \ --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:$libPath \ --run "$out/share/factorio/update-config.sh" \ - --argv0 "" \ - --add-flags "-c \$HOME/.factorio/config.cfg ${optionalString (mods != []) "--mod-directory=${modDir}"}" + --argv0 "" \ + --add-flags "-c \$HOME/.factorio/config.cfg" \ + ${if mods!=[] then "--add-flags --mod-directory=${modDir}" else ""} # TODO Currently, every time a mod is changed/added/removed using the # modlist, a new derivation will take up the entire footprint of the @@ -154,4 +165,5 @@ let ''; }; }; + in stdenv.mkDerivation (releases.${releaseType}) From 2164c01a53aa892fb11350d0d8ba3a5a8238e286 Mon Sep 17 00:00:00 2001 From: Eric Litak Date: Tue, 5 Sep 2017 15:00:33 -0700 Subject: [PATCH 13/29] factorio: 0.15.33 -> 0.15.34 --- pkgs/games/factorio/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index af3d30a2715..e10d97a047b 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -16,9 +16,9 @@ let # where the ultimate "_" (before the version) is changed to a "-". binDists = { x86_64-linux = let bdist = bdistForArch { inUrl = "linux64"; inTar = "x64"; }; in { - alpha = bdist { sha256 = "1m2r0n99ngqq47s9fzr09d347i15an6x9v1qlij8yf8w7lyrdy4z"; fetcher = authenticatedFetch; }; - headless = bdist { sha256 = "17x0dlmfd7jwmpmn5i8wag28rl01iysqz3ri6g6msxjnvj5l6byn"; }; - demo = bdist { sha256 = "03nwn4838yhqq0r76pf2m4wxi32rsq0knsxmq3qq4ycji89q1dyc"; }; + alpha = bdist { sha256 = "0phikwv00mbwpz4207wm6gz6blarm0b9p1f013ha2w5g7c2dxq4s"; fetcher = authenticatedFetch; }; + headless = bdist { sha256 = "1m170cl8ji6k3d3jm6n48wx3b7xfsxp4wkaixh0qszaqzafsglp0"; }; + demo = bdist { sha256 = "03nwn4838yhqq0r76pf2m4wxi32rsq0knsxmq3qq4ycji89q1dyc"; version = "0.15.33"; }; }; i686-linux = let bdist = bdistForArch { inUrl = "linux32"; inTar = "i386"; }; in { alpha = bdist { sha256 = "0nnfkxxqnywx1z05xnndgh71gp4izmwdk026nnjih74m2k5j086l"; version = "0.14.23"; nameMut = asGz; }; @@ -29,7 +29,7 @@ let actual = binDists.${stdenv.system}.${releaseType}; bdistForArch = arch: { sha256 ? null - , version ? "0.15.33" + , version ? "0.15.34" , fetcher ? fetchurl , nameMut ? x: x }: From 6df5f88aca0cb3122cea17d2dd441b3905e95158 Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Tue, 5 Sep 2017 16:12:31 -0700 Subject: [PATCH 14/29] nvidia-x11: 375.66 -> 384.69 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 307c661ddf4..22ceb1b2378 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -6,11 +6,11 @@ in { # Policy: use the highest stable version as the default (on our master). stable = generic { - version = "375.66"; - sha256_32bit = "0k7ib5ah3c2apzgzxlq75l48zm8901mbwj7slv18k3rhk8j0w8i9"; - sha256_64bit = "1h01s8brpz42jwc24dsflm4psd3zsy26ds98h0adgwx51dbpzqsr"; - settingsSha256 = "0bpdayyqw4cpgl7bgddfz6w5j8y3wsgr89p5vxnzgk9g0vgqxh5h"; - persistencedSha256 = "113rllf9l26z546jjfijpxllp17qcpawblzxvsqc6rbzbkmvcdwi"; + version = "384.69"; + sha256_32bit = "1zgq9vji0ndadvql3bsnd0a6p7pq0vr8d0yb5c8b22i2h9smhw1v"; + sha256_64bit = "0l3np6cx2rnb2q89zbnq4lvfcjl2g7i56hxwcb11ggijqm7ridx7"; + settingsSha256 = "064va75p7dnkhy4hyi9b1gl4wjmrpjksg4cyiwl6n3lkmjnvmnwy"; + persistencedSha256 = "0ijq25gnihw34qhkba62l5fy6lwkma94i0fxp8084byyilm3fwms"; }; beta = generic { From 28e4975bd1c245c580d37daa84c4c307ec9b18be Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 6 Sep 2017 00:11:47 -0400 Subject: [PATCH 15/29] zile: disable help2man for cross builds @dezgeg caught my error--the issue isn't building help2man, but running it on cross-compiled binaries. This effectively reverts 0825f30fd2b76ded554221630d9a0439ff6514cb as far as behavior is concerned, but keeps the removal of `crossAttrs`. --- pkgs/applications/editors/zile/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix index 936cde61ee8..fc2e8aa03de 100644 --- a/pkgs/applications/editors/zile/default.nix +++ b/pkgs/applications/editors/zile/default.nix @@ -9,7 +9,12 @@ stdenv.mkDerivation rec { }; buildInputs = [ pkgconfig ncurses boehmgc ]; - nativeBuildInputs = [ help2man perl ]; + nativeBuildInputs = [ perl ] + # `help2man' wants to run Zile, which won't work when the + # newly-produced binary can't be run at build-time. + ++ stdenv.lib.optional + (stdenv.hostPlatform == stdenv.buildPlatform) + help2man; # Tests can't be run because most of them rely on the ability to # fiddle with the terminal. From f152a5d7bbe13221366627f9ad8154ec7aa24b3a Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 6 Sep 2017 00:35:01 -0400 Subject: [PATCH 16/29] mplayer: depsBuildBuild isn't (yet) a parameter, so don't use it Thanks @dezgeg for catching my error. --- pkgs/applications/video/mplayer/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index fe6090c3230..24c5b4335c4 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -102,8 +102,7 @@ stdenv.mkDerivation rec { rm -rf ffmpeg ''; - depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ pkgconfig yasm ]; + nativeBuildInputs = [ buildPackages.stdenv.cc pkgconfig yasm ]; buildInputs = with stdenv.lib; [ freetype ffmpeg ] ++ optional aalibSupport aalib From f03964ff7cd3a4603de3f91deebc41861dde8802 Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Tue, 5 Sep 2017 23:29:31 -0700 Subject: [PATCH 17/29] winetricks: 20170614 -> 20170823 --- pkgs/misc/emulators/wine/sources.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index d37cc93dfcd..438eb8e02ec 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -47,8 +47,8 @@ in rec { }; winetricks = fetchFromGitHub rec { - version = "20170614"; - sha256 = "1xszflrdmixxr0v7vjby8fpnl8fgc9gldr1gnjpwzq1rnb84idqa"; + version = "20170823"; + sha256 = "15kjic39nl3z4g9l9galwkajl108fxfwaa0d9nssp54wg6villwx"; owner = "Winetricks"; repo = "winetricks"; rev = version; From fefdc00c525e8da8f4edadd5caabbb086c1d5e69 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 6 Sep 2017 14:51:08 +0800 Subject: [PATCH 18/29] arc-theme: Fix build with gnome 3.24 --- pkgs/misc/themes/arc/default.nix | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/misc/themes/arc/default.nix b/pkgs/misc/themes/arc/default.nix index a277c796eb4..6598abe73e8 100644 --- a/pkgs/misc/themes/arc/default.nix +++ b/pkgs/misc/themes/arc/default.nix @@ -1,14 +1,18 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gnome3, gtk-engine-murrine }: -stdenv.mkDerivation rec { - name = "${pname}-${version}"; +let + # treat versions newer than 3.22 as 3.22 + gnomeVersion = if stdenv.lib.versionOlder "3.22" gnome3.version then "3.22" else gnome3.version; pname = "arc-theme"; + +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; version = "2017-05-12"; src = fetchFromGitHub { - owner = "horst3180"; - repo = pname; - rev = "8290cb813f157a22e64ae58ac3dfb5983b0416e6"; + owner = "horst3180"; + repo = pname; + rev = "8290cb813f157a22e64ae58ac3dfb5983b0416e6"; sha256 = "1lxiw5iq9n62xzs0fks572c5vkz202jigndxaankxb44wcgn9zyf"; }; @@ -18,7 +22,7 @@ stdenv.mkDerivation rec { preferLocalBuild = true; - configureFlags = [ "--disable-unity" ]; + configureFlags = [ "--disable-unity" "--with-gnome=${gnomeVersion}" ]; postInstall = '' mkdir -p $out/share/plank/themes @@ -30,9 +34,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A flat theme with transparent elements for GTK 3, GTK 2 and Gnome-Shell"; - homepage = https://github.com/horst3180/arc-theme; - license = licenses.gpl3; - platforms = platforms.unix; + homepage = https://github.com/horst3180/arc-theme; + license = licenses.gpl3; maintainers = with maintainers; [ simonvandel romildo ]; + platforms = platforms.unix; }; } From b2bff7e8aea61c5272d8a9a9062ecc1c3ca84ba4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 4 Sep 2017 10:35:22 +0200 Subject: [PATCH 19/29] LTS Haskell 9.3 --- .../configuration-hackage2nix.yaml | 66 ++++++++++--------- 1 file changed, 34 insertions(+), 32 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 7ba056148ed..511ecc57816 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -37,7 +37,7 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 9.2 + # LTS Haskell 9.3 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -57,7 +57,7 @@ default-package-overrides: - aeson-diff ==1.1.0.3 - aeson-extra ==0.4.0.0 - aeson-generic-compat ==0.0.1.0 - - aeson-injector ==1.0.8.0 + - aeson-injector ==1.0.10.0 - aeson-lens ==0.5.0.0 - aeson-pretty ==0.8.5 - aeson-qq ==0.8.2 @@ -66,7 +66,7 @@ default-package-overrides: - airship ==0.6.0 - alarmclock ==0.4.0.3 - alerta ==0.1.0.4 - - alex ==3.2.1 + - alex ==3.2.2 - algebraic-graphs ==0.0.5 - alsa-core ==0.5.0.1 - alsa-mixer ==0.2.0.3 @@ -201,7 +201,7 @@ default-package-overrides: - attoparsec-binary ==0.2 - attoparsec-expr ==0.1.1.2 - attoparsec-iso8601 ==1.0.0.0 - - attoparsec-time ==0.1.3.2 + - attoparsec-time ==0.1.4 - audacity ==0.0.1.2 - authenticate ==1.3.3.2 - authenticate-oauth ==1.6 @@ -352,7 +352,7 @@ default-package-overrides: - cgi ==3001.3.0.2 - ChannelT ==0.0.0.4 - charset ==0.3.7.1 - - charsetdetect-ae ==1.1.0.2 + - charsetdetect-ae ==1.1.0.3 - Chart ==1.8.2 - Chart-cairo ==1.8.2 - Chart-diagrams ==1.8.2 @@ -504,7 +504,7 @@ default-package-overrides: - data-diverse-lens ==0.1.1.0 - data-dword ==0.3.1.1 - data-endian ==0.1.1 - - data-fix ==0.0.4 + - data-fix ==0.0.6 - data-has ==0.2.1.0 - data-hash ==0.2.0.1 - data-inttrie ==0.1.2 @@ -561,10 +561,10 @@ default-package-overrides: - disposable ==0.2.0.4 - distance ==0.1.0.0 - distributed-closure ==0.3.4.0 - - distributed-static ==0.3.7 + - distributed-static ==0.3.8 - distribution ==1.1.1.0 - distributive ==0.5.3 - - diversity ==0.8.0.2 + - diversity ==0.8.1.0 - djinn-ghc ==0.0.2.3 - djinn-lib ==0.0.1.2 - dlist ==0.8.0.3 @@ -673,6 +673,7 @@ default-package-overrides: - extensible-exceptions ==0.1.1.4 - extra ==1.5.3 - extract-dependencies ==0.2.0.1 + - extractable-singleton ==0.0.1 - fail ==4.9.0.0 - farmhash ==0.1.0.5 - fast-builder ==0.0.0.6 @@ -711,7 +712,7 @@ default-package-overrides: - flexible-defaults ==0.0.1.2 - floatshow ==0.2.4 - flock ==0.3.1.8 - - flow ==1.0.8 + - flow ==1.0.9 - fmlist ==0.9 - fmt ==0.3.0.0 - fn ==0.3.0.1 @@ -760,7 +761,7 @@ default-package-overrides: - getopt-generics ==0.13.0.1 - ghc-events ==0.6.0 - ghc-exactprint ==0.5.5.0 - - ghc-heap-view ==0.5.9 + - ghc-heap-view ==0.5.10 - ghc-paths ==0.1.0.9 - ghc-prof ==1.4.0.2 - ghc-syb-utils ==0.2.3.2 @@ -789,7 +790,7 @@ default-package-overrides: - giphy-api ==0.5.2.0 - git ==0.2.0 - github ==0.16.0 - - github-release ==1.0.5 + - github-release ==1.0.6 - github-types ==0.2.1 - github-webhook-handler ==0.0.8 - github-webhook-handler-snap ==0.0.7 @@ -931,7 +932,7 @@ default-package-overrides: - groundhog-sqlite ==0.8 - groundhog-th ==0.8.0.1 - group-by-date ==0.1.0.1 - - grouped-list ==0.2.1.2 + - grouped-list ==0.2.1.3 - groupoids ==4.0 - groups ==0.4.0.0 - gtk ==0.14.6 @@ -961,7 +962,7 @@ default-package-overrides: - happstack-jmacro ==7.0.12 - happstack-server ==7.4.6.4 - happstack-server-tls ==7.1.6.4 - - happy ==1.19.5 + - happy ==1.19.6 - harp ==0.4.2 - hasbolt ==0.1.2.1 - hashable ==1.2.6.1 @@ -1081,7 +1082,7 @@ default-package-overrides: - hruby ==0.3.4.4 - hs-bibutils ==5.5 - hs-GeoIP ==0.3 - - hsass ==0.4.1 + - hsass ==0.4.2 - hsb2hs ==0.3.1 - hscolour ==1.24.1 - hscurses ==1.4.2.0 @@ -1254,14 +1255,14 @@ default-package-overrides: - jmacro-rpc-snap ==0.3 - jni ==0.3.1 - jose ==0.6.0.3 - - jose-jwt ==0.7.6 + - jose-jwt ==0.7.7 - js-flot ==0.8.3 - js-jquery ==3.2.1 - json ==0.9.1 - json-builder ==0.3 - json-rpc-generic ==0.2.1.2 - json-schema ==0.7.4.1 - - json-stream ==0.4.1.3 + - json-stream ==0.4.1.4 - JuicyPixels ==3.2.8.3 - JuicyPixels-extra ==0.2.1 - JuicyPixels-scale-dct ==0.1.1.2 @@ -1281,7 +1282,7 @@ default-package-overrides: - koofr-client ==1.0.0.3 - kraken ==0.0.3 - l10n ==0.1.0.1 - - labels ==0.3.2 + - labels ==0.3.3 - lackey ==0.4.3 - lame ==0.1.1 - language-c ==0.6.1 @@ -1434,6 +1435,7 @@ default-package-overrides: - model ==0.3 - modify-fasta ==0.8.2.3 - monad-control ==1.0.2.2 + - monad-control-aligned ==0.0.1 - monad-coroutine ==0.9.0.3 - monad-extras ==0.6.0 - monad-http ==0.1.0.0 @@ -1488,7 +1490,7 @@ default-package-overrides: - mysql ==0.1.4 - mysql-haskell ==0.8.0.0 - mysql-haskell-openssl ==0.8.0.0 - - mysql-simple ==0.4.0.1 + - mysql-simple ==0.4.1.0 - nagios-check ==0.3.2 - names-th ==0.2.0.3 - nano-erl ==0.1.0.1 @@ -1534,7 +1536,7 @@ default-package-overrides: - non-negative ==0.1.1.2 - nonce ==1.0.4 - nondeterminism ==1.4 - - NoTrace ==0.3.0.1 + - NoTrace ==0.3.0.2 - nsis ==0.3.1 - numbers ==3000.2.0.1 - numeric-extras ==0.1 @@ -1825,10 +1827,10 @@ default-package-overrides: - regex-tdfa-text ==1.0.0.3 - regex-with-pcre ==1.0.1.3 - reinterpret-cast ==0.1.0 - - relational-query ==0.9.4.1 - - relational-query-HDBC ==0.6.4.0 + - relational-query ==0.9.5.0 + - relational-query-HDBC ==0.6.4.1 - relational-record ==0.1.8.0 - - relational-schemas ==0.1.4.0 + - relational-schemas ==0.1.4.1 - renderable ==0.2.0.1 - RepLib ==0.5.4 - repline ==0.1.6.0 @@ -1878,7 +1880,7 @@ default-package-overrides: - scalpel-core ==0.5.1 - scanner ==0.2 - schematic ==0.1.6.0 - - scientific ==0.3.5.1 + - scientific ==0.3.5.2 - scotty ==0.11.0 - scrape-changes ==0.1.0.5 - scrypt ==0.5.0 @@ -1910,14 +1912,14 @@ default-package-overrides: - servant-cassava ==0.9 - servant-checked-exceptions ==0.4.0.0 - servant-client ==0.11 - - servant-docs ==0.10.0.1 + - servant-docs ==0.11 - servant-elm ==0.4.0.1 - servant-foreign ==0.10.1 - servant-js ==0.9.3 - servant-JuicyPixels ==0.3.0.3 - servant-lucid ==0.7.1 - servant-mock ==0.8.2 - - servant-purescript ==0.8.0.0 + - servant-purescript ==0.8.0.1 - servant-ruby ==0.2.1.0 - servant-server ==0.11 - servant-static-th ==0.1.0.5 @@ -2039,7 +2041,7 @@ default-package-overrides: - storable-tuple ==0.0.3.2 - storablevector ==0.2.12.1 - storablevector-carray ==0.0 - - store ==0.4.3.1 + - store ==0.4.3.2 - store-core ==0.4.1 - Strafunski-StrategyLib ==5.0.0.10 - stratosphere ==0.6.0 @@ -2179,7 +2181,7 @@ default-package-overrides: - thread-local-storage ==0.1.1 - threads ==0.5.1.5 - threepenny-editors ==0.4.1 - - threepenny-gui ==0.8.0.1 + - threepenny-gui ==0.8.1.0 - threepenny-gui-flexbox ==0.4.2 - through-text ==0.1.0.0 - throwable-exceptions ==0.1.0.8 @@ -2289,7 +2291,7 @@ default-package-overrides: - uri-bytestring ==0.2.3.3 - uri-bytestring-aeson ==0.1.0.2 - uri-encode ==1.5.0.5 - - uri-templater ==0.2.1.0 + - uri-templater ==0.2.2.0 - url ==2.1.3 - urlpath ==5.0.0.1 - users ==0.5.0.0 @@ -2343,7 +2345,7 @@ default-package-overrides: - wai-middleware-caching-lru ==0.1.0.0 - wai-middleware-caching-redis ==0.2.0.0 - wai-middleware-consul ==0.1.0.2 - - wai-middleware-content-type ==0.5.0.1 + - wai-middleware-content-type ==0.5.1 - wai-middleware-crowd ==0.1.4.2 - wai-middleware-metrics ==0.2.4 - wai-middleware-rollbar ==0.4.0 @@ -2452,15 +2454,15 @@ default-package-overrides: - yackage ==0.8.1 - yahoo-finance-api ==0.2.0.2 - yaml ==0.8.23.3 - - Yampa ==0.10.6.1 + - Yampa ==0.10.6.2 - YampaSynth ==0.2 - yes-precure5-command ==5.5.3 - yesod ==1.4.5 - - yesod-auth ==1.4.17.3 + - yesod-auth ==1.4.18 - yesod-auth-account ==1.4.3 - yesod-auth-basic ==0.1.0.2 - yesod-auth-fb ==1.8.1 - - yesod-auth-hashdb ==1.6.1 + - yesod-auth-hashdb ==1.6.2 - yesod-bin ==1.5.2.5 - yesod-core ==1.4.36 - yesod-default ==1.2.0 From e1a67915f836e7e470dc8cf09b15a16164327397 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 5 Sep 2017 09:07:53 +0200 Subject: [PATCH 20/29] haskell-happy: use 1.19.7 version (despite lts-9) to fix test suite failure --- pkgs/development/haskell-modules/configuration-common.nix | 4 ---- .../haskell-modules/configuration-hackage2nix.yaml | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 25054d65e29..2db821d80ac 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -900,8 +900,4 @@ self: super: { sha256 = "1vss7b99zrhw3r29krl1b60r4qk0m2mpwmrz8q8zdxrh33hb8pd7"; }); - # Has extra data files which are referred to from the binary output, - # creating a store reference cycle. Putting data in separate output - # solves the problem. - happy = overrideCabal super.happy (drv: { enableSeparateDataOutput = true; }); } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 511ecc57816..28e7532f1c4 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -962,7 +962,7 @@ default-package-overrides: - happstack-jmacro ==7.0.12 - happstack-server ==7.4.6.4 - happstack-server-tls ==7.1.6.4 - - happy ==1.19.6 + - happy >1.19.6 - harp ==0.4.2 - hasbolt ==0.1.2.1 - hashable ==1.2.6.1 From f2a76b6c292866e887684a2e7cf0b1e75ffb80cf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 4 Sep 2017 03:00:42 +0200 Subject: [PATCH 21/29] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.5-6-g83a4cb0 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/6bd6c397f5f16f36fec4c26817aeb4146e101bb7. --- .../haskell-modules/hackage-packages.nix | 1905 ++++++++++------- 1 file changed, 1148 insertions(+), 757 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f1f0ad98a9e..ba9864d2605 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -12958,19 +12958,6 @@ self: { }) {}; "NoTrace" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "NoTrace"; - version = "0.3.0.1"; - sha256 = "0kszrn14jzv27h7s3x1ckskhl5a6ayvr8sq3105sbf9vndharvx8"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base ]; - homepage = "https://github.com/CindyLinz/Haskell-NoTrace"; - description = "Remove all the functions come from Debug.Trace after debugging"; - license = stdenv.lib.licenses.mit; - }) {}; - - "NoTrace_0_3_0_2" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "NoTrace"; @@ -12981,7 +12968,6 @@ self: { homepage = "https://github.com/CindyLinz/Haskell-NoTrace"; description = "Remove all the functions come from Debug.Trace after debugging"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Noise" = callPackage @@ -18229,8 +18215,8 @@ self: { }: mkDerivation { pname = "Villefort"; - version = "0.1.1.11"; - sha256 = "0pgwaiz6pxdf6yrxx20p5zmj8lr2gx8wiwqwia19cgzcfgpm8hw8"; + version = "0.1.1.13"; + sha256 = "02qlhg1i5z9z0zdbczygf4px477zg91a8gk5va5i7mcsgznqzv7d"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -19217,22 +19203,6 @@ self: { }) {}; "Yampa" = callPackage - ({ mkDerivation, base, deepseq, hcwiid, random, SDL }: - mkDerivation { - pname = "Yampa"; - version = "0.10.6.1"; - sha256 = "108rn0hc5xqw8pmadaddgawxpsznhjg8kbn9m30lwz04hv2ivjrv"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base deepseq random ]; - executableHaskellDepends = [ base deepseq hcwiid random SDL ]; - testHaskellDepends = [ base ]; - homepage = "http://www.haskell.org/haskellwiki/Yampa"; - description = "Library for programming hybrid systems"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "Yampa_0_10_6_2" = callPackage ({ mkDerivation, base, deepseq, random }: mkDerivation { pname = "Yampa"; @@ -19245,7 +19215,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Yampa"; description = "Library for programming hybrid systems"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Yampa-core" = callPackage @@ -21531,28 +21500,6 @@ self: { }) {}; "aeson-injector" = callPackage - ({ mkDerivation, aeson, base, bifunctors, deepseq, HUnit, lens - , QuickCheck, quickcheck-text, scientific, servant-docs, swagger2 - , tasty, tasty-hunit, tasty-quickcheck, text, unordered-containers - , vector - }: - mkDerivation { - pname = "aeson-injector"; - version = "1.0.8.0"; - sha256 = "1k5chasmpn834pjhfyfjmkmx7dzxy3bw9rkphk6dmp7kp41ygyai"; - libraryHaskellDepends = [ - aeson base bifunctors deepseq lens servant-docs swagger2 text - unordered-containers - ]; - testHaskellDepends = [ - aeson base HUnit lens QuickCheck quickcheck-text scientific - swagger2 tasty tasty-hunit tasty-quickcheck text vector - ]; - description = "Injecting fields into aeson values"; - license = stdenv.lib.licenses.mit; - }) {}; - - "aeson-injector_1_0_10_0" = callPackage ({ mkDerivation, aeson, base, bifunctors, deepseq, HUnit, lens , QuickCheck, quickcheck-text, scientific, servant-docs, swagger2 , tasty, tasty-hunit, tasty-quickcheck, text, unordered-containers @@ -21572,7 +21519,6 @@ self: { ]; description = "Injecting fields into aeson values"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-iproute" = callPackage @@ -22334,8 +22280,8 @@ self: { }: mkDerivation { pname = "aivika-distributed"; - version = "0.7.2"; - sha256 = "1b18sgnk5ybrfvwqhwixcnwzr7ffi2h93ck75ba9a1r8rkkd193c"; + version = "0.7.4"; + sha256 = "0p18s265yf2ficygvgzrngl2ax1zf73h56mz3jv3iigjrsjf4rj2"; libraryHaskellDepends = [ aivika aivika-transformers base binary containers distributed-process exceptions mtl mwc-random random stm time @@ -22586,29 +22532,6 @@ self: { }) {}; "alex" = callPackage - ({ mkDerivation, array, base, Cabal, containers, directory - , filepath, happy, process, QuickCheck - }: - mkDerivation { - pname = "alex"; - version = "3.2.1"; - sha256 = "0v0f4fvb6gqjrxq6k3r7qxjwy2m9462c92vpbidawkwzfbnggrx4"; - revision = "1"; - editedCabalFile = "1nl05l0dkai8i9x9fx288ka010hp6yhy3dmvfhjkqpfakimfcs1s"; - isLibrary = false; - isExecutable = true; - setupHaskellDepends = [ base Cabal directory filepath ]; - executableHaskellDepends = [ - array base containers directory QuickCheck - ]; - executableToolDepends = [ happy ]; - testHaskellDepends = [ base process ]; - homepage = "http://www.haskell.org/alex/"; - description = "Alex is a tool for generating lexical analysers in Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "alex_3_2_2" = callPackage ({ mkDerivation, array, base, containers, directory, happy, process , QuickCheck }: @@ -22626,7 +22549,6 @@ self: { homepage = "http://www.haskell.org/alex/"; description = "Alex is a tool for generating lexical analysers in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "alex-meta" = callPackage @@ -28792,13 +28714,15 @@ self: { }) {}; "attoparsec-time" = callPackage - ({ mkDerivation, attoparsec, base, base-prelude, directory, doctest - , filepath, scientific, text, time + ({ mkDerivation, attoparsec, base, base-prelude, Cabal + , cabal-doctest, directory, doctest, filepath, scientific, text + , time }: mkDerivation { pname = "attoparsec-time"; - version = "0.1.3.2"; - sha256 = "0p7lzqn9is04gp98278ygbwx1ass7ami32nybx6d9n77iz2habp0"; + version = "0.1.4"; + sha256 = "0b4h530j01wkx8405b0yf0cz5k7mjglzr72lvv8rr7idd7m4k5iw"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ attoparsec base base-prelude scientific text time ]; @@ -41603,18 +41527,6 @@ self: { }) {}; "charsetdetect-ae" = callPackage - ({ mkDerivation, base, bytestring }: - mkDerivation { - pname = "charsetdetect-ae"; - version = "1.1.0.2"; - sha256 = "1ghgp8kqpr5xc14lcwlf450s6s8lm52zag34v9gvr3x86bjgm4qk"; - libraryHaskellDepends = [ base bytestring ]; - homepage = "http://github.com/aelve/charsetdetect-ae"; - description = "Character set detection using Mozilla's Universal Character Set Detector"; - license = "LGPL"; - }) {}; - - "charsetdetect-ae_1_1_0_3" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { pname = "charsetdetect-ae"; @@ -41624,7 +41536,6 @@ self: { homepage = "http://github.com/aelve/charsetdetect-ae"; description = "Character set detection using Mozilla's Universal Character Set Detector"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "chart-histogram" = callPackage @@ -41668,7 +41579,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "chart-unit_0_5_0" = callPackage + "chart-unit_0_5_1" = callPackage ({ mkDerivation, base, colour, containers, data-default , diagrams-lib, diagrams-rasterific, diagrams-svg, foldl , formatting, lens, linear, mwc-probability, mwc-random, numhask @@ -41677,8 +41588,8 @@ self: { }: mkDerivation { pname = "chart-unit"; - version = "0.5.0"; - sha256 = "09m543av9wwip64yba3qapf869cafjj03vnl8qfi7rwaf6w94h2a"; + version = "0.5.1"; + sha256 = "1hwbhzs22glikckwbbj9y5hn2vdsz3178gdw7hjrb32aa5kxj45j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -41686,8 +41597,9 @@ self: { lens linear numhask numhask-range palette SVGFonts text ]; executableHaskellDepends = [ - base containers diagrams-lib diagrams-rasterific foldl lens - mwc-probability mwc-random numhask primitive protolude tdigest text + base containers diagrams-lib diagrams-rasterific diagrams-svg foldl + lens mwc-probability mwc-random numhask primitive protolude tdigest + text ]; testHaskellDepends = [ base numhask tasty tasty-hspec text ]; homepage = "https://github.com/tonyday567/chart-unit"; @@ -46702,8 +46614,8 @@ self: { }: mkDerivation { pname = "concrete-haskell-autogen"; - version = "0.0.0.2"; - sha256 = "02y9ahcryrhwiam9fsh8r57lri3zhy2xhm6098j9x1zzr2vq72sl"; + version = "0.0.0.3"; + sha256 = "0csdzkhw1v84ryzdzfii5iphyyclqf8gl1mh5qvg13jyxvh5z7rk"; libraryHaskellDepends = [ base bytestring containers hashable lens QuickCheck text thrift unordered-containers vector @@ -47267,6 +47179,37 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "conduit-extra_1_1_17" = callPackage + ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring + , bytestring-builder, conduit, criterion, directory, exceptions + , filepath, hspec, monad-control, network, primitive, process + , QuickCheck, resourcet, stm, streaming-commons, text, transformers + , transformers-base + }: + mkDerivation { + pname = "conduit-extra"; + version = "1.1.17"; + sha256 = "01haq94kf4jsqrhs6j2kkvxrw4iqhvhnd9rcrqpkdbp1dil493kn"; + libraryHaskellDepends = [ + async attoparsec base blaze-builder bytestring conduit directory + exceptions filepath monad-control network primitive process + resourcet stm streaming-commons text transformers transformers-base + ]; + testHaskellDepends = [ + async attoparsec base blaze-builder bytestring bytestring-builder + conduit directory exceptions hspec process QuickCheck resourcet stm + streaming-commons text transformers transformers-base + ]; + benchmarkHaskellDepends = [ + base blaze-builder bytestring bytestring-builder conduit criterion + transformers + ]; + homepage = "http://github.com/snoyberg/conduit"; + description = "Batteries included conduit: adapters for common libraries"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "conduit-find" = callPackage ({ mkDerivation, attoparsec, base, conduit, conduit-combinators , conduit-extra, directory, doctest, either, exceptions, filepath @@ -47392,6 +47335,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "conduit-throttle" = callPackage + ({ mkDerivation, async, base, conduit, conduit-combinators + , conduit-extra, HUnit, resourcet, stm, stm-chans, stm-conduit + , test-framework, test-framework-hunit, throttle-io-stream + , unliftio, unliftio-core + }: + mkDerivation { + pname = "conduit-throttle"; + version = "0.2.0.1"; + sha256 = "0402bnj5z4m2lqgagbw8rc7c8vmm3sldp1vcrywd5zvcp5031xsa"; + libraryHaskellDepends = [ + async base conduit conduit-combinators conduit-extra resourcet stm + stm-chans throttle-io-stream unliftio unliftio-core + ]; + testHaskellDepends = [ + async base conduit conduit-combinators conduit-extra HUnit + resourcet stm stm-chans stm-conduit test-framework + test-framework-hunit throttle-io-stream unliftio unliftio-core + ]; + homepage = "https://github.com/mtesseract/conduit-throttle#readme"; + description = "Throttle Conduit Producers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "conduit-tokenize-attoparsec" = callPackage ({ mkDerivation, attoparsec, base, bytestring, conduit, hspec , resourcet, text @@ -49269,8 +49236,8 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "counter"; - version = "0.1.0.1"; - sha256 = "0pfg34ph6b7qb3wscvvnqdkqqzkjdjc8wynv35ikgf295bsf3kaz"; + version = "0.1.0.2"; + sha256 = "0jc34nrbzxzilrr1s2k7krrp9g5xc40hpf2srw6mccfrcsyacsnc"; libraryHaskellDepends = [ base containers ]; homepage = "https://github.com/wei2912/counter"; description = "An object frequency counter"; @@ -51956,6 +51923,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "curryer" = callPackage + ({ mkDerivation, aeson, base, blaze-html, bytestring + , case-insensitive, containers, cookie, http-types, mtl, regex-pcre + , text, transformers, wai, warp + }: + mkDerivation { + pname = "curryer"; + version = "0.1.0.0"; + sha256 = "16g66p8hpw1i9ah3isw92mxjj04b8plvz1kqf7k298yqkgcyadmg"; + libraryHaskellDepends = [ + aeson base blaze-html bytestring case-insensitive containers cookie + http-types mtl regex-pcre text transformers wai warp + ]; + homepage = "https://github.com/ChrisPenner/curryer#readme"; + description = "A simple HTTP server framework"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "curryrs" = callPackage ({ mkDerivation, base, mtl, tasty, tasty-hunit }: mkDerivation { @@ -53528,22 +53513,20 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "data-fix"; - version = "0.0.4"; - sha256 = "1446gvgq5xfsixcm63fyi4qv15kqxdfw2b2bzwm3q303n0xd5ql5"; - revision = "1"; - editedCabalFile = "1y2rimg0wpvk6sgc30csz211220im5dm7zzm86yqyx9b3yxzk177"; + version = "0.0.6"; + sha256 = "10shw0c7c3v3qy27c8mahr56bzciikqmafpm01r7792i84glb10g"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/anton-k/data-fix"; description = "Fixpoint data types"; license = stdenv.lib.licenses.bsd3; }) {}; - "data-fix_0_0_6" = callPackage + "data-fix_0_0_7" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "data-fix"; - version = "0.0.6"; - sha256 = "10shw0c7c3v3qy27c8mahr56bzciikqmafpm01r7792i84glb10g"; + version = "0.0.7"; + sha256 = "04k9cmb197majyw6xna8zfkhgfyxfdiz2sgb0jy5jyfpiz3cr60h"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/anton-k/data-fix"; description = "Fixpoint data types"; @@ -59353,22 +59336,6 @@ self: { }) {}; "distributed-static" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, deepseq - , rank1dynamic - }: - mkDerivation { - pname = "distributed-static"; - version = "0.3.7"; - sha256 = "0aalqhk4d2qbkcxnjn5jnp8m2kbvvl6dm49psfgzpmaixbd6wr45"; - libraryHaskellDepends = [ - base binary bytestring containers deepseq rank1dynamic - ]; - homepage = "http://haskell-distributed.github.com"; - description = "Compositional, type-safe, polymorphic static values and closures"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "distributed-static_0_3_8" = callPackage ({ mkDerivation, base, binary, bytestring, containers, deepseq , rank1dynamic }: @@ -59382,7 +59349,6 @@ self: { homepage = "http://haskell-distributed.github.com"; description = "Compositional, type-safe, polymorphic static values and closures"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distribution" = callPackage @@ -59458,29 +59424,6 @@ self: { }) {}; "diversity" = callPackage - ({ mkDerivation, base, containers, data-ordlist, fasta - , math-functions, MonadRandom, optparse-applicative, parsec, pipes - , random-shuffle, scientific, semigroups, split - }: - mkDerivation { - pname = "diversity"; - version = "0.8.0.2"; - sha256 = "093k1i3dikfwaswiahs6rzn304l7xh9c3vshy5lr3zwajl8aggpq"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers data-ordlist fasta math-functions MonadRandom - parsec random-shuffle scientific split - ]; - executableHaskellDepends = [ - base containers fasta optparse-applicative pipes semigroups - ]; - homepage = "https://github.com/GregorySchwartz/diversity"; - description = "Quantify the diversity of a population"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "diversity_0_8_1_0" = callPackage ({ mkDerivation, base, containers, data-ordlist, fasta , math-functions, MonadRandom, optparse-applicative, parsec, pipes , random-shuffle, scientific, semigroups, split @@ -59501,7 +59444,6 @@ self: { homepage = "https://github.com/GregorySchwartz/diversity"; description = "Quantify the diversity of a population"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dixi" = callPackage @@ -59777,6 +59719,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dns_2_0_13" = callPackage + ({ mkDerivation, attoparsec, base, binary, bytestring + , bytestring-builder, conduit, conduit-extra, containers, doctest + , hspec, iproute, mtl, network, random, resourcet, safe, word8 + }: + mkDerivation { + pname = "dns"; + version = "2.0.13"; + sha256 = "0rrv49rvnpd1pf37imhm82ngy9z0vk80sz0zvikpccc0parbmvx0"; + libraryHaskellDepends = [ + attoparsec base binary bytestring conduit conduit-extra containers + iproute mtl network random resourcet safe + ]; + testHaskellDepends = [ + attoparsec base binary bytestring bytestring-builder conduit + conduit-extra containers doctest hspec iproute mtl network random + resourcet safe word8 + ]; + testTarget = "spec"; + description = "DNS library in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dnscache" = callPackage ({ mkDerivation, base, bytestring, containers, contstuff, dns , iproute, time @@ -67181,8 +67147,8 @@ self: { }: mkDerivation { pname = "factory"; - version = "0.2.2.1"; - sha256 = "15x5ki7rpmsy84b5qbzhr0ih0gal75rj7ddqi7h7m5q33zl114b0"; + version = "0.3.0.0"; + sha256 = "0izhwb0plxhlsr4ghk2rybm367n83d598s3nk8ss0mnnv7gv5wpm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -69497,8 +69463,8 @@ self: { }: mkDerivation { pname = "fishfood"; - version = "0.0.1.6"; - sha256 = "01fyncr5ymkm6s200xj76sh1slqhyf840sr0klj0a2s8i0madk25"; + version = "0.0.1.7"; + sha256 = "1b2nabliv1xqi42q2bknri85gizb1xbh7j5729dxv3sybzq50wd8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -70360,19 +70326,6 @@ self: { }) {}; "flow" = callPackage - ({ mkDerivation, base, doctest, QuickCheck, template-haskell }: - mkDerivation { - pname = "flow"; - version = "1.0.8"; - sha256 = "13cfwc67r38kx30yixizcifcgijm7ak2swr3qikdb44fjm5y0zas"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest QuickCheck template-haskell ]; - homepage = "https://github.com/tfausak/flow#readme"; - description = "Write more understandable Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "flow_1_0_9" = callPackage ({ mkDerivation, base, doctest, QuickCheck, template-haskell }: mkDerivation { pname = "flow"; @@ -70383,7 +70336,6 @@ self: { homepage = "https://github.com/tfausak/flow#readme"; description = "Write more understandable Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "flow-er" = callPackage @@ -70889,7 +70841,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "foldl_1_3_0" = callPackage + "foldl_1_3_1" = callPackage ({ mkDerivation, base, bytestring, comonad, containers , contravariant, criterion, hashable, mwc-random, primitive , profunctors, text, transformers, unordered-containers, vector @@ -70897,8 +70849,8 @@ self: { }: mkDerivation { pname = "foldl"; - version = "1.3.0"; - sha256 = "1rinr1a18pjwlrk21d9sfg0f954cwdc3bk9jl276ypcf8ydy3yin"; + version = "1.3.1"; + sha256 = "0g9f2lzlv59bzdjkm917fpcfxrmkzhrmh3jgd2xnfwcb7sfrbmma"; libraryHaskellDepends = [ base bytestring comonad containers contravariant hashable mwc-random primitive profunctors text transformers @@ -71277,8 +71229,8 @@ self: { }: mkDerivation { pname = "forest"; - version = "0.1.1.1"; - sha256 = "0g14zghqhajjbnkds26l09xfq8g7l2nykha3nsbg7f34v8d34yqp"; + version = "0.2"; + sha256 = "0z8wfvylzcls994yg3s4bywjxl3592y4ba6gcn2h8ndc7c8w09v4"; libraryHaskellDepends = [ aeson base bifunctors deepseq hashable profunctors semigroupoids ]; @@ -75671,23 +75623,6 @@ self: { }) {}; "ghc-heap-view" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, deepseq, ghc - , template-haskell, transformers - }: - mkDerivation { - pname = "ghc-heap-view"; - version = "0.5.9"; - sha256 = "1brjvyqd4bzzc1vhljbf5qv9lyf55myyvnz1zx9nngfwsh7a6cf6"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base binary bytestring containers ghc template-haskell transformers - ]; - testHaskellDepends = [ base deepseq ]; - description = "Extract the heap representation of Haskell values and thunks"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghc-heap-view_0_5_10" = callPackage ({ mkDerivation, base, binary, bytestring, Cabal, containers , deepseq, filepath, ghc, template-haskell, transformers }: @@ -75703,7 +75638,6 @@ self: { testHaskellDepends = [ base deepseq ]; description = "Extract the heap representation of Haskell values and thunks"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-imported-from" = callPackage @@ -76002,8 +75936,8 @@ self: { ({ mkDerivation, base, ghc, transformers }: mkDerivation { pname = "ghc-proofs"; - version = "0.1"; - sha256 = "18zznyh84sv5qvxqzk1lkkx3lrqprkqnx996cjywyix5z5kdk5gk"; + version = "0.1.1"; + sha256 = "1kyy2wck8n6cjfcsqv4ki5dsakgps9brpad0lcsgnpixx9x8w88h"; libraryHaskellDepends = [ base ghc ]; testHaskellDepends = [ base transformers ]; homepage = "https://github.com/nomeata/ghc-proofs"; @@ -76790,6 +76724,27 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) gdk_pixbuf;}; + "gi-gdkx11" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gdk-x11 + , gi-gdk, gi-gio, gi-gobject, gi-xlib, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers + }: + mkDerivation { + pname = "gi-gdkx11"; + version = "3.0.1"; + sha256 = "0y9dkiwrx6d7r94ihczc250c2wzg2l4jsz9i198r4kysjdgm7q7v"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-gdk gi-gio gi-gobject gi-xlib + haskell-gi haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ gdk-x11 ]; + doHaddock = false; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "GdkX11 bindings"; + license = stdenv.lib.licenses.lgpl21; + }) {gdk-x11 = null;}; + "gi-ggit" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio , gi-glib, gi-gobject, haskell-gi, haskell-gi-base @@ -77414,6 +77369,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {webkitgtk-web-extension = null;}; + "gi-xlib" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi + , haskell-gi-base, haskell-gi-overloading, text, transformers, x11 + }: + mkDerivation { + pname = "gi-xlib"; + version = "2.0.1"; + sha256 = "1f1f3jnrvqisdalsad9k9wjr92c4ykw2i1gngsygainflk3hzgia"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ x11 ]; + doHaddock = false; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "xlib bindings"; + license = stdenv.lib.licenses.lgpl21; + }) {inherit (pkgs) x11;}; + "giak" = callPackage ({ mkDerivation, async, base, bytestring, Cabal, containers , directory, extra, filemanip, filepath, mtl, process, semigroups @@ -78166,27 +78141,6 @@ self: { }) {}; "github-release" = callPackage - ({ mkDerivation, aeson, base, bytestring, http-client - , http-client-tls, http-types, mime-types, optparse-generic, text - , unordered-containers, uri-templater - }: - mkDerivation { - pname = "github-release"; - version = "1.0.5"; - sha256 = "1dmilm5mwgb975f6n34x3ylnkipqrvxcimkvj6pyfw97bdcclacb"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring http-client http-client-tls http-types - mime-types optparse-generic text unordered-containers uri-templater - ]; - executableHaskellDepends = [ base ]; - homepage = "https://github.com/tfausak/github-release#readme"; - description = "Upload files to GitHub releases"; - license = stdenv.lib.licenses.mit; - }) {}; - - "github-release_1_0_6" = callPackage ({ mkDerivation, aeson, base, bytestring, http-client , http-client-tls, http-types, mime-types, optparse-generic, text , unordered-containers, uri-templater @@ -78205,7 +78159,6 @@ self: { homepage = "https://github.com/tfausak/github-release#readme"; description = "Upload files to GitHub releases"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "github-tools" = callPackage @@ -83092,22 +83045,6 @@ self: { }) {}; "grouped-list" = callPackage - ({ mkDerivation, base, containers, criterion, deepseq, pointed - , QuickCheck, tasty, tasty-quickcheck - }: - mkDerivation { - pname = "grouped-list"; - version = "0.2.1.2"; - sha256 = "0xg8z3ipa9h6zjji3s1dwal3fkdii7bp36cikj0rlxfrn4s9zi2v"; - libraryHaskellDepends = [ base containers deepseq pointed ]; - testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; - benchmarkHaskellDepends = [ base criterion ]; - homepage = "https://github.com/Daniel-Diaz/grouped-list/blob/master/README.md"; - description = "Grouped lists. Equal consecutive elements are grouped."; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "grouped-list_0_2_1_3" = callPackage ({ mkDerivation, base, containers, criterion, deepseq, pointed , QuickCheck, tasty, tasty-quickcheck }: @@ -83121,7 +83058,6 @@ self: { homepage = "https://github.com/Daniel-Diaz/grouped-list/blob/master/README.md"; description = "Grouped lists. Equal consecutive elements are grouped."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "groupoid" = callPackage @@ -87050,6 +86986,33 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hapistrano_0_3_3_0" = callPackage + ({ mkDerivation, aeson, async, base, directory, filepath, hspec + , mtl, optparse-applicative, path, path-io, process, stm, temporary + , time, transformers, yaml + }: + mkDerivation { + pname = "hapistrano"; + version = "0.3.3.0"; + sha256 = "1skpygsnzl940703fxd103lxhyi4cjpp5il9kwjqfavsnbfi0c46"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base filepath mtl path process time transformers + ]; + executableHaskellDepends = [ + aeson async base optparse-applicative path path-io stm yaml + ]; + testHaskellDepends = [ + base directory filepath hspec mtl path path-io process temporary + ]; + homepage = "https://github.com/stackbuilders/hapistrano"; + description = "A deployment library for Haskell applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "happindicator" = callPackage ({ mkDerivation, array, base, bytestring, containers, glib, gtk , gtk2hs-buildtools, libappindicator-gtk2, mtl @@ -87762,28 +87725,8 @@ self: { }: mkDerivation { pname = "happy"; - version = "1.19.5"; - sha256 = "1nj353q4z1g186fpjzf0dnsg71qhxqpamx8jy89rjjvv3p0kmw32"; - revision = "2"; - editedCabalFile = "1dvhv94lzmya938i5crshg9qbx7dxvkyxkhfbqimxkydxn7l2w7w"; - isLibrary = false; - isExecutable = true; - setupHaskellDepends = [ base Cabal directory filepath ]; - executableHaskellDepends = [ array base containers mtl ]; - testHaskellDepends = [ base process ]; - homepage = "http://www.haskell.org/happy/"; - description = "Happy is a parser generator for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "happy_1_19_6" = callPackage - ({ mkDerivation, array, base, Cabal, containers, directory - , filepath, mtl, process - }: - mkDerivation { - pname = "happy"; - version = "1.19.6"; - sha256 = "1hqg42cmaa5zc499sank10r8qyqkgwlv5sr17b748kz5j3n2nivw"; + version = "1.19.7"; + sha256 = "16vg292pp12wnkny7znsv7bichh9ghny7swl7v55qafmcfg2lcdv"; isLibrary = false; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath ]; @@ -87792,7 +87735,6 @@ self: { homepage = "https://www.haskell.org/happy/"; description = "Happy is a parser generator for Haskell"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happy-meta" = callPackage @@ -88046,6 +87988,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "harp_0_4_3" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "harp"; + version = "0.4.3"; + sha256 = "17d9isgwdvrmycbj3ddmmn0810kh4m8b8lmaz4qc8i51i5li8ja7"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/seereason/harp"; + description = "HaRP allows pattern-matching with regular expressions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "harpy" = callPackage ({ mkDerivation, array, base, containers, disassembler, mtl, parsec , pretty, template-haskell @@ -101285,28 +101240,6 @@ self: { }) {xenctrl = null;}; "hsass" = callPackage - ({ mkDerivation, base, bytestring, data-default-class, filepath - , hlibsass, hspec, hspec-discover, monad-loops, temporary - , transformers - }: - mkDerivation { - pname = "hsass"; - version = "0.4.1"; - sha256 = "1k7v2m4k90dg5hbkswf2ff5nm6ri58nlmc1jq9lwv6dxiqbm3nv7"; - libraryHaskellDepends = [ - base bytestring data-default-class filepath hlibsass monad-loops - transformers - ]; - testHaskellDepends = [ - base bytestring data-default-class hspec hspec-discover temporary - ]; - homepage = "https://github.com/jakubfijalkowski/hsass"; - description = "Integrating Sass into Haskell applications"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "hsass_0_4_2" = callPackage ({ mkDerivation, base, bytestring, data-default-class, filepath , hlibsass, hspec, hspec-discover, monad-loops, temporary , transformers @@ -102265,6 +102198,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hsexif_0_6_1_3" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, hspec, HUnit + , iconv, text, time + }: + mkDerivation { + pname = "hsexif"; + version = "0.6.1.3"; + sha256 = "09d8679m6xgbka36rwjvhr7w355dn6arp7cxkdjgbzm7x9zhi5w8"; + libraryHaskellDepends = [ + base binary bytestring containers iconv text time + ]; + testHaskellDepends = [ + base binary bytestring containers hspec HUnit iconv text time + ]; + homepage = "https://github.com/emmanueltouzery/hsexif"; + description = "EXIF handling library in pure Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hsfacter" = callPackage ({ mkDerivation, base, containers, language-puppet, text }: mkDerivation { @@ -102447,8 +102400,8 @@ self: { }: mkDerivation { pname = "hsini"; - version = "0.5.0"; - sha256 = "16dlxfjmn1m9sqf15png7bq9fpw5p0acb9kbp2fi7himdmdhghni"; + version = "0.5.1"; + sha256 = "0kh96xnpsz1ryrn1f8sajxzjlvqwg8dbhpz6409qdxl57vppcjfq"; libraryHaskellDepends = [ base bytestring containers mtl parsec ]; testHaskellDepends = [ base bytestring containers HUnit mtl parsec QuickCheck tasty @@ -109734,6 +109687,8 @@ self: { pname = "imm"; version = "1.2.0.0"; sha256 = "1bpcsahzvf4qa1pzga84wqflk259wcqd41r3rfxk2w3rzdlns999"; + revision = "1"; + editedCabalFile = "1yk1vih0fr53wrq5ksjwi21ba51r6qxhvyzz30iycdbv3zm53pmw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -111898,6 +111853,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "io-streams_1_5_0_1" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder + , deepseq, directory, filepath, HUnit, mtl, network, primitive + , process, QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, time, transformers, vector + , zlib, zlib-bindings + }: + mkDerivation { + pname = "io-streams"; + version = "1.5.0.1"; + sha256 = "12rcdg2d70644bvn838fxcjkssqj8pssnx5y657si5rijcbkgjsx"; + configureFlags = [ "-fnointeractivetests" ]; + libraryHaskellDepends = [ + attoparsec base bytestring bytestring-builder network primitive + process text time transformers vector zlib-bindings + ]; + testHaskellDepends = [ + attoparsec base bytestring bytestring-builder deepseq directory + filepath HUnit mtl network primitive process QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 text + time transformers vector zlib zlib-bindings + ]; + description = "Simple, composable, and easy-to-use stream I/O"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "io-streams-haproxy" = callPackage ({ mkDerivation, attoparsec, base, bytestring, HUnit, io-streams , network, test-framework, test-framework-hunit, transformers @@ -111920,6 +111902,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "io-streams-haproxy_1_0_0_2" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, HUnit, io-streams + , network, test-framework, test-framework-hunit, transformers + }: + mkDerivation { + pname = "io-streams-haproxy"; + version = "1.0.0.2"; + sha256 = "11nh9q158mgnvvb23s5ffg87lkhl5smk039yl43jghxmb214z0bp"; + libraryHaskellDepends = [ + attoparsec base bytestring io-streams network transformers + ]; + testHaskellDepends = [ + attoparsec base bytestring HUnit io-streams network test-framework + test-framework-hunit transformers + ]; + homepage = "http://snapframework.com/"; + description = "HAProxy protocol 1.5 support for io-streams"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "io-streams-http" = callPackage ({ mkDerivation, base, bytestring, http-client, http-client-tls , io-streams, mtl, transformers @@ -112392,8 +112395,8 @@ self: { pname = "irc-dcc"; version = "2.0.1"; sha256 = "1pyj4ngh6rw0k1cd9nlrhwb6rr3jmpiwaxs6crik8gbl6f3s4234"; - revision = "3"; - editedCabalFile = "1kc4yzm5k0s069dhyncj5rmxnbfjjn8ynx182wp9v5qhylgicx98"; + revision = "4"; + editedCabalFile = "05g3c22qz9slc2q107blvg2bym2igk22w0gs60xw7ly78fh1s6s3"; libraryHaskellDepends = [ attoparsec base binary bytestring io-streams iproute irc-ctcp mtl network path safe-exceptions transformers utf8-string @@ -113817,6 +113820,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "jbi" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, Cabal, directory + , filepath, optparse-applicative, process, tagged, text + }: + mkDerivation { + pname = "jbi"; + version = "0.1.0.0"; + sha256 = "13jswxfka5v8n2sdxg0p75ykhgvb351cih2zlid8x05lpiqlw87c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base Cabal directory filepath process tagged + ]; + executableHaskellDepends = [ + aeson-pretty base optparse-applicative text + ]; + description = "Just Build It - a \"do what I mean\" abstraction for Haskell build tools"; + license = stdenv.lib.licenses.mit; + }) {}; + "jcdecaux-vls" = callPackage ({ mkDerivation, aeson, base, bytestring, http-conduit, text , transformers @@ -114180,29 +114203,6 @@ self: { }) {}; "jose-jwt" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal - , containers, criterion, cryptonite, doctest, either, hspec, HUnit - , memory, mtl, QuickCheck, text, time, unordered-containers, vector - }: - mkDerivation { - pname = "jose-jwt"; - version = "0.7.6"; - sha256 = "0kf9v9l1v7ixwpjaq1vc7lrg2669zddvsq8394yhxsgdyyrsi82a"; - libraryHaskellDepends = [ - aeson attoparsec base bytestring cereal containers cryptonite - either memory mtl text time unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring cryptonite doctest either hspec HUnit memory - mtl QuickCheck text unordered-containers vector - ]; - benchmarkHaskellDepends = [ base bytestring criterion cryptonite ]; - homepage = "http://github.com/tekul/jose-jwt"; - description = "JSON Object Signing and Encryption Library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "jose-jwt_0_7_7" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal , containers, criterion, cryptonite, doctest, either, hspec, HUnit , memory, mtl, QuickCheck, text, time, unordered-containers, vector @@ -114223,7 +114223,6 @@ self: { homepage = "http://github.com/tekul/jose-jwt"; description = "JSON Object Signing and Encryption Library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jpeg" = callPackage @@ -115036,8 +115035,8 @@ self: { }: mkDerivation { pname = "json-stream"; - version = "0.4.1.3"; - sha256 = "1p7r3wj2ap748igbrp4y6hg6pwf1s3dpb2jbi87b8w8wvpyiqa0y"; + version = "0.4.1.4"; + sha256 = "0mg1pv1gp2zd7zpl2n5k8kv73br8ji91mwszfhn1bw119m29v1rs"; libraryHaskellDepends = [ aeson base bytestring scientific text unordered-containers vector ]; @@ -115050,15 +115049,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "json-stream_0_4_1_4" = callPackage + "json-stream_0_4_1_5" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, doctest, hspec , QuickCheck, quickcheck-unicode, scientific, text , unordered-containers, vector }: mkDerivation { pname = "json-stream"; - version = "0.4.1.4"; - sha256 = "0mg1pv1gp2zd7zpl2n5k8kv73br8ji91mwszfhn1bw119m29v1rs"; + version = "0.4.1.5"; + sha256 = "0h5g76grhi60idvmxdhydpz5f3198bydwywfyv9pghlmbrzjnkih"; libraryHaskellDepends = [ aeson base bytestring scientific text unordered-containers vector ]; @@ -115463,8 +115462,8 @@ self: { }: mkDerivation { pname = "jukebox"; - version = "0.2.20"; - sha256 = "178fnfn0bjgk9rp5sv00l5vs3cmp3rcxzmm163y68w2azm4125an"; + version = "0.3"; + sha256 = "0fpzbijv73drgk79rf8qyr2w4kfvxbpysbi9y9v2qx5na9y3krci"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -117508,18 +117507,6 @@ self: { }) {}; "labels" = callPackage - ({ mkDerivation, base, template-haskell }: - mkDerivation { - pname = "labels"; - version = "0.3.2"; - sha256 = "0c8agrqs4pphs3m2f2jq9mfg9q55lihzgb119z1zifddwsghq1n4"; - libraryHaskellDepends = [ base template-haskell ]; - homepage = "https://github.com/chrisdone/labels#readme"; - description = "Anonymous records via named tuples"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "labels_0_3_3" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "labels"; @@ -117529,7 +117516,6 @@ self: { homepage = "https://github.com/chrisdone/labels#readme"; description = "Anonymous records via named tuples"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "laborantin-hs" = callPackage @@ -121329,8 +121315,8 @@ self: { }: mkDerivation { pname = "libgraph"; - version = "1.13"; - sha256 = "0h4sas34nfql5w3mxds1j68qv4mcfjrrawxssd3rr23d1icavw2c"; + version = "1.14"; + sha256 = "0grzimgy946mnwggmlc3sja567v2s21ymcwzlwf110k11pjqp5xp"; libraryHaskellDepends = [ array base containers monads-tf process union-find ]; @@ -124686,6 +124672,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "logging-effect_1_2_1" = callPackage + ({ mkDerivation, async, base, bytestring, criterion, exceptions + , fast-logger, free, lifted-async, monad-control, monad-logger, mtl + , semigroups, stm, stm-delay, text, time, transformers + , transformers-base, wl-pprint-text + }: + mkDerivation { + pname = "logging-effect"; + version = "1.2.1"; + sha256 = "1jjw2ach3mni7pnfcw29z2fw5vffhq8i8qh8sn4n4jcya2mfp7xd"; + libraryHaskellDepends = [ + async base exceptions free monad-control mtl semigroups stm + stm-delay text time transformers transformers-base wl-pprint-text + ]; + benchmarkHaskellDepends = [ + base bytestring criterion fast-logger lifted-async monad-logger + text time wl-pprint-text + ]; + homepage = "https://github.com/ocharles/logging-effect"; + description = "A mtl-style monad transformer for general purpose & compositional logging"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "logging-facade" = callPackage ({ mkDerivation, base, call-stack, hspec, transformers }: mkDerivation { @@ -127604,6 +127614,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "markup_4_0_1" = callPackage + ({ mkDerivation, base, blaze-html, blaze-markup, clay, comonad + , lucid, mmorph, monad-control, monad-logger, mtl, path-extra + , resourcet, text, transformers-base, urlpath + }: + mkDerivation { + pname = "markup"; + version = "4.0.1"; + sha256 = "1g2vdwwk0if46q0gc1gw4zpbxjbq6lpii0yab6yazdk4a2snakmx"; + libraryHaskellDepends = [ + base blaze-html blaze-markup clay comonad lucid mmorph + monad-control monad-logger mtl path-extra resourcet text + transformers-base urlpath + ]; + description = "Abstraction for HTML-embedded content"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "markup-preview" = callPackage ({ mkDerivation, base, cmdargs, directory, glib, gtk , gtk2hs-buildtools, MissingH, mtl, pandoc, temporary, text @@ -129035,8 +129064,8 @@ self: { }: mkDerivation { pname = "mellon-core"; - version = "0.7.1.1"; - sha256 = "1s3a5wkfi9pjxgsg92cx5sgf8kwlvc423414k679b2il97ff1cwf"; + version = "0.8.0.2"; + sha256 = "0fl9pwh67diibj2ki75xcwylbhvw0nqn0b0azla4ndr3fxdgnh30"; libraryHaskellDepends = [ async base mtl time transformers ]; testHaskellDepends = [ async base doctest hlint hspec mtl QuickCheck quickcheck-instances @@ -129052,8 +129081,8 @@ self: { ({ mkDerivation, base, hlint, hpio, mellon-core }: mkDerivation { pname = "mellon-gpio"; - version = "0.7.1.1"; - sha256 = "0mq5p462rm8h2nwkdqhwfndi3qqjcqb30hwlpa8ms3d4bjn8xdan"; + version = "0.8.0.2"; + sha256 = "1dx31nyyi4gar2wlmmgfnqi48x4pzwh53q87xg8rrbghc9vfqygj"; libraryHaskellDepends = [ base hpio mellon-core ]; testHaskellDepends = [ base hlint ]; homepage = "https://github.com/quixoftic/mellon/"; @@ -129074,8 +129103,8 @@ self: { }: mkDerivation { pname = "mellon-web"; - version = "0.7.1.1"; - sha256 = "0x9pj12lfk2yk18rp81s6dvh70rybrzcwclnwxwsqvfza3p3kpzc"; + version = "0.8.0.2"; + sha256 = "03awn8qcqn5iz5cd082cr6ap15zlbidp5l2aacz24m0fn5vdgjlf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129386,6 +129415,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "memory_0_14_7" = callPackage + ({ mkDerivation, base, bytestring, deepseq, foundation, ghc-prim + , tasty, tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "memory"; + version = "0.14.7"; + sha256 = "0snm3kphsrjixg1hpas1rfxaq7id7i5siprqf1p9lz7x1l4vznyj"; + libraryHaskellDepends = [ + base bytestring deepseq foundation ghc-prim + ]; + testHaskellDepends = [ + base foundation tasty tasty-hunit tasty-quickcheck + ]; + homepage = "https://github.com/vincenthz/hs-memory"; + description = "memory and related abstraction stuff"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "memorypool" = callPackage ({ mkDerivation, base, containers, transformers, unsafe, vector }: mkDerivation { @@ -132397,6 +132446,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "monad-recorder" = callPackage + ({ mkDerivation, base, exceptions, hspec, monad-control, mtl + , transformers, transformers-base + }: + mkDerivation { + pname = "monad-recorder"; + version = "0.1.0"; + sha256 = "1n3bp3vian88b6wq2r3qybbnvnflphf1815g1qd6kb9r7d4z2g9i"; + libraryHaskellDepends = [ + base exceptions monad-control mtl transformers transformers-base + ]; + testHaskellDepends = [ base hspec ]; + homepage = "http://github.com/harendra-kumar/monad-recorder"; + description = "Record and replay the results of monadic actions"; + license = stdenv.lib.licenses.mit; + }) {}; + "monad-resumption" = callPackage ({ mkDerivation, base, mmorph, mtl, transformers }: mkDerivation { @@ -133601,26 +133667,25 @@ self: { }) {}; "movie-monad" = callPackage - ({ mkDerivation, base, gi-gdkx11, gi-glib, gi-gobject, gi-gst - , gi-gstvideo, gi-gtk, gi-xlib, haskell-gi-base, MissingH, process - , text + ({ mkDerivation, base, gi-gdk, gi-gdkx11, gi-glib, gi-gobject + , gi-gst, gi-gstvideo, gi-gtk, gi-xlib, haskell-gi-base, MissingH + , process, text }: mkDerivation { pname = "movie-monad"; - version = "0.0.0.0"; - sha256 = "1qwj25db28sjci12grs3n6div58j0wj3f5rck90lmy7da9vca7f3"; + version = "0.0.1.0"; + sha256 = "02sj8x49lw80nhzlwsnddj7r9w6xfv1vks4rpgds89pmkr4b5bvn"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ - base gi-gdkx11 gi-glib gi-gobject gi-gst gi-gstvideo gi-gtk gi-xlib - haskell-gi-base MissingH process text + base gi-gdk gi-gdkx11 gi-glib gi-gobject gi-gst gi-gstvideo gi-gtk + gi-xlib haskell-gi-base MissingH process text ]; homepage = "https://github.com/lettier/movie-monad"; description = "Plays videos using GStreamer and GTK+"; license = stdenv.lib.licenses.bsd3; - broken = true; - }) {gi-gdkx11 = null; gi-xlib = null;}; + }) {}; "moving-averages" = callPackage ({ mkDerivation, base, hspec }: @@ -135739,25 +135804,6 @@ self: { }) {}; "mysql-simple" = callPackage - ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder - , blaze-textual, bytestring, hspec, mysql, old-locale, pcre-light - , text, time - }: - mkDerivation { - pname = "mysql-simple"; - version = "0.4.0.1"; - sha256 = "0bdz9hy6921s3g6ddgs5km3yjmw3sz6xd0kb06mwd22wall9sm8v"; - libraryHaskellDepends = [ - attoparsec base base16-bytestring blaze-builder blaze-textual - bytestring mysql old-locale pcre-light text time - ]; - testHaskellDepends = [ base hspec ]; - homepage = "https://github.com/paul-rouse/mysql-simple"; - description = "A mid-level MySQL client library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "mysql-simple_0_4_1_0" = callPackage ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder , blaze-textual, bytestring, hspec, mysql, old-locale, pcre-light , text, time @@ -135774,7 +135820,6 @@ self: { homepage = "https://github.com/paul-rouse/mysql-simple"; description = "A mid-level MySQL client library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mysql-simple-quasi" = callPackage @@ -141807,6 +141852,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "openssl-streams_1_2_1_2" = callPackage + ({ mkDerivation, base, bytestring, HsOpenSSL, HUnit, io-streams + , network, test-framework, test-framework-hunit + }: + mkDerivation { + pname = "openssl-streams"; + version = "1.2.1.2"; + sha256 = "0szfh7jjp8z8yz043a5vil8i1nhrwshaklx2m62n0jz8p6ff3h1b"; + libraryHaskellDepends = [ + base bytestring HsOpenSSL io-streams network + ]; + testHaskellDepends = [ + base bytestring HsOpenSSL HUnit io-streams network test-framework + test-framework-hunit + ]; + description = "OpenSSL network support for io-streams"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "opentheory" = callPackage ({ mkDerivation, base, opentheory-primitive, QuickCheck }: mkDerivation { @@ -145574,6 +145639,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "path-extra_0_0_5" = callPackage + ({ mkDerivation, base, exceptions, path }: + mkDerivation { + pname = "path-extra"; + version = "0.0.5"; + sha256 = "0ks2h5w4zmgimhcxj6vxv3xrrkpjlfc21pdd8w4gbxci1gsd2jyh"; + libraryHaskellDepends = [ base exceptions path ]; + description = "Chris Done's path library, enriched with URL-related goodies"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "path-io" = callPackage ({ mkDerivation, base, containers, directory, exceptions, filepath , hspec, path, temporary, time, transformers, unix-compat @@ -148305,6 +148382,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ping-parser-attoparsec" = callPackage + ({ mkDerivation, attoparsec, base, hspec, iproute, placeholders + , QuickCheck, quickcheck-text, text + }: + mkDerivation { + pname = "ping-parser-attoparsec"; + version = "0.1.0.0"; + sha256 = "1xlqq8hki5jd6ii1j7bbnh0zigqsjm4wl9hpl46bjvlj0qzwmdww"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base iproute placeholders text + ]; + executableHaskellDepends = [ base placeholders ]; + testHaskellDepends = [ + attoparsec base hspec iproute QuickCheck quickcheck-text + ]; + homepage = "https://github.com/frincon/ping-parser-attoparsec"; + description = "Attoparsec parsers of ping utility"; + license = stdenv.lib.licenses.asl20; + }) {}; + "pipe-enumerator" = callPackage ({ mkDerivation, base, enumerator, pipes, transformers }: mkDerivation { @@ -148654,6 +148753,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pipes-concurrency_2_0_8" = callPackage + ({ mkDerivation, async, base, contravariant, pipes, stm, void }: + mkDerivation { + pname = "pipes-concurrency"; + version = "2.0.8"; + sha256 = "0ak6vnjl12q4615waifbpdxbm96yz5yzqzwjj1zwvvb2jfk5snwz"; + libraryHaskellDepends = [ + async base contravariant pipes stm void + ]; + testHaskellDepends = [ async base pipes stm ]; + description = "Concurrency for the pipes ecosystem"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pipes-conduit" = callPackage ({ mkDerivation, base, conduit, mtl, pipes-core }: mkDerivation { @@ -148859,6 +148973,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pipes-group_1_0_8" = callPackage + ({ mkDerivation, base, doctest, free, lens-family-core, pipes + , pipes-parse, transformers + }: + mkDerivation { + pname = "pipes-group"; + version = "1.0.8"; + sha256 = "0zcmhq46972zxjj5nmr46fdvvwb3q0i42q9m70i758a3iwkmnr3a"; + libraryHaskellDepends = [ + base free pipes pipes-parse transformers + ]; + testHaskellDepends = [ base doctest lens-family-core ]; + description = "Group streams into substreams"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pipes-http" = callPackage ({ mkDerivation, base, bytestring, http-client, http-client-tls , pipes @@ -149813,6 +149944,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "plot_0_2_3_8" = callPackage + ({ mkDerivation, array, base, cairo, colour, hmatrix, mtl, pango + , transformers + }: + mkDerivation { + pname = "plot"; + version = "0.2.3.8"; + sha256 = "1in77bvn77wyg9b8vixxd2m5vfnz90in89j3f31v9zbz7fxh2l4m"; + libraryHaskellDepends = [ + array base cairo colour hmatrix mtl pango transformers + ]; + homepage = "http://github.com/amcphail/plot"; + description = "A plotting library, exportable as eps/pdf/svg/png or renderable with gtk"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "plot-gtk" = callPackage ({ mkDerivation, base, glib, gtk, hmatrix, mtl, plot, process }: mkDerivation { @@ -151820,8 +151968,8 @@ self: { }: mkDerivation { pname = "postmark"; - version = "0.2.0"; - sha256 = "14p4zff7phmavw4q0ygyd0b3sllgyn28q994zbgwmpvk9l1a6d80"; + version = "0.2.1"; + sha256 = "1afy3yra89909vilwr36j8vrvkhsy1xcp1jcvrdj90bj93rq64v3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -153588,6 +153736,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "product-isomorphic" = callPackage + ({ mkDerivation, base, template-haskell, th-data-compat }: + mkDerivation { + pname = "product-isomorphic"; + version = "0.0.2.0"; + sha256 = "01fyzyvcz7gvcjmglzb562dmbdrkm34qg5ba16f2xiw8fmj992yh"; + libraryHaskellDepends = [ base template-haskell th-data-compat ]; + homepage = "http://github.com/khibino/haskell-product-isomorphic"; + description = "Weaken applicative functor on products"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "product-profunctors" = callPackage ({ mkDerivation, base, contravariant, profunctors, tagged , template-haskell @@ -161213,8 +161373,8 @@ self: { }: mkDerivation { pname = "regexchar"; - version = "0.9.0.14"; - sha256 = "0hjj4p44zhl4iazw8ivaxldvrghbdfqabkf8d6shb4mw4r0xdqbx"; + version = "0.9.0.15"; + sha256 = "05p3m9phi84lj94vw2l1jdzcxpq96rch64q85jc0wvcb22y6rfm7"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -161629,29 +161789,6 @@ self: { }) {}; "relational-query" = callPackage - ({ mkDerivation, array, base, bytestring, containers, dlist - , names-th, persistable-record, quickcheck-simple, sql-words - , template-haskell, text, th-reify-compat, time, time-locale-compat - , transformers - }: - mkDerivation { - pname = "relational-query"; - version = "0.9.4.1"; - sha256 = "05x6v4587qhv6a82r9kdgsg0bcpgvjfihv17iv2hn98cl2f0m2cc"; - libraryHaskellDepends = [ - array base bytestring containers dlist names-th persistable-record - sql-words template-haskell text th-reify-compat time - time-locale-compat transformers - ]; - testHaskellDepends = [ - base containers quickcheck-simple transformers - ]; - homepage = "http://khibino.github.io/haskell-relational-record/"; - description = "Typeful, Modular, Relational, algebraic query engine"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "relational-query_0_9_5_0" = callPackage ({ mkDerivation, array, base, bytestring, containers, dlist , names-th, persistable-record, quickcheck-simple, sql-words , template-haskell, text, th-reify-compat, time, time-locale-compat @@ -161672,30 +161809,9 @@ self: { homepage = "http://khibino.github.io/haskell-relational-record/"; 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, relational-query - , relational-schemas, template-haskell, th-data-compat - , transformers - }: - mkDerivation { - pname = "relational-query-HDBC"; - version = "0.6.4.0"; - sha256 = "1mybp5nq0l4c9b4as16878c02z282ml3gxisnkrwb80y1xrgdfd2"; - libraryHaskellDepends = [ - base containers convertible dlist HDBC HDBC-session names-th - persistable-record relational-query relational-schemas - template-haskell th-data-compat transformers - ]; - homepage = "http://khibino.github.io/haskell-relational-record/"; - description = "HDBC instance of relational-query and typed query interface for HDBC"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "relational-query-HDBC_0_6_4_1" = callPackage ({ mkDerivation, base, containers, convertible, dlist, HDBC , HDBC-session, names-th, persistable-record, relational-query , relational-schemas, template-haskell, th-data-compat @@ -161713,7 +161829,6 @@ self: { homepage = "http://khibino.github.io/haskell-relational-record/"; 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 @@ -161758,22 +161873,6 @@ self: { }) {}; "relational-schemas" = callPackage - ({ mkDerivation, base, bytestring, containers, relational-query - , template-haskell, time - }: - mkDerivation { - pname = "relational-schemas"; - version = "0.1.4.0"; - sha256 = "1z0v175gx6yxmfjl55dyhsmpmyvrgwzynjy9yhi348kvij7iyivq"; - libraryHaskellDepends = [ - base bytestring containers relational-query template-haskell time - ]; - homepage = "http://khibino.github.io/haskell-relational-record/"; - description = "RDBMSs' schema templates for relational-query"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "relational-schemas_0_1_4_1" = callPackage ({ mkDerivation, base, bytestring, containers, relational-query , template-haskell, time }: @@ -161787,7 +161886,6 @@ self: { homepage = "http://khibino.github.io/haskell-relational-record/"; description = "RDBMSs' schema templates for relational-query"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "relative-date" = callPackage @@ -165060,27 +165158,31 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; - "rss-conduit_0_3_2_0" = callPackage - ({ mkDerivation, base, bytestring, conduit, conduit-combinators - , containers, data-default, hlint, lens-simple, mono-traversable + "rss-conduit_0_4_0_0" = callPackage + ({ mkDerivation, atom-conduit, base, bytestring, conduit + , conduit-combinators, containers, data-default + , dublincore-xml-conduit, hlint, lens-simple, mono-traversable , QuickCheck, quickcheck-instances, resourcet, safe - , safe-exceptions, tasty, tasty-hunit, tasty-quickcheck, text, time - , timerep, uri-bytestring, xml-conduit, xml-types + , safe-exceptions, singletons, tasty, tasty-hunit, tasty-quickcheck + , text, time, timerep, uri-bytestring, vinyl, xml-conduit + , xml-types }: mkDerivation { pname = "rss-conduit"; - version = "0.3.2.0"; - sha256 = "0ps0ynn0d0nz4m556i5w39bwx4m6wfsv3c9a269rkq821z844f3n"; + version = "0.4.0.0"; + sha256 = "0120r3hb6321cb8n8q3l9fybmjndar8plplgx2qxnxwsbq4r7h10"; libraryHaskellDepends = [ - base conduit conduit-combinators containers lens-simple - mono-traversable safe safe-exceptions text time timerep - uri-bytestring xml-conduit xml-types + atom-conduit base conduit conduit-combinators containers + dublincore-xml-conduit lens-simple mono-traversable safe + safe-exceptions singletons text time timerep uri-bytestring vinyl + xml-conduit xml-types ]; testHaskellDepends = [ - base bytestring conduit conduit-combinators data-default hlint - lens-simple mono-traversable QuickCheck quickcheck-instances - resourcet safe-exceptions tasty tasty-hunit tasty-quickcheck text - time uri-bytestring xml-conduit xml-types + atom-conduit base bytestring conduit conduit-combinators + data-default dublincore-xml-conduit hlint 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; @@ -165568,8 +165670,8 @@ self: { ({ mkDerivation, base, mtl, transformers }: mkDerivation { pname = "safe-access"; - version = "0.3.2.0"; - sha256 = "0v0bmxi3y9h7nriyna35crqxngda1cfliiqbrs6iy0frc2s5lv1l"; + version = "0.3.2.1"; + sha256 = "1xfivmd1ski2lbjkp5mxd5qjscjjw1bzxwd5s9hwvqlqsgdhya9b"; libraryHaskellDepends = [ base mtl transformers ]; homepage = "http://darcs.redspline.com/safe-access"; description = "A simple environment to control access to data"; @@ -165993,14 +166095,19 @@ self: { }) {inherit (pkgs) libsodium;}; "salve" = callPackage - ({ mkDerivation, base, criterion, deepseq, doctest, microlens }: + ({ mkDerivation, base, criterion, deepseq, doctest, microlens + , semver, semver-range + }: mkDerivation { pname = "salve"; - version = "0.0.1"; - sha256 = "1ay5cw3ambv5a23qrqq6j61v7gxd8mlkszhiamymaajqbgbsfzm1"; + version = "0.0.5"; + sha256 = "05m24awd4laqxh5mqbi1yzpmbnz2s8sh4xsz7j128dcxlsnrkldf"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest microlens ]; - benchmarkHaskellDepends = [ base criterion deepseq ]; + benchmarkHaskellDepends = [ + base criterion deepseq semver semver-range + ]; + homepage = "https://github.com/tfausak/salve#readme"; description = "Semantic version numbers and constraints"; license = stdenv.lib.licenses.mit; }) {}; @@ -167134,30 +167241,6 @@ self: { }) {}; "scientific" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, criterion - , deepseq, ghc-prim, hashable, integer-gmp, integer-logarithms - , primitive, QuickCheck, smallcheck, tasty, tasty-ant-xml - , tasty-hunit, tasty-quickcheck, tasty-smallcheck, text - }: - mkDerivation { - pname = "scientific"; - version = "0.3.5.1"; - sha256 = "19hvcqrrm375inqmci516xk32vir7dgw7ini8ij5rkdnrf1fd9jv"; - libraryHaskellDepends = [ - base binary bytestring containers deepseq ghc-prim hashable - integer-gmp integer-logarithms primitive text - ]; - testHaskellDepends = [ - base binary bytestring QuickCheck smallcheck tasty tasty-ant-xml - tasty-hunit tasty-quickcheck tasty-smallcheck text - ]; - benchmarkHaskellDepends = [ base criterion ]; - homepage = "https://github.com/basvandijk/scientific"; - description = "Numbers represented using scientific notation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "scientific_0_3_5_2" = callPackage ({ mkDerivation, base, binary, bytestring, containers, criterion , deepseq, hashable, integer-gmp, integer-logarithms, primitive , QuickCheck, smallcheck, tasty, tasty-ant-xml, tasty-hunit @@ -167179,7 +167262,6 @@ self: { homepage = "https://github.com/basvandijk/scientific"; description = "Numbers represented using scientific notation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scion" = callPackage @@ -168053,8 +168135,8 @@ self: { ({ mkDerivation, base, bytestring, free, mtl, text }: mkDerivation { pname = "seakale"; - version = "0.2.1.0"; - sha256 = "0by7fykjqzj43cxv3z33pg7rq7dpn9f0a7nbaxz116qz12kk64a2"; + version = "0.2.1.1"; + sha256 = "0pb0d0y7cxry6np5412j7d2xm5wlp97gc15za3iqc7n38bdffjvy"; libraryHaskellDepends = [ base bytestring free mtl text ]; description = "Pure SQL layer on top of other libraries"; license = stdenv.lib.licenses.bsd3; @@ -168066,8 +168148,8 @@ self: { }: mkDerivation { pname = "seakale-postgresql"; - version = "0.3.0.0"; - sha256 = "0z3ai022yq2ff6yfp3a3s5xbxlchs2v4x6m86f8dgf28731gyynq"; + version = "0.3.0.1"; + sha256 = "1wrh1ix2ycyw7bcblxdmcydlaj10lp7ilwq8wg3csic4hpm2gy10"; libraryHaskellDepends = [ base bytestring free mtl postgresql-libpq seakale time ]; @@ -168081,8 +168163,8 @@ self: { }: mkDerivation { pname = "seakale-tests"; - version = "0.1.1.0"; - sha256 = "01famrx8xvfd8byikhliyrfhml91j264bnq456sxxwkmzs7gpy1n"; + version = "0.1.1.1"; + sha256 = "101z120wmxssxigbn8ax6311xfnhmflw9aa1pa6h4nswf3qran6q"; libraryHaskellDepends = [ base bytestring free mtl recursion-schemes seakale ]; @@ -169900,34 +169982,6 @@ self: { }) {}; "servant-docs" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring - , case-insensitive, control-monad-omega, hashable, hspec - , http-media, http-types, lens, servant, string-conversions, text - , unordered-containers - }: - mkDerivation { - pname = "servant-docs"; - version = "0.10.0.1"; - sha256 = "1lhfvlnpgliiv84pp0gjk1kzmrd66k9dsdxf1y7mwm4mq6r7qf7k"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-pretty base base-compat bytestring case-insensitive - control-monad-omega hashable http-media http-types lens servant - string-conversions text unordered-containers - ]; - executableHaskellDepends = [ - aeson base lens servant string-conversions text - ]; - testHaskellDepends = [ - aeson base hspec lens servant string-conversions - ]; - homepage = "http://haskell-servant.readthedocs.org/"; - description = "generate API docs for your servant webservice"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-docs_0_11" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring , case-insensitive, control-monad-omega, hashable, hspec , http-media, http-types, lens, servant, string-conversions, text @@ -169953,7 +170007,6 @@ self: { homepage = "http://haskell-servant.readthedocs.org/"; description = "generate API docs for your servant webservice"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-ede" = callPackage @@ -170398,30 +170451,6 @@ self: { }) {}; "servant-purescript" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, directory - , filepath, http-types, lens, mainland-pretty, purescript-bridge - , servant, servant-foreign, servant-server, servant-subscriber - , text - }: - mkDerivation { - pname = "servant-purescript"; - version = "0.8.0.0"; - sha256 = "0h2a215i5lqalc4hp0g7iav3nxypdm5i2yfix0i96038sqjzg0wp"; - libraryHaskellDepends = [ - aeson base bytestring containers directory filepath http-types lens - mainland-pretty purescript-bridge servant servant-foreign - servant-server servant-subscriber text - ]; - testHaskellDepends = [ - aeson base containers lens mainland-pretty purescript-bridge - servant servant-foreign servant-subscriber text - ]; - homepage = "https://github.com/eskimor/servant-purescript#readme"; - description = "Generate PureScript accessor functions for you servant API"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-purescript_0_8_0_1" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, http-types, lens, mainland-pretty, purescript-bridge , servant, servant-foreign, servant-server, servant-subscriber @@ -170443,7 +170472,6 @@ self: { homepage = "https://github.com/eskimor/servant-purescript#readme"; description = "Generate PureScript accessor functions for you servant API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-pushbullet-client" = callPackage @@ -175533,6 +175561,42 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "snap-core_1_0_3_1" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder + , case-insensitive, containers, deepseq, directory, filepath + , hashable, HUnit, io-streams, lifted-base, monad-control, mtl + , network, network-uri, old-locale, parallel, QuickCheck, random + , readable, regex-posix, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, time, transformers + , transformers-base, unix-compat, unordered-containers, vector + , zlib + }: + mkDerivation { + pname = "snap-core"; + version = "1.0.3.1"; + sha256 = "0m2pbz7r5dllk859r8bs3yjkmdh4xrw0vafz390jfmj15vaz0j87"; + libraryHaskellDepends = [ + attoparsec base bytestring bytestring-builder case-insensitive + containers directory filepath hashable HUnit io-streams lifted-base + monad-control mtl network network-uri old-locale random readable + regex-posix text time transformers transformers-base unix-compat + unordered-containers vector + ]; + testHaskellDepends = [ + attoparsec base bytestring bytestring-builder case-insensitive + containers deepseq directory filepath hashable HUnit io-streams + lifted-base monad-control mtl network network-uri old-locale + parallel QuickCheck random readable regex-posix test-framework + test-framework-hunit test-framework-quickcheck2 text time + transformers transformers-base unix-compat unordered-containers + vector zlib + ]; + homepage = "http://snapframework.com/"; + description = "Snap: A Haskell Web Framework (core interfaces and types)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "snap-cors" = callPackage ({ mkDerivation, attoparsec, base, bytestring, case-insensitive , hashable, network, network-uri, snap, text, unordered-containers @@ -175757,6 +175821,55 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "snap-server_1_0_3_1" = callPackage + ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder + , bytestring, bytestring-builder, case-insensitive, clock + , containers, criterion, deepseq, directory, filepath, HsOpenSSL + , http-common, http-streams, HUnit, io-streams, io-streams-haproxy + , lifted-base, monad-control, mtl, network, old-locale + , openssl-streams, parallel, QuickCheck, random, snap-core + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, threads, time, transformers, unix, unix-compat, vector + }: + mkDerivation { + pname = "snap-server"; + version = "1.0.3.1"; + sha256 = "0zawrbjncb5nbnahx70078sb9ai0dyqzghcn06qgy3vzk195gwfi"; + configureFlags = [ "-fopenssl" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base blaze-builder bytestring bytestring-builder + case-insensitive clock containers filepath HsOpenSSL io-streams + io-streams-haproxy lifted-base mtl network old-locale + openssl-streams snap-core text time unix unix-compat vector + ]; + executableHaskellDepends = [ + attoparsec base blaze-builder bytestring bytestring-builder + case-insensitive clock containers directory HsOpenSSL io-streams + io-streams-haproxy lifted-base mtl network old-locale + openssl-streams snap-core text time transformers unix unix-compat + vector + ]; + testHaskellDepends = [ + attoparsec base base16-bytestring blaze-builder bytestring + bytestring-builder case-insensitive clock containers deepseq + directory filepath HsOpenSSL http-common http-streams HUnit + io-streams io-streams-haproxy lifted-base monad-control mtl network + old-locale openssl-streams parallel QuickCheck random snap-core + test-framework test-framework-hunit test-framework-quickcheck2 text + threads time transformers unix unix-compat vector + ]; + benchmarkHaskellDepends = [ + attoparsec base blaze-builder bytestring bytestring-builder + criterion io-streams io-streams-haproxy snap-core vector + ]; + homepage = "http://snapframework.com/"; + description = "A web server for the Snap Framework"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "snap-templates" = callPackage ({ mkDerivation, base, bytestring, containers, directory , directory-tree, filepath, hashable, old-time, template-haskell @@ -178979,8 +179092,8 @@ self: { }: mkDerivation { pname = "squeeze"; - version = "1.0.4.12"; - sha256 = "1704hwgk2ly4ynvvmv7zi3pplqjw1gqdck8v9qa6dlr2q11z3ycv"; + version = "1.0.4.13"; + sha256 = "0s6qkfkm8vxqc3vwgzdhayalyrdgbybxw5p1imvsgn409i7vhiyd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -181341,58 +181454,6 @@ self: { }) {}; "store" = callPackage - ({ mkDerivation, array, async, base, base-orphans - , base64-bytestring, bytestring, cereal, cereal-vector, conduit - , containers, contravariant, criterion, cryptohash, deepseq - , directory, filepath, free, ghc-prim, hashable, hspec - , hspec-smallcheck, integer-gmp, lifted-base, monad-control - , mono-traversable, network, primitive, resourcet, safe, semigroups - , smallcheck, store-core, streaming-commons, syb, template-haskell - , text, th-lift, th-lift-instances, th-orphans, th-reify-many - , th-utilities, time, transformers, unordered-containers, vector - , vector-binary-instances, void, weigh - }: - mkDerivation { - pname = "store"; - version = "0.4.3.1"; - sha256 = "0h8b91dpp4r1bhdq3k4zcnaby1ka9x6gy8ypbhv47b2mwpnwp09p"; - libraryHaskellDepends = [ - array async base base-orphans base64-bytestring bytestring conduit - containers contravariant cryptohash deepseq directory filepath free - ghc-prim hashable hspec hspec-smallcheck integer-gmp lifted-base - monad-control mono-traversable network primitive resourcet safe - semigroups smallcheck store-core streaming-commons syb - template-haskell text th-lift th-lift-instances th-orphans - th-reify-many th-utilities time transformers unordered-containers - vector void - ]; - testHaskellDepends = [ - array async base base-orphans base64-bytestring bytestring cereal - cereal-vector conduit containers contravariant criterion cryptohash - deepseq directory filepath free ghc-prim hashable hspec - hspec-smallcheck integer-gmp lifted-base monad-control - mono-traversable network primitive resourcet safe semigroups - smallcheck store-core streaming-commons syb template-haskell text - th-lift th-lift-instances th-orphans th-reify-many th-utilities - time transformers unordered-containers vector - vector-binary-instances void weigh - ]; - benchmarkHaskellDepends = [ - array async base base-orphans base64-bytestring bytestring conduit - containers contravariant criterion cryptohash deepseq directory - filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp - lifted-base monad-control mono-traversable network primitive - resourcet safe semigroups smallcheck store-core streaming-commons - syb template-haskell text th-lift th-lift-instances th-orphans - th-reify-many th-utilities time transformers unordered-containers - vector void - ]; - homepage = "https://github.com/fpco/store#readme"; - description = "Fast binary serialization"; - license = stdenv.lib.licenses.mit; - }) {}; - - "store_0_4_3_2" = callPackage ({ mkDerivation, array, async, base, base-orphans , base64-bytestring, bytestring, cereal, cereal-vector, conduit , containers, contravariant, criterion, cryptohash, deepseq @@ -181442,7 +181503,6 @@ self: { homepage = "https://github.com/fpco/store#readme"; description = "Fast binary serialization"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "store-core" = callPackage @@ -183750,28 +183810,56 @@ self: { license = "unknown"; }) {}; + "swagger-petstore" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive + , containers, exceptions, hspec, http-api-data, http-client + , http-client-tls, http-media, http-types, iso8601-time + , monad-logger, mtl, network, QuickCheck, random, safe-exceptions + , semigroups, text, time, transformers, unordered-containers + , vector + }: + mkDerivation { + pname = "swagger-petstore"; + version = "0.0.1.0"; + sha256 = "1jpd0mxvdqw52dfk2nxvkhzn0ymdlbk99n2pgby7x66nv8vgs4n7"; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive containers exceptions + http-api-data http-client http-client-tls http-media http-types + iso8601-time monad-logger mtl network random safe-exceptions text + time transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers hspec iso8601-time mtl QuickCheck + semigroups text time transformers unordered-containers + ]; + homepage = "https://github.com/swagger-api/swagger-codegen#readme"; + description = "Auto-generated swagger-petstore API Client"; + license = stdenv.lib.licenses.mit; + }) {}; + "swagger-test" = callPackage - ({ mkDerivation, aeson, attoparsec, base, binary, bytestring - , case-insensitive, filepath, http-client, http-client-tls - , http-media, http-types, insert-ordered-containers, lens - , optparse-applicative, QuickCheck, random, scientific, swagger2 - , syb, text, unordered-containers, vector + ({ mkDerivation, aeson, async, attoparsec, base, binary, blaze-html + , bytestring, case-insensitive, containers, directory, filepath + , http-client, http-client-tls, http-media, http-types + , insert-ordered-containers, lens, optparse-applicative, QuickCheck + , random, scientific, swagger2, syb, text, unordered-containers + , vector }: mkDerivation { pname = "swagger-test"; - version = "0.1.0"; - sha256 = "1w9i9hmycmzwfgnc9igmbqjgpamcf2bf0562n99d4z4fyi7j9dmm"; + version = "0.2.3"; + sha256 = "0hs1ylml6bjqmy697fhrbm83s7y5c2bz1zy8y1drvjms1lrlipgs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson attoparsec base binary bytestring case-insensitive filepath - http-client http-client-tls http-media http-types - insert-ordered-containers lens QuickCheck scientific swagger2 syb - text unordered-containers vector + aeson async attoparsec base binary blaze-html bytestring + case-insensitive containers filepath http-client http-client-tls + http-media http-types insert-ordered-containers lens QuickCheck + random scientific swagger2 syb text unordered-containers vector ]; executableHaskellDepends = [ - aeson base bytestring lens optparse-applicative random swagger2 - text + aeson async base bytestring directory filepath lens + optparse-applicative random swagger2 text ]; homepage = "https://github.com/rodrigosetti/swagger-test"; description = "Testing of Swagger APIs"; @@ -189539,17 +189627,17 @@ self: { "text1" = callPackage ({ mkDerivation, base, binary, directory, doctest, filepath, lens - , QuickCheck, semigroups, template-haskell, text + , papa, QuickCheck, semigroups, template-haskell, text }: mkDerivation { pname = "text1"; - version = "0.0.4"; - sha256 = "1v3vfg4h1fx14g8g9iggg6gq3b6j8h6q4l5pvs6v8zirmrdigc8p"; - libraryHaskellDepends = [ base binary lens semigroups text ]; + version = "0.0.5"; + sha256 = "16rz92gvpn1gji6bknilklw397rr118rsdqxysk9wmj10alsxqsp"; + libraryHaskellDepends = [ base binary lens papa semigroups text ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; - homepage = "https://github.com/NICTA/text1"; + homepage = "https://github.com/qfpl/text1"; description = "Non-empty values of `Data.Text`."; license = stdenv.lib.licenses.bsd3; }) {}; @@ -189733,6 +189821,22 @@ self: { license = stdenv.lib.licenses.isc; }) {}; + "th-abstraction_0_2_6_0" = callPackage + ({ mkDerivation, base, containers, ghc-prim, template-haskell }: + mkDerivation { + pname = "th-abstraction"; + version = "0.2.6.0"; + sha256 = "0g42h6wnj2awc5ryhbvx009wd8w75pn66bjzsq1z4s3xajd2hbp5"; + libraryHaskellDepends = [ + base containers ghc-prim template-haskell + ]; + testHaskellDepends = [ base containers template-haskell ]; + homepage = "https://github.com/glguy/th-abstraction"; + description = "Nicer interface for reified information about data types"; + license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "th-alpha" = callPackage ({ mkDerivation, base, containers, derive, mmorph, mtl, tasty , tasty-hunit, tasty-quickcheck, template-haskell, th-desugar @@ -190130,8 +190234,8 @@ self: { }: mkDerivation { pname = "th-typegraph"; - version = "1.0"; - sha256 = "0p6cczd087lk8mxmax149d3zwmpskyj5ms0gdfdxff927q9g1aj6"; + version = "1.0.2"; + sha256 = "09yf7igwki0h7mv946x066955bj9154pfvqkmr3fy5j9j69gwin1"; libraryHaskellDepends = [ aeson base cereal containers fgl lens mtl parsec pretty safecopy split syb template-haskell text th-desugar th-lift @@ -190580,23 +190684,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "threepenny-editors_0_5_4_1" = callPackage - ({ mkDerivation, base, bifunctors, casing, containers, data-default - , generics-sop, profunctors, threepenny-gui + "threepenny-editors_0_5_5" = callPackage + ({ mkDerivation, base, bifunctors, casing, containers, generics-sop + , profunctors, threepenny-gui }: mkDerivation { pname = "threepenny-editors"; - version = "0.5.4.1"; - sha256 = "0mfnyj1v4babbysxwhw63v8r8k4a6wfdza04q3d48mab8qs57ym2"; + version = "0.5.5"; + sha256 = "1gblkdkmkngry2fncjv4l7f3q614rw4p25cskf850kjgvcvm04fj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bifunctors casing containers data-default generics-sop - profunctors threepenny-gui + base bifunctors casing containers generics-sop profunctors + threepenny-gui ]; executableHaskellDepends = [ - base bifunctors casing containers data-default generics-sop - profunctors threepenny-gui + base bifunctors casing containers generics-sop profunctors + threepenny-gui ]; homepage = "https://github.com/pepeiborra/threepenny-editors"; description = "Composable algebraic editors"; @@ -190605,31 +190709,6 @@ self: { }) {}; "threepenny-gui" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, containers - , data-default, deepseq, exceptions, filepath, hashable - , network-uri, safe, snap-core, snap-server, stm, template-haskell - , text, transformers, unordered-containers, vault, vector - , websockets, websockets-snap - }: - mkDerivation { - pname = "threepenny-gui"; - version = "0.8.0.1"; - sha256 = "1jg18gmm4f3aamwz9vr3h8nc3axlxf2440zf0ff6h8dlp20al7zk"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson async base bytestring containers data-default deepseq - exceptions filepath hashable network-uri safe snap-core snap-server - stm template-haskell text transformers unordered-containers vault - vector websockets websockets-snap - ]; - homepage = "http://wiki.haskell.org/Threepenny-gui"; - description = "GUI framework that uses the web browser as a display"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "threepenny-gui_0_8_1_0" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , data-default, deepseq, exceptions, file-embed, filepath, hashable , network-uri, safe, snap-core, snap-server, stm, template-haskell @@ -190652,7 +190731,6 @@ self: { homepage = "http://wiki.haskell.org/Threepenny-gui"; description = "GUI framework that uses the web browser as a display"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "threepenny-gui-contextmenu" = callPackage @@ -190733,6 +190811,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "throttle-io-stream" = callPackage + ({ mkDerivation, async, base, bytestring, clock, HUnit, say, stm + , stm-chans, test-framework, test-framework-hunit, text + }: + mkDerivation { + pname = "throttle-io-stream"; + version = "0.2.0.1"; + sha256 = "13icrx3nrgidnb7j3ixqz93rcsc63qmczkvjyg74pjrb0rlsi5z8"; + libraryHaskellDepends = [ async base clock stm stm-chans ]; + testHaskellDepends = [ + async base bytestring clock HUnit say stm stm-chans test-framework + test-framework-hunit text + ]; + homepage = "https://github.com/mtesseract/throttle-io-stream#readme"; + description = "Throttler between arbitrary IO producer and consumer functions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "throttled-io-loop" = callPackage ({ mkDerivation, base, hspec, natural-numbers, QuickCheck, time }: mkDerivation { @@ -194314,6 +194410,27 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "tsuntsun" = callPackage + ({ mkDerivation, base, conduit, conduit-combinators, conduit-extra + , directory, filepath, gtk3, optparse-applicative, resourcet, stm + , template-haskell, text, typed-process + }: + mkDerivation { + pname = "tsuntsun"; + version = "0.2.0.0"; + sha256 = "1pj8n0iy6cg4in09csnfvqzrx8s8ch6pvwxm2mq54ba8r0cpv7yz"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base conduit conduit-combinators conduit-extra directory filepath + gtk3 optparse-applicative resourcet stm template-haskell text + typed-process + ]; + homepage = "https://github.com/Fuuzetsu/tsuntsun"; + description = "Interacts with tesseract to ease reading of RAW Japanese manga"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tsv2csv" = callPackage ({ mkDerivation, base, HUnit, split }: mkDerivation { @@ -194700,7 +194817,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "turtle_1_4_2" = callPackage + "turtle_1_4_3" = callPackage ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock , criterion, directory, doctest, foldl, hostname, managed , optional-args, optparse-applicative, process, semigroups, stm @@ -194709,8 +194826,8 @@ self: { }: mkDerivation { pname = "turtle"; - version = "1.4.2"; - sha256 = "0zzc84k0126rnfm4sqb1a42n9carfq740vjnb7v7m5p1zf23x1f8"; + version = "1.4.3"; + sha256 = "0dyb99p1ymcjbpi0w3ksj0aj2pzs6fb6vp1n7m2bb1h5dp15rzrf"; libraryHaskellDepends = [ ansi-wl-pprint async base bytestring clock directory foldl hostname managed optional-args optparse-applicative process semigroups stm @@ -194769,21 +194886,20 @@ self: { }) {}; "twee" = callPackage - ({ mkDerivation, array, base, containers, dlist, ghc-prim, heaps - , jukebox, pretty, primitive, reflection, split, transformers + ({ mkDerivation, base, containers, dlist, ghc-prim, jukebox, pretty + , primitive, split, transformers }: mkDerivation { pname = "twee"; - version = "0.1"; - sha256 = "0bbyswnpvqnn2j1wp9ziyr3jc4kh77hh66pv9c8jx5xj1xdxf378"; + version = "2.0"; + sha256 = "18raccm4glf0gysj625wiwkk2b295863g0hgypc9335cxb65n8k0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base containers dlist ghc-prim heaps pretty primitive - reflection transformers + base containers dlist ghc-prim pretty primitive transformers ]; executableHaskellDepends = [ - array base containers jukebox pretty reflection split transformers + base containers jukebox pretty split ]; homepage = "http://github.com/nick8325/twee"; description = "An equational theorem prover"; @@ -197016,6 +197132,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "unconstrained" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "unconstrained"; + version = "0.1.0.1"; + sha256 = "0wzkf8fqlqd11rcb7cvb7zsyg1ws5wyplgmsll6xbfbh68adh32p"; + libraryHaskellDepends = [ base ]; + description = "Null constraint"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "unexceptionalio" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -198661,8 +198788,8 @@ self: { }: mkDerivation { pname = "uri-templater"; - version = "0.2.1.0"; - sha256 = "0g4l0g6277yr31x9g3fc3v4dpir01lmllp9rjbl67vfyqjhj31mi"; + version = "0.2.2.0"; + sha256 = "13dgpsiihlgd0k18bh67ssrv5hgmp38xwicfgss84rar47m61hw6"; libraryHaskellDepends = [ ansi-wl-pprint base charset containers dlist HTTP mtl parsers template-haskell text trifecta unordered-containers vector @@ -198670,7 +198797,7 @@ self: { testHaskellDepends = [ ansi-wl-pprint base HUnit mtl template-haskell ]; - homepage = "http://github.com/iand675/uri-templater"; + homepage = "https://github.com/iand675/uri-templater"; description = "Parsing & Quasiquoting for RFC 6570 URI Templates"; license = stdenv.lib.licenses.mit; }) {}; @@ -198825,6 +198952,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "urlpath_6_0_3" = callPackage + ({ mkDerivation, attoparsec-uri, base, exceptions, mmorph + , monad-control, monad-control-aligned, monad-logger, mtl + , path-extra, resourcet, split, strict, text, transformers + , transformers-base, vector + }: + mkDerivation { + pname = "urlpath"; + version = "6.0.3"; + sha256 = "0nyh47ra4y8q2pjbd1azkg0khqpq9qw2k8dxnhv4jf8jvjpf9zrk"; + libraryHaskellDepends = [ + attoparsec-uri base exceptions mmorph monad-control + monad-control-aligned monad-logger mtl path-extra resourcet split + strict text transformers transformers-base vector + ]; + description = "Painfully simple URL deployment"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "urn" = callPackage ({ mkDerivation, base, hspec, parsec }: mkDerivation { @@ -201487,6 +201634,25 @@ self: { license = "GPL"; }) {}; + "vivid-supercollider" = callPackage + ({ mkDerivation, base, binary, bytestring, cereal, microspec + , QuickCheck, split, utf8-string, vivid-osc + }: + mkDerivation { + pname = "vivid-supercollider"; + version = "0.3.0.0"; + sha256 = "15fkqjf3hfhc262slr5znh4f320lw68h318wr4sdprml0sy9xdw3"; + libraryHaskellDepends = [ + base binary bytestring cereal split utf8-string vivid-osc + ]; + testHaskellDepends = [ + base binary bytestring cereal microspec QuickCheck utf8-string + vivid-osc + ]; + description = "Implementation of SuperCollider server specifications"; + license = "GPL"; + }) {}; + "vk-aws-route53" = callPackage ({ mkDerivation, aws, base, bytestring, containers, http-conduit , http-types, old-locale, resourcet, text, time, xml-conduit @@ -202215,6 +202381,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "wai-handler-launch_3_0_2_3" = callPackage + ({ mkDerivation, async, base, blaze-builder, bytestring, http-types + , process, streaming-commons, transformers, wai, warp + }: + mkDerivation { + pname = "wai-handler-launch"; + version = "3.0.2.3"; + sha256 = "1lv1xybpx7zzyz89nb94sw3326pnmyfz6h4sqs00ib9zf05hxl3d"; + libraryHaskellDepends = [ + async base blaze-builder bytestring http-types process + streaming-commons transformers wai warp + ]; + description = "Launch a web app in the default browser"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-handler-scgi" = callPackage ({ mkDerivation, base, bytestring, wai, wai-extra }: mkDerivation { @@ -202587,36 +202770,6 @@ self: { }) {}; "wai-middleware-content-type" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, blaze-html, bytestring - , clay, exceptions, hashable, hspec, hspec-wai, http-media - , http-types, lucid, mmorph, monad-control, monad-logger, mtl - , pandoc, pandoc-types, resourcet, shakespeare, tasty, tasty-hspec - , text, transformers, transformers-base, unordered-containers - , urlpath, wai, wai-transformers, warp - }: - mkDerivation { - pname = "wai-middleware-content-type"; - version = "0.5.0.1"; - sha256 = "11mx11zl775amdbypn4gp3nk0zh1csj1hs750qmb9yzhb6wwrk9d"; - libraryHaskellDepends = [ - aeson base blaze-builder blaze-html bytestring clay exceptions - hashable http-media http-types lucid mmorph monad-control - monad-logger mtl pandoc resourcet shakespeare text transformers - transformers-base unordered-containers urlpath wai wai-transformers - ]; - testHaskellDepends = [ - aeson base blaze-builder blaze-html bytestring clay exceptions - hashable hspec hspec-wai http-media http-types lucid mmorph - monad-control monad-logger mtl pandoc pandoc-types resourcet - shakespeare tasty tasty-hspec text transformers transformers-base - unordered-containers urlpath wai wai-transformers warp - ]; - description = "Route to different middlewares based on the incoming Accept header"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "wai-middleware-content-type_0_5_1" = callPackage ({ mkDerivation, aeson, base, blaze-builder, blaze-html, bytestring , clay, exceptions, extractable-singleton, hashable, hspec , hspec-wai, http-media, http-types, lucid, mmorph, monad-control @@ -203199,8 +203352,8 @@ self: { }: mkDerivation { pname = "wai-secure-cookies"; - version = "0.1.0.1"; - sha256 = "0i6ipcyqfndakr42d4cbskv5zkg1kizkhl46wi6km0l8lzbc42l4"; + version = "0.1.0.2"; + sha256 = "0lp8g8v122kqp2ps1w13hhcxm0p0xjkqjsdk9hm7xyc4k78x5lvb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -208640,6 +208793,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "xmonad-extras_0_13_1" = callPackage + ({ mkDerivation, alsa-mixer, base, bytestring, containers, hint + , libmpd, mtl, network, regex-posix, X11, xmonad, xmonad-contrib + }: + mkDerivation { + pname = "xmonad-extras"; + version = "0.13.1"; + sha256 = "09qwcfb84r4k65vzv99syy4434pa3pchv1i4mm1qs03b5c835jh0"; + configureFlags = [ + "-f-with_hlist" "-fwith_parsec" "-fwith_split" + ]; + libraryHaskellDepends = [ + alsa-mixer base bytestring containers hint libmpd mtl network + regex-posix X11 xmonad xmonad-contrib + ]; + homepage = "https://github.com/xmonad/xmonad-extras"; + description = "Third party extensions for xmonad with wacky dependencies"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "xmonad-screenshot" = callPackage ({ mkDerivation, base, gtk, xmonad }: mkDerivation { @@ -209855,35 +210029,6 @@ self: { }) {}; "yesod-auth" = callPackage - ({ mkDerivation, aeson, authenticate, base, base16-bytestring - , base64-bytestring, binary, blaze-builder, blaze-html - , blaze-markup, byteable, bytestring, conduit, conduit-extra - , containers, cryptonite, data-default, email-validate, file-embed - , http-client, http-conduit, http-types, lifted-base, memory - , mime-mail, network-uri, nonce, persistent, persistent-template - , random, resourcet, safe, shakespeare, template-haskell, text - , time, transformers, unordered-containers, wai, yesod-core - , yesod-form, yesod-persistent - }: - mkDerivation { - pname = "yesod-auth"; - version = "1.4.17.3"; - sha256 = "16z4rqzy8gzri6sbgm5cx3vm44myx2bzydfyhi91yd6ravi7rc9i"; - libraryHaskellDepends = [ - aeson authenticate base base16-bytestring base64-bytestring binary - blaze-builder blaze-html blaze-markup byteable bytestring conduit - conduit-extra containers cryptonite data-default email-validate - file-embed http-client http-conduit http-types lifted-base memory - mime-mail network-uri nonce persistent persistent-template random - resourcet safe shakespeare template-haskell text time transformers - unordered-containers wai yesod-core yesod-form yesod-persistent - ]; - homepage = "http://www.yesodweb.com/"; - description = "Authentication for Yesod"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-auth_1_4_18" = callPackage ({ mkDerivation, aeson, authenticate, base, base16-bytestring , base64-bytestring, binary, blaze-builder, blaze-html , blaze-markup, byteable, bytestring, conduit, conduit-extra @@ -209910,7 +210055,6 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Authentication for Yesod"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-auth-account" = callPackage @@ -210040,32 +210184,6 @@ self: { }) {}; "yesod-auth-hashdb" = callPackage - ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers - , hspec, http-conduit, http-types, monad-logger, network-uri - , persistent, persistent-sqlite, pwstore-fast, resourcet, text - , unordered-containers, wai-extra, yesod, yesod-auth, yesod-core - , yesod-form, yesod-persistent, yesod-test - }: - mkDerivation { - pname = "yesod-auth-hashdb"; - version = "1.6.1"; - sha256 = "1y2ssd11a4fgxcqa8djvkivv7x6h0s4frm3a9nvsqi76lkg0ai39"; - libraryHaskellDepends = [ - aeson base bytestring persistent pwstore-fast text yesod-auth - yesod-core yesod-form yesod-persistent - ]; - testHaskellDepends = [ - aeson base basic-prelude bytestring containers hspec http-conduit - http-types monad-logger network-uri persistent-sqlite resourcet - text unordered-containers wai-extra yesod yesod-auth yesod-core - yesod-test - ]; - homepage = "https://github.com/paul-rouse/yesod-auth-hashdb"; - description = "Authentication plugin for Yesod"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-auth-hashdb_1_6_2" = callPackage ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers , hspec, http-conduit, http-types, monad-logger, network-uri , persistent, persistent-sqlite, resourcet, text @@ -210089,7 +210207,6 @@ self: { homepage = "https://github.com/paul-rouse/yesod-auth-hashdb"; description = "Authentication plugin for Yesod"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-auth-hmac-keccak" = callPackage @@ -211814,8 +211931,8 @@ self: { }: mkDerivation { pname = "yi"; - version = "0.14.1"; - sha256 = "0l42knqinklyavsg4ygrdikziflal0x2l4j218rrq7yvr5qll4n5"; + version = "0.15.0"; + sha256 = "1mkdpc4fg7qx8mslcmjwnws24hr5p7289v026qf0m6ivc4dkbkbi"; configureFlags = [ "-fpango" "-fvty" ]; isLibrary = false; isExecutable = true; @@ -211893,14 +212010,58 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "yi-core_0_15_0" = callPackage + ({ mkDerivation, array, attoparsec, base, binary, bytestring + , containers, criterion, data-default, deepseq, directory, dlist + , dynamic-state, filepath, hashable, ListLike, microlens-platform + , mtl, old-locale, oo-prototypes, parsec, pointedlist, process + , process-extras, quickcheck-text, split, tasty, tasty-hunit + , tasty-quickcheck, text, text-icu, time, transformers-base, unix + , unix-compat, unordered-containers, xdg-basedir, yi-language + , yi-rope + }: + mkDerivation { + pname = "yi-core"; + version = "0.15.0"; + sha256 = "1lfxqi7z2jhvg6mzh31nighgcq1zp4w2ibggqlq02wbliwvbvbsf"; + libraryHaskellDepends = [ + array attoparsec base binary bytestring containers data-default + directory dlist dynamic-state filepath hashable ListLike + microlens-platform mtl old-locale oo-prototypes parsec pointedlist + process process-extras split text text-icu time transformers-base + unix unix-compat unordered-containers xdg-basedir yi-language + yi-rope + ]; + testHaskellDepends = [ + array attoparsec base binary bytestring containers data-default + directory dlist dynamic-state filepath hashable ListLike + microlens-platform mtl old-locale oo-prototypes parsec pointedlist + process process-extras quickcheck-text split tasty tasty-hunit + tasty-quickcheck text text-icu time transformers-base unix + unix-compat unordered-containers xdg-basedir yi-language yi-rope + ]; + benchmarkHaskellDepends = [ + array attoparsec base binary bytestring containers criterion + data-default deepseq directory dlist dynamic-state filepath + hashable ListLike microlens-platform mtl old-locale oo-prototypes + parsec pointedlist process process-extras split text text-icu time + transformers-base unix unix-compat unordered-containers xdg-basedir + yi-language yi-rope + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Yi editor core library"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yi-dynamic-configuration" = callPackage ({ mkDerivation, base, dyre, microlens-platform, mtl, text , transformers-base, yi-core, yi-rope }: mkDerivation { pname = "yi-dynamic-configuration"; - version = "0.14.1"; - sha256 = "0dpkp554s8hk09x74krix34g0iw2p77xqp23xrpcsn2yrd38i0bw"; + version = "0.15.0"; + sha256 = "0dh8vvmczdlcby9ybp89r59mhi1p7ywrvrh36y0nz6zmfckx3ylh"; libraryHaskellDepends = [ base dyre microlens-platform mtl text transformers-base yi-core yi-rope @@ -211930,8 +212091,8 @@ self: { }: mkDerivation { pname = "yi-frontend-pango"; - version = "0.14.1"; - sha256 = "1rppsmwinczvjlji38cwz11g3h1xzqdjxvz7pimbzfsbccl2wjj3"; + version = "0.15.0"; + sha256 = "02wfcpsamqq5qxdzmbg98h4qji9dfsvk3v4rq1r9lxw6v3rcnd8h"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers filepath glib gtk microlens-platform mtl @@ -211961,6 +212122,25 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "yi-frontend-vty_0_15_0" = callPackage + ({ mkDerivation, base, containers, data-default, dlist + , microlens-platform, pointedlist, stm, text, vty, yi-core + , yi-language, yi-rope + }: + mkDerivation { + pname = "yi-frontend-vty"; + version = "0.15.0"; + sha256 = "0c8qvhn22r1bk9p5c65z8dq73hn84ylpxczqyjb1j8i76wycaccc"; + libraryHaskellDepends = [ + base containers data-default dlist microlens-platform pointedlist + stm text vty yi-core yi-language yi-rope + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Vty frontend for Yi editor"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yi-fuzzy-open" = callPackage ({ mkDerivation, base, binary, containers, data-default, directory , filepath, mtl, text, transformers-base, vector, yi-core @@ -211979,6 +212159,25 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "yi-fuzzy-open_0_15_0" = callPackage + ({ mkDerivation, base, binary, containers, data-default, directory + , filepath, mtl, text, transformers-base, vector, yi-core + , yi-language, yi-rope + }: + mkDerivation { + pname = "yi-fuzzy-open"; + version = "0.15.0"; + sha256 = "0zlscdkxahcdh46pgnlv2v55s5c7271zc43fi37ff305a9d57axq"; + libraryHaskellDepends = [ + base binary containers data-default directory filepath mtl text + transformers-base vector yi-core yi-language yi-rope + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Fuzzy open plugin for yi"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yi-gtk" = callPackage ({ mkDerivation }: mkDerivation { @@ -212008,6 +212207,24 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "yi-ireader_0_15_0" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, data-default + , microlens-platform, text, yi-core, yi-language, yi-rope + }: + mkDerivation { + pname = "yi-ireader"; + version = "0.15.0"; + sha256 = "05jmsdr4bv14mpjzsb2ib20jvmswgm0666d8vz0h2gp2gvda7skd"; + libraryHaskellDepends = [ + base binary bytestring containers data-default microlens-platform + text yi-core yi-language yi-rope + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Yi editor incremental reader"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yi-keymap-cua" = callPackage ({ mkDerivation, base, microlens-platform, text, yi-core , yi-keymap-emacs, yi-rope @@ -212024,6 +212241,23 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "yi-keymap-cua_0_15_0" = callPackage + ({ mkDerivation, base, microlens-platform, text, yi-core + , yi-keymap-emacs, yi-rope + }: + mkDerivation { + pname = "yi-keymap-cua"; + version = "0.15.0"; + sha256 = "0wxblxk9pf3i7dc3hl64lwicj1njwvl8qkimkqw20k3si7hls2vz"; + libraryHaskellDepends = [ + base microlens-platform text yi-core yi-keymap-emacs yi-rope + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Cua keymap for Yi editor"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yi-keymap-emacs" = callPackage ({ mkDerivation, base, containers, filepath, Hclip , microlens-platform, mtl, oo-prototypes, semigroups, text @@ -212043,6 +212277,25 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "yi-keymap-emacs_0_15_0" = callPackage + ({ mkDerivation, base, containers, filepath, Hclip + , microlens-platform, mtl, oo-prototypes, text, transformers-base + , yi-core, yi-language, yi-misc-modes, yi-rope + }: + mkDerivation { + pname = "yi-keymap-emacs"; + version = "0.15.0"; + sha256 = "1sfyddp123zi3inwnilnckf9gair13kn1qjj6k117g1900fh4ha5"; + libraryHaskellDepends = [ + base containers filepath Hclip microlens-platform mtl oo-prototypes + text transformers-base yi-core yi-language yi-misc-modes yi-rope + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Emacs keymap for Yi editor"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yi-keymap-vim" = callPackage ({ mkDerivation, attoparsec, base, binary, containers, data-default , directory, filepath, Hclip, microlens-platform, mtl @@ -212072,6 +212325,35 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "yi-keymap-vim_0_15_0" = callPackage + ({ mkDerivation, attoparsec, base, binary, containers, data-default + , directory, filepath, Hclip, microlens-platform, mtl + , oo-prototypes, pointedlist, QuickCheck, safe, tasty, tasty-hunit + , tasty-quickcheck, text, transformers-base, unordered-containers + , yi-core, yi-language, yi-rope + }: + mkDerivation { + pname = "yi-keymap-vim"; + version = "0.15.0"; + sha256 = "0jd4ssf97zq6rzsdlxj0framwzdkf5ggnzkafk7wvd9abikihmld"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + attoparsec base binary containers data-default directory filepath + Hclip microlens-platform mtl oo-prototypes pointedlist safe text + transformers-base unordered-containers yi-core yi-language yi-rope + ]; + testHaskellDepends = [ + attoparsec base binary containers data-default directory filepath + Hclip microlens-platform mtl oo-prototypes pointedlist QuickCheck + safe tasty tasty-hunit tasty-quickcheck text transformers-base + unordered-containers yi-core yi-language yi-rope + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Vim keymap for Yi editor"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yi-language" = callPackage ({ mkDerivation, alex, array, base, binary, containers , data-default, hashable, microlens-platform, oo-prototypes @@ -212100,6 +212382,35 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "yi-language_0_15_0" = callPackage + ({ mkDerivation, alex, array, base, binary, containers + , data-default, hashable, microlens-platform, oo-prototypes + , pointedlist, regex-base, regex-tdfa, tasty, tasty-hspec + , tasty-quickcheck, template-haskell, transformers-base + , unordered-containers + }: + mkDerivation { + pname = "yi-language"; + version = "0.15.0"; + sha256 = "0skp7n9l4qg665krs6fv7kxmrq7jrbrqv1lppcqff5bak1dk5vxb"; + libraryHaskellDepends = [ + array base binary containers data-default hashable + microlens-platform oo-prototypes pointedlist regex-base regex-tdfa + template-haskell transformers-base unordered-containers + ]; + libraryToolDepends = [ alex ]; + testHaskellDepends = [ + array base binary containers data-default hashable + microlens-platform pointedlist regex-base regex-tdfa tasty + tasty-hspec tasty-quickcheck template-haskell transformers-base + unordered-containers + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Collection of language-related Yi libraries"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yi-misc-modes" = callPackage ({ mkDerivation, alex, array, base, binary, data-default, filepath , microlens-platform, semigroups, text, yi-core, yi-language @@ -212119,6 +212430,25 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "yi-misc-modes_0_15_0" = callPackage + ({ mkDerivation, alex, array, base, binary, data-default, filepath + , microlens-platform, text, yi-core, yi-language, yi-rope + }: + mkDerivation { + pname = "yi-misc-modes"; + version = "0.15.0"; + sha256 = "0rjk5j3jrqvbznh5azc49wgx6i21q30qn0jz1rvhqqxsakqyaqbx"; + libraryHaskellDepends = [ + array base binary data-default filepath microlens-platform text + yi-core yi-language yi-rope + ]; + libraryToolDepends = [ alex ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Yi editor miscellaneous modes"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yi-mode-haskell" = callPackage ({ mkDerivation, alex, array, base, binary, data-default, filepath , microlens-platform, text, yi-core, yi-language, yi-rope @@ -212137,6 +212467,25 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "yi-mode-haskell_0_15_0" = callPackage + ({ mkDerivation, alex, array, base, binary, data-default, filepath + , microlens-platform, text, yi-core, yi-language, yi-rope + }: + mkDerivation { + pname = "yi-mode-haskell"; + version = "0.15.0"; + sha256 = "12h3ij0a887jfz9kcmmsl0i82jimf11pcvshimdk7d3c9gqf8ygn"; + libraryHaskellDepends = [ + array base binary data-default filepath microlens-platform text + yi-core yi-language yi-rope + ]; + libraryToolDepends = [ alex ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Yi editor haskell mode"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yi-mode-javascript" = callPackage ({ mkDerivation, alex, array, base, binary, data-default, dlist , filepath, microlens-platform, mtl, text, yi-core, yi-language @@ -212156,6 +212505,26 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "yi-mode-javascript_0_15_0" = callPackage + ({ mkDerivation, alex, array, base, binary, data-default, dlist + , filepath, microlens-platform, mtl, text, yi-core, yi-language + , yi-rope + }: + mkDerivation { + pname = "yi-mode-javascript"; + version = "0.15.0"; + sha256 = "0ir6m97v3d42j6my5pg52vnbwlr55sgzidajx23mlafnccl9j6js"; + libraryHaskellDepends = [ + array base binary data-default dlist filepath microlens-platform + mtl text yi-core yi-language yi-rope + ]; + libraryToolDepends = [ alex ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Yi editor javascript mode"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yi-monokai" = callPackage ({ mkDerivation, base, yi }: mkDerivation { @@ -212211,6 +212580,28 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "yi-snippet_0_15_0" = callPackage + ({ mkDerivation, base, binary, containers, data-default, free + , microlens-platform, mtl, tasty-hunit, tasty-th, text, vector + , yi-core, yi-rope + }: + mkDerivation { + pname = "yi-snippet"; + version = "0.15.0"; + sha256 = "06cnnjbqkd03d5hzs80gm2bp0nzqnfd74ypzc35a8ad6wjdwsvnw"; + libraryHaskellDepends = [ + base binary containers data-default free microlens-platform mtl + text vector yi-core yi-rope + ]; + testHaskellDepends = [ + base containers tasty-hunit tasty-th yi-rope + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Snippet support for yi"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yi-solarized" = callPackage ({ mkDerivation, base, yi }: mkDerivation { From 89f5d52cf44baec14a7f542a605243777b16e7a5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 6 Sep 2017 09:40:01 +0200 Subject: [PATCH 22/29] Revert "Merge pull request #27209 from nc6/nc/haskell-multiple-out" This reverts commit dfb0f254844150d05d34150a975e6479b883d409, reversing changes made to 7f8ff024372f985e96b438fa5591d9b43fc6e7bd. These changes broke the ghcWithPackages wrapper: nix-shell -p "haskellPackages.ghcWithPackages (ps: [ps.mtl])" --run "ghc-pkg list mtl" /nix/store/szz84j5k1dy3jdashis6ws28d8l8zxxb-ghc-8.0.2-with-packages/lib/ghc-8.0.2/package.conf.d (no packages) --- pkgs/development/compilers/ghc/7.10.2.nix | 2 +- pkgs/development/compilers/ghc/7.10.3.nix | 2 +- pkgs/development/compilers/ghc/8.0.1.nix | 2 +- pkgs/development/compilers/ghc/8.0.2.nix | 2 +- pkgs/development/compilers/ghc/8.2.1.nix | 2 +- pkgs/development/compilers/ghc/head.nix | 2 +- pkgs/development/compilers/ghcjs/base.nix | 2 +- pkgs/development/compilers/halvm/2.4.0.nix | 4 +- .../haskell-modules/configuration-common.nix | 1 - .../haskell-modules/configuration-nix.nix | 48 +------ .../haskell-modules/generic-builder.nix | 118 ++++-------------- pkgs/development/haskell-modules/lib.nix | 4 - .../haskell-modules/make-package-set.nix | 1 - pkgs/top-level/all-packages.nix | 10 +- 14 files changed, 36 insertions(+), 164 deletions(-) diff --git a/pkgs/development/compilers/ghc/7.10.2.nix b/pkgs/development/compilers/ghc/7.10.2.nix index 726fad77865..863f904e4e9 100644 --- a/pkgs/development/compilers/ghc/7.10.2.nix +++ b/pkgs/development/compilers/ghc/7.10.2.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { sha256 = "1x8m4rp2v7ydnrz6z9g8x7z3x3d3pxhv2pixy7i7hkbqbdsp7kal"; }; - buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 (stdenv.lib.getBin hscolour) ]; + buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 hscolour ]; patches = [ ./relocation.patch ]; diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix index 943bc8b124b..eb8f1dddd19 100644 --- a/pkgs/development/compilers/ghc/7.10.3.nix +++ b/pkgs/development/compilers/ghc/7.10.3.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ./relocation.patch ]; - buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 (stdenv.lib.getBin hscolour) ]; + buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 hscolour ]; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/ghc/8.0.1.nix b/pkgs/development/compilers/ghc/8.0.1.nix index 8e800b78d66..6e47ee92630 100644 --- a/pkgs/development/compilers/ghc/8.0.1.nix +++ b/pkgs/development/compilers/ghc/8.0.1.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { (fetchFilteredPatch { url = https://git.haskell.org/ghc.git/patch/2f8cd14fe909a377b3e084a4f2ded83a0e6d44dd; sha256 = "06zvlgcf50ab58bw6yw3krn45dsmhg4cmlz4nqff8k4z1f1bj01v"; }) ] ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch; - buildInputs = [ ghc perl (stdenv.lib.getBin hscolour) sphinx]; + buildInputs = [ ghc perl hscolour sphinx]; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix index 85aca075d86..e50a8df7352 100644 --- a/pkgs/development/compilers/ghc/8.0.2.nix +++ b/pkgs/development/compilers/ghc/8.0.2.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch ++ stdenv.lib.optional stdenv.isDarwin ./ghc-8.0.2-no-cpp-warnings.patch; - buildInputs = [ ghc perl (stdenv.lib.getBin hscolour) sphinx ]; + buildInputs = [ ghc perl hscolour sphinx ]; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/ghc/8.2.1.nix b/pkgs/development/compilers/ghc/8.2.1.nix index 5b76e9ebea7..bce51f92c0b 100644 --- a/pkgs/development/compilers/ghc/8.2.1.nix +++ b/pkgs/development/compilers/ghc/8.2.1.nix @@ -11,7 +11,7 @@ let inherit (bootPkgs) ghc; version = "8.2.1"; preReleaseName = "ghc-8.2.1"; - commonBuildInputs = [ (stdenv.lib.getBin alex) autoconf automake ghc (stdenv.lib.getBin happy) (stdenv.lib.getBin hscolour) perl python3 sphinx ]; + commonBuildInputs = [ alex autoconf automake ghc happy hscolour perl python3 sphinx ]; commonPreConfigure = '' sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 491c014d26d..362b4895b7e 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -11,7 +11,7 @@ let inherit (bootPkgs) ghc; - commonBuildInputs = [ ghc perl autoconf automake (stdenv.lib.getBin happy) (stdenv.lib.getBin alex) python3 ]; + commonBuildInputs = [ ghc perl autoconf automake happy alex python3 ]; rev = "14457cf6a50f708eecece8f286f08687791d51f7"; diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix index 051e7daaa3e..a7381fa1a14 100644 --- a/pkgs/development/compilers/ghcjs/base.nix +++ b/pkgs/development/compilers/ghcjs/base.nix @@ -118,7 +118,7 @@ in mkDerivation (rec { lens optparse-applicative parallel safe shelly split stringsearch syb system-fileio system-filepath tar terminfo text-binary unordered-containers vector wl-pprint-text yaml - (stdenv.lib.getBin alex) (stdenv.lib.getBin happy) git gnumake autoconf automake libtool patch gmp + alex happy git gnumake autoconf automake libtool patch gmp base16-bytestring cryptohash executable-path haddock-api transformers-compat QuickCheck haddock hspec xhtml regex-posix libiconv diff --git a/pkgs/development/compilers/halvm/2.4.0.nix b/pkgs/development/compilers/halvm/2.4.0.nix index 8cbed2a865e..24fffcf603c 100644 --- a/pkgs/development/compilers/halvm/2.4.0.nix +++ b/pkgs/development/compilers/halvm/2.4.0.nix @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { sed -ie 's|ld |${binutils}/bin/ld |g' src/scripts/ldkernel.in ''; configureFlags = stdenv.lib.optional (!enableIntegerSimple) [ "--enable-gmp" ]; - propagatedNativeBuildInputs = [ (stdenv.lib.getBin alex) (stdenv.lib.getBin happy) ]; + propagatedNativeBuildInputs = [ alex happy ]; buildInputs = - let haskellPkgs = [ (stdenv.lib.getBin alex) (stdenv.lib.getBin happy) (stdenv.lib.getBin bootPkgs.hscolour) bootPkgs.cabal-install bootPkgs.haddock bootPkgs.hpc + let haskellPkgs = [ alex happy bootPkgs.hscolour bootPkgs.cabal-install bootPkgs.haddock bootPkgs.hpc ]; in [ bootPkgs.ghc automake perl git binutils autoconf xen zlib ncurses.dev diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2db821d80ac..cdb15fd9f81 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -862,7 +862,6 @@ self: super: { # Don't install internal mkReadme tool. hastache = overrideCabal super.hastache (drv: { doCheck = false; - enableSeparateBinOutput = false; postInstall = "rm $out/bin/mkReadme && rmdir $out/bin"; }); diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 0f2fd37f5bd..36f5f28f2f8 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -211,10 +211,7 @@ self: super: builtins.intersectAttrs super { # wxc supports wxGTX >= 3.0, but our current default version points to 2.8. # http://hydra.cryp.to/build/1331287/log/raw - wxc = (overrideCabal super.wxc (drv: { - buildDepends = (drv.buildDepends or []) ++ [self.split]; - postInstall = "cp -v dist/build/libwxc.so.0.92.3.0 $lib/lib/libwxc.so"; - })).override { wxGTK = pkgs.wxGTK30; }; + wxc = (addBuildDepend super.wxc self.split).override { wxGTK = pkgs.wxGTK30; }; wxcore = super.wxcore.override { wxGTK = pkgs.wxGTK30; }; # Test suite wants to connect to $DISPLAY. @@ -492,47 +489,4 @@ self: super: builtins.intersectAttrs super { # Without this override, the builds lacks pkg-config. opencv-extra = addPkgconfigDepend super.opencv-extra (pkgs.opencv3.override { enableContrib = true; }); - # Alex has some weird files in /usr/share that create a cyclic ref with - # its bin dir. - alex = hasNoBinOutput super.alex; - - # Disable separate bin outputs for these specific packages that break with it. - H = hasNoBinOutput super.H; - cryptol = hasNoBinOutput super.cryptol; - hscolour = hasNoBinOutput super.hscolour; - sproxy = hasNoBinOutput super.sproxy; - sproxy2 = hasNoBinOutput super.sproxy2; - sproxy-web = hasNoBinOutput super.sproxy-web; - juandelacosa = hasNoBinOutput super.juandelacosa; - mywatch = hasNoBinOutput super.mywatch; - sugarhaskell = hasNoBinOutput super.sugarhaskell; - zerobin = hasNoBinOutput super.zerobin; - - git-annex = overrideCabal super.git-annex (drv: { - enableSeparateBinOutput = false; - enableSeparateEtcOutput = false; - }); - - # Override a number of packages with specific references to $out in their - # derivations - stack = overrideCabal super.stack (drv: { - postInstall = '' - exe=$bin/bin/stack - mkdir -p $bin/share/bash-completion/completions - $exe --bash-completion-script $exe >$bin/share/bash-completion/completions/stack - ''; - }); - Agda = overrideCabal super.Agda (drv: { - postInstall = '' - files=("$out/share/"*"-ghc-"*"/Agda-"*"/lib/prim/Agda/"{Primitive.agda,Builtin"/"*.agda}) - for f in "''${files[@]}" ; do - $bin/bin/agda $f - done - for f in "''${files[@]}" ; do - $bin/bin/agda -c --no-main $f - done - $bin/bin/agda-mode compile - ''; - }); - } diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index d49f3112923..60cce56cca0 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -56,10 +56,6 @@ let isCross = (ghc.cross or null) != null; in , hardeningDisable ? lib.optional (ghc.isHaLVM or false) "all" , enableSeparateDataOutput ? false , enableSeparateDocOutput ? doHaddock -, enableSeparateBinOutput ? isExecutable -, outputsToInstall ? [] -, enableSeparateLibOutput ? true -, enableSeparateEtcOutput ? (stdenv.lib.versionOlder "7.7" ghc.version) } @ args: assert editedCabalFile != null -> revision != null; @@ -83,6 +79,9 @@ let then "package-db" else "package-conf"; + # the target dir for haddock documentation + docdir = docoutput: docoutput + "/share/doc"; + newCabalFileUrl = "http://hackage.haskell.org/package/${pname}-${version}/revision/${revision}.cabal"; newCabalFile = fetchurl { url = newCabalFileUrl; @@ -96,13 +95,6 @@ let ''; hasActiveLibrary = isLibrary && (enableStaticLibraries || enableSharedLibraries || enableLibraryProfiling); - hasLibOutput = enableSeparateLibOutput && hasActiveLibrary; - libDir = if hasLibOutput then "$lib/lib/${ghc.name}" else "$out/lib/${ghc.name}"; - binDir = if enableSeparateBinOutput then "$bin/bin" else "$out/bin"; - libexecDir = if enableSeparateBinOutput then "$libexec/bin" else "$out/libexec"; - etcDir = if enableSeparateEtcOutput then "$etc/etc" else "$out/etc"; - docDir = if enableSeparateDocOutput then "$doc/share/doc" else "$out/share/doc"; - dataDir = if enableSeparateDataOutput then "$data/share/${ghc.name}" else "$out/share/${ghc.name}"; # We cannot enable -j parallelism for libraries because GHC is far more # likely to generate a non-determistic library ID in that case. Further @@ -121,20 +113,12 @@ let stdenv.lib.optionalString isCross (" " + stdenv.lib.concatStringsSep " " crossCabalFlags); defaultConfigureFlags = [ - "--verbose" "--prefix=$out" - # Binary directory has to be $bin/bin instead of just $bin: this - # is so that the package is added to the PATH when it's used as a - # build input. Sadly mkDerivation won't add inputs that don't have - # bin subdirectory. - "--bindir=${binDir}" - "--libdir=${libDir}" "--libsubdir=\\$pkgid" - "--libexecdir=${libexecDir}" - (optionalString (enableSeparateEtcOutput) "--sysconfdir=${etcDir}") # Old versions of cabal don't support this flag. - "--datadir=${dataDir}" - "--docdir=${docDir}" + "--verbose" "--prefix=$out" "--libdir=\\$prefix/lib/\\$compiler" "--libsubdir=\\$pkgid" + (optionalString enableSeparateDataOutput "--datadir=$data/share/${ghc.name}") + (optionalString enableSeparateDocOutput "--docdir=${docdir "$doc"}") "--with-gcc=$CC" # Clang won't work without that extra information. "--package-db=$packageConfDir" - (optionalString (enableSharedExecutables && stdenv.isLinux) "--ghc-option=-optl=-Wl,-rpath=${libDir}/${pname}-${version}") + (optionalString (enableSharedExecutables && stdenv.isLinux) "--ghc-option=-optl=-Wl,-rpath=$out/lib/${ghc.name}/${pname}-${version}") (optionalString (enableSharedExecutables && stdenv.isDarwin) "--ghc-option=-optl=-Wl,-headerpad_max_install_names") (optionalString enableParallelBuilding "--ghc-option=-j$NIX_BUILD_CORES") (optionalString useCpphs "--with-cpphs=${cpphs}/bin/cpphs --ghc-options=-cpp --ghc-options=-pgmP${cpphs}/bin/cpphs --ghc-options=-optP--cpp") @@ -168,8 +152,7 @@ let allPkgconfigDepends = pkgconfigDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends ++ optionals doCheck testPkgconfigDepends ++ optionals withBenchmarkDepends benchmarkPkgconfigDepends; - nativeBuildInputs = map stdenv.lib.getBin - (buildTools ++ libraryToolDepends ++ executableToolDepends ++ [ removeReferencesTo ]); + nativeBuildInputs = buildTools ++ libraryToolDepends ++ executableToolDepends ++ [ removeReferencesTo ]; propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends; otherBuildInputs = setupHaskellDepends ++ extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++ optionals (allPkgconfigDepends != []) ([pkgconfig] ++ allPkgconfigDepends) ++ @@ -198,15 +181,7 @@ assert allPkgconfigDepends != [] -> pkgconfig != null; stdenv.mkDerivation ({ name = "${pname}-${version}"; - outputs = if (args ? outputs) then args.outputs else - ( (optional enableSeparateBinOutput "bin") - ++ (optional enableSeparateBinOutput "libexec") - ++ [ "out" ] - ++ (optional enableSeparateDataOutput "data") - ++ (optional enableSeparateDocOutput "doc") - ++ (optional enableSeparateEtcOutput "etc") - ++ (optional hasLibOutput "lib") - ); + outputs = if (args ? outputs) then args.outputs else ([ "out" ] ++ (optional enableSeparateDataOutput "data") ++ (optional enableSeparateDocOutput "doc")); setOutputFlags = false; pos = builtins.unsafeGetAttrPos "pname" args; @@ -230,7 +205,7 @@ stdenv.mkDerivation ({ postPatch = optionalString jailbreak '' echo "Run jailbreak-cabal to lift version restrictions on build inputs." - ${stdenv.lib.getBin jailbreak-cabal}/bin/jailbreak-cabal ${pname}.cabal + ${jailbreak-cabal}/bin/jailbreak-cabal ${pname}.cabal '' + postPatch; setupCompilerEnvironmentPhase = '' @@ -238,7 +213,7 @@ stdenv.mkDerivation ({ echo "Build with ${ghc}." export PATH="${ghc}/bin:$PATH" - ${optionalString (hasActiveLibrary && hyperlinkSource) "export PATH=${stdenv.lib.getBin hscolour}/bin:$PATH"} + ${optionalString (hasActiveLibrary && hyperlinkSource) "export PATH=${hscolour}/bin:$PATH"} packageConfDir="$TMPDIR/package.conf.d" mkdir -p $packageConfDir @@ -265,7 +240,7 @@ stdenv.mkDerivation ({ # # Create a local directory with symlinks of the *.dylib (macOS shared # libraries) from all the dependencies. - local dynamicLinksDir="${libDir}/links" + local dynamicLinksDir="$out/lib/links" mkdir -p $dynamicLinksDir for d in $(grep dynamic-library-dirs "$packageConfDir/"*|awk '{print $2}'); do ln -s "$d/"*.dylib $dynamicLinksDir @@ -337,7 +312,7 @@ stdenv.mkDerivation ({ ${if !hasActiveLibrary then "${setupCommand} install" else '' ${setupCommand} copy - local packageConfDir="${libDir}/package.conf.d" + local packageConfDir="$out/lib/${ghc.name}/package.conf.d" local packageConfFile="$packageConfDir/${pname}-${version}.conf" mkdir -p "$packageConfDir" ${setupCommand} register --gen-pkg-config=$packageConfFile @@ -345,7 +320,7 @@ stdenv.mkDerivation ({ mv $packageConfFile $packageConfDir/$pkgId.conf ''} ${optionalString isGhcjs '' - for exeDir in "${binDir}/"*.jsexe; do + for exeDir in "$out/bin/"*.jsexe; do exe="''${exeDir%.jsexe}" printWords '#!${nodejs}/bin/node' > "$exe" cat "$exeDir/all.js" >> "$exe" @@ -354,68 +329,18 @@ stdenv.mkDerivation ({ ''} ${optionalString doCoverage "mkdir -p $out/share && cp -r dist/hpc $out/share"} ${optionalString (enableSharedExecutables && isExecutable && !isGhcjs && stdenv.isDarwin && stdenv.lib.versionOlder ghc.version "7.10") '' - for exe in "${binDir}/"* ; do - install_name_tool -add_rpath "${libDir}/${pname}-${version}" "$exe" + for exe in "$out/bin/"* ; do + install_name_tool -add_rpath "$out/lib/ghc-${ghc.version}/${pname}-${version}" "$exe" done ''} ${optionalString enableSeparateDocOutput '' - # Remove references back to $out but also back to $lib if we have - # docs. $lib is needed as it stores path to haddock interfaces in the - # conf file which creates a cycle if docs refer back to library - # path. - mkdir -p ${docDir} - - for x in ${docDir}/html/src/*.html; do - remove-references-to -t $out -t ${libDir} -t ${binDir} ${optionalString enableSeparateDataOutput "-t $data"} $x + for x in ${docdir "$doc"}/html/src/*.html; do + remove-references-to -t $out $x done + mkdir -p $doc ''} - - ${optionalString hasLibOutput '' - # Even if we don't have binary output for the package, things like - # Paths files will embed paths to bin/libexec directories in themselves - # which results in .lib <-> $out cyclic store reference. We - # therefore patch out the paths from separate library if we don't have - # separate bin output too. - # - # If we _do_ have separate bin and lib outputs, we may still be in - # trouble in case of shared executables: executable contains path to - # .lib, .lib contains path (through Paths) to .bin and we have a - # cycle. - # - # Lastly we have to deal with references from .lib back into - # $out/share if we're not splitting out data directory. - # - # It may happen that we have hasLibOutput set but the library - # directory was not created: this happens in the case that library - # section is not exposing any modules. See "fail" package for an - # example where no modules are exposed for GHC >= 8.0. - if [ -d ${libDir} ]; then - find ${libDir} -type f -exec \ - remove-references-to -t ${binDir} -t ${libexecDir} "{}" \; - fi - ''} - - ${optionalString (hasLibOutput && ! enableSeparateDocOutput) '' - # If we don't have separate docs, we have to patch out the ref to - # docs in package conf. This will likely break Haddock - # cross-package links but is necessary to break store cycle… - find ${libDir}/ -type f -name '*.conf' -exec \ - remove-references-to -t ${docDir} "{}" \; - ''} - - ${optionalString (hasLibOutput && ! enableSeparateDataOutput) '' - # Just like for doc output path in $out potentially landing in - # *.conf, we have to also remove the data directory so that it - # doesn't appear under data-dir field creating a cycle. - find ${libDir}/ -type f -exec echo Removing ${dataDir} refs from "{}" \; - find ${libDir}/ -type f -exec \ - remove-references-to -t ${dataDir} "{}" \; - ''} - - ${optionalString enableSeparateDataOutput "mkdir -p ${dataDir}"} - ${optionalString enableSeparateBinOutput "mkdir -p ${binDir} ${libexecDir}"} - ${optionalString enableSeparateEtcOutput "mkdir -p ${etcDir}"} + ${optionalString enableSeparateDataOutput "mkdir -p $data"} runHook postInstall ''; @@ -432,7 +357,7 @@ stdenv.mkDerivation ({ # the directory containing the haddock documentation. # `null' if no haddock documentation was built. # TODO: fetch the self from the fixpoint instead - haddockDir = self: if doHaddock then "${docDir}/html" else null; + haddockDir = self: if doHaddock then "${docdir self.doc}/html" else null; env = stdenv.mkDerivation { name = "interactive-${pname}-${version}-environment"; @@ -461,7 +386,6 @@ stdenv.mkDerivation ({ // optionalAttrs (description != "") { inherit description; } // optionalAttrs (maintainers != []) { inherit maintainers; } // optionalAttrs (hydraPlatforms != platforms) { inherit hydraPlatforms; } - // optionalAttrs (outputsToInstall != []) { inherit outputsToInstall; } ; } diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index fbfd5ae6b94..48110cffabf 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -142,8 +142,4 @@ rec { overrideSrc = drv: { src, version ? drv.version }: overrideCabal drv (_: { inherit src version; editedCabalFile = null; }); - hasNoBinOutput = drv: overrideCabal drv (drv: { enableSeparateBinOutput = false; }); - - installOutputs = drv: outputs: overrideCabal drv - (drv: { outputsToInstall = outputs; }); } diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 444a4899a04..ff5be894b92 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -44,7 +44,6 @@ let isLibrary = false; doHaddock = false; hyperlinkSource = false; # Avoid depending on hscolour for this build. - enableSeparateEtcOutput = false; # The flag to support this is missing in old versions of cabal. postFixup = "rm -rf $out/lib $out/share $out/nix-support"; }); cpphs = overrideCabal (self.cpphs.overrideScope (self: super: { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 175b3a98df1..0574b0f6c17 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -798,10 +798,10 @@ with pkgs; enableSharedExecutables = false; executableToolDepends = [ makeWrapper ]; postInstall = '' - exe=$libexec/bin/${drv.pname}-${drv.version}/${drv.pname} - install -D $bin/bin/${drv.pname} $exe - rm -rf $bin/bin $out/lib $out/share - makeWrapper $exe $bin/bin/${drv.pname} \ + exe=$out/libexec/${drv.pname}-${drv.version}/${drv.pname} + install -D $out/bin/${drv.pname} $exe + rm -rf $out/{bin,lib,share} + makeWrapper $exe $out/bin/${drv.pname} \ --prefix PATH ":" "${nix}/bin" \ --prefix PATH ":" "${nix-prefetch-scripts}/bin" mkdir -p $out/share/bash-completion/completions @@ -813,7 +813,7 @@ with pkgs; executableToolDepends = [ makeWrapper ]; postInstall = '' wrapProgram $out/bin/stack2nix \ - ${lib.makeBinPath [ git cabal2nix cabal-install stack ]} + --prefix PATH ":" "${git}/bin:${cabal2nix}/bin:${cabal-install}/bin:${stack}/bin" ''; }); From ad44a760050f79f92c69fff2d7724a34df93207d Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 6 Sep 2017 09:02:26 +0200 Subject: [PATCH 23/29] pythonPackages.browsermob-proxy: make python2-only --- pkgs/top-level/python-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0d89d6bd8d7..14bb5158a2d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -143,7 +143,9 @@ in { breathe = callPackage ../development/python-modules/breathe { }; - browsermob-proxy = callPackage ../development/python-modules/browsermob-proxy {}; + browsermob-proxy = if ! isPy3k then + callPackage ../development/python-modules/browsermob-proxy {} + else throw "browsermob-proxy is not supported for ${python.executable}"; bugseverywhere = callPackage ../applications/version-management/bugseverywhere {}; From cca09d8067869cec535c2bcd3f7a760bdd314590 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 6 Sep 2017 09:03:30 +0200 Subject: [PATCH 24/29] pythonPackages.manifestparser: make python2-only --- .../python-modules/marionette-harness/manifestparser.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/marionette-harness/manifestparser.nix b/pkgs/development/python-modules/marionette-harness/manifestparser.nix index 9e418af8a71..766e419e514 100644 --- a/pkgs/development/python-modules/marionette-harness/manifestparser.nix +++ b/pkgs/development/python-modules/marionette-harness/manifestparser.nix @@ -2,6 +2,7 @@ , stdenv , buildPythonPackage , fetchPypi +, isPy3k }: buildPythonPackage rec { @@ -9,6 +10,8 @@ buildPythonPackage rec { version = "1.1"; name = "${pname}-${version}"; + disabled = isPy3k; + src = fetchPypi { inherit pname version; sha256 = "06cnj682ynacwpi63k1427vbf7ydnwh3dchc4b11yw8ii25wbc5d"; From f20ccd4b5ed6be0e6421b011a394df8ec33b65cf Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 6 Sep 2017 09:11:48 +0200 Subject: [PATCH 25/29] pythonPackages.wptserve: make python2-only (upstream uses relative import in the latest release) --- pkgs/development/python-modules/wptserve/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/wptserve/default.nix b/pkgs/development/python-modules/wptserve/default.nix index 44f3480aec6..d468955e27d 100644 --- a/pkgs/development/python-modules/wptserve/default.nix +++ b/pkgs/development/python-modules/wptserve/default.nix @@ -2,6 +2,7 @@ , stdenv , buildPythonPackage , fetchPypi +, isPy3k }: buildPythonPackage rec { @@ -9,6 +10,8 @@ buildPythonPackage rec { version = "1.4.0"; name = "${pname}-${version}"; + disabled = isPy3k; + src = fetchPypi { inherit pname version; sha256 = "0rkq4dpl41hx64m3ad0bwn0r5i7sf8qpgazgkq905j3wgk5aaspg"; From fff500fc00963565f38f1341313903b16694980f Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 6 Sep 2017 11:42:20 +0200 Subject: [PATCH 26/29] vacuum: 1.2.4 -> 1.3.0.20160104 --- .../networking/instant-messengers/vacuum/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/vacuum/default.nix b/pkgs/applications/networking/instant-messengers/vacuum/default.nix index 1f1a19394b3..9ed954cc7ec 100644 --- a/pkgs/applications/networking/instant-messengers/vacuum/default.nix +++ b/pkgs/applications/networking/instant-messengers/vacuum/default.nix @@ -1,15 +1,17 @@ -{ stdenv, lib, fetchurl +{ stdenv, lib, fetchFromGitHub , qt4, qmake4Hook, openssl , xproto, libX11, libXScrnSaver, scrnsaverproto , xz, zlib }: stdenv.mkDerivation rec { name = "vacuum-im-${version}"; - version = "1.2.4"; + version = "1.3.0.20160104"; - src = fetchurl { - url = "https://googledrive.com/host/0B7A5K_290X8-d1hjQmJaSGZmTTA/vacuum-${version}.tar.gz"; - sha256 = "10qxpfbbaagqcalhk0nagvi5irbbz5hk31w19lba8hxf6pfylrhf"; + src = fetchFromGitHub { + owner = "Vacuum-IM"; + repo = "vacuum-im"; + rev = "1.3.0.20160104-Alpha"; + sha256 = "1jcw9c7s75y4c3m4skfc3cc0i519z39b23n997vj5mwcjplxyc76"; }; buildInputs = [ From 6f740953e6e7a20709a426d491bd0d9b949fc8de Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 6 Sep 2017 11:48:38 +0200 Subject: [PATCH 27/29] silgraphite: drop graphite1 (which had version 2.x) --- .../libraries/silgraphite/default.nix | 21 ------------------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 22 deletions(-) delete mode 100644 pkgs/development/libraries/silgraphite/default.nix diff --git a/pkgs/development/libraries/silgraphite/default.nix b/pkgs/development/libraries/silgraphite/default.nix deleted file mode 100644 index 05db104ecb7..00000000000 --- a/pkgs/development/libraries/silgraphite/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, freetype, libXft, pango, fontconfig }: - -stdenv.mkDerivation rec { - version = "2.3.1"; - name = "silgraphite-2.3.1"; - - src = fetchurl { - url = "mirror://sourceforge/silgraphite/silgraphite/${version}/${name}.tar.gz"; - sha256 = "9b07c6e91108b1fa87411af4a57e25522784cfea0deb79b34ced608444f2ed65"; - }; - - buildInputs = [pkgconfig freetype libXft pango fontconfig]; - - NIX_CFLAGS_COMPILE = "-I${freetype.dev}/include/freetype2"; - - meta = { - description = "An advanced font engine"; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0574b0f6c17..57763bda868 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10364,7 +10364,6 @@ with pkgs; shhopt = callPackage ../development/libraries/shhopt { }; - silgraphite = callPackage ../development/libraries/silgraphite {}; graphite2 = callPackage ../development/libraries/silgraphite/graphite2.nix {}; simavr = callPackage ../development/tools/simavr { }; From 036bafe0b94fb99ee9d1eb3d2fb902293a9f39a6 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 6 Sep 2017 13:45:49 +0200 Subject: [PATCH 28/29] ocropus: 20150316 -> 20170811 --- pkgs/applications/misc/ocropus/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/ocropus/default.nix b/pkgs/applications/misc/ocropus/default.nix index d84671cfa8c..ad3d72e9ef5 100644 --- a/pkgs/applications/misc/ocropus/default.nix +++ b/pkgs/applications/misc/ocropus/default.nix @@ -19,11 +19,11 @@ let in pythonPackages.buildPythonApplication rec { name = "ocropus-${version}"; - version = "20150316"; + version = "20170811"; src = fetchFromGitHub { - sha256 = "0m5bm2ah3p29c13vp7hz7rm058qnlm840zd8xv20byijhlz0447g"; - rev = "5ba07bb959d605ec15424dd2b8f3d7245820084e"; + sha256 = "0qx0d8yj0w66qglkrmfavp5dh1sky72njfaqii7bnrpv5n4j3q39"; + rev = "ae84a8edaf0b76135f749ba66fc30c272d0726d0"; repo = "ocropy"; owner = "tmbdev"; }; @@ -37,7 +37,8 @@ pythonPackages.buildPythonApplication rec { ${concatStrings (map (x: "cp -R ${x.src} models/`basename ${x.name}`;") models)} - substituteInPlace ocrolib/{common,default}.py --replace /usr/local $out + substituteInPlace ocrolib/common.py --replace /usr/local $out + substituteInPlace ocrolib/default.py --replace /usr/local $out ''; doCheck = false; # fails From 67651d80bc8baaf09ab91fec8ea423e09107ed8f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 5 Sep 2017 11:16:41 +0200 Subject: [PATCH 29/29] Merge pull request #28884 from FRidh/python-fixes Python: several fixes --- .../networking/flexget/default.nix | 44 +- .../python-modules/Cython/default.nix | 4 +- .../python-modules/GeoIP/default.nix | 30 + .../python-modules/adal/default.nix | 4 +- .../python-modules/aiohttp/default.nix | 36 + .../python-modules/attrs/default.nix | 28 + .../backports_unittest-mock/default.nix | 22 + .../python-modules/beautifulsoup4/default.nix | 24 + .../python-modules/bkcharts/default.nix | 29 + .../python-modules/bokeh/default.nix | 82 ++ .../python-modules/chardet/default.nix | 22 + .../python-modules/cheroot/default.nix | 28 + .../python-modules/cherrypy/default.nix | 25 + .../python-modules/contextlib2/default.nix | 21 + .../python-modules/coverage/default.nix | 27 + .../python-modules/dask/default.nix | 4 +- .../python-modules/dateutil/default.nix | 12 +- .../python-modules/dill/default.nix | 32 + .../python-modules/discordpy/default.nix | 7 +- .../python-modules/doc8/default.nix | 32 + .../python-modules/entrypoints/default.nix | 31 + .../python-modules/flask-compress/default.nix | 20 + .../python-modules/flask-cors/default.nix | 22 + .../python-modules/flask-migrate/default.nix | 4 +- .../python-modules/flask-restful/default.nix | 29 + .../python-modules/flask-restplus/0.8.nix | 42 -- .../python-modules/flask/default.nix | 21 + .../python-modules/flit/default.nix | 50 ++ .../python-modules/guessit/2.0.nix | 32 + .../python-modules/h5py/default.nix | 4 +- .../python-modules/jinja2/default.nix | 31 + .../python-modules/jsonschema/default.nix | 30 + .../python-modules/keras/default.nix | 4 +- .../python-modules/m2r/default.nix | 4 +- .../python-modules/magic-wormhole/default.nix | 8 +- .../python-modules/multidict/default.nix | 3 +- .../python-modules/openpyxl/default.nix | 33 + .../python-modules/oslo-config/default.nix | 3 + .../python-modules/pandas/default.nix | 7 +- .../python-modules/portend/default.nix | 23 + .../python-modules/prompt_toolkit/default.nix | 40 + .../python-modules/pycryptodome/default.nix | 4 +- .../python-modules/pyroute2/default.nix | 4 +- .../python-modules/pyshp/default.nix | 4 +- .../python-modules/pytest-flake8/default.nix | 12 +- .../python-modules/pytest-sugar/default.nix | 20 + .../pytest-warnings/default.nix | 20 + .../python-modules/pytimeparse/default.nix | 4 +- .../python-modules/requests/default.nix | 25 + .../restructuredtext_lint/default.nix | 34 + .../python-modules/semver/default.nix | 4 +- .../service_identity/default.nix | 38 + .../python-modules/sphinx-testing/default.nix | 35 + .../sqlalchemy-migrate/default.nix | 5 +- .../python-modules/sqlmap/default.nix | 4 +- .../python-modules/tempora/default.nix | 11 +- .../python-modules/testtools/default.nix | 38 + .../testtools_support_unittest2.patch | 0 .../python-modules/tornado/default.nix | 4 +- .../python-modules/treq/default.nix | 17 +- .../python-modules/twisted/default.nix | 16 +- .../python-modules/txtorcon/default.nix | 39 + .../python-modules/tzlocal/default.nix | 24 + .../python-modules/urllib3/default.nix | 32 + .../python-modules/vcversioner/default.nix | 18 + .../python-modules/werkzeug/default.nix | 25 + .../python-modules/zetup/default.nix | 4 +- .../python-modules/zxcvbn-python/default.nix | 4 +- pkgs/tools/admin/ansible/2.1.nix | 12 +- pkgs/tools/admin/ansible/2.2.nix | 9 +- pkgs/top-level/python-packages.nix | 706 ++---------------- 71 files changed, 1365 insertions(+), 761 deletions(-) create mode 100644 pkgs/development/python-modules/GeoIP/default.nix create mode 100644 pkgs/development/python-modules/aiohttp/default.nix create mode 100644 pkgs/development/python-modules/attrs/default.nix create mode 100644 pkgs/development/python-modules/backports_unittest-mock/default.nix create mode 100644 pkgs/development/python-modules/beautifulsoup4/default.nix create mode 100644 pkgs/development/python-modules/bkcharts/default.nix create mode 100644 pkgs/development/python-modules/bokeh/default.nix create mode 100644 pkgs/development/python-modules/chardet/default.nix create mode 100644 pkgs/development/python-modules/cheroot/default.nix create mode 100644 pkgs/development/python-modules/cherrypy/default.nix create mode 100644 pkgs/development/python-modules/contextlib2/default.nix create mode 100644 pkgs/development/python-modules/coverage/default.nix create mode 100644 pkgs/development/python-modules/dill/default.nix create mode 100644 pkgs/development/python-modules/doc8/default.nix create mode 100644 pkgs/development/python-modules/entrypoints/default.nix create mode 100644 pkgs/development/python-modules/flask-compress/default.nix create mode 100644 pkgs/development/python-modules/flask-cors/default.nix create mode 100644 pkgs/development/python-modules/flask-restful/default.nix delete mode 100644 pkgs/development/python-modules/flask-restplus/0.8.nix create mode 100644 pkgs/development/python-modules/flask/default.nix create mode 100644 pkgs/development/python-modules/flit/default.nix create mode 100644 pkgs/development/python-modules/guessit/2.0.nix create mode 100644 pkgs/development/python-modules/jinja2/default.nix create mode 100644 pkgs/development/python-modules/jsonschema/default.nix create mode 100644 pkgs/development/python-modules/openpyxl/default.nix create mode 100644 pkgs/development/python-modules/portend/default.nix create mode 100644 pkgs/development/python-modules/prompt_toolkit/default.nix create mode 100644 pkgs/development/python-modules/pytest-sugar/default.nix create mode 100644 pkgs/development/python-modules/pytest-warnings/default.nix create mode 100644 pkgs/development/python-modules/requests/default.nix create mode 100644 pkgs/development/python-modules/restructuredtext_lint/default.nix create mode 100644 pkgs/development/python-modules/service_identity/default.nix create mode 100644 pkgs/development/python-modules/sphinx-testing/default.nix create mode 100644 pkgs/development/python-modules/testtools/default.nix rename pkgs/development/python-modules/{ => testtools}/testtools_support_unittest2.patch (100%) create mode 100644 pkgs/development/python-modules/txtorcon/default.nix create mode 100644 pkgs/development/python-modules/tzlocal/default.nix create mode 100644 pkgs/development/python-modules/urllib3/default.nix create mode 100644 pkgs/development/python-modules/vcversioner/default.nix create mode 100644 pkgs/development/python-modules/werkzeug/default.nix diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 814f6bb5548..9e5e90996bc 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -9,14 +9,14 @@ with python.pkgs; buildPythonApplication rec { - version = "2.10.40"; + version = "2.10.82"; name = "FlexGet-${version}"; src = fetchFromGitHub { owner = "Flexget"; repo = "Flexget"; rev = version; - sha256 = "0hh21yv1lvdfi198snwjabfsdh04fnpjszpgg28wvg5pd1qq8lqv"; + sha256 = "15508ihswfjbkzhf1f0qhn2ar1aiibz2ggp5d6r33icy8xwhpv09"; }; doCheck = true; @@ -27,30 +27,44 @@ buildPythonApplication rec { sed -i '/def test_non_ascii/i\ import pytest\ @pytest.mark.skip' flexget/tests/test_filesystem.py - substituteInPlace requirements.txt --replace "guessit<=2.0.4" "guessit" + substituteInPlace requirements.txt \ + --replace "chardet==3.0.3" "chardet" \ + --replace "rebulk==0.8.2" "rebulk" \ + --replace "cherrypy==10.2.2" "cherrypy" \ + --replace "portend==1.8" "portend" \ + --replace "sqlalchemy==1.1.10" "sqlalchemy" \ + --replace "zxcvbn-python==4.4.15" "zxcvbn-python" \ + --replace "flask-cors==3.0.2" "flask-cors" \ + --replace "certifi==2017.4.17" "certifi" ''; - # Disable 3 failing tests caused by guessit upgrade - # https://github.com/Flexget/Flexget/issues/1804 checkPhase = '' export HOME=. - py.test --disable-pytest-warnings -k "not test_date_options and not test_ep_as_quality and not testFromGroup" + py.test --disable-pytest-warnings -k "not test_quality_failures \ + and not test_group_quality \ + and not crash_report \ + and not test_multi_episode \ + and not test_double_episodes \ + and not test_inject_force \ + and not test_double_prefered \ + and not test_double" ''; buildInputs = [ pytest mock vcrpy pytest-catchlog boto3 ]; propagatedBuildInputs = [ - feedparser sqlalchemy pyyaml + feedparser sqlalchemy pyyaml chardet beautifulsoup4 html5lib PyRSS2Gen pynzb - rpyc jinja2 requests dateutil jsonschema - pathpy guessit APScheduler + rpyc jinja2 jsonschema requests dateutil jsonschema + pathpy guessit_2_0 APScheduler terminaltables colorclass - cherrypy flask flask-restful flask-restplus_0_8 + cherrypy flask flask-restful flask-restplus flask-compress flask_login flask-cors - pyparsing safe future zxcvbn-python ] - ++ lib.optional (pythonOlder "3.4") pathlib - # enable deluge and transmission plugin support, if they're installed - ++ lib.optional (config.deluge or false) deluge - ++ lib.optional (transmission != null) transmissionrpc; + pyparsing safe future zxcvbn-python + werkzeug tempora cheroot rebulk portend + ] ++ lib.optional (pythonOlder "3.4") pathlib + # enable deluge and transmission plugin support, if they're installed + ++ lib.optional (config.deluge or false) deluge + ++ lib.optional (transmission != null) transmissionrpc; meta = { homepage = https://flexget.com/; diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index 3dd4b0acbaf..22f3579bae3 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "Cython"; name = "${pname}-${version}"; - version = "0.26"; + version = "0.26.1"; src = fetchPypi { inherit pname version; - sha256 = "4c24e2c22ddaed624d35229dc5db25049e9e225c6f64f3364326836cad8f2c66"; + sha256 = "c2e63c4794161135adafa8aa4a855d6068073f421c83ffacc39369497a189dd5"; }; # With Python 2.x on i686-linux or 32-bit ARM this test fails because the diff --git a/pkgs/development/python-modules/GeoIP/default.nix b/pkgs/development/python-modules/GeoIP/default.nix new file mode 100644 index 00000000000..6c4453774ce --- /dev/null +++ b/pkgs/development/python-modules/GeoIP/default.nix @@ -0,0 +1,30 @@ +{lib, buildPythonPackage, fetchPypi, isPy3k, incremental, ipaddress, twisted +, automat, zope_interface, idna, pyopenssl, service-identity, pytest, mock, lsof +, geoip, nose}: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "GeoIP"; + version = "1.3.2"; + + checkInputs = [ nose ]; + propagatedBuildInputs = [ + geoip + ]; + + src = fetchPypi { + inherit pname version; + sha256 = "1rphxf3vrn8wywjgr397f49s0s22m83lpwcq45lm0h2p45mdm458"; + }; + + # Tests cannot be run because they require data that isn't included in the + # release tarball. + checkPhase = "true"; + + meta = { + description = "MaxMind GeoIP Legacy Database - Python API"; + homepage = http://www.maxmind.com/; + maintainers = with lib.maintainers; [ jluttine ]; + license = lib.licenses.lgpl21Plus; + }; +} diff --git a/pkgs/development/python-modules/adal/default.nix b/pkgs/development/python-modules/adal/default.nix index 4673e5461d3..a1fb9667395 100644 --- a/pkgs/development/python-modules/adal/default.nix +++ b/pkgs/development/python-modules/adal/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "adal"; - version = "0.4.6"; + version = "0.4.7"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "7c5bbf4d8a17d535e6e857b28a41cedddc2767fc57424c15d484fa779bb97325"; + sha256 = "114046ac85d0054791c21b00922f26286822bc6f2ba3716db42e7e57f762ef20"; }; propagatedBuildInputs = [ requests pyjwt dateutil ]; diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix new file mode 100644 index 00000000000..72b28d01cea --- /dev/null +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, chardet +, multidict +, async-timeout +, yarl +, pytest +, gunicorn +, pytest-raisesregexp +}: + +buildPythonPackage rec { + pname = "aiohttp"; + version = "2.2.5"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "af5bfdd164256118a0a306b3f7046e63207d1f8cba73a67dcc0bd858dcfcd3bc"; + }; + + disabled = pythonOlder "3.4"; + + doCheck = false; # Too many tests fail. + + checkInputs = [ pytest gunicorn pytest-raisesregexp ]; + propagatedBuildInputs = [ async-timeout chardet multidict yarl ]; + + meta = { + description = "Http client/server for asyncio"; + license = with lib.licenses; [ asl20 ]; + homepage = https://github.com/KeepSafe/aiohttp/; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/attrs/default.nix b/pkgs/development/python-modules/attrs/default.nix new file mode 100644 index 00000000000..e58bf3846dc --- /dev/null +++ b/pkgs/development/python-modules/attrs/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, hypothesis, zope_interface +, pympler, coverage, six, clang }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "attrs"; + version = "17.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "04gx08ikpk26wnq22f7l42gapcvk8iz1512r927k6sadz6cinkax"; + }; + + # macOS needs clang for testing + buildInputs = [ + pytest hypothesis zope_interface pympler coverage six + ] ++ lib.optionals (stdenv.isDarwin) [ clang ]; + + checkPhase = '' + py.test + ''; + + meta = with lib; { + description = "Python attributes without boilerplate"; + homepage = https://github.com/hynek/attrs; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/backports_unittest-mock/default.nix b/pkgs/development/python-modules/backports_unittest-mock/default.nix new file mode 100644 index 00000000000..e64f51fe7ca --- /dev/null +++ b/pkgs/development/python-modules/backports_unittest-mock/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi, setuptools_scm, mock }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "backports.unittest_mock"; + version = "1.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "0xdkx5wf5a2w2zd2pshk7z2cvbv6db64c1x6v9v1a18ja7bn9nf6"; + }; + + propagatedBuildInputs = [ mock ]; + + buildInputs = [ setuptools_scm ]; + + meta = with stdenv.lib; { + description = "Provides a function install() which makes the mock module"; + homepage = https://github.com/jaraco/backports.unittest_mock; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/beautifulsoup4/default.nix b/pkgs/development/python-modules/beautifulsoup4/default.nix new file mode 100644 index 00000000000..fd8bddee14b --- /dev/null +++ b/pkgs/development/python-modules/beautifulsoup4/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi, nose }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "beautifulsoup4"; + version = "4.6.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "12cf0ygpz9srpfh9gx2f9ba0swa1rzypv3sm4r0hmjyw6b4nm2w0"; + }; + + buildInputs = [ nose ]; + checkPhase = '' + nosetests build + ''; + + meta = with stdenv.lib; { + homepage = http://crummy.com/software/BeautifulSoup/bs4/; + description = "HTML and XML parser"; + license = licenses.mit; + maintainers = with maintainers; [ domenkozar ]; + }; +} diff --git a/pkgs/development/python-modules/bkcharts/default.nix b/pkgs/development/python-modules/bkcharts/default.nix new file mode 100644 index 00000000000..dee19b45f44 --- /dev/null +++ b/pkgs/development/python-modules/bkcharts/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +, numpy +, pandas +}: + + +buildPythonPackage rec { + pname = "bkcharts"; + version = "0.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit version pname; + sha256 = "a5eaa8e78853dcecaa46345812e4fabe9cd3b96330ebf0809f640a4a0556d72e"; + }; + + propagatedBuildInputs = [ numpy pandas ]; + + # Circular test dependency on bokeh + doCheck = false; + + meta = { + description = "High level chart types built on top of Bokeh"; + homepage = http://github.com/bokeh/bkcharts; + license = lib.licenses.bsd3; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix new file mode 100644 index 00000000000..43c176a09ec --- /dev/null +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -0,0 +1,82 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPyPy +, mock +, pytest +, flask +, jinja2 +, markupsafe +, werkzeug +, itsdangerous +, dateutil +, requests +, six +, pygments +, pystache +, markdown +, pyyaml +, pyzmq +, tornado +, colorama +, isPy3k +, futures +, websocket_client +, numpy +, pandas +, greenlet +, python +, bkcharts +, pillow +, selenium +}: + +buildPythonPackage rec { + pname = "bokeh"; + name = "${pname}${version}"; + version = "0.12.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "2c42c95bf1a418c758dbff8446b4f5e5fc72ac10ea5da4e6b5010067396d0880"; + }; + + disabled = isPyPy; + + # Some test that uses tornado fails +# doCheck = false; + + checkInputs = [ mock pytest pillow selenium ]; + + propagatedBuildInputs = [ + flask + jinja2 + markupsafe + werkzeug + itsdangerous + dateutil + requests + six + pygments + pystache + markdown + pyyaml + pyzmq + tornado + colorama + bkcharts + ] + ++ lib.optionals ( !isPy3k ) [ futures ] + ++ lib.optionals ( !isPy3k && !isPyPy ) [ websocket_client ] + ++ lib.optionals ( !isPyPy ) [ numpy pandas greenlet ]; + + checkPhase = '' + ${python.interpreter} -m unittest discover -s bokeh/tests + ''; + + meta = { + description = "Statistical and novel interactive HTML plots for Python"; + homepage = "http://github.com/bokeh/bokeh"; + license = lib.licenses.bsd3; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/chardet/default.nix b/pkgs/development/python-modules/chardet/default.nix new file mode 100644 index 00000000000..7e50dca4066 --- /dev/null +++ b/pkgs/development/python-modules/chardet/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pytest, pytestrunner, hypothesis }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "chardet"; + version = "3.0.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "1bpalpia6r5x1kknbk11p1fzph56fmmnp405ds8icksd3knr5aw4"; + }; + + buildInputs = [ pytest pytestrunner hypothesis ]; + + meta = with stdenv.lib; { + homepage = https://github.com/chardet/chardet; + description = "Universal encoding detector"; + license = licenses.lgpl2; + maintainers = with maintainers; [ domenkozar ]; + }; +} diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix new file mode 100644 index 00000000000..c20cbabe0d6 --- /dev/null +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchPypi, buildPythonPackage +, six +, coverage, codecov, pytest, pytestcov, pytest-sugar, portend +, backports_unittest-mock, setuptools_scm }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "cheroot"; + version = "5.5.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1fhyk8lgs2blfx4zjvwsy6f0ynrs5fwnnr3qf07r6c4j3gwlkqsr"; + }; + + propagatedBuildInputs = [ six ]; + buildInputs = [ coverage codecov pytest pytestcov pytest-sugar portend backports_unittest-mock setuptools_scm ]; + + checkPhase = '' + py.test cheroot + ''; + + meta = with stdenv.lib; { + description = "High-performance, pure-Python HTTP"; + homepage = https://github.com/cherrypy/cheroot; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix new file mode 100644 index 00000000000..cffffde8e3d --- /dev/null +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k +, pytest, setuptools_scm, pytestrunner +, six, cheroot, portend }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "CherryPy"; + version = "11.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1037pvhab4my791vfzikm649ny52fj7x2q87cnncmbnqin6ghwan"; + }; + + # wsgiserver.ssl_pyopenssl is broken on py3k. + doCheck = !isPy3k; + buildInputs = [ pytest setuptools_scm pytestrunner ]; + propagatedBuildInputs = [ six cheroot portend ]; + + meta = with stdenv.lib; { + homepage = "http://www.cherrypy.org"; + description = "A pythonic, object-oriented HTTP framework"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/contextlib2/default.nix b/pkgs/development/python-modules/contextlib2/default.nix new file mode 100644 index 00000000000..cadaa8914b2 --- /dev/null +++ b/pkgs/development/python-modules/contextlib2/default.nix @@ -0,0 +1,21 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "contextlib2"; + version = "0.5.5"; + name = "${pname}-${version}"; + + src = fetchPypi rec { + inherit pname version; + sha256 = "509f9419ee91cdd00ba34443217d5ca51f5a364a404e1dce9e8979cea969ca48"; + }; + + meta = { + description = "Backports and enhancements for the contextlib module"; + homepage = http://contextlib2.readthedocs.org/; + license = lib.licenses.psfl; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix new file mode 100644 index 00000000000..137cef06b9e --- /dev/null +++ b/pkgs/development/python-modules/coverage/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, mock +}: + +buildPythonPackage rec { + pname = "coverage"; + version = "4.4.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "7a9c44400ee0f3b4546066e0710e1250fd75831adc02ab99dda176ad8726f424"; + }; + + # No tests in archive + doCheck = false; + checkInputs = [ mock ]; + + meta = { + description = "Code coverage measurement for python"; + homepage = http://nedbatchelder.com/code/coverage/; + license = lib.licenses.bsd3; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 32d925f3648..b1d39e493b7 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "dask"; - version = "0.15.1"; + version = "0.15.2"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "f62f19ab5958b13d0ee733db18218c28a9d452a3554446a3dfb5ac3d4a5f7e34"; + sha256 = "abe6758540fdbc260f14ee71cebc3ab88682e24ff147afa89375b7006f57d3ed"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/dateutil/default.nix b/pkgs/development/python-modules/dateutil/default.nix index c814b82dad0..b980381edbb 100644 --- a/pkgs/development/python-modules/dateutil/default.nix +++ b/pkgs/development/python-modules/dateutil/default.nix @@ -1,12 +1,12 @@ -{ stdenv, buildPythonPackage, fetchurl, six }: +{ stdenv, buildPythonPackage, fetchPypi, six }: buildPythonPackage rec { - pname = "dateutil"; name = "${pname}-${version}"; - version = "2.6.0"; + pname = "python-dateutil"; + version = "2.6.1"; - src = fetchurl { - url = "mirror://pypi/p/python-dateutil/python-${name}.tar.gz"; - sha256 = "1lhq0hxjc3cfha101q02ld5ijlpfyjn2w1yh7wvpiy367pgzi8k2"; + src = fetchPypi { + inherit pname version; + sha256 = "1jkahssf0ir5ssxc3ydbp8cpv77limn8d4s77szb2nrgl2r3h749"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/dill/default.nix b/pkgs/development/python-modules/dill/default.nix new file mode 100644 index 00000000000..79c87772ffe --- /dev/null +++ b/pkgs/development/python-modules/dill/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python +}: + +buildPythonPackage rec { + pname = "dill"; + version = "0.2.7.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "97fd758f5fe742d42b11ec8318ecfcff8776bccacbfcec05dfd6276f5d450f73"; + }; + + # Messy test suite. Even when running the tests like tox does, it fails + doCheck = false; + checkPhase = '' + for test in tests/*.py; do + ${python.interpreter} $test + done + ''; + # Following error without setting checkPhase + # TypeError: don't know how to make test from: {'byref': False, 'recurse': False, 'protocol': 3, 'fmode': 0} + + meta = { + description = "Serialize all of python (almost)"; + homepage = http://www.cacr.caltech.edu/~mmckerns/dill.htm; + license = lib.licenses.bsd3; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/discordpy/default.nix b/pkgs/development/python-modules/discordpy/default.nix index eebcd802dd6..c9ae73b1661 100644 --- a/pkgs/development/python-modules/discordpy/default.nix +++ b/pkgs/development/python-modules/discordpy/default.nix @@ -11,13 +11,13 @@ let pname = "discord.py"; - version = "0.16.10"; + version = "0.16.11"; in buildPythonPackage rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "cb0b9ad5f5edf2d5afd5f5ce07381a0a089eb036004938126a5582fc8fa0cc88"; + sha256 = "eb3c6faa7d4570cce05533d0742bbcb768629e2b3ba9e1cc79c05833db91ac4d"; }; propagatedBuildInputs = [ asyncio aiohttp websockets pynacl ]; @@ -31,6 +31,9 @@ in buildPythonPackage rec { disabled = pythonOlder "3.5"; + # No tests in archive + doCheck = false; + meta = { description = "A python wrapper for the Discord API"; homepage = "https://discordpy.rtfd.org/"; diff --git a/pkgs/development/python-modules/doc8/default.nix b/pkgs/development/python-modules/doc8/default.nix new file mode 100644 index 00000000000..cb91014d6ef --- /dev/null +++ b/pkgs/development/python-modules/doc8/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pbr +, docutils +, six +, chardet +, stevedore +, restructuredtext_lint +}: + +buildPythonPackage rec { + pname = "doc8"; + version = "0.8.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "2df89f9c1a5abfb98ab55d0175fed633cae0cf45025b8b1e0ee5ea772be28543"; + }; + + buildInputs = [ pbr ]; + propagatedBuildInputs = [ docutils six chardet stevedore restructuredtext_lint ]; + + doCheck = false; + + meta = { + description = "Style checker for Sphinx (or other) RST documentation"; + homepage = "https://launchpad.net/doc8"; + license = lib.licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/entrypoints/default.nix b/pkgs/development/python-modules/entrypoints/default.nix new file mode 100644 index 00000000000..d812fd55a88 --- /dev/null +++ b/pkgs/development/python-modules/entrypoints/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, configparser +, pytest +}: + +buildPythonPackage rec { + pname = "entrypoints"; + version = "0.2.3"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "d2d587dde06f99545fb13a383d2cd336a8ff1f359c5839ce3a64c917d10c029f"; + }; + + checkInputs = [ pytest]; + + propagatedBuildInputs = [ configparser ]; + + checkPhase = '' + py.test tests + ''; + + meta = { + description = "Discover and load entry points from installed packages"; + homepage = https://github.com/takluyver/entrypoints; + license = lib.licenses.mit; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/flask-compress/default.nix b/pkgs/development/python-modules/flask-compress/default.nix new file mode 100644 index 00000000000..c46fce2fe75 --- /dev/null +++ b/pkgs/development/python-modules/flask-compress/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchPypi, buildPythonPackage, flask }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + version = "1.4.0"; + pname = "Flask-Compress"; + + src = fetchPypi { + inherit pname version; + sha256 = "1cxdbdiyxkspg7vkchfmaqr7c6q79gwvakna3fjcc6nivps971j6"; + }; + + propagatedBuildInputs = [ flask ]; + + meta = with stdenv.lib; { + description = "Compress responses in your Flask app with gzip"; + homepage = "https://libwilliam.github.io/flask-compress/"; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/flask-cors/default.nix b/pkgs/development/python-modules/flask-cors/default.nix new file mode 100644 index 00000000000..acd9430316b --- /dev/null +++ b/pkgs/development/python-modules/flask-cors/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchPypi, buildPythonPackage +, nose, flask, six }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "Flask-Cors"; + version = "3.0.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "62ebc5ad80dc21ca0ea9f57466c2c74e24a62274af890b391790c260eb7b754b"; + }; + + buildInputs = [ nose ]; + propagatedBuildInputs = [ flask six ]; + + meta = with stdenv.lib; { + description = "A Flask extension adding a decorator for CORS support"; + homepage = https://github.com/corydolphin/flask-cors; + license = with licenses; [ mit ]; + }; +} diff --git a/pkgs/development/python-modules/flask-migrate/default.nix b/pkgs/development/python-modules/flask-migrate/default.nix index dc94be8f600..1a4bd11a1fa 100644 --- a/pkgs/development/python-modules/flask-migrate/default.nix +++ b/pkgs/development/python-modules/flask-migrate/default.nix @@ -5,12 +5,12 @@ with stdenv.lib; buildPythonPackage rec { pname = "Flask-Migrate"; - version = "2.1.0"; + version = "2.1.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "716d5b68eec53821f80b3fbcb0fd60baed0cb0e320abb30289e83217668cef7f"; + sha256 = "b709ca8642559c3c5a81a33ab10839fa052177accd5ba821047a99db635255ed"; }; checkInputs = optional isPy3k glibcLocales; diff --git a/pkgs/development/python-modules/flask-restful/default.nix b/pkgs/development/python-modules/flask-restful/default.nix new file mode 100644 index 00000000000..c54c015af12 --- /dev/null +++ b/pkgs/development/python-modules/flask-restful/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k +, nose, mock, blinker +, flask, six, pytz, aniso8601, pycrypto +}: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "Flask-RESTful"; + version = "0.3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "01rlvl2iq074ciyn4schmjip7cyplkwkysbb8f610zil06am35ap"; + }; + +# TypeError: Only byte strings can be passed to C code + patchPhase = if isPy3k then '' + rm tests/test_crypto.py tests/test_paging.py + '' else null; + buildInputs = [ nose mock blinker ]; + propagatedBuildInputs = [ flask six pytz aniso8601 pycrypto ]; + PYTHON_EGG_CACHE = "`pwd`/.egg-cache"; + + meta = with stdenv.lib; { + homepage = "http://flask-restful.readthedocs.io/"; + description = "REST API building blocks for Flask"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/flask-restplus/0.8.nix b/pkgs/development/python-modules/flask-restplus/0.8.nix deleted file mode 100644 index 2c415ec47e3..00000000000 --- a/pkgs/development/python-modules/flask-restplus/0.8.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, nose -, blinker -, tzlocal -, mock -, rednose -, flask -, six -, jsonschema -, pytz -, aniso8601 -, flask-restful -}: - -buildPythonPackage rec { - pname = "flask-restplus"; - version = "0.8.6"; - name = "${pname}-${version}"; - - src = fetchPypi { - inherit pname version; - sha256 = "3bb76cc156b9a09da62396d82b29fa31e4f27cccf79528538fe7155cf2785593"; - }; - - checkInputs = [ nose blinker tzlocal mock rednose ]; - propagatedBuildInputs = [ flask six jsonschema pytz aniso8601 flask-restful ]; - - # RuntimeError: Working outside of application context. - doCheck = false; - - checkPhase = '' - nosetests - ''; - - meta = { - homepage = https://github.com/noirbizarre/flask-restplus; - description = "Fast, easy and documented API development with Flask"; - license = lib.licenses.mit; - }; -} \ No newline at end of file diff --git a/pkgs/development/python-modules/flask/default.nix b/pkgs/development/python-modules/flask/default.nix new file mode 100644 index 00000000000..b16dc08a5e1 --- /dev/null +++ b/pkgs/development/python-modules/flask/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi +, itsdangerous, click, werkzeug, jinja2 }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + version = "0.12.2"; + pname = "Flask"; + + src = fetchPypi { + inherit pname version; + sha256 = "1hfs2jr2m5lr51xd4gblb28rncd0xrpycz6c07cyqsbv4dhl9x29"; + }; + + propagatedBuildInputs = [ itsdangerous click werkzeug jinja2 ]; + + meta = with stdenv.lib; { + homepage = http://flask.pocoo.org/; + description = "A microframework based on Werkzeug, Jinja 2, and good intentions"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/flit/default.nix b/pkgs/development/python-modules/flit/default.nix new file mode 100644 index 00000000000..2154feeebb7 --- /dev/null +++ b/pkgs/development/python-modules/flit/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchPypi +, fetchurl +, isPy3k +, docutils +, requests +, requests_download +, zipfile36 +, pythonOlder +, pytest +, testpath +, responses +}: + +# Flit is actually an application to build universal wheels. +# It requires Python 3 and should eventually be moved outside of +# python-packages.nix. When it will be used to build wheels, +# care should be taken that there is no mingling of PYTHONPATH. + +buildPythonPackage rec { + pname = "flit"; + version = "0.11.4"; + name = "${pname}-${version}"; + +# format = "wheel"; + + src = fetchPypi { + inherit pname version; +# url = https://files.pythonhosted.org/packages/24/98/50a090112a04d9e29155c31a222637668b0a4dd778fefcd3132adc50e877/flit-0.10-py3-none-any.whl; + sha256 = "8ba7603cc3bf4149d81811d40fe331abc45ff37a207c63f5f712a0fdb69297bb"; + }; + + disabled = !isPy3k; + propagatedBuildInputs = [ docutils requests requests_download ] ++ lib.optional (pythonOlder "3.6") zipfile36; + + checkInputs = [ pytest testpath responses ]; + + # Disable test that needs some ini file. + checkPhase = '' + py.test -k "not test_invalid_classifier" + ''; + + meta = { + description = "A simple packaging tool for simple packages"; + homepage = https://github.com/takluyver/flit; + license = lib.licenses.bsd3; + maintainer = lib.maintainers.fridh; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/guessit/2.0.nix b/pkgs/development/python-modules/guessit/2.0.nix new file mode 100644 index 00000000000..960babd84e2 --- /dev/null +++ b/pkgs/development/python-modules/guessit/2.0.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestrunner +, dateutil +, babelfish +, rebulk +}: + +buildPythonPackage rec { + pname = "guessit"; + version = "2.0.4"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1cfcgb0px6i9jl8nwkx8j06j4y6p5975a9pfmd8lcacwr8gy4wjg"; + }; + + # Tests require more packages. + doCheck = false; + buildInputs = [ pytestrunner ]; + propagatedBuildInputs = [ + dateutil babelfish rebulk + ]; + + meta = { + homepage = http://pypi.python.org/pypi/guessit; + license = lib.licenses.lgpl3; + description = "A library for guessing information from video files"; + }; +} diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix index 0bc8b969f5a..9b2821380b9 100644 --- a/pkgs/development/python-modules/h5py/default.nix +++ b/pkgs/development/python-modules/h5py/default.nix @@ -11,13 +11,13 @@ let mpiSupport = hdf5.mpiSupport; in buildPythonPackage rec { - version = "2.7.0"; + version = "2.7.1"; pname = "h5py"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/h/h5py/${name}.tar.gz"; - sha256 = "79254312df2e6154c4928f5e3b22f7a2847b6e5ffb05ddc33e37b16e76d36310"; + sha256 = "180a688311e826ff6ae6d3bda9b5c292b90b28787525ddfcb10a29d5ddcae2cc"; }; configure_flags = "--hdf5=${hdf5}" + optionalString mpiSupport " --mpi"; diff --git a/pkgs/development/python-modules/jinja2/default.nix b/pkgs/development/python-modules/jinja2/default.nix new file mode 100644 index 00000000000..ca286ae06aa --- /dev/null +++ b/pkgs/development/python-modules/jinja2/default.nix @@ -0,0 +1,31 @@ +{ stdenv, buildPythonPackage, fetchPypi +, markupsafe }: + +buildPythonPackage rec { + pname = "Jinja2"; + version = "2.9.6"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1zzrkywhziqffrzks14kzixz7nd4yh2vc0fb04a68vfd2ai03anx"; + }; + + propagatedBuildInputs = [ markupsafe ]; + + # No tests included + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://jinja.pocoo.org/; + description = "Stand-alone template engine"; + license = licenses.bsd3; + longDescription = '' + Jinja2 is a template engine written in pure Python. It provides a + Django inspired non-XML syntax but supports inline expressions and + an optional sandboxed environment. + ''; + platforms = platforms.all; + maintainers = with maintainers; [ pierron garbas sjourdois ]; + }; +} diff --git a/pkgs/development/python-modules/jsonschema/default.nix b/pkgs/development/python-modules/jsonschema/default.nix new file mode 100644 index 00000000000..cd29d7b5d31 --- /dev/null +++ b/pkgs/development/python-modules/jsonschema/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildPythonPackage, fetchPypi, python +, nose, mock, vcversioner, functools32 }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "jsonschema"; + version = "2.6.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "00kf3zmpp9ya4sydffpifn0j0mzm342a2vzh82p6r0vh10cg7xbg"; + }; + + buildInputs = [ nose mock vcversioner ]; + propagatedBuildInputs = [ functools32 ]; + + patchPhase = '' + substituteInPlace jsonschema/tests/test_jsonschema_test_suite.py \ + --replace "python" "${python}/bin/${python.executable}" + ''; + + checkPhase = "nosetests"; + + meta = with stdenv.lib; { + homepage = https://github.com/Julian/jsonschema; + description = "An implementation of JSON Schema validation for Python"; + license = licenses.mit; + maintainers = with maintainers; [ domenkozar ]; + }; +} diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index 51c15ad6813..1379d93c6dd 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "Keras"; - version = "2.0.7"; + version = "2.0.8"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "a6c72ee2b94be1ffefe7e77b69582b9827211f0c356b2189459711844d3634c0"; + sha256 = "899dc6aaed366f20100b9f80cf1093ea5b43eecc74afd1dc63a4e48dfa776ab9"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix index 39498919708..066a9856e50 100644 --- a/pkgs/development/python-modules/m2r/default.nix +++ b/pkgs/development/python-modules/m2r/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "m2r"; name = "${pname}-${version}"; - version = "0.1.10"; + version = "0.1.11"; src = fetchPypi { inherit pname version; - sha256 = "cfb5b8a37defdd594eb46a794b87d9b4ca1902b0e8e309c9f2623f7275c261d6"; + sha256 = "7e69fe9b2752926c33399709e354da3bcca60043c7bf5e727b7126ec3a5db7db"; }; propagatedBuildInputs = [ mistune docutils ]; diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix index 7fedf4d48bb..cc1e663209e 100644 --- a/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/pkgs/development/python-modules/magic-wormhole/default.nix @@ -17,6 +17,7 @@ , humanize , pyopenssl , service-identity +, txtorcon }: buildPythonPackage rec { @@ -31,14 +32,11 @@ buildPythonPackage rec { checkInputs = [ mock ]; buildInputs = [ nettools glibcLocales ]; - propagatedBuildInputs = [ autobahn cffi click hkdf pynacl spake2 tqdm ipaddress humanize pyopenssl service-identity ]; + propagatedBuildInputs = [ autobahn cffi click hkdf pynacl spake2 tqdm ipaddress humanize pyopenssl service-identity txtorcon ]; postPatch = '' sed -i -e "s|'ifconfig'|'${nettools}/bin/ifconfig'|" src/wormhole/ipaddrs.py - sed -i -e "s|if (os.path.dirname(os.path.abspath(wormhole))|if not os.path.abspath(wormhole).startswith('/nix/store') and (os.path.dirname(os.path.abspath(wormhole))|" src/wormhole/test/test_scripts.py - # XXX: disable one test due to warning: - # setlocale: LC_ALL: cannot change locale (en_US.UTF-8) - sed -i -e "s|def test_text_subprocess|def skip_test_text_subprocess|" src/wormhole/test/test_scripts.py + sed -i -e "s|if (os.path.dirname(os.path.abspath(wormhole))|if not os.path.abspath(wormhole).startswith('/nix/store') and (os.path.dirname(os.path.abspath(wormhole))|" src/wormhole/test/test_cli.py '' + lib.optionalString (pythonAtLeast "3.3") '' sed -i -e 's|"ipaddress",||' setup.py ''; diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix index fc0bdf90627..4141b69f0cd 100644 --- a/pkgs/development/python-modules/multidict/default.nix +++ b/pkgs/development/python-modules/multidict/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , pytest , isPy3k +, psutil }: let @@ -16,7 +17,7 @@ in buildPythonPackage rec { sha256 = "875f80a046e7799b40df4b015b8fc5dae91697936872a8d7362c909a02ec6d12"; }; - buildInputs = [ pytest ]; + checkInputs = [ pytest psutil ]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/openpyxl/default.nix b/pkgs/development/python-modules/openpyxl/default.nix new file mode 100644 index 00000000000..a214af5eab7 --- /dev/null +++ b/pkgs/development/python-modules/openpyxl/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, jdcal +, et_xmlfile +, lxml +}: + +buildPythonPackage rec { + pname = "openpyxl"; + version = "2.4.8"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "ee7551efb70648fa8ee569c2b6a6dbbeff390cc94b321da5d508a573b90a4f17"; + }; + + checkInputs = [ pytest ]; + propagatedBuildInputs = [ jdcal et_xmlfile lxml ]; + + # Tests are not included in archive. + # https://bitbucket.org/openpyxl/openpyxl/issues/610 + doCheck = false; + + meta = { + description = "A Python library to read/write Excel 2007 xlsx/xlsm files"; + homepage = https://openpyxl.readthedocs.org; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ lihop sjourdois ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/oslo-config/default.nix b/pkgs/development/python-modules/oslo-config/default.nix index 6323e72e2a5..51b2f0df75d 100644 --- a/pkgs/development/python-modules/oslo-config/default.nix +++ b/pkgs/development/python-modules/oslo-config/default.nix @@ -19,4 +19,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace requirements.txt --replace "argparse" "" ''; + + # Requires a bunch of new packages + meta.broken = true; } diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index ca3f20d7ca3..7bab184bb2a 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -76,8 +76,13 @@ in buildPythonPackage rec { chmod a+x pbcopy pbpaste export PATH=$(pwd):$PATH '' + '' + # since dateutil 0.6.0 the following fails: test_fallback_plural, test_ambiguous_flags, test_ambiguous_compat + # was supposed to be solved by https://github.com/dateutil/dateutil/issues/321, but is not the case py.test $out/${python.sitePackages}/pandas --skip-slow --skip-network \ - ${if isDarwin then "-k 'not test_locale and not test_clipboard'" else ""} + -k "not test_fallback_plural and \ + not test_ambiguous_flags and \ + not test_ambiguous_compat \ + ${optionalString isDarwin "and not test_locale and not test_clipboard"}" runHook postCheck ''; diff --git a/pkgs/development/python-modules/portend/default.nix b/pkgs/development/python-modules/portend/default.nix new file mode 100644 index 00000000000..cb418678a99 --- /dev/null +++ b/pkgs/development/python-modules/portend/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pytest, pytest-sugar, pytest-warnings, setuptools_scm +, tempora }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "portend"; + version = "2.1.2"; + + buildInputs = [ pytest pytest-sugar pytest-warnings setuptools_scm ]; + propagatedBuildInputs = [ tempora ]; + + src = fetchPypi { + inherit pname version; + sha256 = "0dx8b1rn64ymx5s4mdzlw5hz59qi167z7nny36dl75ghlldn41w4"; + }; + + meta = with stdenv.lib; { + description = "Monitor TCP ports for bound or unbound states"; + homepage = https://github.com/jaraco/portend; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/prompt_toolkit/default.nix b/pkgs/development/python-modules/prompt_toolkit/default.nix new file mode 100644 index 00000000000..9704f1b92c9 --- /dev/null +++ b/pkgs/development/python-modules/prompt_toolkit/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, docopt +, six +, wcwidth +, pygments +}: + +buildPythonPackage rec { + pname = "prompt_toolkit"; + name = "${pname}-${version}"; + version = "1.0.15"; + + src = fetchPypi { + inherit pname version; + sha256 = "858588f1983ca497f1cf4ffde01d978a3ea02b01c8a26a8bbc5cd2e66d816917"; + }; + checkPhase = '' + rm prompt_toolkit/win32_types.py + py.test -k 'not test_pathcompleter_can_expanduser' + ''; + + checkInputs = [ pytest ]; + propagatedBuildInputs = [ docopt six wcwidth pygments ]; + + meta = { + description = "Python library for building powerful interactive command lines"; + longDescription = '' + prompt_toolkit could be a replacement for readline, but it can be + much more than that. It is cross-platform, everything that you build + with it should run fine on both Unix and Windows systems. Also ships + with a nice interactive Python shell (called ptpython) built on top. + ''; + homepage = https://github.com/jonathanslenders/python-prompt-toolkit; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ nckx ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix index 14822578761..9751eaf7ce7 100644 --- a/pkgs/development/python-modules/pycryptodome/default.nix +++ b/pkgs/development/python-modules/pycryptodome/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, python, buildPythonPackage, gmp }: buildPythonPackage rec { - version = "3.4.6"; + version = "3.4.7"; pname = "pycryptodome"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/p/pycryptodome/${name}.tar.gz"; - sha256 = "df1be662060cf3abdcf2086ebb401f750744106425ddebf74c57feab410e4923"; + sha256 = "18d8dfe31bf0cb53d58694903e526be68f3cf48e6e3c6dfbbc1e7042b1693af7"; }; meta = { diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index 8465c205295..7a59690e5b0 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pyroute2"; - version = "0.4.19"; + version = "0.4.21"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/p/pyroute2/${name}.tar.gz"; - sha256 = "122a1e34702287b805742a6edd8fe8483608238bd1602df2d5e3274bd8e8030a"; + sha256 = "7afad28ee0a0f3e7c34adaa9f953d00560ed9910203e93f107833b6e8d151171"; }; # requires root priviledges diff --git a/pkgs/development/python-modules/pyshp/default.nix b/pkgs/development/python-modules/pyshp/default.nix index 4629331e52d..ea38c096ee1 100644 --- a/pkgs/development/python-modules/pyshp/default.nix +++ b/pkgs/development/python-modules/pyshp/default.nix @@ -2,13 +2,13 @@ , setuptools }: buildPythonPackage rec { - version = "1.2.3"; + version = "1.2.12"; pname = "pyshp"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "e18cc19659dadc5ddaa891eb780a6958094da0cf105a1efe0f67e75b4fa1cdf9"; + sha256 = "8dcd65e0aa2aa2951527ddb7339ea6e69023543d8a20a73fc51e2829b9ed6179"; }; buildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pytest-flake8/default.nix b/pkgs/development/python-modules/pytest-flake8/default.nix index 93883283627..b39737ea701 100644 --- a/pkgs/development/python-modules/pytest-flake8/default.nix +++ b/pkgs/development/python-modules/pytest-flake8/default.nix @@ -1,4 +1,4 @@ -{lib, buildPythonPackage, fetchPypi, pytest, flake8}: +{lib, buildPythonPackage, fetchPypi, fetchpatch, pytest, flake8}: buildPythonPackage rec { name = "${pname}-${version}"; @@ -16,6 +16,16 @@ buildPythonPackage rec { sha256 = "1za5i09gz127yraigmcl443w6149714l279rmlfxg1bl2kdsc45a"; }; + patches = [ + # Fix pytest strict mode (pull request #24) + # https://github.com/tholo/pytest-flake8/pull/24 + (fetchpatch { + name = "fix-compatibility-with-pytest-strict-mode.patch"; + url = "https://github.com/tholo/pytest-flake8/commit/434e1b07b4b77bfe1ddb9b2b54470c6c3815bb1a.patch"; + sha256 = "0idwgkwwysx2cibnykd81yxrgqzkpf42j99jmpnanqzi99qnc3wx"; + }) + ]; + checkPhase = '' pytest --ignore=nix_run_setup.py . ''; diff --git a/pkgs/development/python-modules/pytest-sugar/default.nix b/pkgs/development/python-modules/pytest-sugar/default.nix new file mode 100644 index 00000000000..2965d169599 --- /dev/null +++ b/pkgs/development/python-modules/pytest-sugar/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi, termcolor, pytest }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "pytest-sugar"; + version = "0.9.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "11lni9kn0r1y896xg20qjv4yjcyr56h0hx9dprdgjnam4dqcl6lg"; + }; + + propagatedBuildInputs = [ termcolor pytest ]; + + meta = with stdenv.lib; { + description = "A plugin that changes the default look and feel of py.test"; + homepage = https://github.com/Frozenball/pytest-sugar; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/pytest-warnings/default.nix b/pkgs/development/python-modules/pytest-warnings/default.nix new file mode 100644 index 00000000000..6b835abcafe --- /dev/null +++ b/pkgs/development/python-modules/pytest-warnings/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchPypi, pytest }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "pytest-warnings"; + version = "0.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "18yxh153icmndaw8fkl1va0bk0mwzrbpaa6wxd29w3iwxym5zn2a"; + }; + + propagatedBuildInputs = [ pytest ]; + + meta = { + description = "Plugin to list Python warnings in pytest report"; + homepage = github.com/fschulze/pytest-warnings; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/pytimeparse/default.nix b/pkgs/development/python-modules/pytimeparse/default.nix index ce5ff058664..374263c2b70 100644 --- a/pkgs/development/python-modules/pytimeparse/default.nix +++ b/pkgs/development/python-modules/pytimeparse/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pytimeparse"; - version = "1.1.6"; + version = "1.1.7"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0imbb68i5n5fm704gv47if1blpxd4f8g16qmp5ar07cavgh2mibl"; + sha256 = "51b641bcd435e0cb6b9701ed79cf7ee97fa6bf2dbb5d41baa16e5486e5d9b17a"; }; propagatedBuildInputs = [ nose ]; diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix new file mode 100644 index 00000000000..b85bb54a4f1 --- /dev/null +++ b/pkgs/development/python-modules/requests/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchPypi, buildPythonPackage +, urllib3, idna, chardet, certifi +, pytest }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "requests"; + version = "2.18.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "0zi3v9nsmv9j27d0c0m1dvqyvaxz53g8m0aa1h3qanxs4irkwi4w"; + }; + + nativeBuildInputs = [ pytest ]; + propagatedBuildInputs = [ urllib3 idna chardet certifi ]; + # sadly, tests require networking + doCheck = false; + + meta = with stdenv.lib; { + description = "An Apache2 licensed HTTP library, written in Python, for human beings"; + homepage = http://docs.python-requests.org/en/latest/; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/restructuredtext_lint/default.nix b/pkgs/development/python-modules/restructuredtext_lint/default.nix new file mode 100644 index 00000000000..1a863c62973 --- /dev/null +++ b/pkgs/development/python-modules/restructuredtext_lint/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, docutils +, nose +, stdenv +, flake8 +, pyyaml +, testtools +}: + +buildPythonPackage rec { + pname = "restructuredtext_lint"; + version = "1.1.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "167e8adaa5bdc30531ee91760d6c216b306a8a3372aad34b1f72d8adcc5e011e"; + }; + + checkInputs = [ nose flake8 pyyaml testtools ]; + propagatedBuildInputs = [ docutils ]; + + checkPhase = '' + ${stdenv.shell} test.sh + ''; + + meta = { + description = "reStructuredText linter"; + homepage = https://github.com/twolfson/restructuredtext-lint; + license = lib.licenses.unlicense; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/semver/default.nix b/pkgs/development/python-modules/semver/default.nix index 2d592962558..f2f3069fbf9 100644 --- a/pkgs/development/python-modules/semver/default.nix +++ b/pkgs/development/python-modules/semver/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "semver"; - version = "2.7.7"; + version = "2.7.8"; src = fetchPypi { inherit pname version; - sha256 = "20ffbb50248a6141bb9eba907db0e47ee4a239ddb55fe0ada8696fc241495a9d"; + sha256 = "a6212f5c552452e306502ac8476bbca48af62db29c4528fdd91d319d0a44b07b"; }; # No tests in archive diff --git a/pkgs/development/python-modules/service_identity/default.nix b/pkgs/development/python-modules/service_identity/default.nix new file mode 100644 index 00000000000..d27c4fe2975 --- /dev/null +++ b/pkgs/development/python-modules/service_identity/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, characteristic +, pyasn1 +, pyasn1-modules +, pyopenssl +, idna +, attrs +, pytest +}: + +buildPythonPackage rec { + pname = "service_identity"; + version = "17.0.0"; + name = "${pname}-${version}"; + + + src = fetchPypi { + inherit pname version; + sha256 = "4001fbb3da19e0df22c47a06d29681a398473af4aa9d745eca525b3b2c2302ab"; + }; + + propagatedBuildInputs = [ + characteristic pyasn1 pyasn1-modules pyopenssl idna attrs + ]; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + py.test + ''; + + # Tests not included in archive + doCheck = false; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/sphinx-testing/default.nix b/pkgs/development/python-modules/sphinx-testing/default.nix new file mode 100644 index 00000000000..2efb23c8086 --- /dev/null +++ b/pkgs/development/python-modules/sphinx-testing/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, mock +, sphinx +, six +, python +}: + +buildPythonPackage rec { + pname = "sphinx-testing"; + version = "0.7.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "9d30f93007620e137b33edf19f52a7225eab853546b7e588ef09d1342e821e94"; + }; + + checkInputs = [ mock ]; + propagatedBuildInputs = [ sphinx six ]; + + checkPhase = '' + ${python.interpreter} -m unittest discover -s tests + ''; + + # Test failures https://github.com/sphinx-doc/sphinx-testing/issues/5 + doCheck = false; + + meta = { + homepage = https://github.com/sphinx-doc/sphinx-testing; + license = lib.licenses.bsd2; + description = "Testing utility classes and functions for Sphinx extensions"; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix index 9cf1ba1b3d8..9b431f29acb 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"; }; - buildInputs = [ unittest2 scripttest pytz pylint tempest-lib mock testtools ]; + checkInputs = [ unittest2 scripttest pytz pylint mock testtools ]; propagatedBuildInputs = [ pbr tempita decorator sqlalchemy six sqlparse ]; checkPhase = '' @@ -27,6 +27,9 @@ buildPythonPackage rec { ${python.interpreter} setup.py test ''; + # Tests require tempest-lib which requires the broken oslo-config + doCheck = false; + meta = with stdenv.lib; { homepage = http://code.google.com/p/sqlalchemy-migrate/; description = "Schema migration tools for SQLAlchemy"; diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index a440abb5149..b976524ba69 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.1.8"; + version = "1.1.9"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "f8f88fc7fe0ba81a7558902f87df31c052e27404caa26a160174747afcaebe49"; + sha256 = "3387ba58383f4e8131f109b40e2b001dec436f38cd9b9b78d38871b8608fdd9e"; }; # No tests in archive diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix index 69006a31905..a8eba4cb3a0 100644 --- a/pkgs/development/python-modules/tempora/default.nix +++ b/pkgs/development/python-modules/tempora/default.nix @@ -1,19 +1,20 @@ { stdenv, buildPythonPackage, fetchPypi -, setuptools_scm, six }: +, setuptools_scm +, six, pytz}: buildPythonPackage rec { - version = "1.4"; - pname = "tempora"; name = "${pname}-${version}"; + pname = "tempora"; + version = "1.8"; src = fetchPypi { inherit pname version; - sha256 = "0ysvns22i5hzhl5ln4n86bq10j8xwvd09z8qw1zjr3s0fj3lynza"; + sha256 = "1b29d19r8h5my9kzzywi9khn1qzvk3qzp08k0f4rrsa7qks930l4"; }; doCheck = false; buildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = [ six pytz ]; } diff --git a/pkgs/development/python-modules/testtools/default.nix b/pkgs/development/python-modules/testtools/default.nix new file mode 100644 index 00000000000..d1f3a5feeaa --- /dev/null +++ b/pkgs/development/python-modules/testtools/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pbr +, python_mimeparse +, extras +, lxml +, unittest2 +, traceback2 +, isPy3k +}: + +buildPythonPackage rec { + pname = "testtools"; + version = "1.8.0"; + name = "${pname}-${version}"; + + # Python 2 only judging from SyntaxError +# disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "15yxz8d70iy1b1x6gd7spvblq0mjxjardl4vnaqasxafzc069zca"; + }; + + propagatedBuildInputs = [ pbr python_mimeparse extras lxml unittest2 ]; + buildInputs = [ traceback2 ]; + patches = [ ./testtools_support_unittest2.patch ]; + + # No tests in archive + doCheck = false; + + meta = { + description = "A set of extensions to the Python standard library's unit testing framework"; + homepage = http://pypi.python.org/pypi/testtools; + license = lib.licenses.mit; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/testtools_support_unittest2.patch b/pkgs/development/python-modules/testtools/testtools_support_unittest2.patch similarity index 100% rename from pkgs/development/python-modules/testtools_support_unittest2.patch rename to pkgs/development/python-modules/testtools/testtools_support_unittest2.patch diff --git a/pkgs/development/python-modules/tornado/default.nix b/pkgs/development/python-modules/tornado/default.nix index 11078eb8562..bc39745945d 100644 --- a/pkgs/development/python-modules/tornado/default.nix +++ b/pkgs/development/python-modules/tornado/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tornado"; - version = "4.5.1"; + version = "4.5.2"; name = "${pname}-${version}"; propagatedBuildInputs = [ backports_abc backports_ssl_match_hostname certifi singledispatch ]; @@ -23,6 +23,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "db0904a28253cfe53e7dedc765c71596f3c53bb8a866ae50123320ec1a7b73fd"; + sha256 = "1fb8e494cd46c674d86fac5885a3ff87b0e283937a47d74eb3c02a48c9e89ad0"; }; } diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix index 5ee984941d0..6bd7355b34d 100644 --- a/pkgs/development/python-modules/treq/default.nix +++ b/pkgs/development/python-modules/treq/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchPypi, buildPythonPackage, service-identity, requests, six -, mock, twisted, incremental, pep8 }: +, mock, twisted, incremental, pep8, httpbin +}: buildPythonPackage rec { name = "${pname}-${version}"; @@ -11,11 +12,20 @@ buildPythonPackage rec { sha256 = "ef72d2d5e0b24bdf29267b608fa33df0ac401743af8524438b073e1fb2b66f16"; }; - propagatedBuildInputs = [ twisted requests six incremental service-identity ]; + propagatedBuildInputs = [ + requests + six + incremental + service-identity + twisted + # twisted [tls] requirements (we should find a way to list "extras") + twisted.extras.tls + ]; checkInputs = [ pep8 mock + httpbin ]; postPatch = '' @@ -35,6 +45,9 @@ buildPythonPackage rec { trial treq ''; + # Failing tests https://github.com/twisted/treq/issues/208 + doCheck = false; + meta = with stdenv.lib; { homepage = http://github.com/twisted/treq; description = "A requests-like API built on top of twisted.web's Agent"; diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index 66a6022802f..8acbfc91a41 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -1,5 +1,15 @@ -{ stdenv, buildPythonPackage, fetchurl, python, - zope_interface, incremental, automat, constantly, hyperlink +{ stdenv +, buildPythonPackage +, fetchurl +, python +, zope_interface +, incremental +, automat +, constantly +, hyperlink +, pyopenssl +, service-identity +, idna }: buildPythonPackage rec { pname = "Twisted"; @@ -13,6 +23,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ zope_interface incremental automat constantly hyperlink ]; + passthru.extras.tls = [ pyopenssl service-identity idna ]; + # Patch t.p._inotify to point to libc. Without this, # twisted.python.runtime.platform.supportsINotify() == False patchPhase = stdenv.lib.optionalString stdenv.isLinux '' diff --git a/pkgs/development/python-modules/txtorcon/default.nix b/pkgs/development/python-modules/txtorcon/default.nix new file mode 100644 index 00000000000..60947bc769c --- /dev/null +++ b/pkgs/development/python-modules/txtorcon/default.nix @@ -0,0 +1,39 @@ +{lib, buildPythonPackage, fetchPypi, isPy3k, incremental, ipaddress, twisted +, automat, zope_interface, idna, pyopenssl, service-identity, pytest, mock, lsof +, GeoIP}: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "txtorcon"; + version = "0.19.3"; + + checkInputs = [ pytest mock lsof GeoIP ]; + propagatedBuildInputs = [ + incremental twisted automat zope_interface + # extra dependencies required by twisted[tls] + idna pyopenssl service-identity + ] ++ lib.optionals (!isPy3k) [ ipaddress ]; + + src = fetchPypi { + inherit pname version; + sha256 = "1za4qag4g2lbw695v4ssxqc2aspdyknnbn2diylwg8q9g5k9cczp"; + }; + + # ipaddress isn't required for Python 3 although it's in requirements.txt. + # Because ipaddress doesn't install on Python 3, remove the requirement so the + # installation of this package doesn't fail on Python 3. + postPatch = "" + lib.optionalString isPy3k '' + substituteInPlace requirements.txt --replace "ipaddress>=1.0.16" "" + ''; + + checkPhase = '' + pytest . + ''; + + meta = { + description = "Twisted-based Tor controller client, with state-tracking and configuration abstractions"; + homepage = https://github.com/meejah/txtorcon; + maintainers = with lib.maintainers; [ jluttine ]; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/tzlocal/default.nix b/pkgs/development/python-modules/tzlocal/default.nix new file mode 100644 index 00000000000..2277cb7c4ca --- /dev/null +++ b/pkgs/development/python-modules/tzlocal/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi +, tzlocal, pytz }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "tzlocal"; + version = "1.4"; + + propagatedBuildInputs = [ pytz ]; + + src = fetchPypi { + inherit pname version; + sha256 = "0n9hw4kqblyc0avzwi26rqmvyk9impb608rvy11qifmigy7r18h5"; + }; + + # test fail (timezone test fail) + doCheck = false; + + meta = with stdenv.lib; { + description = "Tzinfo object for the local timezone"; + homepage = https://github.com/regebro/tzlocal; + license = licenses.cddl; + }; +} diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix new file mode 100644 index 00000000000..a23ae0f0b74 --- /dev/null +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -0,0 +1,32 @@ +{ stdenv, buildPythonPackage, fetchPypi +, coverage, tornado, mock, nose, psutil, pysocks }: + +buildPythonPackage rec { + pname = "urllib3"; + version = "1.22"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0kyvc9zdlxr5r96bng5rhm9a6sfqidrbvvkz64s76qs5267dli6c"; + }; + + NOSE_EXCLUDE = stdenv.lib.concatStringsSep "," [ + "test_headers" "test_headerdict" "test_can_validate_ip_san" "test_delayed_body_read_timeout" + "test_timeout_errors_cause_retries" "test_select_multiple_interrupts_with_event" + ]; + + checkPhase = '' + nosetests -v --cover-min-percentage 1 + ''; + + doCheck = false; + + buildInputs = [ coverage tornado mock nose psutil pysocks ]; + + meta = with stdenv.lib; { + description = "A Python library for Dropbox's HTTP-based Core and Datastore APIs"; + homepage = https://www.dropbox.com/developers/core/docs; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/vcversioner/default.nix b/pkgs/development/python-modules/vcversioner/default.nix new file mode 100644 index 00000000000..1b9819c035d --- /dev/null +++ b/pkgs/development/python-modules/vcversioner/default.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "vcversioner"; + version = "2.16.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "16z10sm78jd7ca3jbkgc3q5i8a8q7y1h21q1li21yy3rlhbhrrns"; + }; + + meta = with stdenv.lib; { + description = "take version numbers from version control"; + homepage = https://github.com/habnabit/vcversioner; + licenses = licenses.isc; + }; +} diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix new file mode 100644 index 00000000000..5979d895a74 --- /dev/null +++ b/pkgs/development/python-modules/werkzeug/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonPackage, fetchPypi +, itsdangerous +, pytest, requests, glibcLocales }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "Werkzeug"; + version = "0.12.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "09mv4cya3lywkn4mi3qrqmjgwiw99kdk03dk912j8da6ny3pnflh"; + }; + + LC_ALL = "en_US.UTF-8"; + + propagatedBuildInputs = [ itsdangerous ]; + buildInputs = [ pytest requests glibcLocales ]; + + meta = with stdenv.lib; { + homepage = http://werkzeug.pocoo.org/; + description = "A WSGI utility library for Python"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/zetup/default.nix b/pkgs/development/python-modules/zetup/default.nix index 66a4718fe9e..a682a6e4e92 100644 --- a/pkgs/development/python-modules/zetup/default.nix +++ b/pkgs/development/python-modules/zetup/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "zetup"; - version = "0.2.34"; + version = "0.2.42"; src = fetchPypi { inherit pname version; - sha256 = "0k4lm51b5qjy7yxy3n5z8vc5hlvjcsfsvwjgqzkr0pisysar1kpf"; + sha256 = "6c9e25249f3014ed2162398772ccf1a5e8a4e9e66c74e3c7f6683945a6a3d84c"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/zxcvbn-python/default.nix b/pkgs/development/python-modules/zxcvbn-python/default.nix index 66a0f8d77aa..49ff6e505f4 100644 --- a/pkgs/development/python-modules/zxcvbn-python/default.nix +++ b/pkgs/development/python-modules/zxcvbn-python/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "zxcvbn-python"; - version = "4.4.15"; + version = "4.4.16"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "ef982a382518d217d353a42093aa8bb8608a50bc2df559c08885bba166782cd0"; + sha256 = "63cc481bfb8950c43d4a87926be22cf8c4bb281ef7f818a8ef2d30b55a97c3e0"; }; # No tests in archive diff --git a/pkgs/tools/admin/ansible/2.1.nix b/pkgs/tools/admin/ansible/2.1.nix index 5a20b525607..6232e4ad95b 100644 --- a/pkgs/tools/admin/ansible/2.1.nix +++ b/pkgs/tools/admin/ansible/2.1.nix @@ -7,16 +7,14 @@ with pythonPackages; let - jinja = jinja2.override rec { - pname = "Jinja2"; + jinja = jinja2.overridePythonAttrs (old: rec { version = "2.8.1"; - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/J/Jinja2/${name}.tar.gz"; + name = "${old.pname}-${version}"; + src = old.src.override { + inherit version; sha256 = "35341f3a97b46327b3ef1eb624aadea87a535b8f50863036e085e7c426ac5891"; }; - }; - + }); in buildPythonPackage rec { pname = "ansible"; version = "2.1.4.0"; diff --git a/pkgs/tools/admin/ansible/2.2.nix b/pkgs/tools/admin/ansible/2.2.nix index 528dbf0e97b..02392d7ac89 100644 --- a/pkgs/tools/admin/ansible/2.2.nix +++ b/pkgs/tools/admin/ansible/2.2.nix @@ -9,12 +9,11 @@ with pythonPackages; let # Shouldn't be needed anymore in next version # https://github.com/NixOS/nixpkgs/pull/22345#commitcomment-20718521 - jinja = (jinja2.override rec { - pname = "Jinja2"; + jinja = jinja2.overridePythonAttrs (old: rec { version = "2.8.1"; - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/J/Jinja2/${name}.tar.gz"; + name = "${old.pname}-${version}"; + src = old.src.override { + inherit version; sha256 = "35341f3a97b46327b3ef1eb624aadea87a535b8f50863036e085e7c426ac5891"; }; }); diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 14bb5158a2d..2c811c05777 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -315,38 +315,7 @@ in { aiofiles = callPackage ../development/python-modules/aiofiles { }; - aiohttp = - let yarl_0_9_8 = self.yarl.overrideAttrs (old: rec { - pname = "yarl"; - version = "0.9.8"; - name = "${pname}-${version}"; - src = pkgs.fetchurl { - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "1v2dsmr7bqp0yx51pwhbxyvzza8m2f88prsnbd926mi6ah38p0d7"; - }; - }); - in buildPythonPackage rec { - name = "aiohttp-${version}"; - version = "1.3.5"; - - src = pkgs.fetchurl { - url = "mirror://pypi/a/aiohttp/${name}.tar.gz"; - sha256 = "0hpqdiaifgyfqmxkyzwypwvrnvz5rqzgzylzhihfidc5ldfs856d"; - }; - - disabled = pythonOlder "3.4"; - - doCheck = false; # Too many tests fail. - - buildInputs = with self; [ pytest gunicorn pytest-raisesregexp ]; - propagatedBuildInputs = with self; [ async-timeout chardet multidict yarl_0_9_8 ]; - - meta = { - description = "Http client/server for asyncio"; - license = with licenses; [ asl20 ]; - homepage = https://github.com/KeepSafe/aiohttp/; - }; - }; + aiohttp = callPackage ../development/python-modules/aiohttp { }; aiohttp-cors = buildPythonPackage rec { name = "${pname}-${version}"; @@ -682,29 +651,7 @@ in { }; }); - attrs = buildPythonPackage (rec { - name = "attrs-${version}"; - version = "16.2.0"; - src = pkgs.fetchurl { - url = "mirror://pypi/a/attrs/${name}.tar.gz"; - sha256 = "136f2ec0f94ec77ff2990830feee965d608cab1e8922370e3abdded383d52001"; - }; - - # macOS needs clang for testing - buildInputs = with self; [ pytest hypothesis zope_interface - pympler coverage ] - ++ optionals (stdenv.isDarwin) [ pkgs.clang ]; - - checkPhase = '' - py.test - ''; - - meta = { - description = "Python attributes without boilerplate"; - homepage = https://github.com/hynek/attrs; - license = licenses.mit; - }; - }); + attrs = callPackage ../development/python-modules/attrs { }; audioread = callPackage ../development/python-modules/audioread { }; @@ -1263,6 +1210,8 @@ in { }; }; + backports_unittest-mock = callPackage ../development/python-modules/backports_unittest-mock {}; + babelfish = buildPythonPackage rec { version = "0.5.5"; name = "babelfish-${version}"; @@ -1361,26 +1310,7 @@ in { }; }); - beautifulsoup4 = buildPythonPackage (rec { - name = "beautifulsoup4-4.5.3"; - - src = pkgs.fetchurl { - url = "mirror://pypi/b/beautifulsoup4/${name}.tar.gz"; - sha256 = "0glaw1vyxnbp03fni7h5496n6iib0n5iim4gax1n0ngscs9s075j"; - }; - - buildInputs = [ self.nose ]; - checkPhase = '' - nosetests build/ - ''; - - meta = { - homepage = http://crummy.com/software/BeautifulSoup/bs4/; - description = "HTML and XML parser"; - license = licenses.mit; - maintainers = with maintainers; [ domenkozar ]; - }; - }); + beautifulsoup4 = callPackage ../development/python-modules/beautifulsoup4 { }; beaker = buildPythonPackage rec { name = "Beaker-${version}"; @@ -1661,6 +1591,8 @@ in { channels = callPackage ../development/python-modules/channels {}; + cheroot = callPackage ../development/python-modules/cheroot {}; + circus = buildPythonPackage rec { name = "circus-0.11.1"; @@ -2178,54 +2110,9 @@ in { }; }; - bokeh = buildPythonPackage rec { - name = "bokeh-${version}"; - version = "0.12.3"; + bkcharts = callPackage ../development/python-modules/bkcharts { }; - src = pkgs.fetchurl { - url = "mirror://pypi/b/bokeh/${name}.tar.gz"; - sha256 = "e138941b62f59bc48bc5b8d249e90c03fed31c1d5abe47ab2ce9e4c83202f73c"; - }; - - disabled = isPyPy; - - # Some test that uses tornado fails - doCheck = false; - - buildInputs = with self; [ mock pytest ]; - - propagatedBuildInputs = with self; [ - flask - jinja2 - markupsafe - werkzeug - itsdangerous - dateutil - requests - six - pygments - pystache - markdown - pyyaml - pyzmq - tornado - colorama - ] - ++ optionals ( !isPy3k ) [ futures ] - ++ optionals ( isPy26 ) [ argparse ] - ++ optionals ( !isPy3k && !isPyPy ) [ websocket_client ] - ++ optionals ( !isPyPy ) [ numpy pandas greenlet ]; - - checkPhase = '' - ${python.interpreter} -m unittest discover -s bokeh/tests - ''; - - meta = { - description = "Statistical and novel interactive HTML plots for Python"; - homepage = "http://github.com/bokeh/bokeh"; - license = licenses.bsd3; - }; - }; + bokeh = callPackage ../development/python-modules/bokeh { }; boto = buildPythonPackage rec { name = "boto-${version}"; @@ -2793,27 +2680,7 @@ in { }; }; - - cherrypy = buildPythonPackage (rec { - name = "cherrypy-${version}"; - version = "8.7.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/C/CherryPy/CherryPy-${version}.tar.gz"; - sha256 = "cbf418bf46458a67eb841944f2d414c23bf59d090baf2a28704bd67243e6a79f"; - }; - - # wsgiserver.ssl_pyopenssl is broken on py3k. - doCheck = !isPy3k; - buildInputs = with self; [ pytest setuptools_scm pytestrunner ]; - propagatedBuildInputs = with self; [ six ]; - - meta = { - homepage = "http://www.cherrypy.org"; - description = "A pythonic, object-oriented HTTP framework"; - }; - }); - + cherrypy = callPackage ../development/python-modules/cherrypy {}; cjson = buildPythonPackage rec { name = "python-cjson-${version}"; @@ -3319,15 +3186,7 @@ in { }; - contextlib2 = buildPythonPackage rec { - name = "contextlib2-${version}"; - version = "0.5.3"; - - src = pkgs.fetchurl rec { - url = "mirror://pypi/c/contextlib2/${name}.tar.gz"; - sha256 = "01k2921labkbn28kw60jmqzvr4nxzfnx4vcsyjb3rir177qh1r9h"; - }; - }; + contextlib2 = callPackage ../development/python-modules/contextlib2 { }; cookiecutter = buildPythonPackage rec { version = "1.4.0"; @@ -3372,24 +3231,7 @@ in { coveralls = callPackage ../development/python-modules/coveralls { }; - coverage = buildPythonPackage rec { - name = "coverage-4.0.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/coverage/${name}.tar.gz"; - sha256 = "0nrd817pzjw1haaz6gambgwf4jdjnh9kyxkgj6l8qgl6hdxga45w"; - }; - - # TypeError: __call__() takes 1 positional argument but 2 were given - doCheck = !isPy3k; - buildInputs = with self; [ mock ]; - - meta = { - description = "Code coverage measurement for python"; - homepage = http://nedbatchelder.com/code/coverage/; - license = licenses.bsd3; - }; - }; + coverage = callPackage ../development/python-modules/coverage { }; covCore = buildPythonPackage rec { name = "cov-core-1.15.0"; @@ -3490,12 +3332,12 @@ in { cryptography = buildPythonPackage rec { # also bump cryptography_vectors pname = "cryptography"; - name = "${pname}${version}"; - version = "1.8.1"; + name = "${pname}-${version}"; + version = "2.0.3"; src = fetchPypi { inherit pname version; - sha256 = "323524312bb467565ebca7e50c8ae5e9674e544951d28a2904a50012a8828190"; + sha256 = "d04bb2425086c3fe86f7bc48915290b13e798497839fbb18ab7f6dffcf98cc3a"; }; buildInputs = [ pkgs.openssl self.cryptography_vectors ] @@ -3533,12 +3375,12 @@ in { cryptography_vectors = buildPythonPackage rec { # also bump cryptography pname = "cryptography_vectors"; - name = "${pname}${version}"; - version = "1.8.1"; + version = self.cryptography.version; + name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "2fd61facea08800ca98ac923f6d02f48a7ae6648025b29cdeb51987c1532add6"; + sha256 = "beb831aa73663a224f4d7520483ed02da544533bb03b26ec07a5f9a0dd0941e1"; }; # No tests included @@ -4275,6 +4117,8 @@ in { }; }; + pytest-warnings = callPackage ../development/python-modules/pytest-warnings { }; + pytestpep8 = buildPythonPackage rec { name = "pytest-pep8"; src = pkgs.fetchurl { @@ -4485,6 +4329,8 @@ in { }; }; + pytest-sugar = callPackage ../development/python-modules/pytest-sugar { }; + tinycss = buildPythonPackage rec { name = "tinycss-${version}"; version = "0.3"; @@ -5108,24 +4954,7 @@ in { }; - dill = buildPythonPackage rec { - name = "dill-${version}"; - version = "0.2.6"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/dill/${name}.zip"; - sha256 = "6c1ccca68be483fa8c66e85a89ffc850206c26373aa77a97b83d8d0994e7f1fd"; - }; - - # TypeError: don't know how to make test from: {'byref': False, 'recurse': False, 'protocol': 3, 'fmode': 0} - doCheck = false; - - meta = { - description = "Serialize all of python (almost)"; - homepage = http://www.cacr.caltech.edu/~mmckerns/dill.htm; - license = licenses.bsd3; - }; - }; + dill = callPackage ../development/python-modules/dill { }; discogs_client = buildPythonPackage rec { name = "discogs-client-2.0.2"; @@ -5355,38 +5184,7 @@ in { }; }; - urllib3 = let - disabled_tests = [ - "test_headers" "test_headerdict" "test_can_validate_ip_san" "test_delayed_body_read_timeout" - "test_timeout_errors_cause_retries" "test_select_multiple_interrupts_with_event" - ]; - in buildPythonPackage rec { - pname = "urllib3"; - version = "1.20"; - name = "${pname}-${version}"; - - src = fetchPypi { - inherit pname version; - sha256 = "0bx76if7shzlyykmaj4fhjkir5bswc4fdx5r4q0lrn3q51p2pvwp"; - }; - - NOSE_EXCLUDE=concatStringsSep "," disabled_tests; - - checkPhase = '' - nosetests -v --cover-min-percentage 1 - ''; - - doCheck = false; - - buildInputs = with self; [ coverage tornado mock nose psutil pysocks ]; - - meta = { - description = "A Python library for Dropbox's HTTP-based Core and Datastore APIs"; - homepage = https://www.dropbox.com/developers/core/docs; - license = licenses.mit; - }; - }; - + urllib3 = callPackage ../development/python-modules/urllib3 {}; dropbox = buildPythonPackage rec { name = "dropbox-${version}"; @@ -5540,19 +5338,7 @@ in { }; }); - entrypoints = buildPythonPackage rec { - pname = "entrypoints"; - version = "0.2.2"; - name = "${pname}-${version}"; - format = "wheel"; - - src = fetchPypi { - inherit pname version format; - sha256 = "0a0685962ee5ac303f470acbb659f0f97aef5b9deb6b85d059691c706ef6e45e"; - }; - - propagatedBuildInputs = with self; [ configparser ]; - }; + entrypoints = callPackage ../development/python-modules/entrypoints { }; enzyme = callPackage ../development/python-modules/enzyme {}; @@ -5867,28 +5653,7 @@ in { propagatedBuildInputs = with self; [ rpkg offtrac urlgrabber fedora_cert ]; }); - flit = buildPythonPackage rec { - pname = "flit"; - version = "0.10"; - name = "${pname}-${version}"; - - format = "wheel"; - - src = pkgs.fetchurl { - url = https://files.pythonhosted.org/packages/24/98/50a090112a04d9e29155c31a222637668b0a4dd778fefcd3132adc50e877/flit-0.10-py3-none-any.whl; - sha256 = "4566b2e1807abeb1fd7bfaa9b444447556f1720518edfb134b56a6a1272b0428"; - }; - - disabled = !isPy3k; - propagatedBuildInputs = with self; [ docutils requests requests_download zipfile36]; - - meta = { - description = "A simple packaging tool for simple packages"; - homepage = https://github.com/takluyver/flit; - license = licenses.bsd3; - maintainer = maintainers.fridh; - }; - }; + flit = callPackage ../development/python-modules/flit { }; Flootty = buildPythonPackage rec { name = "Flootty-3.2.0"; @@ -6096,6 +5861,8 @@ in { }; }; + GeoIP = callPackage ../development/python-modules/GeoIP { }; + gmpy = buildPythonPackage rec { name = "gmpy-1.17"; disabled = isPyPy; @@ -8755,21 +8522,7 @@ in { }; }; - chardet = buildPythonPackage rec { - name = "chardet-2.3.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/chardet/${name}.tar.gz"; - sha256 = "e53e38b3a4afe6d1132de62b7400a4ac363452dc5dfcf8d88e8e0cce663c68aa"; - }; - - meta = { - homepage = https://github.com/chardet/chardet; - description = "Universal encoding detector"; - license = licenses.lgpl2; - maintainers = with maintainers; [ domenkozar ]; - }; - }; + chardet = callPackage ../development/python-modules/chardet { }; django = self.django_1_11; @@ -9640,22 +9393,7 @@ in { }; }; - flask = buildPythonPackage { - name = "flask-0.12"; - - src = pkgs.fetchurl { - url = "mirror://pypi/F/Flask/Flask-0.12.tar.gz"; - sha256 = "12yasybryp33rdchsqgckf15zj4pjfam7ly5spmn2sijpv6h7s4k"; - }; - - propagatedBuildInputs = with self; [ itsdangerous click werkzeug jinja2 ]; - - meta = { - homepage = http://flask.pocoo.org/; - description = "A microframework based on Werkzeug, Jinja 2, and good intentions"; - license = licenses.bsd3; - }; - }; + flask = callPackage ../development/python-modules/flask { }; flask_assets = buildPythonPackage rec { name = "Flask-Assets-${version}"; @@ -9693,42 +9431,9 @@ in { }; }; - flask-compress = buildPythonPackage rec { - name = "Flask-Compress-${version}"; - version = "1.3.2"; + flask-compress = callPackage ../development/python-modules/flask-compress { }; - src = pkgs.fetchurl { - url = "mirror://pypi/F/Flask-Compress/${name}.tar.gz"; - sha256 = "4fbb53e7f6ce8b1458a2c3d7a528564912f2641ab2f9f43819fc96ed7f770734"; - }; - - propagatedBuildInputs = with self; [ flask ]; - - meta = { - description = "Compress responses in your Flask app with gzip"; - homepage = "https://libwilliam.github.io/flask-compress/"; - license = licenses.mit; - }; - }; - - flask-cors = buildPythonPackage rec { - name = "Flask-Cors-${version}"; - version = "2.1.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/F/Flask-Cors/${name}.tar.gz"; - sha256 = "0fd618a4f88ykqx4x55viz47cm9rl214q1b45a0b4mz5vhxffqpj"; - }; - - buildInputs = with self; [ nose ]; - propagatedBuildInputs = with self; [ flask six ]; - - meta = { - description = "A Flask extension adding a decorator for CORS support"; - homepage = https://github.com/corydolphin/flask-cors; - license = with licenses; [ mit ]; - }; - }; + flask-cors = callPackage ../development/python-modules/flask-cors { }; flask_elastic = callPackage ../development/python-modules/flask-elastic.nix { }; @@ -9762,33 +9467,9 @@ in { flask-pymongo = callPackage ../development/python-modules/Flask-PyMongo { }; - flask-restful = buildPythonPackage rec { - name = "Flask-RESTful-${version}"; - version = "0.3.5"; + flask-restful = callPackage ../development/python-modules/flask-restful { }; - src = pkgs.fetchurl { - url = "mirror://pypi/F/Flask-RESTful/${name}.tar.gz"; - sha256 = "cce4aeff959b571136b5af098bebe7d3deeca7eb1411c4e722ff2c5356ab4c42"; - }; - - # TypeError: Only byte strings can be passed to C code - patchPhase = if isPy3k then '' - rm tests/test_crypto.py tests/test_paging.py - '' else null; - buildInputs = with self; [ nose mock blinker ]; - propagatedBuildInputs = with self; [ flask six pytz aniso8601 pycrypto ]; - PYTHON_EGG_CACHE = "`pwd`/.egg-cache"; - - meta = { - homepage = "http://flask-restful.readthedocs.io/"; - description = "REST API building blocks for Flask"; - license = licenses.bsd3; - }; - }; - - flask-restplus = callPackage ../development/python-modules/flask-restplus/default.nix { }; - # Exactly 0.8.6 is required by flexget - flask-restplus_0_8 = callPackage ../development/python-modules/flask-restplus/0.8.nix { }; + flask-restplus = callPackage ../development/python-modules/flask-restplus { }; flask_script = buildPythonPackage rec { name = "Flask-Script-${version}"; @@ -9965,47 +9646,9 @@ in { }; }; - jsonschema = buildPythonPackage (rec { - version = "2.5.1"; - name = "jsonschema-${version}"; + jsonschema = callPackage ../development/python-modules/jsonschema { }; - src = pkgs.fetchurl { - url = "mirror://pypi/j/jsonschema/jsonschema-${version}.tar.gz"; - sha256 = "0hddbqjm4jq63y8jf44nswina1crjs16l9snb6m3vvgyg31klrrn"; - }; - - buildInputs = with self; [ nose mock vcversioner ]; - propagatedBuildInputs = with self; [ functools32 ]; - - patchPhase = '' - substituteInPlace jsonschema/tests/test_jsonschema_test_suite.py --replace "python" "${python}/bin/${python.executable}" - ''; - - checkPhase = '' - nosetests - ''; - - meta = { - homepage = https://github.com/Julian/jsonschema; - description = "An implementation of JSON Schema validation for Python"; - license = licenses.mit; - maintainers = with maintainers; [ domenkozar ]; - }; - }); - - vcversioner = buildPythonPackage rec { - name = "vcversioner-${version}"; - version = "2.14.0.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/v/vcversioner/vcversioner-${version}.tar.gz"; - sha256 = "11ivq1bm7v0yb4nsfbv9m7g7lyjn112gbvpjnjz8nv1fx633dm5c"; - }; - - meta = with stdenv.lib; { - homepage = "https://github.com/habnabit/vcversioner"; - }; - }; + vcversioner = callPackage ../development/python-modules/vcversioner { }; falcon = buildPythonPackage (rec { name = "falcon-1.0.0"; @@ -10750,6 +10393,9 @@ in { guessit = callPackage ../development/python-modules/guessit { }; + # used by flexget + guessit_2_0 = callPackage ../development/python-modules/guessit/2.0.nix { }; + rebulk = callPackage ../development/python-modules/rebulk { }; gunicorn = callPackage ../development/python-modules/gunicorn.nix { }; @@ -11449,34 +11095,7 @@ in { }; }; - jinja2 = buildPythonPackage rec { - pname = "Jinja2"; - version = "2.9.5"; - name = "${pname}-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/J/Jinja2/${name}.tar.gz"; - sha256 = "702a24d992f856fa8d5a7a36db6128198d0c21e1da34448ca236c42e92384825"; - }; - - propagatedBuildInputs = with self; [ markupsafe ]; - - # No tests included - doCheck = false; - - meta = { - homepage = http://jinja.pocoo.org/; - description = "Stand-alone template engine"; - license = licenses.bsd3; - longDescription = '' - Jinja2 is a template engine written in pure Python. It provides a - Django inspired non-XML syntax but supports inline expressions and - an optional sandboxed environment. - ''; - platforms = platforms.all; - maintainers = with maintainers; [ pierron garbas sjourdois ]; - }; - }; + jinja2 = callPackage ../development/python-modules/jinja2 { }; jinja2_time = buildPythonPackage rec { version = "0.2.0"; @@ -14484,52 +14103,7 @@ in { doCheck = false; }; - openpyxl = buildPythonPackage rec { - version = "2.3.5"; - name = "openpyxl-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/o/openpyxl/${name}.tar.gz"; - sha256 = "0qj7d8l1qc6cjwk1ps01dyh53b3p2k2k7hwmj98y2257jj5mf1s3"; - }; - - buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ jdcal et_xmlfile lxml ]; - - # Tests are not included in archive. - # https://bitbucket.org/openpyxl/openpyxl/issues/610 - doCheck = false; - - meta = { - description = "A Python library to read/write Excel 2007 xlsx/xlsm files"; - homepage = https://openpyxl.readthedocs.org; - license = licenses.mit; - maintainers = with maintainers; [ lihop sjourdois ]; - platforms = platforms.all; - }; - }; - - # optfunc = buildPythonPackage ( rec { - # name = "optfunc-git"; - # - # src = pkgs.fetchgit { - # url = "https://github.com/simonw/optfunc.git"; - # rev = "e3fa034a545ed94ac5a039cf5b170c7d0ee21b7b"; - # }; - # - # installCommand = '' - # dest=$(toPythonPath $out)/optfunc - # mkdir -p $dest - # cp * $dest/ - # ''; - # - # doCheck = false; - # - # meta = { - # description = "A new experimental interface to optparse which works by introspecting a function definition"; - # homepage = "http://simonwillison.net/2009/May/28/optfunc/"; - # }; - # }); + openpyxl = callPackage ../development/python-modules/openpyxl { }; ordereddict = buildPythonPackage rec { name = "ordereddict-${version}"; @@ -15841,10 +15415,15 @@ in { sed -i 's@python@${python.interpreter}@' .testr.conf ''; - buildInputs = with self; [ pbr Babel six wrapt testtools testscenarios - testrepository subunit coverage oslotest ]; + buildInputs = with self; [ pbr ]; + propagatedBuildInputs = with self; [ wrapt Babel six doc8 ]; + checkInputs = with self; [ pbr Babel six wrapt testtools testscenarios + testrepository subunit coverage oslotest ]; + doCheck = false; # oslo is broken }; + doc8 = callPackage ../development/python-modules/doc8 { }; + wrapt = buildPythonPackage rec { name = "wrapt-${version}"; version = "1.10.5"; @@ -16751,6 +16330,8 @@ in { }; }; + portend = callPackage ../development/python-modules/portend { }; + powerline = callPackage ../development/python-modules/powerline { }; pox = buildPythonPackage rec { @@ -16837,41 +16418,14 @@ in { }; - prompt_toolkit = buildPythonPackage rec { - name = "prompt_toolkit-${version}"; - version = "1.0.14"; + prompt_toolkit = callPackage ../development/python-modules/prompt_toolkit { }; - src = pkgs.fetchurl { - sha256 = "cc66413b1b4b17021675d9f2d15d57e640b06ddfd99bb724c73484126d22622f"; - url = "mirror://pypi/p/prompt_toolkit/${name}.tar.gz"; - }; - checkPhase = '' - rm prompt_toolkit/win32_types.py - py.test -k 'not test_pathcompleter_can_expanduser' - ''; - - buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ docopt six wcwidth pygments ]; - - meta = { - description = "Python library for building powerful interactive command lines"; - longDescription = '' - prompt_toolkit could be a replacement for readline, but it can be - much more than that. It is cross-platform, everything that you build - with it should run fine on both Unix and Windows systems. Also ships - with a nice interactive Python shell (called ptpython) built on top. - ''; - homepage = https://github.com/jonathanslenders/python-prompt-toolkit; - license = licenses.bsd3; - maintainers = with maintainers; [ nckx ]; - }; - }; - prompt_toolkit_52 = self.prompt_toolkit.override(self: rec { - name = "prompt_toolkit-${version}"; + prompt_toolkit_52 = self.prompt_toolkit.overridePythonAttrs(oldAttrs: rec { + name = "${oldAttrs.pname}-${version}"; version = "0.52"; - src = pkgs.fetchurl { + src = oldAttrs.src.override { + inherit version; sha256 = "00h9ldqmb33nhg2kpks7paldf3n3023ipp124alwp96yz16s7f1m"; - url = "mirror://pypi/p/prompt_toolkit/${name}.tar.gz"; }; # No tests included in archive @@ -19083,18 +18637,19 @@ in { }; }; - pytz = buildPythonPackage rec { - name = "pytz-${version}"; - version = "2016.6.1"; + name = "${pname}-${version}"; + pname = "pytz"; + version = "2017.2"; - src = pkgs.fetchurl { - url = "mirror://pypi/p/pytz/${name}.tar.gz"; - sha256 = "6f57732f0f8849817e9853eb9d50d85d1ebb1404f702dbc44ee627c642a486ca"; + src = fetchPypi { + inherit pname version; + sha256 = "12cmd3j46d2gcw08bspvp6s9icfcvx88zjz52n1bli9dyvl5dh7m"; + extension = "zip"; }; checkPhase = '' - ${python.interpreter} -m unittest discover -s pytz/tests + python -m unittest discover -s pytz/tests ''; meta = { @@ -19104,7 +18659,6 @@ in { }; }; - pyutil = buildPythonPackage (rec { name = "pyutil-2.0.0"; @@ -19386,25 +18940,7 @@ in { requests2 = throw "requests2 has been deprecated. Use requests instead."; # use requests, not requests_2 - requests = buildPythonPackage rec { - name = "requests-${version}"; - version = "2.13.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/r/requests/${name}.tar.gz"; - sha256 = "5722cd09762faa01276230270ff16af7acf7c5c45d623868d9ba116f15791ce8"; - }; - - nativeBuildInputs = [ self.pytest ]; - # sadly, tests require networking - doCheck = false; - - meta = { - description = "An Apache2 licensed HTTP library, written in Python, for human beings"; - homepage = http://docs.python-requests.org/en/latest/; - license = licenses.asl20; - }; - }; + requests = callPackage ../development/python-modules/requests { }; requests_download = buildPythonPackage rec { pname = "requests_download"; @@ -19909,6 +19445,8 @@ in { }; }; + restructuredtext_lint = callPackage ../development/python-modules/restructuredtext_lint { }; + robomachine = buildPythonPackage rec { name = "robomachine-0.6"; @@ -21753,29 +21291,7 @@ in { }; }); - sphinx-testing = buildPythonPackage rec { - name = "sphinx-testing-${version}"; - version = "0.7.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/sphinx-testing/${name}.tar.gz"; - sha256 = "0cd235ce939770ae5128eda01d8611fb1e36d8129399e98565f99fcbff3a8062"; - }; - - buildInputs = with self; [ mock ]; - propagatedBuildInputs = with self; [ sphinx six ]; - - checkPhase = '' - ${python.interpreter} -m unittest discover -s tests - ''; - - meta = { - homepage = https://github.com/sphinx-doc/sphinx-testing; - license = licenses.bsd2; - description = "Testing utility classes and functions for Sphinx extensions"; - }; - - }; + sphinx-testing = callPackage ../development/python-modules/sphinx-testing { }; sphinxcontrib-blockdiag = buildPythonPackage (rec { name = "${pname}-${version}"; @@ -22542,28 +22058,7 @@ in { }; }; - testtools = buildPythonPackage rec { - name = "testtools-${version}"; - version = "1.8.0"; - - # Python 2 only judging from SyntaxError - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/t/testtools/${name}.tar.gz"; - sha256 = "15yxz8d70iy1b1x6gd7spvblq0mjxjardl4vnaqasxafzc069zca"; - }; - - propagatedBuildInputs = with self; [ pbr python_mimeparse extras lxml unittest2 ]; - buildInputs = with self; [ traceback2 ]; - patches = [ ../development/python-modules/testtools_support_unittest2.patch ]; - - meta = { - description = "A set of extensions to the Python standard library's unit testing framework"; - homepage = http://pypi.python.org/pypi/testtools; - license = licenses.mit; - }; - }; + testtools = callPackage ../development/python-modules/testtools { }; traitlets = buildPythonPackage rec { pname = "traitlets"; @@ -23075,25 +22570,9 @@ in { twisted = callPackage ../development/python-modules/twisted { }; - tzlocal = buildPythonPackage rec { - name = "tzlocal-1.2.2"; + txtorcon = callPackage ../development/python-modules/txtorcon { }; - propagatedBuildInputs = with self; [ pytz ]; - - src = pkgs.fetchurl { - url = "mirror://pypi/t/tzlocal/${name}.tar.gz"; - sha256 = "0paj7vlsb0np8b5sp4bv64wxv7qk2piyp7xg29pkhdjwsbls9fnb"; - }; - - # test fail (timezone test fail) - doCheck = false; - - meta = with pkgs.stdenv.lib; { - description = "Tzinfo object for the local timezone"; - homepage = https://github.com/regebro/tzlocal; - license = licenses.cddl; - }; - }; + tzlocal = callPackage ../development/python-modules/tzlocal { }; u-msgpack-python = callPackage ../development/python-modules/u-msgpack-python { }; @@ -23768,28 +23247,7 @@ EOF }; }; - - werkzeug = buildPythonPackage rec { - name = "Werkzeug-0.11.10"; - - src = pkgs.fetchurl { - url = "mirror://pypi/W/Werkzeug/${name}.tar.gz"; - sha256 = "1vpf98k4jp4yhbv2jbyq8dj5fdasrd26rkq34pacs5n7mkxxlr6c"; - }; - - LC_ALL = "en_US.UTF-8"; - - propagatedBuildInputs = with self; [ itsdangerous ]; - buildInputs = with self; [ pytest requests pkgs.glibcLocales ]; - - - - meta = { - homepage = http://werkzeug.pocoo.org/; - description = "A WSGI utility library for Python"; - license = licenses.bsd3; - }; - }; + werkzeug = callPackage ../development/python-modules/werkzeug { }; wheel = callPackage ../development/python-modules/wheel { }; @@ -25832,27 +25290,7 @@ EOF }; - service-identity = buildPythonPackage rec { - name = "service-identity-${version}"; - version = "16.0.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/service_identity/service_identity-${version}.tar.gz"; - sha256 = "0dih7i7d36nbllcxgfkvbnaj1wlzhwfnpr4b97dz74czylif4c06"; - }; - - propagatedBuildInputs = with self; [ - characteristic pyasn1 pyasn1-modules pyopenssl idna attrs - ]; - - buildInputs = with self; [ - pytest - ]; - - checkPhase = '' - py.test - ''; - }; + service-identity = callPackage ../development/python-modules/service_identity { }; signedjson = buildPythonPackage rec { name = "signedjson-${version}";