From 0a1278a6793bee02c1e48e7b424b2a038bcc1dd9 Mon Sep 17 00:00:00 2001 From: Alexei Boronine Date: Fri, 16 Dec 2016 21:53:35 +0800 Subject: [PATCH 01/97] haxe: 3.1.3 -> 3.2.1 --- pkgs/development/compilers/haxe/default.nix | 8 ++--- .../compilers/haxe/haxelib-nix.patch | 34 ++++++++++--------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index a2afcc77380..a4077408ef0 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchgit, ocaml, zlib, neko, camlp4 }: stdenv.mkDerivation { - name = "haxe-3.1.3"; + name = "haxe-3.2.1"; buildInputs = [ocaml zlib neko camlp4]; src = fetchgit { url = "https://github.com/HaxeFoundation/haxe.git"; - sha256 = "0d8s9yqsqcbr2lfw4xnmg7vzgb6k1jq6hlwwaf1kmn9wxpvcc6x9"; + sha256 = "1x9ay5a2llq46fww3k07jxx8h1vfpyxb522snc6702a050ki5vz3"; fetchSubmodules = true; - # Tag 3.1.3 - rev = "7be30670b2f1f9b6082499c8fb9e23c0a6df6c28"; + # Tag 3.2.1 + rev = "deab4424399b520750671e51e5f5c2684e942c17"; }; prePatch = '' diff --git a/pkgs/development/compilers/haxe/haxelib-nix.patch b/pkgs/development/compilers/haxe/haxelib-nix.patch index da7e4c8dacb..ed370e8efd1 100644 --- a/pkgs/development/compilers/haxe/haxelib-nix.patch +++ b/pkgs/development/compilers/haxe/haxelib-nix.patch @@ -1,10 +1,10 @@ -diff --git a/extra/haxelib_src/src/tools/haxelib/Main.hx b/extra/haxelib_src/src/tools/haxelib/Main.hx -index a44a785..0eb811a 100644 +diff --git a/src/tools/haxelib/Main.hx b/src/tools/haxelib/Main.hx +index dc18815..def5231 100644 --- a/extra/haxelib_src/src/tools/haxelib/Main.hx +++ b/extra/haxelib_src/src/tools/haxelib/Main.hx -@@ -996,21 +996,26 @@ class Main { +@@ -1301,21 +1301,26 @@ class Main { } - + function checkRec( prj : String, version : String, l : List<{ project : String, version : String, info : Infos }> ) { - var pdir = getRepository() + Data.safe(prj); - if( !FileSystem.exists(pdir) ) @@ -44,7 +44,7 @@ index a44a785..0eb811a 100644 var json = try File.getContent(vdir+"/"+Data.JSON) catch( e : Dynamic ) null; var inf = Data.readData(json,false); l.add({ project : prj, version : version, info: inf }); -@@ -1025,15 +1030,21 @@ class Main { +@@ -1330,15 +1335,21 @@ class Main { var a = args[argcur++].split(":"); checkRec(a[0],a[1],list); } @@ -73,10 +73,10 @@ index a44a785..0eb811a 100644 var ndir = dir + "ndll"; if( FileSystem.exists(ndir) ) { var sysdir = ndir+"/"+Sys.systemName(); -@@ -1153,21 +1164,39 @@ class Main { - print(' Path: $devPath'); +@@ -1491,23 +1502,43 @@ class Main { + ); } - + + function getNixLib(project:String):Null + { + var hlibPath = Sys.getEnv("HAXELIB_PATH"); @@ -91,7 +91,7 @@ index a44a785..0eb811a 100644 + } + return null; + } -+ + function run() { - var rep = getRepository(); var project = param("Library"); @@ -103,10 +103,10 @@ index a44a785..0eb811a 100644 - pdir += "/"; - var version = temp[1] != null ? temp[1] : getCurrent(pdir); - var dev = try getDev(pdir) catch ( e : Dynamic ) null; -- var vdir = dev!=null ? dev : pdir + Data.safe(version); -- var rdir = vdir + "/run.n"; -- if( !FileSystem.exists(rdir) ) -- throw "Library "+project+" version "+version+" does not have a run script"; +- var vdir = dev != null ? dev : pdir + Data.safe(version); + + args.push(cli.cwd); ++ + var vdir = this.getNixLib(project); + if (vdir == null) { + var rep = getRepository(); @@ -121,6 +121,8 @@ index a44a785..0eb811a 100644 + if( !FileSystem.exists(rdir) ) + throw "Library "+project+" version "+version+" does not have a run script"; + } - args.push(Sys.getCwd()); - Sys.setCwd(vdir); - var cmd = "neko run.n"; + cli.cwd = vdir; +- + var callArgs = + switch try [Data.readData(File.getContent(vdir + '/haxelib.json'), false), null] catch (e:Dynamic) [null, e] { + case [null, e]: From c39e36f766deda952f268791b9eb681f688296aa Mon Sep 17 00:00:00 2001 From: devhell <^@regexmail.net> Date: Sat, 17 Dec 2016 12:57:27 +0000 Subject: [PATCH 02/97] {lib}mediainfo{-gui},libzen: 0.7.87 -> 0.7.91, 0.4.33 -> 0.4.34 Unfortunately I've not been able to keep this updated on a regular basis at the moment, therefore some versions have been skipped. I'm therefore going to just add the link for the changelog: https://mediaarea.net/MediaInfo/ChangeLog --- pkgs/applications/misc/mediainfo-gui/default.nix | 4 ++-- pkgs/applications/misc/mediainfo/default.nix | 4 ++-- pkgs/development/libraries/libmediainfo/default.nix | 4 ++-- pkgs/development/libraries/libzen/default.nix | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix index 2fe806649c2..e60d1619685 100644 --- a/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -2,11 +2,11 @@ , desktop_file_utils, libSM, imagemagick }: stdenv.mkDerivation rec { - version = "0.7.87"; + version = "0.7.91"; name = "mediainfo-gui-${version}"; src = fetchurl { url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "1ws4hyfcw289hax0bq8y3bbw5y321xmh0va1x4zv5rjwfzcd51pv"; + sha256 = "15jrph9hjza4c87m739s7c9v27gji94ha7rpchb8li0rcdvy40dm"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix index 77c1badbf40..0ddee228e9d 100644 --- a/pkgs/applications/misc/mediainfo/default.nix +++ b/pkgs/applications/misc/mediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }: stdenv.mkDerivation rec { - version = "0.7.87"; + version = "0.7.91"; name = "mediainfo-${version}"; src = fetchurl { url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "1ws4hyfcw289hax0bq8y3bbw5y321xmh0va1x4zv5rjwfzcd51pv"; + sha256 = "15jrph9hjza4c87m739s7c9v27gji94ha7rpchb8li0rcdvy40dm"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix index 90869a4c8a5..f57a49ab812 100644 --- a/pkgs/development/libraries/libmediainfo/default.nix +++ b/pkgs/development/libraries/libmediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }: stdenv.mkDerivation rec { - version = "0.7.87"; + version = "0.7.91"; name = "libmediainfo-${version}"; src = fetchurl { url = "http://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - sha256 = "1gvjvc809mrhpcqr62cihhc6jnwml197xjbgydnzvsghih8dq8s9"; + sha256 = "1h39cwd85rgidr0hbwab9dwbjv25xhvjv8y2nv35p3fwrs48p098"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/libzen/default.nix b/pkgs/development/libraries/libzen/default.nix index 23597c2e03b..5bb3f79f790 100644 --- a/pkgs/development/libraries/libzen/default.nix +++ b/pkgs/development/libraries/libzen/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { - version = "0.4.33"; + version = "0.4.34"; name = "libzen-${version}"; src = fetchurl { url = "https://mediaarea.net/download/source/libzen/${version}/libzen_${version}.tar.bz2"; - sha256 = "0py5iagajz6m5zh26svkjyy85k1dmyhi6cdbmc3cb56a4ix1k2d2"; + sha256 = "02krmhl6dplidz6h251ajpzzdhzzm0hp0lwwv9rgn55xjgh4yxw3"; }; nativeBuildInputs = [ autoreconfHook ]; From a737eff5c194c87cb7858b76a8deabc80487680a Mon Sep 17 00:00:00 2001 From: J Phani Mahesh Date: Tue, 20 Dec 2016 12:26:24 +0530 Subject: [PATCH 03/97] python:html5lib: 0.999 -> 0.999999999 fixes LWN vuln:709146 ref #21289: Vulnerability roundup 14 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 82d5649120d..271e354e02f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12485,12 +12485,12 @@ in { html5lib = buildPythonPackage (rec { - version = "0.999"; + version = "0.999999999"; name = "html5lib-${version}"; src = pkgs.fetchurl { url = "http://github.com/html5lib/html5lib-python/archive/${version}.tar.gz"; - sha256 = "1kxl36p0csssaf37zbbc9p4h8l1s7yb1qnfv3d4nixplvrxqkybp"; + sha256 = "09j6194f5mlnd5xwbavwvnndwl1x91jw74shxl6hcxjp4fxg3h05"; }; buildInputs = with self; [ nose flake8 ]; From 96c8e1982836bf0b5e4c8614f5ca995d252f9fdd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 22 Dec 2016 12:27:18 +0100 Subject: [PATCH 04/97] libtecla: update to version 1.6.3 Also dropped the slightly overzealous -O3 flag for the compiler. I doubt this library benefits from crazy optimizations. --- pkgs/development/libraries/tecla/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/tecla/default.nix b/pkgs/development/libraries/tecla/default.nix index ea03795afc8..93cf0670dc7 100644 --- a/pkgs/development/libraries/tecla/default.nix +++ b/pkgs/development/libraries/tecla/default.nix @@ -1,15 +1,13 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "tecla-1.6.2"; + name = "tecla-1.6.3"; src = fetchurl { url = "http://www.astro.caltech.edu/~mcs/tecla/lib${name}.tar.gz"; - sha256 = "1f5p1v9ac5r1f6pjzwacb4yf8m6z19rv77p76j7fix34hd9dnqcc"; + sha256 = "06pfq5wa8d25i9bdjkp4xhms5101dsrbg82riz7rz1a0a32pqxgj"; }; - configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3"; - meta = { homepage = "http://www.astro.caltech.edu/~mcs/tecla/"; description = "Command-line editing library"; From 9f1880039fef079927ffb746f8b95a4ce4983fa3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 22 Dec 2016 12:42:02 +0100 Subject: [PATCH 05/97] maude: update to version 2.7 --- .../interpreters/maude/default.nix | 33 +++++++++++-------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix index 13403d50759..e833e7b0c6d 100644 --- a/pkgs/development/interpreters/maude/default.nix +++ b/pkgs/development/interpreters/maude/default.nix @@ -1,26 +1,34 @@ -{ stdenv, fetchurl, flex, bison, ncurses, buddy, tecla, libsigsegv, gmpxx, makeWrapper }: +{ stdenv, fetchurl, unzip, makeWrapper +, flex, bison, ncurses, buddy, tecla, libsigsegv, gmpxx, +}: -stdenv.mkDerivation rec { - name = "maude-2.6"; +let - src = fetchurl { - url = "http://maude.cs.uiuc.edu/download/current/Maude-2.6.tar.gz"; - sha256 = "182abzhvjvlaa21aqv7802v3bs57a4dm7cw09s3mqmih7nzpkfm5"; - }; + version = "2.7"; fullMaude = fetchurl { - url = "https://full-maude.googlecode.com/git/full-maude261h.maude"; - sha256 = "0xx8bfn6arsa75m5vhp5lmpazgfw230ssq33h9vifswlvzzc81ha"; + url = "https://raw.githubusercontent.com/maude-team/full-maude/master/full-maude27c.maude"; + sha256 = "08bg3gn1vyjy5k69hnynpzc9s1hnrbkyv6z08y1h2j37rlc4c18y"; }; - buildInputs = [flex bison ncurses buddy tecla gmpxx libsigsegv makeWrapper]; +in + +stdenv.mkDerivation rec { + name = "maude-${version}"; + + src = fetchurl { + url = "https://github.com/maude-team/maude/archive/v${version}-ext-hooks.tar.gz"; + sha256 = "02p0snxm69rs8pvm93r91p881dw6p3bxmazr3cfw5pnxpgz0vjl0"; + }; + + buildInputs = [flex bison ncurses buddy tecla gmpxx libsigsegv makeWrapper unzip]; hardeningDisable = [ "stackprotector" ] ++ stdenv.lib.optionals stdenv.isi686 [ "pic" "fortify" ]; preConfigure = '' configureFlagsArray=( - --datadir=$out/share/maude + --datadir="$out/share/maude" TECLA_LIBS="-ltecla -lncursesw" CFLAGS="-O3" CXXFLAGS="-O3" ) @@ -30,8 +38,7 @@ stdenv.mkDerivation rec { postInstall = '' for n in "$out/bin/"*; do wrapProgram "$n" --suffix MAUDE_LIB ':' "$out/share/maude"; done - mkdir -p $out/share/maude - cp ${fullMaude} -d $out/share/maude/full-maude.maude + install -D -m 444 ${fullMaude} $out/share/maude/full-maude.maude ''; meta = { From e6fa6b21e14df0d204a1f428254651e191270e7a Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Thu, 15 Dec 2016 12:36:07 +0100 Subject: [PATCH 06/97] apacheHttpdPackages.mod_perl: init at 2.0.10 --- .../web-servers/apache-httpd/default.nix | 12 +++++++++ .../http/apache-modules/mod_perl/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 39 insertions(+) create mode 100644 pkgs/servers/http/apache-modules/mod_perl/default.nix diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 2d71bcc0c79..84c608ca2ab 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -16,6 +16,8 @@ let phpMajorVersion = head (splitString "." php.version); + mod_perl = pkgs.mod_perl.override { apacheHttpd = httpd; }; + defaultListen = cfg: if cfg.enableSSL then [{ip = "*"; port = 443;}] else [{ip = "*"; port = 80;}]; @@ -76,6 +78,7 @@ let robotsEntries = ""; startupScript = ""; enablePHP = false; + enablePerl = false; phpOptions = ""; options = {}; documentRoot = null; @@ -355,6 +358,7 @@ let ++ map (name: {inherit name; path = "${httpd}/modules/mod_${name}.so";}) apacheModules ++ optional mainCfg.enableMellon { name = "auth_mellon"; path = "${pkgs.apacheHttpdPackages.mod_auth_mellon}/modules/mod_auth_mellon.so"; } ++ optional enablePHP { name = "php${phpMajorVersion}"; path = "${php}/modules/libphp${phpMajorVersion}.so"; } + ++ optional enablePerl { name = "perl"; path = "${mod_perl}/modules/mod_perl.so"; } ++ concatMap (svc: svc.extraModules) allSubservices ++ extraForeignModules; in concatMapStrings load allModules @@ -415,6 +419,8 @@ let enablePHP = mainCfg.enablePHP || any (svc: svc.enablePHP) allSubservices; + enablePerl = mainCfg.enablePerl || any (svc: svc.enablePerl) allSubservices; + # Generate the PHP configuration file. Should probably be factored # out into a separate module. @@ -579,6 +585,12 @@ in ''; }; + enablePerl = mkOption { + type = types.bool; + default = false; + description = "Whether to enable the Perl module (mod_perl)."; + }; + phpOptions = mkOption { type = types.lines; default = ""; diff --git a/pkgs/servers/http/apache-modules/mod_perl/default.nix b/pkgs/servers/http/apache-modules/mod_perl/default.nix new file mode 100644 index 00000000000..04746d678c5 --- /dev/null +++ b/pkgs/servers/http/apache-modules/mod_perl/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, apacheHttpd, perl }: + +stdenv.mkDerivation rec { + name = "mod_perl-2.0.10"; + + src = fetchurl { + url = "mirror://apache/perl/${name}.tar.gz"; + sha256 = "0r1bhzwl5gr0202r6448943hjxsickzn55kdmb7dzad39vnq7kyi"; + }; + + buildInputs = [ apacheHttpd perl ]; + buildPhase = '' + perl Makefile.PL \ + MP_APXS=${apacheHttpd.dev}/bin/apxs + make + ''; + installPhase = '' + mkdir -p $out + make install DESTDIR=$out + mv $out${apacheHttpd}/* $out + mv $out${apacheHttpd.dev}/* $out + mv $out${perl}/* $out + rm $out/nix -rf + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a980ab66387..4261200ad6c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10005,6 +10005,8 @@ in mod_evasive = callPackage ../servers/http/apache-modules/mod_evasive { }; + mod_perl = callPackage ../servers/http/apache-modules/mod_perl { }; + mod_fastcgi = callPackage ../servers/http/apache-modules/mod_fastcgi { }; mod_python = callPackage ../servers/http/apache-modules/mod_python { }; From af2ecc27fccc7f1e3ed3081f79f2894dde6b8f30 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 21 Dec 2016 17:47:12 -0600 Subject: [PATCH 07/97] kde5.kdeWrapper: use small symlink farms This partially addresses #21345, but we may need to reduce disk usage further. --- .../libraries/kde-frameworks/default.nix | 2 +- .../libraries/kde-frameworks/kde-wrapper.nix | 51 +++++++------------ 2 files changed, 20 insertions(+), 33 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index 936a3953a51..93a8d62ed1d 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -57,7 +57,7 @@ let }); kdeWrapper = import ./kde-wrapper.nix { - inherit (pkgs) stdenv lib makeWrapper; + inherit (pkgs) stdenv lib makeWrapper buildEnv; }; attica = callPackage ./attica.nix {}; diff --git a/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix b/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix index 3591e20d11f..890ec1e4eec 100644 --- a/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix +++ b/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix @@ -1,53 +1,40 @@ -{ stdenv, lib, makeWrapper }: +{ stdenv, lib, makeWrapper, buildEnv }: drv: { targets, paths ? [] }: +let + env = buildEnv { + inherit (drv) name meta; + paths = builtins.map lib.getBin ([drv] ++ paths); + pathsToLink = [ "/bin" "/share" "/lib/qt5" "/etc/xdg" ]; + }; +in + stdenv.mkDerivation { inherit (drv) name meta; + preferLocalBuild = true; paths = builtins.map lib.getBin ([drv] ++ paths); - inherit drv targets; + inherit drv env targets; passthru = { unwrapped = drv; }; nativeBuildInputs = [ makeWrapper ]; - unpackPhase = "true"; - configurePhase = "runHook preConfigure; runHook postConfigure"; - buildPhase = "true"; - - installPhase = '' - propagated= - for p in $drv $paths; do - findInputs $p propagated propagated-user-env-packages - done - - wrap_PATH="$out/bin" - wrap_XDG_DATA_DIRS= - wrap_XDG_CONFIG_DIRS= - wrap_QML_IMPORT_PATH= - wrap_QML2_IMPORT_PATH= - wrap_QT_PLUGIN_PATH= - for p in $propagated; do - addToSearchPath wrap_PATH "$p/bin" - addToSearchPath wrap_XDG_DATA_DIRS "$p/share" - addToSearchPath wrap_XDG_CONFIG_DIRS "$p/etc/xdg" - addToSearchPath wrap_QML_IMPORT_PATH "$p/lib/qt5/imports" - addToSearchPath wrap_QML2_IMPORT_PATH "$p/lib/qt5/qml" - addToSearchPath wrap_QT_PLUGIN_PATH "$p/lib/qt5/plugins" - done + builder = builtins.toFile "builder.sh" '' + . $stdenv/setup for t in $targets; do if [ -a "$drv/$t" ]; then makeWrapper "$drv/$t" "$out/$t" \ --argv0 '"$0"' \ - --suffix PATH : "$wrap_PATH" \ - --prefix XDG_CONFIG_DIRS : "$wrap_XDG_CONFIG_DIRS" \ - --prefix XDG_DATA_DIRS : "$wrap_XDG_DATA_DIRS" \ - --set QML_IMPORT_PATH "$wrap_QML_IMPORT_PATH" \ - --set QML2_IMPORT_PATH "$wrap_QML2_IMPORT_PATH" \ - --set QT_PLUGIN_PATH "$wrap_QT_PLUGIN_PATH" + --suffix PATH : "$env/bin" \ + --prefix XDG_CONFIG_DIRS : "$env/share" \ + --prefix XDG_DATA_DIRS : "$env/etc/xdg" \ + --set QML_IMPORT_PATH "$env/lib/qt5/imports" \ + --set QML2_IMPORT_PATH "$env/lib/qt5/qml" \ + --set QT_PLUGIN_PATH "$env/lib/qt5/plugins" else echo "no such file or directory: $drv/$t" exit 1 From 76b5f2c24980e99ab4862bd4981a2e27f4c64393 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Thu, 22 Dec 2016 15:58:27 +0200 Subject: [PATCH 08/97] wineUnstable: 1.9.23 -> 2.0-rc2 Update staging as well --- pkgs/misc/emulators/wine/sources.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index f583fbff231..5ad39a914f6 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -30,9 +30,9 @@ in rec { }; unstable = fetchurl rec { - version = "1.9.23"; - url = "https://dl.winehq.org/wine/source/1.9/wine-${version}.tar.bz2"; - sha256 = "131nqkwlss24r8la84s3v1qx376wq0016d2i2767bpxkyqkagvz3"; + version = "2.0-rc2"; + url = "https://dl.winehq.org/wine/source/2.0/wine-${version}.tar.bz2"; + sha256 = "0pjkrvslfksx7m2w52pnd3dfxb82l082cz9dr57x58s9al2jpwb6"; inherit (stable) mono; gecko32 = fetchurl rec { version = "2.47"; @@ -48,7 +48,7 @@ in rec { staging = fetchFromGitHub rec { inherit (unstable) version; - sha256 = "188svpmaba2x5a7g8rk68cl2mqrv1vhf1si2g5j5lps9r6pgq1c0"; + sha256 = "1xx9bfirij12l278f5f7vpxxay1zacnrsaib6yfzrybm517ynfw3"; owner = "wine-compholio"; repo = "wine-staging"; rev = "v${version}"; From 59ca5d213f99d10f9cc187763876b5c4008bac7d Mon Sep 17 00:00:00 2001 From: Jason Daniel Augustine Gilliland Date: Sat, 17 Dec 2016 00:36:53 -0500 Subject: [PATCH 09/97] freebayes: init at 1.1.0 Signed-off-by: zimbatm --- lib/maintainers.nix | 1 + .../science/biology/freebayes/builder.sh | 11 ++++++++ .../science/biology/freebayes/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 4 files changed, 41 insertions(+) create mode 100644 pkgs/applications/science/biology/freebayes/builder.sh create mode 100644 pkgs/applications/science/biology/freebayes/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index f88cd1212fb..7ed8ae953bc 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -206,6 +206,7 @@ jb55 = "William Casarin "; jbedo = "Justin Bedő "; jcumming = "Jack Cummings "; + jdagilliland = "Jason Gilliland "; jefdaj = "Jeffrey David Johnson "; jerith666 = "Matt McHenry "; jfb = "James Felix Black "; diff --git a/pkgs/applications/science/biology/freebayes/builder.sh b/pkgs/applications/science/biology/freebayes/builder.sh new file mode 100644 index 00000000000..a9f56e77d7e --- /dev/null +++ b/pkgs/applications/science/biology/freebayes/builder.sh @@ -0,0 +1,11 @@ +source $stdenv/setup + +unpackPhase + +cd freebayes-* + +make + +mkdir -p $out/bin +cp bin/freebayes bin/bamleftalign $out/bin +cp scripts/* $out/bin diff --git a/pkgs/applications/science/biology/freebayes/default.nix b/pkgs/applications/science/biology/freebayes/default.nix new file mode 100644 index 00000000000..ef0da619b25 --- /dev/null +++ b/pkgs/applications/science/biology/freebayes/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, cmake, gcc, zlib}: + +stdenv.mkDerivation rec { + name = "freebayes-${version}"; + version = "1.1.0"; + + src = fetchFromGitHub { + name = "freebayes-${version}-src"; + owner = "ekg"; + repo = "freebayes"; + rev = "refs/tags/v${version}"; + sha256 = "0xb8aicb36w9mfs1gq1x7mcp3p82kl7i61d162hfncqzg2npg8rr"; + fetchSubmodules = true; + }; + + buildInputs = [ cmake gcc zlib ]; + + builder = ./builder.sh; + + meta = with stdenv.lib; { + description = "Bayesian haplotype-based polymorphism discovery and genotyping"; + license = licenses.mit; + homepage = https://github.com/ekg/freebayes; + maintainers = with maintainers; [ jdagilliland ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4261200ad6c..82c131b901a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12994,6 +12994,8 @@ in fossil = callPackage ../applications/version-management/fossil { }; + freebayes = callPackage ../applications/science/biology/freebayes { }; + freewheeling = callPackage ../applications/audio/freewheeling { }; fribid = callPackage ../applications/networking/browsers/mozilla-plugins/fribid { }; From 4154adb128c5bc1e7c44fa4a38230f1d6d110b0e Mon Sep 17 00:00:00 2001 From: Laverne Schrock Date: Mon, 21 Nov 2016 18:03:16 -0600 Subject: [PATCH 10/97] rstudio: add desktop file Fixes #20230 --- pkgs/applications/editors/rstudio/default.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 0749f58ecea..244b3b67045 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, boost155, zlib, openssl, R, qt4, libuuid, hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper }: +{ stdenv, fetchurl, makeDesktopItem, cmake, boost155, zlib, openssl, R, qt4, libuuid, hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper }: let version = "0.98.110"; @@ -61,8 +61,23 @@ stdenv.mkDerivation { cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" ]; + desktopItem = makeDesktopItem { + name = name; + exec = "rstudio %F"; + icon = "rstudio"; + desktopName = "RStudio"; + genericName = "IDE"; + comment = meta.description; + categories = "Development;"; + mimeType = "text/x-r-source;text/x-r;text/x-R;text/x-r-doc;text/x-r-sweave;text/x-r-markdown;text/x-r-html;text/x-r-presentation;application/x-r-data;application/x-r-project;text/x-r-history;text/x-r-profile;text/x-tex;text/x-markdown;text/html;text/css;text/javascript;text/x-chdr;text/x-csrc;text/x-c++hdr;text/x-c++src;"; + }; + postInstall = '' wrapProgram $out/bin/rstudio --suffix PATH : ${gnumake}/bin + mkdir $out/share + cp -r ${desktopItem}/share/applications $out/share + mkdir $out/share/icons + ln $out/rstudio.png $out/share/icons ''; meta = with stdenv.lib; From 9872e65037f03fa45e463dae5c23c35e53e245f4 Mon Sep 17 00:00:00 2001 From: Laverne Schrock Date: Mon, 21 Nov 2016 18:06:28 -0600 Subject: [PATCH 11/97] rstudio: make mkDerivation recursive Needed since we want to access desktopItem from postInstall. --- pkgs/applications/editors/rstudio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 244b3b67045..82bcc485da3 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -5,7 +5,7 @@ let ginVer = "1.5"; gwtVer = "2.5.1"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "RStudio-${version}"; buildInputs = [ cmake boost155 zlib openssl R qt4 libuuid unzip ant jdk makeWrapper ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation { sha256 = "0fjr2rcr8lnywj54mzhg9i4xz1b6fh8yv12p5i2q5mgfld2xymy4"; }; - hunspellDicts = builtins.attrValues hunspellDicts; + hunspellDictionaries = builtins.attrValues hunspellDicts; mathJaxSrc = fetchurl { url = https://s3.amazonaws.com/rstudio-buildtools/mathjax-20.zip; @@ -50,7 +50,7 @@ stdenv.mkDerivation { mv gwt-$gwtVer $GWT_LIB_DIR/gwt/$gwtVer mkdir dependencies/common/dictionaries - for dict in $hunspellDicts; do + for dict in $hunspellDictionaries; do for i in "$dict/share/hunspell/"* do ln -sv $i dependencies/common/dictionaries/ done From c52195daaf587ca3573bad92563a9d2c922eb415 Mon Sep 17 00:00:00 2001 From: James Kent Date: Thu, 22 Dec 2016 15:36:29 +0000 Subject: [PATCH 12/97] gnuchess and xboard definitely work on darwin --- pkgs/games/gnuchess/default.nix | 2 +- pkgs/games/xboard/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/gnuchess/default.nix b/pkgs/games/gnuchess/default.nix index 9b0ada3f926..c61d46e9d33 100644 --- a/pkgs/games/gnuchess/default.nix +++ b/pkgs/games/gnuchess/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { inherit (s) version; description = "GNU Chess engine"; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.gpl3Plus; }; } diff --git a/pkgs/games/xboard/default.nix b/pkgs/games/xboard/default.nix index 46d3873659f..442aad46fea 100644 --- a/pkgs/games/xboard/default.nix +++ b/pkgs/games/xboard/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { inherit (s) version; description = ''GUI for chess engines''; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.gpl3Plus; }; } From 215b1e519be5bbda6c472de2b851fea3e65d060f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 22 Dec 2016 15:04:49 +0100 Subject: [PATCH 13/97] aws-sdk-cpp: 1.0.34 -> 1.0.43 Since this drops the problematic libuuid dependency, enable on Darwin. --- .../libraries/aws-sdk-cpp/default.nix | 14 ++++++++------ .../aws-sdk-cpp/s3-encryption-headers.patch | 18 ++++++++++++++++++ 2 files changed, 26 insertions(+), 6 deletions(-) create mode 100644 pkgs/development/libraries/aws-sdk-cpp/s3-encryption-headers.patch diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index d5d7371aebf..bb07b41b059 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, curl, libuuid, openssl, zlib +{ lib, stdenv, fetchFromGitHub, cmake, curl, openssl, zlib , # Allow building a limited set of APIs, e.g. ["s3" "ec2"]. apis ? ["*"] , # Whether to enable AWS' custom memory management. @@ -7,20 +7,22 @@ stdenv.mkDerivation rec { name = "aws-sdk-cpp-${version}"; - version = "1.0.34"; + version = "1.0.43"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "09vag1ybfqvw37djmd9g740iqjvg8nwr4p0xb21rfj06vazrdg4b"; + sha256 = "0sa0pkkbxxfn3h7b19yf296r5g5nqm4aqpwrkij0rq7jix9lxqj6"; }; + patches = [ ./s3-encryption-headers.patch ]; + # FIXME: might be nice to put different APIs in different outputs # (e.g. libaws-cpp-sdk-s3.so in output "s3"). outputs = [ "out" "dev" ]; - buildInputs = [ cmake curl libuuid ]; + buildInputs = [ cmake curl ]; cmakeFlags = lib.optional (!customMemoryManagement) "-DCUSTOM_MEMORY_MANAGEMENT=0" @@ -39,13 +41,13 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = lib.concatStringsSep " " ( (map (pkg: "-rpath ${lib.getOutput "lib" pkg}/lib")) - [ libuuid curl openssl zlib stdenv.cc.cc ]); + [ curl openssl zlib stdenv.cc.cc ]); meta = { description = "A C++ interface for Amazon Web Services"; homepage = https://github.com/awslabs/aws-sdk-cpp; license = lib.licenses.asl20; - platforms = lib.platforms.linux; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = [ lib.maintainers.eelco ]; }; } diff --git a/pkgs/development/libraries/aws-sdk-cpp/s3-encryption-headers.patch b/pkgs/development/libraries/aws-sdk-cpp/s3-encryption-headers.patch new file mode 100644 index 00000000000..10e427a1509 --- /dev/null +++ b/pkgs/development/libraries/aws-sdk-cpp/s3-encryption-headers.patch @@ -0,0 +1,18 @@ +diff --git a/aws-cpp-sdk-s3-encryption/CMakeLists.txt b/aws-cpp-sdk-s3-encryption/CMakeLists.txt +index 0a1a907..cf9ce0e 100644 +--- a/aws-cpp-sdk-s3-encryption/CMakeLists.txt ++++ b/aws-cpp-sdk-s3-encryption/CMakeLists.txt +@@ -69,9 +69,9 @@ target_link_libraries(${PROJECT_NAME} ${PROJECT_LIBS}) + + setup_install() + +-install (FILES ${S3ENCRYPTION_HEADERS} DESTINATION include/aws/s3-encryption) +-install (FILES ${S3ENCRYPTION_MATERIALS_HEADERS} DESTINATION include/aws/s3-encryption/materials) +-install (FILES ${S3ENCRYPTION_HANDLERS_HEADERS} DESTINATION include/aws/s3-encryption/handlers) +-install (FILES ${S3ENCRYPTION_MODULES_HEADERS} DESTINATION include/aws/s3-encryption/modules) ++install (FILES ${S3ENCRYPTION_HEADERS} DESTINATION ${INCLUDE_DIRECTORY}/aws/s3-encryption) ++install (FILES ${S3ENCRYPTION_MATERIALS_HEADERS} DESTINATION ${INCLUDE_DIRECTORY}/aws/s3-encryption/materials) ++install (FILES ${S3ENCRYPTION_HANDLERS_HEADERS} DESTINATION ${INCLUDE_DIRECTORY}/aws/s3-encryption/handlers) ++install (FILES ${S3ENCRYPTION_MODULES_HEADERS} DESTINATION ${INCLUDE_DIRECTORY}/aws/s3-encryption/modules) + + do_packaging() From 9f200422f28e22cc0e059406bcf0373d3e0444fc Mon Sep 17 00:00:00 2001 From: Richard Lupton Date: Thu, 22 Dec 2016 16:21:00 +0000 Subject: [PATCH 14/97] kubernetes-helm: 2.0.2 -> 2.1.2 (#21343) --- pkgs/applications/networking/cluster/helm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 58ac31ce49f..a258a802477 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -4,12 +4,12 @@ let then "linux-amd64" else "darwin-amd64"; checksum = if stdenv.isLinux - then "dad3791fb07e6cf34f4cf611728cb8ae109a75234498a888529a68ac6923f200" - else "d27bd7e40e12c0a5f08782a8a883166008565b28e0b82126d2089300ff3f8465"; + then "1797ab74720f122432eace591fb415e5e5f5db97f4b6608ca8dbe59bae988374" + else "2b522dcfe27e987138f7826c79fb26a187075dd9be5c5a4c76fd6846bf109014"; in stdenv.mkDerivation rec { pname = "helm"; - version = "2.0.2"; + version = "2.1.2"; name = "${pname}-${version}"; src = fetchurl { From 4888bfecc28c0b74a18351a08cce5618c5b54868 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Thu, 22 Dec 2016 10:34:56 -0800 Subject: [PATCH 15/97] coq_8_6: 8.6 is now default, 8.4 optional, updated mathcomp/ssreflect Addresses #14829 --- .../logic/coq/{default.nix => 8.4.nix} | 0 .../coq-modules/mathcomp/default.nix | 55 +++++++----- .../coq-modules/mathcomp/generic.nix | 5 +- .../coq-modules/ssreflect/default.nix | 14 +++ .../coq-modules/ssreflect/generic.nix | 5 +- pkgs/top-level/all-packages.nix | 87 +++++++------------ 6 files changed, 82 insertions(+), 84 deletions(-) rename pkgs/applications/science/logic/coq/{default.nix => 8.4.nix} (100%) diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/8.4.nix similarity index 100% rename from pkgs/applications/science/logic/coq/default.nix rename to pkgs/applications/science/logic/coq/8.4.nix diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index 189b1220640..81cfdecdfff 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -1,24 +1,39 @@ -{ callPackage, coq, fetchurl }: +{ callPackage, fetchurl, coq }: -let src = - if coq.coq-version == "8.4" then - - fetchurl { - url = http://ssr.msr-inria.inria.fr/FTP/mathcomp-1.6.tar.gz; - sha256 = "0adr556032r1jkvphbpfvrrv041qk0yqb7a1xnbam52ji0mdl2w8"; - } - - else if coq.coq-version == "8.5" then - - fetchurl { - url = http://ssr.msr-inria.inria.fr/FTP/mathcomp-1.6.tar.gz; - sha256 = "0adr556032r1jkvphbpfvrrv041qk0yqb7a1xnbam52ji0mdl2w8"; - } - - else throw "No mathcomp package for Coq version ${coq.coq-version}"; - -in +if coq.coq-version == "8.4" then callPackage ./generic.nix { - inherit src; + + name = "coq-mathcomp-1.6-${coq.coq-version}"; + src = fetchurl { + url = http://ssr.msr-inria.inria.fr/FTP/mathcomp-1.6.tar.gz; + sha256 = "0adr556032r1jkvphbpfvrrv041qk0yqb7a1xnbam52ji0mdl2w8"; + }; + } + +else if coq.coq-version == "8.5" then + +callPackage ./generic.nix { + + name = "coq-mathcomp-1.6-${coq.coq-version}"; + src = fetchurl { + url = http://ssr.msr-inria.inria.fr/FTP/mathcomp-1.6.tar.gz; + sha256 = "0adr556032r1jkvphbpfvrrv041qk0yqb7a1xnbam52ji0mdl2w8"; + }; + +} + +else if coq.coq-version == "8.6" then + +callPackage ./generic.nix { + + name = "coq-mathcomp-1.6.1-${coq.coq-version}"; + src = fetchurl { + url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz; + sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw"; + }; + +} + +else throw "No ssreflect package for Coq version ${coq.coq-version}" diff --git a/pkgs/development/coq-modules/mathcomp/generic.nix b/pkgs/development/coq-modules/mathcomp/generic.nix index b257c81e85f..9a6a98609d2 100644 --- a/pkgs/development/coq-modules/mathcomp/generic.nix +++ b/pkgs/development/coq-modules/mathcomp/generic.nix @@ -1,12 +1,11 @@ { stdenv, fetchurl, coq, ssreflect, ncurses, which , graphviz, ocamlPackages, withDoc ? false -, src +, src, name }: stdenv.mkDerivation { - name = "coq-mathcomp-1.6-${coq.coq-version}"; - + inherit name; inherit src; nativeBuildInputs = stdenv.lib.optionals withDoc [ graphviz ]; diff --git a/pkgs/development/coq-modules/ssreflect/default.nix b/pkgs/development/coq-modules/ssreflect/default.nix index 8ba49d06bae..16147c4dc2a 100644 --- a/pkgs/development/coq-modules/ssreflect/default.nix +++ b/pkgs/development/coq-modules/ssreflect/default.nix @@ -4,6 +4,7 @@ if coq.coq-version == "8.4" then callPackage ./generic.nix { + name = "coq-ssreflect-1.6-${coq.coq-version}"; src = fetchurl { url = http://ssr.msr-inria.inria.fr/FTP/mathcomp-1.6.tar.gz; sha256 = "0adr556032r1jkvphbpfvrrv041qk0yqb7a1xnbam52ji0mdl2w8"; @@ -15,6 +16,7 @@ else if coq.coq-version == "8.5" then callPackage ./generic.nix { + name = "coq-ssreflect-1.6-${coq.coq-version}"; src = fetchurl { url = http://ssr.msr-inria.inria.fr/FTP/mathcomp-1.6.tar.gz; sha256 = "0adr556032r1jkvphbpfvrrv041qk0yqb7a1xnbam52ji0mdl2w8"; @@ -22,4 +24,16 @@ callPackage ./generic.nix { } +else if coq.coq-version == "8.6" then + +callPackage ./generic.nix { + + name = "coq-ssreflect-1.6.1-${coq.coq-version}"; + src = fetchurl { + url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz; + sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw"; + }; + +} + else throw "No ssreflect package for Coq version ${coq.coq-version}" diff --git a/pkgs/development/coq-modules/ssreflect/generic.nix b/pkgs/development/coq-modules/ssreflect/generic.nix index 891a4e2885a..3362e8839a7 100644 --- a/pkgs/development/coq-modules/ssreflect/generic.nix +++ b/pkgs/development/coq-modules/ssreflect/generic.nix @@ -1,12 +1,11 @@ { stdenv, fetchurl, coq, ncurses, which , graphviz, withDoc ? false -, src, patches ? [] +, src, name, patches ? [] }: stdenv.mkDerivation { - name = "coq-ssreflect-1.6-${coq.coq-version}"; - + inherit name; inherit src; nativeBuildInputs = stdenv.lib.optionals withDoc [ graphviz ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 82c131b901a..6e5b498f70a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6603,7 +6603,9 @@ in valkyrie = callPackage ../development/tools/analysis/valkyrie { }; - inherit (ocaml-ng.ocamlPackages_4_02) verasco; + verasco = ocaml-ng.ocamlPackages_4_02.verasco.override { + coq = coq_8_4; + }; visualvm = callPackage ../development/tools/java/visualvm { }; @@ -16716,38 +16718,34 @@ in aspino = callPackage ../applications/science/logic/aspino {}; - coq = callPackage ../applications/science/logic/coq { - inherit (ocamlPackages_4_01_0) ocaml findlib lablgtk; - camlp5 = ocamlPackages_4_01_0.camlp5_transitional; - }; - - coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix { - inherit (ocamlPackages) ocaml findlib lablgtk; - camlp5 = ocamlPackages.camlp5_transitional; - }; - - coq_8_6 = callPackage ../applications/science/logic/coq/8.6.nix { - inherit (ocamlPackages) ocaml findlib lablgtk; - camlp5 = ocamlPackages.camlp5_transitional; - }; - - coq_8_5 = callPackage ../applications/science/logic/coq/8.5.nix { - inherit (ocamlPackages) ocaml findlib lablgtk; - camlp5 = ocamlPackages.camlp5_transitional; - }; - coq_8_3 = callPackage ../applications/science/logic/coq/8.3.nix { make = pkgs.gnumake3; inherit (ocamlPackages_3_12_1) ocaml findlib; camlp5 = ocamlPackages_3_12_1.camlp5_transitional; lablgtk = ocamlPackages_3_12_1.lablgtk_2_14; }; + coq_8_4 = callPackage ../applications/science/logic/coq/8.4.nix { + inherit (ocamlPackages_4_01_0) ocaml findlib lablgtk; + camlp5 = ocamlPackages_4_01_0.camlp5_transitional; + }; + coq_8_5 = callPackage ../applications/science/logic/coq/8.5.nix { + inherit (ocamlPackages) ocaml findlib lablgtk; + camlp5 = ocamlPackages.camlp5_transitional; + }; + coq_8_6 = callPackage ../applications/science/logic/coq/8.6.nix { + inherit (ocamlPackages) ocaml findlib lablgtk; + camlp5 = ocamlPackages.camlp5_transitional; + }; + coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix { + inherit (ocamlPackages) ocaml findlib lablgtk; + camlp5 = ocamlPackages.camlp5_transitional; + }; + coq = coq_8_6; mkCoqPackages_8_4 = self: let callPackage = newScope self; in { - inherit callPackage; - - bedrock = callPackage ../development/coq-modules/bedrock {}; + coq = coq_8_4; + coqPackages = coqPackages_8_4; contribs = let contribs = @@ -16757,86 +16755,59 @@ in in recurseIntoAttrs contribs; + bedrock = callPackage ../development/coq-modules/bedrock {}; coqExtLib = callPackage ../development/coq-modules/coq-ext-lib {}; - coqeal = callPackage ../development/coq-modules/coqeal {}; - coquelicot = callPackage ../development/coq-modules/coquelicot {}; - domains = callPackage ../development/coq-modules/domains {}; - fiat = callPackage ../development/coq-modules/fiat {}; fiat_HEAD = callPackage ../development/coq-modules/fiat/HEAD.nix {}; - flocq = callPackage ../development/coq-modules/flocq {}; - heq = callPackage ../development/coq-modules/heq {}; - interval = callPackage ../development/coq-modules/interval {}; - mathcomp = callPackage ../development/coq-modules/mathcomp {}; - paco = callPackage ../development/coq-modules/paco {}; - QuickChick = callPackage ../development/coq-modules/QuickChick {}; - ssreflect = callPackage ../development/coq-modules/ssreflect {}; - tlc = callPackage ../development/coq-modules/tlc {}; - unimath = callPackage ../development/coq-modules/unimath {}; - ynot = callPackage ../development/coq-modules/ynot {}; - }; mkCoqPackages_8_5 = self: let callPackage = newScope self; in rec { - inherit callPackage; - coq = coq_8_5; + coqPackages = coqPackages_8_5; coq-ext-lib = callPackage ../development/coq-modules/coq-ext-lib {}; - coquelicot = callPackage ../development/coq-modules/coquelicot {}; - dpdgraph = callPackage ../development/coq-modules/dpdgraph {}; - flocq = callPackage ../development/coq-modules/flocq {}; - interval = callPackage ../development/coq-modules/interval {}; - mathcomp = callPackage ../development/coq-modules/mathcomp { }; - ssreflect = callPackage ../development/coq-modules/ssreflect { }; - fiat_HEAD = callPackage ../development/coq-modules/fiat/HEAD.nix {}; - }; mkCoqPackages_8_6 = self: let callPackage = newScope self; in rec { - inherit callPackage; - coq = coq_8_6; + coqPackages = coqPackages_8_6; coq-ext-lib = callPackage ../development/coq-modules/coq-ext-lib {}; - coquelicot = callPackage ../development/coq-modules/coquelicot {}; - dpdgraph = callPackage ../development/coq-modules/dpdgraph {}; - flocq = callPackage ../development/coq-modules/flocq {}; - interval = callPackage ../development/coq-modules/interval {}; - + mathcomp = callPackage ../development/coq-modules/mathcomp { }; + ssreflect = callPackage ../development/coq-modules/ssreflect { }; fiat_HEAD = callPackage ../development/coq-modules/fiat/HEAD.nix {}; - }; - coqPackages = mkCoqPackages_8_4 coqPackages; + coqPackages_8_4 = mkCoqPackages_8_4 coqPackages_8_4; coqPackages_8_5 = mkCoqPackages_8_5 coqPackages_8_5; coqPackages_8_6 = mkCoqPackages_8_6 coqPackages_8_6; + coqPackages = coqPackages_8_6; cryptoverif = callPackage ../applications/science/logic/cryptoverif { }; From f06284b0dc28eb7c1a27c57e97bf087ab224a8e7 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Thu, 22 Dec 2016 11:04:39 -0800 Subject: [PATCH 16/97] coq_8_6: Use ocamlPackages_4_03 rather than 4_01 --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e5b498f70a..e367d529dbc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16733,8 +16733,8 @@ in camlp5 = ocamlPackages.camlp5_transitional; }; coq_8_6 = callPackage ../applications/science/logic/coq/8.6.nix { - inherit (ocamlPackages) ocaml findlib lablgtk; - camlp5 = ocamlPackages.camlp5_transitional; + inherit (ocamlPackages_4_03) ocaml findlib lablgtk; + camlp5 = ocamlPackages_4_03.camlp5_transitional; }; coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix { inherit (ocamlPackages) ocaml findlib lablgtk; From dfe1f721cafc5ddeae79b70592bead719d4f1f05 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Thu, 22 Dec 2016 13:36:08 -0500 Subject: [PATCH 17/97] all-packages: Whitespace pruning --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e367d529dbc..c75239ff472 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2253,7 +2253,7 @@ in ioping = callPackage ../tools/system/ioping { }; iops = callPackage ../tools/system/iops { }; - + ior = callPackage ../tools/system/ior { }; iodine = callPackage ../tools/networking/iodine { }; @@ -2604,7 +2604,7 @@ in libmbim = callPackage ../development/libraries/libmbim { }; libmongo-client = callPackage ../development/libraries/libmongo-client { }; - + libmesode = callPackage ../development/libraries/libmesode { }; libnabo = callPackage ../development/libraries/libnabo { }; From 94fbbb2ed6487aa5da28c3816e343e263df112c8 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Thu, 22 Dec 2016 13:36:37 -0500 Subject: [PATCH 18/97] linux_3_12: Drop already applied patches --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c75239ff472..e8d5e8da8ad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11005,9 +11005,7 @@ in linux_3_12 = callPackage ../os-specific/linux/kernel/linux-3.12.nix { kernelPatches = with kernelPatches; - [ bridge_stp_helper - crc_regression - packet_fix_race_condition_CVE_2016_8655 + [ ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu From 9a167a35ff87606f18580780d6b6e2ce3ddd3fcc Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Thu, 22 Dec 2016 12:44:05 -0800 Subject: [PATCH 19/97] coq_8_6: Use ocamlPackages, rather than a specific version --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e8d5e8da8ad..f76728bd62c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16731,8 +16731,8 @@ in camlp5 = ocamlPackages.camlp5_transitional; }; coq_8_6 = callPackage ../applications/science/logic/coq/8.6.nix { - inherit (ocamlPackages_4_03) ocaml findlib lablgtk; - camlp5 = ocamlPackages_4_03.camlp5_transitional; + inherit (ocamlPackages) ocaml findlib lablgtk; + camlp5 = ocamlPackages.camlp5_transitional; }; coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix { inherit (ocamlPackages) ocaml findlib lablgtk; From 3876b4dd94f1803652a4a76592ad519b4da4ddd8 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Thu, 22 Dec 2016 14:10:21 -0800 Subject: [PATCH 20/97] coq, coqPackages: Roll default back to 8.4, until ssreflect is building --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f76728bd62c..e8ccd434664 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16738,7 +16738,7 @@ in inherit (ocamlPackages) ocaml findlib lablgtk; camlp5 = ocamlPackages.camlp5_transitional; }; - coq = coq_8_6; + coq = coq_8_4; mkCoqPackages_8_4 = self: let callPackage = newScope self; in { inherit callPackage; @@ -16805,7 +16805,7 @@ in coqPackages_8_4 = mkCoqPackages_8_4 coqPackages_8_4; coqPackages_8_5 = mkCoqPackages_8_5 coqPackages_8_5; coqPackages_8_6 = mkCoqPackages_8_6 coqPackages_8_6; - coqPackages = coqPackages_8_6; + coqPackages = coqPackages_8_4; cryptoverif = callPackage ../applications/science/logic/cryptoverif { }; From 556ca974aa0750c7a120d952601ebaacd1a658c3 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Thu, 22 Dec 2016 23:47:15 +0100 Subject: [PATCH 21/97] linux_3_12: add back bridge_stp_helper patch See 94fbbb2ed6487aa5da28c3816e343e263df112c8 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e8ccd434664..a35ef13bb43 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11005,7 +11005,7 @@ in linux_3_12 = callPackage ../os-specific/linux/kernel/linux-3.12.nix { kernelPatches = with kernelPatches; - [ + [ bridge_stp_helper ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu From 53a44eff9291a57d75ef8fe8cfe62225a7d8f918 Mon Sep 17 00:00:00 2001 From: Rory McNamara Date: Thu, 22 Dec 2016 23:22:58 +0000 Subject: [PATCH 22/97] bspwm: 1.9.1 -> 1.9.2 --- pkgs/applications/window-managers/bspwm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/applications/window-managers/bspwm/default.nix index 641716ab2fc..8798d2b3832 100644 --- a/pkgs/applications/window-managers/bspwm/default.nix +++ b/pkgs/applications/window-managers/bspwm/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "bspwm-${version}"; - version = "0.9.1"; + version = "0.9.2"; src = fetchurl { url = "https://github.com/baskerville/bspwm/archive/${version}.tar.gz"; - sha256 = "11dvfcvr8bc116yb3pvl0k1h2gfm9rv652jbxd1c5pmc0yimifq2"; + sha256 = "1w6wxwgyb14w664xafp3b2ps6zzf9yw7cfhbh9229x2hil9rss1k"; }; buildInputs = [ libxcb libXinerama xcbutil xcbutilkeysyms xcbutilwm ]; From d8a8e1cd0a358fba75ef7b323d97561b5a26eed0 Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Fri, 23 Dec 2016 01:44:30 +0000 Subject: [PATCH 23/97] Update GHC 8.0.2 to RC 2 --- pkgs/development/compilers/ghc/8.0.2.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix index 5a435508435..b9bece1489f 100644 --- a/pkgs/development/compilers/ghc/8.0.2.nix +++ b/pkgs/development/compilers/ghc/8.0.2.nix @@ -13,21 +13,15 @@ let }); in stdenv.mkDerivation rec { - version = "8.0.1.20161117"; + version = "8.0.1.20161213"; name = "ghc-${version}"; src = fetchurl { - url = "https://downloads.haskell.org/~ghc/8.0.2-rc1/${name}-src.tar.xz"; - sha256 = "08hpzvg059ha0knmlngd0winfkplkkb7dk88zfz3s177z38kd874"; + url = "https://downloads.haskell.org/~ghc/8.0.2-rc2/${name}-src.tar.xz"; + sha256 = "0l1arhbh3rbs011f0y4pgc35yn07x3hz6lfqlvqbwn96f8ff5529"; }; - patches = [ - # Already applied? - # ./relocation.patch - # Fix https://ghc.haskell.org/trac/ghc/ticket/12130 - # (fetchFilteredPatch { url = https://git.haskell.org/ghc.git/patch/4d71cc89b4e9648f3fbb29c8fcd25d725616e265; sha256 = "0syaxb4y4s2dc440qmrggb4vagvqqhb55m6mx12rip4i9qhxl8k0"; }) - (fetchFilteredPatch { url = https://git.haskell.org/ghc.git/patch/2f8cd14fe909a377b3e084a4f2ded83a0e6d44dd; sha256 = "06zvlgcf50ab58bw6yw3krn45dsmhg4cmlz4nqff8k4z1f1bj01v"; }) - ] ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch; + patches = [] ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch; buildInputs = [ ghc perl hscolour ]; From 9f6bd82364da34a1244dc5a246f9243b6daa8144 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 23 Dec 2016 10:57:28 +0100 Subject: [PATCH 24/97] nvidia-x11: 375.20 -> 375.26 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 69e4de69f9c..967a98d9566 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -12,7 +12,7 @@ assert (!libsOnly) -> kernel != null; let - versionNumber = "375.20"; + versionNumber = "375.26"; # Policy: use the highest stable version as the default (on our master). inherit (stdenv.lib) makeLibraryPath; @@ -30,12 +30,12 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "http://download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "0da3mgfmkhs576wfkdmk8pbmvsksalkwz8a75vnhk0385fnd6yfc"; + sha256 = "0yv19rkz2wzzj0fygfjb1mh21iy769kff3yg2kzk8bsiwnmcyybw"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}.run"; - sha256 = "02v20xns8w4flpllibc684g5yghi5dy28avsarccjyn5knhl03ni"; + sha256 = "1kqy9ayja3g5znj2hzx8pklz8qi0b0l9da7c3ldg3hlxf31v4hjg"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; From d8478c79128cc5220b47ba3fd2f1dccddaa6e31e Mon Sep 17 00:00:00 2001 From: Felix Richter Date: Fri, 23 Dec 2016 11:49:35 +0100 Subject: [PATCH 25/97] services.nginx: allow startup with ipv6 disabled (#21360) currently services.nginx does not start up if `networking.enableIPv6 = false` the commit changes the nginx behavior to handle this case accordingly. The commit resolves #21308 --- nixos/modules/services/web-servers/nginx/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 698d37133d7..c1bceb13312 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -10,6 +10,7 @@ let sslCertificateKey = "/var/lib/acme/${vhostName}/key.pem"; }) ) cfg.virtualHosts; + enableIPv6 = config.networking.enableIPv6; configFile = pkgs.writeText "nginx.conf" '' user ${cfg.user} ${cfg.group}; @@ -84,7 +85,7 @@ let ${optionalString cfg.statusPage '' server { listen 80; - listen [::]:80; + ${optionalString enableIPv6 "listen [::]:80;" } server_name localhost; @@ -92,7 +93,7 @@ let stub_status on; access_log off; allow 127.0.0.1; - allow ::1; + ${optionalString enableIPv6 "allow ::1;"} deny all; } } @@ -133,7 +134,9 @@ let ${optionalString vhost.forceSSL '' server { listen 80 ${optionalString vhost.default "default"}; - listen [::]:80 ${optionalString vhost.default "default"}; + ${optionalString enableIPv6 + ''listen [::]:80 ${optionalString vhost.default "default"};'' + } server_name ${serverName} ${concatStringsSep " " vhost.serverAliases}; ${acmeLocation} @@ -145,7 +148,7 @@ let server { listen ${listenString}; - listen [::]:${listenString}; + ${optionalString enableIPv6 "listen [::]:${listenString};"} server_name ${serverName} ${concatStringsSep " " vhost.serverAliases}; ${acmeLocation} From de44544cebe3cec242d752afcff71a8203b81102 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 23 Dec 2016 11:52:44 +0100 Subject: [PATCH 26/97] nginx service: use `default_server` parameter instead of `default` (#21371) --- nixos/modules/services/web-servers/nginx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index c1bceb13312..68a672c42c9 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -117,7 +117,7 @@ let ssl = vhost.enableSSL || vhost.forceSSL; port = if vhost.port != null then vhost.port else (if ssl then 443 else 80); listenString = toString port + optionalString ssl " ssl http2" - + optionalString vhost.default " default"; + + optionalString vhost.default " default_server"; acmeLocation = optionalString vhost.enableACME ('' location /.well-known/acme-challenge { ${optionalString (vhost.acmeFallbackHost != null) "try_files $uri @acme-fallback;"} @@ -133,9 +133,9 @@ let in '' ${optionalString vhost.forceSSL '' server { - listen 80 ${optionalString vhost.default "default"}; + listen 80 ${optionalString vhost.default "default_server"}; ${optionalString enableIPv6 - ''listen [::]:80 ${optionalString vhost.default "default"};'' + ''listen [::]:80 ${optionalString vhost.default "default_server"};'' } server_name ${serverName} ${concatStringsSep " " vhost.serverAliases}; From c8982c015c82de2fcf97e60399d1461076b9d42b Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 23 Dec 2016 12:28:06 +0100 Subject: [PATCH 27/97] salt: fix patch after upstream code change fixes #20458 --- pkgs/tools/admin/salt/fix-libcrypto-loading.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/salt/fix-libcrypto-loading.patch b/pkgs/tools/admin/salt/fix-libcrypto-loading.patch index c5cc1bde5d0..fa2c5c0aa52 100644 --- a/pkgs/tools/admin/salt/fix-libcrypto-loading.patch +++ b/pkgs/tools/admin/salt/fix-libcrypto-loading.patch @@ -2,10 +2,10 @@ diff --git a/salt/utils/rsax931.py b/salt/utils/rsax931.py index 9eb1f4a..d764f7a 100644 --- a/salt/utils/rsax931.py +++ b/salt/utils/rsax931.py -@@ -36,7 +36,7 @@ def _load_libcrypto(): +@@ -36,7 +36,6 @@ def _load_libcrypto(): 'libcrypto.so*')) lib = lib[0] if len(lib) > 0 else None - if lib: +- if lib: - return cdll.LoadLibrary(lib) -+ return cdll.LoadLibrary('@libcrypto@') ++ return cdll.LoadLibrary('@libcrypto@') raise OSError('Cannot locate OpenSSL libcrypto') From cbe1218cc90de4ddc79b37c52c348b0b4b062edc Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Sun, 18 Dec 2016 21:26:47 -0500 Subject: [PATCH 28/97] plex: 1.2.7 -> 1.3.3 --- pkgs/servers/plex/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix index 467f3ffb1d4..122d5bd7dc9 100644 --- a/pkgs/servers/plex/default.nix +++ b/pkgs/servers/plex/default.nix @@ -6,9 +6,9 @@ let plexPass = throw "Plex pass has been removed at upstream's request; please unset nixpkgs.config.plex.pass"; plexpkg = if enablePlexPass then plexPass else { - version = "1.2.7.2987"; - vsnHash = "1bef33a"; - sha256 = "17d1yisbikcp25mgn71rf8w76zhy015f33hxjj93swfm1qrq55hq"; + version = "1.3.3.3148"; + vsnHash = "b38628e"; + sha256 = "1dx8z27l1dwigr3ipcdzn25hnj0206255ihxh9rnh2qchrcqmb5y"; }; in stdenv.mkDerivation rec { From 3c10e68c40ebb5419aeb282253ef4d0cd902c646 Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Sun, 18 Dec 2016 21:59:06 -0500 Subject: [PATCH 29/97] plex: fix a minor syntax issue in systemd ExecStart --- nixos/modules/services/misc/plex.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/plex.nix b/nixos/modules/services/misc/plex.nix index 92b352db416..48d3c05785c 100644 --- a/nixos/modules/services/misc/plex.nix +++ b/nixos/modules/services/misc/plex.nix @@ -127,7 +127,7 @@ in User = cfg.user; Group = cfg.group; PermissionsStartOnly = "true"; - ExecStart = "/bin/sh -c '${cfg.package}/usr/lib/plexmediaserver/Plex\\ Media\\ Server'"; + ExecStart = "/bin/sh -c ${cfg.package}/usr/lib/plexmediaserver/Plex\\ Media\\ Server"; Restart = "on-failure"; }; environment = { From f381232a96634c37ecbcfcfa6641963544d71f50 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Thu, 15 Dec 2016 17:18:52 +0100 Subject: [PATCH 30/97] libgcrypt: 1.7.3 -> 1.7.5 See http://lists.gnu.org/archive/html/info-gnu/2016-12/msg00007.html for release announcement. --- pkgs/development/libraries/libgcrypt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index 8b7f48967e0..f0525789896 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -4,11 +4,11 @@ assert enableCapabilities -> stdenv.isLinux; stdenv.mkDerivation rec { name = "libgcrypt-${version}"; - version = "1.7.3"; + version = "1.7.5"; src = fetchurl { url = "mirror://gnupg/libgcrypt/${name}.tar.bz2"; - sha256 = "0wbh6fq5zi9wg2xcfvfpwh7dv52jihivx1vm4h91c2kx0w8n3b6x"; + sha256 = "0078pbzm6nlgvnwlylshsg707ifcmfpnpbvhlhqbpwpfic9a9zni"; }; outputs = [ "out" "dev" "info" ]; From 501e485e75eae8f300210eac7a90ca3730f82951 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Tue, 20 Dec 2016 17:17:21 +0100 Subject: [PATCH 31/97] gnupg21: 2.1.16 -> 2.1.17 See http://lists.gnu.org/archive/html/info-gnu/2016-12/msg00011.html for release announcement --- pkgs/tools/security/gnupg/21.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix index a4b47843583..e91f91dbdea 100644 --- a/pkgs/tools/security/gnupg/21.nix +++ b/pkgs/tools/security/gnupg/21.nix @@ -15,11 +15,11 @@ assert guiSupport -> pinentry != null; stdenv.mkDerivation rec { name = "gnupg-${version}"; - version = "2.1.16"; + version = "2.1.17"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "0i483m9q032a0s50f1izb213g4h5i7pcgn395m6hvl3sg2kadfa9"; + sha256 = "1js308b46ifx1gim0c9nivr5yxhans7iq1yvkf7zl2928gdm9p65"; }; buildInputs = [ From ef9e7a8d882d1f5b4f6f153771f630c5dbad9062 Mon Sep 17 00:00:00 2001 From: Adam Beckmeyer Date: Fri, 23 Dec 2016 11:23:14 -0500 Subject: [PATCH 32/97] pythonPackages.markdown: 2.6.4 -> 2.6.7 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8cc49d53c70..aa94c114371 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14139,12 +14139,12 @@ in { }; markdown = buildPythonPackage rec { - version = "2.6.4"; + version = "2.6.7"; name = "markdown-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/M/Markdown/Markdown-${version}.tar.gz"; - sha256 = "1kll5b35wqkhvniwm2kh6rqc43wakv9ls0qm6g5318pjmbkywdp4"; + sha256 = "1h055llfd0ps0ig7qb3v1j9068xv90dc9s7xkhkgz9zg8r4g5sys"; }; # error: invalid command 'test' From fcbce33e27f261db83e5a9ebceb1451a2e82d772 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 23 Dec 2016 01:15:24 +0100 Subject: [PATCH 33/97] bird: 1.6.2 -> 1.6.3 --- pkgs/servers/bird/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix index a03b81583c0..0e77aa1d8ee 100644 --- a/pkgs/servers/bird/default.nix +++ b/pkgs/servers/bird/default.nix @@ -2,11 +2,11 @@ , enableIPv6 ? false }: stdenv.mkDerivation rec { - name = "bird-1.6.2"; + name = "bird-1.6.3"; src = fetchurl { url = "ftp://bird.network.cz/pub/bird/${name}.tar.gz"; - sha256 = "1xlq78mgfyh9yvg9zld9mx75bxg9ajbn4cjjchnf0msh0ibzhlw8"; + sha256 = "0z3yrxqb0p7f8b7r2gk4mvrwfzk45zx7yr9aifbvba1vgksiri9r"; }; buildInputs = [ flex bison readline ]; From 61312a922c1884954fe9821be71d4d223d76702b Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 23 Dec 2016 04:17:07 +0100 Subject: [PATCH 34/97] grafana: 4.0.0 -> 4.0.2 --- pkgs/servers/monitoring/grafana/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 821d049c297..aa14af89c32 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,8 +1,8 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "4.0.0"; - ts = "1480439068"; + version = "4.0.2"; + ts = "1481203731"; name = "grafana-v${version}"; goPackagePath = "github.com/grafana/grafana"; @@ -10,12 +10,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "0ps9bi4mnb3k6g2824crhyb804srk2b4d2j9k306vg0cizirn75c"; + sha256 = "1z71nb4qmp1qavsc101k86hc4yyis3mlqb1csrymkhgl94qpiiqm"; }; srcStatic = fetchurl { url = "https://grafanarel.s3.amazonaws.com/builds/grafana-${version}-${ts}.linux-x64.tar.gz"; - sha256 = "10n3vmmyr1rvq29r5cz1rwz60smavj6fahz4vaqldh1v0qyqzjlm"; + sha256 = "1jnh2hn95r1ik0z31b4p0niq7apykppf8jcjjhsbqf8yp8i2b737"; }; preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace"; From c23032a8b11d0585c1f1aece1d2b0abd82148e82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 20 Dec 2016 23:24:17 +0100 Subject: [PATCH 35/97] docker: update service units from upstream All the new options in detail: Enable docker in multi-user.target make container created with restart=always to start. We still want socket activation as it decouples dependencies between the existing of /var/run/docker.sock and the docker daemon. This means that services can rely on the availability of this socket. Fixes #11478 #21303 wantedBy = ["multi-user.target"]; This allows us to remove the postStart hack, as docker reports on its own when it is ready. Type=notify The following will set unset some limits because overhead in kernel's ressource accounting was observed. Note that these limit only apply to containerd. Containers will have their own limit set. LimitNPROC=infinity LimitCORE=infinity TasksMax=infinity Upgrades may require schema migrations. This can delay the startup of dockerd. TimeoutStartSec=0 Allows docker to create its own cgroup subhierarchy to apply ressource limits on containers. Delegate=true When dockerd is killed, container should be not affected to allow `live restore` to work. KillMode=process --- .../web-servers/lighttpd/inginious.nix | 3 +- nixos/modules/virtualisation/docker.nix | 93 +++++++++++-------- nixos/tests/docker-registry.nix | 2 - 3 files changed, 56 insertions(+), 42 deletions(-) diff --git a/nixos/modules/services/web-servers/lighttpd/inginious.nix b/nixos/modules/services/web-servers/lighttpd/inginious.nix index 43deccb6aef..669e81d0f14 100644 --- a/nixos/modules/services/web-servers/lighttpd/inginious.nix +++ b/nixos/modules/services/web-servers/lighttpd/inginious.nix @@ -191,9 +191,8 @@ in virtualisation.docker = { enable = true; # We need docker to listen on port 2375. - extraOptions = "-H tcp://127.0.0.1:2375 -H unix:///var/run/docker.sock"; + listenOptions = ["127.0.0.1:2375" "/var/run/docker.sock"]; storageDriver = mkDefault "overlay"; - socketActivation = false; }; users.extraUsers."lighttpd".extraGroups = [ "docker" ]; diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix index 92fe98f3f9c..8902799936c 100644 --- a/nixos/modules/virtualisation/docker.nix +++ b/nixos/modules/virtualisation/docker.nix @@ -28,16 +28,42 @@ in docker command line tool. ''; }; - socketActivation = + + listenOptions = + mkOption { + type = types.listOf types.str; + default = ["/var/run/docker.sock"]; + description = + '' + A list of unix and tcp docker should listen to. The format follows + ListenStream as described in systemd.socket(5). + ''; + }; + + enableOnBoot = mkOption { type = types.bool; default = true; description = '' - This option enables docker with socket activation. I.e. docker will - start when first called by client. + When enabled dockerd is started on boot. This is required for + container, which are created with the + --restart=always flag, to work. If this option is + disabled, docker might be started on demand by socket activation. ''; }; + + liveRestore = + mkOption { + type = types.bool; + default = true; + description = + '' + Allow dockerd to be restarted without affecting running container. + This option is incompatible with docker swarm. + ''; + }; + storageDriver = mkOption { type = types.nullOr (types.enum ["aufs" "btrfs" "devicemapper" "overlay" "overlay2" "zfs"]); @@ -69,24 +95,6 @@ in docker daemon. ''; }; - - postStart = - mkOption { - type = types.lines; - default = '' - while ! [ -e /var/run/docker.sock ]; do - sleep 0.1 - done - ''; - description = '' - The postStart phase of the systemd service. You may need to - override this if you are passing in flags to docker which - don't cause the socket file to be created. This option is ignored - if socket activation is used. - ''; - }; - - }; ###### implementation @@ -94,44 +102,53 @@ in config = mkIf cfg.enable (mkMerge [ { environment.systemPackages = [ pkgs.docker ]; users.extraGroups.docker.gid = config.ids.gids.docker; + # this unit follows the one provided by upstream see: https://github.com/docker/docker/blob/master/contrib/init/systemd/docker.service + # comments below reflect experience from upstream. systemd.services.docker = { description = "Docker Application Container Engine"; - wantedBy = optional (!cfg.socketActivation) "multi-user.target"; - after = [ "network.target" ] ++ (optional cfg.socketActivation "docker.socket") ; - requires = optional cfg.socketActivation "docker.socket"; + wantedBy = optional cfg.enableOnBoot "multi-user.target"; + after = [ "network.target" "docker.socket" ]; + requires = ["docker.socket"]; serviceConfig = { + # the default is not to use systemd for cgroups because the delegate issues still + # exists and systemd currently does not support the cgroup feature set required + # for containers run by docker ExecStart = ''${pkgs.docker}/bin/dockerd \ - --group=docker --log-driver=${cfg.logDriver} \ + --group=docker \ + --host=fd:// \ + --log-driver=${cfg.logDriver} \ ${optionalString (cfg.storageDriver != null) "--storage-driver=${cfg.storageDriver}"} \ - ${optionalString cfg.socketActivation "--host=fd://"} \ + ${optionalString cfg.liveRestore "--live-restore" } \ ${cfg.extraOptions} ''; - # I'm not sure if that limits aren't too high, but it's what - # goes in config bundled with docker itself + Type="notify"; + ExecReload="${pkgs.procps}/bin/kill -s HUP $MAINPID"; LimitNOFILE = 1048576; - LimitNPROC = 1048576; + # Having non-zero Limit*s causes performance problems due to accounting overhead + # in the kernel. We recommend using cgroups to do container-local accounting. + LimitNPROC="infinity"; + LimitCORE="infinity"; + TasksMax="infinity"; + TimeoutStartSec=0; + # set delegate yes so that systemd does not reset the cgroups of docker containers + Delegate="yes"; + # kill only the docker process, not all processes in the cgroup + KillMode="process"; } // proxy_env; path = [ pkgs.kmod ] ++ (optional (cfg.storageDriver == "zfs") pkgs.zfs); - - postStart = if cfg.socketActivation then "" else cfg.postStart; - - # Presumably some containers are running we don't want to interrupt - restartIfChanged = false; }; - } - (mkIf cfg.socketActivation { systemd.sockets.docker = { description = "Docker Socket for the API"; wantedBy = [ "sockets.target" ]; socketConfig = { - ListenStream = "/var/run/docker.sock"; + ListenStream = cfg.listenOptions; SocketMode = "0660"; SocketUser = "root"; SocketGroup = "docker"; }; }; - }) + } ]); } diff --git a/nixos/tests/docker-registry.nix b/nixos/tests/docker-registry.nix index df24686aba8..109fca440e5 100644 --- a/nixos/tests/docker-registry.nix +++ b/nixos/tests/docker-registry.nix @@ -16,13 +16,11 @@ import ./make-test.nix ({ pkgs, ...} : { client1 = { config, pkgs, ...}: { virtualisation.docker.enable = true; - virtualisation.docker.socketActivation = false; virtualisation.docker.extraOptions = "--insecure-registry registry:8080"; }; client2 = { config, pkgs, ...}: { virtualisation.docker.enable = true; - virtualisation.docker.socketActivation = false; virtualisation.docker.extraOptions = "--insecure-registry registry:8080"; }; }; From be07d4304e760fefb91104eaebea6350ebae5489 Mon Sep 17 00:00:00 2001 From: mimadrid Date: Fri, 23 Dec 2016 23:23:10 +0100 Subject: [PATCH 36/97] gexiv2: 0.10.3 -> 0.10.4 --- pkgs/desktops/gnome-3/3.22/misc/gexiv2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.22/misc/gexiv2/default.nix b/pkgs/desktops/gnome-3/3.22/misc/gexiv2/default.nix index 7cea9cd8d15..d27e10f104c 100644 --- a/pkgs/desktops/gnome-3/3.22/misc/gexiv2/default.nix +++ b/pkgs/desktops/gnome-3/3.22/misc/gexiv2/default.nix @@ -5,11 +5,11 @@ let in stdenv.mkDerivation rec { name = "gexiv2-${version}"; - version = "${majorVersion}.3"; + version = "${majorVersion}.4"; src = fetchurl { url = "mirror://gnome/sources/gexiv2/${majorVersion}/${name}.tar.xz"; - sha256 = "390cfb966197fa9f3f32200bc578d7c7f3560358c235e6419657206a362d3988"; + sha256 = "190www3b61spfgwx42jw8h5hsz2996jcxky48k63468avjpk33dd"; }; preConfigure = '' From 5e3c4b2bf70ff227ffb5c05a3005c7ac390c672e Mon Sep 17 00:00:00 2001 From: mimadrid Date: Fri, 23 Dec 2016 23:24:36 +0100 Subject: [PATCH 37/97] shotwell: 0.23.5 -> 0.25.2 --- pkgs/applications/graphics/shotwell/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 3f9fd132c09..ca74cd1a4aa 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { version = "${major}.${minor}"; - major = "0.23"; - minor = "5"; + major = "0.25"; + minor = "2"; name = "shotwell-${version}"; src = fetchurl { url = "mirror://gnome/sources/shotwell/${major}/${name}.tar.xz"; - sha256 = "0fgs1rgvkmy79bmpxrsvm5w8rvqml4l1vnwma0xqx5zzm02p8a07"; + sha256 = "1bih5hr3pvpkx3fck55bnhngn4fl92ryjizc34wb8pwigbkxnaj1"; }; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { pkgconfig gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee which udev libgudev gnome3.gexiv2 hicolor_icon_theme libraw json_glib gettext desktop_file_utils glib lcms2 gdk_pixbuf librsvg - wrapGAppsHook gnome_doc_utils gnome3.rest + wrapGAppsHook gnome_doc_utils gnome3.rest gnome3.gcr gnome3.defaultIconTheme itstool ]; meta = with stdenv.lib; { From e08f7afc62cbfe038ce5a5bcc9789c76a6548825 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Fri, 23 Dec 2016 23:44:45 +0100 Subject: [PATCH 38/97] pypi2nix: 1.5.0 -> 1.6.0 --- pkgs/development/tools/pypi2nix/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/pypi2nix/default.nix b/pkgs/development/tools/pypi2nix/default.nix index 229d680f835..1e6b6690e71 100644 --- a/pkgs/development/tools/pypi2nix/default.nix +++ b/pkgs/development/tools/pypi2nix/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, python, zip, makeWrapper +{ stdenv, fetchurl, python, zip, makeWrapper, nix, nix-prefetch-scripts }: let - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { url = "https://github.com/garbas/pypi2nix/archive/v${version}.tar.gz"; - sha256 = "0s79pp7gkgyk7discnv94m6z81fd67p66rdbd4cwk1ma0qljlh2k"; + sha256 = "08iad1ad2gnvsnd66ddw3lff19ms2yly4iq63c8800j603d0pdhn"; }; click = fetchurl { @@ -16,8 +16,8 @@ let }; requests = fetchurl { - url = "https://pypi.python.org/packages/2e/ad/e627446492cc374c284e82381215dcd9a0a87c4f6e90e9789afefe6da0ad/requests-2.11.1.tar.gz"; - sha256 = "0cx1w7m4cpslxz9jljxv0l9892ygrrckkiwpp2hangr8b01rikss"; + url = "https://pypi.python.org/packages/5b/0b/34be574b1ec997247796e5d516f3a6b6509c4e064f2885a96ed885ce7579/requests-2.12.4.tar.gz"; + sha256 = "0d5fwxmw4ibynk3imph3n4n84m0n3ib1vj339fxhkqri0qd4767d"; }; in stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { click requests ]; - buildInputs = [ python zip makeWrapper ]; + buildInputs = [ python zip makeWrapper nix.out nix-prefetch-scripts ]; sourceRoot = "."; postUnpack = '' @@ -45,6 +45,11 @@ in stdenv.mkDerivation rec { fi ''; + patchPhase = '' + sed -i -e "s|default='nix-shell',|default='${nix.out}/bin/nix-shell',|" $out/pkgs/pypi2nix/cli.py + sed -i -e "s|nix-prefetch-git|${nix-prefetch-scripts}/bin/nix-prefetch-git|" $out/pkgs/pypi2nix/stage2.py + ''; + commonPhase = '' mkdir -p $out/bin From 5bb75ae0126737d1794c0f13b0a1e1c392541a73 Mon Sep 17 00:00:00 2001 From: mimadrid Date: Fri, 23 Dec 2016 22:44:18 +0100 Subject: [PATCH 39/97] parallel: 20161122 -> 20161222 --- pkgs/tools/misc/parallel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 4bc346d41f8..99a933b3243 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20161122"; + name = "parallel-20161222"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "0z5c4r35d926ac04ilaivx67cmflr1rsvmjb2ci7hmab948m0ng2"; + sha256 = "1chgr3csyc7hbq2wq4jnwnbsr3ix8rzsk2lf4vdnvkjpd6dvw517"; }; nativeBuildInputs = [ makeWrapper ]; From 25c984f940c1080f1da6873ce9dd2d2dede2fda7 Mon Sep 17 00:00:00 2001 From: mimadrid Date: Fri, 23 Dec 2016 22:26:44 +0100 Subject: [PATCH 40/97] htslib: 1.3.1 -> 1.3.2 --- pkgs/development/libraries/science/biology/htslib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/biology/htslib/default.nix b/pkgs/development/libraries/science/biology/htslib/default.nix index 2609861e319..29fb338c838 100644 --- a/pkgs/development/libraries/science/biology/htslib/default.nix +++ b/pkgs/development/libraries/science/biology/htslib/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "htslib"; - version = "1.3.1"; + version = "1.3.2"; src = fetchurl { url = "https://github.com/samtools/${pname}/releases/download/${version}/${name}.tar.bz2"; - sha256 = "49d53a2395b8cef7d1d11270a09de888df8ba06f70fe68282e8235ee04124ae6"; + sha256 = "0iq3blw23s55vkr1z88p9y2dqrb2dybzhl6hz2nlk53ncihrxcdr"; }; buildInputs = [ zlib ]; From 29cb10c0217c0e72cabbe2c43b93ea57ef9a1558 Mon Sep 17 00:00:00 2001 From: mimadrid Date: Fri, 23 Dec 2016 22:15:59 +0100 Subject: [PATCH 41/97] igv: 2.3.77 -> 2.3.89 --- pkgs/applications/science/biology/igv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/applications/science/biology/igv/default.nix index 3d0f7154e0e..3acf7d96527 100644 --- a/pkgs/applications/science/biology/igv/default.nix +++ b/pkgs/applications/science/biology/igv/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "igv-${version}"; - version = "2.3.77"; + version = "2.3.89"; src = fetchurl { url = "http://data.broadinstitute.org/igv/projects/downloads/IGV_${version}.zip"; - sha256 = "9d8c622649f9f02026e92fa44006bb57e897baad4359c8708ca9cdbb71f94bb5"; + sha256 = "06bmj9jsnk5010ipv0w4qlcvgw67dy8hsvgcx9l74v3s0zp5di3y"; }; buildInputs = [ unzip jre ]; From c4f46949a6b0c14182ff91c5705aab91d1b2c562 Mon Sep 17 00:00:00 2001 From: mimadrid Date: Fri, 23 Dec 2016 21:45:53 +0100 Subject: [PATCH 42/97] sudo: 1.8.18p1 -> 1.8.19p1 --- pkgs/tools/security/sudo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index b430fd8aad0..f2fede456d1 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - name = "sudo-1.8.18p1"; + name = "sudo-1.8.19p1"; src = fetchurl { urls = [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz" "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz" ]; - sha256 = "0d4l6y03khmzdd8vhfnq8lrb8gcxplzf7gav0a9sd08jf8f4g875"; + sha256 = "14pwdwl03kdbbyjkvxrfx409x3c1fjqz8aqz2wgwddinhz7v3bxq"; }; configureFlags = [ From 324a115747ade5e7a3fa932d453ba49cbc1c48df Mon Sep 17 00:00:00 2001 From: Sophie Taylor Date: Wed, 21 Dec 2016 13:58:45 +1000 Subject: [PATCH 43/97] libssh2: 1.7.0 -> 1.8.0 --- pkgs/development/libraries/libssh2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix index 89e402d2416..0e53d27c889 100644 --- a/pkgs/development/libraries/libssh2/default.nix +++ b/pkgs/development/libraries/libssh2/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurlBoot, openssl, zlib, windows}: stdenv.mkDerivation rec { - name = "libssh2-1.7.0"; + name = "libssh2-1.8.0"; src = fetchurlBoot { url = "${meta.homepage}/download/${name}.tar.gz"; - sha256 = "116mh112w48vv9k3f15ggp5kxw5sj4b88dzb5j69llsh7ba1ymp4"; + sha256 = "1m3n8spv79qhjq4yi0wgly5s5rc8783jb1pyra9bkx1md0plxwrr"; }; outputs = [ "out" "dev" "devdoc" ]; From c4236f65b9319fe176103c3ba65ed5c9c3228103 Mon Sep 17 00:00:00 2001 From: Alex Ivanov Date: Fri, 23 Dec 2016 23:41:41 +0300 Subject: [PATCH 44/97] qmmp: 1.1.2 -> 1.1.5 --- pkgs/applications/audio/qmmp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index 7bb8a591612..b28f66aaad7 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -29,11 +29,11 @@ # handle that. stdenv.mkDerivation rec { - name = "qmmp-1.1.2"; + name = "qmmp-1.1.5"; src = fetchurl { url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2"; - sha256 = "023gvgchk6ybkz3miy0z08j9n5awz5cjvav7fqjdmpix4sivhn5q"; + sha256 = "1gfx6nm9v6qrx58gxib6grfhb45mnib1n4wdsnjq16br6bs8h4lv"; }; buildInputs = From 8ba53ffa1622695fe02626704b3991600167a267 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 24 Dec 2016 11:48:07 +0100 Subject: [PATCH 45/97] switch more packages back to boost-1.60 They don't build with 1.62. --- pkgs/top-level/all-packages.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77164a08bbc..d2e46a84a05 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1804,16 +1804,16 @@ in gawp = callPackage ../tools/misc/gawp { }; - gazeboSimulator = recurseIntoAttrs { + gazeboSimulator = recurseIntoAttrs rec { sdformat = gazeboSimulator.sdformat4; sdformat3 = callPackage ../development/libraries/sdformat/3.nix { }; sdformat4 = callPackage ../development/libraries/sdformat { }; - gazebo6 = callPackage ../applications/science/robotics/gazebo/6.nix { }; + gazebo6 = callPackage ../applications/science/robotics/gazebo/6.nix { boost = boost160; }; - gazebo6-headless = callPackage ../applications/science/robotics/gazebo/6.nix { withHeadless = true; }; + gazebo6-headless = gazebo6.override { withHeadless = true; }; gazebo7 = callPackage ../applications/science/robotics/gazebo { }; @@ -4959,7 +4959,9 @@ in hxcpp = callPackage ../development/compilers/haxe/hxcpp.nix { }; - hhvm = callPackage ../development/compilers/hhvm { }; + hhvm = callPackage ../development/compilers/hhvm { + boost = boost160; + }; hop = callPackage ../development/compilers/hop { }; @@ -16938,6 +16940,7 @@ in kicad = callPackage ../applications/science/electronics/kicad { wxGTK = wxGTK30; + boost = boost160; }; ngspice = callPackage ../applications/science/electronics/ngspice { }; From 65830800bdaac91eae965d16df4473fc2a698fca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 24 Dec 2016 11:52:04 +0100 Subject: [PATCH 46/97] Revert "libssh2: 1.7.0 -> 1.8.0" This reverts commit 324a115747ade5e7a3fa932d453ba49cbc1c48df. Moving to staging. I'm sorry, I pushed this by accident. --- pkgs/development/libraries/libssh2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix index 0e53d27c889..89e402d2416 100644 --- a/pkgs/development/libraries/libssh2/default.nix +++ b/pkgs/development/libraries/libssh2/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurlBoot, openssl, zlib, windows}: stdenv.mkDerivation rec { - name = "libssh2-1.8.0"; + name = "libssh2-1.7.0"; src = fetchurlBoot { url = "${meta.homepage}/download/${name}.tar.gz"; - sha256 = "1m3n8spv79qhjq4yi0wgly5s5rc8783jb1pyra9bkx1md0plxwrr"; + sha256 = "116mh112w48vv9k3f15ggp5kxw5sj4b88dzb5j69llsh7ba1ymp4"; }; outputs = [ "out" "dev" "devdoc" ]; From 7fda8db89153207ba22829f2c47108b28228f48c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 24 Dec 2016 13:36:04 +0100 Subject: [PATCH 47/97] borgbackup: 1.0.8 -> 1.0.9 (security fixes) And bug fixes. Changelog: https://github.com/borgbackup/borg/blob/1.0.9/docs/changes.rst#version-109-2016-12-20 --- pkgs/tools/backup/borg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index 09821b01700..09c2dddd515 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -2,18 +2,18 @@ python3Packages.buildPythonApplication rec { name = "borgbackup-${version}"; - version = "1.0.8"; + version = "1.0.9"; namePrefix = ""; src = fetchurl { url = "https://github.com/borgbackup/borg/releases/download/" + "${version}/${name}.tar.gz"; - sha256 = "1fdfi0yzzdrrlml6780n4fh61sqm7pw6fcd1y67kfkvw8hy5c0k9"; + sha256 = "1ciwp9yilcibk0x82y5nn8ps95jrm8rxvff8mjrlp7a2w100i1im"; }; nativeBuildInputs = with python3Packages; [ # For building documentation: - sphinx + sphinx sphinx_rtd_theme ]; propagatedBuildInputs = [ acl lz4 openssl From c98f3ffea867f31d1781ba7a4e3fd93a2780db0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 24 Dec 2016 13:47:05 +0100 Subject: [PATCH 48/97] wireguard: 0.0.20161218 -> 0.0.20161223 --- pkgs/os-specific/linux/wireguard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index b164530938e..06b012fa434 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "4.1"; let name = "wireguard-${version}"; - version = "0.0.20161218"; + version = "0.0.20161223"; src = fetchurl { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "d805035d3e99768e69d8cdeb8fb5250a59b994ce127fceb71a078582c30f5597"; + sha256 = "0wmrsap34nd1x4gvz80isgsjjxbplvkrxnw56qlaqxkycvv8zndv"; }; meta = with stdenv.lib; { From 591eda8310905e78b16b4224eb677056c68889e3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 24 Dec 2016 16:00:31 +0100 Subject: [PATCH 49/97] python27: 2.7.12 -> 2.7.13 --- .../python/cpython/2.7/default.nix | 11 +---- .../python/cpython/2.7/no-ldconfig.patch | 44 +++++++++++++------ 2 files changed, 33 insertions(+), 22 deletions(-) diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 4a25382997c..5842f6fb309 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -28,7 +28,7 @@ with stdenv.lib; let majorVersion = "2.7"; - minorVersion = "12"; + minorVersion = "13"; minorVersionSuffix = ""; pythonVersion = majorVersion; version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; @@ -37,7 +37,7 @@ let src = fetchurl { url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; - sha256 = "0y7rl603vmwlxm6ilkhc51rx2mfj14ckcz40xxgs0ljnvlhp30yp"; + sha256 = "0cgpk3zk0fgpji59pb4zy9nzljr70qzgv1vpz5hq5xw2d2c47m9m"; }; hasDistutilsCxxPatch = !(stdenv.cc.isGNU or false); @@ -57,13 +57,6 @@ let ./properly-detect-curses.patch - # FIXME: get rid of this after the next release, when the commit referenced here makes - # it in. We need it until then because it breaks compilation of programs that use - # locale with clang 3.8 and higher. - (fetchpatch { - url = "https://hg.python.org/cpython/raw-rev/e0ec3471cb09"; - sha256 = "1jdgb70jw942r4kmr01qll7mk1di8jx0qiabmp20jhnmha246ivq"; - }) ] ++ optionals stdenv.isLinux [ # Disable the use of ldconfig in ctypes.util.find_library (since diff --git a/pkgs/development/interpreters/python/cpython/2.7/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/2.7/no-ldconfig.patch index 44c38fb2953..2a6b2a20dd1 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/no-ldconfig.patch +++ b/pkgs/development/interpreters/python/cpython/2.7/no-ldconfig.patch @@ -1,8 +1,18 @@ +From 6b0f329a9f37110020ca02b35c8125391ef282b7 Mon Sep 17 00:00:00 2001 +From: Frederik Rietdijk +Date: Sat, 24 Dec 2016 15:56:10 +0100 +Subject: [PATCH] no ldconfig + +--- + Lib/ctypes/util.py | 35 +---------------------------------- + Lib/uuid.py | 47 ----------------------------------------------- + 2 files changed, 1 insertion(+), 81 deletions(-) + diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py -index b2c514d..a6eca81 100644 +index ab10ec5..f253e34 100644 --- a/Lib/ctypes/util.py +++ b/Lib/ctypes/util.py -@@ -207,31 +207,7 @@ elif os.name == "posix": +@@ -235,40 +235,7 @@ elif os.name == "posix": else: def _findSoname_ldconfig(name): @@ -22,11 +32,20 @@ index b2c514d..a6eca81 100644 - - # XXX assuming GLIBC's ldconfig (with option -p) - expr = r'\s+(lib%s\.[^\s]+)\s+\(%s' % (re.escape(name), abi_type) -- f = os.popen('LC_ALL=C LANG=C /sbin/ldconfig -p 2>/dev/null') +- +- env = dict(os.environ) +- env['LC_ALL'] = 'C' +- env['LANG'] = 'C' +- null = open(os.devnull, 'wb') - try: -- data = f.read() -- finally: -- f.close() +- with null: +- p = subprocess.Popen(['/sbin/ldconfig', '-p'], +- stderr=null, +- stdout=subprocess.PIPE, +- env=env) +- except OSError: # E.g. command not found +- return None +- [data, _] = p.communicate() - res = re.search(expr, data) - if not res: - return None @@ -36,16 +55,12 @@ index b2c514d..a6eca81 100644 def find_library(name): return _findSoname_ldconfig(name) or _get_soname(_findLib_gcc(name)) diff --git a/Lib/uuid.py b/Lib/uuid.py -index 7432032..9829d18 100644 +index 7432032..05eeee5 100644 --- a/Lib/uuid.py +++ b/Lib/uuid.py -@@ -437,57 +437,7 @@ def _netbios_getnode(): - return ((bytes[0]<<40L) + (bytes[1]<<32L) + (bytes[2]<<24L) + - (bytes[3]<<16L) + (bytes[4]<<8L) + bytes[5]) +@@ -441,53 +441,6 @@ def _netbios_getnode(): --# Thanks to Thomas Heller for ctypes and for his help with its use here. -- --# If ctypes is available, use it to find system routines for UUID generation. + # If ctypes is available, use it to find system routines for UUID generation. _uuid_generate_time = _UuidCreate = None -try: - import ctypes, ctypes.util @@ -97,3 +112,6 @@ index 7432032..9829d18 100644 def _unixdll_getnode(): """Get the hardware address on Unix using ctypes.""" +-- +2.11.0 + From b09000e78581f84dff696a7b5296b50ec2c8888c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 24 Dec 2016 16:00:52 +0100 Subject: [PATCH 50/97] python36: 3.6.0rc1 -> 3.6.0 --- pkgs/development/interpreters/python/cpython/3.6/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix index 4654a6e1cb6..8892b0f5c71 100644 --- a/pkgs/development/interpreters/python/cpython/3.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix @@ -25,7 +25,7 @@ with stdenv.lib; let majorVersion = "3.6"; minorVersion = "0"; - minorVersionSuffix = "rc1"; + minorVersionSuffix = ""; pythonVersion = majorVersion; version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; libPrefix = "python${majorVersion}"; @@ -45,7 +45,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; - sha256 = "01sqzz5iq7law93zgdxkb8sv98a493a2wzslynz64cl3hhdqr1pw"; + sha256 = "08inlbb2vb8lahw6wfq654lqk6l1x7ncpggp6a92vqw5yq2gkidh"; }; NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s"; From b87a59bc69c33eca12a2e27fc28cde9538558abf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 Dec 2016 12:34:48 +0100 Subject: [PATCH 51/97] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.0.4 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/4ecc7e6432641e3e44a836d24118e16799e77025. --- .../haskell-modules/hackage-packages.nix | 793 ++++++++++++++---- 1 file changed, 625 insertions(+), 168 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 1bdf1256369..7784f79b830 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -726,35 +726,33 @@ self: { maintainers = with stdenv.lib.maintainers; [ abbradar ]; }) {inherit (pkgs) emacs;}; - "Agda_2_5_1_2" = callPackage + "Agda_2_5_2" = callPackage ({ mkDerivation, alex, array, base, binary, boxes, bytestring - , containers, cpphs, data-hash, deepseq, directory, EdisonAPI - , EdisonCore, edit-distance, emacs, equivalence, filemanip - , filepath, geniplate-mirror, happy, hashable, hashtables - , haskeline, haskell-src-exts, monadplus, mtl, parallel, pretty - , process, QuickCheck, strict, template-haskell, text, time - , transformers, transformers-compat, unordered-containers, xhtml - , zlib + , 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 { pname = "Agda"; - version = "2.5.1.2"; - sha256 = "fb272bd6f7d532320c669b96faa85088b37bae02d906e9a9f764bc8e8639fb5e"; + version = "2.5.2"; + sha256 = "d812cec3bf7f03c4b27248572475c7e060154102771a8434cc11ba89f5691439"; + revision = "1"; + editedCabalFile = "44f0f96c5d26202f964c575e5f94fe52686f4b889078ddfdafef0c6fd2571b47"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base binary boxes bytestring containers data-hash deepseq - directory EdisonAPI EdisonCore edit-distance equivalence filepath - geniplate-mirror hashable hashtables haskeline haskell-src-exts - monadplus mtl parallel pretty process QuickCheck strict + 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 ]; libraryToolDepends = [ alex cpphs happy ]; - executableHaskellDepends = [ - base binary containers directory filemanip filepath - haskell-src-exts mtl process - ]; + executableHaskellDepends = [ base directory filepath process ]; executableToolDepends = [ emacs ]; postInstall = '' files=("$out/share/"*"-ghc-"*"/Agda-"*"/lib/prim/Agda/"{Primitive.agda,Builtin"/"*.agda}) @@ -1388,6 +1386,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "BioHMM" = callPackage + ({ mkDerivation, base, colour, diagrams-cairo, diagrams-lib + , directory, either-unwrap, filepath, parsec, ParsecTools + , StockholmAlignment, SVGFonts, text, vector + }: + mkDerivation { + pname = "BioHMM"; + version = "1.0.1"; + sha256 = "b20fbbd9e38b9f764a9152aa123bbf7296b4be361bddfc7e1bbe833d439f9c20"; + libraryHaskellDepends = [ + base colour diagrams-cairo diagrams-lib directory either-unwrap + filepath parsec ParsecTools StockholmAlignment SVGFonts text vector + ]; + description = "Libary containing parsing and visualisation functions and datastructures for Hidden Markov Models in HMMER3 format"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "Biobase" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq , directory, either-unwrap, file-embed, filemanip, filepath @@ -16061,6 +16076,23 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "StockholmAlignment" = callPackage + ({ mkDerivation, base, colour, diagrams-cairo, diagrams-lib + , directory, either-unwrap, filepath, parsec, ParsecTools, SVGFonts + , text, vector + }: + mkDerivation { + pname = "StockholmAlignment"; + version = "1.0.0"; + sha256 = "0b1234009521e37f69d734391138bec11c7c3d2df2496c939268fbff2cb1c86b"; + libraryHaskellDepends = [ + base colour diagrams-cairo diagrams-lib directory either-unwrap + filepath parsec ParsecTools SVGFonts text vector + ]; + description = "Libary for Stockholm aligmnent format"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "Stomp" = callPackage ({ mkDerivation, base, binary, bytestring, network, time , utf8-string @@ -24252,6 +24284,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "amazonka-s3-streaming" = callPackage + ({ mkDerivation, amazonka, amazonka-core, amazonka-s3, base + , bytestring, conduit, conduit-extra, dlist, exceptions, lens + , lifted-async, mmap, mmorph, mtl, resourcet, text + }: + mkDerivation { + pname = "amazonka-s3-streaming"; + version = "0.1.0.4"; + sha256 = "ecd0dfe5b024a326e96224ba6f406b44f1279eaef4d44904167a8f5a1f3d881d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + amazonka amazonka-core amazonka-s3 base bytestring conduit dlist + exceptions lens lifted-async mmap mmorph mtl resourcet + ]; + executableHaskellDepends = [ + amazonka amazonka-core amazonka-s3 base bytestring conduit + conduit-extra text + ]; + homepage = "https://github.com/Axman6/amazonka-s3-streaming#readme"; + description = "Provides conduits to upload data to S3 using the Multipart API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "amazonka-sdb" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers @@ -25250,6 +25306,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "anonymous-sums_0_6_0_0" = callPackage + ({ mkDerivation, base, lens, template-haskell }: + mkDerivation { + pname = "anonymous-sums"; + version = "0.6.0.0"; + sha256 = "c7c5c13cb19ce97fdb621794cd1de7e34ab7aba8bdc5bcc9309107b1ff3ec2ad"; + libraryHaskellDepends = [ base lens template-haskell ]; + homepage = "http://www.github.com/massysett/anonymous-sums"; + description = "Anonymous sum types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "anonymous-sums-tests" = callPackage ({ mkDerivation, anonymous-sums, base, QuickCheck }: mkDerivation { @@ -25983,8 +26052,8 @@ self: { ({ mkDerivation, aeson, base, bytestring, lens, wreq }: mkDerivation { pname = "apioiaf-client"; - version = "0.1.0.0"; - sha256 = "8493248ae0d1303afba5f600e7c38fb29b6811d2348f994af056413a3ebbd0ff"; + version = "0.2.1.0"; + sha256 = "15561082ee74c3a64786347f9d8206896b70b1d3475e9dfa0318e2ed84703c6a"; libraryHaskellDepends = [ aeson base bytestring lens wreq ]; testHaskellDepends = [ base ]; homepage = "https://github.com/kberger/anapioficeandfire-haskell#readme"; @@ -28601,8 +28670,8 @@ self: { pname = "avers"; version = "0.0.17.0"; sha256 = "3e6b4a39ccb99373a1a574625b86d4948f4ba4a747652e3c5ddd8d8b09fe212d"; - revision = "1"; - editedCabalFile = "76f5fea6b94a6dd6041577fd29de245130f3003c73296a94baea62f066b9b474"; + revision = "3"; + editedCabalFile = "dd1745f57f0636a5932c361e931feec895221ae612acc37eaf2d819f349c75ae"; libraryHaskellDepends = [ aeson attoparsec base bytestring clock containers cryptonite filepath inflections memory MonadRandom mtl network network-uri @@ -28669,8 +28738,8 @@ self: { pname = "avers-server"; version = "0.0.17.0"; sha256 = "6da0c28f2b75989805cb4c2c7bf10b1b6ac4211f310d2bb902a4a7725ce05c3c"; - revision = "1"; - editedCabalFile = "8fb371992bc5535a3d923ec6e16e975ac3d5efaadbb1ae8d4e08400b318f92dc"; + revision = "3"; + editedCabalFile = "025cc10ba6aa604876978781fcfbffbce27867d9155257411a7a40d4c4687988"; libraryHaskellDepends = [ aeson avers avers-api base base64-bytestring bytestring bytestring-conversion containers cookie cryptonite either @@ -28824,6 +28893,42 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "aws_0_15" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base16-bytestring + , base64-bytestring, blaze-builder, byteable, bytestring + , case-insensitive, cereal, conduit, conduit-extra, containers + , cryptohash, data-default, directory, errors, filepath + , http-client, http-client-tls, http-conduit, http-types + , lifted-base, monad-control, mtl, network, old-locale, QuickCheck + , quickcheck-instances, resourcet, safe, scientific, tagged, tasty + , tasty-hunit, tasty-quickcheck, text, time, transformers + , transformers-base, unordered-containers, utf8-string, vector + , xml-conduit + }: + mkDerivation { + pname = "aws"; + version = "0.15"; + sha256 = "53c73595bddd5614d980486a380d4ce83c100fd25b5fa35d477609f1bd03b11b"; + libraryHaskellDepends = [ + aeson attoparsec base base16-bytestring base64-bytestring + blaze-builder byteable bytestring case-insensitive cereal conduit + conduit-extra containers cryptohash data-default directory filepath + http-conduit http-types lifted-base monad-control mtl network + old-locale resourcet safe scientific tagged text time transformers + unordered-containers utf8-string vector xml-conduit + ]; + testHaskellDepends = [ + aeson base bytestring errors http-client http-client-tls http-types + lifted-base monad-control mtl QuickCheck quickcheck-instances + resourcet tagged tasty tasty-hunit tasty-quickcheck text time + transformers transformers-base + ]; + homepage = "http://github.com/aristidb/aws"; + description = "Amazon Web Services (AWS) for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aws-cloudfront-signer" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, base64-bytestring , bytestring, crypto-pubkey-types, RSA, time @@ -34286,18 +34391,23 @@ self: { "bolt" = callPackage ({ mkDerivation, base, bifunctors, bytestring, cereal, containers - , hashable, network, network-uri, scientific, text, transformers - , unordered-containers, vector + , hashable, network, network-uri, scientific, tasty + , tasty-quickcheck, text, transformers, unordered-containers + , vector }: mkDerivation { pname = "bolt"; - version = "0.2.0.0"; - sha256 = "2a066c5e24a707c7fb418b34c01b7dc0f47b084eb621baefa3a79afe03640e12"; + version = "0.2.2.0"; + sha256 = "07d04b418f1106f4fb4e11f8466d18121f7d63d162e86389a69a58f23270339b"; libraryHaskellDepends = [ base bifunctors bytestring cereal containers hashable network network-uri scientific text transformers unordered-containers vector ]; + testHaskellDepends = [ + base bytestring cereal tasty tasty-quickcheck text + unordered-containers vector + ]; homepage = "https://github.com/bflyblue/bolt#readme"; description = "Bolt driver for Neo4j"; license = stdenv.lib.licenses.bsd3; @@ -34618,8 +34728,8 @@ self: { ({ mkDerivation, base, gtk, transformers, X11 }: mkDerivation { pname = "boring-window-switcher"; - version = "0.1.0.1"; - sha256 = "4d966b56d3a6badb666c8947df23557db9544e469514d0a5b68934c644f5645b"; + version = "0.1.0.2"; + sha256 = "e7e568de0b410fd878c6cd6ce9eae66f51e3e98c83090ad5dec23b5738c9721f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base gtk transformers X11 ]; @@ -35172,9 +35282,9 @@ self: { "buchhaltung" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, array, async, base, boxes - , bytestring, Cabal, cassava, containers, data-default, Decimal - , deepseq, directory, edit-distance, file-embed, filepath - , formatting, hashable, haskeline, hint, hledger, hledger-lib, lens + , bytestring, cassava, containers, data-default, Decimal, deepseq + , directory, edit-distance, file-embed, filepath, formatting + , hashable, haskeline, hint, hledger, hledger-lib, lens , lifted-base, ListLike, megaparsec, MissingH, monad-control, mtl , optparse-applicative, parsec, process, regex-compat, regex-tdfa , regex-tdfa-text, safe, semigroups, split, strict, temporary, text @@ -35182,11 +35292,10 @@ self: { }: mkDerivation { pname = "buchhaltung"; - version = "0.0.1"; - sha256 = "fd2dd47210a9d7200c0d4259646963b6bc848ff656255b66b14648b949dec70f"; + version = "0.0.3"; + sha256 = "6ba38b02094431f1f24e698eed4b4dc3c0169f2154d2b66a584c16162c4cf276"; isLibrary = false; isExecutable = true; - setupHaskellDepends = [ base Cabal ]; executableHaskellDepends = [ aeson ansi-wl-pprint array async base boxes bytestring cassava containers data-default Decimal deepseq directory edit-distance @@ -39940,6 +40049,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "choice" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "choice"; + version = "0.1.1.0"; + sha256 = "96245c66c3e2dd48aec6b9bba3198b336d4d111b10781e53c544b43b98c1a989"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/mboes/choice#readme"; + description = "A solution to boolean blindness"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "choose" = callPackage ({ mkDerivation, base, MonadRandom }: mkDerivation { @@ -41671,8 +41792,10 @@ self: { }: mkDerivation { pname = "clit"; - version = "0.1.1.1"; - sha256 = "bb2be5226f6659b709b87ebe593c7c1a2b9447d2b681dc9c97130254ba4e4a61"; + version = "0.1.1.2"; + sha256 = "5daac994e7e122d6e009cfbb8e87c9a6134c7157256d2c64dfb87d8b83503367"; + revision = "1"; + editedCabalFile = "a00ced1d7dcc50bae6eae37b415f304271ee08bec06b3d15f7ec60fe927bdad8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -43900,8 +44023,8 @@ self: { }: mkDerivation { pname = "concurrent-machines"; - version = "0.2.3.1"; - sha256 = "6d67692d241a0e160ace89ecd8bbb2e28cc90651c7d9996f6686de7856731eee"; + version = "0.2.3.3"; + sha256 = "e5204231e35181e56b9313f6dbe83d531b3f6c3f6dfbe3a1c465e5b6b2a24924"; libraryHaskellDepends = [ async base containers lifted-async machines monad-control semigroups time transformers transformers-base @@ -47864,8 +47987,8 @@ self: { }: mkDerivation { pname = "cryptonite-openssl"; - version = "0.3"; - sha256 = "43c8f8b4259f103be4408734f604c55a0053e60d302890174ba4773828bdee26"; + version = "0.4"; + sha256 = "a8307454de4f85456660686815169d925cb90345f7ac016d0c5562c2755667ea"; libraryHaskellDepends = [ base bytestring cryptonite memory ]; librarySystemDepends = [ openssl ]; testHaskellDepends = [ @@ -51869,18 +51992,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "declarative_0_4_0" = callPackage - ({ mkDerivation, base, hasty-hamiltonian, lens, mcmc-types - , mighty-metropolis, mwc-probability, pipes, primitive + "declarative_0_5_1" = callPackage + ({ mkDerivation, base, hasty-hamiltonian, kan-extensions, lens + , mcmc-types, mighty-metropolis, mwc-probability, pipes, primitive , speedy-slice, transformers }: mkDerivation { pname = "declarative"; - version = "0.4.0"; - sha256 = "e771c452cbc7f91b67d078a87349de36182fc5e25a9185f18cff7346941c713c"; + version = "0.5.1"; + sha256 = "4ed591067e741682da3f319284dbf1d77c70bdf9d5c78e32575d5018d3f4c624"; libraryHaskellDepends = [ - base hasty-hamiltonian lens mcmc-types mighty-metropolis - mwc-probability pipes primitive speedy-slice transformers + base hasty-hamiltonian kan-extensions lens mcmc-types + mighty-metropolis mwc-probability pipes primitive speedy-slice + transformers ]; testHaskellDepends = [ base mwc-probability ]; homepage = "http://github.com/jtobin/declarative"; @@ -52504,6 +52628,19 @@ self: { license = "unknown"; }) {}; + "dependent-map_0_2_4_0" = callPackage + ({ mkDerivation, base, containers, dependent-sum }: + mkDerivation { + pname = "dependent-map"; + version = "0.2.4.0"; + sha256 = "5db396bdb5d156434af920c074316c3b84b4d39ba8e1cd349c7bb6679cb28246"; + libraryHaskellDepends = [ base containers dependent-sum ]; + homepage = "https://github.com/mokus0/dependent-map"; + description = "Dependent finite maps (partial dependent products)"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dependent-state" = callPackage ({ mkDerivation, base, lens, mtl, prologue }: mkDerivation { @@ -56151,22 +56288,23 @@ self: { }) {}; "dom-parser" = callPackage - ({ mkDerivation, base, data-default, hspec, lens, mtl, open-union - , semigroups, shakespeare, text, transformers, type-fun + ({ mkDerivation, base, containers, data-default, hspec, lens, mtl + , open-union, semigroups, shakespeare, text, transformers, type-fun , xml-conduit, xml-lens }: mkDerivation { pname = "dom-parser"; - version = "0.1.1"; - sha256 = "e001c486adb3b2c6c6ab18e70205dc759ea018b6db084f8668bb424b623e4e03"; + version = "1.0.0"; + sha256 = "6d48ca6cd564919af8574cc91c97f050f50747f358e159797895fd0517dc9583"; libraryHaskellDepends = [ - base lens mtl open-union semigroups shakespeare text transformers + base containers lens mtl open-union semigroups text transformers type-fun xml-conduit xml-lens ]; testHaskellDepends = [ base data-default hspec lens semigroups shakespeare text xml-conduit ]; + homepage = "https://github.com/typeable/dom-parser"; description = "Simple monadic DOM parser"; license = stdenv.lib.licenses.mit; }) {}; @@ -57872,6 +58010,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "echo" = callPackage + ({ mkDerivation, base, process }: + mkDerivation { + pname = "echo"; + version = "0.1"; + sha256 = "a7211a9da1fa10dc7d95e89d2c68dadf063b3826d81e42eb085df91c46353e4d"; + libraryHaskellDepends = [ base process ]; + homepage = "https://github.com/RyanGlScott/echo"; + description = "A cross-platform, cross-console way to handle echoing terminal input"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ecma262" = callPackage ({ mkDerivation, base, containers, data-default, lens, parsec, safe , transformers @@ -58301,20 +58451,20 @@ self: { "egison" = callPackage ({ mkDerivation, array, base, containers, directory, filepath, ghc - , ghc-paths, Glob, haskeline, HUnit, mtl, parsec, process, random - , regex-tdfa, test-framework, test-framework-hunit, text - , transformers, unordered-containers, vector + , ghc-paths, Glob, haskeline, HUnit, monad-parallel, mtl, parsec + , process, random, regex-tdfa, test-framework, test-framework-hunit + , text, transformers, unordered-containers, vector }: mkDerivation { pname = "egison"; - version = "3.6.3"; - sha256 = "178eebc1798fb6d1c2fceeb8f68c2b7cd87a25ff35db9274c2115e6b5100e6d5"; + version = "3.6.4"; + sha256 = "8900413b3f0e42c0907bec37dfd2ed0d2f6c618836ea6054615a786ff4fcf5f3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base containers directory ghc ghc-paths haskeline mtl parsec - process random regex-tdfa text transformers unordered-containers - vector + array base containers directory ghc ghc-paths haskeline + monad-parallel mtl parsec process random regex-tdfa text + transformers unordered-containers vector ]; executableHaskellDepends = [ array base containers directory filepath ghc ghc-paths haskeline @@ -62897,6 +63047,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "feed_0_3_12_0" = callPackage + ({ mkDerivation, base, HUnit, old-locale, old-time, test-framework + , test-framework-hunit, time, time-locale-compat, utf8-string, xml + }: + mkDerivation { + pname = "feed"; + version = "0.3.12.0"; + sha256 = "cc2d6a3b91027d75b91a0a4c0f83f2df68bee3ce0d7338ea5ae0bcab6dd47942"; + libraryHaskellDepends = [ + base old-locale old-time time time-locale-compat utf8-string xml + ]; + testHaskellDepends = [ + base HUnit old-locale old-time test-framework test-framework-hunit + time time-locale-compat utf8-string xml + ]; + homepage = "https://github.com/bergmark/feed"; + description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds."; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "feed-cli" = callPackage ({ mkDerivation, base, directory, feed, old-locale, old-time, time , xml @@ -64354,6 +64525,27 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {}; + "fixie" = callPackage + ({ mkDerivation, base, containers, data-default-class, either + , haskell-src-exts, haskell-src-meta, hspec, hspec-discover, mtl + , template-haskell, text, th-orphans, transformers + }: + mkDerivation { + pname = "fixie"; + version = "1.0.0"; + sha256 = "b016c231a391816d4dca407f06e64b87d1c29b55fddcae9e0fc28df942bc4f6d"; + libraryHaskellDepends = [ + base containers data-default-class either haskell-src-exts + haskell-src-meta mtl template-haskell text th-orphans + ]; + testHaskellDepends = [ + base hspec hspec-discover mtl template-haskell transformers + ]; + homepage = "http://github.com/jxv/fixie#readme"; + description = "Opininated testing framework for mtl style (spies, stubs, and mocks)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fixplate" = callPackage ({ mkDerivation, base, containers, QuickCheck, tasty , tasty-quickcheck @@ -69483,8 +69675,8 @@ self: { }: mkDerivation { pname = "ghc-prof"; - version = "1.0.1"; - sha256 = "3949eb1542f92ed99b38d4f2eb3efb6161fe3250a778b71e638af52463c23de4"; + version = "1.2.0"; + sha256 = "fcc0d06e75b6b753b9edec96cda46a4b67138a7ddd489da55dd351f475c08810"; libraryHaskellDepends = [ attoparsec base containers scientific text time ]; @@ -71421,6 +71613,7 @@ self: { homepage = "https://github.com/ElastiLotem/git-mediate"; description = "Remove trivial conflict markers in a git repository"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "git-monitor" = callPackage @@ -73985,6 +74178,8 @@ self: { pname = "gogol-core"; version = "0.1.1"; sha256 = "8f6c7dee658281c5d006c5ec4b475665544989c4d9141737e040857e15f3d483"; + revision = "1"; + editedCabalFile = "54bcd3f073a1f1d76726446c4efb96c8b573c3020ffbf6296313c9f6f76d1436"; libraryHaskellDepends = [ aeson attoparsec base bifunctors bytestring case-insensitive conduit dlist exceptions hashable http-api-data http-client @@ -79211,6 +79406,8 @@ self: { pname = "hackage-security"; version = "0.5.2.2"; sha256 = "507a837851264a774c8f4d400f798c3dac5be11dc428fe72d33ef594ca533c41"; + revision = "1"; + editedCabalFile = "abb26d1da6e07e187a4494591154080415152787c2583c09acf522ab929b9642"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring Cabal containers cryptohash-sha256 directory ed25519 filepath ghc-prim @@ -85213,8 +85410,8 @@ self: { }: mkDerivation { pname = "hasql-optparse-applicative"; - version = "0.2"; - sha256 = "c006e033547c82b4986e8bbc09997f73bb5bb75a7e08e10fb29ba06117aaa42b"; + version = "0.2.1"; + sha256 = "170d8a1322866f048d5d05c19cd04f881bbaee0dc4a06a3503280c7a8491d5ea"; libraryHaskellDepends = [ base-prelude hasql hasql-pool optparse-applicative ]; @@ -85486,16 +85683,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hasty-hamiltonian_1_2_0" = callPackage - ({ mkDerivation, ad, base, lens, mcmc-types, mwc-probability, pipes - , primitive, transformers + "hasty-hamiltonian_1_3_0" = callPackage + ({ mkDerivation, ad, base, kan-extensions, lens, mcmc-types + , mwc-probability, pipes, primitive, transformers }: mkDerivation { pname = "hasty-hamiltonian"; - version = "1.2.0"; - sha256 = "602e6bff253cae2151b6c4eb8c81a19dc0a2525bf63bdbd5b12396358548cdda"; + version = "1.3.0"; + sha256 = "15f713bc72cda97a5efad2c75d38915f3b765966142710f069db72ff49eefb31"; libraryHaskellDepends = [ - base lens mcmc-types mwc-probability pipes primitive transformers + base kan-extensions lens mcmc-types mwc-probability pipes primitive + transformers ]; testHaskellDepends = [ ad base mwc-probability ]; homepage = "http://github.com/jtobin/hasty-hamiltonian"; @@ -86478,6 +86676,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hdevtools_0_1_5_0" = callPackage + ({ mkDerivation, base, Cabal, cmdargs, directory, filepath, ghc + , ghc-boot, ghc-paths, network, process, syb, time, transformers + , unix + }: + mkDerivation { + pname = "hdevtools"; + version = "0.1.5.0"; + sha256 = "ed81236f3809a367c5f4401905ae283f8de92cd5b26c0b8370586ab7690d04e7"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base Cabal cmdargs directory filepath ghc ghc-boot ghc-paths + network process syb time transformers unix + ]; + homepage = "https://github.com/hdevtools/hdevtools/"; + description = "Persistent GHC powered background server for FAST haskell development tools"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hdf" = callPackage ({ mkDerivation, base, directory, fgl, fgl-visualize, filepath , hosc, hsc3, murmur-hash, process, split, transformers @@ -87836,8 +88055,8 @@ self: { ({ mkDerivation, base, bytestring, extra }: mkDerivation { pname = "hexml"; - version = "0.2"; - sha256 = "4c14883bc7fd5e059e05a24d5daabacec295ee71fcf91e3fdd066e7993085a2a"; + version = "0.3"; + sha256 = "ace36d4b3a6ca44dad0b4c2f1ab008252acd281e4ff97c3b08c9af41cafb7386"; libraryHaskellDepends = [ base bytestring extra ]; testHaskellDepends = [ base bytestring ]; homepage = "https://github.com/ndmitchell/hexml#readme"; @@ -101003,8 +101222,8 @@ self: { }: mkDerivation { pname = "ideas"; - version = "1.5"; - sha256 = "81969d35319518e7c06d67fea99d106c5a8d86d61b889d64414476327fc95e84"; + version = "1.6"; + sha256 = "dea77dafcb95fb2cfab6218bb0b242829c6c90a540da33fd082967cda84a8476"; libraryHaskellDepends = [ base cgi containers Diff directory filepath parsec QuickCheck random time uniplate wl-pprint @@ -102470,6 +102689,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "indents_0_4_0_0" = callPackage + ({ mkDerivation, base, mtl, parsec, tasty, tasty-hunit }: + mkDerivation { + pname = "indents"; + version = "0.4.0.0"; + sha256 = "9478d3f8ea4dd412ffc56225c4727f295b81daffba408bf1e757b4b23859d495"; + libraryHaskellDepends = [ base mtl parsec ]; + testHaskellDepends = [ base mtl parsec tasty tasty-hunit ]; + homepage = "http://github.com/jaspervdj/indents"; + description = "indentation sensitive parser-combinators for parsec"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "index-core" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -105817,8 +106050,8 @@ self: { }: mkDerivation { pname = "jni"; - version = "0.1"; - sha256 = "1e9545909b89552fb3c65ae6454a40912bf31f2a66fe0d3dcbadfc2af21c255b"; + version = "0.2"; + sha256 = "f98f57417cc015219446f2439c543dc0accd45a4bfdd87004c4c5be1b0b862bf"; libraryHaskellDepends = [ base bytestring containers inline-c singletons thread-local-storage ]; @@ -106165,8 +106398,8 @@ self: { ({ mkDerivation, aeson, base, bytestring, jsaddle }: mkDerivation { pname = "jsaddle-wkwebview"; - version = "0.8.0.0"; - sha256 = "8770e3f9a452502d62025a142aaabc95ac759625fd56f4600217fc8d9ac69dd1"; + version = "0.8.1.0"; + sha256 = "10371cdff510c0229a34def4038e9d8e9e796d0a891b2a424b0e8a05b481d3a0"; libraryHaskellDepends = [ aeson base bytestring jsaddle ]; description = "Interface for JavaScript that works with GHCJS and GHC"; license = stdenv.lib.licenses.mit; @@ -107474,10 +107707,8 @@ self: { }: mkDerivation { pname = "kansas-lava"; - version = "0.2.4.3"; - sha256 = "3bf057340e4a1953e2eef099e26215cd99d4c595feab82cc43c6be1cbf2c5344"; - revision = "1"; - editedCabalFile = "7b1860125ab2958d3831cb2536a6b939879f09951199649182bb848e70b583eb"; + version = "0.2.4.4"; + sha256 = "ed44a01f95c72580c3e198ea43f42a582ec44bbdc8897629fe37f874208f6c5d"; libraryHaskellDepends = [ base bytestring cmdargs containers data-default data-reify directory dotgen filepath netlist netlist-to-vhdl process random @@ -108786,8 +109017,8 @@ self: { }: mkDerivation { pname = "krapsh"; - version = "0.1.6.0"; - sha256 = "12c4c3a9d4e0d013056ad269a51ae77078a6a582b9b5924d5e58b73251176d6e"; + version = "0.1.6.2"; + sha256 = "081bebfed17c6bd548c0a3ef69523bad78eb0aa11e17d5ceb0de7baebc24cc9b"; libraryHaskellDepends = [ aeson aeson-pretty base base16-bytestring binary bytestring containers cryptohash-sha256 deepseq exceptions formatting hashable @@ -109685,8 +109916,8 @@ self: { }: mkDerivation { pname = "lambdacube-gl"; - version = "0.5.1.2"; - sha256 = "2b71bfd829096f8ac59f4e37ebdf6d8bdc4c84bdfaa6cd2c83d5e41fd05ef9fe"; + version = "0.5.2.0"; + sha256 = "6552d8dc5aa3d1639155d42890934aeaa19afe6c5feafee041199ad98cfbd165"; libraryHaskellDepends = [ base bytestring containers JuicyPixels lambdacube-ir mtl OpenGLRaw vector vector-algorithms @@ -111718,8 +111949,8 @@ self: { pname = "lens"; version = "4.15.1"; sha256 = "5cfaa64cb1b9787193c2247a1ed1c248104ba5fadb91cec6432e648e41b1bea6"; - revision = "2"; - editedCabalFile = "012be5e38b4fa0f4cb98ad04d6eb82a48eea6d789213a058b08fdc2e64aa1327"; + revision = "3"; + editedCabalFile = "d23792e0e14306446fe13c8de692b46cbf0aedd22ea22248d70c9dc71646716f"; libraryHaskellDepends = [ array base base-orphans bifunctors bytestring comonad containers contravariant distributive exceptions filepath free ghc-prim @@ -112012,22 +112243,23 @@ self: { ({ mkDerivation, ansi-wl-pprint, base, csv, directory, filemanip , filepath, hspec, natural-sort, optparse-applicative, parsec , pipes, regex-tdfa, semigroups, terminal-progress-bar, text + , transformers }: mkDerivation { pname = "lentil"; - version = "1.0.3.2"; - sha256 = "7c4fcfd08e2b4369f14a3502215cdb6f70a8f776350a6113d3d6f8dbc7a1c397"; + version = "1.0.4.0"; + sha256 = "e990aad8168d8e106ef35a0e8dc1fc707d467dfd87db8127f8ec568a47100f8b"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ ansi-wl-pprint base csv directory filemanip filepath natural-sort optparse-applicative parsec pipes regex-tdfa semigroups - terminal-progress-bar text + terminal-progress-bar text transformers ]; testHaskellDepends = [ ansi-wl-pprint base csv directory filemanip filepath hspec natural-sort optparse-applicative parsec pipes regex-tdfa - semigroups terminal-progress-bar text + semigroups terminal-progress-bar text transformers ]; homepage = "http://www.ariis.it/static/articles/lentil/page.html"; description = "frugal issue tracker"; @@ -115459,6 +115691,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "logger-thread" = callPackage + ({ mkDerivation, base, fast-logger, protolude, safe-exceptions, stm + , text, time + }: + mkDerivation { + pname = "logger-thread"; + version = "0.1.0.2"; + sha256 = "ac0a54001a69cff6f975209c4d9d399fb58ef59bb0ad6ac742c5ffedeac04a2a"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base fast-logger protolude safe-exceptions stm text time + ]; + executableHaskellDepends = [ base protolude stm ]; + homepage = "https://github.com/joe9/logger-thread#readme"; + description = "Run FastLogger in a thread and direct all queued messages to it"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "logging" = callPackage ({ mkDerivation, base, binary, bytestring, fast-logger, hspec , lifted-base, monad-control, old-locale, regex-compat, text, time @@ -116696,8 +116947,8 @@ self: { }: mkDerivation { pname = "lzma-conduit"; - version = "1.1.3.0"; - sha256 = "abf9e7a052a2bbd85923237a6fa7a73e7e077b20908ad3d68e6c24285aef390f"; + version = "1.1.3.1"; + sha256 = "2c181aece2c81c9408271e805a00f2833c5ca79f2c7cb55e3a8b6cb0388d612d"; libraryHaskellDepends = [ base bindings-DSL bytestring conduit resourcet transformers ]; @@ -116839,6 +117090,7 @@ self: { homepage = "http://github.com/as-capabl/machinecell"; description = "Arrow based stream transducers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "machines" = callPackage @@ -120210,16 +120462,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "mighty-metropolis_1_1_0" = callPackage - ({ mkDerivation, base, containers, mcmc-types, mwc-probability - , pipes, primitive, transformers + "mighty-metropolis_1_2_0" = callPackage + ({ mkDerivation, base, containers, kan-extensions, mcmc-types + , mwc-probability, pipes, primitive, transformers }: mkDerivation { pname = "mighty-metropolis"; - version = "1.1.0"; - sha256 = "2a8ac91fe51fa440347ce41edafca463fbf0d822fffca89796250e5e79143f6b"; + version = "1.2.0"; + sha256 = "8d3c0b4b65024846291c4f547c45e5c04f587aefd0e8d041d54679bb519871c0"; libraryHaskellDepends = [ - base mcmc-types mwc-probability pipes primitive transformers + base kan-extensions mcmc-types mwc-probability pipes primitive + transformers ]; testHaskellDepends = [ base containers mwc-probability ]; homepage = "http://github.com/jtobin/mighty-metropolis"; @@ -127530,6 +127783,7 @@ self: { homepage = "https://github.com/centromere/nfc#readme"; description = "libnfc bindings"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {nfc = null;}; "ngrams-loader" = callPackage @@ -131035,6 +131289,19 @@ self: { license = "unknown"; }) {}; + "ordered-containers" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "ordered-containers"; + version = "0.0"; + sha256 = "ea40528ec95f2424bd7231da44b9d96a80b46b4116b2cdfbb57269c88f2419cb"; + revision = "1"; + editedCabalFile = "a8de69537c43ab967f7f512466a5a0e32000e9179239b4c10adf3cd3cfd1e524"; + libraryHaskellDepends = [ base containers ]; + description = "Set- and Map-like types that remember the order elements were inserted"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "orders" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -131821,6 +132088,8 @@ self: { pname = "pandoc"; version = "1.19.1"; sha256 = "9d22db0a1536de0984f4a605f1a28649e68d540e6d892947d9644987ecc4172a"; + revision = "1"; + editedCabalFile = "6db38c75bdb36377e1424b91b2662205dbe54152995a08ab83127bfb17ee027b"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; @@ -131891,8 +132160,8 @@ self: { }: mkDerivation { pname = "pandoc-citeproc-preamble"; - version = "1.2.1"; - sha256 = "99e0988741a8b820ca951b2aabc35d251119c84e0a8245bf0c9b55cbe0e22121"; + version = "1.2.2"; + sha256 = "ee496f052eea0ad9a881d8056025f04cd83ec9773d695e15220151c33890579c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -133738,6 +134007,50 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pdf-slave" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , containers, exceptions, haskintex, HaTeX, optparse-applicative + , pdf-slave-template, shelly, system-filepath, text + , unordered-containers, yaml + }: + mkDerivation { + pname = "pdf-slave"; + version = "1.2.0.0"; + sha256 = "bf45cd593271427ab6f72dffaa1e355a33b59ab20d18a34590a3a1c50d5fe029"; + revision = "1"; + editedCabalFile = "cf72f50463292710ceb929edc7cb9e61c41c5da36676e5d0cc7e7cc5d0dd23a4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring containers exceptions + haskintex HaTeX pdf-slave-template shelly system-filepath + unordered-containers yaml + ]; + executableHaskellDepends = [ + aeson base bytestring optparse-applicative pdf-slave-template + shelly system-filepath text yaml + ]; + homepage = "https://github.com/NCrashed/pdf-slave#readme"; + description = "Tool to generate PDF from haskintex templates and YAML input"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "pdf-slave-template" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , containers, text + }: + mkDerivation { + pname = "pdf-slave-template"; + version = "1.2.0.0"; + sha256 = "63acbe9eb391f698d8428f40cffcf8f3a2f483cd460c8c45d50e297a11b92531"; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring containers text + ]; + homepage = "https://github.com/ncrashed/pdf-slave#readme"; + description = "Template format definition for pdf-slave tool"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pdf-toolbox-content" = callPackage ({ mkDerivation, attoparsec, base, base16-bytestring, bytestring , containers, io-streams, pdf-toolbox-core, text @@ -136949,6 +137262,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "plan-applicative" = callPackage + ({ mkDerivation, base, bifunctors, comonad, containers, doctest + , profunctors, streaming, tasty, tasty-hunit, transformers + }: + mkDerivation { + pname = "plan-applicative"; + version = "1.0.0.0"; + sha256 = "911a0d6f69d2dd4c7642abc855c153d90f799035a722324965506ecb2f954dd7"; + libraryHaskellDepends = [ + base bifunctors comonad containers profunctors streaming + transformers + ]; + testHaskellDepends = [ + base bifunctors comonad containers doctest profunctors streaming + tasty tasty-hunit transformers + ]; + description = "Applicative/Arrow for resource estimation and progress tracking"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "plan-b" = callPackage ({ mkDerivation, base, exceptions, hspec, path, path-io , transformers @@ -137314,8 +137647,8 @@ self: { }: mkDerivation { pname = "ply-loader"; - version = "0.4.2"; - sha256 = "60adbcb9323fd221b70ed106b9c418636112e989b3364a2eb0227fefce47afaf"; + version = "0.5.0"; + sha256 = "70f93a7043531b095f2762fe819ae2ae26a1913c071f179f3e4e936d9223db6f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139146,13 +139479,13 @@ self: { "preamble" = callPackage ({ mkDerivation, aeson, base, basic-prelude, exceptions , fast-logger, lens, monad-control, monad-logger, mtl, resourcet - , safe, shake, template-haskell, text, text-manipulate, time + , safe, shakers, template-haskell, text, text-manipulate, time , transformers-base, unordered-containers }: mkDerivation { pname = "preamble"; - version = "0.0.3"; - sha256 = "5a4a1a4fa8dcad02d6afbdc99b44d4f9e94571b48b88115b7d1ebb266f776a73"; + version = "0.0.8"; + sha256 = "2827df5cd7df280b1ca9092e0a17b585341f758ec91d490be7287483f623b374"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139160,7 +139493,7 @@ self: { monad-logger mtl resourcet safe template-haskell text text-manipulate time transformers-base unordered-containers ]; - executableHaskellDepends = [ base basic-prelude shake ]; + executableHaskellDepends = [ base shakers ]; homepage = "https://github.com/swift-nav/preamble"; description = "Yet another prelude"; license = stdenv.lib.licenses.mit; @@ -139726,8 +140059,8 @@ self: { }: mkDerivation { pname = "pretty-simple"; - version = "0.2.0.0"; - sha256 = "f4f9141b0b816ad56918bb92daba2b62295207eb3119afcc3c2baf2ae46bb4d3"; + version = "0.3.0.0"; + sha256 = "b34af2742904717e1a46c6aa9816eeffedc4aea67452f61dd98fb06aae1d4f0d"; libraryHaskellDepends = [ ansi-terminal base lens mono-traversable mtl parsec semigroups transformers @@ -139736,6 +140069,7 @@ self: { homepage = "https://github.com/cdepillabout/pretty-simple"; description = "Simple pretty printer for any datatype with a 'Show' instance"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pretty-sop" = callPackage @@ -142554,19 +142888,22 @@ self: { "qr-imager" = callPackage ({ mkDerivation, aeson, base, bytestring, cryptonite, directory - , haskell-qrencode, jose-jwt, JuicyPixels, lens, vector + , haskell-qrencode, jose-jwt, JuicyPixels, lens, MissingH + , optparse-applicative, process, vector }: mkDerivation { pname = "qr-imager"; - version = "0.1.0.1"; - sha256 = "2936851586f3e63e7e4aa589d06d88cb6968f5e2c5861f71df62a89fc43d7ef9"; + version = "0.1.2.1"; + sha256 = "72e1c72a7e3da7769401b4d1125b3f527274bdc5f97d78be2e14cf619d705d30"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring cryptonite directory haskell-qrencode - jose-jwt JuicyPixels lens vector + jose-jwt JuicyPixels lens MissingH optparse-applicative process + vector ]; - executableHaskellDepends = [ base bytestring ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base process ]; homepage = "https://github.com/vmchale/QRImager#readme"; description = "Library to generate QR codes from bytestrings and objects"; license = stdenv.lib.licenses.bsd3; @@ -153929,8 +154266,8 @@ self: { }: mkDerivation { pname = "serokell-util"; - version = "0.1.2.3"; - sha256 = "f30880e753f8c7e258906ab0a83f15f23b4ae90cd3bbba02719556421dc97f0a"; + version = "0.1.3.0"; + sha256 = "ddf321ba0126fde5757f186c5080f3a7ffb7539582040aab263165f83cafcc78"; libraryHaskellDepends = [ acid-state aeson aeson-extra base base16-bytestring base64-bytestring binary binary-orphans bytestring cereal @@ -154184,7 +154521,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-auth-cookie_0_4" = callPackage + "servant-auth-cookie_0_4_2" = callPackage ({ mkDerivation, base, base-compat, base64-bytestring , blaze-builder, blaze-html, blaze-markup, bytestring, cereal , cookie, cryptonite, data-default, deepseq, exceptions, hspec @@ -154194,8 +154531,8 @@ self: { }: mkDerivation { pname = "servant-auth-cookie"; - version = "0.4"; - sha256 = "2b5144612cbf8835b5f069f885d9f32483a63884d5d008c7110dd9273756eef1"; + version = "0.4.2"; + sha256 = "e1199517da33d5f0b3735567d2391dcf36ca8ca61edea703b674103192a1ed79"; libraryHaskellDepends = [ base base64-bytestring blaze-builder bytestring cereal cookie cryptonite data-default exceptions http-api-data http-types memory @@ -156169,6 +156506,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "shakers" = callPackage + ({ mkDerivation, base, basic-prelude, directory, shake }: + mkDerivation { + pname = "shakers"; + version = "0.0.4"; + sha256 = "b2769d6b01eab98de11c3c072a2cbc2a5706e0dfdcaf916b67fc344d49f1e09f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base basic-prelude directory shake ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/swift-nav/shakers"; + description = "Shake helpers"; + license = stdenv.lib.licenses.mit; + }) {}; + "shakespeare" = callPackage ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec @@ -158417,6 +158769,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "skylighting" = callPackage + ({ mkDerivation, aeson, base, blaze-html, bytestring + , case-insensitive, containers, Diff, directory, filepath, HUnit + , hxt, mtl, pretty-show, QuickCheck, regex-pcre-builtin, safe + , tasty, tasty-golden, tasty-hunit, text, utf8-string + }: + mkDerivation { + pname = "skylighting"; + version = "0.1.0.1"; + sha256 = "e7cdbea2909306f97135b4444489cfff0136ec5609c22228a68201440d6304ac"; + libraryHaskellDepends = [ + aeson base blaze-html bytestring case-insensitive containers + directory filepath hxt mtl regex-pcre-builtin safe text utf8-string + ]; + testHaskellDepends = [ + aeson base bytestring Diff directory filepath HUnit pretty-show + QuickCheck tasty tasty-golden tasty-hunit text + ]; + homepage = "https://github.com/jgm/skylighting"; + description = "syntax highlighting library"; + license = stdenv.lib.licenses.gpl2; + }) {}; + "skype4hs" = callPackage ({ mkDerivation, attoparsec, base, bytestring, lifted-base , monad-control, mtl, stm, text, time, transformers-base, word8 @@ -161635,16 +162010,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "speedy-slice_0_2_0" = callPackage - ({ mkDerivation, base, containers, lens, mcmc-types + "speedy-slice_0_3_0" = callPackage + ({ mkDerivation, base, containers, kan-extensions, lens, mcmc-types , mwc-probability, pipes, primitive, transformers }: mkDerivation { pname = "speedy-slice"; - version = "0.2.0"; - sha256 = "9ae1b3241624bfb5e656347cca1f598ae9b67b1abe23b00ddf8d3d5925234963"; + version = "0.3.0"; + sha256 = "efbf8a10b681b940078f70fb9aca43fec8ba436c82f3faf719bbe495ba152899"; libraryHaskellDepends = [ - base lens mcmc-types mwc-probability pipes primitive transformers + base kan-extensions lens mcmc-types mwc-probability pipes primitive + transformers ]; testHaskellDepends = [ base containers mwc-probability ]; homepage = "http://github.com/jtobin/speedy-slice"; @@ -163306,6 +163682,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "staf" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "staf"; + version = "0.1.0.0"; + sha256 = "ce066d4b64771489176e72f081b8ec5ba62237ff1f12abe5f515884b0ce8a925"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/lovasko/staf"; + description = "Numerical statistics for Foldable containers"; + license = "unknown"; + }) {}; + "standalone-derive-topdown" = callPackage ({ mkDerivation, base, mtl, template-haskell }: mkDerivation { @@ -165833,6 +166221,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "styx" = callPackage + ({ mkDerivation, aeson, base, containers, directory, filepath, mtl + , optparse-applicative, process, text, yaml + }: + mkDerivation { + pname = "styx"; + version = "1.0"; + sha256 = "2fc5e840d35663ca10771758dec362017f32611675e44fe2e988dd12a05e293c"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base containers directory filepath mtl optparse-applicative + process text yaml + ]; + description = "A generator of nix files"; + license = "GPL"; + }) {}; + "sub-state" = callPackage ({ mkDerivation, base, mtl, QuickCheck, quickcheck-instances, sets , tasty, tasty-hunit, tasty-quickcheck @@ -168713,6 +169119,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tasty-ant-xml_1_0_4" = callPackage + ({ mkDerivation, base, containers, directory, filepath + , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers + , xml + }: + mkDerivation { + pname = "tasty-ant-xml"; + version = "1.0.4"; + sha256 = "4d91c509e0e80919d96c16eaa3ee11089b7ee7c87fbe59a947d26bf0c5aef188"; + libraryHaskellDepends = [ + base containers directory filepath generic-deriving ghc-prim mtl + stm tagged tasty transformers xml + ]; + homepage = "http://github.com/ocharles/tasty-ant-xml"; + description = "Render tasty output to XML for Jenkins"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-dejafu" = callPackage ({ mkDerivation, base, dejafu, tagged, tasty }: mkDerivation { @@ -170739,6 +171164,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "text-generic-pretty" = callPackage + ({ mkDerivation, base, containers, ghc-prim, groom, ixset-typed + , protolude, QuickCheck, string-conversions, tasty, tasty-hunit + , tasty-quickcheck, text, time, unordered-containers + , wl-pprint-text + }: + mkDerivation { + pname = "text-generic-pretty"; + version = "1.2.1"; + sha256 = "cff331fdea2f695cf9a2583f4bd7393935b4a6ffa2bd47eb7dd983c6184752c7"; + libraryHaskellDepends = [ + base containers ghc-prim groom ixset-typed protolude QuickCheck + string-conversions text time unordered-containers wl-pprint-text + ]; + testHaskellDepends = [ + base containers protolude QuickCheck string-conversions tasty + tasty-hunit tasty-quickcheck time unordered-containers + ]; + homepage = "https://github.com/joe9/GenericPretty"; + description = "A generic, derivable, haskell pretty printer"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "text-icu" = callPackage ({ mkDerivation, array, base, bytestring, deepseq, directory , ghc-prim, HUnit, icu, QuickCheck, random, test-framework @@ -170781,6 +171229,7 @@ self: { homepage = "https://www.lambdanow.us/browser/text-icu-normalized"; description = "Dealing with Strict Text in NFC normalization"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-icu-translit" = callPackage @@ -173289,8 +173738,8 @@ self: { }: mkDerivation { pname = "timeseries"; - version = "0.3.0"; - sha256 = "0e59e55b0c1346593f752d88fa69ea9c35fb2942ef13f984727a26ede69d1896"; + version = "0.4.0"; + sha256 = "a073a252dcdb671e57a784f4b37f2009f6e0890579bf705869c572923047af51"; libraryHaskellDepends = [ base bytestring cassava statistics text text-time time vector ]; @@ -177358,23 +177807,24 @@ self: { "uhc-light" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , directory, fgl, filepath, hashable, mtl, network, old-locale - , primitive, process, syb, transformers, uhc-util, uulib, vector + , primitive, process, syb, transformers, uhc-util, utf8-string + , uulib, vector }: mkDerivation { pname = "uhc-light"; - version = "1.1.9.4"; - sha256 = "617fd803d9693cc9c03f071045a892b5a1f8b4564e7764c595014a440261f053"; + version = "1.1.9.5"; + sha256 = "eabaf3cdac62afb5c8d37f8ceb0997fd85647493d2d4cc1b0d00d954d586681d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base binary bytestring containers directory fgl filepath hashable mtl network old-locale primitive process syb transformers - uhc-util uulib vector + uhc-util utf8-string uulib vector ]; executableHaskellDepends = [ array base binary bytestring containers directory fgl filepath hashable mtl network old-locale primitive process syb transformers - uhc-util uulib vector + uhc-util utf8-string uulib vector ]; homepage = "https://github.com/UU-ComputerScience/uhc"; description = "Part of UHC packaged as cabal/hackage installable library"; @@ -177389,8 +177839,8 @@ self: { }: mkDerivation { pname = "uhc-util"; - version = "0.1.6.6"; - sha256 = "b5abc07215168b1f203ce50da8f13b8170269a5e4b2e4c8a872819f13f14bb47"; + version = "0.1.6.7"; + sha256 = "d44b27175e9ce45a15c19c2f589772f4b66ca297a28b34b0ac462a7f6e4f4a75"; libraryHaskellDepends = [ array base binary bytestring containers directory fclabels fgl hashable logict-state mtl pqueue process time time-compat @@ -178641,6 +179091,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "unordered-containers_0_2_7_2" = callPackage + ({ mkDerivation, base, ChasingBottoms, containers, deepseq + , hashable, HUnit, QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "unordered-containers"; + version = "0.2.7.2"; + sha256 = "7f5c4344fcab01f6046378c64522f0dfd69e417f6c1a8858a24bdabaadb3e56e"; + libraryHaskellDepends = [ base deepseq hashable ]; + testHaskellDepends = [ + base ChasingBottoms containers hashable HUnit QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 + ]; + homepage = "https://github.com/tibbe/unordered-containers"; + description = "Efficient hashing-based container types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "unordered-containers-rematch" = callPackage ({ mkDerivation, base, hashable, hspec, HUnit, rematch , unordered-containers @@ -183515,8 +183985,8 @@ self: { }: mkDerivation { pname = "wave"; - version = "0.1.0"; - sha256 = "93c38138c1e85124544eadf0d381ce4ce0505a441060d226e8f09baddc4c5915"; + version = "0.1.1"; + sha256 = "13d5475356efc3ae95c971e930d5e4bf18f9395dc1bd7b63e8bb8e7ed26ddf23"; libraryHaskellDepends = [ base bytestring cereal containers data-default-class transformers ]; @@ -183926,8 +184396,8 @@ self: { }: mkDerivation { pname = "web3"; - version = "0.3.4.0"; - sha256 = "64218b2f2f2319fe137834bbb012e948444f80f88e3da03ee6ecff06b5ecfe27"; + version = "0.4.1.0"; + sha256 = "ead3b350b138946ec921c1e1c13ae6bf52f2ba89e7626ba79a562a5bef63faac"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring cryptonite data-default-class http-client memory mtl template-haskell text @@ -185268,38 +185738,24 @@ self: { "wolf" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 - , amazonka-swf, async, base, basic-prelude, bytestring, conduit - , conduit-combinators, conduit-extra, directory, exceptions - , fast-logger, filemanip, formatting, http-conduit, http-types - , lens, lifted-async, lifted-base, monad-control, monad-logger, mtl - , mtl-compat, optparse-applicative, optparse-generic, preamble - , process, regex-applicative, regex-compat, resourcet, safe, shake - , shelly, system-filepath, tasty, tasty-hunit, template-haskell - , text, text-manipulate, time, transformers, transformers-base - , unordered-containers, uuid, yaml, zlib + , amazonka-swf, base, bytestring, conduit, conduit-combinators + , conduit-extra, directory, exceptions, filemanip, lifted-async + , monad-control, optparse-applicative, optparse-generic, preamble + , process, resourcet, shakers, text, time, uuid, yaml }: mkDerivation { pname = "wolf"; - version = "0.3.1"; - sha256 = "441d7c82cca74e12fd097ebb3b4d5e3c7b2e3dff4145e65e00a9fd9f57ee224b"; + version = "0.3.3"; + sha256 = "2982a25dbdb4bcbfe563cc49f1bae58d8b837014ad28365eb09405222165f311"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-s3 amazonka-swf base - basic-prelude bytestring conduit conduit-combinators conduit-extra - directory exceptions fast-logger filemanip formatting http-conduit - http-types lens lifted-async lifted-base monad-control monad-logger - mtl mtl-compat optparse-applicative preamble process - regex-applicative regex-compat resourcet safe template-haskell text - text-manipulate time transformers transformers-base - unordered-containers uuid yaml + bytestring conduit conduit-combinators conduit-extra directory + exceptions filemanip lifted-async monad-control + optparse-applicative preamble process resourcet text time uuid yaml ]; - executableHaskellDepends = [ - aeson amazonka-core async base basic-prelude bytestring directory - optparse-applicative optparse-generic resourcet shake shelly - system-filepath text transformers yaml zlib - ]; - testHaskellDepends = [ base basic-prelude tasty tasty-hunit ]; + executableHaskellDepends = [ base optparse-generic shakers ]; homepage = "https://github.com/swift-nav/wolf"; description = "Amazon Simple Workflow Service Wrapper"; license = stdenv.lib.licenses.mit; @@ -185992,6 +186448,7 @@ self: { libraryHaskellDepends = [ base cubicbezier wx wxcore ]; description = "Simple zoomable canvas for wxHaskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wxc" = callPackage @@ -188339,8 +188796,8 @@ self: { }: mkDerivation { pname = "yaml-light-lens"; - version = "0.3.3.2"; - sha256 = "27380c456128dc72f117febaf3ade7e8c7a916abc3052e5de9d8ffd5ca01df0d"; + version = "0.3.3.3"; + sha256 = "788a79a1afd97d9c41010b6240261995da9e80f5674b4e335beec47d225211cf"; libraryHaskellDepends = [ base bytestring bytestring-lexing containers lens yaml-light ]; @@ -189219,7 +189676,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "yesod-bin_1_5_0_1" = callPackage + "yesod-bin_1_5_1" = callPackage ({ mkDerivation, async, attoparsec, base, base64-bytestring , blaze-builder, bytestring, Cabal, conduit, conduit-extra , containers, data-default-class, deepseq, directory, file-embed @@ -189233,8 +189690,8 @@ self: { }: mkDerivation { pname = "yesod-bin"; - version = "1.5.0.1"; - sha256 = "5530506d1ddbe0b846f538b366645c416322046aa712d866c422e4778829d3e8"; + version = "1.5.1"; + sha256 = "034114dade5a23ec39ffeb9f78a04b7bd9fc0b8942b1a11118475e4c594863cd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ From 19e2e7290a25819bd66a94db389e7e0d268f7fc0 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 18 Dec 2016 21:38:05 +0100 Subject: [PATCH 52/97] haskell: workaround for bug with dynamic libraries on darwin --- .../haskell-modules/generic-builder.nix | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index f91bd474c6f..dfe9f68ec61 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -245,9 +245,41 @@ stdenv.mkDerivation ({ runHook postConfigure ''; + # The darwin pre/post build sections are a workaround https://github.com/haskell/cabal/issues/4183 + # It seems like --extra-lib-dirs from the previous steps is not detected properly, + # to work around this we build using a DYLD_LIBRARY_PATH and fixup the build afterwards. buildPhase = '' runHook preBuild + ${optionalString stdenv.isDarwin '' + local inputClosure="" + for i in $propagatedNativeBuildInputs $nativeBuildInputs; do + findInputs $i inputClosure propagated-native-build-inputs + done + local -a inputLibs=() + for p in $inputClosure; do + if [ -d "$p/lib/${ghc.name}/package.conf.d" ]; then + continue + fi + if [ -d "$p/lib" ]; then + inputLibs+="$p/lib" + fi + done + + for lib in $inputLibs; do + export DYLD_LIBRARY_PATH="$lib:''${DYLD_LIBRARY_PATH:+:$DYLD_LIBRARY_PATH}" + done + ''} ${setupCommand} build ${buildTarget}${crossCabalFlagsString} + ${optionalString stdenv.isDarwin '' + unset DYLD_LIBRARY_PATH + + local outputLib=dist/build/*-ghc${ghc.version}.dylib + for lib in $inputLib/*.dylib; do + for name in $(otool -L $outputLib | awk '$1 ~ /^'$(basename lib)'/ {print $1}' | cat); do + install_name_tool -change $name $lib $outputLib + done + done + ''} runHook postBuild ''; From 943f4345dd4dc81fb406e16c36d8faeea2332997 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 22 Dec 2016 10:54:53 +0100 Subject: [PATCH 53/97] configuration-hackage2nix.yaml: update list of broken builds --- .../haskell-modules/configuration-hackage2nix.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index f766b2be8f5..42858390c30 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -3829,6 +3829,7 @@ dont-distribute-packages: git-date: [ i686-linux, x86_64-linux, x86_64-darwin ] git-gpush: [ i686-linux, x86_64-linux, x86_64-darwin ] git-jump: [ i686-linux, x86_64-linux, x86_64-darwin ] + git-mediate: [ i686-linux, x86_64-linux, x86_64-darwin ] git-object: [ i686-linux, x86_64-linux, x86_64-darwin ] git-repair: [ i686-linux, x86_64-linux, x86_64-darwin ] git-sanity: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5440,6 +5441,7 @@ dont-distribute-packages: lzma-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] maam: [ i686-linux, x86_64-linux, x86_64-darwin ] macbeth-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] + machinecell: [ i686-linux, x86_64-linux, x86_64-darwin ] machines-zlib: [ i686-linux, x86_64-linux, x86_64-darwin ] macosx-make-standalone: [ i686-linux, x86_64-linux, x86_64-darwin ] mage: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5826,6 +5828,7 @@ dont-distribute-packages: newtype-generics: [ i686-linux, x86_64-linux, x86_64-darwin ] newtype-th: [ i686-linux, x86_64-linux, x86_64-darwin ] next-ref: [ i686-linux, x86_64-linux, x86_64-darwin ] + nfc: [ i686-linux, x86_64-linux, x86_64-darwin ] ngrams-loader: [ i686-linux, x86_64-linux, x86_64-darwin ] NGrams: [ i686-linux, x86_64-linux, x86_64-darwin ] niagra: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6209,6 +6212,7 @@ dont-distribute-packages: press: [ i686-linux, x86_64-linux, x86_64-darwin ] presto-hdbc: [ i686-linux, x86_64-linux, x86_64-darwin ] pretty-error: [ i686-linux, x86_64-linux, x86_64-darwin ] + pretty-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] primitive-simd: [ i686-linux, x86_64-linux, x86_64-darwin ] PrimitiveArray-Pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] primula-board: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7217,6 +7221,7 @@ dont-distribute-packages: texrunner: [ i686-linux, x86_64-linux, x86_64-darwin ] text-all: [ i686-linux, x86_64-linux, x86_64-darwin ] text-and-plots: [ i686-linux, x86_64-linux, x86_64-darwin ] + text-icu-normalized: [ i686-linux, x86_64-linux, x86_64-darwin ] text-json-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] text-normal: [ i686-linux, x86_64-linux, x86_64-darwin ] text-position: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7705,6 +7710,7 @@ dont-distribute-packages: wxFruit: [ i686-linux, x86_64-linux, x86_64-darwin ] WxGeneric: [ i686-linux, x86_64-linux, x86_64-darwin ] wxhnotepad: [ i686-linux, x86_64-linux, x86_64-darwin ] + wxSimpleCanvas: [ i686-linux, x86_64-linux, x86_64-darwin ] wxturtle: [ i686-linux, x86_64-linux, x86_64-darwin ] wyvern: [ i686-linux, x86_64-linux, x86_64-darwin ] x-dsp: [ i686-linux, x86_64-linux, x86_64-darwin ] From d82a1abbb4dc2d9ed914535efcc7ba53037ce525 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 22 Dec 2016 10:56:33 +0100 Subject: [PATCH 54/97] ghcjs: mark this build as broken --- pkgs/development/compilers/ghcjs/base.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix index f8b861311d6..393278be49e 100644 --- a/pkgs/development/compilers/ghcjs/base.nix +++ b/pkgs/development/compilers/ghcjs/base.nix @@ -183,4 +183,5 @@ in mkDerivation (rec { license = stdenv.lib.licenses.bsd3; platforms = ghc.meta.platforms; maintainers = with stdenv.lib.maintainers; [ jwiegley cstrahan ]; + broken = true; # http://hydra.nixos.org/build/45110274 }) From c38b4da9946b32267301ccf352731ed2d80cc2f6 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sat, 24 Dec 2016 15:49:51 +0000 Subject: [PATCH 55/97] strongswan: 5.5.0 -> 5.5.1 --- pkgs/tools/networking/strongswan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index ed67909db67..1791abf4a48 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "strongswan-${version}"; - version = "5.5.0"; + version = "5.5.1"; src = fetchurl { url = "http://download.strongswan.org/${name}.tar.bz2"; - sha256 = "0m449i5s51ikqh36s1sp4rvw60wqyv0j12kyd31yl9b7mjc3jijq"; + sha256 = "1drahhmwz1jg14rfh67cl231dlg2a9pra6jmipfxwyzpj4ck02vj"; }; dontPatchELF = true; From 790818540081420d30a5a04cd8cb4c823c711fee Mon Sep 17 00:00:00 2001 From: mingchuan Date: Wed, 21 Dec 2016 16:21:31 +0800 Subject: [PATCH 56/97] crystal: init at 0.20.3 A compiled language with Ruby like syntax and type inference. --- .../development/compilers/crystal/default.nix | 96 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 98 insertions(+) create mode 100644 pkgs/development/compilers/crystal/default.nix diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix new file mode 100644 index 00000000000..ed9907a283b --- /dev/null +++ b/pkgs/development/compilers/crystal/default.nix @@ -0,0 +1,96 @@ +{ stdenv, fetchurl, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm_39, makeWrapper }: + +stdenv.mkDerivation rec { + version = "0.20.3"; + name = "crystal-${version}-1"; + arch = + { + "x86_64-linux" = "linux-x86_64"; + "i686-linux" = "linux-i686"; + "x86_64-darwin" = "darwin-x86_64"; + }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); + + prebuiltBinary = fetchurl { + url = "https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-1-${arch}.tar.gz"; + sha256 = + { + "x86_64-linux" = "c656dc8092a6161262f527df441aaab4ea9dd9a836a013f7155c6378b26b8cd7"; + "i686-linux" = "85edfa1dda5e712341869bab87f6de0f7c6860e2a04dec2f00e8dc6aa1418611"; + "x86_64-darwin" = "0088972c5cad9543f262976ae6c8ee1dbcbefdee3a8bedae851998bfa7098637"; + }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); + }; + + src = fetchurl { + url = "https://github.com/crystal-lang/crystal/archive/${version}.tar.gz"; + sha256 = "5372ba2a35d885345207047a51b9389f9190fd12389847e7f7298618bcf59ad6"; + }; + + # crystal on Darwin needs libiconv to build + buildInputs = [ + boehmgc libatomic_ops pcre libevent llvm_39 makeWrapper + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + libiconv + ]; + + libPath = stdenv.lib.makeLibraryPath ([ + boehmgc libatomic_ops pcre libevent + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + libiconv + ]); + + unpackPhase = '' + tar zxf ${src} + tar zxf ${prebuiltBinary} + ''; + + sourceRoot = "."; + + fixPrebuiltBinary = if stdenv.isDarwin then '' + wrapProgram $(pwd)/crystal-${version}-1/embedded/bin/crystal \ + --suffix DYLD_LIBRARY_PATH : $libPath + '' + else '' + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + crystal-${version}-1/embedded/bin/crystal + patchelf --set-rpath ${ stdenv.lib.makeLibraryPath [ stdenv.cc.cc ] } \ + crystal-${version}-1/embedded/bin/crystal + ''; + + buildPhase = '' + ${fixPrebuiltBinary} + + cd crystal-${version} + make release=1 PATH="../crystal-${version}-1/bin:$PATH" + make doc + ''; + + installPhase = '' + install -Dm755 .build/crystal $out/bin/crystal + wrapProgram $out/bin/crystal \ + --suffix CRYSTAL_PATH : $out/lib/crystal \ + --suffix LIBRARY_PATH : $libPath + + install -dm755 $out/lib/crystal + cp -r src/* $out/lib/crystal/ + + install -dm755 $out/share/doc/crystal/api + cp -r doc/* $out/share/doc/crystal/api/ + cp -r samples $out/share/doc/crystal/ + + install -Dm644 etc/completion.bash $out/share/bash-completion/completions/crystal + install -Dm644 etc/completion.zsh $out/share/zsh/site-functions/_crystal + + install -Dm644 LICENSE $out/share/licenses/crystal/LICENSE + ''; + + dontStrip = true; + + meta = { + description = "A compiled language with Ruby like syntax and type inference"; + homepage = "https://crystal-lang.org/"; + license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; [ mingchuan ]; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7df99796df8..6b619add313 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4643,6 +4643,8 @@ in ''; }); + crystal = callPackage ../development/compilers/crystal { }; + devpi-client = callPackage ../development/tools/devpi-client {}; drumstick = callPackage ../development/libraries/drumstick { }; From 6db2c983c1d7b2fb994c18b91ce9ed381d4053f4 Mon Sep 17 00:00:00 2001 From: mingchuan Date: Wed, 21 Dec 2016 16:23:01 +0800 Subject: [PATCH 57/97] shards: init at 0.7.1 Dependency manager for the Crystal language --- .../tools/build-managers/shards/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/tools/build-managers/shards/default.nix diff --git a/pkgs/development/tools/build-managers/shards/default.nix b/pkgs/development/tools/build-managers/shards/default.nix new file mode 100644 index 00000000000..7db0d89e8b1 --- /dev/null +++ b/pkgs/development/tools/build-managers/shards/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, crystal, libyaml, which }: + +stdenv.mkDerivation rec { + name = "shards-${version}"; + version = "0.7.1"; + + src = fetchurl { + url = "https://github.com/crystal-lang/shards/archive/v${version}.tar.gz"; + sha256 = "31de819c66518479682ec781a39ef42c157a1a8e6e865544194534e2567cb110"; + }; + + buildInputs = [ crystal libyaml which ]; + + buildFlags = [ "CRFLAGS=" "release" ]; + + installPhase = '' + mkdir -p $out/bin + cp bin/shards $out/bin/ + ''; + + meta = with stdenv.lib; { + homepage = "https://crystal-lang.org/"; + license = licenses.asl20; + description = "Dependency manager for the Crystal language"; + maintainers = with maintainers; [ mingchuan ]; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b619add313..932013bcf29 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6495,6 +6495,8 @@ in sbt = callPackage ../development/tools/build-managers/sbt { }; simpleBuildTool = sbt; + shards = callPackage ../development/tools/build-managers/shards { }; + shellcheck = self.haskellPackages.ShellCheck; shncpd = callPackage ../tools/networking/shncpd { }; From 30074ddfeac5e165eea32b33829bc2bf4185aace Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 24 Dec 2016 22:27:52 +0200 Subject: [PATCH 58/97] coreutils: Fix cross build `make install` was failing presumably due to an upstream cross-compilation bug: Makefile:3440: *** Recursive variable 'INSTALL' references itself (eventually). Stop. While at it, remove the old ugly cross buildPhase. It was seemingly trying to work around the fact that the man pages are generated by piping each command's --help output to help2man. That obviously doesn't work while cross-compiling. Instead, set PERL=missing in the environment to make the build system think there's no perl available to run help2man. (This approach was stolen from buildroot.) --- pkgs/tools/misc/coreutils/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index ec6be06ede3..8b39e3711e1 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -54,13 +54,13 @@ let ++ optional (stdenv.ccCross.libc ? libiconv) stdenv.ccCross.libc.libiconv.crossDrv; - buildPhase = '' - make || ( - pushd man - for a in *.x; do - touch `basename $a .x`.1 - done - popd; make ) + # Prevents attempts of running 'help2man' on cross-built binaries. + PERL = "missing"; + + # Works around a bug with 8.26: + # Makefile:3440: *** Recursive variable 'INSTALL' references itself (eventually). Stop. + preInstall = '' + sed -i Makefile -e 's|^INSTALL =.*|INSTALL = ${self}/bin/install -c|' ''; postInstall = '' From b64214f66f8f73d850e7ceef4d05dcaed50e5b59 Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Sun, 18 Dec 2016 21:59:06 -0500 Subject: [PATCH 59/97] plex: add config option to open recommended network ports as prescribed at https://support.plex.tv/hc/en-us/articles/201543147-What-network-ports-do-I-need-to-allow-through-my-firewall- --- nixos/modules/services/misc/plex.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/nixos/modules/services/misc/plex.nix b/nixos/modules/services/misc/plex.nix index 92b352db416..7c2322b7d89 100644 --- a/nixos/modules/services/misc/plex.nix +++ b/nixos/modules/services/misc/plex.nix @@ -19,6 +19,14 @@ in description = "The directory where Plex stores its data files."; }; + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Open ports in the firewall for the media server + ''; + }; + user = mkOption { type = types.str; default = "plex"; @@ -141,6 +149,11 @@ in }; }; + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPorts = [ 32400 3005 8324 32469 ]; + allowedUDPPorts = [ 1900 5353 32410 32412 32413 32414 ]; + }; + users.extraUsers = mkIf (cfg.user == "plex") { plex = { group = cfg.group; From 0e3b56c7b9b38c71bd3a5bac35acfce8b57f5ebb Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 24 Dec 2016 22:41:32 +0200 Subject: [PATCH 60/97] alsa-lib: Remove unnecessary crossAttrs It's breaking the cross build. --- pkgs/os-specific/linux/alsa-lib/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/os-specific/linux/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-lib/default.nix index b525cbfc261..3205275ff93 100644 --- a/pkgs/os-specific/linux/alsa-lib/default.nix +++ b/pkgs/os-specific/linux/alsa-lib/default.nix @@ -27,12 +27,6 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - crossAttrs = { - patchPhase = '' - sed -i s/extern/static/g include/iatomic.h - ''; - }; - meta = with stdenv.lib; { homepage = http://www.alsa-project.org/; description = "ALSA, the Advanced Linux Sound Architecture libraries"; From bc4a6719809f8965c71e2375e5760ef3bc04a0d3 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Sat, 24 Dec 2016 10:53:34 +0100 Subject: [PATCH 61/97] unifont: 9.0.04 -> 9.0.06 See https://lists.gnu.org/archive/html/info-gnu/2016-12/msg00014.html for release information --- pkgs/data/fonts/unifont/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix index 682c42afa3e..8ac65dcae35 100644 --- a/pkgs/data/fonts/unifont/default.nix +++ b/pkgs/data/fonts/unifont/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { name = "unifont-${version}"; - version = "9.0.04"; + version = "9.0.06"; ttf = fetchurl { url = "mirror://gnu/unifont/${name}/${name}.ttf"; - sha256 = "052waajjdry67jjl7vy984padyzdrkhf5gylgbnvj90q6d52j02z"; + sha256 = "0r96giih04din07wlmw8538izwr7dh5v6dyriq13zfn19brgn5z2"; }; pcf = fetchurl { url = "mirror://gnu/unifont/${name}/${name}.pcf.gz"; - sha256 = "0736qmlzsf4xlipj4vzihafkigc3xjisxnwcqhl9dzkhxfjq9612"; + sha256 = "11ivfzpyz54rbz0cvd437abs6qlv28q0qp37kn27jggxlcpfh8vd"; }; buildInputs = [ mkfontscale mkfontdir ]; From bdc880e49df1515c92c2c9f4f2600d57ad7d686b Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Sat, 24 Dec 2016 22:57:25 +0100 Subject: [PATCH 62/97] flightgear: 3.4.0 -> 2016.4.3. --- .../development/libraries/simgear/default.nix | 10 ++-- pkgs/games/flightgear/default.nix | 47 ++++++++++++------- 2 files changed, 37 insertions(+), 20 deletions(-) diff --git a/pkgs/development/libraries/simgear/default.nix b/pkgs/development/libraries/simgear/default.nix index df732c40f57..aef1a1dc822 100644 --- a/pkgs/development/libraries/simgear/default.nix +++ b/pkgs/development/libraries/simgear/default.nix @@ -1,20 +1,22 @@ { stdenv, fetchurl, plib, freeglut, xproto, libX11, libXext, xextproto, libXi , inputproto, libICE, libSM, libXt, libXmu, mesa, boost, zlib, libjpeg, freealut , openscenegraph, openal, expat, cmake, apr +, curl }: stdenv.mkDerivation rec { name = "simgear-${version}"; - version = "3.4.0"; + version = "2016.4.3"; + shortVersion = "2016.4"; src = fetchurl { - url = "http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/${name}.tar.bz2"; - sha256 = "152q3aqlrg3631ppvl6kr1mp5iszplq68l6lrsn9vjxafbz6czcj"; + url = "mirror://sourceforge/flightgear/release-${shortVersion}/${name}.tar.bz2"; + sha256 = "1gfj0d03jbi0p08baj46ihhyzbgpymmipw2dp11j13412l15acv9"; }; buildInputs = [ plib freeglut xproto libX11 libXext xextproto libXi inputproto libICE libSM libXt libXmu mesa boost zlib libjpeg freealut - openscenegraph openal expat cmake apr ]; + openscenegraph openal expat cmake apr curl ]; meta = with stdenv.lib; { description = "Simulation construction toolkit"; diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix index b55a37e9985..1a1b3a10895 100644 --- a/pkgs/games/flightgear/default.nix +++ b/pkgs/games/flightgear/default.nix @@ -1,22 +1,36 @@ -{ stdenv, fetchurl +{ stdenv, fetchurl, makeWrapper , freeglut, freealut, mesa, libICE, libjpeg, openal, openscenegraph, plib , libSM, libunwind, libX11, xproto, libXext, xextproto, libXi, inputproto , libXmu, libXt, simgear, zlib, boost, cmake, libpng, udev, fltk13, apr , makeDesktopItem, qtbase }: +let + version = "2016.4.3"; + shortVersion = "2016.4"; + data = stdenv.mkDerivation rec { + name = "flightgear-base-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/flightgear/release-${shortVersion}/FlightGear-${version}-data.tar.bz2"; + sha256 = "1wy4fg6r79a635rrjy2a2a6jkz2p5zzahxs0hz7scgxg4ikb5xp4"; + }; + + phases = [ "installPhase" ]; + + installPhase = '' + mkdir -p "$out/share/FlightGear" + tar xf "${src}" -C "$out/share/FlightGear/" --strip-components=1 + ''; + }; +in stdenv.mkDerivation rec { - version = "3.4.0"; name = "flightgear-${version}"; + inherit version; src = fetchurl { - url = "http://ftp.igh.cnrs.fr/pub/flightgear/ftp/Source/${name}.tar.bz2"; - sha256 = "102pg7mahgxzypvyp76x363qy3a4gxavr4hj16gsha07nl2msr5m"; - }; - - datasrc = fetchurl { - url = "http://ftp.igh.cnrs.fr/pub/flightgear/ftp/Shared/FlightGear-data-${version}.tar.bz2"; - sha256 = "12qjvycizg693g5jj5qyp1jiwwywg6p9fg6j3zjxhx6r4g1sgvwc"; + url = "mirror://sourceforge/flightgear/release-${shortVersion}/${name}.tar.bz2"; + sha256 = "08i8dlia3aral2wwf72n5q5ji4vxj51bnn24g6prqjjy4qww9a9m"; }; # Of all the files in the source and data archives, there doesn't seem to be @@ -37,21 +51,22 @@ stdenv.mkDerivation rec { }; buildInputs = [ + makeWrapper freeglut freealut mesa libICE libjpeg openal openscenegraph plib libSM libunwind libX11 xproto libXext xextproto libXi inputproto libXmu libXt simgear zlib boost cmake libpng udev fltk13 apr qtbase ]; - preConfigure = '' - export cmakeFlagsArray=(-DFG_DATA_DIR="$out/share/FlightGear/") - ''; - postInstall = '' mkdir -p "$out/share/applications/" - cp "${desktopItem}"/share/applications/* "$out/share/applications/" + cp "${desktopItem}"/share/applications/* "$out/share/applications/" #*/ + + for f in $out/bin/* #*/ + do + wrapProgram $f --set FG_ROOT "${data}/share/FlightGear" + done + - mkdir -p "$out/share/FlightGear" - tar xvf "${datasrc}" -C "$out/share/FlightGear/" --strip-components=1 ''; meta = with stdenv.lib; { From 585c642bf8adf495d66e1f4ea6d96bc767730347 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 24 Dec 2016 01:44:10 +0100 Subject: [PATCH 63/97] docker: use upstream service file from package --- nixos/modules/virtualisation/docker.nix | 61 ++++++++----------------- 1 file changed, 20 insertions(+), 41 deletions(-) diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix index 8902799936c..92249573a4b 100644 --- a/nixos/modules/virtualisation/docker.nix +++ b/nixos/modules/virtualisation/docker.nix @@ -99,55 +99,34 @@ in ###### implementation - config = mkIf cfg.enable (mkMerge [ - { environment.systemPackages = [ pkgs.docker ]; + config = mkIf cfg.enable (mkMerge [{ + environment.systemPackages = [ pkgs.docker ]; users.extraGroups.docker.gid = config.ids.gids.docker; - # this unit follows the one provided by upstream see: https://github.com/docker/docker/blob/master/contrib/init/systemd/docker.service - # comments below reflect experience from upstream. + systemd.packages = [ pkgs.docker ]; + systemd.services.docker = { - description = "Docker Application Container Engine"; wantedBy = optional cfg.enableOnBoot "multi-user.target"; - after = [ "network.target" "docker.socket" ]; - requires = ["docker.socket"]; serviceConfig = { - # the default is not to use systemd for cgroups because the delegate issues still - # exists and systemd currently does not support the cgroup feature set required - # for containers run by docker - ExecStart = ''${pkgs.docker}/bin/dockerd \ - --group=docker \ - --host=fd:// \ - --log-driver=${cfg.logDriver} \ - ${optionalString (cfg.storageDriver != null) "--storage-driver=${cfg.storageDriver}"} \ - ${optionalString cfg.liveRestore "--live-restore" } \ - ${cfg.extraOptions} - ''; - Type="notify"; - ExecReload="${pkgs.procps}/bin/kill -s HUP $MAINPID"; - LimitNOFILE = 1048576; - # Having non-zero Limit*s causes performance problems due to accounting overhead - # in the kernel. We recommend using cgroups to do container-local accounting. - LimitNPROC="infinity"; - LimitCORE="infinity"; - TasksMax="infinity"; - TimeoutStartSec=0; - # set delegate yes so that systemd does not reset the cgroups of docker containers - Delegate="yes"; - # kill only the docker process, not all processes in the cgroup - KillMode="process"; + ExecStart = [ + "" + '' + ${pkgs.docker}/bin/dockerd \ + --group=docker \ + --host=fd:// \ + --log-driver=${cfg.logDriver} \ + ${optionalString (cfg.storageDriver != null) "--storage-driver=${cfg.storageDriver}"} \ + ${optionalString cfg.liveRestore "--live-restore" } \ + ${cfg.extraOptions} + '']; + ExecReload=[ + "" + "${pkgs.procps}/bin/kill -s HUP $MAINPID" + ]; } // proxy_env; path = [ pkgs.kmod ] ++ (optional (cfg.storageDriver == "zfs") pkgs.zfs); }; - systemd.sockets.docker = { - description = "Docker Socket for the API"; - wantedBy = [ "sockets.target" ]; - socketConfig = { - ListenStream = cfg.listenOptions; - SocketMode = "0660"; - SocketUser = "root"; - SocketGroup = "docker"; - }; - }; + systemd.sockets.docker.socketConfig.ListenStream = cfg.listenOptions; } ]); From 4c891ac6388eec03b047b0854ea9c9ea2fc246fc Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 25 Dec 2016 03:22:25 +0300 Subject: [PATCH 64/97] slade: init at 3.1.1.4 --- pkgs/applications/misc/slade/default.nix | 26 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/applications/misc/slade/default.nix diff --git a/pkgs/applications/misc/slade/default.nix b/pkgs/applications/misc/slade/default.nix new file mode 100644 index 00000000000..b50c2f18690 --- /dev/null +++ b/pkgs/applications/misc/slade/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, wxGTK, gtk2, sfml, fluidsynth, curl, freeimage, ftgl, glew, zip }: + +stdenv.mkDerivation rec { + name = "slade-${version}"; + version = "3.1.1.4"; + + src = fetchFromGitHub { + owner = "sirjuddington"; + repo = "SLADE"; + rev = version; + sha256 = "0c2yjkpcwxkid1wczmc9f16x1p40my8jv61jc93ldgjzcprmrpn8"; + }; + + nativeBuildInputs = [ cmake pkgconfig zip ]; + buildInputs = [ wxGTK gtk2 sfml fluidsynth curl freeimage ftgl glew ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Doom editor"; + homepage = "http://slade.mancubus.net/"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 20b8853a9c2..a0c98f9100d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1476,6 +1476,10 @@ in doomseeker = callPackage ../applications/misc/doomseeker { }; + slade = callPackage ../applications/misc/slade { + wxGTK = wxGTK30; + }; + drive = callPackage ../applications/networking/drive { }; driftnet = callPackage ../tools/networking/driftnet {}; From 6af6cec8b279efe864e1fd995aa95ca32bba504e Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 25 Dec 2016 01:59:11 +0100 Subject: [PATCH 65/97] Revert "thin-provisioning-tools: init at 0.6.1" This reverts commit 55b18ac486336da8f9bfe352afd3fac564b2671b. There is already a "thin-provisioning-tools" package (see cd1ec18b421c3dbbaabfc64f4f5d30371f84e7e1). Although this one was committed earlier, I'm reverting it because it's not only older, but it's unreferenced within . Apart from that the packaging of the other package is of higher packaging quality (maintainer and license, doesn't use "descriptionS", uses autoreconfHook). Signed-off-by: aszlig Cc: @globin, @dwe11er, @jagajaga Signed-off-by: aszlig --- .../linux/thin-provisioning-tools/default.nix | 30 ------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 32 deletions(-) delete mode 100644 pkgs/os-specific/linux/thin-provisioning-tools/default.nix diff --git a/pkgs/os-specific/linux/thin-provisioning-tools/default.nix b/pkgs/os-specific/linux/thin-provisioning-tools/default.nix deleted file mode 100644 index c075c3f1667..00000000000 --- a/pkgs/os-specific/linux/thin-provisioning-tools/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchFromGitHub, autoconf, pkgconfig, utillinux, coreutils, expat, libaio, boost}: - -let - version = "0.6.1"; -in - -stdenv.mkDerivation { - name = "thin-provisioning-tools-${version}"; - - src = fetchFromGitHub { - owner = "jthornber"; - repo = "thin-provisioning-tools"; - rev = "e46bdfd4cc6cdb13852de8aba4e3019425ab0a89"; - sha256 = "061rw33nw16g71ij05axl713wimawx54h2ggpqxvzy7iyi6lhdcm"; - }; - - nativeBuildInputs = [ autoconf pkgconfig expat libaio boost ]; - - preConfigure = - '' - autoconf - ''; - - meta = { - homepage = https://github.com/jthornber/thin-provisioning-tools; - descriptions = "Tools for manipulating the metadata of the device-mapper targets (dm-thin-pool, dm-cache, dm-era)"; - platforms = stdenv.lib.platforms.linux; - inherit version; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a0c98f9100d..c204a37c839 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11374,8 +11374,6 @@ in lvm2 = callPackage ../os-specific/linux/lvm2 { }; - thin_provisioning_tools = callPackage ../os-specific/linux/thin-provisioning-tools { }; - mbpfan = callPackage ../os-specific/linux/mbpfan { }; mdadm = callPackage ../os-specific/linux/mdadm { }; From e4f30acb14b5d7bce542a80d17a81298b65e7f1c Mon Sep 17 00:00:00 2001 From: Johannes Bornhold Date: Sun, 25 Dec 2016 04:58:31 +0100 Subject: [PATCH 66/97] dmd: Fix build for Darwin --- pkgs/development/compilers/dmd/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index 3435b94c32e..41162c4e50e 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -20,10 +20,6 @@ stdenv.mkDerivation rec { substituteInPlace src/dmd/posix.mak \ --replace g++ clang++ \ --replace MACOSX_DEPLOYMENT_TARGET MACOSX_DEPLOYMENT_TARGET_ - - # Was not able to compile on darwin due to "__inline_isnanl" - # being undefined. - substituteInPlace src/dmd/root/port.c --replace __inline_isnanl __inline_isnan ''; # Buid and install are based on http://wiki.dlang.org/Building_DMD From a216fc4ca9fbaf313f1f9d433fd4b219cfeba98f Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Sun, 25 Dec 2016 05:21:58 +0100 Subject: [PATCH 67/97] sonarr: 2.0.0.4409 -> 2.0.0.4427 (#21389) --- pkgs/servers/sonarr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix index 5deb3ea871b..a742249e794 100644 --- a/pkgs/servers/sonarr/default.nix +++ b/pkgs/servers/sonarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sonarr-${version}"; - version = "2.0.0.4409"; + version = "2.0.0.4427"; src = fetchurl { url = "http://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz"; - sha256 = "1kaj1m4ifby8liks8i7fsbgwbajaqwd96yindqp5maf2n6px2nw2"; + sha256 = "066jhvz57hxrcgn902z25a21sj87wiqz224fjzpk1lpxrylv4ac2"; }; buildInputs = [ From 5319587d872397ef2a8d59c34e205b3cc186c095 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 25 Dec 2016 10:40:57 +0100 Subject: [PATCH 68/97] pythonPackages.pandas: 0.19.1 -> 0.19.2 --- .../python-modules/pandas/default.nix | 91 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 72 +-------------- 2 files changed, 92 insertions(+), 71 deletions(-) create mode 100644 pkgs/development/python-modules/pandas/default.nix diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix new file mode 100644 index 00000000000..a923e553582 --- /dev/null +++ b/pkgs/development/python-modules/pandas/default.nix @@ -0,0 +1,91 @@ +{ buildPythonPackage +, python +, stdenv +, fetchurl +, nose +, glibcLocales +, cython +, dateutil +, scipy +, numexpr +, pytz +, xlrd +, bottleneck +, sqlalchemy +, lxml +, html5lib +, beautifulsoup4 +, openpyxl +, tables +, xlwt +, darwin ? {} +, libcxx ? null +}: + +let + inherit (stdenv.lib) optional optionalString concatStringsSep; + inherit (stdenv) isDarwin; +in buildPythonPackage rec { + pname = "pandas"; + version = "0.19.2"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; + sha256 = "6f0f4f598c2b16746803c8bafef7c721c57e4844da752d36240c0acf97658014"; + }; + + LC_ALL = "en_US.UTF-8"; + buildInputs = [ nose glibcLocales ] ++ optional isDarwin libcxx; + propagatedBuildInputs = [ + cython + dateutil + scipy + numexpr + pytz + xlrd + bottleneck + sqlalchemy + lxml + html5lib + beautifulsoup4 + openpyxl + tables + xlwt + ] ++ optional isDarwin darwin.locale; # provides the locale command + + # For OSX, we need to add a dependency on libcxx, which provides + # `complex.h` and other libraries that pandas depends on to build. + patchPhase = optionalString isDarwin '' + cpp_sdk="${libcxx}/include/c++/v1"; + echo "Adding $cpp_sdk to the setup.py common_include variable" + substituteInPlace setup.py \ + --replace "['pandas/src/klib', 'pandas/src']" \ + "['pandas/src/klib', 'pandas/src', '$cpp_sdk']" + + # disable clipboard tests since pbcopy/pbpaste are not open source + substituteInPlace pandas/io/tests/test_clipboard.py \ + --replace pandas.util.clipboard no_such_module \ + --replace OSError ImportError + ''; + + # The flag `-A 'not network'` will disable tests that use internet. + # The `-e` flag disables a few problematic tests. + + checkPhase = '' + runHook preCheck + # The flag `-w` provides the initial directory to search for tests. + # The flag `-A 'not network'` will disable tests that use internet. + nosetests -w $out/${python.sitePackages}/pandas --no-path-adjustment -A 'not slow and not network' --stop \ + --verbosity=3 + runHook postCheck + ''; + + meta = { + homepage = "http://pandas.pydata.org/"; + description = "Python Data Analysis Library"; + license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ raskin fridh ]; + platforms = stdenv.lib.platforms.unix; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b062d7d6233..5711faf65b6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17879,77 +17879,7 @@ in { }; }; - pandas = let - inherit (pkgs.stdenv.lib) optional optionalString; - inherit (pkgs.stdenv) isDarwin; - in buildPythonPackage rec { - name = "pandas-${version}"; - version = "0.19.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pandas/${name}.tar.gz"; - sha256 = "2509feaeda72fce03675e2eccd2284bb1cadb6a0737008a5e741fe2431d47421"; - }; - - LC_ALL = "en_US.UTF-8"; - buildInputs = with self; [ nose pkgs.glibcLocales ] ++ optional isDarwin pkgs.libcxx; - propagatedBuildInputs = with self; [ - cython - dateutil - scipy - numexpr - pytz - xlrd - bottleneck - sqlalchemy - lxml - html5lib - beautifulsoup4 - openpyxl - tables - xlwt - ] ++ optional isDarwin pkgs.darwin.locale; # provides the locale command - - # For OSX, we need to add a dependency on libcxx, which provides - # `complex.h` and other libraries that pandas depends on to build. - patchPhase = optionalString isDarwin '' - cpp_sdk="${pkgs.libcxx}/include/c++/v1"; - echo "Adding $cpp_sdk to the setup.py common_include variable" - substituteInPlace setup.py \ - --replace "['pandas/src/klib', 'pandas/src']" \ - "['pandas/src/klib', 'pandas/src', '$cpp_sdk']" - - # disable clipboard tests since pbcopy/pbpaste are not open source - substituteInPlace pandas/io/tests/test_clipboard.py \ - --replace pandas.util.clipboard no_such_module \ - --replace OSError ImportError - ''; - - # The flag `-A 'not network'` will disable tests that use internet. - # The `-e` flag disables a few problematic tests. - - # Disable two tests that are broken since numpy 1.11. Fixed upstream. - - checkPhase = let - testsToSkip = [ "test_range_slice_day" "test_range_slice_seconds" ]; - in '' - runHook preCheck - # The flag `-A 'not network'` will disable tests that use internet. - # The `-e` flag disables a few problematic tests. - ${python.executable} setup.py nosetests -A 'not slow and not network' --stop \ - -e '${concatStringsSep "|" testsToSkip}' --verbosity=3 - - runHook postCheck - ''; - - meta = { - homepage = "http://pandas.pydata.org/"; - description = "Python Data Analysis Library"; - license = licenses.bsd3; - maintainers = with maintainers; [ raskin fridh ]; - platforms = platforms.unix; - }; - }; + pandas = callPackage ../development/python-modules/pandas { }; xlrd = buildPythonPackage rec { name = "xlrd-${version}"; From 3d455ac9343fd4b9956e2bccd1d6b2a39d5a4eda Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 25 Dec 2016 10:41:36 +0100 Subject: [PATCH 69/97] pythonPackages.xlwt: 1.0.0 -> 1.1.2 --- .../python-modules/xlwt/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +---------- 2 files changed, 37 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/xlwt/default.nix diff --git a/pkgs/development/python-modules/xlwt/default.nix b/pkgs/development/python-modules/xlwt/default.nix new file mode 100644 index 00000000000..ffcdd5ee626 --- /dev/null +++ b/pkgs/development/python-modules/xlwt/default.nix @@ -0,0 +1,36 @@ +{ buildPythonPackage +, fetchurl +, fetchpatch +, nose +, lib +}: + +buildPythonPackage rec { + pname = "xlwt"; + name = "${pname}-${version}"; + version = "1.1.2"; + + src = fetchurl { + url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; + sha256 = "aed648c17731f40f84550dd2a1aaa53569f0cbcaf5610ba895cd2632587b723c"; + }; + + # re.LOCALE was removed in Python 3.6 + patches = [ + (fetchpatch { + url = "https://github.com/python-excel/xlwt/commit/86564ef26341020316cd8a27c704ef1dc5a6129b.patch"; + sha256 = "01abxfkmckcxpi6n5wi8ia58fmkzqrxjfjq1mjljygylm8nb3m8i"; + }) + ]; + + buildInputs = [ nose ]; + checkPhase = '' + nosetests -v + ''; + + meta = { + description = "Library to create spreadsheet files compatible with MS"; + homepage = https://github.com/python-excel/xlwt; + license = with lib.licenses; [ bsdOriginal bsd3 lgpl21 ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5711faf65b6..d83bd7b867e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -26796,26 +26796,7 @@ EOF }; }; - xlwt = buildPythonPackage rec { - name = "xlwt-${version}"; - version = "1.0.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/x/xlwt/${name}.tar.gz"; - sha256 = "1y8w5imsicp01gn749qhw6j0grh9y19zz57ribwaknn8xqwjjhxc"; - }; - - buildInputs = with self; [ nose ]; - checkPhase = '' - nosetests -v - ''; - - meta = { - description = "Library to create spreadsheet files compatible with MS"; - homepage = https://github.com/python-excel/xlwt; - license = with licenses; [ bsdOriginal bsd3 lgpl21 ]; - }; - }; + xlwt = callPackage ../development/python-modules/xlwt { }; youtube-dl = callPackage ../tools/misc/youtube-dl {}; From 916a37cd0e54517be9bccf155e6fa3ab133ee6e5 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 25 Dec 2016 11:10:00 +0100 Subject: [PATCH 70/97] libreoffice-fresh: 5.2.3.3 -> 5.2.4.2 --- .../libreoffice/default-primary-src.nix | 6 +-- .../office/libreoffice/default.nix | 4 +- .../office/libreoffice/libreoffice-srcs.nix | 40 +++++++++---------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pkgs/applications/office/libreoffice/default-primary-src.nix b/pkgs/applications/office/libreoffice/default-primary-src.nix index 52b81595e43..497d4305873 100644 --- a/pkgs/applications/office/libreoffice/default-primary-src.nix +++ b/pkgs/applications/office/libreoffice/default-primary-src.nix @@ -3,8 +3,8 @@ rec { major = "5"; minor = "2"; - patch = "3"; - tweak = "3"; + patch = "4"; + tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -12,6 +12,6 @@ rec { src = fetchurl { url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1h9j3j7drhr49nw2p6by5vvrr8nc8rpldn3yp724mwkb2rfkdwd8"; + sha256 = "047byvyg13baws1bycaq1s6wqhkcr2pk27xbag0npzx1lspx2wwb"; }; } diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index cbe159857eb..39d4688b639 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -42,14 +42,14 @@ let translations = fetchSrc { name = "translations"; - sha256 = "0j0ajli1cbfwbgzrcqkx3db174jv1fgm22ds0gqlgkci9cffa0c4"; + sha256 = "075f7jpp8qi6piwrw4n8inynvsgp0270pdd9jmc2fqv6j5gsn332"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "0fndi6cv8rw426c3l071z130ks9sqf6ca5yas7am9d666mmy4fs4"; + sha256 = "10p1xd077278gm3syd3lc54fzjsvrvzm0zr6csn9iq90kmlsgwzy"; }; }; diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix index bf9150b98ec..6cacff49fc6 100644 --- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix +++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix @@ -112,11 +112,11 @@ md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; } { - name = "curl-7.43.0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/curl-7.43.0.tar.bz2"; - sha256 = "baa654a1122530483ccc1c58cc112fec3724a82c11c6a389f1e6a37dc8858df9"; - md5 = "11bddbb452a8b766b932f859aaeeed39"; - md5name = "11bddbb452a8b766b932f859aaeeed39-curl-7.43.0.tar.bz2"; + name = "curl-7.51.0.tar.gz"; + url = "http://dev-www.libreoffice.org/src/curl-7.51.0.tar.gz"; + sha256 = "65b5216a6fbfa72f547eb7706ca5902d7400db9868269017a8888aa91d87977c"; + md5 = "490e19a8ccd1f4a244b50338a0eb9456"; + md5name = "490e19a8ccd1f4a244b50338a0eb9456-curl-7.51.0.tar.gz"; } { name = "libe-book-0.1.2.tar.bz2"; @@ -224,11 +224,11 @@ md5name = "c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.0000W.tar.gz"; } { - name = "source-code-font-1.009.tar.gz"; - url = "http://dev-www.libreoffice.org/src/0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz"; - sha256 = "9b295127164c81bcf28c7ebb687f1555b71796108b443a04d40202b7364e4cce"; - md5 = "0279a21fab6f245e85a6f85fea54f511"; - md5name = "0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz"; + name = "source-code-pro-2.030R-ro-1.050R-it.tar.gz"; + url = "http://dev-www.libreoffice.org/src/907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz"; + sha256 = "09466dce87653333f189acd8358c60c6736dcd95f042dee0b644bdcf65b6ae2f"; + md5 = "907d6e99f241876695c19ff3db0b8923"; + md5name = "907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz"; } { name = "source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; @@ -497,11 +497,11 @@ md5name = "a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz"; } { - name = "mdds-1.2.0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/mdds-1.2.0.tar.bz2"; - sha256 = "f44fd0635de94c7d490f9a65f74b5e55860d7bdd507951428294f9690fda45b6"; - md5 = "9f3383fb7bae825eab69f3a6ec1d74b2"; - md5name = "9f3383fb7bae825eab69f3a6ec1d74b2-mdds-1.2.0.tar.bz2"; + name = "mdds-1.2.2.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/mdds-1.2.2.tar.bz2"; + sha256 = "141e730b39110434b02cd844c5ad3442103f7c35f7e9a4d6a9f8af813594cc9d"; + md5 = "8855cf852a6088cfdc792c6f7ceb0243"; + md5name = "8855cf852a6088cfdc792c6f7ceb0243-mdds-1.2.2.tar.bz2"; } { name = "mDNSResponder-576.30.4.tar.gz"; @@ -546,11 +546,11 @@ md5name = "231adebe5c2f78fded3e3df6e958878e-neon-0.30.1.tar.gz"; } { - name = "nss-3.22.2-with-nspr-4.12.tar.gz"; - url = "http://dev-www.libreoffice.org/src/6b254cf2f8cb4b27a3f0b8b7b9966ea7-nss-3.22.2-with-nspr-4.12.tar.gz"; - sha256 = "7bc7e5483fc90071be5facd3043f94c69b153055a369c8f0b751ad374c5ae09e"; - md5 = "6b254cf2f8cb4b27a3f0b8b7b9966ea7"; - md5name = "6b254cf2f8cb4b27a3f0b8b7b9966ea7-nss-3.22.2-with-nspr-4.12.tar.gz"; + name = "nss-3.27-with-nspr-4.13.tar.gz"; + url = "http://dev-www.libreoffice.org/src/0e3eee39402386cf16fd7aaa7399ebef-nss-3.27-with-nspr-4.13.tar.gz"; + sha256 = "c74ad468ed5da0304b58ec56fa627fa388b256451b1a44fd184145c6d8203820"; + md5 = "0e3eee39402386cf16fd7aaa7399ebef"; + md5name = "0e3eee39402386cf16fd7aaa7399ebef-nss-3.27-with-nspr-4.13.tar.gz"; } { name = "libodfgen-0.1.6.tar.bz2"; From 352e167c224e5d98076ca9653d2124c351d969d1 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sun, 25 Dec 2016 10:11:06 +0000 Subject: [PATCH 71/97] exim: 4.87 -> 4.88 for CVE-2016-9963 --- pkgs/servers/mail/exim/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index 0918e308d26..68e3ad4ca42 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -1,11 +1,11 @@ { coreutils, fetchurl, db, openssl, pcre, perl, pkgconfig, stdenv }: stdenv.mkDerivation rec { - name = "exim-4.87"; + name = "exim-4.88"; src = fetchurl { - url = "http://mirror.switch.ch/ftp/mirror/exim/exim/exim4/${name}.tar.bz2"; - sha256 = "1jbxn13shq90kpn0s73qpjnx5xm8jrpwhcwwgqw5s6sdzw6iwsbl"; + url = "http://ftp.exim.org/pub/exim/exim4/${name}.tar.bz2"; + sha256 = "0bca3wb45hl7h8m8bpvsmrmqa07jhbhqyigs9pl29hhzwgbmz78i"; }; buildInputs = [ coreutils db openssl pcre perl pkgconfig ]; From bec479482014ad62df6ce6a2a8c3f7517db22647 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 25 Dec 2016 11:11:45 +0100 Subject: [PATCH 72/97] pythonPackages.u-msgpack-python: init at 2.3.0 --- .../u-msgpack-python/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/u-msgpack-python/default.nix diff --git a/pkgs/development/python-modules/u-msgpack-python/default.nix b/pkgs/development/python-modules/u-msgpack-python/default.nix new file mode 100644 index 00000000000..1daf30d883a --- /dev/null +++ b/pkgs/development/python-modules/u-msgpack-python/default.nix @@ -0,0 +1,32 @@ +{ buildPythonPackage +, lib +, fetchurl +, glibcLocales +}: + +let + pname = "u-msgpack-python"; + version = "2.3.0"; +in buildPythonPackage rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; + sha256 = "d8df6bb0e2a838aa227c39cfd14aa147ab32b3df6871001874e9b9da9ce1760c"; + }; + + LC_ALL="en_US.UTF-8"; + + buildInputs = [ glibcLocales ]; + + checkPhase = '' + python -m unittest discover + ''; + + meta = { + description = "A portable, lightweight MessagePack serializer and deserializer written in pure Python"; + homepage = https://github.com/vsergeev/u-msgpack-python; + license = lib.licenses.mit; + }; + +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d83bd7b867e..45fa07f619f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -25867,6 +25867,8 @@ in { }; }; + u-msgpack-python = callPackage ../development/python-modules/u-msgpack-python { }; + umalqurra = buildPythonPackage rec { name = "umalqurra-${version}"; version = "0.2"; From c1dd42e7d64dc86b96df4aeafbc944f322cf8121 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 25 Dec 2016 11:12:04 +0100 Subject: [PATCH 73/97] pythonPackages.webencodings: init at 0.5 --- .../python-modules/webencodings/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/webencodings/default.nix diff --git a/pkgs/development/python-modules/webencodings/default.nix b/pkgs/development/python-modules/webencodings/default.nix new file mode 100644 index 00000000000..54f3517ca00 --- /dev/null +++ b/pkgs/development/python-modules/webencodings/default.nix @@ -0,0 +1,29 @@ +{ buildPythonPackage +, lib +, fetchurl +, pytest +}: + +let + pname = "webencodings"; + version = "0.5"; +in buildPythonPackage rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; + sha256 = "a5c55ee93b24e740fe951c37b5c228dccc1f171450e188555a775261cce1b904"; + }; + + buildInputs = [ pytest ]; + + checkPhase = '' + py.test webencodings/tests.py + ''; + + meta = { + description = "Character encoding aliases for legacy web content"; + homepage = https://github.com/SimonSapin/python-webencodings; + license = lib.licenses.bsd3; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 45fa07f619f..47955ae0e57 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -26423,6 +26423,8 @@ EOF }; }; + webencodings = callPackage ../development/python-modules/webencodings { }; + websockets = callPackage ../development/python-modules/websockets { }; wand = buildPythonPackage rec { From 9f5e022663ebeb11b0e1300dfcc3fbd492c8e72b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 25 Dec 2016 11:12:19 +0100 Subject: [PATCH 74/97] pythonPackages.pytest_expect: init at 1.1.0 --- .../python-modules/pytest-expect/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/pytest-expect/default.nix diff --git a/pkgs/development/python-modules/pytest-expect/default.nix b/pkgs/development/python-modules/pytest-expect/default.nix new file mode 100644 index 00000000000..5abfd9423ac --- /dev/null +++ b/pkgs/development/python-modules/pytest-expect/default.nix @@ -0,0 +1,31 @@ +{ buildPythonPackage +, lib +, fetchurl +, pytest +, u-msgpack-python +, six +}: + +let + pname = "pytest-expect"; + version = "1.1.0"; +in buildPythonPackage rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; + sha256 = "36b4462704450798197d090809a05f4e13649d9cba9acdc557ce9517da1fd847"; + }; + + buildInputs = [ pytest ]; + propagatedBuildInputs = [ u-msgpack-python six ]; + + # Tests in neither the archive nor the repo + doCheck = false; + + meta = { + description = "py.test plugin to store test expectations and mark tests based on them"; + homepage = https://github.com/gsnedders/pytest-expect; + license = lib.licenses.mit; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 47955ae0e57..0105be4d972 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5247,6 +5247,8 @@ in { }; }); + pytest-expect = callPackage ../development/python-modules/pytest-expect { }; + pytest-virtualenv = buildPythonPackage rec { name = "${pname}-${version}"; pname = "pytest-virtualenv"; From 849f2d9e11541c7c580a03761bc8ef1f2c241c89 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 25 Dec 2016 11:12:37 +0100 Subject: [PATCH 75/97] pythonPackages.html5lib: fix missing buildInputs and tests --- pkgs/top-level/python-packages.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0105be4d972..1910e5f8bfa 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12514,12 +12514,14 @@ in { sha256 = "09j6194f5mlnd5xwbavwvnndwl1x91jw74shxl6hcxjp4fxg3h05"; }; - buildInputs = with self; [ nose flake8 ]; + buildInputs = with self; [ flake8 pytest pytest-expect mock ]; propagatedBuildInputs = with self; [ - six + six webencodings ] ++ optionals isPy26 [ ordereddict ]; - checkPhase = "nosetests"; + checkPhase = '' + py.test + ''; meta = { homepage = https://github.com/html5lib/html5lib-python; From 4383aa26f21a7bc344a4f08dcc987e96b8f86cde Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Sat, 24 Dec 2016 10:45:27 -0400 Subject: [PATCH 76/97] ats2 : advance to latest version 0.2.13 --- pkgs/development/compilers/ats2/default.nix | 8 +- .../installed-lib-directory-version.patch | 99 ------------------- 2 files changed, 3 insertions(+), 104 deletions(-) delete mode 100644 pkgs/development/compilers/ats2/installed-lib-directory-version.patch diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix index 97e95b29814..59ce006e835 100644 --- a/pkgs/development/compilers/ats2/default.nix +++ b/pkgs/development/compilers/ats2/default.nix @@ -3,11 +3,11 @@ , withContrib ? true }: let - versionPkg = "0.2.12" ; + versionPkg = "0.2.13" ; contrib = fetchurl { url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-contrib-${versionPkg}.tgz" ; - sha256 = "16jzabmwq5yz72dzlkc2hmvf2lan83gayn21gbl65jgpwdsbh170" ; + sha256 = "1hsqvdwiydks46sfjmm04rmjcx5v25xpjgnq0b96psrdbd0ky2kf" ; }; postInstallContrib = stdenv.lib.optionalString withContrib @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz"; - sha256 = "0m8gmm1pnklixxw76yjjqqqixm2cyp91rnq4sj1k29qp4k9zxpl4"; + sha256 = "01rkybkwgbpx6blv72n46ml9ii3p6kpxbpczsrpbjkqmf22b4vii"; }; buildInputs = [ gmp ]; @@ -45,8 +45,6 @@ stdenv.mkDerivation rec { builtins.toFile "setupHook.sh" (concatMapStringsSep "\n" builtins.readFile hookFiles); - patches = [ ./installed-lib-directory-version.patch ]; - postInstall = postInstallContrib + postInstallEmacs; meta = with stdenv.lib; { diff --git a/pkgs/development/compilers/ats2/installed-lib-directory-version.patch b/pkgs/development/compilers/ats2/installed-lib-directory-version.patch deleted file mode 100644 index 686df69299f..00000000000 --- a/pkgs/development/compilers/ats2/installed-lib-directory-version.patch +++ /dev/null @@ -1,99 +0,0 @@ -Change the name of the library directory to match the version of the package. - -diff -Naur ATS2-Postiats-0.2.12/configure postiats-new/configure ---- ATS2-Postiats-0.2.12/configure 2016-10-13 12:03:20.000000000 -0400 -+++ postiats-new/configure 2016-10-23 20:17:29.912579618 -0400 -@@ -1,6 +1,6 @@ - #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.69 for ATS2/Postiats 0.2.10. -+# Generated by GNU Autoconf 2.69 for ATS2/Postiats 0.2.12. - # - # Report bugs to . - # -@@ -580,8 +580,8 @@ - # Identity of this package. - PACKAGE_NAME='ATS2/Postiats' - PACKAGE_TARNAME='ats2-postiats' --PACKAGE_VERSION='0.2.10' --PACKAGE_STRING='ATS2/Postiats 0.2.10' -+PACKAGE_VERSION='0.2.12' -+PACKAGE_STRING='ATS2/Postiats 0.2.12' - PACKAGE_BUGREPORT='gmpostiats@gmail.com' - PACKAGE_URL='' - -@@ -1242,7 +1242,7 @@ - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat <<_ACEOF --\`configure' configures ATS2/Postiats 0.2.10 to adapt to many kinds of systems. -+\`configure' configures ATS2/Postiats 0.2.12 to adapt to many kinds of systems. - - Usage: $0 [OPTION]... [VAR=VALUE]... - -@@ -1304,7 +1304,7 @@ - - if test -n "$ac_init_help"; then - case $ac_init_help in -- short | recursive ) echo "Configuration of ATS2/Postiats 0.2.10:";; -+ short | recursive ) echo "Configuration of ATS2/Postiats 0.2.12:";; - esac - cat <<\_ACEOF - -@@ -1384,7 +1384,7 @@ - test -n "$ac_init_help" && exit $ac_status - if $ac_init_version; then - cat <<\_ACEOF --ATS2/Postiats configure 0.2.10 -+ATS2/Postiats configure 0.2.12 - generated by GNU Autoconf 2.69 - - Copyright (C) 2012 Free Software Foundation, Inc. -@@ -1936,7 +1936,7 @@ - This file contains any messages produced by compilers while - running configure, to aid debugging if configure makes a mistake. - --It was created by ATS2/Postiats $as_me 0.2.10, which was -+It was created by ATS2/Postiats $as_me 0.2.12, which was - generated by GNU Autoconf 2.69. Invocation command line was - - $ $0 $@ -@@ -4226,7 +4226,7 @@ - # report actual input values of CONFIG_FILES etc. instead of their - # values after options handling. - ac_log=" --This file was extended by ATS2/Postiats $as_me 0.2.10, which was -+This file was extended by ATS2/Postiats $as_me 0.2.12, which was - generated by GNU Autoconf 2.69. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES -@@ -4288,7 +4288,7 @@ - cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" - ac_cs_version="\\ --ATS2/Postiats config.status 0.2.10 -+ATS2/Postiats config.status 0.2.12 - configured by $0, generated by GNU Autoconf 2.69, - with options \\"\$ac_cs_config\\" - -diff -Naur ATS2-Postiats-0.2.12/src/CBOOT/config.h postiats-new/src/CBOOT/config.h ---- ATS2-Postiats-0.2.12/src/CBOOT/config.h 2016-10-13 12:03:20.000000000 -0400 -+++ postiats-new/src/CBOOT/config.h 2016-10-23 20:16:34.613836556 -0400 -@@ -44,7 +44,7 @@ - #define PACKAGE_NAME "ATS2/Postiats" - - /* Define to the full name and version of this package. */ --#define PACKAGE_STRING "ATS2/Postiats 0.2.10" -+#define PACKAGE_STRING "ATS2/Postiats 0.2.12" - - /* Define to the one symbol short name of this package. */ - #define PACKAGE_TARNAME "ats2-postiats" -@@ -53,7 +53,7 @@ - #define PACKAGE_URL "" - - /* Define to the version of this package. */ --#define PACKAGE_VERSION "0.2.10" -+#define PACKAGE_VERSION "0.2.12" - - /* The size of `void*', as computed by sizeof. */ - #define SIZEOF_VOIDP 8 From f3287b0aa53e9ff4ec61b3d8d5ed52f193540506 Mon Sep 17 00:00:00 2001 From: taku0 Date: Sun, 25 Dec 2016 20:32:24 +0900 Subject: [PATCH 77/97] flashplayer: 11.2.202.644 -> 24.0.0.186 [Critical security fix] (#21337) * flashplayer: 11.2.202.644 -> 24.0.0.186 * flashplayer: add debug version * flashplayer-standalone: 11.2.202.644 -> 24.0.0.186 --- .../mozilla-plugins/flashplayer/default.nix | 146 ++++++++++++++++++ .../flashplayer/standalone.nix | 110 +++++++++++++ pkgs/top-level/all-packages.nix | 12 +- 3 files changed, 264 insertions(+), 4 deletions(-) create mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix create mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix new file mode 100644 index 00000000000..d199ea3ece3 --- /dev/null +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -0,0 +1,146 @@ +{ stdenv +, lib +, fetchurl +, alsaLib +, atk +, bzip2 +, cairo +, curl +, expat +, fontconfig +, freetype +, gdk_pixbuf +, glib +, glibc +, graphite2 +, gtk2 +, harfbuzz +, libICE +, libSM +, libX11 +, libXau +, libXcomposite +, libXcursor +, libXdamage +, libXdmcp +, libXext +, libXfixes +, libXi +, libXinerama +, libXrandr +, libXrender +, libXt +, libXxf86vm +, libdrm +, libffi +, libpng +, libvdpau +, libxcb +, libxshmfence +, nspr +, nss +, pango +, pcre +, pixman +, zlib +, unzip +, debug ? false + +/* you have to add ~/mm.cfg : + + TraceOutputFileEnable=1 + ErrorReportingEnable=1 + MaxWarnings=1 + + in order to read the flash trace at ~/.macromedia/Flash_Player/Logs/flashlog.txt + Then FlashBug (a FireFox plugin) shows the log as well +*/ + +}: + +let + arch = + if stdenv.system == "x86_64-linux" then + "x86_64" + else if stdenv.system == "i686-linux" then + "i386" + else throw "Flash Player is not supported on this platform"; + lib_suffix = + if stdenv.system == "x86_64-linux" then + "64" + else + ""; +in +stdenv.mkDerivation rec { + name = "flashplayer-${version}"; + version = "24.0.0.186"; + + src = fetchurl { + url = + if debug then + "https://fpdownload.macromedia.com/pub/flashplayer/updaters/24/flash_player_npapi_linux_debug.${arch}.tar.gz" + else + "https://fpdownload.adobe.com/get/flashplayer/pdc/${version}/flash_player_npapi_linux.${arch}.tar.gz"; + sha256 = + if debug then + if arch == "x86_64" then + "0i7c861n42vb2zd9hnp26lxjakkv0fxp53smcwzc9xhdbjr14ail" + else + "0gj59iinh8gbjm5bn24qi3niyvi8x6byyc1sa6qvqkvjwh1ckdi3" + else + if arch == "x86_64" then + "0qs6hx31p1q2zqsr8jcf7niwsp6nncpqs3igb6l9f9fi0a8va8f7" + else + "1zcinq7629bgbashx25krby8r91sag2v8382q620951iiww06n1v"; + }; + + nativeBuildInputs = [ unzip ]; + + sourceRoot = "."; + + dontStrip = true; + dontPatchELF = true; + + preferLocalBuild = true; + + installPhase = '' + mkdir -p $out/lib/mozilla/plugins + cp -pv libflashplayer.so $out/lib/mozilla/plugins + + mkdir -p $out/bin + cp -pv usr/bin/flash-player-properties $out/bin + + mkdir -p $out/lib${lib_suffix}/kde4 + cp -pv usr/lib${lib_suffix}/kde4/kcm_adobe_flash_player.so $out/lib${lib_suffix}/kde4 + + patchelf --set-rpath "$rpath" \ + $out/lib/mozilla/plugins/libflashplayer.so \ + $out/lib${lib_suffix}/kde4/kcm_adobe_flash_player.so + + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-rpath "$rpath" \ + $out/bin/flash-player-properties + ''; + + passthru = { + mozillaPlugin = "/lib/mozilla/plugins"; + }; + + rpath = lib.makeLibraryPath + [ stdenv.cc.cc + alsaLib atk bzip2 cairo curl expat fontconfig freetype gdk_pixbuf glib + glibc graphite2 gtk2 harfbuzz libICE libSM libX11 libXau libXcomposite + libXcursor libXdamage libXdmcp libXext libXfixes libXi libXinerama + libXrandr libXrender libXt libXxf86vm libdrm libffi libpng libvdpau + libxcb libxshmfence nspr nss pango pcre pixman zlib + ]; + + meta = { + description = "Adobe Flash Player browser plugin"; + homepage = http://www.adobe.com/products/flashplayer/; + license = stdenv.lib.licenses.unfree; + maintainers = []; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix new file mode 100644 index 00000000000..c9de87f1b25 --- /dev/null +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -0,0 +1,110 @@ +{ stdenv +, lib +, fetchurl +, alsaLib +, atk +, bzip2 +, cairo +, curl +, expat +, fontconfig +, freetype +, gdk_pixbuf +, glib +, glibc +, graphite2 +, gtk2 +, harfbuzz +, libICE +, libSM +, libX11 +, libXau +, libXcomposite +, libXcursor +, libXdamage +, libXdmcp +, libXext +, libXfixes +, libXi +, libXinerama +, libXrandr +, libXrender +, libXt +, libXxf86vm +, libdrm +, libffi +, libpng +, libvdpau +, libxcb +, libxshmfence +, nspr +, nss +, pango +, pcre +, pixman +, zlib +, unzip +, debug ? false +}: + +let + arch = + if stdenv.system == "x86_64-linux" then + "x86_64" + else if stdenv.system == "i686-linux" then + "i386" + else throw "Flash Player is not supported on this platform"; +in +stdenv.mkDerivation rec { + name = "flashplayer-standalone-${version}"; + version = "24.0.0.186"; + + src = fetchurl { + url = + if debug then + "https://fpdownload.macromedia.com/pub/flashplayer/updaters/24/flash_player_sa_linux_debug.x86_64.tar.gz" + else + "https://fpdownload.macromedia.com/pub/flashplayer/updaters/24/flash_player_sa_linux.x86_64.tar.gz"; + sha256 = + if debug then + "09653jphzijk3w3dcd05f4pya1ciaymna31qqrmcwhxa0ginxhz2" + else + "0q0wc2lgjzi1v4lpcr5x5nszigli3vsryfq2zk4qq4pqy3i6aq7q"; + }; + + nativeBuildInputs = [ unzip ]; + + sourceRoot = "."; + + dontStrip = true; + dontPatchELF = true; + + preferLocalBuild = true; + + installPhase = '' + mkdir -p $out/bin + cp -pv flashplayer${lib.optionalString debug "debugger"} $out/bin + + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-rpath "$rpath" \ + $out/bin/flashplayer${lib.optionalString debug "debugger"} + ''; + + rpath = lib.makeLibraryPath + [ stdenv.cc.cc + alsaLib atk bzip2 cairo curl expat fontconfig freetype gdk_pixbuf glib + glibc graphite2 gtk2 harfbuzz libICE libSM libX11 libXau libXcomposite + libXcursor libXdamage libXdmcp libXext libXfixes libXi libXinerama + libXrandr libXrender libXt libXxf86vm libdrm libffi libpng libvdpau + libxcb libxshmfence nspr nss pango pcre pixman zlib + ]; + + meta = { + description = "Adobe Flash Player standalone executable"; + homepage = https://www.adobe.com/support/flashplayer/debug_downloads.html; + license = stdenv.lib.licenses.unfree; + maintainers = []; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c204a37c839..3739c89f651 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13151,13 +13151,17 @@ in flac = callPackage ../applications/audio/flac { }; - flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer-11 { - debug = config.flashplayer.debug or false; + flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer { + debug = config.flashplayer.debug or false; }; - flashplayer-standalone = pkgsi686Linux.flashplayer.sa; + flashplayer-standalone = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix { + debug = config.flashplayer.debug or false; + }; - flashplayer-standalone-debugger = (pkgsi686Linux.flashplayer.override { debug = true; }).sa; + flashplayer-standalone-debugger = flashplayer-standalone.override { + debug = true; + }; fluxbox = callPackage ../applications/window-managers/fluxbox { }; From a623ada9121c73833ef8dabeeb2e616a585d1b96 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sun, 25 Dec 2016 11:33:16 +0000 Subject: [PATCH 78/97] flashplayer: removed obsolete files --- .../flashplayer-11/default.nix | 134 ------------------ 1 file changed, 134 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix deleted file mode 100644 index 17168241ed9..00000000000 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ /dev/null @@ -1,134 +0,0 @@ -{ stdenv -, lib -, fetchurl -, zlib -, alsaLib -, curl -, nspr -, fontconfig -, freetype -, expat -, libX11 -, libXext -, libXrender -, libXcursor -, libXt -, libvdpau -, gtk2 -, glib -, pango -, cairo -, atk -, gdk_pixbuf -, nss -, unzip -, debug ? false - -/* you have to add ~/mm.cfg : - - TraceOutputFileEnable=1 - ErrorReportingEnable=1 - MaxWarnings=1 - - in order to read the flash trace at ~/.macromedia/Flash_Player/Logs/flashlog.txt - Then FlashBug (a FireFox plugin) shows the log as well -*/ - -}: - -/* When updating this package, test that the following derivations build: - - * flashplayer - * flashplayer-standalone - * flashplayer-standalone-debugger -*/ - -let - arch = - if stdenv.system == "x86_64-linux" then - if debug then throw "no x86_64 debugging version available" - else "64bit" - else if stdenv.system == "i686-linux" then - if debug then "32bit_debug" - else "32bit" - else throw "Flash Player is not supported on this platform"; - - suffix = - if stdenv.system == "x86_64-linux" then - if debug then throw "no x86_64 debugging version available" - else "_linux.x86_64" - else if stdenv.system == "i686-linux" then - if debug then "_linux_debug.i386" - else "_linux.i386" - else throw "Flash Player is not supported on this platform"; - - saname = - if debug then "flashplayerdebugger" - else "flashplayer"; - - is-i686 = (stdenv.system == "i686-linux"); -in -stdenv.mkDerivation rec { - name = "flashplayer-${version}"; - version = "11.2.202.644"; - - src = fetchurl { - url = "https://fpdownload.macromedia.com/pub/flashplayer/installers/archive/fp_${version}_archive.zip"; - sha256 = "0hf0hwg4kvz99g9d2arg5dwm3nx0hjnpngz9ay1mihhgjksy585b"; - }; - - nativeBuildInputs = [ unzip ]; - - sourceRoot = "."; - - postUnpack = '' - cd *${arch} - - tar -xvzf *${suffix}.tar.gz - - ${lib.optionalString is-i686 '' - tar -xvzf *_sa[_.]*.tar.gz - ''} - ''; - - dontStrip = true; - dontPatchELF = true; - - preferLocalBuild = true; - - outputs = [ "out" ] ++ lib.optional is-i686 "sa"; - - installPhase = '' - mkdir -p $out/lib/mozilla/plugins - cp -pv libflashplayer.so $out/lib/mozilla/plugins - - patchelf --set-rpath "$rpath" $out/lib/mozilla/plugins/libflashplayer.so - - ${lib.optionalString is-i686 '' - install -Dm755 ${saname} $sa/bin/flashplayer - - patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - --set-rpath "$rpath" \ - $sa/bin/flashplayer - ''} - ''; - - passthru = { - mozillaPlugin = "/lib/mozilla/plugins"; - }; - - rpath = lib.makeLibraryPath - [ zlib alsaLib curl nspr fontconfig freetype expat libX11 - libXext libXrender libXcursor libXt gtk2 glib pango atk cairo gdk_pixbuf - libvdpau nss - ]; - - meta = { - description = "Adobe Flash Player browser plugin"; - homepage = http://www.adobe.com/products/flashplayer/; - license = stdenv.lib.licenses.unfree; - maintainers = []; - platforms = [ "x86_64-linux" "i686-linux" ]; - }; -} From 77d495b078e30807948e11a3ae3c42c992149025 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Sun, 25 Dec 2016 12:35:47 +0100 Subject: [PATCH 79/97] gitlab-runner: 1.8.0 -> 1.9.0 (#21375) --- .../continuous-integration/gitlab-runner/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 2a546c8c907..1338201b996 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }: let - version = "1.8.0"; + version = "1.9.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz"; - sha256 = "0fa8hfdxg903n1dqrqbm4069sr8rq6zx7zzybfyj7qz4mmayp24m"; + sha256 = "12hcpvc0j6g200qhz12gfsslngbqx4sifrikr05vh2av17hba25s"; }; docker_arm = fetchurl { url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz"; - sha256 = "1rvvz34rsjxrgg59rda6v4k8zw16slwprnh4h5b16yhyp7lcx93q"; + sha256 = "1hqwhg94g514g0ad4h0h7wh7k5clm9i7whzr6c30i8yb00ga628s"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-ci-multi-runner"; rev = "v${version}"; - sha256 = "0svmy2dc4h6jll80y8j2ml7k0a9krknsp9d0zpsfkw3wcz1wfipl"; + sha256 = "1b30daxnpn1psy3vds1m4mnbl2hmvr2bc0zrd3nn9xm3xacm3dqj"; }; buildInputs = [ go-bindata ]; @@ -57,7 +57,7 @@ buildGoPackage rec { ''; meta = with lib; { - description = "GitLab Runner the continous integration executor of GitLab"; + description = "GitLab Runner the continuous integration executor of GitLab"; license = licenses.mit; homepage = "https://about.gitlab.com/gitlab-ci/"; platforms = platforms.unix; From 7cd5ef772b891668e220561ff0e00088ae235cd0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 25 Dec 2016 12:47:09 +0100 Subject: [PATCH 80/97] rocksdb-haskell: enable Hydra builds on Darwin https://github.com/NixOS/cabal2nix/commit/ac3ba017bd4407bdc1e5d4565d8f9c5c9db5eff0 tells the automatic re-generation process to do the same thing in the next update. Required by https://github.com/NixOS/nixpkgs/issues/21215. --- pkgs/development/haskell-modules/hackage-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 7784f79b830..8b917a56a90 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -149841,7 +149841,6 @@ self: { homepage = "http://github.com/agrafix/rocksdb-haskell"; description = "Haskell bindings to RocksDB"; license = stdenv.lib.licenses.bsd3; - platforms = [ "x86_64-linux" ]; }) {inherit (pkgs) rocksdb;}; "roguestar" = callPackage From b20fdff5214e760205f7fccbce6848c545f12b0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Fri, 23 Dec 2016 17:42:05 +0100 Subject: [PATCH 81/97] nixos/prometheus: make scrapeConfigs.*.static_configs.*.labels optional ...by providing a default value of "no labels" (an empty attrset). Without this change we get $ nixos-rebuild test -I nixpkgs=. building Nix... building the system configuration... error: The option `services.prometheus.scrapeConfigs.[definition 1-entry 1].static_configs.[definition 1-entry 1].labels' is used but not defined. which is unneeded, because labels _are_ optional. --- nixos/modules/services/monitoring/prometheus/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix index d692dd5fc79..a07445ce167 100644 --- a/nixos/modules/services/monitoring/prometheus/default.nix +++ b/nixos/modules/services/monitoring/prometheus/default.nix @@ -191,6 +191,7 @@ let }; labels = mkOption { type = types.attrsOf types.str; + default = {}; description = '' Labels assigned to all metrics scraped from the targets. ''; From 426b2ed9c8233356695d27398bd2d19f6b2eacf7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 25 Dec 2016 16:17:33 +0100 Subject: [PATCH 82/97] pythonPackages.u-msgpack-python: use python.interpreter --- pkgs/development/python-modules/u-msgpack-python/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/u-msgpack-python/default.nix b/pkgs/development/python-modules/u-msgpack-python/default.nix index 1daf30d883a..34d88d74c55 100644 --- a/pkgs/development/python-modules/u-msgpack-python/default.nix +++ b/pkgs/development/python-modules/u-msgpack-python/default.nix @@ -2,6 +2,7 @@ , lib , fetchurl , glibcLocales +, python }: let @@ -20,7 +21,7 @@ in buildPythonPackage rec { buildInputs = [ glibcLocales ]; checkPhase = '' - python -m unittest discover + ${python.interpreter} -m unittest discover ''; meta = { @@ -29,4 +30,4 @@ in buildPythonPackage rec { license = lib.licenses.mit; }; -} \ No newline at end of file +} From 63b0c9d5eacd3fc0e550327cd4c52ed6284c7119 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 25 Dec 2016 16:36:12 +0100 Subject: [PATCH 83/97] pythonPackages.txaio: 2.5.1 -> 2.5.2 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1910e5f8bfa..de5a4a91a32 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -31379,7 +31379,7 @@ EOF txaio = buildPythonPackage rec { name = "${pname}-${version}"; pname = "txaio"; - version = "2.5.1"; + version = "2.5.2"; meta = { description = "Utilities to support code that runs unmodified on Twisted and asyncio."; @@ -31398,7 +31398,7 @@ EOF src = pkgs.fetchurl { url = "mirror://pypi/t/${pname}/${name}.tar.gz"; - sha256 = "1pni1m66mlmbybmaf3py4h7cpkmkssqb5l3rigkxvql2f53pcl32"; + sha256 = "321d441b336447b72dbe81a4d73470414454baf0543ec701fcfecbf4dcbda0fe"; }; }; From 8916131012fd7f9931f61b0d6b348e1d2b23e259 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 25 Dec 2016 16:37:51 +0100 Subject: [PATCH 84/97] pythonPackages.xlwt: fix patch hash --- pkgs/development/python-modules/xlwt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/xlwt/default.nix b/pkgs/development/python-modules/xlwt/default.nix index ffcdd5ee626..01f920a387a 100644 --- a/pkgs/development/python-modules/xlwt/default.nix +++ b/pkgs/development/python-modules/xlwt/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { patches = [ (fetchpatch { url = "https://github.com/python-excel/xlwt/commit/86564ef26341020316cd8a27c704ef1dc5a6129b.patch"; - sha256 = "01abxfkmckcxpi6n5wi8ia58fmkzqrxjfjq1mjljygylm8nb3m8i"; + sha256 = "0ifavfld3rrqjb0iyriy4c0drw31gszvlg3nmnn9dmfsh91vxhs6"; }) ]; From 2469d0bd28ee98742efcc8407876c4d3c0123260 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 25 Dec 2016 16:42:49 +0100 Subject: [PATCH 85/97] pythonPackages.buttersink: only with python 2.x --- pkgs/top-level/python-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index de5a4a91a32..0f7c4c44ff1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2229,6 +2229,9 @@ in { url = "mirror://pypi/b/buttersink/${name}.tar.gz"; }; + # Python 2 syntax + disabled = isPy3k; + meta = { description = "Synchronise btrfs snapshots"; longDescription = '' From f2df4cef5cd673b578eceed1ec4d848c5f13509d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 25 Dec 2016 16:48:14 +0100 Subject: [PATCH 86/97] pythonPackages.xgboost: only with Python 3.x --- pkgs/top-level/python-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0f7c4c44ff1..9af257a0088 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -30140,6 +30140,9 @@ EOF propagatedBuildInputs = with self; [ scipy ]; buildInputs = with self; [ nose ]; + # Cannot be installed with Python 2.x, most likely due to the patch below. + disabled = !isPy3k; + postPatch = '' cd python-package From 277080fea0d2cf5017e4179a23e370307502c677 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 25 Dec 2016 17:25:18 +0100 Subject: [PATCH 87/97] openssh: security 7.3p1 -> 7.4p1 The two removed patches were for issues that should've been fixed. Minor vulnerabilities addressed: CVE-2016-{10009,10010,10011,10012}. https://www.openssh.com/txt/release-7.4 --- ...H-1380296-NEWKEYS-null-pointer-deref.patch | 37 ------------------- pkgs/tools/networking/openssh/default.nix | 6 +-- .../openssh/fix-CVE-2016-8858.patch | 11 ------ 3 files changed, 2 insertions(+), 52 deletions(-) delete mode 100644 pkgs/tools/networking/openssh/RH-1380296-NEWKEYS-null-pointer-deref.patch delete mode 100644 pkgs/tools/networking/openssh/fix-CVE-2016-8858.patch diff --git a/pkgs/tools/networking/openssh/RH-1380296-NEWKEYS-null-pointer-deref.patch b/pkgs/tools/networking/openssh/RH-1380296-NEWKEYS-null-pointer-deref.patch deleted file mode 100644 index 665eff86453..00000000000 --- a/pkgs/tools/networking/openssh/RH-1380296-NEWKEYS-null-pointer-deref.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/kex.c b/kex.c -index 50c7a0f..823668b 100644 ---- a/kex.c -+++ b/kex.c -@@ -419,6 +419,8 @@ kex_input_newkeys(int type, u_int32_t seq, void *ctxt) - ssh_dispatch_set(ssh, SSH2_MSG_NEWKEYS, &kex_protocol_error); - if ((r = sshpkt_get_end(ssh)) != 0) - return r; -+ if ((r = ssh_set_newkeys(ssh, MODE_IN)) != 0) -+ return r; - kex->done = 1; - sshbuf_reset(kex->peer); - /* sshbuf_reset(kex->my); */ -diff --git a/packet.c b/packet.c -index d6dad2d..f96566b 100644 ---- a/packet.c -+++ b/packet.c -@@ -38,7 +38,7 @@ - */ - - #include "includes.h" -- -+ - #include /* MIN roundup */ - #include - #include "openbsd-compat/sys-queue.h" -@@ -1907,9 +1907,7 @@ ssh_packet_read_poll2(struct ssh *ssh, u_char *typep, u_int32_t *seqnr_p) - return r; - return SSH_ERR_PROTOCOL_ERROR; - } -- if (*typep == SSH2_MSG_NEWKEYS) -- r = ssh_set_newkeys(ssh, MODE_IN); -- else if (*typep == SSH2_MSG_USERAUTH_SUCCESS && !state->server_side) -+ if (*typep == SSH2_MSG_USERAUTH_SUCCESS && !state->server_side) - r = ssh_packet_enable_delayed_compress(ssh); - else - r = 0; diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 064f68947b8..ce323bae4e7 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -29,11 +29,11 @@ stdenv.mkDerivation rec { # Please ensure that openssh_with_kerberos still builds when # bumping the version here! name = "openssh-${version}"; - version = "7.3p1"; + version = "7.4p1"; src = fetchurl { url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz"; - sha256 = "1k5y1wi29d47cgizbryxrhc1fbjsba2x8l5mqfa9b9nadnd9iyrz"; + sha256 = "1l8r3x4fr2kb6xm95s7kjdif1wp6f94d4kljh4qjj9109shw87qv"; }; prePatch = optionalString hpnSupport @@ -44,13 +44,11 @@ stdenv.mkDerivation rec { patches = [ - ./RH-1380296-NEWKEYS-null-pointer-deref.patch ./locale_archive.patch ./fix-host-key-algorithms-plus.patch # See discussion in https://github.com/NixOS/nixpkgs/pull/16966 ./dont_create_privsep_path.patch - ./fix-CVE-2016-8858.patch ] ++ optional withGssapiPatches gssapiSrc; diff --git a/pkgs/tools/networking/openssh/fix-CVE-2016-8858.patch b/pkgs/tools/networking/openssh/fix-CVE-2016-8858.patch deleted file mode 100644 index e526161083c..00000000000 --- a/pkgs/tools/networking/openssh/fix-CVE-2016-8858.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -u -r1.126 -r1.127 ---- ssh/kex.c 2016/09/28 21:44:52 1.126 -+++ ssh/kex.c 2016/10/10 19:28:48 1.127 -@@ -461,6 +461,7 @@ - if (kex == NULL) - return SSH_ERR_INVALID_ARGUMENT; - -+ ssh_dispatch_set(ssh, SSH2_MSG_KEXINIT, NULL); - ptr = sshpkt_ptr(ssh, &dlen); - if ((r = sshbuf_put(kex->peer, ptr, dlen)) != 0) - return r; From 683f25522dea2e0a3667f344657fa604c46a05e9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 25 Dec 2016 18:54:27 +0100 Subject: [PATCH 88/97] pythonPackages.datrie: add missing dependencies --- 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 9af257a0088..ef173c6b111 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5457,6 +5457,8 @@ in { url = "mirror://pypi/d/datrie/datrie-${version}.tar.gz"; sha256 = "08r0if7dry2q7p34gf7ffyrlnf4bdvnprxgydlfxgfnvq8f3f4bs"; }; + + buildInputs = with self; [ pytest pytestrunner hypothesis ]; meta = { description = "Super-fast, efficiently stored Trie for Python"; homepage = "https://github.com/kmike/datrie"; From 6cf9b1c970c84590175c9a27e6f67c3b5c4e7106 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 25 Dec 2016 18:58:11 +0100 Subject: [PATCH 89/97] pythonPackages.magic: 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 ef173c6b111..25da69df726 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14064,6 +14064,7 @@ in { meta = { description = "A Python wrapper around libmagic"; homepage = http://www.darwinsys.com/file/; + broken = true; }; }; From c9e642c549f9569c08e0f5dffb8c0c11ff343a6f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 25 Dec 2016 19:03:03 +0100 Subject: [PATCH 90/97] pythonPackages.zipfile36: disable on python 2.x --- pkgs/top-level/python-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 25da69df726..86e72ed5cca 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -31690,6 +31690,10 @@ EOF ${python.interpreter} -m unittest test_zipfile.py ''; + # Only works with Python 3.x. + # Not supposed to be used with 3.6 and up. + disabled = !(isPy3k && (pythonOlder "3.6")); + meta = { description = "Read and write ZIP files - backport of the zipfile module from Python 3.6"; homepage = https://gitlab.com/takluyver/zipfile36; From 925c59745766c598de32e236a57b93f75fe18223 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 25 Dec 2016 19:20:34 +0100 Subject: [PATCH 91/97] pythonPackages.mwclient: 0.8.1 -> 0.8.3 and fix tests. cc @DamienCassou --- pkgs/top-level/python-packages.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 86e72ed5cca..7ca61ccbf4d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15084,18 +15084,20 @@ in { }; mwclient = buildPythonPackage rec { - version = "0.8.1"; - basename = "mwclient"; - name = "${basename}-${version}"; + version = "0.8.3"; + pname = "mwclient"; + name = "${pname}-${version}"; - src = pkgs.fetchurl { - url = "mirror://pypi/m/${basename}/${name}.tar.gz"; - sha256 = "1r322v6i6xps9xh861rbr4ggshydcgp8cycbdlmgy8qbrh8jg2az"; + src = pkgs.fetchFromGitHub { + owner = "mwclient"; + repo = "mwclient"; + rev = "v${version}"; + sha256 = "0kl1yp9z5f1wl6lkm0vix87zkrbl9wcmkrrj1x5c35xvf95laf53"; }; buildInputs = with self; [ mock responses pytestcov pytest pytestcache pytestpep8 coverage ]; - propagatedBuildInputs = with self; [ six requests2 ]; + propagatedBuildInputs = with self; [ six requests2 requests_oauthlib ]; checkPhase = '' py.test @@ -15105,6 +15107,7 @@ in { description = "Python client library to the MediaWiki API"; maintainers = with maintainers; [ DamienCassou ]; license = licenses.mit; + homepage = https://github.com/mwclient/mwclient; }; }; From 7b2a37f5c8fab26c23907072fe44ac41e2317fc3 Mon Sep 17 00:00:00 2001 From: Eric Litak Date: Sun, 25 Dec 2016 11:04:47 -0800 Subject: [PATCH 92/97] remmina: add icon packages as soft deps (#21411) --- pkgs/applications/networking/remote/remmina/default.nix | 7 +++++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 2b157604f48..fe097af9c75 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -4,7 +4,10 @@ , pcre, webkitgtk, libdbusmenu-gtk3, libappindicator-gtk3 , libvncserver, libpthreadstubs, libXdmcp, libxkbcommon , libsecret, spice_protocol, spice_gtk, epoxy, at_spi2_core -, openssl }: +, openssl +# The themes here are soft dependencies; only icons are missing without them. +, hicolor_icon_theme, adwaita-icon-theme +}: let version = "1.2.0-rcgit.15"; @@ -51,7 +54,7 @@ stdenv.mkDerivation { pcre webkitgtk libdbusmenu-gtk3 libappindicator-gtk3 libvncserver libpthreadstubs libXdmcp libxkbcommon libsecret spice_protocol spice_gtk epoxy at_spi2_core - openssl ]; + openssl hicolor_icon_theme adwaita-icon-theme ]; cmakeFlags = "-DWITH_VTE=OFF -DWITH_TELEPATHY=OFF -DWITH_AVAHI=OFF -DWINPR_INCLUDE_DIR=${freerdp_git}/include/winpr2"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3739c89f651..e7b135e2911 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3543,7 +3543,7 @@ in remind = callPackage ../tools/misc/remind { }; - remmina = callPackage ../applications/networking/remote/remmina {}; + remmina = callPackage ../applications/networking/remote/remmina { adwaita-icon-theme = gnome3.adwaita-icon-theme; }; renameutils = callPackage ../tools/misc/renameutils { }; From f49a23c28e8382d60136efeb3ef47844fe9da6fb Mon Sep 17 00:00:00 2001 From: symphorien Date: Sun, 25 Dec 2016 20:43:46 +0100 Subject: [PATCH 93/97] os-prober: init at 1.65 (#21409) * os-prober: init at 1.65 * os-prober: fix source url * os-prober: use sha256 instead of md5 --- pkgs/tools/misc/os-prober/default.nix | 77 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 79 insertions(+) create mode 100644 pkgs/tools/misc/os-prober/default.nix diff --git a/pkgs/tools/misc/os-prober/default.nix b/pkgs/tools/misc/os-prober/default.nix new file mode 100644 index 00000000000..8d2f15734c5 --- /dev/null +++ b/pkgs/tools/misc/os-prober/default.nix @@ -0,0 +1,77 @@ +{ stdenv, fetchurl, makeWrapper, +systemd, # udevadm +busybox, +coreutils, # os-prober desn't seem to work with pure busybox +devicemapper, # lvs +# optional dependencies +cryptsetup ? null, +libuuid ? null, # blkid and blockdev +dmraid ? null, +ntfs3g ? null +}: + +stdenv.mkDerivation rec { + version = "1.65"; + name = "os-prober-${version}"; + src = fetchurl { + url = "mirror://debian/pool/main/o/os-prober/os-prober_${version}.tar.xz"; + sha256 = "c4a7661a52edae722f7e6bacb3f107cf7086cbe768275fadf5398d04360bfc84"; + }; + + buildInputs = [ makeWrapper ]; + installPhase = '' + # executables + mkdir -p $out/bin + mkdir -p $out/lib + mkdir -p $out/share + cp os-prober linux-boot-prober $out/bin + cp newns $out/lib + cp common.sh $out/share + + # probes + case "${stdenv.system}" in + i686*|x86_64*) ARCH=x86;; + powerpc*) ARCH=powerpc;; + arm*) ARCH=arm;; + *) ARCH=other;; + esac; + for probes in os-probes os-probes/mounted os-probes/init linux-boot-probes linux-boot-probes/mounted; do + mkdir -p $out/lib/$probes; + cp $probes/common/* $out/lib/$probes; + if [ -e "$probes/$ARCH" ]; then + mkdir -p $out/lib/$probes + cp -r $probes/$ARCH/* $out/lib/$probes; + fi; + done + if [ $ARCH = "x86" ]; then + cp -r os-probes/mounted/powerpc/20macosx $out/lib/os-probes/mounted; + fi; + ''; + postFixup = '' + for file in $(find $out -type f ! -name newns) ; do + substituteInPlace $file \ + --replace /usr/share/os-prober/ $out/share/ \ + --replace /usr/lib/os-probes/ $out/lib/os-probes/ \ + --replace /usr/lib/linux-boot-probes/ $out/lib/linux-boot-probes/ \ + --replace /usr/lib/os-prober/ $out/lib/ + done; + for file in $out/bin/*; do + wrapProgram $file \ + --set LVM_SYSTEM_DIR ${devicemapper} \ + --suffix PATH : "$out/bin${builtins.foldl' (x: y: x + ":" + y) "" ( + map (x: (toString x) + "/bin") ( + builtins.filter (x: x!=null) + [ devicemapper systemd coreutils cryptsetup libuuid dmraid ntfs3g busybox ] + ) + ) + }" \ + --run "[ -d /var/lib/os-prober ] || mkdir /var/lib/os-prober" + done; + ''; + + meta = { + description = "Utility to detect other OSs on a set of drives"; + homepage = http://packages.debian.org/source/sid/os-prober; + license = stdenv.lib.licenses.gpl2Plus; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e7b135e2911..95b8baf7be2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3133,6 +3133,8 @@ in olsrd = callPackage ../tools/networking/olsrd { }; + os-prober = callPackage ../tools/misc/os-prober {}; + ossec = callPackage ../tools/security/ossec {}; ostree = callPackage ../tools/misc/ostree { }; From 661b5a9875cbc37310da5ee53b47a1d121bb5660 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 25 Dec 2016 22:14:24 +0100 Subject: [PATCH 94/97] Revert "openssh: security 7.3p1 -> 7.4p1" This reverts commit 277080fea0d2cf5017e4179a23e370307502c677. I had tested the server on my physical machine before pushing, but the openssh test got broken so something is clearly wrong. http://hydra.nixos.org/build/45500080 --- ...H-1380296-NEWKEYS-null-pointer-deref.patch | 37 +++++++++++++++++++ pkgs/tools/networking/openssh/default.nix | 6 ++- .../openssh/fix-CVE-2016-8858.patch | 11 ++++++ 3 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 pkgs/tools/networking/openssh/RH-1380296-NEWKEYS-null-pointer-deref.patch create mode 100644 pkgs/tools/networking/openssh/fix-CVE-2016-8858.patch diff --git a/pkgs/tools/networking/openssh/RH-1380296-NEWKEYS-null-pointer-deref.patch b/pkgs/tools/networking/openssh/RH-1380296-NEWKEYS-null-pointer-deref.patch new file mode 100644 index 00000000000..665eff86453 --- /dev/null +++ b/pkgs/tools/networking/openssh/RH-1380296-NEWKEYS-null-pointer-deref.patch @@ -0,0 +1,37 @@ +diff --git a/kex.c b/kex.c +index 50c7a0f..823668b 100644 +--- a/kex.c ++++ b/kex.c +@@ -419,6 +419,8 @@ kex_input_newkeys(int type, u_int32_t seq, void *ctxt) + ssh_dispatch_set(ssh, SSH2_MSG_NEWKEYS, &kex_protocol_error); + if ((r = sshpkt_get_end(ssh)) != 0) + return r; ++ if ((r = ssh_set_newkeys(ssh, MODE_IN)) != 0) ++ return r; + kex->done = 1; + sshbuf_reset(kex->peer); + /* sshbuf_reset(kex->my); */ +diff --git a/packet.c b/packet.c +index d6dad2d..f96566b 100644 +--- a/packet.c ++++ b/packet.c +@@ -38,7 +38,7 @@ + */ + + #include "includes.h" +- ++ + #include /* MIN roundup */ + #include + #include "openbsd-compat/sys-queue.h" +@@ -1907,9 +1907,7 @@ ssh_packet_read_poll2(struct ssh *ssh, u_char *typep, u_int32_t *seqnr_p) + return r; + return SSH_ERR_PROTOCOL_ERROR; + } +- if (*typep == SSH2_MSG_NEWKEYS) +- r = ssh_set_newkeys(ssh, MODE_IN); +- else if (*typep == SSH2_MSG_USERAUTH_SUCCESS && !state->server_side) ++ if (*typep == SSH2_MSG_USERAUTH_SUCCESS && !state->server_side) + r = ssh_packet_enable_delayed_compress(ssh); + else + r = 0; diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index ce323bae4e7..064f68947b8 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -29,11 +29,11 @@ stdenv.mkDerivation rec { # Please ensure that openssh_with_kerberos still builds when # bumping the version here! name = "openssh-${version}"; - version = "7.4p1"; + version = "7.3p1"; src = fetchurl { url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz"; - sha256 = "1l8r3x4fr2kb6xm95s7kjdif1wp6f94d4kljh4qjj9109shw87qv"; + sha256 = "1k5y1wi29d47cgizbryxrhc1fbjsba2x8l5mqfa9b9nadnd9iyrz"; }; prePatch = optionalString hpnSupport @@ -44,11 +44,13 @@ stdenv.mkDerivation rec { patches = [ + ./RH-1380296-NEWKEYS-null-pointer-deref.patch ./locale_archive.patch ./fix-host-key-algorithms-plus.patch # See discussion in https://github.com/NixOS/nixpkgs/pull/16966 ./dont_create_privsep_path.patch + ./fix-CVE-2016-8858.patch ] ++ optional withGssapiPatches gssapiSrc; diff --git a/pkgs/tools/networking/openssh/fix-CVE-2016-8858.patch b/pkgs/tools/networking/openssh/fix-CVE-2016-8858.patch new file mode 100644 index 00000000000..e526161083c --- /dev/null +++ b/pkgs/tools/networking/openssh/fix-CVE-2016-8858.patch @@ -0,0 +1,11 @@ +diff -u -r1.126 -r1.127 +--- ssh/kex.c 2016/09/28 21:44:52 1.126 ++++ ssh/kex.c 2016/10/10 19:28:48 1.127 +@@ -461,6 +461,7 @@ + if (kex == NULL) + return SSH_ERR_INVALID_ARGUMENT; + ++ ssh_dispatch_set(ssh, SSH2_MSG_KEXINIT, NULL); + ptr = sshpkt_ptr(ssh, &dlen); + if ((r = sshbuf_put(kex->peer, ptr, dlen)) != 0) + return r; From 6b2ead98cb1570583aa07464ae9d8200321c3ca8 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 25 Dec 2016 22:55:48 +0100 Subject: [PATCH 95/97] libwacom: 0.19 -> 0.22 --- pkgs/development/libraries/libwacom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix index 0d757d33cf9..ad3cbe119c5 100644 --- a/pkgs/development/libraries/libwacom/default.nix +++ b/pkgs/development/libraries/libwacom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libwacom-${version}"; - version = "0.19"; + version = "0.22"; src = fetchurl { url = "mirror://sourceforge/linuxwacom/libwacom/${name}.tar.bz2"; - sha256 = "1zsmp2l53fbfy6jykh4c0i127baf503lq2fvd5y1066ihp6qh3b2"; + sha256 = "1h10awwapj5v8nik220ga0raggv3lgaq0kzwlma2qjmzdhhrrhcp"; }; nativeBuildInputs = [ pkgconfig ]; From 2c616b04738da584d99b1db2832ed8a7a1d4bffc Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 25 Dec 2016 22:56:13 +0100 Subject: [PATCH 96/97] xf86-input-wacom: 0.32.0 -> 0.34.0 --- pkgs/os-specific/linux/xf86-input-wacom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix index 3d3b52acf6f..b308a5ec3c3 100644 --- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix +++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix @@ -3,11 +3,11 @@ , ncurses, pkgconfig, randrproto, xorgserver, xproto, udev, libXinerama, pixman }: stdenv.mkDerivation rec { - name = "xf86-input-wacom-0.32.0"; + name = "xf86-input-wacom-0.34.0"; src = fetchurl { url = "mirror://sourceforge/linuxwacom/${name}.tar.bz2"; - sha256 = "03c73vi5rrcr92442k82f4kbabp21yqcrqi6ak2afl41zjdar5wc"; + sha256 = "0idhkigl0pnyp08sqm6bqfb4h20v6rjrb71z1gdv59gk7d7qwpgi"; }; buildInputs = [ inputproto libX11 libXext libXi libXrandr libXrender From da70d3da0f11b22eac77756b39b349215e06b2e3 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Sun, 25 Dec 2016 01:11:07 +0000 Subject: [PATCH 97/97] SDL2: split derivation --- pkgs/development/libraries/SDL2/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 16aa4f6c2f7..f94d7051d0d 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -31,6 +31,8 @@ stdenv.mkDerivation rec { sha256 = "0jqp46mxxbh9lhpx1ih6sp93k752j2smhpc0ad0q4cb3px0famfs"; }; + outputs = [ "out" "dev" ]; + patches = [ ./find-headers.patch ]; nativeBuildInputs = [ pkgconfig ]; @@ -61,6 +63,7 @@ stdenv.mkDerivation rec { postInstall = '' rm $out/lib/*.a + moveToOutput bin/sdl2-config "$dev" ''; setupHook = ./setup-hook.sh;