From 03187c3e15633806883555810bb69b94ac93cf91 Mon Sep 17 00:00:00 2001 From: Emanuele Peruffo Date: Thu, 4 May 2017 00:22:15 +0200 Subject: [PATCH 001/172] epson-alc1100: init at version 1.2-0 Driver for printer Epson AcuLaser C1100 --- lib/licenses.nix | 6 ++ .../drivers/epson-alc1100/cups-data-dir.patch | 13 ++++ pkgs/misc/drivers/epson-alc1100/default.nix | 70 +++++++++++++++++++ pkgs/misc/drivers/epson-alc1100/ppd.patch | 13 ++++ pkgs/top-level/all-packages.nix | 2 + 5 files changed, 104 insertions(+) create mode 100644 pkgs/misc/drivers/epson-alc1100/cups-data-dir.patch create mode 100644 pkgs/misc/drivers/epson-alc1100/default.nix create mode 100644 pkgs/misc/drivers/epson-alc1100/ppd.patch diff --git a/lib/licenses.nix b/lib/licenses.nix index 0919699b41e3..780c3353c0ae 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -170,6 +170,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "DOC License"; }; + eapl = { + fullName = "EPSON AVASYS PUBLIC LICENSE"; + url = http://avasys.jp/hp/menu000000700/hpg000000603.htm; + free = false; + }; + efl10 = spdx { spdxId = "EFL-1.0"; fullName = "Eiffel Forum License v1.0"; diff --git a/pkgs/misc/drivers/epson-alc1100/cups-data-dir.patch b/pkgs/misc/drivers/epson-alc1100/cups-data-dir.patch new file mode 100644 index 000000000000..2277a9afcccf --- /dev/null +++ b/pkgs/misc/drivers/epson-alc1100/cups-data-dir.patch @@ -0,0 +1,13 @@ +diff --git a/configure b/configure +index 0053441..9a6b855 100755 +--- a/configure ++++ b/configure +@@ -2833,7 +2833,7 @@ if test $have_cups_config = yes; then + CUPS_LIBS=`cups-config --libs` + CUPS_IMAGE_LIBS=`cups-config --image --libs` + CUPS_SERVER_DIR=`cups-config --serverbin` +- CUPS_DATA_DIR=`cups-config --datadir` ++ CUPS_DATA_DIR="${prefix}/share/cups" + else + { { echo "$as_me:$LINENO: error: *** 'cups-config' missing, please install CUPS or fix your \$PATH ***" >&5 + echo "$as_me: error: *** 'cups-config' missing, please install CUPS or fix your \$PATH ***" >&2;} diff --git a/pkgs/misc/drivers/epson-alc1100/default.nix b/pkgs/misc/drivers/epson-alc1100/default.nix new file mode 100644 index 000000000000..88b88f59afc8 --- /dev/null +++ b/pkgs/misc/drivers/epson-alc1100/default.nix @@ -0,0 +1,70 @@ +{ stdenv, stdenv_32bit, fetchurl, cups, pkgsi686Linux, dpkg, psutils, makeWrapper, ghostscript, bash }: + +let + version = "1.2-0"; + + libstdcpp5 = fetchurl { + url = "http://old-releases.ubuntu.com/ubuntu/pool/universe/g/gcc-3.3/libstdc++5_3.3.6-17ubuntu1_i386.deb"; + sha256 = "10f8zcmqaa7skvg2bz94mnlgqpan4iscvi8913r6iawjh7hiisjy"; + }; +in + stdenv.mkDerivation { + name = "epson-alc1100-${version}"; + + src = fetchurl { + url = "http://a1227.g.akamai.net/f/1227/40484/7d/download.ebz.epson.net/dsc/f/01/00/01/58/65/cd71929d2bf41ebf7e96f68fa9f1279556545ef1/Epson-ALC1100-filter-1.2.tar.gz"; + sha256 = "0q0bf4dfm4v69l7xg6sgkh7rwb0h77i8j9kplq1dfkd208g7y81p"; + }; + + patches = [ ./cups-data-dir.patch ./ppd.patch ]; + + nativeBuildInputs = [ dpkg makeWrapper ]; + + buildInputs = [ cups pkgsi686Linux.glibc psutils ghostscript bash ]; + + postUnpack = '' + dpkg -x ${libstdcpp5} libstdcpp5_i386; + + mkdir -p $out/lib; + + mv libstdcpp5_i386/usr/lib/* $out/lib; + ''; + + postFixup = '' + patchelf --set-interpreter ${pkgsi686Linux.glibc}/lib/ld-linux.so.2 \ + --set-rpath "${stdenv.lib.makeLibraryPath [ + pkgsi686Linux.glibc + "$out" + ]}" $out/bin/alc1100 + + patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ + pkgsi686Linux.glibc + ]}" $out/lib/libstdc++.so.5.0.7 + + wrapProgram $out/bin/alc1100_lprwrapper.sh \ + --suffix PATH : "\$PATH:${psutils}/bin:/var/lib/cups/path/bin" + + wrapProgram $out/bin/pstoalc1100.sh \ + --suffix PATH : "\$PATH:${psutils}/bin:${ghostscript}/bin:${bash}/bin:/var/lib/cups/path/bin" + ''; + + meta = with stdenv.lib; { + homepage = "http://download.ebz.epson.net/dsc/search/01/search/"; + description = "Epson AcuLaser C1100 Driver"; + longDescription = '' + This package provides a print filter for printing to EPSON AL-C1100 + printers on Linux systems. + + To use the driver adjust your configuration.nix file: + services.printing = { + enable = true; + drivers = [ pkgs.epson-alc1100 ]; + }; + ''; + + license = with licenses; [ mit eapl ]; + maintainers = [ maintainers.eperuffo ]; + platforms = platforms.linux; + }; + + } diff --git a/pkgs/misc/drivers/epson-alc1100/ppd.patch b/pkgs/misc/drivers/epson-alc1100/ppd.patch new file mode 100644 index 000000000000..71d86668f53d --- /dev/null +++ b/pkgs/misc/drivers/epson-alc1100/ppd.patch @@ -0,0 +1,13 @@ +diff --git a/ppd/Epson-AL-C1100-fm3.ppd b/ppd/Epson-AL-C1100-fm3.ppd +index 75c7fff..ecd04c8 100644 +--- a/ppd/Epson-AL-C1100-fm3.ppd ++++ b/ppd/Epson-AL-C1100-fm3.ppd +@@ -68,7 +68,7 @@ + *%*********** Foomatic Configulations ************ + *%pprRIP: foomatic-rip other + *FoomaticIDs: Epson-AL-C1100 alc1100 +-*FoomaticRIPCommandLine: "pstoalc1100.sh %C" ++*FoomaticRIPCommandLine: "/var/lib/cups/path/bin/pstoalc1100.sh %C" + + *%**************** Paper Handling ****************** + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dce94584e034..b66018277876 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18009,6 +18009,8 @@ with pkgs; e17gtk = callPackage ../misc/themes/e17gtk { }; + epson-alc1100 = callPackage ../misc/drivers/epson-alc1100 { }; + epson-escpr = callPackage ../misc/drivers/epson-escpr { }; epson_201207w = callPackage ../misc/drivers/epson_201207w { }; From 8b1f1d93fa8e3524e0e01378dbe813e6eb06712e Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Wed, 12 Jul 2017 22:03:53 +0100 Subject: [PATCH 002/172] nixos-install: only search for nixpkgs when needed --- nixos/modules/installer/tools/nixos-install.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index 087fbcd4512f..7fae915871e4 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -106,8 +106,11 @@ extraBuildFlags+=(--option "build-users-group" "$buildUsersGroup") binary_caches="$(@perl@/bin/perl -I @nix@/lib/perl5/site_perl/*/* -e 'use Nix::Config; Nix::Config::readConfig; print $Nix::Config::config{"binary-caches"};')" extraBuildFlags+=(--option "binary-caches" "$binary_caches") -nixpkgs="$(readlink -f "$(nix-instantiate --find-file nixpkgs)")" -export NIX_PATH="nixpkgs=$nixpkgs:nixos-config=$mountPoint/$NIXOS_CONFIG" +# We only need nixpkgs in the path if we don't already have a system closure to install +if [[ -z "$closure" ]]; then + nixpkgs="$(readlink -f "$(nix-instantiate --find-file nixpkgs)")" + export NIX_PATH="nixpkgs=$nixpkgs:nixos-config=$mountPoint/$NIXOS_CONFIG" +fi unset NIXOS_CONFIG # TODO: do I need to set NIX_SUBSTITUTERS here or is the --option binary-caches above enough? From 77ce02201e1bc7facabb774d7e9996ab803145d2 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Wed, 12 Jul 2017 22:04:49 +0100 Subject: [PATCH 003/172] nixos-install: use FIFO for system closure This avoids running out of space in space-constrained environments, e.g. VMs with relatively small amounts of memory and tmp on tmpfs --- nixos/modules/installer/tools/nixos-install.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index 7fae915871e4..79ed18c923c0 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -126,6 +126,9 @@ function closure() { } system_closure="$tmpdir/system.closure" +# Use a FIFO for piping nix-store --export into nix-store --import, saving disk +# I/O and space. nix-store --import is run by nixos-prepare-root. +mkfifo $system_closure if [ -z "$closure" ]; then expr="(import {}).system" @@ -135,7 +138,9 @@ else system_root=$closure # Create a temporary file ending in .closure (so nixos-prepare-root knows to --import it) to transport the store closure # to the filesytem we're preparing. Also delete it on exit! - nix-store --export $(nix-store -qR $closure) > $system_closure + # Run in background to avoid blocking while trying to write to the FIFO + # $system_closure refers to + nix-store --export $(nix-store -qR $closure) > $system_closure & fi channel_root="$(nix-env -p /nix/var/nix/profiles/per-user/root/channels -q nixos --no-name --out-path 2>/dev/null || echo -n "")" From 77f1c7d5bcbe21514e651010ab335ad022c0bc0b Mon Sep 17 00:00:00 2001 From: tilpner Date: Sun, 30 Jul 2017 22:09:12 +0200 Subject: [PATCH 004/172] buildenv: Make buildEnv overridable callPackage already calls makeOverridable, but that just makes the function that evaluates to buildEnv overridable, not buildEnv itself. If no overridable version of buildEnv is used during construction, users can't override e.g. `paths` at all --- pkgs/build-support/buildenv/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix index 47e2c1b904c3..41a1e67ef428 100644 --- a/pkgs/build-support/buildenv/default.nix +++ b/pkgs/build-support/buildenv/default.nix @@ -4,7 +4,8 @@ { buildPackages, runCommand, lib }: -{ name +lib.makeOverridable +({ name , # The manifest file (if any). A symlink $out/manifest will be # created to it. @@ -68,4 +69,4 @@ runCommand name '' ${buildPackages.perl}/bin/perl -w ${./builder.pl} eval "$postBuild" - '' + '') From f8a72662cf1ca0717f1007d26a3d789f088c5c47 Mon Sep 17 00:00:00 2001 From: Maarten Hoogendoorn Date: Thu, 17 Aug 2017 16:57:43 +0200 Subject: [PATCH 005/172] openshift: 1.5.0 -> 3.6.0 - Updated from 1.5.0 to 3.6.0 (this is just the next version, but Red Hat did quite the version bump there) - Added 'v' to the version; it is used by `oc cluster up` to determine which image should be downloaded. - Added myself as a maintainer. --- .../applications/networking/cluster/openshift/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index 6ade5bab70e8..ca4793251499 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, which, buildGoPackage }: let - version = "1.5.0"; + version = "3.6.0"; ver = stdenv.lib.elemAt (stdenv.lib.splitString "." version); versionMajor = ver 0; versionMinor = ver 1; @@ -14,7 +14,7 @@ in buildGoPackage rec { owner = "openshift"; repo = "origin"; rev = "v${version}"; - sha256 = "0qvyxcyca3888nkgvyvqcmybm95ncwxb3zvrzbg2gz8kx6g6350v"; + sha256 = "08bdqvsjl6c7dmllyz8n4akb7gyn91znvbph5cgmmk1bhskycy1r"; }; buildInputs = [ which ]; @@ -28,7 +28,7 @@ in buildGoPackage rec { cd go/src/origin-v${version}-src # Openshift build require this variables to be set # unless there is a .git folder which is not the case with fetchFromGitHub - export OS_GIT_VERSION=${version} + export OS_GIT_VERSION=v${version} export OS_GIT_MAJOR=${versionMajor} export OS_GIT_MINOR=${versionMinor} make build @@ -43,7 +43,7 @@ in buildGoPackage rec { description = "Build, deploy, and manage your applications with Docker and Kubernetes"; license = licenses.asl20; homepage = http://www.openshift.org; - maintainers = with maintainers; [offline bachp]; + maintainers = with maintainers; [offline bachp moretea]; platforms = platforms.linux; }; } From a3dde7776bd8200887e68909b637bc49451b7fed Mon Sep 17 00:00:00 2001 From: Maarten Hoogendoorn Date: Fri, 18 Aug 2017 17:06:26 +0200 Subject: [PATCH 006/172] Fix `oc cluster up` The command `oc cluster up` mainly runs code though Docker containers. However, in pkg/bootstrap/docker/host/host.go, nsenter is used to run some commands on the host. For this to work on NixOS, we need to provide the absolute path to the required programs. --- .../networking/cluster/openshift/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index ca4793251499..e7e2d1763ad7 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, which, buildGoPackage }: +{ stdenv, fetchFromGitHub, which, buildGoPackage, utillinux, coreutils }: let version = "3.6.0"; @@ -22,6 +22,17 @@ in buildGoPackage rec { goPackagePath = null; patchPhase = '' patchShebangs ./hack + substituteInPlace pkg/bootstrap/docker/host/host.go \ + --replace 'nsenter --mount=/rootfs/proc/1/ns/mnt findmnt' \ + 'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/findmnt' + + substituteInPlace pkg/bootstrap/docker/host/host.go \ + --replace 'nsenter --mount=/rootfs/proc/1/ns/mnt mount' \ + 'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/mount' + + substituteInPlace pkg/bootstrap/docker/host/host.go \ + --replace 'nsenter --mount=/rootfs/proc/1/ns/mnt mkdir' \ + 'nsenter --mount=/rootfs/proc/1/ns/mnt ${coreutils}/bin/mount' ''; buildPhase = '' From e17fdb9607d52e5d64fe0ed8a517fd2723b7d85f Mon Sep 17 00:00:00 2001 From: Thomas Mader Date: Sun, 27 Aug 2017 19:03:07 +0200 Subject: [PATCH 007/172] dmd: Fix bootstrap dmd compiler build. Doesn't work with gcc6. --- pkgs/top-level/all-packages.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 605baef68940..885faf457fea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1673,7 +1673,14 @@ with pkgs; disper = callPackage ../tools/misc/disper { }; - dmd_2_067_1 = callPackage ../development/compilers/dmd/2.067.1.nix { }; + dmd_2_067_1 = callPackage ../development/compilers/dmd/2.067.1.nix { + stdenv = if stdenv.hostPlatform.isDarwin then + stdenv + else + # Doesn't build with gcc6 on linux + overrideCC stdenv gcc5; + }; + dmd = callPackage ../development/compilers/dmd { bootstrapDmd = dmd_2_067_1; }; From 5a35b0707fb2c3204a86ae261c5208c31f53deb3 Mon Sep 17 00:00:00 2001 From: Thomas Mader Date: Sun, 27 Aug 2017 19:08:41 +0200 Subject: [PATCH 008/172] dmd: Run dmd-testsuite in checkPhase Remove cppa test for now because it isn't working. --- pkgs/development/compilers/dmd/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index 278a77f62903..a7f710520d4d 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub , makeWrapper, unzip, which -, curl, tzdata +, curl, tzdata, gdb # Versions 2.070.2 and up require a working dmd compiler to build: , bootstrapDmd }: @@ -35,6 +35,10 @@ stdenv.mkDerivation rec { mv dmd-v${version}-src dmd mv druntime-v${version}-src druntime mv phobos-v${version}-src phobos + + # Remove cppa test for now because it doesn't work. + rm dmd/test/runnable/cppa.d + rm dmd/test/runnable/extra-files/cppb.cpp ''; # Compile with PIC to prevent colliding modules with binutils 2.28. @@ -69,22 +73,22 @@ stdenv.mkDerivation rec { --replace MACOSX_DEPLOYMENT_TARGET MACOSX_DEPLOYMENT_TARGET_ ''; - nativeBuildInputs = [ bootstrapDmd makeWrapper unzip which ]; + nativeBuildInputs = [ bootstrapDmd makeWrapper unzip which gdb ]; buildInputs = [ curl tzdata ]; # Buid and install are based on http://wiki.dlang.org/Building_DMD buildPhase = '' cd dmd - make -f posix.mak INSTALL_DIR=$out + make -j$NIX_BUILD_CORES -f posix.mak INSTALL_DIR=$out ${ let bits = builtins.toString stdenv.hostPlatform.parsed.cpu.bits; osname = if stdenv.hostPlatform.isDarwin then "osx" else stdenv.hostPlatform.parsed.kernel.name; in "export DMD=$PWD/generated/${osname}/release/${bits}/dmd" } cd ../druntime - make -f posix.mak PIC=${usePIC} INSTALL_DIR=$out DMD=$DMD + make -j$NIX_BUILD_CORES -f posix.mak PIC=${usePIC} INSTALL_DIR=$out DMD=$DMD cd ../phobos - make -f posix.mak PIC=${usePIC} INSTALL_DIR=$out DMD=$DMD + make -j$NIX_BUILD_CORES -f posix.mak PIC=${usePIC} INSTALL_DIR=$out DMD=$DMD cd .. ''; @@ -97,10 +101,11 @@ stdenv.mkDerivation rec { osname = if stdenv.hostPlatform.isDarwin then "osx" else stdenv.hostPlatform.parsed.kernel.name; in "export DMD=$PWD/generated/${osname}/release/${bits}/dmd" } + make -j$NIX_BUILD_CORES -C test -f Makefile PIC=${usePIC} DMD=$DMD BUILD=release SHARED=0 cd ../druntime - make -f posix.mak unittest PIC=${usePIC} DMD=$DMD BUILD=release + make -j$NIX_BUILD_CORES -f posix.mak unittest PIC=${usePIC} DMD=$DMD BUILD=release cd ../phobos - make -f posix.mak unittest PIC=${usePIC} DMD=$DMD BUILD=release + make -j$NIX_BUILD_CORES -f posix.mak unittest PIC=${usePIC} DMD=$DMD BUILD=release cd .. ''; From 8a2a3dad80070d4a8fc05445a30b1176c2126133 Mon Sep 17 00:00:00 2001 From: Thomas Mader Date: Sun, 27 Aug 2017 19:07:15 +0200 Subject: [PATCH 009/172] ldc: Init at 1.3.0 --- lib/maintainers.nix | 1 + pkgs/development/compilers/dmd/default.nix | 1 + pkgs/development/compilers/ldc/default.nix | 98 ++++++++++++++++++++++ pkgs/development/tools/dtools/default.nix | 3 +- pkgs/top-level/all-packages.nix | 2 + 5 files changed, 104 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/ldc/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 707770cdc820..a95b60a1b57e 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -575,6 +575,7 @@ thammers = "Tobias Hammerschmidt "; the-kenny = "Moritz Ulrich "; theuni = "Christian Theune "; + ThomasMader = "Thomas Mader "; thoughtpolice = "Austin Seipp "; timbertson = "Tim Cuthbertson "; titanous = "Jonathan Rudenberg "; diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index a7f710520d4d..e18391ba8968 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -158,6 +158,7 @@ stdenv.mkDerivation rec { # Everything is now Boost licensed, even the backend. # https://github.com/dlang/dmd/pull/6680 license = licenses.boost; + maintainers = with maintainers; [ ThomasMader ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix new file mode 100644 index 000000000000..22d2923897cd --- /dev/null +++ b/pkgs/development/compilers/ldc/default.nix @@ -0,0 +1,98 @@ +{ stdenv, fetchFromGitHub, cmake, llvm, dmd, curl, tzdata, python, + lit, gdb, unzip, darwin }: + +stdenv.mkDerivation rec { + name = "ldc-${version}"; + version = "1.3.0"; + + srcs = [ + (fetchFromGitHub { + owner = "ldc-developers"; + repo = "ldc"; + rev = "v${version}"; + sha256 = "1ac3j4cwwgjpayhijxx4d6478bc3iqksjxkd7xp7byx7k8w1ppdl"; + }) + (fetchFromGitHub { + owner = "ldc-developers"; + repo = "druntime"; + rev = "ldc-v${version}"; + sha256 = "1m13370wnj3sizqk3sdpzi9am5d24srf27d613qblhqa9n8vwz30"; + }) + (fetchFromGitHub { + owner = "ldc-developers"; + repo = "phobos"; + rev = "ldc-v${version}"; + sha256 = "0fhcdfi7a00plwj27ysfyv783nhk0kspq7hawf6vbsl3s1nyvn8g"; + }) + (fetchFromGitHub { + owner = "ldc-developers"; + repo = "dmd-testsuite"; + rev = "ldc-v${version}"; + sha256 = "0dmdkp220gqhxjrmrjfkf0vsvylwfaj70hswavq4q3v4dg17pzmj"; + }) + ]; + + sourceRoot = "."; + + postUnpack = '' + mv ldc-v${version}-src/* . + + mv druntime-ldc-v${version}-src/* runtime/druntime + + mv phobos-ldc-v${version}-src/* runtime/phobos + + mv dmd-testsuite-ldc-v${version}-src/* tests/d2/dmd-testsuite + + # Remove cppa test for now because it doesn't work. + rm tests/d2/dmd-testsuite/runnable/cppa.d + rm tests/d2/dmd-testsuite/runnable/extra-files/cppb.cpp + ''; + + postPatch = '' + substituteInPlace runtime/phobos/std/net/curl.d \ + --replace libcurl.so ${curl.out}/lib/libcurl.so + + # Ugly hack to fix the hardcoded path to zoneinfo in the source file. + # https://issues.dlang.org/show_bug.cgi?id=15391 + substituteInPlace runtime/phobos/std/datetime.d \ + --replace /usr/share/zoneinfo/ ${tzdata}/share/zoneinfo/ + '' + + + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace driver/tool.cpp \ + --replace "gcc" "clang" + ''; + + nativeBuildInputs = [ cmake llvm dmd python lit gdb unzip ] + + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ + Foundation + ]); + + buildInputs = [ curl tzdata stdenv.cc ]; + + preConfigure = '' + cmakeFlagsArray=("-DINCLUDE_INSTALL_DIR=$out/include/dlang/ldc") + ''; + + postConfigure = '' + export DMD=$PWD/bin/ldc2 + ''; + + makeFlags = [ "DMD=$DMD" ]; + + doCheck = true; + + checkPhase = '' + ctest -j $NIX_BUILD_CORES -V DMD=$DMD + ''; + + meta = with stdenv.lib; { + description = "The LLVM-based D compiler"; + homepage = https://github.com/ldc-developers/ldc; + # from https://github.com/ldc-developers/ldc/blob/master/LICENSE + license = with licenses; [ bsd3 boost mit ncsa gpl2Plus ]; + maintainers = with maintainers; [ ThomasMader ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/dtools/default.nix b/pkgs/development/tools/dtools/default.nix index 28d0c57f2e3b..4d93eda24df7 100644 --- a/pkgs/development/tools/dtools/default.nix +++ b/pkgs/development/tools/dtools/default.nix @@ -45,10 +45,11 @@ stdenv.mkDerivation rec { } ''; - meta = { + meta = with stdenv.lib; { description = "Ancillary tools for the D programming language compiler"; homepage = https://github.com/dlang/tools; license = lib.licenses.boost; + maintainers = with maintainers; [ ThomasMader ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 885faf457fea..720a96df7d99 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2784,6 +2784,8 @@ with pkgs; kytea = callPackage ../tools/text/kytea { }; + ldc = callPackage ../development/compilers/ldc { }; + lbreakout2 = callPackage ../games/lbreakout2 { }; leocad = callPackage ../applications/graphics/leocad { }; From 930b01ab3d6066d2a7313c3d54d392d8e040630f Mon Sep 17 00:00:00 2001 From: Thomas Mader Date: Mon, 28 Aug 2017 17:00:45 +0200 Subject: [PATCH 010/172] dtools: Fix rdmd test when building with newer phobos version which doesn't include std.stdiobase.d anymore. --- pkgs/development/tools/dtools/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/tools/dtools/default.nix b/pkgs/development/tools/dtools/default.nix index 4d93eda24df7..0d639875da57 100644 --- a/pkgs/development/tools/dtools/default.nix +++ b/pkgs/development/tools/dtools/default.nix @@ -17,6 +17,10 @@ stdenv.mkDerivation rec { substituteInPlace posix.mak \ --replace gcc $CC + + # To fix rdmd test with newer phobos + substituteInPlace rdmd.d \ + --replace " std.stdiobase," "" ''; nativeBuildInputs = [ dmd ]; From 2a0f1ecdc81074158ed2e33c53016cf8f3a0f227 Mon Sep 17 00:00:00 2001 From: Thomas Mader Date: Sun, 27 Aug 2017 19:10:23 +0200 Subject: [PATCH 011/172] apple-sdk: Move cf-private first in list, otherwise the build fails because CoreFoundation/CFAttributedString.h could not be found. The problem appeared when building ldc on Mac OSX. See also 13778. --- pkgs/os-specific/darwin/apple-sdk/frameworks.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix index 5475b6641707..7b930e86a39f 100644 --- a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix +++ b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix @@ -46,7 +46,8 @@ with frameworks; with libs; { ExceptionHandling = []; FWAUserLib = []; ForceFeedback = [ CF IOKit ]; - Foundation = [ CF libobjc Security ApplicationServices SystemConfiguration ]; + # cf-private was moved first in list because of https://github.com/NixOS/nixpkgs/pull/28635 + Foundation = [ cf-private CF libobjc Security ApplicationServices SystemConfiguration ]; GLKit = [ CF ]; GLUT = [ OpenGL ]; GSS = []; From 6182b67228147f4c2c0dc23337e4692dd68e2e30 Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Fri, 8 Sep 2017 19:28:39 -0400 Subject: [PATCH 012/172] gocr: Install libraries and includes --- pkgs/applications/graphics/gocr/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/applications/graphics/gocr/default.nix b/pkgs/applications/graphics/gocr/default.nix index 4b45e44e22d5..6fe37d605ae1 100644 --- a/pkgs/applications/graphics/gocr/default.nix +++ b/pkgs/applications/graphics/gocr/default.nix @@ -8,7 +8,18 @@ stdenv.mkDerivation rec { sha256 = "1dgmcpapy7h68d53q2c5d0bpgzgfb2nw2blndnx9qhc7z12149mw"; }; + buildFlags = [ "all" "libs" ]; + installFlags = [ "libdir=/lib/" ]; # Specify libdir so Makefile will also install library. + + preInstall = "mkdir -p $out/lib"; + postInstall = '' + for i in pgm2asc.h gocr.h; do + install -D -m644 src/$i $out/include/gocr/$i + done + ''; + + preFixup = '' sed -i -e 's|exec wish|exec ${tk}/bin/wish|' $out/bin/gocr.tcl ''; From 8c2895400fd59058b5fad86308d38dcaace650d4 Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Sat, 9 Sep 2017 01:09:03 -0400 Subject: [PATCH 013/172] k2pdfopt: 2.32 -> 2.42 --- pkgs/applications/misc/k2pdfopt/default.nix | 167 ++++++++---------- .../applications/misc/k2pdfopt/k2pdfopt.patch | 152 ++++++++-------- .../misc/k2pdfopt/tesseract.patch | 13 +- 3 files changed, 162 insertions(+), 170 deletions(-) diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix index 7c0d615f3663..587e6a588a73 100644 --- a/pkgs/applications/misc/k2pdfopt/default.nix +++ b/pkgs/applications/misc/k2pdfopt/default.nix @@ -1,105 +1,92 @@ -# Build procedure lifted from https://aur.archlinux.org/packages/k2/k2pdfopt/PKGBUILD -{ stdenv, fetchzip, fetchurl, writeScript, libX11, libXext, autoconf, automake, libtool - , leptonica, libpng, libtiff, zlib, openjpeg, freetype, jbig2dec, djvulibre - , openssl }: +{ stdenv, fetchzip, fetchurl, fetchpatch, cmake, pkgconfig +, zlib, libpng +, enableGSL ? true, gsl +, enableGhostScript ? true, ghostscript +, enableMuPDF ? true, jbig2dec, openjpeg, freetype, harfbuzz, mupdf +, enableJPEG2K ? true, jasper +, enableDJVU ? true, djvulibre +, enableGOCR ? false, gocr # Disabled by default due to crashes +, enableTesseract ? true, leptonica, tesseract +}: -let - mupdf_src = fetchurl { - url = http://www.mupdf.com/downloads/archive/mupdf-1.6-source.tar.gz; - sha256 = "0qx51rj6alzcagcixm59rvdpm54w6syrwr4184v439jh14ryw4wq"; - }; +with stdenv.lib; - tess_src = fetchurl { - url = http://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.02.02.tar.gz; - sha256 = "0g81m9y4iydp7kgr56mlkvjdwpp3mb01q385yhdnyvra7z5kkk96"; - }; - - gocr_src = fetchurl { - url = http://www-e.uni-magdeburg.de/jschulen/ocr/gocr-0.49.tar.gz; - sha256 = "06hpzp7rkkwfr1fvmc8kcfz9v490i9yir7f7imh13gmka0fr6afc"; - }; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "k2pdfopt-${version}"; - version = "2.32"; + version = "2.42"; + src = fetchzip { url = "http://www.willus.com/k2pdfopt/src/k2pdfopt_v${version}_src.zip"; - sha256 = "1v3cj5bwpjvy7s66sfqcmkxs91f7nxaykjpdjm2wn87vn6q7n19m"; + sha256 = "1zag4jmkr0qrcpqqb5davmvdrabhdyz87q4zz0xpfkl6xw2dn9bk"; }; - buildInputs = [ libX11 libXext autoconf automake libtool leptonica libpng libtiff zlib - openjpeg freetype jbig2dec djvulibre openssl ]; - NIX_LDFLAGS = "-lX11 -lXext"; + patches = [ ./k2pdfopt.patch ]; - hardeningDisable = [ "format" ]; + nativeBuildInputs = [ cmake pkgconfig ]; - k2_pa = ./k2pdfopt.patch; - tess_pa = ./tesseract.patch; + buildInputs = + let + mupdf_modded = mupdf.overrideAttrs (attrs: { + name = "mupdf-1.10a"; + src = fetchurl { + url = "http://mupdf.com/downloads/archive/mupdf-1.10a-source.tar.gz"; + sha256 = "0dm8wcs8i29aibzkqkrn8kcnk4q0kd1v66pg48h5c3qqp4v1zk5a"; + }; + # Excluded the pdf-*.c files, since they mostly just broke the #includes + prePatch = '' + cp ${src}/mupdf_mod/{font,stext-device,string}.c source/fitz/ + cp ${src}/mupdf_mod/font-win32.c source/pdf/ + ''; + # Patches from previous 1.10a version in nixpkgs + patches = [ + # Compatibility with new openjpeg + (fetchpatch { + name = "mupdf-1.9a-openjpeg-2.1.1.patch"; + url = "https://git.archlinux.org/svntogit/community.git/plain/mupdf/trunk/0001-mupdf-openjpeg.patch?id=5a28ad0a8999a9234aa7848096041992cc988099"; + sha256 = "1i24qr4xagyapx4bijjfksj4g3bxz8vs5c2mn61nkm29c63knp75"; + }) - builder = writeScript "builder.sh" '' - . ${stdenv}/setup - set -e + (fetchurl { + name = "CVE-2017-5896.patch"; + url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=2c4e5867ee699b1081527bc6c6ea0e99a35a5c27"; + sha256 = "14k7x47ifx82sds1c06ibzbmcparfg80719jhgwjk6w1vkh4r693"; + }) + ]; + }); + leptonica_modded = leptonica.overrideAttrs (attrs: { + prePatch = '' + cp ${src}/leptonica_mod/* src/ + ''; + }); + tesseract_modded = tesseract.overrideAttrs (attrs: { + prePatch = '' + cp ${src}/tesseract_mod/{ambigs.cpp,ccutil.h,ccutil.cpp} ccutil/ + cp ${src}/tesseract_mod/dawg.cpp api/ + cp ${src}/tesseract_mod/{imagedata.cpp,tessdatamanager.cpp} ccstruct/ + cp ${src}/tesseract_mod/openclwrapper.h opencl/ + cp ${src}/tesseract_mod/{tessedit.cpp,thresholder.cpp} ccmain/ + cp ${src}/tesseract_mod/tess_lang_mod_edge.h cube/ + cp ${src}/tesseract_mod/tesscapi.cpp api/ + cp ${src}/include_mod/{tesseract.h,leptonica.h} api/ + ''; + patches = [ ./tesseract.patch ]; + }); + in + [ zlib libpng ] ++ + optional enableGSL gsl ++ + optional enableGhostScript ghostscript ++ + optionals enableMuPDF [ jbig2dec openjpeg freetype harfbuzz mupdf_modded ] ++ + optionals enableJPEG2K [ jasper ] ++ + optional enableDJVU djvulibre ++ + optional enableGOCR gocr ++ + optionals enableTesseract [ leptonica_modded tesseract_modded ]; - plibs=`pwd`/patched_libraries + dontUseCmakeBuildDir = true; - tar zxf ${mupdf_src} - cp $src/mupdf_mod/font.c $src/mupdf_mod/string.c mupdf-1.6-source/source/fitz/ - cp $src/mupdf_mod/pdf-* mupdf-1.6-source/source/pdf + cmakeFlags = [ "-DCMAKE_C_FLAGS=-I${src}/include_mod" ]; - tar zxf ${tess_src} - cp $src/tesseract_mod/dawg.cpp tesseract-ocr/dict - cp $src/tesseract_mod/tessdatamanager.cpp tesseract-ocr/ccutil - cp $src/tesseract_mod/tessedit.cpp tesseract-ocr/ccmain - cp $src/tesseract_mod/tesscapi.cpp tesseract-ocr/api - cp $src/include_mod/tesseract.h $src/include_mod/leptonica.h tesseract-ocr/api - - cp -a $src k2pdfopt_v2.21 - chmod -R +w k2pdfopt_v2.21 - - patch -p0 -i $tess_pa - patch -p0 -i $k2_pa - - cd tesseract-ocr - ./autogen.sh - substituteInPlace "configure" \ - --replace 'LIBLEPT_HEADERSDIR="/usr/local/include /usr/include"' \ - 'LIBLEPT_HEADERSDIR=${leptonica}/include' - ./configure --prefix=$plibs --disable-shared - make install - - cd .. - tar zxf ${gocr_src} - cd gocr-0.49 - ./configure - cp src/{gocr.h,pnm.h,unicode.h,list.h} $plibs/include - cp include/config.h $plibs/include - make libs - cp src/libPgm2asc.a $plibs/lib - - cd ../mupdf-1.6-source - make prefix=$plibs install - install -Dm644 build/debug/libmujs.a $plibs/lib - - cd ../k2pdfopt_v2.21/k2pdfoptlib - gcc -Ofast -Wall -c *.c -I ../include_mod/ -I $plibs/include \ - -I . -I ../willuslib - ar rcs libk2pdfopt.a *.o - - cd ../willuslib - gcc -Ofast -Wall -c *.c -I ../include_mod/ -I $plibs/include - ar rcs libwillus.a *.o - - cd .. - gcc -Wall -Ofast -o k2pdfopt.o -c k2pdfopt.c -I k2pdfoptlib/ -I willuslib/ \ - -I include_mod/ -I $plibs/include - g++ -Ofast k2pdfopt.o -o k2pdfopt -I willuslib/ -I k2pdfoptlib/ -I include_mod/ \ - -I $plibs/include -L $plibs/lib/ \ - -L willuslib/ -L k2pdfoptlib/ -lk2pdfopt -lwillus -ldjvulibre -lz -lmupdf \ - -ljbig2dec -ljpeg -lopenjp2 -lpng -lfreetype -lpthread -lmujs \ - -lPgm2asc -llept -ltesseract -lcrypto - - mkdir -p $out/bin - cp k2pdfopt $out/bin + installPhase = '' + install -D -m 755 k2pdfopt $out/bin/k2pdfopt ''; meta = with stdenv.lib; { @@ -107,7 +94,7 @@ in stdenv.mkDerivation rec { homepage = http://www.willus.com/k2pdfopt; license = licenses.gpl3; platforms = platforms.linux; - maintainers = [ maintainers.bosu ]; + maintainers = with maintainers; [ bosu danielfullmer ]; }; } diff --git a/pkgs/applications/misc/k2pdfopt/k2pdfopt.patch b/pkgs/applications/misc/k2pdfopt/k2pdfopt.patch index 00ac5770ea42..a393e30fc726 100644 --- a/pkgs/applications/misc/k2pdfopt/k2pdfopt.patch +++ b/pkgs/applications/misc/k2pdfopt/k2pdfopt.patch @@ -1,95 +1,99 @@ -diff -aur k2pdfopt_v2.21/willuslib/array.c k2pdfopt_v2.21.new/willuslib/array.c ---- k2pdfopt_v2.21/willuslib/array.c 2014-05-23 16:29:58.000000000 -0300 -+++ k2pdfopt_v2.21.new/willuslib/array.c 2014-07-26 11:35:49.829825567 -0300 -@@ -1055,7 +1055,7 @@ - void arrayf_sort(float *a,int n) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4a2378b..502c477 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -52,6 +52,7 @@ endif(JPEG_FOUND) + include(FindJasper) + if(JASPER_FOUND) + set(HAVE_JASPER_LIB 1) ++ set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${JASPER_LIBRARY}) + endif(JASPER_FOUND) - { -- sort(a,(long)n); -+ willus_sort(a,(long)n); - } + # paths from willuslib/wgs.c +@@ -66,8 +67,12 @@ else() + message(STATUS "Could NOT find ghostscript executable") + endif(GHOSTSCRIPT_EXECUTABLE) + +-# willus.h +-# HAVE_GSL_LIB ++pkg_check_modules(GSL gsl) ++if(MUPDF_FOUND) ++ set(HAVE_GSL_LIB 1) ++ include_directories(SYSTEM ${GSL_INCLUDEDIR}) ++ set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${GSL_LDFLAGS}) ++endif(MUPDF_FOUND) -diff -aur k2pdfopt_v2.21/willuslib/math.c k2pdfopt_v2.21.new/willuslib/math.c ---- k2pdfopt_v2.21/willuslib/math.c 2013-08-15 21:33:50.000000000 -0300 -+++ k2pdfopt_v2.21.new/willuslib/math.c 2014-07-26 11:36:02.853170659 -0300 -@@ -532,7 +532,7 @@ + # libfreetype6 (>= 2.3.9), libjbig2dec0, libjpeg8 (>= 8c), libx11-6, libxext6, zlib1g (>= 1:1.2.0) +@@ -80,7 +85,7 @@ if(MUPDF_FOUND) + include_directories(SYSTEM ${MUPDF_INCLUDEDIR}) + message(STATUS "mupdf libraries: ${MUPDF_LDFLAGS}") + set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${MUPDF_LDFLAGS} +- -lmupdf-js-none -lopenjpeg -ljbig2dec -ljpeg -lfreetype ++ -lopenjp2 -ljbig2dec -ljpeg -lfreetype -lharfbuzz + ) + endif(MUPDF_FOUND) +@@ -91,9 +96,25 @@ if(DJVU_FOUND) + set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${DJVU_LDFLAGS}) + endif(DJVU_FOUND) +-# HAVE_GOCR_LIB +-# HAVE_LEPTONICA_LIB +-# HAVE_TESSERACT_LIB ++find_library(GOCR_LIB NAMES Pgm2asc) ++if(GOCR_LIB) ++ set(HAVE_GOCR_LIB 1) ++ set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${GOCR_LIB}) ++endif(GOCR_LIB) ++ ++pkg_check_modules(LEPTONICA lept) ++if(LEPTONICA_FOUND) ++ set(HAVE_LEPTONICA_LIB 1) ++ include_directories(SYSTEM ${LEPTONICA_INCLUDEDIR}) ++ set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${LEPTONICA_LDFLAGS}) ++endif(LEPTONICA_FOUND) ++ ++pkg_check_modules(TESSERACT tesseract) ++if(TESSERACT_FOUND) ++ set(HAVE_TESSERACT_LIB 1) ++ include_directories(SYSTEM ${TESSERACT_INCLUDEDIR}) ++ set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${TESSERACT_LDFLAGS}) ++endif(TESSERACT_FOUND) --void sort(float *x,int n) -+void willus_sort(float *x,int n) + # ---- Describe project - { - int top,n1; -diff -aur k2pdfopt_v2.21/willuslib/ocrjocr.c k2pdfopt_v2.21.new/willuslib/ocrjocr.c ---- k2pdfopt_v2.21/willuslib/ocrjocr.c 2012-11-12 13:09:42.000000000 -0300 -+++ k2pdfopt_v2.21.new/willuslib/ocrjocr.c 2014-07-26 11:36:46.699837185 -0300 +diff --git a/willuslib/CMakeLists.txt b/willuslib/CMakeLists.txt +index 463bbc9..8043db5 100644 +--- a/willuslib/CMakeLists.txt ++++ b/willuslib/CMakeLists.txt +@@ -6,7 +6,7 @@ include_directories(..) + set(WILLUSLIB_SRC + ansi.c array.c bmp.c bmpdjvu.c bmpmupdf.c dtcompress.c filelist.c + fontdata.c fontrender.c gslpolyfit.c linux.c math.c mem.c ocr.c +- ocrjocr.c ocrtess.c pdfwrite.c point2d.c render.c strbuf.c string.c ++ ocrgocr.c ocrtess.c pdfwrite.c point2d.c render.c strbuf.c string.c + token.c wfile.c wgs.c wgui.c willusversion.c win.c winbmp.c + wincomdlg.c winmbox.c winshell.c wmupdf.c wmupdfinfo.c wpdf.c wsys.c + wzfile.c wleptonica.c +diff --git a/willuslib/ocrgocr.c b/willuslib/ocrgocr.c +index 6027e9a..fbe10f0 100644 +--- a/willuslib/ocrgocr.c ++++ b/willuslib/ocrgocr.c @@ -29,6 +29,8 @@ #ifdef HAVE_GOCR_LIB #include -+job_t *JOB; ++job_t *OCR_JOB; + /* ** bmp8 must be grayscale ** (x1,y1) and (x2,y2) from top left of bitmap -@@ -66,6 +68,7 @@ +@@ -63,6 +65,7 @@ void gocr_single_word_from_bmp8(char *text,int maxlen,WILLUSBITMAP *bmp8, h=y2-y1+1; dh=h+bw*2; job=&_job; -+ JOB=job; ++ OCR_JOB=job; job_init(job); job_init_image(job); // willus_mem_alloc_warn((void **)&job->src.p.p,w*h,funcname,10); -diff -aur k2pdfopt_v2.21/willuslib/string.c k2pdfopt_v2.21.new/willuslib/string.c ---- k2pdfopt_v2.21/willuslib/string.c 2014-02-03 00:37:44.000000000 -0300 -+++ k2pdfopt_v2.21.new/willuslib/string.c 2014-07-26 11:37:01.766506277 -0300 -@@ -81,7 +81,7 @@ - ** Returns NULL if EOF, otherwise returns pointer to the string. - ** - */ --char *get_line(char *buf,int max,FILE *f) -+char *willus_get_line(char *buf,int max,FILE *f) - - { - int i; -diff -aur k2pdfopt_v2.21/willuslib/willus.h k2pdfopt_v2.21.new/willuslib/willus.h ---- k2pdfopt_v2.21/willuslib/willus.h 2014-07-25 15:03:51.000000000 -0300 -+++ k2pdfopt_v2.21.new/willuslib/willus.h 2014-07-26 11:37:56.316506038 -0300 -@@ -214,9 +214,6 @@ - ** CMAKE handles the defines, not this source - ** (Mod from Dirk Thierbach, 31-Dec-2013) - */ --#ifdef USE_CMAKE --#include "config.h" --#else /* USE_CMAKE */ - - #ifndef HAVE_Z_LIB - #define HAVE_Z_LIB -@@ -268,7 +265,6 @@ - #undef HAVE_GSL_LIB - #endif - --#endif /* USE_CMAKE */ - /* - ** Consistency check - */ -@@ -533,7 +529,7 @@ - int *n,FILE *err); - int readxyz_ex (char *filename,double **x,double **y,double **z, - int *n,FILE *err,int ignore_after_semicolon); --void sort (float *x,int n); -+void willus_sort (float *x,int n); - void sortd (double *x,int n); - void sorti (int *x,int n); - void sortxy (float *x,float *y,int n); -@@ -602,7 +598,7 @@ - /* string.c */ - void clean_line (char *buf); - void clean_line_end(char *buf); --char *get_line (char *buf,int max,FILE *f); -+char *willus_get_line (char *buf,int max,FILE *f); - char *get_line_cf (char *buf,int max,FILE *f); - int mem_get_line_cf(char *buf,int maxlen,char *cptr,long *cindex,long csize); - int in_string (char *buffer,char *pattern); diff --git a/pkgs/applications/misc/k2pdfopt/tesseract.patch b/pkgs/applications/misc/k2pdfopt/tesseract.patch index 5cb6e0fe3176..4827daa1a905 100644 --- a/pkgs/applications/misc/k2pdfopt/tesseract.patch +++ b/pkgs/applications/misc/k2pdfopt/tesseract.patch @@ -1,12 +1,13 @@ -diff -aur tesseract-ocr/api/Makefile.am tesseract-ocr.new/api/Makefile.am ---- tesseract-ocr/api/Makefile.am 2012-10-09 14:18:39.000000000 -0300 -+++ tesseract-ocr.new/api/Makefile.am 2014-03-20 18:43:13.926030341 -0300 -@@ -36,7 +36,7 @@ +diff --git a/api/Makefile.am b/api/Makefile.am +index d8c1e54..46ead13 100644 +--- a/api/Makefile.am ++++ b/api/Makefile.am +@@ -42,7 +42,7 @@ libtesseract_api_la_CPPFLAGS = $(AM_CPPFLAGS) if VISIBILITY libtesseract_api_la_CPPFLAGS += -DTESS_EXPORTS endif --libtesseract_api_la_SOURCES = baseapi.cpp capi.cpp -+libtesseract_api_la_SOURCES = baseapi.cpp capi.cpp tesscapi.cpp +-libtesseract_api_la_SOURCES = baseapi.cpp capi.cpp renderer.cpp pdfrenderer.cpp ++libtesseract_api_la_SOURCES = baseapi.cpp capi.cpp renderer.cpp pdfrenderer.cpp tesscapi.cpp lib_LTLIBRARIES += libtesseract.la libtesseract_la_LDFLAGS = From 734a04800a3b370ab8ce83533d3f8ff14a0c9b3a Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Sun, 10 Sep 2017 10:54:06 +0200 Subject: [PATCH 014/172] steam: Get rid of newStdcpp option, always on --- pkgs/games/steam/chrootenv.nix | 9 ++------- pkgs/games/steam/runtime-wrapped.nix | 7 +++---- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index ace8e9888a76..0c59821bdd26 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -5,16 +5,11 @@ , extraPkgs ? pkgs: [ ] # extra packages to add to targetPkgs , nativeOnly ? false , runtimeOnly ? false -, newStdcpp ? false }: let commonTargetPkgs = pkgs: with pkgs; let - primus2 = if newStdcpp then primus else primus.override { - stdenv = overrideInStdenv stdenv [ useOldCXXAbi ]; - stdenv_i686 = overrideInStdenv pkgsi686Linux.stdenv [ useOldCXXAbi ]; - }; tzdir = "${pkgs.tzdata}/share/zoneinfo"; # I'm not sure if this is the best way to add things like this # to an FHSUserEnv @@ -38,7 +33,7 @@ let # Zoneinfo etc-zoneinfo ] ++ lib.optional withJava jdk - ++ lib.optional withPrimus primus2 + ++ lib.optional withPrimus primus ++ extraPkgs pkgs; in buildFHSUserEnv rec { @@ -68,7 +63,7 @@ in buildFHSUserEnv rec { xlibs.libpciaccess (steamPackages.steam-runtime-wrapped.override { - inherit nativeOnly runtimeOnly newStdcpp; + inherit nativeOnly runtimeOnly; }) ]; diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix index 6274a91625fa..3d614bda31e4 100644 --- a/pkgs/games/steam/runtime-wrapped.nix +++ b/pkgs/games/steam/runtime-wrapped.nix @@ -1,11 +1,9 @@ { stdenv, lib, perl, pkgs, steam-runtime , nativeOnly ? false , runtimeOnly ? false -, newStdcpp ? false }: assert !(nativeOnly && runtimeOnly); -assert newStdcpp -> !runtimeOnly; let runtimePkgs = with pkgs; [ @@ -79,7 +77,7 @@ let SDL2_mixer gstreamer gst-plugins-base - ] ++ lib.optional (!newStdcpp) gcc48.cc; + ]; overridePkgs = with pkgs; [ libgpgerror @@ -88,7 +86,8 @@ let openalSoft libva vulkan-loader - ] ++ lib.optional newStdcpp gcc.cc; + gcc.cc + ]; ourRuntime = if runtimeOnly then [] else if nativeOnly then runtimePkgs ++ overridePkgs From d27f710b87f4bde3ab81bd75edd3c7dfc7550ebf Mon Sep 17 00:00:00 2001 From: Maarten Hoogendoorn Date: Sun, 10 Sep 2017 16:07:50 +0200 Subject: [PATCH 015/172] mount is in utillinux --- pkgs/applications/networking/cluster/openshift/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index e7e2d1763ad7..fdc97733c773 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -32,7 +32,7 @@ in buildGoPackage rec { substituteInPlace pkg/bootstrap/docker/host/host.go \ --replace 'nsenter --mount=/rootfs/proc/1/ns/mnt mkdir' \ - 'nsenter --mount=/rootfs/proc/1/ns/mnt ${coreutils}/bin/mount' + 'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/mount' ''; buildPhase = '' From e87a72caef69a99e0340b87d946c5d01e86ebf15 Mon Sep 17 00:00:00 2001 From: zraexy Date: Tue, 12 Sep 2017 12:39:08 -0800 Subject: [PATCH 016/172] streamlink: 0.7.0 -> 0.8.1 --- pkgs/applications/video/streamlink/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index 1c92d66bcfcc..f8d983b1a682 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -1,19 +1,19 @@ { stdenv, pythonPackages, fetchFromGitHub, rtmpdump, ffmpeg }: pythonPackages.buildPythonApplication rec { - version = "0.7.0"; + version = "0.8.1"; name = "streamlink-${version}"; src = fetchFromGitHub { owner = "streamlink"; repo = "streamlink"; rev = "${version}"; - sha256 = "0knh7lw6bv1vix3p40hjp5lc0z9pavvx6rncviw5h095rzcw5287"; + sha256 = "0l09vp108dw6d9d9rri2xwlr49mr5nkrlxbivr4kk5jbaczjp9xm"; }; buildInputs = with pythonPackages; [ pytest mock ]; - propagatedBuildInputs = (with pythonPackages; [ pycryptodome requests iso-639 iso3166 ]) ++ [ rtmpdump ffmpeg ]; + propagatedBuildInputs = (with pythonPackages; [ pycryptodome requests iso-639 iso3166 websocket_client ]) ++ [ rtmpdump ffmpeg ]; meta = with stdenv.lib; { homepage = https://github.com/streamlink/streamlink; From 3d812d203748fdcc0e55f98dd72be77d6d8399ac Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 13 Sep 2017 08:15:11 -0400 Subject: [PATCH 017/172] atom: 1.19.7 -> 1.20.0 --- pkgs/applications/editors/atom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 5fe4d0910ee7..65df31aaa226 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atom-${version}"; - version = "1.19.7"; + version = "1.20.0"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "0ividd7bmx0fqz1ykcx5cbnd6qyms1h7r662pcclyzzm3vxj9zif"; + sha256 = "1jzpa44ny78djdxc8d2w4jz1m68xmi8bzq87q3wmdffa4g9z4aa0"; name = "${name}.deb"; }; From 9c4233f7b6e055eb6d18e8e7a49508dfa3ce9ee4 Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Wed, 13 Sep 2017 09:37:16 +0200 Subject: [PATCH 018/172] oysttyer: init at 2.9.1 A Perl Console Twitter Client --- lib/licenses.nix | 5 +++ lib/maintainers.nix | 1 + .../instant-messengers/oysttyer/default.nix | 42 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/perl-packages.nix | 15 +++++++ 5 files changed, 65 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/oysttyer/default.nix diff --git a/lib/licenses.nix b/lib/licenses.nix index e85aac8d440b..c177497e85e5 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -211,6 +211,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "GNU Free Documentation License v1.3"; }; + ffsl = { + fullName = "Floodgap Free Software License"; + url = http://www.floodgap.com/software/ffsl/license.html; + }; + free = { fullName = "Unspecified free software license"; }; diff --git a/lib/maintainers.nix b/lib/maintainers.nix index f77a26697026..a78539ffb6d3 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -636,6 +636,7 @@ wjlroe = "William Roe "; wkennington = "William A. Kennington III "; wmertens = "Wout Mertens "; + woffs = "Frank Doepper "; womfoo = "Kranium Gikos Mendoza "; wscott = "Wayne Scott "; wyvie = "Elijah Rum "; diff --git a/pkgs/applications/networking/instant-messengers/oysttyer/default.nix b/pkgs/applications/networking/instant-messengers/oysttyer/default.nix new file mode 100644 index 000000000000..c71db351e9d2 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/oysttyer/default.nix @@ -0,0 +1,42 @@ +{ stdenv, lib, perl, perlPackages, coreutils, +fetchFromGitHub, makeWrapper }: + +stdenv.mkDerivation rec { + name = "oysttyer-${version}"; + version = "2.9.1"; + + src = fetchFromGitHub { + owner = "oysttyer"; + repo = "oysttyer"; + rev = "${version}"; + sha256 = "05bfak4jr8ln4847rkj5qkazqnjym65k1phav3yicbyr3mxywhjw"; + }; + + buildInputs = [ + perl + makeWrapper + ]; + + propagatedBuildInputs = with perlPackages; [ + DateTimeFormatDateParse + TermReadLineTTYtter + TermReadKey + ]; + + installPhase = '' + ${coreutils}/bin/install -Dm755 \ + oysttyer.pl \ + $out/bin/oysttyer + + wrapProgram $out/bin/oysttyer \ + --prefix PERL5LIB : $PERL5LIB + ''; + + meta = with lib; { + inherit version; + description = "Perl Console Twitter Client"; + homepage = http://oysttyer.github.io/; + maintainers = with maintainers; [ woffs ]; + license = with licenses; [ ffsl ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 345d12e13f6b..2da9f5187108 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4652,6 +4652,8 @@ with pkgs; turses = callPackage ../applications/networking/instant-messengers/turses { }; + oysttyer = callPackage ../applications/networking/instant-messengers/oysttyer { }; + twitterBootstrap = callPackage ../development/web/twitter-bootstrap {}; twitterBootstrap3 = callPackage ../development/web/twitter-bootstrap/v3.nix {}; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3d8f7622d030..41920f7ccb5a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13059,6 +13059,21 @@ let self = _self // overrides; _self = with self; { }; }; + TermReadLineTTYtter = buildPerlPackage rec { + name = "Term-ReadLine-TTYtter-1.4"; + src = fetchurl { + url = "mirror://cpan/authors/id/C/CK/CKAISER/Term-ReadLine-TTYtter-1.4.tar.gz"; + sha256 = "14xcqhg1vrwgv65nd2z8xzn0wgb18i17pzkkh8m15cp1rqrk2dxc"; + }; + + outputs = [ "out" ]; + + meta = { + description = "a modified version of T::RL::Perl with several new nonstandard features specific to TTYtter"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TermShellUI = buildPerlPackage rec { name = "Term-ShellUI-0.92"; src = fetchurl { From d12d2c1e1cc061c0d980fe14cdc969f20cd64c4a Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 13 Sep 2017 11:29:54 -0400 Subject: [PATCH 019/172] minikube: 0.22.0 -> 0.22.1 --- pkgs/applications/networking/cluster/minikube/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index 49517d45c10b..9745143dabda 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -15,15 +15,15 @@ let # instead, we download localkube ourselves and shove it into the minikube binary. The versions URL that minikube uses is # currently https://storage.googleapis.com/minikube/k8s_releases.json - localkube-version = "1.7.4"; + localkube-version = "1.7.5"; localkube-binary = fetchurl { url = "https://storage.googleapis.com/minikube/k8sReleases/v${localkube-version}/localkube-linux-amd64"; - sha256 = "1v9zq6ivcs2qvdmhidvvp0krd1sxgqvqpp4bcl9is85vpdxhk95b"; + sha256 = "1kn4lwnn961r19hqnkgr13np80zqk2fhp8xkhrvxzq6v6shk7gfz"; }; in buildGoPackage rec { pname = "minikube"; name = "${pname}-${version}"; - version = "0.22.0"; + version = "0.22.1"; goPackagePath = "k8s.io/minikube"; @@ -31,7 +31,7 @@ in buildGoPackage rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "118l98kxzn6npq67nmylanfy9pvd1vd9hvsr2rkzrsvhzzk13kh4"; + sha256 = "015ffsb7xx82y0dl38gayv2v9v33v99qmssd5djl21dhb3j79yba"; }; # kubernetes is here only to shut up a loud warning when generating the completions below. minikube checks very eagerly From 8550e4e520d22868e91807968c128cf83399f22e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= Date: Wed, 13 Sep 2017 19:12:08 +0200 Subject: [PATCH 020/172] emscriptenfastcomp: move wrap magic to own file, use newScope --- .../compilers/emscripten-fastcomp/default.nix | 70 +++++-------------- .../emscripten-fastcomp.nix | 54 ++++++++++++++ pkgs/top-level/all-packages.nix | 18 +---- 3 files changed, 76 insertions(+), 66 deletions(-) create mode 100644 pkgs/development/compilers/emscripten-fastcomp/emscripten-fastcomp.nix diff --git a/pkgs/development/compilers/emscripten-fastcomp/default.nix b/pkgs/development/compilers/emscripten-fastcomp/default.nix index f35ca26584f1..e543f799495f 100644 --- a/pkgs/development/compilers/emscripten-fastcomp/default.nix +++ b/pkgs/development/compilers/emscripten-fastcomp/default.nix @@ -1,54 +1,22 @@ -{ stdenv, fetchFromGitHub, cmake, python, ... }: - +{ newScope, stdenv, wrapCC, wrapCCWith, symlinkJoin }: let - rev = "1.37.16"; - gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; -in -stdenv.mkDerivation rec { - name = "emscripten-fastcomp-${rev}"; + callPackage = newScope (self // {inherit stdenv;}); - src = fetchFromGitHub { - owner = "kripken"; - repo = "emscripten-fastcomp"; - sha256 = "0wj9sc0gciaiidcjv6wb0qn6ks06xds7q34351masc7qpvd217by"; - inherit rev; + self = { + emscriptenfastcomp-unwrapped = callPackage ./emscripten-fastcomp.nix {}; + emscriptenfastcomp-wrapped = wrapCCWith stdenv.cc.libc '' + # hardening flags break WASM support + cat > $out/nix-support/add-hardening.sh + '' self.emscriptenfastcomp-unwrapped; + emscriptenfastcomp = symlinkJoin { + name = "emscriptenfastcomp"; + paths = [ self.emscriptenfastcomp-wrapped self.emscriptenfastcomp-unwrapped ]; + preferLocalBuild = false; + allowSubstitutes = true; + postBuild = '' + # replace unwrapped clang-3.9 binary by wrapper + ln -sf $out/bin/clang $out/bin/clang-[0-9]* + ''; + }; }; - - srcFL = fetchFromGitHub { - owner = "kripken"; - repo = "emscripten-fastcomp-clang"; - sha256 = "1akdgxzxhzjbhp4d14ajcrp9jrf39x004a726ly2gynqc185l4j7"; - inherit rev; - }; - - nativeBuildInputs = [ cmake python ]; - preConfigure = '' - cp -Lr ${srcFL} tools/clang - chmod +w -R tools/clang - ''; - cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" - "-DLLVM_TARGETS_TO_BUILD='X86;JSBackend'" - "-DLLVM_INCLUDE_EXAMPLES=OFF" - "-DLLVM_INCLUDE_TESTS=OFF" - # "-DCLANG_INCLUDE_EXAMPLES=OFF" - "-DCLANG_INCLUDE_TESTS=OFF" - ] ++ (stdenv.lib.optional stdenv.isLinux - # necessary for clang to find crtend.o - "-DGCC_INSTALL_PREFIX=${gcc}" - ); - enableParallelBuilding = true; - - passthru = { - isClang = true; - inherit gcc; - }; - - meta = with stdenv.lib; { - homepage = https://github.com/kripken/emscripten-fastcomp; - description = "Emscripten LLVM"; - platforms = platforms.all; - maintainers = with maintainers; [ qknight matthewbauer ]; - license = stdenv.lib.licenses.ncsa; - }; -} +in self diff --git a/pkgs/development/compilers/emscripten-fastcomp/emscripten-fastcomp.nix b/pkgs/development/compilers/emscripten-fastcomp/emscripten-fastcomp.nix new file mode 100644 index 000000000000..f35ca26584f1 --- /dev/null +++ b/pkgs/development/compilers/emscripten-fastcomp/emscripten-fastcomp.nix @@ -0,0 +1,54 @@ +{ stdenv, fetchFromGitHub, cmake, python, ... }: + +let + rev = "1.37.16"; + gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; +in +stdenv.mkDerivation rec { + name = "emscripten-fastcomp-${rev}"; + + src = fetchFromGitHub { + owner = "kripken"; + repo = "emscripten-fastcomp"; + sha256 = "0wj9sc0gciaiidcjv6wb0qn6ks06xds7q34351masc7qpvd217by"; + inherit rev; + }; + + srcFL = fetchFromGitHub { + owner = "kripken"; + repo = "emscripten-fastcomp-clang"; + sha256 = "1akdgxzxhzjbhp4d14ajcrp9jrf39x004a726ly2gynqc185l4j7"; + inherit rev; + }; + + nativeBuildInputs = [ cmake python ]; + preConfigure = '' + cp -Lr ${srcFL} tools/clang + chmod +w -R tools/clang + ''; + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DLLVM_TARGETS_TO_BUILD='X86;JSBackend'" + "-DLLVM_INCLUDE_EXAMPLES=OFF" + "-DLLVM_INCLUDE_TESTS=OFF" + # "-DCLANG_INCLUDE_EXAMPLES=OFF" + "-DCLANG_INCLUDE_TESTS=OFF" + ] ++ (stdenv.lib.optional stdenv.isLinux + # necessary for clang to find crtend.o + "-DGCC_INSTALL_PREFIX=${gcc}" + ); + enableParallelBuilding = true; + + passthru = { + isClang = true; + inherit gcc; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/kripken/emscripten-fastcomp; + description = "Emscripten LLVM"; + platforms = platforms.all; + maintainers = with maintainers; [ qknight matthewbauer ]; + license = stdenv.lib.licenses.ncsa; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bbeb4b2be392..c9099618a436 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1816,21 +1816,9 @@ with pkgs; emscripten = callPackage ../development/compilers/emscripten { }; - emscriptenfastcomp-unwrapped = callPackage ../development/compilers/emscripten-fastcomp { }; - emscriptenfastcomp-wrapped = wrapCCWith stdenv.cc.libc '' - # hardening flags break WASM support - cat > $out/nix-support/add-hardening.sh - '' emscriptenfastcomp-unwrapped; - emscriptenfastcomp = symlinkJoin { - name = "emscriptenfastcomp"; - paths = [ emscriptenfastcomp-wrapped emscriptenfastcomp-unwrapped ]; - preferLocalBuild = false; - allowSubstitutes = true; - postBuild = '' - # replace unwrapped clang-3.9 binary by wrapper - ln -sf $out/bin/clang $out/bin/clang-[0-9]* - ''; - }; + emscriptenfastcompPackages = callPackage ../development/compilers/emscripten-fastcomp { }; + + emscriptenfastcomp = emscriptenfastcompPackages.emscriptenfastcomp; emscriptenPackages = recurseIntoAttrs (callPackage ./emscripten-packages.nix { }); From 74065fc7806930a9b47d96b99398302075c76223 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 13 Sep 2017 20:34:50 +0200 Subject: [PATCH 021/172] =?UTF-8?q?sublime3:=203126=20=E2=86=92=203143?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/editors/sublime3/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix index c295313621e3..1ec24325460a 100644 --- a/pkgs/applications/editors/sublime3/default.nix +++ b/pkgs/applications/editors/sublime3/default.nix @@ -6,7 +6,7 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; assert gksuSupport -> gksu != null; let - build = "3126"; + build = "3143"; libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk2 cairo pango]; redirects = [ "/usr/bin/pkexec=${pkexecPath}" ] ++ stdenv.lib.optional gksuSupport "/usr/bin/gksudo=${gksu}/bin/gksudo"; @@ -20,13 +20,13 @@ in let fetchurl { name = "sublimetext-${build}.tar.bz2"; url = "https://download.sublimetext.com/sublime_text_3_build_${build}_x32.tar.bz2"; - sha256 = "0acff4wj1s61x3xszdd93lkhaqa26lb7ryqdxnbphxzhf2jfzzwj"; + sha256 = "0dgpx4wij2m77f478p746qadavab172166bghxmj7fb61nvw9v5i"; } else fetchurl { name = "sublimetext-${build}.tar.bz2"; url = "https://download.sublimetext.com/sublime_text_3_build_${build}_x64.tar.bz2"; - sha256 = "0ykj33fq86iv7f9zx76h90pl9y86iri0idhlj09a6prhk8p17nqq"; + sha256 = "06b554d2cvpxc976rvh89ix3kqc7klnngvk070xrs8wbyb221qcw"; }; dontStrip = true; From ac88515052316802b09fd0956aa4ef0b8a63b823 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Mon, 11 Sep 2017 20:35:36 +0200 Subject: [PATCH 022/172] clang-stdenv: move libstdcxxHook to cc-wrapper --- pkgs/development/compilers/llvm/4/default.nix | 24 +++++++++++++------ pkgs/top-level/all-packages.nix | 6 ++--- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/llvm/4/default.nix b/pkgs/development/compilers/llvm/4/default.nix index 11a9a46c15e5..c1d1ce055d76 100644 --- a/pkgs/development/compilers/llvm/4/default.nix +++ b/pkgs/development/compilers/llvm/4/default.nix @@ -37,14 +37,17 @@ let llvm-manpages = lowPrio self.llvm.man; clang-manpages = lowPrio self.clang-unwrapped.man; - clang = wrapCC self.clang-unwrapped; + clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang; - openmp = callPackage ./openmp.nix {}; + libstdcxxClang = ccWrapperFun { + cc = self.clang-unwrapped; + /* FIXME is this right? */ + inherit (stdenv.cc) libc nativeTools nativeLibc; + extraPackages = [ libstdcxxHook ]; + }; libcxxClang = ccWrapperFun { cc = self.clang-unwrapped; - isClang = true; - inherit (self) stdenv; /* FIXME is this right? */ inherit (stdenv.cc) libc nativeTools nativeLibc; extraPackages = [ self.libcxx self.libcxxabi ]; @@ -53,11 +56,16 @@ let 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; + # Don't include the libc++ and libc++abi from the original stdenv. + extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF; }); - libcxxStdenv = overrideCC stdenv self.libcxxClang; + libcxxStdenv = stdenv.override (drv: { + allowedRequisites = null; + cc = self.libcxxClang; + # Don't include the libc++ and libc++abi from the original stdenv. + extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF; + }); lld = callPackage ./lld.nix {}; @@ -66,6 +74,8 @@ let libcxx = callPackage ./libc++ {}; libcxxabi = callPackage ./libc++abi.nix {}; + + openmp = callPackage ./openmp.nix {}; }; in self diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6f449057a786..48336e75a38c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5308,7 +5308,7 @@ with pkgs; #Use this instead of stdenv to build with clang clangStdenv = if stdenv.isDarwin then stdenv else lowPrio llvmPackages.stdenv; clang-sierraHack-stdenv = overrideCC stdenv clang-sierraHack; - libcxxStdenv = lowPrio llvmPackages.libcxxStdenv; + libcxxStdenv = if stdenv.isDarwin then stdenv else lowPrio llvmPackages.libcxxStdenv; clean = callPackage ../development/compilers/clean { }; @@ -19410,8 +19410,8 @@ with pkgs; # `recurseIntoAttrs` for sake of hydra, not nix-env tests = recurseIntoAttrs { cc-wrapper = callPackage ../test/cc-wrapper { }; - cc-wrapper-clang = callPackage ../test/cc-wrapper { stdenv = clangStdenv; }; - cc-wrapper-libcxx = callPackage ../test/cc-wrapper { stdenv = libcxxStdenv; }; + cc-wrapper-clang = callPackage ../test/cc-wrapper { stdenv = llvmPackages.stdenv; }; + cc-wrapper-libcxx = callPackage ../test/cc-wrapper { stdenv = llvmPackages.libcxxStdenv; }; stdenv-inputs = callPackage ../test/stdenv-inputs { }; macOSSierraShared = callPackage ../test/macos-sierra-shared {}; From ad486c48a66ee72283e37d6da52a5f74ae56413f Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Mon, 11 Sep 2017 20:44:32 +0200 Subject: [PATCH 023/172] llvm-packages: apply cc-wrapper/stdenv changes to older versions --- .../compilers/llvm/3.7/default.nix | 30 +++++++++++++++---- .../compilers/llvm/3.8/default.nix | 27 +++++++++++++---- .../compilers/llvm/3.9/default.nix | 27 +++++++++++++---- 3 files changed, 66 insertions(+), 18 deletions(-) diff --git a/pkgs/development/compilers/llvm/3.7/default.nix b/pkgs/development/compilers/llvm/3.7/default.nix index b7155defb437..432443e1a89a 100644 --- a/pkgs/development/compilers/llvm/3.7/default.nix +++ b/pkgs/development/compilers/llvm/3.7/default.nix @@ -1,4 +1,7 @@ -{ newScope, stdenv, cmake, libxml2, python2, isl, fetchurl, overrideCC, wrapCC, ccWrapperFun }: +{ newScope, stdenv, libstdcxxHook, cmake, libxml2, python2, isl, fetchurl +, overrideCC, wrapCC, ccWrapperFun, darwin +}: + let callPackage = newScope (self // { inherit stdenv cmake libxml2 python2 isl version fetch; }); @@ -22,20 +25,35 @@ let inherit clang-tools-extra_src stdenv; }; - clang = wrapCC self.clang-unwrapped; + clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang; + + libstdcxxClang = ccWrapperFun { + cc = self.clang-unwrapped; + /* FIXME is this right? */ + inherit (stdenv.cc) libc nativeTools nativeLibc; + extraPackages = [ libstdcxxHook ]; + }; libcxxClang = ccWrapperFun { cc = self.clang-unwrapped; - isClang = true; - inherit (self) stdenv; /* FIXME is this right? */ inherit (stdenv.cc) libc nativeTools nativeLibc; extraPackages = [ self.libcxx self.libcxxabi ]; }; - stdenv = overrideCC stdenv self.clang; + stdenv = stdenv.override (drv: { + allowedRequisites = null; + cc = self.clang; + # Don't include the libc++ and libc++abi from the original stdenv. + extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF; + }); - libcxxStdenv = overrideCC stdenv self.libcxxClang; + libcxxStdenv = stdenv.override (drv: { + allowedRequisites = null; + cc = self.libcxxClang; + # Don't include the libc++ and libc++abi from the original stdenv. + extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF; + }); lldb = callPackage ./lldb.nix {}; diff --git a/pkgs/development/compilers/llvm/3.8/default.nix b/pkgs/development/compilers/llvm/3.8/default.nix index 04cd9f791e62..453d2c1f04b4 100644 --- a/pkgs/development/compilers/llvm/3.8/default.nix +++ b/pkgs/development/compilers/llvm/3.8/default.nix @@ -1,4 +1,4 @@ -{ newScope, stdenv, isl, fetchurl, overrideCC, wrapCC, ccWrapperFun }: +{ newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCC, ccWrapperFun, darwin }: let callPackage = newScope (self // { inherit stdenv isl version fetch; }); @@ -22,20 +22,35 @@ let inherit clang-tools-extra_src stdenv; }; - clang = wrapCC self.clang-unwrapped; + clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang; + + libstdcxxClang = ccWrapperFun { + cc = self.clang-unwrapped; + /* FIXME is this right? */ + inherit (stdenv.cc) libc nativeTools nativeLibc; + extraPackages = [ libstdcxxHook ]; + }; libcxxClang = ccWrapperFun { cc = self.clang-unwrapped; - isClang = true; - inherit (self) stdenv; /* FIXME is this right? */ inherit (stdenv.cc) libc nativeTools nativeLibc; extraPackages = [ self.libcxx self.libcxxabi ]; }; - stdenv = overrideCC stdenv self.clang; + stdenv = stdenv.override (drv: { + allowedRequisites = null; + cc = self.clang; + # Don't include the libc++ and libc++abi from the original stdenv. + extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF; + }); - libcxxStdenv = overrideCC stdenv self.libcxxClang; + libcxxStdenv = stdenv.override (drv: { + allowedRequisites = null; + cc = self.libcxxClang; + # Don't include the libc++ and libc++abi from the original stdenv. + extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF; + }); lldb = callPackage ./lldb.nix {}; diff --git a/pkgs/development/compilers/llvm/3.9/default.nix b/pkgs/development/compilers/llvm/3.9/default.nix index a01e47efb753..755b417c78d4 100644 --- a/pkgs/development/compilers/llvm/3.9/default.nix +++ b/pkgs/development/compilers/llvm/3.9/default.nix @@ -1,4 +1,4 @@ -{ newScope, stdenv, isl, fetchurl, overrideCC, wrapCC, darwin, ccWrapperFun }: +{ newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCC, ccWrapperFun, darwin }: let callPackage = newScope (self // { inherit stdenv isl version fetch; }); @@ -22,20 +22,35 @@ let inherit clang-tools-extra_src stdenv; }; - clang = wrapCC self.clang-unwrapped; + clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang; + + libstdcxxClang = ccWrapperFun { + cc = self.clang-unwrapped; + /* FIXME is this right? */ + inherit (stdenv.cc) libc nativeTools nativeLibc; + extraPackages = [ libstdcxxHook ]; + }; libcxxClang = ccWrapperFun { cc = self.clang-unwrapped; - isClang = true; - inherit (self) stdenv; /* FIXME is this right? */ inherit (stdenv.cc) libc nativeTools nativeLibc; extraPackages = [ self.libcxx self.libcxxabi ]; }; - stdenv = overrideCC stdenv self.clang; + stdenv = stdenv.override (drv: { + allowedRequisites = null; + cc = self.clang; + # Don't include the libc++ and libc++abi from the original stdenv. + extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF; + }); - libcxxStdenv = overrideCC stdenv self.libcxxClang; + libcxxStdenv = stdenv.override (drv: { + allowedRequisites = null; + cc = self.libcxxClang; + # Don't include the libc++ and libc++abi from the original stdenv. + extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF; + }); lldb = callPackage ./lldb.nix {}; From 70c4ac12cd82ac2bd592758434acb4dd83d2baa2 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Mon, 11 Sep 2017 21:11:23 +0200 Subject: [PATCH 024/172] nixpkgs-tests: add tests for llvm 3.9 --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 48336e75a38c..e55a4510ab5b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19412,6 +19412,8 @@ with pkgs; cc-wrapper = callPackage ../test/cc-wrapper { }; cc-wrapper-clang = callPackage ../test/cc-wrapper { stdenv = llvmPackages.stdenv; }; cc-wrapper-libcxx = callPackage ../test/cc-wrapper { stdenv = llvmPackages.libcxxStdenv; }; + cc-wrapper-clang-39 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_39.stdenv; }; + cc-wrapper-libcxx-39 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_39.libcxxStdenv; }; stdenv-inputs = callPackage ../test/stdenv-inputs { }; macOSSierraShared = callPackage ../test/macos-sierra-shared {}; From 56ea313c29986c4ccbb12396de06efb3c47b81ac Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 13 Sep 2017 22:08:25 +0200 Subject: [PATCH 025/172] prometheus-node-exported: fix output cycle on darwin --- pkgs/servers/monitoring/prometheus/node-exporter.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix index 2d2fb26324c4..611543ee87e2 100644 --- a/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix @@ -14,6 +14,10 @@ buildGoPackage rec { sha256 = "0rm43jjqv7crfahl973swi4warqmqnmv740cg800yvzvnlp37kl4"; }; + preFixup = stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -delete_rpath $out/lib $bin/bin/node_exporter + ''; + # FIXME: megacli test fails doCheck = false; From ad8e4c272ad45850e3be8bafeb685210b41a2c2a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 13 Sep 2017 22:37:30 +0200 Subject: [PATCH 026/172] =?UTF-8?q?meson:=200.41.2=20=E2=86=92=200.42.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/tools/build-managers/meson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 1f38ad584532..114913403577 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -1,12 +1,12 @@ { lib, python3Packages }: python3Packages.buildPythonApplication rec { - version = "0.41.2"; + version = "0.42.1"; pname = "meson"; name = "${pname}-${version}"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0p69hir68ar3nzrjn0zjsnyzq181b0kq6arrcmxqpzl7g5qhf5xd"; + sha256 = "1phf1xpwm8m85qiiirkqhrf5aigx7ajaw0l59d6lzadf1fmgfx5v"; }; postFixup = '' From efeef044bef9cdcb7ee8431a8c174a7a20be93c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 13 Sep 2017 22:41:10 +0200 Subject: [PATCH 027/172] appstream-glib: more RPATH fixes #29326 Fix in 6a17c5a46c93 wasn't enough. --- pkgs/development/libraries/appstream-glib/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix index 0b2f0e03cc19..e07e1fc39087 100644 --- a/pkgs/development/libraries/appstream-glib/default.nix +++ b/pkgs/development/libraries/appstream-glib/default.nix @@ -28,7 +28,11 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ gtk3 ]; mesonFlags = [ "-Denable-rpm=false" "-Denable-stemmer=false" "-Denable-dep11=false" ]; - postFixup = "patchelf --set-rpath ${rpath} $out/lib/libappstream-glib.so"; + postFixup = '' + for elf in "$out"/bin/* "$out"/lib/*.so; do + patchelf --set-rpath '${rpath}':"$out/lib" "$elf" + done + ''; meta = with stdenv.lib; { description = "Objects and helper methods to read and write AppStream metadata"; From 85f3834bad29fa720f89fe0586cd48bb045d4d8a Mon Sep 17 00:00:00 2001 From: Yann Hodique Date: Wed, 13 Sep 2017 07:01:32 -0700 Subject: [PATCH 028/172] hugo: 0.27 -> 0.27.1 --- pkgs/applications/misc/hugo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 872bfc72bd81..c69bb5bea3bd 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "hugo-${version}"; - version = "0.27"; + version = "0.27.1"; goPackagePath = "github.com/gohugoio/hugo"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "gohugoio"; repo = "hugo"; rev = "v${version}"; - sha256 = "1r64pwk5g50gwriawmsgza6j8m4jymg8mwgwh1rplpsdfxqdfrbx"; + sha256 = "0vxzjwm9dsan314cz0gnj4spssg4w8y6ywsak8n9c6w0l45xf07p"; }; goDeps = ./deps.nix; From 1e84bb90d40a157b90580c8950dd53909d1b2aef Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Wed, 13 Sep 2017 23:59:42 +0300 Subject: [PATCH 029/172] strace: 4.18 -> 4.19 --- pkgs/development/tools/misc/strace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 2dad1c596ab7..9702534b5ccb 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "strace-${version}"; - version = "4.18"; + version = "4.19"; src = fetchurl { url = "mirror://sourceforge/strace/${name}.tar.xz"; - sha256 = "026agy9nq238nx3ynhmi8h3vx96yra4xacfsm2ybs9k23ry8ibc9"; + sha256 = "10bjh2mrkvx41fk60b2iqv5b5k4r7a3qdsx04iyg904jqb3fp4vw"; }; nativeBuildInputs = [ perl ]; From af2ceaf63c8798d3bf7d741415f48daa630b7869 Mon Sep 17 00:00:00 2001 From: geistesk Date: Wed, 13 Sep 2017 23:16:18 +0200 Subject: [PATCH 030/172] racket: 6.10 -> 6.10.1 --- pkgs/development/interpreters/racket/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 07f622931faa..fbb07468e5cb 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -33,11 +33,11 @@ in stdenv.mkDerivation rec { name = "racket-${version}"; - version = "6.10"; + version = "6.10.1"; src = fetchurl { url = "http://mirror.racket-lang.org/installers/${version}/${name}-src.tgz"; - sha256 = "1mqnyj3bawad12dygsb11f2dbnkjp7q6d7ra714rqyw8mxix5ws0"; + sha256 = "0v3z6x277lq1y7wkqdf6mj3826z5vq0yadygspx9h4r0f1dnmafc"; }; FONTCONFIG_FILE = fontsConf; From b3162a107491ce306996de591926830b68e9bc69 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 27 Jul 2017 10:16:29 +0200 Subject: [PATCH 031/172] nixos/tests: Add common modules for letsencrypt These modules implement a way to test ACME based on a test instance of Letsencrypt's Boulder service. The service implementation is in letsencrypt.nix and the second module (resolver.nix) is a support-module for the former, but can also be used for tests not involving ACME. The second module provides a DNS server which hosts a root zone containing all the zones and /etc/hosts entries (except loopback) in the entire test network, so this can be very useful for other modules that need DNS resolution. Originally, I wrote these modules for the Headcounter deployment, but I've refactored them a bit to be generally useful to NixOS users. The original implementation can be found here: https://github.com/headcounter/deployment/tree/89e7feafb/modules/testing Quoting parts from the commit message of the initial implementation of the Letsencrypt module in headcounter/deployment@95dfb31110397567534f2: This module is going to be used for tests where we need to impersonate an ACME service such as the one from Letsencrypt within VM tests, which is the reason why this module is a bit ugly (I only care if it's working not if it's beautiful). While the module isn't used anywhere, it will serve as a pluggable module for testing whether ACME works properly to fetch certificates and also as a replacement for our snakeoil certificate generator. Also quoting parts of the commit where I have refactored the same module in headcounter/deployment@85fa481b3431bbc450e8008fd25adc28ef0c6036: Now we have a fully pluggable module which automatically discovers in which network it's used via the nodes attribute. The test environment of Boulder used "dns-test-srv", which is a fake DNS server that's resolving almost everything to 127.0.0.1. On our setup this is not useful, so instead we're now running a local BIND name server which has a fake root zone and uses the mentioned node attribute to automatically discover other zones in the network of machines and generate delegations from the root zone to the respective zones with the primaryIPAddress of the node. ... We want to use real letsencrypt.org FQDNs here, so we can't get away with the snakeoil test certificates from the upstream project but now roll our own. This not only has the benefit that we can easily pass the snakeoil certificate to other nodes, but we can (and do) also use it for an nginx proxy that's now serving HTTPS for the Boulder web front end. The Headcounter deployment tests are simulating a production scenario with real IPs and nameservers so it won't need to rely on networking.extraHost. However in this implementation we don't necessarily want to do that, so I've added auto-discovery of networking.extraHosts in the resolver module. Another change here is that the letsencrypt module now falls back to using a local resolver, the Headcounter implementation on the other hand always required to add an extra test node which serves as a resolver. I could have squashed both modules into the final ACME test, but that would make it not very reusable, so that's the main reason why I put these modules in tests/common. Signed-off-by: aszlig --- nixos/tests/common/letsencrypt.nix | 444 +++++++++++++++++++++++++++++ nixos/tests/common/resolver.nix | 141 +++++++++ 2 files changed, 585 insertions(+) create mode 100644 nixos/tests/common/letsencrypt.nix create mode 100644 nixos/tests/common/resolver.nix diff --git a/nixos/tests/common/letsencrypt.nix b/nixos/tests/common/letsencrypt.nix new file mode 100644 index 000000000000..162f50385d8f --- /dev/null +++ b/nixos/tests/common/letsencrypt.nix @@ -0,0 +1,444 @@ +# Fully pluggable module to have Letsencrypt's Boulder ACME service running in +# a test environment. +# +# The certificate for the ACME service is exported as: +# +# config.test-support.letsencrypt.caCert +# +# This value can be used inside the configuration of other test nodes to inject +# the snakeoil certificate into security.pki.certificateFiles or into package +# overlays. +# +# Another value that's needed if you don't use a custom resolver (see below for +# notes on that) is to add the letsencrypt node as a nameserver to every node +# that needs to acquire certificates using ACME, because otherwise the API host +# for letsencrypt.org can't be resolved. +# +# A configuration example of a full node setup using this would be this: +# +# { +# letsencrypt = import ./common/letsencrypt.nix; +# +# example = { nodes, ... }: { +# networking.nameservers = [ +# nodes.letsencrypt.config.networking.primaryIPAddress +# ]; +# security.pki.certificateFiles = [ +# nodes.letsencrypt.config.test-support.letsencrypt.caCert +# ]; +# }; +# } +# +# By default, this module runs a local resolver, generated using resolver.nix +# from the same directory to automatically discover all zones in the network. +# +# If you do not want this and want to use your own resolver, you can just +# override networking.nameservers like this: +# +# { +# letsencrypt = { nodes, ... }: { +# imports = [ ./common/letsencrypt.nix ]; +# networking.nameservers = [ +# nodes.myresolver.config.networking.primaryIPAddress +# ]; +# }; +# +# myresolver = ...; +# } +# +# Keep in mind, that currently only _one_ resolver is supported, if you have +# more than one resolver in networking.nameservers only the first one will be +# used. +# +# Also make sure that whenever you use a resolver from a different test node +# that it has to be started _before_ the ACME service. +{ config, pkgs, lib, ... }: + +let + softhsm = pkgs.stdenv.mkDerivation rec { + name = "softhsm-${version}"; + version = "1.3.8"; + + src = pkgs.fetchurl { + url = "https://dist.opendnssec.org/source/${name}.tar.gz"; + sha256 = "0flmnpkgp65ym7w3qyg78d3fbmvq3aznmi66rgd420n33shf7aif"; + }; + + configureFlags = [ "--with-botan=${pkgs.botan}" ]; + buildInputs = [ pkgs.sqlite ]; + }; + + pkcs11-proxy = pkgs.stdenv.mkDerivation { + name = "pkcs11-proxy"; + + src = pkgs.fetchFromGitHub { + owner = "SUNET"; + repo = "pkcs11-proxy"; + rev = "944684f78bca0c8da6cabe3fa273fed3db44a890"; + sha256 = "1nxgd29y9wmifm11pjcdpd2y293p0dgi0x5ycis55miy97n0f5zy"; + }; + + postPatch = "patchShebangs mksyscalls.sh"; + + nativeBuildInputs = [ pkgs.cmake ]; + buildInputs = [ pkgs.openssl pkgs.libseccomp ]; + }; + + mkGoDep = { goPackagePath, url ? "https://${goPackagePath}", rev, sha256 }: { + inherit goPackagePath; + src = pkgs.fetchgit { inherit url rev sha256; }; + }; + + goose = let + owner = "liamstask"; + repo = "goose"; + rev = "8488cc47d90c8a502b1c41a462a6d9cc8ee0a895"; + version = "20150116"; + + in pkgs.buildGoPackage rec { + name = "${repo}-${version}"; + + src = pkgs.fetchFromBitbucket { + name = "${name}-src"; + inherit rev owner repo; + sha256 = "1jy0pscxjnxjdg3hj111w21g8079rq9ah2ix5ycxxhbbi3f0wdhs"; + }; + + goPackagePath = "bitbucket.org/${owner}/${repo}"; + subPackages = [ "cmd/goose" ]; + extraSrcs = map mkGoDep [ + { goPackagePath = "github.com/go-sql-driver/mysql"; + rev = "2e00b5cd70399450106cec6431c2e2ce3cae5034"; + sha256 = "085g48jq9hzmlcxg122n0c4pi41sc1nn2qpx1vrl2jfa8crsppa5"; + } + { goPackagePath = "github.com/kylelemons/go-gypsy"; + rev = "08cad365cd28a7fba23bb1e57aa43c5e18ad8bb8"; + sha256 = "1djv7nii3hy451n5jlslk0dblqzb1hia1cbqpdwhnps1g8hqjy8q"; + } + { goPackagePath = "github.com/lib/pq"; + rev = "ba5d4f7a35561e22fbdf7a39aa0070f4d460cfc0"; + sha256 = "1mfbqw9g00bk24bfmf53wri5c2wqmgl0qh4sh1qv2da13a7cwwg3"; + } + { goPackagePath = "github.com/mattn/go-sqlite3"; + rev = "2acfafad5870400156f6fceb12852c281cbba4d5"; + sha256 = "1rpgil3w4hh1cibidskv1js898hwz83ps06gh0hm3mym7ki8d5h7"; + } + { goPackagePath = "github.com/ziutek/mymysql"; + rev = "0582bcf675f52c0c2045c027fd135bd726048f45"; + sha256 = "0bkc9x8sgqbzgdimsmsnhb0qrzlzfv33fgajmmjxl4hcb21qz3rf"; + } + { goPackagePath = "golang.org/x/net"; + url = "https://go.googlesource.com/net"; + rev = "10c134ea0df15f7e34d789338c7a2d76cc7a3ab9"; + sha256 = "14cbr2shl08gyg85n5gj7nbjhrhhgrd52h073qd14j97qcxsakcz"; + } + ]; + }; + + boulder = let + owner = "letsencrypt"; + repo = "boulder"; + rev = "9866abab8962a591f06db457a4b84c518cc88243"; + version = "20170510"; + + in pkgs.buildGoPackage rec { + name = "${repo}-${version}"; + + src = pkgs.fetchFromGitHub { + name = "${name}-src"; + inherit rev owner repo; + sha256 = "170m5cjngbrm36wi7wschqw8jzs7kxpcyzmshq3pcrmcpigrhna1"; + }; + + postPatch = '' + # compat for go < 1.8 + sed -i -e 's/time\.Until(\([^)]\+\))/\1.Sub(time.Now())/' \ + test/ocsp/helper/helper.go + + find test -type f -exec sed -i -e '/libpkcs11-proxy.so/ { + s,/usr/local,${pkcs11-proxy}, + }' {} + + + sed -i -r \ + -e '/^def +install/a \ return True' \ + -e 's,exec \./bin/,,' \ + test/startservers.py + + cat "${snakeOilCa}/ca.key" > test/test-ca.key + cat "${snakeOilCa}/ca.pem" > test/test-ca.pem + ''; + + goPackagePath = "github.com/${owner}/${repo}"; + buildInputs = [ pkgs.libtool ]; + }; + + boulderSource = "${boulder.out}/share/go/src/${boulder.goPackagePath}"; + + softHsmConf = pkgs.writeText "softhsm.conf" '' + 0:/var/lib/softhsm/slot0.db + 1:/var/lib/softhsm/slot1.db + ''; + + snakeOilCa = pkgs.runCommand "snakeoil-ca" { + buildInputs = [ pkgs.openssl ]; + } '' + mkdir "$out" + openssl req -newkey rsa:4096 -x509 -sha256 -days 36500 \ + -subj '/CN=Snakeoil CA' -nodes \ + -out "$out/ca.pem" -keyout "$out/ca.key" + ''; + + createAndSignCert = fqdn: let + snakeoilCertConf = pkgs.writeText "snakeoil.cnf" '' + [req] + default_bits = 4096 + prompt = no + default_md = sha256 + req_extensions = req_ext + distinguished_name = dn + [dn] + CN = ${fqdn} + [req_ext] + subjectAltName = DNS:${fqdn} + ''; + in pkgs.runCommand "snakeoil-certs-${fqdn}" { + buildInputs = [ pkgs.openssl ]; + } '' + mkdir "$out" + openssl genrsa -out "$out/snakeoil.key" 4096 + openssl req -new -key "$out/snakeoil.key" \ + -config ${lib.escapeShellArg snakeoilCertConf} \ + -out snakeoil.csr + openssl x509 -req -in snakeoil.csr -sha256 -set_serial 666 \ + -CA "${snakeOilCa}/ca.pem" -CAkey "${snakeOilCa}/ca.key" \ + -extfile ${lib.escapeShellArg snakeoilCertConf} \ + -out "$out/snakeoil.pem" -days 36500 + ''; + + wfeCerts = createAndSignCert wfeDomain; + wfeDomain = "acme-v01.api.letsencrypt.org"; + wfeCertFile = "${wfeCerts}/snakeoil.pem"; + wfeKeyFile = "${wfeCerts}/snakeoil.key"; + + siteCerts = createAndSignCert siteDomain; + siteDomain = "letsencrypt.org"; + siteCertFile = "${siteCerts}/snakeoil.pem"; + siteKeyFile = "${siteCerts}/snakeoil.key"; + + # Retrieved via: + # curl -s -I https://acme-v01.api.letsencrypt.org/terms \ + # | sed -ne 's/^[Ll]ocation: *//p' + tosUrl = "https://letsencrypt.org/documents/LE-SA-v1.1.1-August-1-2016.pdf"; + tosPath = builtins.head (builtins.match "https?://[^/]+(.*)" tosUrl); + + tosFile = pkgs.fetchurl { + url = tosUrl; + sha256 = "08b2gacdz23mzji2pjr1pwnk82a84rzvr36isif7mmi9kydl6wv3"; + }; + + resolver = let + message = "You need to define a resolver for the letsencrypt test module."; + firstNS = lib.head config.networking.nameservers; + in if config.networking.nameservers == [] then throw message else firstNS; + + cfgDir = pkgs.stdenv.mkDerivation { + name = "boulder-config"; + src = "${boulderSource}/test/config"; + nativeBuildInputs = [ pkgs.jq ]; + phases = [ "unpackPhase" "patchPhase" "installPhase" ]; + postPatch = '' + sed -i -e 's/5002/80/' -e 's/5002/443/' va.json + sed -i -e '/listenAddress/s/:4000/:80/' wfe.json + sed -i -r \ + -e ${lib.escapeShellArg "s,http://boulder:4000/terms/v1,${tosUrl},g"} \ + -e 's,http://(boulder|127\.0\.0\.1):4000,https://${wfeDomain},g' \ + -e '/dnsResolver/s/127\.0\.0\.1:8053/${resolver}:53/' \ + *.json + if grep 4000 *.json; then exit 1; fi + + # Change all ports from 1909X to 909X, because the 1909X range of ports is + # allocated by startservers.py in order to intercept gRPC communication. + sed -i -e 's/\<1\(909[0-9]\)\>/\1/' *.json + + # Patch out all additional issuer certs + jq '. + {ca: (.ca + {Issuers: + [.ca.Issuers[] | select(.CertFile == "test/test-ca.pem")] + })}' ca.json > tmp + mv tmp ca.json + ''; + installPhase = "cp -r . \"$out\""; + }; + + components = { + gsb-test-srv.args = "-apikey my-voice-is-my-passport"; + gsb-test-srv.waitForPort = 6000; + gsb-test-srv.first = true; + boulder-sa.args = "--config ${cfgDir}/sa.json"; + boulder-wfe.args = "--config ${cfgDir}/wfe.json"; + boulder-ra.args = "--config ${cfgDir}/ra.json"; + boulder-ca.args = "--config ${cfgDir}/ca.json"; + boulder-va.args = "--config ${cfgDir}/va.json"; + boulder-publisher.args = "--config ${cfgDir}/publisher.json"; + boulder-publisher.waitForPort = 9091; + ocsp-updater.args = "--config ${cfgDir}/ocsp-updater.json"; + ocsp-updater.after = [ "boulder-publisher" ]; + ocsp-responder.args = "--config ${cfgDir}/ocsp-responder.json"; + ct-test-srv = {}; + mail-test-srv.args = "--closeFirst 5"; + }; + + commonPath = [ softhsm pkgs.mariadb goose boulder ]; + + mkServices = a: b: with lib; listToAttrs (concatLists (mapAttrsToList a b)); + + componentServices = mkServices (name: attrs: let + mkSrvName = n: "boulder-${n}.service"; + firsts = lib.filterAttrs (lib.const (c: c.first or false)) components; + firstServices = map mkSrvName (lib.attrNames firsts); + firstServicesNoSelf = lib.remove "boulder-${name}.service" firstServices; + additionalAfter = firstServicesNoSelf ++ map mkSrvName (attrs.after or []); + needsPort = attrs ? waitForPort; + inits = map (n: "boulder-init-${n}.service") [ "mysql" "softhsm" ]; + portWaiter = { + name = "boulder-${name}"; + value = { + description = "Wait For Port ${toString attrs.waitForPort} (${name})"; + after = [ "boulder-real-${name}.service" "bind.service" ]; + requires = [ "boulder-real-${name}.service" ]; + requiredBy = [ "boulder.service" ]; + serviceConfig.Type = "oneshot"; + serviceConfig.RemainAfterExit = true; + script = let + netcat = "${pkgs.netcat-openbsd}/bin/nc"; + portCheck = "${netcat} -z 127.0.0.1 ${toString attrs.waitForPort}"; + in "while ! ${portCheck}; do :; done"; + }; + }; + in lib.optional needsPort portWaiter ++ lib.singleton { + name = if needsPort then "boulder-real-${name}" else "boulder-${name}"; + value = { + description = "Boulder ACME Component (${name})"; + after = inits ++ additionalAfter; + requires = inits; + requiredBy = [ "boulder.service" ]; + path = commonPath; + environment.GORACE = "halt_on_error=1"; + environment.SOFTHSM_CONF = softHsmConf; + environment.PKCS11_PROXY_SOCKET = "tcp://127.0.0.1:5657"; + serviceConfig.WorkingDirectory = boulderSource; + serviceConfig.ExecStart = "${boulder}/bin/${name} ${attrs.args or ""}"; + serviceConfig.Restart = "on-failure"; + }; + }) components; + +in { + imports = [ ./resolver.nix ]; + + options.test-support.letsencrypt.caCert = lib.mkOption { + type = lib.types.path; + description = '' + A certificate file to use with the nodes attribute to + inject the snakeoil CA certificate used in the ACME server into + . + ''; + }; + + config = { + test-support = { + resolver.enable = let + isLocalResolver = config.networking.nameservers == [ "127.0.0.1" ]; + in lib.mkOverride 900 isLocalResolver; + letsencrypt.caCert = "${snakeOilCa}/ca.pem"; + }; + + # This has priority 140, because modules/testing/test-instrumentation.nix + # already overrides this with priority 150. + networking.nameservers = lib.mkOverride 140 [ "127.0.0.1" ]; + networking.firewall.enable = false; + + networking.extraHosts = '' + 127.0.0.1 ${toString [ + "sa.boulder" "ra.boulder" "wfe.boulder" "ca.boulder" "va.boulder" + "publisher.boulder" "ocsp-updater.boulder" "admin-revoker.boulder" + "boulder" "boulder-mysql" wfeDomain + ]} + ${config.networking.primaryIPAddress} ${wfeDomain} ${siteDomain} + ''; + + services.mysql.enable = true; + services.mysql.package = pkgs.mariadb; + + services.nginx.enable = true; + services.nginx.recommendedProxySettings = true; + services.nginx.virtualHosts.${wfeDomain} = { + enableSSL = true; + sslCertificate = wfeCertFile; + sslCertificateKey = wfeKeyFile; + locations."/".proxyPass = "http://127.0.0.1:80"; + }; + services.nginx.virtualHosts.${siteDomain} = { + enableSSL = true; + sslCertificate = siteCertFile; + sslCertificateKey = siteKeyFile; + locations.${tosPath}.extraConfig = "alias ${tosFile};"; + }; + + systemd.services = { + pkcs11-daemon = { + description = "PKCS11 Daemon"; + after = [ "boulder-init-softhsm.service" ]; + before = map (n: "${n}.service") (lib.attrNames componentServices); + wantedBy = [ "multi-user.target" ]; + environment.SOFTHSM_CONF = softHsmConf; + environment.PKCS11_DAEMON_SOCKET = "tcp://127.0.0.1:5657"; + serviceConfig.ExecStart = let + softhsmLib = "${softhsm}/lib/softhsm/libsofthsm.so"; + in "${pkcs11-proxy}/bin/pkcs11-daemon ${softhsmLib}"; + }; + + boulder-init-mysql = { + description = "Boulder ACME Init (MySQL)"; + after = [ "mysql.service" ]; + serviceConfig.Type = "oneshot"; + serviceConfig.RemainAfterExit = true; + serviceConfig.WorkingDirectory = boulderSource; + path = commonPath; + script = "${pkgs.bash}/bin/sh test/create_db.sh"; + }; + + boulder-init-softhsm = { + description = "Boulder ACME Init (SoftHSM)"; + environment.SOFTHSM_CONF = softHsmConf; + serviceConfig.Type = "oneshot"; + serviceConfig.RemainAfterExit = true; + serviceConfig.WorkingDirectory = boulderSource; + preStart = "mkdir -p /var/lib/softhsm"; + path = commonPath; + script = '' + softhsm --slot 0 --init-token \ + --label intermediate --pin 5678 --so-pin 1234 + softhsm --slot 0 --import test/test-ca.key \ + --label intermediate_key --pin 5678 --id FB + softhsm --slot 1 --init-token \ + --label root --pin 5678 --so-pin 1234 + softhsm --slot 1 --import test/test-root.key \ + --label root_key --pin 5678 --id FA + ''; + }; + + boulder = { + description = "Boulder ACME Server"; + after = map (n: "${n}.service") (lib.attrNames componentServices); + wantedBy = [ "multi-user.target" ]; + serviceConfig.Type = "oneshot"; + serviceConfig.RemainAfterExit = true; + script = let + ports = lib.range 8000 8005 ++ lib.singleton 80; + netcat = "${pkgs.netcat-openbsd}/bin/nc"; + mkPortCheck = port: "${netcat} -z 127.0.0.1 ${toString port}"; + checks = "(${lib.concatMapStringsSep " && " mkPortCheck ports})"; + in "while ! ${checks}; do :; done"; + }; + } // componentServices; + }; +} diff --git a/nixos/tests/common/resolver.nix b/nixos/tests/common/resolver.nix new file mode 100644 index 000000000000..a1901c5c8167 --- /dev/null +++ b/nixos/tests/common/resolver.nix @@ -0,0 +1,141 @@ +# This module automatically discovers zones in BIND and NSD NixOS +# configurations and creates zones for all definitions of networking.extraHosts +# (except those that point to 127.0.0.1 or ::1) within the current test network +# and delegates these zones using a fake root zone served by a BIND recursive +# name server. +{ config, nodes, pkgs, lib, ... }: + +{ + options.test-support.resolver.enable = lib.mkOption { + type = lib.types.bool; + default = true; + internal = true; + description = '' + Whether to enable the resolver that automatically discovers zone in the + test network. + + This option is true by default, because the module + defining this option needs to be explicitly imported. + + The reason this option exists is for the + nixos/tests/common/letsencrypt.nix module, which + needs that option to disable the resolver once the user has set its own + resolver. + ''; + }; + + config = lib.mkIf config.test-support.resolver.enable { + networking.firewall.enable = false; + services.bind.enable = true; + services.bind.cacheNetworks = lib.mkForce [ "any" ]; + services.bind.forwarders = lib.mkForce []; + services.bind.zones = lib.singleton { + name = "."; + file = let + addDot = zone: zone + lib.optionalString (!lib.hasSuffix "." zone) "."; + mkNsdZoneNames = zones: map addDot (lib.attrNames zones); + mkBindZoneNames = zones: map (zone: addDot zone.name) zones; + getZones = cfg: mkNsdZoneNames cfg.services.nsd.zones + ++ mkBindZoneNames cfg.services.bind.zones; + + getZonesForNode = attrs: { + ip = attrs.config.networking.primaryIPAddress; + zones = lib.filter (zone: zone != ".") (getZones attrs.config); + }; + + zoneInfo = lib.mapAttrsToList (lib.const getZonesForNode) nodes; + + # A and AAAA resource records for all the definitions of + # networking.extraHosts except those for 127.0.0.1 or ::1. + # + # The result is an attribute set with keys being the host name and the + # values are either { ipv4 = ADDR; } or { ipv6 = ADDR; } where ADDR is + # the IP address for the corresponding key. + recordsFromExtraHosts = let + getHostsForNode = lib.const (n: n.config.networking.extraHosts); + allHostsList = lib.mapAttrsToList getHostsForNode nodes; + allHosts = lib.concatStringsSep "\n" allHostsList; + + reIp = "[a-fA-F0-9.:]+"; + reHost = "[a-zA-Z0-9.-]+"; + + matchAliases = str: let + matched = builtins.match "[ \t]+(${reHost})(.*)" str; + continue = lib.singleton (lib.head matched) + ++ matchAliases (lib.last matched); + in if matched == null then [] else continue; + + matchLine = str: let + result = builtins.match "[ \t]*(${reIp})[ \t]+(${reHost})(.*)" str; + in if result == null then null else { + ipAddr = lib.head result; + hosts = lib.singleton (lib.elemAt result 1) + ++ matchAliases (lib.last result); + }; + + skipLine = str: let + rest = builtins.match "[^\n]*\n(.*)" str; + in if rest == null then "" else lib.head rest; + + getEntries = str: acc: let + result = matchLine str; + next = getEntries (skipLine str); + newEntry = acc ++ lib.singleton result; + continue = if result == null then next acc else next newEntry; + in if str == "" then acc else continue; + + isIPv6 = str: builtins.match ".*:.*" str != null; + loopbackIps = [ "127.0.0.1" "::1" ]; + filterLoopback = lib.filter (e: !lib.elem e.ipAddr loopbackIps); + + allEntries = lib.concatMap (entry: map (host: { + inherit host; + ${if isIPv6 entry.ipAddr then "ipv6" else "ipv4"} = entry.ipAddr; + }) entry.hosts) (filterLoopback (getEntries (allHosts + "\n") [])); + + mkRecords = entry: let + records = lib.optional (entry ? ipv6) "AAAA ${entry.ipv6}" + ++ lib.optional (entry ? ipv4) "A ${entry.ipv4}"; + mkRecord = typeAndData: "${entry.host}. IN ${typeAndData}"; + in lib.concatMapStringsSep "\n" mkRecord records; + + in lib.concatMapStringsSep "\n" mkRecords allEntries; + + # All of the zones that are subdomains of existing zones. + # For example if there is only "example.com" the following zones would + # be 'subZones': + # + # * foo.example.com. + # * bar.example.com. + # + # While the following would *not* be 'subZones': + # + # * example.com. + # * com. + # + subZones = let + allZones = lib.concatMap (zi: zi.zones) zoneInfo; + isSubZoneOf = z1: z2: lib.hasSuffix z2 z1 && z1 != z2; + in lib.filter (z: lib.any (isSubZoneOf z) allZones) allZones; + + # All the zones without 'subZones'. + filteredZoneInfo = map (zi: zi // { + zones = lib.filter (x: !lib.elem x subZones) zi.zones; + }) zoneInfo; + + in pkgs.writeText "fake-root.zone" '' + $TTL 3600 + . IN SOA ns.fakedns. admin.fakedns. ( 1 3h 1h 1w 1d ) + ns.fakedns. IN A ${config.networking.primaryIPAddress} + . IN NS ns.fakedns. + ${lib.concatImapStrings (num: { ip, zones }: '' + ns${toString num}.fakedns. IN A ${ip} + ${lib.concatMapStrings (zone: '' + ${zone} IN NS ns${toString num}.fakedns. + '') zones} + '') (lib.filter (zi: zi.zones != []) filteredZoneInfo)} + ${recordsFromExtraHosts} + ''; + }; + }; +} From 11b3ae74e19a075e8d733af99530fbbe697cf0d5 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 27 Jul 2017 13:24:17 +0200 Subject: [PATCH 032/172] nixos/tests: Add a basic test for ACME The test here is pretty basic and only tests nginx, but it should get us started to write tests for different webservers and different ACME implementations. Signed-off-by: aszlig --- nixos/release.nix | 1 + nixos/tests/acme.nix | 62 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+) create mode 100644 nixos/tests/acme.nix diff --git a/nixos/release.nix b/nixos/release.nix index 34198a950647..38c446c1f8a4 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -214,6 +214,7 @@ in rec { # Run the tests for each platform. You can run a test by doing # e.g. ‘nix-build -A tests.login.x86_64-linux’, or equivalently, # ‘nix-build tests/login.nix -A result’. + tests.acme = callTest tests/acme.nix {}; tests.avahi = callTest tests/avahi.nix {}; tests.bittorrent = callTest tests/bittorrent.nix {}; tests.blivet = callTest tests/blivet.nix {}; diff --git a/nixos/tests/acme.nix b/nixos/tests/acme.nix new file mode 100644 index 000000000000..a48f4d75ae3e --- /dev/null +++ b/nixos/tests/acme.nix @@ -0,0 +1,62 @@ +let + commonConfig = { config, lib, pkgs, nodes, ... }: { + networking.nameservers = [ + nodes.letsencrypt.config.networking.primaryIPAddress + ]; + + nixpkgs.overlays = lib.singleton (self: super: { + cacert = super.cacert.overrideDerivation (drv: { + installPhase = (drv.installPhase or "") + '' + cat "${nodes.letsencrypt.config.test-support.letsencrypt.caCert}" \ + >> "$out/etc/ssl/certs/ca-bundle.crt" + ''; + }); + + pythonPackages = (super.python.override { + packageOverrides = lib.const (pysuper: { + requests = pysuper.requests.overrideDerivation (drv: { + postPatch = (drv.postPatch or "") + '' + cat "${self.cacert}/etc/ssl/certs/ca-bundle.crt" \ + > requests/cacert.pem + ''; + }); + }); + }).pkgs; + }); + }; + +in import ./make-test.nix { + name = "acme"; + + nodes = { + letsencrypt = ./common/letsencrypt.nix; + + webserver = { config, pkgs, ... }: { + imports = [ commonConfig ]; + networking.firewall.allowedTCPPorts = [ 80 443 ]; + + networking.extraHosts = '' + ${config.networking.primaryIPAddress} example.com + ''; + + services.nginx.enable = true; + services.nginx.virtualHosts."example.com" = { + enableACME = true; + forceSSL = true; + locations."/".root = pkgs.runCommand "docroot" {} '' + mkdir -p "$out" + echo hello world > "$out/index.html" + ''; + }; + }; + + client = commonConfig; + }; + + testScript = '' + $letsencrypt->waitForUnit("boulder.service"); + startAll; + $webserver->waitForUnit("acme-certificates.target"); + $client->succeed('curl https://example.com/ | grep -qF "hello world"'); + ''; +} From bda38317eb3ad36be74ad08013afeaf55fe9066f Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 13 Sep 2017 23:03:32 +0200 Subject: [PATCH 033/172] nixos/tests/letsencrypt: Fix nginx options The enableSSL option has been deprecated in a912a6a291eaa5f6a2ad9143c9e276779c357a41, so we switch to using onlySSL. I've also explicitly disabled enableACME, because this is the default and we don't actually want to have ACME enabled for a host which runs an actual ACME server. Signed-off-by: aszlig --- nixos/tests/common/letsencrypt.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/tests/common/letsencrypt.nix b/nixos/tests/common/letsencrypt.nix index 162f50385d8f..5a2a266d4da5 100644 --- a/nixos/tests/common/letsencrypt.nix +++ b/nixos/tests/common/letsencrypt.nix @@ -371,13 +371,15 @@ in { services.nginx.enable = true; services.nginx.recommendedProxySettings = true; services.nginx.virtualHosts.${wfeDomain} = { - enableSSL = true; + onlySSL = true; + enableACME = false; sslCertificate = wfeCertFile; sslCertificateKey = wfeKeyFile; locations."/".proxyPass = "http://127.0.0.1:80"; }; services.nginx.virtualHosts.${siteDomain} = { - enableSSL = true; + onlySSL = true; + enableACME = false; sslCertificate = siteCertFile; sslCertificateKey = siteKeyFile; locations.${tosPath}.extraConfig = "alias ${tosFile};"; From 01fffd94e5848e55fab88cd85a6ac958e1a309ff Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 13 Sep 2017 23:06:39 +0200 Subject: [PATCH 034/172] nixos/tests/acme: Patch certifi with cacert Since 67651d80bc8baaf09ab91fec8ea423e09107ed8f the requests package now depends on certifi, which in turn provides the CA root certificates that we need to replace. It might also be a good idea to actually patch certifi with our version of cacert by default so that if we want to override and/or add something we only need to do it once. Signed-off-by: aszlig Cc: @fpletz, @k0ral, @FRidh --- nixos/tests/acme.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/acme.nix b/nixos/tests/acme.nix index a48f4d75ae3e..f44524a1d6a8 100644 --- a/nixos/tests/acme.nix +++ b/nixos/tests/acme.nix @@ -14,10 +14,10 @@ let pythonPackages = (super.python.override { packageOverrides = lib.const (pysuper: { - requests = pysuper.requests.overrideDerivation (drv: { + certifi = pysuper.certifi.overrideDerivation (drv: { postPatch = (drv.postPatch or "") + '' cat "${self.cacert}/etc/ssl/certs/ca-bundle.crt" \ - > requests/cacert.pem + > certifi/cacert.pem ''; }); }); From 9111b533257d54053fe2f7c5e7970c8aac3c67e3 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 13 Jul 2017 22:18:59 -0700 Subject: [PATCH 035/172] duti: init at 1.5.4pre MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I would init at 1.5.4, but sadly it doesn’t work on OS X 10.11+. --- pkgs/os-specific/darwin/duti/default.nix | 30 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/os-specific/darwin/duti/default.nix diff --git a/pkgs/os-specific/darwin/duti/default.nix b/pkgs/os-specific/darwin/duti/default.nix new file mode 100644 index 000000000000..10eac5d47191 --- /dev/null +++ b/pkgs/os-specific/darwin/duti/default.nix @@ -0,0 +1,30 @@ +{stdenv, lib, fetchFromGitHub, autoreconfHook, darwin}: + +stdenv.mkDerivation rec { + pname = "duti"; + name = "${pname}-${version}"; + version = "1.5.4pre"; + src = fetchFromGitHub { + owner = "moretension"; + repo = pname; + rev = "7dbcae86f99fedef5a6c4311f032a0f1ca0539cc"; + sha256 = "1z9sa0yk87vs57d5338y6lvm1v1vvynxb7dy1x5aqzkcr0imhljl"; + }; + nativeBuildInputs = [autoreconfHook]; + buildInputs = [darwin.apple_sdk.frameworks.ApplicationServices]; + configureFlags = ["--with-macosx-sdk=/homeless-shelter"]; + meta = with lib; { + description = "A command-line tool to select default applications for document types and URL schemes on Mac OS X"; + longDescription = '' + duti is a command-line utility capable of setting default applications for + various document types on Mac OS X, using Apple's Uniform Type Identifiers. A + UTI is a unique string describing the format of a file's content. For instance, + a Microsoft Word document has a UTI of com.microsoft.word.doc. Using duti, the + user can change which application acts as the default handler for a given UTI. + ''; + maintainers = with maintainers; [matthewbauer]; + platforms = platforms.darwin; + licenses = licenses.publicDomain; + homepage = "http://duti.org/"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7d4b467a3e3e..e86283244777 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19401,4 +19401,6 @@ with pkgs; macOSSierraShared = callPackage ../test/macos-sierra-shared {}; }; + + duti = callPackage ../os-specific/darwin/duti {}; } From 0c368ef02f40fdc01641959be0d6a3ee8c1df5ff Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Thu, 14 Sep 2017 01:03:39 +0300 Subject: [PATCH 036/172] treewide: Escape backslash in strings properly "\." is apparently the same as "." wheras the correct one is "\\." --- nixos/modules/services/misc/geoip-updater.nix | 4 ++-- pkgs/development/idris-modules/default.nix | 2 +- pkgs/top-level/impure.nix | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/misc/geoip-updater.nix b/nixos/modules/services/misc/geoip-updater.nix index 5135fac8f7dc..760fa66e80d6 100644 --- a/nixos/modules/services/misc/geoip-updater.nix +++ b/nixos/modules/services/misc/geoip-updater.nix @@ -238,7 +238,7 @@ in assertions = [ { assertion = (builtins.filter - (x: builtins.match ".*\.(gz|xz)$" x == null) cfg.databases) == []; + (x: builtins.match ".*\\.(gz|xz)$" x == null) cfg.databases) == []; message = '' services.geoip-updater.databases supports only .gz and .xz databases. @@ -246,7 +246,7 @@ in ${toString cfg.databases} Offending element(s): - ${toString (builtins.filter (x: builtins.match ".*\.(gz|xz)$" x == null) cfg.databases)}; + ${toString (builtins.filter (x: builtins.match ".*\\.(gz|xz)$" x == null) cfg.databases)}; ''; } ]; diff --git a/pkgs/development/idris-modules/default.nix b/pkgs/development/idris-modules/default.nix index 3d0ea511e101..4d7c4928283a 100644 --- a/pkgs/development/idris-modules/default.nix +++ b/pkgs/development/idris-modules/default.nix @@ -26,7 +26,7 @@ }; files = builtins.filter (n: n != "default") (pkgs.lib.mapAttrsToList (name: type: let - m = builtins.match "(.*)\.nix" name; + m = builtins.match "(.*)\\.nix" name; in if m == null then "default" else builtins.head m) (builtins.readDir ./.)); in (builtins.listToAttrs (map (name: { inherit name; diff --git a/pkgs/top-level/impure.nix b/pkgs/top-level/impure.nix index a4d313a1b991..a9f21e45aed4 100644 --- a/pkgs/top-level/impure.nix +++ b/pkgs/top-level/impure.nix @@ -50,7 +50,7 @@ in # it's a directory, so the set of overlays from the directory, ordered lexicographically let content = readDir path; in map (n: import (path + ("/" + n))) - (builtins.filter (n: builtins.match ".*\.nix" n != null || pathExists (path + ("/" + n + "/default.nix"))) + (builtins.filter (n: builtins.match ".*\\.nix" n != null || pathExists (path + ("/" + n + "/default.nix"))) (attrNames content)) else # it's a file, so the result is the contents of the file itself From a4a187fe5f41e1eb7416b0ae7d6f9381e5863942 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Wed, 13 Sep 2017 22:01:45 +0000 Subject: [PATCH 037/172] include-what-you-use: 0.6 -> 0.8 --- .../tools/analysis/include-what-you-use/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/analysis/include-what-you-use/default.nix b/pkgs/development/tools/analysis/include-what-you-use/default.nix index bd3f33d169a1..7f34ec0fd630 100644 --- a/pkgs/development/tools/analysis/include-what-you-use/default.nix +++ b/pkgs/development/tools/analysis/include-what-you-use/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { name = "include-what-you-use-${version}"; # Also bump llvmPackages in all-packages.nix to the supported version! - version = "0.6"; + version = "0.8"; src = fetchurl { - sha256 = "0n3z4pfbby0rl338irbs4yvcmjfnza82xg9a8r9amyl0bkfasbxb"; + sha256 = "0r6n5gqicl0f9c8jrphq40kc2cis952gmnkm3643m3jwad0mn33d"; url = "${meta.homepage}/downloads/${name}.src.tar.gz"; }; - buildInputs = with llvmPackages; [ clang llvm ]; + buildInputs = with llvmPackages; [ clang-unwrapped llvm ]; nativeBuildInputs = [ cmake ]; cmakeFlags = [ "-DIWYU_LLVM_ROOT_PATH=${llvmPackages.clang-unwrapped}" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7d4b467a3e3e..3301c5b51648 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7131,7 +7131,7 @@ with pkgs; }; include-what-you-use = callPackage ../development/tools/analysis/include-what-you-use { - llvmPackages = llvmPackages_38; + llvmPackages = llvmPackages_4; }; indent = callPackage ../development/tools/misc/indent { }; From bb5b0849863eacb2b54b62a52c17c15c7a05a9fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 13 Sep 2017 23:30:45 +0100 Subject: [PATCH 038/172] tor: skip ControlPort in torrc, if not set. --- nixos/modules/services/security/tor.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix index 04b065f6ae4b..bc79d9f2a590 100644 --- a/nixos/modules/services/security/tor.nix +++ b/nixos/modules/services/security/tor.nix @@ -17,7 +17,7 @@ let GeoIPv6File ${pkgs.tor.geoip}/share/tor/geoip6 ''} - ${optint "ControlPort" (toString cfg.controlPort)} + ${optint "ControlPort" cfg.controlPort} '' # Client connection config + optionalString cfg.client.enable '' From 73af0b1696c58983849b4df4b55da7f07335b5be Mon Sep 17 00:00:00 2001 From: Kirill Boltaev Date: Tue, 29 Aug 2017 19:58:10 +0300 Subject: [PATCH 039/172] chromium: 60.0.3112.90 -> 60.0.3112.113 --- .../browsers/chromium/upstream-info.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index e80cfdbc904e..b2f0ade96f44 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "1sh3rq36sh4g7blajvqfvs06fs5sbrbdp50qq0cvcj4k3fmb4bd8"; - sha256bin64 = "1w67y4z57qm5fwniayncly7a4mjmwqir7gfd54ny8lwlf247d43m"; - version = "60.0.3112.78"; + sha256 = "0q23dm6mjq2z2akn3l65dyyg5kv1c9km5ynydzghk34fbv8yj3vl"; + sha256bin64 = "0igscn5y8ipqhkwvzfc8rfp3d5icilz66bgiypz54q4w2sfbqpvg"; + version = "61.0.3163.71"; }; dev = { - sha256 = "0yan2dzx1854f3xslif5682rkb82a1li6vxj12z5s5fxqijhj1jq"; - sha256bin64 = "0ddva2rqnid2gcx3qh72p41wc15869w2w9n0rbdpn662rpl041v1"; - version = "61.0.3163.25"; + sha256 = "06brghm7f0xr6ycn1vkaj6iqxrdga5zkyh4xjbn5bdxvbq2c4z23"; + sha256bin64 = "0d55q8qz9sxhpaws2f2w445m48piivdgip9wwgd1ahl0mm2vidd4"; + version = "62.0.3198.0"; }; stable = { - sha256 = "1rirhwvccidza4q4z1gqdwcd9v1bymh1m9r2cq8jhiabfrjpjbxl"; - sha256bin64 = "1lw349ips0sgyls3arv864yq5xykfn9jilwkalvllaq6yvdvcvlk"; - version = "60.0.3112.90"; + sha256 = "0ngc9wdac6mm9kgfln8b0k7xm10i9lvcfq7k6lpaj0pal43fgz7b"; + sha256bin64 = "15a29hh9747vkhgrhiw5i4qlf0pfihjqip863fxsl32fqsakp3qn"; + version = "60.0.3112.113"; }; } From ebb6488e74f17dce5c54348e98797bdda2912650 Mon Sep 17 00:00:00 2001 From: Ruben Maher Date: Tue, 12 Sep 2017 09:01:41 +0930 Subject: [PATCH 040/172] nextcloud-client: use cmakeDir and cmakeFlags attrs --- .../networking/nextcloud-client/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index d369ec63a948..a3dce871c4bb 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -14,9 +14,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig cmake ]; buildInputs = [ qtbase qtwebkit qtkeychain sqlite ]; - preConfigure = '' - cmakeFlagsArray+=("-UCMAKE_INSTALL_LIBDIR" "-DOEM_THEME_DIR=$(realpath ./nextcloudtheme)" "../client") - ''; + dontUseCmakeBuildDir = true; + + cmakeDir = "client"; + + cmakeFlags = [ + "-UCMAKE_INSTALL_LIBDIR" + "-DCMAKE_BUILD_TYPE=Release" + "-DOEM_THEME_DIR=${src}/nextcloudtheme" + ]; meta = with stdenv.lib; { description = "Nextcloud themed desktop client"; From e02f936b2766ba7d8b6229444c2268e703deb0c6 Mon Sep 17 00:00:00 2001 From: Ruben Maher Date: Tue, 12 Sep 2017 09:04:17 +0930 Subject: [PATCH 041/172] nextcloud-client: add inotify dependency when building on linux This allows for more efficient change detection. --- .../applications/networking/nextcloud-client/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index a3dce871c4bb..c42fdf6fc1e6 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchgit, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, sqlite }: +{ stdenv, fetchgit, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, sqlite +, inotify-tools }: stdenv.mkDerivation rec { name = "nextcloud-client-${version}"; @@ -12,7 +13,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ qtbase qtwebkit qtkeychain sqlite ]; + buildInputs = [ qtbase qtwebkit qtkeychain sqlite ] + ++ stdenv.lib.optional stdenv.isLinux inotify-tools; dontUseCmakeBuildDir = true; @@ -22,6 +24,9 @@ stdenv.mkDerivation rec { "-UCMAKE_INSTALL_LIBDIR" "-DCMAKE_BUILD_TYPE=Release" "-DOEM_THEME_DIR=${src}/nextcloudtheme" + ] ++ stdenv.lib.optionals stdenv.isLinux [ + "-DINOTIFY_LIBRARY=${inotify-tools}/lib/libinotifytools.so" + "-DINOTIFY_INCLUDE_DIR=${inotify-tools}/include" ]; meta = with stdenv.lib; { From 4ce18c836759619167f76e76f6548127617261ea Mon Sep 17 00:00:00 2001 From: Ruben Maher Date: Tue, 12 Sep 2017 09:22:48 +0930 Subject: [PATCH 042/172] nextcloud-client: enable parallel building So that the client can build faster. --- pkgs/applications/networking/nextcloud-client/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index c42fdf6fc1e6..aa6bb6d884c7 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase qtwebkit qtkeychain sqlite ] ++ stdenv.lib.optional stdenv.isLinux inotify-tools; + enableParallelBuilding = true; + dontUseCmakeBuildDir = true; cmakeDir = "client"; From e828dcb5cd4ae321dde053d2eb3a24992b42f167 Mon Sep 17 00:00:00 2001 From: Ruben Maher Date: Wed, 13 Sep 2017 08:59:16 +0930 Subject: [PATCH 043/172] nextcloud-client: provide optional gnome-keyring integration `qtkeyring` can use `gnome-keyring`, but it needs some help to find it. I have not enabled this by default because not everyone who uses this will want to pull in GNOME dependencies. --- .../networking/nextcloud-client/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index aa6bb6d884c7..081f765a3e87 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, sqlite -, inotify-tools }: +, inotify-tools, withGnomeKeyring ? false, makeWrapper, libgnome_keyring }: stdenv.mkDerivation rec { name = "nextcloud-client-${version}"; @@ -13,8 +13,10 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig cmake ]; + buildInputs = [ qtbase qtwebkit qtkeychain sqlite ] - ++ stdenv.lib.optional stdenv.isLinux inotify-tools; + ++ stdenv.lib.optional stdenv.isLinux inotify-tools + ++ stdenv.lib.optional withGnomeKeyring makeWrapper; enableParallelBuilding = true; @@ -31,6 +33,11 @@ stdenv.mkDerivation rec { "-DINOTIFY_INCLUDE_DIR=${inotify-tools}/include" ]; + postInstall = stdenv.lib.optionalString (withGnomeKeyring) '' + wrapProgram "$out/bin/nextcloud" \ + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libgnome_keyring ]} + ''; + meta = with stdenv.lib; { description = "Nextcloud themed desktop client"; homepage = https://nextcloud.com; From 4a67ee98930954b9cf95471e22e81cf5f0cc831a Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 14 Sep 2017 02:17:50 -0300 Subject: [PATCH 044/172] mgba: 0.5.2 -> 0.6.0 --- pkgs/misc/emulators/mgba/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix index e4e84220812b..f14608fd93ef 100644 --- a/pkgs/misc/emulators/mgba/default.nix +++ b/pkgs/misc/emulators/mgba/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "mgba-${version}"; - version = "0.5.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "mgba-emu"; repo = "mgba"; rev = version; - sha256 = "1cpxiwzbywnjs3lrqa3bc9bj68plypx0br3lssd6p68c4wh01fyp"; + sha256 = "1kzb6zj2lxfaiyfq9h7q26fh7xh1ggybmh5pin5rcgs7jyygrsjb"; }; nativeBuildInputs = [ pkgconfig cmake ]; From 2f70241e21554eae0be8bf4175dea0a9097b0d40 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 14 Sep 2017 06:03:12 +0000 Subject: [PATCH 045/172] gtk+: 3.22.19 -> 3.22.21 --- pkgs/development/libraries/gtk+/3.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index bc5b6a363398..f5d75177963a 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -13,7 +13,7 @@ with stdenv.lib; let ver_maj = "3.22"; - ver_min = "19"; + ver_min = "21"; version = "${ver_maj}.${ver_min}"; in stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz"; - sha256 = "9883d3ca5244f9b3168ce660e87d52900e141d0f7147dea0640bdd6fe8e5166c"; + sha256 = "1bd3c1a85cfb4db112cabb5379abb05a1a94fe43052d309d573493fca00e6b87"; }; outputs = [ "out" "dev" ]; From fc2566e9666a2a8578d29a60b8b8cac395726180 Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Thu, 14 Sep 2017 07:25:13 +0200 Subject: [PATCH 046/172] s3fs: 1.80 -> 1.82 --- pkgs/tools/filesystems/s3fs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix index fa975790d4a6..9d7e9eaee95e 100644 --- a/pkgs/tools/filesystems/s3fs/default.nix +++ b/pkgs/tools/filesystems/s3fs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "s3fs-fuse-${version}"; - version = "1.80"; + version = "1.82"; src = fetchFromGitHub { owner = "s3fs-fuse"; repo = "s3fs-fuse"; rev = "v${version}"; - sha256 = "0yikqpdyjibbb36rj4118lv9nxgp9f5jhydzxijzxrzw29ypvw76"; + sha256 = "0bammbb8h10n51qk5141gabsd5p91qbaqq7cwa1q8yf5qglwlp10"; }; buildInputs = [ curl openssl libxml2 fuse ]; From addfb83852a752a678627a74125b06f216979835 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 14 Sep 2017 14:42:25 +0800 Subject: [PATCH 047/172] neomutt: 20170907 -> 20170912 --- .../applications/networking/mailreaders/neomutt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index 7ebc2a7868ad..b0246b58e068 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -2,14 +2,14 @@ , cyrus_sasl, gss, gpgme, kerberos, libidn, notmuch, openssl, lmdb, libxslt, docbook_xsl }: stdenv.mkDerivation rec { - version = "20170907"; + version = "20170912"; name = "neomutt-${version}"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = "neomutt-${version}"; - sha256 = "0j2k5d77j5dvfh0yqihgvynnxxv2s5lf3pl50dr8b5b4jk04b961"; + sha256 = "0qndszmaihly3pp2wqiqm31nxbv9ys3j05kzffaqhzngfilmar9g"; }; nativeBuildInputs = [ autoreconfHook docbook_xsl libxslt.bin which ]; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A small but very powerful text-based mail client"; homepage = http://www.neomutt.org; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; maintainers = with maintainers; [ cstrahan erikryb jfrankenau vrthra ]; platforms = platforms.unix; }; From c3e7040d0eec1d82b00a47c6b113a93f60719077 Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Thu, 14 Sep 2017 03:14:56 -0400 Subject: [PATCH 048/172] pgpdump: disable tests --- pkgs/top-level/python-packages.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9edf6571a527..60eefe2fceb2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20295,13 +20295,18 @@ in { sqlmap = callPackage ../development/python-modules/sqlmap { }; pgpdump = self.buildPythonPackage rec { - name = "pgpdump-1.5"; + pname = "pgpdump"; + version = "1.5"; + name = "${pname}-${version}"; - src = pkgs.fetchurl { - url = "mirror://pypi/p/pgpdump/pgpdump-1.5.tar.gz"; - sha256 = "1c4700857bf7ba735b08cfe4101aa3a4f5fd839657af249c17b2697c20829668"; + src = fetchPypi { + inherit pname version; + sha256 = "0s4nh8h7qsdj2yf29bspjs1zvxd4lcd11r6g11dp7fppgf2h0iqw"; }; + # Disabling check because of: https://github.com/toofishes/python-pgpdump/issues/18 + doCheck = false; + meta = { description = "Python library for parsing PGP packets"; homepage = https://github.com/toofishes/python-pgpdump; From 746f20fc7f1346ac9c24a9b98d777ec85ffc1321 Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Thu, 14 Sep 2017 03:22:00 -0400 Subject: [PATCH 049/172] colanderalchemy: fixes tests --- pkgs/top-level/python-packages.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9edf6571a527..cd32040517a6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3063,6 +3063,13 @@ in { sha256 = "11wcni2xmfmy001rj62q2pwf305vvngkrfm5c4zlwvgbvlsrvnnw"; }; + patches = [ + (pkgs.fetchpatch { + url = "https://github.com/stefanofontanelli/ColanderAlchemy/commit/b45fe35f2936a5ccb705e9344075191e550af6c9.patch"; + sha256 = "1kf278wjq49zd6fhpp55vdcawzdd107767shzfck522sv8gr6qvx"; + }) + ]; + buildInputs = with self; [ unittest2 ]; propagatedBuildInputs = with self; [ colander sqlalchemy ]; From dabf89fadddd334aeefe033991c91c9232bd0cc6 Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Wed, 13 Sep 2017 21:30:40 -0400 Subject: [PATCH 050/172] credstash: 1.13.2 -> 1.13.3 --- .../python-modules/credstash/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +----------------- 2 files changed, 24 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/credstash/default.nix diff --git a/pkgs/development/python-modules/credstash/default.nix b/pkgs/development/python-modules/credstash/default.nix new file mode 100644 index 000000000000..9f61018ceabb --- /dev/null +++ b/pkgs/development/python-modules/credstash/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, cryptography, boto3, pyyaml, docutils }: + +buildPythonPackage rec { + pname = "credstash"; + version = "1.13.3"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1x2dh4rs5sahb8h2xznhq7srcm2zl9ykc72a8iqpq4dz7l9k7x7i"; + }; + + propagatedBuildInputs = [ cryptography boto3 pyyaml docutils ]; + + # No tests in archive + doCheck = false; + + meta = with stdenv.lib; { + description = "A utility for managing secrets in the cloud using AWS KMS and DynamoDB"; + homepage = https://github.com/LuminalOSS/credstash; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9edf6571a527..7ba293f521bb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3254,27 +3254,7 @@ in { }; }; - credstash = buildPythonPackage rec { - pname = "credstash"; - version = "1.13.2"; - name = "${pname}-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "b6283e565e3e441e8f74efcca54ece9697db16ce2e930fb5b6f7c0ab929c377e"; - }; - - propagatedBuildInputs = with self; [ cryptography boto3 pyyaml docutils ]; - - # No tests in archive - doCheck = false; - - meta = { - description = "A utility for managing secrets in the cloud using AWS KMS and DynamoDB"; - homepage = https://github.com/LuminalOSS/credstash; - license = licenses.asl20; - }; - }; + credstash = callPackage ../development/python-modules/credstash { }; cython = callPackage ../development/python-modules/Cython { }; From 03898f2f2311260a8bb60302d59b48901ea61395 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Sep 2017 10:17:36 +0200 Subject: [PATCH 051/172] python34: check LD_LIBRARY_PATH Backports support for LD_LIBRARY_PATH from 3.6 --- .../python/cpython/3.4/default.nix | 1 + .../python/cpython/3.4/ld_library_path.patch | 51 +++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 pkgs/development/interpreters/python/cpython/3.4/ld_library_path.patch diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix index 3b375e147bce..a924b543fe38 100644 --- a/pkgs/development/interpreters/python/cpython/3.4/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix @@ -66,6 +66,7 @@ in stdenv.mkDerivation { patches = [ ./no-ldconfig.patch + ./ld_library_path.patch ]; postPatch = '' diff --git a/pkgs/development/interpreters/python/cpython/3.4/ld_library_path.patch b/pkgs/development/interpreters/python/cpython/3.4/ld_library_path.patch new file mode 100644 index 000000000000..3172eb6d18e4 --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/3.4/ld_library_path.patch @@ -0,0 +1,51 @@ +From 85991e0d7f0e631240f3f6233bd65d1128a66dec Mon Sep 17 00:00:00 2001 +From: Frederik Rietdijk +Date: Thu, 14 Sep 2017 10:00:31 +0200 +Subject: [PATCH] ctypes.util: support LD_LIBRARY_PATH + +Backports support for LD_LIBRARY_PATH from 3.6 +--- + Lib/ctypes/util.py | 26 +++++++++++++++++++++++++- + 1 file changed, 25 insertions(+), 1 deletion(-) + +diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py +index 780cd5d21b..d7ac15070f 100644 +--- a/Lib/ctypes/util.py ++++ b/Lib/ctypes/util.py +@@ -181,8 +181,32 @@ elif os.name == "posix": + def _findSoname_ldconfig(name): + return None + ++ def _findLib_ld(name): ++ # See issue #9998 for why this is needed ++ expr = r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name) ++ cmd = ['ld', '-t'] ++ libpath = os.environ.get('LD_LIBRARY_PATH') ++ if libpath: ++ for d in libpath.split(':'): ++ cmd.extend(['-L', d]) ++ cmd.extend(['-o', os.devnull, '-l%s' % name]) ++ result = None ++ try: ++ p = subprocess.Popen(cmd, stdout=subprocess.PIPE, ++ stderr=subprocess.PIPE, ++ universal_newlines=True) ++ out, _ = p.communicate() ++ res = re.search(expr, os.fsdecode(out)) ++ if res: ++ result = res.group(0) ++ except Exception as e: ++ pass # result will be None ++ return result ++ + def find_library(name): +- return _findSoname_ldconfig(name) or _get_soname(_findLib_gcc(name)) ++ # See issue #9998 ++ return _findSoname_ldconfig(name) or \ ++ _get_soname(_findLib_gcc(name) or _findLib_ld(name)) + + ################################################################ + # test code +-- +2.14.1 + From 77baf6e818ffb81bb8328b13ca2d849fb2de0320 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Sep 2017 10:17:58 +0200 Subject: [PATCH 052/172] python35: check LD_LIBRARY_PATH Backports support for LD_LIBRARY_PATH from 3.6 --- .../python/cpython/3.5/default.nix | 1 + .../python/cpython/3.5/ld_library_path.patch | 51 +++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 pkgs/development/interpreters/python/cpython/3.5/ld_library_path.patch diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix index ed1170427c0a..abe220e0a3e5 100644 --- a/pkgs/development/interpreters/python/cpython/3.5/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix @@ -66,6 +66,7 @@ in stdenv.mkDerivation { patches = [ ./no-ldconfig.patch + ./ld_library_path.patch ]; postPatch = '' diff --git a/pkgs/development/interpreters/python/cpython/3.5/ld_library_path.patch b/pkgs/development/interpreters/python/cpython/3.5/ld_library_path.patch new file mode 100644 index 000000000000..013c2d266eff --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/3.5/ld_library_path.patch @@ -0,0 +1,51 @@ +From 918201682127ed8a270a4bd1a448b490019e4ada Mon Sep 17 00:00:00 2001 +From: Frederik Rietdijk +Date: Thu, 14 Sep 2017 10:00:31 +0200 +Subject: [PATCH] ctypes.util: support LD_LIBRARY_PATH + +Backports support for LD_LIBRARY_PATH from 3.6 +--- + Lib/ctypes/util.py | 26 +++++++++++++++++++++++++- + 1 file changed, 25 insertions(+), 1 deletion(-) + +diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py +index e9957d7951..9926f6c881 100644 +--- a/Lib/ctypes/util.py ++++ b/Lib/ctypes/util.py +@@ -219,8 +219,32 @@ elif os.name == "posix": + def _findSoname_ldconfig(name): + return None + ++ def _findLib_ld(name): ++ # See issue #9998 for why this is needed ++ expr = r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name) ++ cmd = ['ld', '-t'] ++ libpath = os.environ.get('LD_LIBRARY_PATH') ++ if libpath: ++ for d in libpath.split(':'): ++ cmd.extend(['-L', d]) ++ cmd.extend(['-o', os.devnull, '-l%s' % name]) ++ result = None ++ try: ++ p = subprocess.Popen(cmd, stdout=subprocess.PIPE, ++ stderr=subprocess.PIPE, ++ universal_newlines=True) ++ out, _ = p.communicate() ++ res = re.search(expr, os.fsdecode(out)) ++ if res: ++ result = res.group(0) ++ except Exception as e: ++ pass # result will be None ++ return result ++ + def find_library(name): +- return _findSoname_ldconfig(name) or _get_soname(_findLib_gcc(name)) ++ # See issue #9998 ++ return _findSoname_ldconfig(name) or \ ++ _get_soname(_findLib_gcc(name) or _findLib_ld(name)) + + ################################################################ + # test code +-- +2.14.1 + From a2666e36687c2183a90fcbe7d850e4d0ef2cf851 Mon Sep 17 00:00:00 2001 From: Kamil Chmielewski Date: Thu, 14 Sep 2017 10:35:58 +0200 Subject: [PATCH 053/172] ponyc: 0.19.0 -> 0.19.1 https://github.com/ponylang/ponyc/issues/2226 --- pkgs/development/compilers/ponyc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index 4e8ec2e587df..69a8243b6662 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation ( rec { name = "ponyc-${version}"; - version = "0.19.0"; + version = "0.19.1"; src = fetchFromGitHub { owner = "ponylang"; repo = "ponyc"; rev = version; - sha256 = "05xswxbibkrzm6rf8mvd1y9ysf624ngpj0k0xxcrlsls197sian9"; + sha256 = "1zd051syn0n6ign4nnxb40xj2s5vqp0s349nkjqv7051xzvlzf1p"; }; buildInputs = [ llvm makeWrapper which ]; From 3f5f208d1390c79bbcb74f52a0e422c1d5ecf2c0 Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Thu, 14 Sep 2017 00:29:39 -0400 Subject: [PATCH 054/172] ws4py: add git to checkInputs --- .../python-modules/ws4py/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 24 +---------------- 2 files changed, 27 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/python-modules/ws4py/default.nix diff --git a/pkgs/development/python-modules/ws4py/default.nix b/pkgs/development/python-modules/ws4py/default.nix new file mode 100644 index 000000000000..dff729a9c117 --- /dev/null +++ b/pkgs/development/python-modules/ws4py/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytest, mock, git, asyncio +, cherrypy, gevent, tornado }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "ws4py"; + version = "0.4.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0zr3254ky6r7q15l3dhdczfa8i723055zdkqssjifsgcwvirriks"; + }; + + checkInputs = [ pytest mock git ]; + propagatedBuildInputs = [ asyncio cherrypy gevent tornado ]; + + checkPhase = '' + pytest test + ''; + + meta = with stdenv.lib; { + homepage = https://ws4py.readthedocs.org; + description = "A WebSocket package for Python"; + maintainers = with maintainers; [ rickynils ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9edf6571a527..6a7ceb3c6d49 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -24545,29 +24545,7 @@ EOF }; }; - ws4py = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "ws4py"; - version = "0.4.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "0zr3254ky6r7q15l3dhdczfa8i723055zdkqssjifsgcwvirriks"; - }; - - buildInputs = with self; [ pytest mock ]; - propagatedBuildInputs = with self; [ asyncio cherrypy gevent tornado ]; - - checkPhase = '' - pytest test - ''; - - meta = { - homepage = https://ws4py.readthedocs.org; - description = "A WebSocket package for Python"; - maintainers = with maintainers; [ rickynils ]; - }; - }; + ws4py = callPackage ../development/python-modules/ws4py {}; gdata = buildPythonPackage rec { name = "gdata-${version}"; From f49b7d3c88cddc2a18404aef512701736176a251 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 14 Sep 2017 11:28:54 +0200 Subject: [PATCH 055/172] vm: remove trusty-updates hash as it changes too often --- pkgs/build-support/vm/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index b7d9203a0b63..d886e9a56fa4 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1687,10 +1687,6 @@ rec { url = mirror://ubuntu/dists/trusty/universe/binary-amd64/Packages.bz2; sha256 = "558637eeb8e340b871653e2060effe36e064677eca4eae62d9e4138dd402a610"; }) - (fetchurl { - url = mirror://ubuntu/dists/trusty-updates/main/binary-amd64/Packages.bz2; - sha256 = "03vd582p8b78s8sq6hz3nynn9vr7syccmn77i5mzayvsadb74cfy"; - }) ]; urlPrefix = mirror://ubuntu; packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; From d35e4439dd0c2bb0376915bb872151af8566a851 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Thu, 14 Sep 2017 11:46:39 +0200 Subject: [PATCH 056/172] cloc: 1.72 -> 1.74 --- pkgs/tools/misc/cloc/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/tools/misc/cloc/default.nix index fb1c79d250a0..ee645762003d 100644 --- a/pkgs/tools/misc/cloc/default.nix +++ b/pkgs/tools/misc/cloc/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { name = "cloc-${version}"; - version = "1.72"; + version = "1.74"; src = fetchFromGitHub { owner = "AlDanial"; repo = "cloc"; - rev = "v${version}"; - sha256 = "192z3fzib71y3sjic03ll67xv51igdlpvfhx12yv9wnzkir7lx02"; + rev = version; + sha256 = "1ihma4f6f92jp1mvzr4rjrgyh9m5wzrlxngaxfn7g0a8r2kyi65b"; }; - sourceRoot = "cloc-v${version}-src/Unix"; + sourceRoot = "cloc-${version}-src/Unix"; buildInputs = [ makeWrapper perl AlgorithmDiff RegexpCommon ]; From a3a8887b7f0cc17683100d1e98482f92f14440bf Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Thu, 14 Sep 2017 11:47:24 +0200 Subject: [PATCH 057/172] cloc: add myself as maintainer --- pkgs/tools/misc/cloc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/tools/misc/cloc/default.nix index ee645762003d..534e3d950d36 100644 --- a/pkgs/tools/misc/cloc/default.nix +++ b/pkgs/tools/misc/cloc/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/AlDanial/cloc; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; + maintainers = with stdenv.lib.maintainers; [ fuuzetsu rycee ]; }; } From fd4d957ac43cba170edf44e17f345083b91af654 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Thu, 14 Sep 2017 11:58:25 +0200 Subject: [PATCH 058/172] josm: 12545 -> 12712 --- pkgs/applications/misc/josm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index e03abb8bf95a..6d41f4fe2702 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "josm-${version}"; - version = "12545"; + version = "12712"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "0817mjc4118b5hhfvx67bib1lhcg8mdkzibrpa2mb7hrv38q56y4"; + sha256 = "0lpz4yzkvjpn5g36nibrkh773jnlkiqj6lghsx69i86h0xfb7gqf"; }; phases = [ "installPhase" ]; From 2a36c6c18543cbfa540b76ba72b71e110e07b617 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Thu, 14 Sep 2017 12:04:23 +0200 Subject: [PATCH 059/172] josm: minor cleanups - Use `makeWrapper` to generate wrapper script. - Use `buildCommand` instead of explicit phases.` --- pkgs/applications/misc/josm/default.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 6d41f4fe2702..8952b7edba4e 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, makeDesktopItem, unzip, bash, jre8 }: +{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, bash, jre8 }: stdenv.mkDerivation rec { name = "josm-${version}"; @@ -9,9 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0lpz4yzkvjpn5g36nibrkh773jnlkiqj6lghsx69i86h0xfb7gqf"; }; - phases = [ "installPhase" ]; - - buildInputs = [ jre8 ]; + buildInputs = [ jre8 makeWrapper ]; desktopItem = makeDesktopItem { name = "josm"; @@ -23,14 +21,12 @@ stdenv.mkDerivation rec { categories = "Education;Geoscience;Maps;"; }; - installPhase = '' + buildCommand = '' mkdir -p $out/bin $out/share/java cp -v $src $out/share/java/josm.jar - cat > $out/bin/josm < Date: Thu, 14 Sep 2017 18:13:47 +0800 Subject: [PATCH 060/172] mtr: 0.87 -> 0.92 --- pkgs/tools/networking/mtr/default.nix | 38 ++++++++++++++++----------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/pkgs/tools/networking/mtr/default.nix b/pkgs/tools/networking/mtr/default.nix index 03a0c99c4213..8932360c7176 100644 --- a/pkgs/tools/networking/mtr/default.nix +++ b/pkgs/tools/networking/mtr/default.nix @@ -1,34 +1,40 @@ -{stdenv, fetchurl, autoreconfHook, pkgconfig, ncurses -, withGtk ? false, gtk2 ? null}: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, ncurses +, withGtk ? false, gtk2 ? null }: assert withGtk -> gtk2 != null; -with stdenv.lib; stdenv.mkDerivation rec { - baseName="mtr"; - version="0.87"; - name="${baseName}-${version}"; + name="mtr-${version}"; + version="0.92"; - src = fetchurl { - url="ftp://ftp.bitwizard.nl/${baseName}/${name}.tar.gz"; - sha256 = "17zi99n8bdqrwrnbfyjn327jz4gxx287wrq3vk459c933p34ff8r"; + src = fetchFromGitHub { + owner = "traviscross"; + repo = "mtr"; + rev = "v${version}"; + sha256 = "0ca2ml846cv0zzkpd8y7ah6i9b3czrr8wlxja3cray94ybwb294d"; }; - preConfigure = "substituteInPlace Makefile.in --replace ' install-exec-hook' ''"; + preConfigure = '' + echo ${version} > .tarball-version - configureFlags = optionalString (!withGtk) "--without-gtk"; + ./bootstrap.sh + + substituteInPlace Makefile.in --replace ' install-exec-hook' "" + ''; + + configureFlags = stdenv.lib.optionalString (!withGtk) "--without-gtk"; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ ncurses ] ++ optional withGtk gtk2; + buildInputs = [ ncurses ] ++ stdenv.lib.optional withGtk gtk2; enableParallelBuilding = true; - meta = { - homepage = http://www.bitwizard.nl/mtr/; + meta = with stdenv.lib; { description = "A network diagnostics tool"; + homepage = http://www.bitwizard.nl/mtr/; + license = licenses.gpl2; maintainers = with maintainers; [ koral orivej raskin ]; - platforms = platforms.unix; - license = licenses.gpl2; + platforms = platforms.unix; }; } From 068fd9fb8efb6bd0b8c0b90c26de3da74b89576d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 14 Sep 2017 10:57:27 +0100 Subject: [PATCH 061/172] perlPackages.TermReadKey: 2.31 -> 2.37 --- pkgs/top-level/perl-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 41920f7ccb5a..8c6879390190 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13021,10 +13021,11 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ TermProgressBarQuiet ]; }; - TermReadKey = buildPerlPackage { - name = "TermReadKey-2.31"; + TermReadKey = buildPerlPackage rec { + name = "TermReadKey-${version}"; + version = "2.37"; src = fetchurl { - url = mirror://cpan/authors/id/J/JS/JSTOWE/TermReadKey-2.31.tar.gz; + url = "mirror://cpan/authors/id/J/JS/JSTOWE/${name}.tar.gz"; sha256 = "1czarrdxgnxmmbaasjnq3sj14nf1cvzhm37padq6xvl7h7r2acb2"; }; }; From 94dc132ff99d34f98b0fdffc7f3367799643604f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 17 Jul 2017 14:39:10 +0100 Subject: [PATCH 062/172] perlPackages.HTTPDAV: init at 0.44 --- pkgs/top-level/perl-packages.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8c6879390190..1858001e3623 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6745,6 +6745,18 @@ let self = _self // overrides; _self = with self; { }; }; + HTTPDAV = buildPerlPackage rec { + name = "HTTP-DAV-0.44"; + src = fetchurl { + url = "mirror://cpan/authors/id/O/OP/OPERA/${name}.tar.gz"; + sha256 = "1pp7xbfn6yr87cqy2m2kl2v5zgvmmikhl7wmaw6c5nksj4wi9xq1"; + }; + buildInputs = [ LWP XMLDOM ]; + meta = { + description = "WebDAV client library."; + }; + }; + HTTPHeaderParserXS = buildPerlPackage rec { name = "HTTP-HeaderParser-XS-0.20"; src = fetchurl { From 9b960686bf990ef640f0dc20fb2794e4a3742289 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 17 Jul 2017 15:18:29 +0100 Subject: [PATCH 063/172] perlPackages.ProtocolHTTP2: init at 1.08 --- pkgs/top-level/perl-packages.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1858001e3623..46ba5f52fdb5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11205,6 +11205,26 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ IPCSignal ]; }; + ProtocolWebSocket = buildPerlModule rec { + name = "Protocol-WebSocket-0.20"; + src = fetchurl { + url = "mirror://cpan/authors/id/V/VT/VTI/${name}.tar.gz"; + sha256 = "00ga7sjrqcbr46kwfbaa37lxqqbp9z5gymjckzps6ll2jf7k58mx"; + }; + buildInputs = [ ModuleBuildTiny ]; + }; + + ProtocolHTTP2 = buildPerlModule rec { + name = "Protocol-HTTP2-1.08"; + + src = fetchurl { + url = "mirror://cpan/authors/id/C/CR/CRUX/${name}.tar.gz"; + sha256 = "06y1djgzbn340hixav85728dvp8mj2mx2qf5fzkqxh145g5q860g"; + }; + buildInputs = [ ModuleBuildTiny TestLeakTrace TestTCP ]; + propagatedBuildInputs = [ AnyEvent NetSSLeay ]; + }; + PSGI = buildPerlPackage rec { name = "PSGI-1.102"; src = fetchurl { From 4addea54ae1987394c0f6d080e1c2967fa000b46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 14 Jul 2017 14:25:48 +0100 Subject: [PATCH 064/172] perlPackages.SCGI: init at 0.6 --- pkgs/top-level/perl-packages.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 46ba5f52fdb5..627c585ea8b6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11852,6 +11852,16 @@ let self = _self // overrides; _self = with self; { buildInputs = [ ModuleBuild ]; }; + SCGI = buildPerlPackage rec { + name = "SCGI-0.6"; + src = fetchurl { + url = "mirror://cpan/authors/id/V/VI/VIPERCODE/${name}.tar.gz"; + sha256 = "196rj47mh4fq2vlnw595q391zja5v6qg7s3sy0vy8igfyid8rdsq"; + }; + preConfigure = "export HOME=$(mktemp -d)"; + buildInputs = [ ModuleBuild ]; + }; + ScopeGuard = buildPerlPackage { name = "Scope-Guard-0.20"; src = fetchurl { From 9b985dfb2fdc0be8fe713d2d4a713bb6f06630e7 Mon Sep 17 00:00:00 2001 From: romildo Date: Thu, 14 Sep 2017 06:48:28 -0300 Subject: [PATCH 065/172] adapta-gtk-theme: 3.91.2.10 -> 3.91.2.147 --- pkgs/misc/themes/adapta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix index a86cfd48d54a..bfbae3396c8b 100644 --- a/pkgs/misc/themes/adapta/default.nix +++ b/pkgs/misc/themes/adapta/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "adapta-gtk-theme-${version}"; - version = "3.91.2.10"; + version = "3.91.2.147"; src = fetchFromGitHub { owner = "tista500"; repo = "Adapta"; rev = version; - sha256 = "0bp5fnxgrrrs0ajqw2lbhbarbpvzvajnvcjip6fkl9aa76gz9czy"; + sha256 = "1sv4s8rcc40v4lanapdqanlqf1l60rbc5wd7h73l5cigbqxxgda9"; }; preferLocalBuild = true; From e477fa94b5fc984599aa9c9a5950eedbc6d6ce39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 6 Sep 2017 21:16:32 +0100 Subject: [PATCH 066/172] vimPlugins.vim-devicons: init at 2017-05-29 --- pkgs/misc/vim-plugins/default.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 32a126f453d8..f42ef4944dd3 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1374,6 +1374,17 @@ rec { }; + vim-devicons = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-devicons-2017-05-29"; + src = fetchgit { + url = "https://github.com/ryanoasis/vim-devicons"; + rev = "153266275acc4f4615407a18e90f58780ebaef92"; + sha256 = "1zjrra0q5c7lmgxzlz7ddd7vi6k2vhz69fdy2s7d873nnmmd7kgn"; + }; + dependencies = []; + + }; + neoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "neoformat-2017-07-22"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 09a157e6812a..48666ebc6755 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -108,6 +108,7 @@ "github:raichoo/purescript-vim" "github:rhysd/vim-grammarous" "github:rodjek/vim-puppet" +"github:ryanoasis/vim-devicons" "github:rust-lang/rust.vim" "github:sbdchd/neoformat" "github:sebastianmarkow/deoplete-rust" From 5c544b8c782ca03e741d3957031ac3a2f64a3a7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 7 Sep 2017 08:24:59 +0100 Subject: [PATCH 067/172] vimPlugins.nvim-completion-manager: init at 2017-09-05 --- pkgs/misc/vim-plugins/default.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index f42ef4944dd3..ee6b0fe8c375 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1363,6 +1363,17 @@ rec { }; + nvim-completion-manager = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "nvim-completion-manager-2017-09-05"; + src = fetchgit { + url = "https://github.com/roxma/nvim-completion-manager"; + rev = "d9db97f7e5a4ab8af905bc00a4501d770368dee4"; + sha256 = "1aaclyz1ss2iv0lwcxkz8x5x4wivsixmlk5xakwy989q9g9ps2f1"; + }; + dependencies = []; + + }; + rust-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "rust-vim-2017-07-14"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 48666ebc6755..8dd187fe5223 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -108,6 +108,7 @@ "github:raichoo/purescript-vim" "github:rhysd/vim-grammarous" "github:rodjek/vim-puppet" +"github:roxma/nvim-completion-manager" "github:ryanoasis/vim-devicons" "github:rust-lang/rust.vim" "github:sbdchd/neoformat" From c01e064750275614518cc3c04997702c214b8821 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Thu, 14 Sep 2017 13:00:53 +0200 Subject: [PATCH 068/172] kdeTelepathy: Remove, because it is not maintained anymore --- .../telepathy/kde/0.8.80.nix | 14 ---- .../telepathy/kde/default.nix | 69 ------------------- .../telepathy/kde/update.sh | 38 ---------- pkgs/top-level/all-packages.nix | 2 - 4 files changed, 123 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/telepathy/kde/0.8.80.nix delete mode 100644 pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix delete mode 100755 pkgs/applications/networking/instant-messengers/telepathy/kde/update.sh diff --git a/pkgs/applications/networking/instant-messengers/telepathy/kde/0.8.80.nix b/pkgs/applications/networking/instant-messengers/telepathy/kde/0.8.80.nix deleted file mode 100644 index 6beebef1c727..000000000000 --- a/pkgs/applications/networking/instant-messengers/telepathy/kde/0.8.80.nix +++ /dev/null @@ -1,14 +0,0 @@ -[ -{name="ktp-accounts-kcm";key="accounts_kcm";sha256="08b873k455jbs9vd5nsb222pr1kb7gjx3qky769654j696rad5bc";} -{name="ktp-approver";key="approver";sha256="07qsjxvcjr9i0v7g7cdx3rky1fa8aany5fyfav488kq6nc13fjb1";} -{name="ktp-auth-handler";key="auth_handler";sha256="00gq5gq7imv7rv8xivl2s1n0k39llpmd5z46rvhai76z7hp8sj4l";} -{name="ktp-call-ui";key="call_ui";sha256="1dwsq2ixci95byfg1ayy6g2zv0dbc0273r9wb395f220dgqpz7b4";} -{name="ktp-common-internals";key="common_internals";sha256="049hh045p6nccyrjvagfw183vfa857xdl96q2w1vrj6frimniz9q";} -{name="ktp-contact-list";key="contact_list";sha256="0xydyyla48y7q8pf84i12l7fx13p0gi8k4jl7nl7jxjsflzidscp";} -{name="ktp-contact-runner";key="contact_runner";sha256="1bfb772cyzrbwjkglr3bvawp44dcqr59kkgvb6irgha8w7adic3b";} -{name="ktp-desktop-applets";key="desktop_applets";sha256="150mpk7vq2w47vz2yffhj676k84fn3h8g77xklmyqm1y3f21dx01";} -{name="ktp-filetransfer-handler";key="filetransfer_handler";sha256="07jgfydhr5hh7z0wkrz6k4gh3li9nmyxhjvxcxsayxrc7gnhazja";} -{name="ktp-kded-integration-module";key="kded_integration_module";sha256="0axjqsk1h9c71hxpcy8ls7jsb0dsmsm75wdgwx71xrdb9hpqwn9f";} -{name="ktp-send-file";key="send_file";sha256="0wiqrwhrmccx3ic0aaqlq539jcznkgsrwyn9hdizwsc8f33rxmri";} -{name="ktp-text-ui";key="text_ui";sha256="0ch6sqvj9hpx3823c1wmziqy6g9v97sj1hihbaf8z8wyb84f0wbl";} -] diff --git a/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix deleted file mode 100644 index 0a5a309c27da..000000000000 --- a/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ stdenv, fetchurl, fetchgit, automoc4, cmake, gettext, perl, pkgconfig -, telepathy_qt, kdelibs4, kde_workspace, dbus_glib, dbus_libs, farstream -, qt-gstreamer1, telepathy_glib, telepathy_logger -, qjson, flex, bison, qca2 }: - -let - version = "0.8.80"; - manifest = import (./. + "/${version}.nix"); - - overrides = { - call_ui = x : x // { - NIX_CFLAGS_COMPILE = - "-I${telepathy_glib}/include/telepathy-1.0" - + " -I${dbus_glib.dev}/include/dbus-1.0" - + " -I${dbus_libs.dev}/include/dbus-1.0"; - }; - telepathy_logger_qt = x : x // { - NIX_CFLAGS_COMPILE = "-I${dbus_libs.dev}/include/dbus-1.0"; - }; - }; - - extraBuildInputs = { - auth_handler = [ qjson qca2 ]; - call_ui = [ qt-gstreamer1 telepathy_glib farstream ]; - contact_applet = [ kde_workspace ]; - telepathy_logger_qt = [ telepathy_logger qt-gstreamer1 ]; - text_ui = [ qt-gstreamer1 telepathy_logger qjson ]; - common_internals = [ telepathy_qt ]; - }; - - extraNativeBuildInputs = { - telepathy_logger_qt = [ flex bison ]; - }; - - ktpFun = { name, key, sha256 }: - { - name = key; - value = stdenv.mkDerivation ( - (stdenv.lib.attrByPath [ key ] (x : x) overrides) - { - name = "${name}-${version}"; - - src = fetchurl { - url = "mirror://kde/unstable/kde-telepathy/${version}/src/${name}-${version}.tar.bz2"; - inherit sha256; - }; - - nativeBuildInputs = - [ automoc4 cmake gettext perl pkgconfig ] - ++ (stdenv.lib.attrByPath [ key ] [] extraNativeBuildInputs); - buildInputs = [ kdelibs4 telepathy_qt ] - ++ stdenv.lib.optional (name != "ktp-common-internals") ktp.common_internals - ++ (stdenv.lib.attrByPath [ key ] [] extraBuildInputs); - - meta = { - inherit (kdelibs4.meta) platforms; - maintainers = [ ]; - }; - } - ); - }; - - ktp = builtins.listToAttrs (map ktpFun manifest); -in -ktp // { - inherit version; - recurseForDerivations = true; - full = stdenv.lib.attrValues ktp; -} diff --git a/pkgs/applications/networking/instant-messengers/telepathy/kde/update.sh b/pkgs/applications/networking/instant-messengers/telepathy/kde/update.sh deleted file mode 100755 index 199607047b80..000000000000 --- a/pkgs/applications/networking/instant-messengers/telepathy/kde/update.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh - -usage() { - echo "$0 version|directory" -} - -download() { - URL=ftp://ftp.kde.org/pub/kde/unstable/kde-telepathy/$1/src - destdir=$2 - if test -n "$KDE_FULL_SESSION"; then - kioclient copy $URL $destdir - else - mkdir $destdir - lftp -c "open $URL; lcd $destdir; mget -c *" - fi -} - -if [[ -d $1 ]]; then - directory=$1 - version=$(ls $directory/* | head -n1 | - sed -e "s,$directory/[^0-9.]*\\([0-9.]\\+\\)\\.tar.*,\\1,") - echo "Version $version" -else - version=$1 - directory=src-$version - download $version $directory -fi - -packages=$(ls $directory/* | sed -e "s,$directory/\\(.*\\)-$version.*,\\1,") -echo $packages -exec >$version.nix -echo "[" -for name in $packages; do - hash=$(nix-hash --flat --type sha256 --base32 $directory/$name-$version.*) - key=${name#ktp-} - echo "{name=\"${name}\";key=\"${key//-/_}\";sha256=\"${hash}\";}" -done -echo "]" \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 67b8537cf902..162fb993290e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14963,8 +14963,6 @@ with pkgs; kanboard = callPackage ../applications/misc/kanboard { }; - kde-telepathy = kde4.callPackage ../applications/networking/instant-messengers/telepathy/kde {}; - kdeApplications = let mkApplications = import ../applications/kde; From 4bfb9e3c9bbe6de97d9f8b7f9fa7effa8f85e5a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Thu, 14 Sep 2017 13:01:43 +0200 Subject: [PATCH 069/172] kde4Workspace: Remove, because it is not maintained anymore --- pkgs/desktops/kde-4.14/kde-package/4.14.3.nix | 3 -- pkgs/desktops/kde-4.14/kde-workspace.nix | 41 ------------------- 2 files changed, 44 deletions(-) delete mode 100644 pkgs/desktops/kde-4.14/kde-workspace.nix diff --git a/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix b/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix index 401069785763..5d9e2401ca82 100644 --- a/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix +++ b/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix @@ -3,7 +3,6 @@ hashes=builtins.listToAttrs[ {name="baloo";value="0p3awsrc20q79kq04x0vjz84acxz6gjm9jc7j2al4kybkyzx5p4y";} {name="kde-baseapps";value="1nz6mm257rd916dklnbrix4r25scylvjil99b1djb35blx1aynqj";} {name="kdepimlibs";value="1mv8k0wr0wr0hnlb1al50nmz8d77vbm73p2hhipipgliq6zb3vb5";} - {name="kde-workspace";value="00bf708i0vzl47dgcr8mp61n7k0xjzqnlb8j1smliy5bydiaa86g";} {name="kfilemetadata";value="0wak1nphnphcam8r6pba7m2gld4w04dkk8qn23myjammv3myc59i";} {name="libkcddb";value="0xrmg53p5lh4ral2l5zh96angaf9czhih3zzvwr9qr9h9ks5vrn1";} {name="libkdcraw";value="0ksarwq8aaxc77cp0ryfnw1n311wkykzdlhj03rln8jjlbdm3j3q";} @@ -18,7 +17,6 @@ versions=builtins.listToAttrs[ {name="kde-baseapps";value="4.14.3";} {name="kdepimlibs";value="4.14.3";} {name="kde-runtime";value="4.14.3";} - {name="kde-workspace";value="4.11.14";} {name="kfilemetadata";value="4.14.3";} {name="libkcddb";value="4.14.3";} {name="libkdcraw";value="4.14.3";} @@ -69,6 +67,5 @@ sane="kde_baseapps"; split=true; } { module="kactivities"; split=false;} { module="kdepimlibs"; split=false;} -{ module="kde-workspace"; sane="kde_workspace"; split=false;} ]; } diff --git a/pkgs/desktops/kde-4.14/kde-workspace.nix b/pkgs/desktops/kde-4.14/kde-workspace.nix deleted file mode 100644 index 5aeba4be3a6e..000000000000 --- a/pkgs/desktops/kde-4.14/kde-workspace.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, lm_sensors -, pciutils, libraw1394, libusb1, python, libqalculate, akonadi -, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison -, libjpeg, pkgconfig, kactivities, qjson, udev, fetchurl -}: - -kde { -#todo: wayland, xmms, libusb isn't found -#note: xorg.libXft is needed to build kfontview and kfontinst though this isn't reflected in the build log - buildInputs = - [ kdelibs qimageblitz libdbusmenu_qt xorg.libxcb xorg.xcbutilimage libjpeg - xorg.xcbutilrenderutil xorg.xcbutilkeysyms xorg.libpthreadstubs xorg.libXdmcp - xorg.libxkbfile xorg.libXcomposite xorg.libXtst - xorg.libXdamage xorg.libXft - - python boost qjson lm_sensors /* gpsd */ libraw1394 pciutils udev - akonadi pam libusb1 libqalculate kdepimlibs prison - kactivities - ]; - - patches = [ ./files/ksysguard-0001-disable-signalplottertest.patch ]; - - preConfigure = - '' - # Fix incorrect path to kde4-config. - substituteInPlace startkde.cmake --replace '$bindir/kde4-config' ${kdelibs}/bin/kde4-config - - # Fix the path to the keyboard configuration files. - substituteInPlace kcontrol/keyboard/xkb_rules.cpp \ - --replace /usr/share/X11 ${xkeyboard_config}/etc/X11 - ''; - - NIX_CFLAGS_COMPILE = [ "-fpermissive" ]; # gcc-6 - - enableParallelBuilding = false; # frequent problems on Hydra - - meta = { - description = "KDE workspace components such as Plasma, Kwin and System Settings"; - license = stdenv.lib.licenses.gpl2; - }; -} From 1e16bceb46a2f1436c93263e6d90a0b467424c04 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Sep 2017 13:06:48 +0200 Subject: [PATCH 070/172] python.pkgs.mwlib: mark as broken --- pkgs/top-level/python-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 51f738fde391..a8a9b1cadd0a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6912,6 +6912,7 @@ in { description = "Library for parsing MediaWiki articles and converting them to different output formats"; homepage = "http://pediapress.com/code/"; license = licenses.bsd3; + broken = true; # Requires different versions of packages }; }; From d29a8f25c3fc5601c7c4250868e4900a91dd55cb Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 14 Sep 2017 19:09:17 +0800 Subject: [PATCH 071/172] pdf2odt: 20141217 -> 20170207 --- pkgs/tools/typesetting/pdf2odt/default.nix | 44 +++++++++++----------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/pkgs/tools/typesetting/pdf2odt/default.nix b/pkgs/tools/typesetting/pdf2odt/default.nix index 4f798702101b..902cf9a5f836 100644 --- a/pkgs/tools/typesetting/pdf2odt/default.nix +++ b/pkgs/tools/typesetting/pdf2odt/default.nix @@ -1,21 +1,7 @@ { stdenv, lib, makeWrapper, fetchFromGitHub , bc, coreutils, file, gawk, ghostscript, gnused, imagemagick, zip }: -stdenv.mkDerivation rec { - version = "2014-12-17"; - name = "pdf2odt-${version}"; - - src = fetchFromGitHub { - owner = "gutschke"; - repo = "pdf2odt"; - rev = "master"; - sha256 = "14f9r5f0g6jzanl54jv86ls0frvspka1p9c8dy3fnriqpm584j0r"; - }; - - dontStrip = true; - - nativeBuildInputs = [ makeWrapper ]; - +let path = lib.makeBinPath [ bc coreutils @@ -27,24 +13,36 @@ stdenv.mkDerivation rec { zip ]; +in stdenv.mkDerivation rec { + name = "pdf2odt-${version}"; + version = "20170207"; + + src = fetchFromGitHub { + owner = "gutschke"; + repo = "pdf2odt"; + rev = "4533bd14306c30c085001db59dbb8114ea09c360"; + sha256 = "14f9r5f0g6jzanl54jv86ls0frvspka1p9c8dy3fnriqpm584j0r"; + }; + + nativeBuildInputs = [ makeWrapper ]; + patches = [ ./use_mktemp.patch ]; installPhase = '' - mkdir -p $out/bin $out/share/doc + install -Dm0755 pdf2odt -t $out/bin + install -Dm0644 README.md LICENSE -t $out/share/doc/pdf2odt - install -m0755 pdf2odt $out/bin/pdf2odt ln -rs $out/bin/pdf2odt $out/bin/pdf2ods - install -m0644 README.md LICENSE -t $out/share/doc - - wrapProgram $out/bin/pdf2odt --prefix PATH : ${path} + wrapProgram $out/bin/pdf2odt \ + --prefix PATH : ${path} ''; meta = with stdenv.lib; { description = "PDF to ODT format converter"; - homepage = http://github.com/gutschke/pdf2odt; - license = licenses.mit; - platforms = platforms.all; + homepage = http://github.com/gutschke/pdf2odt; + license = licenses.mit; + platforms = platforms.all; maintainers = with maintainers; [ peterhoeg ]; inherit version; }; From 4b78d44ab6a4c9d8f7b5c719985851f4a636b6ea Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 14 Sep 2017 19:05:11 +0800 Subject: [PATCH 072/172] mtr nixos module: wrap the proper binary --- nixos/modules/programs/mtr.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/programs/mtr.nix b/nixos/modules/programs/mtr.nix index 927fe68be875..1fdec4c04f68 100644 --- a/nixos/modules/programs/mtr.nix +++ b/nixos/modules/programs/mtr.nix @@ -19,8 +19,9 @@ in { }; config = mkIf cfg.enable { - security.wrappers.mtr = { - source = "${pkgs.mtr}/bin/mtr"; + environment.systemPackages = with pkgs; [ mtr ]; + security.wrappers.mtr-packet = { + source = "${pkgs.mtr}/bin/mtr-packet"; capabilities = "cap_net_raw+p"; }; }; From ec7b09ecd0e1249c48c8f899e563233e4ba15cb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= Date: Thu, 14 Sep 2017 13:54:14 +0200 Subject: [PATCH 073/172] fix src.url typos --- pkgs/development/libraries/libipfix/default.nix | 2 +- pkgs/tools/cd-dvd/nrg2iso/default.nix | 2 +- pkgs/top-level/python-packages.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libipfix/default.nix b/pkgs/development/libraries/libipfix/default.nix index eca1730ca7ce..9d7bd273d8db 100644 --- a/pkgs/development/libraries/libipfix/default.nix +++ b/pkgs/development/libraries/libipfix/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libipfix-${version}"; version = "110209"; src = fetchurl { - url = " http://sourceforge.net/projects/libipfix/files/libipfix/libipfix_110209.tgz"; + url = "http://sourceforge.net/projects/libipfix/files/libipfix/libipfix_110209.tgz"; sha256 = "0h7v0sxjjdc41hl5vq2x0yhyn04bczl11bqm97825mivrvfymhn6"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/cd-dvd/nrg2iso/default.nix b/pkgs/tools/cd-dvd/nrg2iso/default.nix index 35414f6e776a..98853d1ba61a 100644 --- a/pkgs/tools/cd-dvd/nrg2iso/default.nix +++ b/pkgs/tools/cd-dvd/nrg2iso/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.4"; src = fetchurl { - url = "gregory.kokanosky.free.fr/v4/linux/${name}.tar.gz"; + url = "http://gregory.kokanosky.free.fr/v4/linux/${name}.tar.gz"; sha256 = "18sam7yy50rbfhjixwd7wx7kmfn1x1y5j80vwfxi5v408s39s115"; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3d936e43ad92..b2911994fbc3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20593,7 +20593,7 @@ in { version = "2.1.1"; src = pkgs.fetchurl { - url = " mirror://pypi/p/python-daemon/${name}.tar.gz"; + url = "mirror://pypi/p/python-daemon/${name}.tar.gz"; sha256 = "17v80qb98p1gv4j9mq6wb55cv7hc4j1hzw5y2f4s5hrpxs3w3a2q"; }; From 258186571721b4938822b02dd518c9295153f1f4 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Thu, 14 Sep 2017 15:25:08 +0300 Subject: [PATCH 074/172] diffoscope: Add even more tools --- pkgs/tools/misc/diffoscope/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 13d1b149d06c..2de8ceb68930 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchgit, python3Packages, docutils -, acl, binutils, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, diffutils, dtc, e2fsprogs -, file, findutils, fpc, gettext, ghc, gnupg1, gnutar, gzip, imagemagick, jdk, libarchive, libcaca, llvm -, mono, openssh, pdftk, poppler_utils, sng, sqlite, squashfsTools, tcpdump, unzip, xxd, xz +, acl, apktool, binutils, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, diffutils, dtc +, e2fsprogs, file, findutils, fontforge-fonttools, fpc, gettext, ghc, ghostscriptX, giflib, gnupg1, gnutar +, gzip, imagemagick, jdk, libarchive, libcaca, llvm, mono, openssh, pdftk, pgpdump, poppler_utils, sng, sqlite +, squashfsTools, tcpdump, unoconv, unzip, xxd, xz , enableBloat ? false }: @@ -24,13 +25,13 @@ python3Packages.buildPythonApplication rec { sed -i setup.py -e "/'rpm-python',/d" ''; - # Still missing these tools: apktool docx2txt enjarify gifbuild js-beautify odt2txt oggDump pgpdump ps2ascii Rscript showttf + # Still missing these tools: docx2txt enjarify js-beautify oggDump Rscript # Also these libraries: python3-guestfs pythonPath = with python3Packages; [ debian libarchive-c python_magic tlsh rpm ] ++ [ - acl binutils bzip2 cbfstool cdrkit colordiff coreutils cpio diffutils dtc e2fsprogs file - findutils gettext gnutar gzip libarchive libcaca poppler_utils sng sqlite squashfsTools unzip - xxd xz - ] ++ lib.optionals enableBloat [ colord fpc ghc gnupg1 imagemagick llvm jdk mono openssh pdftk tcpdump ]; + acl binutils bzip2 cbfstool cdrkit colordiff coreutils cpio diffutils dtc e2fsprogs file findutils + fontforge-fonttools gettext gnutar gzip libarchive libcaca pgpdump poppler_utils sng sqlite + squashfsTools unzip xxd xz + ] ++ lib.optionals enableBloat [ apktool colord fpc ghc ghostscriptX giflib gnupg1 imagemagick llvm jdk mono openssh pdftk tcpdump unoconv ]; doCheck = false; # Calls 'mknod' in squashfs tests, which needs root From 0dc4672d365055e941a1c1f6e9eef5035e875b74 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Thu, 14 Sep 2017 15:26:19 +0300 Subject: [PATCH 075/172] diffoscope: Move cbfstool and poppler_utils to bloat category --- pkgs/tools/misc/diffoscope/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 2de8ceb68930..2ea29196ed66 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -28,10 +28,13 @@ python3Packages.buildPythonApplication rec { # Still missing these tools: docx2txt enjarify js-beautify oggDump Rscript # Also these libraries: python3-guestfs pythonPath = with python3Packages; [ debian libarchive-c python_magic tlsh rpm ] ++ [ - acl binutils bzip2 cbfstool cdrkit colordiff coreutils cpio diffutils dtc e2fsprogs file findutils - fontforge-fonttools gettext gnutar gzip libarchive libcaca pgpdump poppler_utils sng sqlite + acl binutils bzip2 cdrkit colordiff coreutils cpio diffutils dtc e2fsprogs file findutils + fontforge-fonttools gettext gnutar gzip libarchive libcaca pgpdump sng sqlite squashfsTools unzip xxd xz - ] ++ lib.optionals enableBloat [ apktool colord fpc ghc ghostscriptX giflib gnupg1 imagemagick llvm jdk mono openssh pdftk tcpdump unoconv ]; + ] ++ lib.optionals enableBloat [ + apktool cbfstool colord fpc ghc ghostscriptX giflib gnupg1 imagemagick + llvm jdk mono openssh pdftk poppler_utils tcpdump unoconv + ]; doCheck = false; # Calls 'mknod' in squashfs tests, which needs root From 232fc6a806d4930fe0c0a9eb70200ca478d8f555 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 14 Sep 2017 08:34:19 -0400 Subject: [PATCH 076/172] linux: 4.13.1 -> 4.13.2 --- pkgs/os-specific/linux/kernel/linux-4.13.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.13.nix b/pkgs/os-specific/linux/kernel/linux-4.13.nix index 29f0a05558cf..fb53a278bd14 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.13.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.13.nix @@ -1,12 +1,12 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.13.1"; + version = "4.13.2"; extraMeta.branch = "4.13"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1kp1lsf4314af7crpqkd2x1zx407a97r7rz3zhhskbilvsifgkny"; + sha256 = "1lgwgw9yp5ywbylnmahsmqzs98yfq53mvvqqdgp7ljiqg8bxqjh6"; }; kernelPatches = args.kernelPatches; From 537da6cb50f7095210c64c0e33c570cff08f57b7 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 14 Sep 2017 08:37:40 -0400 Subject: [PATCH 077/172] linux: 4.12.12 -> 4.12.13 --- pkgs/os-specific/linux/kernel/linux-4.12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.12.nix b/pkgs/os-specific/linux/kernel/linux-4.12.nix index c35b9e3e02ce..876bbff119fe 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.12.nix @@ -1,12 +1,12 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.12.12"; + version = "4.12.13"; extraMeta.branch = "4.12"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1d254yxn46ydp0x3s5cpyg4p74zvdwiqfiaaim1m3g6rwjmlkjpa"; + sha256 = "18sxw7mw4fya7381mkah70s3di6b8xxfigjhrhb7zcczrffb4vl9"; }; kernelPatches = args.kernelPatches; From 43b3029a4ac95396d67fe67cf1f62def628d68fa Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 14 Sep 2017 08:39:58 -0400 Subject: [PATCH 078/172] linux: 4.9.49 -> 4.9.50 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 309286b662fc..7e959241b9c2 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,12 +1,12 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9.49"; + version = "4.9.50"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1ywiww2h1gf3ps305irzk7n9xkcgg9bclr2jw6r5cqxmh3qxrv2p"; + sha256 = "0dhm5w7qa1hyqp254r41b4nhf10a8w7sv1mhd16f61inpb41829c"; }; kernelPatches = args.kernelPatches; From eab81249398f592fc30a2407cb92b84901e5ed5c Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Thu, 14 Sep 2017 15:39:28 +0300 Subject: [PATCH 079/172] pythonmagick: Fix sha256 --- pkgs/applications/graphics/PythonMagick/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/PythonMagick/default.nix b/pkgs/applications/graphics/PythonMagick/default.nix index b1f64afd9aee..f0b4a991f74a 100644 --- a/pkgs/applications/graphics/PythonMagick/default.nix +++ b/pkgs/applications/graphics/PythonMagick/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://imagemagick/python/releases/PythonMagick-${version}.tar.xz"; - sha256 = "0vkgpmrdz530nyvmjahpdrvcj7fd7hvsp15d485hq6103qycisv8"; + sha256 = "137278mfb5079lns2mmw73x8dhpzgwha53dyl00mmhj2z25varpn"; }; nativeBuildInputs = [ pkgconfig ]; From 14b833e5604fe8c60a0095fe2cbd632d0a61c0c0 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Thu, 14 Sep 2017 15:42:38 +0300 Subject: [PATCH 080/172] awesomebump: Yet another RPATH-contains-TMPDIR hack https://github.com/NixOS/patchelf/pull/98 --- pkgs/applications/graphics/awesomebump/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/graphics/awesomebump/default.nix b/pkgs/applications/graphics/awesomebump/default.nix index 9e0916bab9cf..f1958ca35bec 100644 --- a/pkgs/applications/graphics/awesomebump/default.nix +++ b/pkgs/applications/graphics/awesomebump/default.nix @@ -28,6 +28,11 @@ stdenv.mkDerivation { --run "cd $d" ''; + # RPATH in /tmp hack + preFixup = '' + rm -r $NIX_BUILD_TOP/__nix_qt5__ + ''; + meta = { homepage = https://github.com/kmkolasinski/AwesomeBump; description = "A program to generate normal, height, specular or ambient occlusion textures from a single image"; From f59bcb64e8800cf3ca7b1e73d93e6a18f96fd2e6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 13 Sep 2017 11:39:48 +0200 Subject: [PATCH 081/172] LTS Haskell 9.4 --- .../configuration-hackage2nix.yaml | 84 +++++++++---------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 45c3f094e2d4..46a6334e1227 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.3 + # LTS Haskell 9.4 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -62,11 +62,11 @@ default-package-overrides: - aeson-pretty ==0.8.5 - aeson-qq ==0.8.2 - aeson-utils ==0.3.0.2 - - Agda ==2.5.2 + - Agda ==2.5.3 - airship ==0.6.0 - alarmclock ==0.4.0.3 - alerta ==0.1.0.4 - - alex ==3.2.2 + - alex ==3.2.3 - algebraic-graphs ==0.0.5 - alsa-core ==0.5.0.1 - alsa-mixer ==0.2.0.3 @@ -420,10 +420,10 @@ default-package-overrides: - concurrent-output ==1.9.2 - concurrent-split ==0.0.1 - concurrent-supply ==0.1.8 - - conduit ==1.2.11 + - conduit ==1.2.12 - conduit-combinators ==1.1.1 - conduit-connection ==0.1.0.3 - - conduit-extra ==1.1.16 + - conduit-extra ==1.1.17 - conduit-iconv ==0.1.1.2 - conduit-parse ==0.1.2.1 - ConfigFile ==1.1.4 @@ -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.6 + - data-fix ==0.0.7 - data-has ==0.2.1.0 - data-hash ==0.2.0.1 - data-inttrie ==0.1.2 @@ -525,7 +525,7 @@ default-package-overrides: - Decimal ==0.4.2 - declarative ==0.5.1 - deepseq-generics ==0.2.0.0 - - dejafu ==0.7.1.2 + - dejafu ==0.7.1.3 - dependent-map ==0.2.4.0 - dependent-sum ==0.4 - derive ==2.6.3 @@ -574,7 +574,7 @@ default-package-overrides: - dmenu-pkill ==0.1.0.1 - dmenu-pmount ==0.1.0.1 - dmenu-search ==0.1.0.1 - - dns ==2.0.12 + - dns ==2.0.13 - do-list ==1.0.1 - dockerfile ==0.1.0.1 - docopt ==0.7.0.5 @@ -697,7 +697,7 @@ default-package-overrides: - filemanip ==0.3.6.3 - fileplow ==0.1.0.0 - filter-logger ==0.6.0.0 - - find-clumpiness ==0.2.2.0 + - find-clumpiness ==0.2.3.0 - fingertree ==0.1.1.0 - fingertree-psqueue ==0.3 - finite-typelits ==0.1.2.0 @@ -957,18 +957,18 @@ default-package-overrides: - hamlet ==1.2.0 - HandsomeSoup ==0.4.2 - handwriting ==0.1.0.3 - - hapistrano ==0.3.2.4 + - hapistrano ==0.3.3.0 - happstack-hsp ==7.3.7.3 - happstack-jmacro ==7.0.12 - happstack-server ==7.4.6.4 - happstack-server-tls ==7.1.6.4 - - happy >1.19.6 - - harp ==0.4.2 + - happy ==1.19.7 + - harp ==0.4.3 - hasbolt ==0.1.2.1 - hashable ==1.2.6.1 - hashable-time ==0.2.0.1 - hashmap ==1.3.2 - - hashtables ==1.2.1.1 + - hashtables ==1.2.2.0 - haskeline ==0.7.4.0 - haskell-gi ==0.20.3 - haskell-gi-base ==0.20.4 @@ -1093,7 +1093,7 @@ default-package-overrides: - hsemail ==2 - HSet ==0.0.1 - hset ==2.2.0 - - hsexif ==0.6.1.2 + - hsexif ==0.6.1.3 - hsignal ==0.2.7.5 - hsinstall ==1.6 - hslogger ==1.2.10 @@ -1212,7 +1212,7 @@ default-package-overrides: - instance-control ==0.1.1.1 - integer-logarithms ==1.0.2 - integration ==0.2.1 - - intero ==0.1.21 + - intero ==0.1.23 - interpolate ==0.1.1 - interpolatedstring-perl6 ==1.0.0 - interpolation ==0.1.0.1 @@ -1228,7 +1228,7 @@ default-package-overrides: - io-region ==0.1.1 - io-storage ==0.3 - io-streams ==1.4.1.0 - - io-streams-haproxy ==1.0.0.1 + - io-streams-haproxy ==1.0.0.2 - ip6addr ==0.5.3 - iproute ==1.7.1 - IPv6Addr ==1.0.1 @@ -1262,7 +1262,7 @@ default-package-overrides: - json-builder ==0.3 - json-rpc-generic ==0.2.1.2 - json-schema ==0.7.4.1 - - json-stream ==0.4.1.4 + - json-stream ==0.4.1.5 - JuicyPixels ==3.2.8.3 - JuicyPixels-extra ==0.2.1 - JuicyPixels-scale-dct ==0.1.1.2 @@ -1355,7 +1355,7 @@ default-package-overrides: - log-postgres ==0.7.0.2 - logfloat ==0.13.3.3 - logger-thread ==0.1.0.2 - - logging-effect ==1.2.0 + - logging-effect ==1.2.1 - logging-facade ==0.3.0 - logging-facade-syslog ==1 - logict ==0.6.0.2 @@ -1398,7 +1398,7 @@ default-package-overrides: - median-stream ==0.7.0.0 - mega-sdist ==0.3.0.2 - megaparsec ==5.3.1 - - memory ==0.14.6 + - memory ==0.14.7 - MemoTrie ==0.6.8 - mersenne-random-pure64 ==0.2.2.0 - messagepack ==0.5.4 @@ -1440,7 +1440,7 @@ default-package-overrides: - monad-extras ==0.6.0 - monad-http ==0.1.0.0 - monad-journal ==0.7.2 - - monad-logger ==0.3.25 + - monad-logger ==0.3.25.1 - monad-logger-json ==0.1.0.0 - monad-logger-prefix ==0.1.6 - monad-logger-syslog ==0.1.4.0 @@ -1565,7 +1565,7 @@ default-package-overrides: - Only ==0.1 - oo-prototypes ==0.1.0.0 - opaleye ==0.5.4.0 - - opaleye-trans ==0.3.5 + - opaleye-trans ==0.3.6 - open-browser ==0.2.1.0 - open-witness ==0.4.0.1 - OpenAL ==1.7.0.4 @@ -1574,7 +1574,7 @@ default-package-overrides: - OpenGLRaw ==3.2.5.0 - openpgp-asciiarmor ==0.1 - opensource ==0.1.0.0 - - openssl-streams ==1.2.1.1 + - openssl-streams ==1.2.1.3 - operational ==0.2.3.5 - operational-class ==0.3.0.0 - opml-conduit ==0.6.0.3 @@ -1594,7 +1594,7 @@ default-package-overrides: - pagerduty ==0.0.8 - pagination ==0.2.1 - palette ==0.1.0.5 - - pandoc ==1.19.2.1 + - pandoc ==1.19.2.3 - pandoc-citeproc ==0.10.5.1 - pandoc-types ==1.17.0.5 - pango ==0.13.3.1 @@ -1612,7 +1612,7 @@ default-package-overrides: - partial-order ==0.1.2.1 - patat ==0.5.2.2 - path ==0.5.13 - - path-extra ==0.0.3 + - path-extra ==0.0.5 - path-io ==1.2.2 - path-pieces ==0.2.1 - pathtype ==0.8 @@ -1654,10 +1654,10 @@ default-package-overrides: - pipes-bytestring ==2.1.6 - pipes-cacophony ==0.5.0 - pipes-category ==0.2.0.1 - - pipes-concurrency ==2.0.7 + - pipes-concurrency ==2.0.8 - pipes-extras ==1.0.10 - pipes-fluid ==0.5.0.3 - - pipes-group ==1.0.7 + - pipes-group ==1.0.8 - pipes-misc ==0.3.0.0 - pipes-mongodb ==0.1.0.0 - pipes-parse ==3.0.8 @@ -1669,7 +1669,7 @@ default-package-overrides: - pkcs10 ==0.2.0.0 - placeholders ==0.1 - plan-b ==0.2.1 - - plot ==0.2.3.7 + - plot ==0.2.3.8 - plot-gtk ==0.2.0.4 - plot-gtk-ui ==0.3.0.2 - plot-gtk3 ==0.1.0.2 @@ -1868,7 +1868,7 @@ default-package-overrides: - safe-exceptions ==0.1.6.0 - safe-exceptions-checked ==0.1.0 - safecopy ==0.9.3.3 - - safeio ==0.0.3.0 + - safeio ==0.0.4.0 - SafeSemaphore ==0.10.1 - sample-frame ==0.0.3 - sample-frame-np ==0.0.4.1 @@ -1893,8 +1893,8 @@ default-package-overrides: - search-algorithms ==0.2.0 - securemem ==0.1.9 - SegmentTree ==0.3 - - selda ==0.1.10.1 - - selda-postgresql ==0.1.6.0 + - selda ==0.1.11.0 + - selda-postgresql ==0.1.7.0 - selda-sqlite ==0.1.6.0 - semigroupoid-extras ==5 - semigroupoids ==5.2.1 @@ -1970,8 +1970,8 @@ default-package-overrides: - smoothie ==0.4.2.7 - smtp-mail ==0.1.4.6 - snap-blaze ==0.2.1.5 - - snap-core ==1.0.3.0 - - snap-server ==1.0.3.0 + - snap-core ==1.0.3.1 + - snap-server ==1.0.3.1 - snowflake ==0.1.1.1 - snowtify ==0.1.0.3 - soap ==0.2.3.5 @@ -2073,7 +2073,7 @@ default-package-overrides: - svg-tree ==0.6.2 - SVGFonts ==1.6.0.2 - swagger ==0.3.0 - - swagger2 ==2.1.4.1 + - swagger2 ==2.1.5 - syb ==0.7 - symbol ==0.2.4 - symengine ==0.1.2.0 @@ -2161,11 +2161,11 @@ default-package-overrides: - text-region ==0.3.0.0 - text-show ==3.6 - text-show-instances ==3.6 - - text-zipper ==0.10 + - text-zipper ==0.10.1 - textlocal ==0.1.0.5 - tf-random ==0.5 - tfp ==1.0.0.2 - - th-abstraction ==0.2.5.0 + - th-abstraction ==0.2.6.0 - th-data-compat ==0.0.2.4 - th-desugar ==1.6 - th-expand-syns ==0.4.3.0 @@ -2246,7 +2246,7 @@ default-package-overrides: - type-operators ==0.1.0.4 - type-spec ==0.3.0.1 - TypeCompose ==0.9.12 - - typed-process ==0.1.0.1 + - typed-process ==0.1.1 - typelits-witnesses ==0.2.3.0 - typography-geometry ==1.0.0.1 - tz ==0.1.3.0 @@ -2268,7 +2268,7 @@ default-package-overrides: - union-find ==0.2 - uniplate ==1.6.12 - uniq-deep ==1.1.0.0 - - Unique ==0.4.6.1 + - Unique ==0.4.7.1 - unique ==0 - unit-constraint ==0.0.0 - units ==2.4 @@ -2306,7 +2306,7 @@ default-package-overrides: - uuid-types ==1.0.3 - vado ==0.0.9 - validate-input ==0.4.0.0 - - validation ==0.5.4 + - validation ==0.5.5 - validationt ==0.2.0.0 - varying ==0.7.0.3 - vault ==0.3.0.7 @@ -2338,7 +2338,7 @@ default-package-overrides: - wai-cors ==0.2.5 - wai-eventsource ==3.0.0 - wai-extra ==3.0.20.0 - - wai-handler-launch ==3.0.2.2 + - wai-handler-launch ==3.0.2.3 - wai-logger ==2.3.0 - wai-middleware-auth ==0.1.2.1 - wai-middleware-caching ==0.1.0.2 @@ -2448,7 +2448,7 @@ default-package-overrides: - xmlgen ==0.6.2.1 - xmonad ==0.13 - xmonad-contrib ==0.13 - - xmonad-extras ==0.13.0 + - xmonad-extras ==0.13.1 - xss-sanitize ==0.3.5.7 - xturtle ==0.2.0.0 - yackage ==0.8.1 @@ -2458,7 +2458,7 @@ default-package-overrides: - YampaSynth ==0.2 - yes-precure5-command ==5.5.3 - yesod ==1.4.5 - - yesod-auth ==1.4.18 + - yesod-auth ==1.4.19 - yesod-auth-account ==1.4.3 - yesod-auth-basic ==0.1.0.2 - yesod-auth-fb ==1.8.1 @@ -2468,7 +2468,7 @@ default-package-overrides: - yesod-default ==1.2.0 - yesod-eventsource ==1.4.1 - yesod-fb ==0.4.0 - - yesod-form ==1.4.15 + - yesod-form ==1.4.16 - yesod-form-bootstrap4 ==0.1.0.1 - yesod-form-richtext ==0.1.0.2 - yesod-gitrepo ==0.2.1.0 From 9aa82d70140e3914bc4dec8758b5ded2b1144990 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 14 Sep 2017 14:49:53 +0200 Subject: [PATCH 082/172] haskell-pandoc: bump version to pandoc-1.19.2.4 to fix the build with GHC 8.2.x --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 46a6334e1227..fcb67847171a 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -1594,7 +1594,7 @@ default-package-overrides: - pagerduty ==0.0.8 - pagination ==0.2.1 - palette ==0.1.0.5 - - pandoc ==1.19.2.3 + - pandoc ==1.19.2.4 - pandoc-citeproc ==0.10.5.1 - pandoc-types ==1.17.0.5 - pango ==0.13.3.1 From c59c53bf395dedcd4e1a53b46156f67bfe6cb3e0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 9 Sep 2017 03:00:30 +0200 Subject: [PATCH 083/172] 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/095b0a6eb28e1d8aafc1ec3107c2f1ad63b4c942. --- .../haskell-modules/hackage-packages.nix | 2140 +++++++++-------- 1 file changed, 1135 insertions(+), 1005 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index e281cf9e7742..5be4388835bb 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -714,30 +714,28 @@ self: { }) {}; "Agda" = callPackage - ({ mkDerivation, alex, array, base, binary, boxes, bytestring - , containers, cpphs, data-hash, deepseq, directory, EdisonCore - , edit-distance, emacs, equivalence, filepath, geniplate-mirror - , gitrev, happy, hashable, hashtables, haskeline, ieee754 - , monadplus, mtl, murmur-hash, parallel, pretty, process - , regex-tdfa, strict, template-haskell, text, time, transformers - , transformers-compat, unordered-containers, xhtml, zlib + ({ mkDerivation, alex, array, async, base, binary, blaze-html + , boxes, bytestring, containers, cpphs, data-hash, deepseq + , directory, EdisonCore, edit-distance, emacs, equivalence + , filepath, geniplate-mirror, gitrev, happy, hashable, hashtables + , haskeline, ieee754, monadplus, mtl, murmur-hash, parallel, pretty + , process, regex-tdfa, stm, strict, template-haskell, text, time + , transformers, unordered-containers, uri-encode, zlib }: mkDerivation { pname = "Agda"; - version = "2.5.2"; - sha256 = "0f8ld7sqkfhirhs886kp090iaq70qxsj8ms8farc80vzpz1ww4nq"; - revision = "3"; - editedCabalFile = "10j2hf2g9vv2xibywgd8s96x05clfxr4wli00011vkhblr4p9br8"; + version = "2.5.3"; + sha256 = "0r80vw7vnvbgq47y50v050malv7zvv2p2kg6f47i04r0b2ix855a"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - array base binary boxes bytestring containers data-hash deepseq - directory EdisonCore edit-distance equivalence filepath - geniplate-mirror gitrev hashable hashtables haskeline ieee754 - monadplus mtl murmur-hash parallel pretty process regex-tdfa strict - template-haskell text time transformers transformers-compat - unordered-containers xhtml zlib + array async base binary blaze-html boxes bytestring containers + data-hash deepseq directory EdisonCore edit-distance equivalence + filepath geniplate-mirror gitrev hashable hashtables haskeline + ieee754 monadplus mtl murmur-hash parallel pretty process + regex-tdfa stm strict template-haskell text time transformers + unordered-containers uri-encode zlib ]; libraryToolDepends = [ alex cpphs happy ]; executableHaskellDepends = [ base directory filepath process ]; @@ -6303,8 +6301,8 @@ self: { }: mkDerivation { pname = "Gene-CluEDO"; - version = "0.0.0.1"; - sha256 = "045h6p6n5rw6qb498hrgzgfddlj5hiij3zmbbs6p9nb9c6h03y48"; + version = "0.0.0.2"; + sha256 = "1gl5walv8mslb5rz9lf5s882ij4596shklqgjybckqajqwimblpd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -6452,13 +6450,14 @@ self: { }) {}; "Gifcurry" = callPackage - ({ mkDerivation, base, cmdargs, directory, filepath, gtk3, process - , temporary, text + ({ mkDerivation, base, cmdargs, directory, filepath, gi-gdk + , gi-glib, gi-gobject, gi-gtk, haskell-gi-base, process, temporary + , text }: mkDerivation { pname = "Gifcurry"; - version = "2.1.0.0"; - sha256 = "030p4ihh3zdjy0f687ffpnsf1zjb7mhwih47718fj2pawi4hkksi"; + version = "2.2.0.0"; + sha256 = "19f5prpnf3c3ga85ad1s1q5nl78n67iva5cwppkqklc15w0ad3rs"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -6466,11 +6465,12 @@ self: { base directory filepath process temporary text ]; executableHaskellDepends = [ - base cmdargs directory filepath gtk3 process temporary text + base cmdargs directory filepath gi-gdk gi-glib gi-gobject gi-gtk + haskell-gi-base process temporary text ]; homepage = "https://github.com/lettier/gifcurry"; - description = "Create animated GIFs, overlaid with optional text, from video files"; - license = stdenv.lib.licenses.asl20; + description = "GIF creation utility"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -9573,20 +9573,16 @@ self: { "Hoed" = callPackage ({ mkDerivation, array, base, bytestring, cereal, containers - , directory, filepath, FPretty, libgraph, mtl, process, RBTree - , regex-posix, template-haskell, threepenny-gui, time + , directory, filepath, libgraph, mtl, process, regex-posix, time }: mkDerivation { pname = "Hoed"; - version = "0.3.6"; - sha256 = "1nsiqcwx9xiz3774c0kv036v8pz53jzl9pfxyhm6ci8ag83za245"; - isLibrary = true; - isExecutable = true; + version = "0.4.0"; + sha256 = "0l01viv04dkxinysd7wbzn7k5rm8c21ix8k5a4p940hml879m9f1"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - array base bytestring cereal containers directory filepath FPretty - libgraph mtl process RBTree regex-posix template-haskell - threepenny-gui time + array base bytestring cereal containers directory filepath libgraph + mtl process regex-posix time ]; homepage = "https://wiki.haskell.org/Hoed"; description = "Lightweight algorithmic debugging"; @@ -13825,8 +13821,8 @@ self: { }: mkDerivation { pname = "PTQ"; - version = "0.0.7"; - sha256 = "0pfd5y8plxicdchkbij0nqj6zwxw3fcy5cz1ji5bky9g3bmz9mhm"; + version = "0.0.8"; + sha256 = "0mbyf63s19rps7p74b4fazbfccpjzx40l1fjszv38kprrg7jff2s"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -15462,16 +15458,18 @@ self: { }) {}; "SCalendar" = callPackage - ({ mkDerivation, base, containers, hspec, QuickCheck, text, time }: + ({ mkDerivation, base, containers, hspec, QuickCheck, scalendar + , text, time + }: mkDerivation { pname = "SCalendar"; - version = "1.0.0"; - sha256 = "0w69p3min1iijbk5cv645v5cizd2k5xwdzr52l7fg72bv17l0xcx"; + version = "1.1.0"; + sha256 = "139lggc8f7sw703asdyxqbja0jfcgphx0l5si1046lsryinvywa9"; libraryHaskellDepends = [ base containers text time ]; testHaskellDepends = [ - base containers hspec QuickCheck text time + base containers hspec QuickCheck scalendar text time ]; - homepage = "https://github.com/stackbuilders/scalendar"; + homepage = "https://www.researchgate.net/publication/311582722_Method_of_Managing_Resources_in_a_Telecommunication_Network_or_a_Computing_System"; description = "This is a library for handling calendars and resource availability based on the \"top-nodes algorithm\" and set operations"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -15954,6 +15952,8 @@ self: { pname = "SciFlow"; version = "0.6.0"; sha256 = "1b57sa2gx3jj00239sq62qmywjykc80lkk587lwzrdp9w5ycl4sb"; + revision = "1"; + editedCabalFile = "1nsakdi9y5nnwm8x9f2a1cvf55k0wnva3wkd9nmz9my8mlk2jfi3"; libraryHaskellDepends = [ aeson base bytestring cereal cereal-text containers data-default-class directory exceptions executable-path fgl @@ -17963,22 +17963,6 @@ self: { }) {}; "Unique" = callPackage - ({ mkDerivation, base, containers, extra, hashable, hspec - , QuickCheck, unordered-containers - }: - mkDerivation { - pname = "Unique"; - version = "0.4.6.1"; - sha256 = "1yc45a81rfhg8vw1wbdgb4x8fdr1diycnyvby7npy2187cw4i5lb"; - libraryHaskellDepends = [ - base containers extra hashable unordered-containers - ]; - testHaskellDepends = [ base containers hspec QuickCheck ]; - description = "It provides the functionality like unix \"uniq\" utility"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "Unique_0_4_7_1" = callPackage ({ mkDerivation, base, containers, extra, hashable, hspec , QuickCheck, unordered-containers }: @@ -17992,7 +17976,6 @@ self: { testHaskellDepends = [ base containers hspec QuickCheck ]; description = "It provides the functionality like unix \"uniq\" utility"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Unixutils" = callPackage @@ -18233,8 +18216,8 @@ self: { }: mkDerivation { pname = "Villefort"; - version = "0.1.1.13"; - sha256 = "02qlhg1i5z9z0zdbczygf4px477zg91a8gk5va5i7mcsgznqzv7d"; + version = "0.1.1.14"; + sha256 = "020ialav8dxbzkyra8sjip397l50j7d3gy3m44jf4wgiyk3d9jpj"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -18679,6 +18662,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Win32-notify_0_3_0_3" = callPackage + ({ mkDerivation, base, containers, directory, Win32 }: + mkDerivation { + pname = "Win32-notify"; + version = "0.3.0.3"; + sha256 = "05j10i83354cqbi8yzq5rgkkd6rmxsvy1b0sbwz3pkmidkhdn88c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers directory Win32 ]; + executableHaskellDepends = [ base directory ]; + description = "A binding to part of the Win32 library for file notification"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Win32-security" = callPackage ({ mkDerivation, base, text, Win32, Win32-errors }: mkDerivation { @@ -21064,6 +21062,49 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "aern2-mp" = callPackage + ({ mkDerivation, base, convertible, hmpfr, hspec, integer-gmp + , integer-logarithms, lens, mixed-types-num, QuickCheck, regex-tdfa + , template-haskell + }: + mkDerivation { + pname = "aern2-mp"; + version = "0.1.0.1"; + sha256 = "0l217dh94j8cf16rsv3408551qslwzjy068ni0m88i2cwliq9pyi"; + libraryHaskellDepends = [ + base convertible hmpfr hspec integer-gmp integer-logarithms lens + mixed-types-num QuickCheck regex-tdfa template-haskell + ]; + testHaskellDepends = [ base hspec QuickCheck ]; + homepage = "https://github.com/michalkonecny/aern2"; + description = "Multi-precision floats via MPFR"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "aern2-real" = callPackage + ({ mkDerivation, aern2-mp, aeson, base, bytestring, containers + , convertible, elm-bridge, hspec, lens, mixed-types-num, QuickCheck + , random, stm, transformers + }: + mkDerivation { + pname = "aern2-real"; + version = "0.1.0.1"; + sha256 = "0xvag7xzs5azcivlcp641p6wzf6pimz74fvwcl3rmrbah1ij1qv0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aern2-mp aeson base bytestring containers convertible hspec lens + mixed-types-num QuickCheck stm transformers + ]; + executableHaskellDepends = [ + aern2-mp base elm-bridge mixed-types-num QuickCheck random + ]; + testHaskellDepends = [ base hspec QuickCheck ]; + homepage = "https://github.com/michalkonecny/aern2"; + description = "Exact real numbers via Cauchy sequences and MPFR"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "aeson_0_7_0_6" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers, deepseq , dlist, ghc-prim, hashable, HUnit, mtl, old-locale, QuickCheck @@ -22558,8 +22599,8 @@ self: { }: mkDerivation { pname = "alex"; - version = "3.2.2"; - sha256 = "16v259aqgsj2lgia210f05zx6drbyad9958hk3cn9i27k7cmlkis"; + version = "3.2.3"; + sha256 = "0bi1cs9b8ir33h1fl6x2xw4ymygapqbr713ridpf7rmk2wa7jqqs"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -22588,6 +22629,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "alex-prelude" = callPackage + ({ mkDerivation, base, time }: + mkDerivation { + pname = "alex-prelude"; + version = "0.1.1.1"; + sha256 = "1ngxkr7jvy48pgq0sjqpi7a84qjm4fjny64hxksyvbj08l2rn7ha"; + libraryHaskellDepends = [ base time ]; + homepage = "https://www.asayers.com/"; + description = "Collection of useful functions for writing console applications"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "alex-tools" = callPackage ({ mkDerivation, base, deepseq, template-haskell, text }: mkDerivation { @@ -24999,7 +25052,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "amqp_0_16_0" = callPackage + "amqp_0_17_0" = callPackage ({ mkDerivation, base, binary, bytestring, clock, connection , containers, data-binary-ieee754, hspec, hspec-expectations , monad-control, network, network-uri, split, stm, text, vector @@ -25007,8 +25060,8 @@ self: { }: mkDerivation { pname = "amqp"; - version = "0.16.0"; - sha256 = "100krph1yaazxcs74r6v5785l50886rsbip98w8p4rzqgcya311a"; + version = "0.17.0"; + sha256 = "18g63nx7ksbqs45nr3nfw0hii9niw0bw5s35vk4xnchhj9f3ibwr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -27756,8 +27809,9 @@ self: { ({ mkDerivation, base, pretty-show, text }: mkDerivation { pname = "assert-failure"; - version = "0.1.1.0"; - sha256 = "09djlhhyn9w822a5r41y7gk4cqk74a2fy7skzml2bah2an166gm1"; + version = "0.1.2.1"; + sha256 = "1fjn40d555ryz9fffbx3qizrh3y018kalz6b4w8gdxapvpszj0sc"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base pretty-show text ]; homepage = "https://github.com/Mikolaj/assert-failure"; description = "Syntactic sugar improving 'assert' and 'error'"; @@ -31064,8 +31118,8 @@ self: { ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "basement"; - version = "0.0.0"; - sha256 = "1agqj5yp0nf7117qx62xp5mncans5szscbp6gz6ifhhsl6lng3k1"; + version = "0.0.2"; + sha256 = "01jvdi7xb61jgrq64ll325mvhibmm2q8nllq7aicy13mwxqgcyac"; libraryHaskellDepends = [ base ghc-prim ]; homepage = "https://github.com/haskell-foundation/foundation"; description = "Foundation scrap box of array & string"; @@ -32401,7 +32455,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "binary-orphans_0_1_7_0" = callPackage + "binary-orphans_0_1_8_0" = callPackage ({ mkDerivation, aeson, base, binary, case-insensitive, hashable , QuickCheck, quickcheck-instances, scientific, tagged, tasty , tasty-quickcheck, text, text-binary, time, unordered-containers @@ -32409,10 +32463,8 @@ self: { }: mkDerivation { pname = "binary-orphans"; - version = "0.1.7.0"; - sha256 = "1pv10g4a9sxjrsp2fj0w4n1sklxk2nf5w9q6na308smngbx3k1f9"; - revision = "1"; - editedCabalFile = "0k0griirhzac9h5wcf1331dmpxn32qdzx8pablaf1ny9r6pbjigy"; + version = "0.1.8.0"; + sha256 = "1k6067wn9zki7xvbslvxx8cq1wrmz3kjb3q3x8mxycc9v765fxgi"; libraryHaskellDepends = [ aeson base binary case-insensitive hashable scientific tagged text text-binary time unordered-containers vector @@ -37679,6 +37731,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "byteunits" = callPackage + ({ mkDerivation, base, Cabal, QuickCheck, safe }: + mkDerivation { + pname = "byteunits"; + version = "0.2.0.2"; + sha256 = "1n0gbjjhxx6rv07sck3bx70bd96pkgl0vx5qyqbby9gdfndil4vl"; + libraryHaskellDepends = [ base safe ]; + testHaskellDepends = [ base Cabal QuickCheck ]; + description = "Human friendly conversion between byte units (KB, MB, GB...)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "bzlib" = callPackage ({ mkDerivation, base, bytestring, bzip2 }: mkDerivation { @@ -39516,8 +39580,8 @@ self: { }: mkDerivation { pname = "canteven-http"; - version = "0.1.4.0"; - sha256 = "0zxs8ciyv3zb109an3qkw2c7kbg0zgs6cx1phndyl61wxf6vbqa6"; + version = "0.1.5.1"; + sha256 = "0rb77g2g9ddzypswwgjqw8dg31m2q70p765jbq4g5jj4jynm2vdb"; libraryHaskellDepends = [ base bytestring canteven-log directory exceptions filepath http-types mime-types monad-logger template-haskell text time @@ -41601,7 +41665,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "chart-unit_0_5_2" = callPackage + "chart-unit_0_5_3" = callPackage ({ mkDerivation, base, colour, containers, data-default , diagrams-lib, diagrams-rasterific, diagrams-svg, foldl , formatting, lens, linear, mwc-probability, mwc-random, numhask @@ -41610,8 +41674,8 @@ self: { }: mkDerivation { pname = "chart-unit"; - version = "0.5.2"; - sha256 = "1fslw870412dpc333hhxqhly7lz5gr8m2x7bvndfj4a98mmsv056"; + version = "0.5.3"; + sha256 = "0kr57pv63xlx2xnc0cj0da1bc5cf8icnw81lbndrdxh126si50k5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -42212,6 +42276,8 @@ self: { pname = "chronos"; version = "0.4"; sha256 = "0lc7qb1ky15sxmvndfjcmmy6j913ncnzq0hjx9mbqljvg7di0yal"; + revision = "1"; + editedCabalFile = "1mk6kn0gs7azv7c9bcal8k6zzlpska0x9akk91la2xvg298sy6a5"; libraryHaskellDepends = [ aeson attoparsec base bytestring hashable primitive text vector ]; @@ -44022,8 +44088,8 @@ self: { }: mkDerivation { pname = "cloudi"; - version = "1.7.1"; - sha256 = "12kk359wfkwsc62bb6f0ak5gzkwdw4gmcfmj9ryqrjcc2irlnbk1"; + version = "1.7.2"; + sha256 = "1w6rdmb5a50vdski2k4xwysrbxaycybijgak0hvpsjhnf16yb04f"; libraryHaskellDepends = [ array base binary bytestring containers network time unix zlib ]; @@ -44448,8 +44514,8 @@ self: { }: mkDerivation { pname = "cmark-sections"; - version = "0.2.0.0"; - sha256 = "0xrss1vlbcswk2izpjh34vxnkjaim6pxih00vv13hcarip17qs4f"; + version = "0.3.0"; + sha256 = "1zc7gcncmbq5ph17hlwxdikjvx6ccywkbs60523ybp7dagch4cfs"; libraryHaskellDepends = [ base base-prelude cmark containers microlens split text ]; @@ -44651,21 +44717,21 @@ self: { "cmv" = callPackage ({ mkDerivation, aeson, base, BiobaseInfernal, BiobaseTypes , BiobaseXNA, BioHMM, bytestring, cmdargs, colour, containers - , diagrams-cairo, diagrams-lib, directory, either-unwrap, filepath - , mtl, parsec, ParsecTools, PrimitiveArray, StockholmAlignment - , SVGFonts, template-haskell, text, vector + , diagrams-cairo, diagrams-core, diagrams-lib, directory + , either-unwrap, filepath, mtl, parsec, ParsecTools, PrimitiveArray + , StockholmAlignment, SVGFonts, template-haskell, text, vector }: mkDerivation { pname = "cmv"; - version = "1.0.2"; - sha256 = "107cwha465c7i2yi1k9m2csf9kdszrix7295d1q0dhklwi0fll8d"; + version = "1.0.3"; + sha256 = "1ahvr926iwg7r9ljflng28gwm39g2j42r754hbqg8ph5n0h0nlxj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base BiobaseInfernal BiobaseTypes BiobaseXNA BioHMM colour - containers diagrams-cairo diagrams-lib directory either-unwrap - filepath mtl parsec ParsecTools PrimitiveArray StockholmAlignment - SVGFonts text vector + containers diagrams-cairo diagrams-core diagrams-lib directory + either-unwrap filepath mtl parsec ParsecTools PrimitiveArray + StockholmAlignment SVGFonts text vector ]; executableHaskellDepends = [ aeson base BiobaseInfernal BiobaseXNA BioHMM bytestring cmdargs @@ -46176,8 +46242,8 @@ self: { }: mkDerivation { pname = "composite-aeson"; - version = "0.5.1.0"; - sha256 = "05v87hj60b3bcvq1jr45svs3z0q2ix5jkkk5kyd4fx95y63l1viw"; + version = "0.5.2.0"; + sha256 = "12r2kkn6gxp5aj3fzdyfazi2nzgfvvk6cp9rb5y0ak2llvsh5jm4"; libraryHaskellDepends = [ aeson aeson-better-errors base composite-base containers contravariant generic-deriving hashable lens mmorph mtl profunctors @@ -46201,8 +46267,8 @@ self: { }: mkDerivation { pname = "composite-aeson-refined"; - version = "0.5.1.0"; - sha256 = "1q7a210fnnypmb7m9jmqvfxzlb4aiy773vcmy7sv3qfnqys0ychm"; + version = "0.5.2.0"; + sha256 = "02kx3dsqfqwn07lxhvj6gxw4p0h5yv8r1nndzi6d8lil38rx9gap"; libraryHaskellDepends = [ aeson-better-errors base composite-aeson mtl refined ]; @@ -46218,8 +46284,8 @@ self: { }: mkDerivation { pname = "composite-base"; - version = "0.5.1.0"; - sha256 = "0ba25lw2kcn159w10kpbg5zhbiz6ka9kxcwsahw99030lm01d4rb"; + version = "0.5.2.0"; + sha256 = "1s19y7cnsk7k0hsc124xnvcj35vmdk1yqwvv15xf2qilvp3ppzxw"; libraryHaskellDepends = [ base exceptions lens monad-control mtl profunctors template-haskell text transformers transformers-base vinyl @@ -46239,8 +46305,8 @@ self: { }: mkDerivation { pname = "composite-ekg"; - version = "0.5.1.0"; - sha256 = "06jyl3vry7i0hypkzdm8zmf6h14s7vrl3322wpbjn72x1sd2cqsp"; + version = "0.5.2.0"; + sha256 = "0bymnfw5d3nzwrbmnq1jpdvvm86p7c3y7s779dlpmdcsq2wxvp92"; libraryHaskellDepends = [ base composite-base ekg ekg-core lens text vinyl ]; @@ -46256,8 +46322,8 @@ self: { }: mkDerivation { pname = "composite-opaleye"; - version = "0.5.1.0"; - sha256 = "1gyhjsa2144r402jlvm5g7c3gfbjlg5cr3ja51l7bavvsgvp28br"; + version = "0.5.2.0"; + sha256 = "1k2h9acbk4g8rfqpg9r689k5nr8cgj385797mkca3f76xrzlxbfl"; libraryHaskellDepends = [ base bytestring composite-base lens opaleye postgresql-simple product-profunctors profunctors template-haskell text vinyl @@ -47002,33 +47068,6 @@ self: { }) {}; "conduit" = callPackage - ({ mkDerivation, base, containers, criterion, deepseq, exceptions - , hspec, kan-extensions, lifted-base, mmorph, monad-control, mtl - , mwc-random, primitive, QuickCheck, resourcet, safe, split - , transformers, transformers-base, vector - }: - mkDerivation { - pname = "conduit"; - version = "1.2.11"; - sha256 = "1xx8vj2azbzr2skcrpcy02hgnik01i6hcx01h0mjd4fr0hzl4rhb"; - libraryHaskellDepends = [ - base exceptions lifted-base mmorph monad-control mtl primitive - resourcet transformers transformers-base - ]; - testHaskellDepends = [ - base containers exceptions hspec mtl QuickCheck resourcet safe - split transformers - ]; - benchmarkHaskellDepends = [ - base containers criterion deepseq hspec kan-extensions mwc-random - transformers vector - ]; - homepage = "http://github.com/snoyberg/conduit"; - description = "Streaming data processing library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "conduit_1_2_12" = callPackage ({ mkDerivation, base, containers, criterion, deepseq, exceptions , hspec, kan-extensions, lifted-base, mmorph, monad-control, mtl , mwc-random, primitive, QuickCheck, resourcet, safe, split @@ -47053,7 +47092,6 @@ self: { homepage = "http://github.com/snoyberg/conduit"; description = "Streaming data processing library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conduit-algorithms" = callPackage @@ -47065,8 +47103,8 @@ self: { }: mkDerivation { pname = "conduit-algorithms"; - version = "0.0.3.0"; - sha256 = "1bcn3gmq3dd23biw7widf1pmx7063yn5xn949cviw4nmfshrqahp"; + version = "0.0.4.0"; + sha256 = "0d142r0ljcdyd6z92k4nn19a0sain4fdqmfdr1wiibwq4bdcfzqw"; libraryHaskellDepends = [ async base bytestring bzlib-conduit conduit conduit-combinators conduit-extra containers deepseq directory filepath mtl resourcet @@ -47200,36 +47238,6 @@ self: { }) {}; "conduit-extra" = 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.16"; - sha256 = "1mgqc34i6ccq5bjkkn943gfa3w0lhddi3am0fd5afnazrnxc2wmx"; - 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; - }) {}; - - "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 @@ -47257,7 +47265,6 @@ self: { 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 @@ -48303,6 +48310,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "continued-fraction" = callPackage + ({ mkDerivation, base, criterion, hspec, recursion-schemes }: + mkDerivation { + pname = "continued-fraction"; + version = "0.1.0.0"; + sha256 = "1vip1ask3zyhy9n0vacx5ipww2m2wxkdhnp2j20c0i2g1jrpspx7"; + libraryHaskellDepends = [ base recursion-schemes ]; + testHaskellDepends = [ base hspec ]; + benchmarkHaskellDepends = [ base criterion ]; + homepage = "https://github.com/vmchale/continued-fractions#readme"; + description = "Types and functions for working with continued fractions in Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "continued-fractions" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -51101,6 +51122,8 @@ self: { pname = "cryptol"; version = "2.5.0"; sha256 = "1w8w4srdvnd8dwjbip45bdqsgpg5xmw2nrw1asnk857bgdhjh2ci"; + revision = "1"; + editedCabalFile = "0zd7ly5xy61z401bhw49r13wkcmrl7lsbc0245yas23j4bdmpbdr"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -53567,18 +53590,6 @@ self: { }) {}; "data-fix" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "data-fix"; - 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_7" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "data-fix"; @@ -53588,7 +53599,6 @@ self: { homepage = "https://github.com/anton-k/data-fix"; description = "Fixpoint data types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-fix-cse" = callPackage @@ -53627,6 +53637,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "data-foldapp" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "data-foldapp"; + version = "0.1.0.0"; + sha256 = "0m2rwai52q712fxkpk4k23cc8x9dx87c8wwwsg9w5y5pxq78csn8"; + libraryHaskellDepends = [ base containers ]; + homepage = "https://github.com/erisco/data-foldapp"; + description = "Fold function applications. Framework for variadic functions."; + license = stdenv.lib.licenses.bsd3; + }) {}; + "data-forest" = callPackage ({ mkDerivation, base, doctest }: mkDerivation { @@ -56061,8 +56083,8 @@ self: { }: mkDerivation { pname = "dejafu"; - version = "0.7.1.2"; - sha256 = "07ilcx6j4y587vda3y6maqjzn00zx9lz7mlgp2c1rhikbyk5dn03"; + version = "0.7.1.3"; + sha256 = "1bb629li526ji0kk3vkyrf5kim5m42k9vfhdhjcizdw85dlbxqgn"; libraryHaskellDepends = [ base concurrency containers deepseq exceptions leancheck mtl random ref-fd semigroups transformers transformers-base @@ -57072,8 +57094,8 @@ self: { pname = "diagrams-builder"; version = "0.8.0.1"; sha256 = "072vzskwp20qb768rv87876ngn6gnj959m91vpzri9ls9jx0x6vf"; - revision = "2"; - editedCabalFile = "0hrpic80rh8xyld8fhblvwykkg82nlp7j9xmcf5403wnqgprna97"; + revision = "3"; + editedCabalFile = "00lpy8ch7zjc2z3ifwg8j1jfsrf4sg1fk9pngykl8bqb79hm5h3i"; configureFlags = [ "-fcairo" "-fps" "-frasterific" "-fsvg" ]; isLibrary = true; isExecutable = true; @@ -57102,8 +57124,8 @@ self: { pname = "diagrams-cairo"; version = "1.4"; sha256 = "10gabibjg1hb83pm7qbqxmskrvrb52m5wdb8fcqwy9d3vfzwhkm9"; - revision = "1"; - editedCabalFile = "0xqjwxvhk45c202vlkbcl3kmp6rvwpyb1lzk4j3wnh5b9210v0y7"; + revision = "2"; + editedCabalFile = "1h21l3wa4vbl7p6n7sk949jpxvxikkhf81y2qjqgn904564w73r6"; libraryHaskellDepends = [ array base bytestring cairo colour containers data-default-class diagrams-core diagrams-lib filepath hashable JuicyPixels lens mtl @@ -57510,6 +57532,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "diagrams-svg_1_4_1_1" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, colour + , containers, diagrams-core, diagrams-lib, filepath, hashable + , JuicyPixels, lens, monoid-extras, mtl, optparse-applicative + , semigroups, split, svg-builder, text + }: + mkDerivation { + pname = "diagrams-svg"; + version = "1.4.1.1"; + sha256 = "1ans2lliaxqbx2q2459kiv59ff307vz6plqnh082pxhvmk36h1n8"; + libraryHaskellDepends = [ + base base64-bytestring bytestring colour containers diagrams-core + diagrams-lib filepath hashable JuicyPixels lens monoid-extras mtl + optparse-applicative semigroups split svg-builder text + ]; + homepage = "http://projects.haskell.org/diagrams/"; + description = "SVG backend for diagrams drawing EDSL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "diagrams-tikz" = callPackage ({ mkDerivation, base, diagrams-core, diagrams-lib, dlist, mtl }: mkDerivation { @@ -59099,8 +59142,8 @@ self: { }: mkDerivation { pname = "distributed-process-lifted"; - version = "0.2.0.1"; - sha256 = "0l19lf97m68xf1484srx2cnsprw9hqp0z0b58gjkpp4b2ki9cbcz"; + version = "0.3.0.0"; + sha256 = "1n0jic03x959rnkaavcywhz0zbqhaya53y0ydh13qs83a1y13m7i"; libraryHaskellDepends = [ base deepseq distributed-process distributed-process-monad-control lifted-base monad-control mtl network-transport transformers @@ -59371,8 +59414,10 @@ self: { }: mkDerivation { pname = "distributed-process-zookeeper"; - version = "0.2.2.0"; - sha256 = "0a3rd4wzwmnvsq3lq0p86rnf98gzwa4xan1gpqs40kppw17h85fz"; + version = "0.2.3.0"; + sha256 = "08dbqmzg80mffa4a3xls99mrk0i9zsx5f5s2nv8x35dlirdlbiwh"; + revision = "1"; + editedCabalFile = "1mvhc7lb4ssmjy24945fj7x185y665qn1gy9bldslfck3rdzi19n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -59754,29 +59799,6 @@ self: { }) {}; "dns" = 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.12"; - sha256 = "0c5w2s8cvid9nk9ldd759k0p54pnb10ld3iin1w1b4lqi08cnnwk"; - 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; - }) {}; - - "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 @@ -59797,7 +59819,6 @@ self: { testTarget = "spec"; description = "DNS library in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dnscache" = callPackage @@ -66869,15 +66890,15 @@ self: { }: mkDerivation { pname = "expressions"; - version = "0.1.1"; - sha256 = "0vbykw97f1zb4nlj1ibamyk4bi0467ldlxwlknhr5b940dfs3rmy"; + version = "0.1.2"; + sha256 = "0xl0302n98ijizv30bmj6dkmafam74rnn7n77q176ql22mjr0yfn"; libraryHaskellDepends = [ attoparsec base containers lattices singletons text transformers ]; testHaskellDepends = [ base QuickCheck singletons tasty tasty-quickcheck text ]; - description = "Expressions and Formulas a la carte"; + description = "Expressions and Formulae a la carte"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -68979,6 +69000,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "file-embed_0_0_10_1" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath + , template-haskell + }: + mkDerivation { + pname = "file-embed"; + version = "0.0.10.1"; + sha256 = "0lj164cnzqyd487mli91nnr7137a4h4qsasfwsnsh77sx12fpk9k"; + libraryHaskellDepends = [ + base bytestring directory filepath template-haskell + ]; + testHaskellDepends = [ base filepath ]; + homepage = "https://github.com/snoyberg/file-embed"; + description = "Use Template Haskell to embed file contents directly"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "file-embed-poly" = callPackage ({ mkDerivation, base, bytestring, directory, file-embed, filepath , hspec, template-haskell @@ -69366,18 +69405,20 @@ self: { "find-clumpiness" = callPackage ({ mkDerivation, aeson, base, BiobaseNewick, bytestring, clumpiness - , containers, listsafe, mtl, optparse-applicative, text, text-show - , tree-fun, unordered-containers, vector + , containers, hierarchical-clustering, listsafe, mtl + , optparse-applicative, text, text-show, tree-fun + , unordered-containers, vector }: mkDerivation { pname = "find-clumpiness"; - version = "0.2.2.0"; - sha256 = "174i1yhd7z884xfci8ml9kbcm0qpnsbryj8vchrd7rwi63ya0rbw"; + version = "0.2.3.0"; + sha256 = "08aby19vx6mvv606f66yi89bbg7x487drzzbax8437xm7k2fpg73"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base BiobaseNewick bytestring clumpiness containers listsafe - mtl text text-show tree-fun unordered-containers vector + aeson base BiobaseNewick bytestring clumpiness containers + hierarchical-clustering listsafe mtl text text-show tree-fun + unordered-containers vector ]; executableHaskellDepends = [ aeson base BiobaseNewick bytestring clumpiness containers @@ -69506,6 +69547,41 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "firefly" = callPackage + ({ mkDerivation, aeson, base, blaze-html, bytestring + , case-insensitive, containers, cookie, http-types, mtl, regex-pcre + , text, transformers, wai, warp + }: + mkDerivation { + pname = "firefly"; + version = "0.1.0.0"; + sha256 = "0m7a7n9iw5ylw4w0awwsbafck5gn7jap3jd34064in6qp009s05v"; + libraryHaskellDepends = [ + aeson base blaze-html bytestring case-insensitive containers cookie + http-types mtl regex-pcre text transformers wai warp + ]; + homepage = "https://github.com/ChrisPenner/firefly#readme"; + description = "A simple HTTP server framework"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "firefly-example" = callPackage + ({ mkDerivation, aeson, base, blaze-html, firefly, mtl, text, wai + }: + mkDerivation { + pname = "firefly-example"; + version = "0.1.0.0"; + sha256 = "1z8xr575dqpdb2rhbin1ib1wmswnkrxcrjdrgd3wjw524iq4b51m"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base blaze-html firefly mtl text wai + ]; + homepage = "https://github.com/ChrisPenner/Firefly#readme"; + description = "A simple example using Firefly"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "first-and-last" = callPackage ({ mkDerivation, base, doctest }: mkDerivation { @@ -70847,19 +70923,43 @@ self: { license = stdenv.lib.licenses.isc; }) {}; + "fn_0_3_0_2" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, directory + , filepath, hspec, http-types, resourcet, text + , unordered-containers, wai, wai-extra + }: + mkDerivation { + pname = "fn"; + version = "0.3.0.2"; + sha256 = "0pxfwyfigj449qd01xb044gz1h63f3lvmpq6xij09xhkm8bv0d0y"; + libraryHaskellDepends = [ + base blaze-builder bytestring directory filepath http-types + resourcet text unordered-containers wai wai-extra + ]; + testHaskellDepends = [ + base directory filepath hspec http-types resourcet text + unordered-containers wai wai-extra + ]; + homepage = "http://github.com/positiondev/fn#readme"; + description = "A functional web framework"; + license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fn-extra" = callPackage ({ mkDerivation, base, blaze-builder, bytestring , digestive-functors, directory, either, fn, heist, http-types - , lens, mtl, resourcet, text, wai, wai-extra, wai-util, xmlhtml + , lens, map-syntax, mtl, resourcet, text, wai, wai-extra, wai-util + , xmlhtml }: mkDerivation { pname = "fn-extra"; - version = "0.3.0.1"; - sha256 = "01zjzykfh1gv14lx3xb8vmchk3qywlnarlfn2h2mbf69xns73fjs"; + version = "0.3.0.2"; + sha256 = "1wbhfaddqhp68gh7906w4lnnlz2zfqrfl71kf5w5pb3nhkbjx3g1"; libraryHaskellDepends = [ base blaze-builder bytestring digestive-functors directory either - fn heist http-types lens mtl resourcet text wai wai-extra wai-util - xmlhtml + fn heist http-types lens map-syntax mtl resourcet text wai + wai-extra wai-util xmlhtml ]; homepage = "http://github.com/positiondev/fn#readme"; description = "Extras for Fn, a functional web framework"; @@ -71486,6 +71586,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "formatting_6_2_5" = callPackage + ({ mkDerivation, base, clock, old-locale, scientific, text + , text-format, time + }: + mkDerivation { + pname = "formatting"; + version = "6.2.5"; + sha256 = "0k4z8b9x91m243kplx9gap1rqyvdszf3241aq7pkqwrybbzgm8yh"; + libraryHaskellDepends = [ + base clock old-locale scientific text text-format time + ]; + description = "Combinator-based type-safe formatting (like printf() or FORMAT)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "forml" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, cereal , containers, directory, file-embed, ghc-prim, GraphSCC, hslogger @@ -71710,6 +71826,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "foundation_0_0_15" = callPackage + ({ mkDerivation, base, basement, criterion, ghc-prim }: + mkDerivation { + pname = "foundation"; + version = "0.0.15"; + sha256 = "05xl96lc7qi2sdkfc0s5rcrp84cbsyz0r0v3dffmgnv4n1f06cdh"; + libraryHaskellDepends = [ base basement ghc-prim ]; + testHaskellDepends = [ base basement ]; + benchmarkHaskellDepends = [ base basement criterion ]; + homepage = "https://github.com/haskell-foundation/foundation"; + description = "Alternative prelude with batteries and no dependencies"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "foundation-edge" = callPackage ({ mkDerivation, bytestring, foundation, text }: mkDerivation { @@ -76462,6 +76593,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghcjs-base-stub_0_1_0_3" = callPackage + ({ mkDerivation, aeson, attoparsec, base, containers, deepseq + , ghc-prim, primitive, scientific, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "ghcjs-base-stub"; + version = "0.1.0.3"; + sha256 = "1b9hvqzqiaq5f8daahayjh1rw2izpfssq1bvj9iis2v3ihh8hl01"; + libraryHaskellDepends = [ + aeson attoparsec base containers deepseq ghc-prim primitive + scientific text transformers unordered-containers vector + ]; + homepage = "https://github.com/louispan/javascript-stub#readme"; + description = "Allow GHCJS projects to compile under GHC and develop using intero"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghcjs-codemirror" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -77553,7 +77703,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "ginger_0_7_0_0" = callPackage + "ginger_0_7_1_0" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default, filepath , http-types, mtl, parsec, safe, scientific, tasty, tasty-hunit , tasty-quickcheck, text, time, transformers, unordered-containers @@ -77561,8 +77711,8 @@ self: { }: mkDerivation { pname = "ginger"; - version = "0.7.0.0"; - sha256 = "0sxg3mc47f578srkcvgd5p52abxqmrbbydm3ngh16jpz998y8cm4"; + version = "0.7.1.0"; + sha256 = "0022qv80dkjns825361laaksccay56q6zmcrbhjrc4j25nys29n8"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -87078,34 +87228,6 @@ self: { }) {}; "hapistrano" = 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.2.4"; - sha256 = "08p1060m9wjxgxai5zxhzv40c0h9xsdvcbdg33b20hzyapzgq6kl"; - revision = "1"; - editedCabalFile = "0cvbn9a7jhq8nr1cwfij5bm030d662s5hn287q5w5wx5xmmzsn9m"; - 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; - }) {}; - - "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 @@ -87129,7 +87251,6 @@ self: { 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 @@ -88117,18 +88238,6 @@ self: { }) {}; "harp" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "harp"; - version = "0.4.2"; - sha256 = "1wwwy7375nbqshwg4i49ypav8a632awsr9xlmjp5q7iqs0v65akz"; - libraryHaskellDepends = [ base ]; - homepage = "https://github.com/seereason/harp"; - description = "HaRP allows pattern-matching with regular expressions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "harp_0_4_3" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "harp"; @@ -88138,7 +88247,6 @@ self: { 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 @@ -88627,8 +88735,8 @@ self: { ({ mkDerivation, base, ghc-prim, hashable, primitive, vector }: mkDerivation { pname = "hashtables"; - version = "1.2.1.1"; - sha256 = "0lg9fb73w4awpcfr161xpz8y6z9lkfb5jii5ak34a1iijd55azr2"; + version = "1.2.2.0"; + sha256 = "0v7kfm04pynj66rkzyzvygxqv3xr3dj3h2aw0qj3h2zzjp33ybbf"; libraryHaskellDepends = [ base ghc-prim hashable primitive vector ]; @@ -89453,6 +89561,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "haskell-import-graph_1_0_3" = callPackage + ({ mkDerivation, base, classy-prelude, ghc, graphviz, process, text + , transformers + }: + mkDerivation { + pname = "haskell-import-graph"; + version = "1.0.3"; + sha256 = "1fh3nn4hqcj6lc3m1zlxykxk2dbchh3cdz63k8zfpl7dr2d91132"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base classy-prelude ghc graphviz process text transformers + ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/ncaq/haskell-import-graph#readme"; + description = "create haskell import graph for graphviz"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-in-space" = callPackage ({ mkDerivation, base, HGL, random }: mkDerivation { @@ -89929,6 +90057,8 @@ self: { pname = "haskell-src-exts-observe"; version = "0.1.0"; sha256 = "06vqd9ljmlx96xx6gyhfag2fsxwdzab0sy1gry2d24mbppbaa1x1"; + revision = "1"; + editedCabalFile = "1n4f4yylk09g95040g6pbcygzp95yadihv0sxr4sj87j0d4xa6fc"; libraryHaskellDepends = [ base haskell-src-exts Hoed ]; homepage = "https://github.com/pepeiborra/haskell-src-exts-observe"; description = "Observable orphan instances for haskell-src-exts"; @@ -91169,48 +91299,44 @@ self: { "haskey" = callPackage ({ mkDerivation, async, base, binary, bytestring, containers , directory, exceptions, filepath, focus, haskey-btree, HUnit - , list-t, lz4, mtl, QuickCheck, semigroups, stm, stm-containers - , temporary, test-framework, test-framework-hunit + , list-t, lz4, mtl, QuickCheck, random, semigroups, stm + , stm-containers, temporary, test-framework, test-framework-hunit , test-framework-quickcheck2, text, transformers, unix, vector , xxhash-ffi }: mkDerivation { pname = "haskey"; - version = "0.1.0.1"; - sha256 = "08kd48a67m1p55i3d4fla6zdpaqzq49piswhqwj1jnks4sj18ran"; - isLibrary = true; - isExecutable = true; + version = "0.2.0.0"; + sha256 = "1c0snqs740gqwfzlpyhr8zggaplmba6mzj8cnl8r47sgn006q95i"; libraryHaskellDepends = [ base binary bytestring containers directory exceptions filepath focus haskey-btree list-t lz4 mtl semigroups stm stm-containers transformers unix xxhash-ffi ]; - executableHaskellDepends = [ - async base bytestring haskey-btree text - ]; testHaskellDepends = [ - base binary bytestring containers directory exceptions haskey-btree - HUnit mtl QuickCheck temporary test-framework test-framework-hunit - test-framework-quickcheck2 transformers vector + async base binary bytestring containers directory exceptions + haskey-btree HUnit mtl QuickCheck random temporary test-framework + test-framework-hunit test-framework-quickcheck2 text transformers + vector ]; homepage = "https://github.com/haskell-haskey"; - description = "A transcatoinal, ACID compliant, embeddable key-value store"; + description = "A transactional, ACID compliant, embeddable key-value store"; license = stdenv.lib.licenses.bsd3; }) {}; "haskey-btree" = callPackage ({ mkDerivation, base, binary, bytestring, containers, data-ordlist - , focus, hashable, HUnit, list-t, mtl, QuickCheck, semigroups, stm - , test-framework, test-framework-hunit, test-framework-quickcheck2 + , hashable, HUnit, mtl, QuickCheck, semigroups, test-framework + , test-framework-hunit, test-framework-quickcheck2, text , transformers, vector }: mkDerivation { pname = "haskey-btree"; - version = "0.1.0.0"; - sha256 = "1kr9ihgvbxirbvs638y5sfmx41mj685jmcka87ics7w9ppcpkbsw"; + version = "0.2.0.0"; + sha256 = "00gp5fh64b26bqrchdrpdl8s46fdzglsqi07xf0cfrfcm867az23"; libraryHaskellDepends = [ - base binary bytestring containers focus hashable list-t mtl - semigroups stm transformers vector + base binary bytestring containers hashable mtl semigroups text + transformers vector ]; testHaskellDepends = [ base binary bytestring containers data-ordlist HUnit mtl QuickCheck @@ -91222,6 +91348,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskey-mtl" = callPackage + ({ mkDerivation, base, binary, exceptions, haskey, haskey-btree + , lens, mtl, text, transformers + }: + mkDerivation { + pname = "haskey-mtl"; + version = "0.2.0.0"; + sha256 = "1n3j4avydrr2w0sa0zjsc2jvmr9fmyxz5s54y6zam40a2cg2wc2l"; + libraryHaskellDepends = [ + base exceptions haskey haskey-btree mtl transformers + ]; + testHaskellDepends = [ + base binary exceptions haskey haskey-btree lens mtl text + transformers + ]; + homepage = "https://github.com/haskell-haskey"; + description = "A monad transformer supporting Haskey transactions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "haskgame" = callPackage ({ mkDerivation, base, containers, haskell98, SDL, SDL-ttf }: mkDerivation { @@ -92219,36 +92365,33 @@ self: { "haste-compiler" = callPackage ({ mkDerivation, array, base, bin-package-db, binary, blaze-builder - , bytestring, bzlib, Cabal, containers, data-binary-ieee754 - , directory, either, filepath, ghc, ghc-paths, ghc-prim, ghc-simple - , HTTP, monads-tf, mtl, network, network-uri, process, random - , shellmate, system-fileio, tar, terminfo, transformers, unix - , utf8-string, websockets + , bytestring, bzlib, Cabal, containers, cryptonite, directory + , either, filepath, ghc, ghc-paths, ghc-prim, ghc-simple, HTTP, mtl + , network, network-uri, process, random, shellmate + , shellmate-extras, system-fileio, tar, terminfo, transformers + , unix, utf8-string }: mkDerivation { pname = "haste-compiler"; - version = "0.5.5.1"; - sha256 = "0p46yhd9hj7jnbkqwyms6b7kgjk8bdx1r6q1aspfq9001z71sgf9"; + version = "0.6.0.0"; + sha256 = "0n169k2kcpkcms701hg0h6kqjdq9jxpkm9zh72nj8530xmhckirs"; configureFlags = [ "-fportable" ]; - isLibrary = true; + isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base binary bytestring containers data-binary-ieee754 directory - filepath ghc ghc-paths ghc-prim monads-tf network network-uri - process random shellmate transformers utf8-string websockets - ]; executableHaskellDepends = [ array base bin-package-db binary blaze-builder bytestring bzlib - Cabal containers directory either filepath ghc ghc-paths ghc-prim - ghc-simple HTTP mtl network network-uri process random shellmate - system-fileio tar terminfo transformers unix utf8-string + Cabal containers cryptonite directory either filepath ghc ghc-paths + ghc-prim ghc-simple HTTP mtl network network-uri process random + shellmate shellmate-extras system-fileio tar terminfo transformers + unix utf8-string ]; homepage = "http://haste-lang.org/"; description = "Haskell To ECMAScript compiler"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + broken = true; + }) {bin-package-db = null;}; "haste-gapi" = callPackage ({ mkDerivation, base, data-default, haste-compiler, transformers @@ -95588,10 +95731,8 @@ self: { ({ mkDerivation, base, ghc-prim, integer-gmp, QuickCheck }: mkDerivation { pname = "hgmp"; - version = "0.1.0.1"; - sha256 = "0fkcp3l34si7v286dza3yhw2bjpx6vpwqnkqnp9lv18jwxak7xji"; - revision = "1"; - editedCabalFile = "0fmzm7m0z1jzpi7c1k8gk843d9jqljrkrb25yzs1kpbrg0ylpi3c"; + version = "0.1.1"; + sha256 = "1hisbcpz47x2lbqf8vzwis7qw7xhvx22lv7dcyhm9vsmsh5741dr"; libraryHaskellDepends = [ base ghc-prim integer-gmp ]; testHaskellDepends = [ base QuickCheck ]; homepage = "https://code.mathr.co.uk/hgmp"; @@ -95958,8 +96099,8 @@ self: { }: mkDerivation { pname = "higher-leveldb"; - version = "0.4.0.0"; - sha256 = "116cpw9b0j82ik3242cqm82515dgixl4gj2s1qsmrn2w5yx1qrvd"; + version = "0.4.0.1"; + sha256 = "0ia3ssxr414jqvb4gzkaaa4a8d3rd7b395cfh0m2hz2jn6q7z651"; libraryHaskellDepends = [ base bytestring cereal data-default exceptions leveldb-haskell lifted-base monad-control mtl resourcet transformers @@ -97232,6 +97373,8 @@ self: { pname = "hledger-api"; version = "1.3.1"; sha256 = "149v81qslajzkr13ba7j4qqliagaq88v3d3pw301haf4v3wz9sv4"; + revision = "1"; + editedCabalFile = "11rsyhfxjr87j9m3frnkq6mssj6isay29v61l280a1bd5r58zcr3"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -102338,25 +102481,6 @@ self: { }) {}; "hsexif" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, hspec, HUnit - , iconv, text, time - }: - mkDerivation { - pname = "hsexif"; - version = "0.6.1.2"; - sha256 = "1i6h4gpjlrb9jadm52ygs9i1430lik2kljv86bpq6wz9zmq25d0s"; - 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; - }) {}; - - "hsexif_0_6_1_3" = callPackage ({ mkDerivation, base, binary, bytestring, containers, hspec, HUnit , iconv, text, time }: @@ -102373,7 +102497,6 @@ self: { 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 @@ -102558,8 +102681,8 @@ self: { }: mkDerivation { pname = "hsini"; - version = "0.5.1"; - sha256 = "0kh96xnpsz1ryrn1f8sajxzjlvqwg8dbhpz6409qdxl57vppcjfq"; + version = "0.5.1.1"; + sha256 = "0yfmra5z9fjms5ighlmi6zd092c4kpwnmsrcp2p8gqwdz7k1in51"; libraryHaskellDepends = [ base bytestring containers mtl parsec ]; testHaskellDepends = [ base bytestring containers HUnit mtl parsec QuickCheck tasty @@ -103961,13 +104084,14 @@ self: { }) {inherit (pkgs) sqlite;}; "hsqml" = callPackage - ({ mkDerivation, base, c2hs, containers, directory, filepath, qt5 - , QuickCheck, tagged, text, transformers + ({ mkDerivation, base, c2hs, Cabal, containers, directory, filepath + , qt5, QuickCheck, tagged, template-haskell, text, transformers }: mkDerivation { pname = "hsqml"; - version = "0.3.4.1"; - sha256 = "0qzg72pdz05rnzz9m6qycbrxm9jnh3qfvsbs0lqn18b1fn4i4qbi"; + version = "0.3.5.0"; + sha256 = "1im7jm144vvyvrmkvblxwhbya55xsyxl8z10bs4anwxxjlf9sggc"; + setupHaskellDepends = [ base Cabal filepath template-haskell ]; libraryHaskellDepends = [ base containers filepath tagged text transformers ]; @@ -105298,6 +105422,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "http-client-openssl_0_2_1_0" = callPackage + ({ mkDerivation, base, HsOpenSSL, hspec, http-client, http-types + , network + }: + mkDerivation { + pname = "http-client-openssl"; + version = "0.2.1.0"; + sha256 = "1k80gljqah2dqiardnzdkgrf5p3wvzrxqgc0gqg2vnnjxxj8paf7"; + libraryHaskellDepends = [ base HsOpenSSL http-client network ]; + testHaskellDepends = [ + base HsOpenSSL hspec http-client http-types + ]; + doCheck = false; + homepage = "https://github.com/snoyberg/http-client"; + description = "http-client backend using the OpenSSL library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-client-request-modifiers" = callPackage ({ mkDerivation, base, bytestring, exceptions, http-client , http-media, http-types, network, network-uri @@ -106056,8 +106199,8 @@ self: { }: mkDerivation { pname = "http2-client"; - version = "0.3.0.1"; - sha256 = "0py51s0dfw7gz7kz8l6p344aas7ifa8hxx4ybrmbs0936mpmmqbh"; + version = "0.3.0.2"; + sha256 = "06iw2mi176rwjmmynhjhyl06f3jq832viyl7adbxgdyws36b64jl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -107228,16 +107371,20 @@ self: { }) {}; "hw-prim-bits" = callPackage - ({ mkDerivation, base, criterion, vector }: + ({ mkDerivation, base, criterion, hedgehog, hspec, hw-hedgehog + , hw-hspec-hedgehog, QuickCheck, vector + }: mkDerivation { pname = "hw-prim-bits"; - version = "0.1.0.1"; - sha256 = "1fvmmp8l93j4wqcszk8lq4isl1xjyqnjzlaghs1wh9m6vywv5ncy"; + version = "0.1.0.4"; + sha256 = "1k2fqsa4msd156ar5cx57r0gj5ppwp1929yv56spv6n7xar1ich4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base ]; - testHaskellDepends = [ base ]; + testHaskellDepends = [ + base hedgehog hspec hw-hedgehog hw-hspec-hedgehog QuickCheck + ]; benchmarkHaskellDepends = [ base criterion vector ]; homepage = "https://github.com/githubuser/hw-prim-bits#readme"; description = "Primitive support for bit manipulation"; @@ -107475,15 +107622,13 @@ self: { }: mkDerivation { pname = "hworker-ses"; - version = "0.1.1.0"; - sha256 = "1iw16mm7iwjm50y4k878p885d6hjsbnvg3msvpq9zcw52mlk0lyx"; - revision = "1"; - editedCabalFile = "0vbzj885q7hrlsv2ds0izsjciishcfnh1m8nw98szzis4byhck48"; + version = "0.1.1.1"; + sha256 = "1rvf9fbmdf1xfpwlcxcrbjp0a3h5gmhb91897g6dp343wrq41amv"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-ses base hworker lens text time unordered-containers ]; - homepage = "http://github.com/dbp/hworker-ses"; + homepage = "http://github.com/position/hworker-ses"; description = "Library for sending email with Amazon's SES and hworker"; license = stdenv.lib.licenses.isc; hydraPlatforms = stdenv.lib.platforms.none; @@ -109285,6 +109430,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ige" = callPackage + ({ mkDerivation, aeson, array, base, bytestring, cairo, conduit + , conduit-combinators, containers, directory, fgl, gtk, linear + , megaparsec, microlens-platform, mtl, mwc-random, protolude, stm + , stm-chans, stm-conduit, text, transformers, wl-pprint-text + }: + mkDerivation { + pname = "ige"; + version = "0.1.0.0"; + sha256 = "14cbmb69h8fxabcqi2ncs48xsnflcq5g8gl8s6hvc4x80wb79f5s"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson array base bytestring cairo conduit conduit-combinators + containers directory fgl gtk linear megaparsec microlens-platform + mtl mwc-random protolude stm stm-chans stm-conduit text + transformers wl-pprint-text + ]; + homepage = "https://github.com/olynch/ige"; + description = "An keyboard-driven interactive graph editor"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "ige-mac-integration" = callPackage ({ mkDerivation, array, base, containers, glib, gtk , gtk2hs-buildtools, haskell98, ige-mac-integration, mtl @@ -109795,8 +109963,8 @@ self: { }: mkDerivation { pname = "imap"; - version = "0.3.0.2"; - sha256 = "1mcfmzqiwiasbaakz8w1cq4zj04jh61sppn1c88cvvkmi28qpwqa"; + version = "0.3.0.4"; + sha256 = "021ya9pkf8q1nk805ck5hhm06q9lnp22d78hr0nz112xbxm5rqkw"; libraryHaskellDepends = [ attoparsec base bytestring connection containers derive either exceptions hslogger list-t network pipes random rolling-queue stm @@ -109910,6 +110078,42 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "imm_1_2_1_0" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, atom-conduit, base + , blaze-html, blaze-markup, bytestring, case-insensitive + , chunked-data, comonad, conduit, conduit-combinators, connection + , containers, directory, dyre, fast-logger, filepath, free + , hashable, HaskellNet, HaskellNet-SSL, http-client + , http-client-tls, http-types, microlens, mime-mail + , mono-traversable, monoid-subclasses, network, opml-conduit + , optparse-applicative, rainbow, rainbox, rss-conduit + , safe-exceptions, tagged, text, time, timerep, tls, transformers + , uri-bytestring, xml, xml-conduit, xml-types + }: + mkDerivation { + pname = "imm"; + version = "1.2.1.0"; + sha256 = "0m869l6z50zf57hfy28ad70id3phfqjwkna64m59yycvcqlkj064"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-wl-pprint atom-conduit base blaze-html blaze-markup + bytestring case-insensitive chunked-data comonad conduit + conduit-combinators connection containers directory dyre + fast-logger filepath free hashable HaskellNet HaskellNet-SSL + http-client http-client-tls http-types microlens mime-mail + mono-traversable monoid-subclasses network opml-conduit + optparse-applicative rainbow rainbox rss-conduit safe-exceptions + tagged text time timerep tls transformers uri-bytestring xml + xml-conduit xml-types + ]; + executableHaskellDepends = [ base free ]; + homepage = "https://github.com/k0ral/imm"; + description = "Execute arbitrary actions for each unread element of RSS/Atom feeds"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "immortal" = callPackage ({ mkDerivation, base, lifted-base, monad-control, stm, tasty , tasty-hunit, transformers, transformers-base @@ -109929,6 +110133,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "immortal_0_2_2_1" = callPackage + ({ mkDerivation, base, lifted-base, monad-control, stm, tasty + , tasty-hunit, transformers, transformers-base + }: + mkDerivation { + pname = "immortal"; + version = "0.2.2.1"; + sha256 = "13lddk62byx8w41k80d24q31mmijacnqqz64zrrkls9si2ia2jpd"; + libraryHaskellDepends = [ + base lifted-base monad-control stm transformers-base + ]; + testHaskellDepends = [ + base lifted-base stm tasty tasty-hunit transformers + ]; + homepage = "https://github.com/feuerbach/immortal"; + description = "Spawn threads that never die (unless told to do so)"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "imparse" = callPackage ({ mkDerivation, ascetic, base, compilation, containers, directory , indents, MissingH, parsec, richreports, split, staticanalysis @@ -111510,8 +111734,8 @@ self: { }: mkDerivation { pname = "intero"; - version = "0.1.21"; - sha256 = "1fr855gbz0ypxa73d5f74wp2sr3q67wdv6g4bpckj682c1x7dr73"; + version = "0.1.23"; + sha256 = "17247yscz7z1axhml2f5m4i4sxgyydpvcidk75ng350dk6z1wd4x"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -111520,7 +111744,8 @@ self: { ghc-paths ghci haskeline process syb time transformers unix ]; testHaskellDepends = [ - base directory hspec process regex-compat temporary transformers + base directory filepath hspec process regex-compat temporary + transformers ]; homepage = "https://github.com/commercialhaskell/intero"; description = "Complete interactive development program for Haskell"; @@ -112084,28 +112309,6 @@ self: { }) {}; "io-streams-haproxy" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, HUnit, io-streams - , network, test-framework, test-framework-hunit, transformers - }: - mkDerivation { - pname = "io-streams-haproxy"; - version = "1.0.0.1"; - sha256 = "0zwjdsg1pcxzd8s0d308q4jhx0pfrk2aq8q039gs8k9y8h9cbh64"; - revision = "2"; - editedCabalFile = "1zm580jcncmh667k51k47xwwhd171r3f0h00d25hi6isq812ia40"; - 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; - }) {}; - - "io-streams-haproxy_1_0_0_2" = callPackage ({ mkDerivation, attoparsec, base, bytestring, HUnit, io-streams , network, test-framework, test-framework-hunit, transformers }: @@ -112123,7 +112326,6 @@ self: { 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 @@ -112249,6 +112451,8 @@ self: { pname = "ip"; version = "0.9.2"; sha256 = "0r15mdknz1j85hws9bqfil6l39q88pbbjz0kbky9kl7y675hkzdj"; + revision = "2"; + editedCabalFile = "1l6gj2678rbaryby9gzsqvyjyknyfc2r6xj27kbcb02cz4igga7m"; libraryHaskellDepends = [ aeson attoparsec base bytestring hashable primitive text vector ]; @@ -113762,8 +113966,8 @@ self: { }: mkDerivation { pname = "jammittools"; - version = "0.5.3"; - sha256 = "1lb4ayalkplfd9gpsl4rhi6svj4y3yr5v25br4g19cjh5iiv4sif"; + version = "0.5.3.2"; + sha256 = "0wym2mz4bvcmwg10v90dx14n41qhmn58bgccnxy7li9ahqwvj0f0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -115233,27 +115437,6 @@ self: { }) {}; "json-stream" = 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"; - libraryHaskellDepends = [ - aeson base bytestring scientific text unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring directory doctest hspec QuickCheck - quickcheck-unicode scientific text unordered-containers vector - ]; - homepage = "https://github.com/ondrap/json-stream"; - description = "Incremental applicative JSON parser"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "json-stream_0_4_1_5" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, doctest, hspec , QuickCheck, quickcheck-unicode, scientific, text , unordered-containers, vector @@ -115272,7 +115455,6 @@ self: { homepage = "https://github.com/ondrap/json-stream"; description = "Incremental applicative JSON parser"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-togo" = callPackage @@ -118732,6 +118914,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "language-c_0_7_0" = callPackage + ({ mkDerivation, alex, array, base, bytestring, containers + , directory, filepath, happy, pretty, process, syb + }: + mkDerivation { + pname = "language-c"; + version = "0.7.0"; + sha256 = "1j4slggwj5g0rnrdxafgn2savv14sl2nqk7lfy3qj73vmpn1d86d"; + libraryHaskellDepends = [ + array base bytestring containers directory filepath pretty process + syb + ]; + libraryToolDepends = [ alex happy ]; + testHaskellDepends = [ base directory filepath process ]; + homepage = "http://visq.github.io/language-c/"; + description = "Analysis and generation of C code"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "language-c-comments" = callPackage ({ mkDerivation, alex, array, base, language-c }: mkDerivation { @@ -118967,13 +119169,13 @@ self: { }) {}; "language-elm" = callPackage - ({ mkDerivation, base, HUnit, MissingH, pretty }: + ({ mkDerivation, base, hspec, MissingH, mtl, pretty, protolude }: mkDerivation { pname = "language-elm"; - version = "0.0.10.1"; - sha256 = "1kp2mwl1hngpvl2hfzlf7dghcvcr407f7qc86b3zz2vgxfac0n07"; - libraryHaskellDepends = [ base MissingH pretty ]; - testHaskellDepends = [ base HUnit pretty ]; + version = "0.1.0.3"; + sha256 = "07pyj3ibrpa3mrqn6skjpk0w44hi32mm0c08yqpnql3qv2xy4wcz"; + libraryHaskellDepends = [ base MissingH mtl pretty protolude ]; + testHaskellDepends = [ base hspec mtl pretty protolude ]; homepage = "https://github.com/eliaslfox/language-elm#readme"; description = "Generate elm code"; license = stdenv.lib.licenses.bsd3; @@ -121639,13 +121841,13 @@ self: { , network-ip, parsers, pathtype, protolude, QuickCheck, random , semigroups, stm, stm-chans, stm-containers, temporary , test-framework, test-framework-quickcheck2, test-framework-th - , text, text-icu, text-icu-normalized, text-printer, time - , transformers, transformers-base, zippers + , text, text-printer, time, transformers, transformers-base + , zippers }: mkDerivation { pname = "liblawless"; - version = "0.24.0"; - sha256 = "1dqz2d8zgwb8i176fhga5637y8mfxiq0vq1ws0lsy9ijlpyiikmp"; + version = "0.25.2"; + sha256 = "0s1qahk7yabggjv4zkqxiy4yygzbq8zwbh5nvh46zm0r09q802s1"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base base-unicode-symbols binary boomerang bytestring @@ -121653,9 +121855,8 @@ self: { contravariant data-textual dns exceptions hjsonschema lens lifted-async lifted-base machines managed monad-control mtl network network-ip parsers pathtype protolude QuickCheck random semigroups - stm stm-chans stm-containers temporary text text-icu - text-icu-normalized text-printer time transformers - transformers-base zippers + stm stm-chans stm-containers temporary text text-printer time + transformers transformers-base zippers ]; testHaskellDepends = [ aeson base binary bytestring exceptions filepath QuickCheck @@ -124908,29 +125109,6 @@ self: { }) {}; "logging-effect" = 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.0"; - sha256 = "0i45dmfm05zi2pl1c39znhp108nnp0il29kw2ka4g6bfs4hh2vxy"; - 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; - }) {}; - - "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 @@ -124951,7 +125129,6 @@ self: { 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 @@ -126656,8 +126833,8 @@ self: { }: mkDerivation { pname = "mackerel-client"; - version = "0.0.4"; - sha256 = "1l14jw7awi6vrnlw4g5x4fa4a26j9b7k3mgvr651lxrxz5vc6qrg"; + version = "0.0.5"; + sha256 = "17ppg6nzm8q6fz1y630vzda1rgc8fkhxhjabmvis79h2k3q994s5"; libraryHaskellDepends = [ aeson base bytestring data-default directory filepath htoml http-client http-client-tls http-types parsec split text @@ -128452,8 +128629,8 @@ self: { }: mkDerivation { pname = "matterhorn"; - version = "40000.0.2"; - sha256 = "1lsxadkhvk8bylpc0sh1pmkldv8m17fpi96zkihdpchpwhw1i8jn"; + version = "40000.1.0"; + sha256 = "0zqbaqdvcq45sgkiii7w2y8b3m8fv8zqj1y85rdkycjfy7h8lkjd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -128485,8 +128662,8 @@ self: { }: mkDerivation { pname = "mattermost-api"; - version = "40000.0.1"; - sha256 = "0phykn8h08yprmpds92cp6snraxg66hbh553b8da5v47dn06y8mv"; + version = "40000.1.0"; + sha256 = "076b5l2hqjbspdm6j321inf141jsr07c9dsckqvq02wxjaz8ws80"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -128512,8 +128689,8 @@ self: { }: mkDerivation { pname = "mattermost-api-qc"; - version = "40000.0.1"; - sha256 = "0444m1349gpyffpjlvf9faz4sia5kfsry9q174n6b60ch85w1ilg"; + version = "40000.1.0"; + sha256 = "11yxkq19f0iczh69hglv7plv466wfzdskkygp9vh6a7bjwwr8hzk"; libraryHaskellDepends = [ base containers mattermost-api QuickCheck text time ]; @@ -129660,8 +129837,8 @@ self: { }: mkDerivation { pname = "memory"; - version = "0.14.6"; - sha256 = "0q61zxdlgcw7wg244hb3c11qm5agrmnmln0h61sz2mj72xqc1pn7"; + version = "0.14.7"; + sha256 = "0snm3kphsrjixg1hpas1rfxaq7id7i5siprqf1p9lz7x1l4vznyj"; libraryHaskellDepends = [ base bytestring deepseq foundation ghc-prim ]; @@ -129673,14 +129850,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "memory_0_14_7" = callPackage + "memory_0_14_8" = callPackage ({ mkDerivation, base, bytestring, deepseq, foundation, ghc-prim , tasty, tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "memory"; - version = "0.14.7"; - sha256 = "0snm3kphsrjixg1hpas1rfxaq7id7i5siprqf1p9lz7x1l4vznyj"; + version = "0.14.8"; + sha256 = "093jin2yckha0wccswwxqaak2di7fz2v2rid03h1q0pjm4q9vmyk"; libraryHaskellDepends = [ base bytestring deepseq foundation ghc-prim ]; @@ -132312,28 +132489,6 @@ self: { }) {}; "monad-logger" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, conduit - , conduit-extra, exceptions, fast-logger, lifted-base - , monad-control, monad-loops, mtl, resourcet, stm, stm-chans - , template-haskell, text, transformers, transformers-base - , transformers-compat - }: - mkDerivation { - pname = "monad-logger"; - version = "0.3.25"; - sha256 = "1ai55mk3n72qcdh7b6n4sv8bh5wqf2nznpzldimrwxg3m2b6g88g"; - libraryHaskellDepends = [ - base blaze-builder bytestring conduit conduit-extra exceptions - fast-logger lifted-base monad-control monad-loops mtl resourcet stm - stm-chans template-haskell text transformers transformers-base - transformers-compat - ]; - homepage = "https://github.com/kazu-yamamoto/logger"; - description = "A class of monads which can log messages"; - license = stdenv.lib.licenses.mit; - }) {}; - - "monad-logger_0_3_25_1" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, conduit , conduit-extra, exceptions, fast-logger, lifted-base , monad-control, monad-loops, mtl, resourcet, stm, stm-chans @@ -132353,7 +132508,6 @@ self: { homepage = "https://github.com/kazu-yamamoto/logger"; description = "A class of monads which can log messages"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-logger-json" = callPackage @@ -136108,6 +136262,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mysql-simple_0_4_2_0" = 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.2.0"; + sha256 = "0050z2hhdg9zmqczghjc609aaaqjzrxrfly68d4m5046wz4lnkx8"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mysql-simple-quasi" = callPackage ({ mkDerivation, base, haskell-src-meta, mysql-simple , template-haskell @@ -140410,6 +140584,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "numhask-array" = callPackage + ({ mkDerivation, adjunctions, base, distributive, doctest + , ghc-typelits-natnormalise, numhask, protolude, singletons + , typelits-witnesses, vector + }: + mkDerivation { + pname = "numhask-array"; + version = "0.0.1"; + sha256 = "0drxxbzzflgc7z5pjwy6pkrxkzckkj7xqp2icsn8762nwc9iqsp4"; + libraryHaskellDepends = [ + adjunctions base distributive ghc-typelits-natnormalise numhask + protolude singletons typelits-witnesses vector + ]; + testHaskellDepends = [ base doctest numhask ]; + homepage = "https://github.com/tonyday567/numhask-array"; + description = "See readme.md"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "numhask-range" = callPackage ({ mkDerivation, base, containers, foldl, formatting, lens, linear , numhask, protolude, QuickCheck, tasty, tasty-quickcheck @@ -141555,28 +141748,6 @@ self: { }) {}; "opaleye-trans" = callPackage - ({ mkDerivation, base, mtl, opaleye, postgresql-simple - , product-profunctors, transformers, transformers-base - }: - mkDerivation { - pname = "opaleye-trans"; - version = "0.3.5"; - sha256 = "1za8xhi20905x8zgnbr821fkdx5w32smmxmz72vx6jga44vxsq4k"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base mtl opaleye postgresql-simple product-profunctors transformers - transformers-base - ]; - executableHaskellDepends = [ - base opaleye postgresql-simple product-profunctors - ]; - homepage = "https://github.com/WraithM/opaleye-trans"; - description = "A monad transformer for Opaleye"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "opaleye-trans_0_3_6" = callPackage ({ mkDerivation, base, mtl, opaleye, postgresql-simple , product-profunctors, transformers, transformers-base }: @@ -141596,7 +141767,6 @@ self: { homepage = "https://github.com/WraithM/opaleye-trans"; description = "A monad transformer for Opaleye"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "open-browser" = callPackage @@ -142143,25 +142313,6 @@ self: { }) {}; "openssl-streams" = callPackage - ({ mkDerivation, base, bytestring, HsOpenSSL, HUnit, io-streams - , network, test-framework, test-framework-hunit - }: - mkDerivation { - pname = "openssl-streams"; - version = "1.2.1.1"; - sha256 = "1annfc0nmkj0hl62x4w39phai54qd8ibislwhbw66k0df3bc8kyz"; - 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; - }) {}; - - "openssl-streams_1_2_1_3" = callPackage ({ mkDerivation, base, bytestring, HsOpenSSL, HUnit, io-streams , network, test-framework, test-framework-hunit }: @@ -142178,7 +142329,6 @@ self: { ]; description = "OpenSSL network support for io-streams"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "opentheory" = callPackage @@ -143844,7 +143994,7 @@ self: { "pandoc" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base , base64-bytestring, binary, blaze-html, blaze-markup, bytestring - , cmark, containers, criterion, data-default, deepseq, Diff + , Cabal, cmark, containers, criterion, data-default, deepseq, Diff , directory, doctemplates, executable-path, extensible-exceptions , filemanip, filepath, ghc-prim, haddock-library, hslua, HTTP , http-client, http-client-tls, http-types, HUnit, JuicyPixels, mtl @@ -143856,14 +144006,13 @@ self: { }: mkDerivation { pname = "pandoc"; - version = "1.19.2.1"; - sha256 = "00bq5h70byfs1fnszkggwws33hp7dpr7lzs0lfdvp5dzfwyjys88"; - revision = "5"; - editedCabalFile = "0rp81lr8ys7bcnjx5hm9fn704zhph313whjc51ns8sbpzlpwvx1f"; + version = "1.19.2.4"; + sha256 = "0mim429mpakrcnm50csxyqk3ljcx2l26r5grk6w9isnggwgqrq5v"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ aeson array base base64-bytestring binary blaze-html blaze-markup bytestring cmark containers data-default deepseq directory @@ -143876,8 +144025,8 @@ self: { ]; executableHaskellDepends = [ aeson base bytestring containers directory extensible-exceptions - filepath HTTP network network-uri pandoc-types skylighting text - unix yaml + filepath HTTP network network-uri pandoc-types skylighting texmath + text unix yaml ]; testHaskellDepends = [ ansi-terminal base bytestring containers Diff directory @@ -145938,17 +146087,6 @@ self: { }) {}; "path-extra" = callPackage - ({ mkDerivation, base, exceptions, path }: - mkDerivation { - pname = "path-extra"; - version = "0.0.3"; - sha256 = "0ncbcc16b1xg5hc8mm3czabn7crz7d41jv1k5lbcvbisgarkn12m"; - libraryHaskellDepends = [ base exceptions path ]; - description = "Chris Done's path library, enriched with URL-related goodies"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "path-extra_0_0_5" = callPackage ({ mkDerivation, base, exceptions, path }: mkDerivation { pname = "path-extra"; @@ -145957,7 +146095,6 @@ self: { 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 @@ -146370,6 +146507,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pcf-font" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, vector }: + mkDerivation { + pname = "pcf-font"; + version = "0.1.0.0"; + sha256 = "14ix40vsvax0wklb3bffg99rvhfq1w6w937r4n73kknhjszdhf6g"; + libraryHaskellDepends = [ + base binary bytestring containers vector + ]; + homepage = "https://github.com/michael-swan/pcf-font"; + description = "PCF font parsing and rendering library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pcg-random" = callPackage ({ mkDerivation, base, bytestring, doctest, entropy, primitive , random @@ -147069,6 +147220,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "perf_0_2_0" = callPackage + ({ mkDerivation, base, containers, doctest, foldl, formatting + , numhask, optparse-generic, protolude, rdtsc, tdigest, text, time + , vector + }: + mkDerivation { + pname = "perf"; + version = "0.2.0"; + sha256 = "1db6acsszdwdlkz2cp5r0wwrmgam4jl6n91d02b3zdn0jfazp7nn"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers foldl numhask protolude rdtsc tdigest time + ]; + executableHaskellDepends = [ + base containers formatting numhask optparse-generic protolude text + vector + ]; + testHaskellDepends = [ base doctest protolude ]; + homepage = "https://github.com/tonyday567/perf"; + description = "low-level performance statistics"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "perfecthash" = callPackage ({ mkDerivation, array, base, bytestring, cmph, containers , criterion, deepseq, hspec, QuickCheck, random, time @@ -148193,8 +148369,8 @@ self: { }: mkDerivation { pname = "phoityne-vscode"; - version = "0.0.15.0"; - sha256 = "1r4wbf6x19gzmz88f770si5mvrya9adgilgs76kc36ynlsz5jyrp"; + version = "0.0.16.0"; + sha256 = "02ma54ffjijazyfnag2z9gq2l86yiqzvlrdc1y3mw8b8yjgzvidd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -149075,18 +149251,6 @@ self: { }) {}; "pipes-concurrency" = callPackage - ({ mkDerivation, async, base, contravariant, pipes, stm, void }: - mkDerivation { - pname = "pipes-concurrency"; - version = "2.0.7"; - sha256 = "0nbmyhnkcw0frdbjzyhgal3zadzf6hsrqj5l619lj6rnjq07z90l"; - libraryHaskellDepends = [ base contravariant pipes stm void ]; - testHaskellDepends = [ async base pipes stm ]; - description = "Concurrency for the pipes ecosystem"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pipes-concurrency_2_0_8" = callPackage ({ mkDerivation, async, base, contravariant, pipes, stm, void }: mkDerivation { pname = "pipes-concurrency"; @@ -149098,7 +149262,6 @@ self: { testHaskellDepends = [ async base pipes stm ]; description = "Concurrency for the pipes ecosystem"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-conduit" = callPackage @@ -149291,22 +149454,6 @@ self: { }) {}; "pipes-group" = callPackage - ({ mkDerivation, base, doctest, free, lens-family-core, pipes - , pipes-parse, transformers - }: - mkDerivation { - pname = "pipes-group"; - version = "1.0.7"; - sha256 = "0p0bfc91ij481bybk99jpfczkkcz3v7mcr0y03kvhxddf575jhw6"; - libraryHaskellDepends = [ - base free pipes pipes-parse transformers - ]; - testHaskellDepends = [ base doctest lens-family-core ]; - description = "Group streams into substreams"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pipes-group_1_0_8" = callPackage ({ mkDerivation, base, doctest, free, lens-family-core, pipes , pipes-parse, transformers }: @@ -149320,7 +149467,6 @@ self: { testHaskellDepends = [ base doctest lens-family-core ]; description = "Group streams into substreams"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-http" = callPackage @@ -149382,6 +149528,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pipes-kafka" = callPackage + ({ mkDerivation, base, bytestring, exceptions, hw-kafka-client + , monad-logger, pipes, pipes-safe, text, transformers + , transformers-base + }: + mkDerivation { + pname = "pipes-kafka"; + version = "0.2.0.0"; + sha256 = "1ca0pdig35waqr499i4m92w34sywc8nc0gdfszqjcmpsjmba93hv"; + libraryHaskellDepends = [ + base bytestring exceptions hw-kafka-client monad-logger pipes + pipes-safe text transformers transformers-base + ]; + homepage = "https://github.com/boothead/pipes-kafka"; + description = "Kafka in the Pipes ecosystem"; + license = stdenv.lib.licenses.mit; + }) {}; + "pipes-key-value-csv" = callPackage ({ mkDerivation, base, bifunctors, containers, contravariant , data-default-class, lens, mtl, pipes, pipes-bytestring @@ -150262,22 +150426,6 @@ self: { }) {}; "plot" = callPackage - ({ mkDerivation, array, base, cairo, colour, hmatrix, mtl, pango - , transformers - }: - mkDerivation { - pname = "plot"; - version = "0.2.3.7"; - sha256 = "192pjxpdnfrzjb6n8swkcd5f5nv3vvj7kc110v002akcgkii31li"; - 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; - }) {}; - - "plot_0_2_3_8" = callPackage ({ mkDerivation, array, base, cairo, colour, hmatrix, mtl, pango , transformers }: @@ -150291,7 +150439,6 @@ self: { 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 @@ -153481,6 +153628,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "primesieve" = callPackage + ({ mkDerivation, base, foundation, primesieve }: + mkDerivation { + pname = "primesieve"; + version = "0.1.0.1"; + sha256 = "17fmja87sr6lpq6qjmn31zx6y1cxhc65amfza22w07480wk7lhp2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base foundation ]; + executableHaskellDepends = [ base foundation ]; + executableSystemDepends = [ primesieve ]; + homepage = "https://github.com/sighingnow/computations/tree/master/primesieve#readme"; + description = "FFI bindings for the primesieve library"; + license = stdenv.lib.licenses.mit; + }) {primesieve = null;}; + "primitive_0_5_1_0" = callPackage ({ mkDerivation, base, ghc-prim }: mkDerivation { @@ -156021,8 +156184,8 @@ self: { }: mkDerivation { pname = "push-notify-apn"; - version = "0.1.0.2"; - sha256 = "0cziiry6zlaaap6njrqbhpd20ycp97ychk2cy3xkf5c36lzl7kv3"; + version = "0.1.0.4"; + sha256 = "1mrlr7x6njb1n21185wn81fybyg89c4jyph8sabf20gg7qng893s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -160343,8 +160506,8 @@ self: { }: mkDerivation { pname = "recursion-schemes-ext"; - version = "0.2.0.0"; - sha256 = "0h74109rwybpg6wardmrzh3163868mi025a8wq5dbpcx284zv1w1"; + version = "0.2.0.1"; + sha256 = "0lnqc4w4lpavs4d6jzdszl35g4qjksgfrqfqsyhv4a8w3w79xnz9"; libraryHaskellDepends = [ base composition-prelude deepseq recursion-schemes template-haskell ]; @@ -163707,6 +163870,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "restless-git" = callPackage + ({ mkDerivation, base, bytestring, containers, HSH, tasty + , tasty-hunit, temporary, text, time + }: + mkDerivation { + pname = "restless-git"; + version = "0.5.0"; + sha256 = "0rz3aqrlsyld6slxq9lbpf3ydngpkka6ksr4qbl9qq6f42hb0pwi"; + libraryHaskellDepends = [ + base bytestring containers HSH text time + ]; + testHaskellDepends = [ + base bytestring containers tasty tasty-hunit temporary text + ]; + homepage = "https://github.com/lessrest/restless-git"; + description = "Easy Git repository serialization"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "restricted-workers" = callPackage ({ mkDerivation, async, base, bytestring, cereal, data-default , directory, either, filepath, monad-control, mtl, network, selinux @@ -166004,8 +166186,8 @@ self: { ({ mkDerivation, base, mtl, transformers }: mkDerivation { pname = "safe-access"; - version = "0.3.2.1"; - sha256 = "1xfivmd1ski2lbjkp5mxd5qjscjjw1bzxwd5s9hwvqlqsgdhya9b"; + version = "0.3.3.0"; + sha256 = "0j3k6nlp3qch9kxv2zh5lfx1cfqy4w0xc7pbivqkn38drdjd920z"; libraryHaskellDepends = [ base mtl transformers ]; homepage = "http://darcs.redspline.com/safe-access"; description = "A simple environment to control access to data"; @@ -166272,28 +166454,6 @@ self: { }) {}; "safeio" = callPackage - ({ mkDerivation, base, bytestring, conduit, conduit-combinators - , directory, filepath, HUnit, resourcet, test-framework - , test-framework-hunit, test-framework-th, unix - }: - mkDerivation { - pname = "safeio"; - version = "0.0.3.0"; - sha256 = "0rknn8rlxyj32a0vrx0wjfma9w0zhs3vg1jyksn71drxch7jvwqs"; - libraryHaskellDepends = [ - base bytestring conduit conduit-combinators directory filepath - resourcet unix - ]; - testHaskellDepends = [ - base bytestring conduit conduit-combinators directory filepath - HUnit resourcet test-framework test-framework-hunit - test-framework-th unix - ]; - description = "Write output to disk atomically"; - license = stdenv.lib.licenses.mit; - }) {}; - - "safeio_0_0_4_0" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-combinators , directory, filepath, HUnit, resourcet, test-framework , test-framework-hunit, test-framework-th, unix @@ -166313,7 +166473,6 @@ self: { ]; description = "Write output to disk atomically"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "safepath" = callPackage @@ -166457,8 +166616,8 @@ self: { }: mkDerivation { pname = "salve"; - version = "0.0.6"; - sha256 = "1269qhsck9mx5adhzbvyznbfmi2lwrafmf8b750y31cpiziw4mfb"; + version = "0.0.7"; + sha256 = "13qrxn5h0pind32wc7sw9i026g8lw91k71i8prrdzdzc656nhiq5"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest microlens ]; benchmarkHaskellDepends = [ @@ -167130,11 +167289,13 @@ self: { pname = "scalendar"; version = "1.1.0"; sha256 = "077v0k745z1hs8k8yb5s6ln1ing8b5fllp7gw2kcrlrw108ijvwb"; + revision = "5"; + editedCabalFile = "02p4iy6vypz6q0zh5wmy3lp1s9zrcvqn9xx8vczl8000wa0asn7p"; libraryHaskellDepends = [ base containers text time ]; testHaskellDepends = [ base containers hspec QuickCheck text time ]; - homepage = "https://github.com/stackbuilders/scalendar"; + homepage = "https://www.researchgate.net/publication/311582722_Method_of_Managing_Resources_in_a_Telecommunication_Network_or_a_Computing_System"; description = "This is a library for handling calendars and resource availability based on the \"top-nodes algorithm\" and set operations"; license = stdenv.lib.licenses.mit; }) {}; @@ -167948,19 +168109,24 @@ self: { }) {}; "scotty-rest" = callPackage - ({ mkDerivation, base, base-prelude, bytestring, convertible - , data-default-class, hspec, hspec-wai, http-date, http-media - , http-types, mtl, QuickCheck, scotty, string-conversions, text - , time, transformers, wai, wai-extra + ({ mkDerivation, aeson, base, base-prelude, bytestring, convertible + , hspec, hspec-wai, http-date, http-media, http-types, mtl + , QuickCheck, scotty, sqlite-simple, string-conversions, text, time + , transformers, wai, wai-extra }: mkDerivation { pname = "scotty-rest"; - version = "0.1.0.0"; - sha256 = "1z0x7fvs1933cnxj8kr91xqvf5zqil3d0zq2adq2wlf1a2zwa4j0"; + version = "0.2.0.0"; + sha256 = "1pj9xwbppax4s5rhm3kvmmxs41qslm82xz98npj3nb3zb0gbykzc"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - base base-prelude bytestring convertible data-default-class - http-date http-media http-types mtl scotty string-conversions text - time transformers wai wai-extra + base base-prelude bytestring convertible http-date http-media + http-types mtl scotty string-conversions text time transformers wai + wai-extra + ]; + executableHaskellDepends = [ + aeson base mtl scotty sqlite-simple text wai-extra ]; testHaskellDepends = [ base bytestring hspec hspec-wai mtl QuickCheck scotty @@ -168819,8 +168985,8 @@ self: { }: mkDerivation { pname = "selda"; - version = "0.1.10.1"; - sha256 = "1yx8gxi9bha95ss2i1hvbv8vlywxgi3a6rxjig44jz5w2s0zlp5h"; + version = "0.1.11.0"; + sha256 = "1jdy7rf98ycqvrw73f70xnyidq5gjhzbavd2h64ib6v0mpcskdhy"; libraryHaskellDepends = [ base bytestring exceptions hashable mtl psqueues text time unordered-containers @@ -168836,8 +169002,8 @@ self: { }: mkDerivation { pname = "selda-postgresql"; - version = "0.1.6.0"; - sha256 = "0zf77mavhxn64mag6cgf6xch54qknl1yhack5nylf5xlwhpmrgsx"; + version = "0.1.7.0"; + sha256 = "0smx2hvpdxjcw58zchwmzcqz4xr5m1idv5y5rrj20df190r4l3l2"; libraryHaskellDepends = [ base bytestring exceptions postgresql-libpq selda text ]; @@ -169048,8 +169214,8 @@ self: { pname = "semigroupoids"; version = "5.2.1"; sha256 = "006jys6kvckkmbnhf4jc51sh64hamkz464mr8ciiakybrfvixr3r"; - revision = "1"; - editedCabalFile = "1lb59k2hdz9kbhmpw7bzc0n9pb5x3b9ysglp69dn4yf5xxjw03wx"; + revision = "2"; + editedCabalFile = "049j2jl6f5mxqnavi1aadx37j4bk5xksvkxsl43hp4rg7n53p11z"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base base-orphans bifunctors comonad containers contravariant @@ -169364,18 +169530,16 @@ self: { }) {}; "separated" = callPackage - ({ mkDerivation, base, bifunctors, directory, doctest, filepath - , lens, parsec, QuickCheck, semigroupoids, semigroups - , template-haskell + ({ mkDerivation, base, bifunctors, deriving-compat, directory + , doctest, filepath, lens, parsec, QuickCheck, semigroupoids + , semigroups, template-haskell }: mkDerivation { pname = "separated"; - version = "0.2.3"; - sha256 = "0lxl7i0j27nn43a6p7ayxd1rr48h31zj0bviw0nd49fsd9l5c0iq"; - revision = "1"; - editedCabalFile = "0k1z3a9yr9aq7cnm7kfk5yiclhq95nqlgnzzz5ksj010qmnsb6zj"; + version = "0.3.0"; + sha256 = "1ivgx1iaqs4k4zj4n0l92090zvx9x46j6kp56zf60b1bn9s3fcs0"; libraryHaskellDepends = [ - base bifunctors lens semigroupoids semigroups + base bifunctors deriving-compat lens semigroupoids semigroups ]; testHaskellDepends = [ base directory doctest filepath parsec QuickCheck template-haskell @@ -174946,7 +175110,7 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "skylighting_0_3_3_1" = callPackage + "skylighting_0_3_4_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, binary, blaze-html , bytestring, case-insensitive, containers, criterion, Diff , directory, filepath, HUnit, hxt, mtl, pretty-show, random @@ -174955,8 +175119,8 @@ self: { }: mkDerivation { pname = "skylighting"; - version = "0.3.3.1"; - sha256 = "0msx7hwnfcqmq0rkn27lr3y6iybghfnm9p5bybzkmqfhlh8gkqgk"; + version = "0.3.4.1"; + sha256 = "09hw6dqsk859gwkn4p5gh3n75lxix76a6kwyzzdml9yqr973jgbz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -175901,41 +176065,6 @@ self: { }) {}; "snap-core" = 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.0"; - sha256 = "0vkla7rfrwyhk31nign8ccjfhp7f0nqjhmg6hb7rq7ggblgwgnr4"; - 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; - }) {}; - - "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 @@ -175968,7 +176097,6 @@ self: { 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 @@ -176148,54 +176276,6 @@ self: { }) {}; "snap-server" = 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.0"; - sha256 = "1lvwfrirf6gq6nr6ias0i0xynq62s9myrj4203wdwq0y4c40nhqc"; - 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; - }) {}; - - "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 @@ -176241,7 +176321,6 @@ self: { 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 @@ -180285,14 +180364,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stackage-curator_0_15_0_0" = callPackage + "stackage-curator_0_15_1_0" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, async - , base, base16-bytestring, blaze-html, byteable, bytestring, Cabal - , classy-prelude-conduit, conduit, conduit-extra, containers - , cryptohash, cryptohash-conduit, data-default-class, directory - , exceptions, filepath, hashable, hspec, html-conduit, http-client - , http-client-tls, http-conduit, lucid, mime-types, monad-unlift - , monad-unlift-ref, mono-traversable, mtl, old-locale + , base, blaze-html, bytestring, Cabal, classy-prelude-conduit + , conduit, conduit-extra, containers, cryptonite + , cryptonite-conduit, data-default-class, directory, exceptions + , filepath, hashable, hspec, html-conduit, http-client + , http-client-tls, http-conduit, lucid, memory, mime-types + , monad-unlift, monad-unlift-ref, mono-traversable, mtl, old-locale , optparse-applicative, optparse-simple, process, QuickCheck , resourcet, safe, semigroups, stm, store, streaming-commons, syb , system-fileio, system-filepath, tar, temporary, text, time @@ -180301,21 +180380,21 @@ self: { }: mkDerivation { pname = "stackage-curator"; - version = "0.15.0.0"; - sha256 = "0z84ywxh4zb996b0ir8hjl9pwdcb0ds0pgq6i8sfxmj5nrw5yjn5"; + version = "0.15.1.0"; + sha256 = "158bxk5g1bc139nmdqvr4fid5igmsgqa1d4nxy0dpl8xb68l69jp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson amazonka amazonka-core amazonka-s3 async base - base16-bytestring blaze-html byteable bytestring Cabal - classy-prelude-conduit conduit conduit-extra containers cryptohash - cryptohash-conduit data-default-class directory exceptions filepath - hashable html-conduit http-client http-client-tls http-conduit - lucid mime-types monad-unlift monad-unlift-ref mono-traversable mtl - old-locale process resourcet safe semigroups stm store - streaming-commons syb system-fileio system-filepath tar temporary - text time transformers unix-compat unordered-containers utf8-string - vector xml-conduit xml-types yaml zlib + aeson amazonka amazonka-core amazonka-s3 async base blaze-html + bytestring Cabal classy-prelude-conduit conduit conduit-extra + containers cryptonite cryptonite-conduit data-default-class + directory exceptions filepath hashable html-conduit http-client + http-client-tls http-conduit lucid memory mime-types monad-unlift + monad-unlift-ref mono-traversable mtl old-locale process resourcet + safe semigroups stm store streaming-commons syb system-fileio + system-filepath tar temporary text time transformers unix-compat + unordered-containers utf8-string vector xml-conduit xml-types yaml + zlib ]; executableHaskellDepends = [ aeson base http-client http-client-tls optparse-applicative @@ -182880,6 +182959,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "string-transform" = callPackage + ({ mkDerivation, base, bytestring, tasty, tasty-hunit + , tasty-smallcheck, text, utf8-string + }: + mkDerivation { + pname = "string-transform"; + version = "0.0.1"; + sha256 = "1hm360yyh700wwjaf5xlmnla8i8vcm3vk4isgs29yavkq81pwm7x"; + libraryHaskellDepends = [ base bytestring text utf8-string ]; + testHaskellDepends = [ + base bytestring tasty tasty-hunit tasty-smallcheck text utf8-string + ]; + homepage = "https://github.com/ncaq/string-transform#readme"; + description = "simple and easy haskell string transform"; + license = stdenv.lib.licenses.mit; + }) {}; + "string-typelits" = callPackage ({ mkDerivation, base, template-haskell, type-combinators , type-combinators-quote @@ -184213,20 +184309,20 @@ self: { "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 + , http-client-tls, http-media, http-types, iso8601-time, microlens , 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"; + version = "0.0.1.1"; + sha256 = "1zpxs97lrpv4ailn6mqdx6ihbzilcsjcycrc8qj1v1f1lg00m9k6"; 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 + iso8601-time microlens monad-logger mtl network random + safe-exceptions text time transformers unordered-containers vector ]; testHaskellDepends = [ aeson base bytestring containers hspec iso8601-time mtl QuickCheck @@ -184242,20 +184338,21 @@ self: { , 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 + , random, scientific, swagger2, syb, text, time + , unordered-containers, vector }: mkDerivation { pname = "swagger-test"; - version = "0.2.4"; - sha256 = "1rm001vwhl648xhb02jr6c72q8klx4wigk9kz2lw9ipkz2pra15a"; + version = "0.2.7"; + sha256 = "04rhgkdg8c4cy6mj5jxykirp4m1f5n3nik4pdmvyjv71q3gdwkjp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ 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 + random scientific swagger2 syb text time unordered-containers + vector ]; executableHaskellDepends = [ aeson async base bytestring directory filepath lens @@ -184277,8 +184374,8 @@ self: { }: mkDerivation { pname = "swagger2"; - version = "2.1.4.1"; - sha256 = "0b4c9m6yvhj2z7krf7r3a4xmbnyiifhcc4ahl5xfkb2wh6g6nfi3"; + version = "2.1.5"; + sha256 = "1sxv03fgafr21824wcz68l4nvazk6j31z74xa7njg7d3mc5w66pw"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson base base-compat bytestring containers generics-sop hashable @@ -184393,22 +184490,20 @@ self: { }) {}; "sws" = callPackage - ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring - , crypto-pubkey, crypto-random, directory, filepath, hourglass - , http-types, network, pem, resourcet, transformers, wai, wai-extra - , wai-middleware-static, warp, warp-tls, x509 + ({ mkDerivation, base, bytestring, cryptonite, directory, filepath + , hourglass, http-types, network, resourcet, transformers, wai + , wai-extra, wai-middleware-static, warp, warp-tls }: mkDerivation { pname = "sws"; - version = "0.3.1.2"; - sha256 = "031495207zswwqg23p8kkv7gnm9lhkipm5b9mdp7ypsh9zgy8sz8"; + version = "0.4.0.0"; + sha256 = "02x2dh8nc1ci9n4mzhvq3wxvq5802mghs3kpqi6vhbglai60cj6g"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - asn1-encoding asn1-types base bytestring crypto-pubkey - crypto-random directory filepath hourglass http-types network pem - resourcet transformers wai wai-extra wai-middleware-static warp - warp-tls x509 + base bytestring cryptonite directory filepath hourglass http-types + network resourcet transformers wai wai-extra wai-middleware-static + warp warp-tls ]; description = "A simple web server for serving directories, similar to weborf"; license = stdenv.lib.licenses.bsd3; @@ -188813,8 +188908,8 @@ self: { }: mkDerivation { pname = "test-framework-th-prime"; - version = "0.0.9"; - sha256 = "1gcrhfazxj75msjdf3zj3cz81ikakpd1xfy0lflnpp0788zf7r3p"; + version = "0.0.10"; + sha256 = "1x3iq4dqbnhb96rfzs7awdk5v2arr3fi3jgkkhnn4vjz43ixygg8"; libraryHaskellDepends = [ base cpphs haskell-src-exts template-haskell test-framework ]; @@ -189159,6 +189254,31 @@ self: { license = "GPL"; }) {}; + "texmath_0_9_4_2" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, filepath + , mtl, network-uri, pandoc-types, parsec, process, split, syb + , temporary, text, utf8-string, xml + }: + mkDerivation { + pname = "texmath"; + version = "0.9.4.2"; + sha256 = "1xx3yp5m0rjs8bi1gb4r0xk0mjh5gm4x2pdsgfmbrisw0pl5x0mv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers mtl pandoc-types parsec syb xml + ]; + executableHaskellDepends = [ network-uri ]; + testHaskellDepends = [ + base bytestring directory filepath process split temporary text + utf8-string xml + ]; + homepage = "http://github.com/jgm/texmath"; + description = "Conversion between formats used to represent mathematics"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "texrunner" = callPackage ({ mkDerivation, attoparsec, base, bytestring, directory, filepath , HUnit, io-streams, lens, mtl, process, temporary, test-framework @@ -190004,8 +190124,8 @@ self: { ({ mkDerivation, base, deepseq, hspec, QuickCheck, text, vector }: mkDerivation { pname = "text-zipper"; - version = "0.10"; - sha256 = "0vhp707irmyqdix4clnjphnly8zyph4brpjb41n05rxlaybn96n5"; + version = "0.10.1"; + sha256 = "0jxicjp0ak1fyl1n3yspxq6hv9l90zzy75glsv8bc2svsn9ypyls"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base deepseq text vector ]; testHaskellDepends = [ base hspec QuickCheck text ]; @@ -190210,21 +190330,6 @@ self: { }) {}; "th-abstraction" = callPackage - ({ mkDerivation, base, containers, ghc-prim, template-haskell }: - mkDerivation { - pname = "th-abstraction"; - version = "0.2.5.0"; - sha256 = "1fxapnbny5gyys24q8v93i6ipcrmsrs2b95i8kz2dpgg8cc95skp"; - 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; - }) {}; - - "th-abstraction_0_2_6_0" = callPackage ({ mkDerivation, base, containers, ghc-prim, template-haskell }: mkDerivation { pname = "th-abstraction"; @@ -190237,7 +190342,6 @@ self: { 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 @@ -190671,6 +190775,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "thank-you-stars" = callPackage + ({ mkDerivation, aeson, base, bytestring, Cabal, containers + , directory, filepath, hackage-db, hspec, req, split, text + }: + mkDerivation { + pname = "thank-you-stars"; + version = "0.1.0"; + sha256 = "1qxi26g81ndrx8vxckb8hkpaqqpbd60r2ck705mhafrv0yd3kry7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring Cabal containers directory filepath + hackage-db req split text + ]; + executableHaskellDepends = [ base containers directory filepath ]; + testHaskellDepends = [ base Cabal containers hackage-db hspec ]; + homepage = "https://github.com/y-taka-23/thank-you-stars#readme"; + description = "Give your dependencies stars on GitHub!"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "themoviedb" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, either , http-client, http-client-tls, http-types, mtl, tasty, tasty-hunit @@ -191278,6 +191403,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "throwable-exceptions_0_1_0_9" = callPackage + ({ mkDerivation, base, doctest, either, safe-exceptions, silently + , tasty, tasty-discover, tasty-hunit, template-haskell, text + }: + mkDerivation { + pname = "throwable-exceptions"; + version = "0.1.0.9"; + sha256 = "1ab9qx87r0wxrvx9fk77cpimj0pm1qa2pvcv4b8sadj0s8fkrcis"; + libraryHaskellDepends = [ base safe-exceptions template-haskell ]; + testHaskellDepends = [ + base doctest either safe-exceptions silently tasty tasty-discover + tasty-hunit text + ]; + homepage = "https://github.com/aiya000/hs-throwable-exceptions#README.md"; + description = "throwable-exceptions gives the easy way to throw exceptions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "thumbnail" = callPackage ({ mkDerivation, base, bytestring, gd }: mkDerivation { @@ -195320,8 +195464,8 @@ self: { }: mkDerivation { pname = "tweet-hs"; - version = "1.0.1.3"; - sha256 = "0xxyb2czffd46hwiv1wqqhhh5km8z9k0jqv5j64f68zmxfra5x04"; + version = "1.0.1.7"; + sha256 = "026hmzrc80mc2jpvd0cnxa6kj4lfirh7ygdh1xaw51svrql8320j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -196345,14 +196489,14 @@ self: { }) {}; "type-of-html" = callPackage - ({ mkDerivation, base, blaze-html, bytestring, criterion, hspec - , QuickCheck, text + ({ mkDerivation, base, blaze-html, bytestring, criterion, ghc-prim + , hspec, QuickCheck, text }: mkDerivation { pname = "type-of-html"; - version = "0.3.0.0"; - sha256 = "1cj0q9h7dda8zmn8lnvm0scn97cfwxihvj31x28nzfywgbhimhv6"; - libraryHaskellDepends = [ base bytestring text ]; + version = "0.5.1.0"; + sha256 = "01j4kk5c8qiqcgnymx26csj38aa76zg3vl8nwiwxcjbfng87xvmk"; + libraryHaskellDepends = [ base bytestring ghc-prim text ]; testHaskellDepends = [ base hspec QuickCheck text ]; benchmarkHaskellDepends = [ base blaze-html bytestring criterion text @@ -196563,28 +196707,6 @@ self: { }) {}; "typed-process" = callPackage - ({ mkDerivation, async, base, base64-bytestring, bytestring - , conduit, conduit-extra, exceptions, hspec, http-conduit, process - , stm, temporary, transformers - }: - mkDerivation { - pname = "typed-process"; - version = "0.1.0.1"; - sha256 = "05pwpis2vm63qxg8kkqd52whbgkgf5k5sy0w1z1am7jsm6fiychc"; - libraryHaskellDepends = [ - async base bytestring conduit conduit-extra exceptions process stm - transformers - ]; - testHaskellDepends = [ - async base base64-bytestring bytestring conduit conduit-extra hspec - http-conduit temporary - ]; - homepage = "https://haskell-lang.org/library/typed-process"; - description = "Run external processes, with strong typing of streams"; - license = stdenv.lib.licenses.mit; - }) {}; - - "typed-process_0_1_1" = callPackage ({ mkDerivation, async, base, base64-bytestring, bytestring , conduit, conduit-extra, exceptions, hspec, http-conduit, process , stm, temporary, transformers @@ -196604,7 +196726,6 @@ self: { homepage = "https://haskell-lang.org/library/typed-process"; description = "Run external processes, with strong typing of streams"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "typed-spreadsheet" = callPackage @@ -200007,8 +200128,8 @@ self: { }: mkDerivation { pname = "uuid-orphans"; - version = "1.4.1"; - sha256 = "19hxgi6rn5pg51jd8v64b96a2j0vh016xcbja8vdhkbdpiizyq9j"; + version = "1.4.2"; + sha256 = "1rsaskv8xhj773abijsq3xi3maa0ixw1k2qywcmw4bdm25pyxsr2"; libraryHaskellDepends = [ base safecopy text th-lift uuid-types web-routes ]; @@ -200318,26 +200439,6 @@ self: { }) {}; "validation" = callPackage - ({ mkDerivation, base, bifunctors, directory, doctest, filepath - , lens, mtl, QuickCheck, semigroupoids, semigroups - , template-haskell, transformers - }: - mkDerivation { - pname = "validation"; - version = "0.5.4"; - sha256 = "18vliywmqj3kwlrc4dcp2z3skwqb86crf0rmphpmna1mkrfmyy4b"; - libraryHaskellDepends = [ - base bifunctors lens mtl semigroupoids semigroups transformers - ]; - testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell - ]; - homepage = "https://github.com/NICTA/validation"; - description = "A data-type like Either but with an accumulating Applicative"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "validation_0_5_5" = callPackage ({ mkDerivation, base, bifunctors, directory, doctest, filepath , lens, mtl, QuickCheck, semigroupoids, semigroups , template-haskell, transformers @@ -200355,7 +200456,6 @@ self: { homepage = "https://github.com/qfpl/validation"; description = "A data-type like Either but with an accumulating Applicative"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "validations" = callPackage @@ -202050,19 +202150,20 @@ self: { }) {}; "vivid" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, filepath + ({ mkDerivation, base, bytestring, containers, directory, filepath , hashable, MonadRandom, mtl, network, process, random - , random-shuffle, split, stm, time, transformers + , random-shuffle, split, stm, time, transformers, utf8-string + , vivid-osc, vivid-supercollider }: mkDerivation { pname = "vivid"; - version = "0.2.0.5"; - sha256 = "0wxkv8vygxd8waab0f87p2q8ya20lnjh7b77yih4r3znf092fmpx"; + version = "0.3.0.2"; + sha256 = "16dvg5yq26fkrq01mn3c4byz32xld3alxa8h9m16gi4g04f99q00"; libraryHaskellDepends = [ - base binary bytestring containers filepath hashable MonadRandom mtl - network process random random-shuffle split stm time transformers + base bytestring containers directory filepath hashable MonadRandom + mtl network process random random-shuffle split stm time + transformers utf8-string vivid-osc vivid-supercollider ]; - homepage = "http://vivid-synth.com"; description = "Sound synthesis with SuperCollider"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; @@ -202813,22 +202914,6 @@ self: { }) {inherit (pkgs) fcgi;}; "wai-handler-launch" = callPackage - ({ mkDerivation, async, base, blaze-builder, bytestring, http-types - , process, streaming-commons, transformers, wai, warp - }: - mkDerivation { - pname = "wai-handler-launch"; - version = "3.0.2.2"; - sha256 = "021923x32sgig40sng5mffzkv5ay9asbxpzkik9bpg1yagdc954w"; - 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; - }) {}; - - "wai-handler-launch_3_0_2_3" = callPackage ({ mkDerivation, async, base, blaze-builder, bytestring, http-types , process, streaming-commons, transformers, wai, warp }: @@ -202842,7 +202927,6 @@ self: { ]; description = "Launch a web app in the default browser"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-handler-scgi" = callPackage @@ -206863,8 +206947,8 @@ self: { }: mkDerivation { pname = "wrecker"; - version = "1.0.0.2"; - sha256 = "0ydmwxixgxryiq4nf4lxds30zmx4hhhm1w6fyk4h1hva01vrybr8"; + version = "1.2.2.0"; + sha256 = "03iw04jg3lmar97l9mhgd5kabfjps1dh84s7r5p9cbc6rsy5knsh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -206879,9 +206963,8 @@ self: { unordered-containers vector vty wreq ]; executableHaskellDepends = [ - aeson aeson-qq base bytestring connection http-client - http-client-tls immortal lens markdown-unlit network next-ref - optparse-applicative scotty text transformers wai warp wreq + base http-client http-client-tls lens markdown-unlit + optparse-applicative wreq ]; testHaskellDepends = [ aeson aeson-qq base bytestring connection hspec hspec-discover @@ -206894,6 +206977,38 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "wrecker-ui" = callPackage + ({ mkDerivation, aeson, async, base, binary, bytestring, containers + , directory, distributed-process, distributed-process-async + , distributed-process-simplelocalnet, distributed-static, esqueleto + , HostAndPort, http-types, iso8601-time, monad-control + , monad-logger, mtl, network-transport, network-transport-tcp + , persistent, persistent-postgresql, persistent-sqlite + , persistent-template, postgresql-simple, postgresql-simple-url + , process, resource-pool, resourcet, scotty, stm, temporary, text + , time, transformers, wai-cors + }: + mkDerivation { + pname = "wrecker-ui"; + version = "2.3.0.2"; + sha256 = "0bfpcc464fgcgzp5h20d2q7p79z3mkxi6c0i3cc4mmzspgvnsjk3"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + executableHaskellDepends = [ + aeson async base binary bytestring containers directory + distributed-process distributed-process-async + distributed-process-simplelocalnet distributed-static esqueleto + HostAndPort http-types iso8601-time monad-control monad-logger mtl + network-transport network-transport-tcp persistent + persistent-postgresql persistent-sqlite persistent-template + postgresql-simple postgresql-simple-url process resource-pool + resourcet scotty stm temporary text time transformers wai-cors + ]; + description = "A web interface for Wrecker, the HTTP Performance Benchmarker"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "wreq" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec , authenticate-oauth, base, base16-bytestring, base64-bytestring @@ -208382,7 +208497,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "xml-conduit_1_6_0" = callPackage + "xml-conduit_1_7_0" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html , blaze-markup, bytestring, conduit, conduit-extra, containers , data-default-class, deepseq, hspec, HUnit, monad-control @@ -208390,8 +208505,8 @@ self: { }: mkDerivation { pname = "xml-conduit"; - version = "1.6.0"; - sha256 = "042cq7i988jxfwayndzpk2mygfs73709xmzi875imhmar10nv914"; + version = "1.7.0"; + sha256 = "0g0a6h52n6q3w09350d6vgjpvb6xj224isp4lphgwbmd2xr12i76"; libraryHaskellDepends = [ attoparsec base blaze-builder blaze-html blaze-markup bytestring conduit conduit-extra containers data-default-class deepseq @@ -209221,28 +209336,6 @@ self: { }) {}; "xmonad-extras" = callPackage - ({ mkDerivation, alsa-mixer, base, bytestring, containers - , directory, hint, libmpd, mtl, network, old-locale, old-time - , process, random, regex-posix, unix, X11, xmonad, xmonad-contrib - }: - mkDerivation { - pname = "xmonad-extras"; - version = "0.13.0"; - sha256 = "11clsfa5i174i6bfp6mdy06w11jyx2sydrbbczf2s9kg92ysbnqb"; - configureFlags = [ - "-f-with_hlist" "-fwith_parsec" "-fwith_split" - ]; - libraryHaskellDepends = [ - alsa-mixer base bytestring containers directory hint libmpd mtl - network old-locale old-time process random regex-posix unix 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; - }) {}; - - "xmonad-extras_0_13_1" = callPackage ({ mkDerivation, alsa-mixer, base, bytestring, containers, hint , libmpd, mtl, network, regex-posix, X11, xmonad, xmonad-contrib }: @@ -209260,7 +209353,6 @@ self: { 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 @@ -210362,8 +210454,8 @@ self: { }: mkDerivation { pname = "yeshql"; - version = "3.0.1.1"; - sha256 = "07swxkxjdvsgsfz9qanygv1fmp3vzcd18hffyp0m6c7qv4av7zps"; + version = "3.0.1.3"; + sha256 = "04svfqlmhm94ljyhirihhsdqpskvq989y3wwznclbn0isspjcq9p"; libraryHaskellDepends = [ base containers convertible filepath HDBC parsec template-haskell ]; @@ -210477,35 +210569,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.18"; - sha256 = "1cg3wb5d8cy65rmrc0dq086mmfhvvwdyig926pb0nhn2zj2kbzav"; - 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_19" = callPackage ({ mkDerivation, aeson, authenticate, base, base16-bytestring , base64-bytestring, binary, blaze-builder, blaze-html , blaze-markup, byteable, bytestring, conduit, conduit-extra @@ -210532,7 +210595,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 @@ -211068,6 +211130,50 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-core_1_4_37" = callPackage + ({ mkDerivation, aeson, async, auto-update, base, blaze-builder + , blaze-html, blaze-markup, byteable, bytestring, case-insensitive + , cereal, clientsession, conduit, conduit-extra, containers, cookie + , criterion, data-default, deepseq, deepseq-generics, directory + , exceptions, fast-logger, hspec, hspec-expectations, http-types + , HUnit, lifted-base, monad-control, monad-logger, mtl, mwc-random + , network, old-locale, parsec, path-pieces, primitive, QuickCheck + , random, resourcet, safe, semigroups, shakespeare + , streaming-commons, template-haskell, text, time, transformers + , transformers-base, unix-compat, unordered-containers, vector, wai + , wai-extra, wai-logger, warp, word8 + }: + mkDerivation { + pname = "yesod-core"; + version = "1.4.37"; + sha256 = "0ww8hl0cx2g58zrdx3j6d5m2xwhssbajdqws1xk6rzl7rpfm1b9j"; + libraryHaskellDepends = [ + aeson auto-update base blaze-builder blaze-html blaze-markup + byteable bytestring case-insensitive cereal clientsession conduit + conduit-extra containers cookie data-default deepseq + deepseq-generics directory exceptions fast-logger http-types + lifted-base monad-control monad-logger mtl mwc-random old-locale + parsec path-pieces primitive random resourcet safe semigroups + shakespeare template-haskell text time transformers + transformers-base unix-compat unordered-containers vector wai + wai-extra wai-logger warp word8 + ]; + testHaskellDepends = [ + async base blaze-builder bytestring clientsession conduit + conduit-extra containers cookie hspec hspec-expectations http-types + HUnit lifted-base mwc-random network path-pieces QuickCheck random + resourcet shakespeare streaming-commons template-haskell text + transformers wai wai-extra + ]; + benchmarkHaskellDepends = [ + base blaze-html bytestring criterion shakespeare text transformers + ]; + homepage = "http://www.yesodweb.com/"; + description = "Creation of type-safe, RESTful web applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-crud" = callPackage ({ mkDerivation, base, classy-prelude, containers, MissingH , monad-control, persistent, random, safe, stm, uuid, yesod-core @@ -211306,30 +211412,6 @@ self: { }) {}; "yesod-form" = callPackage - ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html - , blaze-markup, byteable, bytestring, containers, data-default - , email-validate, hspec, network-uri, persistent, resourcet - , semigroups, shakespeare, template-haskell, text, time - , transformers, wai, xss-sanitize, yesod-core, yesod-persistent - }: - mkDerivation { - pname = "yesod-form"; - version = "1.4.15"; - sha256 = "107ddpngzwzmslrv1cc82fx775icvjpbsgjhinj7cnmpi3paq3w3"; - libraryHaskellDepends = [ - aeson attoparsec base blaze-builder blaze-html blaze-markup - byteable bytestring containers data-default email-validate - network-uri persistent resourcet semigroups shakespeare - template-haskell text time transformers wai xss-sanitize yesod-core - yesod-persistent - ]; - testHaskellDepends = [ base hspec text time ]; - homepage = "http://www.yesodweb.com/"; - description = "Form handling support for Yesod Web Framework"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-form_1_4_16" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html , blaze-markup, byteable, bytestring, containers, data-default , email-validate, hspec, network-uri, persistent, resourcet @@ -211351,7 +211433,6 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Form handling support for Yesod Web Framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-form-bootstrap4" = callPackage @@ -211366,6 +211447,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-form-bootstrap4_0_1_0_2" = callPackage + ({ mkDerivation, base, classy-prelude-yesod, yesod-form }: + mkDerivation { + pname = "yesod-form-bootstrap4"; + version = "0.1.0.2"; + sha256 = "0lsdvs33xsy7ipr44calfhyf375mkq7h3axi39q91f28r76iy6cf"; + libraryHaskellDepends = [ base classy-prelude-yesod yesod-form ]; + homepage = "https://github.com/ncaq/yesod-form-bootstrap4#readme"; + description = "renderBootstrap4"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-form-json" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, text , unordered-containers, yesod-core, yesod-form @@ -211963,6 +212057,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-recaptcha2_0_1_0_1" = callPackage + ({ mkDerivation, base, classy-prelude-yesod, http-conduit + , yesod-auth + }: + mkDerivation { + pname = "yesod-recaptcha2"; + version = "0.1.0.1"; + sha256 = "0avlm1jchp0j65c3f6bj9gv9kba0cvvk77sq918dzjvx54hnygf3"; + libraryHaskellDepends = [ + base classy-prelude-yesod http-conduit yesod-auth + ]; + homepage = "https://github.com/ncaq/yesod-recaptcha2#readme"; + description = "yesod recaptcha2"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-routes" = callPackage ({ mkDerivation, base, bytestring, containers, hspec, HUnit , path-pieces, template-haskell, text, vector @@ -212513,41 +212624,40 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-core_0_15_0" = callPackage + "yi-core_0_16_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 + , tasty-quickcheck, text, time, transformers-base, unix , unix-compat, unordered-containers, xdg-basedir, yi-language , yi-rope }: mkDerivation { pname = "yi-core"; - version = "0.15.0"; - sha256 = "1lfxqi7z2jhvg6mzh31nighgcq1zp4w2ibggqlq02wbliwvbvbsf"; + version = "0.16.0"; + sha256 = "0r7hbwlc0l45mb5qd949vn0h34kg5aqj7ic9shifz23cxlapkssj"; 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 + process process-extras split text 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 + tasty-quickcheck text 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 + parsec pointedlist process process-extras split text time transformers-base unix unix-compat unordered-containers xdg-basedir yi-language yi-rope ]; @@ -212558,16 +212668,16 @@ self: { }) {}; "yi-dynamic-configuration" = callPackage - ({ mkDerivation, base, dyre, microlens-platform, mtl, text - , transformers-base, yi-core, yi-rope + ({ mkDerivation, base, data-default, dyre, microlens-platform, mtl + , text, transformers-base, yi-core, yi-rope }: mkDerivation { pname = "yi-dynamic-configuration"; - version = "0.15.0"; - sha256 = "0dh8vvmczdlcby9ybp89r59mhi1p7ywrvrh36y0nz6zmfckx3ylh"; + version = "0.16.0"; + sha256 = "1y439lsrf6akq1db6gkxm44pq83672jbnyg2hcw2s8b0rlr873vz"; libraryHaskellDepends = [ - base dyre microlens-platform mtl text transformers-base yi-core - yi-rope + base data-default dyre microlens-platform mtl text + transformers-base yi-core yi-rope ]; homepage = "https://github.com/yi-editor/yi#readme"; description = "Dynamic configuration support for Yi"; @@ -212594,8 +212704,8 @@ self: { }: mkDerivation { pname = "yi-frontend-pango"; - version = "0.15.0"; - sha256 = "02wfcpsamqq5qxdzmbg98h4qji9dfsvk3v4rq1r9lxw6v3rcnd8h"; + version = "0.16.0"; + sha256 = "0dbmkh72rrnmcxs8ixgpzvj6bra0nzrgiwnjz19rlpsgzvw5vfhh"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers filepath glib gtk microlens-platform mtl @@ -212625,15 +212735,15 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-frontend-vty_0_15_0" = callPackage + "yi-frontend-vty_0_16_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"; + version = "0.16.0"; + sha256 = "00rmwcm1431rffhq1rif0k0g43wnzdfhw1zhacl4f2n5v2gxkjsq"; libraryHaskellDepends = [ base containers data-default dlist microlens-platform pointedlist stm text vty yi-core yi-language yi-rope @@ -212662,15 +212772,15 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-fuzzy-open_0_15_0" = callPackage + "yi-fuzzy-open_0_16_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"; + version = "0.16.0"; + sha256 = "0z59g33rgdpg090sj6ilkwxvcg9r3my0v8wd49vvn72livf3v88k"; libraryHaskellDepends = [ base binary containers data-default directory filepath mtl text transformers-base vector yi-core yi-language yi-rope @@ -212710,14 +212820,14 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-ireader_0_15_0" = callPackage + "yi-ireader_0_16_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"; + version = "0.16.0"; + sha256 = "1wmkji3sz7hnik7cy25r8wbc7y2x938gy8fyy4cadgrpbpndb58a"; libraryHaskellDepends = [ base binary bytestring containers data-default microlens-platform text yi-core yi-language yi-rope @@ -212744,14 +212854,14 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-keymap-cua_0_15_0" = callPackage + "yi-keymap-cua_0_16_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"; + version = "0.16.0"; + sha256 = "082f3jhbas2ww4jmq53gqr7ssl8c0cd5gz2avvhqzvfsfxk1qiay"; libraryHaskellDepends = [ base microlens-platform text yi-core yi-keymap-emacs yi-rope ]; @@ -212780,15 +212890,15 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-keymap-emacs_0_15_0" = callPackage + "yi-keymap-emacs_0_16_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"; + version = "0.16.0"; + sha256 = "0l0xvkb0y3kp0bkvarl6kdvvj4rn5pm70z1g1yavk1krs41xxz6j"; libraryHaskellDepends = [ base containers filepath Hclip microlens-platform mtl oo-prototypes text transformers-base yi-core yi-language yi-misc-modes yi-rope @@ -212828,7 +212938,7 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-keymap-vim_0_15_0" = callPackage + "yi-keymap-vim_0_16_0" = callPackage ({ mkDerivation, attoparsec, base, binary, containers, data-default , directory, filepath, Hclip, microlens-platform, mtl , oo-prototypes, pointedlist, QuickCheck, safe, tasty, tasty-hunit @@ -212837,8 +212947,8 @@ self: { }: mkDerivation { pname = "yi-keymap-vim"; - version = "0.15.0"; - sha256 = "0jd4ssf97zq6rzsdlxj0framwzdkf5ggnzkafk7wvd9abikihmld"; + version = "0.16.0"; + sha256 = "1fvl4frjikkdp561zai6z35r8r7f4fq2izlcxl1k1rvsvxz3cbi2"; enableSeparateDataOutput = true; libraryHaskellDepends = [ attoparsec base binary containers data-default directory filepath @@ -212885,7 +212995,7 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-language_0_15_0" = callPackage + "yi-language_0_16_0" = callPackage ({ mkDerivation, alex, array, base, binary, containers , data-default, hashable, microlens-platform, oo-prototypes , pointedlist, regex-base, regex-tdfa, tasty, tasty-hspec @@ -212894,8 +213004,8 @@ self: { }: mkDerivation { pname = "yi-language"; - version = "0.15.0"; - sha256 = "0skp7n9l4qg665krs6fv7kxmrq7jrbrqv1lppcqff5bak1dk5vxb"; + version = "0.16.0"; + sha256 = "0wq4m665xcy7256iapjwggc3ylrg9y1k1vhvjn5a8716nn23mnr5"; libraryHaskellDepends = [ array base binary containers data-default hashable microlens-platform oo-prototypes pointedlist regex-base regex-tdfa @@ -212933,14 +213043,14 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-misc-modes_0_15_0" = callPackage + "yi-misc-modes_0_16_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"; + version = "0.16.0"; + sha256 = "1vsdfwpqmpmdiaxh30hshxwlpqmkxzih13ic0hnbsx27amd3mv59"; libraryHaskellDepends = [ array base binary data-default filepath microlens-platform text yi-core yi-language yi-rope @@ -212970,14 +213080,14 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-mode-haskell_0_15_0" = callPackage + "yi-mode-haskell_0_16_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"; + version = "0.16.0"; + sha256 = "0h4796zdcwrj6zkmxcvdjpmwb1rw0zgwzzgsdsch455j770y4dyy"; libraryHaskellDepends = [ array base binary data-default filepath microlens-platform text yi-core yi-language yi-rope @@ -213008,15 +213118,15 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-mode-javascript_0_15_0" = callPackage + "yi-mode-javascript_0_16_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"; + version = "0.16.0"; + sha256 = "09xp4a1w4m6spnzm943zkivaxicipmzs07qn9xqrfvcwavy56kha"; libraryHaskellDepends = [ array base binary data-default dlist filepath microlens-platform mtl text yi-core yi-language yi-rope @@ -213062,6 +213172,26 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "yi-rope_0_10" = callPackage + ({ mkDerivation, base, binary, bytestring, criterion, deepseq + , fingertree, hspec, QuickCheck, quickcheck-instances, text + }: + mkDerivation { + pname = "yi-rope"; + version = "0.10"; + sha256 = "0lkaca2nnivzd6dbrawdkfydm9rd06bm0j0kbl1nhh53ghdp4cs9"; + libraryHaskellDepends = [ + base binary bytestring deepseq fingertree text + ]; + testHaskellDepends = [ + base hspec QuickCheck quickcheck-instances text + ]; + benchmarkHaskellDepends = [ base criterion deepseq text ]; + description = "A rope data structure used by Yi"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yi-snippet" = callPackage ({ mkDerivation, base, binary, containers, data-default, free , microlens-platform, mtl, tasty-hunit, tasty-th, text, vector @@ -213083,15 +213213,15 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-snippet_0_15_0" = callPackage + "yi-snippet_0_16_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"; + version = "0.16.0"; + sha256 = "0n9m2n8k4k79hi661gpjdz0yca1jhxmbjdkxgzg7gnvwiikmfawh"; libraryHaskellDepends = [ base binary containers data-default free microlens-platform mtl text vector yi-core yi-rope From 88630c94ae94c2b3674a402342c52e6131b14824 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 14 Sep 2017 09:37:52 +0200 Subject: [PATCH 084/172] haskell: fix evaluation error in configuration-ghc-8.2.x.nix --- pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix index 4153e96e74af..39b2ff9d67c3 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix @@ -88,6 +88,6 @@ self: super: { path-io = super.path-io_1_3_3; trifecta = super.trifecta_1_7_1_1; aeson-compat = dontCheck super.aeson-compat_0_3_7_1; # test suite needs QuickCheck 2.10.* - binary-orphans = dontCheck super.binary-orphans_0_1_7_0; # test suite needs QuickCheck 2.10.* + binary-orphans = dontCheck super.binary-orphans_0_1_8_0; # test suite needs QuickCheck 2.10.* } From 62079ef824f6f8673877203d89892a10c6acdd86 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 14 Sep 2017 09:48:10 +0200 Subject: [PATCH 085/172] haskell-pandoc: new versions compile with Cabal 2.x out of the box --- .../haskell-modules/configuration-ghc-8.2.x.nix | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix index 39b2ff9d67c3..c44edf6b02a3 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix @@ -71,18 +71,6 @@ self: super: { # https://github.com/aristidb/aws/issues/238 aws = doJailbreak super.aws; - # https://github.com/jgm/pandoc/issues/3876 - pandoc = let fixSetup = pkgs.fetchpatch { - url = "https://github.com/jgm/pandoc/pull/3899.patch"; - sha256 = "0lk9vs2l1wc1kr0y8fkdcarfi4sjd3dl81r52n39r25xx9kqawv7"; - }; - in overrideCabal super.pandoc (drv: { - editedCabalFile = null; - patches = drv.patches or [] ++ [fixSetup]; - setupHaskellDepends = drv.setupHaskellDepends or [self.Cabal_1_24_2_0]; - preCompileBuildDriver = "setupCompileFlags+=' -package=Cabal-1.24.2.0'"; - }); - # LTS-9 versions do not compile. path = dontCheck super.path; path-io = super.path-io_1_3_3; From 49446109035a8e041dcd57759af3226ab9b0337d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 14 Sep 2017 14:53:47 +0200 Subject: [PATCH 086/172] haskell-cryptol: override happy to older version to fix the build --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index abff9dfee4dc..77c94f9f2502 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -929,6 +929,9 @@ self: super: { # https://hydra.nixos.org/build/60678124 Agda = markBroken (super.Agda.override { happy = self.happy_1_19_5; }); + # cryptol-2.5.0 doesn't want happy 1.19.6+. + cryptol = super.cryptol.override { happy = self.happy_1_19_5; }; + # https://github.com/jtdaugherty/text-zipper/issues/11 text-zipper = dontCheck super.text-zipper; From 5b91f125aa58fb0243c8e7a5f9f8c06254490f16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Thu, 14 Sep 2017 14:32:08 +0200 Subject: [PATCH 087/172] mailnag: 1.1.0 -> 1.2.1 --- .../networking/mailreaders/mailnag/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix index 7720fd69eebd..6b8cf89fc75b 100644 --- a/pkgs/applications/networking/mailreaders/mailnag/default.nix +++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix @@ -5,11 +5,11 @@ python2Packages.buildPythonApplication rec { name = "mailnag-${version}"; - version = "1.1.0"; + version = "1.2.1"; src = fetchurl { url = "https://github.com/pulb/mailnag/archive/v${version}.tar.gz"; - sha256 = "0li4kvxjmbz3nqg6bysgn2wdazqrd7gm9fym3rd7148aiqqwa91r"; + sha256 = "ec7ac027d93bc7d88fc270858f5a181453a6ff07f43cab20563d185818801fee"; }; buildInputs = [ @@ -30,6 +30,12 @@ python2Packages.buildPythonApplication rec { done ''; + buildPhase = ""; + + installPhase = "python2 setup.py install --prefix=$out"; + + doCheck = false; + meta = with stdenv.lib; { description = "An extensible mail notification daemon"; homepage = https://github.com/pulb/mailnag; From 3b94239c8acfb97b01978f63932fb628ec5aaa0a Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 14 Sep 2017 06:11:24 -0500 Subject: [PATCH 088/172] kdeFrameworks: 5.37 -> 5.38.1 This reverts commit e468ef511945c4db32226e0194d449414db3525a. KDE Frameworks is updated to 5.38.1, bypassing a serious bug in 5.38.0. --- .../libraries/kde-frameworks/fetch.sh | 2 +- .../libraries/kde-frameworks/ktexteditor.nix | 4 +- .../libraries/kde-frameworks/srcs.nix | 600 +++++++++--------- 3 files changed, 303 insertions(+), 303 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index a0fe6a17e8d8..9f212c422f4f 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.37/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.38/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix index ae4d3a71d535..9e88c0a99fc6 100644 --- a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix +++ b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix @@ -2,7 +2,7 @@ mkDerivation, lib, copyPathsToStore, extra-cmake-modules, perl, karchive, kconfig, kguiaddons, ki18n, kiconthemes, kio, kparts, libgit2, - qtscript, qtxmlpatterns, sonnet, syntax-highlighting + qtscript, qtxmlpatterns, sonnet, syntax-highlighting, qtquickcontrols }: mkDerivation { @@ -11,7 +11,7 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules perl ]; buildInputs = [ karchive kconfig kguiaddons ki18n kiconthemes kio libgit2 qtscript - qtxmlpatterns sonnet syntax-highlighting + qtxmlpatterns sonnet syntax-highlighting qtquickcontrols ]; propagatedBuildInputs = [ kparts ]; } diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 090478ad04d0..0672e48aba23 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -3,603 +3,603 @@ { attica = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/attica-5.37.0.tar.xz"; - sha256 = "13jqk4w9crh8pca6n9334l1gb8bmwf86pa36k0mfh5j19dq72g2p"; - name = "attica-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/attica-5.38.0.tar.xz"; + sha256 = "12smdcd7lcyjqiw0bsk3lwivrl6cvmiqv5cqaw0gz8flhvk29w96"; + name = "attica-5.38.0.tar.xz"; }; }; baloo = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/baloo-5.37.0.tar.xz"; - sha256 = "19sl07lhjrri40vfi8wl6azgmg08lgfb98xx110j6spjbbbnww79"; - name = "baloo-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/baloo-5.38.0.tar.xz"; + sha256 = "14522akyxg36lclfblp65xai95i9hiydqjhkmfkadjbq82wm9s9i"; + name = "baloo-5.38.0.tar.xz"; }; }; bluez-qt = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/bluez-qt-5.37.0.tar.xz"; - sha256 = "1x6nj7vsn0sp9rckzkcbl6fwm7qzj5w98w2qys1fndb1spl7av8s"; - name = "bluez-qt-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/bluez-qt-5.38.0.tar.xz"; + sha256 = "0hanmygp4smbvczxn4dj997z3bln32p017z0r26z89m2p0b2ylwv"; + name = "bluez-qt-5.38.0.tar.xz"; }; }; breeze-icons = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/breeze-icons-5.37.0.tar.xz"; - sha256 = "17nr2phd0nxyx49igvl170ksikapgc4365z26pw0dmmw41llcbxw"; - name = "breeze-icons-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/breeze-icons-5.38.0.tar.xz"; + sha256 = "09afi6c4h31ycs6aa85lqbmn392zi532zf8fp7ll43xxjv9isac9"; + name = "breeze-icons-5.38.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/extra-cmake-modules-5.37.0.tar.xz"; - sha256 = "1jr7nmhh4kyz1g454qkldfhimfjvvylqa19zna5iak08bkq8q696"; - name = "extra-cmake-modules-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/extra-cmake-modules-5.38.0.tar.xz"; + sha256 = "0ci3vdzdbcrbnxpqvf4hcwcrzz1ijhifp8b99wh3k53rinnai231"; + name = "extra-cmake-modules-5.38.0.tar.xz"; }; }; frameworkintegration = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/frameworkintegration-5.37.0.tar.xz"; - sha256 = "0pcy3hjqbahbx65yxz5bl0h2ah4y3fb7mq3pj1rrp2cpp92s135a"; - name = "frameworkintegration-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/frameworkintegration-5.38.0.tar.xz"; + sha256 = "0w1n3czgsnnmaqwypy3mpci8s4ppv9030zxw7ka7rsvwgkpqijq8"; + name = "frameworkintegration-5.38.0.tar.xz"; }; }; kactivities = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/kactivities-5.37.0.tar.xz"; - sha256 = "005xvzp10kvwcsl2w6ghcqgqnr2rdvv9w61i4y44y25vcb85g26v"; - name = "kactivities-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/kactivities-5.38.0.tar.xz"; + sha256 = "0grm0cilc80g5ih2hqhwgwm35mlfnrs343j6ixkd9s0mflv2b798"; + name = "kactivities-5.38.0.tar.xz"; }; }; kactivities-stats = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/kactivities-stats-5.37.0.tar.xz"; - sha256 = "09zsdzf77palmww7x3dzinl0hxrm4z0q0yc2fmf0d7z6cfl695y2"; - name = "kactivities-stats-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/kactivities-stats-5.38.0.tar.xz"; + sha256 = "0s57iz04n3m4fpqrqflda6vpk4l1mnf0nyz1iyza382fb375afd2"; + name = "kactivities-stats-5.38.0.tar.xz"; }; }; kapidox = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/kapidox-5.37.0.tar.xz"; - sha256 = "1xwkaamifxjghv158rwslndfd9z70rm9ixnp1mmkgw8radwsqg5v"; - name = "kapidox-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/kapidox-5.38.0.tar.xz"; + sha256 = "1j4k75lhqdnsxmgyvblla0627qvgabxivw6limfdb3rdpmqdxj76"; + name = "kapidox-5.38.0.tar.xz"; }; }; karchive = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/karchive-5.37.0.tar.xz"; - sha256 = "1599lql0kcx705313bfvbazr7rayr6vsiwrpiq6iwljzc7lli1im"; - name = "karchive-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/karchive-5.38.0.tar.xz"; + sha256 = "0n5nxd3v9ljjff0r6k4xrvy5hj057b7c7jzcq258harl359d8m4k"; + name = "karchive-5.38.0.tar.xz"; }; }; kauth = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/kauth-5.37.0.tar.xz"; - sha256 = "0ciz28bvbvxlv0iz0cgs31x2m1czkki21ypzqj8rg2ix8jw2p65w"; - name = "kauth-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/kauth-5.38.0.tar.xz"; + sha256 = "12nyfbilz4v4b2i5x191iph3jj4lcpw7z1rh0xrv5y1v7dczk6i7"; + name = "kauth-5.38.0.tar.xz"; }; }; kbookmarks = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/kbookmarks-5.37.0.tar.xz"; - sha256 = "0l6rkj0b7hk2wg6dypj1dkl8pcd1vx89gaiixbhkd3vf7jp46n41"; - name = "kbookmarks-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/kbookmarks-5.38.0.tar.xz"; + sha256 = "0s230mcwmrg0qpz42sg804m96j2xpnwj4bdp0mfv08x3jasqpbrq"; + name = "kbookmarks-5.38.0.tar.xz"; }; }; kcmutils = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/kcmutils-5.37.0.tar.xz"; - sha256 = "1ik1505f16swsmvrv62dacis33f1ccnmkw3zbhb84vbrbqyskvzx"; - name = "kcmutils-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/kcmutils-5.38.0.tar.xz"; + sha256 = "0n6f2xvl5v8fwfxpdl6la1hb01dh4h1pcdrf05nn60v0rqg9f58b"; + name = "kcmutils-5.38.0.tar.xz"; }; }; kcodecs = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/kcodecs-5.37.0.tar.xz"; - sha256 = "0kmk97b5vbnyb3xjxwmg3l47aka8mkf50g4p7wvr096qwplffbva"; - name = "kcodecs-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/kcodecs-5.38.0.tar.xz"; + sha256 = "0cnxhaj5jk7f3j9q4hzphc3nm3vdaqwy9xab5d4nvn1kv8vjv8ii"; + name = "kcodecs-5.38.0.tar.xz"; }; }; kcompletion = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/kcompletion-5.37.0.tar.xz"; - sha256 = "0qhjkqmd1jjy50hlzsdxwgnjwpfdrz3njl5n88h3nzp83yjv1ljz"; - name = "kcompletion-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/kcompletion-5.38.0.tar.xz"; + sha256 = "0f955w67wrk15rdmglrk7k0xc5i6kah12bpb078xhzlyfackg52w"; + name = "kcompletion-5.38.0.tar.xz"; }; }; kconfig = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/kconfig-5.37.0.tar.xz"; - sha256 = "1f0y2gmwy05b17clr7vg1zp18l1z0fd757v02ha7cwd64yznyr5d"; - name = "kconfig-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/kconfig-5.38.0.tar.xz"; + sha256 = "0fi428dsr6qpa9336wcfic6hyix6l2p9s135w00qzdwhdkr4lx3r"; + name = "kconfig-5.38.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/kconfigwidgets-5.37.0.tar.xz"; - sha256 = "001d1nj8q6xpl71rwm15rnvy5ajyxpvknvf4ic7p5pbik3021bs6"; - name = "kconfigwidgets-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/kconfigwidgets-5.38.0.tar.xz"; + sha256 = "0w319d94wxn90dbbdfw5zrn2ddnv9vb7wldkpvvycq7yxrhsfw0x"; + name = "kconfigwidgets-5.38.0.tar.xz"; }; }; kcoreaddons = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/kcoreaddons-5.37.0.tar.xz"; - sha256 = "0a45sz11d7b2d8sbr9z57mv337nbhd94fiqk3issw470n0y46g3y"; - name = "kcoreaddons-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/kcoreaddons-5.38.0.tar.xz"; + sha256 = "1m3mn9fhllwcidzji2l26k5yxzrqkbyjdly04nh3s5rf823dvqwv"; + name = "kcoreaddons-5.38.0.tar.xz"; }; }; kcrash = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/kcrash-5.37.0.tar.xz"; - sha256 = "16k2pwf3s3adgayd9vq7kk8c5gnq9g6wra4psrvs3a3c5k5am5y0"; - name = "kcrash-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/kcrash-5.38.0.tar.xz"; + sha256 = "1a8hvyhwa112wx4ldadlrxpyda6qpial387j07dr1jq1cnzr0p11"; + name = "kcrash-5.38.0.tar.xz"; }; }; kdbusaddons = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/kdbusaddons-5.37.0.tar.xz"; - sha256 = "0745arkp4wnpwyhjq02h7lfac049cmlg5qwhf96i7ss0w54vch4i"; - name = "kdbusaddons-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/kdbusaddons-5.38.0.tar.xz"; + sha256 = "1mw9sl82y2aj7l2xj1skrbxbyv55br60h6f61r4f1mqcaxaqj7qw"; + name = "kdbusaddons-5.38.0.tar.xz"; }; }; kdeclarative = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/kdeclarative-5.37.0.tar.xz"; - sha256 = "1ish46m2dpnpqjnf8g660clcg7ky65w11cbk2m79pwyhqvhxgggj"; - name = "kdeclarative-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/kdeclarative-5.38.0.tar.xz"; + sha256 = "1966sxzhdkzi2lwg5ixhrx0yg10plbvn9lsjgnj9crghaajsnf4b"; + name = "kdeclarative-5.38.0.tar.xz"; }; }; kded = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/kded-5.37.0.tar.xz"; - sha256 = "162s5qx2qb0bi889f8jjvd3ci31azd8iwp25i04vwi0lzglwb8gy"; - name = "kded-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/kded-5.38.0.tar.xz"; + sha256 = "0xsjzj5jx4wsrq5fnbv6raqlr11shz20p2mvypf5wfvq2c1vb5lb"; + name = "kded-5.38.0.tar.xz"; }; }; kdelibs4support = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/portingAids/kdelibs4support-5.37.0.tar.xz"; - sha256 = "1zz100m1sqfmg3ni7023b99qn79jhdd2ryw6534axl5zgn0sglh9"; - name = "kdelibs4support-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/portingAids/kdelibs4support-5.38.0.tar.xz"; + sha256 = "06vlgziy212pwm4z9r8rbfa9ziwx3nkihy9b25m13gbh60baqapp"; + name = "kdelibs4support-5.38.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/kdesignerplugin-5.37.0.tar.xz"; - sha256 = "1197003bqcdpsyn6faasr2nhaadh7ryg92vjpqim78af3vwinsdw"; - name = "kdesignerplugin-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/kdesignerplugin-5.38.0.tar.xz"; + sha256 = "0rivjxgsxvsgk24lnzsqpzqr7m1i1faqnbby3rnkw2059z28l0y6"; + name = "kdesignerplugin-5.38.0.tar.xz"; }; }; kdesu = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/kdesu-5.37.0.tar.xz"; - sha256 = "1qfhkzk6l9rfdyiad8y6k30zlhziz3q2dxvxkmnghxmkg98yhdza"; - name = "kdesu-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/kdesu-5.38.0.tar.xz"; + sha256 = "1c9j2zih7r0jph41kzxnxpri9snphm1k4w4rs1q6zawwz8a5kcr5"; + name = "kdesu-5.38.0.tar.xz"; }; }; kdewebkit = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/kdewebkit-5.37.0.tar.xz"; - sha256 = "1ph3a50wix42hmsbc9jbfxla172aihjx9yzp9rza09j1a7va3hg1"; - name = "kdewebkit-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/kdewebkit-5.38.0.tar.xz"; + sha256 = "1cncbjkgrbrnvwx3izjqh9hqiw9bg6aqaq09f8bdryvr8537b0zf"; + name = "kdewebkit-5.38.0.tar.xz"; }; }; kdnssd = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/kdnssd-5.37.0.tar.xz"; - sha256 = "03rd6znn2qwndn4m3bb03slwyic06ry535rawgyh06lfps0fcc5z"; - name = "kdnssd-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/kdnssd-5.38.0.tar.xz"; + sha256 = "101gygxrq2m3yfz6j0ldspib3pm3jjvqz505j3h15zj59qcwqw0x"; + name = "kdnssd-5.38.0.tar.xz"; }; }; kdoctools = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/kdoctools-5.37.0.tar.xz"; - sha256 = "0gbc5qqim6262hvkl9pf6rynnblxb3hsw3c4ars03ip7n761y0zl"; - name = "kdoctools-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/kdoctools-5.38.0.tar.xz"; + sha256 = "0fbv7i1930rl496psny7nfiixvsnaq535h1zggwkwv6i9dh7wpy9"; + name = "kdoctools-5.38.0.tar.xz"; }; }; kemoticons = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/kemoticons-5.37.0.tar.xz"; - sha256 = "1cx978s1dm3v1jh4aymncxs44iizdqp174dqg9m5mf043fcvvinq"; - name = "kemoticons-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/kemoticons-5.38.0.tar.xz"; + sha256 = "1c0991yd8jx2diy5ynl11h5qqyapn1dsir2gy04y8m90h944vdd5"; + name = "kemoticons-5.38.0.tar.xz"; }; }; kfilemetadata = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/kfilemetadata-5.37.0.tar.xz"; - sha256 = "17mbm6pdi6ac61kj2qzxf7y3rbxhxg9rwqr7qy766gh3img2vq8p"; - name = "kfilemetadata-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/kfilemetadata-5.38.0.tar.xz"; + sha256 = "1815r9lx99h9kzbk67bfk41jya3y2hsi112fsgpv3m4mg028pklm"; + name = "kfilemetadata-5.38.0.tar.xz"; }; }; kglobalaccel = { - version = "5.37.0"; + version = "5.38.1"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/kglobalaccel-5.37.0.tar.xz"; - sha256 = "1d84q3r6q5n2lclym9a9m1brfqnq3p3dykfpzvhcba3bjxh3cdsb"; - name = "kglobalaccel-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/kglobalaccel-5.38.1.tar.xz"; + sha256 = "0si3bxxa6wj008j6rr6a1ljnsbmim4z0pqyx1z48ih4qamcfpkin"; + name = "kglobalaccel-5.38.1.tar.xz"; }; }; kguiaddons = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/kguiaddons-5.37.0.tar.xz"; - sha256 = "13g6nlw8fk135i6z3f8ichy8whxd6v4rycg80dlvm25h66rg6vn5"; - name = "kguiaddons-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/kguiaddons-5.38.0.tar.xz"; + sha256 = "1jks0hwn665hlypl0qfhi5r0prqzrg1gv4skc88zp1kgx05kb9h1"; + name = "kguiaddons-5.38.0.tar.xz"; }; }; khtml = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/portingAids/khtml-5.37.0.tar.xz"; - sha256 = "1n0mx2xy9n5ffhvh58z3kn61aa7dhppsrwgxk697pybqy1h45ah2"; - name = "khtml-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/portingAids/khtml-5.38.0.tar.xz"; + sha256 = "0fa61va3dbwml40y4scxks223swlb8vf5730wr7rijl91lz1adgy"; + name = "khtml-5.38.0.tar.xz"; }; }; ki18n = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/ki18n-5.37.0.tar.xz"; - sha256 = "1c1sy4pbhlwsajs2972brdmma5val72gkil6k0a0f58nfvvg952d"; - name = "ki18n-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/ki18n-5.38.0.tar.xz"; + sha256 = "0z9arj2s4fn04vavl6ad3avl1p5yr3mgr2n802lmvy2wlqicy314"; + name = "ki18n-5.38.0.tar.xz"; }; }; kiconthemes = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/kiconthemes-5.37.0.tar.xz"; - sha256 = "1j7mgfsvxa24nf1d9xyn2jv9y9j523vghsvsm73x8d3ijibchfxq"; - name = "kiconthemes-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/kiconthemes-5.38.0.tar.xz"; + sha256 = "01xa30r2cx312vbmz2c3x8vvna1cqb6fx91cjp4aivp9q4jwaz9a"; + name = "kiconthemes-5.38.0.tar.xz"; }; }; kidletime = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/kidletime-5.37.0.tar.xz"; - sha256 = "01m4q3l2yq83f2dpbv6jry7cjkj6bqdgfpy5b8byaf1gf9w2firs"; - name = "kidletime-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/kidletime-5.38.0.tar.xz"; + sha256 = "1i91w9hcb2k5n9qz8q7k2z44z9ss7r9i2zsg9vnl8am7dqqhmlsv"; + name = "kidletime-5.38.0.tar.xz"; }; }; kimageformats = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/kimageformats-5.37.0.tar.xz"; - sha256 = "1knha6wjzjs0vnkljwpfinzg3hg2jyh9c07ifqvd47cprl96ickg"; - name = "kimageformats-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/kimageformats-5.38.0.tar.xz"; + sha256 = "0q78shcwgczdm5ylhbp9fnq70w3hqzkbynp2vpyyg5pjaam8xjlp"; + name = "kimageformats-5.38.0.tar.xz"; }; }; kinit = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/kinit-5.37.0.tar.xz"; - sha256 = "0b7dyy4hqyf6wk7gg2l23ldnji2zl8vzyj5wd5qh4yi7rdl6js5r"; - name = "kinit-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/kinit-5.38.0.tar.xz"; + sha256 = "0k4i0zrwkz088vjkk7d7whwhkrjvqqhdigspzf58d1laryiy0jdf"; + name = "kinit-5.38.0.tar.xz"; }; }; kio = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/kio-5.37.0.tar.xz"; - sha256 = "0nxchbhs8p2d4243dyp7qa65g1p6r3ic2h6dz7w0aa0qzsy8wi29"; - name = "kio-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/kio-5.38.0.tar.xz"; + sha256 = "15qmr2ghrj7pgqxrgpvhdp9g5vaap9mzlmry6ayph75m1afb4fpl"; + name = "kio-5.38.0.tar.xz"; }; }; kirigami2 = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/kirigami2-5.37.0.tar.xz"; - sha256 = "1z42rsi8nzshrbv8m8vxkay4dq46kggglhgxbbgg2q00y8gjq9dd"; - name = "kirigami2-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/kirigami2-5.38.0.tar.xz"; + sha256 = "18k41j5ijmgmzgl2rv4ac0bnxlax3505zi1nmqm8bkdpznhfr13c"; + name = "kirigami2-5.38.0.tar.xz"; }; }; kitemmodels = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/kitemmodels-5.37.0.tar.xz"; - sha256 = "1nlpzzp4m0ghfz1p2hrwn4lbhjhxc8b8q8kbzqbh9hmwmimbzzrr"; - name = "kitemmodels-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/kitemmodels-5.38.0.tar.xz"; + sha256 = "0s20in4jjd2pvv9bn79lvgqqlf806hw014icp51f5hfknrhpdyjc"; + name = "kitemmodels-5.38.0.tar.xz"; }; }; kitemviews = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/kitemviews-5.37.0.tar.xz"; - sha256 = "17r7vnlyiiifhrz4gb4fifshn1jb4c67lhadczi8d301rzk7wwsm"; - name = "kitemviews-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/kitemviews-5.38.0.tar.xz"; + sha256 = "0ldi8qzs2sbhz8l57nshjrnwhjl9mhw90kcqw71cldp41wm0pps6"; + name = "kitemviews-5.38.0.tar.xz"; }; }; kjobwidgets = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/kjobwidgets-5.37.0.tar.xz"; - sha256 = "1162dxhpspd7p1735npp0amrxr5b0j467f5651k2rv6mvqfmqr4b"; - name = "kjobwidgets-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/kjobwidgets-5.38.0.tar.xz"; + sha256 = "0vp6nc73c9788nrib742k9nzqbx4m8m77ipqh9dnnkx4ggrhsd55"; + name = "kjobwidgets-5.38.0.tar.xz"; }; }; kjs = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/portingAids/kjs-5.37.0.tar.xz"; - sha256 = "046hy8ji4i6p2xp5gnqa8dk82sv6sbh4xg67y79i82bbi97dvq9b"; - name = "kjs-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/portingAids/kjs-5.38.0.tar.xz"; + sha256 = "0diw580k5kyv60bqhnxhqinlrn0b3p3n89iy0kdgjgnr6197fwy1"; + name = "kjs-5.38.0.tar.xz"; }; }; kjsembed = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/portingAids/kjsembed-5.37.0.tar.xz"; - sha256 = "0w2wk5azf1b45db58qj0cdc1l056x9s1xcd09ibavx5xmdvq6br0"; - name = "kjsembed-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/portingAids/kjsembed-5.38.0.tar.xz"; + sha256 = "0nb07n54208gnmag7h3dhc8hri2s83ln1c9wq6c0xw7jchaz9z8a"; + name = "kjsembed-5.38.0.tar.xz"; }; }; kmediaplayer = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/portingAids/kmediaplayer-5.37.0.tar.xz"; - sha256 = "0fqxrkcwwzg11zsax9q169lisnfp9jsqg4ccd6xvv8kpkz3g04jp"; - name = "kmediaplayer-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/portingAids/kmediaplayer-5.38.0.tar.xz"; + sha256 = "1qb2g8j871gf38i2dk2j9ags848fa3kqdjl3l4924hf28az0g736"; + name = "kmediaplayer-5.38.0.tar.xz"; }; }; knewstuff = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/knewstuff-5.37.0.tar.xz"; - sha256 = "1scnxhxx4g8j4wml6x8i5v00rpaxyzzcm7vqbra2axbql5d8g8ny"; - name = "knewstuff-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/knewstuff-5.38.0.tar.xz"; + sha256 = "1l4cmfcsljg7v5l6341fxcp7c7i615l8351l941dwcmw4yng0lj0"; + name = "knewstuff-5.38.0.tar.xz"; }; }; knotifications = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/knotifications-5.37.0.tar.xz"; - sha256 = "0gvv6jal7n4m3y30ragjlyhghq3y2782d422im9klxqzlgdgvkb6"; - name = "knotifications-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/knotifications-5.38.0.tar.xz"; + sha256 = "1jvmv2hi3dbf0bd2b61l9s5lb1dx2rjl9z7pw1fb5j20910k6zgd"; + name = "knotifications-5.38.0.tar.xz"; }; }; knotifyconfig = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/knotifyconfig-5.37.0.tar.xz"; - sha256 = "14kjckynszv8015p17j578l3knmkmw25d8r8ks4wavgj3db9bik5"; - name = "knotifyconfig-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/knotifyconfig-5.38.0.tar.xz"; + sha256 = "05hgglm6ypbaplxr43632zh5fmgsz6543110169k9fbjnczyhcyk"; + name = "knotifyconfig-5.38.0.tar.xz"; }; }; kpackage = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/kpackage-5.37.0.tar.xz"; - sha256 = "1ikf55q2pk8vm70pqm7rmakja309zjh9z1lg0xqslq1pqd6xki7s"; - name = "kpackage-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/kpackage-5.38.0.tar.xz"; + sha256 = "0v4j3kqgg52rlmdxmd98aqw0hk7i2xqsw9mhhxfs9c7vm1x05sxn"; + name = "kpackage-5.38.0.tar.xz"; }; }; kparts = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/kparts-5.37.0.tar.xz"; - sha256 = "0jrd8idkz8nhkda2rwgf8rysqngiv4r5ajmrzp2kfz1pr91a6l5h"; - name = "kparts-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/kparts-5.38.0.tar.xz"; + sha256 = "19ba749pwnb7xvmr7lryn6z53zb49hqn0xq4j9fmbic95nh039zp"; + name = "kparts-5.38.0.tar.xz"; }; }; kpeople = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/kpeople-5.37.0.tar.xz"; - sha256 = "1qgp4wqp985ac1m9wakpsvk3c2driwkwrjkc3aic7dyr1p456qsf"; - name = "kpeople-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/kpeople-5.38.0.tar.xz"; + sha256 = "0yd29436bgfw6jjjr9n38hx8561mrlgl5vynci6ng9bx1jflay0x"; + name = "kpeople-5.38.0.tar.xz"; }; }; kplotting = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/kplotting-5.37.0.tar.xz"; - sha256 = "0k4s0qvhjm9h1bmg16l32g4bsdrp2jrcila4dgzvrb56447px0zw"; - name = "kplotting-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/kplotting-5.38.0.tar.xz"; + sha256 = "1hvfqm6i5fsyssb51w3yybsil8h9cbqgd2n8k0wnz99m8xifzn72"; + name = "kplotting-5.38.0.tar.xz"; }; }; kpty = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/kpty-5.37.0.tar.xz"; - sha256 = "0wb873r1ycgi11s0qx3lhvz54703yz5sax6fb6wdmri5c05gzd5a"; - name = "kpty-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/kpty-5.38.0.tar.xz"; + sha256 = "0cgh8hixrplgc280652jlvk8ibcddmjvflwb0gjawd9iq7lcb66y"; + name = "kpty-5.38.0.tar.xz"; }; }; kross = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/portingAids/kross-5.37.0.tar.xz"; - sha256 = "06pk6f6v82pd7x9rsmkhkp5r9sgcbrc503lqckl8d7argbb7j4k1"; - name = "kross-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/portingAids/kross-5.38.0.tar.xz"; + sha256 = "1dccg214cqpyn3nninalpknglfmchz2k1fk4rlgq53wf4n6w23b7"; + name = "kross-5.38.0.tar.xz"; }; }; krunner = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/krunner-5.37.0.tar.xz"; - sha256 = "171qbhr1yszl2gcffm47p5wiwj71w9yhvk6srhvfpiwfyh61a4ld"; - name = "krunner-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/krunner-5.38.0.tar.xz"; + sha256 = "16fhl5zm8scyxk83mpkavvzkn23qgzcblg315jy6klr5bz9jxgcm"; + name = "krunner-5.38.0.tar.xz"; }; }; kservice = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/kservice-5.37.0.tar.xz"; - sha256 = "1zxs5yzd3rmy33vsip4c4igk9g38kzaggw8c29sxmgr8vgdrnvhr"; - name = "kservice-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/kservice-5.38.0.tar.xz"; + sha256 = "0zaamvxhfx4xdy2m8spyhi0hdv6p0fn5hqn9pyi5l8xdixnwjc9d"; + name = "kservice-5.38.0.tar.xz"; }; }; ktexteditor = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/ktexteditor-5.37.0.tar.xz"; - sha256 = "0y04s1nwkf0np6iymjxf0jssin28qw2901kpb3iw8gd52ni5rrks"; - name = "ktexteditor-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/ktexteditor-5.38.0.tar.xz"; + sha256 = "195ygv1j4wfvly31g22wxz9sshhqyi1yyf2mv1v63d9ci88v7rri"; + name = "ktexteditor-5.38.0.tar.xz"; }; }; ktextwidgets = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/ktextwidgets-5.37.0.tar.xz"; - sha256 = "1p8ns75sbnapm6ds16hx36q9vlnz9phgy28rx0gm1ckxqvm4yzr5"; - name = "ktextwidgets-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/ktextwidgets-5.38.0.tar.xz"; + sha256 = "120jxab8w1vhqcckda51r0x2pmfb2qd2h6inhivl72c4m5x89w7f"; + name = "ktextwidgets-5.38.0.tar.xz"; }; }; kunitconversion = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/kunitconversion-5.37.0.tar.xz"; - sha256 = "1qvq61sbv9naj5ndi5xjwx7ami0xa6bqiajr912kbbbp2257cjsi"; - name = "kunitconversion-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/kunitconversion-5.38.0.tar.xz"; + sha256 = "10k0xfb11r7l1bdnlanqgdwwx8wrs8bmnswb2y85xxr7wwsqnlvc"; + name = "kunitconversion-5.38.0.tar.xz"; }; }; kwallet = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/kwallet-5.37.0.tar.xz"; - sha256 = "1l7jl3y0rzx2whnbp6w5p6kg71vwyccp2nwxxgcxr6541m0nihsz"; - name = "kwallet-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/kwallet-5.38.0.tar.xz"; + sha256 = "1qysdj4nmkxywj7bzqdc78ifnqjnkrz9qbp4a49acpng2y4zw1nw"; + name = "kwallet-5.38.0.tar.xz"; }; }; kwayland = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/kwayland-5.37.0.tar.xz"; - sha256 = "0d4c8l8k38pgj73kzlf1hsq52w31wy9wgpwph1bv0cq5yn2rjiyr"; - name = "kwayland-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/kwayland-5.38.0.tar.xz"; + sha256 = "0gd58nvyc39waj7vv2c68r59qqpv0jppm95548j2p924w48syjj0"; + name = "kwayland-5.38.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/kwidgetsaddons-5.37.0.tar.xz"; - sha256 = "1jmk377r1h4is2il7chh6bq8wbj21psf4b1yiw84iivg38vlpid4"; - name = "kwidgetsaddons-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/kwidgetsaddons-5.38.0.tar.xz"; + sha256 = "1yh48qxdqz3rk020wr897vkzsi4nhh37lxbg6211xrlirn0lzvj5"; + name = "kwidgetsaddons-5.38.0.tar.xz"; }; }; kwindowsystem = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/kwindowsystem-5.37.0.tar.xz"; - sha256 = "0pd2n0j5pdv1x7wf4mwcpimnah73g6l0xidhqbpg37p829jix2k2"; - name = "kwindowsystem-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/kwindowsystem-5.38.0.tar.xz"; + sha256 = "02xrin8lshvqkw12d0692z40h3g61f4crh28jcmi5zqlaxiyn5ic"; + name = "kwindowsystem-5.38.0.tar.xz"; }; }; kxmlgui = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/kxmlgui-5.37.0.tar.xz"; - sha256 = "0jrvjlxkg9knj61b2gj2w6l96jlmww9kn4ij808ir35365x3cdg2"; - name = "kxmlgui-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/kxmlgui-5.38.0.tar.xz"; + sha256 = "12cmyhm05nkr9xj7cpnqihrlndfqn1kjkzhcn1ywj20y1gd3mxv4"; + name = "kxmlgui-5.38.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/kxmlrpcclient-5.37.0.tar.xz"; - sha256 = "1jn9v86dpfx43qcdcsp6lpnga9q6aa5vxjkkg4wg0wbxmw4w9gvq"; - name = "kxmlrpcclient-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/kxmlrpcclient-5.38.0.tar.xz"; + sha256 = "0g9ah59h8vq68yg4pfdbqx44xrs856wrr181rsdbsizj0qj3hyaa"; + name = "kxmlrpcclient-5.38.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/modemmanager-qt-5.37.0.tar.xz"; - sha256 = "1fqf43kvj1v1mcdlbfxbh6sh3ycvg35aml2ywh2a684iz4qzq1aq"; - name = "modemmanager-qt-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/modemmanager-qt-5.38.0.tar.xz"; + sha256 = "18ham8lrxblywc634n49237js5y5k6qgjf5zrjc8gzapn934l89w"; + name = "modemmanager-qt-5.38.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/networkmanager-qt-5.37.0.tar.xz"; - sha256 = "01px9n97gyvyyfg3dp1k7dik9fprgx9i28hg8wjr2rb5dlr99jd1"; - name = "networkmanager-qt-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/networkmanager-qt-5.38.0.tar.xz"; + sha256 = "10d28nrkppmmfl9pwq2hkrvi461acf29djdzala4l37mp4dwvbf8"; + name = "networkmanager-qt-5.38.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/oxygen-icons5-5.37.0.tar.xz"; - sha256 = "1rns7n93f83qp5q11a7r5y87y0hvc0q95ar57cqy0fxsqrg4614h"; - name = "oxygen-icons5-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/oxygen-icons5-5.38.0.tar.xz"; + sha256 = "0fk97r3br5myqpnfalz67l5hkamxc5vc5swa68wpg1xih6jc3iid"; + name = "oxygen-icons5-5.38.0.tar.xz"; }; }; plasma-framework = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/plasma-framework-5.37.0.tar.xz"; - sha256 = "0kamvxfzrbx3msn0cp3k20clqchz9jg5wlazz3h6p6zmrk5v16bh"; - name = "plasma-framework-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/plasma-framework-5.38.0.tar.xz"; + sha256 = "1dvhqfi34v44h0wj0m68k477hmx53x9zsf4mh03xq164w1yz68sg"; + name = "plasma-framework-5.38.0.tar.xz"; }; }; prison = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/prison-5.37.0.tar.xz"; - sha256 = "1icsirwfh7zscm8x9g2gp7aqzhs81ahhjflwjcwpz9bh0r9f1wb7"; - name = "prison-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/prison-5.38.0.tar.xz"; + sha256 = "0prj3z6s3aighmk4qarfljca7j9cy7ypvgh8rv5di3jb2v4nbg4m"; + name = "prison-5.38.0.tar.xz"; }; }; solid = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/solid-5.37.0.tar.xz"; - sha256 = "1gb9gnp1a11q5abl97b7sq1if2rqcrcs0f33sakpxf1z9y0ppg8l"; - name = "solid-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/solid-5.38.0.tar.xz"; + sha256 = "1b3c5drx4m1x4ai0ziz0yan16a5s3ghf0py37mb92qyimq586lhh"; + name = "solid-5.38.0.tar.xz"; }; }; sonnet = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/sonnet-5.37.0.tar.xz"; - sha256 = "0sb6i464riadgb2q73nj0vy6xavr2m1sszrvghr20nj7i64f3kk0"; - name = "sonnet-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/sonnet-5.38.0.tar.xz"; + sha256 = "1355p88swnk828gsbnm3v4gryffnwbzjcdq49k8jwywzb65bnwxa"; + name = "sonnet-5.38.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/syntax-highlighting-5.37.0.tar.xz"; - sha256 = "1l56pb84z7sy0qq8xkd5w5v5418bm9n4qds0vd39ch655d47bl72"; - name = "syntax-highlighting-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/syntax-highlighting-5.38.0.tar.xz"; + sha256 = "101ng0l3jfg8x9bns9z38jk3iayijwcb299kf860vfy0nki8gf6l"; + name = "syntax-highlighting-5.38.0.tar.xz"; }; }; threadweaver = { - version = "5.37.0"; + version = "5.38.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.37/threadweaver-5.37.0.tar.xz"; - sha256 = "1hb3721r1zbbyj211886sfkcxk18k0rsdhcg9ssagx10f29rpxx4"; - name = "threadweaver-5.37.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.38/threadweaver-5.38.0.tar.xz"; + sha256 = "1d89l9lknc1q25cz9r8iwc1a102q788mj01ghnl6ydss65rclvfv"; + name = "threadweaver-5.38.0.tar.xz"; }; }; } From c8c82a67f0f57774123337df760b5bab4332f38f Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Thu, 14 Sep 2017 18:20:27 +0300 Subject: [PATCH 089/172] swfmill: Fix build on GCC 6 https://hydra.nixos.org/build/60900173 --- pkgs/tools/video/swfmill/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/video/swfmill/default.nix b/pkgs/tools/video/swfmill/default.nix index 4df4e3f5428f..0c8a34c57630 100644 --- a/pkgs/tools/video/swfmill/default.nix +++ b/pkgs/tools/video/swfmill/default.nix @@ -10,6 +10,9 @@ stdenv.mkDerivation rec { sha256 = "15mcpql448vvgsbxs7wd0vdk1ln6rdcpnif6i2zjm5l4xng55s7r"; }; + # Fixes build with GCC 6 + NIX_CFLAGS_COMPILE = "-std=c++03"; + buildInputs = [ pkgconfig libxslt freetype libpng libxml2 ]; meta = { From 808ddd86fcae061439f2c779ba80cf7ad3c2d13c Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Thu, 14 Sep 2017 18:48:28 +0300 Subject: [PATCH 090/172] linuxPackages.sch_cake: Mark broken on >= 4.13 --- pkgs/os-specific/linux/sch_cake/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/sch_cake/default.nix b/pkgs/os-specific/linux/sch_cake/default.nix index 1522f277fed7..68fc8a6e0170 100644 --- a/pkgs/os-specific/linux/sch_cake/default.nix +++ b/pkgs/os-specific/linux/sch_cake/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation { license = with licenses; [ bsd3 gpl2 ]; maintainers = with maintainers; [ fpletz ]; platforms = platforms.linux; + broken = !stdenv.lib.versionOlder kernel.version "4.13"; }; } From 2459616f0f590b401367c014035f5ac944e4e847 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Thu, 14 Sep 2017 18:52:28 +0300 Subject: [PATCH 091/172] linuxPackages.netatop: Mark broken on >= 4.13 --- pkgs/os-specific/linux/netatop/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/netatop/default.nix b/pkgs/os-specific/linux/netatop/default.nix index 5177ea45e7ab..0498f5cf37e2 100644 --- a/pkgs/os-specific/linux/netatop/default.nix +++ b/pkgs/os-specific/linux/netatop/default.nix @@ -38,5 +38,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [viric]; + broken = !stdenv.lib.versionOlder kernel.version "4.13"; }; } From 94454384c2863a940e7e46b1c53f13ba50db90fd Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Thu, 14 Sep 2017 18:53:19 +0300 Subject: [PATCH 092/172] linuxPackages.evdi: Mark broken on >= 4.13 --- pkgs/os-specific/linux/evdi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix index 9cfcb55ce137..11d0a461da09 100644 --- a/pkgs/os-specific/linux/evdi/default.nix +++ b/pkgs/os-specific/linux/evdi/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.gpl2; homepage = http://www.displaylink.com/; - broken = versionOlder kernel.version "4.9"; + broken = versionOlder kernel.version "4.9" || !stdenv.lib.versionOlder kernel.version "4.13"; }; } From f96f3f7a5c46fc31e9c0008665cd7ae876310398 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 14 Sep 2017 12:31:52 -0400 Subject: [PATCH 093/172] bcachefs-tools: Make eval more robust No hash was changed --- pkgs/tools/filesystems/bcachefs-tools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index 0ce695000388..5c5779037ab2 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig attr libuuid libscrypt libsodium keyutils liburcu zlib libaio ]; preConfigure = '' - substituteInPlace cmd_migrate.c --replace /usr/include/dirent.h ${stdenv.glibc.dev}/include/dirent.h + substituteInPlace cmd_migrate.c --replace /usr/include/dirent.h ${stdenv.lib.getDev stdenv.cc.libc}/include/dirent.h ''; installFlags = [ "PREFIX=$(out)" ]; From 2773508b5d2de099511e42b9683d94c676f4689b Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Tue, 12 Sep 2017 15:13:03 +0200 Subject: [PATCH 094/172] chromium: 60.0.3112.113 -> 61.0.3163.79 CVE-2017-5111 CVE-2017-5112 CVE-2017-5113 CVE-2017-5114 CVE-2017-5115 CVE-2017-5116 CVE-2017-5117 CVE-2017-5118 CVE-2017-5119 CVE-2017-5120 --- .../networking/browsers/chromium/common.nix | 5 +- .../chromium/patches/chromium-atk-r1.patch | 11 ++++ .../chromium/patches/chromium-gcc-r1.patch | 14 ++++ .../chromium/patches/chromium-gcc5-r1.patch | 66 +++++++++++++++++++ .../patches/chromium-gn-bootstrap-r14.patch | 27 ++++++++ .../patches/chromium-gn-bootstrap-r8.patch | 13 ---- .../browsers/chromium/upstream-info.nix | 18 ++--- 7 files changed, 131 insertions(+), 23 deletions(-) create mode 100644 pkgs/applications/networking/browsers/chromium/patches/chromium-atk-r1.patch create mode 100644 pkgs/applications/networking/browsers/chromium/patches/chromium-gcc-r1.patch create mode 100644 pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r1.patch create mode 100644 pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r14.patch delete mode 100644 pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r8.patch diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 33b8ee220ba2..c4fd85ab93e9 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -117,7 +117,10 @@ let patches = [ ./patches/nix_plugin_paths_52.patch - ./patches/chromium-gn-bootstrap-r8.patch + ./patches/chromium-gn-bootstrap-r14.patch + ./patches/chromium-gcc-r1.patch + ./patches/chromium-atk-r1.patch + ./patches/chromium-gcc5-r1.patch # To enable ChromeCast, go to chrome://flags and set "Load Media Router Component Extension" to Enabled # Fixes Chromecast: https://bugs.chromium.org/p/chromium/issues/detail?id=734325 ./patches/fix_network_api_crash.patch diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-atk-r1.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-atk-r1.patch new file mode 100644 index 000000000000..602be1e3ba74 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/chromium-atk-r1.patch @@ -0,0 +1,11 @@ +--- a/content/browser/accessibility/browser_accessibility_auralinux.cc.orig 2017-07-27 06:28:01.090257874 +0000 ++++ b/content/browser/accessibility/browser_accessibility_auralinux.cc 2017-07-27 06:28:21.174653680 +0000 +@@ -571,7 +571,7 @@ + // it's best to leave this out rather than break people's builds: + #if defined(ATK_CHECK_VERSION) + #if ATK_CHECK_VERSION(2, 16, 0) +- atk_state_set_add_state(atk_state_set, ATK_STATE_READ_ONLY); ++ atk_state_set_add_state(state_set, ATK_STATE_READ_ONLY); + #endif + #endif + break; \ No newline at end of file diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc-r1.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc-r1.patch new file mode 100644 index 000000000000..036d57b601da --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc-r1.patch @@ -0,0 +1,14 @@ +diff --git a/base/numerics/safe_math_shared_impl.h b/base/numerics/safe_math_shared_impl.h +index 99f230ce7e9a..de2415d402f5 100644 +--- a/base/numerics/safe_math_shared_impl.h ++++ b/base/numerics/safe_math_shared_impl.h +@@ -21,8 +21,7 @@ + #if !defined(__native_client__) && \ + ((defined(__clang__) && \ + ((__clang_major__ > 3) || \ +- (__clang_major__ == 3 && __clang_minor__ >= 4))) || \ +- (defined(__GNUC__) && __GNUC__ >= 5)) ++ (__clang_major__ == 3 && __clang_minor__ >= 4)))) + #include "base/numerics/safe_math_clang_gcc_impl.h" + #define BASE_HAS_OPTIMIZED_SAFE_MATH (1) + #else \ No newline at end of file diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r1.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r1.patch new file mode 100644 index 000000000000..8d2886fbfa94 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r1.patch @@ -0,0 +1,66 @@ +--- a/chrome/browser/devtools/devtools_file_system_indexer.cc ++++ b/chrome/browser/devtools/devtools_file_system_indexer.cc +@@ -34,7 +34,6 @@ using base::TimeDelta; + using base::TimeTicks; + using content::BrowserThread; + using std::map; +-using std::set; + using std::string; + using std::vector; + +@@ -191,7 +190,7 @@ vector Index::Search(const string& query) { + if (trigram != kUndefinedTrigram) + trigrams.push_back(trigram); + } +- set file_ids; ++ std::set file_ids; + bool first = true; + vector::const_iterator it = trigrams.begin(); + for (; it != trigrams.end(); ++it) { +@@ -203,7 +202,7 @@ vector Index::Search(const string& query) { + first = false; + continue; + } +- set intersection = base::STLSetIntersection >( ++ std::set intersection = base::STLSetIntersection >( + file_ids, index_[trigram]); + file_ids.swap(intersection); + } +diff --git a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h +index 94bb9161ec85..e40c6387f72e 100644 +--- a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h ++++ b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h +@@ -63,7 +63,7 @@ class WTF_EXPORT ArrayBufferContents { + allocation_length_(0), + data_(data), + data_length_(0), +- kind_(AllocationKind::kNormal), ++ kind_(WTF::ArrayBufferContents::AllocationKind::kNormal), + deleter_(deleter) {} + DataHandle(void* allocation_base, + size_t allocation_length, +@@ -94,11 +94,11 @@ class WTF_EXPORT ArrayBufferContents { + reinterpret_cast(allocation_base_) + + allocation_length_); + switch (kind_) { +- case AllocationKind::kNormal: ++ case WTF::ArrayBufferContents::AllocationKind::kNormal: + DCHECK(deleter_); + deleter_(data_); + return; +- case AllocationKind::kReservation: ++ case WTF::ArrayBufferContents::AllocationKind::kReservation: + ReleaseReservedMemory(allocation_base_, allocation_length_); + return; + } +--- a/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.orig 2017-08-15 12:45:59.433532111 +0000 ++++ b/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc 2017-08-15 17:52:59.691328825 +0000 +@@ -10,7 +10,7 @@ + + #include "webrtc/modules/audio_processing/aec3/aec_state.h" + +-#include ++#include + #include + #include + \ No newline at end of file diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r14.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r14.patch new file mode 100644 index 000000000000..624267153669 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r14.patch @@ -0,0 +1,27 @@ +commit 96c271f8ab2be7ea4199078ea65ac50c6ada4685 +Author: Pawel Hajdan, Jr +Date: Wed Jul 26 21:51:54 2017 +0000 + + wip + +diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py +index 1390560f8e37..ff2ae57c46b0 100755 +--- a/tools/gn/bootstrap/bootstrap.py ++++ b/tools/gn/bootstrap/bootstrap.py +@@ -449,6 +449,7 @@ def write_gn_ninja(path, root_gen_dir, options): + 'base/metrics/histogram_base.cc', + 'base/metrics/histogram_functions.cc', + 'base/metrics/histogram_samples.cc', ++ 'base/metrics/histogram_snapshot_manager.cc', + 'base/metrics/metrics_hashes.cc', + 'base/metrics/persistent_histogram_allocator.cc', + 'base/metrics/persistent_memory_allocator.cc', +@@ -534,7 +535,7 @@ def write_gn_ninja(path, root_gen_dir, options): + 'base/trace_event/heap_profiler_allocation_context_tracker.cc', + 'base/trace_event/heap_profiler_allocation_register.cc', + 'base/trace_event/heap_profiler_event_filter.cc', +- 'base/trace_event/heap_profiler_event_writer.cc', ++ 'base/trace_event/heap_profiler_heap_dump_writer.cc', + 'base/trace_event/heap_profiler_serialization_state.cc', + 'base/trace_event/heap_profiler_stack_frame_deduplicator.cc', + 'base/trace_event/heap_profiler_type_name_deduplicator.cc', \ No newline at end of file diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r8.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r8.patch deleted file mode 100644 index d9f389aaf588..000000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r8.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: tools/gn/bootstrap/bootstrap.py -diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py -index 6f2f5b1264519ea38cc36fb0b7e2cc24c378ca7a..0b03d2626b358fb90ab39d737679ee47bd60303b 100755 ---- a/tools/gn/bootstrap/bootstrap.py -+++ b/tools/gn/bootstrap/bootstrap.py -@@ -487,6 +487,7 @@ def write_gn_ninja(path, root_gen_dir, options): - 'base/sys_info.cc', - 'base/task_runner.cc', - 'base/task_scheduler/delayed_task_manager.cc', -+ 'base/task_scheduler/environment_config.cc', - 'base/task_scheduler/post_task.cc', - 'base/task_scheduler/priority_queue.cc', - 'base/task_scheduler/scheduler_lock_impl.cc', diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index b2f0ade96f44..ff349c8a5762 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "0q23dm6mjq2z2akn3l65dyyg5kv1c9km5ynydzghk34fbv8yj3vl"; - sha256bin64 = "0igscn5y8ipqhkwvzfc8rfp3d5icilz66bgiypz54q4w2sfbqpvg"; - version = "61.0.3163.71"; + sha256 = "09q7s5x22vnmvqyz0f1l6qnaryglmsp0rc63qcg5sfvgv2g17g5x"; + sha256bin64 = "12z6z8gjxl4mx8j6db8nnlzrj03rh4qwyrvcf4hqcsv7b1armg6j"; + version = "61.0.3163.79"; }; dev = { - sha256 = "06brghm7f0xr6ycn1vkaj6iqxrdga5zkyh4xjbn5bdxvbq2c4z23"; - sha256bin64 = "0d55q8qz9sxhpaws2f2w445m48piivdgip9wwgd1ahl0mm2vidd4"; - version = "62.0.3198.0"; + sha256 = "168i6dcdl13an3vlr2m83q8fcprgckmclkmzwj70jdkp84qx80fq"; + sha256bin64 = "116vddp01m2ls337zj6r4h1nvybphvldlk9bs8czypx5skn29vbz"; + version = "62.0.3202.9"; }; stable = { - sha256 = "0ngc9wdac6mm9kgfln8b0k7xm10i9lvcfq7k6lpaj0pal43fgz7b"; - sha256bin64 = "15a29hh9747vkhgrhiw5i4qlf0pfihjqip863fxsl32fqsakp3qn"; - version = "60.0.3112.113"; + sha256 = "09q7s5x22vnmvqyz0f1l6qnaryglmsp0rc63qcg5sfvgv2g17g5x"; + sha256bin64 = "0a0wd06c0v061lnmb8x20gqgsg9zqafp2kq1fl3cjm0ldg9rwayw"; + version = "61.0.3163.79"; }; } From cd972113586aacd1f722d95fe9fec4b122f7811d Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Thu, 14 Sep 2017 19:23:25 +0200 Subject: [PATCH 095/172] rtags: use clang-unwrapped --- pkgs/development/tools/rtags/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix index 1825bbe81c30..84f048194c8f 100644 --- a/pkgs/development/tools/rtags/default.nix +++ b/pkgs/development/tools/rtags/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { name = "rtags-${version}"; version = "2.12"; - buildInputs = [ cmake llvmPackages.llvm openssl llvmPackages.clang emacs pkgconfig ] + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ llvmPackages.clang-unwrapped llvmPackages.llvm openssl emacs ] ++ lib.optionals stdenv.isDarwin [ apple_sdk.libs.xpc apple_sdk.frameworks.CoreServices ]; From fad96f62d0380336856bcf8a6328ad905e96dbef Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Thu, 14 Sep 2017 14:27:48 -0400 Subject: [PATCH 096/172] 3to2: rename py3to2 to work with callPackage --- pkgs/top-level/python-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 73e4e79a4bcf..e1685dc8339a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -99,6 +99,8 @@ in { acoustics = callPackage ../development/python-modules/acoustics { }; + py3to2 = callPackage ../development/python-modules/3to2 { }; + # Left for backwards compatibility "3to2" = callPackage ../development/python-modules/3to2 { }; aenum = callPackage ../development/python-modules/aenum { }; From 3c70ed9577ae99a1b99293c49ac63c9743c8220f Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Thu, 14 Sep 2017 22:01:53 +0200 Subject: [PATCH 097/172] rtags: fix darwin build --- pkgs/development/tools/rtags/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix index 84f048194c8f..32be2a503bfc 100644 --- a/pkgs/development/tools/rtags/default.nix +++ b/pkgs/development/tools/rtags/default.nix @@ -5,7 +5,8 @@ stdenv.mkDerivation rec { version = "2.12"; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ llvmPackages.clang-unwrapped llvmPackages.llvm openssl emacs ] + buildInputs = [ llvmPackages.llvm openssl emacs ] + ++ lib.optionals stdenv.cc.isGNU [ llvmPackages.clang-unwrapped ] ++ lib.optionals stdenv.isDarwin [ apple_sdk.libs.xpc apple_sdk.frameworks.CoreServices ]; From 50a33089c6b67931b7b7ce2be4a620aca9bbe917 Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Thu, 14 Sep 2017 16:22:19 -0400 Subject: [PATCH 098/172] emacsMacport: emacs-25.2 => 25.3, macport-6.3 => 6.7 --- pkgs/applications/editors/emacs/macport.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/emacs/macport.nix b/pkgs/applications/editors/emacs/macport.nix index f38839a5abca..421d0ddd9f69 100644 --- a/pkgs/applications/editors/emacs/macport.nix +++ b/pkgs/applications/editors/emacs/macport.nix @@ -4,21 +4,21 @@ }: stdenv.mkDerivation rec { - emacsVersion = "25.2"; + emacsVersion = "25.3"; emacsName = "emacs-${emacsVersion}"; - macportVersion = "6.3"; + macportVersion = "6.7"; name = "emacs-mac-${emacsVersion}-${macportVersion}"; builder = ./builder.sh; src = fetchurl { url = "mirror:///gnu/emacs/${emacsName}.tar.xz"; - sha256 = "1ykkq0xl28ljdg61bm6gzy04ww86ajms98gix72qg6cpr6a53dar"; + sha256 = "02y00y9q42g1iqgz5qhmsja75hwxd88yrn9zp14lanay0zkwafi5"; }; macportSrc = fetchurl { url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${emacsName}-mac-${macportVersion}.tar.gz"; - sha256 = "1dz11frk3ya3842lb89ixzpns9bz5f9njxdkyvjy75gfymqfhhzv"; + sha256 = "0fivrasvigszr31w8wg8kb808hmqv2cc8klrm9n0hdxwg5fs5d0y"; }; hiresSrc = fetchurl { From d1260ea6aaa63dae88029fa6597d182fee969b90 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Thu, 14 Sep 2017 22:23:48 +0200 Subject: [PATCH 099/172] irony-server: don't use wrapped clang --- pkgs/development/tools/irony-server/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/irony-server/default.nix b/pkgs/development/tools/irony-server/default.nix index 0dcb74b803d2..b52cbf21168e 100644 --- a/pkgs/development/tools/irony-server/default.nix +++ b/pkgs/development/tools/irony-server/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "irony-server-${version}"; inherit (irony) version; - buildInputs = [ cmake llvmPackages.clang ]; + nativeBuildInputs = [ cmake ]; dontUseCmakeBuildDir = true; From 6ac283b185b3d164b5dcc912fc4b20e7619aeb11 Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Thu, 14 Sep 2017 14:28:29 -0400 Subject: [PATCH 100/172] arelle: add py3to2 as a buildInput --- pkgs/development/python-modules/arelle/default.nix | 3 ++- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/arelle/default.nix b/pkgs/development/python-modules/arelle/default.nix index 32c020961f21..2cf14192d09d 100644 --- a/pkgs/development/python-modules/arelle/default.nix +++ b/pkgs/development/python-modules/arelle/default.nix @@ -1,7 +1,7 @@ { gui ? true, buildPythonPackage, fetchFromGitHub, lib, sphinx_1_2, lxml, isodate, numpy, pytest, - tkinter ? null, + tkinter ? null, py3to2, ... }: let @@ -26,6 +26,7 @@ buildPythonPackage { buildInputs = [ sphinx_1_2 pytest + py3to2 ]; propagatedBuildInputs = [ lxml diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e1685dc8339a..ec4a6cbbb7ee 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -101,7 +101,7 @@ in { py3to2 = callPackage ../development/python-modules/3to2 { }; # Left for backwards compatibility - "3to2" = callPackage ../development/python-modules/3to2 { }; + "3to2" = self.py3to2; aenum = callPackage ../development/python-modules/aenum { }; From b5fbb4f3622bc6edabe59402aeb9cd4a40cf08f3 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 14 Sep 2017 23:18:52 +0200 Subject: [PATCH 101/172] nixos/tests/acme: Use overridePythonAttrs Quoting from @FRidh: Note overridePythonAttrs exists since 17.09. It overrides the call to buildPythonPackage. While it's not strictly necessary to do this, because postPatch ends up in drvAttrs anyway, it's probably better to use overridePythonAttrs so we don't run into problems when the underlying implementation of buildPythonPackage changes. Signed-off-by: aszlig --- nixos/tests/acme.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/acme.nix b/nixos/tests/acme.nix index f44524a1d6a8..d7452744e17b 100644 --- a/nixos/tests/acme.nix +++ b/nixos/tests/acme.nix @@ -14,8 +14,8 @@ let pythonPackages = (super.python.override { packageOverrides = lib.const (pysuper: { - certifi = pysuper.certifi.overrideDerivation (drv: { - postPatch = (drv.postPatch or "") + '' + certifi = pysuper.certifi.overridePythonAttrs (attrs: { + postPatch = (attrs.postPatch or "") + '' cat "${self.cacert}/etc/ssl/certs/ca-bundle.crt" \ > certifi/cacert.pem ''; From 739b4091cf4bf92ad8ea0fddd0c421784482a2f0 Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Thu, 14 Sep 2017 15:06:47 -0700 Subject: [PATCH 102/172] ffmpeg, ffmpeg-full: 3.3.3 -> 3.3.4 --- pkgs/development/libraries/ffmpeg-full/default.nix | 4 ++-- pkgs/development/libraries/ffmpeg/3.3.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index d9239989cf65..275389b7b8bd 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -231,11 +231,11 @@ assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing; stdenv.mkDerivation rec { name = "ffmpeg-full-${version}"; - version = "3.3.3"; + version = "3.3.4"; src = fetchurl { url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"; - sha256 = "07is8msrhxr1dk6vgwa192k2pl2a0in1h9w8f9cknlvbvhn01afj"; + sha256 = "0mx9dvad3lkyhvsrblf280x2bz6dxajya1ylnspbdzldj0dpxfcq"; }; patchPhase = ''patchShebangs . diff --git a/pkgs/development/libraries/ffmpeg/3.3.nix b/pkgs/development/libraries/ffmpeg/3.3.nix index bf414e0865d1..3218461258d7 100644 --- a/pkgs/development/libraries/ffmpeg/3.3.nix +++ b/pkgs/development/libraries/ffmpeg/3.3.nix @@ -6,7 +6,7 @@ callPackage ./generic.nix (args // rec { version = "${branch}"; - branch = "3.3.3"; - sha256 = "0wx421d7vp4nz8kgp0kg16sswikj8ff1pd18x9mmcbpmqy7sqs8h"; + branch = "3.3.4"; + sha256 = "0zmczggi95fbsq9nz33mpln1y3p1gqniqc4x5smp871idhkykxay"; darwinFrameworks = [ Cocoa CoreMedia ]; }) From 0d9410a57330ce3c28c8844cea7e01345ee0fd38 Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Thu, 14 Sep 2017 19:47:07 -0400 Subject: [PATCH 103/172] jedi: disable tests --- .../python-modules/jedi/default.nix | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix index 1199435c7d22..5d904ee311ff 100644 --- a/pkgs/development/python-modules/jedi/default.nix +++ b/pkgs/development/python-modules/jedi/default.nix @@ -1,9 +1,4 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pytest -, glibcLocales -}: +{ stdenv, buildPythonPackage, fetchPypi, pytest, glibcLocales, tox, pytestcov }: buildPythonPackage rec { pname = "jedi"; @@ -15,19 +10,19 @@ buildPythonPackage rec { sha256 = "7abb618cac6470ebbd142e59c23daec5e6e063bfcecc8a43a037d2ab57276f4e"; }; - checkInputs = [ pytest glibcLocales ]; + checkInputs = [ pytest glibcLocales tox pytestcov ]; checkPhase = '' LC_ALL="en_US.UTF-8" py.test test ''; - # 7 failed - #doCheck = false; + # tox required for tests: https://github.com/davidhalter/jedi/issues/808 + doCheck = false; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/davidhalter/jedi; description = "An autocompletion tool for Python that can be used for text editors"; - license = lib.licenses.lgpl3Plus; - maintainers = with lib.maintainers; [ garbas ]; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ garbas ]; }; } From e13e3dd2fb1b2910d62674cf36eb5c7448005d75 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Fri, 15 Sep 2017 02:12:32 +0200 Subject: [PATCH 104/172] grafana: 4.4.3 -> 4.5.0 --- pkgs/servers/monitoring/grafana/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index ccf5e7fea0a9..594c0cfad179 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.4.3"; + version = "4.5.0"; name = "grafana-v${version}"; goPackagePath = "github.com/grafana/grafana"; @@ -9,12 +9,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "04cm8h7if8yvczcwd83drbfzgr1spfspzg5im8lb540ks9x55dz4"; + sha256 = "00n58v3a5amkj9r2nsbzmifbnch9rq1cpcqc5ws0bz3x004z43cs"; }; srcStatic = fetchurl { url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-x64.tar.gz"; - sha256 = "1p36hniay2y3mwg300b7n3sl3vv7l5jq5ddcnmpmznwyd8zwbl4h"; + sha256 = "0fm69r1qb2fn8zwfsiwss8vc7nx0ql98pk0a3d2vjgpdyvk5jmw7"; }; preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace"; From 799a70d62304af44180412cf2eea4da0b06afb3f Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Thu, 14 Sep 2017 20:30:08 -0400 Subject: [PATCH 105/172] cx_Freeze: 4.3.4 -> 5.3.2 --- .../python-modules/cx_freeze/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 24 +--------------- 2 files changed, 29 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/python-modules/cx_freeze/default.nix diff --git a/pkgs/development/python-modules/cx_freeze/default.nix b/pkgs/development/python-modules/cx_freeze/default.nix new file mode 100644 index 000000000000..3d937debe58b --- /dev/null +++ b/pkgs/development/python-modules/cx_freeze/default.nix @@ -0,0 +1,28 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPyPy, isPy35, ncurses }: + +buildPythonPackage rec { + pname = "cx_Freeze"; + version = "5.0.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0zbx9j5z5l06bvwvlqvvn7h9dm7zjcjgxm7agbb625nymkq6cd15"; + }; + + propagatedBuildInputs = [ ncurses ]; + + # timestamp need to come after 1980 for zipfiles and nix store is set to epoch + prePatch = '' + substituteInPlace cx_Freeze/freezer.py --replace "os.stat(module.file).st_mtime" "time.time()" + ''; + + # fails to find Console even though it exists on python 3.x + doCheck = false; + + meta = with stdenv.lib; { + description = "A set of scripts and modules for freezing Python scripts into executables"; + homepage = "http://cx-freeze.sourceforge.net/"; + license = licenses.psfl; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 73e4e79a4bcf..de08bfae3938 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1704,29 +1704,7 @@ in { csvkit = callPackage ../development/python-modules/csvkit { }; - cx_Freeze = buildPythonPackage rec { - name = "cx_freeze-${version}"; - version = "4.3.4"; - - # build failures - disabled = isPyPy || isPy35; - - # timestamp need to come after 1980 for zipfiles and nix store is set to epoch - prePatch = '' - substituteInPlace cx_Freeze/freezer.py --replace "os.stat(module.file).st_mtime" "time.time()" - ''; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/cx_Freeze/cx_Freeze-${version}.tar.gz"; - sha256 = "1qhv0gq3ggr06k8cvzphma29zfqdajkx2yfzbw89s4vy23xbpis0"; - }; - - meta = { - description = "A set of scripts and modules for freezing Python scripts into executables"; - homepage = "http://cx-freeze.sourceforge.net/"; - license = licenses.psfl; - }; - }; + cx_Freeze = callPackage ../development/python-modules/cx_freeze {}; cvxopt = buildPythonPackage rec { name = "${pname}-${version}"; From e355e9cf0310344d8ffed42e80b0ed4ef0f47698 Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Thu, 14 Sep 2017 20:48:17 -0400 Subject: [PATCH 106/172] ptpython: 0.35 -> 0.41 --- .../python-modules/ptpython/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +------------ 2 files changed, 26 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/ptpython/default.nix diff --git a/pkgs/development/python-modules/ptpython/default.nix b/pkgs/development/python-modules/ptpython/default.nix new file mode 100644 index 000000000000..b553d50d130b --- /dev/null +++ b/pkgs/development/python-modules/ptpython/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonPackage, fetchPypi, wcwidth, six, prompt_toolkit, docopt +, jedi, pygments }: + +buildPythonPackage rec { + pname = "ptpython"; + version = "0.41"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1hcaaadkp5n37hxggraynifa33wx1akklzvf6y4rvgjxbjl2g2x7"; + }; + + propagatedBuildInputs = [ wcwidth six prompt_toolkit docopt jedi pygments ]; + + # no tests to run + doCheck = false; + + meta = with stdenv.lib; { + description = "An advanced Python REPL"; + license = licenses.bsd3; + maintainers = with maintainers; [ mlieberman85 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 73e4e79a4bcf..393d4cd294e9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16328,22 +16328,7 @@ in { }; }; - ptpython = buildPythonPackage rec { - name = "ptpython-0.35"; - propagatedBuildInputs = with self; - [ wcwidth six prompt_toolkit docopt jedi pygments]; - src = pkgs.fetchurl { - url = "mirror://pypi/p/ptpython/${name}.tar.gz"; - sha256 = "e0d380fbccb03ed33a7f33d96988e66fbd286bc813c9ceea84a1b3b5615a5660"; - }; - - meta = { - description = "An advanced Python REPL"; - license = licenses.bsd3; - maintainers = with maintainers; [ mlieberman85 ]; - platforms = platforms.all; - }; - }; + ptpython = callPackage ../development/python-modules/ptpython {}; publicsuffix = buildPythonPackage rec { name = "publicsuffix-${version}"; From 651540268ea1e51b1a261fd95771419ebaa3be8d Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Thu, 14 Sep 2017 21:22:44 -0400 Subject: [PATCH 107/172] altair: disable tests --- pkgs/development/python-modules/altair/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix index a0504de4fb81..7e9701906ef9 100644 --- a/pkgs/development/python-modules/altair/default.nix +++ b/pkgs/development/python-modules/altair/default.nix @@ -19,6 +19,8 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ vega pandas ipython traitlets ]; + # Disabling checks, MockRequest object has no method send() + doCheck = false; meta = with stdenv.lib; { description = "A declarative statistical visualization library for Python."; From aad00e35dbc0a78dccab9c640468cc4b884fc215 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Fri, 15 Sep 2017 08:48:02 +0200 Subject: [PATCH 108/172] lean: 3.2.0 -> 3.3.0 --- pkgs/applications/science/logic/lean/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index 08861341a1ae..b3f0b3259277 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "lean-${version}"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "leanprover"; repo = "lean"; rev = "v${version}"; - sha256 = "13sb9rwgc9ni2j5zx77imjhkzhix9d7klsdb8cg68c17b20sy1g3"; + sha256 = "0irh9b4haz0pzzxrb4hwcss91a0xb499kjrcrmr2s59p3zq8bbd9"; }; buildInputs = [ gmp cmake ]; From 209b9e88df6c9802185cfe004d821dfcaf1992ad Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Fri, 15 Sep 2017 08:58:07 +0200 Subject: [PATCH 109/172] chromium: remove swiftshader install dir --- pkgs/applications/networking/browsers/chromium/browser.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 993d81ff96e4..49c9dfef8c55 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -12,11 +12,10 @@ mkChromiumDerivation (base: rec { sandboxExecutableName = "__chromium-suid-sandbox"; installPhase = '' - mkdir -p "$libExecPath/swiftshader" + mkdir -p "$libExecPath " cp -v "$buildPath/"*.pak "$buildPath/"*.bin "$libExecPath/" cp -v "$buildPath/icudtl.dat" "$libExecPath/" cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/" - cp -v "$buildPath/swiftshader/"*.so "$libExecPath/swiftshader/" cp -v "$buildPath/chrome" "$libExecPath/$packageName" if [ -e "$buildPath/libwidevinecdmadapter.so" ]; then From 6319210b8af4d002b5bf56b26451a5f24b279074 Mon Sep 17 00:00:00 2001 From: romildo Date: Thu, 14 Sep 2017 18:11:58 -0300 Subject: [PATCH 110/172] zuki-themes: 3.24.2017-06-26 -> 3.24-2 - Update to version 3.24-2, released on 2017 Aug 3 - Remove versions for GNOME 3.22 and 3.20. The version for 3.24 should work with them as well. --- pkgs/misc/themes/zuki/default.nix | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/pkgs/misc/themes/zuki/default.nix b/pkgs/misc/themes/zuki/default.nix index cee459134991..3d0de843a91b 100644 --- a/pkgs/misc/themes/zuki/default.nix +++ b/pkgs/misc/themes/zuki/default.nix @@ -1,27 +1,14 @@ -{ stdenv, fetchFromGitHub, gnome3, gdk_pixbuf, gtk_engines, gtk-engine-murrine }: +{ stdenv, fetchFromGitHub, gdk_pixbuf, gtk_engines, gtk-engine-murrine }: stdenv.mkDerivation rec { name = "zuki-themes-${version}"; - version = "${gnome3.version}.${date}"; - date = { - "3.20" = "2017-05-03"; - "3.22" = "2017-04-23"; - "3.24" = "2017-06-26"; - }."${gnome3.version}"; + version = "3.24-2"; src = fetchFromGitHub { owner = "lassekongo83"; repo = "zuki-themes"; - rev = { - "3.20" = "ce7ae498df7d5c81acaf48ed957b9f828356d58c"; - "3.22" = "e97f2c3cf75b5205bc5ecd6072696327169fde5d"; - "3.24" = "d25e0a2fb6e08ad107d8bb627451433362f2a830"; - }."${gnome3.version}"; - sha256 = { - "3.20" = "0na81q9mc8kwn9m04kkcchrdr67087dqf3q155imhjgqrxjhh3w4"; - "3.22" = "195v0d2sgqh92c104xqm00p68yxp6kzp5mzx8q7s36bdv9p972q4"; - "3.24" = "0z5swi5aah3s4yinfglh491qydxgjkqwf6zxyz7k9c1d7lrvj3ww"; - }."${gnome3.version}"; + rev = "v${version}"; + sha256 = "1js92qq1zi3iq40nl6n0m52hhhn9ql9i7y8ycg8vw3w0v8xyb4km"; }; buildInputs = [ gdk_pixbuf gtk_engines gtk-engine-murrine ]; From 32f7c567cde355d0cc192a0a51a32b230add2ad1 Mon Sep 17 00:00:00 2001 From: romildo Date: Thu, 14 Sep 2017 17:35:59 -0300 Subject: [PATCH 111/172] numix-gtk-theme: 2017-02-15 -> 2017-07-26 --- pkgs/misc/themes/numix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/themes/numix/default.nix b/pkgs/misc/themes/numix/default.nix index c2f6fb210586..4e1963536a87 100644 --- a/pkgs/misc/themes/numix/default.nix +++ b/pkgs/misc/themes/numix/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "2017-02-15"; + version = "2017-07-26"; name = "numix-gtk-theme-${version}"; src = fetchFromGitHub { repo = "numix-gtk-theme"; owner = "numixproject"; - rev = "f25d7e04353543e03fd155f4d9dfa80fc6b551f2"; - sha256 = "0n57airi1kgg754099sdq40bb0mbp4my385fvslnsjv5d4h8jhvq"; + rev = "858e6292c4336302be4d499c9b085a891b4c3b40"; + sha256 = "1z9l13px79yk42874dlh8z6p7chlngwarfnki89win3g2xvclz8q"; }; nativeBuildInputs = [ sass glib libxml2 gdk_pixbuf ]; From 17c3599ee384f41091312955d6af8fb6da9efb97 Mon Sep 17 00:00:00 2001 From: romildo Date: Thu, 14 Sep 2017 13:03:07 -0300 Subject: [PATCH 112/172] clearlooks-phenix: 5.0.7 -> 7.0.1 --- pkgs/misc/themes/{gtk3 => }/clearlooks-phenix/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename pkgs/misc/themes/{gtk3 => }/clearlooks-phenix/default.nix (92%) diff --git a/pkgs/misc/themes/gtk3/clearlooks-phenix/default.nix b/pkgs/misc/themes/clearlooks-phenix/default.nix similarity index 92% rename from pkgs/misc/themes/gtk3/clearlooks-phenix/default.nix rename to pkgs/misc/themes/clearlooks-phenix/default.nix index bea08bcdf141..51320e18c1a3 100644 --- a/pkgs/misc/themes/gtk3/clearlooks-phenix/default.nix +++ b/pkgs/misc/themes/clearlooks-phenix/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "5.0.7"; + version = "7.0.1"; name = "clearlooks-phenix-${version}"; src = fetchurl { url = "http://github.com/jpfleury/clearlooks-phenix/archive/${version}.tar.gz"; - sha256 = "107jx3p3zwzy8xy0m8hwzs1kp8j60xgc3dja27r3vwhb3x3y1i8k"; + sha256 = "1x2psfbhxc3bk3q795bafxv6p890yfsankfw64p44q4r1x0236ra"; }; dontBuild = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 02cb87977287..f3f49d1625b5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17853,7 +17853,7 @@ with pkgs; ### DESKTOP ENVIRONMENTS - clearlooks-phenix = callPackage ../misc/themes/gtk3/clearlooks-phenix { }; + clearlooks-phenix = callPackage ../misc/themes/clearlooks-phenix { }; enlightenment = recurseIntoAttrs (callPackage ../desktops/enlightenment { callPackage = newScope pkgs.enlightenment; From 090947b2859b3c51e7a763a2a5d9311a2165d283 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 15 Sep 2017 08:52:18 +0800 Subject: [PATCH 113/172] go-ethereum: 1.6.7 -> 1.7.0 --- pkgs/applications/altcoins/go-ethereum.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix index 1911f4081b11..4cf68fb76fd6 100644 --- a/pkgs/applications/altcoins/go-ethereum.nix +++ b/pkgs/applications/altcoins/go-ethereum.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "go-ethereum-${version}"; - version = "1.6.7"; + version = "1.7.0"; goPackagePath = "github.com/ethereum/go-ethereum"; # Fixes Cgo related build failures (see https://github.com/NixOS/nixpkgs/issues/25959 ) @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "ethereum"; repo = "go-ethereum"; rev = "v${version}"; - sha256 = "19cq0pmif4y33v34jzvam4mcszl8vf2saf2gzfz01l4x1iv4hf1r"; + sha256 = "0ybjaiyrfb320rab6a5r9iiqvkrcd8b2qvixzx0kjmc4a7l1q5zh"; }; # Fix cyclic referencing on Darwin @@ -23,9 +23,10 @@ buildGoPackage rec { done ''; - meta = { + meta = with stdenv.lib; { homepage = https://ethereum.github.io/go-ethereum/; description = "Official golang implementation of the Ethereum protocol"; - license = with lib.licenses; [ lgpl3 gpl3 ]; + license = with licenses; [ lgpl3 gpl3 ]; + maintainers = [ maintainers.adisbladis ]; }; } From d0090c0941109482045f3a95ad55c15d72068394 Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Thu, 14 Sep 2017 14:15:39 +0100 Subject: [PATCH 114/172] bitlbee-facebook: 1.1.1 -> 1.1.2 --- .../instant-messengers/bitlbee-facebook/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix index 14a0a54fedac..94490d9f0341 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix @@ -3,13 +3,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "bitlbee-facebook-${version}"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { rev = "v${version}"; - owner = "jgeboski"; + owner = "bitlbee"; repo = "bitlbee-facebook"; - sha256 = "08ibjqqcrmq1a5nmj8z93rjrdabi0yy2a70p31xalnfrh200m24c"; + sha256 = "0kz2sc10iq01vn0hvf06bcdc1rsxz1j77z3mw55slf3j08xr07in"; }; nativeBuildInputs = [ autoconf automake libtool pkgconfig ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "The Facebook protocol plugin for bitlbee"; - homepage = https://github.com/jgeboski/bitlbee-facebook; + homepage = https://github.com/bitlbee/bitlbee-facebook; license = licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; }; From 259d61b34a358c893638b9c15e7aad74c39bf011 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Thu, 14 Sep 2017 12:26:04 +0200 Subject: [PATCH 115/172] xorriso: 1.4.6 -> 1.4.8 See http://lists.gnu.org/archive/html/info-gnu/2017-09/msg00009.html for release information --- pkgs/tools/cd-dvd/xorriso/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/cd-dvd/xorriso/default.nix b/pkgs/tools/cd-dvd/xorriso/default.nix index d0d220b1de80..b91a59006e94 100644 --- a/pkgs/tools/cd-dvd/xorriso/default.nix +++ b/pkgs/tools/cd-dvd/xorriso/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libcdio, zlib, bzip2, readline, acl, attr }: stdenv.mkDerivation rec { - name = "xorriso-1.4.6"; + name = "xorriso-1.4.8"; src = fetchurl { url = "mirror://gnu/xorriso/${name}.tar.gz"; - sha256 = "112p0ghwzxrcjbsir1n2jxhq103ckrw93wzvd55qqvzfgs674vsj"; + sha256 = "10c44yr3dpmwxa7rf23mwfsy1bahny3jpcg9ig0xjv090jg0d0pc"; }; doCheck = true; From 0e09b79bcc78c7c1dea6ef436177cfd9160b6581 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Thu, 14 Sep 2017 19:40:21 +0700 Subject: [PATCH 116/172] maintainer: change email --- lib/maintainers.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index a78539ffb6d3..314e2502d135 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -304,7 +304,7 @@ kiloreux = "Kiloreux Emperex "; kkallio = "Karn Kallio "; knedlsepp = "Josef Kemetmüller "; - konimex = "Muhammad Herdiansyah "; + konimex = "Muhammad Herdiansyah "; koral = "Koral "; kovirobi = "Kovacsics Robert "; kragniz = "Louis Taylor "; From 25944370e1d0dd0ba231e3a6fd78413a0b4403d5 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Thu, 14 Sep 2017 19:54:29 +0700 Subject: [PATCH 117/172] neofetch: 3.2.0 -> 3.3.0 --- pkgs/tools/misc/neofetch/default.nix | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/misc/neofetch/default.nix b/pkgs/tools/misc/neofetch/default.nix index ea2b863cd776..de4a22ee9e47 100644 --- a/pkgs/tools/misc/neofetch/default.nix +++ b/pkgs/tools/misc/neofetch/default.nix @@ -2,26 +2,14 @@ stdenv.mkDerivation rec { name = "neofetch-${version}"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "dylanaraps"; repo = "neofetch"; rev = version; - sha256 = "1skkclvkqayqsbywja2fhv18l4rn9kg2da6bkip82zrwd713akl3"; + sha256 = "1f1hvd635wv81qg802jdi0yggi4631w9nlznipaxkvk4y1zpdq5j"; }; - # This patch is only needed so that Neofetch 3.2.0 can look for - # configuration file, w3m directory (for fetching images) and ASCII - # directory properly. It won't be needed in subsequent releases. - patches = [ - (fetchpatch { - name = "nixos.patch"; - url = "https://github.com/konimex/neofetch/releases/download/3.2.0/nixos.patch"; - sha256 = "0c6vsa74bxq6qlgbv3rrkhzkpvnq4304s6y2r1bl0sachyakaljy"; - }) - ]; - - dontBuild = true; From 95f88c458b589fbfa30a0a481ee52b76beb06c12 Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Thu, 14 Sep 2017 13:26:22 -0400 Subject: [PATCH 118/172] PyWebDAV: Fix src url --- .../python-modules/pywebdav/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pywebdav/default.nix b/pkgs/development/python-modules/pywebdav/default.nix index a69c8568aca6..c228e44f893f 100644 --- a/pkgs/development/python-modules/pywebdav/default.nix +++ b/pkgs/development/python-modules/pywebdav/default.nix @@ -1,18 +1,18 @@ -{ lib, fetchurl, buildPythonPackage, isPy3k }: +{ stdenv, fetchPypi, buildPythonPackage, isPy3k }: buildPythonPackage rec { - pname = "pywebdav"; - name = "${pname}-${version}"; + pname = "PyWebDAV"; version = "0.9.8"; + name = "${pname}-${version}"; disabled = isPy3k; - src = fetchurl { - url = "mirror://pypi/p/pywebdav/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "1v10vg79h85milnq8w7yd75qq5z6297ywkn9b2kxajldzwqxn3ji"; }; - meta = { + meta = with stdenv.lib; { homepage = http://code.google.com/p/pywebdav/; description = "WebDAV library including a standalone server for python"; - maintainers = with lib.maintainers; [ johbo ]; - license = lib.licenses.gpl2Plus; + maintainers = with maintainers; [ johbo ]; + license = licenses.gpl2Plus; }; } From 608045aed54c3579923d54c533b2d57a09c361e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 15 Sep 2017 10:06:38 +0200 Subject: [PATCH 119/172] abcMIDI: init at 2017.06.10 --- pkgs/tools/audio/abcmidi/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/tools/audio/abcmidi/default.nix diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix new file mode 100644 index 000000000000..cbb674f3801c --- /dev/null +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "abcMIDI-${version}"; + version = "2017.06.10"; + + src = fetchFromGitHub { + owner = "leesavide"; + repo = "abcmidi"; + rev = name; + sha256 = "0y92m3mj63vvy79ksq4z5hgkz6w50drg9a4bmbk6jylny0l0bdpy"; + }; + + # There is also a file called "makefile" which seems to be preferred by the standard build phase + makefile = "Makefile"; + + meta = with stdenv.lib; { + homepage = http://abc.sourceforge.net/abcMIDI/; + license = licenses.gpl2Plus; + description = "abc <-> MIDI conversion utilities"; + maintainers = [ maintainers.dotlambda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f3f49d1625b5..4e6ae6cc03f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -362,6 +362,8 @@ with pkgs; a2ps = callPackage ../tools/text/a2ps { }; + abcmidi = callPackage ../tools/audio/abcmidi { }; + abduco = callPackage ../tools/misc/abduco { }; acbuild = callPackage ../applications/misc/acbuild { }; From b86fd340f077e89c54d88e33dd294eef32acd0fd Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 15 Sep 2017 11:27:20 +0200 Subject: [PATCH 120/172] nixUnstable: 1.12pre5511_c94f3d55 -> 1.12pre5619_346aeee1 --- pkgs/tools/package-management/nix/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 3d0c89091779..2192113711c7 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, fetchFromGitHub, perl, curl, bzip2, sqlite, openssl ? null, xz , pkgconfig, boehmgc, perlPackages, libsodium, aws-sdk-cpp, brotli, readline , autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook5_xsl -, libseccomp, busybox +, libseccomp, busybox, nlohmann_json , hostPlatform , storeDir ? "/nix/store" , stateDir ? "/nix/var" @@ -39,7 +39,7 @@ let buildInputs = [ curl openssl sqlite xz ] ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium - ++ lib.optionals fromGit [ brotli readline ] # Since 1.12 + ++ lib.optionals fromGit [ brotli readline nlohmann_json ] # Since 1.12 ++ lib.optional stdenv.isLinux libseccomp ++ lib.optional ((stdenv.isLinux || stdenv.isDarwin) && is112) (aws-sdk-cpp.override { @@ -161,12 +161,12 @@ in rec { nixUnstable = (lib.lowPrio (common rec { name = "nix-1.12${suffix}"; - suffix = "pre5511_c94f3d55"; + suffix = "pre5619_346aeee1"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "c94f3d5575d7af5403274d1e9e2f3c9d72989751"; - sha256 = "1akfzzm4f07wj6l7za916xv5rnh71pk3vl8dphgradjfqb37bv18"; + rev = "346aeee1cb21b5cab5ddc3e8658c88321f513761"; + sha256 = "0lyrs0mqnh89w1nzrqpxvnh7bdjpg8j22xaidql47f1nwbblmn3f"; }; fromGit = true; })) // { perl-bindings = perl-bindings { nix = nixUnstable; }; }; From 3b5245f0c4bab768cb69b72553def28d0a426720 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 15 Sep 2017 04:35:30 -0500 Subject: [PATCH 121/172] dmd: remove broken flag --- pkgs/development/compilers/dmd/2.067.1.nix | 1 - pkgs/development/compilers/dmd/default.nix | 1 - 2 files changed, 2 deletions(-) diff --git a/pkgs/development/compilers/dmd/2.067.1.nix b/pkgs/development/compilers/dmd/2.067.1.nix index 7134aa6888b0..3cf530e9e5e8 100644 --- a/pkgs/development/compilers/dmd/2.067.1.nix +++ b/pkgs/development/compilers/dmd/2.067.1.nix @@ -153,7 +153,6 @@ stdenv.mkDerivation rec { # https://github.com/dlang/dmd/pull/6680 license = licenses.boost; platforms = platforms.unix; - broken = true; }; } diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index f84253708e69..2b29ba9aa3e8 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -160,6 +160,5 @@ stdenv.mkDerivation rec { license = licenses.boost; maintainers = with maintainers; [ ThomasMader ]; platforms = platforms.unix; - broken = true; }; } From 140136ad9567a23b0d88ca014b2604e1820d74f2 Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Thu, 14 Sep 2017 13:15:06 -0400 Subject: [PATCH 122/172] mdp: disable tests --- .../python-modules/mdp/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +--------------- 2 files changed, 26 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/mdp/default.nix diff --git a/pkgs/development/python-modules/mdp/default.nix b/pkgs/development/python-modules/mdp/default.nix new file mode 100644 index 000000000000..28f6057e5633 --- /dev/null +++ b/pkgs/development/python-modules/mdp/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytest_29, future, numpy }: + +buildPythonPackage rec { + pname = "MDP"; + version = "3.5"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0aw1zxmyvx6gfmmnixbqmdaah28jl7rmqkzhxv53091asc23iw9k"; + }; + + checkInputs = [ pytest_29 ]; + propagatedBuildInputs = [ future numpy ]; + + # Tests disabled because of missing dependencies not in nix + doCheck = false; + + meta = with stdenv.lib; { + description = "Library for building complex data processing software by combining widely used machine learning algorithms"; + homepage = http://mdp-toolkit.sourceforge.net; + license = licenses.bsd3; + maintainers = with maintainers; [ nico202 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6ba77d3e45a4..d3c2b3ac5768 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3626,27 +3626,7 @@ in { }; }; - MDP = buildPythonPackage rec { - version = "3.5"; - name = "MDP-${version}"; - - src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/source/M/MDP/${name}.tar.gz"; - sha256 = "0aw1zxmyvx6gfmmnixbqmdaah28jl7rmqkzhxv53091asc23iw9k"; - }; - - buildInputs = with self; [ pytest_29 ]; - propagatedBuildInputs = with self; [ future numpy ]; - - doCheck = true; - - meta = { - description = "Library for building complex data processing software by combining widely used machine learning algorithms"; - homepage = http://mdp-toolkit.sourceforge.net; - license = licenses.bsd3; - maintainers = with maintainers; [ nico202 ]; - }; - }; + MDP = callPackage ../development/python-modules/mdp {}; minidb = buildPythonPackage rec { name = "minidb-2.0.1"; From 0783efb41cd4db584102b331bff561e8e7274268 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Fri, 15 Sep 2017 10:43:09 +0000 Subject: [PATCH 123/172] google-instance-setup: add openssh to path --- nixos/modules/virtualisation/google-compute-image.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index 4a8dadaa281d..e3b3e6a5f4ab 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -117,7 +117,7 @@ in before = ["sshd.service"]; wants = ["local-fs.target" "network-online.target" "network.target"]; wantedBy = [ "sshd.service" "multi-user.target" ]; - path = with pkgs; [ ethtool ]; + path = with pkgs; [ ethtool openssh ]; serviceConfig = { ExecStart = "${gce}/bin/google_instance_setup --debug"; Type = "oneshot"; From 33b09c0f0eb068904776a6b339406a608526d4f9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 15 Sep 2017 13:55:23 +0200 Subject: [PATCH 124/172] ghc-7.2.2 is broken --- pkgs/development/compilers/ghc/7.2.2.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/ghc/7.2.2.nix b/pkgs/development/compilers/ghc/7.2.2.nix index 156ff56bd663..a8faa8f63be1 100644 --- a/pkgs/development/compilers/ghc/7.2.2.nix +++ b/pkgs/development/compilers/ghc/7.2.2.nix @@ -61,6 +61,7 @@ stdenv.mkDerivation rec { ]; platforms = ["x86_64-linux" "i686-linux"]; # Darwin is unsupported. inherit (ghc.meta) license; + broken = true; # https://hydra.nixos.org/build/60616815 }; } From 2edb7e9b2d8ff5db64beb49353353887610d83fb Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Fri, 15 Sep 2017 14:06:51 +0200 Subject: [PATCH 125/172] ruby: 2.4.1 -> 2.4.2 (#29417) --- pkgs/development/interpreters/ruby/default.nix | 8 ++++---- pkgs/development/interpreters/ruby/patchsets.nix | 2 +- pkgs/top-level/all-packages.nix | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 7169d09e4127..b4cd9f3f4180 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -212,11 +212,11 @@ in { }; }; - ruby_2_4_1 = generic { - version = rubyVersion "2" "4" "1" ""; + ruby_2_4_2 = generic { + version = rubyVersion "2" "4" "2" ""; sha256 = { - src = "0l0201fqwzwygnrgxay469gbb2w865bnqckq00x3prdmbh6y2c53"; - git = "1gjn31ymypzzcwkrjx62hqw59fywz1x3cyvmi1f2yb9bwb3659ss"; + src = "174cdiz3am1f76vsnm3iqi9c5vqphypbf9kbxx6vqqmj01gfgfck"; + git = "1w83kzak3m6vv3k09ynfw9vpgc7vpmij3x3zmgrhwm4ds1sp5irl"; }; }; } diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index f6ecb7c8e285..cdf1bf26717f 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -34,7 +34,7 @@ rec { "${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch" ]; - "2.4.1" = ops useRailsExpress [ + "2.4.2" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.4/head/railsexpress/01-skip-broken-tests.patch" "${patchSet}/patches/ruby/2.4/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.4/head/railsexpress/03-display-more-detailed-stack-trace.patch" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c0e430ddac08..e2c7ac55350e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6584,7 +6584,7 @@ with pkgs; ruby_2_1_10 ruby_2_2_7 ruby_2_3_4 - ruby_2_4_1; + ruby_2_4_2; # Ruby aliases ruby = ruby_2_3; @@ -6592,7 +6592,7 @@ with pkgs; ruby_2_1 = ruby_2_1_10; ruby_2_2 = ruby_2_2_7; ruby_2_3 = ruby_2_3_4; - ruby_2_4 = ruby_2_4_1; + ruby_2_4 = ruby_2_4_2; scsh = callPackage ../development/interpreters/scsh { }; From 49fac1f824a925a46e91b2648ebc619f3255eec6 Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Fri, 15 Sep 2017 09:15:54 -0400 Subject: [PATCH 126/172] moto: 0.4.25 -> 0.4.31 --- .../python-modules/moto/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +------------ 2 files changed, 33 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/moto/default.nix diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix new file mode 100644 index 000000000000..cf74e1dc1342 --- /dev/null +++ b/pkgs/development/python-modules/moto/default.nix @@ -0,0 +1,32 @@ +{ stdenv, buildPythonPackage, fetchPypi, jinja2, werkzeug, flask, requests, pytz +, six, boto, httpretty, xmltodict, nose, sure, boto3, freezegun, dateutil }: + +buildPythonPackage rec { + pname = "moto"; + version = "0.4.31"; + name = "moto-${version}"; + src = fetchPypi { + inherit pname version; + sha256 = "19s8hfz4mzzzdksa0ddlvrga5mxdaqahk89p5l29a5id8127shr8"; + }; + + propagatedBuildInputs = [ + boto + dateutil + flask + httpretty + jinja2 + pytz + werkzeug + requests + six + xmltodict + ]; + + checkInputs = [ boto3 nose sure freezegun ]; + + checkPhase = "nosetests"; + + # TODO: make this true; I think lots of the tests want network access but we can probably run the others + doCheck = false; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bc55c414aa05..66974520dba8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12332,27 +12332,7 @@ in { moretools = callPackage ../development/python-modules/moretools { }; - moto = buildPythonPackage rec { - version = "0.4.25"; - name = "moto-${version}"; - src = pkgs.fetchurl { - url = "http://pypi.python.org/packages/df/9e/0b22ac0abf61711c86ae75a0548825e19cc123b522ff3508cbc43924969d/moto-0.4.25.tar.gz"; - sha256 = "1gqm7h6bm5xkspd07bnjwdr2q6cvpxkayx0hkgk8fhkawbg0fqq7"; - }; - - propagatedBuildInputs = with self; [ - # Main dependencies - jinja2 werkzeug flask requests six boto httpretty xmltodict - # For tests - nose sure boto3 freezegun - ]; - - checkPhase = "nosetests"; - - # TODO: make this true; I think lots of the tests want network access but we can probably run the others - doCheck = false; - }; - + moto = callPackage ../development/python-modules/moto {}; mox = buildPythonPackage rec { name = "mox-0.5.3"; From 3f7ac9217531813f2f629c0706e2a560238c27e9 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Fri, 15 Sep 2017 16:04:08 +0200 Subject: [PATCH 127/172] tinycc: 0.9.27pre-20170821 -> 0.9.27pre-20170911 Contains various fixes. --- pkgs/development/compilers/tinycc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index 094007aa2d0f..8e56c1ee50b3 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -2,10 +2,10 @@ with stdenv.lib; let - date = "20170821"; + date = "20170911"; + rev = "870271ea071971002fa556e09e1873db316fa1a9"; + sha256 = "1a9djm0p7cd5nzqdhch9y48c4wai76x6d4nwx0bj5jz46ws39bs9"; version = "0.9.27pre-${date}"; - rev = "b8fe8fc2105455eb5004be89fa8575aa928a18f3"; - sha256 = "0rsv5pikm7ai2n7r93qlbvkyky23dsgc3sdc83crbcxjjk6xh378"; in stdenv.mkDerivation rec { From 6dad1f70ce5a7788bfd1487c8ecbc0036a34ddf8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 15 Sep 2017 16:38:33 +0200 Subject: [PATCH 128/172] nix: 1.11.14 -> 1.11.15 --- nixos/modules/installer/tools/nix-fallback-paths.nix | 6 +++--- pkgs/tools/package-management/nix/default.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index 62c292eea6dd..321fb9a2030a 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,5 +1,5 @@ { - x86_64-linux = "/nix/store/xrqssm90gsrnqdn79rpfcs6dwx8597d2-nix-1.11.14"; - i686-linux = "/nix/store/3vjphivqs2iy6m9yb3bd80nd3518510k-nix-1.11.14"; - x86_64-darwin = "/nix/store/4j9jacx8mjd4jlj53wvymyhxq7dqyj5d-nix-1.11.14"; + x86_64-linux = "/nix/store/b4s1gxiis1ryvybnjhdjvgc5sr1nq0ys-nix-1.11.15"; + i686-linux = "/nix/store/kgb5hs7qw13bvb6icramv1ry9dard3h9-nix-1.11.15"; + x86_64-darwin = "/nix/store/dgwz3dxdzs2wwd7pg7cdhvl8rv0qpnbj-nix-1.11.15"; } diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 2192113711c7..e90f71780ebd 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -152,10 +152,10 @@ in rec { nix = nixStable; nixStable = (common rec { - name = "nix-1.11.14"; + name = "nix-1.11.15"; src = fetchurl { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; - sha256 = "26593c831addf1d40f6b7d131f394cb0f9fbec9e46471369faed16eaa2c4b7e4"; + sha256 = "d20f20e45d519f54fae5c61d55eadcf53e6d7cdbde9870eeec80d499f9805165"; }; }) // { perl-bindings = nixStable; }; From baaed4c80151c3f3d02160f86b3bdecadd55445c Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 14 Sep 2017 19:23:53 -0400 Subject: [PATCH 129/172] linux-headers: Remove dead old version This sat around unused for who knows how long --- .../linux/kernel-headers/default.nix | 29 ------------------- 1 file changed, 29 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel-headers/default.nix diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix deleted file mode 100644 index da67747b8b24..000000000000 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, kernel, perl -, hostPlatform -}: - -let - baseBuildFlags = [ "INSTALL_HDR_PATH=$(out)" "headers_install" ]; -in stdenv.mkDerivation { - name = "linux-headers-${kernel.version}"; - - inherit (kernel) src patches; - - nativeBuildInputs = [ perl ]; - - buildFlags = [ "ARCH=${stdenv.platform.kernelArch}" ] ++ baseBuildFlags; - - crossAttrs = { - inherit (kernel.crossDrv) src patches; - buildFlags = [ "ARCH=${hostPlatform.platform.kernelArch}" ] ++ baseBuildFlags; - }; - - installPhase = '' - find $out \( -name ..install.cmd -o -name .install \) -print0 | xargs -0 rm - ''; - - # Headers shouldn't reference anything else - allowedReferences = []; - - meta.platforms = stdenv.lib.platforms.linux; -} From c13cf47e7971cd94553d55caca6a004dc72c98e1 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 14 Sep 2017 19:24:48 -0400 Subject: [PATCH 130/172] linux-headers 4.4: Remove arch fallback code @dezgeg was right: The `platform` field of a linux platorm is already manadatory---if not specified it is inferred, and all such inferences include a `kernelArch` field. Therefore linux packages can indeed rely on it being defined. --- pkgs/os-specific/linux/kernel-headers/4.4.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/kernel-headers/4.4.nix b/pkgs/os-specific/linux/kernel-headers/4.4.nix index 716ad799bc64..0ef5280d13b6 100644 --- a/pkgs/os-specific/linux/kernel-headers/4.4.nix +++ b/pkgs/os-specific/linux/kernel-headers/4.4.nix @@ -20,12 +20,7 @@ stdenvNoCC.mkDerivation { targetConfig = if hostPlatform != buildPlatform then hostPlatform.config else null; - platform = hostPlatform.platform.kernelArch or ( - if hostPlatform.system == "i686-linux" then "i386" else - if hostPlatform.system == "x86_64-linux" then "x86_64" else - if hostPlatform.system == "powerpc-linux" then "powerpc" else - if hostPlatform.isArm then "arm" else - abort "don't know what the kernel include directory is called for this platform"); + platform = hostPlatform.platform.kernelArch; # It may look odd that we use `stdenvNoCC`, and yet explicit depend on a cc. # We do this so we have a build->build, not build->host, C compiler. From 7b866fdff90c6400e3c82c45e7390adc4563eb91 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Fri, 15 Sep 2017 17:49:17 +0200 Subject: [PATCH 131/172] chromium: create libexec output dir in installphase --- pkgs/applications/networking/browsers/chromium/browser.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 49c9dfef8c55..62059dd95993 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -12,7 +12,7 @@ mkChromiumDerivation (base: rec { sandboxExecutableName = "__chromium-suid-sandbox"; installPhase = '' - mkdir -p "$libExecPath " + mkdir -p "$libExecPath/chromium" cp -v "$buildPath/"*.pak "$buildPath/"*.bin "$libExecPath/" cp -v "$buildPath/icudtl.dat" "$libExecPath/" cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/" From f4dfa30d24caa2260e43f02cd1bdcd6379799c99 Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 14 Sep 2017 22:12:08 +0200 Subject: [PATCH 132/172] tinc_pre: 1.1pre14 -> 1.1pre15 Remove an obsolete patch Add lassulus to maintainers Supply the build with the correct version number and changelog --- pkgs/tools/networking/tinc/pre.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix index 38ba5accbb33..0f5fd2836921 100644 --- a/pkgs/tools/networking/tinc/pre.nix +++ b/pkgs/tools/networking/tinc/pre.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "tinc-${version}"; - version = "1.1pre14"; + version = "1.1pre15"; src = fetchgit { rev = "refs/tags/release-${version}"; url = "git://tinc-vpn.org/tinc"; - sha256 = "05an2vj0a3wjv5w672wgzyixbydin5jpja5zv6x81bc72dms0ymc"; + sha256 = "1msym63jpipvzb5dn8yn8yycrii43ncfq6xddxh2ifrakr48l6y5"; }; outputs = [ "out" "man" "info" ]; @@ -15,18 +15,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook texinfo ]; buildInputs = [ ncurses readline zlib lzo openssl ]; + # needed so the build doesn't need to run git to find out the version. prePatch = '' substituteInPlace configure.ac --replace UNKNOWN ${version} + echo "${version}" > configure-version + echo "https://tinc-vpn.org/git/browse?p=tinc;a=log;h=refs/tags/release-${version}" > ChangeLog + sed -i '/AC_INIT/s/m4_esyscmd_s.*/${version})/' configure.ac ''; - patches = [ - # Avoid infinite loop with "Error while reading from Linux tun/tap device (tun mode) /dev/net/tun: File descriptor in bad state" on network restart - (fetchpatch { - url = https://github.com/gsliepen/tinc/compare/acefa66...e4544db.patch; - sha256 = "1jz7anqqzk7j96l5ifggc2knp14fmbsjdzfrbncxx0qhb6ihdcvn"; - }) - ]; - postInstall = '' rm $out/bin/tinc-gui ''; @@ -47,6 +43,6 @@ stdenv.mkDerivation rec { homepage="http://www.tinc-vpn.org/"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington fpletz ]; + maintainers = with maintainers; [ wkennington fpletz lassulus ]; }; } From 1ecf3e862f40fa87afdc7492282e48f4889f02ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 13 Sep 2017 00:28:42 +0100 Subject: [PATCH 133/172] zfsUnstable: init at 2017-09-12 --- nixos/modules/rename.nix | 1 - nixos/modules/tasks/filesystems/zfs.nix | 19 +- pkgs/os-specific/linux/spl/default.nix | 103 +++++----- pkgs/os-specific/linux/zfs/default.nix | 249 ++++++++++++++---------- pkgs/top-level/all-packages.nix | 22 ++- 5 files changed, 240 insertions(+), 154 deletions(-) diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index fcf4c32d2778..deff4067957a 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -192,7 +192,6 @@ with lib; "Set the option `services.xserver.displayManager.sddm.package' instead.") (mkRemovedOptionModule [ "fonts" "fontconfig" "forceAutohint" ] "") (mkRemovedOptionModule [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ] "") - (mkRemovedOptionModule [ "boot" "zfs" "enableUnstable" ] "0.7.0 is now the default") # ZSH (mkRenamedOptionModule [ "programs" "zsh" "enableSyntaxHighlighting" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ]) diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index f300091b11ee..145fae432c65 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -24,7 +24,11 @@ let kernel = config.boot.kernelPackages; - packages = { + packages = if config.boot.zfs.enableUnstable then { + spl = kernel.splUnstable; + zfs = kernel.zfsUnstable; + zfsUser = pkgs.zfsUnstable; + } else { spl = kernel.spl; zfs = kernel.zfs; zfsUser = pkgs.zfs; @@ -58,6 +62,19 @@ in options = { boot.zfs = { + enableUnstable = mkOption { + type = types.bool; + default = false; + description = '' + Use the unstable zfs package. This might be an option, if the latest + kernel is not yet supported by a published release of ZFS. Enabling + this option will install a development version of ZFS on Linux. The + version will have already passed an extensive test suite, but it is + more likely to hit an undiscovered bug compared to running a released + version of ZFS on Linux. + ''; + }; + extraPools = mkOption { type = types.listOf types.str; default = []; diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 227b67e44863..2d8ee2719da9 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -10,53 +10,66 @@ with stdenv.lib; let buildKernel = any (n: n == configFile) [ "kernel" "all" ]; buildUser = any (n: n == configFile) [ "user" "all" ]; + common = { version + , sha256 + , rev ? "spl-${version}" + } @ args : stdenv.mkDerivation rec { + name = "spl-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}"; + + src = fetchFromGitHub { + owner = "zfsonlinux"; + repo = "spl"; + inherit rev sha256; + }; + + patches = [ ./const.patch ./install_prefix.patch ]; + + nativeBuildInputs = [ autoreconfHook ]; + + hardeningDisable = [ "pic" ]; + + preConfigure = '' + substituteInPlace ./module/spl/spl-generic.c --replace /usr/bin/hostid hostid + substituteInPlace ./module/spl/spl-generic.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:${gawk}:/bin" + substituteInPlace ./module/splat/splat-vnode.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin" + substituteInPlace ./module/splat/splat-linux.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin" + ''; + + configureFlags = [ + "--with-config=${configFile}" + ] ++ optionals buildKernel [ + "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source" + "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; + + enableParallelBuilding = true; + + meta = { + description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)"; + + longDescription = '' + This kernel module is a porting layer for ZFS to work inside the linux + kernel. + ''; + + homepage = http://zfsonlinux.org/; + platforms = platforms.linux; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ jcumming wizeman wkennington fpletz globin ]; + }; + }; in assert any (n: n == configFile) [ "kernel" "user" "all" ]; assert buildKernel -> kernel != null; -stdenv.mkDerivation rec { - name = "spl-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}"; - version = "0.7.1"; +{ + splStable = common { + version = "0.7.1"; + sha256 = "0m8qhbdd8n40lbd91s30q4lrw8g169sha0410c8rwk2d5qfaxv9n"; + }; - src = fetchFromGitHub { - owner = "zfsonlinux"; - repo = "spl"; - rev = "spl-${version}"; - sha256 = "0m8qhbdd8n40lbd91s30q4lrw8g169sha0410c8rwk2d5qfaxv9n"; - }; - - patches = [ ./const.patch ./install_prefix.patch ]; - - nativeBuildInputs = [ autoreconfHook ]; - - hardeningDisable = [ "pic" ]; - - preConfigure = '' - substituteInPlace ./module/spl/spl-generic.c --replace /usr/bin/hostid hostid - substituteInPlace ./module/spl/spl-generic.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:${gawk}:/bin" - substituteInPlace ./module/splat/splat-vnode.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin" - substituteInPlace ./module/splat/splat-linux.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin" - ''; - - configureFlags = [ - "--with-config=${configFile}" - ] ++ optionals buildKernel [ - "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source" - "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" - ]; - - enableParallelBuilding = true; - - meta = { - description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)"; - - longDescription = '' - This kernel module is a porting layer for ZFS to work inside the linux - kernel. - ''; - - homepage = http://zfsonlinux.org/; - platforms = platforms.linux; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ jcumming wizeman wkennington fpletz globin ]; - }; + splUnstable = common { + version = "2017-08-11"; + rev = "9df9692637aeee416f509c7f39655beb2d35b549"; + sha256 = "1dggf6xqgk2f7vccv6cgvr8krj7h9f921szp1j2qbxnnq41m37mi"; + }; } diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 48389a758b71..c3af49e08f20 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -13,112 +13,163 @@ let buildKernel = any (n: n == configFile) [ "kernel" "all" ]; buildUser = any (n: n == configFile) [ "user" "all" ]; -in stdenv.mkDerivation rec { - name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}"; - version = "0.7.1"; + common = { version + , sha256 + , extraPatches + , spl + , rev ? "zfs-${version}" + , isUnstable ? false + , incompatibleKernelVersion ? null } @ args: + if buildKernel && + (incompatibleKernelVersion != null) && + versionAtLeast kernel.version incompatibleKernelVersion then + throw '' + Linux v${kernel.version} is not yet supported by zfsonlinux v${version}. + ${stdenv.lib.optional (!isUnstable) "Try zfsUnstable or set the NixOS option boot.zfs.enableUnstable."} + '' + else stdenv.mkDerivation rec { + name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}"; + + src = fetchFromGitHub { + owner = "zfsonlinux"; + repo = "zfs"; + inherit rev sha256; + }; + + patches = extraPatches; + + buildInputs = [ autoreconfHook nukeReferences ] + ++ optionals buildKernel [ spl ] + ++ optionals buildUser [ zlib libuuid python attr ]; + + # for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work + NIX_CFLAGS_LINK = "-lgcc_s"; + + hardeningDisable = [ "pic" ]; + + preConfigure = '' + substituteInPlace ./module/zfs/zfs_ctldir.c --replace "umount -t zfs" "${utillinux}/bin/umount -t zfs" + substituteInPlace ./module/zfs/zfs_ctldir.c --replace "mount -t zfs" "${utillinux}/bin/mount -t zfs" + substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/umount" "${utillinux}/bin/umount" + substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/mount" "${utillinux}/bin/mount" + substituteInPlace ./cmd/ztest/ztest.c --replace "/usr/sbin/ztest" "$out/sbin/ztest" + substituteInPlace ./cmd/ztest/ztest.c --replace "/usr/sbin/zdb" "$out/sbin/zdb" + substituteInPlace ./config/user-systemd.m4 --replace "/usr/lib/modules-load.d" "$out/etc/modules-load.d" + substituteInPlace ./config/zfs-build.m4 --replace "\$sysconfdir/init.d" "$out/etc/init.d" + substituteInPlace ./etc/zfs/Makefile.am --replace "\$(sysconfdir)" "$out/etc" + substituteInPlace ./cmd/zed/Makefile.am --replace "\$(sysconfdir)" "$out/etc" + substituteInPlace ./module/Makefile.in --replace "/bin/cp" "cp" + substituteInPlace ./etc/systemd/system/zfs-share.service.in \ + --replace "@bindir@/rm " "${coreutils}/bin/rm " + + for f in ./udev/rules.d/* + do + substituteInPlace "$f" --replace "/lib/udev/vdev_id" "$out/lib/udev/vdev_id" + done + + ./autogen.sh + ''; + + configureFlags = [ + "--with-config=${configFile}" + ] ++ optionals buildUser [ + "--with-dracutdir=$(out)/lib/dracut" + "--with-udevdir=$(out)/lib/udev" + "--with-systemdunitdir=$(out)/etc/systemd/system" + "--with-systemdpresetdir=$(out)/etc/systemd/system-preset" + "--with-mounthelperdir=$(out)/bin" + "--sysconfdir=/etc" + "--localstatedir=/var" + "--enable-systemd" + ] ++ optionals buildKernel [ + "--with-spl=${spl}/libexec/spl" + "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source" + "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; + + enableParallelBuilding = true; + + installFlags = [ + "sysconfdir=\${out}/etc" + "DEFAULT_INITCONF_DIR=\${out}/default" + ]; + + postInstall = '' + # Prevent kernel modules from depending on the Linux -dev output. + nuke-refs $(find $out -name "*.ko") + '' + optionalString buildUser '' + # Remove provided services as they are buggy + rm $out/etc/systemd/system/zfs-import-*.service + + sed -i '/zfs-import-scan.service/d' $out/etc/systemd/system/* + + for i in $out/etc/systemd/system/*; do + substituteInPlace $i --replace "zfs-import-cache.service" "zfs-import.target" + done + + # Fix pkgconfig. + ln -s ../share/pkgconfig $out/lib/pkgconfig + + # Remove tests because they add a runtime dependency on gcc + rm -rf $out/share/zfs/zfs-tests + ''; + + outputs = [ "out" ] ++ optionals buildUser [ "lib" "dev" ]; + + meta = { + description = "ZFS Filesystem Linux Kernel module"; + longDescription = '' + ZFS is a filesystem that combines a logical volume manager with a + Copy-On-Write filesystem with data integrity detection and repair, + snapshotting, cloning, block devices, deduplication, and more. + ''; + home = http://zfsonlinux.org/; + license = licenses.cddl; + platforms = platforms.linux; + maintainers = with maintainers; [ jcumming wizeman wkennington fpletz globin ]; + }; + }; +in { + # also check if kernel version constraints in + # ./nixos/modules/tasks/filesystems/zfs.nix needs + # to be adapted + zfsStable = common { + # comment/uncomment if breaking kernel versions are known + incompatibleKernelVersion = null; + + # this package should point to the latest release. + version = "0.7.1"; - src = fetchFromGitHub { - owner = "zfsonlinux"; - repo = "zfs"; - rev = "zfs-${version}"; sha256 = "0czal6lpl8igrhwmqh5jcgx07rlcgnrfg6ywzf681vsyh3gaxj9n"; + + extraPatches = [ + (fetchpatch { + url = "https://github.com/Mic92/zfs/compare/zfs-0.7.0-rc3...nixos-zfs-0.7.0-rc3.patch"; + sha256 = "1vlw98v8xvi8qapzl1jwm69qmfslwnbg3ry1lmacndaxnyckkvhh"; + }) + ]; + + inherit spl; }; - patches = [ - (fetchpatch { - url = "https://github.com/Mic92/zfs/compare/zfs-0.7.0-rc3...nixos-zfs-0.7.0-rc3.patch"; - sha256 = "1vlw98v8xvi8qapzl1jwm69qmfslwnbg3ry1lmacndaxnyckkvhh"; - }) - ]; + zfsUnstable = common { + # comment/uncomment if breaking kernel versions are known + incompatibleKernelVersion = null; - buildInputs = [ autoreconfHook nukeReferences ] - ++ optionals buildKernel [ spl ] - ++ optionals buildUser [ zlib libuuid python attr ]; + # this package should point to a version / git revision compatible with the latest kernel release + version = "2017-09-12"; - # for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work - NIX_CFLAGS_LINK = "-lgcc_s"; + rev = "ded8f06a3cfee60b3a8ea5309e9c4d0e567ed3b5"; + sha256 = "0yn4fg4a00hpflmmr0jbbhfb921nygpw2xbbjy35abl57k6zk375"; + isUnstable = true; - hardeningDisable = [ "pic" ]; + extraPatches = [ + (fetchpatch { + url = "https://github.com/Mic92/zfs/compare/ded8f06a3cfee...nixos-zfs-2017-09-12.patch"; + sha256 = "033wf4jn0h0kp0h47ai98rywnkv5jwvf3xwym30phnaf8xxdx8aj"; + }) + ]; - preConfigure = '' - substituteInPlace ./module/zfs/zfs_ctldir.c --replace "umount -t zfs" "${utillinux}/bin/umount -t zfs" - substituteInPlace ./module/zfs/zfs_ctldir.c --replace "mount -t zfs" "${utillinux}/bin/mount -t zfs" - substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/umount" "${utillinux}/bin/umount" - substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/mount" "${utillinux}/bin/mount" - substituteInPlace ./cmd/ztest/ztest.c --replace "/usr/sbin/ztest" "$out/sbin/ztest" - substituteInPlace ./cmd/ztest/ztest.c --replace "/usr/sbin/zdb" "$out/sbin/zdb" - substituteInPlace ./config/user-systemd.m4 --replace "/usr/lib/modules-load.d" "$out/etc/modules-load.d" - substituteInPlace ./config/zfs-build.m4 --replace "\$sysconfdir/init.d" "$out/etc/init.d" - substituteInPlace ./etc/zfs/Makefile.am --replace "\$(sysconfdir)" "$out/etc" - substituteInPlace ./cmd/zed/Makefile.am --replace "\$(sysconfdir)" "$out/etc" - substituteInPlace ./module/Makefile.in --replace "/bin/cp" "cp" - substituteInPlace ./etc/systemd/system/zfs-share.service.in \ - --replace "@bindir@/rm " "${coreutils}/bin/rm " - - for f in ./udev/rules.d/* - do - substituteInPlace "$f" --replace "/lib/udev/vdev_id" "$out/lib/udev/vdev_id" - done - - ./autogen.sh - ''; - - configureFlags = [ - "--with-config=${configFile}" - ] ++ optionals buildUser [ - "--with-dracutdir=$(out)/lib/dracut" - "--with-udevdir=$(out)/lib/udev" - "--with-systemdunitdir=$(out)/etc/systemd/system" - "--with-systemdpresetdir=$(out)/etc/systemd/system-preset" - "--with-mounthelperdir=$(out)/bin" - "--sysconfdir=/etc" - "--localstatedir=/var" - "--enable-systemd" - ] ++ optionals buildKernel [ - "--with-spl=${spl}/libexec/spl" - "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source" - "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" - ]; - - enableParallelBuilding = true; - - installFlags = [ - "sysconfdir=\${out}/etc" - "DEFAULT_INITCONF_DIR=\${out}/default" - ]; - - postInstall = '' - # Prevent kernel modules from depending on the Linux -dev output. - nuke-refs $(find $out -name "*.ko") - '' + optionalString buildUser '' - # Remove provided services as they are buggy - rm $out/etc/systemd/system/zfs-import-*.service - - sed -i '/zfs-import-scan.service/d' $out/etc/systemd/system/* - - for i in $out/etc/systemd/system/*; do - substituteInPlace $i --replace "zfs-import-cache.service" "zfs-import.target" - done - - # Fix pkgconfig. - ln -s ../share/pkgconfig $out/lib/pkgconfig - - # Remove tests because they add a runtime dependency on gcc - rm -rf $out/share/zfs/zfs-tests - ''; - - outputs = [ "out" ] ++ optionals buildUser [ "lib" "dev" ]; - - meta = { - description = "ZFS Filesystem Linux Kernel module"; - longDescription = '' - ZFS is a filesystem that combines a logical volume manager with a - Copy-On-Write filesystem with data integrity detection and repair, - snapshotting, cloning, block devices, deduplication, and more. - ''; - homepage = http://zfsonlinux.org/; - license = licenses.cddl; - platforms = platforms.linux; - maintainers = with maintainers; [ jcumming wizeman wkennington fpletz globin ]; + spl = splUnstable; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 659bf3b30d54..a38d87218719 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12376,10 +12376,12 @@ with pkgs; sch_cake = callPackage ../os-specific/linux/sch_cake { }; - spl = callPackage ../os-specific/linux/spl { + inherit (callPackage ../os-specific/linux/spl { configFile = "kernel"; inherit kernel; - }; + }) splStable splUnstable; + + spl = splStable; sysdig = callPackage ../os-specific/linux/sysdig {}; @@ -12403,10 +12405,12 @@ with pkgs; x86_energy_perf_policy = callPackage ../os-specific/linux/x86_energy_perf_policy { }; - zfs = callPackage ../os-specific/linux/zfs { + inherit (callPackage ../os-specific/linux/zfs { configFile = "kernel"; inherit kernel spl; - }; + }) zfsStable zfsUnstable; + + zfs = zfsStable; }); # The current default kernel / kernel modules. @@ -12704,9 +12708,9 @@ with pkgs; statifier = callPackage ../os-specific/linux/statifier { }; - spl = callPackage ../os-specific/linux/spl { + inherit (callPackage ../os-specific/linux/spl { configFile = "user"; - }; + }) splStable splUnstable; sysdig = callPackage ../os-specific/linux/sysdig { kernel = null; @@ -12910,9 +12914,11 @@ with pkgs; zd1211fw = callPackage ../os-specific/linux/firmware/zd1211 { }; - zfs = callPackage ../os-specific/linux/zfs { + inherit (callPackage ../os-specific/linux/zfs { configFile = "user"; - }; + }) zfsStable zfsUnstable; + + zfs = zfsStable; ### DATA From 7904499542814b8a4d04fce8dc7ca8c383c083e7 Mon Sep 17 00:00:00 2001 From: joachim schiele Date: Tue, 15 Aug 2017 12:14:29 +0200 Subject: [PATCH 134/172] dovecot2: added quota, changed pop3 default --- nixos/modules/services/mail/dovecot.nix | 109 +++++++++++++++++++++++- 1 file changed, 108 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix index 3b25e41edb19..135d3b277378 100644 --- a/nixos/modules/services/mail/dovecot.nix +++ b/nixos/modules/services/mail/dovecot.nix @@ -60,6 +60,39 @@ let } '') + '' + protocol imap { + namespace inbox { + inbox=yes + ${concatStringsSep "\n" (map mailboxConfig cfg.mailboxes)} + } + } + '' + + (optionalString cfg.enableQuota '' + mail_plugins = $mail_plugins quota + service quota-status { + executable = ${dovecotPkg}/libexec/dovecot/quota-status -p postfix + inet_listener { + port = ${cfg.quotaPort} + } + client_limit = 1 + } + + protocol imap { + mail_plugins = $mail_plugins imap_quota + } + + plugin { + quota_rule = *:storage=${cfg.quotaGlobalPerUser} + quota = maildir:User quota # per virtual mail user quota # BUG/FIXME broken, we couldn't get this working + quota_status_success = DUNNO + quota_status_nouser = DUNNO + quota_status_overquota = "552 5.2.2 Mailbox is full" + quota_grace = 10%% + } + '') + cfg.extraConfig ]; @@ -68,6 +101,34 @@ let paths = map (pkg: "${pkg}/lib/dovecot") ([ dovecotPkg ] ++ map (module: module.override { dovecot = dovecotPkg; }) cfg.modules); }; + mailboxConfig = mailbox: '' + mailbox ${mailbox.name} { + auto = ${toString mailbox.auto} + '' + optionalString (mailbox.specialUse != null) '' + special_use = \${toString mailbox.specialUse} + '' + "}"; + + mailboxes = { lib, pkgs, ... }: { + options = { + name = mkOption { + type = types.str; + example = "Spam"; + description = "The name of the mailbox."; + }; + auto = mkOption { + type = types.enum [ "no" "create" "subscribe" ]; + default = "no"; + example = "subscribe"; + description = "Whether to automatically create or create and subscribe to the mailbox or not."; + }; + specialUse = mkOption { + type = types.nullOr (types.enum [ "All" "Archive" "Drafts" "Flagged" "Junk" "Sent" "Trash" ]); + default = null; + example = "Junk"; + description = "Null if no special use flag is set. Other than that every use flag mentioned in the RFC is valid."; + }; + }; + }; in { @@ -76,7 +137,7 @@ in enablePop3 = mkOption { type = types.bool; - default = true; + default = false; description = "Start the POP3 listener (when Dovecot is enabled)."; }; @@ -145,6 +206,14 @@ in description = "Default group to store mail for virtual users."; }; + createMailUser = mkOption { + type = types.bool; + default = true; + description = ''Whether to automatically create the user + given in and the group + given in .''; + }; + modules = mkOption { type = types.listOf types.package; default = []; @@ -191,6 +260,36 @@ in default = false; description = "Show the PAM failure message on authentication error (useful for OTPW)."; }; + + mailboxes = mkOption { + type = types.listOf (types.submodule mailboxes); + default = []; + example = [ { name = "Spam"; specialUse = "Junk"; auto = "create"; } ]; + description = "Configure mailboxes and auto create or subscribe them."; + }; + + enableQuota = mkOption { + type = types.bool; + default = false; + example = true; + description = "Whether to enable the dovecot quota service."; + }; + + quotaPort = mkOption { + type = types.str; + default = "12340"; + description = '' + The Port the dovecot quota service binds to. + If using postfix, add check_policy_service inet:localhost:12340 to your smtpd_recipient_restrictions in your postfix config. + ''; + }; + quotaGlobalPerUser = mkOption { + type = types.str; + default = "100G"; + example = "10G"; + description = "Quota limit for the user in bytes. Supports suffixes b, k, M, G, T and %."; + }; + }; @@ -214,11 +313,19 @@ in uid = config.ids.uids.dovecot2; description = "Dovecot user"; group = cfg.group; + } + ++ optional cfg.createMailUser + { name = cfg.mailUser; + description = "Virtual Mail User"; + group = cfg.mailGroup; }; users.extraGroups = optional (cfg.group == "dovecot2") { name = "dovecot2"; gid = config.ids.gids.dovecot2; + } + ++ optional cfg.createMailUser + { name = cfg.mailGroup; }; environment.etc."dovecot/modules".source = modulesDir; From a4633ca5a352af8eb01e5db48cd597a09397a776 Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Thu, 14 Sep 2017 00:52:47 -0400 Subject: [PATCH 135/172] cram: fix ignored tests causing failures --- pkgs/development/python-modules/cram/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/cram/default.nix b/pkgs/development/python-modules/cram/default.nix index 4db709769a6e..c0fc5b177e0a 100644 --- a/pkgs/development/python-modules/cram/default.nix +++ b/pkgs/development/python-modules/cram/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { #COVERAGE=${coverage}/bin/coverage $out/bin/cram tests #${coverage}/bin/coverage report --fail-under=100 COVERAGE=coverage $out/bin/cram tests - coverage report --fail-under=100 --omit="*/_encoding.py" + coverage report --fail-under=100 --omit="*/_encoding.py,*/__main__.py" ''; meta = { From 3510197dccd999ac7189e70d819e0c6a61296817 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 15 Sep 2017 18:45:15 +0200 Subject: [PATCH 136/172] Revert "haskell infra, ghc: Slight cleanup" --- .../compilers/ghc/6.10.2-binary.nix | 33 +++++++-------- pkgs/development/compilers/ghc/6.10.4.nix | 5 --- pkgs/development/compilers/ghc/6.12.3.nix | 5 --- .../compilers/ghc/7.0.4-binary.nix | 33 +++++++-------- pkgs/development/compilers/ghc/7.0.4.nix | 5 --- pkgs/development/compilers/ghc/7.10.2.nix | 28 ++++--------- pkgs/development/compilers/ghc/7.10.3.nix | 28 ++++--------- pkgs/development/compilers/ghc/7.2.2.nix | 7 +--- .../compilers/ghc/7.4.2-binary.nix | 33 +++++++-------- pkgs/development/compilers/ghc/7.4.2.nix | 10 +---- pkgs/development/compilers/ghc/7.6.3.nix | 10 +---- pkgs/development/compilers/ghc/7.8.3.nix | 10 +---- pkgs/development/compilers/ghc/7.8.4.nix | 10 +---- pkgs/development/compilers/ghc/8.0.2.nix | 35 +++++----------- pkgs/development/compilers/ghc/8.2.1.nix | 41 ++++++------------- pkgs/development/compilers/ghc/head.nix | 40 ++++++------------ .../haskell-modules/generic-builder.nix | 38 +++++++---------- .../haskell-modules/make-package-set.nix | 25 +++++------ .../haskell-modules/with-packages-wrapper.nix | 5 ++- .../darwin/ghc-standalone-archive/default.nix | 3 +- 20 files changed, 132 insertions(+), 272 deletions(-) diff --git a/pkgs/development/compilers/ghc/6.10.2-binary.nix b/pkgs/development/compilers/ghc/6.10.2-binary.nix index 10792ffb05bf..60749a29b58b 100644 --- a/pkgs/development/compilers/ghc/6.10.2-binary.nix +++ b/pkgs/development/compilers/ghc/6.10.2-binary.nix @@ -1,29 +1,24 @@ -{ stdenv -, fetchurl, perl -, libedit, ncurses5, gmp -}: - -# Prebuilt only does native -assert stdenv.targetPlatform == stdenv.hostPlatform; +{stdenv, lib, fetchurl, perl, libedit, ncurses5, gmp}: stdenv.mkDerivation rec { version = "6.10.2"; name = "ghc-${version}-binary"; - src = { - "i686-linux" = fetchurl { + src = + if stdenv.system == "i686-linux" then + fetchurl { # This binary requires libedit.so.0 (rather than libedit.so.2). url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-unknown-linux.tar.bz2"; sha256 = "1fw0zr2qshlpk8s0d16k27zcv5263nqdg2xds5ymw8ff6qz9rz9b"; - }; - "x86_64-linux" = fetchurl { + } + else if stdenv.system == "x86_64-linux" then + fetchurl { # Idem. url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-unknown-linux.tar.bz2"; sha256 = "1rd2j7lmcfsm2rdfb5g6q0l8dz3sxadk5m3d2f69d4a6g4p4h7jj"; - }; - }.${stdenv.hostPlatform.system} - or (throw "cannot bootstrap GHC on this platform"); + } + else throw "cannot bootstrap GHC on this platform"; buildInputs = [perl]; @@ -42,17 +37,17 @@ stdenv.mkDerivation rec { '' + # On Linux, use patchelf to modify the executables so that they can # find editline/gmp. - stdenv.lib.optionalString stdenv.hostPlatform.isLinux '' + (if stdenv.isLinux then '' find . -type f -perm -0100 \ -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${lib.makeLibraryPath [ libedit ncurses5 gmp ]}" {} \; for prog in ld ar gcc strip ranlib; do find . -name "setup-config" -exec sed -i "s@/usr/bin/$prog@$(type -p $prog)@g" {} \; done - ''; + '' else ""); configurePhase = '' - ./configure --prefix=$out --with-gmp-libraries=${stdenv.lib.getLib gmp}/lib --with-gmp-includes=${stdenv.lib.getDev gmp}/include + ./configure --prefix=$out --with-gmp-libraries=${lib.getLib gmp}/lib --with-gmp-includes=${lib.getDev gmp}/include ''; # Stripping combined with patchelf breaks the executables (they die @@ -67,7 +62,7 @@ stdenv.mkDerivation rec { # and create some wrapper scripts that set DYLD_FRAMEWORK_PATH so # that the executables work with no special setup. postInstall = - stdenv.lib.optionalString stdenv.hostPlatform.isDarwin + (if stdenv.isDarwin then '' mkdir -p $out/frameworks/GMP.framework/Versions/A ln -s ${gmp.out}/lib/libgmp.dylib $out/frameworks/GMP.framework/GMP @@ -84,7 +79,7 @@ stdenv.mkDerivation rec { echo \"DYLD_FRAMEWORK_PATH=$out/frameworks exec $out/bin-orig/$i -framework-path $out/frameworks \\\"\\$@\\\"\" >> $out/bin/$i chmod +x $out/bin/$i done - '' + '' else "") + '' # bah, the passing gmp doesn't work, so let's add it to the final package.conf in a quick but dirty way diff --git a/pkgs/development/compilers/ghc/6.10.4.nix b/pkgs/development/compilers/ghc/6.10.4.nix index 85dd31dda88c..c56762edd24e 100644 --- a/pkgs/development/compilers/ghc/6.10.4.nix +++ b/pkgs/development/compilers/ghc/6.10.4.nix @@ -1,8 +1,5 @@ {stdenv, fetchurl, libedit, ghc, perl, gmp, ncurses}: -# TODO(@Ericson2314): Cross compilation support -assert stdenv.targetPlatform == stdenv.hostPlatform; - stdenv.mkDerivation rec { version = "6.10.4"; @@ -25,8 +22,6 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-fomit-frame-pointer"; - passthru = { prefix = ""; }; - meta = { homepage = http://haskell.org/ghc; description = "The Glasgow Haskell Compiler"; diff --git a/pkgs/development/compilers/ghc/6.12.3.nix b/pkgs/development/compilers/ghc/6.12.3.nix index bd738f079423..a46ef66a8cb7 100644 --- a/pkgs/development/compilers/ghc/6.12.3.nix +++ b/pkgs/development/compilers/ghc/6.12.3.nix @@ -1,8 +1,5 @@ {stdenv, fetchurl, ghc, perl, gmp, ncurses}: -# TODO(@Ericson2314): Cross compilation support -assert stdenv.targetPlatform == stdenv.hostPlatform; - stdenv.mkDerivation rec { version = "6.12.3"; @@ -36,8 +33,6 @@ stdenv.mkDerivation rec { # that in turn causes GHCi to abort stripDebugFlags=["-S" "--keep-file-symbols"]; - passthru = { prefix = ""; }; - meta = { homepage = http://haskell.org/ghc; description = "The Glasgow Haskell Compiler"; diff --git a/pkgs/development/compilers/ghc/7.0.4-binary.nix b/pkgs/development/compilers/ghc/7.0.4-binary.nix index ad54b4aa9aa1..6140cde4a9ef 100644 --- a/pkgs/development/compilers/ghc/7.0.4-binary.nix +++ b/pkgs/development/compilers/ghc/7.0.4-binary.nix @@ -1,35 +1,32 @@ -{ stdenv -, fetchurl, perl -, ncurses5, gmp, libiconv -}: - -# Prebuilt only does native -assert stdenv.targetPlatform == stdenv.hostPlatform; +{stdenv, fetchurl, perl, ncurses5, gmp, libiconv}: stdenv.mkDerivation rec { version = "7.0.4"; name = "ghc-${version}-binary"; - src = { - "i686-linux" = fetchurl { + src = + if stdenv.system == "i686-linux" then + fetchurl { url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-unknown-linux.tar.bz2"; sha256 = "0mfnihiyjl06f5w1yrjp36sw9g67g2ymg5sdl0g23h1pab99jx63"; - }; - "x86_64-linux" = fetchurl { + } + else if stdenv.system == "x86_64-linux" then + fetchurl { url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-unknown-linux.tar.bz2"; sha256 = "0mc4rhqcxz427wq4zgffmnn0d2yjqvy6af4x9mha283p1gdj5q99"; - }; - "i686-darwin" = fetchurl { + } + else if stdenv.system == "i686-darwin" then + fetchurl { url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-apple-darwin.tar.bz2"; sha256 = "0qj45hslrrr8zfks8m1jcb3awwx9rh35ndnpfmb0gwb6j7azq5n3"; - }; - "x86_64-darwin" = fetchurl { + } + else if stdenv.system == "x86_64-darwin" then + fetchurl { url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-apple-darwin.tar.bz2"; sha256 = "1m2ml88p1swf4dnv2vq8hz4drcp46n3ahpfi05wh01ajkf8hnn3l"; - }; - }.${stdenv.hostPlatform.system} - or (throw "cannot bootstrap GHC on this platform"); + } + else throw "cannot bootstrap GHC on this platform"; buildInputs = [perl]; diff --git a/pkgs/development/compilers/ghc/7.0.4.nix b/pkgs/development/compilers/ghc/7.0.4.nix index a869c34c4f07..9d052ddb246f 100644 --- a/pkgs/development/compilers/ghc/7.0.4.nix +++ b/pkgs/development/compilers/ghc/7.0.4.nix @@ -1,8 +1,5 @@ { stdenv, fetchurl, ghc, perl, gmp, ncurses, libiconv }: -# TODO(@Ericson2314): Cross compilation support -assert stdenv.targetPlatform == stdenv.hostPlatform; - stdenv.mkDerivation rec { version = "7.0.4"; name = "ghc-${version}"; @@ -45,8 +42,6 @@ stdenv.mkDerivation rec { # that in turn causes GHCi to abort stripDebugFlags=["-S" "--keep-file-symbols"]; - passthru = { prefix = ""; }; - meta = { homepage = http://haskell.org/ghc; description = "The Glasgow Haskell Compiler"; diff --git a/pkgs/development/compilers/ghc/7.10.2.nix b/pkgs/development/compilers/ghc/7.10.2.nix index 5c6533f6c303..863f904e4e96 100644 --- a/pkgs/development/compilers/ghc/7.10.2.nix +++ b/pkgs/development/compilers/ghc/7.10.2.nix @@ -1,28 +1,14 @@ -{ stdenv, __targetPackages -, buildPlatform, hostPlatform, targetPlatform +{ stdenv, fetchurl, fetchpatch, bootPkgs, perl, ncurses, libiconv, binutils, coreutils +, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42, hscolour -# build-tools -, bootPkgs, hscolour -, binutils, coreutils, fetchurl, fetchpatch, perl -, docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42, libxml2, libxslt - -, ncurses, libiconv - -, # If enabled GHC will be build with the GPL-free but slower integer-simple + # If enabled GHC will be build with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. - enableIntegerSimple ? false, gmp ? null +, enableIntegerSimple ? false, gmp }: -assert !enableIntegerSimple -> gmp != null; - let inherit (bootPkgs) ghc; - # TODO(@Ericson2314) Make unconditional - prefix = stdenv.lib.optionalString - (targetPlatform != hostPlatform) - "${targetPlatform.config}-"; - buildMK = '' libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include" libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.out}/lib" @@ -41,7 +27,7 @@ in stdenv.mkDerivation rec { version = "7.10.2"; - name = "${prefix}ghc-${version}"; + name = "ghc-${version}"; src = fetchurl { url = "https://downloads.haskell.org/~ghc/7.10.2/${name}-src.tar.xz"; @@ -78,7 +64,7 @@ stdenv.mkDerivation rec { postInstall = '' # Install the bash completion file. - install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${prefix}ghc + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/ghc # Patch scripts to include "readelf" and "cat" in $PATH. for i in "$out/bin/"*; do @@ -89,7 +75,7 @@ stdenv.mkDerivation rec { ''; passthru = { - inherit bootPkgs prefix; + inherit bootPkgs; }; meta = { diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix index 96d0111970c2..eb8f1dddd19b 100644 --- a/pkgs/development/compilers/ghc/7.10.3.nix +++ b/pkgs/development/compilers/ghc/7.10.3.nix @@ -1,28 +1,14 @@ -{ stdenv, __targetPackages -, buildPlatform, hostPlatform, targetPlatform +{ stdenv, fetchurl, fetchpatch, bootPkgs, perl, ncurses, libiconv, binutils, coreutils +, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42, hscolour -# build-tools -, bootPkgs, hscolour -, binutils, coreutils, fetchurl, fetchpatch, perl -, docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42, libxml2, libxslt - -, ncurses, libiconv - -, # If enabled GHC will be build with the GPL-free but slower integer-simple + # If enabled GHC will be build with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. - enableIntegerSimple ? false, gmp ? null +, enableIntegerSimple ? false, gmp }: -assert !enableIntegerSimple -> gmp != null; - let inherit (bootPkgs) ghc; - # TODO(@Ericson2314) Make unconditional - prefix = stdenv.lib.optionalString - (targetPlatform != hostPlatform) - "${targetPlatform.config}-"; - docFixes = fetchurl { url = "https://downloads.haskell.org/~ghc/7.10.3/ghc-7.10.3a.patch"; sha256 = "1j45z4kcd3w1rzm4hapap2xc16bbh942qnzzdbdjcwqznsccznf0"; @@ -32,7 +18,7 @@ in stdenv.mkDerivation rec { version = "7.10.3"; - name = "${prefix}ghc-${version}"; + name = "ghc-${version}"; src = fetchurl { url = "https://downloads.haskell.org/~ghc/${version}/${name}-src.tar.xz"; @@ -76,7 +62,7 @@ stdenv.mkDerivation rec { postInstall = '' # Install the bash completion file. - install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${prefix}ghc + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/ghc # Patch scripts to include "readelf" and "cat" in $PATH. for i in "$out/bin/"*; do @@ -87,7 +73,7 @@ stdenv.mkDerivation rec { ''; passthru = { - inherit bootPkgs prefix; + inherit bootPkgs; }; meta = { diff --git a/pkgs/development/compilers/ghc/7.2.2.nix b/pkgs/development/compilers/ghc/7.2.2.nix index c4733b2e3368..a8faa8f63be1 100644 --- a/pkgs/development/compilers/ghc/7.2.2.nix +++ b/pkgs/development/compilers/ghc/7.2.2.nix @@ -2,12 +2,9 @@ # If enabled GHC will be build with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. -, enableIntegerSimple ? false, gmp ? null +, enableIntegerSimple ? false, gmp }: -# TODO(@Ericson2314): Cross compilation support -assert stdenv.targetPlatform == stdenv.hostPlatform; - stdenv.mkDerivation rec { version = "7.2.2"; name = "ghc-${version}"; @@ -54,8 +51,6 @@ stdenv.mkDerivation rec { # that in turn causes GHCi to abort stripDebugFlags=["-S" "--keep-file-symbols"]; - passthru = { prefix = ""; }; - meta = { homepage = http://haskell.org/ghc; description = "The Glasgow Haskell Compiler"; diff --git a/pkgs/development/compilers/ghc/7.4.2-binary.nix b/pkgs/development/compilers/ghc/7.4.2-binary.nix index eae45bc0b921..100bb87768b5 100644 --- a/pkgs/development/compilers/ghc/7.4.2-binary.nix +++ b/pkgs/development/compilers/ghc/7.4.2-binary.nix @@ -1,35 +1,32 @@ -{ stdenv -, fetchurl, perl, makeWrapper -, ncurses5, gmp, libiconv -}: - -# Prebuilt only does native -assert stdenv.targetPlatform == stdenv.hostPlatform; +{stdenv, fetchurl, perl, ncurses5, gmp, libiconv, makeWrapper}: stdenv.mkDerivation rec { version = "7.4.2"; name = "ghc-${version}-binary"; - src = { - "i686-linux" = fetchurl { + src = + if stdenv.system == "i686-linux" then + fetchurl { url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-unknown-linux.tar.bz2"; sha256 = "0gny7knhss0w0d9r6jm1gghrcb8kqjvj94bb7hxf9syrk4fxlcxi"; - }; - "x86_64-linux" = fetchurl { + } + else if stdenv.system == "x86_64-linux" then + fetchurl { url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-unknown-linux.tar.bz2"; sha256 = "043jabd0lh6n1zlqhysngbpvlsdznsa2mmsj08jyqgahw9sjb5ns"; - }; - "i686-darwin" = fetchurl { + } + else if stdenv.system == "i686-darwin" then + fetchurl { url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-apple-darwin.tar.bz2"; sha256 = "1vrbs3pzki37hzym1f1nh07lrqh066z3ypvm81fwlikfsvk4djc0"; - }; - "x86_64-darwin" = fetchurl { + } + else if stdenv.system == "x86_64-darwin" then + fetchurl { url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-apple-darwin.tar.bz2"; sha256 = "1imzqc0slpg0r6p40n5a9m18cbcm0m86z8dgyhfxcckksw54mzwf"; - }; - }.${stdenv.hostPlatform.system} - or (throw "cannot bootstrap GHC on this platform"); + } + else throw "cannot bootstrap GHC on this platform"; buildInputs = [perl]; diff --git a/pkgs/development/compilers/ghc/7.4.2.nix b/pkgs/development/compilers/ghc/7.4.2.nix index 046a3a0fae65..e5bc4724c9eb 100644 --- a/pkgs/development/compilers/ghc/7.4.2.nix +++ b/pkgs/development/compilers/ghc/7.4.2.nix @@ -1,14 +1,10 @@ { stdenv, fetchurl, ghc, perl, ncurses, libiconv -, # If enabled GHC will be build with the GPL-free but slower integer-simple + # If enabled GHC will be build with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. - enableIntegerSimple ? false, gmp ? null +, enableIntegerSimple ? false, gmp }: -# TODO(@Ericson2314): Cross compilation support -assert stdenv.targetPlatform == stdenv.hostPlatform; -assert !enableIntegerSimple -> gmp != null; - stdenv.mkDerivation rec { version = "7.4.2"; @@ -56,8 +52,6 @@ stdenv.mkDerivation rec { # that in turn causes GHCi to abort stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; - passthru = { prefix = ""; }; - meta = { homepage = http://haskell.org/ghc; description = "The Glasgow Haskell Compiler"; diff --git a/pkgs/development/compilers/ghc/7.6.3.nix b/pkgs/development/compilers/ghc/7.6.3.nix index ab288f222f97..5f951936046f 100644 --- a/pkgs/development/compilers/ghc/7.6.3.nix +++ b/pkgs/development/compilers/ghc/7.6.3.nix @@ -1,14 +1,10 @@ { stdenv, fetchurl, ghc, perl, ncurses, binutils, libiconv -, # If enabled GHC will be build with the GPL-free but slower integer-simple + # If enabled GHC will be build with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. - enableIntegerSimple ? false, gmp ? null +, enableIntegerSimple ? false, gmp }: -# TODO(@Ericson2314): Cross compilation support -assert stdenv.targetPlatform == stdenv.hostPlatform; -assert !enableIntegerSimple -> gmp != null; - let # The "-Wa,--noexecstack" options might be needed only with GNU ld (as opposed # to the gold linker). It prevents binaries' stacks from being marked as @@ -82,8 +78,6 @@ in stdenv.mkDerivation rec { # that in turn causes GHCi to abort stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; - passthru = { prefix = ""; }; - meta = { homepage = http://haskell.org/ghc; description = "The Glasgow Haskell Compiler"; diff --git a/pkgs/development/compilers/ghc/7.8.3.nix b/pkgs/development/compilers/ghc/7.8.3.nix index b147c787cafc..50b0108861f0 100644 --- a/pkgs/development/compilers/ghc/7.8.3.nix +++ b/pkgs/development/compilers/ghc/7.8.3.nix @@ -1,14 +1,10 @@ { stdenv, fetchurl, ghc, perl, ncurses, libiconv -, # If enabled GHC will be build with the GPL-free but slower integer-simple + # If enabled GHC will be build with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. - enableIntegerSimple ? false, gmp ? null +, enableIntegerSimple ? false, gmp }: -# TODO(@Ericson2314): Cross compilation support -assert stdenv.targetPlatform == stdenv.hostPlatform; -assert !enableIntegerSimple -> gmp != null; - stdenv.mkDerivation rec { version = "7.8.3"; name = "ghc-${version}"; @@ -53,8 +49,6 @@ stdenv.mkDerivation rec { # that in turn causes GHCi to abort stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; - passthru = { prefix = ""; }; - meta = { homepage = http://haskell.org/ghc; description = "The Glasgow Haskell Compiler"; diff --git a/pkgs/development/compilers/ghc/7.8.4.nix b/pkgs/development/compilers/ghc/7.8.4.nix index db4f46fb8808..5a380c75c69f 100644 --- a/pkgs/development/compilers/ghc/7.8.4.nix +++ b/pkgs/development/compilers/ghc/7.8.4.nix @@ -1,14 +1,10 @@ { stdenv, fetchurl, ghc, perl, ncurses, libiconv -, # If enabled GHC will be build with the GPL-free but slower integer-simple + # If enabled GHC will be build with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. - enableIntegerSimple ? false, gmp ? null +, enableIntegerSimple ? false, gmp }: -# TODO(@Ericson2314): Cross compilation support -assert stdenv.targetPlatform == stdenv.hostPlatform; -assert !enableIntegerSimple -> gmp != null; - stdenv.mkDerivation (rec { version = "7.8.4"; name = "ghc-${version}"; @@ -53,8 +49,6 @@ stdenv.mkDerivation (rec { # that in turn causes GHCi to abort stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; - passthru = { prefix = ""; }; - meta = { homepage = http://haskell.org/ghc; description = "The Glasgow Haskell Compiler"; diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix index 2ac24ec16836..e50a8df7352d 100644 --- a/pkgs/development/compilers/ghc/8.0.2.nix +++ b/pkgs/development/compilers/ghc/8.0.2.nix @@ -1,30 +1,18 @@ -{ stdenv, __targetPackages -, buildPlatform, hostPlatform, targetPlatform +{ stdenv, lib, fetchurl, fetchpatch, bootPkgs, perl, ncurses, libiconv, binutils, coreutils +, hscolour, patchutils, sphinx -# build-tools -, bootPkgs, hscolour -, binutils, coreutils, fetchurl, fetchpatch, patchutils, perl, sphinx - -, libiconv, ncurses - -, # If enabled GHC will be build with the GPL-free but slower integer-simple + # If enabled GHC will be build with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. - enableIntegerSimple ? false, gmp ? null +, enableIntegerSimple ? false, gmp +, cross ? null }: -assert !enableIntegerSimple -> gmp != null; - let inherit (bootPkgs) ghc; - - # TODO(@Ericson2314) Make unconditional - prefix = stdenv.lib.optionalString - (targetPlatform != hostPlatform) - "${targetPlatform.config}-"; in stdenv.mkDerivation rec { version = "8.0.2"; - name = "${prefix}ghc-${version}"; + name = "ghc-${version}"; src = fetchurl { url = "https://downloads.haskell.org/~ghc/8.0.2/${name}-src.tar.xz"; @@ -59,20 +47,19 @@ stdenv.mkDerivation rec { "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" ] ++ stdenv.lib.optional stdenv.isDarwin [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" - ] ++ stdenv.lib.optionals (targetPlatform.isDarwin && targetPlatform.isAarch64) [ + ] ++ # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ - "--disable-large-address-space" - ]; + lib.optional (cross.config or null == "aarch64-apple-darwin14") "--disable-large-address-space"; # required, because otherwise all symbols from HSffi.o are stripped, and # that in turn causes GHCi to abort stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; postInstall = '' - paxmark m $out/lib/${name}/bin/${if targetPlatform != hostPlatform then "ghc" else "{ghc,haddock}"} + paxmark m $out/lib/${name}/bin/{ghc,haddock} # Install the bash completion file. - install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${prefix}ghc + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/ghc # Patch scripts to include "readelf" and "cat" in $PATH. for i in "$out/bin/"*; do @@ -83,7 +70,7 @@ stdenv.mkDerivation rec { ''; passthru = { - inherit bootPkgs prefix; + inherit bootPkgs; }; meta = { diff --git a/pkgs/development/compilers/ghc/8.2.1.nix b/pkgs/development/compilers/ghc/8.2.1.nix index a3d2f73c87e4..dde56df81313 100644 --- a/pkgs/development/compilers/ghc/8.2.1.nix +++ b/pkgs/development/compilers/ghc/8.2.1.nix @@ -1,30 +1,16 @@ -{ stdenv, __targetPackages -, buildPlatform, hostPlatform, targetPlatform -, selfPkgs, cross ? null +{ stdenv, lib, fetchurl, bootPkgs, perl, ncurses, libiconv, binutils, coreutils +, autoconf, automake, happy, alex, python3, sphinx, hscolour +, buildPlatform, targetPlatform , selfPkgs, cross ? null -# build-tools -, bootPkgs, alex, happy, hscolour -, autoconf, automake, binutils, coreutils, fetchurl, perl, python3, sphinx - -, libiconv ? null, ncurses - -, # If enabled, GHC will be build with the GPL-free but slower integer-simple + # If enabled GHC will be build with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. - enableIntegerSimple ? false, gmp ? null +, enableIntegerSimple ? false, gmp }: -assert !enableIntegerSimple -> gmp != null; - let inherit (bootPkgs) ghc; - version = "8.2.1"; - # TODO(@Ericson2314) Make unconditional - prefix = stdenv.lib.optionalString - (targetPlatform != hostPlatform) - "${targetPlatform.config}-"; - commonBuildInputs = [ alex autoconf automake ghc happy hscolour perl python3 sphinx ]; commonPreConfigure = '' sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure @@ -35,10 +21,9 @@ let '' + stdenv.lib.optionalString enableIntegerSimple '' echo "INTEGER_LIBRARY=integer-simple" > mk/build.mk ''; -in -stdenv.mkDerivation (rec { +in stdenv.mkDerivation (rec { inherit version; - name = "${prefix}ghc-${version}"; + name = "ghc-${version}"; src = fetchurl { url = "https://downloads.haskell.org/~ghc/${version}/${name}-src.tar.xz"; @@ -67,17 +52,15 @@ stdenv.mkDerivation (rec { # required, because otherwise all symbols from HSffi.o are stripped, and # that in turn causes GHCi to abort - stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; + stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; checkTarget = "test"; - # zsh and other shells are smart about `{ghc}` but bash isn't, and doesn't - # treat that as a unary `{x,y,z,..}` repetition. postInstall = '' - paxmark m $out/lib/${name}/bin/${if targetPlatform != hostPlatform then "ghc" else "{ghc,haddock}"} + paxmark m $out/lib/${name}/bin/{ghc,haddock} # Install the bash completion file. - install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${prefix}ghc + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/ghc # Patch scripts to include "readelf" and "cat" in $PATH. for i in "$out/bin/"*; do @@ -90,7 +73,7 @@ stdenv.mkDerivation (rec { outputs = [ "out" "doc" ]; passthru = { - inherit bootPkgs prefix; + inherit bootPkgs; } // stdenv.lib.optionalAttrs (targetPlatform != buildPlatform) { crossCompiler = selfPkgs.ghc.override { cross = targetPlatform; @@ -122,7 +105,7 @@ stdenv.mkDerivation (rec { "--enable-bootstrap-with-devel-snapshot" ] ++ # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ - stdenv.lib.optional (cross.config or null == "aarch64-apple-darwin14") "--disable-large-address-space"; + lib.optional (cross.config or null == "aarch64-apple-darwin14") "--disable-large-address-space"; buildInputs = commonBuildInputs ++ [ stdenv.ccCross stdenv.binutils ]; diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 349f9963e532..362b4895b7e3 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,33 +1,20 @@ -{ stdenv, __targetPackages -, buildPlatform, hostPlatform, targetPlatform +{ stdenv, lib, fetchgit, bootPkgs, perl, ncurses, libiconv, binutils, coreutils +, autoconf, automake, happy, alex, python3, buildPlatform, targetPlatform , selfPkgs, cross ? null -# build-tools -, bootPkgs, alex, happy -, autoconf, automake, binutils, coreutils, fetchgit, perl, python3 - -, libiconv ? null, ncurses - -, # If enabled, GHC will be build with the GPL-free but slower integer-simple + # If enabled GHC will be build with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. - enableIntegerSimple ? false, gmp ? null - +, enableIntegerSimple ? false, gmp , version ? "8.3.20170808" }: -assert !enableIntegerSimple -> gmp != null; - let inherit (bootPkgs) ghc; + commonBuildInputs = [ ghc perl autoconf automake happy alex python3 ]; + rev = "14457cf6a50f708eecece8f286f08687791d51f7"; - # TODO(@Ericson2314) Make unconditional - prefix = stdenv.lib.optionalString - (targetPlatform != hostPlatform) - "${targetPlatform.config}-"; - - commonBuildInputs = [ ghc perl autoconf automake happy alex python3 ]; commonPreConfigure = '' echo ${version} >VERSION echo ${rev} >GIT_COMMIT_ID @@ -40,8 +27,7 @@ let '' + stdenv.lib.optionalString enableIntegerSimple '' echo "INTEGER_LIBRARY=integer-simple" > mk/build.mk ''; -in -stdenv.mkDerivation (rec { +in stdenv.mkDerivation (rec { inherit version rev; name = "ghc-${version}"; @@ -71,17 +57,15 @@ stdenv.mkDerivation (rec { # required, because otherwise all symbols from HSffi.o are stripped, and # that in turn causes GHCi to abort - stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; + stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; checkTarget = "test"; - # zsh and other shells are smart about `{ghc}` but bash isn't, and doesn't - # treat that as a unary `{x,y,z,..}` repetition. postInstall = '' - paxmark m $out/lib/${name}/bin/${if targetPlatform != hostPlatform then "ghc" else "{ghc,haddock}"} + paxmark m $out/lib/${name}/bin/{ghc,haddock} # Install the bash completion file. - install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${prefix}ghc + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/ghc # Patch scripts to include "readelf" and "cat" in $PATH. for i in "$out/bin/"*; do @@ -94,7 +78,7 @@ stdenv.mkDerivation (rec { outputs = [ "out" "doc" ]; passthru = { - inherit bootPkgs prefix; + inherit bootPkgs; } // stdenv.lib.optionalAttrs (targetPlatform != buildPlatform) { crossCompiler = selfPkgs.ghc.override { cross = targetPlatform; @@ -126,7 +110,7 @@ stdenv.mkDerivation (rec { "--enable-bootstrap-with-devel-snapshot" ] ++ # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ - stdenv.lib.optional (cross.config or null == "aarch64-apple-darwin14") "--disable-large-address-space"; + lib.optional (cross.config or null == "aarch64-apple-darwin14") "--disable-large-address-space"; buildInputs = commonBuildInputs; diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 555ef31f0bb1..60cce56cca02 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -1,14 +1,7 @@ -{ stdenv, buildPackages, ghc -, jailbreak-cabal, hscolour, cpphs, nodejs -, buildPlatform, hostPlatform +{ stdenv, fetchurl, ghc, pkgconfig, glibcLocales, coreutils, gnugrep, gnused +, jailbreak-cabal, hscolour, cpphs, nodejs, lib, removeReferencesTo }: - -let - isCross = buildPlatform != hostPlatform; - inherit (buildPackages) - fetchurl removeReferencesTo - pkgconfig binutils coreutils gnugrep gnused glibcLocales; -in +let isCross = (ghc.cross or null) != null; in { pname , dontStrip ? (ghc.isGhcjs or false) @@ -27,8 +20,8 @@ in , enableLibraryProfiling ? false , enableExecutableProfiling ? false # TODO enable shared libs for cross-compiling -, enableSharedExecutables ? ((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version) -, enableSharedLibraries ? ((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version) +, enableSharedExecutables ? !isCross && (((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version)) +, enableSharedLibraries ? !isCross && (((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version)) , enableSplitObjs ? null # OBSOLETE, use enableDeadCodeElimination , enableDeadCodeElimination ? (!stdenv.isDarwin) # TODO: use -dead_strip for darwin , enableStaticLibraries ? true @@ -60,7 +53,7 @@ in , shellHook ? "" , coreSetup ? false # Use only core packages to build Setup.hs. , useCpphs ? false -, hardeningDisable ? stdenv.lib.optional (ghc.isHaLVM or false) "all" +, hardeningDisable ? lib.optional (ghc.isHaLVM or false) "all" , enableSeparateDataOutput ? false , enableSeparateDocOutput ? doHaddock } @ args: @@ -109,12 +102,11 @@ let enableParallelBuilding = (versionOlder "7.8" ghc.version && !hasActiveLibrary) || versionOlder "8.0.1" ghc.version; crossCabalFlags = [ - "--with-ghc=${ghc.prefix}ghc" - "--with-ghc-pkg=${ghc.prefix}ghc-pkg" - "--with-gcc=${ghc.prefix}cc" - "--with-ld=${ghc.prefix}ld" + "--with-ghc=${ghc.cross.config}-ghc" + "--with-ghc-pkg=${ghc.cross.config}-ghc-pkg" + "--with-gcc=${ghc.cc}" + "--with-ld=${ghc.ld}" "--with-hsc2hs=${nativeGhc}/bin/hsc2hs" - "--with-strip=${binutils}/bin/${ghc.prefix}strip" ] ++ (if isHaLVM then [] else ["--hsc2hs-options=--cross-compile"]); crossCabalFlagsString = @@ -143,7 +135,7 @@ let ] ++ optionals isGhcjs [ "--ghcjs" ] ++ optionals isCross ([ - "--configure-option=--host=${hostPlatform.config}" + "--configure-option=--host=${ghc.cross.config}" ] ++ crossCabalFlags); setupCompileFlags = [ @@ -178,7 +170,8 @@ let setupBuilder = if isCross then "${nativeGhc}/bin/ghc" else ghcCommand; setupCommand = "./Setup"; ghcCommand' = if isGhcjs then "ghcjs" else "ghc"; - ghcCommand = "${ghc.prefix}${ghcCommand'}"; + crossPrefix = if (ghc.cross or null) != null then "${ghc.cross.config}-" else ""; + ghcCommand = "${crossPrefix}${ghcCommand'}"; ghcCommandCaps= toUpper ghcCommand'; in @@ -275,8 +268,6 @@ stdenv.mkDerivation ({ runHook postCompileBuildDriver ''; - inherit configureFlags; - configurePhase = '' runHook preConfigure @@ -402,6 +393,7 @@ stdenv.mkDerivation ({ // optionalAttrs (postCompileBuildDriver != "") { inherit postCompileBuildDriver; } // optionalAttrs (preUnpack != "") { inherit preUnpack; } // optionalAttrs (postUnpack != "") { inherit postUnpack; } +// optionalAttrs (configureFlags != []) { inherit configureFlags; } // optionalAttrs (patches != []) { inherit patches; } // optionalAttrs (patchPhase != "") { inherit patchPhase; } // optionalAttrs (preConfigure != "") { inherit preConfigure; } @@ -420,5 +412,5 @@ stdenv.mkDerivation ({ // optionalAttrs (postFixup != "") { inherit postFixup; } // optionalAttrs (dontStrip) { inherit dontStrip; } // optionalAttrs (hardeningDisable != []) { inherit hardeningDisable; } -// optionalAttrs (buildPlatform.isLinux){ LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; } +// optionalAttrs (stdenv.isLinux) { LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; } ) diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index deeeeb7a5a8a..ff5be894b926 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -1,10 +1,7 @@ # This expression takes a file like `hackage-packages.nix` and constructs # a full package set out of that. -{ # package-set used for build tools (all of nixpkgs) - buildPackages - -, # package-set used for non-haskell dependencies (all of nixpkgs) +{ # package-set used for non-haskell dependencies (all of nixpkgs) pkgs , # stdenv to use for building haskell packages @@ -31,21 +28,19 @@ self: let - inherit (stdenv) buildPlatform hostPlatform; inherit (stdenv.lib) fix' extends makeOverridable; inherit (haskellLib) overrideCabal; - buildHaskellPackages = if hostPlatform != buildPlatform - then self.ghc.bootPkgs - else self; - mkDerivationImpl = pkgs.callPackage ./generic-builder.nix { inherit stdenv; - nodejs = buildPackages.nodejs-slim; - inherit (buildHaskellPackages) jailbreak-cabal; + inherit (pkgs) fetchurl pkgconfig glibcLocales coreutils gnugrep gnused; + nodejs = pkgs.nodejs-slim; + jailbreak-cabal = if (self.ghc.cross or null) != null + then self.ghc.bootPkgs.jailbreak-cabal + else self.jailbreak-cabal; inherit (self) ghc; - hscolour = overrideCabal buildHaskellPackages.hscolour (drv: { + hscolour = overrideCabal self.hscolour (drv: { isLibrary = false; doHaddock = false; hyperlinkSource = false; # Avoid depending on hscolour for this build. @@ -109,13 +104,13 @@ let haskellSrc2nix = { name, src, sha256 ? null }: let sha256Arg = if isNull sha256 then "--sha256=" else ''--sha256="${sha256}"''; - in pkgs.buildPackages.stdenv.mkDerivation { + in pkgs.stdenv.mkDerivation { name = "cabal2nix-${name}"; - nativeBuildInputs = [ pkgs.buildPackages.haskellPackages.cabal2nix ]; + buildInputs = [ pkgs.haskellPackages.cabal2nix ]; preferLocalBuild = true; phases = ["installPhase"]; LANG = "en_US.UTF-8"; - LOCALE_ARCHIVE = pkgs.lib.optionalString buildPlatform.isLinux "${buildPackages.glibcLocales}/lib/locale/locale-archive"; + LOCALE_ARCHIVE = pkgs.lib.optionalString pkgs.stdenv.isLinux "${pkgs.glibcLocales}/lib/locale/locale-archive"; installPhase = '' export HOME="$TMP" mkdir -p "$out" diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index fb96f0bcbaed..ec7d961581a4 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -36,8 +36,9 @@ let isHaLVM = ghc.isHaLVM or false; ghc761OrLater = isGhcjs || isHaLVM || lib.versionOlder "7.6.1" ghc.version; packageDBFlag = if ghc761OrLater then "--global-package-db" else "--global-conf"; - ghcCommand' = if isGhcjs then "ghcjs" else "ghc"; - ghcCommand = "${ghc.prefix}${ghcCommand'}"; + ghcCommand' = if isGhcjs then "ghcjs" else "ghc"; + crossPrefix = if (ghc.cross or null) != null then "${ghc.cross.config}-" else ""; + ghcCommand = "${crossPrefix}${ghcCommand'}"; ghcCommandCaps= lib.toUpper ghcCommand'; libDir = if isHaLVM then "$out/lib/HaLVM-${ghc.version}" else "$out/lib/${ghcCommand}-${ghc.version}"; docDir = "$out/share/doc/ghc/html"; diff --git a/pkgs/os-specific/darwin/ghc-standalone-archive/default.nix b/pkgs/os-specific/darwin/ghc-standalone-archive/default.nix index 227a8c59985c..d23328d362e0 100644 --- a/pkgs/os-specific/darwin/ghc-standalone-archive/default.nix +++ b/pkgs/os-specific/darwin/ghc-standalone-archive/default.nix @@ -2,7 +2,8 @@ { haskellPackages, src, deps ? p : [], name }: let inherit (haskellPackages) ghc ghcWithPackages; with-env = ghcWithPackages deps; - ghcName = "${ghc.prefix}ghc"; + crossPrefix = if (ghc.cross or null) != null then "${ghc.cross.config}-" else ""; + ghcName = "${crossPrefix}ghc"; in runCommand name { buildInputs = [ with-env cctools ]; } '' mkdir -p $out/lib mkdir -p $out/include From 42f243922871d7fd2d261ba39379c7d9ecaae39f Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Fri, 15 Sep 2017 18:42:39 +0200 Subject: [PATCH 137/172] pharo-launcher: fix build As noted by @dtzWill at https://github.com/NixOS/nixpkgs/pull/26924/files#r126686231 --- pkgs/development/pharo/launcher/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/pharo/launcher/default.nix b/pkgs/development/pharo/launcher/default.nix index 9cec6e81ae62..8282c38a1e7f 100644 --- a/pkgs/development/pharo/launcher/default.nix +++ b/pkgs/development/pharo/launcher/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { secs=5 echo -n "Running headless Pharo for $secs seconds to check for a crash... " timeout $secs \ - "${pharo}/bin/pharo" -nodisplay PharoLauncher.image --no-quit eval 'true' + "${pharo}/bin/pharo" --nodisplay PharoLauncher.image --no-quit eval 'true' test "$?" == 124 && echo "ok") ''; From 12aa8b2f2b1452875033ea7ca90226ad1929e26e Mon Sep 17 00:00:00 2001 From: Patrick Callahan Date: Wed, 13 Sep 2017 12:04:53 -0700 Subject: [PATCH 138/172] shell-conduit: disable tests on Darwin to fix build --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 77c94f9f2502..c87e2e5cfe74 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -104,6 +104,10 @@ self: super: { # Fix test trying to access /home directory shell-conduit = (overrideCabal super.shell-conduit (drv: { postPatch = "sed -i s/home/tmp/ test/Spec.hs"; + + # the tests for shell-conduit on Darwin illegitimatey assume non-GNU echo + # see: https://github.com/psibi/shell-conduit/issues/12 + doCheck = !pkgs.stdenv.hostPlatform.isDarwin; })); # https://github.com/froozen/kademlia/issues/2 From 8119e48c2d90bb8252004389676d18501f0af4b7 Mon Sep 17 00:00:00 2001 From: Patrick Callahan Date: Wed, 13 Sep 2017 12:06:16 -0700 Subject: [PATCH 139/172] haskellPackages.tldr: fix build and add to top-level packages --- pkgs/development/haskell-modules/configuration-common.nix | 6 ++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 8 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c87e2e5cfe74..85a5f961485c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -404,6 +404,12 @@ self: super: { th-printf = dontCheck super.th-printf; thumbnail-plus = dontCheck super.thumbnail-plus; tickle = dontCheck super.tickle; + tldr = super.tldr.override { + # shell-conduit determines what commands are available at compile-time, so + # that tldr will not compile unless the shell-conduit it uses is compiled + # with git in its environment. + shell-conduit = addBuildTool self.shell-conduit pkgs.git; + }; tpdb = dontCheck super.tpdb; translatable-intset = dontCheck super.translatable-intset; ua-parser = dontCheck super.ua-parser; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a38d87218719..b60de5c713bf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4566,6 +4566,8 @@ with pkgs; tldr = callPackage ../tools/misc/tldr { }; + tldr-hs = haskellPackages.tldr; + tlspool = callPackage ../tools/networking/tlspool { }; tmate = callPackage ../tools/misc/tmate { }; From 8554eafb78a15776dc7b428a2bcb5be7bcbc60ef Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Fri, 15 Sep 2017 19:10:23 +0200 Subject: [PATCH 140/172] nntp-proxy: fix clang build --- pkgs/applications/networking/nntp-proxy/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/nntp-proxy/default.nix b/pkgs/applications/networking/nntp-proxy/default.nix index 05333f67ecfa..8795f32e829d 100644 --- a/pkgs/applications/networking/nntp-proxy/default.nix +++ b/pkgs/applications/networking/nntp-proxy/default.nix @@ -11,14 +11,16 @@ stdenv.mkDerivation rec { sha256 = "0jwxh71am83fbnq9mn06jl06rq8qybm506js79xmmc3xbk5pqvy4"; }; - buildInputs = [ libconfig pkgconfig libevent openssl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libconfig libevent openssl ]; - installFlags = "INSTALL_DIR=\${out}/bin/"; + installFlags = [ "INSTALL_DIR=$(out)/bin/" ]; - preInstall = '' + prePatch = '' mkdir -p $out/bin substituteInPlace Makefile \ - --replace /usr/bin/install $(type -P install) + --replace /usr/bin/install $(type -P install) \ + --replace gcc cc ''; meta = { From ae624c89c1cede40ec0f043f2acab6f47884ea92 Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Fri, 15 Sep 2017 11:22:46 -0700 Subject: [PATCH 141/172] doomseeker: 1.0 -> 1.1 --- pkgs/applications/misc/doomseeker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/doomseeker/default.nix b/pkgs/applications/misc/doomseeker/default.nix index 61b0357bb9d0..1393af67bf8c 100644 --- a/pkgs/applications/misc/doomseeker/default.nix +++ b/pkgs/applications/misc/doomseeker/default.nix @@ -1,11 +1,11 @@ { stdenv, cmake, fetchurl, pkgconfig, qt4, zlib, bzip2 }: stdenv.mkDerivation rec { - name = "doomseeker-1.0"; + name = "doomseeker-1.1"; src = fetchurl { url = "http://doomseeker.drdteam.org/files/${name}_src.tar.bz2"; - sha256 = "172ybxg720r64hp6aah0hqvxklqv1cf8v7kwx0ng5ap0h20jydbw"; + sha256 = "0nmq8s842z30ngzikrmfx0xpnk4klxdv37y26chs002rnj010r7h"; }; buildInputs = [ qt4 zlib bzip2 ]; From 990ea8789db2203f31025ab3f9a333aae55c750b Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Fri, 15 Sep 2017 11:23:26 -0700 Subject: [PATCH 142/172] zandronum: 2.1.2 -> 3.0 remove sqlite-amalgamation and put it internal to the zandronum folder, as it is only used by zandronum. Patches needed to avoid build impurities and to get the correct protocol version to connect to public servers. remove zandronum_bin as it is no longer needed --- pkgs/games/zandronum/add_gitinfo.patch | 15 ++++ pkgs/games/zandronum/bin.nix | 83 ------------------- pkgs/games/zandronum/default.nix | 27 ++++-- .../games/zandronum/dont_update_gitinfo.patch | 19 +++++ .../zandronum/sqlite.nix} | 13 +-- .../zandronum/zan_configure_impurity.patch | 65 +++++++++++++++ pkgs/top-level/all-packages.nix | 10 +-- 7 files changed, 123 insertions(+), 109 deletions(-) create mode 100644 pkgs/games/zandronum/add_gitinfo.patch delete mode 100644 pkgs/games/zandronum/bin.nix create mode 100644 pkgs/games/zandronum/dont_update_gitinfo.patch rename pkgs/{development/libraries/sqlite-amalgamation/default.nix => games/zandronum/sqlite.nix} (65%) create mode 100644 pkgs/games/zandronum/zan_configure_impurity.patch diff --git a/pkgs/games/zandronum/add_gitinfo.patch b/pkgs/games/zandronum/add_gitinfo.patch new file mode 100644 index 000000000000..4d8d7c837961 --- /dev/null +++ b/pkgs/games/zandronum/add_gitinfo.patch @@ -0,0 +1,15 @@ +diff -Naur blah/src/gitinfo.h blah2/src/gitinfo.h +--- blah/src/gitinfo.h 1969-12-31 16:00:00.000000000 -0800 ++++ blah2/src/gitinfo.h 2017-09-15 01:44:43.953562714 -0700 +@@ -0,0 +1,11 @@ ++// dd3c3b57023f64cda84f09ed13e4c03a4ad2b920 ++// ++// This file was automatically generated by the ++// updaterevision tool. Do not edit by hand. ++ ++#define GIT_DESCRIPTION "ZA_3.0-0-dd3c3b57023f" ++#define GIT_HASH "dd3c3b57023f64cda84f09ed13e4c03a4ad2b920" ++#define GIT_TIME "2017-09-01 06:40:50 -0500" ++#define HG_REVISION_NUMBER 1504266050 ++#define HG_REVISION_HASH_STRING "dd3c3b57023f" ++#define HG_TIME "170901-1140" diff --git a/pkgs/games/zandronum/bin.nix b/pkgs/games/zandronum/bin.nix deleted file mode 100644 index 4fa7ec1b0451..000000000000 --- a/pkgs/games/zandronum/bin.nix +++ /dev/null @@ -1,83 +0,0 @@ -{ stdenv -, atk -, bzip2 -, cairo -, fetchurl -, fluidsynth -, fontconfig -, freetype -, gdk_pixbuf -, glib -, gtk2 -, libjpeg_turbo -, mesa_glu -, mesa_noglu -, openssl -, pango -, SDL -, zlib -, makeWrapper -}: - -stdenv.mkDerivation rec { - name = "zandronum-2.1.2"; - - src = fetchurl { - url = "http://zandronum.com/downloads/zandronum2.1.2-linux-x86_64.tar.bz2"; - sha256 = "1f5aw2m8c0bl3lrvi2k3rrzq3q9x1ikxnxxjgh3k9qvanfn7ykbk"; - }; - - libPath = stdenv.lib.makeLibraryPath [ - atk - bzip2 - cairo - fluidsynth - fontconfig - freetype - gdk_pixbuf - glib - gtk2 - libjpeg_turbo - mesa_glu - mesa_noglu - openssl - pango - SDL - stdenv.cc.cc - zlib - ]; - - nativeBuildInputs = [ makeWrapper ]; - - phases = [ "unpackPhase" "installPhase" ]; - - sourceRoot = "."; - - installPhase = '' - mkdir -p $out/bin - mkdir -p $out/share/zandronum - cp *.so *.pk3 zandronum zandronum-server $out/share/zandronum - - patchelf \ - --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \ - --set-rpath $libPath:$out/share/zandronum \ - $out/share/zandronum/zandronum - patchelf \ - --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \ - --set-rpath $libPath \ - $out/share/zandronum/zandronum-server - - # If we don't set absolute argv0, zandronum.wad file is not found. - makeWrapper $out/share/zandronum/zandronum $out/bin/zandronum - makeWrapper $out/share/zandronum/zandronum-server $out/bin/zandronum-server - ''; - - meta = { - homepage = http://zandronum.com/; - description = "Multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software. Binary version for online play"; - maintainers = [ stdenv.lib.maintainers.lassulus ]; - # Binary version has different version string than source code version. - license = stdenv.lib.licenses.unfreeRedistributable; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/games/zandronum/default.nix b/pkgs/games/zandronum/default.nix index 7b4185594189..fd7113e3a539 100644 --- a/pkgs/games/zandronum/default.nix +++ b/pkgs/games/zandronum/default.nix @@ -1,31 +1,40 @@ { stdenv, lib, fetchhg, cmake, pkgconfig, makeWrapper, callPackage -, soundfont-fluid, SDL, mesa, bzip2, zlib, libjpeg, fluidsynth, openssl, sqlite-amalgamation, gtk2 +, soundfont-fluid, SDL, mesa, glew, bzip2, zlib, libjpeg, fluidsynth, openssl, gtk2, python3 , serverOnly ? false }: let suffix = lib.optionalString serverOnly "-server"; fmod = callPackage ./fmod.nix { }; + sqlite = callPackage ./sqlite.nix { }; # FIXME: drop binary package when upstream fixes their protocol versioning in stdenv.mkDerivation { - name = "zandronum${suffix}-2.1.2"; + name = "zandronum${suffix}-3.0"; src = fetchhg { url = "https://bitbucket.org/Torr_Samaho/zandronum-stable"; - rev = "a3663b0061d5"; - sha256 = "0qwsnbwhcldwrirfk6hpiklmcj3a7dzh6pn36nizci6pcza07p56"; + rev = "dd3c3b57023f"; + sha256 = "1f8pd8d2zjwdp6v9anp9yrkdbfhd2mp7svmnna0jiqgxjw6wkyls"; }; + # zandronum tries to download sqlite now when running cmake, don't let it + + # it also needs the current mercurial revision info embedded in gitinfo.h + # otherwise, the client will fail to connect to servers because the + # protocol version doesn't match. + + patches = [ ./zan_configure_impurity.patch ./add_gitinfo.patch ./dont_update_gitinfo.patch ]; + # I have no idea why would SDL and libjpeg be needed for the server part! # But they are. - buildInputs = [ openssl bzip2 zlib SDL libjpeg ] - ++ lib.optionals (!serverOnly) [ mesa fmod fluidsynth gtk2 ]; + buildInputs = [ openssl bzip2 zlib SDL libjpeg sqlite ] + ++ lib.optionals (!serverOnly) [ mesa glew fmod fluidsynth gtk2 ]; - nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; + nativeBuildInputs = [ cmake pkgconfig makeWrapper python3 ]; preConfigure = '' - ln -s ${sqlite-amalgamation}/* sqlite/ + ln -s ${sqlite}/* sqlite/ sed -ie 's| restrict| _restrict|g' dumb/include/dumb.h \ dumb/src/it/*.c '' + lib.optionalString serverOnly '' @@ -53,7 +62,7 @@ in stdenv.mkDerivation { $out/lib/zandronum # For some reason, while symlinks work for binary version, they don't for source one. - makeWrapper $out/lib/zandronum/zandronum${suffix} $out/bin/zandronum${suffix} + makeWrapper $out/lib/zandronum/zandronum${suffix} $out/bin/zandronum${suffix} --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH:${fluidsynth}/lib" ''; postFixup = lib.optionalString (!serverOnly) '' diff --git a/pkgs/games/zandronum/dont_update_gitinfo.patch b/pkgs/games/zandronum/dont_update_gitinfo.patch new file mode 100644 index 000000000000..d6dd3a58f457 --- /dev/null +++ b/pkgs/games/zandronum/dont_update_gitinfo.patch @@ -0,0 +1,19 @@ +diff -r dd3c3b57023f src/CMakeLists.txt +--- a/src/CMakeLists.txt Fri Sep 01 06:40:50 2017 -0500 ++++ b/src/CMakeLists.txt Fri Sep 15 01:46:34 2017 -0700 +@@ -636,15 +636,6 @@ + add_definitions( -DBACKPATCH ) + endif( BACKPATCH ) + +-# Update gitinfo.h +- +-get_target_property( UPDATEREVISION_EXE updaterevision LOCATION ) +- +-add_custom_target( revision_check ALL +- COMMAND ${UPDATEREVISION_EXE} src/gitinfo.h +- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} +- DEPENDS updaterevision ) +- + # Libraries ZDoom needs + + message( STATUS "Fluid synth libs: ${FLUIDSYNTH_LIBRARIES}" ) diff --git a/pkgs/development/libraries/sqlite-amalgamation/default.nix b/pkgs/games/zandronum/sqlite.nix similarity index 65% rename from pkgs/development/libraries/sqlite-amalgamation/default.nix rename to pkgs/games/zandronum/sqlite.nix index 2ee3b6f2ecbb..35fcb4a0eec7 100644 --- a/pkgs/development/libraries/sqlite-amalgamation/default.nix +++ b/pkgs/games/zandronum/sqlite.nix @@ -1,27 +1,20 @@ { lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation { - name = "sqlite-amalgamation-201505302257"; + name = "sqlite-zandronum-3.0"; src = fetchurl { - url = "https://www.sqlite.org/snapshot/sqlite-amalgamation-201505302257.zip"; - sha256 = "0488wjrpnxd61g7pcka6fckx0q8yl1k26i6q5hrmkm92qcpml76h"; + url = "https://www.sqlite.org/2017/sqlite-autoconf-3180000.tar.gz"; + sha256 = "0p5cx7nbjxk7glcm277ypi5w4gv144qazw79ql47svlpccj62mrp"; }; phases = [ "unpackPhase" "buildPhase" ]; - buildInputs = [ unzip ]; - - unpackPhase = '' - unzip $src - ''; - buildPhase = '' mkdir -p $out cp sqlite3.c $out/ cp sqlite3.h $out/ cp sqlite3ext.h $out/ - cp shell.c $out/ ''; meta = { diff --git a/pkgs/games/zandronum/zan_configure_impurity.patch b/pkgs/games/zandronum/zan_configure_impurity.patch new file mode 100644 index 000000000000..0cf7150502e4 --- /dev/null +++ b/pkgs/games/zandronum/zan_configure_impurity.patch @@ -0,0 +1,65 @@ +diff -r 6d5130e4ae52 sqlite/CMakeLists.txt +--- a/sqlite/CMakeLists.txt Sun Sep 10 18:53:00 2017 +0200 ++++ b/sqlite/CMakeLists.txt Fri Sep 15 00:12:11 2017 -0700 +@@ -1,62 +1,5 @@ + cmake_minimum_required( VERSION 2.4 ) + +-# [BB/EP] Download SQLite archive and extract the sources if necessary. +-set( ZAN_SQLITE_VERSION 3180000 ) # SQL version 3.18.0 +-set( ZAN_SQLITE_YEAR 2017 ) +-set( ZAN_SQLITE_SHA1 "74559194e1dd9b9d577cac001c0e9d370856671b" ) +-set( ZAN_SQLITE_DOWNLOAD_NAME "sqlite-autoconf-${ZAN_SQLITE_VERSION}" ) +-set( ZAN_SQLITE_TEMP_ARCHIVE "${CMAKE_CURRENT_SOURCE_DIR}/${ZAN_SQLITE_DOWNLOAD_NAME}.tar.gz" ) +-set( ZAN_SQLITE_HASHED_ARCHIVE "${CMAKE_CURRENT_SOURCE_DIR}/sqlite-${ZAN_SQLITE_SHA1}.tar.gz" ) +- +-if( IS_DIRECTORY ${ZAN_SQLITE_HASHED_ARCHIVE} OR IS_SYMLINK ${ZAN_SQLITE_HASHED_ARCHIVE} ) +- message( FATAL_ERROR "SQLite: ${ZAN_SQLITE_HASHED_ARCHIVE} must be a valid file.\n" +- "SQLite: Please remove it and try again." ) +-elseif( NOT EXISTS ${ZAN_SQLITE_HASHED_ARCHIVE} ) +- +- if( IS_DIRECTORY ${ZAN_SQLITE_TEMP_ARCHIVE} OR IS_SYMLINK ${ZAN_SQLITE_TEMP_ARCHIVE} ) +- message( FATAL_ERROR "SQLite: ${ZAN_SQLITE_TEMP_ARCHIVE} must be a valid file.\n" +- "SQLite: Please remove it and try again." ) +- endif() +- message( STATUS "SQLite: downloading the archive..." ) +- +- file( DOWNLOAD https://www.sqlite.org/${ZAN_SQLITE_YEAR}/${ZAN_SQLITE_DOWNLOAD_NAME}.tar.gz ${ZAN_SQLITE_TEMP_ARCHIVE} +- SHOW_PROGRESS +- STATUS ZAN_SQLITE_DOWNLOAD_STATUS ) +- +- # Report any problem if present and abort immediately. +- list( GET ZAN_SQLITE_DOWNLOAD_STATUS 0 ZAN_SQLITE_DOWNLOAD_ERROR_CODE ) +- if( ZAN_SQLITE_DOWNLOAD_ERROR_CODE ) +- list( GET ZAN_SQLITE_DOWNLOAD_STATUS 1 ZAN_SQLITE_DOWNLOAD_ERROR_MESSAGE ) +- message( FATAL_ERROR "SQLite: download failed. Reason: ${ZAN_SQLITE_DOWNLOAD_ERROR_MESSAGE}" ) +- endif() +- +- # Check the hash. Abort immediately if it's not valid (something is wrong with the download) +- file( SHA1 ${ZAN_SQLITE_TEMP_ARCHIVE} ZAN_SQLITE_CURRENT_SHA1 ) +- if( NOT ZAN_SQLITE_CURRENT_SHA1 STREQUAL ZAN_SQLITE_SHA1 ) +- message( FATAL_ERROR "SQLite: download failed. The downloaded file has a different hash:\n" +- "SQLite: valid: ${ZAN_SQLITE_SHA1}\n" +- "SQLite: downloaded: ${ZAN_SQLITE_CURRENT_SHA1}" ) +- endif() +- +- message( STATUS "SQLite: saving the source files into the 'sqlite' directory." ) +- +- # Rename the archive. +- execute_process( COMMAND ${CMAKE_COMMAND} -E rename ${ZAN_SQLITE_TEMP_ARCHIVE} ${ZAN_SQLITE_HASHED_ARCHIVE} ) +- +- # Extract the archive. +- execute_process( COMMAND ${CMAKE_COMMAND} -E tar xzf ${ZAN_SQLITE_HASHED_ARCHIVE} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ) +- +- # Copy the required files. +- execute_process( COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/${ZAN_SQLITE_DOWNLOAD_NAME}/sqlite3.c ${CMAKE_CURRENT_SOURCE_DIR} ) +- execute_process( COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/${ZAN_SQLITE_DOWNLOAD_NAME}/sqlite3.h ${CMAKE_CURRENT_SOURCE_DIR} ) +- execute_process( COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/${ZAN_SQLITE_DOWNLOAD_NAME}/sqlite3ext.h ${CMAKE_CURRENT_SOURCE_DIR} ) +- +- # Remove the extracted folder. +- execute_process( COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_CURRENT_SOURCE_DIR}/${ZAN_SQLITE_DOWNLOAD_NAME} ) +- +- message( STATUS "SQLite: done." ) +-endif() +- + add_library( sqlite3 sqlite3.c ) + target_link_libraries( sqlite3 ${CMAKE_DL_LIBS} ) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a38d87218719..e02b240612f0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3795,6 +3795,8 @@ with pkgs; pdf2svg = callPackage ../tools/graphics/pdf2svg { }; + fmodex = callPackage ../games/zandronum/fmod.nix { }; + pdfmod = callPackage ../applications/misc/pdfmod { }; jbig2enc = callPackage ../tools/graphics/jbig2enc { }; @@ -10484,8 +10486,6 @@ with pkgs; sqlite3_analyzer = lowPrio (callPackage ../development/libraries/sqlite/sqlite3_analyzer.nix { }); - sqlite-amalgamation = callPackage ../development/libraries/sqlite-amalgamation { }; - sqlite-interactive = appendToName "interactive" (sqlite.override { interactive = true; }).bin; sqlcipher = lowPrio (callPackage ../development/libraries/sqlcipher { @@ -17830,16 +17830,12 @@ with pkgs; xsokoban = callPackage ../games/xsokoban { }; - zandronum = callPackage ../games/zandronum { - cmake = cmake_2_8; - }; + zandronum = callPackage ../games/zandronum { }; zandronum-server = zandronum.override { serverOnly = true; }; - zandronum-bin = hiPrio (callPackage ../games/zandronum/bin.nix { }); - zangband = callPackage ../games/zangband { }; zdbsp = callPackage ../games/zdoom/zdbsp.nix { }; From 6b7a9376f17deb2adb2b010e8022bea5e43042e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Fri, 15 Sep 2017 20:19:42 +0200 Subject: [PATCH 143/172] nixos/wpa_supplicant: use literalExample For various reasons, big Nix attrsets look ugly in the generated manual page[1]. Use literalExample to fix it. [1] Quotes around attribute names are lost, newlines inside multi-line strings are shown as '\n' and attrs written on multiple lines are joined into one. --- .../services/networking/supplicant.nix | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/nixos/modules/services/networking/supplicant.nix b/nixos/modules/services/networking/supplicant.nix index 31d11548f195..dc90a4bcc620 100644 --- a/nixos/modules/services/networking/supplicant.nix +++ b/nixos/modules/services/networking/supplicant.nix @@ -181,18 +181,19 @@ in default = { }; - example = { - "wlan0 wlan1" = { - configFile = "/etc/wpa_supplicant"; - userControlled.group = "network"; - extraConf = '' - ap_scan=1 - p2p_disabled=1 - ''; - extraCmdArgs = "-u -W"; - bridge = "br0"; - }; - }; + example = literalExample '' + { "wlan0 wlan1" = { + configFile = "/etc/wpa_supplicant"; + userControlled.group = "network"; + extraConf = ''' + ap_scan=1 + p2p_disabled=1 + '''; + extraCmdArgs = "-u -W"; + bridge = "br0"; + }; + } + ''; description = '' Interfaces for which to start wpa_supplicant. From 76519f9299065671a694adf9214e54cb3efae5cd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 15 Sep 2017 20:47:24 +0200 Subject: [PATCH 144/172] ghc-7.2.2: record the commit that broke it git-bisect says the problem is 51cf42ad0d3ccb55af182f1f0ee5eb5094ea5995. --- pkgs/development/compilers/ghc/7.2.2.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ghc/7.2.2.nix b/pkgs/development/compilers/ghc/7.2.2.nix index a8faa8f63be1..dd3b5cb2ebcb 100644 --- a/pkgs/development/compilers/ghc/7.2.2.nix +++ b/pkgs/development/compilers/ghc/7.2.2.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { ]; platforms = ["x86_64-linux" "i686-linux"]; # Darwin is unsupported. inherit (ghc.meta) license; - broken = true; # https://hydra.nixos.org/build/60616815 + broken = true; # broken by 51cf42ad0d3ccb55af182f1f0ee5eb5094ea5995: https://hydra.nixos.org/build/60616815 }; } From 6141d8e6fdc17b3937011368a36a098b8cb99403 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Fri, 15 Sep 2017 21:32:13 +0200 Subject: [PATCH 145/172] chromium: shorten mkdir -p --- pkgs/applications/networking/browsers/chromium/browser.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 62059dd95993..75f2dcda6a62 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -12,7 +12,7 @@ mkChromiumDerivation (base: rec { sandboxExecutableName = "__chromium-suid-sandbox"; installPhase = '' - mkdir -p "$libExecPath/chromium" + mkdir -p "$libExecPath" cp -v "$buildPath/"*.pak "$buildPath/"*.bin "$libExecPath/" cp -v "$buildPath/icudtl.dat" "$libExecPath/" cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/" From b19fa00e3edd49442a838e4979b88d4d9e99af00 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 10 Sep 2017 17:59:45 +0200 Subject: [PATCH 146/172] Revert "mcrl2: force use of gcc5 to prevent compilation errors" This reverts commit 5e5e57b57bc06119b63e07405a2550894e5bff83. Already fixed with edd94f5fcd077a9e7eb80102cc076a8f8bfe3524. --- pkgs/applications/science/logic/mcrl2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/mcrl2/default.nix b/pkgs/applications/science/logic/mcrl2/default.nix index ce368a77c2b4..c9016a5ee0ce 100644 --- a/pkgs/applications/science/logic/mcrl2/default.nix +++ b/pkgs/applications/science/logic/mcrl2/default.nix @@ -1,4 +1,4 @@ -{stdenv, gcc5, fetchurl, xlibs, cmake, subversion, mesa, qt5, boost, +{stdenv, fetchurl, xlibs, cmake, subversion, mesa, qt5, boost, python27, python27Packages}: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1c8h94ja7271ph61zrcgnjgblxppld6v22f7f900prjgzbcfy14m"; }; - buildInputs = [ gcc5 cmake mesa qt5.qtbase boost ]; + buildInputs = [ cmake mesa qt5.qtbase boost ]; enableParallelBuilding = true; From c8e7aab0c8bae8a49ec5bd87ace65b237c8e3d18 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 15 Sep 2017 23:15:16 +0300 Subject: [PATCH 147/172] sd-image-aarch64: Increase CMA memory so RPi3 virtual console works again --- nixos/modules/installer/cd-dvd/sd-image-aarch64.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix index 063ffb191ee6..8d80ceff84e0 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix @@ -27,7 +27,8 @@ in boot.loader.generic-extlinux-compatible.enable = true; boot.kernelPackages = pkgs.linuxPackages_latest; - boot.kernelParams = ["console=ttyS0,115200n8" "console=tty0"]; + # Increase the amount of CMA to ensure the virtual console on the RPi3 works. + boot.kernelParams = ["cma=32M" "console=ttyS0,115200n8" "console=tty0"]; boot.consoleLogLevel = 7; # FIXME: this probably should be in installation-device.nix From 65445212df63934c8f05d19f5c4a9ecaff92276d Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 15 Sep 2017 23:55:50 +0300 Subject: [PATCH 148/172] libffi: Add aarch64 patch This fixes pythonPackages.cffi test suite failure. --- pkgs/development/libraries/libffi/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index 284705e88d33..e48db6c9928b 100644 --- a/pkgs/development/libraries/libffi/default.nix +++ b/pkgs/development/libraries/libffi/default.nix @@ -10,7 +10,11 @@ stdenv.mkDerivation rec { sha256 = "0dya49bnhianl0r65m65xndz6ls2jn1xngyn72gd28ls3n7bnvnh"; }; - patches = stdenv.lib.optional stdenv.isCygwin ./3.2.1-cygwin.patch; + patches = stdenv.lib.optional stdenv.isCygwin ./3.2.1-cygwin.patch ++ + stdenv.lib.optional stdenv.isAarch64 (fetchurl { + url = https://src.fedoraproject.org/rpms/libffi/raw/ccffc1700abfadb0969495a6e51b964117fc03f6/f/libffi-aarch64-rhbz1174037.patch; + sha256 = "1vpirrgny43hp0885rswgv3xski8hg7791vskpbg3wdjdpb20wbc"; + }); outputs = [ "out" "dev" "man" "info" ]; From fea9e081a92683affd9731601c0bd12b59bbeeb0 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Fri, 15 Sep 2017 23:08:53 +0200 Subject: [PATCH 149/172] namecoin service: fix typo --- nixos/modules/services/networking/namecoind.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/namecoind.nix b/nixos/modules/services/networking/namecoind.nix index 9df9f67cde83..11f7d7e5caef 100644 --- a/nixos/modules/services/networking/namecoind.nix +++ b/nixos/modules/services/networking/namecoind.nix @@ -173,7 +173,7 @@ in serviceConfig = { User = "namecoin"; - Griup = "namecoin"; + Group = "namecoin"; ExecStart = "${pkgs.altcoins.namecoind}/bin/namecoind -conf=${configFile} -datadir=${dataDir} -printtoconsole"; ExecStop = "${pkgs.coreutils}/bin/kill -KILL $MAINPID"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; From a0a8f0ac87349a6eaf09f952805fdf739d8a87f8 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 16 Sep 2017 01:16:08 +0300 Subject: [PATCH 150/172] python2: Use system libffi on Aarch64 libffi needs a patch to actually work on aarch64 (or the cffi Python package fails its testsuite). Of course the bundled version of libffi has the same bug, so don't use the buggy version on aarch64. Python3 already uses the system libffi on all platforms. I don't know why Python2 doesn't. --- .../development/interpreters/python/cpython/2.7/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index f601fbc98085..5f0d8d0655c2 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -110,8 +110,9 @@ let "--enable-shared" "--with-threads" "--enable-unicode=ucs4" - ] ++ optionals hostPlatform.isCygwin [ + ] ++ optionals (hostPlatform.isCygwin || hostPlatform.isAarch64) [ "--with-system-ffi" + ] ++ optionals hostPlatform.isCygwin [ "--with-system-expat" "ac_cv_func_bind_textdomain_codeset=yes" ] ++ optionals stdenv.isDarwin [ @@ -125,7 +126,8 @@ let buildInputs = optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++ [ bzip2 openssl zlib ] - ++ optionals hostPlatform.isCygwin [ expat libffi ] + ++ optional (hostPlatform.isCygwin || hostPlatform.isAarch64) libffi + ++ optional hostPlatform.isCygwin expat ++ [ db gdbm ncurses sqlite readline ] ++ optionals x11Support [ tcl tk xlibsWrapper libX11 ] ++ optionals stdenv.isDarwin [ CF configd ]; From edd0d2f2e9faac642096caf3250b2b21364135bd Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 16 Sep 2017 00:20:41 +0200 Subject: [PATCH 151/172] hardened-config: additional refcount checking --- pkgs/os-specific/linux/kernel/hardened-config.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix index 5711779eb869..cf2b223a8863 100644 --- a/pkgs/os-specific/linux/kernel/hardened-config.nix +++ b/pkgs/os-specific/linux/kernel/hardened-config.nix @@ -68,6 +68,10 @@ DEBUG_SG y SCHED_STACK_END_CHECK y BUG_ON_DATA_CORRUPTION y +${optionalString (versionAtLeast version "4.13") '' + REFCOUNT_FULL y +''} + # Perform usercopy bounds checking. HARDENED_USERCOPY y From 9a763f8f59e9dd03a93fa99170d16f1ad517af0f Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 16 Sep 2017 00:20:51 +0200 Subject: [PATCH 152/172] hardened-config: enable the randstruct plugin --- pkgs/os-specific/linux/kernel/hardened-config.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix index cf2b223a8863..dda7ca6226c9 100644 --- a/pkgs/os-specific/linux/kernel/hardened-config.nix +++ b/pkgs/os-specific/linux/kernel/hardened-config.nix @@ -93,6 +93,11 @@ ${optionalString (versionAtLeast version "4.11") '' GCC_PLUGIN_STRUCTLEAK y # A port of the PaX structleak plugin ''} +${optionalString (versionAtLeast version "4.13") '' + GCC_PLUGIN_RANDSTRUCT y # A port of the PaX randstruct plugin + GCC_PLUGIN_RANDSTRUCT_PERFORMANCE y +''} + # Disable various dangerous settings ACPI_CUSTOM_METHOD n # Allows writing directly to physical memory PROC_KCORE n # Exposes kernel text image layout From dd170cd5df832a7f1d70aba69fee7c41d012b34a Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 16 Sep 2017 00:20:59 +0200 Subject: [PATCH 153/172] hardened-config: build with fortify source --- pkgs/os-specific/linux/kernel/hardened-config.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix index dda7ca6226c9..7f1fb98789d9 100644 --- a/pkgs/os-specific/linux/kernel/hardened-config.nix +++ b/pkgs/os-specific/linux/kernel/hardened-config.nix @@ -106,4 +106,9 @@ INET_DIAG n # Has been used for heap based attacks in the past # Use -fstack-protector-strong (gcc 4.9+) for best stack canary coverage. CC_STACKPROTECTOR_REGULAR n CC_STACKPROTECTOR_STRONG y + +# Enable compile/run-time buffer overflow detection ala glibc's _FORTIFY_SOURCE +${optionalString (versionAtLeast version "4.13") '' + FORTIFY_SOURCE y +''} '' From f8f62d5216b76e886bed964f3e94f276f194be1c Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Fri, 15 Sep 2017 16:48:53 -0400 Subject: [PATCH 154/172] nilearn: 0.2.5 -> 0.3.1 fixes #29178 --- .../python-modules/nilearn/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 31 +------------------ 2 files changed, 32 insertions(+), 30 deletions(-) create mode 100644 pkgs/development/python-modules/nilearn/default.nix diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix new file mode 100644 index 000000000000..f5dc7607e2d2 --- /dev/null +++ b/pkgs/development/python-modules/nilearn/default.nix @@ -0,0 +1,31 @@ +{ stdenv, buildPythonPackage, fetchPypi, nose, nibabel, numpy, scikitlearn +, scipy, matplotlib }: + +buildPythonPackage rec { + pname = "nilearn"; + version = "0.3.1"; + name = "nilearn-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0kkarh5cdcd2czs0bf0s1g51qas84mfxfq0dzd7k5h5l0qr4zy06"; + }; + + checkPhase = "nosetests --exclude with_expand_user nilearn/tests"; + + buildInputs = [ nose ]; + + propagatedBuildInputs = [ + matplotlib + nibabel + numpy + scikitlearn + scipy + ]; + + meta = with stdenv.lib; { + homepage = http://nilearn.github.io; + description = "A module for statistical learning on neuroimaging data"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bc55c414aa05..243ea7dac94f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13190,36 +13190,7 @@ in { }; }; - nilearn = buildPythonPackage rec { - version = "0.2.5"; - name = "nilearn-${version}"; - - # package seems to attempt Python 3 compatibility, but throws UnicodeDecodeError when building: - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/n/nilearn/${name}.tar.gz"; - sha256 = "1lmkrzr5x2yp129v2fvckrbdzf2kpcivdg9cacl519l3mb0acdv9"; - }; - - checkPhase = "nosetests --exclude with_expand_user nilearn/tests"; - - buildInputs = with self; [ nose ]; - - propagatedBuildInputs = with self; [ - matplotlib - nibabel - numpy - scikitlearn - scipy - ]; - - meta = { - homepage = http://nilearn.github.io; - description = "A module for statistical learning on neuroimaging data"; - license = licenses.bsd3; - }; - }; + nilearn = callPackage ../development/python-modules/nilearn {}; nipy = buildPythonPackage rec { version = "0.4.0"; From c71d8a1aeb87cf703faf3f72fd228a038a9c9723 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 16 Sep 2017 04:39:25 +0300 Subject: [PATCH 155/172] mxnet: init at 0.11.0 --- .../science/math/mxnet/default.nix | 43 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/applications/science/math/mxnet/default.nix diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix new file mode 100644 index 000000000000..67183c9dd551 --- /dev/null +++ b/pkgs/applications/science/math/mxnet/default.nix @@ -0,0 +1,43 @@ +{ stdenv, lib, fetchgit, cmake +, opencv, gtest, openblas, liblapack +, cudaSupport ? false, cudatoolkit +, cudnnSupport ? false, cudnn +}: + +assert cudnnSupport -> cudaSupport; + +stdenv.mkDerivation rec { + name = "mxnet-${version}"; + version = "0.11.0"; + + # Submodules needed + src = fetchgit { + url = "https://github.com/apache/incubator-mxnet"; + rev = "refs/tags/${version}"; + sha256 = "1qgns0c70a1gfyil96h17ms736nwdkp9kv496gvs9pkzqzvr6cpz"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ opencv gtest openblas liblapack ] + ++ lib.optional cudaSupport cudatoolkit + ++ lib.optional cudnnSupport cudnn; + + cmakeFlags = lib.optional (!cudaSupport) "-DUSE_CUDA=OFF" + ++ lib.optional (!cudnnSupport) "-DUSE_CUDNN=OFF"; + + installPhase = '' + install -Dm755 libmxnet.so $out/lib/libmxnet.so + cp -r ../include $out + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Lightweight, Portable, Flexible Distributed/Mobile Deep Learning with Dynamic, Mutation-aware Dataflow Dep Scheduler"; + homepage = "https://mxnet.incubator.apache.org/"; + maintainers = with maintainers; [ abbradar ]; + license = licenses.asl20; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 61c35ca93b14..3662baec6081 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18472,6 +18472,8 @@ with pkgs; sbcl = null; }; + mxnet = callPackage ../applications/science/math/mxnet { }; + wxmaxima = callPackage ../applications/science/math/wxmaxima { wxGTK = wxGTK30; }; pari = callPackage ../applications/science/math/pari { tex = texlive.combined.scheme-basic; }; From eb2f321e11a48eb2041fe7aabd150ca98360d6a6 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 16 Sep 2017 04:39:33 +0300 Subject: [PATCH 156/172] python.pkgs.mxnet: init at 0.11.0 --- pkgs/top-level/python-packages.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 243ea7dac94f..88ccf67f9acb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3644,6 +3644,25 @@ in { }; }; + mxnet = buildPythonPackage rec { + inherit (pkgs.mxnet) name version src meta; + + buildInputs = [ pkgs.mxnet ]; + propagatedBuildInputs = with self; [ requests numpy graphviz ]; + + LD_LIBRARY_PATH = makeLibraryPath [ pkgs.mxnet ]; + + doCheck = !isPy3k; + + preConfigure = '' + cd python + ''; + + postInstall = '' + rm -rf $out/mxnet + ln -s ${pkgs.mxnet}/lib/libmxnet.so $out/${python.sitePackages}/mxnet + ''; + }; pkginfo = buildPythonPackage rec { version = "1.3.2"; From 569867b3e8f59ec25c1f815b5ae4810df6c382b0 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 16 Sep 2017 10:34:15 +0800 Subject: [PATCH 157/172] dropbox: 34.4.20 -> 34.4.22 --- pkgs/applications/networking/dropbox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 01dfa244a19c..0bd3dcbc33a9 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -24,10 +24,10 @@ let # NOTE: When updating, please also update in current stable, # as older versions stop working - version = "34.4.20"; + version = "34.4.22"; sha256 = { - "x86_64-linux" = "04yc0sf4w4p86f2rpph4g4qhd4wxlsyhiwcf4201xadnnjj11gzz"; - "i686-linux" = "0ch5yxw1n6mwa6050pd10f5z3ys2yca9n8ccjlqi2d2aa4qcxsmr"; + "x86_64-linux" = "1ryxj8d5ym2dc18vn2m883jvy9n19xvw5kgfbqxziirb0bip58ba"; + "i686-linux" = "1pj7c77196ill8jpwk8f66917v2a7c2xvkd9mssh98c9n321k5j8"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); arch = { From 8080285966835c202ed426a6f573fe1f53aa0d08 Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Fri, 15 Sep 2017 23:08:47 -0700 Subject: [PATCH 158/172] zandronum: fix soundfont support, minor cleanup also add myself to maintainers --- pkgs/games/zandronum/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/games/zandronum/default.nix b/pkgs/games/zandronum/default.nix index fd7113e3a539..df58304b38d8 100644 --- a/pkgs/games/zandronum/default.nix +++ b/pkgs/games/zandronum/default.nix @@ -8,7 +8,6 @@ let fmod = callPackage ./fmod.nix { }; sqlite = callPackage ./sqlite.nix { }; -# FIXME: drop binary package when upstream fixes their protocol versioning in stdenv.mkDerivation { name = "zandronum${suffix}-3.0"; @@ -37,7 +36,7 @@ in stdenv.mkDerivation { ln -s ${sqlite}/* sqlite/ sed -ie 's| restrict| _restrict|g' dumb/include/dumb.h \ dumb/src/it/*.c - '' + lib.optionalString serverOnly '' + '' + lib.optionalString (!serverOnly) '' sed -i \ -e "s@/usr/share/sounds/sf2/@${soundfont-fluid}/share/soundfonts/@g" \ -e "s@FluidR3_GM.sf2@FluidR3_GM2-2.sf2@g" \ @@ -60,10 +59,10 @@ in stdenv.mkDerivation { *.pk3 \ ${lib.optionalString (!serverOnly) "liboutput_sdl.so"} \ $out/lib/zandronum - - # For some reason, while symlinks work for binary version, they don't for source one. - makeWrapper $out/lib/zandronum/zandronum${suffix} $out/bin/zandronum${suffix} --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH:${fluidsynth}/lib" - ''; + '' + (if (!serverOnly) then + ''makeWrapper $out/lib/zandronum/zandronum $out/bin/zandronum --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH:${fluidsynth}/lib"'' + else + ''makeWrapper $out/lib/zandronum/zandronum${suffix} $out/bin/zandronum${suffix}''); postFixup = lib.optionalString (!serverOnly) '' patchelf --set-rpath $(patchelf --print-rpath $out/lib/zandronum/zandronum):$out/lib/zandronum \ @@ -73,7 +72,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { homepage = http://zandronum.com/; description = "Multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software"; - maintainers = with maintainers; [ lassulus ]; + maintainers = with maintainers; [ lassulus MP2E ]; license = licenses.unfreeRedistributable; platforms = platforms.linux; }; From 151d0fde1979216caf21d5e96131ca6fd4f663e8 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Wed, 13 Sep 2017 00:43:11 +0100 Subject: [PATCH 159/172] pythonPackages.unidecode: 0.04.18 -> 0.04.21 Higher version is a requirement of textacy. --- .../python-modules/unidecode/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +---------------- 2 files changed, 24 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/unidecode/default.nix diff --git a/pkgs/development/python-modules/unidecode/default.nix b/pkgs/development/python-modules/unidecode/default.nix new file mode 100644 index 000000000000..1a5da395ee34 --- /dev/null +++ b/pkgs/development/python-modules/unidecode/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, glibcLocales }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "Unidecode"; + version = "0.04.21"; + + src = fetchPypi { + inherit pname version; + sha256 = "0lfhp9c5xrbpjvbpr12ji52g1lx04404bzzdg6pvabhzisw6l2i8"; + }; + + LC_ALL="en_US.UTF-8"; + + buildInputs = [ glibcLocales ]; + + meta = with stdenv.lib; { + homepage = http://pypi.python.org/pypi/Unidecode/; + description = "ASCII transliterations of Unicode text"; + license = licenses.gpl2; + maintainers = with maintainers; [ domenkozar ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9edf6571a527..19899264a7bb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -24149,26 +24149,7 @@ EOF }; - unidecode = buildPythonPackage rec { - name = "Unidecode-0.04.18"; - - src = pkgs.fetchurl { - url = "mirror://pypi/U/Unidecode/${name}.tar.gz"; - sha256 = "12hhblqy1ajvidm38im4171x4arg83pfmziyn53nizp29p3m14gi"; - }; - - LC_ALL="en_US.UTF-8"; - - buildInputs = [ pkgs.glibcLocales ]; - - meta = { - homepage = http://pypi.python.org/pypi/Unidecode/; - description = "ASCII transliterations of Unicode text"; - license = licenses.gpl2; - maintainers = with maintainers; [ domenkozar ]; - }; - }; - + unidecode = callPackage ../development/python-modules/unidecode {}; pyusb = buildPythonPackage rec { name = "pyusb-1.0.0"; From 31037bab49848e3e8d9fe9ab9e1d716f18fbdcf3 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Wed, 13 Sep 2017 00:54:52 +0100 Subject: [PATCH 160/172] pythonPackages.cachetools: Add version 2.0.1 Textacy requires a later version. v2.0.0 introduced breaking changes, so keep two versions for other packages. --- .../audio/mopidy-gmusic/default.nix | 2 +- .../python-modules/cachetools/1.nix | 18 +++++++++++++++ .../python-modules/cachetools/default.nix | 18 +++++++++++++++ pkgs/top-level/python-packages.nix | 22 +++++-------------- 4 files changed, 42 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/cachetools/1.nix create mode 100644 pkgs/development/python-modules/cachetools/default.nix diff --git a/pkgs/applications/audio/mopidy-gmusic/default.nix b/pkgs/applications/audio/mopidy-gmusic/default.nix index ab2a23b1994c..b792ec3428e7 100644 --- a/pkgs/applications/audio/mopidy-gmusic/default.nix +++ b/pkgs/applications/audio/mopidy-gmusic/default.nix @@ -13,7 +13,7 @@ pythonPackages.buildPythonApplication rec { mopidy pythonPackages.requests pythonPackages.gmusicapi - pythonPackages.cachetools + pythonPackages.cachetools_1 ]; doCheck = false; diff --git a/pkgs/development/python-modules/cachetools/1.nix b/pkgs/development/python-modules/cachetools/1.nix new file mode 100644 index 000000000000..edfe965fa800 --- /dev/null +++ b/pkgs/development/python-modules/cachetools/1.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPyPy }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "cachetools"; + version = "1.1.3"; + disabled = isPyPy; # a test fails + + src = fetchPypi { + inherit pname version; + sha256 = "0js7qx5pa8ibr8487lcf0x3a7w0xml0wa17snd6hjs0857kqhn20"; + }; + + meta = with stdenv.lib; { + homepage = "https://github.com/tkem/cachetools"; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/cachetools/default.nix b/pkgs/development/python-modules/cachetools/default.nix new file mode 100644 index 000000000000..fe69768c976a --- /dev/null +++ b/pkgs/development/python-modules/cachetools/default.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPyPy }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "cachetools"; + version = "2.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0pdw2fr29pxlyn1g5fhdrrqbpn0iw062nv716ngdqvdx7hnizq7d"; + }; + + meta = with stdenv.lib; { + description = "Extensible memoizing collections and decorators"; + homepage = "https://github.com/tkem/cachetools"; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 19899264a7bb..f11f3e2c2c0b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14289,7 +14289,7 @@ in { oslo-serialization oslo-utils iso8601 oslo-log oslo-i18n webob ]; buildInputs = with self; [ - oslo-middleware cachetools oslo-service futurist anyjson oslosphinx + oslo-middleware cachetools_1 oslo-service futurist anyjson oslosphinx testtools oslotest ]; @@ -14298,20 +14298,8 @@ in { }; }; - cachetools = buildPythonPackage rec { - name = "cachetools-${version}"; - version = "1.1.3"; - disabled = isPyPy; # a test fails - - src = pkgs.fetchurl { - url = "mirror://pypi/c/cachetools/${name}.tar.gz"; - sha256 = "0js7qx5pa8ibr8487lcf0x3a7w0xml0wa17snd6hjs0857kqhn20"; - }; - - meta = with stdenv.lib; { - homepage = "https://github.com/tkem/cachetools"; - }; - }; + cachetools_1 = callPackage ../development/python-modules/cachetools/1.nix {}; + cachetools = callPackage ../development/python-modules/cachetools {}; futurist = buildPythonPackage rec { name = "futurist-${version}"; @@ -14347,7 +14335,7 @@ in { propagatedBuildInputs = with self; [ pbr oslo-config oslo-context oslo-log oslo-utils oslo-serialization oslo-i18n stevedore six eventlet greenlet webob pyyaml kombu_3 trollius - aioeventlet cachetools oslo-middleware futurist redis oslo-service + aioeventlet cachetools_1 oslo-middleware futurist redis oslo-service eventlet pyzmq ]; @@ -14754,7 +14742,7 @@ in { }; propagatedBuildInputs = with self; [ - pbr futures enum34 debtcollector cachetools oslo-serialization oslo-utils + pbr futures enum34 debtcollector cachetools_1 oslo-serialization oslo-utils jsonschema monotonic stevedore networkx futurist pbr automaton fasteners ]; buildInputs = with self; [ From 18161a5b6f9c4b7506362d64ebef2b5ed884d3fc Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Wed, 13 Sep 2017 00:58:29 +0100 Subject: [PATCH 161/172] pythonPackages.pyemd: init at 0.4.4 This module is a requirement of textacy. --- .../python-modules/pyemd/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/python-modules/pyemd/default.nix diff --git a/pkgs/development/python-modules/pyemd/default.nix b/pkgs/development/python-modules/pyemd/default.nix new file mode 100644 index 000000000000..e23cf7794b16 --- /dev/null +++ b/pkgs/development/python-modules/pyemd/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi, numpy, cython }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "pyemd"; + version = "0.4.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "13y06y7r1697cv4r430g45fxs40i2yk9xn0dk9nqlrpddw3a0mr4"; + }; + + propagatedBuildInputs = [ numpy ]; + buildInputs = [ cython ]; + + meta = with stdenv.lib; { + description = "A Python wrapper for Ofir Pele and Michael Werman's implementation of the Earth Mover's Distance"; + homepage = http://github.com/wmayner/pyemd; + license = licenses.mit; + maintainers = with maintainers; [ rvl ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f11f3e2c2c0b..199888f34e80 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -27277,6 +27277,8 @@ EOF spacy = callPackage ../development/python-modules/spacy { }; + pyemd = callPackage ../development/python-modules/pyemd { }; + behave = callPackage ../development/python-modules/behave { }; pyhamcrest = callPackage ../development/python-modules/pyhamcrest { }; From 3b1877f4c0e08c9d337b4039fb929f5d7722d218 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Wed, 13 Sep 2017 01:01:01 +0100 Subject: [PATCH 162/172] pythonPackages.textacy: init at 0.4.1 --- .../python-modules/textacy/default.nix | 65 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 67 insertions(+) create mode 100644 pkgs/development/python-modules/textacy/default.nix diff --git a/pkgs/development/python-modules/textacy/default.nix b/pkgs/development/python-modules/textacy/default.nix new file mode 100644 index 000000000000..1647b837d976 --- /dev/null +++ b/pkgs/development/python-modules/textacy/default.nix @@ -0,0 +1,65 @@ +{ stdenv +, buildPythonPackage +, isPy27 +, fetchPypi +, cachetools +, cld2-cffi +, cython +, cytoolz +, ftfy +, ijson +, matplotlib +, networkx +, numpy +, pyemd +, pyphen +, python-Levenshtein +, requests +, scikitlearn +, scipy +, spacy +, tqdm +, unidecode +}: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "textacy"; + version = "0.4.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "04wf3a7zgzz83nmgkh488wkl50zm9yfdpv3sl12sm2zj685plqcz"; + }; + + disabled = isPy27; # 2.7 requires backports.csv + + propagatedBuildInputs = [ + cachetools + cld2-cffi + cytoolz + ftfy + ijson + matplotlib + networkx + numpy + pyemd + pyphen + python-Levenshtein + requests + scikitlearn + scipy + spacy + tqdm + unidecode + ]; + + doCheck = false; # tests want to download data files + + meta = with stdenv.lib; { + description = "Higher-level text processing, built on spaCy"; + homepage = "http://textacy.readthedocs.io/"; + license = licenses.asl20; + maintainers = with maintainers; [ rvl ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 199888f34e80..733fb7c63912 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -27277,6 +27277,8 @@ EOF spacy = callPackage ../development/python-modules/spacy { }; + textacy = callPackage ../development/python-modules/textacy { }; + pyemd = callPackage ../development/python-modules/pyemd { }; behave = callPackage ../development/python-modules/behave { }; From fad89eda77aedd4400abc57b5074179a09eb3a79 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Wed, 13 Sep 2017 18:32:46 +0100 Subject: [PATCH 163/172] pythonPackages.spacy: add models data attr set Model Version es_core_web_md 1.0.0 fr_depvec_web_lg 1.0.0 en_core_web_md 1.2.1 en_depent_web_md 1.2.1 en_core_web_sm 1.2.0 de_core_news_md 1.0.0 en_vectors_glove_md 1.0.0 --- .../python-modules/spacy/models.json | 42 +++++++++++++++++++ .../python-modules/spacy/models.nix | 26 ++++++++++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 70 insertions(+) create mode 100644 pkgs/development/python-modules/spacy/models.json create mode 100644 pkgs/development/python-modules/spacy/models.nix diff --git a/pkgs/development/python-modules/spacy/models.json b/pkgs/development/python-modules/spacy/models.json new file mode 100644 index 000000000000..e9c163c65259 --- /dev/null +++ b/pkgs/development/python-modules/spacy/models.json @@ -0,0 +1,42 @@ +[{ + "pname": "es_core_web_md", + "version": "1.0.0", + "sha256": "0ikyakdhnj6rrfpr8k83695d1gd3z9n60a245hwwchv94jmr7r6s", + "license": "cc-by-sa-40" +}, +{ + "pname": "fr_depvec_web_lg", + "version": "1.0.0", + "sha256": "0nxmdszs1s5by2874cz37azrmwamh1ngdsiylffkfihzq6s8bhka", + "license": "cc-by-nc-sa-40" +}, +{ + "pname": "en_core_web_md", + "version": "1.2.1", + "sha256": "12prr4hcbfdaky9rcna1y1ykr417jkhkks2r8l06g8fb7am3pvp3", + "license": "cc-by-sa-40" +}, +{ + "pname": "en_depent_web_md", + "version": "1.2.1", + "sha256": "0giyr35q5lpp5drpcamyvb5gsjnhj62mk3ndfr49nm1s6d5f6m52", + "license": "cc-by-sa-40" +}, +{ + "pname": "en_core_web_sm", + "version": "1.2.0", + "sha256": "0vc4l77dcwa9lmzyqdci8ikjc0m2rhasl2zvyba547vf76qb0528", + "license": "cc-by-sa-40" +}, +{ + "pname": "de_core_news_md", + "version": "1.0.0", + "sha256": "072jz2rdi1nckny7k16avp86vjg4didfdsw816kfl9zwr88iny6g", + "license": "cc-by-sa-40" +}, +{ + "pname": "en_vectors_glove_md", + "version": "1.0.0", + "sha256": "1jbr27xnh5fdww8yphpvk2brfnzb174wfnxkzdqwv3iyi02zsin6", + "license": "cc-by-sa-40" +}] diff --git a/pkgs/development/python-modules/spacy/models.nix b/pkgs/development/python-modules/spacy/models.nix new file mode 100644 index 000000000000..3ef57d9c04f3 --- /dev/null +++ b/pkgs/development/python-modules/spacy/models.nix @@ -0,0 +1,26 @@ +{ stdenv, buildPythonPackage, fetchurl, spacy }: +let + buildModelPackage = { pname, version, sha256, license }: buildPythonPackage { + name = "${pname}-${version}"; + inherit pname version; + + src = fetchurl { + url = "https://github.com/explosion/spacy-models/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; + inherit sha256; + }; + + propagatedBuildInputs = [ spacy ]; + + meta = with stdenv.lib; { + description = "Models for the spaCy NLP library"; + homepage = "https://github.com/explosion/spacy-models"; + license = licenses."${license}"; + maintainers = with maintainers; [ rvl ]; + }; + }; + + makeModelSet = models: with pkgs.lib; listToAttrs (map (m: nameValuePair m.pname (buildModelPackage m)) models); + +in makeModelSet (pkgs.lib.importJSON ./models.json) + +# cat models.json | jq -r '.[] | @uri "https://github.com/explosion/spacy-models/releases/download/\(.pname)-\(.version)/\(.pname)-\(.version).tar.gz"' | xargs -n1 nix-prefetch-url diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 733fb7c63912..f8ae7a610ddd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -27277,6 +27277,8 @@ EOF spacy = callPackage ../development/python-modules/spacy { }; + spacy_models = callPackage ../development/python-modules/spacy/models.nix { }; + textacy = callPackage ../development/python-modules/textacy { }; pyemd = callPackage ../development/python-modules/pyemd { }; From d851b95d636b4afab9caec61a32a10c7cfdacb51 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Fri, 15 Sep 2017 06:32:37 +0100 Subject: [PATCH 164/172] pythonPackages.clld-cffi: init at 0.1.4 --- .../python-modules/cld2-cffi/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/python-modules/cld2-cffi/default.nix diff --git a/pkgs/development/python-modules/cld2-cffi/default.nix b/pkgs/development/python-modules/cld2-cffi/default.nix new file mode 100644 index 000000000000..fd5b27d00e4d --- /dev/null +++ b/pkgs/development/python-modules/cld2-cffi/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchPypi, six, cffi, nose }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "cld2-cffi"; + version = "0.1.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "0rvcdx4fdh5yk4d2nlddq1q1r2r0xqp86hpmbdn447pdcj1r8a9s"; + }; + + propagatedBuildInputs = [ six cffi ]; + checkInputs = [ nose ]; + + # gcc doesn't approve of this code, so disable -Werror + NIX_CFLAGS_COMPILE = "-w"; + + checkPhase = "nosetests -v"; + + meta = with stdenv.lib; { + description = "CFFI bindings around Google Chromium's embedded compact language detection library (CLD2)"; + homepage = "https://github.com/GregBowyer/cld2-cffi"; + license = licenses.asl20; + maintainers = with maintainers; [ rvl ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f8ae7a610ddd..5c4a4e49cbc8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2696,6 +2696,8 @@ in { }; }; + cld2-cffi = callPackage ../development/python-modules/cld2-cffi {}; + clf = buildPythonPackage rec { name = "clf-${version}"; version = "0.5.2"; From c5d1218336d7961b9e13e9c24ac9c1ee593fcd51 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Fri, 15 Sep 2017 06:33:31 +0100 Subject: [PATCH 165/172] pythonPackages.ijson: init at 2.3 --- .../python-modules/ijson/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/python-modules/ijson/default.nix diff --git a/pkgs/development/python-modules/ijson/default.nix b/pkgs/development/python-modules/ijson/default.nix new file mode 100644 index 000000000000..f70cc9d69452 --- /dev/null +++ b/pkgs/development/python-modules/ijson/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "ijson"; + version = "2.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "0x7l9k2dvxzd5mjgiq15nl9b0sxcqy1cqaz744bjwkz4z5mrypzg"; + }; + + doCheck = false; # something about yajl + + meta = with stdenv.lib; { + description = "Iterative JSON parser with a standard Python iterator interface"; + homepage = "https://github.com/isagalaev/ijson"; + license = licenses.bsd3; + maintainers = with maintainers; [ rvl ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5c4a4e49cbc8..d650f4025200 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6323,6 +6323,8 @@ in { }; }; + ijson = callPackage ../development/python-modules/ijson/default.nix {}; + imagesize = buildPythonPackage rec { name = "imagesize-${version}"; version = "0.7.0"; From fdb90edc6cc2f22877454479f5c040cea3a4f34f Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Fri, 15 Sep 2017 06:33:53 +0100 Subject: [PATCH 166/172] pythonPackages.pyphen: init at 0.9.4 --- .../python-modules/pyphen/default.nix | 19 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/python-modules/pyphen/default.nix diff --git a/pkgs/development/python-modules/pyphen/default.nix b/pkgs/development/python-modules/pyphen/default.nix new file mode 100644 index 000000000000..0e134f9d84a2 --- /dev/null +++ b/pkgs/development/python-modules/pyphen/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "Pyphen"; + version = "0.9.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "1mqb5jrigxipxzp1d8nbwkq0cfjw77pnn6hc4mp1yd2mn059mymb"; + }; + + meta = with stdenv.lib; { + description = "Pure Python module to hyphenate text"; + homepage = "https://github.com/Kozea/Pyphen"; + license = with licenses; [gpl2 lgpl21 mpl20]; + maintainers = with maintainers; [ rvl ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d650f4025200..61ce28183100 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7431,6 +7431,8 @@ in { inherit pythonOlder; }; + pyphen = callPackage ../development/python-modules/pyphen {}; + pypoppler = buildPythonPackage rec { name = "pypoppler-${version}"; version = "0.12.2"; From 9785fc73a07ddb11628c25949cf7b2eb51b183c6 Mon Sep 17 00:00:00 2001 From: Servilio Afre Puentes Date: Thu, 31 Aug 2017 11:01:08 -0400 Subject: [PATCH 167/172] gmime: init at 3.0.1, leave 2.6.23 as is This needs to be added as a separate package because API changed in 3.0, see: https://mail.gnome.org/archives/gmime-devel-list/2017-April/msg00002.html https://developer.gnome.org/gmime/3.0/gmime-changes-3-0.html https://github.com/jstedfast/gmime/blob/3fd646c95503acb0d11bf67afde1c7bdd4fcc341/PORTING --- .../libraries/gmime/{default.nix => 2.nix} | 7 ++--- pkgs/development/libraries/gmime/3.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++- 3 files changed, 33 insertions(+), 4 deletions(-) rename pkgs/development/libraries/gmime/{default.nix => 2.nix} (82%) create mode 100644 pkgs/development/libraries/gmime/3.nix diff --git a/pkgs/development/libraries/gmime/default.nix b/pkgs/development/libraries/gmime/2.nix similarity index 82% rename from pkgs/development/libraries/gmime/default.nix rename to pkgs/development/libraries/gmime/2.nix index a01f3890453c..5477a20d2031 100644 --- a/pkgs/development/libraries/gmime/default.nix +++ b/pkgs/development/libraries/gmime/2.nix @@ -16,10 +16,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/jstedfast/gmime/; description = "A C/C++ library for creating, editing and parsing MIME messages and structures"; - maintainers = [ stdenv.lib.maintainers.chaoflow ]; - platforms = stdenv.lib.platforms.unix; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ chaoflow ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/gmime/3.nix b/pkgs/development/libraries/gmime/3.nix new file mode 100644 index 000000000000..319db5b3092c --- /dev/null +++ b/pkgs/development/libraries/gmime/3.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, pkgconfig, glib, zlib, gpgme, libidn, gobjectIntrospection }: + +stdenv.mkDerivation rec { + name = "gmime-3.0.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gmime/3.0/${name}.tar.xz"; + sha256 = "001y93b8mq9alzkvli6vfh3pzdcn5c5iy206ml23lzhhhvm5k162"; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ pkgconfig gobjectIntrospection ]; + propagatedBuildInputs = [ glib zlib gpgme libidn ]; + configureFlags = [ "--enable-introspection=yes" ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://github.com/jstedfast/gmime/; + description = "A C/C++ library for creating, editing and parsing MIME messages and structures"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ chaoflow ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 162fb993290e..5b3ea1e16255 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8187,7 +8187,9 @@ with pkgs; glui = callPackage ../development/libraries/glui {}; - gmime = callPackage ../development/libraries/gmime { }; + gmime2 = callPackage ../development/libraries/gmime/2.nix { }; + gmime3 = callPackage ../development/libraries/gmime/3.nix { }; + gmime = gmime2; gmm = callPackage ../development/libraries/gmm { }; From 04e97f98685bd8bf2ece6bf89c50366f4ed87fa1 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Fri, 15 Sep 2017 20:48:46 +0000 Subject: [PATCH 168/172] gmime: expose versions --- pkgs/development/libraries/gmime/2.nix | 3 ++- pkgs/development/libraries/gmime/3.nix | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gmime/2.nix b/pkgs/development/libraries/gmime/2.nix index 5477a20d2031..7d5eeb29997b 100644 --- a/pkgs/development/libraries/gmime/2.nix +++ b/pkgs/development/libraries/gmime/2.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, pkgconfig, glib, zlib, libgpgerror, gobjectIntrospection }: stdenv.mkDerivation rec { - name = "gmime-2.6.23"; + version = "2.6.23"; + name = "gmime-${version}"; src = fetchurl { url = "mirror://gnome/sources/gmime/2.6/${name}.tar.xz"; diff --git a/pkgs/development/libraries/gmime/3.nix b/pkgs/development/libraries/gmime/3.nix index 319db5b3092c..548772ea6507 100644 --- a/pkgs/development/libraries/gmime/3.nix +++ b/pkgs/development/libraries/gmime/3.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, pkgconfig, glib, zlib, gpgme, libidn, gobjectIntrospection }: stdenv.mkDerivation rec { - name = "gmime-3.0.1"; + version = "3.0.1"; + name = "gmime-${version}"; src = fetchurl { url = "mirror://gnome/sources/gmime/3.0/${name}.tar.xz"; From ae86fddd95e5b616b52e1707f3a82ac33d445c25 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Fri, 1 Sep 2017 00:01:42 +0000 Subject: [PATCH 169/172] notmuch: switch to gmime3, make all tests pass with gmime3 --- .../mailreaders/notmuch/default.nix | 32 +++++++++---------- pkgs/top-level/all-packages.nix | 4 ++- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index d9af01bdad41..74e43a728d7f 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, fixDarwinDylibNames, gdb +{ fetchurl, stdenv, fixDarwinDylibNames , pkgconfig, gnupg , xapian, gmime, talloc, zlib , doxygen, perl @@ -6,9 +6,11 @@ , bash-completion , emacs , ruby -, which, dtach, openssl, bash +, which, dtach, openssl, bash, gdb, man }: +with stdenv.lib; + stdenv.mkDerivation rec { version = "0.25"; name = "notmuch-${version}"; @@ -32,19 +34,11 @@ stdenv.mkDerivation rec { emacs # (optional) to byte compile emacs code ruby # (optional) ruby bindings which dtach openssl bash # test dependencies - ] - ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames - ++ stdenv.lib.optional (!stdenv.isDarwin) gdb; - - doCheck = !stdenv.isDarwin; - checkTarget = "test"; - - patchPhase = '' - # XXX: disabling few tests since i have no idea how to make them pass for now - rm -f test/T010-help-test.sh \ - test/T350-crypto.sh \ - test/T355-smime.sh + ] + ++ optional stdenv.isDarwin fixDarwinDylibNames + ++ optionals (!stdenv.isDarwin) [ gdb man ]; # test dependencies + postPatch = '' find test -type f -exec \ sed -i \ -e "1s|#!/usr/bin/env bash|#!${bash}/bin/bash|" \ @@ -65,7 +59,9 @@ stdenv.mkDerivation rec { done ''; - preFixup = stdenv.lib.optionalString stdenv.isDarwin '' + makeFlags = "V=1"; + + preFixup = optionalString stdenv.isDarwin '' set -e die() { @@ -92,12 +88,16 @@ stdenv.mkDerivation rec { install_name_tool -change "$badname" "$goodname" "$prg" ''; + doCheck = !stdenv.isDarwin && (versionAtLeast gmime.version "3.0"); + checkTarget = "test V=1"; + postInstall = '' make install-man ''; + dontGzipMan = true; # already compressed - meta = with stdenv.lib; { + meta = { description = "Mail indexer"; homepage = https://notmuchmail.org/; license = licenses.gpl3; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5b3ea1e16255..09c595b2dadd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15580,7 +15580,9 @@ with pkgs; notepadqq = libsForQt56.callPackage ../applications/editors/notepadqq { }; - notmuch = callPackage ../applications/networking/mailreaders/notmuch { }; + notmuch = callPackage ../applications/networking/mailreaders/notmuch { + gmime = gmime3; + }; notmuch-mutt = callPackage ../applications/networking/mailreaders/notmuch/mutt.nix { }; From fd3ddfb95b689a38592b9f55061ca0403f67e8ef Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 16 Sep 2017 11:41:27 +0200 Subject: [PATCH 170/172] python.pkgs.{pitz, clepy}: remove old packages These were added in 2013 by @bjornfor but haven't been touched since. They seem to be unmaintained, both in Nixpkgs and by upstream. --- pkgs/applications/misc/pitz/default.nix | 34 ------------------------- pkgs/top-level/python-packages.nix | 19 -------------- 2 files changed, 53 deletions(-) delete mode 100644 pkgs/applications/misc/pitz/default.nix diff --git a/pkgs/applications/misc/pitz/default.nix b/pkgs/applications/misc/pitz/default.nix deleted file mode 100644 index dcb36082231f..000000000000 --- a/pkgs/applications/misc/pitz/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, fetchurl, buildPythonApplication, tempita, jinja2, pyyaml, clepy, mock -, nose, decorator, docutils -}: - -# TODO: pitz has a pitz-shell utility that depends on ipython, but it just -# errors out and dies (it probably depends on an old ipython version): -# -# from IPython.Shell import IPShellEmbed -# ImportError: No module named Shell -# -# pitz-shell is not the primary interface, so it is not critical to have it -# working. Concider fixing pitz upstream. - -buildPythonApplication rec { - name = "pitz-1.2.4"; - namePrefix = ""; - - src = fetchurl { - url = "mirror://pypi/p/pitz/${name}.tar.gz"; - sha256 = "1k7f3h4acllzqy3mjqnjd4w5jskp03s79b7dx3c85vlmd7824smr"; - }; - - # propagatedBuildInputs is needed for pitz to find its dependencies at - # runtime. If we use buildInputs it would just build, not run. - propagatedBuildInputs = [ tempita jinja2 pyyaml clepy mock nose decorator docutils ]; - - meta = with stdenv.lib; { - description = "Distributed bugtracker"; - license = licenses.bsd3; - homepage = http://pitz.tplus1.com/; - platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; - }; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 73e4e79a4bcf..f24cee40c170 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -203,8 +203,6 @@ in { ntlm-auth = callPackage ../development/python-modules/ntlm-auth { }; - pitz = callPackage ../applications/misc/pitz { }; - plantuml = callPackage ../tools/misc/plantuml { }; Pmw = callPackage ../development/python-modules/Pmw { }; @@ -2822,23 +2820,6 @@ in { cligj = callPackage ../development/python-modules/cligj { }; - clepy = buildPythonPackage rec { - name = "clepy-0.3.20"; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/clepy/${name}.tar.gz"; - sha256 = "16vibfxms5z4ld8gbkra6dkhqm2cc3jnn0fwp7mw70nlwxnmm51c"; - }; - - buildInputs = with self; [ self.mock self.nose self.decorator ]; - - meta = { - homepage = http://code.google.com/p/clepy/; - description = "Utilities created by the Cleveland Python users group"; - }; - }; - - clientform = buildPythonPackage (rec { name = "clientform-0.2.10"; disabled = isPy3k; From 4f8ad9f7ebf775770fd7981be8e7f00d7b8dd4a0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 16 Sep 2017 12:21:20 +0200 Subject: [PATCH 171/172] python.pkgs.spacy_models: fix eval --- pkgs/development/python-modules/spacy/models.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spacy/models.nix b/pkgs/development/python-modules/spacy/models.nix index 3ef57d9c04f3..2d591eef7233 100644 --- a/pkgs/development/python-modules/spacy/models.nix +++ b/pkgs/development/python-modules/spacy/models.nix @@ -19,8 +19,8 @@ let }; }; - makeModelSet = models: with pkgs.lib; listToAttrs (map (m: nameValuePair m.pname (buildModelPackage m)) models); + makeModelSet = models: with stdenv.lib; listToAttrs (map (m: nameValuePair m.pname (buildModelPackage m)) models); -in makeModelSet (pkgs.lib.importJSON ./models.json) +in makeModelSet (stdenv.lib.importJSON ./models.json) # cat models.json | jq -r '.[] | @uri "https://github.com/explosion/spacy-models/releases/download/\(.pname)-\(.version)/\(.pname)-\(.version).tar.gz"' | xargs -n1 nix-prefetch-url From bb57df26ddcb8dd61b3c07bc32253bcb84ed1a6c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 16 Sep 2017 12:22:15 +0200 Subject: [PATCH 172/172] python.pkgs.PyXAPI: remove old package url of source and homepage is dead as well. --- pkgs/top-level/python-packages.nix | 38 ------------------------------ 1 file changed, 38 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1d83f8ced1c6..a53b873475f9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18443,44 +18443,6 @@ in { pywinrm = callPackage ../development/python-modules/pywinrm { }; - PyXAPI = stdenv.mkDerivation rec { - name = "PyXAPI-0.1"; - - src = pkgs.fetchurl { - url = "http://www.pps.univ-paris-diderot.fr/~ylg/PyXAPI/${name}.tar.gz"; - sha256 = "19lblwfq24bgsgfy7hhqkxdf4bxl40chcxdlpma7a0wfa0ngbn26"; - }; - - buildInputs = [ self.python ]; - - installPhase = '' - mkdir -p "$out/lib/${python.libPrefix}/site-packages" - - export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" - - ${python}/bin/${python.executable} setup.py install \ - --install-lib=$out/lib/${python.libPrefix}/site-packages \ - --prefix="$out" - ''; - - meta = with stdenv.lib; { - description = "Python socket module extension & RFC3542 IPv6 Advanced Sockets API"; - longDescription = '' - PyXAPI consists of two modules: `socket_ext' and `rfc3542'. - `socket_ext' extends the Python module `socket'. `socket' objects have - two new methods: `recvmsg' and `sendmsg'. It defines `ancillary data' - objects and some functions related to. `socket_ext' module also provides - functions to manage interfaces indexes defined in RFC3494 and not - available from standard Python module `socket'. - `rfc3542' is a full implementation of RFC3542 (Advanced Sockets - Application Program Interface (API) for IPv6). - ''; - homepage = http://www.pps.univ-paris-diderot.fr/~ylg/PyXAPI/; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ nckx ]; - }; - }; - pyxattr = buildPythonPackage (rec { name = "pyxattr-0.5.1";